diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java index 2ac1085f..f22f3597 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java @@ -1006,16 +1006,16 @@ public class DepositoryRecordController { return new RestResponse(b, 0, 1); } else if (map.containsKey("ids")) { List ids = (List) map.get("ids"); - List resultIds = new ArrayList<>(); + List resultCodes = new ArrayList<>(); for (Integer id : ids ) { boolean b1 = depositoryRecordService.judgeApplicationOutRecordStatus(id); if (!b1) { - resultIds.add(id); + ApplicationOutRecordP recordPById = depositoryRecordService.findApplicationOutRecordPById(id); + resultCodes.add(recordPById.getCode()); } } - resultIds.add(2); - return new RestResponse(resultIds, 0, 2); + return new RestResponse(resultCodes, 0, 2); } else { throw new MyException("所需请求参数缺失！"); } diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java index a593d647..9821f896 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java @@ -274,7 +274,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { public Integer deleteApplicationOutRecordById(Integer id, UserByPort userByPort) { // 删除主单 Integer integer = depositoryRecordMapper.deleteApplicationOutRecordById(id); - + // 获取当前主单下的子单 List applicationOutRecordMinByParent = depositoryRecordMapper.findApplicationOutRecordMinByParent(id); // 开启一个线程去删除redis中的数据 @@ -283,15 +283,13 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { public void run() { // 获取该用户在redis中的订单记录 String key = "user:" + userByPort.getId().toString(); - // 获取当前用户所有订单 + // 获取当前用户所有处理单 String minRecord = (String) redisTemplate.opsForHash().get(key, "minRecord"); for (ApplicationOutRecordMin recordMin : applicationOutRecordMinByParent) { - Inventory inventoryById = materialMapper.findInventoryById(recordMin.getMid()); inventoryById.setNumberOfTemporary(inventoryById.getNumberOfTemporary() - recordMin.getQuantity()); materialMapper.updateInventory(inventoryById); - String redisMinRecordKey = "minRecord:" + recordMin.getId(); minRecord = minRecord.replace(redisMinRecordKey + ",", ""); if (minRecord.length() == 2) { @@ -2027,6 +2025,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { } else { // 获取所有子订单 List recordMinByParent = depositoryRecordMapper.findApplicationOutRecordMinByParent(id); + // 如果有一个子单开始出库就不允许删除 for (ApplicationOutRecordMin recordMin : recordMinByParent) { if (Integer.compare(recordMin.getTrueOut(), 0) != 0) { diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java index 52e89ae9..9dc8b5e1 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java @@ -1436,7 +1436,7 @@ public class QyWxOperationService { qywxDepartment qyWxDepartment = QyWxConfig.getQyWxDepartment(userAgent, portByQyWxInteger); // 获取部门负责人id列表 // List userIdList = new ArrayList<>(qyWxDepartment.getDepartment_leader()); - List userIdList = new ArrayList(Collections.singleton("PangFuZhen")); + List userIdList = new ArrayList<>(Collections.singleton("PangFuZhen")); approval_template_approver_departMentHeader.setUserid(userIdList); diff --git a/src/main/resources/templates/pages/depository/table-out.html b/src/main/resources/templates/pages/depository/table-out.html index 262d4664..7f019c34 100644 --- a/src/main/resources/templates/pages/depository/table-out.html +++ b/src/main/resources/templates/pages/depository/table-out.html @@ -19,10 +19,12 @@
-
- +
+ - - +
@@ -37,27 +39,30 @@
- +
- +
- +
- +
@@ -237,7 +242,8 @@ } if (data.startDate !== '') { req.startDate = data.startDate; - }if (data.endDate !== '') { + } + if (data.endDate !== '') { req.endDate = data.endDate; } if (data.mcode !== '') { @@ -300,57 +306,53 @@ success: function (res) { let status = res.status; let res_data = res.data; - if(status === 2){ - if(res_data.length === 0){ - layer.confirm("该操作会造成不可逆的后果，确定删除?",{ - icon:2, - title:"提示" - },function () { - $.ajax({ - url: '/depositoryRecord/deleteApplicationOutRecord', - type: 'post', - dataType: 'json', - contentType: "application/json;charset=utf-8", - data: JSON.stringify(req), - beforeSend: function () { - this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']}); - }, - success: function (data) { - layer.close(this.layerIndex); - if (data.status >= 300) { - layer.msg(data.statusInfo.message);//失败的表情 + if (status === 2 || status === "2") { + if (res_data.length === 0) { + layer.confirm("该操作会造成不可逆的后果，确定删除?", { + icon: 2, + title: "提示" + }, + function () { + $.ajax({ + url: '/depositoryRecord/deleteApplicationOutRecord', + type: 'post', + dataType: 'json', + contentType: "application/json;charset=utf-8", + data: JSON.stringify(req), + beforeSend: function () { + this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']}); + }, + success: function (data) { + layer.close(this.layerIndex); + if (data.status >= 300) { + layer.msg(data.statusInfo.message);//失败的表情 - } else { - layer.msg("删除成功", { - icon: 6,//成功的表情 - time: 500 //1秒关闭（如果不配置，默认是3秒） - }); - //执行搜索重载 - table.reload('currentTableId', { - url: '/depositoryRecord/applicationOutView', - page: { - curr: 1 - } - }, 'data'); - return false; + } else { + layer.msg("删除成功", { + icon: 6,//成功的表情 + time: 500 //1秒关闭（如果不配置，默认是3秒） + }); + //执行搜索重载 + table.reload('currentTableId', { + url: '/depositoryRecord/applicationOutView', + page: { + curr: 1 + } + }, 'data'); + return false; + } } - } + }) }) - }) - } - else { + } else { let msg = "申请编码为："; - $.each(res_data,function (index_num,item_num) { - $.each(data,function (index,item) { - if(item_num === item.id){ - msg += item.code+"，"; - } - }) + $.each(res_data, function (index_num, item_num) { + msg += item_num + "，"; }); msg += "的出库记录正在出库中，不允许删除"; - layer.msg(msg,{ - icon:2, - time:1500 + layer.msg(msg, { + icon: 2, + time: 1500 }) } } @@ -400,7 +402,7 @@ success: function (res) { let data = res.data; let status = res.status; - if (status === 1) { + if (status === 1 || status === "1") { if (data) { // 如果可以删除 layer.confirm('该操作将造成不可逆的后果，是否删除？', {icon: 2, title: '提示'}, function (index) { diff --git a/target/classes/templates/pages/depository/table-out.html b/target/classes/templates/pages/depository/table-out.html index 262d4664..7f019c34 100644 --- a/target/classes/templates/pages/depository/table-out.html +++ b/target/classes/templates/pages/depository/table-out.html @@ -19,10 +19,12 @@
-
- +
+ - - +
@@ -37,27 +39,30 @@
- +
- +
- +
- +
@@ -237,7 +242,8 @@ } if (data.startDate !== '') { req.startDate = data.startDate; - }if (data.endDate !== '') { + } + if (data.endDate !== '') { req.endDate = data.endDate; } if (data.mcode !== '') { @@ -300,57 +306,53 @@ success: function (res) { let status = res.status; let res_data = res.data; - if(status === 2){ - if(res_data.length === 0){ - layer.confirm("该操作会造成不可逆的后果，确定删除?",{ - icon:2, - title:"提示" - },function () { - $.ajax({ - url: '/depositoryRecord/deleteApplicationOutRecord', - type: 'post', - dataType: 'json', - contentType: "application/json;charset=utf-8", - data: JSON.stringify(req), - beforeSend: function () { - this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']}); - }, - success: function (data) { - layer.close(this.layerIndex); - if (data.status >= 300) { - layer.msg(data.statusInfo.message);//失败的表情 + if (status === 2 || status === "2") { + if (res_data.length === 0) { + layer.confirm("该操作会造成不可逆的后果，确定删除?", { + icon: 2, + title: "提示" + }, + function () { + $.ajax({ + url: '/depositoryRecord/deleteApplicationOutRecord', + type: 'post', + dataType: 'json', + contentType: "application/json;charset=utf-8", + data: JSON.stringify(req), + beforeSend: function () { + this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']}); + }, + success: function (data) { + layer.close(this.layerIndex); + if (data.status >= 300) { + layer.msg(data.statusInfo.message);//失败的表情 - } else { - layer.msg("删除成功", { - icon: 6,//成功的表情 - time: 500 //1秒关闭（如果不配置，默认是3秒） - }); - //执行搜索重载 - table.reload('currentTableId', { - url: '/depositoryRecord/applicationOutView', - page: { - curr: 1 - } - }, 'data'); - return false; + } else { + layer.msg("删除成功", { + icon: 6,//成功的表情 + time: 500 //1秒关闭（如果不配置，默认是3秒） + }); + //执行搜索重载 + table.reload('currentTableId', { + url: '/depositoryRecord/applicationOutView', + page: { + curr: 1 + } + }, 'data'); + return false; + } } - } + }) }) - }) - } - else { + } else { let msg = "申请编码为："; - $.each(res_data,function (index_num,item_num) { - $.each(data,function (index,item) { - if(item_num === item.id){ - msg += item.code+"，"; - } - }) + $.each(res_data, function (index_num, item_num) { + msg += item_num + "，"; }); msg += "的出库记录正在出库中，不允许删除"; - layer.msg(msg,{ - icon:2, - time:1500 + layer.msg(msg, { + icon: 2, + time: 1500 }) } } @@ -400,7 +402,7 @@ success: function (res) { let data = res.data; let status = res.status; - if (status === 1) { + if (status === 1 || status === "1") { if (data) { // 如果可以删除 layer.confirm('该操作将造成不可逆的后果，是否删除？', {icon: 2, title: '提示'}, function (index) { diff --git a/target/classes/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html b/target/classes/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html index e8f388d2..f3767d8a 100644 --- a/target/classes/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html +++ b/target/classes/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html @@ -60,7 +60,7 @@ }else{ wxScan = wxScan.parent.wx; } - /*wxScan.scanQRCode({ + wxScan.scanQRCode({ desc: 'scanQRCode desc', needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果， scanType: ["barCode", "qrCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有 @@ -79,11 +79,7 @@ } - });*/ - var result = "1614903417674964992";//当needResult为1时返回处理结果 - var req = {}; - req.qrCode = result; - outboundLogic(req); + }); }); @@ -116,15 +112,13 @@ }); } else { // 如果出库失败 - layer.msg(res.statusInfo.detail + ",请确认库存数量满足要求",{ + layer.msg(res.statusInfo.detail + ",请重试",{ icon:0, time:1000 - },function() { + },function () { var index = parent.layer.getFrameIndex(window.name); parent.layer.close(index); }); - - } }