日计划导入增加生产订单明细行号功能

王 垚

2021-03-01 4b0ac821502f956d7b0acd73f80a384ee41f6a6a

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

@@ -19,6 +19,7 @@
using Kingdee.BOS.Util;
using Kingdee.K3.Core.SCM.STK;
using Kingdee.K3.SCM.ServiceHelper;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using NPOI.HSSF.UserModel;
using NPOI.SS.Formula.Functions;
@@ -136,10 +137,10 @@
        /// <param name="e"></param>    
        public override void EntityRowDoubleClick(Kingdee.BOS.Core.DynamicForm.PlugIn.Args.EntityRowClickEventArgs e)
        {
            LogHelper.Info("[行双击事件]");

            base.EntityRowClick(e);

            DynamicFormShowParameter formPa = new DynamicFormShowParameter();

            if (e.ColKey == "FDELAYLNUM")
            {
                //生产计划平台拖期明细跳转
@@ -154,6 +155,7 @@
                formPa.CustomParams.Add("FHMainICMOEntryID", Convert.ToString(this.View.Model.GetValue("FHMainSourceEntryID", e.Row).ToString()));
                formPa.CustomParams.Add("FHICMOInterID", Convert.ToString(this.View.Model.GetValue("FDayPlanWorkID", e.Row).ToString()));
                formPa.CustomParams.Add("FMatrailId_Id", Convert.ToString((this.View.Model.GetValue("FMatrailId", e.Row) as DynamicObject)["Id"].ToString()));

            }
            this.View.ShowForm(formPa);
        }
@@ -162,13 +164,20 @@
        /// </summary>
        public void ExportExcel()
        {
            string[] Title = new string[] {"销售订单号", "生产订单号", "生产组织", "生产车间", "生产资源", "产品代码", "产品名称", "规格型号", "计量单位",
                "批次号","销售订单数量","生产订单数量","总齐套数量","交货日期","订单等级","T0","T1","T2","T3","T4","T5","T6","T7",
            List<string> Title = new List<string> {"销售订单号", "生产订单号*","生产订单明细行号*", "生产车间*", "生产资源", "产品代码*", "产品名称", "规格型号", "计量单位",
                "批次号","销售订单数量","生产订单数量","总齐套数量","交货日期*","订单等级*"};
            /*
             ,"T0","T1","T2","T3","T4","T5","T6","T7",
                "T8","T9","T10","T11","T12","T13","T14","T15","T16","T17",
                "T18","T19","T20","T21","T22","T23","T24","T25","T26","T27","T28","T29",
                "T30","T31","T32","T33","T34","T35","T36","T37","T38","T39","T40","T41","T42",
                "T43","T44","T45","T46","T47","T48","T49","T50","T51","T52","T53","T54","T55","T56","T57","T58","T59","T60"};

                "T43","T44","T45","T46","T47","T48","T49","T50","T51","T52","T53","T54","T55","T56","T57","T58","T59","T60"
             */
            DateTime date = DateTime.Now;
            for (int i = 0; i < 61; i++)
            {
                Title.Add(date.AddDays(i).ToString("yyyy-MM-dd"));
            }
            string sheetname = "日计划导入模板.xlsx";
            string file = "";
            file = @"D:\办公\K3Cloud\WebSite\TempfilePath\" + sheetname;
@@ -217,7 +226,7 @@

            //设置列名
            HSSFRow row = (HSSFRow)sheet.CreateRow(0);
            for (int i = 0; i < Title.Length; i++)
            for (int i = 0; i < Title.Count; i++)
            {
                ICell cell = (ICell)row.CreateCell(i);
                var rowName = Title[i];
@@ -227,7 +236,7 @@

            //单元格赋值
            //列宽自适应，只对英文和数字有效
            for (int i = 0; i <= Title.Length; i++)
            for (int i = 0; i <= Title.Count; i++)
            {
                sheet.AutoSizeColumn(i);
            }
@@ -356,13 +365,14 @@
            }

            int result = DBServiceHelper.ExecuteBatch(Context, sqlList);
            if (result > 0)
            {
                this.View.ShowMessage("操作成功");
                SearchList();
            }
            else
                this.View.ShowMessage("操作失败，联系管理员！");

            this.View.ShowMessage("操作成功");
            SearchList();
            //if (result > 0)
            //{
            //}
            //else
            //    this.View.ShowMessage("操作失败，联系管理员！");

        }
        /// <summary>
@@ -396,7 +406,7 @@
                {
                    // 需要捕获错误，以确保处理结束时，关闭进度滚动界面
                    // 引入功能实际处理函数
                    this.CompleteSetAnalysisBatch();
                    this.CompleteSetAnalysisBySQL();
                }
                finally
                {
@@ -944,8 +954,8 @@
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
--join t_BD_Stock d on a.FSTOCKID =d.FSTOCKID
--where d.FAvailableComplete<>0
join t_BD_Stock d on a.FSTOCKID =d.FSTOCKID
where d.FAvailableComplete<>0
--where T1.FMATERIALID in (105773)
");
                ListInventory = ds.ToModelList<PRD_Inventory>();
@@ -963,8 +973,8 @@
) 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
--join t_BD_Stock d on a.FSTOCKID =d.FSTOCKID
--where d.FAvailableComplete<>0
join t_BD_Stock d on a.FSTOCKID =d.FSTOCKID
where d.FAvailableComplete<>0
--where T1.FMATERIALID in (105773)
group by T1.FStockOrgId,T1.FMATERIALID
");
@@ -998,7 +1008,7 @@
                Dictionary<string, decimal> occupyDic = new Dictionary<string, decimal>();
                foreach (var item in DatePlanList)
                {
                   

                    //筛选出当日计划数据
                    var _BomList = BomList.Where(x => x.FHMASTERDATE == item.FHMASTERDATE && x.FPRDMOENTYID == item.FPRDMOENTYID).ToList();
                    foreach (var _item in _BomList)
@@ -1180,7 +1190,7 @@
                    this.Model.SetValue("FSEQ", i + 1, i);//序号
                    this.Model.SetValue("FCompleteSetCount", "", i);//总齐套数量
                    this.Model.SetValue("FProOrderCount", dt.Rows[i]["FHOrderNeedQty"].ToString(), i);//生产订单数量 
                    this.Model.SetValue("FSalOrderCount", dt.Rows[i]["FHSeOrderBillNo"].ToString(), i);//销售订单数量
                    this.Model.SetValue("FSalOrderCount", dt.Rows[i]["FHOrderQty"].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("FORGID", dt.Rows[i]["FHPRDORGID"].ToString(), i);//生产组织
@@ -1309,7 +1319,7 @@
                    this.Model.SetValue("FSEQ", i + 1, i);//序号
                    this.Model.SetValue("FCompleteSetCount", "", i);//总齐套数量
                    this.Model.SetValue("FProOrderCount", dt.Rows[i]["FHOrderNeedQty"].ToString(), i);//生产订单数量 
                    this.Model.SetValue("FSalOrderCount", dt.Rows[i]["FHSeOrderBillNo"].ToString(), i);//销售订单数量
                    this.Model.SetValue("FSalOrderCount", dt.Rows[i]["FHOrderQty"].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("FORGID", dt.Rows[i]["FHPRDORGID"].ToString(), i);//生产组织
@@ -1507,11 +1517,14 @@
            {
                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
 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 FPPBOMENTRYID,isnull(T9.FBillNo,'')FBillNo,t10.FNUMBER FORGNUMBER,t11.FNUMBER FHSOURCENUMBER,FSCRAPRATE,FFIXSCRAPQTY,T9.FID AS DayPlanFID,t2.FSCORDERNO,
t3.FMOENTRYID,t3.FBILLNO FPPBOMBILLNO,T4.FSEQ,tc.FOWNERTYPEID,tc.FOWNERID,tc.FEntrustPickOrgId,torg.FNUMBER as FORGNUMBER,t3.FMOID,FIssueType
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_PRD_PPBOMENTRY_C Tc ON T4.FENTRYID=Tc.FENTRYID
join T_ORG_Organizations torg ON tc.FOWNERID = torg.FORGID 
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
@@ -1546,12 +1559,21 @@
                            FHQtyMust = dr["FHQtyMust"].ToString(),
                            FHQtySub = dr["FHQtyMust"].ToString(),
                            FHPPBomInterID = dr["FPPBOM"].ToString(),
                            FHPPBomEntryID = dr["FENTRYID"].ToString(),
                            FHPPBomEntryID = dr["FPPBOMENTRYID"].ToString(),
                            FHSourceID = dr["FHSOURCENUMBER"].ToString(),
                            FNumerator = dr["FNumerator"].ToString(),
                            FDenominator = dr["FDenominator"].ToString(),
                            FFIXSCRAPQTY = dr["FFIXSCRAPQTY"].ToString(),
                            FHQtyScrap = dr["FSCRAPRATE"].ToString(),
                            FMOBILLNO = dr["FSCORDERNO"].ToString(),
                            FMOENTRYID = dr["FMOENTRYID"].ToString(),
                            FPPBOMBILLNO = dr["FPPBOMBILLNO"].ToString(),
                            FPPBOMFSEQ = dr["FSEQ"].ToString(),
                            FOwnerTypeId = dr["FOWNERTYPEID"].ToString(),
                            FOwnerID = dr["FORGNUMBER"].ToString(),
                            FEntrustPickOrgId = dr["FORGNUMBER"].ToString(),
                            FMOID = dr["FMOID"].ToString(),
                            FIssueType = dr["FIssueType"].ToString()
                        });
                    }
                    LogHelper.Info($"日计划用料清单，数据准备完成，保存到Model实体，总行数：{DayPlanMaterial.Count}，耗时：" + sw.Elapsed);
@@ -1562,6 +1584,9 @@
                    {
                        var _DayPlanMaterial = DayPlanMaterial.Where(x => x.FEntryID == item).ToList();
                        JObject model = new JObject();

                        if (!string.IsNullOrEmpty(_DayPlanMaterial[0].FID))
                            model.Add("FID", _DayPlanMaterial[0].FID);
                        model.Add("FHDate", DateTime.Now);
                        model.Add("FOrgId", new JObject() { ["Fnumber"] = _DayPlanMaterial[0].FOrgId });//发料组织
                        model.Add("FHMaterID", new JObject() { ["Fnumber"] = _DayPlanMaterial[0].FHMaterID });//物料
@@ -1585,11 +1610,20 @@
                            ModelEnty.Add("FDwyl", Convert.ToDecimal(_item.FNumerator) / Convert.ToDecimal(_item.FDenominator));//单位用料
                            ModelEnty.Add("FFIXSCRAPQTY", _item.FFIXSCRAPQTY);//固定损耗
                            ModelEnty.Add("FHQtyScrap", _item.FHQtyScrap);//变动损耗率%
                            ModelEnty.Add("FMOBILLNO", _item.FMOBILLNO);//  
                            ModelEnty.Add("FMOENTRYIDINT", _item.FMOENTRYID);//  
                            ModelEnty.Add("FPPBOMBILLNO", _item.FPPBOMBILLNO);//  
                            ModelEnty.Add("FPPBOMFSEQINT", _item.FPPBOMFSEQ);//  
                            ModelEnty.Add("FOwnerTypeId", _item.FOwnerTypeId);//  
                            ModelEnty.Add("FOwnerID", new JObject() { ["Fnumber"] = _item.FOwnerID });// 
                            ModelEnty.Add("FEntrustPickOrgId", new JObject() { ["Fnumber"] = _item.FEntrustPickOrgId });// 
                            ModelEnty.Add("FMOID", _item.FMOID);//  
                            ModelEnty.Add("FISSUETYPE", _item.FIssueType);//  

                            Entry.Add(ModelEnty);
                        }
                        model.Add("FEntity", Entry);
                        //if (!string.IsNullOrEmpty(_DayPlanMaterial[0].FID))
                        //    model.Add("FID", _DayPlanMaterial[0].FID);

                        Fentity.Add(model);
                        if ((i >= 20 || i == fidList.Count) && (i % 20 == 0 || i == fidList.Count))
                        {
@@ -1631,11 +1665,12 @@
        /// </summary>
        public void Extraction()
        {
            LogHelper.Info("[提料计划准备阶段]：测试测试测试测试测试测试测试测试");
            try
            {
                Stopwatch sw = new Stopwatch();
                sw.Start();//开始计时
                string sql = string.Format(@"/*dialect*/ select t1.FID from Sc_WorkBillSortBillMain t1");
                string sql = string.Format(@"/*dialect*/  select distinct FHICMOINTERID FID  from  JIT_MOMaterReadysBill ");
                DataTable fidDt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
                string FDayPlanWorkID = "";
                foreach (DataRow dr in fidDt.Rows)
@@ -1649,6 +1684,7 @@
 exec [提料计划预处理] '{0}'
 ", FDayPlanWorkID.Replace(",", "-"));
                DBServiceHelper.Execute(Context, sql);
                LogHelper.Info("[提料计划准备阶段]提料计划预处理sql：" + sql);
                //采购订单数据
                sql = @"
 /*dialect*/
@@ -1681,15 +1717,16 @@
", FDayPlanWorkID);
                sql = string.Format(@"
 /*dialect*/
SELECT T1.FID,FHMASTERDATE,t1.FEntryID,T1.FBILLNO, FNeedQty,(FLeadtime+FLeadTtime2)FFIXLEADTIME,t5.FMAXPOQTY,FJITBatch FMINPOQTY,FJITMATERIALGROUP,FJITMaterielDemand,FJITSafeStock,t1.FMATERIALID,t6.FNumber,NeedQty, FStockOrgId 
SELECT T1.FID,FHMASTERDATE,t1.FEntryID,T1.FBILLNO, FNeedQty,(FLeadtime+FLeadTtime2)FFIXLEADTIME,t5.FMAXPOQTY,FJITBatch FMINPOQTY,FJITMATERIALGROUP,FJITMaterielDemand,FJITSafeStock,t1.FMATERIALID,t6.FNumber,NeedQty, FStockOrgId ,FErpClsID
FROM   (
select FHICMOINTERID FID,FHICMOENTRYID FEntryID,FPlanDate FHMASTERDATE,FLackCount NeedQty,FHMATERID FMATERIALID,FHStockOrgID FStockOrgId,FPRDBILLNO FBillNo,FSumPlanCount FNeedQty from JIT_MOMaterReadysBill 
select FHICMOINTERID FID,FHICMOENTRYID FEntryID,FPlanDate FHMASTERDATE,FLackCount NeedQty,FHMATERID FMATERIALID,FHStockOrgID FStockOrgId,FPRDBILLNO FBillNo,FSumPlanCount FNeedQty from JIT_MOMaterReadysBill a
right join (select max(FID)FID from JIT_MOMaterReadysBill GROUP BY FHICMOENTRYID,FHMATERID) b on a.FID = b.FID
)T1
JOIN T_BD_MATERIAL T6 ON T1.FMATERIALID = T6.FMATERIALID
join t_BD_MaterialBase t4 on T1.FMATERIALID = t4.FMATERIALID
join t_BD_MaterialPlan t5 on T1.FMATERIALID = t5.FMATERIALID
WHERE  DATEDIFF(D,GETDATE(),FHMASTERDATE) >=0
AND FERPCLSID=1 
AND FERPCLSID in ('1','3') 
AND T1.NeedQty>0
AND T1.FENTRYID not in (select distinct FHSOURCEENTRYID from CG_PODEMANDPLANBILLSUB where FHSOURCEINTERID IN ({0}))
AND T1.FID in ({0}) 
@@ -1700,7 +1737,7 @@
                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();
                var _MaterialIDList = MaterialIDList.Where(p => p.FMATERIALID == "162305").ToList();
                LogHelper.Info("[提料计划准备阶段]总物料行数" + MaterialIDList.Count);
                //提料计划数据集临时存储集合
                List<PODemandPlanTemp> PODemandPlanTemp = new List<PODemandPlanTemp>();
@@ -1726,127 +1763,145 @@
                    string FJITSafeStock = _DayPlanPpbom.FirstOrDefault().FJITSafeStock; //JIT安全库存
                    decimal NeedQty = 0;
                    DateTime DATE = _DayPlanPpbom.FirstOrDefault().FHMASTERDATE;//第一个订货起始日期
                    int i = 1;
                    int i = 0;
                    //记录在最小采购量需求下的日计划明细FentyrID
                    List<int> FEntryIdList = new List<int>();
                    foreach (var _item in _DayPlanPpbom)
                    {
                        i++;
                        _PurchaseInventory = PurchaseInventory.Where(x => x.FMATERIALID == item.FMATERIALID && x.FStockOrgId == item.FStockOrgId && x.FQTY > 0).ToList();
                        if (_PurchaseInventory.Count == 0)
                        {
                            LogHelper.Info("[提料计划开始]当前物料明细无采购信息：" + item.FMATERIALID + " 库存组织：" + item.FStockOrgId);
                            break;
                        }

                        if (NeedQty == 0)
                            DATE = Convert.ToDateTime(_item.FHMASTERDATE).AddDays(-FFIXLEADTIME);
                        FEntryIdList.Add(_item.FENTRYID);
                        NeedQty += _item.NeedQty;
                        if ((FJITmaterialGroup == "总量控制规格类" || FJITmaterialGroup == "订单专用个性类") && FEntryIdList.Count < Convert.ToInt32(FJITMaterielDemand)) //订单专用个性类
                            continue;
                        if (NeedQty >= FMINPOQTY)

                        LogHelper.Info("记录明细id：" + _item.FENTRYID + "");
                        LogHelper.Info("总需求量：" + NeedQty + "");
                        LogHelper.Info("最小起订量：" + FMINPOQTY + "");
                        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)
                            LogHelper.Info("[提料计划]当前物料明细无采购信息：" + item.FMATERIALID + ",数量：" + NeedQty + "，最小起订量：" + FMINPOQTY + "");
                        }

                        if ((FJITmaterialGroup == "总量控制规格类" || FJITmaterialGroup == "订单专用个性类") && FEntryIdList.Count < Convert.ToInt32(FJITMaterielDemand) && i < _DayPlanPpbom.Count) //订单专用个性类
                            continue;

                        //if (NeedQty >= FMINPOQTY)
                        //{
                        foreach (var Purchase in _PurchaseInventory)
                        {
                            LogHelper.Info("物料：" + Purchase.FMATERIALID + ",采购订单数量：" + Purchase.FQTY);
                            if (Purchase.FQTY >= NeedQty)
                            {
                                NeedQty = 0;
                                foreach (int id in FEntryIdList)
                                {
                                    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,
                                        FErpClsID = DayPlanPpbomls.FErpClsID,

                                        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 = 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;
                            }
                            */
                            foreach (var Purchase in _PurchaseInventory)
                            else
                            {
                                //LogHelper.Info("Purchase");
                                //LogHelper.Info("物料：" + Purchase.FMATERIALID + ",数量：" + Purchase.FQTY);
                                if (Purchase.FQTY >= NeedQty)
                                //更新总需求数量
                                NeedQty = NeedQty - Purchase.FQTY;
                                //采购订单数量
                                decimal _NeedQty = Purchase.FQTY;
                                List<int> mmm = new List<int>();
                                foreach (int id in FEntryIdList)
                                {
                                    foreach (int id in FEntryIdList)
                                    {
                                        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,
                                    var DayPlanPpbomls = DayPlanPpbom.Where(c => c.FENTRYID == id && c.FMATERIALID == _item.FMATERIALID).FirstOrDefault();
                                    decimal Qty = DayPlanPpbomls.NeedQty;//订单数量
                                    if (Qty == 0)
                                        LogHelper.Info("订单数量为0");
                                    if (Qty > _NeedQty)
                                        Qty = _NeedQty; //订单数量>采购订单数量 取采购订单

                                            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 = 0;
                                    }
                                    FEntryIdList.Clear();
                                    if (_NeedQty == 0)
                                        LogHelper.Info("订单数量为0");

                                    _NeedQty = _NeedQty - Qty;
                                    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,
                                        FErpClsID = DayPlanPpbomls.FErpClsID,

                                        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)+  '{NeedQty}' 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 -= NeedQty;
                                    break;
                                }
                                else
                                {
                                    //更新总需求数量
                                    NeedQty = NeedQty - Purchase.FQTY;
                                    decimal _NeedQty = Purchase.FQTY;//采购订单数量
                                    List<int> mmm = new List<int>();
                                    foreach (int id in FEntryIdList)
                                    ls.FQTY -= Qty;
                                    if (_NeedQty <= 0)
                                    {
                                        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
                                        foreach (var mm in mmm)
                                        {
                                            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;
                                            FEntryIdList.Remove(mm);
                                        }
                                        mmm.Add(id);
                                        break;
                                    }
                                    foreach (var mm in mmm)
                                    {
                                        FEntryIdList.Remove(mm);
                                    }
                                    mmm.Add(id);
                                }
                                //foreach (var mm in mmm)
                                //{
                                //    FEntryIdList.Remove(mm);
                                //}
                            }
                            NeedQty = 0;
                        }
                        NeedQty = 0;
                        //}
                        #region 剩下不足时按最小采购批次生成
                        //剩下不足时按最小采购批次生成
                        //else if (i == _DayPlanPpbom.Count && NeedQty > 0)
@@ -1951,12 +2006,12 @@
                        //    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();
                LogHelper.Info($"提料计划，数据准备完成，保存到Model实体，总行数：{PODemandPlanList.Count}，耗时：" + sw.Elapsed);
                LogHelper.Info($"提料计划，数据准备完成，保存到Model实体，总行数：{PODemandPlanTemp.Count}，耗时：" + sw.Elapsed);
                int tlmmm = 1;
                JArray FinalyResult = new JArray();
                foreach (var item in PODemandPlanList)
@@ -1986,13 +2041,14 @@
                        FentityModel.Add("FHPOOrderInterID", _item.PurchseFID);// 采购订单内码：FHPOOrderInterID
                        FentityModel.Add("FHPOOrderEntryID", _item.PurchseFentryID); //采购订单子内码：FHPOOrderEntryID
                        FentityModel.Add("FHPOOrderBillNo", _item.PurchseFBillNo); //采购订单号：FHPOOrderBillNo
                        FentityModel.Add("FERPCLSID", _item.FErpClsID); //发料方式
                        Fentity.Add(FentityModel);
                    }
                    model.Add("FEntity", Fentity);
                    FinalyResult.Add(model);
                    if ((tlmmm >= 20 || tlmmm == PODemandPlanList.Count) && (tlmmm % 20 == 0 || tlmmm == PODemandPlanList.Count))
                    {
                        LogHelper.Info("齐套分析批量执行，记录循环的当前条数" + tlmmm);
                        LogHelper.Info("提料计划新增批量执行，记录循环的当前条数" + tlmmm);
                        JObject jsonRoot = new JObject()
                        {
                            ["Creator"] = "",