日计划调整

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

@@ -436,7 +436,7 @@ namespace Business.ResourceExamineManagement
                         foreach (var gdh in sczWorkords)
                         {
                             //提前投产的日计划
-                            var tcSeqs = wlSequenceDets.Where(p => p.WorkOrds == gdh && p.Status.ToUpper() == "W").ToList();
+                            var tcSeqs = wlSequenceDets.Where(p => p.WorkOrds == gdh && (p.Status.ToUpper() == "W" || p.Status.ToUpper() == "S")).ToList();
                             //当前工单存在未来日期投产的日计划
                             if (tcSeqs.Any())
                             {
@@ -1318,8 +1318,8 @@ namespace Business.ResourceExamineManagement
                 planQty = Math.Floor(sumTimes / 60 * rate);
             }
             //剩余待排产数量=工单数量-已报工数量-预估数量
-            lineStart.QtyRemain = workOrd.QtyOrded - routing.QtyComplete - planQty;
-            lineStart.QtyRemain = lineStart.QtyRemain < 0 ? 0 : lineStart.QtyRemain;
+            decimal restQty = workOrd.QtyOrded - routing.QtyComplete - planQty;
+            lineStart.QtyRemain = restQty < 0 ? (workOrd.QtyOrded - routing.QtyComplete) : restQty;
             return lineStart;
         }
 
@@ -1743,8 +1743,8 @@ namespace Business.ResourceExamineManagement
                 planQty = Math.Floor(sumTimes / 60 * rate);
             }
             //剩余待排产数量=工单数量-已报工数量-预估数量
-            startDto.QtyRemain = workOrd.QtyOrded - routing.QtyComplete - planQty;
-            startDto.QtyRemain = startDto.QtyRemain < 0 ? 0 : startDto.QtyRemain;
+            decimal restQty = workOrd.QtyOrded - routing.QtyComplete - planQty;
+            startDto.QtyRemain = restQty < 0 ? (workOrd.QtyOrded - routing.QtyComplete) : restQty;
             return startDto;
         }