From eedd1a047c306f4971d0e05ac2d5b8143b90af0a Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 05 八月 2022 15:45:09 +0800
Subject: [PATCH] 工艺路线 编辑 维护

---
 WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs |   22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
index cf23e88..acf2d8f 100644
--- a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
+++ b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
@@ -119,9 +119,9 @@
             string msg2 = sArray[0].ToString();
             string msg3 = sArray[1].ToString();
 
-            int hentryid = int.Parse(sArray[2].ToString());//瀛愯〃鐨勯『搴廼d
-            int OperationType = int.Parse(sArray[3].ToString());//鏁版嵁绫诲瀷 1娣诲姞 3淇敼
-            string user = sArray[4].ToString();//鐢ㄦ埛鍚�
+            //int hentryid = int.Parse(sArray[2].ToString());//瀛愯〃鐨勯『搴廼d
+            int OperationType = int.Parse(sArray[2].ToString());//鏁版嵁绫诲瀷 1娣诲姞 3淇敼
+            string user = sArray[3].ToString();//鐢ㄦ埛鍚�
             try
             {
                 //鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
@@ -170,7 +170,9 @@
                 string HProductNum = mainList[0].HProductNum;//鎴愬搧缂栧彿
                 string HVerNum = mainList[0].HVerNum;//鐗堟湰
 
-                if (OperationType == 1)//鏂板
+                ds = oCN.RunProcReturn("select * from h_v_Gy_RoutingBillList where hmainid=" + HInterID + " and 鍗曟嵁鍙�='" + HBillNo + "'", "h_v_Gy_RoutingBillList");
+
+                if (OperationType == 1 && ds.Tables[0].Rows.Count == 0)//鏂板
                 {
                     //涓昏〃
                     oCN.RunProc("Insert Into Gy_RoutingBillMain   " +
@@ -184,9 +186,9 @@
                     "," + HRoutingGroupID + "," + HUnitID + ",'" + HMaterNumber + "','" + HUnitNumber + "'," + Convert.ToString(HStandard ? 1 : 0) +
                     "," + HMainGroupID + "," + HMainProcID + "," + HMainCenterID + ",'" + HMainTimeUnit + "'," + HMainUnitTime + "," + HMainWorkQty +
                     "," + HMainPrice + "," + HStdSourceQty + "," + HAddSourceRate + "," + HPRDORGID + "," + HDelSourceRate +
-                    ",'"+ HPicNumVer + "','" + HPicNumAssemble + "','" + HMaterTexture + "','" + HProductNum + "','" + HVerNum + "',"+ HOrgID + ") ");
+                    ",'" + HPicNumVer + "','" + HPicNumAssemble + "','" + HMaterTexture + "','" + HProductNum + "','" + HVerNum + "'," + HOrgID + ") ");
                 }
-                else if (OperationType == 3)
+                else if (OperationType == 3 || ds.Tables[0].Rows.Count != 0)
                 { //淇敼
                     oCN.RunProc("update Gy_RoutingBillMain  set " +
                        "HDate='" + HDate +
@@ -200,10 +202,10 @@
                         ",HProductNum='" + HProductNum + "',HVerNum='" + HVerNum + "' where HInterID='" + HInterID + "'");
 
                     //鍒犻櫎瀛愯〃
-                    oCN.RunProc("delete from Gy_RoutingBillSub where HInterID='" + HInterID + "' and HEntryID='" + hentryid + "'");
+                    oCN.RunProc("delete from Gy_RoutingBillSub where HInterID='" + HInterID+"'");
                 }
                 //淇濆瓨瀛愯〃
-                objJsonResult = AddBillSub(msg3, HInterID, hentryid);
+                objJsonResult = AddBillSub(msg3, HInterID);
                 if (objJsonResult.code == "0")
                 {
                     objJsonResult.code = "0";
@@ -255,7 +257,7 @@
             }
         }
 
-        public json AddBillSub(string msg3, long HInterID, int hentryid)
+        public json AddBillSub(string msg3, long HInterID)
         {
             List<Gy_RoutingBillSub> DetailColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_RoutingBillSub>>(msg3);
             int i = 0;
@@ -284,7 +286,7 @@
                   ",HTechnologyParameter,HPicNum,HProcCheckNote" +
                   ",HOverRate,HProcWorkNum" +
                   ") values("
-                  + HInterID + "," + (hentryid==-1?i: hentryid) + "," + oSub.HProcID.ToString() + ",'" + (hentryid == -1 ? i : hentryid) + "'," + oSub.HSupID.ToString() + "," + Convert.ToString(oSub.HSupFlag ? 1 : 0) + "" +
+                  + HInterID + "," + i + "," + oSub.HProcID.ToString() + ",'" + i + "'," + oSub.HSupID.ToString() + "," + Convert.ToString(oSub.HSupFlag ? 1 : 0) + "" +
                   "," + oSub.HWorkQty.ToString() + "," + oSub.HCenterID.ToString() + ",'" + oSub.HTimeUnit.ToString() + "'," + oSub.HUnitTime.ToString() +
                   "," + oSub.HReadyTime.ToString() + "," + oSub.HQueueTime.ToString() + "," + oSub.HMoveTime.ToString() +
                   ",'" + oSub.HCloseMan + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "','" + oSub.HProcType + "'," + Convert.ToString(oSub.HNextProcFlag ? 1 : 0) + "," + Convert.ToString(oSub.HFlowProc ? 1 : 0) +

--
Gitblit v1.9.1