From 1a44c3289e0e0fb4e99c528f314b349f3e78e3a1 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 26 三月 2025 15:03:16 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/SCGL/日计划管理/Sc_JIT_ComplementGoodBillController.cs | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Sc_JIT_ComplementGoodBillController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Sc_JIT_ComplementGoodBillController.cs"
index 142d610..3507868 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Sc_JIT_ComplementGoodBillController.cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Sc_JIT_ComplementGoodBillController.cs"
@@ -467,7 +467,7 @@
return objJsonResult;
}
- if (oSystemParameter.omodel.WMS_CampanyName != "甯呭▉")
+ if (oSystemParameter.omodel.WMS_CampanyName != "甯呭▉"&& oSystemParameter.omodel.WMS_CampanyName != "瀹濆伐")
{
if (oSub.HLeadTime_Sec == 0 || oSub.HLeadTime_Sec == null)
{
@@ -1142,8 +1142,9 @@
public json AddNeedBillSub(string msg3)
{
+ string Ret = "";
omodelNeedsub = Newtonsoft.Json.JsonConvert.DeserializeObject<List<JIT_NeedMaterPlanConfigBillSub>>(msg3);
-
+ oSystemParameter.ShowBill(ref Ret);
foreach (Models.JIT_NeedMaterPlanConfigBillSub oSub in omodelNeedsub)
{
if (oSub.HWorkShopID == 0 || oSub.HWorkShopID == null)
@@ -1178,14 +1179,18 @@
objJsonResult.data = null;
return objJsonResult;
}
- if (oSub.HDeliveryDaysCtrl == 0 || oSub.HDeliveryDaysCtrl == null)
+ if (oSystemParameter.omodel.WMS_CampanyName != "瀹濆伐")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = " JIT閫佽揣鎺у埗澶╂暟涓嶈兘涓虹┖";
- objJsonResult.data = null;
- return objJsonResult;
+ if (oSub.HDeliveryDaysCtrl == 0 || oSub.HDeliveryDaysCtrl == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = " JIT閫佽揣鎺у埗澶╂暟涓嶈兘涓虹┖";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
}
+
}
//鍒犻櫎瀛愯〃
--
Gitblit v1.9.1