From ff28c80eb67115f7aaa792eeea5b5af1875fbbef Mon Sep 17 00:00:00 2001
From: WYB <908761037@qq.com>
Date: 星期三, 21 四月 2021 22:15:03 +0800
Subject: [PATCH] 1.单据编辑模块（工序汇报单）： 按钮。增加关闭功能，撤销关闭功能。 2.单据编辑模块（工序汇报单）：增加审核、反审核按钮
---
WebAPI/Controllers/Sc_ProcessMangementController.cs | 255 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 245 insertions(+), 10 deletions(-)
diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs
index 2a2139f..b881e7e 100644
--- a/WebAPI/Controllers/Sc_ProcessMangementController.cs
+++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -128,6 +128,97 @@
}
/// <summary>
+ /// 杩斿洖鐢熶骇姹囨姤鍗曚富琛ㄨ鎯呬俊鎭�
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Sc_ProcessMangement/MES_DetailSc_ProcessReportList_Json")]
+ [HttpGet]
+ public object MES_DetailSc_ProcessReportList_Json(int HInterID)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (HInterID<=0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID灏忎簬0锛�" ;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+
+ string sql1 = @"select s1.HInterID,s1.HBillNo,s1.HDeptID,s2.HName,s1.HDate,s1.HPlanQty,s1.HICMOBillNo,s1.HRemark,s2.HNumber
+,s1.HMaker,s1.HMakeDate,s1.HChecker,s1.HCheckDate,s1.HUpDater,s1.HUpDateDate,s1.HCloseMan,s1.HCloseDate
+from Sc_ProcessReportMain s1
+ inner join Gy_Department s2 on s1.HDeptID=s2.HItemID and s1.HInterID=" + HInterID;
+
+ ds = oCN.RunProcReturn(sql1, "Sc_ProcessReportMain");
+
+ }
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ return GetObjectJson(ds);
+ }
+
+ /// <summary>
+ /// 杩斿洖鐢熶骇娲惧伐鍗曞叧鑱旇鎯呬俊鎭�
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Sc_ProcessMangement/MES_h_v_Sc_ProcessSendWorkList_Json")]
+ [HttpGet]
+ public object MES_h_v_Sc_ProcessSendWorkList_Json(int HInterID)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (HInterID <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID灏忎簬0锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+
+ string sql1 =@"select [hmainid], [鏃ユ湡], [鍗曟嵁鍙穄, [HDeptID], [閮ㄩ棬浠ｇ爜], [閮ㄩ棬], [HMaterID], [鐗╂枡浠ｇ爜], [鐗╂枡鍚嶇О], [瑙勬牸鍨嬪彿], [HUnitID], [璁￠噺鍗曚綅浠ｇ爜], [璁￠噺鍗曚綅], [HprocID],
+[宸ュ簭浠ｇ爜], [宸ュ簭], [HGroupID], [鐝粍浠ｇ爜], [鐝粍鍚嶇О], [HSourceID], [璧勬簮浠ｇ爜], [鐢熶骇璧勬簮], [HWorkerID], [鑱屽憳浠ｇ爜], [鑱屽憳], [hsubid], [鏁伴噺], [璁″垝寮�宸ユ棩鏈焆,
+[璁″垝瀹屽伐鏃ユ湡], [璁″垝宸ユ椂], [琛ㄤ綋澶囨敞], [HICMOInterID], [鐢熶骇浠诲姟鍗曞彿], [HSeOrderInterID], [閿�鍞鍗曞彿], [琛ㄥご澶囨敞], [鍒跺崟浜篯, [鍒跺崟鏃ユ湡], [瀹℃牳浜篯, [瀹℃牳鏃ユ湡], [淇敼浜篯,
+[淇敼鏃ユ湡], [鍏抽棴浜篯, [鍏抽棴鏃ユ湡], [浣滃簾浜篯, [浣滃簾鏃ユ湡], [婧愬崟涓诲唴鐮乚, [婧愬崟瀛愬唴鐮乚, [婧愬崟鍗曞彿], [婧愬崟绫诲瀷], [琛屽叧闂汉], [HBillType], [HQtyDecimal], [HPriceDecimal]
+from h_v_Sc_ProcessSendWorkList
+where hmainid=(select HSourceID from Sc_ProcessReportSub where HInterID="+HInterID+")";
+
+ ds = oCN.RunProcReturn(sql1, "h_v_Sc_ProcessSendWorkList");
+
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ return GetObjectJson(ds);
+ }
+
+ /// <summary>
/// 杩斿洖鐢熶骇宸ュ簭璁″垝鍗曞垪琛�
///鍙傛暟锛歴tring sql銆�
///杩斿洖鍊硷細object銆�
@@ -761,23 +852,19 @@
reportSub.HEntryID = i;
reportSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
reportSub.HRemark = "";
- reportSub.HCloseMan = "";
+ reportSub.HCloseMan = ReportModel.omodel.HCloseMan;
reportSub.HCloseType = false;
reportSub.HEmpID =0;
reportSub.HICMOBillNo ="";
reportSub.HICMOInterID = (long)ItemView.HICMOInterID;
- reportSub.HEntryID = i;
- reportSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
reportSub.HRemark = "";
- reportSub.HCloseMan = "";
- reportSub.HCloseType = false;
reportSub.HSourceBillType = "3712";
reportSub.HQty = (double)ItemView.鏁伴噺;
reportSub.HProcID = (long)ItemView.HprocID;
reportSub.HProcNumber = ItemView.宸ュ簭浠ｇ爜;
reportSub.HOutPrice = 0;
reportSub.HOutMoney = 0;
- reportSub.HSourceID = (long)ItemView.HSourceID;
+ reportSub.HSourceID = (long)ItemView.hmainid;
reportSub.HEmpNumber = "";
reportSub.HRelBeginDate = DateTime.Now;
reportSub.HRelEndDate = DateTime.Now;
@@ -787,8 +874,8 @@
reportSub.HSeOrderBillNo = "";
reportSub.HProcPlanInterID = 0;
reportSub.HProcPlanBillNo = "";
- reportSub.HSourceInterID = 0;
- reportSub.HSourceBillNo = "";
+ reportSub.HSourceInterID = (long)ItemView.hmainid;
+ reportSub.HSourceBillNo = ItemView.鍗曟嵁鍙�;
reportSub.HRelationQty = 0;
reportSub.HRelationMoney = 0;
reportSub.HMaterID = (long)ItemView.HMaterID;
@@ -803,7 +890,7 @@
reportSub.HProcPlanEntryID = 0;
reportSub.HProcPlanBillNo = "";
reportSub.HSourceEntryID = 0;
- reportSub.HSourceBillType = "";
+ reportSub.HSourceBillType = "3712";
reportSub.HRelationQty = 0;
reportSub.HRelationMoney = 0;
reportSub.HBadPrirce = 0;
@@ -1067,8 +1154,156 @@
}
+ /// <summary>
+ /// 姹囨姤鍗曠紪杈戝叧闂姛鑳�
+ /// </summary>
+ /// <param name="HInterID"></param>
+ /// <param name="IsClose"></param>
+ /// <param name="CurUserName"></param>
+ /// <returns></returns>
+ [Route("CloseProcessReportList")]
+ [HttpGet]
+ public object CloseProcessReportList(int HInterID,int IsClose,string CurUserName)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (HInterID <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID灏忎簬0锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn("select * from Sc_ProcessReportMain where HInterID=" + HInterID, "Sc_ProcessReportMain");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩欎釜鍗曟嵁锛屾棤娉曞叧闂紒";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ if (IsClose == 0)
+ {
+
+ oCN.RunProc("update Sc_ProcessReportMain set HCloseMan='" + CurUserName + "' ,HCloseDate=GETDATE() where HInterID=" + HInterID);
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "* 鍗曟嵁鍏抽棴鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ else if(IsClose==1)
+ {
+
+ oCN.RunProc("update Sc_ProcessReportMain set HCloseMan='' ,HCloseDate=null where HInterID=" + HInterID);
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "* 鍗曟嵁鍙嶅叧闂垚鍔燂紒";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏃犳硶鍏抽棴锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍏抽棴澶辫触鎴栧垯鍙嶅叧闂け璐ワ紒" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 姹囨姤鍗曠紪杈戝鏍稿弽瀹℃牳鍔熻兘
+ /// </summary>
+ /// <param name="HInterID"></param>
+ /// <param name="IsAudit"></param>
+ /// <param name="CurUserName"></param>
+ /// <returns></returns>
+ [Route("AuditProcessReportList")]
+ [HttpGet]
+ public object AuditProcessReportList(int HInterID, int IsAudit, string CurUserName)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (HInterID <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID灏忎簬0锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn("select * from Sc_ProcessReportMain where HInterID=" + HInterID, "Sc_ProcessReportMain");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩欎釜鍗曟嵁锛屾棤娉曞鏍革紒";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ if (IsAudit == 0)
+ {
+
+ oCN.RunProc("update Sc_ProcessReportMain set HChecker='" + CurUserName + "' ,HCheckDate=GETDATE() where HInterID=" + HInterID);
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "* 鍗曟嵁瀹℃牳鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ else if (IsAudit == 1)
+ {
+
+ oCN.RunProc("update Sc_ProcessReportMain set HChecker='' ,HCheckDate=null where HInterID=" + HInterID);
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "* 鍗曟嵁鍙嶅鏍告垚鍔燂紒";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏃犳硶瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
-
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触鎴栬�呭弽瀹℃牳澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
+
+
}
}
\ No newline at end of file
--
Gitblit v1.9.1