From ed436058f1ae782a0c18e28e134c6099f4e5e951 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 06 三月 2024 10:09:12 +0800
Subject: [PATCH] 提交返工界面

---
 north-glass-erp/src/main/java/com/example/erp/service/pp/ReworkService.java |   23 +++++++++++++++++------
 1 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReworkService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReworkService.java
index 8f22591..a4132da 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReworkService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReworkService.java
@@ -4,6 +4,7 @@
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.example.erp.entity.pp.BasicDataProduce;
+import com.example.erp.entity.pp.PatchLog;
 import com.example.erp.entity.pp.Rework;
 import com.example.erp.entity.sd.Delivery;
 import com.example.erp.entity.sd.OrderDetail;
@@ -79,8 +80,8 @@
 
     public Boolean saveRework(Map<String,Object> object) {
         boolean saveState = true;
-
-
+        Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
+        try {
             String userName = "";
             String userId = "";
             if (object.get("userName") != null) {
@@ -89,18 +90,28 @@
             if (object.get("userId") != null) {
                 userId = object.get("userId").toString();
             }
+            //鑾峰彇鍗曞彿
+            String oddNumber= orderNumberSetting("杩斿伐");
             //鑾峰彇瀵硅薄闆嗗悎寰幆杩涜鏂板淇敼
             List<Rework> reworklist = JSONArray.parseArray(JSONObject.toJSONString(object.get("rework")), Rework.class);
             if (!reworklist.isEmpty()){
                 for (Rework rework : reworklist) {
-                    //鑾峰彇鍗曞彿
-                    String oddNumber= orderNumberSetting("杩斿伐");
-                    //娣诲姞鍑哄叆搴撹褰�
+                    //娣诲姞杩斿伐璁板綍锛屼慨鏀规鐮存槑缁嗘暟閲�
                     reworkMapper.insertRework(rework,oddNumber);
-                    reworkMapper.updateReportingWorkDetail(rework);
+                    reworkMapper.updateDamageDetails(rework);
                 }
             }
 
+        } catch (Exception e) {
+            TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
+            //灏嗗紓甯镐紶鍏ユ暟鎹簱
+            SysError sysError = new SysError();
+            sysError.setError(e.toString());
+            sysError.setFunc("saveOrder");
+            sysErrorService.insert(sysError);
+            saveState = false;
+
+        }
 
         return saveState;
 

--
Gitblit v1.8.0