Browse Source

产销协同接口改为Get请求

Murphy 2 years ago
parent
commit
a8cbde521d

+ 14 - 4
MicroServices/Business/Business.Application/ReplenishmentManagement/ReplenishmentAppService.cs

@@ -418,6 +418,8 @@ namespace Business.Replenishment
         /// <exception cref="NotImplementedException"></exception>
         public async Task<string> SaveAnnualProductionOutline(InputDto input)
         {
+            input.year = DateTime.Now.Year;
+            input.month = DateTime.Now.Month;
             //获取当前导入或修改数据
             List<YearDemandManagement> yearDemands = _yearDemandManagement.GetListAsync(p => p.Year == input.year && p.factory_id == input.factory_id && !p.IsDeleted).Result.OrderBy(p => p.OrderNum).ThenBy(o => o.PlanMonth).ToList();
             //标准工艺路径表
@@ -604,6 +606,8 @@ namespace Business.Replenishment
         /// <returns></returns>
         public async Task<string> SaveProductionMasterPlan(InputDto input,List<ReplenishmentAnnualProduction> annual)
         {
+            input.year = DateTime.Now.Year;
+            input.month = DateTime.Now.Month;
             //计算当前年月的N0,N+1,N+2
             List<string> planMons = GetPlanMonth(4);
             List<ProductionMasterPlan> productionMasters= new List<ProductionMasterPlan>();
@@ -819,6 +823,8 @@ namespace Business.Replenishment
         /// <returns></returns>
         public async Task<string> CalcROP(InputDto input)
         {
+            input.year = DateTime.Now.Year;
+            input.month = DateTime.Now.Month;
             //1.获取补货模型全局参数
             ReplenishmentDto replenishmentDto = GetROPParam(input.factory_id.ToString());
             List<ReplenishmentROPWeekPlan> addList = new List<ReplenishmentROPWeekPlan>();
@@ -1526,9 +1532,9 @@ namespace Business.Replenishment
             _workOrdDetail.Delete(a => workOrderDelete.Contains(a.WorkOrd) && a.Domain == input.factory_id.ToString());
             var deletedOrderList=_mysql_mes_morder.GetListAsync(a=>workOrderDelete.Contains(a.morder_no) && a.factory_id == input.factory_id).Result;
             var deletedIds = deletedOrderList.Select(a => a.Id).ToList();
-            await _mysql_mes_morder.DeleteManyAsync(deletedOrderList);
+            await _mysql_mes_morder.HardDeleteAsync(deletedOrderList);
             var deletedEntryList= _mysql_mes_moentry.GetListAsync(a => workOrderDelete.Contains(a.moentry_mono) && a.factory_id == input.factory_id).Result;
-            await _mysql_mes_moentry.DeleteManyAsync(deletedEntryList);
+            await _mysql_mes_moentry.HardDeleteAsync(deletedEntryList);
             var examine_result = _mysql_examine_result.GetListAsync(a => workOrderDelete.Contains(a.morder_no) && a.factory_id == input.factory_id).Result;
             List<srm_po_occupy> occupy = await _mysql_srm_po_occupy.GetListAsync(s => workOrderDelete.Contains(s.morder_mo));
             _businessDbContext.BulkDelete(occupy);
@@ -1544,8 +1550,8 @@ namespace Business.Replenishment
             {
                 _businessDbContext.BulkDelete(itemstockoccupy);
             }
-            await _mysql_bom_child_examine.DeleteAsync(a => examine_result.Select(b => b.Id).ToList().Contains(a.examine_id.Value) && a.factory_id == input.factory_id);
-            await _mysql_examine_result.DeleteManyAsync(examine_result);
+            await _mysql_bom_child_examine.HardDeleteAsync(a => examine_result.Select(b => b.Id).ToList().Contains(a.examine_id.Value) && a.factory_id == input.factory_id);
+            await _mysql_examine_result.HardDeleteAsync(examine_result);
             await _replenishmentWeekPlan.HardDeleteAsync(weekPlanDelete);
 
             //月度补货模型
@@ -1969,6 +1975,8 @@ namespace Business.Replenishment
         /// <returns></returns>
         public async Task<string> CalcDayPlan(InputDto input)
         {
+            input.year = DateTime.Now.Year;
+            input.month = DateTime.Now.Month;
             ReplenishmentDto replenishmentDto = GetROPParam(input.factory_id.ToString());
             //DOP运行资源检查每个成品和半成品SKU的可用库存,当可用库存 <= 修正后ROP时,自动生成月度计划订单(MPlan order,MPO48年月日3位流水号)= EOP;可用库存为没有被其他SO和PO占用的(合格成品或半成品库存 + WIP);
             var ropModelList = _replenishmentROPWeekPlan.GetListAsync(a => a.planmonth==$"{DateTime.Now.Year}-{DateTime.Now.Month.ToString("00")}" && a.erp_cls==1 && a.distributionchannel=="瑞奇" && a.factory_id==input.factory_id  && !a.IsDeleted).Result;
@@ -3728,6 +3736,8 @@ namespace Business.Replenishment
         /// <returns></returns>
         public async Task<string> CalcLongPeriodItemPR(InputDto input)
         {
+            input.year = DateTime.Now.Year;
+            input.month = DateTime.Now.Month;
             var ropParam = GetROPParam(input.factory_id.ToString());
             //获取滚动未来六个月数据
             var monthlist = GetPlanMonth(6);

+ 1 - 1
MicroServices/Business/Business.HttpApi/Controllers/ReplenishmentController.cs

@@ -38,7 +38,7 @@ namespace Business.Controllers
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
-        [HttpPost]
+        [HttpGet]
         [Route("demandanalysis")]
         public Task<string> DemandAnalysis(InputDto input)
         {