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/Controllers/SBGL/Sb_EquipRepairSendWorkBillController.cs | 214 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 186 insertions(+), 28 deletions(-)
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
--
Gitblit v1.9.1