排产相关-sjx

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java

@@ -128,7 +128,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                 mainProducerMap.put(item.getProcessId(), item.getMainProducer());
             });
             //计算cr值
-            //calculateCr(list);
+            calculateCr(list);
             //根据作业中心将订单分组，并根据优先级、cr值、订单需求数量、计划下达时间4个维度进行组内排序
             Map<Long, List<YieldOrderEntity>> map =
                     list.stream()
@@ -415,6 +415,10 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
 			}
 			//换算成天
 			total = total.divide(BigDecimal.valueOf(1440), 2, RoundingMode.HALF_UP);
+            if(total.compareTo(new BigDecimal(0)) == 0){
+                entity.setCrValue(new BigDecimal(0));
+                continue;
+            }
 			//获取交期剩余天数
 			BigDecimal restDays = new BigDecimal(TimeUnit.DAYS.convert(entity.getDemandDate().getTime() - DateUtil.now().getTime(), TimeUnit.MILLISECONDS));
 			//计算cr值剩余交期天数/生产所需额定时长
@@ -433,7 +437,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
      **/
 	@Transactional(rollbackFor = Exception.class)
     public void allocateResources(List<YieldOrderEntity> list,Map<String, PersonAbilityEntity> personAbilityMap,Map<Long, String> mainProducerMap,Map<String,List<WorkPlanEntity>> planMap) {
-
+        List<WorkOrderEntity> workOrderList = new ArrayList<>();
         for (YieldOrderEntity order : list) {
             //是否可以排产
             Boolean isSchecuding = true;
@@ -718,9 +722,13 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                 //更新订单状态为已排产
                 order.setStatus(4);
                 yieldOrderService.updateById(order);
+                workOrderList.add(workOrder);
             }
 
         }
+        if(CollectionUtils.isNotEmpty(workOrderList)){
+            this.sendWorkOrderToOldMes(workOrderList);
+        }
     }
 
     //获取下一个整数点
@@ -1091,4 +1099,5 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
 
         return StringToFix;
     }
+
 }