From aebf2e58305fce0dab246f18adc017a52e81a67d Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 31 七月 2025 16:53:03 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormImportController.cs | 331 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 331 insertions(+), 0 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 b5249f2..e38ab25 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"
@@ -1240,5 +1240,336 @@
#endregion
+
+
+ #region 瀹濆伐锛氭棩鐢熶骇璁″垝 鏂囦欢涓婁紶
+ [Route("JIT_DayPlanPlatForm_DayImport/JIT_DayPlanPlatForm_DayImport_DR")]
+ [HttpPost]
+ public object JIT_DayPlanPlatForm_DayImport_DR()
+ {
+ try
+ {
+ //鑾峰彇鏂囦欢鍚嶇О
+ var file = HttpContext.Current.Request.Files[0];
+ //鑾峰彇鏂囦欢鐗╃悊璺緞
+ string ExcelPath = HttpContext.Current.Server.MapPath("~/" + file.FileName);
+ //淇濆瓨鏂囦欢
+ file.SaveAs(ExcelPath);
+
+ NpoiHelper np = new NpoiHelper();
+ DataSet ExcelDs = np.ReadExcel(ExcelPath, 1, 1, "0");
+
+ //鍒犻櫎鏂囦欢
+ File.Delete(ExcelPath);
+
+ //鍒涘缓涓存椂琛�
+ DataTable tb2 = new DataTable("dt2");
+
+ //灏嗗鍏ユ枃浠朵腑鐨勫垪娣诲姞鍒皌b2涓�
+ for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
+ {
+ tb2.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
+ }
+
+ //妯℃澘缂哄皯鍒� 浣嗛渶瑕佷粠鏁版嵁搴撲腑鏌ヨ鍑烘潵鏄剧ず鍦ㄩ〉闈㈢殑瀛楁
+ tb2.Columns.Add("HWorkShopID", typeof(Int32)); //鐢熶骇杞﹂棿
+ tb2.Columns.Add("鐢熶骇杞﹂棿缂栫爜*", typeof(string)); //鏃ヨ鍒掑崟鎹富鍐呯爜
+
+ tb2.Columns.Add("hmainid", typeof(Int32)); //鏃ヨ鍒掑崟鎹富鍐呯爜
+ tb2.Columns.Add("鍗曟嵁鍙�", typeof(string)); //鏃ヨ鍒掑崟鍙�
+ tb2.Columns.Add("HSourceID", typeof(Int32)); //鐢熶骇璧勬簮id
+
+ tb2.Columns.Add("ICMOBillHInterID", typeof(Int32)); //鐢熶骇璁㈠崟涓籭d
+ tb2.Columns.Add("ICMOBillHEntryID", typeof(Int32)); //鐢熶骇璁㈠崟瀛恑d
+ tb2.Columns.Add("HMaterID", typeof(Int32)); //鐗╂枡ID
+
+
+ //鑾峰彇绯荤粺鍙傛暟
+ string Ret = "";
+ oSystemParameter.ShowBill(ref Ret);
+
+ //灏嗗鍏ユ枃浠朵腑鐨勬暟鎹坊鍔犲埌tb2涓�
+ for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
+ {
+ DataRow row = tb2.NewRow();
+ for (int j = 0; j < ExcelDs.Tables[0].Columns.Count; j++)
+ {
+ row[j] = ExcelDs.Tables[0].Rows[i][j].ToString();
+ }
+ //濡傛灉琛ㄦ牸绗琲琛岀殑绗竴鍒椾负绌猴紝鍒欏垽鏂负杩欎竴琛岀殑鏁版嵁涓虹┖锛岃烦鍑哄惊鐜苟涓斾笉鎶婃暟鎹啓鍏� tb2
+ if (ExcelDs.Tables[0].Rows[i][0].ToString() == "" && ExcelDs.Tables[0].Rows[i][1].ToString() == "")
+ {
+ continue;
+ }
+ else
+ {
+ tb2.Rows.Add(row);
+ }
+ }
+
+ var error = "";
+ var ErrorResult = "";
+
+ //鏌ヨ鐢熶骇璁㈠崟琛ㄥ垽鏂湁娌℃湁鐢熶骇璁㈠崟淇℃伅
+ for (int i = 0; i < tb2.Rows.Count; i++)
+ {
+ //鍒ゆ柇瀵煎叆鏂囦欢涓紝蹇呭～椤圭洰鏄惁濉啓
+ //if (tb2.Rows[i]["缁勭粐缂栫爜*"].ToString() == "")
+ // error += "缁勭粐缂栫爜涓嶈兘涓虹┖;";
+ //if (tb2.Rows[i]["鐢熶骇杞﹂棿缂栫爜*"].ToString() == "")
+ // error += "鐢熶骇杞﹂棿缂栫爜涓嶈兘涓虹┖;";
+ if (tb2.Rows[i]["鐢熶骇璁㈠崟鍙�*"].ToString() == "")
+ error += "鐢熶骇璁㈠崟鍙蜂笉鑳戒负绌�;\n";
+ if (tb2.Rows[i]["鐢熶骇璁㈠崟鏄庣粏琛屽彿*"].ToString() == "")
+ error += "鐢熶骇璁㈠崟鏄庣粏琛屽彿涓嶈兘涓虹┖;";
+ if (tb2.Rows[i]["鐢熶骇璧勬簮缂栫爜*"].ToString() == "")
+ error += "鐢熶骇璧勬簮缂栫爜涓嶈兘涓虹┖;";
+ if (tb2.Rows[i]["鐗╂枡缂栫爜*"].ToString() == "")
+ error += "鐗╂枡缂栫爜涓嶈兘涓虹┖;";
+ if (tb2.Rows[i]["鐢熶骇璧勬簮缂栫爜*"].ToString() == "")
+ error += "鐢熶骇璧勬簮缂栫爜涓嶈兘涓虹┖;";
+ if (error.Length > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = ErrorResult += $"Excel妯℃澘瀛樺湪閿欒锛岃鏁皗i + 1}:{error}\r\n"; ;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //鍒ゆ柇瀵煎叆鏂囦欢涓殑鐢熶骇璁㈠崟鏄惁瀛樺湪
+ 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} ",
+ 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()}";
+ }
+
+ //鑻ョ敓浜ц鍗曞瓨鍦紝鑾峰彇鐢熶骇璁㈠崟淇℃伅
+ if (error.Length > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = ErrorResult += $"Excel妯℃澘瀛樺湪閿欒锛岃鏁皗i + 1}:{error}\r\n"; ;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ tb2.Rows[i]["HWorkShopID"] = ds.Tables[0].Rows[0]["HDeptID"].ToString(); //鐢熶骇杞﹂棿鍐呯爜
+ tb2.Rows[i]["鐢熶骇杞﹂棿缂栫爜*"] = ds.Tables[0].Rows[0]["鐢熶骇杞﹂棿浠ｇ爜"].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]["HWorkShopID"] = ds.Tables[0].Rows[0]["HDeptID"].ToString();
+ tb2.Rows[i]["HMaterID"] = ds.Tables[0].Rows[0]["HMaterID"].ToString();
+ tb2.Rows[i]["鐗╂枡鍚嶇О"] = ds.Tables[0].Rows[0]["浜у搧鍚嶇О"].ToString();
+ tb2.Rows[i]["瑙勬牸鍨嬪彿"] = ds.Tables[0].Rows[0]["瑙勬牸鍨嬪彿"].ToString();
+ }
+
+
+ //鑾峰彇宸ュ崟鎺掍骇淇℃伅
+ 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()}' ", "h_v_JIT_WorkBillSortBillList_DR");
+ //缁勭粐缂栫爜='{tb2.Rows[i]["缁勭粐缂栫爜*"].ToString()}' and
+ //and 鐢熶骇璧勬簮缂栫爜='{tb2.Rows[i]["鐢熶骇璧勬簮缂栫爜*"].ToString()}'
+
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ tb2.Rows[i]["hmainid"] = ds.Tables[0].Rows[0]["hmainid"].ToString();
+ tb2.Rows[i]["鍗曟嵁鍙�"] = ds.Tables[0].Rows[0]["鍗曟嵁鍙�"].ToString();
+ tb2.Rows[i]["HSourceID"] = ds.Tables[0].Rows[0]["HSourceID"].ToString();
+ }
+ else
+ {
+ error += $"娌℃湁鎺掍骇淇℃伅锛岀敓浜ц鍗曞彿:{ tb2.Rows[i]["鐢熶骇璁㈠崟鍙�*"].ToString()},鐢熶骇杞﹂棿缂栫爜:{tb2.Rows[i]["鐢熶骇杞﹂棿缂栫爜*"].ToString()}" +
+ $",鐢熶骇璁㈠崟鏄庣粏琛屽彿:{ tb2.Rows[i]["鐢熶骇璁㈠崟鏄庣粏琛屽彿*"].ToString()},鐗╂枡缂栫爜:{ tb2.Rows[i]["鐗╂枡缂栫爜*"].ToString()}" +
+ $",鐢熶骇璧勬簮缂栫爜:{tb2.Rows[i]["鐢熶骇璧勬簮缂栫爜*"].ToString()}";
+ }
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = ErrorResult;
+ objJsonResult.data = tb2;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 瀹濆伐锛氭棩鐢熶骇璁″垝 瀵煎叆(淇濆瓨)
+ [Route("JIT_DayPlanPlatForm_DayImport/JIT_DayPlanPlatForm_DayImport_btnSave")]
+ [HttpPost]
+ public object JIT_DayPlanPlatForm_DayImport_btnSave([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ oCN.BeginTran();
+ //淇濆瓨涓昏〃
+ objJsonResult = AddBillMain_DayImport(msg1);
+ if (objJsonResult.code == "0")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = objJsonResult.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ public json AddBillMain_DayImport(string msg1)
+ {
+ string err = "";
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString(); //璺濅粖澶╁線鍚庡彲璁剧疆鐨勫ぉ鏁�
+ string msg3 = sArray[1].ToString(); //琛ㄦ牸鏁版嵁
+ string user = sArray[2].ToString(); //鐢ㄦ埛
+
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("Sc_WorkBillSortBill_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //JSON搴忓垪鍖栬浆鎹㈠瓧鍏搁泦鍚�
+ List<Dictionary<string, string>> list = new List<Dictionary<string, string>>();
+ List<object> jb = JsonConvert.DeserializeObject<List<object>>(msg3);
+ foreach (JObject item in jb)
+ {
+ Dictionary<string, string> dic = new Dictionary<string, string>();
+ foreach (var itm in item.Properties())
+ {
+ dic.Add(itm.Name, itm.Value.ToString());
+ }
+ list.Add(dic);
+ }
+
+ for (int i = 0; i < list.Count; i++)
+ {
+ var HInterID = list[i]["hmainid"].ToString();
+ var HBillNo = list[i]["鍗曟嵁鍙�"].ToString();
+ var HSourceID = list[i]["HSourceID"].ToString();
+ var HSourceNumber = list[i]["鐢熶骇璧勬簮缂栫爜*"].ToString();
+ var HMainSourceInterID = list[i]["ICMOBillHInterID"].ToString();
+ var HMainSourceEntryID = list[i]["ICMOBillHEntryID"].ToString();
+ var HICMOBillNo = list[i]["鐢熶骇璁㈠崟鍙�*"].ToString();
+ var HICMOEntrySEQ = list[i]["鐢熶骇璁㈠崟鏄庣粏琛屽彿*"].ToString();
+ var HMaterID = list[i]["HMaterID"].ToString();
+ var HMaterNumber = list[i]["鐗╂枡缂栫爜*"].ToString();
+ var HMaterName = list[i]["鐗╂枡鍚嶇О"].ToString();
+ var HMaterModel = list[i]["瑙勬牸鍨嬪彿"].ToString();
+
+
+ // 缁熻鎬诲ぉ鏁�
+ HashSet<DateTime> uniqueDates = new HashSet<DateTime>();
+ foreach (var key in list[i].Keys)
+ {
+ if (DateTime.TryParseExact(key, "yyyy-MM-dd", CultureInfo.InvariantCulture, DateTimeStyles.None, out DateTime date))
+ {
+ uniqueDates.Add(date);
+ }
+ }
+ int SumDay = uniqueDates.Count; //鍔ㄦ�佷袱鏈堜箣宸� DateTime.Now.AddMonths(1).AddDays(-1).Subtract(DateTime.Now).Days;
+
+ foreach(var date in uniqueDates)
+ {
+ //涓昏〃瀛愯〃閮芥湁鏁版嵁
+ if (list[i][date.ToString("yyyy-MM-dd")].ToString() != "")
+ {
+ int HQty = int.Parse(list[i][date.ToString("yyyy-MM-dd")].ToString());
+
+ //淇濆瓨瀛愯〃
+ objJsonResult = AddBillSub_DayImport(HInterID, HBillNo, date, HQty);
+ if (objJsonResult.code == "0")
+ {
+ err += "銆愮敓浜ц鍗曪細" + HICMOBillNo + "锛涜鍙凤細" + HICMOEntrySEQ + "锛涚墿鏂欑紪鐮侊細" + HMaterNumber + "锛涚墿鏂欏悕绉帮細" + HMaterName + "锛涚敓浜ц祫婧愮紪鐮侊細" + HSourceNumber + "锛涙棩鏈燂細" + date.ToString("yyyy-MM-dd") + "锛涙暟閲忥細" + HQty + "銆戯細" + objJsonResult.Message + "锛�";
+ }
+ }
+ }
+ }
+
+ if (err.Length > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = err;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = null;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ public json AddBillSub_DayImport(string HInterID, string HBillNo, DateTime date, int HQTY)
+ {
+ //灏嗘棩璁″垝宸ュ崟涓鏃ユ湡鐨勮褰曚綔搴�
+ string sql_delete = "update Sc_WorkBillSortBillSub set HDeleteFlag = 1 where HInterID = " + HInterID + " and convert(varchar(100),HMasterDate,23) = '" + date.ToString("yyyy-MM-dd") + "'";
+ oCN.RunProc(sql_delete);
+
+ //灏嗗鍏ョ殑鏁版嵁鐢熸垚璇ユ棩璁″垝宸ュ崟鎸囧畾鏃ユ湡鐨勮褰�
+ string sql_insert = "insert into Sc_WorkBillSortBillSub(HInterID,HSEQ,HMasterDate,HQty,HDayImportFlag) " +
+ "values(" +
+ "" + HInterID + "" +
+ "," + 0 + "" +
+ ",'" + date.ToString("yyyy-MM-dd") + "'" +
+ "," + HQTY + "" +
+ "," + 1 + "" +
+ ")";
+
+ oCN.RunProc(sql_insert);
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = null;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ #endregion
+
}
}
\ No newline at end of file
--
Gitblit v1.9.1