From ba0678df9d8528e28a8a8519c8333499b2f91cc7 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期三, 24 十二月 2025 16:48:14 +0800
Subject: [PATCH] 修复钉钉调用接口生成金蝶采购订单,生成mes器具档案

---
 WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs |  101 +++++++++++++++++++++++++-------------------------
 1 files changed, 50 insertions(+), 51 deletions(-)

diff --git a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
index 8c0dd1e..9a3e451 100644
--- a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
@@ -771,16 +771,16 @@
                     return objJsonResult;
                 }
                 oCN.Commit();
-                #region 鐢熸垚閲戣澏鍗曟嵁锛堝厛淇濆瓨鍒癿es鏈湴锛岄�氳繃鏈湴璋冪敤鐢熸垚閲戣澏鍗曟嵁锛�
-                if (!jindieCloud(msg1))
-                {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 1;
-                    objJsonResult.Message = "杩斿洖閲戣澏鍗曟嵁澶辫触";  //鎴愬姛锛�
-                    objJsonResult.data = null;
-                    return objJsonResult;
-                }
-                #endregion
+                //#region 鐢熸垚閲戣澏鍗曟嵁锛堝厛淇濆瓨鍒癿es鏈湴锛岄�氳繃鏈湴璋冪敤鐢熸垚閲戣澏鍗曟嵁锛�
+                //if (!jindieCloud(msg1))
+                //{
+                //    objJsonResult.code = "0";
+                //    objJsonResult.count = 1;
+                //    objJsonResult.Message = "杩斿洖閲戣澏鍗曟嵁澶辫触";  //鎴愬姛锛�
+                //    objJsonResult.data = null;
+                //    return objJsonResult;
+                //}
+                //#endregion
                 objJsonResult.code = "1";
                 objJsonResult.count = 1;
                 objJsonResult.Message = "鍗曟嵁淇濆瓨鎴愬姛锛�";
@@ -798,25 +798,24 @@
                 return objJsonResult;
             }
         }
-        public bool jindieCloud(string msg1)
+        [Route("Cg_POOrderBill/jindieCloud")]
+        [HttpPost]
+        public bool jindieCloud(int HSupID,int MaterID)
         {
+            Int64 HInterID = 0;
+            string HBillNo = "";
+            string sErrMsg = "";
+            HInterID = DBUtility.ClsPub.CreateBillID_Prod("1102", ref sErrMsg);
+            HBillNo = DBUtility.ClsPub.CreateBillCode_Prod("1102", ref sErrMsg, true);
             WebS.ClsCg_POOrderBillMain websLsmain = new WebS.ClsCg_POOrderBillMain();
-            //WebS.ClsCg_POInStockBillMain websLsmain = new WebS.ClsKf_OtherOutBillMain();
-            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
-            string msg2 = sArray[0].ToString(); //涓昏〃鏁版嵁
-            string msg3 = sArray[1].ToString(); //瀛愯〃鏁版嵁
-            int OperationType = int.Parse(sArray[2].ToString()); // 鏁版嵁绫诲瀷 1娣诲姞 3淇敼
-            string user = sArray[3].ToString();
-            string msg_allVal = sArray[4].ToString(); //涓昏〃+瀛愯〃鎵�鏈夋暟鎹�
-            msg2 = "[" + msg2.ToString() + "]";
-            List<ClsCg_POOrderBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsCg_POOrderBillMain>>(msg2);
-            websLsmain.HInterID = mainList[0].HInterID;
-            websLsmain.HDate = mainList[0].HDate;
-            websLsmain.HBillNo = mainList[0].HBillNo;
-            websLsmain.HSupID = mainList[0].HSupID;
-            websLsmain.HEmpID = mainList[0].HEmpID;
-            websLsmain.HSTOCKORGID = mainList[0].HUSEORGID;
-            websLsmain.HBillType = mainList[0].HBillType;
+            
+            websLsmain.HInterID = HInterID;
+            websLsmain.HDate = DateTime.Now;
+            websLsmain.HBillNo = HBillNo;
+            websLsmain.HSupID = HSupID;
+            websLsmain.HEmpID = MaterID;
+            websLsmain.HSTOCKORGID = 100038;
+            //websLsmain.HBillType = mainList[0].HBillType;
             if (!oWebs.set_Bill_New(websLsmain, "1100", ref DBUtility.ClsPub.sErrInfo))
             {
                 objJsonResult.code = "0";
@@ -825,7 +824,7 @@
                 objJsonResult.data = null;
                 return false;
             }
-            objJsonResult = AddBillMould(msg1);
+            objJsonResult = AddBillMould(HBillNo, MaterID, HSupID);
             if (objJsonResult.code == "0")
             {
                 objJsonResult.code = "0";
@@ -836,40 +835,40 @@
             }
             return true;
         }
-        public json AddBillMould(string msg1)
+        public json AddBillMould(string HBillNo,int MaterID,int HSupID)
         {
-            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
-            string msg2 = sArray[0].ToString();
-            string msg3 = sArray[1].ToString();
+            //string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+            //string msg2 = sArray[0].ToString();
+            //string msg3 = sArray[1].ToString();
             try
             {
-                msg2 = "[" + msg2.ToString() + "]";
-                List<Gy_Mould> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Mould>>(msg2);
-                List<Gy_Mould> mainList1 = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Mould>>(msg3);
+                //msg2 = "[" + msg2.ToString() + "]";
+                //List<Gy_Mould> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Mould>>(msg2);
+                //List<Gy_Mould> mainList1 = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Mould>>(msg3);
                 string BillType = "3899";
                 //寰楀埌mainid
                 long HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
-                string HBillNo = mainList[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
-                DateTime HDate = mainList[0].HDate;//鏃ユ湡
+                //string HBillNo = HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
+                DateTime HDate = DateTime.Now;//鏃ユ湡
                 int HYear = DBUtility.ClsPub.isInt(DateTime.Now.Year);
                 double HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
                 string HMouldNo = HInterID+"xxx";
                 string HBarCode = HBillNo+"xxx";
-                string HName = mainList[0].HName??"娴嬭瘯妯″叿";
-                string HModel = mainList[0].HModel?? "娴嬭瘯";
-                string HModel2 = mainList[0].HModel2 ?? "娴嬭瘯";
-                string HDiameter = mainList[0].HDiameter ?? "娴嬭瘯";
-                string HSubjoin = mainList[0].HSubjoin ?? "娴嬭瘯";
-                string HSubjoin2 = mainList[0].HSubjoin2 ?? "娴嬭瘯";
-                string HPICNo = mainList[0].HPICNo ?? "娴嬭瘯";
-                string HWorkMaterModel = mainList[0].HWorkMaterModel ?? "娴嬭瘯";
-                long HMaterID = mainList1[0].HMaterID;
+                string HName = "娴嬭瘯妯″叿";
+                string HModel =  "娴嬭瘯";
+                string HModel2 = "娴嬭瘯";
+                string HDiameter = "娴嬭瘯";
+                string HSubjoin = "娴嬭瘯";
+                string HSubjoin2 =  "娴嬭瘯";
+                string HPICNo = "娴嬭瘯";
+                string HWorkMaterModel =  "娴嬭瘯";
+                long HMaterID = MaterID;
                 long HMouleTypeID = 1;
-                long HUnitID = mainList1[0].HUnitID;
+                long HUnitID = 1;
                 DateTime HOutComDate = DateTime.Now;
-                string HOutComNo = mainList[0].HOutComNo ?? "娴嬭瘯";
+                string HOutComNo = "娴嬭瘯";
                 long HDeptID = 0;
-                long HSupID = mainList[0].HSupID;
+                //long HSupID = HSupID;
                 string HMouldStatus = "0";
                 long HWHID = 0;
                 long HRoutingID = 0;
@@ -900,8 +899,8 @@
                 int HNowWHID = 0;
                 int HNowSPID = 0;
                 string HMouldUseStatus = "test";
-                int HCREATEORGID = mainList[0].HCREATEORGID;
-                int HUSEORGID = mainList[0].HUSEORGID;
+                int HCREATEORGID = 100038;
+                int HUSEORGID = 100038;
                 bool HTransPackFlag = false;     //鍛ㄨ浆瀹瑰櫒鏍囪
                 bool HSendPackFlag = false;       //鍙戣揣瀹瑰櫒鏍囪
                 int HMouldLength =0;          //闀�

--
Gitblit v1.9.1