From 25c5ea9d524cc7ba92b676bbd85a05889c335796 Mon Sep 17 00:00:00 2001 From: 王 垚 <1402714037@qq.com> Date: 星期二, 22 十二月 2020 17:42:43 +0800 Subject: [PATCH] 问题改进 --- src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs | 661 ++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 554 insertions(+), 107 deletions(-) diff --git a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs index ec48004..9767d5a 100644 --- a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs +++ b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs @@ -31,6 +31,7 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Text; +using System.Threading; using System.Threading.Tasks; using System.Web; using System.Windows.Documents; @@ -76,7 +77,7 @@ if (e.BarItemKey.ToUpper() == "TBSEARCH") { - SearchList222(); + SearchList(); } if (e.BarItemKey.ToUpper() == "TBLOCK") @@ -95,14 +96,14 @@ if (e.BarItemKey.ToUpper() == "TBCOMPLETE") { - CompleteSetAnalysis(); + //CompleteSetAnalysis(); //COMPLETEMAIN(); - // COMPLETE(); + COMPLETE(); } //鎻愭枡璁″垝 if (e.BarItemKey.ToUpper() == "TBEXTRACTION") { - Extraction3(); + Extraction(); } } @@ -254,35 +255,16 @@ public void Lock() { int day = Convert.ToInt32(this.Model.GetValue("FLockDays")); - - string sqlwhere = " and 1=1"; - string FSalOrder = Convert.ToString((this.Model.GetValue("FSalOrder"))); - if (string.IsNullOrEmpty(FSalOrder)) - { - - } - else - sqlwhere += $" and FHSeOrderBillNo='{FSalOrder}'"; - - //鑾峰彇鍗曟嵁浣撲俊鎭� - Entity entity = this.View.BillBusinessInfo.GetEntity("FEntity"); - //鍗曟嵁浣撲俊鎭浆鎹负鍒楄〃闆嗗悎 - DynamicObjectCollection entityDataObjoct = this.View.Model.GetEntityDataObject(entity); List<string> sqlList = new List<string>(); - string sql; - foreach (var item in entityDataObjoct) - { - sql = $"/*dialect*/update t1 set t1.FHLockedSub=1 from Sc_WorkBillSortBillSub t1 join Sc_WorkBillSortBillMain t2 on t1.FID = t2.FID where FHMASTERDATE between DATEADD(day,-1,getdate()) and DATEADD(day,{day - 1},getdate()) and t1.FID = { Convert.ToString(item["FDayPlanWorkID"])} "; - - //sql = $"/*dialect*/update Sc_WorkBillSortBillSub set FHLockedSub=1 where FEntryID in (select TOP({day}) FEntryID from Sc_WorkBillSortBillSub where FHLOCKEDSUB = 0 AND FID = { Convert.ToString(item["FDayPlanWorkID"])} AND DATEDIFF(DAY, GETDATE(), FHMASTERDATE) >= 0 ORDER BY FEntryID) "; - sqlList.Add(sql); - - } - + string sql = $"/*dialect*/update t1 set t1.FHLockedSub=1 from Sc_WorkBillSortBillSub t1 join Sc_WorkBillSortBillMain t2 on t1.FID = t2.FID where FHMASTERDATE between DATEADD(day,-1,getdate()) and DATEADD(day,{day - 1},getdate())"; + sqlList.Add(sql); int result = DBServiceHelper.ExecuteBatch(Context, sqlList); if (result > 0) { - SearchList222(); + //閿佸畾鍚庣敓鎴愭棩璁″垝鐢ㄦ枡娓呭崟 鍙� 鎻愭枡璁″垝 + DayPlanPPBomBill(); + Extraction(); + SearchList(); this.View.ShowMessage("鎿嶄綔鎴愬姛"); } else @@ -294,16 +276,6 @@ public void RelieveLock() { int day = Convert.ToInt32(this.Model.GetValue("FLockDays")); - - string sqlwhere = " and 1=1"; - string FSalOrder = Convert.ToString((this.Model.GetValue("FSalOrder"))); - if (string.IsNullOrEmpty(FSalOrder)) - { - - } - else - sqlwhere += $" and FHSeOrderBillNo='{FSalOrder}'"; - //鑾峰彇鍗曟嵁浣撲俊鎭� Entity entity = this.View.BillBusinessInfo.GetEntity("FEntity"); //鍗曟嵁浣撲俊鎭浆鎹负鍒楄〃闆嗗悎 @@ -313,16 +285,12 @@ foreach (var item in entityDataObjoct) { sql = $"/*dialect*/update t1 set t1.FHLockedSub=0 from Sc_WorkBillSortBillSub t1 join Sc_WorkBillSortBillMain t2 on t1.FID = t2.FID where FHMASTERDATE between DATEADD(day,-1,getdate()) and DATEADD(day,{day - 1},getdate()) and t1.FID = { Convert.ToString(item["FDayPlanWorkID"])} "; - - //sql = $"/*dialect*/update Sc_WorkBillSortBillSub set FHLockedSub=1 where FEntryID in (select TOP({day}) FEntryID from Sc_WorkBillSortBillSub where FHLOCKEDSUB = 0 AND FID = { Convert.ToString(item["FDayPlanWorkID"])} AND DATEDIFF(DAY, GETDATE(), FHMASTERDATE) >= 0 ORDER BY FEntryID) "; sqlList.Add(sql); - } - int result = DBServiceHelper.ExecuteBatch(Context, sqlList); if (result > 0) { - SearchList222(); + SearchList(); this.View.ShowMessage("鎿嶄綔鎴愬姛"); } else @@ -380,7 +348,7 @@ if (result > 0) { this.View.ShowMessage("鎿嶄綔鎴愬姛"); - SearchList222(); + SearchList(); } else this.View.ShowMessage("鎿嶄綔澶辫触锛岃仈绯荤鐞嗗憳锛�"); @@ -392,16 +360,12 @@ /// private void COMPLETE() { - // 鏄剧ず涓�涓繘搴︽樉绀虹晫闈細鏄剧ず涓�涓笉鍋滄粴鍔ㄧ殑妯℃嫙杩涘害 - // bUseTruePro鍙傛暟锛氭槸鍚︽樉绀虹湡瀹炵殑杩涘害銆� // bUseTruePro = false 锛� // 鏄剧ず涓�涓笉鍋滄粴鍔ㄧ殑妯℃嫙杩涘害锛屼笌瀹為檯澶勭悊杩涘害娌℃湁鍏宠仈銆� // 姝ゆ柟妗堜紭鐐癸細瀹為檯澶勭悊浠g爜鏃犻渶璁$畻杩涘害 // 姝ゆ柟妗堢己鐐癸細杩涘害涓嶅噯纭紝涓旇繘搴﹂〉闈笉浼氳嚜鍔ㄥ叧闂�� - - // bUseTruePro = true: 杩涘害鐣岄潰鏄剧ず鐪熷疄杩涘害 // 姝ゆ柟妗堜紭鐐癸細杩涘害鐪熷疄 // 姝ゆ柟妗堢己鐐癸細闇�瑕佸湪澶勭悊浠g爜涓紝涓嶆柇鐨勬洿鏂扮湡瀹炶繘搴︼紝鏇存柊璇彞 @@ -420,15 +384,13 @@ try { // 闇�瑕佹崟鑾烽敊璇紝浠ョ‘淇濆鐞嗙粨鏉熸椂锛屽叧闂繘搴︽粴鍔ㄧ晫闈� - // 寮曞叆鍔熻兘瀹為檯澶勭悊鍑芥暟 - this.COMPLETEMAIN(); + this.CompleteSetAnalysis(); } finally { // 纭繚鏍囪杩涘害宸茬粡鍒拌揪100% this.View.Session["ProcessRateValue"] = 100; - // 寮曞叆瀹屾瘯锛屽叧闂繘搴︽樉绀洪〉闈� var processView = this.View.GetView(processForm.PageId); if (processView != null) @@ -749,12 +711,15 @@ /// </summary> public void CompleteSetAnalysis() { + try { Stopwatch sw = new Stopwatch(); sw.Start();//寮�濮嬭鏃� //娓呯┖榻愬涓存椂琛� DBServiceHelper.Execute(Context, "/*dialect*/ delete JIT_MOMaterReadysBill "); + //鏇存柊鐘舵�� + DBServiceHelper.Execute(Context, "/*dialect*/ update Sc_WorkBillSortBillsub set FCOMPLETE='' "); //鑾峰彇褰撳墠鍗虫椂搴撳瓨 鎸夌収鐗╂枡+搴撳瓨缁勭粐+璐т富+搴撳瓨鏁伴噺 DataSet ds = DBServiceHelper.ExecuteDataSet(Context, @" /*dialect*/ @@ -770,7 +735,7 @@ LEFT JOIN T_STK_Inventory a on T1.FStockOrgId = a.FStockOrgId and T1.FMATERIALID =a.FMATERIALID LEFT JOIN JIT_MOMaterReadysBill B ON T1.FStockOrgId = b.FHSTOCKORGID and T1.FMATERIALID =b.FHMATERID and a.FOwnerId = b.FOwnerId LEFT join T_ORG_Organizations c on a.FOWNERID = c.FORGID -where T1.FMATERIALID in (105773) +--where T1.FMATERIALID in (105773) "); ListInventory = ds.ToModelList<PRD_Inventory>(); //鎬诲簱瀛� 鐗╂枡+搴撳瓨缁勭粐+搴撳瓨鏁伴噺 @@ -787,7 +752,7 @@ ) T1 LEFT JOIN T_STK_Inventory a on T1.FStockOrgId = a.FStockOrgId and T1.FMATERIALID =a.FMATERIALID LEFT JOIN JIT_MOMaterReadysBill B ON T1.FStockOrgId = b.FHSTOCKORGID and T1.FMATERIALID =b.FHMATERID -where T1.FMATERIALID in (105773) +--where T1.FMATERIALID in (105773) group by T1.FStockOrgId,T1.FMATERIALID "); ListInventoryByStockOrgId = ds.ToModelList<PRD_Inventory>(); @@ -804,8 +769,8 @@ JOIN T_BD_MATERIAL T4 on T2.FMATERIALID = T4.FMATERIALID JOIN T_ORG_Organizations t5 on a.FHPRDORGID = t5.FORGID --where FPRDMOMAINID = 100010 -where t4.FMATERIALID in (105773 -) +--where t4.FMATERIALID in (105773 +--) ORDER BY b.FHMASTERDATE,a.FHOrderLev "; ds = DBServiceHelper.ExecuteDataSet(Context, sql); List<PRD_PPBOM> BomList = ds.ToModelList<PRD_PPBOM>(); @@ -813,8 +778,11 @@ var DatePlanList = BomList.GroupBy(p => new { p.FHMASTERDATE, p.FPRDMOENTYID }).Select(x => new PRD_PPBOM { FHMASTERDATE = x.Key.FHMASTERDATE, FPRDMOENTYID = x.Key.FPRDMOENTYID }).ToList(); //CompleteAnalysisTempModel 鐢ㄤ簬瀛樺偍涓存椂闇�瑕佹彃鍏ユ暟鎹� List<CompleteAnalysisTempModel> completeAnalysisTempModel = new List<CompleteAnalysisTempModel>(); + int i = 1; foreach (var item in DatePlanList) { + this.View.Session["ProcessRateValue"] = Convert.ToInt32(this.View.Session["ProcessRateValue"]) + Convert.ToInt32((decimal)(1.0 / DatePlanList.Count)); + //绛涢�夊嚭褰撴棩璁″垝鏁版嵁 var _BomList = BomList.Where(x => x.FHMASTERDATE == item.FHMASTERDATE && x.FPRDMOENTYID == item.FPRDMOENTYID).ToList(); foreach (var _item in _BomList) @@ -889,9 +857,15 @@ }); } } + Thread.Sleep(100); + this.View.Session["ProcessRateValue"] = Convert.ToInt32((Convert.ToDecimal(40) / DatePlanList.Count) * i); + i++; + } + i = 1; foreach (var item in completeAnalysisTempModel) { + // this.View.Session["ProcessRateValue"] = Convert.ToInt32(this.View.Session["ProcessRateValue"]) + Convert.ToInt32(1 / completeAnalysisTempModel.Count * 90); JObject jsonRoot = new JObject(); jsonRoot.Add("Creator", ""); jsonRoot.Add("NeedUpDateFields", new JArray()); @@ -929,6 +903,8 @@ { LogHelper.Error(jsonRoot.ToString()); } + this.View.Session["ProcessRateValue"] = 40 + Convert.ToInt32((Convert.ToDecimal(60) / completeAnalysisTempModel.Count) * i); + i++; } //鎵ц瀹屾垚鍚� 鏇存柊鏃ヨ鍒掑伐鍗曠姸鎬� DBServiceHelper.Execute(Context, @" @@ -948,10 +924,9 @@ /// <summary> /// 鏌ヨ /// </summary> - public void SearchList222() + public void SearchList() { string sqlwhere = " where 1=1"; - if ((this.Model.GetValue("FProWorkShopId") as DynamicObject) != null) { string FProWorkShopId = (this.Model.GetValue("FProWorkShopId") as DynamicObject)["Id"].ToString(); @@ -960,23 +935,12 @@ } //閿�鍞鍗曞彿 string FSalOrder = Convert.ToString((this.Model.GetValue("FSalOrder"))); - if (string.IsNullOrEmpty(FSalOrder)) - { - - } - else + if (!string.IsNullOrEmpty(FSalOrder)) sqlwhere += $" and FHSeOrderBillNo='{FSalOrder}'"; - - //鐢熶骇璁㈠崟鍙� string FScOrderMainNo = Convert.ToString((this.Model.GetValue("FScOrderMainNo"))); - if (string.IsNullOrEmpty(FScOrderMainNo)) - { - - } - else + if (!string.IsNullOrEmpty(FScOrderMainNo)) sqlwhere += $" and FSCORDERNO='{FScOrderMainNo}'"; - //鐗╂枡 if ((this.Model.GetValue("FMatralId") as DynamicObject) != null) { @@ -988,8 +952,6 @@ string FPreparatDate = Convert.ToString((this.Model.GetValue("FPreparatDate"))); if (!string.IsNullOrEmpty(FPreparatDate)) sqlwhere += $" and FPreparatDate='{FPreparatDate}'"; - - try { string sql = @"/*dialect*/select t1.* from Sc_WorkBillSortBillMain t1 @@ -1019,19 +981,14 @@ this.Model.SetValue("FHMainSourceInterID", dt.Rows[i]["FPRDMOMAINID"].ToString(), i);//婧愬崟涓诲唴鐮丗HMainSourceInterID this.Model.SetValue("FHMainSourceEntryID", dt.Rows[i]["FPRDMOENTYID"].ToString(), i);//婧愬崟瀛愬唴鐮丗HMainSourceEntryID this.Model.SetValue("FDayPlanWorkID", dt.Rows[i]["FID"].ToString(), i);//鏃ヨ鍒掑伐鍗旻ID - this.Model.SetValue("FResourcesId", dt.Rows[i]["FHSourceID"].ToString(), i);//鐢熶骇璧勬簮 this.Model.SetValue("FProductWorkShopId", dt.Rows[i]["FHWorkShopID"].ToString(), i);//鐢熶骇杞﹂棿 - this.Model.SetValue("FCompleteSetCount", dt.Rows[i]["FCompleteCount"].ToString(), i);//榻愬鏁伴噺 this.Model.SetValue("FOrderQuantity", dt.Rows[i]["FOrderQuantity"].ToString(), i);//鐢熶骇璁㈠崟鏁伴噺 this.Model.SetValue("FDayPlanQuantity", dt.Rows[i]["FDayPlanQuantity"].ToString(), i);//鏃ヨ鍒掓暟閲� this.Model.SetValue("FNoScheduled", dt.Rows[i]["FNoScheduled"].ToString(), i);//鏈帓鏁伴噺 - - sql = @"/*dialect*/SELECT * FROM Sc_WorkBillSortBillSub WHERE DATEDIFF(D,GETDATE(),FHMASTERDATE)>=0 and FID=" + dt.Rows[i]["FID"].ToString(); DataTable _dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0]; - foreach (DataRow dr in _dt.Rows) { /* @@ -1077,7 +1034,6 @@ } } } - for (int m = 0; m <= 60; m++) { this.View.GetControl("FT" + "" + m + "").Text = DateNow.AddDays(m).ToShortDateString(); @@ -1087,9 +1043,6 @@ { this.View.ShowErrMessage(ex.Message.ToString()); } - - - } /// <summary> /// 缂栬緫 @@ -1214,35 +1167,23 @@ /// </summary> public void Extraction3() { + string sql = string.Format(@"/*dialect*/ select t1.FID from Sc_WorkBillSortBillMain t1"); + DataTable fidDt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0]; + string FDayPlanWorkID = ""; + foreach (DataRow dr in fidDt.Rows) + { + FDayPlanWorkID += Convert.ToString(dr["FID"]) + ","; + } - //鑾峰彇鍗曟嵁浣撲俊鎭� - Entity entity = this.View.BillBusinessInfo.GetEntity("FEntity"); - //鍗曟嵁浣撲俊鎭浆鎹负鍒楄〃闆嗗悎 - DynamicObjectCollection entityDataObjoct = this.View.Model.GetEntityDataObject(entity); - EntryGrid grid = this.View.GetControl<EntryGrid>("FEntity"); - string FDayPlanWorkID = "";//鏃ュ伐鍗旾D - if (entityDataObjoct.Count == 0) - { - this.View.ShowMessage("璇峰厛鍔犺浇鏁版嵁锛�"); - return; - } - else - { - foreach (DynamicObject current in entityDataObjoct) - { - FDayPlanWorkID += Convert.ToString(current["FDayPlanWorkID"]) + ","; - } - } FDayPlanWorkID = FDayPlanWorkID.Substring(0, FDayPlanWorkID.Length - 1); //鎻愭枡璁″垝棰勫鐞� 娓呯悊鎻愭枡璁″垝鍗曟暟鎹� 鏇存柊閲囪喘璁㈠崟鎻愭枡璁″垝鏁伴噺 - string sql = string.Format(@" - /*dialect*/ + sql = string.Format(@" + exec [鎻愭枡璁″垝棰勫鐞哴 '{0}' ", FDayPlanWorkID.Replace(",", "-")); DBServiceHelper.Execute(Context, sql); - //閲囪喘璁㈠崟鏁版嵁 sql = @" /*dialect*/ @@ -1256,7 +1197,6 @@ "; List<PurchaseInventory> PurchaseInventory = DBServiceHelper.ExecuteDataSet(Context, sql).ToModelList<PurchaseInventory>(); LogHelper.Info("閲囪喘璁㈠崟鏁版嵁" + sql); - sql = string.Format(@" /*dialect*/ @@ -1311,9 +1251,6 @@ { DayPlanPpbom.RemoveAll(p => p.FENTRYID == item.FENTRYID && p.FMATERIALID == item.FMATERIALID); } - - - sql = @"select T1.FID,FDayPlanQuantity,FCOMPLETECOUNT,t2.FHQTY, FHPRDORGID FStockOrgId from SC_WORKBILLSORTBILLMAIN T1 JOIN SC_WORKBILLSORTBILLSUB T2 ON T1.FID=T2.FID WHERE DATEDIFF(D,GETDATE(),FHMASTERDATE) >=0 AND FDayPlanQuantity>FCOMPLETECOUNT AND T1.FID in (" + FDayPlanWorkID + ")"; DataSet Complete = DBServiceHelper.ExecuteDataSet(Context, sql); @@ -1705,6 +1642,516 @@ this.View.ShowMessage("鎿嶄綔鎴愬姛"); // var PODemandPlanList22 = PODemandPlanTemp.GroupBy(p => new {p.FSUPPLIERID, p.FHMASTERDATE }).ToList(); } + /// <summary> + /// 鏃ヨ鍒掔敤鏂欐竻鍗曠敓鎴� + /// </summary> + public void DayPlanPPBomBill() + { + try + { + string sql = string.Format(@" +/*dialect*/ +select t1.FID,t1.FEntryID,t3.FMATERIALID,T5.FNUMBER,t1.FHMASTERDATE,t1.FHQTY,t4.FMATERIALID FMATERIALID2,T6.FNUMBER FNUMBER2,T7.FNUMBER FUNITNUMBER,FNumerator,FDenominator,convert(decimal(18,2),(FNumerator/FDenominator) *t1.FHQTY) FHQtyMust,T4.FUnitID,t8.FNUMBER FUNITNUMBER2,T3.FID FPPBOM,T4.FENTRYID,isnull(T9.FBillNo,'')FBillNo,t10.FNUMBER FORGNUMBER,t11.FNUMBER FHSOURCENUMBER,FSCRAPRATE,FFIXSCRAPQTY,T9.FID AS DayPlanFID +FROM Sc_WorkBillSortBillSub t1 +JOIN Sc_WorkBillSortBillMAIN t2 on t1.FID = t2.FID +JOIN T_PRD_PPBOM T3 on T2.FPRDMOMAINID=t3.FMOID AND T2.FPRDMOENTYID=T3.FMOENTRYID +JOIN T_PRD_PPBOMENTRY T4 ON T3.FID=T4.FID +JOIN T_BD_MATERIAL T5 ON T3.FMATERIALID=T5.FMATERIALID +JOIN T_BD_MATERIAL T6 ON T4.FMATERIALID=T6.FMATERIALID +LEFT JOIN T_BD_UNIT T7 ON T3.FUNITID = T7.FUNITID +LEFT JOIN T_BD_UNIT T8 ON T4.FUNITID = T8.FUNITID + LEFT JOIN Sc_DayPlanPPBomBillMain T9 ON T1.FEntryID=T9.FDayPlanFID + LEFT join T_ORG_Organizations t10 on t2.FHPRDORGID = t10.FORGID + LEFT join T_ENG_WORKCENTER t11 on t2.FHSOURCEID = t11.FID +" +); + DataSet ds = DBServiceHelper.ExecuteDataSet(Context, sql); + DataTable dt = ds.Tables[0]; + List<DayPlanMaterial> DayPlanMaterial = new List<DayPlanMaterial>(); + if (dt.Rows.Count > 0) + { + foreach (DataRow dr in dt.Rows) + { + DayPlanMaterial.Add(new Demo.Model.Model.DayPlanMaterial + { + FID = dr["DayPlanFID"].ToString(), + FEntryID = dr["FEntryID"].ToString(), + FHDate = DateTime.Now.ToString(), + FOrgId = dr["FORGNUMBER"].ToString(), + FHMaterID = dr["FNUMBER"].ToString(), + FHWorkDate = dr["FHMASTERDATE"].ToString(), + FHQty = dr["FHQTY"].ToString(), + FHUnitID = dr["FUNITNUMBER"].ToString(), + FDayPlanFID = dr["FEntryID"].ToString(), + FHMaterSubID = dr["FNUMBER2"].ToString(), + FHUnitSubID = dr["FUNITNUMBER2"].ToString(), + FHQtyMust = dr["FHQtyMust"].ToString(), + FHQtySub = dr["FHQtyMust"].ToString(), + FHPPBomInterID = dr["FPPBOM"].ToString(), + FHPPBomEntryID = dr["FENTRYID"].ToString(), + FHSourceID = dr["FHSOURCENUMBER"].ToString(), + FNumerator = dr["FNumerator"].ToString(), + FDenominator = dr["FDenominator"].ToString(), + FFIXSCRAPQTY = dr["FFIXSCRAPQTY"].ToString(), + FHQtyScrap = dr["FSCRAPRATE"].ToString(), + }); + } + var fidList = DayPlanMaterial.Select(x => x.FEntryID).Distinct().ToList(); + foreach (var item in fidList) + { + var _DayPlanMaterial = DayPlanMaterial.Where(x => x.FEntryID == item).ToList(); + JObject model = new JObject(); + model.Add("FHDate", DateTime.Now); + model.Add("FOrgId", new JObject() { ["Fnumber"] = _DayPlanMaterial[0].FOrgId });//鍙戞枡缁勭粐 + model.Add("FHMaterID", new JObject() { ["Fnumber"] = _DayPlanMaterial[0].FHMaterID });//鐗╂枡 + model.Add("FHWorkDate", _DayPlanMaterial[0].FHWorkDate);//鏃ュ伐鍗曟棩鏈� FHWorkDate + model.Add("FHQty", _DayPlanMaterial[0].FHQty);//涓讳骇鍝佹暟閲忥細FHQty + model.Add("FHUnitID", new JObject() { ["Fnumber"] = _DayPlanMaterial[0].FHUnitID });//鍗曚綅锛欶HUnitID + model.Add("FDayPlanFID", _DayPlanMaterial[0].FDayPlanFID);//鏃ヨ鍒掑伐鍗曞唴鐮� + JArray Entry = new JArray(); + foreach (var _item in _DayPlanMaterial) + { + JObject ModelEnty = new JObject(); + ModelEnty.Add("FHMaterSubID", new JObject() { ["Fnumber"] = _item.FHMaterSubID });//瀛愮墿鏂橣HMaterSubID + ModelEnty.Add("FHUnitSubID", new JObject() { ["Fnumber"] = _item.FHUnitSubID });//鍗曚綅FHUnitSubID + ModelEnty.Add("FHQtyMust", _item.FHQtyMust);//搴斿彂鏁伴噺FHQtyMust + ModelEnty.Add("FHQtySub", _item.FHQtySub);//鏁伴噺FHQtySub + ModelEnty.Add("FHPPBomInterID", _item.FHPPBomInterID);//鐢ㄦ枡娓呭崟涓诲唴鐮丗HPPBomInterID + ModelEnty.Add("FHPPBomEntryID", _item.FHPPBomEntryID);//鐢ㄦ枡娓呭崟瀛愬唴鐮丗HPPBomEntryID + ModelEnty.Add("FHSourceID", new JObject() { ["Fnumber"] = _item.FHSourceID });//鐢熶骇璧勬簮FHSourceID + ModelEnty.Add("FNumerator", _item.FNumerator);//鍒嗘瘝 + ModelEnty.Add("FDenominator", _item.FDenominator);//鍒嗗瓙 + ModelEnty.Add("FFIXSCRAPQTY", _item.FFIXSCRAPQTY);//鍥哄畾鎹熻�� + ModelEnty.Add("FHQtyScrap", _item.FHQtyScrap);//鍙樺姩鎹熻�楃巼% + Entry.Add(ModelEnty); + } + model.Add("FEntity", Entry); + if (!string.IsNullOrEmpty(_DayPlanMaterial[0].FID)) + model.Add("FID", _DayPlanMaterial[0].FID); + JObject jsonRoot = new JObject() + { + ["Creator"] = "", + ["NeedUpDateFields"] = new JArray(), + ["NeedReturnFields"] = new JArray(), + ["IsDeleteEntry"] = "true", + ["SubSystemId"] = "", + ["IsVerifyBaseDataField"] = "false", + ["Model"] = model + }; + + CloudClient cloudClient = new CloudClient("http://localhost/K3Cloud/"); + var result = cloudClient.Save("Paez_Sc_DayPlanPPBomBill", jsonRoot.ToString()); + JObject saveObj = JObject.Parse(result); + string saveIsSuc = saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper(); + if (saveIsSuc != "TRUE") + LogHelper.Error(saveIsSuc); + } + } + } + catch (Exception ex) + { + LogHelper.Error(ex.Message.ToString()); + } + } + /// <summary> + /// 鎻愭枡璁″垝 + /// </summary> + public void Extraction() + { + string sql = string.Format(@"/*dialect*/ select t1.FID from Sc_WorkBillSortBillMain t1"); + DataTable fidDt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0]; + string FDayPlanWorkID = ""; + foreach (DataRow dr in fidDt.Rows) + { + FDayPlanWorkID += Convert.ToString(dr["FID"]) + ","; + } + + FDayPlanWorkID = FDayPlanWorkID.Substring(0, FDayPlanWorkID.Length - 1); + + //鎻愭枡璁″垝棰勫鐞� 娓呯悊鎻愭枡璁″垝鍗曟暟鎹� 鏇存柊閲囪喘璁㈠崟鎻愭枡璁″垝鏁伴噺 + sql = string.Format(@" + + exec [鎻愭枡璁″垝棰勫鐞哴 '{0}' + ", FDayPlanWorkID.Replace(",", "-")); + + DBServiceHelper.Execute(Context, sql); + //閲囪喘璁㈠崟鏁版嵁 + sql = @" + /*dialect*/ +select t1.FID,t1.FBillNo,t2.FENTRYID,t1.FSUPPLIERID,t3.fnumber,t2.FMATERIALID,(t2.FQTY-t2.FPODemandPlanCount)FQTY,FPurchaseOrgId FStockOrgId,t5.FNUMBER FORGNumber,FSTOCKINQTY,FReceiveQty,FCloseStatus,FMRPCLOSESTATUS from t_PUR_POOrder t1 +join t_PUR_POOrderEntry t2 on t1.FID = t2.FID +join t_BD_Supplier t3 on t1.FSUPPLIERID = t3.FSUPPLIERID +join T_PUR_POORDERENTRY_R t4 on t2.FENTRYID = t4.FENTRYID +join T_ORG_Organizations t5 on t1.FPurchaseOrgId = t5.FORGID +where t2.FQTY-t2.FPODemandPlanCount>0 + and FCloseStatus in('A') and FMRPCLOSESTATUS in('A') +"; + List<PurchaseInventory> PurchaseInventory = DBServiceHelper.ExecuteDataSet(Context, sql).ToModelList<PurchaseInventory>(); + LogHelper.Info("閲囪喘璁㈠崟鏁版嵁" + sql); + + sql = string.Format(@" + /*dialect*/ + select T1.*,t5.FFIXLEADTIME,t5.FMAXPOQTY,t5.FMINPOQTY,t6.FNumber from ( +select FHICMOINTERID FID,FHICMOENTRYID FEntryID,FPlanDate FHMASTERDATE,FLackCount NeedQty,FHMATERID FMATERIALID,FHStockOrgID FStockOrgId,FPRDBILLNO FBillNo from JIT_MOMaterReadysBill +)T1 +join t_BD_MaterialBase t4 on T1.FMATERIALID = t4.FMATERIALID +join t_BD_MaterialPlan t5 on T1.FMATERIALID = t5.FMATERIALID +JOIN T_BD_MATERIAL T6 ON T1.FMATERIALID = T6.FMATERIALID +WHERE T1.NeedQty >0 AND FERPCLSID=1 +AND T1.FENTRYID not in (select distinct FHSOURCEENTRYID from CG_PODEMANDPLANBILLSUB where FHSOURCEINTERID IN ({0})) +AND T1.FID in ({0}) +order by FHMASTERDATE +", FDayPlanWorkID); + LogHelper.Info("鎻愭枡鏁版嵁" + sql); + DataSet ds = DBServiceHelper.ExecuteDataSet(Context, sql); + List<DayPlanPpbom> DayPlanPpbom = ds.ToModelList<DayPlanPpbom>(); + + var MaterialIDList = DayPlanPpbom.GroupBy(p => new { p.FMATERIALID, p.FStockOrgId }).Select(x => new PODemandPlanTemp { FMATERIALID = x.Key.FMATERIALID, FStockOrgId = x.Key.FStockOrgId }).ToList(); + var _MaterialIDList = MaterialIDList.Where(p => p.FMATERIALID == "105773").ToList(); + + LogHelper.Info("鐗╂枡琛屾暟" + MaterialIDList.Count); + + //鎻愭枡璁″垝鏁版嵁闆嗕复鏃跺瓨鍌ㄩ泦鍚� + List<PODemandPlanTemp> PODemandPlanTemp = new List<PODemandPlanTemp>(); + //sql闆嗗悎 鏇存柊閲囪喘璁㈠崟鍗犵敤鐨勬彁鏂欒鍒掓暟閲� + List<string> sqlList = new List<string>(); + //MaterialIDList = new List<string> { "105773" }; + foreach (var item in MaterialIDList) + { + LogHelper.Info(item.FMATERIALID.ToString()); + List<DayPlanPpbom> _DayPlanPpbom = DayPlanPpbom.Where(x => x.FMATERIALID == item.FMATERIALID && x.FStockOrgId == item.FStockOrgId).ToList(); + + decimal FMINPOQTY = _DayPlanPpbom.FirstOrDefault().FMINPOQTY;//鏈�灏忚捣璁㈤噺 + double FFIXLEADTIME = _DayPlanPpbom.FirstOrDefault().FFIXLEADTIME;//鎻愬墠鏈� + decimal NeedQty = 0; + DateTime DATE = _DayPlanPpbom.FirstOrDefault().FHMASTERDATE; + int i = 1; + //璁板綍鍦ㄦ渶灏忛噰璐噺闇�姹備笅鐨勬棩璁″垝鏄庣粏FentyrID + List<int> FEntryIdList = new List<int>(); + foreach (var _item in _DayPlanPpbom) + { + + if (NeedQty == 0) + DATE = Convert.ToDateTime(_item.FHMASTERDATE).AddDays(-FFIXLEADTIME); + + FEntryIdList.Add(_item.FENTRYID); + + NeedQty += _item.NeedQty; + if (NeedQty >= FMINPOQTY) + { + List<PurchaseInventory> _PurchaseInventory = PurchaseInventory.Where(x => x.FMATERIALID == item.FMATERIALID && x.FStockOrgId == item.FStockOrgId && x.FQTY > 0).ToList(); + if (_PurchaseInventory.Count == 0) + { + NeedQty = 0; + break; + } + + foreach (var Purchase in _PurchaseInventory) + { + LogHelper.Info("Purchase"); + LogHelper.Info("鐗╂枡锛�" + Purchase.FMATERIALID + ",鏁伴噺锛�" + Purchase.FQTY); + + if (Purchase.FQTY >= NeedQty) + { + List<int> mmm = new List<int>(); + foreach (int id in FEntryIdList) + { + mmm.Add(id); + var DayPlanPpbomls = DayPlanPpbom.Where(c => c.FENTRYID == id && c.FMATERIALID == _item.FMATERIALID).FirstOrDefault(); + PODemandPlanTemp.Add(new Demo.Model.Model.PODemandPlan.PODemandPlanTemp + { + FID = DayPlanPpbomls.FID, + FHMASTERDATE = DATE, + FQty = DayPlanPpbomls.NeedQty, + FBILLNO = DayPlanPpbomls.FBILLNO, + FENTRYID = DayPlanPpbomls.FENTRYID, + FMATERIALID = DayPlanPpbomls.FMATERIALID, + FNumber = DayPlanPpbomls.FNumber, + OLDDATE = DayPlanPpbomls.FHMASTERDATE, + FFIXLEADTIME = FFIXLEADTIME, + + PurchseFID = Purchase.FID, + PurchseFentryID = Purchase.FENTRYID, + FSUPPLIERID = Purchase.FSUPPLIERID, + PurchseFNUMBER = Purchase.FNUMBER, + PurchseFBillNo = Purchase.FBillNo, + PurchseFqty = Purchase.FQTY, + FStockOrgId = Purchase.FStockOrgId, //閲囪喘缁勭粐 + FORGNumber = Purchase.FORGNumber + + }); + //鎵i櫎鏃ヨ鍒掓槑缁嗗凡琚垎閰嶇殑鏁伴噺 + DayPlanPpbomls.NeedQty = 0; + } + FEntryIdList.Clear(); + //鏇存柊閲囪喘璁㈠崟 + sqlList.Add($"/*dialect*/ update t_PUR_POOrderEntry set FPODemandPlanCount =isnull(FPODemandPlanCount,0)+ '{NeedQty}' where FENTRYID = {Purchase.FENTRYID}"); + //鎵i櫎褰撳墠琛屽搴旈噰璐鍗曟暟閲� + var ls = PurchaseInventory.Where(c => c.FENTRYID == Purchase.FENTRYID).FirstOrDefault(); + ls.FQTY -= NeedQty; + break; + } + else + { + NeedQty = NeedQty - Purchase.FQTY; + decimal _NeedQty = Purchase.FQTY;//閲囪喘璁㈠崟鏁伴噺 + List<int> mmm = new List<int>(); + foreach (int id in FEntryIdList) + { + + var DayPlanPpbomls = DayPlanPpbom.Where(c => c.FENTRYID == id && c.FMATERIALID == _item.FMATERIALID).FirstOrDefault(); + decimal Qty = DayPlanPpbomls.NeedQty; + if (Qty > _NeedQty) + Qty = _NeedQty; + _NeedQty = _NeedQty - DayPlanPpbomls.NeedQty; + PODemandPlanTemp.Add(new Demo.Model.Model.PODemandPlan.PODemandPlanTemp + { + FID = DayPlanPpbomls.FID, + FHMASTERDATE = DATE, + FQty = Qty, + FBILLNO = DayPlanPpbomls.FBILLNO, + FENTRYID = DayPlanPpbomls.FENTRYID, + FMATERIALID = DayPlanPpbomls.FMATERIALID, + FNumber = DayPlanPpbomls.FNumber, + OLDDATE = DayPlanPpbomls.FHMASTERDATE, + FFIXLEADTIME = FFIXLEADTIME, + + + PurchseFID = Purchase.FID, + PurchseFentryID = Purchase.FENTRYID, + FSUPPLIERID = Purchase.FSUPPLIERID, + PurchseFNUMBER = Purchase.FNUMBER, + PurchseFBillNo = Purchase.FBillNo, + PurchseFqty = Purchase.FQTY, + FStockOrgId = Purchase.FStockOrgId, //閲囪喘缁勭粐 + FORGNumber = Purchase.FORGNumber + + + }); + DayPlanPpbomls.NeedQty -= Qty; + + //鏇存柊閲囪喘璁㈠崟 + sqlList.Add($"/*dialect*/ update t_PUR_POOrderEntry set FPODemandPlanCount = isnull(FPODemandPlanCount,0)+ '{Qty}' where FENTRYID = {Purchase.FENTRYID}"); + + //鏇存柊Model + var ls = PurchaseInventory.Where(c => c.FENTRYID == Purchase.FENTRYID).FirstOrDefault(); + ls.FQTY -= Qty; + + if (_NeedQty < 0) + { + foreach (var mm in mmm) + { + FEntryIdList.Remove(mm); + } + break; + } + + mmm.Add(id); + } + foreach (var mm in mmm) + { + FEntryIdList.Remove(mm); + } + + } + } + NeedQty = 0; + } + + #region 鍓╀笅涓嶈冻鏃舵寜鏈�灏忛噰璐壒娆$敓鎴� + //鍓╀笅涓嶈冻鏃舵寜鏈�灏忛噰璐壒娆$敓鎴� + //else if (i == _DayPlanPpbom.Count && NeedQty > 0) + //{ + // NeedQty = FMINPOQTY; + // List<PurchaseInventory> _PurchaseInventory = PurchaseInventory.Where(x => x.FMATERIALID == item.FMATERIALID && x.FStockOrgId == item.FStockOrgId && x.FQTY > 0).ToList(); + // if (_PurchaseInventory.Count == 0) + // { + // NeedQty = 0; + // break; + // } + + // foreach (var Purchase in _PurchaseInventory) + // { + // if (Purchase.FQTY >= NeedQty) + // { + + // List<int> mmm = new List<int>(); + // foreach (int id in FEntryIdList) + // { + // mmm.Add(id); + // var DayPlanPpbomls = DayPlanPpbom.Where(c => c.FENTRYID == id && c.FMATERIALID == _item.FMATERIALID).FirstOrDefault(); + // PODemandPlanTemp.Add(new Demo.Model.Model.PODemandPlan.PODemandPlanTemp + // { + // FID = DayPlanPpbomls.FID, + // FHMASTERDATE = DATE, + // FQty = DayPlanPpbomls.NeedQty, + // FBILLNO = DayPlanPpbomls.FBILLNO, + // FENTRYID = DayPlanPpbomls.FENTRYID, + // FMATERIALID = DayPlanPpbomls.FMATERIALID, + // FNumber = DayPlanPpbomls.FNumber, + // OLDDATE = DayPlanPpbomls.FHMASTERDATE, + // FFIXLEADTIME = FFIXLEADTIME, + + // PurchseFID = Purchase.FID, + // PurchseFentryID = Purchase.FENTRYID, + // FSUPPLIERID = Purchase.FSUPPLIERID, + // PurchseFNUMBER = Purchase.FNUMBER, + // PurchseFBillNo = Purchase.FBillNo, + // PurchseFqty = Purchase.FQTY + + // }); + // //鎵i櫎鏃ヨ鍒掓槑缁嗗凡琚垎閰嶇殑鏁伴噺 + // DayPlanPpbomls.NeedQty = 0; + // } + // FEntryIdList.Clear(); + // //鏇存柊閲囪喘璁㈠崟 + // sqlList.Add($"/*dialect*/ update t_PUR_POOrderEntry set FPODemandPlanCount =isnull(FPODemandPlanCount,0)+ '{NeedQty}' where FENTRYID = {Purchase.FENTRYID}"); + // //鎵i櫎褰撳墠琛屽搴旈噰璐鍗曟暟閲� + // var ls = PurchaseInventory.Where(c => c.FENTRYID == Purchase.FENTRYID).FirstOrDefault(); + // ls.FQTY -= NeedQty; + // break; + // } + // else + // { + // NeedQty = NeedQty - Purchase.FQTY; + // decimal _NeedQty = Purchase.FQTY;//閲囪喘璁㈠崟鏁伴噺 + // List<int> mmm = new List<int>(); + // foreach (int id in FEntryIdList) + // { + + // var DayPlanPpbomls = DayPlanPpbom.Where(c => c.FENTRYID == id && c.FMATERIALID == _item.FMATERIALID).FirstOrDefault(); + // decimal Qty = DayPlanPpbomls.NeedQty; + // if (Qty > _NeedQty) + // Qty = _NeedQty; + // _NeedQty = _NeedQty - DayPlanPpbomls.NeedQty; + // PODemandPlanTemp.Add(new Demo.Model.Model.PODemandPlan.PODemandPlanTemp + // { + // FID = DayPlanPpbomls.FID, + // FHMASTERDATE = DATE, + // FQty = Qty, + // FBILLNO = DayPlanPpbomls.FBILLNO, + // FENTRYID = DayPlanPpbomls.FENTRYID, + // FMATERIALID = DayPlanPpbomls.FMATERIALID, + // FNumber = DayPlanPpbomls.FNumber, + // OLDDATE = DayPlanPpbomls.FHMASTERDATE, + // FFIXLEADTIME = FFIXLEADTIME, + + + // PurchseFID = Purchase.FID, + // PurchseFentryID = Purchase.FENTRYID, + // FSUPPLIERID = Purchase.FSUPPLIERID, + // PurchseFNUMBER = Purchase.FNUMBER, + // PurchseFBillNo = Purchase.FBillNo, + // PurchseFqty = Purchase.FQTY + + + // }); + // DayPlanPpbomls.NeedQty -= Qty; + // //鏇存柊閲囪喘璁㈠崟 + // sqlList.Add($"/*dialect*/ update t_PUR_POOrderEntry set FPODemandPlanCount = isnull(FPODemandPlanCount,0)+ '{Qty}' where FENTRYID = {Purchase.FENTRYID}"); + + // //鏇存柊Model + // var ls = PurchaseInventory.Where(c => c.FENTRYID == Purchase.FENTRYID).FirstOrDefault(); + // ls.FQTY -= Qty; + + // if (_NeedQty < 0) + // { + // foreach (var mm in mmm) + // { + // FEntryIdList.Remove(mm); + // } + // break; + // } + + // mmm.Add(id); + // } + // foreach (var mm in mmm) + // { + // FEntryIdList.Remove(mm); + // } + + // } + // } + // NeedQty = 0; + //} + #endregion + i++; + } + } + + var PODemandPlanList222 = PODemandPlanTemp.GroupBy(p => new PODemandPlanTemp { PurchseFNUMBER = p.PurchseFNUMBER, FHMASTERDATE = p.FHMASTERDATE }).Select(x => new PODemandPlanTemp { PurchseFNUMBER = x.Key.PurchseFNUMBER, FHMASTERDATE = x.Key.FHMASTERDATE }).ToList(); + + var PODemandPlanList = PODemandPlanTemp.GroupBy(p => new { p.PurchseFNUMBER, p.FHMASTERDATE }).Select(x => new PODemandPlanTemp { PurchseFNUMBER = x.Key.PurchseFNUMBER, FHMASTERDATE = x.Key.FHMASTERDATE }).ToList(); + + + foreach (var item in PODemandPlanList) + { + DateTime date = item.FHMASTERDATE; + string PurchseFNUMBER = item.PurchseFNUMBER; + + JObject model = new JObject(); + model.Add("FHDate", date); + model.Add("FHRemark", "鐢熶骇璁㈠崟鍙凤細" + "娴嬭瘯鍛㈠憿"); + model.Add("FSupplierID", new JObject() { ["Fnumber"] = PurchseFNUMBER }); + JArray Fentity = new JArray(); + + List<PODemandPlanTemp> _PODemandPlanList = PODemandPlanTemp.Where(x => x.FHMASTERDATE == date && x.PurchseFNUMBER == PurchseFNUMBER).ToList(); + foreach (var _item in _PODemandPlanList) + { + JObject FentityModel = new JObject(); + + FentityModel.Add("FHPURCHASEORGID", new JObject() { ["Fnumber"] = _item.FORGNumber });//閲囪喘缁勭粐 + + FentityModel.Add("FHMaterID", new JObject() { ["Fnumber"] = _item.FNumber });//鐗╂枡 + FentityModel.Add("FHQty", _item.FQty);//鏁伴噺 + FentityModel.Add("FHSourceInterID", _item.FID);//鏃ヨ鍒掑伐鍗旻ID + FentityModel.Add("FHSourceEntryID", _item.FENTRYID);//鏃ヨ鍒掑伐鍗旻ENTRYID + FentityModel.Add("FHSourceBillNo", _item.FBILLNO);//鏃ヨ鍒掑伐鍗曞崟鍙� + FentityModel.Add("FHSourceBillType", "");//鏃ヨ鍒掑伐鍗曠被鍨� + FentityModel.Add("FDayPlanDate", _item.OLDDATE);//鏃ヨ鍒掑伐鍗曠被鍨� + FentityModel.Add("FHRelationQty", _item.PurchseFqty);//鍏宠仈鏁伴噺 + FentityModel.Add("FFIXLEADTIME", _item.FFIXLEADTIME);//鎻愬墠鏈� + + + FentityModel.Add("FPURCHASEORGID", new JObject() { ["Fnumber"] = _item.FORGNumber });//閲囪喘缁勭粐 + FentityModel.Add("FHPOOrderInterID", _item.PurchseFID);// 閲囪喘璁㈠崟鍐呯爜锛欶HPOOrderInterID + FentityModel.Add("FHPOOrderEntryID", _item.PurchseFentryID); //閲囪喘璁㈠崟瀛愬唴鐮侊細FHPOOrderEntryID + FentityModel.Add("FHPOOrderBillNo", _item.PurchseFBillNo); //閲囪喘璁㈠崟鍙凤細FHPOOrderBillNo + Fentity.Add(FentityModel); + } + model.Add("FEntity", Fentity); + JObject jsonRoot = new JObject() + { + ["Creator"] = "", + ["NeedUpDateFields"] = new JArray(), + ["NeedReturnFields"] = new JArray(), + ["IsDeleteEntry"] = "false", + ["SubSystemId"] = "", + ["IsVerifyBaseDataField"] = "false", + ["Model"] = model + }; + + CloudClient cloudClient = new CloudClient("http://localhost/K3Cloud/"); + var result = cloudClient.Save("paez_PODemandPlan", jsonRoot.ToString()); + JObject saveObj = JObject.Parse(result); + string saveIsSuc = saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper(); + + LogHelper.Info("鏈�鍚�"); + LogHelper.Info(jsonRoot.ToString()); + if (saveIsSuc == "TRUE") + { + } + else + { + LogHelper.Error(saveIsSuc); + + } + + } + DBServiceHelper.ExecuteBatch(Context, sqlList); + this.View.ShowMessage("鎿嶄綔鎴愬姛"); + // var PODemandPlanList22 = PODemandPlanTemp.GroupBy(p => new {p.FSUPPLIERID, p.FHMASTERDATE }).ToList(); + } } } -- Gitblit v1.9.1