Browse Source

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

tangdi 2 years ago
parent
commit
aae048b892

+ 13 - 4
MicroServices/Business/Business.Application.Contracts/ReplenishmentManagement/IReplenishmentAppService.cs

@@ -57,14 +57,16 @@ namespace Business.ReplenishmentManagement
         /// </summary>
         /// <param name="companyId">工厂id</param>
         /// <returns></returns>
-        Task<string> CalcDayPlan(InputDto input);
+        Task<string> PublishWeekPlan(InputDto input);
 
+        
         /// <summary>
-        /// 检查所有成品半成品原材料是否需要补货先判断SS再判断ROP
+        /// 每日补货
         /// </summary>
-        /// <param name="input"></param>
+        /// <param name="companyId">工厂id</param>
         /// <returns></returns>
-        Task<string> DayCheckAllByFinalGoods(InputDto input);
+        Task<string> CalcDayPlan(InputDto input);
+
 
         /// <summary>
         /// 计算工单优先级
@@ -72,5 +74,12 @@ namespace Business.ReplenishmentManagement
         /// <param name="companyId">工厂id</param>
         /// <returns></returns>
         List<WorkOrdMaster> CalcPriority(List<string> workOrdMasters, string domain);
+
+        /// <summary>
+        /// 调整工单优先级
+        /// </summary>
+        /// <param name="companyId">工厂id</param>
+        /// <returns></returns>
+        Task<string> ChangePriority(string weekplanid, string tenant_id, string factory_id, string company_id, string itemNumber, string qty, string instockdate, string priority);
     }
 }

File diff suppressed because it is too large
+ 853 - 272
MicroServices/Business/Business.Application/ReplenishmentManagement/ReplenishmentAppService.cs


+ 12 - 1
MicroServices/Business/Business.Application/ResourceExamineManagement/ProductionScheduleAppService.cs

@@ -416,6 +416,8 @@ namespace Business.ResourceExamineManagement
         /// <returns></returns>
         public List<ScheduleExceptionMaster> BeforeScheduleCheck(List<WorkOrdMaster> workOrds,List<WorkOrdRouting> workOrdRoutings, List<ProdLineDetail> prodLines,int type) 
         {
+            //记录操作时间
+            string optTime = DateTime.Now.ToString("yyyyMMddHHmmss");
             List<ScheduleExceptionMaster> exceptions = new List<ScheduleExceptionMaster>();
             ScheduleExceptionMaster entity;
             foreach (var item in workOrds)
@@ -433,6 +435,7 @@ namespace Business.ResourceExamineManagement
                         entity.CreateTime = DateTime.Now;
                         entity.Remark = "排产异常:工单没有维护工艺路线,请维护后再操作!";
                         entity.Type = type == 1 ? "自动排产" : "手动排产";
+                        entity.OptTime = optTime;
                         exceptions.Add(entity);
                     }
 
@@ -451,6 +454,7 @@ namespace Business.ResourceExamineManagement
                             entity.CreateTime = DateTime.Now;
                             entity.Remark = "排产异常:产线[" + item.ProdLine + "]没有维护工作日历且标准工作日历未维护完全,请维护后再操作!";
                             entity.Type = type == 1 ? "自动排产" : "手动排产";
+                            entity.OptTime = optTime;
                             exceptions.Add(entity);
                         }
                     }
@@ -463,6 +467,7 @@ namespace Business.ResourceExamineManagement
                         entity.CreateTime = DateTime.Now;
                         entity.Remark = "排产异常:产线[" + item.ProdLine + "]工作日历没有维护完整,请维护后再操作!";
                         entity.Type = type == 1 ? "自动排产" : "手动排产";
+                        entity.OptTime = optTime;
                         exceptions.Add(entity);
                     }
                     continue;
@@ -476,8 +481,9 @@ namespace Business.ResourceExamineManagement
                     entity.WorkOrd = item.WorkOrd;
                     entity.ItemNum = item.ItemNum;
                     entity.CreateTime = DateTime.Now;
-                    entity.Remark = "排产异常:工单的工艺路没有维护关键工序,请维护后再操作!";
+                    entity.Remark = "排产异常:工单的工艺路线没有维护关键工序,请维护后再操作!";
                     entity.Type = type == 1 ? "自动排产" : "手动排产";
+                    entity.OptTime = optTime;
                     exceptions.Add(entity);
                     continue;
                 }
@@ -492,6 +498,7 @@ namespace Business.ResourceExamineManagement
                     entity.CreateTime = DateTime.Now;
                     entity.Remark = "排产异常:工单的关键工序没有维护产线数据,请维护后再操作!";
                     entity.Type = type == 1 ? "自动排产" : "手动排产";
+                    entity.OptTime = optTime;
                     exceptions.Add(entity);
                     continue;
                 }
@@ -509,6 +516,7 @@ namespace Business.ResourceExamineManagement
                         entity.CreateTime = DateTime.Now;
                         entity.Remark = "排产异常:工单的关键工序["+ op + "]没有维护产线数据,请维护后再操作!";
                         entity.Type = type == 1 ? "自动排产" : "手动排产";
+                        entity.OptTime = optTime;
                         exceptions.Add(entity);
                     }
                     foreach (var line in curLines)
@@ -533,6 +541,7 @@ namespace Business.ResourceExamineManagement
                         entity.CreateTime = DateTime.Now;
                         entity.Remark = "排产异常:工单的多个关键工序[" + string.Join("、",curLines.Select(p=>p.Op).ToList()) + "]对应同一条产线,请调整后再操作!";
                         entity.Type = type == 1 ? "自动排产" : "手动排产";
+                        entity.OptTime = optTime;
                         exceptions.Add(entity);
                     }
                 }
@@ -555,6 +564,7 @@ namespace Business.ResourceExamineManagement
                             entity.CreateTime = DateTime.Now;
                             entity.Remark = "排产异常:产线["+rut.Line+ "]没有维护工作日历且标准工作日历未维护完全,请维护后再操作!";
                             entity.Type = type == 1 ? "自动排产" : "手动排产";
+                            entity.OptTime = optTime;
                             exceptions.Add(entity);
                         }
                     }
@@ -567,6 +577,7 @@ namespace Business.ResourceExamineManagement
                         entity.CreateTime = DateTime.Now;
                         entity.Remark = "排产异常:产线[" + rut.Line + "]工作日历没有维护完整,请维护后再操作!";
                         entity.Type = type == 1 ? "自动排产" : "手动排产";
+                        entity.OptTime = optTime;
                         exceptions.Add(entity);
                     }
                 }

+ 0 - 50
MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

@@ -3728,56 +3728,6 @@ namespace Business.ResourceExamineManagement
             return list;
         }
 
-        /// <summary>
-        /// 得到一个流水号的最大流水号
-        /// </summary>
-        /// <param name="id">流水号id</param>
-        /// <param name="formData">json数据,可以用json中的某个字段值作为通配符字替换流水号格式。</param>
-        /// <returns></returns>
-        public string GetMaxSerialNumber(long id, JObject? formData = null)
-        {
-            var modelList = _rf_serialnumber.Select(s => s.Id == id);
-            if (modelList == null || modelList.Count < 1)
-            {
-                return string.Empty;
-            }
-            var model = modelList[0];
-            int max = model.CurrentNumber + 1;
-            var date = DateTime.Now;
-            var lastDate = model.LastTime;
-            switch (model.NumberType)
-            {
-                case 1: //年流水
-                    if (date.Year > lastDate.Year)
-                    {
-                        max = 1;
-                    }
-                    break;
-                case 2: //月流水
-                    if (date.Year > lastDate.Year || date.Month > lastDate.Month)
-                    {
-                        max = 1;
-                    }
-                    break;
-                case 3: //日流水
-                    if (date.Year > lastDate.Year || date.Month > lastDate.Month || date.Day > lastDate.Day)
-                    {
-                        max = 1;
-                    }
-                    break;
-            }
-            string number = max.ToString().PadLeft(model.NumberSize, '0');
-            string serialNumber = string.IsNullOrWhiteSpace(model.Format) ? number
-                : model.Format.ContainsIgnoreCase("{number}")
-                ? model.Format.ReplaceIgnoreCase("{number}", number)
-                : model.Format + number;
-            //更新当前编号和最后时间
-            model.LastTime = date;
-            model.CurrentNumber = max;
-            _rf_serialnumber.Update(model);
-            return Wildcard.Replace(serialNumber, formData);
-        }
-
         /// <summary>
         /// 生成领料单
         /// </summary>

+ 1 - 2
MicroServices/Business/Business.Domain/StructuredDB/Base/BaseEntity.cs

@@ -54,7 +54,7 @@ namespace Business.Domain
         /// </summary>
         [StringLength(50)]
         [Comment("修改人名称")]
-        public virtual string update_by_name { get; set; }
+        public virtual string? update_by_name { get; set; }
 
         /// <summary>
         /// 修改时间
@@ -65,7 +65,6 @@ namespace Business.Domain
         /// <summary>
         /// 租户ID
         /// </summary>
-        [Required]
         [Comment("租户ID")]
         [DefaultValue(1000)]
         public virtual long? tenant_id { get; set; }

+ 6 - 0
MicroServices/Business/Business.Domain/StructuredDB/Production/ScheduleExceptionMaster.cs

@@ -56,5 +56,11 @@ namespace Business.StructuredDB.Production
         /// </summary>
         [Comment("异常类型")]
         public string Type { get; set; }
+
+        /// <summary>
+        /// 操作时间
+        /// </summary>
+        [Comment("操作时间")]
+        public string OptTime { get; set; }
     }
 }

+ 0 - 176
MicroServices/Business/Business.Domain/StructuredDB/Replenishment/ReplenishmentMonthPlan.cs

@@ -1,176 +0,0 @@
-using Business.Domain;
-using Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Business.StructuredDB.Replenishment
-{
-
-    /// <summary>
-    ///  月生产主计划    
-    /// </summary>
-    public class ReplenishmentMonthPlan : BaseEntity
-    {
-        /// <summary>
-        /// 市场    
-        /// </summary>
-        [StringLength(128)]
-        [Comment("市场")]
-        public string Area { get; set; }
-
-        /// <summary>
-        /// 产品线    
-        /// </summary>
-        [StringLength(128)]
-        [Comment("产品线")]
-        public string ProdLine { get; set; }
-
-        /// <summary>
-        /// 产品系列    
-        /// </summary>
-        [StringLength(128)]
-        [Comment("产品系列")]
-        public string ProdRange { get; set; }
-
-        /// <summary>
-        /// 车间线体(产线)    
-        /// </summary>
-        [StringLength(128)]
-        [Comment("车间线体(产线)    ")]
-        public string Line { get; set; }
-
-        /// <summary>
-        /// 物料编码   
-        /// </summary>
-        [StringLength(128)]
-        [Comment("物料编码")] 
-        public string ItemNumber { get; set; }
-
-        /// <summary>
-        /// 规格型号    
-        /// </summary>
-        [StringLength(128)]
-        [Comment("规格型号")] 
-        public string Model { get; set; }
-
-        /// <summary>
-        /// 生命周期    
-        /// </summary>
-        [StringLength(128)]
-        [Comment("产品线")]
-        public string LifeCycle { get; set; }
-
-        /// <summary>
-        /// 语种    
-        /// </summary>
-        [StringLength(128)]
-        [Comment("语种")]
-        public string Languages { get; set; }
-
-        /// <summary>
-        /// 计划年月    
-        /// </summary>
-        [StringLength(7)]
-        [Comment("计划年月")] 
-        public string PlanMonth { get; set; }
-
-        /// <summary>
-        /// 计划发货数量    
-        /// </summary>
-        [Precision(18, 5)]
-        [Comment("计划发货数量")] 
-        public decimal PlanShipQty { get; set; }
-
-        /// <summary>
-        /// 实际发货数量    
-        /// </summary>
-
-        [Precision(18, 5)]
-        [Comment("实际发货数量")] 
-        public decimal ActualShipQty { get; set; }
-
-
-        /// <summary>
-        /// 8001库存(灭菌完成检验合格转入的仓库)    
-        /// </summary>
-
-        [Precision(18, 5)]
-        [Comment("8001库存(灭菌完成检验合格转入的仓库)")] 
-        public decimal Inventory8001 { get; set; }
-
-
-        /// <summary>
-        /// 8000库存(委外灭菌仓)    
-        /// </summary>
-        [Precision(18, 5)]
-        [Comment("8000库存(委外灭菌仓)")] 
-        public decimal Inventory8000 { get; set; }
-
-        /// <summary>
-        /// 5008库存(成品线边仓)    
-        /// </summary>
-        [Precision(18, 5)]
-        [Comment("5008库存(成品线边仓)")] 
-        public decimal Inventory5008 { get; set; }
-
-        /// <summary>
-        /// 灭菌中数量    
-        /// </summary>
-        [Precision(18, scale: 5)]
-        [Comment("灭菌中数量")] 
-        public decimal DuringSterilizationQty { get; set; }
-
-        /// <summary>
-        /// 在制数量    
-        /// </summary>
-        [Precision(18, 5)]
-        [Comment("在制数量")] 
-        public decimal InProductionQty { get; set; }
-
-        /// <summary>
-        /// 计划生产数量    
-        /// </summary>
-        [Precision(18, 5)]
-        [Comment("计划生产数量")]
-        public decimal PlanProductQty { get; set; }
-
-        /// <summary>
-        /// 实际生产数量    
-        /// </summary>
-        [Precision(18, 5)]
-        [Comment("实际生产数量")]
-        public decimal ActualProductQty { get; set; }
-
-        
-        /// <summary>
-        /// 期初库存    
-        /// </summary>
-        [Precision(18, 5)]
-        [Comment("期初库存")] 
-        public decimal StartStockQty { get; set; }
-
-        /// <summary>
-        /// 期末库存    
-        /// </summary>
-        [Precision(18, 5)]
-        [Comment("期末库存")] 
-        public decimal EndStockQty { get; set; }
-
-        /// <summary>
-        /// 经济批量    
-        /// </summary>
-        [Precision(18, 5)]
-        [Comment("经济批量")] 
-        public decimal EconomicLotQty { get; set; }
-
-        /// <summary>
-        /// 排序编码    
-        /// </summary>
-        [Comment("排序编码")]
-        public int OrderNum { get; set; }
-    }
-}

+ 17 - 17
MicroServices/Business/Business.Domain/StructuredDB/Replenishment/ReplenishmentWeekPlan.cs

@@ -27,41 +27,41 @@ namespace Business.StructuredDB.Replenishment
         /// </summary>
         [StringLength(128)]
         [Comment("市场")]
-        public string Area { get; set; }
+        public string? Area { get; set; }
 
         /// <summary>
         /// 开工日期
         /// </summary>
         [Comment("开工日期")]
-        public DateTime PlanStartDate { get; set; }
+        public DateTime? PlanStartDate { get; set; }
 
         /// <summary>
         /// 开工日期星期
         /// </summary>
         [StringLength(128)]
         [Comment("开工日期星期")]
-        public string Week { get; set; }
+        public string? Week { get; set; }
 
         /// <summary>
         /// 订单号
         /// </summary>
         [StringLength(128)]
         [Comment("订单号")]
-        public string OrderNO { get; set; }
+        public string? OrderNO { get; set; }
 
         /// <summary>
         /// 生产指令
         /// </summary>
         [StringLength(128)]
         [Comment("生产指令")]
-        public string ProductionOrder { get; set; }
+        public string? ProductionOrder { get; set; }
 
         /// <summary>
         /// SAP工单号
         /// </summary>
         [StringLength(128)]
         [Comment("SAP工单号")]
-        public string SAPOrderNO { get; set; }
+        public string? SAPOrderNO { get; set; }
 
 
         /// <summary>
@@ -76,35 +76,35 @@ namespace Business.StructuredDB.Replenishment
         /// </summary>
         [StringLength(128)]
         [Comment("生产批次")]
-        public string ProductionBatch { get; set; }
+        public string? ProductionBatch { get; set; }
 
         /// <summary>
         /// 生产状态
         /// </summary>
         [StringLength(128)]
         [Comment("生产状态")]
-        public string ProductionStatus { get; set; }
+        public string? ProductionStatus { get; set; }
 
         /// <summary>
         /// 产品线    
         /// </summary>
         [StringLength(128)]
         [Comment("产品线")]
-        public string ProdLine { get; set; }
+        public string? ProdLine { get; set; }
 
         /// <summary>
         /// 产品系列    
         /// </summary>
         [StringLength(128)]
         [Comment("产品系列")]
-        public string ProdRange { get; set; }
+        public string? ProdRange { get; set; }
 
         /// <summary>
         /// 车间线体(产线)    
         /// </summary>
         [StringLength(128)]
         [Comment("车间线体(产线)")]
-        public string Line { get; set; }
+        public string? Line { get; set; }
 
         /// <summary>
         /// 物料编码   
@@ -118,14 +118,14 @@ namespace Business.StructuredDB.Replenishment
         /// </summary>
         [StringLength(128)]
         [Comment("规格型号")]
-        public string Model { get; set; }
+        public string? Model { get; set; }
 
         /// <summary>
         /// 语种    
         /// </summary>
         [StringLength(128)]
         [Comment("语种")]
-        public string Languages { get; set; }
+        public string? Languages { get; set; }
 
         /// <summary>
         /// 计划数量    
@@ -139,21 +139,21 @@ namespace Business.StructuredDB.Replenishment
         /// </summary>
         [StringLength(128)]
         [Comment("物料情况")]
-        public string ItemStatus { get; set; }
+        public string? ItemStatus { get; set; }
 
         /// <summary>
         /// 预计齐套时间    
         /// </summary>
         [Precision(18, 5)]
         [Comment("预计齐套时间")]
-        public DateTime PlanKittingDate { get; set; }
+        public DateTime? PlanKittingDate { get; set; }
 
         /// <summary>
         /// 灭菌开始日期    
         /// </summary>
         [Precision(18, 5)]
         [Comment("灭菌开始日期")]
-        public DateTime SterilizationDate { get; set; }
+        public DateTime? SterilizationDate { get; set; }
 
 
         /// <summary>
@@ -161,7 +161,7 @@ namespace Business.StructuredDB.Replenishment
         /// </summary>
         [Precision(18, 5)]
         [Comment("成品入库日期")]
-        public DateTime InStockDate { get; set; }
+        public DateTime? InStockDate { get; set; }
 
         /// <summary>
         /// 组装工时    

+ 0 - 44
MicroServices/Business/Business.Domain/StructuredDB/SaleFcst/SkuVersionSet.cs

@@ -1,44 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.ComponentModel.DataAnnotations;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Business.Domain
-{
-    /// <summary>
-    /// SKU版本号设置表
-    /// </summary>
-    [Comment("SKU版本号设置表")]
-    [Index(nameof(Model),nameof(Language),nameof(ItemNum),nameof(Version), nameof(tenant_id),nameof(company_id), nameof(factory_id), IsUnique = true)]
-    public class SkuVersionSet:BaseEntity
-    {
-        /// <summary>
-        /// 规格型号
-        /// </summary>
-        [Comment("规格型号")]
-        public string Model { get; set; }
-
-        /// <summary>
-        /// 语种
-        /// </summary>
-        [Comment("语种")]
-        public string Language { get; set; }
-
-        /// <summary>
-        /// 物料编码
-        /// </summary>
-        [Comment("物料编码")]
-        public string ItemNum { get; set; }
-
-        /// <summary>
-        /// 物料版本号
-        /// </summary>
-        [Comment("物料版本号")]
-        public string Version { get; set; }
-    }
-}

+ 2 - 4
MicroServices/Business/Business.EntityFrameworkCore/EntityFrameworkCore/DOP/BusinessDbContext.cs

@@ -245,10 +245,6 @@ namespace Business.EntityFrameworkCore
         /// </summary>
         public DbSet<PlatStockMonitorSetting> PlatStockMonitorSetting { get; set; }
 
-        /// <summary>
-        /// SKU경굶뵀郭빱깊
-        /// </summary>
-        public DbSet<SkuVersionSet> SkuVersionSet { get; set; }
 
         /// <summary>
         /// 셕뺍땐데깊
@@ -279,6 +275,8 @@ namespace Business.EntityFrameworkCore
 
         public DbSet<CustMaster> CustMaster { get; set; }
 
+        public DbSet<ReplenishmentWeekPlan> ReplenishmentWeekPlan { get; set; }
+
         #endregion
 
         //Code generation...

+ 42 - 29
MicroServices/Business/Business.HttpApi/Controllers/ReplenishmentController.cs

@@ -33,6 +33,29 @@ namespace Business.Controllers
             _ReplenishmentAppService = ReplenishmentAppService;
         }
 
+        /// <summary>
+        /// 刷新年度销售预测
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("demandanalysis")]
+        public Task<string> DemandAnalysis(InputDto input)
+        {
+            return _ReplenishmentAppService.DemandAnalysis(input);
+        }
+
+        /// <summary>
+        /// 年度生产大纲
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("SaveAnnualProductionOutline")]
+        public Task<string> SaveAnnualProductionOutline(InputDto input)
+        {
+            return _ReplenishmentAppService.SaveAnnualProductionOutline(input);
+        }
 
         /// <summary>
         /// 调整ROP和最高库存水位
@@ -59,17 +82,7 @@ namespace Business.Controllers
         }
 
 
-        /// <summary>
-        /// 刷新年度销售预测
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpGet]
-        [Route("demandanalysis")]
-        public Task<string> DemandAnalysis(InputDto input)
-        {
-            return _ReplenishmentAppService.DemandAnalysis(input);
-        }
+
 
 
         /// <summary>
@@ -85,51 +98,51 @@ namespace Business.Controllers
         }
 
         /// <summary>
-        /// 定时任务长周期物料
+        /// 调整工单优先级
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
         [HttpGet]
-        [Route("calclongperioditempr")]
-        public Task<string> CalcLongPeriodItemPR(InputDto input)
+        [Route("changepriority")]
+        public Task<string> ChangePriority(string weekplanid, string tenant_id, string factory_id,string company_id, string itemNumber, string qty,string instockdate,string priority)
         {
-            return _ReplenishmentAppService.CalcLongPeriodItemPR(input);
+            return _ReplenishmentAppService.ChangePriority( weekplanid,tenant_id,factory_id, company_id,itemNumber, qty,instockdate, priority);
         }
 
         /// <summary>
-        /// 定时任务每天补货
+        /// 发布周计划
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
         [HttpGet]
-        [Route("calcdayplan")]
-        public Task<string> CalcDayPlan(InputDto input)
+        [Route("publishweekplan")]
+        public Task<string> PublishWeekPlan(InputDto input)
         {
-            return _ReplenishmentAppService.CalcDayPlan(input);
+            return _ReplenishmentAppService.PublishWeekPlan(input);
         }
 
         /// <summary>
-        /// 生成整体需求计划
+        /// 定时任务长周期物料
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
         [HttpGet]
-        [Route("overalldemandplan")]
-        //public Task<string> OverallDemandPlan(InputDto input)
-        //{
-        //    return _ReplenishmentAppService.OverallDemandPlan(input);
-        //}
+        [Route("calclongperioditempr")]
+        public Task<string> CalcLongPeriodItemPR(InputDto input)
+        {
+            return _ReplenishmentAppService.CalcLongPeriodItemPR(input);
+        }
 
         /// <summary>
-        /// 年度生产大纲
+        /// 定时任务每天补货
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
         [HttpGet]
-        [Route("SaveAnnualProductionOutline")]
-        public Task<string> SaveAnnualProductionOutline(InputDto input)
+        [Route("calcdayplan")]
+        public Task<string> CalcDayPlan(InputDto input)
         {
-            return _ReplenishmentAppService.SaveAnnualProductionOutline(input);
+            return _ReplenishmentAppService.CalcDayPlan(input);
         }
     }
 }

+ 78 - 0
MicroServices/Business/QuartzSettings/logs/logs.txt

@@ -397,3 +397,81 @@
 {"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2023-09-13T15:27:08.7225361+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
 {"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2023-09-13T15:27:08.7278219+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
 {"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2023-09-13T15:27:08.7309267+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2023-09-14T01:25:19.0525516+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2023-09-14T01:25:19.1109461+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2023-09-14T01:25:19.1179102+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2023-09-14T01:25:19.1202417+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2023-09-14T01:31:34.1063958+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2023-09-14T01:31:34.1701203+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2023-09-14T01:31:34.1754017+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2023-09-14T01:31:34.1774495+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2023-09-14T01:39:57.6003154+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2023-09-14T01:39:57.6700284+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2023-09-14T01:39:57.6750937+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2023-09-14T01:39:57.6778476+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2023-09-14T01:46:18.990665+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2023-09-14T01:46:19.0598667+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2023-09-14T01:46:19.0654517+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2023-09-14T01:46:19.0675773+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2023-09-15T11:05:26.7374465+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2023-09-15T11:05:26.7787229+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2023-09-15T11:05:26.7816015+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2023-09-15T11:05:26.7832825+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2023-09-15T14:39:51.299579+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2023-09-15T14:39:51.3706874+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2023-09-15T14:39:51.3755506+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2023-09-15T14:39:51.3782243+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2023-09-15T15:28:33.2461134+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2023-09-15T15:28:33.3094727+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2023-09-15T15:28:33.3149802+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2023-09-15T15:28:33.3174761+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2023-09-15T15:32:00.1211543+08:00","EndDate":"2023-09-15T15:32:00.3818989+08:00","Msg":"同步完成","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2023-09-15T16:37:19.7196369+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2023-09-15T16:37:19.7894862+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2023-09-15T16:37:19.7941312+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2023-09-15T16:37:19.7967595+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2023-09-15T16:46:23.2608099+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2023-09-15T16:46:23.3261186+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2023-09-15T16:46:23.3317502+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2023-09-15T16:46:23.3342496+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2023-09-15T17:04:00.2666482+08:00","EndDate":"2023-09-15T17:05:40.8562435+08:00","Msg":"The request was canceled due to the configured HttpClient.Timeout of 100 seconds elapsing.","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2023-09-17T09:05:42.7275254+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2023-09-17T09:05:42.7966808+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2023-09-17T09:05:42.80349+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2023-09-17T09:05:42.8052754+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2023-09-17T09:28:22.1295453+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2023-09-17T09:28:22.2055693+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2023-09-17T09:28:22.2136041+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2023-09-17T09:28:22.2162052+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2023-09-17T10:34:37.0280692+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2023-09-17T10:34:37.0850684+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2023-09-17T10:34:37.0908385+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2023-09-17T10:34:37.0928723+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2023-09-17T11:30:24.2639566+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2023-09-17T11:30:24.3290017+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2023-09-17T11:30:24.33591+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2023-09-17T11:30:24.338466+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2023-09-17T12:08:56.3235168+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2023-09-17T12:08:56.4012041+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2023-09-17T12:08:56.4076831+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2023-09-17T12:08:56.4211045+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2023-09-17T13:50:59.8507642+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2023-09-17T13:50:59.9227283+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2023-09-17T13:50:59.9281049+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2023-09-17T13:50:59.9303887+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2023-09-17T13:53:48.4714988+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2023-09-17T13:53:48.5425855+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2023-09-17T13:53:48.5478919+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2023-09-17T13:53:48.5510056+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2023-09-18T01:37:41.5379799+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2023-09-18T01:37:41.6025067+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2023-09-18T01:37:41.6081817+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2023-09-18T01:37:41.6101546+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2023-09-18T01:52:00.52446+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2023-09-18T01:52:00.5945725+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2023-09-18T01:52:00.5995141+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2023-09-18T01:52:00.6019508+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2023-09-18T02:07:55.28627+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2023-09-18T02:07:55.3518218+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2023-09-18T02:07:55.3563462+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2023-09-18T02:07:55.3591345+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}

Some files were not shown because too many files changed in this diff