bz

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,15 +287,18 @@ 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);
             }
+
+        }
         return new ResultBean();
     }
 

src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java

@@ -1430,40 +1430,43 @@ public class BomUploadServiceImpl {
                 }
             }
         }
-        for (int i = 0; i < tltList.size(); ) {
+
+        System.out.println(" = " + "tlt over");
+//        if (type.equals("01")) {
+            List<DmWlqd> ljbList = wlqdService.getLJQDList(querMap);
+            for (int i = 0; i < ljbList.size(); ) {
                 if (i == adds.size()) {
                     BomVO bomVO = new BomVO();
-                bomVO.setTlt(tltList.get(i));
-                bomVO.setCs(3);
+                    bomVO.setLjb(ljbList.get(i));
+                    bomVO.setCs(2);
                     adds.add(bomVO);
                     i++;
                 } else {
                     for (BomVO v : adds) {
-                    v.setTlt(tltList.get(i));
-                    v.setCs(3);
+                        v.setLjb(ljbList.get(i));
+                        v.setCs(2);
                         i++;
-                    if (i == tltList.size()) {
+                        if (i == ljbList.size()) {
                             break;
                         }
                     }
                 }
             }
-        System.out.println(" = " + "tlt over");
-//        if (type.equals("01")) {
-            List<DmWlqd> ljbList = wlqdService.getLJQDList(querMap);
-            for (int i = 0; i < ljbList.size(); ) {
+
+
+        for (int i = 0; i < tltList.size(); ) {
             if (i == adds.size()) {
                 BomVO bomVO = new BomVO();
-                    bomVO.setLjb(ljbList.get(i));
-                    bomVO.setCs(2);
+                bomVO.setTlt(tltList.get(i));
+                bomVO.setCs(3);
                 adds.add(bomVO);
                 i++;
             } else {
                 for (BomVO v : adds) {
-                        v.setLjb(ljbList.get(i));
-                        v.setCs(2);
+                    v.setTlt(tltList.get(i));
+                    v.setCs(3);
                     i++;
-                        if (i == ljbList.size()) {
+                    if (i == tltList.size()) {
                         break;
                     }
                 }