From 8e122920ad2a8308523e4aff8e1732ab7ce42113 Mon Sep 17 00:00:00 2001 From: gsz Date: Mon, 27 May 2024 10:49:28 +0800 Subject: [PATCH] =?UTF-8?q?CCSC=E9=A6=96=E5=B0=BE=E4=BB=B6=E5=92=8C?= =?UTF-8?q?=E9=9A=8F=E6=9C=BA=E4=BB=B6bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/ext/mes/api/base/IMesCcscTaskService.java | 2 +- .../apiservice/serviceimpl/base/MesCcscTaskServiceImpl.java | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesCcscTaskService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesCcscTaskService.java index 1909043..a774c39 100644 --- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesCcscTaskService.java +++ b/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 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 mesWorkOrderList); } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCcscTaskServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCcscTaskServiceImpl.java index 55886f2..c4fab1e 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCcscTaskServiceImpl.java +++ b/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 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 implemen Integer frequency = ccscRule.getFrequency(); Integer rule = ccscRule.getRule(); + Integer qtyRule = ccscRule.getQty(); LOGGER.info("-------- doCcscTaskByMesWorkOrder--83-{}",rule); List mesWorkOrderToTask=new ArrayList<>(); //首件取第一个工单？还是全部工单都同步，取工单明细条码的首件条码？ @@ -101,6 +103,10 @@ public class MesCcscTaskServiceImpl extends BaseMesService 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 implemen .build(); } LOGGER.info("-------- doCcscTaskByMesWorkOrder--129-insert"); - insert(workOrder, orderNo, frequency, rule); + insert(workOrder, orderNo, frequency, rule,qtyRule); } } LOGGER.info("-------- doCcscTaskByMesWorkOrder--133-ccscRuleRDao.save");