From 8bf3c2974305e1878297bb98b09b8d9ce764b27a Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 27 六月 2025 14:48:02 +0800
Subject: [PATCH] 三升导入模板添加明细行号
---
WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormImportController.cs | 74 ++++++++++++++++++++++++++++++++----
1 files changed, 65 insertions(+), 9 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 62b64b5..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"
@@ -64,6 +64,7 @@
tb2.Columns.Add("ICMOBillHEntryID", typeof(Int32));//鐢熶骇璁㈠崟瀛恑d
tb2.Columns.Add("HProdORGID", typeof(Int32));//缁勭粐id
tb2.Columns.Add("HSeOrderBillNo", typeof(string));//閿�鍞鍗曞彿
+ tb2.Columns.Add("HVersion_Import", typeof(string));//瀵煎叆搴忓垪鍙�
//鑾峰彇绯荤粺鍙傛暟
string Ret = "";
@@ -110,6 +111,9 @@
//鏌ヨ鐢熶骇璁㈠崟琛ㄥ垽鏂湁娌℃湁鐢熶骇璁㈠崟淇℃伅
for (int i = 0; i < tb2.Rows.Count; i++)
{
+ tb2.Rows[i]["HVersion_Import"] = DateTime.Now.ToString("yyyy-MM-dd HH");
+
+
if (tb2.Rows[i]["缁勭粐缂栫爜*"].ToString() == "")
error += "缁勭粐缂栫爜涓嶈兘涓虹┖;";
if (tb2.Rows[i]["鐢熶骇璁㈠崟鍙�*"].ToString() == "")
@@ -132,8 +136,16 @@
return objJsonResult;
}
- string sql1 = string.Format("select * from h_v_JIT_ICMOBillList_DR where 鍗曟嵁鍙�='{0}' and 鐢熶骇杞﹂棿浠ｇ爜='{1}' and 浜у搧浠ｇ爜='{2}' and 鏄庣粏琛屽彿={3} ",
+ string sql1 = "";
+ if (oSystemParameter.omodel.WMS_CampanyName == "瀹濆伐")
+ {
+ sql1 = "select * from h_v_JIT_ICMOBillList_DR where 鍗曟嵁鍙�='" + tb2.Rows[i]["鐢熶骇璁㈠崟鍙�*"].ToString() + "' and 浜у搧浠ｇ爜='" + tb2.Rows[i]["鐗╂枡缂栫爜*"].ToString() + "' and 鏄庣粏琛屽彿=" + tb2.Rows[i]["鐢熶骇璁㈠崟鏄庣粏琛屽彿*"].ToString();
+ }
+ else
+ {
+ sql1 = string.Format("select * from h_v_JIT_ICMOBillList_DR where 鍗曟嵁鍙�='{0}' and 鐢熶骇杞﹂棿浠ｇ爜='{1}' and 浜у搧浠ｇ爜='{2}' and 鏄庣粏琛屽彿={3} ",
tb2.Rows[i]["鐢熶骇璁㈠崟鍙�*"].ToString(), tb2.Rows[i]["鐢熶骇杞﹂棿缂栫爜*"].ToString(), tb2.Rows[i]["鐗╂枡缂栫爜*"].ToString(), tb2.Rows[i]["鐢熶骇璁㈠崟鏄庣粏琛屽彿*"].ToString());
+ }
ds = oCN.RunProcReturn(sql1, "h_v_JIT_ICMOBillList_DR");
if (ds.Tables[0].Rows.Count == 0)
@@ -255,6 +267,24 @@
objJsonResult.data = tb2;
return objJsonResult;
}
+ if (oSystemParameter.omodel.WMS_CampanyName == "瀹濆伐")
+ {
+ string HOrgID = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ //鐢熶骇杞﹂棿
+ ds = oCN.RunProcReturn($"select * from Gy_Department with(nolock) where HUSEORGID = {HOrgID} and HNumber='{tb2.Rows[i]["鐢熶骇杞﹂棿缂栫爜*"].ToString()}'", "Gy_Department");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ tb2.Rows[i]["HWorkShopID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = $"绗瑊i + 1}琛�,鐢熶骇杞﹂棿鏌ユ棤鏁版嵁!";
+ objJsonResult.data = tb2;
+ return objJsonResult;
+ }
+ }
}
objJsonResult.code = "1";
@@ -368,6 +398,7 @@
var HMainSourceInterID = list[i]["ICMOBillHInterID"].ToString();
var HMainSourceEntryID = list[i]["ICMOBillHEntryID"].ToString();
var HSeOrderBillNo = list[i]["HSeOrderBillNo"].ToString();
+ var HVersion_Import = list[i]["HVersion_Import"].ToString();
string sql = $"select * from Sc_WorkBillSortBillMain where HMainSourceInterID={HMainSourceInterID}" +
$" and HMainSourceEntryID={HMainSourceEntryID} and HICMOBillNo='{HICMOBillNo}' and HICMOEntrySEQ={HICMOEntrySEQ} and HSourceID={HSourceID} and ISNULL(HDeleteMan,'') = ''";
@@ -389,14 +420,14 @@
" HMaterID, HMaterName, HMaterModel, HUnitID, HBatchNo," +
" HSeOrderBillQty, HPlanQty, HCompleteQty,HPreparatDate," +
"HMainSourceInterID,HMainSourceEntryID,HICMOInterID,HICMOEntryID,HProdORGID,HICMOInterID_Sec,HICMOEntryID_Sec" +
- ",HSeOrderBillNo)values" +
+ ",HSeOrderBillNo,HVersion_Import)values" +
$"({HInterID},'{HBillNo}',{DateTime.Now.Year},{DateTime.Now.Month},'{BillType}'," +
$"'{BillType}',GETDATE(),1,'{user}','{HDate}','{HICMOBillNo}','{HOrderType}'," +
$"{(HICMOEntrySEQ == "" ? 0.ToString() : HICMOEntrySEQ)},{(HWorkShopID == "" ? 0.ToString() : HWorkShopID)},{(HSourceID == "" ? 0.ToString() : HSourceID)}, {(HYX == "" ? 0.ToString() : HYX)},{(HWorkQty)}, {(HEmpID == "" ? 0.ToString() : HEmpID)}," +
$" {(HMaterID == "" ? 0.ToString() : HMaterID)}, '{HMaterName}', '{HMaterModel}', {(HUnitID == "" ? 0.ToString() : HUnitID)}, '{HBatchNo}'," +
$" {(HSeOrderBillQty == "" ? 0.ToString() : HSeOrderBillQty)}, {(HPlanQty == "" ? 0.ToString() : HPlanQty)}, {(HCompleteQty == "" ? 0.ToString() : HCompleteQty)},getdate()," +
$" {HMainSourceInterID},{HMainSourceEntryID},{HMainSourceInterID},{HMainSourceEntryID},{HProdORGID}, {HMainSourceInterID},{HMainSourceEntryID}" +
- $",'{HSeOrderBillNo}')");
+ $",'{HSeOrderBillNo}','{HVersion_Import}')");
}
int SumDay = 31; //鍔ㄦ�佷袱鏈堜箣宸� DateTime.Now.AddMonths(1).AddDays(-1).Subtract(DateTime.Now).Days;
@@ -583,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)
@@ -886,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)
@@ -1065,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