CCSC首尾件和随机件bug修改

modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesCcscTaskService.java

@@ -13,7 +13,7 @@ import java.util.List;
  * @Modify:
  **/
 public interface IMesCcscTaskService extends IBaseMesService<MesCcscTask> {
-    MesCcscTask insert(MesWorkOrder mesWorkOrder,String orderNo,Integer frequency,Integer rule);
+    MesCcscTask insert(MesWorkOrder mesWorkOrder,String orderNo,Integer frequency,Integer rule,Integer qtyRule);
 
     void doCcscTaskByMesWorkOrder(String organizeCode,List<MesWorkOrder> mesWorkOrderList);
 }

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

@@ -47,11 +47,12 @@ public class MesCcscTaskServiceImpl extends BaseMesService<MesCcscTask> implemen
     }
 
     @Override
-    public MesCcscTask insert(MesWorkOrder mesWorkOrder, String orderNo, Integer frequency, Integer rule) {
+    public MesCcscTask insert(MesWorkOrder mesWorkOrder, String orderNo, Integer frequency, Integer rule, Integer qtyRule) {
         MesCcscTask mesCcscTask = new MesCcscTask(mesWorkOrder);
         mesCcscTask.setTaskNo(orderNo);
         mesCcscTask.setFrequency(frequency);
         mesCcscTask.setRule(rule);
+        mesCcscTask.setQty((double)qtyRule);
         ConvertBean.serviceModelInitialize(mesCcscTask, mesWorkOrder.getModifyUser());
 
         return baseRDao.insert(mesCcscTask);
@@ -83,6 +84,7 @@ public class MesCcscTaskServiceImpl extends BaseMesService<MesCcscTask> implemen
 
                 Integer frequency = ccscRule.getFrequency();
                 Integer rule = ccscRule.getRule();
+                Integer qtyRule = ccscRule.getQty();
                 LOGGER.info("-------- doCcscTaskByMesWorkOrder--83-{}",rule);
                 List<MesWorkOrder> mesWorkOrderToTask=new ArrayList<>();
                 //首件取第一个工单？还是全部工单都同步，取工单明细条码的首件条码？
@@ -101,6 +103,10 @@ public class MesCcscTaskServiceImpl extends BaseMesService<MesCcscTask> implemen
                             mesWorkOrderToTask.add(next);
                         }
                         break;
+                    case 4://随机
+                        int qty= mesWorkOrders.size()/qtyRule ;
+                        mesWorkOrderToTask.addAll(mesWorkOrders.stream().sorted(Comparator.comparing(MesWorkOrder::getStartTime)).collect(Collectors.toList()).subList(0,qty));
+                        break;
                     default:
                         break;
                 }
@@ -127,7 +133,7 @@ public class MesCcscTaskServiceImpl extends BaseMesService<MesCcscTask> implemen
                                     .build();
                         }
                         LOGGER.info("-------- doCcscTaskByMesWorkOrder--129-insert");
-                        insert(workOrder, orderNo, frequency, rule);
+                        insert(workOrder, orderNo, frequency, rule,qtyRule);
                     }
                 }
                 LOGGER.info("-------- doCcscTaskByMesWorkOrder--133-ccscRuleRDao.save");