From ca2442c4cf9df5653c6b12acca82cdf017c853c1 Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Tue, 10 May 2022 09:07:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=8B=E5=8A=A1=E6=B3=A8?=
 =?UTF-8?q?=E8=A7=A3=202022-05-10=20sxm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CRollinfoServiceImpl.java    |  3 +-
 .../service/impl/ScheduleServiceImpl.java     |  3 ++
 .../resources/static/pda/js/dump/dump_page.js | 31 +++++++++++++------
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/finishedProduct/service/impl/CRollinfoServiceImpl.java b/src/main/java/com/gaotao/modules/finishedProduct/service/impl/CRollinfoServiceImpl.java
index 21da3ba..4903cd7 100644
--- a/src/main/java/com/gaotao/modules/finishedProduct/service/impl/CRollinfoServiceImpl.java
+++ b/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();
         });
     }
diff --git a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
index 541535e..c813ee0 100644
--- a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
+++ b/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());
diff --git a/src/main/resources/static/pda/js/dump/dump_page.js b/src/main/resources/static/pda/js/dump/dump_page.js
index 17f876b..6a38412 100644
--- a/src/main/resources/static/pda/js/dump/dump_page.js
+++ b/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: ['确认', '取消']