From a5ac8ae1764596ada3aa17eb087185456c592cfd Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 04 四月 2023 13:49:04 +0800
Subject: [PATCH] 乔一优化

---
 WebAPI/Controllers/生产管理/生产任务单/Sc_ICMOBillController.cs |   31 +++++++++++++++++++++++--------
 1 files changed, 23 insertions(+), 8 deletions(-)

diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs"
index 9a42063..06c9b44 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs"
@@ -507,6 +507,28 @@
         public json AddBillSub_NoTable(string msg3, long HInterID, int OperationType,int HEntryID)
         {
             ClsSc_ICMOBillSub oSub = Newtonsoft.Json.JsonConvert.DeserializeObject<ClsSc_ICMOBillSub>(msg3);
+
+            //瀹㈡埛鍒跺畾
+            string sErr = "";
+            if (oSystemParameter.ShowBill(ref sErr))
+            {
+                if (oSystemParameter.omodel.WMS_CampanyName == "涔斾竴")
+                {
+
+                }
+                else
+                {
+                    if (oSub.HDeptID == 0)
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "鐢熶骇杞﹂棿涓嶈兘涓虹┖";
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                }
+            }
+
             if (oSub.HQty <= 0 || oSub.HQty == null)
             {
                 objJsonResult.code = "0";
@@ -525,14 +547,7 @@
                 return objJsonResult;
             }
 
-            if (oSub.HDeptID == 0)
-            {
-                objJsonResult.code = "0";
-                objJsonResult.count = 0;
-                objJsonResult.Message = "鐢熶骇杞﹂棿涓嶈兘涓虹┖";
-                objJsonResult.data = null;
-                return objJsonResult;
-            }
+          
 
             if (oSub.HUnitID == 0)
             {

--
Gitblit v1.9.1