43890 工单加工记录报表-试制工单，汇报状态修改成"无需汇报"

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

@@ -441,10 +441,6 @@ public class MesWorkOrderService implements IMesWorkOrderService {
         try {
             LOGGER.info("此次报工的条码【{}】,工单【{}】", productionRecord.getProductSn(), productionRecord.getWorkOrderNo());
             List<MesWorkOrder> oldMesWorkOrders = getMesWorkOrders(productionRecord, organizeCode);
-            if (CollectionUtils.isEmpty(oldMesWorkOrders)) {
-                updateProductionRecord(organizeCode, userName, productionRecord.getId());
-                return;
-            }
             // 工单加工记录报表-试制工单，汇报状态修改成"无需汇报"
             if (Objects.equals(productionRecord.getReportStatus(), MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_30.getValue())) {
                 LOGGER.warn("报工条码:{}工单为试制单，更新成无需报工", productionRecord.getProductSn());
@@ -454,6 +450,10 @@ public class MesWorkOrderService implements IMesWorkOrderService {
                         new Object[]{userName, TimeTool.getNowTime(true), productionRecord.getReportStatus()}, ddlPackBean);
                 return;
             }
+            if (CollectionUtils.isEmpty(oldMesWorkOrders)) {
+                updateProductionRecord(organizeCode, userName, productionRecord.getId());
+                return;
+            }
             report(productionRecord, organizeCode, userName, oldMesWorkOrders);
         } catch (Exception e) {
             String msg = e.getMessage();