From 3516cdb38f8dde6e88c2881df7c31f83c226a0ab Mon Sep 17 00:00:00 2001 From: duhe <226547893@qq.com> Date: 星期三, 15 十一月 2023 19:31:41 +0800 Subject: [PATCH] 生产订单变更单:审核时需要判断源单是否为审核状态,不是则审核失败 --- WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormBillController.cs | 51 +++++++++++++++++++++++++++++++++------------------ 1 files changed, 33 insertions(+), 18 deletions(-) diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs" index 0ac933a..0b956a5 100644 --- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs" +++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs" @@ -185,6 +185,7 @@ var HSplitQty = list[i]["鎷嗗崟鏁伴噺"].ToString(); var HDayPlanSumQty = list[i]["鏃ヨ鍒掓暟閲忔�婚噺"].ToString(); var HPlanBeginDate = list[i]["璁″垝寮�濮嬫棩鏈�"].ToString(); + var HPlanEndDate = list[i]["璁″垝缁撴潫鏃ユ湡"].ToString(); var HSeOrderBillNo = list[i]["閿�鍞鍗曞彿"].ToString(); var HICMOBillType = list[i]["鐢熶骇璁㈠崟鍗曟嵁绫诲瀷"].ToString(); var HSourceStockInQty = list[i]["浜х嚎鍏ュ簱鏁伴噺"].ToString(); @@ -225,7 +226,7 @@ " HOrderNeedQty, HSplitQty, HDayPlanSumQty,HPlanBeginDate," + "HSeOrderBillNo,HICMOBillType,HSourceStockInQty,HLeftPlanQty,HOrderLev,HPreparatDate," + "HMainSourceInterID,HMainSourceEntryID,HICMOInterID_Sec,HICMOEntryID_Sec,HPlanQty" + - ",HICMOInterID,HICMOEntryID)values" + + ",HICMOInterID,HICMOEntryID,HPlanEndDate)values" + $"({HInterID},'{HBillNo}',{DateTime.Now.Year},{DateTime.Now.Month},'{BillType}'," + $"'{BillType}',GETDATE(),1,'{user}',getdate(),'{HICMOBillNo}','{HOrderType}'," + $"{(HICMOEntrySEQ == "" ? 0.ToString() : HICMOEntrySEQ)},{(HWorkShopID == "" ? 0.ToString() : HWorkShopID)},{(HSourceID == "" ? 0.ToString() : HSourceID)}, {(HYX == "" ? 0.ToString() : HYX)}, {(HProdORGID == "" ? 0.ToString() : HProdORGID)}," + @@ -233,7 +234,7 @@ $" 0, {(HSplitQty == "" ? 0.ToString() : HSplitQty)}, {(HDayPlanSumQty == "" ? 0.ToString() : HDayPlanSumQty)},'{HPlanBeginDate}'," + $"'{HSeOrderBillNo}','{HICMOBillType}',{(HSourceStockInQty == "" ? 0.ToString() : HSourceStockInQty)},{(HLeftPlanQty == "" ? 0.ToString() : HLeftPlanQty)},'{HOrderLev}',getdate()," + $"{HMainSourceInterID},{HMainSourceEntryID},{HMainSourceInterID},{HMainSourceEntryID},{HPlanQty}," + - $"{HMainSourceInterID},{HMainSourceEntryID})"; + $"{HMainSourceInterID},{HMainSourceEntryID},'{HPlanEndDate}')"; //LogService.Write("sql:" + sql); //涓昏〃 @@ -241,6 +242,8 @@ } else { + HBillNo = list[i]["鍗曟嵁鍙�"].ToString(); + HInterID = int.Parse(list[i]["hmainid"].ToString()); var HMainSourceInterID = list[i]["婧愬崟涓诲唴鐮�"].ToString(); var HMainSourceEntryID = list[i]["婧愬崟瀛愬唴鐮�"].ToString(); var HICMOBillNo = list[i]["鐢熶骇璁㈠崟鍙�"].ToString(); @@ -254,6 +257,8 @@ var HLastEndDate = list[i]["鏈�杩熷畬宸ユ棩鏈�"].ToString(); var HOrderNeedQty = list[i]["璁㈠崟闇�姹傛暟閲�"].ToString(); var HOrderCommitDate = list[i]["璁㈠崟浜よ揣鏈�"].ToString(); + var HPlanEndDate = list[i]["璁″垝缁撴潫鏃ユ湡"].ToString(); + var HSplitQty = list[i]["鎷嗗崟鏁伴噺"].ToString(); if (HSourceID == "" || HSourceID == "0") { @@ -287,7 +292,7 @@ oCN.RunProc($"update Sc_WorkBillSortBillMain set HSourceID={(HSourceID == "" ? 0.ToString() : HSourceID)},HYX={HYX}" + $",HWorkQty={HWorkQty},HProdTimes={HProdTimes},HReadyTimes={HReadyTimes},HLastBeginDate='{HLastBeginDate}'" + - $",HLastEndDate='{HLastEndDate}',HOrderNeedQty={HOrderNeedQty},HOrderCommitDate='{HOrderCommitDate}'" + + $",HLastEndDate='{HLastEndDate}',HOrderNeedQty={HOrderNeedQty},HOrderCommitDate='{HOrderCommitDate}',HPlanEndDate='{HPlanEndDate}',HSplitQty={HSplitQty}" + $" where HInterID={list[i]["hmainid"].ToString()} and HBillNo='{list[i]["鍗曟嵁鍙�"].ToString()}'"); } @@ -305,7 +310,7 @@ objJsonResult = AddBillSub(HInterID == 0 ? list[i]["hmainid"].ToString() : HInterID.ToString() , HBillNo == "" ? list[i]["鍗曟嵁鍙�"].ToString() : HBillNo , DateTime.Parse(DateTime.Now.AddDays(j).ToString("yyyy-MM-dd").ToString()) - , int.Parse(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) , list[i]); if (objJsonResult.count == 1) { @@ -315,19 +320,22 @@ //涓昏〃鏈夋暟鎹� 瀛愯〃鏃犳暟鎹� if (j == 30 && SumCount == 0 && HInterID != 0 && HBillNo != "") { + //LogService.CustomWriteLog("3:"+ HInterID+","+ HBillNo, DateTime.Now.ToString("yyyy-MM-dd")); objJsonResult = AddBillSub(HInterID.ToString(), HBillNo, DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd").ToString()), 0, list[i]); } } + + if (TrueCount != SumCount) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = objJsonResult.Message; + objJsonResult.data = null; + return objJsonResult; + } } - if (TrueCount != SumCount) - { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = objJsonResult.Message; - objJsonResult.data = null; - return objJsonResult; - } + //鍚屾鏃ヨ鍒掑伐鍗� oCN.RunProc("exec REALESE_SC_ICMOBILLSTATUS_TMP"); @@ -348,7 +356,7 @@ } } - public json AddBillSub(string HInterID, string HBillNo, DateTime date, int HQTY, Dictionary<string, string> dic) + public json AddBillSub(string HInterID, string HBillNo, DateTime date, double HQTY, Dictionary<string, string> dic) { //鑾峰彇琛ㄦ牸鏁版嵁 ds = oCN.RunProcReturn($"select * from h_v_JIT_Sc_WorkBillSortBillList where 鍗曟嵁鍙�='{HBillNo}'", "h_v_JIT_Sc_WorkBillSortBillList"); @@ -1529,6 +1537,10 @@ { sqlName = "AIS20230129011339"; } + else if (oSystemParameter.omodel.WMS_CampanyName == "鍑礉濂堢壒") + { + sqlName = "AIS20210820164804"; + } else { sqlName = "AIS20210811135644"; @@ -1701,7 +1713,8 @@ F_QIMB_NOTE = Purchase.F_QIMB_NOTE, FNOTE = Purchase.FNOTE, FPURCHASEQTY = Purchase.FPURCHASEQTY, - FJOINQTY = Purchase.FJOINQTY + FJOINQTY = Purchase.FJOINQTY, + FDAYPLANBILLNO = _item.FDAYPLANBILLNO }); //鎵i櫎鏃ヨ鍒掓槑缁嗗凡琚垎閰嶇殑鏁伴噺 DayPlanPpbomls.NeedQty = 0; @@ -1764,7 +1777,8 @@ F_QIMB_NOTE = Purchase.F_QIMB_NOTE, FNOTE = Purchase.FNOTE, FPURCHASEQTY = Purchase.FPURCHASEQTY, - FJOINQTY = Purchase.FJOINQTY + FJOINQTY = Purchase.FJOINQTY, + FDAYPLANBILLNO = _item.FDAYPLANBILLNO }); //鏇存柊璁″垝鏁伴噺锛堝墿浣欓渶瑕佹帓鐨勶級 缁х画鍘昏绠椾笅涓�涓噰璐鍗� DayPlanPpbomls.NeedQty -= Qty; @@ -2604,11 +2618,11 @@ #region 鐢熶骇鏃ヨ鍒掑钩鍙� 鏁版嵁鍑嗗 璁剧疆浠诲姟鍗曠浉鍏充俊鎭� [Route("JIT_DayPlanPlatFormBill/ReadyData")] [HttpGet] - public object ReadyData(string HICOMNum) + public object ReadyData(string SWhere) { try { - var list = HICOMNum.Split(','); + var list = SWhere.Split(','); DataTable dt = new DataTable("date"); dt.Columns.Add("HICMOInterID", typeof(string)); dt.Columns.Add("HICMOEntryID", typeof(string)); @@ -2624,9 +2638,10 @@ { string HICMOInterID = list[i].Split(';')[0].ToString(); string HICMOEntryID = list[i].Split(';')[1].ToString(); + string HSourceID = list[i].Split(';')[2].ToString(); Thread.Sleep(100); - ds = oCN.RunProcReturn("exec h_p_Sc_GetInfoByICMOBillNo " + HICMOInterID+","+ HICMOEntryID, "h_p_Sc_GetInfoByICMOBillNo"); + ds = oCN.RunProcReturn("exec h_p_Sc_GetInfoByICMOBillNo " + HICMOInterID+","+ HICMOEntryID+","+ HSourceID, "h_p_Sc_GetInfoByICMOBillNo"); if (ds == null || ds.Tables[0].Rows.Count == 0) { -- Gitblit v1.9.1