From af6e1e7da3131b268b035401aeb75a6bab83f312 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 12 五月 2023 09:10:12 +0800
Subject: [PATCH] 末道工序入库时,可入库数量得等于出站汇报单数量,要是可入库数量小于汇报数量,则保存汇报单失败,报错提示,匹配生产汇报单数量不足出站数量,不允许入库。 --首道出站单删除的时候判断一下对应的金蝶云生产汇报单是否删除,要是没有删除本地出站单也不允许删除 --末道出站单删除的时候判断一下对应的金蝶云生产入库单是否删除,要是没有删除本地出站单也不允许删除 工序流转卡号改成年+月+四位流水号(23050001) 角色对应权限 设置功能 完善;

---
 WebAPI/Controllers/Sc_MouldRepairSendWorkBillController.cs |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/WebAPI/Controllers/Sc_MouldRepairSendWorkBillController.cs b/WebAPI/Controllers/Sc_MouldRepairSendWorkBillController.cs
index 87ed716..90d4350 100644
--- a/WebAPI/Controllers/Sc_MouldRepairSendWorkBillController.cs
+++ b/WebAPI/Controllers/Sc_MouldRepairSendWorkBillController.cs
@@ -109,9 +109,8 @@
             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 msg4 = sArray[4].ToString();
+            int OperationType = int.Parse(sArray[2].ToString());//鏁版嵁绫诲瀷 1娣诲姞 3淇敼
+            string msg4 = sArray[3].ToString();
             try
             {
                 if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairSendWorkBill_Edit", 1, false, msg4))
@@ -183,10 +182,10 @@
                 " where HInterID=" + omodel.HInterID.ToString());
 
                     //鍒犻櫎瀛愯〃
-                    oCN.RunProc("delete from Sc_MouldRepairSendWorkBillSub where HInterID='" + omodel.HInterID.ToString() + "' and HEntryID='" + hentryid + "'");
+                    oCN.RunProc("delete from Sc_MouldRepairSendWorkBillSub where HInterID='" + omodel.HInterID.ToString() + "'");
                 }
                 //淇濆瓨瀛愯〃
-                objJsonResult = AddBillSub(msg3, hentryid);
+                objJsonResult = AddBillSub(msg3);
                 if (objJsonResult.code == "0")
                 {
                     objJsonResult.code = "0";
@@ -212,7 +211,7 @@
             }
         }
 
-        public json AddBillSub(string msg3, int hentryid)
+        public json AddBillSub(string msg3)
         {
             DetailColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsSb_MouldRepairWorkBillSub>>(msg3);
             int i = 1;
@@ -224,7 +223,7 @@
                    ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
                    ",HRepairID,HRepairExplanation,HManagerID,HMoney" +
                    ") values("
-                   + omodel.HInterID.ToString() + "," + (hentryid == -1 ? i : hentryid) + ",'" + oSub.HCloseMan + "','" + DateTime.Now + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
+                   + omodel.HInterID.ToString() + "," + (i) + ",'" + oSub.HCloseMan + "','" + DateTime.Now + "'," + 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.HRepairExplanation + "'," + oSub.HManagerID.ToString() + "," + oSub.HMoney.ToString() +
                    ") ");

--
Gitblit v1.9.1