Merge branch 'dev' of http://123.60.180.165:4647/ZZYDOP/DOPCore into dev

MicroServices/Business/Business.Application.Contracts/ReplenishmentManagement/IReplenishmentAppService.cs

@@ -0,0 +1,26 @@
+using Business.Dto;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Business.ReplenishmentManagement
+{
+    public interface IReplenishmentAppService
+    {
+        /// <summary>
+        /// 调整ROP和最高库存水位
+        /// </summary>
+        Task<string> CalcROP(InputDto input);
+
+        /// <summary>
+        /// 检查所有成品半成品原材料是否需要补货先判断SS再判断ROP
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        Task<string> DayCheckAllByFinalGoods(InputDto input);
+
+        Task<string> LongPeriodItemPR(InputDto input, int month);
+    }
+}

MicroServices/Business/Business.Application.Contracts/ResourceExamineManagement/IResourceExamineAppService.cs

@@ -36,7 +36,7 @@ namespace Business.ResourceExamineManagement
         Task<string> ReceiveResult(string ids, int type,string companyid);
 
         /// <summary>
-        /// 按日期范围工单检查
+        /// 自动下达
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
@@ -50,7 +50,7 @@ namespace Business.ResourceExamineManagement
         Task<string> SubstituteResourceCheck(int day, string workOrd);
 
         /// <summary>
-        /// 计划工单齐套检查
+        /// 计划工单资源检查
         /// </summary>
         /// <param name="workOrds"></param>
         /// <returns></returns>
@@ -99,7 +99,7 @@ namespace Business.ResourceExamineManagement
         Task<string> PrApprove(string ids);
 
         /// <summary>
-        /// 按工单检查
+        /// 手动按工单下达
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
@@ -118,16 +118,5 @@ namespace Business.ResourceExamineManagement
         /// <param name="dto"></param>
         /// <returns></returns>
         Task<string> BindingSubstitute(BindingSubstituteDto dto);
-
-        /// <summary>
-        /// 更新补货模型月度参数
-        /// </summary>
-        Task<string> WeekPlanParms(InputDto input);
-
-        /// <summary>
-        /// 更新周计划
-        /// </summary>
-        Task<string> WeekPlan(InputDto input);
-
     }
 }

MicroServices/Business/Business.Application/ReplenishmentManagement/ReplenishmentAppService.cs

@@ -0,0 +1,1818 @@
+using Business.Core.Utilities;
+using Business.Domain;
+using Business.Dto;
+using Business.EntityFrameworkCore;
+using Business.EntityFrameworkCore.SqlRepositories;
+using Business.PriorityManagement;
+using Business.ReplenishmentManagement;
+using Business.ResourceExamineManagement.Dto;
+using Business.ResourceExamineManagement;
+using Business.SaleForecast;
+using Business.StructuredDB.SaleFcst;
+using Business.StructuredDB.WMS;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Volo.Abp.Application.Services;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Domain.Repositories;
+using Volo.Abp.MultiTenancy;
+using Volo.Abp.Uow;
+using Newtonsoft.Json;
+using EFCore.BulkExtensions;
+using Business.Core.Enum;
+using Org.BouncyCastle.Crypto;
+
+namespace Business.Replenishment
+{
+    /// <summary>
+    /// 产能分析
+    /// </summary>
+    public class ReplenishmentAppService : ApplicationService, IReplenishmentAppService, ITransientDependency
+    {
+        #region 服务
+        /// <summary>
+        /// 雪花算法
+        /// </summary>
+        SnowFlake help = new SnowFlake();
+        private readonly IRepository<ReplenishmentModel, long> _replenishmentModel;
+        private readonly IRepository<DomesticTerminalFcst, long> _domesticTerminalFcst;
+        private readonly ISqlRepository<ASNBOLShipperDetail> _ASNBOLShipperDetail;
+        private readonly IRepository<StandardItemModelSet, long> _standardItemModelSet;
+        private readonly ISqlRepository<InvTransHist> _invTransHist;
+        private readonly ISqlRepository<SAPInv> _SAPInv;
+        private readonly IRepository<srm_purchase, long> _srmPurchase;
+        private readonly ISqlRepository<MonthlyShipmentPlan> _monthlyShipmentPlan;
+        private readonly ISqlRepository<GeneralizedCodeMaster> _generalizedCodeMaster;
+        private readonly ISqlRepository<rf_serialnumber> _rf_serialnumber;
+        private readonly ISqlRepository<LocationDetail> _locationDetail;
+        private readonly IRepository<mo_ic_item, long> _ic_item;
+        private readonly IRepository<ic_item, long> _mysql_ic_item;
+        private readonly ISqlRepository<ItemMaster> _itemMaster;
+        private readonly IRepository<mo_srm_pr_main, long> _srm_pr_main;
+        private readonly IRepository<srm_pr_main, long> _mysql_srm_pr_main;
+        private readonly IRepository<mo_srm_po_occupy, long> _srm_po_occupy;
+        private readonly IRepository<srm_po_occupy, long> _mysql_srm_po_occupy;
+        private readonly IRepository<mo_mes_morder, long> _mes_morder;
+        private readonly IRepository<mo_mes_moentry, long> _mes_moentry;
+        private readonly IRepository<mo_mes_mooccupy, long> _mes_mooccupy;
+        private readonly IRepository<mes_mooccupy, long> _mysql_mes_mooccupy;
+        private readonly IRepository<b_bom_pretreatment, long> _mysql_b_bom_pretreatment;
+        private readonly ISqlRepository<WorkOrdMaster> _workOrdMaster;
+        private readonly ISqlRepository<ProdLineDetail> _prodLineDetail;
+        private readonly IRepository<mo_ic_bom, long> _ic_bom;
+        private readonly IRepository<ic_bom, long> _mysql_ic_bom;
+        private readonly IRepository<mo_ic_bom_child, long> _ic_bom_child;
+        private readonly IRepository<ic_bom_child, long> _mysql_ic_bom_child;
+        private readonly ISqlRepository<HolidayMaster> _holidayMaster;
+        private readonly IRepository<mo_ic_item_stockoccupy, long> _ic_item_stockoccupy;
+        private readonly IRepository<ic_item_stockoccupy, long> _mysql_ic_item_stockoccupy;
+        private readonly IRepository<mo_ic_item_stock, long> _ic_item_stock;
+        private readonly IRepository<ic_item_stock, long> _mysql_ic_item_stock;
+        private readonly IRepository<mo_ic_substitute, long> _ic_substitute;
+        private readonly IRepository<mo_ic_substitute_group, long> _ic_substitute_group;
+        private readonly IRepository<mo_ic_substitute_group_detail, long> _ic_substitute_group_detail;
+        private readonly IRepository<ic_substitute, long> _mysql_ic_substitute;
+        private readonly IRepository<ic_substitute_group, long> _mysql_ic_substitute_group;
+        private readonly IRepository<ic_substitute_group_detail, long> _mysql_ic_substitute_group_detail;
+        private readonly IRepository<mes_moentry, long> _mysql_mes_moentry;
+        private readonly ISqlRepository<WorkOrdDetail> _workOrdDetail;
+        private readonly IRepository<mo_srm_po_list, long> _srm_po_list;
+        private readonly IRepository<srm_po_list, long> _mysql_srm_po_list;
+        private readonly ISqlRepository<RoutingOpDetail> _routingOpDetail;
+        private readonly ISqlRepository<ProductStructureMaster> _productStructureMaster;
+        private readonly ISqlRepository<ShopCalendarWorkCtr> _shopCalendarWorkCtr;
+        private readonly ISqlRepository<PeriodSequenceDet> _periodSequenceDet;
+        private readonly ISqlRepository<QualityLineWorkDetail> _qualityLineWorkDetail;
+        private readonly IRepository<mo_srm_po_main, long> _srm_po_main;
+        private readonly IRepository<srm_po_main, long> _mysql_srm_po_main;
+        private readonly IRepository<mo_srm_purchase, long> _srm_purchase;
+        private readonly IRepository<srm_purchase, long> _mysql_srm_purchase;
+        private readonly IRepository<mes_morder, long> _mysql_mes_morder;
+        private readonly IRepository<crm_seorderentry, long> _mysql_crm_seorderentry;
+        private readonly IRepository<mo_mes_oorder, long> _mes_oorder;
+        private readonly ISqlRepository<ScheduleResultOpMaster> _scheduleResultOpMaster;
+        /// <summary>
+        /// 在途检查
+        /// </summary>
+        private readonly PurchaseOrderAppService _purchaseOrderAppService;
+        /// <summary>
+        /// 计算BOM平铺物料情况
+        /// </summary>
+        private readonly CalcBomViewAppService _CalcBomViewAppService;
+
+        /// <summary>
+        /// 预处理
+        /// </summary>
+        private readonly PretreatmentAppService _pretreatmentAppService;
+        /// <summary>
+        /// 资源检查入参
+        /// </summary>
+        private readonly SeorderentryDto param = new SeorderentryDto();
+        /// <summary>
+        /// 生产线明细表
+        /// </summary>
+        public List<ProdLineDetail> prodLines = new List<ProdLineDetail>();
+
+        /// <summary>
+        /// 标准工艺路径表
+        /// </summary>
+        public List<RoutingOpDetail> routingOps = new List<RoutingOpDetail>();
+
+        /// <summary>
+        /// 排产记录表
+        /// </summary>
+        public List<PeriodSequenceDet> periodSequences = new List<PeriodSequenceDet>();
+
+        /// <summary>
+        /// 工作日历
+        /// </summary>
+        public List<ShopCalendarWorkCtr> calendarWorks = new List<ShopCalendarWorkCtr>();
+
+        /// <summary>
+        /// 休息时间段
+        /// </summary>
+        public List<QualityLineWorkDetail> qualityLineWorks = new List<QualityLineWorkDetail>();
+
+        /// <summary>
+        /// 节假日
+        /// </summary>
+        public List<HolidayMaster> holidays = new List<HolidayMaster>();
+        private List<ICItemLeadTimeDto> leadTimeList;
+        private List<mo_srm_purchase> supplierList;
+        private readonly BusinessBangDbContext _businessBangDbContext;
+        private readonly BusinessDbContext _businessDbContext;
+        private readonly ICurrentTenant _currentTenant;
+        private readonly IUnitOfWorkManager _unitOfWorkManager;
+        #endregion
+
+        #region 构造函数
+        /// <summary>
+        /// 构造函数
+        /// </summary>
+        public ReplenishmentAppService(
+            IRepository<ReplenishmentModel, long> replenishmentModel,
+            IRepository<DomesticTerminalFcst, long> domesticTerminalFcst,
+            ISqlRepository<ASNBOLShipperDetail> ASNBOLShipperDetail,
+            IRepository<StandardItemModelSet, long> standardItemModelSet,
+            ISqlRepository<InvTransHist> invTransHist,
+            ISqlRepository<SAPInv> SAPInv,
+            IRepository<srm_purchase, long> srmPurchase,
+            ISqlRepository<MonthlyShipmentPlan> monthlyShipmentPlan,
+            ISqlRepository<GeneralizedCodeMaster> generalizedCodeMaster, 
+            ISqlRepository<rf_serialnumber> rf_serialnumber, 
+            ISqlRepository<LocationDetail> locationDetail,
+            IRepository<mo_ic_item, long> ic_item,
+            IRepository<ic_item, long> mysql_ic_item,
+            ISqlRepository<ItemMaster> itemMaster,
+            IRepository<mo_srm_pr_main, long> srm_pr_main,
+            IRepository<srm_pr_main, long> mysql_srm_pr_main,
+            IRepository<mo_srm_po_occupy, long> srm_po_occupy,
+            IRepository<srm_po_occupy, long> mysql_srm_po_occupy,
+            IRepository<mo_mes_morder, long> mes_morder,
+            IRepository<mo_mes_moentry, long> mes_moentry,
+            IRepository<mo_mes_mooccupy, long> mes_mooccupy,
+            IRepository<mes_mooccupy, long> mysql_mes_mooccupy,
+            IRepository<b_bom_pretreatment, long> mysql_b_bom_pretreatment,
+            ISqlRepository<WorkOrdMaster> workOrdMaster,
+            ISqlRepository<ProdLineDetail> prodLineDetail,
+            IRepository<mo_ic_bom, long> ic_bom,
+            IRepository<ic_bom, long> mysql_ic_bom,
+            IRepository<mo_ic_bom_child, long> ic_bom_child,
+            IRepository<ic_bom_child, long> mysql_ic_bom_child,
+            ISqlRepository<HolidayMaster> holidayMaster,
+            IRepository<mo_ic_item_stockoccupy, long> ic_item_stockoccupy,
+            IRepository<ic_item_stockoccupy, long> mysql_ic_item_stockoccupy,
+            IRepository<mo_ic_item_stock, long> ic_item_stock,
+            IRepository<ic_item_stock, long> mysql_ic_item_stock,
+            IRepository<mo_ic_substitute, long> ic_substitute,
+            IRepository<mo_ic_substitute_group, long> ic_substitute_group,
+            IRepository<mo_ic_substitute_group_detail, long> ic_substitute_group_detail,
+            IRepository<ic_substitute, long> mysql_ic_substitute,
+            IRepository<ic_substitute_group, long> mysql_ic_substitute_group,
+            IRepository<ic_substitute_group_detail, long> mysql_ic_substitute_group_detail,
+            IRepository<mes_moentry, long> mysql_mes_moentry,
+            ISqlRepository<WorkOrdDetail> workOrdDetail,
+            IRepository<mo_srm_po_list, long> srm_po_list,
+            IRepository<srm_po_list, long> mysql_srm_po_list,
+            ISqlRepository<RoutingOpDetail> routingOpDetail,
+            ISqlRepository<ProductStructureMaster> productStructureMaster,
+            ISqlRepository<ShopCalendarWorkCtr> shopCalendarWorkCtr,
+            ISqlRepository<PeriodSequenceDet> periodSequenceDet,
+            ISqlRepository<QualityLineWorkDetail> qualityLineWorkDetail,
+            IRepository<mo_srm_po_main, long> srm_po_main,
+            IRepository<srm_po_main, long> mysql_srm_po_main,
+            IRepository<mo_srm_purchase, long> srm_purchase,
+            IRepository<srm_purchase, long> mysql_srm_purchase,
+            IRepository<mes_morder, long> mysql_mes_morder,
+            IRepository<crm_seorderentry, long> mysql_crm_seorderentry,
+            IRepository<mo_mes_oorder, long> mes_oorder,
+            ISqlRepository<ScheduleResultOpMaster> scheduleResultOpMaster,
+
+
+            PretreatmentAppService pretreatmentAppService,
+            PurchaseOrderAppService purchaseOrderAppService,
+            CalcBomViewAppService CalcBomViewAppService,
+            ProductExamineAppService productExamineAppService,
+            BusinessBangDbContext businessBangDbContext,
+            BusinessDbContext businessDbContext,
+            ICurrentTenant currentTenant,
+            IUnitOfWorkManager unitOfWorkManager)
+        {
+            _replenishmentModel = replenishmentModel;
+            _domesticTerminalFcst = domesticTerminalFcst;
+            _ASNBOLShipperDetail = ASNBOLShipperDetail;
+            _standardItemModelSet = standardItemModelSet;
+            _invTransHist = invTransHist;
+            _SAPInv = SAPInv;
+            _srmPurchase = srmPurchase;
+            _monthlyShipmentPlan = monthlyShipmentPlan;
+            _generalizedCodeMaster = generalizedCodeMaster;
+            _rf_serialnumber=rf_serialnumber;
+            _locationDetail = locationDetail;
+            _ic_item = ic_item;
+            _mysql_ic_item = mysql_ic_item;
+            _itemMaster = itemMaster;
+            _srm_pr_main= srm_pr_main;
+            _mysql_srm_pr_main= mysql_srm_pr_main;
+            _srm_po_occupy = srm_po_occupy;
+            _mysql_srm_po_occupy = mysql_srm_po_occupy;
+            _mes_morder= mes_morder;
+            _mes_moentry = mes_moentry;
+            _mes_mooccupy = mes_mooccupy;
+            _mysql_mes_mooccupy = mysql_mes_mooccupy;
+            _mysql_b_bom_pretreatment = mysql_b_bom_pretreatment;
+            _workOrdMaster = workOrdMaster;
+            _prodLineDetail = prodLineDetail;
+            _ic_bom = ic_bom;
+            _mysql_ic_bom = mysql_ic_bom;
+            _ic_bom_child = ic_bom_child;
+            _mysql_ic_bom_child = mysql_ic_bom_child;
+            _holidayMaster = holidayMaster;
+            _ic_item_stockoccupy = ic_item_stockoccupy;
+            _mysql_ic_item_stockoccupy = mysql_ic_item_stockoccupy;
+            _ic_item_stock = ic_item_stock;
+            _mysql_ic_item_stock = mysql_ic_item_stock;
+            _ic_substitute = ic_substitute;
+            _ic_substitute_group= ic_substitute_group;
+            _ic_substitute_group_detail= ic_substitute_group_detail;
+            _mysql_ic_substitute= mysql_ic_substitute;
+            _mysql_ic_substitute_group= mysql_ic_substitute_group;
+            _mysql_ic_substitute_group_detail= mysql_ic_substitute_group_detail;
+            _mysql_mes_moentry = mysql_mes_moentry;
+            _workOrdDetail = workOrdDetail;
+            _srm_po_list = srm_po_list;
+            _mysql_srm_po_list = mysql_srm_po_list;
+            _routingOpDetail = routingOpDetail;
+            _productStructureMaster = productStructureMaster;
+            _shopCalendarWorkCtr=shopCalendarWorkCtr;
+            _periodSequenceDet = periodSequenceDet;
+            _qualityLineWorkDetail= qualityLineWorkDetail;
+            _srm_po_main= srm_po_main;
+            _mysql_srm_po_main= mysql_srm_po_main;
+            _srm_purchase= srm_purchase;
+            _mysql_srm_purchase = mysql_srm_purchase;
+            _mysql_mes_morder = mysql_mes_morder;
+            _mysql_crm_seorderentry = mysql_crm_seorderentry;
+            _mes_oorder = mes_oorder;
+            _scheduleResultOpMaster = scheduleResultOpMaster;
+
+
+            _pretreatmentAppService = pretreatmentAppService;
+            _CalcBomViewAppService = CalcBomViewAppService;
+            _purchaseOrderAppService = purchaseOrderAppService;
+            _currentTenant =currentTenant;
+            _businessBangDbContext= businessBangDbContext;
+            _businessDbContext = businessDbContext;
+            _unitOfWorkManager = unitOfWorkManager;
+        }
+        #endregion
+
+        /// <summary>
+        /// 调整ROP和最高库存水位
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        public async Task<string> CalcROP(InputDto input)
+        {
+            //1.获取补货模型全局参数
+            ReplenishmentDto replenishmentDto = GetROPParam(input.factory_id.ToString());
+
+            //Step1:按照瑞奇、两大平台分别根据历史出库数据和预测出货数据计算ROP
+            //Step2:计算瑞奇的M-M+2共12周补货(每次补EOP/4),计算海王的M-M+2共12周补货(每次补EOP/4),计算国科的M-M+2共12周补货(每次补EOP/4)
+            //Step3:汇总Step2所有补货，为工厂的制造需求
+            //Step4:按照Step3制造需求做资源检查，按月统计各物料消耗预测
+            //Step5:按照各SKU的历史出库数据和Step4里计算的预测消耗数量计算参数
+            //Step6:计算各SKU的12周采购补货
+
+
+
+            //获取月度发货计划(一次导入三个月的销售预测),因为是固定格式yyyy-MM所以可以用字符串比较，避免写很多字符串判断相等
+            string planMonth = $"{DateTime.Now.Year}-{DateTime.Now.Month.ToString("00")}";
+            string planMonthMax = $"{DateTime.Now.AddMonths(replenishmentDto.SaleFcstMonth).Year}-{DateTime.Now.AddMonths(replenishmentDto.SaleFcstMonth).Month.ToString("00")}";
+            var planList = _monthlyShipmentPlan.Select(a => a.PlanMonth.CompareTo(planMonth) >= 0 && a.PlanMonth.CompareTo(planMonthMax) <= 0 && !a.IsDeleted).ToList();
+
+
+            var itemList = _ic_item.GetListAsync(a => planList.Select(p => p.SAPItemNumber).Contains(a.number) && a.tenant_id == input.tenant_id && a.company_id == input.company_id && !a.IsDeleted).Result;
+            var mesItemList = _itemMaster.Select(a => planList.Select(p => p.SAPItemNumber).Contains(a.ItemNum) && a.Domain == input.factory_id.ToString() && a.IsActive);
+            var srm_purchaseList = _srmPurchase.GetListAsync(a => planList.Select(p => p.SAPItemNumber).Contains(a.number) && a.tenant_id == input.tenant_id && a.company_id == input.company_id && !a.IsDeleted).Result;
+
+            //获取补货模型前H周期和未来F个周期的数据
+            var ropModelList = _replenishmentModel.GetListAsync(a => a.zero_based_seqno >= -1 * replenishmentDto.HistoryOutStockMonth && a.zero_based_seqno <= replenishmentDto.SaleFcstMonth).Result;
+            //发货计划物料列表
+            List<string> planItemList = planList?.Select(a => a.SAPItemNumber).ToList();
+            //获取成品库存、灭菌库存、在制库存(会从SAP同步的库存表更新到LocationDetail、ic_item表中)
+            //List<SAPInv> sAPInvs = _SAPInv.Select(p => p.WERKS == input.factory_id.ToString() && itemNums.Contains(p.MATNR));
+            var locations = _locationDetail.Select(p => p.Domain == input.factory_id.ToString() && planList.Select(a => a.SAPItemNumber).Contains(p.ItemNum) && p.IsActive);
+            var sapItemInv = _SAPInv.Select(a => planItemList.Contains(a.MATNR) && a.WERKS == input.factory_id.ToString());
+
+            //取上一个月发货出库记录
+            var shipList = _ASNBOLShipperDetail.Select(a => a.Domain == input.factory_id.ToString() && a.IsActive && a.shtype == "SH" && a.Typed != "S" && a.RealQty > 0 && planItemList.Contains(a.ContainerItem) && a.ShipDate >= getMonthStartTime(-1) && a.ShipDate <= getMonthEndTime(-1));
+
+            //取本月发货出库记录
+            var shipMList = _ASNBOLShipperDetail.Select(a => a.Domain == input.factory_id.ToString() && a.IsActive && a.shtype == "SH" && a.Typed != "S" && a.RealQty > 0 && planItemList.Contains(a.ContainerItem) && a.ShipDate >= getMonthStartTime(0) && a.ShipDate <= DateTime.Now);
+            //按照物料分组统计出货金额
+            var itemGroup = shipList.GroupBy(p => p.ContainerItem)
+                 .Select(p => new ASNBOLShipperDetail
+                 {
+                     QtyToShip = p.Sum(a => a.QtyToShip),
+                     ContainerItem = p.Key
+                 }).ToList();
+            //按照物料分组统计出货金额
+            var itemMGroup = shipMList.GroupBy(p => p.ContainerItem)
+                 .Select(p => new ASNBOLShipperDetail
+                 {
+                     QtyToShip = p.Sum(a => a.QtyToShip),
+                     ContainerItem = p.Key
+                 }).ToList();
+            List<ReplenishmentModel> addList = new List<ReplenishmentModel>();
+            List<ReplenishmentModel> updateList = new List<ReplenishmentModel>();//更新上一个月的实际出库数量
+            var mathtool = new MathNet.Numerics.Distributions.Normal();
+            ropModelList?.Where(r => r.isparam && r.seqno == DateTime.Now.AddMonths(-1).Month && r.year == DateTime.Now.AddMonths(-1).Year).ToList()?.ForEach
+                (m =>
+                {
+                    if (itemGroup.Any(a => a.ContainerItem == m.number))
+                    {
+                        m.actual_out_qty = itemGroup.Find(a => a.ContainerItem == m.number)?.QtyToShip;
+                        updateList.Add(m);
+                    }
+                });
+            //需要按照成品资源检查计算原材料
+            planList?.Where(s => s.PlanMonth == planMonth).ToList()?.ForEach(a =>
+            {
+                ReplenishmentModel rop = new ReplenishmentModel();
+                rop.number = a.SAPItemNumber;
+                var icItem = itemList.Find(s => s.number == a.SAPItemNumber);
+                if (icItem != null)
+                {
+                    rop.name = icItem.name;
+                    rop.model = a.Model;
+                    rop.erp_cls = icItem.erp_cls; //物料属性: 0.配置类 1.自制 2.委外加工 3.外购 4.虚拟件
+                    rop.fversion = icItem.fversion;
+                    rop.min_pack_qty = icItem.minpackqty;
+                    rop.moq = icItem.moq;
+                }
+                rop.actual_period_start_instock = 0;
+                if (rop.distributionchannel == "海王" || rop.distributionchannel == "国科")
+                {
+                    rop.actual_period_start_instock = locations.Find(l => l.ItemNum == a.SAPItemNumber)?.QtyOnHand;
+                }
+                else
+                {
+                    rop.actual_period_start_instock = sapItemInv.Find(s => s.MATNR == a.SAPItemNumber)?.LABST.ToDecimal();
+                }
+                rop.distributionchannel = a.DistributionChannel;
+                rop.lifecycle = a.LifeCycle;
+                rop.area = a.Area;
+                rop.plan_out_qty = Math.Ceiling(a.Qty);
+                rop.actual_out_qty = 0;
+                if (itemMGroup.Any(m => m.ContainerItem == a.SAPItemNumber))
+                {
+                    rop.actual_out_qty = itemMGroup.Find(m => m.ContainerItem == a.SAPItemNumber)?.QtyToShip;
+                }
+                rop.year = DateTime.Now.Year;
+                rop.long_period = "Y";
+                rop.short_period = "M";
+                rop.seqno = DateTime.Now.Month;
+                rop.zero_based_seqno = 0;
+                rop.period_start_date = getMonthStartTime(0);
+                rop.period_end_date = getMonthEndTime(0);
+                rop.monthl_avg_demand = CalcAvgDemand(planList, a.SAPItemNumber);
+                rop.monthl_avg_demand_variance = Math.Ceiling(Convert.ToDecimal(CalcVariance(planList, a.SAPItemNumber)));
+                rop.monthl_avg_outstock = CalcAvgOutStock(ropModelList, replenishmentDto, rop.actual_out_qty.Value, a.SAPItemNumber);
+                if (mesItemList.Find(s => s.ItemNum == a.SAPItemNumber) != null)
+                {
+                    rop.stock_turnover = mesItemList.Find(s => s.ItemNum == a.SAPItemNumber).StockTurnOver;
+                    rop.supply_leadtime = mesItemList.Find(s => s.ItemNum == a.SAPItemNumber)?.PurLT;
+                    rop.stock_turnover = mesItemList.Find(s => s.ItemNum == a.SAPItemNumber)?.StockTurnOver;
+                }
+                else
+                {
+                    rop.stock_turnover = 4;
+                }
+                if (srm_purchaseList.Find(s => s.number == a.SAPItemNumber) != null)
+                {
+                    rop.supply_leadtime = srm_purchaseList.Find(s => s.number == a.SAPItemNumber).lead_time;
+                }
+                CalcFMRAndABC(rop, replenishmentDto, input);
+                rop.security_stock = Math.Ceiling((decimal)(mathtool.InverseCumulativeDistribution((double)rop.service_level_pct.Value) * (double)rop.monthl_avg_demand_variance));
+                rop.eop = Math.Ceiling(rop.monthl_avg_demand.Value * rop.supply_leadtime.Value / DateTime.DaysInMonth(DateTime.Now.Year, DateTime.Now.Month));
+                rop.rop_computed = rop.security_stock + rop.eop;
+                rop.max_stock_level = rop.monthl_avg_outstock * (12 / rop.stock_turnover);
+                rop.rop_revised = Math.Min(rop.rop_computed.Value, rop.max_stock_level.Value);
+                rop.isparam = true;
+                rop.tenant_id = input.tenant_id;
+                rop.factory_id = input.factory_id;
+                rop.create_time = DateTime.Now;
+                rop.org_id = input.org_id;
+                addList.Add(rop);
+            });
+            addList?.ForEach(item => { item.GenerateNewId(help.NextId()); });
+
+            await _replenishmentModel.InsertManyAsync(addList);
+            await _replenishmentModel.UpdateManyAsync(updateList);
+            var ropModeAllList = _replenishmentModel.GetListAsync(a => a.year != DateTime.Now.Year && a.seqno != DateTime.Now.Month && a.isparam).Result;
+            ropModeAllList?.ForEach(item => { item.seqno = item.seqno - 1; });
+            await _replenishmentModel.UpdateManyAsync(ropModeAllList);
+            return "OK";
+        }
+
+        /// <summary>
+        /// 计划工单齐套检查
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        public async Task<string> PlanOrderResourceCheck(string companyid)
+        {
+            /*List<string> workOrds = workOrd.Split(",").ToList();
+            if (workOrds.Count == 0)
+            {
+                return "";
+            }*/
+            if (string.IsNullOrEmpty(companyid))
+            {
+                return "当前任务公司编码为空，请检查。";
+            }
+
+            List<mes_morder> Mes_Morders = _mysql_mes_morder.GetListAsync(x => x.morder_type == "计划工单" && x.morder_state == "初始" && x.company_id == long.Parse(companyid)).Result;
+
+            //先排除锁定期内的工单 //优先级排序
+            var sysSet = _generalizedCodeMaster.Select(s => s.FldName == "SystemConfig" && s.Val == "WorkOrderLockPeriod" && s.Domain == companyid).ToList();
+            decimal lookDay = 0;
+            if (sysSet.Any())
+            {
+                //锁定期
+                lookDay = sysSet[0].UDeci1;
+            }
+            lookDay = lookDay == 0 ? 7 : lookDay;
+            DateTime lookTime = DateTime.Now.Date.AddDays((double)lookDay);
+            Mes_Morders = Mes_Morders.Where(s => s.moentry_sys_stime > lookTime || s.moentry_sys_stime == null).OrderBy(s => s.moentry_sys_stime).ToList();
+
+            if (Mes_Morders.Any())
+            {
+                Mes_Morders.ForEach(s => { s.moentry_sys_stime = DateTime.Now.Date.AddDays((double)lookDay + 1); });
+                List<string> monolist = Mes_Morders.Select(c => c.morder_no).ToList();
+                //清理PR的占用。
+                //如果PR没有转PO，则PR没有合并，就删除，有合并，就减少合并后的PR的数量。
+                var prlist = _mysql_srm_pr_main.GetListAsync(s => monolist.Contains(s.pr_mono)).Result;
+                List<srm_pr_main> alllist = new List<srm_pr_main>();
+                List<srm_pr_main> updatelist = new List<srm_pr_main>();
+                List<srm_pr_main> dellist = new List<srm_pr_main>();
+                RecursionGetDbPr2(prlist, alllist);
+                foreach (var pr in prlist)
+                {
+                    //找到没有关闭的PR，如果关联上的PR都是已关闭，则说明已经转了PO。
+                    //TODO:解决Database operation expected to affect 1 row(s) but actually affected 0 row(s). 如果业务逻辑有问题自行修改
+                    var getPr = RerunPr(pr, alllist);
+                    if (getPr != null)
+                    {
+                        if (getPr.pr_aqty - pr.pr_aqty <= 0)
+                        {
+                            //删除这个pr，没有小于0则是更新
+                            dellist.Add(getPr);
+                        }
+                        else
+                        {
+                            getPr.pr_aqty = getPr.pr_aqty - pr.pr_aqty;
+                            updatelist.Add(getPr);
+                        }
+                    }
+                }
+                List<srm_po_occupy> occupy = await _mysql_srm_po_occupy.GetListAsync(s => monolist.Contains(s.morder_mo));
+                _businessDbContext.BulkDelete(occupy);
+                if (updatelist.Any())
+                {
+                    _businessDbContext.BulkUpdate(updatelist);
+                }
+                if (dellist.Any())
+                {
+                    _businessDbContext.BulkDelete(dellist);
+                }
+                //清理掉库存占用
+                var itemstockoccupy = _mysql_ic_item_stockoccupy.GetListAsync(s => monolist.Contains(s.morder_mo)).Result;
+                if (itemstockoccupy.Any())
+                {
+                    _businessDbContext.BulkDelete(itemstockoccupy);
+                }
+                //清理锁定期外的排程数据.
+                var periodList = _periodSequenceDet.Select(s => monolist.Contains(s.WorkOrds));
+                if (periodList.Any())
+                {
+                    _periodSequenceDet.Delete(s => monolist.Contains(s.WorkOrds));
+                }
+                var schedulList = _scheduleResultOpMaster.Select(s => monolist.Contains(s.WorkOrd));
+                if (schedulList.Any())
+                {
+                    _scheduleResultOpMaster.Delete(s => monolist.Contains(s.WorkOrd));
+                }
+                //只走计划工单
+                var rtn = await OrderKittingCheck(Mes_Morders, true);
+            }
+            else
+            {
+                return "未查找到对应的计划工单，请联系管理员。";
+            }
+            return "ok";
+        }
+
+        //找到没有关闭的PR，做数量的减少
+        public srm_pr_main RerunPr(srm_pr_main pr, List<srm_pr_main> referlist)
+        {
+            //如果当前PR已经关闭，则检查合并数据
+            if (pr.state == 0)
+            {
+                //已关闭，并且没有关联数据，则代表转PO了。
+                var refPr = referlist.Find(s => s.pr_billno == pr.refer_pr_billno);
+                //如果有关联，继续往下查
+                if (refPr != null)
+                {
+                    return RerunPr(refPr, referlist);
+                }
+                else
+                {
+                    return null;
+                }
+            }
+            else
+            {
+                return pr;
+            }
+        }
+
+        /// <summary>
+        /// 递归寻找PR,找到合并后的PR
+        /// </summary>
+        public void RecursionGetDbPr2(List<srm_pr_main> list, List<srm_pr_main> referlist)
+        {
+            List<srm_pr_main> prlist = _mysql_srm_pr_main.GetListAsync(s => list.Select(c => c.refer_pr_billno).Contains(s.pr_billno)).Result;
+            if (prlist.Any())
+            {
+                referlist.AddRange(prlist);
+                RecursionGetDbPr2(prlist, referlist);
+            }
+        }
+
+        /// <summary>
+        /// 工单检查物料齐套
+        /// </summary>
+        /// <param name="input"></param>
+        public async Task<PschedDto> OrderKittingCheck(List<mes_morder> mo_Mes_Morders, bool planCheck = false)
+        {
+            //资源检查结果
+            PschedDto rtn = new PschedDto();
+            //资源检查明细list
+            List<ExamineResult> examines = new List<ExamineResult>();
+            OrderCheckDto input = new OrderCheckDto();
+            if (mo_Mes_Morders.Any())
+            {
+                input.company_id = mo_Mes_Morders[0].company_id;
+                input.factoryId = mo_Mes_Morders[0].factory_id.GetValueOrDefault();
+            }
+            //资源检查入参全局变量赋值
+            param.company_id = input.company_id;
+            param.factoryId = input.factoryId;
+            param.checkflag = false;
+            param.checkPlan = planCheck;
+            //生成当前计算bangid
+            long bangid = help.NextId();
+
+            /*List<mo_mes_morder> mo_Mes_Morders = _mes_morder.GetManyByCondition(x => x.start_time > DateTime
+            .Now.Date.AddDays(1) && x.start_time < DateTime
+            .Now.Date.AddDays(input.Day) && x.morder_state == MorderEnum.Initial_state && !x.IsDeleted && x.tenant_id == param.tenantId && x.bang_id == bangid).Result;
+
+            List<mo_mes_moentry> mo_Mes_Moentries = _mes_moentry.GetManyByCondition(x=> mo_Mes_Morders.Select(s => s.id).Contains(x.moentry_moid.Value)).Result;*/
+
+            var morderIdList = mo_Mes_Morders.Select(s => s.Id).ToList();
+
+            List<mes_moentry> mo_Mes_Moentries = _mysql_mes_moentry.GetListAsync(x => morderIdList.Contains(x.moentry_moid.Value)).Result;
+
+            //获取订单行数据
+            List<crm_seorderentry> sentrys = _mysql_crm_seorderentry.GetListAsync(p => p.company_id == input.company_id && p.factory_id == input.factoryId && !p.IsDeleted && mo_Mes_Moentries.Select(x => x.soentry_id).Contains(p.Id)).Result;
+
+            //删除同步Mysql后旧数据
+            await DeleteMySqlOldData(sentrys);
+
+            List<mo_ic_bom> boms = _ic_bom.GetListAsync(p => mo_Mes_Morders.Select(m => m.bom_number).Contains(p.bom_number) && p.factory_id == input.factoryId && p.company_id == input.company_id && !p.IsDeleted).Result.ToList();
+
+            //物料bom
+            List<mo_ic_bom> bomlist = new List<mo_ic_bom>();
+            //物料bom明细
+            List<mo_ic_bom_child> bomchildlist = new List<mo_ic_bom_child>();
+            //物料信息
+            List<mo_ic_item> icitemlist = new List<mo_ic_item>();
+            //替代关系
+            List<mo_ic_substitute> sublist = new List<mo_ic_substitute>();
+            List<mo_ic_substitute_group> suballlist = new List<mo_ic_substitute_group>();
+            List<mo_ic_substitute_group_detail> subdtllist = new List<mo_ic_substitute_group_detail>();
+            //物料库存表
+            List<mo_ic_item_stock> stocklist = new List<mo_ic_item_stock>();
+            //物料占用记录
+            List<mo_ic_item_stockoccupy> sklist = new List<mo_ic_item_stockoccupy>();
+
+            //sorder=null  是因为齐套检查不需要生成工单、采购、委外等信息，所以不需要关联的工单信息传递进去。
+            var pretreatments = _mysql_b_bom_pretreatment.GetListAsync(s => boms.Select(c => c.mysql_id).ToList().Contains(s.sourceid)).Result;
+            List<mo_ic_bom> autoCreates = new List<mo_ic_bom>();
+            boms.ForEach(p =>
+            {
+                if (!pretreatments.Where(s => s.sourceid == p.mysql_id).Any())
+                {
+                    autoCreates.Add(p);
+                }
+            });
+            if (autoCreates.Any())
+            {
+                AutoCreateBomBill(param.company_id.ToString(), autoCreates);
+                pretreatments = _mysql_b_bom_pretreatment.GetListAsync(s => boms.Select(c => c.mysql_id).ToList().Contains(s.sourceid)).Result;
+            }
+
+            //数据库快照-同步mysql库数据到mongoDB中
+            await DbSnapShot(input.company_id, input.factoryId, bangid, pretreatments);
+
+            DataInitialization(boms, bangid, icitemlist, stocklist, pretreatments, sklist);
+            if (!planCheck)
+            {
+                //如果是齐套检查，则不考虑其他数据的占用，只看原材料库存
+                sklist = new List<mo_ic_item_stockoccupy>();
+            }
+            _CalcBomViewAppService.param = param;
+            foreach (var item in mo_Mes_Morders)
+            {
+                var moentry = mo_Mes_Moentries.Find(s => s.moentry_moid == item.Id);
+                if (moentry == null)
+                {
+                    continue;
+                }
+                var sentry = sentrys.Find(s => s.Id == moentry.soentry_id);
+
+                //工单资源检查信息
+                ExamineResult dtl = new ExamineResult();
+                dtl.morder_id = item.Id;
+                dtl.morder_no = item.morder_no;
+                dtl.bangid = bangid;
+                dtl.order_statr_time = item.start_time;
+                dtl.bom_number = item.bom_number;
+                dtl.need_qty = item.need_number.GetValueOrDefault();
+
+                //获取当前物料bom数据
+                var childBom = boms.Where(p => p.bom_number == item.bom_number).FirstOrDefault();
+
+                var itemPrelist = pretreatments.Where(s => s.sourceid == childBom.mysql_id).ToList();
+                if (!itemPrelist.Any())
+                {
+                    continue;
+                }
+
+                var getBomList = ObjectMapper.Map<List<b_bom_pretreatment>, List<BomChildExamineDto>>(itemPrelist);
+
+                if (sentry != null)
+                {
+                    dtl.sentry_id = sentry.Id;
+                    getBomList.ForEach(s => s.sentry_id = item.Id);
+                }
+                _CalcBomViewAppService.newStockOccList = new List<mo_ic_item_stockoccupy>();
+                _CalcBomViewAppService.mes_morder = item;
+                //库存初始化
+                _CalcBomViewAppService.BomStock(getBomList, stocklist, bangid);
+
+                //计算
+                _CalcBomViewAppService.CalcView(getBomList, bangid, item.need_number.GetValueOrDefault(), item.start_time, sklist, sentry, item.urgent, icitemlist);
+
+                //TODO:最晚开始时间
+                var curFacDtl = leadTimeList.FirstOrDefault(p => p.item_id == childBom.icitem_id);
+                //物料齐套时间
+                dtl.kitting_times = getBomList.Where(p => p.is_use && p.kitting_time != null).OrderByDescending(m => m.kitting_time).First().kitting_time.GetValueOrDefault();
+                //替代关系展开list
+                dtl.BomChildExamineList = getBomList;
+                //添加订单行开工信息
+                examines.Add(dtl);
+            }
+            rtn.examines = examines;
+            if (planCheck)
+            {
+                //如果有计划工单，则需要生成pr po oo
+                List<mo_srm_pr_main> prmainlist = new List<mo_srm_pr_main>();
+                if (_CalcBomViewAppService.SRMPRDtoList.Any())
+                {
+                    List<List<mo_srm_pr_main>> prlist = _CalcBomViewAppService.SRMPRDtoList.Where(f => f.srm_Pr_Main != null).Select(s => s.srm_Pr_Main).ToList();
+                    List<mo_srm_pr_main> list = new List<mo_srm_pr_main>();
+
+                    foreach (var pr in prlist)
+                    {
+                        foreach (var item in pr)
+                        {
+                            list.Add(item);
+                            prmainlist.Add(item);
+                        }
+                    }
+                    if (list.Any())
+                        rtn.srm_pr_list = _CalcBomViewAppService.SRMPRDtoList;
+                }
+
+
+                //获取工单数据
+                var workOrdMasters = _workOrdMaster.Select(p => mo_Mes_Morders.Select(c => c.morder_no).Contains(p.WorkOrd));
+                workOrdMasters.ForEach(s => {
+                    var mo = mo_Mes_Morders.Find(m => m.morder_no == s.WorkOrd);
+                    if (mo != null)
+                    {
+                        //锁定期
+                        s.OrdDate = mo.moentry_sys_stime;
+                        s.DueDate = mo.moentry_sys_stime;
+                    }
+
+                });
+                //优先级排序
+                workOrdMasters = workOrdMasters.OrderBy(s => s.OrdDate).ToList();
+                //排产
+                //await _productionScheduleAppService.DoProductSchedule(workOrdMasters, param.factoryId.ToString());
+
+                foreach (var wod in workOrdMasters)
+                {
+                    var morder = mo_Mes_Morders.Find(s => s.morder_no == wod.WorkOrd);
+                    morder.moentry_sys_stime = wod.OrdDate;
+                    morder.moentry_sys_etime = wod.DueDate;
+
+                    /*var exa = rtn.examines.Find(s => s.morder_no == wod.WorkOrd);
+                    exa.latest_times = morder.moentry_sys_etime.GetValueOrDefault().Date.AddDays(1);*/
+                    //根据排产后得日期，反推PR。
+                    var wkordPrList = prmainlist.Where(s => s.pr_mono == wod.WorkOrd).ToList();
+
+                    //反算所有的PR，根据时间减去提前期   //按最大预处理时间倒排
+                    var moIcitems = icitemlist.Where(s => wkordPrList.Select(c => c.icitem_id).Contains(s.mysql_id)).ToList();
+                    var maxTime = moIcitems.Max(s => s.clean_leadtime.GetValueOrDefault());
+                    wkordPrList.ForEach(pr =>
+                    {
+                        var ts = pr.pr_parrive_date - pr.pr_psend_date;
+                        //var icitem = icitemlist.Find(s => s.mysql_id == pr.icitem_id);
+                        //var bce = exa.BomChildExamineList.Find(s => s.item_id == pr.icitem_id && s.num == pr.num);
+                        pr.pr_sarrive_date = morder.moentry_sys_stime.Value.AddDays((double)(0 - maxTime - 1));//到货还需要向前推 物料的预处理时间。到货日期必须提前一天到
+                        pr.pr_ssend_date = pr.pr_sarrive_date.GetValueOrDefault().AddDays(0 - ts.Value.Days);
+                        if (pr.pr_ssend_date < DateTime.Now.Date.AddDays(1))
+                        {
+                            pr.pr_ssend_date = DateTime.Now.Date.AddDays(1);
+                        }
+                    });
+                }
+                using (var unitOfWork = _unitOfWorkManager.Begin(false, true))
+                {
+                    try
+                    {
+                        _businessDbContext.BulkUpdate(mo_Mes_Morders);
+                        if (prmainlist.Any())
+                        {
+                            var pr_mainlist = ObjectMapper.Map<List<mo_srm_pr_main>, List<srm_pr_main>>(prmainlist);
+                            _businessDbContext.BulkInsert(pr_mainlist);
+                        }
+                        if (_CalcBomViewAppService.newStockOccList.Any())
+                        {
+                            var stockoccupylist = ObjectMapper.Map<List<mo_ic_item_stockoccupy>, List<ic_item_stockoccupy>>(_CalcBomViewAppService.newStockOccList);
+                            stockoccupylist.ForEach(s => { s.create_time = DateTime.Now; s.tenant_id = param.company_id.GetValueOrDefault(); s.company_id = param.company_id; s.factory_id = param.factoryId; });
+                            _businessDbContext.BulkInsert(stockoccupylist);
+                        }
+                        if (_CalcBomViewAppService.srm_Po_OccupiesInsert.Any())
+                        {
+                            _CalcBomViewAppService.srm_Po_OccupiesInsert.ForEach(s => { s.company_id = param.company_id; s.factory_id = param.factoryId; });
+                            await _srm_po_occupy.InsertManyAsync(_CalcBomViewAppService.srm_Po_OccupiesInsert);
+                        }
+                        await unitOfWork.CompleteAsync();
+                    }
+                    catch (Exception e)
+                    {
+                        unitOfWork.Dispose();
+                        new NLogHelper("ResourceExamineAppService").WriteLog("OrderKittingCheck", "工单检查数据更新失败：" + e.Message, _currentTenant.Id.ToString());
+                    }
+                }
+
+            }
+            //检查结果写入数据库
+            await ExamineResultInsertDBAsync(examines);
+            //清空快照数据
+            await ClearSnapShot(bangid);
+            return rtn;
+        }
+
+        public async Task ExamineResultInsertDBAsync(List<ExamineResult> examines)
+        {
+            //检查结果写入数据库
+            List<b_examine_result> examineList = new List<b_examine_result>();
+            List<b_bom_child_examine> bomExamineList = new List<b_bom_child_examine>();
+            List<b_mo_occupy> mooccupyList = new List<b_mo_occupy>();
+            List<b_mo_order> moorderList = new List<b_mo_order>();
+            List<b_ooder> ooderList = new List<b_ooder>();
+            List<b_purchase> purchaseList = new List<b_purchase>();
+            List<b_purchase_occupy> purchaseoccupyList = new List<b_purchase_occupy>();
+
+            foreach (var ex in examines)
+            {
+                var b_ex = ObjectMapper.Map<ExamineResult, b_examine_result>(ex);
+                b_ex.GenerateNewId(help.NextId());// = help.NextId();
+                if (_CalcBomViewAppService.mordersInsertList.Any())
+                {
+                    var moentry = _CalcBomViewAppService.moentriesInsertList.Where(s => s.soentry_id == b_ex.sentry_id).FirstOrDefault();
+                    if (moentry != null)
+                    {
+                        var sentryMo = _CalcBomViewAppService.mordersInsertList.Where(s => s.mysql_id == moentry.moentry_moid).FirstOrDefault();
+                        if (sentryMo != null)
+                        {
+                            b_ex.morder_id = sentryMo.mysql_id;
+                            b_ex.morder_no = sentryMo.morder_no;
+                        }
+                    }
+                }
+                b_ex.create_time = DateTime.Now;
+                b_ex.company_id = param.company_id;
+                b_ex.tenant_id = param.company_id;
+                b_ex.factory_id = param.factoryId;
+                examineList.Add(b_ex);
+                ex.BomChildExamineList.ForEach(s =>
+                {
+                    var bc_ex = ObjectMapper.Map<BomChildExamineDto, b_bom_child_examine>(s);
+                    bc_ex.GenerateNewId(help.NextId());
+                    bc_ex.examine_id = b_ex.Id;
+                    bc_ex.company_id = param.company_id;
+                    bc_ex.tenant_id = param.company_id;
+                    bc_ex.factory_id = param.factoryId;
+                    bc_ex.create_time = DateTime.Now;
+                    bomExamineList.Add(bc_ex);
+
+                    if (s.mo_occupy_list != null)
+                    {
+                        var olist = ObjectMapper.Map<List<mo_occupy>, List<b_mo_occupy>>(s.mo_occupy_list);
+                        olist.ForEach(o =>
+                        {
+                            o.bom_child_examine_id = bc_ex.Id; o.company_id = param.company_id; o.tenant_id = param.company_id;
+                            o.factory_id = param.factoryId;
+                        });
+                        mooccupyList.AddRange(olist);
+                    }
+                    if (s.make_list != null)
+                    {
+                        var mlist = ObjectMapper.Map<List<moorder>, List<b_mo_order>>(s.make_list);
+                        mlist.ForEach(o =>
+                        {
+                            o.bom_child_examine_id = bc_ex.Id; o.company_id = param.company_id; o.tenant_id = param.company_id;
+                            o.factory_id = param.factoryId;
+                        });
+                        moorderList.AddRange(mlist);
+                    }
+                    if (s.subcontracting_list != null)
+                    {
+                        var slist = ObjectMapper.Map<List<ooder>, List<b_ooder>>(s.subcontracting_list);
+                        slist.ForEach(o =>
+                        {
+                            o.bom_child_examine_id = bc_ex.Id; o.company_id = param.company_id; o.tenant_id = param.company_id;
+                            o.factory_id = param.factoryId;
+                        });
+                        ooderList.AddRange(slist);
+                    }
+                    if (s.purchase_list != null)
+                    {
+                        var plist = ObjectMapper.Map<List<purchase>, List<b_purchase>>(s.purchase_list);
+                        plist.ForEach(o =>
+                        {
+                            o.bom_child_examine_id = bc_ex.Id; o.company_id = param.company_id; o.tenant_id = param.company_id;
+                            o.factory_id = param.factoryId;
+                        });
+                        purchaseList.AddRange(plist);
+                    }
+                    if (s.purchase_occupy_list != null)
+                    {
+                        var purlist = ObjectMapper.Map<List<purchase_occupy>, List<b_purchase_occupy>>(s.purchase_occupy_list);
+                        purlist.ForEach(o =>
+                        {
+                            o.bom_child_examine_id = bc_ex.Id; o.company_id = param.company_id; o.tenant_id = param.company_id;
+                            o.factory_id = param.factoryId;
+                        });
+                        purchaseoccupyList.AddRange(purlist);
+                    }
+                });
+            }
+            using (var unitOfWork = _unitOfWorkManager.Begin(false, true))
+            {
+                try
+                {
+                    if (examineList.Any())
+                    {
+                        _businessBangDbContext.BulkInsert(examineList);
+                    }
+                    if (bomExamineList.Any())
+                    {
+                        _businessBangDbContext.BulkInsert(bomExamineList.OrderBy(s => s.num_order).ToList());
+                    }
+                    if (mooccupyList.Any())
+                    {
+                        _businessBangDbContext.BulkInsert(mooccupyList);
+                    }
+                    if (moorderList.Any())
+                    {
+                        _businessBangDbContext.BulkInsert(moorderList);
+                    }
+                    if (ooderList.Any())
+                    {
+                        _businessBangDbContext.BulkInsert(ooderList);
+                    }
+                    if (purchaseList.Any())
+                    {
+                        _businessBangDbContext.BulkInsert(purchaseList);
+                    }
+                    if (purchaseoccupyList.Any())
+                    {
+                        _businessBangDbContext.BulkInsert(purchaseoccupyList);
+                    }
+                    await unitOfWork.CompleteAsync();
+                }
+                catch (Exception e)
+                {
+                    new NLogHelper("ResourceExamineAppService").WriteLog("ReceiveResult", "资源检查计算结果相关数据更新失败：" + e.Message, _currentTenant.Id.ToString());
+                    unitOfWork.Dispose();
+                }
+            }
+        }
+
+        /// <summary>
+        /// 删除旧订单行数据
+        /// </summary>
+        /// <param name="tenantId"></param>
+        /// <param name="factoryId"></param>
+        /// <param name="soentry_id"></param>
+        /// <returns></returns>
+        public async Task DeleteMySqlOldData(List<crm_seorderentry> soentry_id)
+        {
+            List<long> sentryids = soentry_id.Select(p => p.Id).ToList();
+            //删除工单相关表数据
+            /*var mes_moentry = _mysql_mes_moentry.GetListAsync(x => sentryids.Contains(x.soentry_id.Value)).Result;
+
+            var mes_morder = _mysql_mes_morder.GetListAsync(x => mes_moentry.Select(p => p.moentry_moid).ToList().Contains(x.Id)).Result;
+            if (mes_moentry.Count > 0)
+            {
+                await _mysql_mes_moentry.DeleteManyAsync(mes_moentry);
+            }
+            if (mes_morder.Count > 0)
+            {
+                await _mysql_mes_morder.DeleteManyAsync(mes_morder);
+            }*/
+            var mysql_mes_mooccupy = _mysql_mes_mooccupy.GetListAsync(x => soentry_id.Select(p => p.Id).Contains(x.moo_id_billid.Value)).Result;
+            if (mysql_mes_mooccupy.Count > 0)
+            {
+                await _mysql_mes_mooccupy.DeleteManyAsync(mysql_mes_mooccupy);
+            }
+            /*var srm_pr_main = _mysql_srm_pr_main.GetListAsync(x => soentry_id.Select(p => p.Id).Contains(x.sentry_id.GetValueOrDefault())).Result;
+            if (srm_pr_main.Count > 0)
+            {
+                await _mysql_srm_pr_main.DeleteManyAsync(srm_pr_main);
+            }*/
+            /*var mes_oorders = _mysql_mes_oorder.GetListAsync(x => soentry_id.Select(p => p.Id).Contains(x.sentry_id.GetValueOrDefault())).Result;
+            if (mes_oorders.Count > 0)
+            {
+                await _mysql_mes_oorder.DeleteManyAsync(mes_oorders);
+            }*/
+        }
+
+        /// <summary>
+        /// 数据库快照
+        /// </summary>
+        /// <returns></returns>
+        public async Task DbSnapShot(long? companyId, long factoryId, long bangid, List<b_bom_pretreatment> pretreatments)
+        {
+            //TODO:申老师明确后续需要调整 根据需要使用的字段，来同步表数据。
+
+            //同步物料库存数据  根据预处理，来只找出部分数据同步。
+            List<long> itemIds = pretreatments.Select(s => s.item_id.GetValueOrDefault()).ToList();
+            //var icitemStokc = _mysql_ic_item_stock.GetListAsync(p => p.tenant_id == tenantId && p.factory_id == factoryId).Result;
+            var icitemStokc = _mysql_ic_item_stock.GetListAsync(p => p.company_id == companyId && itemIds.Contains(p.icitem_id)).Result;
+            if (icitemStokc.Count > 0)
+            {
+                List<string> numbers = pretreatments.Select(s => s.item_number).ToList();
+                var locStock = _locationDetail.Select(a => numbers.Contains(a.ItemNum) && a.IsActive && a.Domain == factoryId.ToString());
+                //设置当前计算bangid
+                icitemStokc.ForEach(item => {
+                    item.bang_id = bangid;
+                    var pret = pretreatments.Find(s => s.item_id == item.icitem_id);
+                    if (pret != null)
+                    {
+                        item.sqty = locStock.Where(s => s.ItemNum == pret.item_number).Sum(p => p.QtyOnHand);
+                    }
+                });
+                var moIcitemStokc = ObjectMapper.Map<List<ic_item_stock>, List<mo_ic_item_stock>>(icitemStokc);
+                moIcitemStokc.ForEach(item => { item.GenerateNewId(help.NextId()); });
+                //插入数据
+                await _ic_item_stock.InsertManyAsync(moIcitemStokc);
+            }
+
+            var workordmsters = _workOrdMaster.Select(s => s.Domain == factoryId.ToString() && s.Status.ToLower() != "c");
+            if (workordmsters.Any())
+            {
+                //根据工单表找到工单明细，然后根据DOP工单占用记录，对比工单明细发货数量，来做冲销。
+                var workdetails = _workOrdDetail.Select(s => workordmsters.Select(c => c.WorkOrd).Contains(s.WorkOrd));
+
+                //物料库存占用记录表
+                var item_occupy = _mysql_ic_item_stockoccupy.GetListAsync(p => p.company_id == companyId && itemIds.Contains(p.icitem_id) && workordmsters.Select(c => c.WorkOrd).Contains(p.morder_mo)).Result;
+                if (item_occupy.Any())
+                {
+                    item_occupy.ForEach(s =>
+                    {
+                        //TODO：对发布数量和占用数量进行对冲，因为目前没有处理不同层级下使用相同物料的占用的问题。dop占用有项次号，而wms的发布数量明细没有项次号
+                        var wdtl = workdetails.Where(x => x.WorkOrd == s.morder_mo && x.ItemNum == s.icitem_number).ToList();
+                        if (wdtl.Any())
+                        {
+                            foreach (var dtl in wdtl)
+                            {
+                                if (s.quantity - dtl.QtyPosted > 0)
+                                {
+                                    s.quantity -= dtl.QtyPosted;
+                                    dtl.QtyPosted = 0;
+                                }
+                                else
+                                {
+                                    dtl.QtyPosted -= s.quantity;
+                                    s.quantity = 0;
+                                }
+                            }
+                        }
+                    });
+                    item_occupy = item_occupy.Where(s => s.quantity > 0).ToList();
+                    if (item_occupy.Count > 0)
+                    {
+                        var mo_item_occupy = ObjectMapper.Map<List<ic_item_stockoccupy>, List<mo_ic_item_stockoccupy>>(item_occupy);
+                        mo_item_occupy.ForEach(item => { item.GenerateNewId(help.NextId()); item.bang_id = bangid; });
+                        await _ic_item_stockoccupy.InsertManyAsync(mo_item_occupy);
+                    }
+                }
+
+                //工单主表
+                var mes_morder = _mysql_mes_morder.GetListAsync(x => x.company_id == companyId && x.factory_id == factoryId && workordmsters.Select(c => c.WorkOrd).Contains(x.morder_no)).Result;
+                if (mes_morder.Count > 0)
+                {
+                    mes_morder.ForEach(item => { item.bang_id = bangid; });
+                    var moMes_morder = ObjectMapper.Map<List<mes_morder>, List<mo_mes_morder>>(mes_morder);
+                    moMes_morder.ForEach(item => { item.GenerateNewId(help.NextId()); });
+                    await _mes_morder.InsertManyAsync(moMes_morder);
+                }
+                //工单子表
+                var mes_moentry = _mysql_mes_moentry.GetListAsync(x => x.company_id == companyId && x.factory_id == factoryId).Result;
+                if (mes_moentry.Count > 0)
+                {
+                    mes_moentry.ForEach(item => { item.bang_id = bangid; });
+                    var moMes_moentry = ObjectMapper.Map<List<mes_moentry>, List<mo_mes_moentry>>(mes_moentry);
+                    moMes_moentry.ForEach(item => { item.GenerateNewId(help.NextId()); });
+                    await _mes_moentry.InsertManyAsync(moMes_moentry);
+                }
+
+                //在制工单占用记录表
+                var mes_mooccupy = _mysql_mes_mooccupy.GetListAsync(x => x.company_id == companyId && x.factory_id == factoryId && mes_morder.Select(c => c.morder_no).Contains(x.moo_mo)).Result;
+                if (mes_mooccupy.Count > 0)
+                {
+                    var moMes_mooccupy = ObjectMapper.Map<List<mes_mooccupy>, List<mo_mes_mooccupy>>(mes_mooccupy);
+                    moMes_mooccupy.ForEach(item => { item.GenerateNewId(help.NextId()); item.bang_id = bangid; });
+                    await _mes_mooccupy.InsertManyAsync(moMes_mooccupy);
+                }
+            }
+            //TODO:要不要根据某些条件只同步有效的数据
+            //采购订单
+            var srm_po_main = _mysql_srm_po_main.GetListAsync(x => x.company_id == companyId && x.factory_id == factoryId).Result;
+            if (srm_po_main.Count > 0)
+            {
+                var moSrm_po_main = ObjectMapper.Map<List<srm_po_main>, List<mo_srm_po_main>>(srm_po_main);
+                moSrm_po_main.ForEach(item => { item.GenerateNewId(help.NextId()); item.bang_id = bangid; });
+                await _srm_po_main.InsertManyAsync(moSrm_po_main);
+            }
+
+            //采购订单明细
+            var srm_po_list = _mysql_srm_po_list.GetListAsync(x => x.company_id == companyId && x.factory_id == factoryId).Result;
+            if (srm_po_list.Count > 0)
+            {
+                var moSrm_po_list = ObjectMapper.Map<List<srm_po_list>, List<mo_srm_po_list>>(srm_po_list);
+                moSrm_po_list.ForEach(item => { item.GenerateNewId(help.NextId()); item.bang_id = bangid; });
+                await _srm_po_list.InsertManyAsync(moSrm_po_list);
+            }
+
+            //采购订单占用详情
+            var srm_po_occupy = _mysql_srm_po_occupy.GetListAsync(x => x.company_id == companyId && x.factory_id == factoryId).Result;
+            if (srm_po_occupy.Count > 0)
+            {
+                var moSrm_po_occupy = ObjectMapper.Map<List<srm_po_occupy>, List<mo_srm_po_occupy>>(srm_po_occupy);
+                moSrm_po_occupy.ForEach(item => { item.GenerateNewId(help.NextId()); item.bang_id = bangid; });
+                await _srm_po_occupy.InsertManyAsync(moSrm_po_occupy);
+            }
+        }
+
+        /// <summary>
+        /// 清处数据库快照
+        /// </summary>
+        /// <returns></returns>
+        public async Task ClearSnapShot(long bangid)
+        {
+            //清除物料库存数据
+            await _ic_item_stock.DeleteAsync(p => p.bang_id == bangid);
+
+            //清除工单占用记录表
+            //await _mes_mooccupy.DeleteAsync(p => p.bang_id == bangid);
+
+            //清除工单主表
+            //await _mes_morder.Delete(p => p.bang_id == bangid);
+
+            //清除工单子表
+            //await _mes_moentry.Delete(p => p.bang_id == bangid);
+
+            //清除采购订单
+            await _srm_po_main.DeleteAsync(p => p.bang_id == bangid);
+
+            //清除采购订单明细
+            await _srm_po_list.DeleteAsync(p => p.bang_id == bangid);
+
+            //清除采购订单占用详情
+            //await _srm_po_occupy.DeleteAsync(p => p.bang_id == bangid);
+        }
+
+
+        /// <summary>
+        /// 物料数据计算前准备
+        /// </summary>
+        /// <param name="boms"></param>
+        /// <param name="bangid"></param>
+        /// <param name="sorder"></param>
+        /// <param name="bomlist"></param>
+        /// <param name="bomchildlist"></param>
+        /// <param name="icitemlist"></param>
+        /// <param name="sublist"></param>
+        /// <param name="suballlist"></param>
+        /// <param name="subdtllist"></param>
+        /// <param name="stocklist"></param>
+        /// <param name="sklist"></param>
+        /// <exception cref="NotImplementedException"></exception>
+        public void DataInitialization(List<mo_ic_bom> boms, long bangid, List<mo_ic_item> icitemlist, List<mo_ic_item_stock> stocklist, List<b_bom_pretreatment> pretreatments, List<mo_ic_item_stockoccupy> sklist)
+        {
+            List<long> itemIds = pretreatments.Select(p => p.item_id.GetValueOrDefault()).ToList();
+            icitemlist.AddRange(_ic_item.GetListAsync(p => itemIds.Contains(p.mysql_id) && !p.IsDeleted).Result);
+            #region 1、数据准备
+            //1.1、获取产能检查相关数据
+            //产品物料编码
+            List<string> itemnums = pretreatments.Where(p => p.level == 1).Select(p => p.item_number).Distinct().ToList();
+            //产线明细
+            prodLines = _prodLineDetail.Select(p => itemnums.Contains(p.Part)).ToList();
+            //标准工序
+            routingOps = _routingOpDetail.Select(p => itemnums.Contains(p.RoutingCode)).ToList();
+            List<string> lines = prodLines.Select(p => p.Line).Distinct().ToList();
+            //工作日历
+            calendarWorks = _shopCalendarWorkCtr.Select(p => lines.Contains(p.ProdLine)).ToList();
+            //休息日
+            qualityLineWorks = _qualityLineWorkDetail.Select(p => lines.Contains(p.ProdLine)).ToList();
+            //节假日
+            holidays = _holidayMaster.Select(p => p.Dated >= DateTime.Now.Date);
+
+            //主工单
+            List<mo_mes_morder> mo_Mes_Morders = _mes_morder.GetListAsync(x => boms.Select(p => p.bom_number).Contains(x.bom_number) && (x.morder_state != MorderEnum.Accomplish_state || x.morder_state != MorderEnum.Close_state
+          && x.morder_icitem_type != MorderEnum.XgwyMorder) && x.company_id == param.company_id && x.bang_id == bangid).Result;
+            List<long> moids = mo_Mes_Morders.Select(p => p.mysql_id).ToList();
+            List<mo_mes_moentry> mo_Mes_Moentry = _mes_moentry.GetListAsync(x => moids.Contains(x.moentry_moid)).Result;
+            //工单占用表
+            List<mo_mes_mooccupy> mes_mooccupyList = _mes_mooccupy.GetListAsync(x => x.moo_state == 1 && !x.IsDeleted && x.company_id == param.company_id
+          && boms.Select(p => p.item_number).Contains(x.fitem_number) && x.bang_id == bangid).Result;
+
+            //物料采购订单明细
+            var poDetailList = _srm_po_list.GetListAsync(x => icitemlist.Select(p => p.mysql_id).ToList().Contains(x.icitem_id.Value) && x.bang_id == bangid && x.state == 1 && x.rstate == 1 && !x.IsDeleted).Result;
+            //采购订单占用数据
+            var poOccupys = _srm_po_occupy.GetListAsync(x => poDetailList.Select(p => p.Id).ToList().Contains(x.polist_id) && x.bang_id == bangid && !x.IsDeleted).Result;
+            #endregion
+
+            //处理一下已经插入得占用记录
+
+            //物料库存
+            stocklist.AddRange(_ic_item_stock.GetListAsync(p => p.factory_id == param.factoryId && p.bang_id == bangid && itemIds.Contains(p.icitem_id)).Result);
+            //物料库存占用表
+            sklist.AddRange(_ic_item_stockoccupy.GetListAsync(x => x.bang_id == bangid && !x.IsDeleted).Result);
+
+            //物料提前期
+            leadTimeList = GetLeadTime(icitemlist, param.company_id, param.factoryId);//提前期列表
+            supplierList = GetSupplier(itemIds, param.company_id, param.factoryId);//供应商列表
+
+            _CalcBomViewAppService.leadTimeList = leadTimeList;
+            _CalcBomViewAppService.supplierList = supplierList;
+
+            //资源检查添加产线工序等数据
+            _CalcBomViewAppService.prodLines = prodLines;
+            _CalcBomViewAppService.routingOps = routingOps;
+            _CalcBomViewAppService.calendarWorks = calendarWorks;
+            _CalcBomViewAppService.qualityLineWorks = qualityLineWorks;
+            _CalcBomViewAppService.holidays = holidays;
+
+            _CalcBomViewAppService.mordersList = mo_Mes_Morders;//工单
+            _CalcBomViewAppService.moentriesList = mo_Mes_Moentry;//工单子表
+            _CalcBomViewAppService.mooccupyAllList = mes_mooccupyList;//工单占用表
+
+            _CalcBomViewAppService.srm_Po_Lists = poDetailList; //采购明细
+            _CalcBomViewAppService.srm_Po_Occupies = poOccupys; //采购占用表
+            _CalcBomViewAppService.ic_item_List = icitemlist; //物料表
+        }
+
+
+        public void GenerateSort(List<BomChildExamineDto> returnlist)
+        {
+            int level = returnlist.Max(s => s.level);
+            returnlist.ForEach(s =>
+            {
+                int num = level - s.level;
+                if (num > 0)
+                {
+                    s.num_order = long.Parse((s.num_order * Math.Pow(1000, num)).ToString());
+                }
+            });
+        }
+
+        /// <summary>
+        /// 根据物料id获取物料4个提前期
+        /// </summary>
+        /// <param name="icItemIds">物料id</param>
+        /// <param name="tenantId">企业id</param>
+        /// <param name="factoryid">工厂id</param>
+        /// <returns></returns>
+        private List<ICItemLeadTimeDto> GetLeadTime(List<mo_ic_item> icItemIds, long? companyId, long factoryid)
+        {
+            return icItemIds.Where(p => p.factory_id == factoryid && p.company_id == companyId && !p.IsDeleted).
+                Select(x => new ICItemLeadTimeDto
+                {
+                    item_id = x.mysql_id,
+                    transportation_leadtime = x.transportation_leadtime,
+                    stock_leadtime = x.stock_leadtime,
+                    production_leadtime = x.production_leadtime,
+                    order_leadtime = x.order_leadtime,
+                    minorderqty = x.minorderqty,
+                    put_integer = x.put_integer,
+                    minpackqty = x.minpackqty,
+                    ordissu_days = x.ordissu_days
+                }).AsQueryable<ICItemLeadTimeDto>().ToList();
+        }
+
+        //根据物料id获取物料供应商
+        private List<mo_srm_purchase> GetSupplier(List<long> icItemIds, long? companyId, long factoryid)
+        {
+            return _srm_purchase.GetListAsync(p => icItemIds.Contains(p.icitem_id) && p.company_id == companyId && p.factory_id == factoryid && !p.IsDeleted).Result;
+        }
+
+
+        /// <summary>
+        /// 物料和BOM前置数据准备
+        /// </summary>
+        /// <param name="boms"></param>
+        /// <param name="bomlist"></param>
+        /// <param name="bomchildlist"></param>
+        /// <param name="icitemlist"></param>
+        /// <param name="sublist"></param>
+        /// <param name="suballlist"></param>
+        /// <param name="subdtllist"></param>
+        public void IcItemPretreatment(List<mo_ic_bom> boms, List<mo_ic_bom> bomlist, List<mo_ic_bom_child> bomchildlist, List<mo_ic_item> icitemlist, List<mo_ic_substitute> sublist, List<mo_ic_substitute_group> suballlist, List<mo_ic_substitute_group_detail> subdtllist)
+        {
+            //获取物料bom，物料bom明细
+            GetIcBomData(boms, bomlist, bomchildlist);
+
+            //根据明细集合查出所有得替代关系表数据集合
+            List<string> codeList = bomchildlist.Select(c => c.substitute_code).Distinct().ToList();
+            sublist.AddRange(_ic_substitute.GetListAsync(p => codeList.Contains(p.substitute_code) && !p.IsDeleted).Result);
+
+            List<long> subidlist = sublist.Select(c => c.mysql_id).Distinct().ToList();
+            suballlist.AddRange(_ic_substitute_group.GetListAsync(p => subidlist.Contains(p.substitute_group_id) && !p.IsDeleted).Result);
+
+            List<long> suballidlist = suballlist.Select(c => c.mysql_id).Distinct().ToList();
+            subdtllist.AddRange(_ic_substitute_group_detail.GetListAsync(p => suballidlist.Contains(p.substitute_group_id) && !p.IsDeleted).Result);
+
+            //获取物料数据
+            List<long> itemIds = bomlist.Select(p => p.icitem_id).ToList();
+            itemIds.AddRange(bomchildlist.Select(p => p.icitem_id).ToList());
+            itemIds.AddRange(subdtllist.Select(p => p.icitem_id).ToList());
+            icitemlist.AddRange(_ic_item.GetListAsync(p => itemIds.Contains(p.mysql_id) && !p.IsDeleted).Result);
+        }
+
+        /// <summary>
+        /// 递归:获取icbom,icbomchild数据
+        /// </summary>
+        /// <param name="icBoms"></param>
+        /// <param name="bomlist"></param>
+        /// <param name="bomchildlist"></param>
+        public void GetIcBomData(List<mo_ic_bom> icBoms, List<mo_ic_bom> bomlist, List<mo_ic_bom_child> bomchildlist)
+        {
+            if (icBoms.Count == 0)
+            {
+                return;
+            }
+            //添加物料bom数据
+            foreach (var ib in icBoms)
+            {
+                if (!bomlist.Exists(s => s.mysql_id == ib.mysql_id))
+                {
+                    bomlist.Add(ib);
+                }
+            }
+            //获取物料bom明细数据
+            //List<mo_ic_bom_child> childList = _ic_bom_child.GetManyByCondition(p => icBoms.Select(m => m.mysql_id).Contains(p.bom_id) && p.use_status == 1 && p.tenant_id == param.tenantId && p.factory_id == param.factoryId && !p.IsDeleted).Result.ToList();
+            List<mo_ic_bom_child> childList = _ic_bom_child.GetListAsync(p => icBoms.Select(m => m.mysql_id).Contains(p.bom_id) && p.company_id == param.company_id && !p.IsDeleted).Result.ToList();
+            //没有明细数据,终止
+            if (childList.Count == 0)
+            {
+                return;
+            }
+            foreach (var bchild in childList)
+            {
+                if (!bomchildlist.Exists(s => s.mysql_id == bchild.mysql_id))
+                {
+                    bomchildlist.Add(bchild);
+                }
+            }
+            //通过物料bom明细数据反查物料bom数据
+            var boms = _ic_bom.GetListAsync(p => childList.Select(m => m.icitem_id).ToList().Contains(p.icitem_id) && p.use_status == 1 && p.company_id == param.company_id && !p.IsDeleted).Result.ToList();
+            foreach (var chd in childList)
+            {
+                var curBoms = boms.Where(p => p.icitem_id == chd.icitem_id).ToList();
+                GetIcBomData(curBoms, bomlist, bomchildlist);
+            }
+        }
+
+
+        /// <summary>
+        /// 自动生成BOM预处理清单
+        /// </summary>
+        public void AutoCreateBomBill(string companyid, List<mo_ic_bom> ic_Boms = null)
+        {
+            ic_Boms ??= _ic_bom.GetListAsync(p => p.company_id.ToString() == companyid && (p.bom_number == "10100012_V1.0" || p.bom_number == "10100241_V1.0" || p.bom_number == "BOM00042070") && !p.IsDeleted).Result.ToList();
+            var pretreatment = _mysql_b_bom_pretreatment.GetListAsync(s => ic_Boms.Select(c => c.mysql_id).ToList().Contains(s.sourceid)).Result;
+
+            param.company_id = long.Parse(companyid);
+
+            //物料bom
+            List<mo_ic_bom> bomlist = new List<mo_ic_bom>();
+            List<mo_ic_bom_child> bomchildlist = new List<mo_ic_bom_child>();
+            //物料信息
+            List<mo_ic_item> icitemlist = new List<mo_ic_item>();
+            //替代关系
+            List<mo_ic_substitute> sublist = new List<mo_ic_substitute>();
+            List<mo_ic_substitute_group> suballlist = new List<mo_ic_substitute_group>();
+            List<mo_ic_substitute_group_detail> subdtllist = new List<mo_ic_substitute_group_detail>();
+            IcItemPretreatment(ic_Boms, bomlist, bomchildlist, icitemlist, sublist, suballlist, subdtllist);
+
+            List<b_bom_pretreatment> deleteList = new List<b_bom_pretreatment>();
+            List<b_bom_pretreatment> addList = new List<b_bom_pretreatment>();
+            foreach (var bom in ic_Boms)
+            {
+                var pret = pretreatment.Find(s => s.sourceid == bom.mysql_id && s.bom_id == bom.mysql_id);
+                if (pret != null)
+                {
+                    if (pret.version == bom.version)
+                    {
+                        //如果存在，且版本相同，则不需要处理
+                        continue;
+                    }
+                    //版本不同则重新生成
+                    deleteList.Add(pret);
+                }
+                //bom层级组装
+                var getBomList = _pretreatmentAppService.BomPretreatment(bom.mysql_id, bomlist, bomchildlist, icitemlist);
+                //bom替代关系组装
+                _pretreatmentAppService.BomSubstitute(getBomList, bomlist, bomchildlist, icitemlist, sublist, suballlist, subdtllist);
+
+                GenerateSort(getBomList);
+                var list = ObjectMapper.Map<List<BomChildExamineDto>, List<b_bom_pretreatment>>(getBomList);
+                list.ForEach(s =>
+                {
+                    s.sourceid = bom.mysql_id;
+                    s.company_id = bom.company_id;
+                    s.tenant_id = bom.tenant_id;
+                    s.factory_id = bom.factory_id;
+                });
+                addList.AddRange(list);
+            }
+            if (deleteList.Any())
+            {
+                _businessDbContext.BulkDelete(deleteList);
+            }
+            if (addList.Any())
+            {
+                _businessDbContext.BulkInsert(addList);
+
+                //await _mysql_b_bom_pretreatment.InsertManyAsync(addList);
+            }
+        }
+
+        /// <summary>
+        /// 检查所有成品半成品原材料是否需要补货先判断SS再判断ROP
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        public async Task<string> DayCheckAllByFinalGoods(InputDto input)
+        {
+            //先找成品，就是年度销售预测
+            //_replenishmentModel.
+            return "OK";
+        }
+
+        /// <summary>
+        /// 生产长周期物料要货令
+        /// </summary>
+        /// <param name="input">需要传入工厂编码</param>
+        /// <param name="month">要生成多少个月的长周期要货令，导入年度销售预测为12，编辑滚动更新为6个月</param>
+        /// <returns></returns>
+        public async Task<string> LongPeriodItemPR(InputDto input, int month)
+        {
+
+            return "OK";
+        }
+
+        public ReplenishmentDto GetROPParam(string domain)
+        {
+            //select [Domain],Val,Ufld1,UDeci1 from GeneralizedCodeMaster where [Domain] = '1001' AND FldName ='SystemConfig' 
+            //  AND Val IN('ReplenishmentCalcPeriod', 'HistoryOutStockMonth', 'SaleFcstMonth', 'SaleFcstEntryDate', 'UpdateWeeks', 'WeekPlanUpdateDay', 'LongPeriodDay')
+            List<string> list = new List<string>();
+            list.Add("ReplenishmentCalcPeriod");
+            list.Add("HistoryOutStockMonth");
+            list.Add("SaleFcstMonth");
+            list.Add("SaleFcstEntryDate");
+            list.Add("UpdateWeeks");
+            list.Add("WeekPlanUpdateDay");
+            list.Add("LongPeriodDay");
+            var configList = _generalizedCodeMaster.Select(a => a.Domain == domain && a.FldName == "SystemConfig" && list.Contains(a.Val));
+
+            ReplenishmentDto replenishmentDto = new ReplenishmentDto();
+            replenishmentDto.HistoryOutStockMonth = 3;
+            replenishmentDto.ReplenishmentCalcPeriod = "W";
+            replenishmentDto.HistoryOutStockMonth = 2;
+            replenishmentDto.SaleFcstMonth = 2;
+            replenishmentDto.SaleFcstEntryDate = 27;
+            replenishmentDto.UpdateWeeks = 12;
+            replenishmentDto.WeekPlanUpdateDay = 7;//每周日更新
+            replenishmentDto.LongPeriodDay = 60;
+            if (configList?.Find(a => a.Val == "HistoryOutStockMonth") != null)
+            {
+                replenishmentDto.HistoryOutStockMonth = (int)configList?.Find(a => a.Val == "HistoryOutStockMonth").UDeci1;
+            }
+            if (configList?.Find(a => a.Val == "ReplenishmentCalcPeriod") != null)
+            {
+                switch (configList?.Find(a => a.Val == "ReplenishmentCalcPeriod").Ufld1)
+                {
+                    case "月":
+                        replenishmentDto.ReplenishmentCalcPeriod = "M";
+                        break;
+                    case "周":
+                        replenishmentDto.ReplenishmentCalcPeriod = "W";
+                        break;
+                    case "":
+                        replenishmentDto.ReplenishmentCalcPeriod = "D";
+                        break;
+                    default:
+                        replenishmentDto.ReplenishmentCalcPeriod = "W";
+                        break;
+                }
+            }
+            if (configList?.Find(a => a.Val == "SaleFcstMonth") != null)
+            {
+                replenishmentDto.SaleFcstMonth = (int)configList?.Find(a => a.Val == "SaleFcstMonth").UDeci1;
+            }
+
+            if (configList?.Find(a => a.Val == "SaleFcstEntryDate") != null)
+            {
+                replenishmentDto.SaleFcstEntryDate = (int)configList?.Find(a => a.Val == "SaleFcstEntryDate").UDeci1;
+            }
+
+            if (configList?.Find(a => a.Val == "UpdateWeeks") != null)
+            {
+                replenishmentDto.UpdateWeeks = (int)configList?.Find(a => a.Val == "UpdateWeeks").UDeci1;
+            }
+
+            if (configList?.Find(a => a.Val == "WeekPlanUpdateDay") != null)
+            {
+                switch (configList?.Find(a => a.Val == "WeekPlanUpdateDay").Ufld1)
+                {
+                    case "周一":
+                        replenishmentDto.WeekPlanUpdateDay = 1;
+                        break;
+                    case "周二":
+                        replenishmentDto.WeekPlanUpdateDay = 2;
+                        break;
+                    case "周三":
+                        replenishmentDto.WeekPlanUpdateDay = 3;
+                        break;
+                    case "周四":
+                        replenishmentDto.WeekPlanUpdateDay = 4;
+                        break;
+                    case "周五":
+                        replenishmentDto.WeekPlanUpdateDay = 5;
+                        break;
+                    case "周六":
+                        replenishmentDto.WeekPlanUpdateDay = 6;
+                        break;
+                    case "周日":
+                        replenishmentDto.WeekPlanUpdateDay = 7;
+                        break;
+                    default:
+                        replenishmentDto.WeekPlanUpdateDay = 7;
+                        break;
+                }
+            }
+
+            if (configList?.Find(a => a.Val == "LongPeriodDay") != null)
+            {
+                replenishmentDto.LongPeriodDay = (int)configList?.Find(a => a.Val == "LongPeriodDay").UDeci1;
+            }
+            return replenishmentDto;
+        }
+
+        /// <summary>
+        /// 计算ABC分类和FMR分类
+        /// </summary>
+        /// <param name="replenishmentModels"></param>
+        /// <param name="replenishmentDto"></param>
+        /// <param name="input"></param>
+        /// <param name="type">1为全部一起算，2为成品算成品原材料算原材料</param>
+        public void CalcFMRAndABC(List<ReplenishmentModel> replenishmentModels, ReplenishmentDto replenishmentDto, InputDto input, int type)
+        {
+            var itemNumList = replenishmentModels?.Select(a => a.number).ToList();
+            //发货出库记录
+            var shipList = _ASNBOLShipperDetail.Select(a => a.Domain == input.factory_id.ToString() && a.IsActive && a.shtype == "SH" && a.Typed != "S" && a.ShipDate >= DateTime.Now.AddMonths(-6) && a.RealQty > 0 && itemNumList.Contains(a.ContainerItem));
+            //领料出库记录
+            //var pickbilllist = _NbrDetail.Select(a => a.Domain == input.factory_id.ToString() && a.Type == "SM" && a.IsActive && a.UpdateTime >= DateTime.Now.AddMonths(replenishmentDto.HistoryOutStockMonth * -1) && itemNumList.Contains(a.ItemNum));
+            var pickbilllist = _invTransHist.Select(a => a.Domain == input.factory_id.ToString() && a.TransType == "iss-wo" && a.IsActive && a.CreateTime >= DateTime.Now.AddMonths(-6) && itemNumList.Contains(a.ItemNum));
+            //总的移库次数
+            int totalCount = shipList.Count() + pickbilllist.Count();
+            //平均出库次数
+            decimal avgOutStock = totalCount / replenishmentDto.HistoryOutStockMonth;
+
+            //总出货金额
+            decimal? totalPrice = shipList.Sum(a => a.Price * a.QtyToShip);
+            //按照物料分组统计出货金额
+            var itemGroup = shipList.GroupBy(p => p.ContainerItem)
+                 .Select(p => new ASNBOLShipperDetail
+                 {
+                     Price = p.Sum(a => a.Price * a.QtyToShip) * 100 / totalPrice,
+                     ContainerItem = p.Key
+                 }).ToList().OrderByDescending(c => c.Price).ThenByDescending(c => c.ContainerItem);
+            var AIndex = (int)Math.Ceiling(itemGroup.Count() * 0.75);//A类：0-75%
+            var BIndex = (int)Math.Ceiling(itemGroup.Count() * 0.9) - AIndex;//A类：75%-90%
+            var CIndex = itemGroup.Count() - AIndex - BIndex;//A类：90%-100%
+            var AItem = itemGroup.Take(AIndex);
+            var BItem = itemGroup.Skip(AIndex).Take(BIndex);
+            var CItem = itemGroup.Skip(AIndex + BIndex).Take(CIndex);
+            replenishmentModels?.ForEach(replenishmentModel =>
+            {
+                if (AItem.Any(a => a.ContainerItem == replenishmentModel.number))
+                {
+                    replenishmentModel.abc = "A";//金额占比前75%的物料划为A类
+                }
+                else if (BItem.Any(a => a.ContainerItem == replenishmentModel.number))
+                {
+                    replenishmentModel.abc = "B";//金额占比前75%-90%的物料划为A类
+                }
+                else if (CItem.Any(a => a.ContainerItem == replenishmentModel.number))
+                {
+                    replenishmentModel.abc = "C";//金额占比后10%的物料划为A类
+                }
+                else
+                {
+                    replenishmentModel.abc = "B";//原材料默认为B
+                }
+                int itemMoveCount = shipList.Count(a => a.ContainerItem == replenishmentModel.number) + pickbilllist.Count(a => a.ItemNum == replenishmentModel.number);
+                if (itemMoveCount >= avgOutStock)
+                {
+                    replenishmentModel.fmr = "F";
+                }
+                else if (itemMoveCount >= avgOutStock / 2 && itemMoveCount < avgOutStock || itemMoveCount == 0)
+                {
+                    replenishmentModel.fmr = "M";//没有出库移库记录的默认为M
+                }
+                else if (itemMoveCount < avgOutStock / 2)
+                {
+                    replenishmentModel.fmr = "R";
+                }
+
+                if (replenishmentModel.abc == "A" && replenishmentModel.fmr == "R")
+                {
+                    replenishmentModel.service_level_pct = (decimal?)0.8;
+                }
+                if (replenishmentModel.abc != "C" && replenishmentModel.fmr != "R")
+                {
+                    replenishmentModel.service_level_pct = (decimal?)0.96;
+                }
+                if (replenishmentModel.abc == "C" || (replenishmentModel.abc == "B" && replenishmentModel.fmr == "R"))
+                {
+                    replenishmentModel.service_level_pct = (decimal?)0.9;
+                }
+            });
+        }
+
+        /// <summary>
+        /// 计算ABC分类和FMR分类
+        /// </summary>
+        /// <param name="replenishmentModels"></param>
+        public void CalcFMRAndABC(ReplenishmentModel replenishmentModel, ReplenishmentDto replenishmentDto, InputDto input)
+        {
+            //发货出库记录
+            var shipList = _ASNBOLShipperDetail.Select(a => a.Domain == input.factory_id.ToString() && a.IsActive && a.shtype == "SH" && a.Typed != "S" && a.ShipDate >= DateTime.Now.AddMonths(-6) && a.RealQty > 0 && replenishmentModel.number == a.ContainerItem);
+            //领料出库记录
+            //var pickbilllist = _NbrDetail.Select(a => a.Domain == input.factory_id.ToString() && a.Type == "SM" && a.IsActive && a.UpdateTime >= DateTime.Now.AddMonths(replenishmentDto.HistoryOutStockMonth * -1) && itemNumList.Contains(a.ItemNum));
+            var pickbilllist = _invTransHist.Select(a => a.Domain == input.factory_id.ToString() && a.TransType == "iss-wo" && a.IsActive && a.CreateTime >= DateTime.Now.AddMonths(-6) && replenishmentModel.number == a.ItemNum);
+            //总的移库次数
+            int totalCount = shipList.Count() + pickbilllist.Count();
+            //平均出库次数
+            decimal avgOutStock = totalCount / replenishmentDto.HistoryOutStockMonth;
+
+            //总出货金额
+            decimal? totalPrice = shipList.Sum(a => a.Price * a.QtyToShip);
+            //按照物料分组统计出货金额
+            var itemGroup = shipList.GroupBy(p => p.ContainerItem)
+                 .Select(p => new ASNBOLShipperDetail
+                 {
+                     Price = p.Sum(a => a.Price * a.QtyToShip) * 100 / totalPrice,
+                     ContainerItem = p.Key
+                 }).ToList().OrderByDescending(c => c.Price).ThenByDescending(c => c.ContainerItem);
+            var AIndex = (int)Math.Ceiling(itemGroup.Count() * 0.75);//A类：0-75%
+            var BIndex = (int)Math.Ceiling(itemGroup.Count() * 0.9) - AIndex;//A类：75%-90%
+            var CIndex = itemGroup.Count() - AIndex - BIndex;//A类：90%-100%
+            var AItem = itemGroup.Take(AIndex);
+            var BItem = itemGroup.Skip(AIndex).Take(BIndex);
+            var CItem = itemGroup.Skip(AIndex + BIndex).Take(CIndex);
+            if (AItem.Any(a => a.ContainerItem == replenishmentModel.number))
+            {
+                replenishmentModel.abc = "A";//金额占比前75%的物料划为A类
+            }
+            else if (BItem.Any(a => a.ContainerItem == replenishmentModel.number))
+            {
+                replenishmentModel.abc = "B";//金额占比前75%-90%的物料划为B类
+            }
+            else if (CItem.Any(a => a.ContainerItem == replenishmentModel.number))
+            {
+                replenishmentModel.abc = "C";//金额占比后10%的物料划为C类
+            }
+            else
+            {
+                replenishmentModel.abc = "B";//原材料默认为B
+            }
+            int itemMoveCount = shipList.Count(a => a.ContainerItem == replenishmentModel.number) + pickbilllist.Count(a => a.ItemNum == replenishmentModel.number);
+            if (itemMoveCount >= avgOutStock)
+            {
+                replenishmentModel.fmr = "F";
+            }
+            else if (itemMoveCount >= avgOutStock / 2 && itemMoveCount < avgOutStock || itemMoveCount == 0)
+            {
+                replenishmentModel.fmr = "M";//没有出库移库记录的默认为M
+            }
+            else if (itemMoveCount < avgOutStock / 2)
+            {
+                replenishmentModel.fmr = "R";
+            }
+
+            if (replenishmentModel.abc == "A" && replenishmentModel.fmr == "R")
+            {
+                replenishmentModel.service_level_pct = (decimal?)0.8;
+            }
+            if (replenishmentModel.fmr != "R")
+            {
+                replenishmentModel.service_level_pct = (decimal?)0.96;
+            }
+            if (replenishmentModel.abc != "A" && replenishmentModel.fmr == "R")
+            {
+                replenishmentModel.service_level_pct = (decimal?)0.9;
+            }
+        }
+
+        /// <summary>
+        /// 算平均月需求数量
+        /// </summary>
+        /// <param name="planList">发货计划</param>
+        /// <param name="itemGroup"></param>
+        /// <param name="itemNum"></param>
+        /// <param name="month"></param>
+        /// <returns></returns>
+        public decimal CalcAvgDemand(List<MonthlyShipmentPlan> list, string itemNum)
+        {
+            return list.Where(i => i.SAPItemNumber == itemNum).Select(a => a.Qty).Average();
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="list">补货模型</param>
+        /// <param name="MQty">本月实际出库</param>
+        /// <param name="replenishmentDto">全局参数</param>
+        /// <param name="itemNum">物料编码</param>
+        /// <returns></returns>
+        public decimal CalcAvgOutStock(List<ReplenishmentModel> list, ReplenishmentDto replenishmentDto, decimal MQty, string itemNum)
+        {
+            return (list.Where(i => i.number == itemNum && i.zero_based_seqno > 1 - replenishmentDto.HistoryOutStockMonth && i.zero_based_seqno <= 0).Select(a => a.actual_out_qty.Value).Sum() + MQty) / (replenishmentDto.HistoryOutStockMonth + 1);
+        }
+
+        public double CalcVariance(List<MonthlyShipmentPlan> list, string itemNum)
+        {
+            var avg = CalcAvgDemand(list, itemNum);
+            var nums = list.Where(i => i.SAPItemNumber == itemNum).Select(a => a.Qty);
+            if (nums.Count() <= 1)
+                return 0;
+            return Math.Sqrt(nums.Sum(x => Math.Pow(Convert.ToDouble(x) - Convert.ToDouble(avg), 2)) / (nums.Count() - 1));
+        }
+
+        /// <summary>
+        /// 获取指定日期在为一年中为第几周
+        /// </summary>
+        /// <param name="dt">指定时间</param>
+        /// <reutrn>返回第几周</reutrn>
+        public static int GetWeekOfYear(DateTime dt)
+        {
+
+            System.Globalization.GregorianCalendar gc = new System.Globalization.GregorianCalendar();
+            int weekOfYear = gc.GetWeekOfYear(dt, System.Globalization.CalendarWeekRule.FirstDay, DayOfWeek.Monday);
+            return weekOfYear;
+        }
+
+        /// <summary>
+        /// 获取指定日期在该月的第几周
+        /// </summary>
+        /// <param name="day"></param>
+        /// <param name="WeekStart">1表示周一至周日为一周,2表示周日至周六为一周</param>
+        /// <returns></returns>
+        public static int WeekOfMonth(DateTime day, int WeekStart)
+        {
+            DateTime FirstofMonth = Convert.ToDateTime(day.Date.Year + "-" + day.Date.Month + "-" + 1);
+
+            int i = (int)FirstofMonth.Date.DayOfWeek;
+            if (i == 0)
+            {
+                i = 7;
+            }
+
+            if (WeekStart == 1)
+            {
+                return (day.Date.Day + i - 2) / 7 + 1;
+            }
+            if (WeekStart == 2)
+            {
+                return (day.Date.Day + i - 1) / 7;
+
+            }
+            return 0;
+        }
+        //获取上周开始时间
+        public static DateTime getPreWeekStartTime()
+        {
+            var weekday = (int)DateTime.Now.DayOfWeek;
+            return Convert.ToDateTime(DateTime.Now.AddDays(-7 - weekday + 1).ToString("yyyy-MM-dd 00:00:00.000"));
+        }
+        //获取上周结束时间
+        public static DateTime getPreWeekEndTime()
+        {
+            int weekday = (int)DateTime.Now.DayOfWeek;
+            return Convert.ToDateTime(DateTime.Now.AddDays(weekday - 7 + 1).ToString("yyyy-MM-dd 23:59:59.000"));
+        }
+        /// <summary>
+        /// 获取上个月开始时间
+        /// </summary>
+        /// <param name="months"></param>
+        /// <returns></returns>
+        public static DateTime getPreMonthStartTime()
+        {
+            return Convert.ToDateTime(DateTime.Now.AddMonths(-1).AddDays(1 - DateTime.Now.Day).ToString("yyyy-MM-dd 00:00:00.000"));
+        }
+        /// <summary>
+        /// 获取上月结束时间
+        /// </summary>
+        /// <param name="months"></param>
+        /// <returns></returns>
+        public static DateTime getPreMonthEndTime()
+        {
+            return Convert.ToDateTime(DateTime.Now.AddDays(-DateTime.Now.Day).ToString("yyyy-MM-dd 23:59:59.000"));
+        }
+
+        /// <summary>
+        /// 获取前后某个，整数月开始时间
+        /// </summary>
+        /// <param name="months">正数表示后多少个月的第一天，负数为前多少个月第一天</param>
+        /// <returns></returns>
+        public static DateTime getMonthStartTime(int months)
+        {
+            return getPreMonthStartTime().AddMonths(months + 1);
+        }
+        /// <summary>
+        /// 获取前后某个，整数月结束时间
+        /// </summary>
+        /// <param name="months">正数表示后多少个月的第一天，负数为前多少个月第一天</param>
+        /// <returns></returns>
+        public static DateTime getMonthEndTime(int months)
+        {
+            return getPreMonthEndTime().AddMonths(months + 1);
+        }
+    }
+}

MicroServices/Business/Business.Application/ResourceExamineManagement/CalcBomViewAppService.cs

@@ -259,6 +259,7 @@ namespace Business.ResourceExamineManagement
                         //根据成品属性来判断是自制还是委外还是外购，需要考虑这种场景
                         if (level1Dto.erp_cls == 1 && param.checkflag)
                         {
+                            //param.checkflag=true 销售订单产生工单
                             level1Dto.make_qty = level1Dto.lack_qty;
                             //生成主工单
                             GenerateMorderDto generateMorderDto = new GenerateMorderDto()
@@ -301,6 +302,11 @@ namespace Business.ResourceExamineManagement
                                 }
                                 //1.先生成委外工单。
                                 var mesorder = CreateMesOOder(level1Dto, param.company_id, param.factoryId, bangid, leadTimeList, supplierList, plan_date.Value);
+
+                                //2.生成采购申请
+                                //采购申请
+                                PackageSRMPR(level1Dto, bangid, sentrys);
+
                                 level1Dto.subcontracting_qty = level1Dto.lack_qty;
                                 level1Dto.subcontracting_list = new List<ooder>();
                                 ooder oo = new ooder();
@@ -310,19 +316,12 @@ namespace Business.ResourceExamineManagement
                                 oo.production_unit_code = mesorder.production_unit_code;
                                 oo.ooentry_prdname = mesorder.ooentry_prdname;
                                 oo.ooentry_stime = mesorder.ooentry_stime;
-                                oo.ooentry_etime = mesorder.ooentry_etime;
+                                oo.ooentry_etime = level1Dto.kitting_time;
                                 oo.oorder_date = mesorder.oorder_date;
                                 oo.oorder_no = mesorder.oorder_no;
                                 level1Dto.subcontracting_list.Add(oo);
-                                level1Dto.kitting_time = mesorder.ooentry_etime;
                                 orderList.Add(mesorder);
-                                //2.生成采购申请
-                                //采购申请
-                                PackageSRMPR(level1Dto, bangid, sentrys);
                             }
-
-                           
-
                         }
                         else
                         {
@@ -736,6 +735,9 @@ namespace Business.ResourceExamineManagement
                             }
                             //1.先生成委外工单。
                             var mesorder = CreateMesOOder(item, param.company_id, param.factoryId, bangid, leadTimeList, supplierList, plan_date.Value);
+                            //2.生成采购申请
+                            //采购申请
+                            PackageSRMPR(item, bangid, sentrys);
                             item.subcontracting_qty = item.lack_qty;
                             item.subcontracting_list = new List<ooder>();
                             ooder oo = new ooder();
@@ -745,15 +747,12 @@ namespace Business.ResourceExamineManagement
                             oo.production_unit_code = mesorder.production_unit_code;
                             oo.ooentry_prdname = mesorder.ooentry_prdname;
                             oo.ooentry_stime = mesorder.ooentry_stime;
-                            oo.ooentry_etime = mesorder.ooentry_etime;
+                            oo.ooentry_etime = item.kitting_time;
                             oo.oorder_date = mesorder.oorder_date;
                             oo.oorder_no = mesorder.oorder_no;
                             item.subcontracting_list.Add(oo);
-                            item.kitting_time = mesorder.ooentry_etime;
                             orderList.Add(mesorder);
-                            //2.生成采购申请
-                            //采购申请
-                            PackageSRMPR(item, bangid, sentrys);
+                            
                         }
                     }
                 }
@@ -1162,6 +1161,8 @@ namespace Business.ResourceExamineManagement
                                     }
                                     //1.先生成委外工单。
                                     var mesorder = CreateMesOOder(sct, param.company_id, param.factoryId, bangid, leadTimeList, supplierList, plan_date.Value);
+                                    //采购申请
+                                    PackageSRMPR(sct, bangid, sentrys);
                                     sct.subcontracting_qty = sct.lack_qty;
                                     sct.subcontracting_list = new List<ooder>();
                                     ooder oo = new ooder();
@@ -1171,14 +1172,11 @@ namespace Business.ResourceExamineManagement
                                     oo.production_unit_code = mesorder.production_unit_code;
                                     oo.ooentry_prdname = mesorder.ooentry_prdname;
                                     oo.ooentry_stime = mesorder.ooentry_stime;
-                                    oo.ooentry_etime = mesorder.ooentry_etime;
+                                    oo.ooentry_etime = sct.kitting_time;
                                     oo.oorder_date = mesorder.oorder_date;
                                     oo.oorder_no = mesorder.oorder_no;
                                     item.subcontracting_list.Add(oo);
-                                    sct.kitting_time = mesorder.ooentry_etime;
                                     orderList.Add(mesorder);
-                                    //采购申请
-                                    PackageSRMPR(sct, bangid, sentrys);
                                 }
                             }
                         }
@@ -1300,7 +1298,7 @@ namespace Business.ResourceExamineManagement
             }
             sRMPR.item_no = returnlist.num;
             sRMPR.orderentry_id = returnlist.sentry_id;
-            sRMPR.lastStartTmie = DateTime.Now.AddDays((double)(sRMPR.srm_Pr_Main.MinBy(x => x.totalLeadTime).totalLeadTime.GetValueOrDefault() + plan.clean_leadtime.GetValueOrDefault()));//加上提前期和备料期，得到齐套时间
+            sRMPR.lastStartTmie = DateTime.Now.AddDays((double)(sRMPR.srm_Pr_Main.MinBy(x => x.totalLeadTime).totalLeadTime.GetValueOrDefault()));//加上提前期和备料期，得到齐套时间
             return sRMPR;
         }
         // 生成订单编号 字母+年月日+8位随机数+时间戳
@@ -1443,8 +1441,9 @@ namespace Business.ResourceExamineManagement
             {
                 item.purchase_qty = item.lack_qty;
                 item.purchase_list = new List<purchase>();
-                item.kitting_time = SRMPRDto.lastStartTmie;
+                
             }
+            item.kitting_time = SRMPRDto.lastStartTmie;
             SRMPRDtoList.Add(SRMPRDto);
         }
     }

MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

@@ -10,13 +10,13 @@ using Business.ResourceExamineManagement.Dto;
 using Business.StructuredDB.SaleFcst;
 using Business.StructuredDB.WMS;
 using EFCore.BulkExtensions;
+using Microsoft.AspNetCore.DataProtection.Repositories;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 using MongoDB.Driver;
 using MongoDB.Driver.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using SixLabors.ImageSharp;
-using Spire.Pdf.General.Render.Decode.Jpeg2000.j2k.wavelet.synthesis;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.Design;
@@ -26,10 +26,10 @@ using System.Threading.Tasks;
 using Volo.Abp.Application.Services;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Domain.Repositories;
+using Volo.Abp.Json.SystemTextJson;
 using Volo.Abp.MultiTenancy;
 using Volo.Abp.ObjectMapping;
 using Volo.Abp.Uow;
-using static Spire.Pdf.General.Render.Decode.Jpeg2000.j2k.codestream.HeaderInfo;
 
 namespace Business.ResourceExamineManagement
 {
@@ -363,18 +363,6 @@ namespace Business.ResourceExamineManagement
         /// </summary>
         public List<HolidayMaster> holidays = new List<HolidayMaster>();
         private readonly IUnitOfWorkManager _unitOfWorkManager;
-
-        /// <summary>
-        /// 补货模型
-        /// </summary>
-        private IRepository<ReplenishmentModel, long> _replenishmentModel;
-        private IRepository<DomesticTerminalFcst, long> _domesticTerminalFcst;
-        private ISqlRepository<ASNBOLShipperDetail> _ASNBOLShipperDetail;
-        private IRepository<StandardItemModelSet, long> _standardItemModelSet;
-        private ISqlRepository<InvTransHist> _invTransHist;
-        private ISqlRepository<SAPInv> _SAPInv;
-        private IRepository<srm_purchase, long> _srmPurchase;
-        private ISqlRepository<MonthlyShipmentPlan> _monthlyShipmentPlan;
         #endregion
 
         #region 构造函数
@@ -567,13 +555,6 @@ namespace Business.ResourceExamineManagement
             _generalizedCodeMaster = generalizedCodeMaster;
             _unitOfWorkManager = unitOfWorkManager;
             _scheduleResultOpMaster = scheduleResultOpMaster;
-            _replenishmentModel = replenishmentModel;
-            _domesticTerminalFcst = domesticTerminalFcst;
-            _standardItemModelSet = standardItemModelSet;
-            _invTransHist = invTransHist;
-            _SAPInv = SAPInv;
-            _monthlyShipmentPlan = monthlyShipmentPlan;
-            _srmPurchase = srmPurchase;
             _businessDbContext = businessDbContext;
         }
         #endregion
@@ -2272,7 +2253,7 @@ namespace Business.ResourceExamineManagement
 
 
         /// <summary>
-        /// 计划工单齐套检查
+        /// 计划工单资源检查
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
@@ -2403,13 +2384,45 @@ namespace Business.ResourceExamineManagement
             }
         }
 
+        /// <summary>
+        /// 范围内工单齐套检查
+        /// </summary>
+        /// <param name="domain"></param>
+        /// <param name="userAccount"></param>
+        /// <returns></returns>
+        public async Task<string> OrderCompleteInspection(string domain, string userAccount)
+        {
+            var workords = _workOrdMaster.Select(s => s.Domain == domain && (s.Status == "r" || string.IsNullOrEmpty(s.Status) == true)).ToList();
+            List<mes_morder> morders = _mysql_mes_morder.GetListAsync(x => x.factory_id.ToString() == domain && workords.Select(s => s.WorkOrd).Contains(x.morder_no) && (x.morder_state == MorderEnum.Initial_state || x.morder_state == MorderEnum.Xd_state) && !x.IsDeleted).Result;
+            if (morders.Any())
+            {
+                var rst = await OrderResourceCheck(morders, domain, userAccount);
+                if (rst == "ok")
+                {
+                    try
+                    {
+                        await _mysql_mes_morder.UpdateManyAsync(morders);
+                    }
+                    catch (Exception e)
+                    {
+                        new NLogHelper("ResourceExamineAppService").WriteLog("OrderCompleteInspection", "工单齐套检查失败：" + e.Message, _currentTenant.Id.ToString());
+                    }
+                }
+                else {
+                    return rst;
+                }
+            }
+            return "ok";
+        }
+
+
 
         /// <summary>
-        /// 按工单齐套检查
+        /// 原材料在库检查
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
-        public async Task<string> OrderResourceCheck(List<mes_morder> mo_Mes_Morders,string domain, string userAccount, bool WordOrdXd=false)
+        public async Task<string> OrderResourceCheck(List<mes_morder> mo_Mes_Morders,string domain, string userAccount)
         {
             List<mes_morder> checkMo = new List<mes_morder>();
             //只做库存是否齐套检查
@@ -2450,23 +2463,11 @@ namespace Business.ResourceExamineManagement
                         checkMo.Add(mo);
                     }
                 }
-
-                string workords = "";
-
                 if (checkMo.Any())
                 {
                     var rtn = await OrderKittingCheck(checkMo);
                     if (rtn != null && rtn.examines != null)
                     {
-                        var sysSet = _generalizedCodeMaster.Select(s => s.FldName == "SystemConfig" && s.Val == "WorkOrderLockPeriod" && s.Domain == domain).ToList();
-                        decimal lookDay = 0;
-                        if (sysSet.Any())
-                        {
-                            //锁定期
-                            lookDay = sysSet[0].UDeci1;
-                        }
-                        lookDay = lookDay == 0 ? 7 : lookDay;
-                        DateTime lookTime = DateTime.Now.Date.AddDays((double)lookDay);
                         //循环处理工单
                         foreach (var cmo in checkMo)
                         {
@@ -2479,7 +2480,7 @@ namespace Business.ResourceExamineManagement
                                     //如果有缺料
                                     if (bce.is_use && bce.stock_state == 0)
                                     {
-                                        //如果当前数据没有子级，则代表原材料
+                                        //如果当前数据没有子级，则代表原材料齐套
                                         if (exm.BomChildExamineList.Where(s => s.parent_id == bce.fid).Count() == 0)
                                         {
                                             flag = false;
@@ -2495,56 +2496,15 @@ namespace Business.ResourceExamineManagement
                             if (flag)
                             {
                                 //锁定期内生产备料单，并且更新为备料中，锁定期外的则更新成仓库齐套。
-                                if (cmo.moentry_sys_stime.GetValueOrDefault().Date <= lookTime)
-                                {
-                                    //生成领料单
-                                    workords += "," + cmo.morder_no;
-                                    cmo.MaterialSituation = MorderEnum.Preparation;
-                                    cmo.morder_state = MorderEnum.Xd_state;
-                                }
-                                else {
-                                    cmo.MaterialSituation = MorderEnum.CarehouseComplete;
-                                    if (WordOrdXd)
-                                    {
-                                        workords += "," + cmo.morder_no;
-                                        cmo.MaterialSituation = MorderEnum.Preparation;
-                                        cmo.morder_state = MorderEnum.Xd_state;
-                                    }
-                                }
+                                cmo.MaterialSituation = MorderEnum.CarehouseComplete;
                             }
                             else
                             {
                                 //工单状态为  “仓库不齐套”
                                 cmo.MaterialSituation = MorderEnum.NoCarehouseComplete;
-                                if (WordOrdXd)
-                                {
-                                    workords += "," + cmo.morder_no;
-                                    cmo.morder_state = MorderEnum.Xd_state;
-                                    cmo.MaterialSituation = MorderEnum.Part;
-                                }
                             }
                         }
                     }
-                    /*OrderResourceViewDto result = DataPackage(rtn);
-                    result.DayBulletinBoardList = result.DayBulletinBoardList.OrderByDescending(d => d.day).ToList();
-                    //保存检查结果
-                    SaveExamineResult(result.KittingCheckResultList, result.DayBulletinBoardList, 1);*/
-                }
-                _businessDbContext.BulkUpdate(mo_Mes_Morders);
-                if (workords.Length > 0)
-                {
-                    workords = workords.Substring(1, workords.Length - 1);
-                    //如果生成领料单，需清理掉当前工单的占用，然后根据领料单的数据，来生成工单的占用
-                    var rst = await CreatePickBill(workords, domain, userAccount);
-                    if (rst != "ok")
-                    {
-                        return rst;
-                    }
-                    var insertList = GetCopyOP(workords, domain);
-                    if (insertList.Any())
-                    {
-                        _periodSequenceDet.Insert(insertList);
-                    }
                 }
                 return "ok";
             }
@@ -2634,7 +2594,7 @@ namespace Business.ResourceExamineManagement
         }
 
         /// <summary>
-        /// 范围内工单齐套检查并下达
+        /// 自动下达
         /// </summary>
         /// <param name="startime"></param>
         /// <param name="endtime"></param>
@@ -2652,12 +2612,58 @@ namespace Business.ResourceExamineManagement
             {
                 DateTime.TryParse(startime, out etime);
             }
-
-            var periodSd = _periodSequenceDet.Select(s => s.Domain == domain && (s.Status == "" || s.Status == "r") && stime <= s.PlanDate && s.PlanDate <= etime).ToList();
+            //根据排产日计划来获取
+            var periodSd = _periodSequenceDet.Select(s => s.Domain == domain && string.IsNullOrEmpty(s.Status) == true && stime <= s.PlanDate && s.PlanDate <= etime).ToList();
             if (periodSd.Any())
             {
-                List<mes_morder> mo_Mes_Morders = _mysql_mes_morder.GetListAsync(x => domain == x.factory_id.ToString() && periodSd.Select(s => s.WorkOrds).Contains(x.morder_no) && (x.morder_state == MorderEnum.Initial_state || x.morder_state == MorderEnum.Xd_state) && !x.IsDeleted).Result;
-                return await OrderResourceCheck(mo_Mes_Morders, domain, userAccount);
+                List<mes_morder> morders = _mysql_mes_morder.GetListAsync(x => domain == x.factory_id.ToString() && periodSd.Select(s => s.WorkOrds).Contains(x.morder_no) && (x.morder_state == MorderEnum.Initial_state || x.morder_state == MorderEnum.Xd_state) && !x.IsDeleted).Result;
+                if (!morders.Any())
+                {
+                    return "没有需要下达的工单";
+                }
+                var rst = await OrderResourceCheck(morders, domain, userAccount);
+                if (rst == "ok")
+                {
+                    var sysSet = _generalizedCodeMaster.Select(s => s.FldName == "SystemConfig" && s.Val == "WorkOrderLockPeriod" && s.Domain == domain).ToList();
+                    decimal lookDay = 0;
+                    if (sysSet.Any())
+                    {
+                        //锁定期
+                        lookDay = sysSet[0].UDeci1;
+                    }
+                    lookDay = lookDay == 0 ? 7 : lookDay;
+                    DateTime lookTime = DateTime.Now.Date.AddDays((double)lookDay);
+
+                    string workords = "";
+                    foreach (var mo in morders)
+                    {
+                        if (mo.MaterialSituation == MorderEnum.CarehouseComplete && mo.morder_state == MorderEnum.Initial_state && mo.moentry_sys_stime.GetValueOrDefault().Date <= lookTime)
+                        {
+                            workords += "," + mo.morder_no;
+                            mo.morder_state = MorderEnum.Xd_state;
+                        }
+                    }
+                    await _mysql_mes_morder.UpdateManyAsync(morders);
+                    if (workords.Length > 0)
+                    {
+                        workords = workords.Substring(1, workords.Length - 1);
+                        //如果生成领料单，需清理掉当前工单的占用，然后根据领料单的数据，来生成工单的占用
+                        var pickRst = await CreatePickBill(workords, domain, userAccount);
+                        if (pickRst != "ok")
+                        {
+                            return pickRst;
+                        }
+                        var insertList = GetCopyOP(workords, domain);
+                        if (insertList.Any())
+                        {
+                            _periodSequenceDet.Insert(insertList);
+                        }
+                    }
+                    return "ok";
+                }
+                else {
+                    return rst;
+                }
             }
             else { 
                 return "没有需要下达的工单";
@@ -2665,7 +2671,7 @@ namespace Business.ResourceExamineManagement
         }
 
         /// <summary>
-        /// 工单齐套检查并下达
+        /// 手动按工单下达
         /// </summary>
         /// <param name="startime"></param>
         /// <param name="endtime"></param>
@@ -2675,14 +2681,45 @@ namespace Business.ResourceExamineManagement
         {
             if (!string.IsNullOrEmpty(workord))
             {
-                List<mes_morder> mo_Mes_Morders = _mysql_mes_morder.GetListAsync(x => domain == x.factory_id.ToString() && x.morder_no == workord && !x.IsDeleted).Result;
-                if (mo_Mes_Morders.Any())
+                List<mes_morder> morders = _mysql_mes_morder.GetListAsync(x => domain == x.factory_id.ToString() && x.morder_no == workord && !x.IsDeleted).Result;
+                if (morders.Any())
                 {
-                    if (!string.IsNullOrEmpty(mo_Mes_Morders[0].morder_state) && mo_Mes_Morders[0].morder_state != MorderEnum.Initial_state)
+                    if (!string.IsNullOrEmpty(morders[0].morder_state) && morders[0].morder_state != MorderEnum.Initial_state)
+                    {
+                        return "工单信息为"+ morders[0].morder_state + ",不允许下达。";
+                    }
+                    var rst = await OrderResourceCheck(morders, domain, userAccount);
+                    if (rst == "ok")
+                    {
+                        try
+                        {
+                            morders[0].morder_state = MorderEnum.Xd_state;
+                            morders[0].MaterialSituation = morders[0].MaterialSituation == MorderEnum.NoCarehouseComplete ? MorderEnum.Part : morders[0].MaterialSituation;
+
+                            //如果生成领料单，需清理掉当前工单的占用，然后根据领料单的数据，来生成工单的占用
+                            var pickRst = await CreatePickBill(morders[0].morder_no, domain, userAccount);
+                            if (pickRst != "ok")
+                            {
+                                return pickRst;
+                            }
+                            await _mysql_mes_morder.UpdateManyAsync(morders);
+                            //复制子工序
+                            var insertList = GetCopyOP(morders[0].morder_no, domain);
+                            if (insertList.Any())
+                            {
+                                _periodSequenceDet.Insert(insertList);
+                            }
+                            return "ok";
+                        }
+                        catch (Exception e)
+                        {
+                            return "下达失败，请联系管理员。";
+                        }
+                    }
+                    else
                     {
-                        return "工单信息为"+ mo_Mes_Morders[0].morder_state + ",不允许下达。";
+                        return rst;
                     }
-                    return await OrderResourceCheck(mo_Mes_Morders, domain, userAccount, true);
                 }
                 else {
                     return "工单信息不存在，请重新检查。";
@@ -2761,7 +2798,8 @@ namespace Business.ResourceExamineManagement
         /// <returns></returns>
         public async Task<string> SubstituteResourceCheck(int day, string workOrd)
         {
-            List<mes_morder> mo_Mes_Morders = new List<mes_morder>();
+            //先屏蔽此功能，暂未使用
+            /*List<mes_morder> mo_Mes_Morders = new List<mes_morder>();
             if (day == 0)
             {
                 List<string> workOrds = workOrd.Split(",").ToList();
@@ -2786,7 +2824,8 @@ namespace Business.ResourceExamineManagement
             }
             else {
                 return JsonConvert.SerializeObject("没有需要检查的工单");
-            }
+            }*/
+            return "ok";
         }
 
         /// <summary>
@@ -3060,8 +3099,13 @@ namespace Business.ResourceExamineManagement
                     var wkordPrList = prmainlist.Where(s => s.pr_mono == wod.WorkOrd).ToList();
 
                     //反算所有的PR，根据时间减去提前期   //按最大预处理时间倒排
-                    var moIcitems = icitemlist.Where(s => wkordPrList.Select(c => c.icitem_id).Contains(s.mysql_id)).ToList();
-                    var maxTime = moIcitems.Max(s => s.clean_leadtime.GetValueOrDefault());
+                    var moIcitems = icitemlist.Where(s => s.is_clean == 1 && wkordPrList.Select(c => c.icitem_id).Contains(s.mysql_id)).ToList();
+                    //获取预处理提前期最大值
+                    decimal maxTime = 0;
+                    if (moIcitems.Any())
+                    {
+                        maxTime = moIcitems.Max(x => x.clean_leadtime.GetValueOrDefault());
+                    }
                     wkordPrList.ForEach(pr =>
                     {
                         var ts = pr.pr_parrive_date - pr.pr_psend_date;
@@ -3310,7 +3354,7 @@ namespace Business.ResourceExamineManagement
             AutoCreateBomBill(companyid);
         }
 
-        public async Task AutoCreatePickBill(List<WorkOrdMaster> workOrdMasters, List<PeriodSequenceDet> dbPeriodSequences, List<NbrMaster> nbrMasterList, List<NbrDetail> nbrDetailList, string userAccount)
+        public async Task AutoCreatePickBill(List<WorkOrdMaster> workOrdMasters, List<PeriodSequenceDet> dbPeriodSequences, List<NbrMaster> nbrMasterList, List<NbrDetail> nbrDetailList, string userAccount, List<WorkOrdDetail> workDetails)
         {
             if (dbPeriodSequences.Any())
             {
@@ -3318,11 +3362,14 @@ namespace Business.ResourceExamineManagement
                 List<LineMaster> AllLineMasters = _lineMaster.Select(p => AllLines.Contains(p.Line) && p.Domain == workOrdMasters[0].Domain && p.IsActive);
                 var user = _employeeMaster.Select(s => s.Employee == userAccount && s.Domain == workOrdMasters[0].Domain).FirstOrDefault();
                 var ewdmList = _empWorkDutyMaster.Select(s => s.Domain == workOrdMasters[0].Domain).ToList();
+                //需要前处理物料
+                var Items = _mysql_ic_item.GetListAsync(s => workDetails.Select(c => c.ItemNum).Contains(s.number) && s.factory_id.ToString() == workOrdMasters[0].Domain).Result;
+                List<ItemMaster> itemMasterList = _itemMaster.Select(p => workDetails.Select(c => c.ItemNum).Contains(p.ItemNum) && p.Domain == workOrdMasters[0].Domain).Distinct().ToList();
+
                 //按照工单领料，一个工单一个领料单，之前是按照排产日期和产线分别领料
                 foreach (var workord in workOrdMasters)
                 {
                     Dictionary<string, decimal> dictItemQty = new Dictionary<string, decimal>();
-                    decimal QtyOrdSum = workord.QtyOrded;
                     string LocationTo = "";
                     LineMaster defaultLine = null;
 
@@ -3336,110 +3383,44 @@ namespace Business.ResourceExamineManagement
                         }
                         LocationTo = defaultLine?.VLocation;
                     }
-                    
-                    List<ProductStructureMaster> itemList = GetProductStructure(dbPeriodSequences.First(a => a.WorkOrds == workord.WorkOrd).ItemNum, QtyOrdSum, workord.Domain);
-                    var childrenList = itemList.Select(a => a.ComponentItem).Distinct().ToList();
-                    List<ItemMaster> itemLocList = _itemMaster.Select(p => childrenList.Contains(p.ItemNum) && p.Domain == workord.Domain && p.IsActive).Distinct().ToList();
-                    var dopIcitems = _ic_item.GetListAsync(s => itemLocList.Select(c => c.ItemNum).Contains(s.number) && s.factory_id.ToString() == workord.Domain).Result;
+                    var workdtls = workDetails.Where(s => s.WorkOrd == workord.WorkOrd).ToList();
+                    //List<ProductStructureMaster> itemList = GetProductStructure(dbPeriodSequences.First(a => a.WorkOrds == workord.WorkOrd).ItemNum, QtyOrdSum, workord.Domain);
+                    //var childrenList = itemList.Select(a => a.ComponentItem).Distinct().ToList();
+                    List<ItemMaster> itemLocList = itemMasterList.Where(p => workdtls.Select(c => c.ItemNum).Contains(p.ItemNum) && p.Domain == workord.Domain).Distinct().ToList();
+
+                    List<WorkOrdDetail> cleanDetail = new List<WorkOrdDetail>();
+                    List<WorkOrdDetail> noCleanDetail = new List<WorkOrdDetail>();
+                    workdtls.ForEach(s => {
+                        var i = Items.Find(x => x.number == s.ItemNum && x.is_clean == 1);
+                        if (i != null)
+                        {
+                            cleanDetail.Add(s);
+                        }
+                        else {
+                            noCleanDetail.Add(s);
+                        }
+                    });
                     //获取预处理提前期最大值
                     decimal cleanTime = 0;
-                    if (dopIcitems.Any())
+                    if (noCleanDetail.Any())
                     {
-                        cleanTime = dopIcitems.Max(s => s.clean_leadtime.GetValueOrDefault());
+                        //无需前处理领料单
+                        GenerateNbr(workord, cleanTime, defaultLine, userAccount, nbrMasterList, nbrDetailList, noCleanDetail, itemLocList, ewdmList, LocationTo, user,"");
                     }
-                    List<ItemPackMaster> itemPackList = _itemPackMaster.Select(p => childrenList.Contains(p.ItemNum) && p.Domain == workord.Domain && p.IsActive).Distinct().ToList();
-                    var Nbr = GetMaxSerialNumber(417416915624005);
-                    
-                    DateTime eff = workord.OrdDate.GetValueOrDefault().Date.AddDays(-1);
-                    DateTime start = eff.AddDays((double)(0 - cleanTime - 1));
-                    if (start <= DateTime.Now.Date)
+                    if (cleanDetail.Any())
                     {
-                        start = DateTime.Now.Date;
+                        //需要前处理的领料单
+                        cleanTime = Items.Where(s=> cleanDetail.Select(i=>i.ItemNum).Contains(s.number)).Max(s => s.clean_leadtime.GetValueOrDefault());
+                        GenerateNbr(workord, cleanTime, defaultLine, userAccount, nbrMasterList, nbrDetailList, cleanDetail, itemLocList, ewdmList, LocationTo, user, "PrevProcess");
                     }
-                    var newNbr = new NbrMaster
-                    {
-                        Domain = workord.Domain,
-                        Type = "SM",
-                        Nbr = Nbr,
-                        Remark = "下达自动领料",
-                        //Date = dbPeriodSequences.Where(a => a.WorkOrds == workord.WorkOrd).Min(a => a.PlanDate),
-                        ProdLine = defaultLine?.Line,
-                        EffDate = eff,
-                        Date = start,
-                        Status = "",
-                        WorkOrd = workord.WorkOrd,
-                        QtyOrd = QtyOrdSum,
-                        IsActive = true,
-                        IsChanged = true,
-                        Name = userAccount,
-                        Department = "101",
-                        CreateTime = DateTime.Now,
-                        UpdateTime = DateTime.Now,
-                        CreateUser = user?.Name,
-                        UpdateUser = user?.Name,
-                    };
-                    nbrMasterList.Add(newNbr);
-                    List<string> headAccount = new List<string>();
-                    int i = 1;
-                    itemList?.ForEach(a =>
-                    {
-                        var find = itemLocList?.Find(c => c.ItemNum == a.ComponentItem);
-                        string LocationFrom = "";
-                        if (find != null)
-                        {
-                            LocationFrom = find.Location;
-                            //找出职责范围负责人
-                            //s.ItemNum1 <= a.ComponentItem && a.ComponentItem <= s.ItemNum2
-                           var ewdm = ewdmList.Find(s => 0 >= string.Compare(s.ItemNum1, a.ComponentItem) && 0 >= string.Compare(a.ComponentItem, s.ItemNum2));
-                            if (ewdm != null && !string.IsNullOrEmpty(ewdm.Employee))
-                            {
-                                headAccount.Add(ewdm.Employee);
-                            }
-                        }
-                        
-                        //相同物料汇总
-                        var itemComponent = nbrDetailList.Find(b => b.Nbr == Nbr && b.ItemNum == a.ComponentItem);
-                        if (itemComponent == null)
-                        {
-                            nbrDetailList.Add(new NbrDetail
-                            {
-                                Domain = workord.Domain,
-                                Type = "SM",
-                                Nbr = Nbr,
-                                ItemNum = a.ComponentItem,
-                                QtyFrom = 0,
-                                QtyTo = 0,
-                                LocationFrom = LocationFrom,
-                                LocationTo = LocationTo,//现在这几条线是同一线边仓，暂时不考虑多个线边仓
-                                WorkOrd = workord.WorkOrd,
-                                QtyOrd = a.Qty,
-                                CurrQtyOpened = a.Qty,
-                                Line = i,
-                                IsActive = true,
-                                CreateTime = DateTime.Now,
-                                UpdateTime = DateTime.Now,
-                                CreateUser = user?.Name,
-                                UpdateUser = user?.Name,
-                                UM = a.UM
-                            });
-                            i++;
-                        }
-                        else
-                        {
-                            nbrDetailList.First(b => b.Nbr == Nbr && b.ItemNum == a.ComponentItem).QtyOrd = itemComponent.QtyOrd + a.Qty;
-                            nbrDetailList.First(b => b.Nbr == Nbr && b.ItemNum == a.ComponentItem).CurrQtyOpened = itemComponent.CurrQtyOpened + a.Qty;
-                        }
-                    });
+                    
 
-                    if (headAccount.Any())
-                    {
-                        newNbr.User1 = string.Join(",", headAccount.Distinct());
-                        string[] user2 = headAccount.ToArray();
-                        newNbr.User2 =JsonConvert.SerializeObject(user2);
-                    }
+                    
+                    //List<ItemPackMaster> itemPackList = _itemPackMaster.Select(p => childrenList.Contains(p.ItemNum) && p.Domain == workord.Domain && p.IsActive).Distinct().ToList();
+                    
 
-                    //先屏蔽备料单扣除库存的DEMO演示。
-                    /*nbrDetailList.ForEach(a =>
+                    /*//先屏蔽备料单扣除库存的DEMO演示。
+                    nbrDetailList.ForEach(a =>
                     {
                         if (a.Nbr == Nbr)
                         {
@@ -3486,6 +3467,101 @@ namespace Business.ResourceExamineManagement
             }
         }
 
+        private void GenerateNbr(WorkOrdMaster workord,decimal cleanTime, LineMaster defaultLine, string userAccount, List<NbrMaster> nbrMasterList, List<NbrDetail> nbrDetailList, List<WorkOrdDetail> detail, List<ItemMaster> itemLocList, List<EmpWorkDutyMaster> ewdmList, string LocationTo,EmployeeMaster user,string TransType)
+        {
+            var Nbr = GetMaxSerialNumber(417416915624005);
+            DateTime eff = workord.OrdDate.GetValueOrDefault().Date.AddDays(-1);
+            DateTime start = eff.AddDays((double)(0 - cleanTime - 1));
+            if (start <= DateTime.Now.Date)
+            {
+                start = DateTime.Now.Date;
+            }
+            //string sql = "exec pr_SFM_GetOrdNbr @Domain='{0}',@NbrType='SM', @UserNo='{1}',@IsDopCall=1'";
+
+            var newNbr = new NbrMaster
+            {
+                Domain = workord.Domain,
+                Type = "SM",
+                Nbr = Nbr,
+                Remark = "下达自动领料",
+                //Date = dbPeriodSequences.Where(a => a.WorkOrds == workord.WorkOrd).Min(a => a.PlanDate),
+                ProdLine = defaultLine?.Line,
+                EffDate = eff,
+                Date = start,
+                Status = "",
+                WorkOrd = workord.WorkOrd,
+                QtyOrd = workord.QtyOrded,
+                IsActive = true,
+                IsChanged = true,
+                Name = userAccount,
+                Department = "101",
+                CreateTime = DateTime.Now,
+                UpdateTime = DateTime.Now,
+                CreateUser = user?.Name,
+                UpdateUser = user?.Name,
+                TransType = TransType
+            };
+            nbrMasterList.Add(newNbr);
+            List<string> headAccount = new List<string>();
+            int i = 1;
+            detail.ForEach(a =>
+            {
+                var find = itemLocList?.Find(c => c.ItemNum == a.ItemNum);
+                string LocationFrom = "";
+                if (find != null)
+                {
+                    LocationFrom = find.Location;
+                    //找出职责范围负责人
+                    var ewdm = ewdmList.Find(s => 0 >= string.Compare(s.ItemNum1, a.ItemNum) && 0 >= string.Compare(a.ItemNum, s.ItemNum2));
+                    if (ewdm != null && !string.IsNullOrEmpty(ewdm.Employee))
+                    {
+                        headAccount.Add(ewdm.Employee);
+                    }
+                    //相同物料汇总
+                    var itemComponent = nbrDetailList.Find(b => b.Nbr == Nbr && b.ItemNum == a.ItemNum);
+                    if (itemComponent == null)
+                    {
+                        nbrDetailList.Add(new NbrDetail
+                        {
+                            Domain = workord.Domain,
+                            Type = "SM",
+                            Nbr = Nbr,
+                            ItemNum = a.ItemNum,
+                            QtyFrom = 0,
+                            QtyTo = 0,
+                            LocationFrom = LocationFrom,
+                            LocationTo = LocationTo,//现在这几条线是同一线边仓，暂时不考虑多个线边仓
+                            WorkOrd = workord.WorkOrd,
+                            QtyOrd = a.QtyRequired,
+                            CurrQtyOpened = a.QtyRequired,
+                            Line = i,
+                            IsActive = true,
+                            CreateTime = DateTime.Now,
+                            UpdateTime = DateTime.Now,
+                            CreateUser = user?.Name,
+                            UpdateUser = user?.Name,
+                            UM = find.UM
+                        });
+                        i++;
+                    }
+                    else
+                    {
+                        nbrDetailList.First(b => b.Nbr == Nbr && b.ItemNum == a.ItemNum).QtyOrd = itemComponent.QtyOrd + a.QtyRequired;
+                        nbrDetailList.First(b => b.Nbr == Nbr && b.ItemNum == a.ItemNum).CurrQtyOpened = itemComponent.CurrQtyOpened + a.QtyRequired;
+                    }
+                }
+            });
+
+            if (headAccount.Any())
+            {
+                newNbr.User1 = string.Join(",", headAccount.Distinct());
+                string[] user2 = headAccount.ToArray();
+                newNbr.User2 = JsonConvert.SerializeObject(user2);
+            }
+        }
+
+
+
         public void AsyncItemStockFromWMS(List<crm_seorderentry> sentrys)
         {
             //产品编码
@@ -3643,22 +3719,24 @@ namespace Business.ResourceExamineManagement
             }
 
             //增加判断当前工单是否进行过齐套检查，并且是仓库齐套
-            var mes_morders = _mysql_mes_morder.GetListAsync(s => dbWorkOrds.Contains(s.morder_no) && s.factory_id.ToString() == domain).Result;
+            /*var mes_morders = _mysql_mes_morder.GetListAsync(s => dbWorkOrds.Contains(s.morder_no) && s.factory_id.ToString() == domain).Result;
             if (mes_morders.Where(s => s.MaterialSituation != MorderEnum.CarehouseComplete).Any())
             {
                 return "请选择物料情况为“仓库齐套”的工单。";
-            }
+            }*/
 
             List<NbrMaster> nbrMasterList = new List<NbrMaster>();//需要生成领料单列表
             List<NbrDetail> nbrDetailList = new List<NbrDetail>();//需要生成领料单明细列表
 
             var ords = workOrdMasters.Select(p => p.WorkOrd).ToList();
+            var workDetails = _workOrdDetail.Select(p => p.Domain == domain && workOrds.Contains(p.WorkOrd));
 
             dbPeriodSequences = dbPeriodSequences.Where(p => ords.Contains(p.WorkOrds)).ToList();
-            await AutoCreatePickBill(workOrdMasters, dbPeriodSequences, nbrMasterList, nbrDetailList, userAccount);
+            await AutoCreatePickBill(workOrdMasters, dbPeriodSequences, nbrMasterList, nbrDetailList, userAccount, workDetails);
             if (nbrMasterList.Any())
             {
-                dbPeriodSequences.ForEach(p => { p.Status = "r"; });
+                //改到发布日计划时更新。
+                //dbPeriodSequences.ForEach(p => { p.Status = "r"; });
                 workOrdMasters.ForEach(p => { p.Status = "r"; });
 
                 //清理掉库存占用  这里考虑的是资源检查的占用没有完全占用备料单数据，而其他数据再进行齐套检查时，无法考虑到备料单的占用。
@@ -3672,6 +3750,7 @@ namespace Business.ResourceExamineManagement
                     nbrdtls.ForEach(x =>
                     {
                         ic_item_stockoccupy itemStockoccupyDto = new ic_item_stockoccupy();
+                        itemStockoccupyDto.GenerateNewId(help.NextId());
                         itemStockoccupyDto.morder_mo = s.WorkOrd;
                         itemStockoccupyDto.occupy_time = DateTime.Now;
                         var nbrItem = icitem.Find(c => c.number == x.ItemNum);
@@ -3698,13 +3777,13 @@ namespace Business.ResourceExamineManagement
                         _nbrMaster.Insert(nbrMasterList);
                         nbrMasterList.ForEach(a =>
                         {
-                            string sql ="exec pr_WMS_BPM_AddMobileTask @TaskID='{0}',@PlanDate='{1}',@ExecuterTypeID=2,@CreateUser='{2}'";
-                            _businessDbContext.Database.ExecuteSqlRaw(sql, a.Nbr, a.Date.Value.ToString("yyyy-MM-dd"), a.CreateUser);
+                            string sql =string.Format("exec pr_WMS_BPM_AddMobileTask @TaskID='{0}',@PlanDate='{1}',@ExecuterTypeID=2,@CreateUser='{2}'", a.Nbr, a.Date.Value.ToString("yyyy-MM-dd"), a.CreateUser);
+                            _businessDbContext.Database.ExecuteSqlRaw(sql);
                         });
 
                         if (itemstockoccupy.Any())
                         {
-                            _businessDbContext.BulkDelete(itemstockoccupy);
+                            await _mysql_ic_item_stockoccupy.HardDeleteAsync(itemstockoccupy);
                         }
                         if (insertOccuyy.Any())
                         { 
@@ -4243,694 +4322,5 @@ namespace Business.ResourceExamineManagement
             }
             return "ok";
         }
-
-        public async Task<string> WeekPlan(InputDto input)
-        {
-
-            //1.获取补货模型全局参数
-            ReplenishmentDto replenishmentDto = GetROPParam();
-
-            //到了配置的更新时间才更新
-            if (DateTime.Now.Day != replenishmentDto.SaleFcstEntryDate)
-                return "不在更新时间日期";
-
-
-            //获取月度发货计划
-            string planMonth = $"{DateTime.Now.AddMonths(1).Year}-{DateTime.Now.AddMonths(months: 1).Month}";
-            var planList = _monthlyShipmentPlan.Select(a => a.PlanMonth == planMonth && !a.IsDeleted);
-            var monthPlanList = ObjectMapper.Map<List<MonthlyShipmentPlan>, List<MonthlyShipmentPlanDto>>(planList);
-            var itemList = _ic_item.GetListAsync(a => planList.Select(p => p.SAPItemNumber).Contains(a.number) && a.tenant_id == input.tenant_id && a.company_id == input.company_id && !a.IsDeleted).Result;
-            var mesItemList = _itemMaster.Select(a => planList.Select(p => p.SAPItemNumber).Contains(a.ItemNum) && a.Domain == input.factory_id.ToString() && a.IsActive);
-            var srm_purchaseList = _srmPurchase.GetListAsync(a => planList.Select(p => p.SAPItemNumber).Contains(a.number) && a.tenant_id == input.tenant_id && a.company_id == input.company_id && !a.IsDeleted).Result;
-            //获取补货模型前一个周期和未来N个周期的数据
-            var ropModelList = _replenishmentModel.GetListAsync(a => a.zero_based_seqno >= 0 && a.zero_based_seqno <= replenishmentDto.UpdateWeeks).Result;
-            //发货计划物料列表
-            List<string> planItemList = planList?.Select(a => a.SAPItemNumber).ToList();
-            //补货模型物料列表
-            List<string> ropItemList = ropModelList?.Where(c => c.zero_based_seqno == 0).Select(a => a.number).ToList();
-            //第一次算或者新品物料列表
-            List<string> nohistoryItemList = planItemList.Except(ropItemList).ToList();
-            var sapItemInv = _SAPInv.Select(a => nohistoryItemList.Contains(a.MATNR) && a.WERKS == input.factory_id.ToString());
-
-
-
-            //取上一个月发货出库记录
-            var shipList = _ASNBOLShipperDetail.Select(a => a.Domain == input.factory_id.ToString() && a.IsActive && a.shtype == "SH" && a.Typed != "S" && a.ShipDate >= getMonthStartTime(-1) && a.ShipDate <= getMonthEndTime(-1) && a.RealQty > 0 && planItemList.Contains(a.ContainerItem));
-
-            //按照物料分组统计出货金额
-            var itemGroup = shipList.GroupBy(p => p.ContainerItem)
-                 .Select(p => new ASNBOLShipperDetail
-                 {
-                     QtyToShip = p.Sum(a => a.QtyToShip),
-                     ContainerItem = p.Key
-                 }).ToList();
-
-            monthPlanList?.ForEach(a =>
-            {
-                //物料属性:0.配置类 1.自制 2.委外加工 3.外购 4.虚拟件
-                a.erp_cls = itemList.Find(s => s.number == a.SAPItemNumber)?.erp_cls;
-                if (mesItemList.Find(s => s.ItemNum == a.SAPItemNumber) != null)
-                {
-                    a.stock_turnover = mesItemList.Find(s => s.ItemNum == a.SAPItemNumber).StockTurnOver;
-                    a.PLT = mesItemList.Find(s => s.ItemNum == a.SAPItemNumber)?.PurLT;
-                    a.IsLongPeriod = a.PLT >= replenishmentDto.LongPeriodDay;
-                }
-                else
-                {
-                    a.stock_turnover = 4;
-                }
-                if (srm_purchaseList.Find(s => s.number == a.SAPItemNumber) != null)
-                {
-                    a.PLT = srm_purchaseList.Find(s => s.number == a.SAPItemNumber).lead_time;
-                    a.IsLongPeriod = a.PLT >= replenishmentDto.LongPeriodDay;
-                }
-                //存在物料该物料编码表示之前算过，否则表示第一次算或者是新品
-                //之前算过，取算法模型数据，不存在表示第一次算要取默认值
-                if (ropModelList != null && ropModelList.Any(a => a.zero_based_seqno == 0))
-                {
-                    a.actual_period_start_instock = 0;
-                }
-                else
-                {
-                    if (sapItemInv.Find(s => s.MATNR == a.SAPItemNumber) != null)
-                    {
-                        a.actual_period_start_instock = Convert.ToDecimal(sapItemInv.Find(s => s.MATNR == a.SAPItemNumber).LABST);
-                    }
-                    else
-                    {
-                        a.actual_period_start_instock = 0;
-                    }
-                }
-            });
-
-
-            //第一周需要更新参数，其他周不要更新
-            if (WeekOfMonth(DateTime.Now, 1) == 1)
-            {
-
-            }
-            //每算一次都要把所有zero_based_seqno减去1
-
-
-
-            List<DomesticTerminalFcst> domesticFcst = _domesticTerminalFcst.GetListAsync(p => p.TypeEnum == 2 && p.Year == input.year && p.Month == input.month
-            && p.tenant_id == input.tenant_id && p.company_id == input.company_id && p.factory_id == input.factory_id && !p.IsDeleted).Result;
-
-            var modelList = domesticFcst?.Select(a => a.Model);
-            var ItemModelSetList = _standardItemModelSet.GetListAsync(a => a.tenant_id == input.tenant_id && a.company_id == input.company_id && modelList.Contains(a.Model) && !a.IsDeleted).Result;
-            if (ItemModelSetList == null)
-            {
-                return "库存数据不存在";
-            }
-            var itemNumList = ItemModelSetList?.Select(a => a.ItemNumber).ToList();
-            List<mo_ic_bom> boms = _ic_bom.GetListAsync(p => itemNumList.Contains(p.item_number) && p.factory_id == input.factory_id && p.company_id == input.company_id && !p.IsDeleted).Result.ToList();
-            var pretreatments = _mysql_b_bom_pretreatment.GetListAsync(s => boms.Select(c => c.mysql_id).ToList().Contains(s.sourceid)).Result;
-            List<mo_ic_bom> autoCreates = new List<mo_ic_bom>();
-            boms.ForEach(p =>
-            {
-                if (!pretreatments.Where(s => s.sourceid == p.mysql_id).Any())
-                {
-                    autoCreates.Add(p);
-                }
-            });
-            if (autoCreates.Any())
-            {
-                AutoCreateBomBill(input.company_id.ToString(), autoCreates);
-                pretreatments = _mysql_b_bom_pretreatment.GetListAsync(s => boms.Select(c => c.mysql_id).ToList().Contains(s.sourceid)).Result;
-            }
-
-
-            return "OK";
-        }
-
-        /// <summary>
-        /// 每月15号更新周计划参数(考虑多次执行的情况)
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        public async Task<string> WeekPlanParms(InputDto input)
-        {
-            //1.获取补货模型全局参数
-            ReplenishmentDto replenishmentDto = GetROPParam();
-
-            //到了配置的更新时间才更新
-            if (DateTime.Now.Day != replenishmentDto.SaleFcstEntryDate)
-                return "不在更新时间日期";
-
-            //Step1:按照瑞奇、两大平台分别根据历史出库数据和预测出货数据计算ROP
-            //Step2:计算瑞奇的M-M+2共12周补货(每次补EOP/4),计算海王的M-M+2共12周补货(每次补EOP/4),计算国科的M-M+2共12周补货(每次补EOP/4)
-            //Step3:汇总Step2所有补货，为工厂的制造需求
-            //Step4:按照Step3制造需求做资源检查，按月统计各物料消耗预测
-            //Step5:按照各SKU的历史出库数据和Step4里计算的预测消耗数量计算参数
-            //Step6:计算各SKU的12周采购补货
-
-
-
-            //获取月度发货计划(一次导入三个月的销售预测),因为是固定格式yyyy-MM所以可以用字符串比较，避免写很多字符串判断相等
-            string planMonth = $"{DateTime.Now.Year}-{DateTime.Now.Month.ToString("00")}";
-            string planMonthMax = $"{DateTime.Now.AddMonths(replenishmentDto.SaleFcstMonth).Year}-{DateTime.Now.AddMonths(replenishmentDto.SaleFcstMonth).Month.ToString("00")}";
-            var planList = _monthlyShipmentPlan.Select(a => a.PlanMonth.CompareTo(planMonth) >= 0 && a.PlanMonth.CompareTo(planMonthMax) <= 0 && !a.IsDeleted).ToList();
-
-            var itemList = _ic_item.GetListAsync(a => planList.Select(p => p.SAPItemNumber).Contains(a.number) && a.tenant_id == input.tenant_id && a.company_id == input.company_id && !a.IsDeleted).Result;
-            var mesItemList = _itemMaster.Select(a => planList.Select(p => p.SAPItemNumber).Contains(a.ItemNum) && a.Domain == input.factory_id.ToString() && a.IsActive);
-            var srm_purchaseList = _srmPurchase.GetListAsync(a => planList.Select(p => p.SAPItemNumber).Contains(a.number) && a.tenant_id == input.tenant_id && a.company_id == input.company_id && !a.IsDeleted).Result;
-
-            //获取补货模型前H周期和未来F个周期的数据
-            var ropModelList = _replenishmentModel.GetListAsync(a => a.zero_based_seqno >= -1 * replenishmentDto.HistoryOutStockMonth && a.zero_based_seqno <= replenishmentDto.SaleFcstMonth).Result;
-            //发货计划物料列表
-            List<string> planItemList = planList?.Select(a => a.SAPItemNumber).ToList();
-            //获取成品库存、灭菌库存、在制库存(会从SAP同步的库存表更新到LocationDetail、ic_item表中)
-            //List<SAPInv> sAPInvs = _SAPInv.Select(p => p.WERKS == input.factory_id.ToString() && itemNums.Contains(p.MATNR));
-            var locations = _locationDetail.Select(p => p.Domain == input.factory_id.ToString() && planList.Select(a => a.SAPItemNumber).Contains(p.ItemNum) && p.IsActive);
-            var sapItemInv = _SAPInv.Select(a => planItemList.Contains(a.MATNR) && a.WERKS == input.factory_id.ToString());
-
-            //取上一个月发货出库记录
-            var shipList = _ASNBOLShipperDetail.Select(a => a.Domain == input.factory_id.ToString() && a.IsActive && a.shtype == "SH" && a.Typed != "S" && a.RealQty > 0 && planItemList.Contains(a.ContainerItem)).Where(s => s.ShipDate >= getMonthStartTime(-1) && s.ShipDate <= getMonthEndTime(-1));
-
-            //取本月发货出库记录
-            var shipMList = _ASNBOLShipperDetail.Select(a => a.Domain == input.factory_id.ToString() && a.IsActive && a.shtype == "SH" && a.Typed != "S" && a.RealQty > 0 && planItemList.Contains(a.ContainerItem)).Where(s => s.ShipDate.Value >= getMonthStartTime(0) && s.ShipDate <= DateTime.Now);
-            //按照物料分组统计出货金额
-            var itemGroup = shipList.GroupBy(p => p.ContainerItem)
-                 .Select(p => new ASNBOLShipperDetail
-                 {
-                     QtyToShip = p.Sum(a => a.QtyToShip),
-                     ContainerItem = p.Key
-                 }).ToList();
-            //按照物料分组统计出货金额
-            var itemMGroup = shipMList.GroupBy(p => p.ContainerItem)
-                 .Select(p => new ASNBOLShipperDetail
-                 {
-                     QtyToShip = p.Sum(a => a.QtyToShip),
-                     ContainerItem = p.Key
-                 }).ToList();
-            List<ReplenishmentModel> addList = new List<ReplenishmentModel>();
-            List<ReplenishmentModel> updateList = new List<ReplenishmentModel>();//更新上一个月的实际出库数量
-            var mathtool = new MathNet.Numerics.Distributions.Normal();
-            ropModelList?.Where(r => r.isparam && r.seqno == DateTime.Now.AddMonths(-1).Month && r.year == DateTime.Now.AddMonths(-1).Year).ToList()?.ForEach
-                (m =>
-                {
-                    if (itemGroup.Any(a => a.ContainerItem == m.number))
-                    {
-                        m.actual_out_qty = itemGroup.Find(a => a.ContainerItem == m.number)?.QtyToShip;
-                        updateList.Add(m);
-                    }
-                });
-            //需要按照成品资源检查计算原材料
-            planList?.Where(s => s.PlanMonth == planMonth).ToList()?.ForEach(a =>
-            {
-                ReplenishmentModel rop = new ReplenishmentModel();
-                rop.number = a.SAPItemNumber;
-                var icItem = itemList.Find(s => s.number == a.SAPItemNumber);
-                if (icItem != null)
-                {
-                    rop.name = icItem.name;
-                    rop.model = a.Model;
-                    rop.erp_cls = icItem.erp_cls; //物料属性: 0.配置类 1.自制 2.委外加工 3.外购 4.虚拟件
-                    rop.fversion = icItem.fversion;
-                    rop.min_pack_qty = icItem.minpackqty;
-                    rop.moq = icItem.moq;
-                }
-                rop.actual_period_start_instock = 0;
-                if (rop.distributionchannel == "海王" || rop.distributionchannel == "国科")
-                {
-                    rop.actual_period_start_instock = locations.Find(l => l.ItemNum == a.SAPItemNumber)?.QtyOnHand;
-                }
-                else
-                {
-                    rop.actual_period_start_instock = sapItemInv.Find(s => s.MATNR == a.SAPItemNumber)?.LABST.ToDecimal();
-                }
-                rop.distributionchannel = a.DistributionChannel;
-                rop.lifecycle = a.LifeCycle;
-                rop.area = a.Area;
-                rop.plan_out_qty = Math.Ceiling(a.Qty);
-                rop.actual_out_qty = 0;
-                if (itemMGroup.Any(m => m.ContainerItem == a.SAPItemNumber))
-                {
-                    rop.actual_out_qty = itemMGroup.Find(m => m.ContainerItem == a.SAPItemNumber)?.QtyToShip;
-                }
-                rop.year = DateTime.Now.Year;
-                rop.long_period = "Y";
-                rop.short_period = "M";
-                rop.seqno = DateTime.Now.Month;
-                rop.zero_based_seqno = 0;
-                rop.period_start_date = getMonthStartTime(0);
-                rop.period_end_date = getMonthEndTime(0);
-                rop.monthl_avg_demand = CalcAvgDemand(planList, a.SAPItemNumber);
-                rop.monthl_avg_demand_variance = Math.Ceiling(Convert.ToDecimal(CalcVariance(planList, a.SAPItemNumber)));
-                rop.monthl_avg_outstock = CalcAvgOutStock(ropModelList, replenishmentDto, rop.actual_out_qty.Value, a.SAPItemNumber);
-                if (mesItemList.Find(s => s.ItemNum == a.SAPItemNumber) != null)
-                {
-                    rop.stock_turnover = mesItemList.Find(s => s.ItemNum == a.SAPItemNumber).StockTurnOver;
-                    rop.supply_leadtime = mesItemList.Find(s => s.ItemNum == a.SAPItemNumber)?.PurLT;
-                    rop.stock_turnover = mesItemList.Find(s => s.ItemNum == a.SAPItemNumber)?.StockTurnOver;
-                }
-                else
-                {
-                    rop.stock_turnover = 4;
-                }
-                if (srm_purchaseList.Find(s => s.number == a.SAPItemNumber) != null)
-                {
-                    rop.supply_leadtime = srm_purchaseList.Find(s => s.number == a.SAPItemNumber).lead_time;
-                }
-                CalcFMRAndABC(rop, replenishmentDto, input);
-                rop.security_stock = Math.Ceiling((decimal)(mathtool.InverseCumulativeDistribution((double)rop.service_level_pct.Value) * (double)rop.monthl_avg_demand_variance));
-                rop.eop = Math.Ceiling(rop.monthl_avg_demand.Value * rop.supply_leadtime.Value / DateTime.DaysInMonth(DateTime.Now.Year, DateTime.Now.Month));
-                rop.rop_computed = rop.security_stock + rop.eop;
-                rop.max_stock_level = rop.monthl_avg_outstock * (12 / rop.stock_turnover);
-                rop.rop_revised = Math.Min(rop.rop_computed.Value, rop.max_stock_level.Value);
-                rop.isparam = true;
-                rop.tenant_id = input.tenant_id;
-                rop.factory_id = input.factory_id;
-                rop.create_time = DateTime.Now;
-                rop.org_id = input.org_id;
-                addList.Add(rop);
-            });
-            addList?.ForEach(item => { item.GenerateNewId(help.NextId()); });
-
-            await _replenishmentModel.InsertManyAsync(addList);
-            await _replenishmentModel.UpdateManyAsync(updateList);
-            var ropModeAllList = _replenishmentModel.GetListAsync(a => a.year != DateTime.Now.Year && a.seqno != DateTime.Now.Month && a.isparam).Result;
-            ropModeAllList?.ForEach(item => { item.seqno = item.seqno - 1; });
-            await _replenishmentModel.UpdateManyAsync(ropModeAllList);
-            return "OK";
-        }
-
-        /// <summary>
-        /// GK和HW平台成品周计划
-        /// </summary>
-        /// <param name="planDtos"></param>
-        /// <param name="input"></param>
-        /// <param name="nohistoryItemList"></param>
-        /// <returns></returns>
-        public string PlatformWeekPlan(InputDto input)
-        {
-            //1.获取补货模型全局参数
-            ReplenishmentDto replenishmentDto = GetROPParam();
-
-            //到了配置的更新时间才更新
-            if (DateTime.Now.Day != replenishmentDto.SaleFcstEntryDate)
-                return "不在更新时间日期";
-
-
-            //获取月度发货计划
-            string planMonth = $"{DateTime.Now.AddMonths(1).Year}-{DateTime.Now.AddMonths(months: 1).Month}";
-            var planList = _monthlyShipmentPlan.Select(a => a.PlanMonth == planMonth && !a.IsDeleted);
-            var monthPlanList = ObjectMapper.Map<List<MonthlyShipmentPlan>, List<MonthlyShipmentPlanDto>>(planList);
-            var itemList = _ic_item.GetListAsync(a => planList.Select(p => p.SAPItemNumber).Contains(a.number) && a.tenant_id == input.tenant_id && a.company_id == input.company_id && !a.IsDeleted).Result;
-            var mesItemList = _itemMaster.Select(a => planList.Select(p => p.SAPItemNumber).Contains(a.ItemNum) && a.Domain == input.factory_id.ToString() && a.IsActive);
-            var srm_purchaseList = _srmPurchase.GetListAsync(a => planList.Select(p => p.SAPItemNumber).Contains(a.number) && a.tenant_id == input.tenant_id && a.company_id == input.company_id && !a.IsDeleted).Result;
-            //获取补货模型前一个周期和未来N个周期的数据
-            var ropModelList = _replenishmentModel.GetListAsync(a => a.zero_based_seqno >= 0 && a.zero_based_seqno <= replenishmentDto.UpdateWeeks).Result;
-            //发货计划物料列表
-            List<string> planItemList = planList?.Select(a => a.SAPItemNumber).ToList();
-            //补货模型物料列表
-            List<string> ropItemList = ropModelList?.Where(c => c.zero_based_seqno == 0).Select(a => a.number).ToList();
-            //第一次算或者新品物料列表
-            List<string> nohistoryItemList = planItemList.Except(ropItemList).ToList();
-            var sapItemInv = _SAPInv.Select(a => nohistoryItemList.Contains(a.MATNR) && a.WERKS == input.factory_id.ToString());
-
-            //1.6、获取成品库存、灭菌库存、在制库存(会从SAP同步的库存表更新到LocationDetail、ic_item表中)
-            //List<SAPInv> sAPInvs = _SAPInv.Select(p => p.WERKS == input.factory_id.ToString() && itemNums.Contains(p.MATNR));
-            var locations = _locationDetail.Select(p => p.Domain == input.factory_id.ToString() && planList.Select(a => a.SAPItemNumber).Contains(p.ItemNum) && p.IsActive);
-
-
-            //取上一个月发货出库记录
-            var shipList = _ASNBOLShipperDetail.Select(a => a.Domain == input.factory_id.ToString() && a.IsActive && a.shtype == "SH" && a.Typed != "S" && a.ShipDate >= getMonthStartTime(-1) && a.ShipDate <= getMonthEndTime(-1) && a.RealQty > 0 && planItemList.Contains(a.ContainerItem));
-
-            //按照物料分组统计出货金额
-            var itemGroup = shipList.GroupBy(p => p.ContainerItem)
-                 .Select(p => new ASNBOLShipperDetail
-                 {
-                     Price = p.Sum(a => a.QtyToShip),
-                     ContainerItem = p.Key
-                 }).ToList();
-
-            monthPlanList?.ForEach(a =>
-            {
-                //物料属性:0.配置类 1.自制 2.委外加工 3.外购 4.虚拟件
-                a.erp_cls = itemList.Find(s => s.number == a.SAPItemNumber)?.erp_cls;
-                if (mesItemList.Find(s => s.ItemNum == a.SAPItemNumber) != null)
-                {
-                    a.stock_turnover = mesItemList.Find(s => s.ItemNum == a.SAPItemNumber).StockTurnOver;
-                    a.PLT = mesItemList.Find(s => s.ItemNum == a.SAPItemNumber)?.PurLT;
-                    a.IsLongPeriod = a.PLT >= replenishmentDto.LongPeriodDay;
-                }
-                else
-                {
-                    a.stock_turnover = 4;
-                }
-                if (srm_purchaseList.Find(s => s.number == a.SAPItemNumber) != null)
-                {
-                    a.PLT = srm_purchaseList.Find(s => s.number == a.SAPItemNumber).lead_time;
-                    a.IsLongPeriod = a.PLT >= replenishmentDto.LongPeriodDay;
-                }
-                //存在物料该物料编码表示之前算过，否则表示第一次算或者是新品
-                //之前算过，取算法模型数据，不存在表示第一次算要取默认值
-                if (ropModelList != null && ropModelList.Any(a => a.zero_based_seqno == 0))
-                {
-                    a.actual_period_start_instock = 0;
-                }
-                else
-                {
-                    if (sapItemInv.Find(s => s.MATNR == a.SAPItemNumber) != null)
-                    {
-                        a.actual_period_start_instock = Convert.ToDecimal(sapItemInv.Find(s => s.MATNR == a.SAPItemNumber).LABST);
-                    }
-                    else
-                    {
-                        a.actual_period_start_instock = 0;
-                    }
-                }
-            });
-
-
-            //第一周需要更新参数，其他周不要更新
-            if (WeekOfMonth(DateTime.Now, 1) == 1)
-            {
-
-            }
-            //每算一次都要把所有zero_based_seqno减去1
-
-
-
-            List<DomesticTerminalFcst> domesticFcst = _domesticTerminalFcst.GetListAsync(p => p.TypeEnum == 2 && p.Year == input.year && p.Month == input.month
-            && p.tenant_id == input.tenant_id && p.company_id == input.company_id && p.factory_id == input.factory_id && !p.IsDeleted).Result;
-
-            var modelList = domesticFcst?.Select(a => a.Model);
-            var ItemModelSetList = _standardItemModelSet.GetListAsync(a => a.tenant_id == input.tenant_id && a.company_id == input.company_id && modelList.Contains(a.Model) && !a.IsDeleted).Result;
-            if (ItemModelSetList == null)
-            {
-                return "库存数据不存在";
-            }
-            var itemNumList = ItemModelSetList?.Select(a => a.ItemNumber).ToList();
-            List<mo_ic_bom> boms = _ic_bom.GetListAsync(p => itemNumList.Contains(p.item_number) && p.factory_id == input.factory_id && p.company_id == input.company_id && !p.IsDeleted).Result.ToList();
-            var pretreatments = _mysql_b_bom_pretreatment.GetListAsync(s => boms.Select(c => c.mysql_id).ToList().Contains(s.sourceid)).Result;
-            List<mo_ic_bom> autoCreates = new List<mo_ic_bom>();
-            boms.ForEach(p =>
-            {
-                if (!pretreatments.Where(s => s.sourceid == p.mysql_id).Any())
-                {
-                    autoCreates.Add(p);
-                }
-            });
-            if (autoCreates.Any())
-            {
-                AutoCreateBomBill(input.company_id.ToString(), autoCreates);
-                pretreatments = _mysql_b_bom_pretreatment.GetListAsync(s => boms.Select(c => c.mysql_id).ToList().Contains(s.sourceid)).Result;
-            }
-
-
-            return "OK";
-        }
-
-        public ReplenishmentDto GetROPParam()
-        {
-            ReplenishmentDto replenishmentDto = new ReplenishmentDto();
-            replenishmentDto.ReplenishmentCalcPeriod = "W";
-            replenishmentDto.HistoryOutStockMonth = 2;
-            replenishmentDto.SaleFcstMonth = 2;
-            replenishmentDto.SaleFcstEntryDate = 27;
-            replenishmentDto.UpdateWeeks = 12;
-            replenishmentDto.WeekPlanUpdateDay = 7;//每周日更新
-            replenishmentDto.LongPeriodDay = 60;
-            return replenishmentDto;
-        }
-        /// <summary>
-        /// 计算ABC分类和FMR分类
-        /// </summary>
-        /// <param name="replenishmentModels"></param>
-        public void CalcFMRAndABC(List<ReplenishmentModel> replenishmentModels, ReplenishmentDto replenishmentDto, InputDto input)
-        {
-            var itemNumList = replenishmentModels?.Select(a => a.number).ToList();
-            //发货出库记录
-            var shipList = _ASNBOLShipperDetail.Select(a => a.Domain == input.factory_id.ToString() && a.IsActive && a.shtype == "SH" && a.Typed != "S" && a.ShipDate >= DateTime.Now.AddMonths(replenishmentDto.HistoryOutStockMonth * -1) && a.RealQty > 0 && itemNumList.Contains(a.ContainerItem));
-            //领料出库记录
-            //var pickbilllist = _NbrDetail.Select(a => a.Domain == input.factory_id.ToString() && a.Type == "SM" && a.IsActive && a.UpdateTime >= DateTime.Now.AddMonths(replenishmentDto.HistoryOutStockMonth * -1) && itemNumList.Contains(a.ItemNum));
-            var pickbilllist = _invTransHist.Select(a => a.Domain == input.factory_id.ToString() && a.TransType == "iss-wo" && a.IsActive && a.CreateTime >= DateTime.Now.AddMonths(replenishmentDto.HistoryOutStockMonth * -1) && itemNumList.Contains(a.ItemNum));
-            //总的移库次数
-            int totalCount = shipList.Count() + pickbilllist.Count();
-            //平均出库次数
-            decimal avgOutStock = totalCount / replenishmentDto.HistoryOutStockMonth;
-
-            //总出货金额
-            decimal? totalPrice = shipList.Sum(a => a.Price * a.QtyToShip);
-            //按照物料分组统计出货金额
-            var itemGroup = shipList.GroupBy(p => p.ContainerItem)
-                 .Select(p => new ASNBOLShipperDetail
-                 {
-                     Price = p.Sum(a => a.Price * a.QtyToShip) * 100 / totalPrice,
-                     ContainerItem = p.Key
-                 }).ToList().OrderByDescending(c => c.Price).ThenByDescending(c => c.ContainerItem);
-            var AIndex = (int)Math.Ceiling(itemGroup.Count() * 0.75);//A类：0-75%
-            var BIndex = (int)Math.Ceiling(itemGroup.Count() * 0.9) - AIndex;//A类：75%-90%
-            var CIndex = itemGroup.Count() - AIndex - BIndex;//A类：90%-100%
-            var AItem = itemGroup.Take(AIndex);
-            var BItem = itemGroup.Skip(AIndex).Take(BIndex);
-            var CItem = itemGroup.Skip(AIndex + BIndex).Take(CIndex);
-            replenishmentModels?.ForEach(replenishmentModel =>
-            {
-                if (AItem.Any(a => a.ContainerItem == replenishmentModel.number))
-                {
-                    replenishmentModel.abc = "A";//金额占比前75%的物料划为A类
-                }
-                else if (BItem.Any(a => a.ContainerItem == replenishmentModel.number))
-                {
-                    replenishmentModel.abc = "B";//金额占比前75%-90%的物料划为A类
-                }
-                else if (CItem.Any(a => a.ContainerItem == replenishmentModel.number))
-                {
-                    replenishmentModel.abc = "C";//金额占比后10%的物料划为A类
-                }
-                else
-                {
-                    replenishmentModel.abc = "B";//原材料默认为B
-                }
-                int itemMoveCount = shipList.Count(a => a.ContainerItem == replenishmentModel.number) + pickbilllist.Count(a => a.ItemNum == replenishmentModel.number);
-                if (itemMoveCount >= avgOutStock)
-                {
-                    replenishmentModel.fmr = "F";
-                }
-                else if (itemMoveCount >= avgOutStock / 2 && itemMoveCount < avgOutStock || itemMoveCount == 0)
-                {
-                    replenishmentModel.fmr = "M";//没有出库移库记录的默认为M
-                }
-                else if (itemMoveCount < avgOutStock / 2)
-                {
-                    replenishmentModel.fmr = "R";
-                }
-
-                if (replenishmentModel.abc == "A" && replenishmentModel.fmr == "R")
-                {
-                    replenishmentModel.service_level_pct = (decimal?)0.8;
-                }
-                if (replenishmentModel.abc != "C" && replenishmentModel.fmr != "R")
-                {
-                    replenishmentModel.service_level_pct = (decimal?)0.96;
-                }
-                if (replenishmentModel.abc == "C" || (replenishmentModel.abc == "B" && replenishmentModel.fmr == "R"))
-                {
-                    replenishmentModel.service_level_pct = (decimal?)0.9;
-                }
-            });
-        }
-
-        /// <summary>
-        /// 计算ABC分类和FMR分类
-        /// </summary>
-        /// <param name="replenishmentModels"></param>
-        public void CalcFMRAndABC(ReplenishmentModel replenishmentModel, ReplenishmentDto replenishmentDto, InputDto input)
-        {
-            //发货出库记录
-            var shipList = _ASNBOLShipperDetail.Select(a => a.Domain == input.factory_id.ToString() && a.IsActive && a.shtype == "SH" && a.Typed != "S" && a.ShipDate >= DateTime.Now.AddMonths(replenishmentDto.HistoryOutStockMonth * -1) && a.RealQty > 0 && replenishmentModel.number == a.ContainerItem);
-            //领料出库记录
-            //var pickbilllist = _NbrDetail.Select(a => a.Domain == input.factory_id.ToString() && a.Type == "SM" && a.IsActive && a.UpdateTime >= DateTime.Now.AddMonths(replenishmentDto.HistoryOutStockMonth * -1) && itemNumList.Contains(a.ItemNum));
-            var pickbilllist = _invTransHist.Select(a => a.Domain == input.factory_id.ToString() && a.TransType == "iss-wo" && a.IsActive && a.CreateTime >= DateTime.Now.AddMonths(replenishmentDto.HistoryOutStockMonth * -1) && replenishmentModel.number == a.ItemNum);
-            //总的移库次数
-            int totalCount = shipList.Count() + pickbilllist.Count();
-            //平均出库次数
-            decimal avgOutStock = totalCount / replenishmentDto.HistoryOutStockMonth;
-
-            //总出货金额
-            decimal? totalPrice = shipList.Sum(a => a.Price * a.QtyToShip);
-            //按照物料分组统计出货金额
-            var itemGroup = shipList.GroupBy(p => p.ContainerItem)
-                 .Select(p => new ASNBOLShipperDetail
-                 {
-                     Price = p.Sum(a => a.Price * a.QtyToShip) * 100 / totalPrice,
-                     ContainerItem = p.Key
-                 }).ToList().OrderByDescending(c => c.Price).ThenByDescending(c => c.ContainerItem);
-            var AIndex = (int)Math.Ceiling(itemGroup.Count() * 0.75);//A类：0-75%
-            var BIndex = (int)Math.Ceiling(itemGroup.Count() * 0.9) - AIndex;//A类：75%-90%
-            var CIndex = itemGroup.Count() - AIndex - BIndex;//A类：90%-100%
-            var AItem = itemGroup.Take(AIndex);
-            var BItem = itemGroup.Skip(AIndex).Take(BIndex);
-            var CItem = itemGroup.Skip(AIndex + BIndex).Take(CIndex);
-            if (AItem.Any(a => a.ContainerItem == replenishmentModel.number))
-            {
-                replenishmentModel.abc = "A";//金额占比前75%的物料划为A类
-            }
-            else if (BItem.Any(a => a.ContainerItem == replenishmentModel.number))
-            {
-                replenishmentModel.abc = "B";//金额占比前75%-90%的物料划为B类
-            }
-            else if (CItem.Any(a => a.ContainerItem == replenishmentModel.number))
-            {
-                replenishmentModel.abc = "C";//金额占比后10%的物料划为C类
-            }
-            else
-            {
-                replenishmentModel.abc = "B";//原材料默认为B
-            }
-            int itemMoveCount = shipList.Count(a => a.ContainerItem == replenishmentModel.number) + pickbilllist.Count(a => a.ItemNum == replenishmentModel.number);
-            if (itemMoveCount >= avgOutStock)
-            {
-                replenishmentModel.fmr = "F";
-            }
-            else if (itemMoveCount >= avgOutStock / 2 && itemMoveCount < avgOutStock || itemMoveCount == 0)
-            {
-                replenishmentModel.fmr = "M";//没有出库移库记录的默认为M
-            }
-            else if (itemMoveCount < avgOutStock / 2)
-            {
-                replenishmentModel.fmr = "R";
-            }
-
-            if (replenishmentModel.abc == "A" && replenishmentModel.fmr == "R")
-            {
-                replenishmentModel.service_level_pct = (decimal?)0.8;
-            }
-            if (replenishmentModel.fmr != "R")
-            {
-                replenishmentModel.service_level_pct = (decimal?)0.96;
-            }
-            if (replenishmentModel.abc != "A" && replenishmentModel.fmr == "R")
-            {
-                replenishmentModel.service_level_pct = (decimal?)0.9;
-            }
-        }
-
-        /// <summary>
-        /// 算平均月需求数量
-        /// </summary>
-        /// <param name="planList">发货计划</param>
-        /// <param name="itemGroup"></param>
-        /// <param name="itemNum"></param>
-        /// <param name="month"></param>
-        /// <returns></returns>
-        public decimal CalcAvgDemand(List<MonthlyShipmentPlan> list, string itemNum)
-        {
-            return list.Where(i => i.SAPItemNumber == itemNum).Select(a => a.Qty).Average();
-        }
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="list">补货模型</param>
-        /// <param name="MQty">本月实际出库</param>
-        /// <param name="replenishmentDto">全局参数</param>
-        /// <param name="itemNum">物料编码</param>
-        /// <returns></returns>
-        public decimal CalcAvgOutStock(List<ReplenishmentModel> list, ReplenishmentDto replenishmentDto, decimal MQty, string itemNum)
-        {
-            return (list.Where(i => i.number == itemNum && i.zero_based_seqno > 1 - replenishmentDto.HistoryOutStockMonth && i.zero_based_seqno <= 0).Select(a => a.actual_out_qty.Value).Sum() + MQty) / (replenishmentDto.HistoryOutStockMonth + 1);
-        }
-
-        public double CalcVariance(List<MonthlyShipmentPlan> list, string itemNum)
-        {
-            var avg = CalcAvgDemand(list, itemNum);
-            var nums = list.Where(i => i.SAPItemNumber == itemNum).Select(a => a.Qty);
-            if (nums.Count() <= 1)
-                return 0;
-            return Math.Sqrt(nums.Sum(x => Math.Pow(Convert.ToDouble(x) - Convert.ToDouble(avg), 2)) / (nums.Count() - 1));
-        }
-
-        /// <summary>
-        /// 获取指定日期在为一年中为第几周
-        /// </summary>
-        /// <param name="dt">指定时间</param>
-        /// <reutrn>返回第几周</reutrn>
-        public static int GetWeekOfYear(DateTime dt)
-        {
-
-            System.Globalization.GregorianCalendar gc = new System.Globalization.GregorianCalendar();
-            int weekOfYear = gc.GetWeekOfYear(dt, System.Globalization.CalendarWeekRule.FirstDay, DayOfWeek.Monday);
-            return weekOfYear;
-        }
-
-        /// <summary>
-        /// 获取指定日期在该月的第几周
-        /// </summary>
-        /// <param name="day"></param>
-        /// <param name="WeekStart">1表示周一至周日为一周,2表示周日至周六为一周</param>
-        /// <returns></returns>
-        public static int WeekOfMonth(DateTime day, int WeekStart)
-        {
-            DateTime FirstofMonth = Convert.ToDateTime(day.Date.Year + "-" + day.Date.Month + "-" + 1);
-
-            int i = (int)FirstofMonth.Date.DayOfWeek;
-            if (i == 0)
-            {
-                i = 7;
-            }
-
-            if (WeekStart == 1)
-            {
-                return (day.Date.Day + i - 2) / 7 + 1;
-            }
-            if (WeekStart == 2)
-            {
-                return (day.Date.Day + i - 1) / 7;
-
-            }
-            return 0;
-        }
-        //获取上周开始时间
-        public static DateTime getPreWeekStartTime()
-        {
-            var weekday = (int)DateTime.Now.DayOfWeek;
-            return Convert.ToDateTime(DateTime.Now.AddDays(-7 - weekday + 1).ToString("yyyy-MM-dd 00:00:00.000"));
-        }
-        //获取上周结束时间
-        public static DateTime getPreWeekEndTime()
-        {
-            int weekday = (int)DateTime.Now.DayOfWeek;
-            return Convert.ToDateTime(DateTime.Now.AddDays(weekday - 7 + 1).ToString("yyyy-MM-dd 23:59:59.000"));
-        }
-        /// <summary>
-        /// 获取上个月开始时间
-        /// </summary>
-        /// <param name="months"></param>
-        /// <returns></returns>
-        public static DateTime getPreMonthStartTime()
-        {
-            return Convert.ToDateTime(DateTime.Now.AddMonths(-1).AddDays(1 - DateTime.Now.Day).ToString("yyyy-MM-dd 00:00:00.000"));
-        }
-        /// <summary>
-        /// 获取上月结束时间
-        /// </summary>
-        /// <param name="months"></param>
-        /// <returns></returns>
-        public static DateTime getPreMonthEndTime()
-        {
-            return Convert.ToDateTime(DateTime.Now.AddDays(-DateTime.Now.Day).ToString("yyyy-MM-dd 23:59:59.000"));
-        }
-
-        /// <summary>
-        /// 获取前后某个，整数月开始时间
-        /// </summary>
-        /// <param name="months">正数表示后多少个月的第一天，负数为前多少个月第一天</param>
-        /// <returns></returns>
-        public static DateTime getMonthStartTime(int months)
-        {
-            return getPreMonthStartTime().AddMonths(months + 1);
-        }
-        /// <summary>
-        /// 获取前后某个，整数月结束时间
-        /// </summary>
-        /// <param name="months">正数表示后多少个月的第一天，负数为前多少个月第一天</param>
-        /// <returns></returns>
-        public static DateTime getMonthEndTime(int months)
-        {
-            return getPreMonthEndTime().AddMonths(months + 1);
-        }
     }
 }

MicroServices/Business/Business.Application/SaleForecastManagement/AnnualProductionOutlineAppService.cs

@@ -6,6 +6,7 @@ using Business.EntityFrameworkCore.SqlRepositories;
 using Business.SaleForecast;
 using Business.StructuredDB.SaleFcst;
 using Business.StructuredDB.WMS;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 using NetTopologySuite.Algorithm;
 using RazorEngine;
 using Spire.Pdf.General.Render.Decode.Jpeg2000.j2k.wavelet.synthesis;
@@ -20,6 +21,7 @@ using Volo.Abp.DependencyInjection;
 using Volo.Abp.Domain.Repositories;
 using Volo.Abp.MultiTenancy;
 using Volo.Abp.Uow;
+using ZstdSharp.Unsafe;
 using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
 
 namespace Business.SaleForecastManagement
@@ -69,6 +71,23 @@ namespace Business.SaleForecastManagement
         /// 平台库存表
         /// </summary>
         private readonly IRepository<WMS_PlatformInventory, long> _PlatformInventory;
+        /// <summary>
+        /// 已发货记录
+        /// </summary>
+        private ISqlRepository<ASNBOLShipperDetail> _ASNBOLShipperDetail;
+        /// <summary>
+        /// 工单工艺路线明细
+        /// </summary>
+        private ISqlRepository<WorkOrdRouting> _workOrdRouting;
+        /// <summary>
+        /// 补货模型
+        /// </summary>
+        private IRepository<ReplenishmentModel, long> _replenishmentModel;
+        /// <summary>
+        /// 主生产计划
+        /// </summary>
+        private IRepository<ProductionMasterPlan, long> _productionMasterPlan;
+
 
         /// <summary>
         /// 雪花算法
@@ -90,18 +109,26 @@ namespace Business.SaleForecastManagement
             ISqlRepository<ProdLineDetail> prodLineDetail,
             IRepository<WMS_PlatformInventory, long> PlatformInventory,
             ISqlRepository<RoutingOpDetail> routingOpDetail,
-            ISqlRepository<LocationDetail> locationDetail
+            ISqlRepository<ASNBOLShipperDetail> ASNBOLShipperDetail,
+            ISqlRepository<WorkOrdRouting> workOrdRouting,
+            ISqlRepository<LocationDetail> locationDetail,
+            IRepository<ReplenishmentModel, long> replenishmentModel,
+            IRepository<ProductionMasterPlan, long> productionMasterPlan
             )
         {
             _unitOfWorkManager = unitOfWorkManager;
             _currentTenant = currentTenant;
             _PlatformInventory = PlatformInventory;
             _prodLineDetail = prodLineDetail;
+            _workOrdRouting = workOrdRouting;
             _routingOpDetail = routingOpDetail;
             _locationDetail = locationDetail;
+            _ASNBOLShipperDetail = ASNBOLShipperDetail;
             _yearDemandManagement = yearDemandManagement;
             _yearDemandManagementHistory = yearDemandManagementHistory;
             _annualProductionOutline = annualProductionOutline;
+            _replenishmentModel = replenishmentModel;
+            _productionMasterPlan = productionMasterPlan;
         }
         #endregion
         /// <summary>
@@ -121,42 +148,76 @@ namespace Business.SaleForecastManagement
             List<ProdLineDetail> prodLines = _prodLineDetail.Select(p => yearDemands.Select(m => m.SAPItemNumber).Contains(p.Part) && p.Domain == input.factory_id.ToString() && p.IsActive && routingOpList.Select(m => m.Op).Contains(p.Op)).OrderBy(x => x.Sequence).ToList();
             List<LocationDetail> locations = _locationDetail.Select(x => yearDemands.Select(m => m.SAPItemNumber).Contains(x.ItemNum) && x.Domain == input.factory_id.ToString() && x.IsActive).ToList();
             //平台库存
-            var platformInvList = _PlatformInventory.GetListAsync(a => yearDemands.Select(m => m.SAPItemNumber).Contains(a.SAPItemNumber) && a.tenant_id == input.tenant_id && a.factory_id == input.factory_id).Result;
-            //取上一个月发货出库记录
-            //IEnumerable<ASNBOLShipperDetail> shipList = _ASNBOLShipperDetail.Select(a => a.Domain == input.factory_id.ToString() && a.IsActive && a.shtype == "SH" && a.Typed != "S" && a.RealQty > 0 && planItemList.Contains(a.ContainerItem)).Where(s => s.ShipDate >= getMonthStartTime(-1) && s.ShipDate <= getMonthEndTime(-1));
-            //在制  -- 工单计划中的数量   工单数量-完成数=生产中的在制
+            var platformInvList = _PlatformInventory.GetListAsync(a => yearDemands.Select(m => m.SAPItemNumber).Contains(a.SAPItemNumber) && a.tenant_id == input.tenant_id && a.factory_id == input.factory_id && !a.IsDeleted).Result;
+            var replenishmentModels = _replenishmentModel.GetListAsync(x => !x.IsDeleted && x.isparam && yearDemands.Select(m => m.SAPItemNumber).Contains(x.number)).Result.ToList();
+            // 获取某年某月的起始日期和结束日期
+            int year = input.year;
+            int month = DateTime.Now.Month;
+            DateTime start = new DateTime(year, month, 1);
+            DateTime end = start.AddMonths(1).AddDays(-1);
+            //取当月发货出库记录
+            var shipList = _ASNBOLShipperDetail.Select(a => a.Domain == input.factory_id.ToString() && a.IsActive && a.shtype == "SH" && a.Typed != "S" && a.RealQty > 0 && yearDemands.Select(p => p.SAPItemNumber).Contains(a.ContainerItem)).Where(s => s.ShipDate >= start && s.ShipDate <= end);
+            #region 在制数量
+            //获取在制数量 获取工单数取每年4月到12月底的工单
+            DateTime startYear = new DateTime(year, 4, 1);
+            DateTime endYear = new DateTime(year, 12, 31);
+            List<WorkOrdRouting> workOrdRoutings = _workOrdRouting.Select(x => x.IsActive && x.QtyComplete > 0 && x.Domain == input.factory_id.ToString()).Where(p => p.DueDate >= startYear && p.DueDate <= endYear).ToList();
+            decimal? InProductionQty = 0.00m;
+            var workOrds = workOrdRoutings.GroupBy(x => x.WorkOrd).ToList();
+            //按照工单循环
+            //某工单10-90工序   Max（10-80工序QtyComplete）-90工序QtyComplete =在制数量
+            foreach (var item in workOrds)
+            {
+                var workOrdRoutingList = workOrdRoutings.Where(x => x.WorkOrd == item.Key).OrderByDescending(o => o.OP).ToList();
+                //找出最大工序
+                var MaxOp = workOrdRoutingList.FirstOrDefault();
+                //查询出其他工序最大值
+                var MaxQtyComplete = workOrdRoutingList.Where(x => x.RecID != MaxOp.RecID).ToList().Max(o => o.QtyComplete);
+                InProductionQty += MaxQtyComplete - MaxOp.QtyComplete;
+            }
+            #endregion
             //年度生产大纲实体
             List<AnnualProductionOutline> annualProductionOutlines = new List<AnnualProductionOutline>();
             List<YearDemandManagement> frontYearDemand = new List<YearDemandManagement>();
             foreach (var item in yearDemands)
             {
                 var routingOp = routingOps.Where(x => x.RoutingCode == item.SAPItemNumber).ToList();
+                //组装标准工时
                 var Assembly = routingOp.Where(x => x.Descr == "组装").FirstOrDefault();
+                //热封标准工时
                 var HeatSealing = routingOp.Where(x => x.Descr == "热封").FirstOrDefault();
+                //包装标准工时
                 var Packaging = routingOp.Where(x => x.Descr == "包装").FirstOrDefault();
                 var prodLine = prodLines.Where(x => x.Part == item.SAPItemNumber).OrderBy(x => x.Sequence).FirstOrDefault();
                 //不同库位库存数量
                 var locationList = locations.Where(x => x.ItemNum == item.SAPItemNumber).ToList();
+                //平台数据
                 var platformInvs = platformInvList.Where(x => x.SAPItemNumber == item.SAPItemNumber).ToList();
-                var QtySum = yearDemands.Where(x => x.SAPItemNumber == item.SAPItemNumber).ToList();
+                //销售预测 对应 Excel中公式 AVERAGE 如果预测为0不参与计算排产批量
+                var QtySum = yearDemands.Where(x => x.SAPItemNumber == item.SAPItemNumber && x.Qty > 0).ToList();
                 //排产批量：(AVG（1 - 12月销售预测）/ 100 )=（0.45 = 1 小数向上取整）  *100 = 100
                 var pcpl = Math.Ceiling(QtySum.Sum(p => p.Qty) / QtySum.Count()) * 100;
-                //库存合计 + 在制+已发货
-                var locationSum = (locationList.Count == 0 ? 0 : locationList.Sum(x => x.QtyOnHand)) + (platformInvs.Count == 0 ? 0 : platformInvs.Sum(x => x.InventoryQuantity));
-                //if (annualProductionOutlines.Count > 0)
-                //{
+                //库存合计 + 在制+已发货 + 灭菌中 TODO: 灭菌中取值待确定
+                var ship = shipList.Where(x => x.ContainerItem == item.SAPItemNumber).ToList();
+                var locationSum = (locationList.Count == 0 ? 0 : locationList.Sum(x => x.QtyOnHand)) + (platformInvs.Count == 0 ? 0 : platformInvs.Sum(x => x.InventoryQuantity)) + (ship.Count == 0 ? 0 : ship.Sum(x => x.RealQty)) + InProductionQty + 0;
                 //前面N个月的生产数量
                 var frontQtySum = annualProductionOutlines.Sum(x => x.Qty);
-                var num = (locationSum + frontQtySum) - frontYearDemand.Sum(m => m.Qty) - item.Qty / 2;
+                //生产数量：3月为例子，if(（库存合计和前2月生产数量）-（前2个月销售预测数据+安全库存）-当月销售预测数据 / 2 < 0)
+                // { 排产批量 * ((-(库存合计+前2个月生产数量)) +  (安全库存+前2个月销售预测) + 当月销售预测 / 2 ) / 排产批量 ) } else {0}
+                decimal ProduceQty = 0.00m;
+                //判断库存是否满足需要，满足则不用生产
+                var num = (locationSum.Value + frontQtySum) - frontYearDemand.Sum(m => m.Qty) + 0 - item.Qty / 2;
                 if (num < 0)
                 {
-                    num = pcpl * Math.Ceiling((-(locationSum + frontQtySum)) + frontYearDemand.Sum(m => m.Qty) + item.Qty / 2);
+                    ProduceQty = pcpl * Math.Ceiling((-(locationSum.Value + frontQtySum)) + (frontYearDemand.Sum(m => m.Qty) + 0) + item.Qty / 2);
                 }
-                // }
-                //生产数量：3月为例子，（库存和前2月生产数量）-（前2个月销售预测数据）-当月销售预测数据 / 2 < 0  else 排产批量 *（（-库存合计数量 + 前2个月销售预测数量 + 当月销售预测数量 / 2）/ 批量排产）
+                else
+                {
+                    ProduceQty = 0;
+                }
+
                 //生成年度生产大纲
                 AnnualProductionOutline annualProductionOutline = new AnnualProductionOutline();
-                //TODO:取值
                 annualProductionOutline.Year = item.Year;
                 annualProductionOutline.Area = item.Area;
                 annualProductionOutline.ProdLine = item.ProdLine;
@@ -166,12 +227,12 @@ namespace Business.SaleForecastManagement
                 annualProductionOutline.Model = item.Model;
                 annualProductionOutline.Languages = item.Languages;
                 annualProductionOutline.PlanMonth = item.PlanMonth;
-                annualProductionOutline.Qty = num;
+                annualProductionOutline.Qty = ProduceQty;
                 annualProductionOutline.StandardHours = (Assembly == null ? 0 : Assembly.RunTime) + (HeatSealing == null ? 0 : HeatSealing.RunTime) + (Packaging == null ? 0 : Packaging.RunTime);
                 //组装热封包装工时乘以数量 =单月工时
-                annualProductionOutline.AssemblyHours = Assembly == null ? 0 : Assembly.RunTime * num;
-                annualProductionOutline.HeatSealingHours = HeatSealing == null ? 0 : HeatSealing.RunTime * num;
-                annualProductionOutline.PackagingHours = Packaging == null ? 0 : Packaging.RunTime * num;
+                annualProductionOutline.AssemblyHours = Assembly == null ? 0 : Assembly.RunTime * ProduceQty;
+                annualProductionOutline.HeatSealingHours = HeatSealing == null ? 0 : HeatSealing.RunTime * ProduceQty;
+                annualProductionOutline.PackagingHours = Packaging == null ? 0 : Packaging.RunTime * ProduceQty;
                 annualProductionOutline.Totalhours = annualProductionOutline.AssemblyHours + annualProductionOutline.HeatSealingHours + annualProductionOutline.Totalhours;
                 annualProductionOutline.OrderNum = item.OrderNum;
                 annualProductionOutlines.Add(annualProductionOutline);
@@ -182,17 +243,66 @@ namespace Business.SaleForecastManagement
             {
                 try
                 {
-                    await _annualProductionOutline.InsertManyAsync(annualProductionOutlines);
+                    //await _annualProductionOutline.InsertManyAsync(annualProductionOutlines);
+                    await unitOfWork.CompleteAsync();
+                }
+                catch (Exception e)
+                {
+                    unitOfWork.Dispose();
+                    new NLogHelper("AnnualProductionOutlineAppService").WriteLog("SaveAnnualProductionOutline", "【" + input.year + "年" + "】年度生成大纲生成失败：" + e.Message, _currentTenant.Id.ToString());
+                    return "NO|" + e.Message;
+                };
+            }
+            return "OK";
+        }
+
+        /// <summary>
+        /// 生成主计划
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        public async Task<string> SaveProductionMasterPlan(InputDto input)
+        {
+            //计算当前年月的N0,N+1,N+2
+            List<string> planMons = new List<string>();
+            string strN0 = input.year.ToString() + "-" + input.month.ToString("00");
+            planMons.Add(strN0);
+            int newYear = input.month == 12 ? input.year + 1 : input.year;
+            int newMonth = input.month == 12 ? 1 : input.month + 1;
+            string strN1 = newYear.ToString() + "-" + newMonth.ToString("00");
+            planMons.Add(strN1);
+            newYear = newMonth == 12 ? newYear + 1 : newYear;
+            newMonth = newMonth == 12 ? 1 : newMonth + 1;
+            string strN2 = newYear.ToString() + "-" + newMonth.ToString("00");
+            planMons.Add(strN2);
+            //N0,N+1,N+2月度发货计划
+            var productionMasterPlan = _productionMasterPlan.GetListAsync(x => x.Year == input.year && !x.IsDeleted && x.tenant_id == input.tenant_id && x.company_id == input.company_id && x.factory_id == input.factory_id && planMons.Contains(x.PlanMonth)).Result.OrderBy(p => p.OrderNum).ThenBy(o => o.PlanMonth).ToList();
+            foreach (var item in productionMasterPlan)
+            {
+
+            }
+
+
+
+
+
+            //保存数据
+            using (var unitOfWork = _unitOfWorkManager.Begin(false, true))
+            {
+                try
+                {
+                    //await _annualProductionOutline.InsertManyAsync(annualProductionOutlines);
                     await unitOfWork.CompleteAsync();
                 }
                 catch (Exception e)
                 {
                     unitOfWork.Dispose();
-                    new NLogHelper("AnnualProductionOutlineAppService").WriteLog("SaveAnnualProductionOutline", "【" + input.year + "年" + "】月度需求预测更新失败：" + e.Message, _currentTenant.Id.ToString());
+                    new NLogHelper("AnnualProductionOutlineAppService").WriteLog("SaveProductionMasterPlan", "【" + input.year + "年" + "】主计划生成失败：" + e.Message, _currentTenant.Id.ToString());
                     return "NO|" + e.Message;
                 };
             }
             return "OK";
+
         }
     }
 }

MicroServices/Business/Business.Application/SaleForecastManagement/MonthlyCapacityLoadAppService.cs

@@ -19,7 +19,7 @@ namespace Business.SaleForecastManagement
     /// <summary>
     /// 产能分析
     /// </summary>
-    public class MonthlyCapacityLoadAppService : ApplicationService, IMonthlyCapacityLoadAppService, ITransientDependency
+    public class ReplenishmentAppService : ApplicationService, IMonthlyCapacityLoadAppService, ITransientDependency
     {
         #region 服务
         /// <summary>
@@ -152,7 +152,7 @@ namespace Business.SaleForecastManagement
         /// <summary>
         /// 构造函数
         /// </summary>
-        public MonthlyCapacityLoadAppService(
+        public ReplenishmentAppService(
             IRepository<ic_item, long> ic_item,
             ISqlRepository<ProdLineDetail> prodLineDetail,
             ISqlRepository<ShopCalendarWorkCtr> shopCalendarWorkCtr,

MicroServices/Business/Business.Application/SystemJobManagement/SystemJobAppService.cs

@@ -590,118 +590,118 @@ namespace Business.SystemJobManagement
         ////    }
         ////}
 
-        ////同步物料
-        //public void SyncItemMaster()
-        //{
-        //    bool isAll = true;//是否同步所有物料
-        //    var ic_itemList = _mysql_ic_item.GetListAsync(a => a.tenant_id == 1000 && a.factory_id == 1001).Result;
-        //    List<ItemMaster> custList = new List<ItemMaster>();
-        //    if (isAll)
-        //    {
-        //        custList = _itemMaster.Select(a => a.IsActive && a.Domain == "1001");
-        //    }
-        //    else
-        //    {
-        //        //格努产品编码同步子级物料
-        //        List<string> childItems = GetChildItemNumber("", new List<string>());
-        //        custList = _itemMaster.Select(a => a.IsActive && a.Domain == "1001" && childItems.Distinct().Contains(a.ItemNum));
-        //    }
-        //    List<ic_item> ItemsAdd = new List<ic_item>();
-        //    List<srm_purchase> srm_purchaseAdd = new List<srm_purchase>();
-        //    if (custList != null && custList.Count > 0)
-        //    {
-        //        for (int i = 0; i < custList.Count; i++)
-        //        {
-        //            var ic_item = ic_itemList.Find(x => x.number == custList[i].ItemNum && x.tenant_id == 1000 && x.factory_id == 1001);
-        //            if (ic_item == null)
-        //            {
-        //                long itemId = help.NextId();
-        //                ItemsAdd.Add(new ic_item(itemId)
-        //                {
-        //                    number = custList[i].ItemNum, //物料编码
-        //                    name = custList[i].Descr, //物料名称
-        //                    model = custList[i].Descr1,//规格型号
-        //                    fversion = "",//版本号
-        //                    //ext.FErpClsID == "配置类" ? 0 : ext.FErpClsID == "自制" ? 1 : ext.FErpClsID == "委外" ? 2 : ext.FErpClsID == "外购" ? 3 : ext.FErpClsID == "虚拟" ? 4 : ext.FErpClsID == "费用" ? 5 : ext.FErpClsID == "服务" ? 6 : -1;
-        //                    //erp_cls = custList[i].PurMfg == "P" ? 3 : 1,//物料属性
-        //                    erp_cls = custList[i].ItemNum == "1.SD1.D.0056-F" || custList[i].ItemNum == "1.ZC1.D.0001" || custList[i].ItemNum == "1.BW1.D.0030" ? 1 : 3,
-        //                    //erp_cls_name = custList[i].PurMfg == "P" ? "外购" : "自制",//物料属性名称
-        //                    erp_cls_name = custList[i].ItemNum == "1.SD1.D.0056-F" || custList[i].ItemNum == "1.ZC1.D.0001" || custList[i].ItemNum == "1.BW1.D.0030" ? "自制" : "外购",
-        //                    unit = custList[i].UM,//单位
-        //                    item_level = 0,//物料等级
-        //                    source = "",//来源
-        //                    iskeyitem = custList[i].IsMainMas ? 1 : 0,//是否关键件
-        //                    net_weight = (decimal)custList[i].NetWeight,//净重
-        //                    maund = custList[i].NetWeightUM,//重量单位
-        //                    length = (decimal)custList[i].Length,//长度
-        //                    width = (decimal)custList[i].Width,//宽度
-        //                    height = (decimal)custList[i].Height,//高度
-        //                    allowpur = custList[i].PurMfg == "P" ? 1 : 0,//允许采购
-        //                    allowsale = 1,//允许销售
-        //                    allowmanu = custList[i].PurMfg == "L" ? 1 : 0,//允许生产
-        //                    allowout = 1,//允许委外
-        //                    allowbatch = custList[i].LotSerialControl ? 1 : 0,//批号管理
-        //                    allowserial = custList[i].LotSerialControl ? 1 : 0,//序列号管理
-        //                    photo = "",//图片
-        //                    enable_warning = 1,//启用预警
-        //                    factory_id = 1001,
-        //                    tenant_id = 1000,
-        //                    IsDeleted = false,
-
-
-        //                    batch_manager = custList[i].LotSerialControl ? 1 : 0,
-        //                    minorderqty = custList[i].MinOrd,
-        //                    minpackqty = 1,
-        //                    ordissu_days = 1,
-        //                    transportation_leadtime = 3,
-        //                    stock_leadtime = 1,
-        //                    production_leadtime = 4,
-        //                    order_leadtime = 4,
-
-        //                    fix_leadtime = 1,
-        //                    order_inter_val = 1,
-        //                    lead_time = 1,
-        //                    bat_change_economy = 1,
-        //                    total_tqq = 1,
-        //                    order_point = 1,
-        //                    secinv = 1,
-        //                    secinv_ratio = 1,
-        //                    self_inspection_date = 1,
-        //                    Warehousing_date = 1,
-        //                    Shipping_date = 3,
-        //                });
-        //                srm_purchaseAdd.Add(new srm_purchase(help.NextId())
-        //                {
-        //                    icitem_id = itemId,
-        //                    icitem_name = custList[i].Descr,
-        //                    sourcelist_number = "HYQD12064",
-        //                    supplier_id = 10101000051,
-        //                    supplier_number = "",
-        //                    supplier_name = "广州市伟正金属构件有限公司",
-        //                    purchgroup = "",
-        //                    purcher = "",
-        //                    purchase_unit = "",
-        //                    netpurchase_price = 1,
-        //                    taxrate = 0.13m,
-        //                    currency_type = 1,
-        //                    order_rector_name = "",
-        //                    order_rector_num = "",
-        //                    factory_code = "",
-        //                    order_dept = "",
-        //                    order_price = 13,
-        //                    sale_price = 130,
-        //                    qty_min = 10,
-        //                    batch_append_qty = 10,
-        //                    factory_id = 1001,
-        //                    tenant_id = 1000,
-        //                    IsDeleted = false
-        //                });
-        //            }
-        //        }
-        //    }
-        //    _businessDbContext.BulkInsert(ItemsAdd);
-        //    _businessDbContext.BulkInsert(srm_purchaseAdd);
-        //}
+        /*//同步物料
+        public void SyncItemMaster()
+        {
+            bool isAll = true;//是否同步所有物料
+            var ic_itemList = _mysql_ic_item.GetListAsync(a => a.tenant_id == 1000 && a.factory_id == 1001).Result;
+            List<ItemMaster> custList = new List<ItemMaster>();
+            if (isAll)
+            {
+                custList = _itemMaster.Select(a => a.IsActive && a.Domain == "1001");
+            }
+            else
+            {
+                //格努产品编码同步子级物料
+                List<string> childItems = GetChildItemNumber("", new List<string>());
+                custList = _itemMaster.Select(a => a.IsActive && a.Domain == "1001" && childItems.Distinct().Contains(a.ItemNum));
+            }
+            List<ic_item> ItemsAdd = new List<ic_item>();
+            List<srm_purchase> srm_purchaseAdd = new List<srm_purchase>();
+            if (custList != null && custList.Count > 0)
+            {
+                for (int i = 0; i < custList.Count; i++)
+                {
+                    var ic_item = ic_itemList.Find(x => x.number == custList[i].ItemNum && x.tenant_id == 1000 && x.factory_id == 1001);
+                    if (ic_item == null)
+                    {
+                        long itemId = help.NextId();
+                        ItemsAdd.Add(new ic_item(itemId)
+                        {
+                            number = custList[i].ItemNum, //物料编码
+                            name = custList[i].Descr, //物料名称
+                            model = custList[i].Descr1,//规格型号
+                            fversion = "",//版本号
+                            //ext.FErpClsID == "配置类" ? 0 : ext.FErpClsID == "自制" ? 1 : ext.FErpClsID == "委外" ? 2 : ext.FErpClsID == "外购" ? 3 : ext.FErpClsID == "虚拟" ? 4 : ext.FErpClsID == "费用" ? 5 : ext.FErpClsID == "服务" ? 6 : -1;
+                            //erp_cls = custList[i].PurMfg == "P" ? 3 : 1,//物料属性
+                            erp_cls = custList[i].ItemNum == "1.SD1.D.0056-F" || custList[i].ItemNum == "1.ZC1.D.0001" || custList[i].ItemNum == "1.BW1.D.0030" ? 1 : 3,
+                            //erp_cls_name = custList[i].PurMfg == "P" ? "外购" : "自制",//物料属性名称
+                            erp_cls_name = custList[i].ItemNum == "1.SD1.D.0056-F" || custList[i].ItemNum == "1.ZC1.D.0001" || custList[i].ItemNum == "1.BW1.D.0030" ? "自制" : "外购",
+                            unit = custList[i].UM,//单位
+                            item_level = 0,//物料等级
+                            source = "",//来源
+                            iskeyitem = custList[i].IsMainMas ? 1 : 0,//是否关键件
+                            net_weight = (decimal)custList[i].NetWeight,//净重
+                            maund = custList[i].NetWeightUM,//重量单位
+                            length = (decimal)custList[i].Length,//长度
+                            width = (decimal)custList[i].Width,//宽度
+                            height = (decimal)custList[i].Height,//高度
+                            allowpur = custList[i].PurMfg == "P" ? 1 : 0,//允许采购
+                            allowsale = 1,//允许销售
+                            allowmanu = custList[i].PurMfg == "L" ? 1 : 0,//允许生产
+                            allowout = 1,//允许委外
+                            allowbatch = custList[i].LotSerialControl ? 1 : 0,//批号管理
+                            allowserial = custList[i].LotSerialControl ? 1 : 0,//序列号管理
+                            photo = "",//图片
+                            enable_warning = 1,//启用预警
+                            factory_id = 1001,
+                            tenant_id = 1000,
+                            IsDeleted = false,
+                            clean_leadtime = custList[i].MFGMTTR,
+                            is_clean= custList[i].IssuePolicy ? 1 : 0,
+                            batch_manager = custList[i].LotSerialControl ? 1 : 0,
+                            minorderqty = custList[i].MinOrd,
+                            minpackqty = 1,
+                            ordissu_days = 1,
+                            transportation_leadtime = 3,
+                            stock_leadtime = 1,
+                            production_leadtime = 4,
+                            order_leadtime = 4,
+
+                            fix_leadtime = 1,
+                            order_inter_val = 1,
+                            lead_time = 1,
+                            bat_change_economy = 1,
+                            total_tqq = 1,
+                            order_point = 1,
+                            secinv = 1,
+                            secinv_ratio = 1,
+                            self_inspection_date = 1,
+                            Warehousing_date = 1,
+                            Shipping_date = 3,
+                        });
+                        srm_purchaseAdd.Add(new srm_purchase(help.NextId())
+                        {
+                            icitem_id = itemId,
+                            icitem_name = custList[i].Descr,
+                            sourcelist_number = "HYQD12064",
+                            supplier_id = 10101000051,
+                            supplier_number = "",
+                            supplier_name = "广州市伟正金属构件有限公司",
+                            purchgroup = "",
+                            purcher = "",
+                            purchase_unit = "",
+                            netpurchase_price = 1,
+                            taxrate = 0.13m,
+                            currency_type = 1,
+                            order_rector_name = "",
+                            order_rector_num = "",
+                            factory_code = "",
+                            order_dept = "",
+                            order_price = 13,
+                            sale_price = 130,
+                            qty_min = 10,
+                            batch_append_qty = 10,
+                            factory_id = 1001,
+                            tenant_id = 1000,
+                            IsDeleted = false
+                        });
+                    }
+                }
+            }
+            _businessDbContext.BulkInsert(ItemsAdd);
+            _businessDbContext.BulkInsert(srm_purchaseAdd);
+        }*/
 
         //public void SyncBom()
         //{

MicroServices/Business/Business.Domain/MongoDB/MES/IC/mo_ic_item.cs

@@ -675,5 +675,12 @@ namespace Business.Domain
         /// </summary>
         [Comment("投料自动取整")]
         public int? put_integer { get; set; }
+
+        /// <summary>
+        /// RS50成品  RS30 组件  RS11 原材料 RS12 零件 RS13 包装材料 RS14 辅料 RS15 低值易耗品 RS99 虚拟物料
+        /// </summary>
+        [StringLength(80)]
+        [Comment("物料类型")]
+        public string item_type { get; set; }
     }
 }

MicroServices/Business/Business.Domain/StructuredDB/MES/IC/ItemMaster.cs

@@ -71,7 +71,16 @@ namespace Business.Domain
         public string DefaultShelf { get; set; }
         public decimal? MaxOrd { get; set; }
         public decimal? MinOrd { get; set; }
+        /// <summary>
+        /// 前处理天数
+        /// </summary>
         public decimal MFGMTTR { get; set; }
+        /// <summary>
+        /// 是否前处理
+        /// </summary>
+        [Comment("是否前处理")]
+        public bool IssuePolicy { get; set; }
+
         /// <summary>
         /// 是否有效：1-有效；0-无效
         /// </summary>
@@ -96,5 +105,10 @@ namespace Business.Domain
         [Comment("存货周转率")]
         public decimal StockTurnOver { get; set; }
 
+        /// <summary>
+        /// 物料类型
+        /// </summary>
+        public string ItemType { get; set; }
+
     }
 }

MicroServices/Business/Business.Domain/StructuredDB/MES/IC/NbrMaster.cs

@@ -147,5 +147,11 @@ namespace Business.Domain
         /// </summary>
         [Comment("修改人")]
         public string UpdateUser { get; set; }
+
+        /// <summary>
+        /// 前处理领料单 =PrevProcess
+        /// </summary>
+        [Comment("前处理领料单")]
+        public string TransType { get; set; }
     }
 }

MicroServices/Business/Business.Domain/StructuredDB/MES/IC/ic_item.cs

@@ -680,5 +680,12 @@ namespace Business.Domain
         /// </summary>
         [Comment("投料自动取整")]
         public int? put_integer { get; set; }
+
+        /// <summary>
+        /// RS50成品  RS30 组件  RS11 原材料 RS12 零件 RS13 包装材料 RS14 辅料 RS15 低值易耗品 RS99 虚拟物料
+        /// </summary>
+        [StringLength(80)]
+        [Comment("物料类型")]
+        public string item_type { get; set; }
     }
 }

MicroServices/Business/Business.Domain/StructuredDB/Production/WorkOrdRouting.cs

@@ -80,6 +80,12 @@ namespace Business.Domain
         /// </summary>
         [Comment("订单数量")]
         public decimal? QtyOrded { get; set; }
+        /// <summary>
+        /// 报工数量
+        /// </summary>
+        [Comment("报工数量")]
+        public decimal? QtyComplete { get; set; }
+        
 
         /// <summary>
         /// 工序清场时长(小时)

MicroServices/Business/Business.Domain/StructuredDB/Replenishment/ItemABCFMR.cs

@@ -0,0 +1,124 @@
+using Business.Core.Attributes;
+using Microsoft.EntityFrameworkCore;
+using Spire.Pdf.General.Render.Decode.Jpeg2000.j2k.roi.encoder;
+using System;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Runtime.Intrinsics.X86;
+using ZstdSharp.Unsafe;
+
+namespace Business.Domain
+{
+    /// <summary>
+    ///补货模型物料abcfmr
+    /// </summary>
+    [Comment("补货模型物料abcfmr")]
+    [Index(nameof(number), nameof(tenant_id), nameof(fversion),nameof(isstandalone), nameof(factory_id), IsUnique = true)]
+    public class replenishmentabcfmr : BaseEntity
+    {
+        /// <summary>
+        /// 物料编码
+        /// </summary>
+        [StringLength(80)]
+        [Comment("物料编码")]
+        public string number { get; set; }
+        /// <summary>
+        /// 物料名称
+        /// </summary>
+        [StringLength(200)]
+        [Comment("物料名称")]
+        public string name { get; set; }
+        /// <summary>
+        /// 规格型号
+        /// </summary>
+        [StringLength(200)]
+        [Comment("规格型号")]
+        public string model { get; set; }
+
+        /// <summary>
+        /// RS50成品  RS30 组件  RS11 原材料 RS12 零件 RS13 包装材料 RS14 辅料 RS15 低值易耗品 RS99 虚拟物料
+        /// </summary>
+        [StringLength(50)]
+        [Comment("物料类型")]
+        public string item_type { get; set; }
+
+        /// <summary>
+        /// 版本号
+        /// </summary>
+        [StringLength(80)]
+        [Comment("版本号")]
+        public string? fversion { get; set; }
+
+
+        /// <summary>
+        /// 存货金额
+        /// </summary>
+        [Precision(20, 8)]
+        [Comment("存货金额")]
+        public decimal? inventoryamount { get; set; }
+
+        /// <summary>
+        /// 出库金额
+        /// </summary>
+        [Precision(20, 8)]
+        [Comment("出库金额")]
+        public decimal? outstockamount { get; set; }
+
+        /// <summary>
+        /// 金额占比
+        /// </summary>
+        [Precision(20, 8)]
+        [Comment("金额占比")]
+        public decimal? amountpercent { get; set; }
+
+
+        /// <summary>
+        /// ABC分类
+        /// </summary>
+        [StringLength(8)]
+        [Comment("ABC分类")]
+        public string? abc { get; set; }
+
+        /// <summary>
+        /// 出库次数
+        /// </summary>
+        [Precision(20, 8)]
+        [Comment("出库次数")]
+        public decimal? outstockcount { get; set; }
+
+        /// <summary>
+        /// 移动次数
+        /// </summary>
+        [Precision(20, 8)]
+        [Comment("移动次数/月")]
+        public decimal? movecount { get; set; }
+
+        /// <summary>
+        /// 次数占比
+        /// </summary>
+        [Precision(20, 8)]
+        [Comment("次数占比")]
+        public decimal? moveperent { get; set; }
+
+        /// <summary>
+        /// FMR分类
+        /// </summary>
+        [StringLength(8)]
+        [Comment("FMR分类")]
+        public string? fmr { get; set; }
+
+        /// <summary>
+        /// Z服务水平参数
+        /// </summary>
+        [Precision(20, 8)]
+        [Comment("Z服务水平参数")]
+        public decimal? service_level_pct { get; set; }
+
+        /// <summary>
+        /// 是否独立计算，成品跟产品计算，原材料跟原材料计算
+        /// </summary>
+        [Comment("Z服务水平参数")]
+        public bool isstandalone { get; set; }
+    }
+}

MicroServices/Business/Business.EntityFrameworkCore/EntityFrameworkCore/DOP/BusinessDbContext.cs

@@ -269,6 +269,8 @@ namespace Business.EntityFrameworkCore
         /// </summary>
         public DbSet<SAPInv> SAPInv { get; set; }
 
+        public DbSet<replenishmentabcfmr> replenishmentabcfmr { get; set; }
+
         #endregion
 
         //Code generation...

MicroServices/Business/Business.HttpApi/Controllers/AnnualProductionOutlineController.cs

@@ -22,6 +22,15 @@ namespace Business.Controllers
         /// 年度生产大纲
         /// </summary>
         private readonly IAnnualProductionOutlineAppService _IAnnualProductionOutlineAppService;
+
+        /// <summary>
+        /// 构造函数
+        /// </summary>
+        /// <param name="MonthlyCapacityLoadAppService"></param>
+        public AnnualProductionOutlineController(IAnnualProductionOutlineAppService MonthlyCapacityLoadAppService)
+        {
+            _IAnnualProductionOutlineAppService = MonthlyCapacityLoadAppService;
+        }
         /// <summary>
         /// 月度需求分析
         /// </summary>

MicroServices/Business/Business.HttpApi/Controllers/ReplenishmentController.cs

@@ -0,0 +1,72 @@
+using Business.Domain;
+using Business.Dto;
+using Business.ReplenishmentManagement;
+using Business.ResourceExamineManagement;
+using Business.ResourceExamineManagement.Dto;
+using Microsoft.AspNetCore.Mvc;
+using MongoDB.Bson.IO;
+using Newtonsoft.Json;
+using Org.BouncyCastle.Asn1.Ocsp;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.Design;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Volo.Abp;
+using Volo.Abp.AspNetCore.Mvc;
+
+namespace Business.Controllers
+{
+    /// <summary>
+    /// 补货模型
+    /// </summary>
+    [RemoteService]
+    [Area("Business")]
+    [Route("api/business/replenishment")]
+    public class ReplenishmentController : AbpController
+    {
+        private readonly IReplenishmentAppService _ReplenishmentAppService;
+
+        public ReplenishmentController(IReplenishmentAppService ReplenishmentAppService)
+        {
+            _ReplenishmentAppService = ReplenishmentAppService;
+        }
+
+        ///// <summary>
+        ///// 计划工单齐套检查
+        ///// </summary>
+        ///// <param name="workOrd"></param>
+        ///// <returns></returns>
+        //[HttpPost]
+        //[Route("PlanOrderResourceCheck")]
+        //public Task<string> PlanOrderResourceCheck(string companyid)
+        //{
+        //    return _ReplenishmentAppService.PlanOrderResourceCheck(companyid);
+        //}
+
+        /// <summary>
+        /// 调整ROP和最高库存水位
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("calcrop")]
+        public Task<string> CalcROP(InputDto input)
+        {
+            return _ReplenishmentAppService.CalcROP(input);
+        }
+
+        ///// <summary>
+        ///// 更新周计划
+        ///// </summary>
+        ///// <param name="input"></param>
+        ///// <returns></returns>
+        //[HttpPost]
+        //[Route("weekplan")]
+        //public Task<string> WeekPlan(InputDto input)
+        //{
+        //    return _ReplenishmentAppService.WeekPlan(input);
+        //}
+    }
+}

MicroServices/Business/Business.HttpApi/Controllers/ResourceExamineController.cs

@@ -69,7 +69,7 @@ namespace Business.Controllers
         }
 
         /// <summary>
-        /// 齐套检查下达
+        /// 自动下达
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
@@ -93,7 +93,7 @@ namespace Business.Controllers
         }
 
         /// <summary>
-        /// 计划工单齐套检查
+        /// 计划工单资源检查
         /// </summary>
         /// <param name="workOrd"></param>
         /// <returns></returns>
@@ -175,6 +175,13 @@ namespace Business.Controllers
             return _ResourceExamineAppService.PrApprove(ids);
         }
 
+        /// <summary>
+        /// 手动按工单下达
+        /// </summary>
+        /// <param name="workord"></param>
+        /// <param name="domain"></param>
+        /// <param name="userAccount"></param>
+        /// <returns></returns>
         [HttpGet]
         [Route("ProduceWorkOrdKittingCheck")]
         public Task<string> ProduceWorkOrdKittingCheck(string workord, string domain, string userAccount)
@@ -205,29 +212,5 @@ namespace Business.Controllers
         {
             return _ResourceExamineAppService.BindingSubstitute(dto);
         }
-
-        /// <summary>
-        /// 更新补货模型月度参数
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("weekplanparms")]
-        public Task<string> WeekPlanParms(InputDto input)
-        {
-            return _ResourceExamineAppService.WeekPlanParms(input);
-        }
-
-        /// <summary>
-        /// 更新周计划
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("weekplan")]
-        public Task<string> WeekPlan(InputDto input)
-        {
-            return _ResourceExamineAppService.WeekPlan(input);
-        }
     }
 }