From 5505d694e0e7e33f0a312a0e077d49fa25ab00e3 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 09 七月 2025 10:05:43 +0800
Subject: [PATCH] 车间定位库存查询；车间下架扫源单查库存位置；添康三周排产
---
WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormImportController.cs | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 insertions(+), 6 deletions(-)
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormImportController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormImportController.cs"
index 341c50b..b5249f2 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormImportController.cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormImportController.cs"
@@ -614,9 +614,21 @@
objJsonResult.data = null;
return objJsonResult;
}
- //鏌ユ壘鏄惁瀛樺湪瀵瑰簲鐢熶骇璁㈠崟
- string sql1 = string.Format("select * from h_v_IF_ICMOBillList where 瀹㈡埛璁㈠崟鍙�='{0}' and 浜у搧浠ｇ爜='{1}' and 鐘舵�� in ('璁″垝纭','寮�宸�')",
- tb2.Rows[i]["瀹㈡埛璁㈠崟鍙�"].ToString(), tb2.Rows[i]["鐗╂枡缂栫爜"].ToString());
+ string sql1 = "";
+ //鏄庣粏琛屽彿涓虹┖涓嶈�冭檻
+ if (tb2.Rows[i]["鏄庣粏琛屽彿"].ToString() == "")
+ {
+ //鏌ユ壘鏄惁瀛樺湪瀵瑰簲鐢熶骇璁㈠崟
+ sql1 = string.Format("select * from h_v_IF_ICMOBillList where 瀹㈡埛璁㈠崟鍙�='{0}' and 浜у搧浠ｇ爜='{1}' and 鐘舵�� in ('璁″垝纭','寮�宸�')",
+ tb2.Rows[i]["瀹㈡埛璁㈠崟鍙�"].ToString(), tb2.Rows[i]["鐗╂枡缂栫爜"].ToString());
+ }
+ else
+ {
+ //鏌ユ壘鏄惁瀛樺湪瀵瑰簲鐢熶骇璁㈠崟
+ sql1 = string.Format("select * from h_v_IF_ICMOBillList where 瀹㈡埛璁㈠崟鍙�='{0}' and 浜у搧浠ｇ爜='{1}' and 鐘舵�� in ('璁″垝纭','寮�宸�') and 鏄庣粏琛屽彿 = '{2}'",
+ tb2.Rows[i]["瀹㈡埛璁㈠崟鍙�"].ToString(), tb2.Rows[i]["鐗╂枡缂栫爜"].ToString(),tb2.Rows[i]["鏄庣粏琛屽彿"].ToString());
+ }
+
ds = oCN.RunProcReturn(sql1, "h_v_IF_ICMOBillList");
if (ds.Tables[0].Rows.Count == 0)
@@ -917,9 +929,20 @@
}
}
- //鏌ユ壘鏄惁瀛樺湪瀵瑰簲鐢熶骇璁㈠崟
- string sql1 = string.Format("select * from h_v_IF_ICMOBillList where 瀹㈡埛璁㈠崟鍙�='{0}' and 浜у搧浠ｇ爜='{1}' and 鐘舵�� in ('璁″垝纭','寮�宸�')",
- tb2.Rows[i]["瀹㈡埛璁㈠崟鍙�"].ToString(), tb2.Rows[i]["鐗╂枡缂栫爜"].ToString());
+ string sql1 = "";
+ //鏄庣粏琛屽彿涓虹┖涓嶈�冭檻
+ if (tb2.Rows[i]["鏄庣粏琛屽彿"].ToString() == "")
+ {
+ //鏌ユ壘鏄惁瀛樺湪瀵瑰簲鐢熶骇璁㈠崟
+ sql1 = string.Format("select * from h_v_IF_ICMOBillList where 瀹㈡埛璁㈠崟鍙�='{0}' and 浜у搧浠ｇ爜='{1}' and 鐘舵�� in ('璁″垝纭','寮�宸�')",
+ tb2.Rows[i]["瀹㈡埛璁㈠崟鍙�"].ToString(), tb2.Rows[i]["鐗╂枡缂栫爜"].ToString());
+ }
+ else
+ {
+ //鏌ユ壘鏄惁瀛樺湪瀵瑰簲鐢熶骇璁㈠崟
+ sql1 = string.Format("select * from h_v_IF_ICMOBillList where 瀹㈡埛璁㈠崟鍙�='{0}' and 浜у搧浠ｇ爜='{1}' and 鐘舵�� in ('璁″垝纭','寮�宸�') and 鏄庣粏琛屽彿 = '{2}'",
+ tb2.Rows[i]["瀹㈡埛璁㈠崟鍙�"].ToString(), tb2.Rows[i]["鐗╂枡缂栫爜"].ToString(), tb2.Rows[i]["鏄庣粏琛屽彿"].ToString());
+ }
ds = oCN.RunProcReturn(sql1, "h_v_IF_ICMOBillList");
if (ds.Tables[0].Rows.Count == 0)
@@ -1096,6 +1119,8 @@
var HSourceID = list[i]["HSourceID"].ToString();
var HYX = list[i]["浼樺厛绾�"].ToString();
var HPlanEndDate = list[i]["璁″垝缁撴潫鏃ユ湡"].ToString();
+ //鏇存柊鏃跺垹闄ゅ瓙琛ㄥ唴瀹�
+ oCN.RunProc($"delete from Sc_WorkBillSortBillSub where HInterID ={hmainid}");
//鏇存柊灏忔椂浜ц兘
if (HWorkQty != ""&& HWorkQty != "0")
{
--
Gitblit v1.9.1