From a0aa7dbfd9b42eca6e3cf2c095b88d59d5212951 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期三, 21 九月 2022 12:30:35 +0800
Subject: [PATCH] 生产订单列表 出站单列表增加包装标识 包装标识代码
---
WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormImportController.cs | 15 ++++++---------
1 files changed, 6 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 f31a9b3..ef1f8d4 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"
@@ -36,14 +36,13 @@
file.SaveAs(ExcelPath);
NpoiHelper np = new NpoiHelper();
- DataSet ExcelDs = np.ReadExcel(ExcelPath, 1);
+ DataSet ExcelDs = np.ReadExcel(ExcelPath, 1,1,"0");
//鍒犻櫎鏂囦欢
File.Delete(ExcelPath);
//鍒涘缓涓存椂琛�
DataTable tb2 = new DataTable("dt2");
- DataTable tb3 = new DataTable("dt3");
//娣诲姞鍒楀悕
for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
@@ -71,8 +70,6 @@
}
tb2.Rows.Add(row);
}
-
- ExcelDs.Tables.Add(tb2);
var error = "";
var ErrorResult = "";
@@ -126,6 +123,7 @@
tb2.Rows[i]["HWorkShopID"] = ds.Tables[0].Rows[0]["HDeptID"].ToString();
tb2.Rows[i]["ICMOBillHInterID"] = ds.Tables[0].Rows[0]["hmainid"].ToString();//鐢熶骇璁㈠崟涓籭d
tb2.Rows[i]["ICMOBillHEntryID"] = ds.Tables[0].Rows[0]["HEntryID"].ToString();//鐢熶骇璁㈠崟瀛恑d
+ tb2.Rows[i]["鐢熶骇璁㈠崟鏁伴噺"] = ds.Tables[0].Rows[0]["鐢熶骇浠诲姟鍗曟暟閲�"].ToString();//鐢熶骇璁㈠崟鏁伴噺
}
ds = oCN.RunProcReturn("select * from h_v_JIT_Sc_WorkBillSortBillList " +
@@ -147,7 +145,6 @@
tb2.Rows[i]["璁￠噺鍗曚綅"] = ds.Tables[0].Rows[0]["璁￠噺鍗曚綅"].ToString();
tb2.Rows[i]["鎵规鍙�"] = ds.Tables[0].Rows[0]["鎵规"].ToString();
tb2.Rows[i]["閿�鍞鍗曟暟閲�"] = ds.Tables[0].Rows[0]["閿�鍞鍗曟暟閲�"].ToString();
- tb2.Rows[i]["鐢熶骇璁㈠崟鏁伴噺"] = ds.Tables[0].Rows[0]["璁㈠崟闇�姹傛暟閲�"].ToString();
tb2.Rows[i]["鎬婚綈濂楁暟閲�"] = ds.Tables[0].Rows[0]["榻愬鏁伴噺"].ToString();
}
else
@@ -270,7 +267,7 @@
var HUnitID = list[i]["HUnitID"].ToString();
var HBatchNo = list[i]["鎵规鍙�"].ToString();
var HSeOrderBillQty = list[i]["閿�鍞鍗曟暟閲�"].ToString();
- var HOrderNeedQty = list[i]["鐢熶骇璁㈠崟鏁伴噺"].ToString();
+ var HPlanQty = list[i]["鐢熶骇璁㈠崟鏁伴噺"].ToString();
var HCompleteQty = list[i]["鎬婚綈濂楁暟閲�"].ToString();
var HOrderType = omdelMian.HOrderType;
var HDate = omdelMian.HDate;
@@ -293,13 +290,13 @@
"HBillSubType,HDate,HBillStatus,HMaker,HMakeDate,HICMOBillNo,HOrderType," +
"HICMOEntrySEQ,HWorkShopID,HSourceID, HYX, HEmpID," +
" HMaterID, HMaterName, HMaterModel, HUnitID, HBatchNo," +
- " HSeOrderBillQty, HOrderNeedQty, HCompleteQty,HPreparatDate," +
+ " HSeOrderBillQty, HPlanQty, HCompleteQty,HPreparatDate," +
"HMainSourceInterID,HMainSourceEntryID)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)}, {(HEmpID == "" ? 0.ToString() : HEmpID)}," +
$" {(HMaterID == "" ? 0.ToString() : HMaterID)}, '{HMaterName}', '{HMaterModel}', {(HUnitID == "" ? 0.ToString() : HUnitID)}, '{HBatchNo}'," +
- $" {(HSeOrderBillQty == "" ? 0.ToString() : HSeOrderBillQty)}, {(HOrderNeedQty == "" ? 0.ToString() : HOrderNeedQty)}, {(HCompleteQty == "" ? 0.ToString() : HCompleteQty)},getdate()," +
+ $" {(HSeOrderBillQty == "" ? 0.ToString() : HSeOrderBillQty)}, {(HPlanQty == "" ? 0.ToString() : HPlanQty)}, {(HCompleteQty == "" ? 0.ToString() : HCompleteQty)},getdate()," +
$" {HMainSourceInterID},{HMainSourceEntryID})");
}
@@ -378,7 +375,7 @@
if (count != 1)
{
//鎻掑叆瀛愯〃
- oCN.RunProc("insert into Sc_WorkBillSortBillSub(HInterID,HEntryID," +
+ oCN.RunProc("insert into Sc_WorkBillSortBillSub(HInterID,HSEQ," +
"HMasterDate,HQty)" +
$"values({HInterID}, {(ds.Tables[0].Rows.Count + 1)}," +
$" '{date}', {HQTY})");
--
Gitblit v1.9.1