From 254f71374c74cb9782ff85db0e39cf64d38c7ce2 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期三, 11 三月 2026 14:24:37 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormImportController.cs | 130 ++++++++++++++++++++-----------------------
1 files changed, 61 insertions(+), 69 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 74a36af..6930aaf 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"
@@ -49,7 +49,10 @@
//娣诲姞鍒楀悕
for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
{
- tb2.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
+ if (!tb2.Columns.Contains(ExcelDs.Tables[0].Rows[0][i].ToString()))
+ {
+ tb2.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
+ }
}
//妯℃澘缂哄皯鍒� 浣嗛渶瑕佷粠鏁版嵁搴撲腑鏌ヨ鍑烘潵鏄剧ず鍦ㄩ〉闈㈢殑瀛楁
tb2.Columns.Add("hmainid", typeof(Int32));
@@ -2016,8 +2019,12 @@
//娣诲姞鍒楀悕
for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
{
- tb2.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
- }
+ if (!tb2.Columns.Contains(ExcelDs.Tables[0].Rows[0][i].ToString()))
+ {
+ tb2.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
+ }
+ }
+
//妯℃澘缂哄皯鍒� 浣嗛渶瑕佷粠鏁版嵁搴撲腑鏌ヨ鍑烘潵鏄剧ず鍦ㄩ〉闈㈢殑瀛楁
tb2.Columns.Add("hmainid", typeof(Int32));
tb2.Columns.Add("HMaterID", typeof(Int32));//鐗╂枡ID
@@ -2081,17 +2088,17 @@
tb2.Rows[i]["HVersion_Import"] = DateTime.Now.ToString("yyyy-MM-dd HH");
- if (tb2.Rows[i]["缁勭粐缂栫爜*"].ToString() == "")
+ if (tb2.Rows[i]["缁勭粐缂栫爜"].ToString() == "")
error += "缁勭粐缂栫爜涓嶈兘涓虹┖;";
- if (tb2.Rows[i]["鐢熶骇璁㈠崟鍙�*"].ToString() == "")
+ if (tb2.Rows[i]["鐢熶骇璁㈠崟鍙�"].ToString() == "")
error += "鐢熶骇璁㈠崟鍙蜂笉鑳戒负绌�;\n";
- if (tb2.Rows[i]["鐢熶骇璁㈠崟鏄庣粏琛屽彿*"].ToString() == "")
+ if (tb2.Rows[i]["鐢熶骇璁㈠崟鏄庣粏琛屽彿"].ToString() == "")
error += "鐢熶骇璁㈠崟鏄庣粏琛屽彿涓嶈兘涓虹┖;";
- if (tb2.Rows[i]["鐢熶骇杞﹂棿缂栫爜*"].ToString() == "")
+ if (tb2.Rows[i]["鐢熶骇杞﹂棿缂栫爜"].ToString() == "")
error += "鐢熶骇杞﹂棿缂栫爜涓嶈兘涓虹┖;";
- if (tb2.Rows[i]["鐢熶骇璧勬簮缂栫爜*"].ToString() == "")
+ if (tb2.Rows[i]["鐢熶骇璧勬簮缂栫爜"].ToString() == "")
error += "鐢熶骇璧勬簮缂栫爜涓嶈兘涓虹┖;";
- if (tb2.Rows[i]["鐗╂枡缂栫爜*"].ToString() == "")
+ if (tb2.Rows[i]["鐗╂枡缂栫爜"].ToString() == "")
error += "鐗╂枡缂栫爜涓嶈兘涓虹┖;";
if (error.Length > 0)
@@ -2103,16 +2110,22 @@
return objJsonResult;
}
+ //瀵煎嚭excel琛ㄦ牸鏃讹紝鍓嶉潰鐨�0娌℃帀浜嗭紝杩欒竟鍋氳ˉ0鐨勫姩浣滐紱
+ if (tb2.Rows[i]["鐢熶骇杞﹂棿缂栫爜"].ToString().Length == 4)
+ {
+ tb2.Rows[i]["鐢熶骇杞﹂棿缂栫爜"] = "0" + tb2.Rows[i]["鐢熶骇杞﹂棿缂栫爜"].ToString();
+ }
+
string 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());
+ "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)
{
- error += $"娌℃湁鐢熶骇璁㈠崟淇℃伅锛岀敓浜ц鍗曞彿:{ tb2.Rows[i]["鐢熶骇璁㈠崟鍙�*"].ToString()},鐢熶骇杞﹂棿缂栫爜:{tb2.Rows[i]["鐢熶骇杞﹂棿缂栫爜*"].ToString()}" +
- $",鐢熶骇璁㈠崟鏄庣粏琛屽彿:{ tb2.Rows[i]["鐢熶骇璁㈠崟鏄庣粏琛屽彿*"].ToString()},鐗╂枡缂栫爜:{ tb2.Rows[i]["鐗╂枡缂栫爜*"].ToString()}";
+ error += $"娌℃湁鐢熶骇璁㈠崟淇℃伅锛岀敓浜ц鍗曞彿:{ tb2.Rows[i]["鐢熶骇璁㈠崟鍙�"].ToString()},鐢熶骇杞﹂棿缂栫爜:{tb2.Rows[i]["鐢熶骇杞﹂棿缂栫爜"].ToString()}" +
+ $",鐢熶骇璁㈠崟鏄庣粏琛屽彿:{ tb2.Rows[i]["鐢熶骇璁㈠崟鏄庣粏琛屽彿"].ToString()},鐗╂枡缂栫爜:{ tb2.Rows[i]["鐗╂枡缂栫爜"].ToString()}";
}
if (error.Length > 0)
@@ -2144,9 +2157,9 @@
}
ds = oCN.RunProcReturn("select * from h_v_JIT_WorkBillSortBillList_DR " +
- $"where 鐢熶骇璁㈠崟鍙�='{tb2.Rows[i]["鐢熶骇璁㈠崟鍙�*"].ToString()}' and 鐢熶骇璁㈠崟鏄庣粏琛屽彿='{tb2.Rows[i]["鐢熶骇璁㈠崟鏄庣粏琛屽彿*"].ToString()}' " +
- $"and 鐢熶骇杞﹂棿缂栫爜='{tb2.Rows[i]["鐢熶骇杞﹂棿缂栫爜*"].ToString()}' and 鐗╂枡浠ｇ爜='{tb2.Rows[i]["鐗╂枡缂栫爜*"].ToString()}' " +
- $"and 鐢熶骇璧勬簮缂栫爜='{tb2.Rows[i]["鐢熶骇璧勬簮缂栫爜*"].ToString()}' ", "h_v_JIT_WorkBillSortBillList_DR");
+ $"where 鐢熶骇璁㈠崟鍙�='{tb2.Rows[i]["鐢熶骇璁㈠崟鍙�"].ToString()}' and 鐢熶骇璁㈠崟鏄庣粏琛屽彿='{tb2.Rows[i]["鐢熶骇璁㈠崟鏄庣粏琛屽彿"].ToString()}' " +
+ $"and 鐢熶骇杞﹂棿缂栫爜='{tb2.Rows[i]["鐢熶骇杞﹂棿缂栫爜"].ToString()}' and 鐗╂枡浠ｇ爜='{tb2.Rows[i]["鐗╂枡缂栫爜"].ToString()}' " +
+ $"and 鐢熶骇璧勬簮缂栫爜='{tb2.Rows[i]["鐢熶骇璧勬簮缂栫爜"].ToString()}' ", "h_v_JIT_WorkBillSortBillList_DR");
//缁勭粐缂栫爜='{tb2.Rows[i]["缁勭粐缂栫爜*"].ToString()}' and
//and 鐢熶骇璧勬簮缂栫爜='{tb2.Rows[i]["鐢熶骇璧勬簮缂栫爜*"].ToString()}'
@@ -2159,32 +2172,32 @@
tb2.Rows[i]["浼樺厛绾�"] = ds.Tables[0].Rows[0]["浼樺厛绾�"].ToString();
}
tb2.Rows[i]["HSourceID"] = ds.Tables[0].Rows[0]["HSourceID"].ToString();
- tb2.Rows[i]["HEmpID"] = ds.Tables[0].Rows[0]["HEmpID"].ToString();
- tb2.Rows[i]["鍛樺伐缂栫爜"] = ds.Tables[0].Rows[0]["鑱屽憳浠ｇ爜"].ToString();
- tb2.Rows[i]["鍛樺伐"] = ds.Tables[0].Rows[0]["鑱屽憳"].ToString();
+ //tb2.Rows[i]["HEmpID"] = ds.Tables[0].Rows[0]["HEmpID"].ToString();
+ //tb2.Rows[i]["鍛樺伐缂栫爜"] = ds.Tables[0].Rows[0]["鑱屽憳浠ｇ爜"].ToString();
+ //tb2.Rows[i]["鍛樺伐"] = ds.Tables[0].Rows[0]["鑱屽憳"].ToString();
tb2.Rows[i]["HUnitID"] = ds.Tables[0].Rows[0]["HUnitID"].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();
+ //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
{
- //鍛樺伐
- ds = oCN.RunProcReturn($"select * from Gy_Employee with(nolock) where HNumber='{tb2.Rows[i]["鍛樺伐缂栫爜"].ToString()}'", "Gy_Employee");
- if (ds.Tables[0].Rows.Count > 0)
- {
- tb2.Rows[i]["HEmpID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
- tb2.Rows[i]["鍛樺伐"] = ds.Tables[0].Rows[0]["HName"].ToString();
- }
- else
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = $"绗瑊i + 1}琛�,鍛樺伐鏌ユ棤鏁版嵁!";
- objJsonResult.data = tb2;
- return objJsonResult;
- }
+ ////鍛樺伐
+ //ds = oCN.RunProcReturn($"select * from Gy_Employee with(nolock) where HNumber='{tb2.Rows[i]["鍛樺伐缂栫爜"].ToString()}'", "Gy_Employee");
+ //if (ds.Tables[0].Rows.Count > 0)
+ //{
+ // tb2.Rows[i]["HEmpID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ // tb2.Rows[i]["鍛樺伐"] = ds.Tables[0].Rows[0]["HName"].ToString();
+ //}
+ //else
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = $"绗瑊i + 1}琛�,鍛樺伐鏌ユ棤鏁版嵁!";
+ // objJsonResult.data = tb2;
+ // return objJsonResult;
+ //}
//璁￠噺鍗曚綅
ds = oCN.RunProcReturn($"select * from Gy_Unit with(nolock) where HNumber='{tb2.Rows[i]["璁￠噺鍗曚綅"].ToString()}'", "Gy_Unit");
@@ -2202,7 +2215,7 @@
}
//鐢熶骇璧勬簮
- ds = oCN.RunProcReturn($"select * from Gy_Source with(nolock) where HNumber='{tb2.Rows[i]["鐢熶骇璧勬簮缂栫爜*"].ToString()}'", "Gy_Source");
+ ds = oCN.RunProcReturn($"select * from Gy_Source with(nolock) where HNumber='{tb2.Rows[i]["鐢熶骇璧勬簮缂栫爜"].ToString()}'", "Gy_Source");
if (ds.Tables[0].Rows.Count > 0)
{
tb2.Rows[i]["HSourceID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
@@ -2217,7 +2230,7 @@
}
}
//缁勭粐
- ds = oCN.RunProcReturn($"select * from Xt_ORGANIZATIONS with(nolock) where HNumber='{tb2.Rows[i]["缁勭粐缂栫爜*"].ToString()}'", "Xt_ORGANIZATIONS");
+ ds = oCN.RunProcReturn($"select * from Xt_ORGANIZATIONS with(nolock) where HNumber='{tb2.Rows[i]["缁勭粐缂栫爜"].ToString()}'", "Xt_ORGANIZATIONS");
if (ds.Tables[0].Rows.Count > 0)
{
tb2.Rows[i]["HProdORGID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
@@ -2229,25 +2242,7 @@
objJsonResult.Message = $"绗瑊i + 1}琛�,缁勭粐鏌ユ棤鏁版嵁!";
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";
@@ -2328,9 +2323,6 @@
list.Add(dic);
}
-
-
-
for (int i = 0; i < list.Count; i++)
{
int TrueCount = 0, SumCount = 0;
@@ -2340,22 +2332,22 @@
{
HBillNo = DBUtility.ClsPub.CreateBillCode_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);//鑾峰緱涓�涓柊鐨勫崟鎹彿
HInterID = DBUtility.ClsPub.CreateBillID_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo);//鑾峰緱涓�涓柊鐨刬d
- var HICMOBillNo = list[i]["鐢熶骇璁㈠崟鍙�*"].ToString();
- var HICMOEntrySEQ = list[i]["鐢熶骇璁㈠崟鏄庣粏琛屽彿*"].ToString();
+ var HICMOBillNo = list[i]["鐢熶骇璁㈠崟鍙�"].ToString();
+ var HICMOEntrySEQ = list[i]["鐢熶骇璁㈠崟鏄庣粏琛屽彿"].ToString();
var HProdORGID = list[i]["HProdORGID"].ToString();
var HWorkShopID = list[i]["HWorkShopID"].ToString();
var HSourceID = list[i]["HSourceID"].ToString();
- var HWorkQty = DBUtility.ClsPub.isDoule(list[i]["浜ц兘"]);
+ var HWorkQty = DBUtility.ClsPub.isDoule(list[i]["灏忔椂浜ц兘"]);
var HYX = list[i]["浼樺厛绾�"].ToString();
var HEmpID = list[i]["HEmpID"].ToString();
var HMaterID = list[i]["HMaterID"].ToString();
var HMaterName = list[i]["鐗╂枡鍚嶇О"].ToString();
var HMaterModel = list[i]["瑙勬牸鍨嬪彿"].ToString();
var HUnitID = list[i]["HUnitID"].ToString();
- var HBatchNo = list[i]["鎵规鍙�"].ToString();
- var HSeOrderBillQty = list[i]["閿�鍞鍗曟暟閲�"].ToString();
+ var HBatchNo = ""; // list[i]["鎵规鍙�"].ToString();
+ var HSeOrderBillQty = "0"; // list[i]["閿�鍞鍗曟暟閲�"].ToString();
var HPlanQty = list[i]["鐢熶骇璁㈠崟鏁伴噺"].ToString();
- var HCompleteQty = list[i]["鎬婚綈濂楁暟閲�"].ToString();
+ var HCompleteQty = "0"; // list[i]["鎬婚綈濂楁暟閲�"].ToString();
var HOrderType = omdelMian.HOrderType;
var HDate = omdelMian.HDate;
var HMainSourceInterID = list[i]["ICMOBillHInterID"].ToString();
@@ -2393,7 +2385,7 @@
$",'{HSeOrderBillNo}','{HVersion_Import}')");
}
- int SumDay = 31; //鍔ㄦ�佷袱鏈堜箣宸� DateTime.Now.AddMonths(1).AddDays(-1).Subtract(DateTime.Now).Days;
+ int SumDay = 50; //鍔ㄦ�佷袱鏈堜箣宸� DateTime.Now.AddMonths(1).AddDays(-1).Subtract(DateTime.Now).Days;
// 缁熻鎬诲ぉ鏁�
HashSet<DateTime> uniqueDates = new HashSet<DateTime>();
@@ -2414,7 +2406,7 @@
LogService.Write("1:" + list[i][DateTime.Now.AddDays(j).ToString("yyyy-MM-dd")].ToString());
LogService.Write("2:" + DateTime.Now.AddDays(j).ToString("yyyy-MM-dd"));
//涓昏〃瀛愯〃閮芥湁鏁版嵁
- if (list[i][DateTime.Now.AddDays(j).ToString("yyyy-MM-dd")].ToString() != "")
+ if (list[i][DateTime.Now.AddDays(j).ToString("yyyy-MM-dd")].ToString() != "" && Math.Round(double.Parse(list[i][DateTime.Now.AddDays(j).ToString("yyyy-MM-dd")].ToString()), 1) > 0)
{
SumCount += 1;
////淇濆瓨瀛愯〃
--
Gitblit v1.9.1