From 61080d0bca087c7fdd3e738e68d6c5e7a26391fa Mon Sep 17 00:00:00 2001 From: z1873 <z1873@LAPTOP-EAVL132E> Date: 星期三, 28 五月 2025 09:36:02 +0800 Subject: [PATCH] 1 --- WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormImportController.cs | 10 ++++------ 1 files changed, 4 insertions(+), 6 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 aae6b3d..62b64b5 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" @@ -608,7 +608,7 @@ tb2.Rows[i]["ICMOBillHEntryID"] = ds.Tables[0].Rows[0]["HEntryID"].ToString();//鐢熶骇璁㈠崟瀛恑d } //鏌ユ壘鏄惁瀛樺湪瀵瑰簲鏃ヨ鍒掑伐鍗� - var dt = oCN.RunProcReturn($"select * from h_v_JIT_Sc_WorkBillSortBillList where 婧愬崟涓诲唴鐮� in({ds.Tables[0].Rows[0]["hmainid"].ToString()}) and 婧愬崟瀛愬唴鐮� in({ds.Tables[0].Rows[0]["HEntryID"].ToString()})", "h_v_JIT_Sc_WorkBillSortBillList"); + var dt = oCN.RunProcReturn($"select * from h_v_JIT_Sc_WorkBillSortBillList_Left where 婧愬崟涓诲唴鐮� in({ds.Tables[0].Rows[0]["hmainid"].ToString()}) and 婧愬崟瀛愬唴鐮� in({ds.Tables[0].Rows[0]["HEntryID"].ToString()})", "h_v_JIT_Sc_WorkBillSortBillList"); if (dt.Tables[0].Rows.Count > 0) { tb2.Rows[i]["hmainid"] = dt.Tables[0].Rows[0]["hmainid"].ToString(); @@ -911,7 +911,7 @@ tb2.Rows[i]["ICMOBillHEntryID"] = ds.Tables[0].Rows[0]["HEntryID"].ToString();//鐢熶骇璁㈠崟瀛恑d } //鏌ユ壘鏄惁瀛樺湪瀵瑰簲鏃ヨ鍒掑伐鍗� - var dt = oCN.RunProcReturn($"select * from h_v_JIT_Sc_WorkBillSortBillList where 婧愬崟涓诲唴鐮� in({ds.Tables[0].Rows[0]["hmainid"].ToString()}) and 婧愬崟瀛愬唴鐮� in({ds.Tables[0].Rows[0]["HEntryID"].ToString()})", "h_v_JIT_Sc_WorkBillSortBillList"); + var dt = oCN.RunProcReturn($"select * from h_v_JIT_Sc_WorkBillSortBillList_Left where 婧愬崟涓诲唴鐮� in({ds.Tables[0].Rows[0]["hmainid"].ToString()}) and 婧愬崟瀛愬唴鐮� in({ds.Tables[0].Rows[0]["HEntryID"].ToString()})", "h_v_JIT_Sc_WorkBillSortBillList"); if (dt.Tables[0].Rows.Count > 0) { tb2.Rows[i]["hmainid"] = dt.Tables[0].Rows[0]["hmainid"].ToString(); @@ -1057,8 +1057,6 @@ $" {(HSeOrderBillQty == "" ? 0.ToString() : HSeOrderBillQty)}, {(HPlanQty == "" ? 0.ToString() : HPlanQty)}, {(HCompleteQty == "" ? 0.ToString() : HCompleteQty)},getdate()," + $" {HMainSourceInterID},{HMainSourceEntryID},{HMainSourceInterID},{HMainSourceEntryID},{HProdORGID}, {HMainSourceInterID},{HMainSourceEntryID}" + $",'{HSeOrderBillNo}','{HPlanEndDate}',{HLockOrder})"); - //鎻掑叆瀛愯〃鏁版嵁 - objJsonResult = AddBillSub(HInterID.ToString(), HBillNo, DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd").ToString()), 0); }//濡傛灉宸插瓨鍦ㄦ棩璁″垝宸ュ崟鏇存柊瀵瑰簲鐢熶骇璧勬簮灏忔椂浜ц兘 else { @@ -1096,7 +1094,7 @@ foreach (var key in list[i].Keys) { - if (DateTime.TryParseExact(key, "yyyy-M-d", CultureInfo.InvariantCulture, DateTimeStyles.None, out DateTime date)) + if (DateTime.TryParseExact(key, "yyyy-MM-dd", CultureInfo.InvariantCulture, DateTimeStyles.None, out DateTime date)) { uniqueDates.Add(date); } @@ -1110,7 +1108,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