ccsc汇总job 规则随机逻辑修改

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCcscTaskServiceImpl.java

@@ -109,8 +109,13 @@ public class MesCcscTaskServiceImpl extends BaseMesService<MesCcscTask> implemen
                         ccscRuleQty = 2;
                         break;
                     case 4://随机 todo 规则应该是每生产qtyRule件此产品，触发一次检测任务，任务中待检测的数量为1
-                        if(mesWorkOrders.size()/qtyRule>0){
+                        double sum = mesWorkOrders.stream().mapToDouble(MesWorkOrder::getQty).sum();
-                            mesWorkOrderToTask.add(mesWorkOrders.stream().sorted(Comparator.comparing(MesWorkOrder::getStartTime).reversed()).collect(Collectors.toList()).iterator().next());
+                        if (sum / qtyRule > 0) {
+                            if (sum / qtyRule > mesWorkOrders.size()) {
+                                mesWorkOrderToTask.addAll(mesWorkOrders.stream().sorted(Comparator.comparing(MesWorkOrder::getStartTime).reversed()).collect(Collectors.toList()));
+                            } else {
+                                mesWorkOrderToTask.addAll(mesWorkOrders.stream().sorted(Comparator.comparing(MesWorkOrder::getStartTime).reversed()).collect(Collectors.toList()).subList(0, (int) (sum / qtyRule)));
+                            }
                         }
                         break;
                     default: