日计划调整

MicroServices/Business/Business.Application/ResourceExamineManagement/ProductionScheduleAppService.cs

@@ -482,7 +482,7 @@ namespace Business.ResourceExamineManagement
             //更新当天日计划的计划数量，排产数量
             foreach (var item in periodSequenceDtls)
             {
-                item.UDeci5 = item.OrdQty.GetValueOrDefault();
+                item.UDeci5 = item.OrdQty;
                 //获取历史排产数据
                 var curDtl = dbPeriodSequences.FirstOrDefault(p =>p.OrdQty > 0 && p.Op == item.Op && p.WorkOrds == item.WorkOrds && p.Line == item.Line && p.PlanDate == item.PlanDate && p.PlanDate == scheTime.Date);
                 item.OrdQty = curDtl == null ? item.OrdQty : curDtl.OrdQty;
@@ -556,13 +556,7 @@ namespace Business.ResourceExamineManagement
                                     {
                                         delSequenceDets.Add(dtSeq);
                                     }
-                                    seqInfo = new PeriodSequenceDet();
-                                    seqInfo = opSeqs[0];
-                                    seqInfo.PlanDate = scheTime.Date;
-                                    seqInfo.OrdQty = opSeqs.Sum(p => p.OrdQty) + (dtSeq != null ? dtSeq.OrdQty : 0m);
-                                    seqInfo.CompQty = opSeqs.Sum(p=>p.CompQty) + (dtSeq != null ? dtSeq.CompQty : 0m);
-                                    upSequenceDets.Add(seqInfo);
-
+                                    
                                     //获取提前投产的日计划
                                     var opSchs = wlSchedules.Where(p => p.WorkOrd == gdh && p.Op == op && opSeqs.Select(m => m.PlanDate).Contains(p.WorkDate)).ToList();
                                     schInfo = opSchs[0];
@@ -578,6 +572,13 @@ namespace Business.ResourceExamineManagement
                                     {
                                         delScheduleResults.Add(dtSch);
                                     }
+
+                                    seqInfo = new PeriodSequenceDet();
+                                    seqInfo = opSeqs[0];
+                                    seqInfo.PlanDate = scheTime.Date;
+                                    seqInfo.OrdQty = opSeqs.Sum(p => p.OrdQty) + (dtSeq != null ? dtSeq.OrdQty : 0m);
+                                    seqInfo.CompQty = opSeqs.Sum(p => p.CompQty) + (dtSeq != null ? dtSeq.CompQty : 0m);
+                                    upSequenceDets.Add(seqInfo);
                                 }
                             }
                         }

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

@@ -55,7 +55,7 @@ namespace Business.Domain
         /// 订单数量
         /// </summary>
         [Comment("订单数量")]
-        public decimal? OrdQty { get; set; }
+        public decimal OrdQty { get; set; }
 
         /// <summary>
         /// 报工数量

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

@@ -61,7 +61,7 @@ namespace Business.Domain
         /// 计划数量
         /// </summary>
         [Comment("计划数量")]
-        public decimal? WorkQty { get; set; }
+        public decimal WorkQty { get; set; }
 
         /// <summary>
         /// 换型开始时间