Просмотр исходного кода

月度预测回写年度大纲调整

heteng 2 лет назад
Родитель
Сommit
b5d27086fc

+ 21 - 4
MicroServices/Business/Business.Application/SaleForecastManagement/MonthlyCapacityLoadAppService.cs

@@ -106,6 +106,16 @@ namespace Business.SaleForecastManagement
         /// </summary>
         private IRepository<StandardItemModelSet,long> _standardItemModelSet;
 
+        /// <summary>
+        /// 库存明细表
+        /// </summary>
+        private ISqlRepository<LocationDetail> _locationDetail;
+
+        /// <summary>
+        /// 工单
+        /// </summary>
+        private ISqlRepository<WorkOrdMaster> _workOrdMaster;
+
         /// <summary>
         /// 雪花算法
         /// </summary>
@@ -132,7 +142,9 @@ namespace Business.SaleForecastManagement
             IRepository<DomesticTerminalFcst, long> domesticTerminalFcst,
             IRepository<OverseasSaleFcst, long> overseasSaleFcst,
             IRepository<PlatformFcstCollect, long> platformFcstCollect,
-            IRepository<YearDemandManagementHistory, long> yearDemandManagementHistory
+            IRepository<YearDemandManagementHistory, long> yearDemandManagementHistory,
+            ISqlRepository<LocationDetail> locationDetail,
+            ISqlRepository<WorkOrdMaster> workOrdMaster
             )
         {
             _ic_item = ic_item;
@@ -151,6 +163,8 @@ namespace Business.SaleForecastManagement
             _overseasSaleFcst = overseasSaleFcst;
             _platformFcstCollect= platformFcstCollect;
             _yearDemandManagementHistory= yearDemandManagementHistory;
+            _locationDetail = locationDetail;
+            _workOrdMaster = workOrdMaster;
         }
         #endregion
 
@@ -334,9 +348,12 @@ namespace Business.SaleForecastManagement
             //1.5、获取规格型号对应的标准SKU数据:获取最小包装单位
             List<string> itemNums = standards.Select(p=>p.ItemNumber).Distinct().ToList();
             List<ic_item> items = _ic_item.GetListAsync(p=> itemNums.Contains(p.number) && p.tenant_id == input.tenant_id && p.company_id == input.company_id && p.factory_id == input.factory_id && !p.IsDeleted).Result;
-            //1.6、获取成品库存
-            //1.7、获取在制库存
-            //1.8、获取灭菌库存
+            //1.6、获取成品库存、灭菌库存
+            //List<LocationDetail> locations = _locationDetail.Select(p=>p.Domain == input.factory_id.ToString() && p.IsActive && itemNums.Contains(p.ItemNum));
+            //1.7、获取在制库存:计划开始时间、计划结束时间都在本月,并且未关闭的工单
+            //DateTime monStart = Convert.ToDateTime(input.year + "-" + input.month + "-01");
+            //DateTime monEnd = monStart.AddMonths(1).AddDays(-1);
+            //List<WorkOrdMaster> workOrds = _workOrdMaster.Select(p=>p.Domain);
             //1.9、获取节假日设置
             List<HolidayMaster> holidays = _holidayMaster.Select(p => (p.Dated.Value.Year == input.year || p.Dated.Value.Year == (input.year + 1)) && p.Domain == input.factory_id.ToString() && p.IsActive);