From 58157d9007c9a291b74f5f20554a280b3ed33946 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 17:42:28 +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

---
 .../serviceimpl/busi/MesWorkOrderService.java      | 24 ++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java
index 6e2d737..c93e76c 100644
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java
@@ -449,15 +449,27 @@ public class MesWorkOrderService implements IMesWorkOrderService {
         //新增初始化 todo
         // 根据
         //根据物料获取已发布的工单
-        List<MesWorkOrder> oldMesWorkOrderList = getMesWorkOrder(productionRecord, organizeCode);
-        if (CollectionUtils.isEmpty(oldMesWorkOrderList)) {
-            updateProductionRecord(organizeCode, userName, productionRecord.getProductSn());
-            return;
-        }
+        try {
+            List<MesWorkOrder> oldMesWorkOrderList = getMesWorkOrder(productionRecord, organizeCode);
+            if (CollectionUtils.isEmpty(oldMesWorkOrderList)) {
+                updateProductionRecord(organizeCode, userName, productionRecord.getProductSn());
+                return;
+            }
 
-        report(productionRecord, organizeCode, userName, oldMesWorkOrderList);
+            report(productionRecord, organizeCode, userName, oldMesWorkOrderList);
+        }
+        catch (Exception e) {
+            String msg = e.getMessage();
+            if (e instanceof  ImppBusiException) {
+                msg = ((ImppBusiException) e).getErrorMsg();
+            }
+            e.printStackTrace();
+            LOGGER.error("条码:{}报工失败", productionRecord.getProductSn(), e);
+            productionRecordService.updateProductionRecord(organizeCode, userName, productionRecord.getProductSn(), msg);
+        }
     }
     @Override
+    @Transactional(propagation= Propagation.REQUIRES_NEW,isolation= Isolation.READ_COMMITTED,readOnly = false,rollbackFor = Exception.class)
     public void doProductHasOrderReportByRecord(MesProductionRecord productionRecord, String organizeCode, String userName) {
         //新增初始化 todo
         // 根据