From ee97c386f74d12af74e39a08eae455f2e94288de Mon Sep 17 00:00:00 2001 From: 王 垚 <1402714037@qq.com> Date: 星期一, 23 十一月 2020 09:31:20 +0800 Subject: [PATCH] 生产计划导入 平台 测试更改 --- src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs index 85e5725..472cc10 100644 --- a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs +++ b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs @@ -406,7 +406,7 @@ } double Sum = 100; - Sum = Convert.ToDouble(SumGetComplete(current["FMatrailId_Id"].ToString(), current["FHMainSourceInterID"].ToString(), current["FHMainSourceEntryID"].ToString(), current["FDayPlanWorkID"].ToString(), SumPlan)); + Sum = Convert.ToDouble(SumGetComplete(current["FMatrailId_Id"].ToString(), current["FHMainSourceInterID"].ToString(), current["FHMainSourceEntryID"].ToString(), current["FDayPlanWorkID"].ToString(), SumPlan, current["FORGID"].ToString())); this.View.Model.SetValue("FCompleteSetCount", Sum, m); this.View.UpdateView("FCompleteSetCount"); //淇濆瓨榻愬鏁� @@ -454,7 +454,7 @@ /// <param name="FDayPlanWorkID"> 鏃ヨ鍒掑伐鍗旻ID</param> /// <param name="FDayPlanWorkID"> 璁″垝鎬绘暟閲�</param> /// <returns></returns> - public string SumGetComplete(string FMATERIALID, string FMainInterID, string FMainEntryID, string FDayPlanWorkID, decimal SumPlan) + public string SumGetComplete(string FMATERIALID, string FMainInterID, string FMainEntryID, string FDayPlanWorkID, decimal SumPlan, string sc) { //FDayPlanWorkID鏃ヨ鍒掑伐鍗旾D鍘诲垹闄ょ幇鏈夌殑榻愬鍒嗘瀽鏁版嵁 DBServiceHelper.Execute(Context, "/*dialect*/delete JIT_MOMaterReadysBill where FHICMOInterID = '" + FDayPlanWorkID + "'"); @@ -577,7 +577,7 @@ { string FProWorkShopId = (this.Model.GetValue("FProWorkShopId") as DynamicObject)["Id"].ToString(); if (!string.IsNullOrEmpty(FProWorkShopId)) - sqlwhere += $" and FProductWorkShopId='{FProWorkShopId}'"; + sqlwhere += $" and FHWorkShopID='{FProWorkShopId}'"; } //閿�鍞鍗曞彿 string FSalOrder = Convert.ToString((this.Model.GetValue("FSalOrder"))); @@ -640,8 +640,8 @@ 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("FProductWorkShopId", dt.Rows[i]["FHSourceID"].ToString(), i);//鐢熶骇杞﹂棿 - this.Model.SetValue("FResourcesId", dt.Rows[i]["FHWorkShopID"].ToString(), i);//鐢熶骇璧勬簮 + this.Model.SetValue("FResourcesId", dt.Rows[i]["FHSourceID"].ToString(), i);//鐢熶骇璧勬簮 + this.Model.SetValue("FProductWorkShopId", dt.Rows[i]["FHWorkShopID"].ToString(), i);//鐢熶骇杞﹂棿 sql = @"/*dialect*/SELECT * FROM Sc_WorkBillSortBillSub WHERE DATEDIFF(D,GETDATE(),FHMASTERDATE)>=0 and FID=" + dt.Rows[i]["FID"].ToString(); @@ -906,6 +906,9 @@ JOIN SC_WORKBILLSORTBILLSUB T2 ON T1.FID=T2.FID WHERE DATEDIFF(D,GETDATE(),FHMASTERDATE) >=0 AND FPLANCOUNT>FCOMPLETECOUNT AND T1.FID in (" + FDayPlanWorkID + ")"; DataSet Complete = DBServiceHelper.ExecuteDataSet(Context, sql); List<DayPlanPpbom> CompleteList = ds.ToModelList<DayPlanPpbom>(); + + #region + /* //FID闆嗗悎 var FIDList = CompleteList.Select(x => x.FID).Distinct().ToList(); foreach (var item in FIDList) @@ -935,6 +938,12 @@ } } + */ + #endregion + //鑾峰彇褰撳墠鍗虫椂搴撳瓨 + DataSet JSKCds = DBServiceHelper.ExecuteDataSet(Context, " /*dialect*/ select DISTINCT FBASEQTY,FMATERIALID,FStockOrgId,FOwnerId from T_STK_Inventory"); + var InventoryList = ds.ToModelList<PRD_Inventory>(); + //鐗╂枡闆嗗悎 鐢辩墿鏂欏幓鍒嗙粍 List<string> MaterialIDList = DayPlanPpbom.Select(x => x.FMATERIALID).Distinct().ToList(); -- Gitblit v1.9.1