非排序汇报job问题修复（报工数量成倍增加）

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/schedulejob/MesProductReportJob.java

@@ -42,6 +42,7 @@ public class MesProductReportJob extends BaseMesScheduleJob {
             for (WmsJobParamModel wmsJobParamModel : wmsJobParamModelList) {
                 //排序汇报
                 try {
+                    log.info("工厂{}排序报工job --- START --- ", wmsJobParamModel.getOrganizeCode());
                     long startTime = System.currentTimeMillis();
                     workOrderService.doMesWorkOrderSortReport(wmsJobParamModel.getOrganizeCode(), wmsJobParamModel.getPageSize(), MesPcnExtConstWords.JOB);
                     long endTime = System.currentTimeMillis();
@@ -51,6 +52,7 @@ public class MesProductReportJob extends BaseMesScheduleJob {
                 }
                 //非排序汇报
                 try {
+                    log.info("工厂{}非排序报工JOB --- START --- ", wmsJobParamModel.getOrganizeCode());
                     long startTime = System.currentTimeMillis();
                     workOrderService.doMesWorkOrderNoSortReport(wmsJobParamModel.getOrganizeCode(), wmsJobParamModel.getPageSize(), MesPcnExtConstWords.JOB);
                     long endTime = System.currentTimeMillis();

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java

@@ -541,9 +541,8 @@ public class MesWorkOrderService implements IMesWorkOrderService {
 
         Map<String, Object> propertyMap = new HashMap<>();
 
-        oldMesWorkOrder.setNum(oldMesWorkOrder.getNum() == null ? 1 : oldMesWorkOrder.getNum() + 1);
-        LOGGER.info("工单报工原数量【{}】", oldMesWorkOrder.getReportedQty());
-        oldMesWorkOrder.setReportedQty(MathOperation.add(oldMesWorkOrder.getNum(), oldMesWorkOrder.getReportedQty()));
+        LOGGER.info("工单【{}]】报工原数量【{}】", oldMesWorkOrder.getWorkOrderNo(), oldMesWorkOrder.getReportedQty());
+        oldMesWorkOrder.setReportedQty(MathOperation.add(MesPcnExtConstWords.ONE, oldMesWorkOrder.getReportedQty()));
         propertyMap.put("reportedQty", oldMesWorkOrder.getReportedQty());
         if (StringUtils.isEmpty(productionRecord.getWorkOrderNo())) {
             oldMesWorkOrder.setCompleteQty(oldMesWorkOrder.getReportedQty());
@@ -584,7 +583,7 @@ public class MesWorkOrderService implements IMesWorkOrderService {
             return;
         }
 
-        LOGGER.info("工单报工后数量【{}】", oldMesWorkOrder.getReportedQty());
+        LOGGER.info("工单【{}】报工后数量【{}】", oldMesWorkOrder.getWorkOrderNo(), oldMesWorkOrder.getReportedQty());
         ConvertBean.serviceModelUpdate(oldMesWorkOrder, userName);
         oldMesWorkOrder.setModifyDatetime((new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS")).format(new Date()));
         propertyMap.put(MesPcnExtConstWords.MODIFY_DATE_TIME, (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS")).format(new Date()));
@@ -592,7 +591,6 @@ public class MesWorkOrderService implements IMesWorkOrderService {
 
 
         //workOrderExtService.update(oldMesWorkOrder);
-        LOGGER.info("工单报工后数量【{}】", oldMesWorkOrder.getReportedQty());
 
         //查询工作中心
         DdlPackBean orderPackBean = DdlPackBean.getDdlPackBean(organizeCode);