From 4c23c16bdda552f6e8c027de9f3e0bb1a7d210cb Mon Sep 17 00:00:00 2001 From: 王 垚 <1402714037@qq.com> Date: 星期四, 25 三月 2021 15:21:26 +0800 Subject: [PATCH] 生产计划平台导入优化 --- src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs | 81 +++++++++++++++++++++++++++++----------- 1 files changed, 59 insertions(+), 22 deletions(-) diff --git a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs index d1f3ea9..79eab08 100644 --- a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs +++ b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs @@ -256,7 +256,7 @@ jObject.Put("desc", "璇风偣鍑绘墦寮�闄勪欢锛�"); jObject.Put("urltitle", "杩欐槸鏂囦欢鍚�"); this.View.AddAction(JSAction.openUrlWindow, new JSONArray { jObject }); - } + } /// <summary> /// 閿佸畾 /// </summary> @@ -316,7 +316,7 @@ Entity entity = this.View.BillBusinessInfo.GetEntity("FEntity"); //鍗曟嵁浣撲俊鎭浆鎹负鍒楄〃闆嗗悎 DynamicObjectCollection entityDataObjoct = this.View.Model.GetEntityDataObject(entity); - DateTime date = DateTime.Now; + DateTime date = Convert.ToDateTime(DateTime.Now.ToString("d")); string _result = ""; @@ -334,34 +334,71 @@ foreach (DynamicObject current in entityDataObjoct) { - sql = $"/*dialect*/ update Sc_WorkBillSortBillMain set FOrderQuantity={current["FOrderQuantity"]},FDayPlanQuantity={current["FDayPlanQuantity"]},FNoScheduled={current["FNoScheduled"]} where FID = {current["FDayPlanWorkID"]}"; - sqlList.Add(sql); - DateTime FBzDate = Convert.ToDateTime(Convert.ToDateTime(current["FBzDate"])); - DateTime end = Convert.ToDateTime(Convert.ToDateTime(current["FBzDate"]).AddDays(60).ToShortDateString());//鏈�澶ф棩鏈� + JObject jsonRoot = new JObject(); + jsonRoot.Add("Creator", ""); + jsonRoot.Add("NeedUpDateFields", new JArray()); + jsonRoot.Add("NeedReturnFields", new JArray()); + jsonRoot.Add("IsDeleteEntry", "false"); + jsonRoot.Add("SubSystemId", ""); + jsonRoot.Add("IsVerifyBaseDataField", ""); + JObject jsonModel = new JObject(); + jsonModel.Add("FID", Convert.ToString(current["FDayPlanWorkID"])); + jsonModel.Add("FOrderQuantity", Convert.ToString(current["FOrderQuantity"])); + jsonModel.Add("FDayPlanQuantity", Convert.ToString(current["FDayPlanQuantity"])); + jsonModel.Add("FNoScheduled", Convert.ToString(current["FNoScheduled"])); + + sql = $" /*dialect*/ select FEntryID, FHMASTERDATE from SC_WORKBILLSORTBILLSub where FID={Convert.ToString(current["FDayPlanWorkID"])} "; + List<DayPlanModel> dayPlanModel = new List<DayPlanModel>(); + dayPlanModel = DBServiceHelper.ExecuteDataSet(Context, sql).ToModelList<DayPlanModel>(); + + JArray Entry = new JArray(); for (int i = 0; i <= 60; i++) { - DateTime start = Convert.ToDateTime(date.AddDays(i).ToShortDateString()); - TimeSpan getDay = end.Subtract(start); - //缂栧埗鏃ユ湡+61澶�>date.AddDays(i).ToShortDateString() continue - if (getDay.Days < 0) - break; - sql = $"/*dialect*/update t1 set FHQTY='{Convert.ToString(current["FT" + "" + i + ""])}' from Sc_WorkBillSortBillSub t1 join " + - $" Sc_WorkBillSortBillMain t2 on t1.FID = t2.FID where FHMASTERDATE='{date.AddDays(i).ToShortDateString()}' and t2.FID='{Convert.ToString(current["FDayPlanWorkID"])}'"; - sqlList.Add(sql); + if (Convert.ToString(current["FT" + "" + i + ""]) == "" || Convert.ToString(current["FT" + "" + i + ""]) == "0") + continue; + JObject jsonFPOOrderEntry = new JObject(); + jsonFPOOrderEntry.Add("FHMasterDate", date.AddDays(i).ToShortDateString()); ;//涓绘棩鏈� + jsonFPOOrderEntry.Add("FHQty ", Convert.ToString(current["FT" + "" + i + ""])); ;//鏃ヨ鍒掓暟閲� + List<DayPlanModel> _dayPlanModel = dayPlanModel.Where(x => x.FHMASTERDATE == date.AddDays(i)).ToList(); + if (_dayPlanModel.Count > 0) + { + jsonFPOOrderEntry.Add("FEntryID", _dayPlanModel.FirstOrDefault().FEntryID); ;//搴忓彿 + } + Entry.Add(jsonFPOOrderEntry); } + jsonModel.Add("FEntity", Entry); + jsonRoot.Add("Model", jsonModel); + CloudClient cloudClient = new CloudClient("http://localhost//k3cloud/"); + var result = cloudClient.Save("Paez_Sc_WorkBillAutoSortBill", jsonRoot.ToString()); + JObject saveObj = JObject.Parse(result); + string saveIsSuc = saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper(); + if (saveIsSuc != "TRUE") + { + LogHelper.Error("鐢熶骇璁″垝骞冲彴淇濆瓨澶辫触:" + jsonRoot.ToString()); + this.View.ShowMessage("鏁版嵁鍌ㄥ瓨澶辫触锛佽鑱旂郴绠$悊鍛橈紒"); + } + + + //sql = $"/*dialect*/ update Sc_WorkBillSortBillMain set FOrderQuantity={current["FOrderQuantity"]},FDayPlanQuantity={current["FDayPlanQuantity"]},FNoScheduled={current["FNoScheduled"]} where FID = {current["FDayPlanWorkID"]}"; + //sqlList.Add(sql); + //DateTime FBzDate = Convert.ToDateTime(Convert.ToDateTime(current["FBzDate"])); + //DateTime end = Convert.ToDateTime(Convert.ToDateTime(current["FBzDate"]).AddDays(60).ToShortDateString());//鏈�澶ф棩鏈� + //for (int i = 0; i <= 60; i++) + //{ + // DateTime start = Convert.ToDateTime(date.AddDays(i).ToShortDateString()); + // TimeSpan getDay = end.Subtract(start); + // //缂栧埗鏃ユ湡+61澶�>date.AddDays(i).ToShortDateString() continue + // if (getDay.Days < 0) + // break; + // sql = $"/*dialect*/update t1 set FHQTY='{Convert.ToString(current["FT" + "" + i + ""])}' from Sc_WorkBillSortBillSub t1 join " + + // $" Sc_WorkBillSortBillMain t2 on t1.FID = t2.FID where FHMASTERDATE='{date.AddDays(i).ToShortDateString()}' and t2.FID='{Convert.ToString(current["FDayPlanWorkID"])}'"; + // sqlList.Add(sql); + //} } - int result = DBServiceHelper.ExecuteBatch(Context, sqlList); - this.View.ShowMessage("鎿嶄綔鎴愬姛"); SearchList(); - //if (result > 0) - //{ - //} - //else - // this.View.ShowMessage("鎿嶄綔澶辫触锛岃仈绯荤鐞嗗憳锛�"); - } /// <summary> /// 榻愬鍒嗘瀽 -- Gitblit v1.9.1