From 5ba6a7769020e9ea63db0ee0ac9e4a09ab841ae8 Mon Sep 17 00:00:00 2001
From: xhj <xhjzrq@163.com>
Date: Tue, 18 Mar 2025 11:51:21 +0800
Subject: [PATCH] bz

---
 .../controller/jcsj/DmBomController.java      |  6 ++-
 .../jcsj/impl/BomUploadServiceImpl.java       | 39 ++++++++++---------
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBomController.java b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBomController.java
index 6fa7590..747cf4c 100644
--- a/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBomController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBomController.java
@@ -26,6 +26,7 @@ import io.swagger.annotations.ApiOperation;
 import jdk.nashorn.internal.ir.ReturnNode;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -286,14 +287,17 @@ public class DmBomController {
 
     @ApiOperation(value = "重新生成")
     @PostMapping("/scbom")
+    @Transactional(rollbackFor = Exception.class)
     public ResultBean scbom (HttpServletRequest req) throws CustomException {
         List<DmBom> nolj = dmBomMapper.getNolj();
         for(DmBom bom :nolj){
             String czbh=bom.getDcch();
             String pl =bom.getPl();
             List<BomVO> dmBoms = bomUploadService.insertBom(req, czbh, pl, "01");
+            if(dmBoms.size()>0){
+                bomUploadService.saveBom(req, dmBoms, czbh, pl, 0);
+            }
 
-            bomUploadService.saveBom(req, dmBoms, czbh, pl, 0);
         }
         return new ResultBean();
     }
diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java
index 6a001eb..f5e6a37 100644
--- a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java
+++ b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java
@@ -1430,24 +1430,7 @@ public class BomUploadServiceImpl {
                 }
             }
         }
-        for (int i = 0; i < tltList.size(); ) {
-            if (i == adds.size()) {
-                BomVO bomVO = new BomVO();
-                bomVO.setTlt(tltList.get(i));
-                bomVO.setCs(3);
-                adds.add(bomVO);
-                i++;
-            } else {
-                for (BomVO v : adds) {
-                    v.setTlt(tltList.get(i));
-                    v.setCs(3);
-                    i++;
-                    if (i == tltList.size()) {
-                        break;
-                    }
-                }
-            }
-        }
+
         System.out.println(" = " + "tlt over");
 //        if (type.equals("01")) {
             List<DmWlqd> ljbList = wlqdService.getLJQDList(querMap);
@@ -1469,6 +1452,26 @@ public class BomUploadServiceImpl {
                     }
                 }
             }
+
+
+        for (int i = 0; i < tltList.size(); ) {
+            if (i == adds.size()) {
+                BomVO bomVO = new BomVO();
+                bomVO.setTlt(tltList.get(i));
+                bomVO.setCs(3);
+                adds.add(bomVO);
+                i++;
+            } else {
+                for (BomVO v : adds) {
+                    v.setTlt(tltList.get(i));
+                    v.setCs(3);
+                    i++;
+                    if (i == tltList.size()) {
+                        break;
+                    }
+                }
+            }
+        }
 //        }
 //        tltList.forEach(e->{
 //            if(StringUtils.isNotBlank(e.getWpggZ())){