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 params = new ArrayList<>(); params.add(inData.getSite()); @@ -3891,6 +3892,7 @@ public class ScheduleServiceImpl implements ScheduleService { } @Override + @Transactional public void saveSfdcDefect(SfdcDefectData inData) { List params = new ArrayList<>(); params.add(inData.getSite()); @@ -4418,6 +4420,7 @@ public class ScheduleServiceImpl implements ScheduleService { } @Override + @Transactional public void workbenchCreateslittingrollRepackAction(SearchScheduleData scheduleData) { List 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: ['确认', '取消']