2020.11.24 测试更改上传

王 垚

2020-11-24 529179f84e3fd76c359d604815788414a540deba

 src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs

@@ -45,7 +45,8 @@
    {
        string _OutServicePath = "";
        string PathName = "日计划导入模板.xlsx";
        List<PRD_Inventory> ListInventory;
        List<PRD_Inventory> ListInventory;//库存明细
        List<PRD_Inventory> ListInventoryByStockOrgId;//物料总库存

        public override void BarItemClick(BarItemClickEventArgs e)
        {
@@ -262,9 +263,21 @@
            else
                sqlwhere += $" and FHSeOrderBillNo='{FSalOrder}'";

            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())   " + sqlwhere;
            //获取单据体信息
            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)
            {

            int result = DBUtils.Execute(Context, sql);
                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();
@@ -272,7 +285,6 @@
            }
            else
                this.View.ShowMessage("操作失败，联系管理员！");

        }
        /// <summary>
        /// 保存功能
@@ -287,11 +299,17 @@
            //单据体信息转换为列表集合
            DynamicObjectCollection entityDataObjoct = this.View.Model.GetEntityDataObject(entity);
            DateTime date = DateTime.Now;

            foreach (DynamicObject current in entityDataObjoct)
            {
                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);
@@ -366,9 +384,12 @@
        }
        public void COMPLETEMAIN()
        {
            //获取当前即时库存
            DataSet ds = DBServiceHelper.ExecuteDataSet(Context, " /*dialect*/ select DISTINCT FBASEQTY,FMATERIALID from T_STK_Inventory");
            //获取当前即时库存 按照物料+货主+库存 展现
            DataSet ds = DBServiceHelper.ExecuteDataSet(Context, @" /*dialect*/ select DISTINCT FBASEQTY,FMATERIALID,FStockOrgId,FOwnerId from T_STK_Inventory order by FBASEQTY");
            ListInventory = ds.ToModelList<PRD_Inventory>();

            ds = DBServiceHelper.ExecuteDataSet(Context, @" /*dialect*/ select   sum(FBASEQTY)FBASEQTY,FMATERIALID,FStockOrgId from T_STK_Inventory group by FMATERIALID, FStockOrgId ");
            ListInventoryByStockOrgId = ds.ToModelList<PRD_Inventory>();

            //获取单据体信息
            Entity entity = this.View.BillBusinessInfo.GetEntity("FEntity");
@@ -389,7 +410,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_Id"].ToString()));
                    this.View.Model.SetValue("FCompleteSetCount", Sum, m);
                    this.View.UpdateView("FCompleteSetCount");
                    //保存齐套数 
@@ -436,8 +457,9 @@
        /// <param name="FMainEntryID"> 生产订单子码</param>
        /// <param name="FDayPlanWorkID"> 日计划工单FID</param>
        /// <param name="FDayPlanWorkID"> 计划总数量</param>
        /// <param name="FStockOrgId"> 库存组织</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 FStockOrgId)
        {
            //FDayPlanWorkID日计划工单ID去删除现有的齐套分析数据
            DBServiceHelper.Execute(Context, "/*dialect*/delete JIT_MOMaterReadysBill where FHICMOInterID = '" + FDayPlanWorkID + "'");
@@ -461,11 +483,12 @@
/*dialect*/
--生产用料清单列表
SELECT T1.FID,T1.FBillNo,T1.FMOBillNO,T1.FMOEntrySeq,T1.FMoId,T1.FMaterialID,T1.FQty,
T2.FMATERIALID FMATERIALID2,T4.FNumber,T2.FNeedQty,isnull(t3.FBASEQTY,0)FBASEQTY
T2.FMATERIALID FMATERIALID2,T4.FNumber,T2.FNeedQty
--,isnull(t3.FBASEQTY,0)FBASEQTY
 FROM T_PRD_PPBOM T1
LEFT JOIN (select FID,MAX(FENTRYID)FENTRYID,SUM(FNeedQty)FNeedQty,FMATERIALID  from T_PRD_PPBOMENTRY where FMoId='{0}'
group by FMATERIALID,FID ) T2 on T1.FID=t2.FID
LEFT JOIN T_STK_Inventory T3 on t2.FMATERIALID = t3.FMATERIALID
--LEFT JOIN T_STK_Inventory T3 on t2.FMATERIALID = t3.FMATERIALID
LEFT JOIN T_BD_MATERIAL T4 on T2.FMATERIALID=T4.FMATERIALID
where t1.FMoId='{0}' and T1.FMaterialID='{1}'
", FMainInterID, FMATERIALID);
@@ -479,7 +502,7 @@
            List<decimal> list = new List<decimal>();
            foreach (var t in PpbomList)
            {
                var ls = ListInventory.Where(c => c.FMATERIALID == t.FMATERIALID2).FirstOrDefault();
                var ls = ListInventoryByStockOrgId.Where(c => c.FMATERIALID == t.FMATERIALID2 && c.FStockOrgId == FStockOrgId).FirstOrDefault();
                if (ls == null)
                {
                    list.Add(0);
@@ -496,53 +519,148 @@
                SumGetComplete = SumPlan;
            foreach (var item in PpbomList)
            {
                decimal jskc = 0;
                var ls = ListInventoryByStockOrgId.Where(c => c.FMATERIALID == item.FMATERIALID2 && c.FStockOrgId == FStockOrgId).FirstOrDefault();
                if (ls != null)
                    jskc = ls.FBASEQTY;
                /*
                及时库存数量 = 系统现有库存
                可用数量 = 及时库存数量
                数量字段 = 齐套量 * 单位用料
                */
                decimal UnitDosage = item.FNeedQty / item.FQty;
                var ls = ListInventory.Where(c => c.FMATERIALID == item.FMATERIALID2).FirstOrDefault();
                if (ls != null)
                    ls.FBASEQTY -= SumGetComplete * (UnitDosage);
                // var _ls = ListInventory.Where(c => c.FMATERIALID == item.FMATERIALID2).DefaultIfEmpty();
                JObject jsonRoot = new JObject();
                jsonRoot.Add("Creator", "");
                jsonRoot.Add("NeedUpDateFields", new JArray());
                jsonRoot.Add("NeedReturnFields", new JArray());
                jsonRoot.Add("IsDeleteEntry", "true");
                jsonRoot.Add("SubSystemId", "");
                jsonRoot.Add("IsVerifyBaseDataField", "");
                JObject jsonModel = new JObject();
                jsonModel.Add("FHMainICMOInterIDr", FMainInterID);//主生产订单主内码
                jsonModel.Add("FHMainICMOEntryID", FMainEntryID);//主生产订单主内码
                decimal UnitDosage = item.FNeedQty / item.FQty;//单位用量
                decimal xhsl = SumGetComplete * (UnitDosage);///消耗数量

                jsonModel.Add("FHICMOInterID", FDayPlanWorkID);//日计划订单主内码
                JObject _jsonRoot = new JObject();
                _jsonRoot.Add("Creator", "");
                _jsonRoot.Add("NeedUpDateFields", new JArray());
                _jsonRoot.Add("NeedReturnFields", new JArray());
                _jsonRoot.Add("IsDeleteEntry", "true");
                _jsonRoot.Add("SubSystemId", "");
                _jsonRoot.Add("IsVerifyBaseDataField", "");
                JObject _jsonModel = new JObject();
                _jsonModel.Add("FHMainICMOInterIDr", FMainInterID);//主生产订单主内码
                _jsonModel.Add("FHMainICMOEntryID", FMainEntryID);//主生产订单主内码
                _jsonModel.Add("FHICMOInterID", FDayPlanWorkID);//日计划订单主内码

                JObject HMaterID = new JObject();
                HMaterID.Add("FNumber", item.FNumber);
                jsonModel.Add("FHMaterID", HMaterID);//FHMaterID 物料
                JObject _HMaterID = new JObject();
                _HMaterID.Add("FNumber", item.FNumber);
                _jsonModel.Add("FHMaterID", _HMaterID);//FHMaterID 物料

                jsonModel.Add("FHStockQty", Convert.ToDecimal(item.FBASEQTY));//及时库存数量
                jsonModel.Add("FHUseQty", Convert.ToDecimal(SumGetComplete * (UnitDosage)));//数量 
                jsonModel.Add("FHLeftQty", Convert.ToDecimal(item.FBASEQTY));//可用数量
                jsonModel.Add("FUnitDosage", Convert.ToDecimal(UnitDosage));//单位用量 .
                _jsonModel.Add("FHStockQty", Convert.ToDecimal(jskc));//及时库存数量
                _jsonModel.Add("FHUseQty", Convert.ToDecimal(xhsl));//数量 
                _jsonModel.Add("FHLeftQty", Convert.ToDecimal(jskc));//可用数量
                _jsonModel.Add("FUnitDosage", Convert.ToDecimal(UnitDosage));//单位用量 .

                jsonModel.Add("FSumPlanCount", Convert.ToDecimal(SumPlan));//FSumPlanCount 计划总数量  
                jsonModel.Add("FCompleteCount", Convert.ToDecimal(SumGetComplete));//FCompleteCount 齐套数量  
                jsonModel.Add("FPRDBILLNO", item.FMOBillNO);//FPRDBILLNO 工单编号  
                _jsonModel.Add("FSumPlanCount", Convert.ToDecimal(SumPlan));//FSumPlanCount 计划总数量  
                _jsonModel.Add("FCompleteCount", Convert.ToDecimal(SumGetComplete));//FCompleteCount 齐套数量  
                _jsonModel.Add("FPRDBILLNO", item.FMOBillNO);//FPRDBILLNO 工单编号  
                _jsonModel.Add("FIdentificat", "1");//标识 

                jsonRoot.Add("Model", jsonModel);
                _jsonRoot.Add("Model", _jsonModel);

                CloudClient cloudClient = new CloudClient("http://localhost/K3Cloud/");
                var result = cloudClient.Save("paez_CompleteAnalysisTemp", jsonRoot.ToString());
                JObject saveObj = JObject.Parse(result);
                string saveIsSuc = saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper();
                CloudClient _cloudClient = new CloudClient("http://localhost/K3Cloud/");
                var _result = _cloudClient.Save("paez_CompleteAnalysisTemp", _jsonRoot.ToString());
                JObject _saveObj = JObject.Parse(_result);
                string _saveIsSuc = _saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper();

                if (saveIsSuc != "TRUE")
                if (_saveIsSuc != "TRUE")
                {
                    this.View.ShowMessage("操作失败，联系管理员！");
                }

                //扣除总库存的数量

                if (ls != null)
                    ls.FBASEQTY -= xhsl;



                List<PRD_Inventory> _ListInventory = ListInventory.Where(c => c.FMATERIALID == item.FMATERIALID2 && c.FStockOrgId == FStockOrgId && c.FBASEQTY > 0).ToList();
                foreach (var Inventory in _ListInventory)
                {
                    //扣除库存数量
                    // Inventory.FBASEQTY;
                    if (xhsl <= 0)
                        break;

                    // var _ls = ListInventory.Where(c => c.FMATERIALID == item.FMATERIALID2).DefaultIfEmpty();
                    JObject jsonRoot = new JObject();
                    jsonRoot.Add("Creator", "");
                    jsonRoot.Add("NeedUpDateFields", new JArray());
                    jsonRoot.Add("NeedReturnFields", new JArray());
                    jsonRoot.Add("IsDeleteEntry", "true");
                    jsonRoot.Add("SubSystemId", "");
                    jsonRoot.Add("IsVerifyBaseDataField", "");
                    JObject jsonModel = new JObject();
                    jsonModel.Add("FHMainICMOInterIDr", FMainInterID);//主生产订单主内码
                    jsonModel.Add("FHMainICMOEntryID", FMainEntryID);//主生产订单主内码
                    jsonModel.Add("FHICMOInterID", FDayPlanWorkID);//日计划订单主内码

                    JObject HMaterID = new JObject();
                    HMaterID.Add("FNumber", item.FNumber);
                    jsonModel.Add("FHMaterID", HMaterID);//FHMaterID 物料


                    DataTable dt = DBServiceHelper.ExecuteDataSet(Context, @"
select FNUMBER
 from T_ORG_Organizations where FORGID='" + FStockOrgId + "'").Tables[0];
                    JObject FHStockOrgID = new JObject();
                    FHStockOrgID.Add("FNumber", dt.Rows[0]["FNUMBER"].ToString());
                    jsonModel.Add("FHStockOrgID", FHStockOrgID);//FHStockOrgID 库存组织

                    jsonModel.Add("FOwnerTypeId", "BD_OwnerOrg");//FHStockOrgID 货主类型

                    dt = DBServiceHelper.ExecuteDataSet(Context, @"
select FNUMBER
 from T_ORG_Organizations where FORGID='" + Inventory.FOwnerId + "'").Tables[0];

                    JObject FOwnerId = new JObject();
                    FOwnerId.Add("FNumber", dt.Rows[0]["FNUMBER"].ToString());
                    jsonModel.Add("FOwnerId", FOwnerId);//FOwnerId 货主

                    jsonModel.Add("FHStockQty", Convert.ToDecimal(Inventory.FBASEQTY));//及时库存数量
                    jsonModel.Add("FHUseQty", Convert.ToDecimal(xhsl > Inventory.FBASEQTY ? Inventory.FBASEQTY : xhsl));//数量 
                    jsonModel.Add("FHLeftQty", Convert.ToDecimal(Inventory.FBASEQTY));//可用数量
                    jsonModel.Add("FUnitDosage", Convert.ToDecimal(UnitDosage));//单位用量 .

                    jsonModel.Add("FSumPlanCount", Convert.ToDecimal(SumPlan));//FSumPlanCount 计划总数量  
                    jsonModel.Add("FCompleteCount", Convert.ToDecimal(SumGetComplete));//FCompleteCount 齐套数量  
                    jsonModel.Add("FPRDBILLNO", item.FMOBillNO);//FPRDBILLNO 工单编号  
                    jsonModel.Add("FIdentificat", "2");//标识 


                    jsonRoot.Add("Model", jsonModel);

                    CloudClient cloudClient = new CloudClient("http://localhost/K3Cloud/");
                    var result = cloudClient.Save("paez_CompleteAnalysisTemp", jsonRoot.ToString());
                    JObject saveObj = JObject.Parse(result);
                    string saveIsSuc = saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper();

                    if (saveIsSuc != "TRUE")
                    {
                        this.View.ShowMessage("操作失败，联系管理员！");
                    }


                    if (xhsl >= Inventory.FBASEQTY)
                    {
                        xhsl = xhsl - Inventory.FBASEQTY;
                        Inventory.FBASEQTY = 0;

                    }
                    else
                    {
                        Inventory.FBASEQTY -= xhsl;
                        xhsl = 0;
                    }





                }

            }
            return SumGetComplete.ToString();
        }
@@ -560,7 +678,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")));
@@ -570,6 +688,16 @@
            }
            else
                sqlwhere += $" and FHSeOrderBillNo='{FSalOrder}'";


            //生产订单号
            string FScOrderMainNo = Convert.ToString((this.Model.GetValue("FScOrderMainNo")));
            if (string.IsNullOrEmpty(FScOrderMainNo))
            {

            }
            else
                sqlwhere += $" and FSCORDERNO='{FScOrderMainNo}'";

            //物料
            if ((this.Model.GetValue("FMatralId") as DynamicObject) != null)
@@ -601,8 +729,8 @@
                    this.Model.SetValue("FSalOrderCount", dt.Rows[i]["FHSeOrderBillNo"].ToString(), i);//销售订单数量
                    this.Model.SetValue("FBatch", dt.Rows[i]["FBatch"].ToString(), i);//批次号
                    this.Model.SetValue("FUnit", dt.Rows[i]["FHUnitID"].ToString(), i);//计量单位
                    this.Model.SetValue("FMatrailId", dt.Rows[i]["FHMaterID"].ToString(), i);//产品代码
                    this.Model.SetValue("FORGID", dt.Rows[i]["FHPRDORGID"].ToString(), i);//生产组织
                    this.Model.SetValue("FMatrailId", dt.Rows[i]["FHMaterID"].ToString(), i);//产品代码
                    this.Model.SetValue("FDeliverydate", dt.Rows[i]["FHOrderCommitDate"].ToString(), i);//交货日期
                    this.Model.SetValue("FOrderLevel", dt.Rows[i]["FHOrderLev"].ToString(), i);//订单等级
                    this.Model.SetValue("FSCOrderNo", dt.Rows[i]["FSCOrderNo"].ToString(), i);//生产订单号
@@ -612,6 +740,12 @@
                    this.Model.SetValue("FHMainSourceInterID", dt.Rows[i]["FPRDMOMAINID"].ToString(), i);//源单主内码FHMainSourceInterID
                    this.Model.SetValue("FHMainSourceEntryID", dt.Rows[i]["FPRDMOENTYID"].ToString(), i);//源单子内码FHMainSourceEntryID
                    this.Model.SetValue("FDayPlanWorkID", dt.Rows[i]["FID"].ToString(), i);//日计划工单FID

                    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);//齐套数量


                    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];
@@ -843,16 +977,21 @@
            DBServiceHelper.Execute(Context, sql);

            //采购订单数据
            sql = @"select t1.FID,t1.FBillNo,t2.FENTRYID,t1.FSUPPLIERID,t3.fnumber,t2.FMATERIALID,(t2.FQTY-t2.FPODemandPlanCount)FQTY from t_PUR_POOrder t1
            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>();

            sql = string.Format(@"
 /*dialect*/
 SELECT T1.FID,FHMATERID,FHMASTERDATE,FHQTY,FCOMPLETECOUNT,FPRDMOMAINID,T2.FENTRYID,T1.FBILLNO, FNeedQty,t5.FFIXLEADTIME,t5.FMAXPOQTY,t5.FMINPOQTY,t3.FMATERIALID,t6.FNumber,FHQTY*FNeedQty NeedQty  FROM  SC_WORKBILLSORTBILLMAIN T1 
 SELECT T1.FID,FHMATERID,FHMASTERDATE,FHQTY,FCOMPLETECOUNT,FPRDMOMAINID,T2.FENTRYID,T1.FBILLNO, FNeedQty,t5.FFIXLEADTIME,t5.FMAXPOQTY,t5.FMINPOQTY,t3.FMATERIALID,t6.FNumber,FHQTY*FNeedQty NeedQty,FHPRDORGID FStockOrgId FROM  SC_WORKBILLSORTBILLMAIN T1 
JOIN SC_WORKBILLSORTBILLSUB T2 ON T1.FID=T2.FID
LEFT JOIN(SELECT T1.FID,max(t2.FMATERIALID)FMATERIALIDMAIN, max(t2.FMoId)FMoId,MAX(FENTRYID) FENTRYID, SUM(convert(decimal(18, 2), FBASENUMERATOR / FBASEDENOMINATOR))FNeedQty, T1.FMATERIALID from T_PRD_PPBOMENTRY  T1
JOIN T_PRD_PPBOM   T2 on t1.FID = t2.FID
@@ -870,15 +1009,98 @@

            DataSet ds = DBServiceHelper.ExecuteDataSet(Context, sql);
            List<DayPlanPpbom> DayPlanPpbom = ds.ToModelList<DayPlanPpbom>();

            //所有物料的库存
            ds = DBServiceHelper.ExecuteDataSet(Context, @" /*dialect*/ select   sum(FBASEQTY)FBASEQTY,FMATERIALID,FStockOrgId from T_STK_Inventory group by FMATERIALID, FStockOrgId ");
            ListInventoryByStockOrgId = ds.ToModelList<PRD_Inventory>();
            List<PODemandPlanTemp> deleteList = new List<PODemandPlanTemp>();
            foreach (var item in DayPlanPpbom)
            {
                string FmaterialID = item.FMATERIALID;
                string FStockOrgId = item.FStockOrgId.ToString();
                decimal NeedQty = item.NeedQty;
                var kcList = ListInventoryByStockOrgId.Where(c => c.FMATERIALID == FmaterialID && c.FStockOrgId == FStockOrgId && c.FBASEQTY > 0).FirstOrDefault();
                if (kcList != null)
                {
                    if (kcList.FBASEQTY >= NeedQty)
                    {
                        deleteList.Add(new PODemandPlanTemp
                        {
                            FENTRYID = item.FENTRYID,
                            FMATERIALID = item.FMATERIALID
                        });
                        kcList.FBASEQTY = kcList.FBASEQTY - NeedQty;
                    }
                    else
                    {
                        item.NeedQty -= kcList.FBASEQTY;
                        kcList.FBASEQTY = 0;
                    }
                }
            }
            foreach (var item in deleteList)
            {
                DayPlanPpbom.RemoveAll(p => p.FENTRYID == item.FENTRYID && p.FMATERIALID == item.FMATERIALID);
            }



            sql = @"select T1.FID,FPLANCOUNT,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 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)
            {
                var _CompleteList = CompleteList.Where(p => p.FID == item).ToList();
                decimal FComplete = _CompleteList.FirstOrDefault().FCOMPLETECOUNT;
                if (FComplete == 0)
                    continue;
                foreach (var _item in _CompleteList)
                {
                    FComplete = FComplete - _item.FHQTY;
                    if (FComplete >= 0)
                    {
                        DayPlanPpbom.RemoveAll(p => p.FENTRYID == _item.FENTRYID);

                    }
                    else
                    {
                        DayPlanPpbom.FindAll(p => p.FENTRYID == _item.FENTRYID).ForEach(x =>
                        {
                            x.NeedQty = -(x.FNeedQty * FComplete);
                        });
                        break;
                    }


                }

            }
            */
            #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();
            // List<string> MaterialIDList = DayPlanPpbom.Select(x => x.FMATERIALID).Distinct().ToList();

            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();

            //提料计划数据集临时存储集合
            List<PODemandPlanTemp> PODemandPlanTemp = new List<PODemandPlanTemp>();
            //sql集合 更新采购订单占用的提料计划数量
            List<string> sqlList = new List<string>();
            foreach (string item in MaterialIDList)
            //MaterialIDList = new List<string> { "105773" };
            foreach (var item in MaterialIDList)
            {
                List<DayPlanPpbom> _DayPlanPpbom = DayPlanPpbom.Where(x => x.FMATERIALID == item).ToList();
                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;//提前期
@@ -897,7 +1119,7 @@
                    NeedQty += _item.NeedQty;
                    if (NeedQty >= FMINPOQTY)
                    {
                        List<PurchaseInventory> _PurchaseInventory = PurchaseInventory.Where(x => x.FMATERIALID == item && x.FQTY > 0).ToList();
                        List<PurchaseInventory> _PurchaseInventory = PurchaseInventory.Where(x => x.FMATERIALID == item.FMATERIALID && x.FStockOrgId == item.FStockOrgId && x.FQTY > 0).ToList();
                        if (_PurchaseInventory.Count == 0)
                        {
                            NeedQty = 0;
@@ -930,16 +1152,17 @@
                                        FSUPPLIERID = Purchase.FSUPPLIERID,
                                        PurchseFNUMBER = Purchase.FNUMBER,
                                        PurchseFBillNo = Purchase.FBillNo,
                                        PurchseFqty = Purchase.FQTY
                                        PurchseFqty = Purchase.FQTY,
                                        FStockOrgId = Purchase.FStockOrgId, //采购组织
                                        FORGNumber = Purchase.FORGNumber

                                    });
                                    //扣除日计划明细已被分配的数量
                                    var _ls = DayPlanPpbom.Where(c => c.FENTRYID == id && c.FMATERIALID == _item.FMATERIALID).FirstOrDefault();
                                    _ls.NeedQty = 0;
                                    DayPlanPpbomls.NeedQty = 0;
                                }
                                FEntryIdList.Clear();
                                //更新采购订单
                                sqlList.Add($"/*dialect*/ update t_PUR_POOrderEntry set FPODemandPlanCount += '{NeedQty}' where FENTRYID = {Purchase.FENTRYID}");
                                sqlList.Add($"/*dialect*/ update t_PUR_POOrderEntry set FPODemandPlanCount  =isnull(FPODemandPlanCount,0)+  '{NeedQty}' where FENTRYID = {Purchase.FENTRYID}");
                                //扣除当前行对应采购订单数量
                                var ls = PurchaseInventory.Where(c => c.FENTRYID == Purchase.FENTRYID).FirstOrDefault();
                                ls.FQTY -= NeedQty;
@@ -947,125 +1170,8 @@
                            }
                            else
                            {
                                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


                                    });

                                    //更新采购订单
                                    sqlList.Add($"/*dialect*/ update t_PUR_POOrderEntry set FPODemandPlanCount += '{Purchase.FQTY}' where FENTRYID = {Purchase.FENTRYID}");
                                    //更新Model
                                    var ls = PurchaseInventory.Where(c => c.FENTRYID == Purchase.FENTRYID ).FirstOrDefault();
                                    ls.FQTY = 0;

                                    var _ls = DayPlanPpbom.Where(c => c.FENTRYID == id && c.FMATERIALID == _item.FMATERIALID).FirstOrDefault();
                                    _ls.NeedQty -= Qty;

                                    if (_NeedQty < 0)
                                    {
                                        foreach (var mm in mmm)
                                        {
                                            FEntryIdList.Remove(mm);
                                        }


                                        break;
                                    }
                                    NeedQty = NeedQty - Qty;
                                    mmm.Add(id);
                                }
                                foreach (var mm in mmm)
                                {
                                    FEntryIdList.Remove(mm);
                                }
                                NeedQty = NeedQty - Purchase.FQTY;
                            }
                        }
                        NeedQty = 0;
                    }
                    //剩下不足时按最小采购批次生成
                    else if (i == _DayPlanPpbom.Count && NeedQty > 0)
                    {
                        NeedQty = FMINPOQTY;
                        List<PurchaseInventory> _PurchaseInventory = PurchaseInventory.Where(x => x.FMATERIALID == item && 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

                                    });
                                    //扣除日计划明细已被分配的数量
                                    var _ls = DayPlanPpbom.Where(c => c.FENTRYID == id && c.FMATERIALID == _item.FMATERIALID).FirstOrDefault();
                                    _ls.NeedQty = 0;
                                }
                                FEntryIdList.Clear();
                                //更新采购订单
                                sqlList.Add($"/*dialect*/ update t_PUR_POOrderEntry set FPODemandPlanCount += '{NeedQty}' where FENTRYID = {Purchase.FENTRYID}");
                                //扣除当前行对应采购订单数量
                                var ls = PurchaseInventory.Where(c => c.FENTRYID == Purchase.FENTRYID).FirstOrDefault();
                                ls.FQTY -= NeedQty;
                                break;
                            }
                            else
                            {
                                decimal _NeedQty = Purchase.FQTY;
                                decimal _NeedQty = Purchase.FQTY;//采购订单数量
                                List<int> mmm = new List<int>();
                                foreach (int id in FEntryIdList)
                                {
@@ -1093,19 +1199,20 @@
                                        FSUPPLIERID = Purchase.FSUPPLIERID,
                                        PurchseFNUMBER = Purchase.FNUMBER,
                                        PurchseFBillNo = Purchase.FBillNo,
                                        PurchseFqty = Purchase.FQTY
                                        PurchseFqty = Purchase.FQTY,
                                        FStockOrgId = Purchase.FStockOrgId, //采购组织
                                        FORGNumber = Purchase.FORGNumber


                                    });
                                    DayPlanPpbomls.NeedQty -= Qty;

                                    //更新采购订单
                                    sqlList.Add($"/*dialect*/ update t_PUR_POOrderEntry set FPODemandPlanCount += '{Purchase.FQTY}' where FENTRYID = {Purchase.FENTRYID}");
                                    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 = 0;

                                    var _ls = DayPlanPpbom.Where(c => c.FENTRYID == id && c.FMATERIALID == _item.FMATERIALID).FirstOrDefault();
                                    _ls.NeedQty -= Qty;
                                    ls.FQTY -= Qty;

                                    if (_NeedQty < 0)
                                    {
@@ -1113,22 +1220,138 @@
                                        {
                                            FEntryIdList.Remove(mm);
                                        }


                                        break;
                                    }
                                    NeedQty = NeedQty - Qty;

                                    mmm.Add(id);
                                }
                                foreach (var mm in mmm)
                                {
                                    FEntryIdList.Remove(mm);
                                }
                                NeedQty = NeedQty - Purchase.FQTY;

                            }
                        }
                        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

                    //                });
                    //                //扣除日计划明细已被分配的数量
                    //                DayPlanPpbomls.NeedQty = 0;
                    //            }
                    //            FEntryIdList.Clear();
                    //            //更新采购订单
                    //            sqlList.Add($"/*dialect*/ update t_PUR_POOrderEntry set FPODemandPlanCount  =isnull(FPODemandPlanCount,0)+  '{NeedQty}' where FENTRYID = {Purchase.FENTRYID}");
                    //            //扣除当前行对应采购订单数量
                    //            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++;
                }
            }
@@ -1153,6 +1376,9 @@
                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);//日计划工单FID
@@ -1163,6 +1389,8 @@
                    FentityModel.Add("FHRelationQty", _item.PurchseFqty);//关联数量
                    FentityModel.Add("FFIXLEADTIME", _item.FFIXLEADTIME);//提前期


                    FentityModel.Add("FPURCHASEORGID", new JObject() { ["Fnumber"] = _item.FORGNumber });//采购组织
                    FentityModel.Add("FHPOOrderInterID", _item.PurchseFID);// 采购订单内码：FHPOOrderInterID
                    FentityModel.Add("FHPOOrderEntryID", _item.PurchseFentryID); //采购订单子内码：FHPOOrderEntryID
                    FentityModel.Add("FHPOOrderBillNo", _item.PurchseFBillNo); //采购订单号：FHPOOrderBillNo