添加事务注解 2022-05-10 sxm

src/main/java/com/gaotao/modules/finishedProduct/service/impl/CRollinfoServiceImpl.java

@@ -512,7 +512,8 @@ public class CRollinfoServiceImpl extends ServiceImpl<CRollinfoDao, CRollinfoEnt
             lambdaUpdate().set(CRollinfoEntity::getStatus, rollInfo.getStatus())
                     .set(CRollinfoEntity::getStatusDb, rollInfo.getStatusDb())
                     .set(StringUtils.isNotEmpty(rollInfo.getSynchronizedflag()), CRollinfoEntity::getSynchronizedflag, rollInfo.getSynchronizedflag())
-                    .eq(StringUtils.isNotEmpty(rollInfo.getSite()), CRollinfoEntity::getSite, rollInfo.getSite()).eq(CRollinfoEntity::getRollno, rollInfo.getRollno())
+                    .eq(StringUtils.isNotEmpty(rollInfo.getSite()), CRollinfoEntity::getSite, rollInfo.getSite())
+                    .eq(CRollinfoEntity::getRollno, rollInfo.getRollno())
                     .update();
         });
     }

src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -3869,6 +3869,7 @@ public class ScheduleServiceImpl implements ScheduleService {
 
 
     @Override
+    @Transactional
     public void otherCreateSplitSfdcRoll(SearchScheduleData inData) {
         List<Object> params = new ArrayList<>();
         params.add(inData.getSite());
@@ -3891,6 +3892,7 @@ public class ScheduleServiceImpl implements ScheduleService {
     }
 
     @Override
+    @Transactional
     public void saveSfdcDefect(SfdcDefectData inData) {
         List<Object> params = new ArrayList<>();
         params.add(inData.getSite());
@@ -4418,6 +4420,7 @@ public class ScheduleServiceImpl implements ScheduleService {
     }
 
     @Override
+    @Transactional
     public void workbenchCreateslittingrollRepackAction(SearchScheduleData scheduleData) {
         List<Object> params = new ArrayList<>();
         params.add(scheduleData.getSite());

src/main/resources/static/pda/js/dump/dump_page.js

@@ -158,19 +158,30 @@ function endCurrentScan() {
                 }, () => {
                     $("#iframe_for_print").attr("src", '/pda/print/dump');
 					setTimeout(`console.log("打印转储订单")`, 1000)
+                    layer.confirm(data.msg, {
+                        btn: ['确认', '取消']
+                        // 按钮
+                    }, function () {
+                        layer.closeAll('dialog');
+                        window.document.location.href = "/pda/publicMenu?titleName=''&menuId=0"
+                    }, function () {
+                        layer.closeAll('dialog');
+                        window.document.location.href = "/pda/publicMenu?titleName=''&menuId=0"
+                    });
                 }, () => {
+                    layer.confirm(data.msg, {
+                        btn: ['确认', '取消']
+                        // 按钮
+                    }, function () {
+                        layer.closeAll('dialog');
+                        window.document.location.href = "/pda/publicMenu?titleName=''&menuId=0"
+                    }, function () {
+                        layer.closeAll('dialog');
+                        window.document.location.href = "/pda/publicMenu?titleName=''&menuId=0"
+                    });
                 })
 
-                layer.confirm(data.msg, {
-                    btn: ['确认', '取消']
-                    // 按钮
-                }, function () {
-                    layer.closeAll('dialog');
-                    window.document.location.href = "/pda/publicMenu?titleName=''&menuId=0"
-                }, function () {
-                    layer.closeAll('dialog');
-                    window.document.location.href = "/pda/publicMenu?titleName=''&menuId=0"
-                });
+
             } else if (code == '1') {
                 layer.confirm(data.msg, {
                     btn: ['确认', '取消']