From 7d860d3718eaf73e26fefa91dbe4bea58ca30183 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期一, 22 八月 2022 11:11:34 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormImportController.cs |    7 ++-----
 1 files changed, 2 insertions(+), 5 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 3d73e5b..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 = "";
@@ -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