Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev

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);

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<String, Integer> 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());