From b72ff0caf3650df77ac3e6163647d776c3d0ef72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=AE=E7=AC=91=E7=9D=80=E9=9D=A2=E5=AF=B9=E6=98=8E?= =?UTF-8?q?=E5=A4=A9?= <752558143@qq.com> Date: Thu, 25 Jul 2024 11:24:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/ext/mes/pcn/apiservice/mqtt/PcnMqttCallback.java | 4 ++-- .../i3plus/ext/mes/pcn/apiservice/schedulejob/MesReportNoSortJob.java | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/mqtt/PcnMqttCallback.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/mqtt/PcnMqttCallback.java index cf17d76..4ea85d2 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/mqtt/PcnMqttCallback.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/mqtt/PcnMqttCallback.java @@ -25,7 +25,7 @@ import java.util.concurrent.TimeUnit; @Slf4j public class PcnMqttCallback implements MqttCallbackExtended { - private static ExecutorService executorService = new ThreadPoolExecutor(100, 100, + private static ExecutorService executorService = new ThreadPoolExecutor(1000, 1000, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>(10000), r -> { Thread thread = new Thread(r); @@ -33,7 +33,7 @@ public class PcnMqttCallback implements MqttCallbackExtended { return thread; },new ThreadPoolExecutor.DiscardPolicy()); - private static ExecutorService executorServiceTwo = new ThreadPoolExecutor(100, 100, + private static ExecutorService executorServiceTwo = new ThreadPoolExecutor(1000,1000, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>(10000), r -> { Thread thread = new Thread(r); diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/schedulejob/MesReportNoSortJob.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/schedulejob/MesReportNoSortJob.java index 8d145c4..5ed16e3 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/schedulejob/MesReportNoSortJob.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/schedulejob/MesReportNoSortJob.java @@ -101,7 +101,9 @@ public class MesReportNoSortJob extends BaseMesScheduleJob { } try { Map map = new HashMap<>(); - workOrderService.doProductHasOrderReportByRecord(unReportMesProduceSn.get(0), organizeCode, userName); + for (MesProductionRecord mesProductionRecord : unReportMesProduceSn) { + workOrderService.doProductHasOrderReportByRecord(mesProductionRecord, organizeCode, userName); + } } catch (ImppBusiException e) { LOGGER.error("条码:{}报工失败", unReportMesProduceSn.get(0).getProductSn(), e.getErrorDetail());