From d1ff6d3f77431b15feb72688a280f80b89fb68d6 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期五, 21 一月 2022 17:30:51 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/DLL/ClsSc_ProcessReport.cs | 6
WebAPI/Controllers/SBGL/Sb_EquipRepairSendWorkBillController.cs | 214 +++++++++++++++++++++++++++++++++++++-----
WebAPI/DLL/ClsSc_MESEndWorkBill.cs | 2
WebAPI/Controllers/Sc_ProcessMangementController.cs | 21 +--
WebAPI/Controllers/LMESController.cs | 10 ++
WebAPI/Controllers/Sc_MouldRepairSendWorkBillController.cs | 14 --
6 files changed, 210 insertions(+), 57 deletions(-)
diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs
index 828d0e7..9728f1a 100644
--- a/WebAPI/Controllers/LMESController.cs
+++ b/WebAPI/Controllers/LMESController.cs
@@ -180,6 +180,9 @@
return GetObjectJson(ds);
}
+ #region 宸ヨ壓璺嚎
+
+ #region 宸ヨ壓璺嚎鍒楄〃
/// <summary>
/// 杩斿洖宸ヨ壓璺嚎鍒楄〃
///鍙傛暟锛歴tring sql銆�
@@ -214,6 +217,10 @@
}
return GetObjectJson(ds);
}
+
+ #endregion
+
+ #region 宸ヨ壓璺嚎 鍒犻櫎
/// <summary>
/// 宸ヨ壓璺嚎鍒犻櫎鍔熻兘
/// </summary>
@@ -292,6 +299,9 @@
return objJsonResult;
}
}
+ #endregion
+
+ #endregion
/// <summary>
/// 杩斿洖鐢熶骇浠诲姟鍗曞垪琛�
diff --git a/WebAPI/Controllers/SBGL/Sb_EquipRepairSendWorkBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipRepairSendWorkBillController.cs
index 9d16d2f..4abe0a6 100644
--- a/WebAPI/Controllers/SBGL/Sb_EquipRepairSendWorkBillController.cs
+++ b/WebAPI/Controllers/SBGL/Sb_EquipRepairSendWorkBillController.cs
@@ -46,11 +46,11 @@
ds = oCN.RunProcReturn(sql + sWhere, "h_v_Sb_EquipRepairSendWorkBillList");
}
- if (ds.Tables[0].Rows.Count == 0||ds==null)
+ if (ds.Tables[0].Rows.Count == 0 || ds == null)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message ="鏃犺褰�";
+ objJsonResult.Message = "鏃犺褰�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -64,7 +64,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "Exception"+e.ToString();
+ objJsonResult.Message = "Exception" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
@@ -207,7 +207,7 @@
",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
",HRepairID,HManagerID,HRepairExplanation" +
") values("
- + omodel.HInterID.ToString() + "," + (hentryid==-1?i: hentryid) + ",'" + oSub.HCloseMan + "'," + oSub.HEntryCloseDate.ToShortDateString() + "," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
+ + omodel.HInterID.ToString() + "," + (hentryid == -1 ? i : hentryid) + ",'" + oSub.HCloseMan + "'," + oSub.HEntryCloseDate.ToShortDateString() + "," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
"," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
"," + oSub.HRepairID.ToString() + "," + oSub.HManagerID.ToString() + ",'" + oSub.HRepairExplanation + "'" +
") ");
@@ -240,30 +240,6 @@
}
oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
- if (oBill.omodel.HBillStatus > 1)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = "鍗曟嵁褰撳墠澶勪簬涓嶈兘鍒犻櫎鐨勭姸鎬�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- if (oBill.omodel.HCloseMan != "")
- {
- objJsonResult.code = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = "鍗曟嵁褰撳墠宸插叧闂�,涓嶈兘鍒犻櫎";
- objJsonResult.data = null;
- return objJsonResult;
- }
- if (oBill.omodel.HDeleteMan != "")
- {
- objJsonResult.code = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = "鍗曟嵁褰撳墠宸蹭綔搴�,涓嶈兘鍒犻櫎";
- objJsonResult.data = null;
- return objJsonResult;
- }
if (oBill.omodel.HChecker != "")
{
objJsonResult.code = "0";
@@ -299,5 +275,187 @@
}
}
#endregion
+
+ #region 璁惧缁翠慨娲惧伐鍗� 瀹℃牳/鍙嶅鏍�
+ [Route("Sb_EquipRepairSendWorkBill/EquipAuditBill")]
+ [HttpGet]
+ public object EquipAuditBill(int HInterID, int IsAudit, string CurUserName)
+ {
+ // string ModRightNameCheck = ""; 璇ユā鍧楃殑瀹℃牳鍔熻兘
+ DBUtility.ClsPub.CurUserName = CurUserName;//瀛樺偍鐢ㄦ埛鍚�
+ try
+ {
+ ////鍒ゆ柇鏄惁鏈夊鏍告潈闄�
+ // if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+ if (HInterID <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "ID灏忎簬0";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ Int64 lngBillKey = 0;
+ lngBillKey = DBUtility.ClsPub.isLong(HInterID);//鏁版嵁杞崲
+
+ //鏌ヨ瀹℃牳鐨勬暟鎹�
+ ds = oCN.RunProcReturn("select * from Sb_EquipRepairSendWorkBillMain where HInterID='" + HInterID + "'", "Sb_EquipRepairSendWorkBillMain");
+
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ var hcloseman = ds.Tables[0].Rows[0]["hcloseman"].ToString();//鍏抽棴浜�
+ var hdeleteman = ds.Tables[0].Rows[0]["hdeleteman"].ToString();//浣滃簾浜�
+ var hchecker = ds.Tables[0].Rows[0]["hchecker"].ToString();//瀹℃牳浜�
+
+ if (hcloseman != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撳墠鍗曟嵁宸插叧闂�,鏃犳硶瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (hdeleteman != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撳墠鍗曟嵁宸蹭綔搴�,鏃犳硶瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //IsAudit==0 瀹℃牳
+ if (IsAudit == 0)
+ {
+ if (hchecker != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撳墠鍗曟嵁宸插鏍�,鏃犳硶鍐嶆瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //IsAudit==1 鍙嶅鏍�
+ if (IsAudit == 1)
+ {
+ if (hchecker == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撳墠鍗曟嵁鏈鏍�,鏃犳硶鍙嶅鏍�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�;鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //瀹℃牳鎻愪氦
+ if (IsAudit == 0)
+ {
+ if (CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //鍙嶅鏍告彁浜�
+ if (IsAudit == 1)
+ {
+ if (AbandonCheck(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍告垚鍔�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触鎴栧弽瀹℃牳澶辫触" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //瀹℃牳
+ public bool CheckBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ string Hchecker = DBUtility.ClsPub.CurUserName;
+
+ oCN.BeginTran();//鎵撳紑浜嬪姟
+ oCN.RunProc("update Sb_EquipRepairSendWorkBillMain set HBillStatus=2,hchecker='"+Hchecker+ "',hcheckdate='"+DateTime.Now+ "' where HInterID='"+ lngBillKey + "'");
+ oCN.Commit();//鍏抽棴浜嬪姟
+ sReturn = "瀹℃牳鎴愬姛!";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+ //鍙嶅鏍�
+ public bool AbandonCheck(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ string Hchecker = DBUtility.ClsPub.CurUserName;
+
+ oCN.BeginTran();//鎵撳紑浜嬪姟
+ oCN.RunProc("update Sb_EquipRepairSendWorkBillMain set HBillStatus=1,hchecker='',hcheckdate=null where HInterID='" + lngBillKey + "'");
+ oCN.Commit();//鍏抽棴浜嬪姟
+ sReturn = "鍙嶅鏍稿崟鎹垚鍔�!";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw(e);
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/Sc_MouldRepairSendWorkBillController.cs b/WebAPI/Controllers/Sc_MouldRepairSendWorkBillController.cs
index 3c39e3b..6e8393a 100644
--- a/WebAPI/Controllers/Sc_MouldRepairSendWorkBillController.cs
+++ b/WebAPI/Controllers/Sc_MouldRepairSendWorkBillController.cs
@@ -258,23 +258,15 @@
}
oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
- if (oBill.omodel.HBillStatus > 1)
+ if (oBill.omodel.HChecker != "")
{
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = "鍗曟嵁褰撳墠澶勪簬涓嶈兘鍒犻櫎鐨勭姸鎬�";
+ objJsonResult.Message = "鍗曟嵁宸茬粡瀹℃牳,涓嶈兘鍒犻櫎锛�";
objJsonResult.data = null;
return objJsonResult;
}
- //涓嶉渶瑕�
- //if (oBill.omodel.HChecker != "")
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "鍗曟嵁褰撳墠宸插鏍�";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+
if (oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
{
objJsonResult.code = "1";
diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs
index 8f1878c..ee872f5 100644
--- a/WebAPI/Controllers/Sc_ProcessMangementController.cs
+++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -265,7 +265,7 @@
}
#endregion
- #region 淇濆瓨/缂栬緫
+ #region 宸ュ簭璁″垝鍗� 淇濆瓨/缂栬緫
//宸ュ簭璁″垝鍗� 淇濆瓨/缂栬緫
[Route("Sc_ProcessMangement/AddBill")]
[HttpPost]
@@ -421,7 +421,7 @@
}
#endregion
- #region 瀹℃牳/鍙嶅鏍�
+ #region 宸ュ簭璁″垝鍗� 瀹℃牳/鍙嶅鏍�
[Route("Sc_ProcessMangement/CheckDeOAuditBill")]
[HttpGet]
public object CheckDeOAuditBill(int HInterID, int IsAudit, string CurUserName)
@@ -603,7 +603,7 @@
}
#endregion
- #region 鍒犻櫎
+ #region 宸ュ簭璁″垝鍗� 鍒犻櫎
[Route("Sc_ProcessMangement/DeleteProcessBill")]
[HttpGet]
public object MouldDeleteBill(long HInterID, string User, string ModRightNameDelete)
@@ -621,23 +621,15 @@
//}
oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
- if (oBill.omodel.HBillStatus > 1)
+ if (oBill.omodel.HChecker != "")
{
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = "鍗曟嵁褰撳墠澶勪簬涓嶈兘鍒犻櫎鐨勭姸鎬�";
+ objJsonResult.Message = "鍗曟嵁褰撳墠澶勪簬瀹℃牳鐘舵��,涓嶈兘鍒犻櫎!";
objJsonResult.data = null;
return objJsonResult;
}
- //涓嶉渶瑕�
- //if (oBill.omodel.HChecker != "")
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "鍗曟嵁褰撳墠宸插鏍�";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+
if (oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
{
objJsonResult.code = "1";
@@ -667,6 +659,7 @@
#endregion
#endregion
+
/// <summary>
/// 杩斿洖鐢熶骇宸ュ簭娲惧伐鍗曞垪琛�
/// </summary>
diff --git a/WebAPI/DLL/ClsSc_MESEndWorkBill.cs b/WebAPI/DLL/ClsSc_MESEndWorkBill.cs
index af7f884..1943e50 100644
--- a/WebAPI/DLL/ClsSc_MESEndWorkBill.cs
+++ b/WebAPI/DLL/ClsSc_MESEndWorkBill.cs
@@ -458,7 +458,7 @@
string HCheckDate = DBUtility.ClsPub.GetServerDate(-1);
oCn.BeginTran();
oCn.RunProc(" Update " + MvarItemKey + " set HBillStatus='2',HChecker='" + HChecker + "',HCheckDate='" + HCheckDate + "' Where HInterID=" + lngBillKey.ToString());
- //鏍规嵁寮�宸ュ崟鍐呯爜 璁剧疆 鐢熶骇鐘舵�佽〃 寮�宸ョ姸鎬�(鍏堟妸 鏈祫婧愬叏閮ㄥ伐鍗� 璁剧疆涓洪潪寮�宸ョ姸鎬侊紝鍐嶈缃湰鍗曞搴斿緱婧愬崟 涓哄紑宸ョ姸鎬�)
+ //鏍规嵁寮�宸ュ崟鍐呯爜 鍙栧埌鐢熶骇鐘舵�佷复鏃惰〃涓诲唴鐮侊紝鐒跺悗鏇存柊鐢熶骇鐘舵�佷复鏃惰〃鐘舵�佷负锛氬緟鐢熶骇 浠诲姟鍗曠姸鎬�(0寰呯敓浜э紝1鐢熶骇涓紝2鎸傝捣锛�3宸插畬宸�)
oCn.RunProc("exec h_p_JIT_MESBeginWorkBill_BeginWork @HInterId=" + lngBillKey + ",@flag='瀹屽伐'");
oCn.Commit();
diff --git a/WebAPI/DLL/ClsSc_ProcessReport.cs b/WebAPI/DLL/ClsSc_ProcessReport.cs
index 66150bf..f1c9bb5 100644
--- a/WebAPI/DLL/ClsSc_ProcessReport.cs
+++ b/WebAPI/DLL/ClsSc_ProcessReport.cs
@@ -179,11 +179,11 @@
") ");
}
//鏇存柊鍏宠仈鏁伴噺
- AddNewRelation(ref sReturn, omodel.HInterID);
+ //AddNewRelation(ref sReturn, omodel.HInterID);
//鏇存柊鍏宠仈鏁伴噺
- //oCn.RunProc("exec h_p_Sc_UpDateICMOBillStepStatusRelation_Add " + omodel.HInterID);
+ oCn.RunProc("exec h_p_Sc_UpDateICMOBillStepStatusRelation_Add " + omodel.HInterID);
//鍥炲～ 鐢熶骇鐘舵�佽〃 鏃ヨ鍒� 涓� 宸插畬宸� 鐘舵��
- oCn.RunProc("exec h_p_Sc_UpDateICMOBillQualityStatus " + omodel.HICMOStatusInterID.ToString() + ",3");
+ //oCn.RunProc("exec h_p_Sc_UpDateICMOBillQualityStatus " + omodel.HICMOStatusInterID.ToString() + ",3");
//榛樿鍙樹负 鐢宠妫�楠岀姸鎬�
oCn.RunProc("exec h_p_Sc_UpDateProcessReportStatus " + omodel.HInterID.ToString() + ",15");
//
--
Gitblit v1.9.1