From 6955aa214c12c309da1c7e99af8c58d381812684 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期三, 21 七月 2021 19:55:27 +0800
Subject: [PATCH] 检验申请单提交

---
 WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs |   67 ++++++++++++++++++++++++++-------
 1 files changed, 53 insertions(+), 14 deletions(-)

diff --git a/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
index 9d7818d..de9c845 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
@@ -583,23 +583,62 @@
         #region 鎶ュ伐骞冲彴鎶ユ鐢宠淇濆瓨
         [Route("Sc_MESBeginWorkBill/SaveGetMESProductReportBillList")]
         [HttpGet]
-        public object SaveGetMESProductReportBillList([FromBody] JObject msg)
-        {
-            var _value = msg["msg"].ToString();
-            string msg1 = _value.ToString();
-            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
-            string msg2 = sArray[0].ToString();
-
-
+        public object SaveGetMESProductReportBillList(string ScMaxWork,string HSourceBillType, string workcode,int HSourceID,int HICMOInterID,int HICMOEntryID,string HMaker)
+        {   
             ListModels oListModels = new ListModels();
             try
             {
-                DLL.ClsSc_ICMOReportBill oBill = new DLL.ClsSc_ICMOReportBill();
-                List<Models.ClsSc_ICMOReportBillMain> lsmain = new List<Models.ClsSc_ICMOReportBillMain>();
-                msg2 = msg2.Replace("\\", "");
-                msg2 = msg2.Replace("\n", "");  //\n
-                lsmain = oListModels.getObjectByJson_Gy_ICMOReportBillMain(msg2);
-               
+                string sHSourceType = HSourceBillType;
+                string  BillType = "3711";  //鍗曟嵁绫诲瀷 (鐢熶骇姹囨姤鍗�)
+                //寰楀埌mainid
+                 long HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+                oCN.BeginTran();
+                //鏍规嵁鍗曞彿銆佽祫婧怚D銆佽鍗曚富ID銆佽鍗曞瓙ID銆佸埗鍗曚汉杩囨护浜ч噺姹囨姤鎶ユ鐢宠鎻愪氦鏁版嵁
+                string sql = string.Format(@"update Sc_ICMOBillWorkQtyStatus_Tmp set 
+                                 HICMOReportInterID ='"+HInterID+"', HICMOReportBillNo='"+ ScMaxWork + "' from Sc_ICMOBillWorkQtyStatus_Tmp a where a.HICMOBillNo='" + workcode+ "' and a.HSourceID='" + HSourceID + "' and  HICMOInterID='" + HICMOInterID+ "' and a.HICMOEntryID='"+ HICMOEntryID + "' and a.HMaker='"+HMaker+"'  and HRelationInterID='0'");
+                oCN.RunProc(sql);
+                oCN.Commit();
+                //鏍规嵁鐢熶骇璁㈠崟鍙锋煡璇㈢敓浜ц鍗曡〃锛屾嬁鍒扮粍缁囥�佽溅闂�
+                DataSet ds0 = oCN.RunProcReturn("select HPRDORGID,HDeptID from Sc_ICMOBillMain where HBillNo='"+ workcode + "'", "Sc_ICMOBillMain");
+
+                //鏌ヨ浜ч噺姹囨姤涓存椂琛�
+                ds = oCN.RunProcReturn("select top1* from Sc_ICMOBillWorkQtyStatus_Tmp where HICMOReportInterID='"+ HInterID + "' and HICMOReportBillNo='" + ScMaxWork + "'", "Sc_ICMOBillWorkQtyStatus_Tmp");
+                if (ds.Tables[0].Rows.Count <= 0) 
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "褰撳墠鍗曟嵁鏃犱骇閲忔眹鎶ヨ褰曪紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                //璋冪敤WebService鏈嶅姟
+                WebS.ClsSc_ICMOReportBillMain model = new WebS.ClsSc_ICMOReportBillMain();
+                model.HInterID = HInterID;
+                model.HBillNo = ScMaxWork;
+                model.HYear= DBUtility.ClsPub.isLong(DateTime.Now.Year);
+                model.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
+                model.HRemark = "";
+                model.HMaker = HMaker;
+                model.HEmpID = 0;
+                model.HGroupID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HGroupID"]);
+                model.HDeptID= DBUtility.ClsPub.isLong(ds0.Tables[0].Rows[0]["HDeptID"]);
+                model.HPRDORGID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HPRDORGID"]);
+                WebS.WebService1 oWebs = new WebS.WebService1();
+                bool flag=oWebs.set_SaveICMOProductReportBill_Layui(model, sHSourceType, ref DBUtility.ClsPub.sErrInfo);
+                if (flag)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+                    objJsonResult.data = 1;
+                }
+                else 
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sErrInfo;
+                    objJsonResult.data = null;
+                }
             }
             catch (Exception e)
             {

--
Gitblit v1.9.1