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 c5d9336f..84e2eed8 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java @@ -1367,7 +1367,13 @@ public class DepositoryRecordController { String header = request.getHeader("user-agent"); String crypt = Md5.crypt(header); Long id = ObjectFormatUtil.toLong(map.get("id")); - return CrudUtil.deleteHandle(depositoryRecordService.refundedApplicationOutRecordMinById(id, userByPort, crypt, userKey, token), 1); + int integer = depositoryRecordService.refundedApplicationOutRecordMinById(id, userByPort, crypt, userKey, token); + if (integer == -1) { + return new RestResponse("",444,new StatusInfo("退回失败","该记录正在出库或已出库,无法退回!")); + } else { + + return CrudUtil.deleteHandle(integer, 1); + } } 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 ee0eeb31..08881e29 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 @@ -354,7 +354,12 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { } String minRedisKey = "minRecord:" + id; + RedisTemplate redisTemplateByDb = redisPool.getRedisTemplateByDb(15); + + // 删除redis中该子单记录 + redisTemplateByDb.delete(minRedisKey); + // 获取redis中存储的当前单的出库人 Object manager = redisTemplateByDb.opsForHash().get(minRedisKey, "manager"); if (manager != null) { @@ -366,14 +371,14 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { if (minRecord == null) { continue; } - String mindRecordString = minRecord.toString(); - mindRecordString = mindRecordString.replace(minRedisKey + ",", ""); - if (mindRecordString.length() == 2) { + String minRecordString = minRecord.toString(); + minRecordString = minRecordString.replace(minRedisKey + ",", ""); + if (minRecordString.length() == 2) { // [] // 如果当前用户已经没有剩余订单,则删除 redisTemplateByDb.delete(managerRedisKey); } else { - redisTemplateByDb.opsForHash().put(managerRedisKey, "minRecord", minRecord); + redisTemplateByDb.opsForHash().put(managerRedisKey, "minRecord", minRecordString); } } } @@ -389,7 +394,8 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 如果主单的子单数小于等于1个,则删除主单 Integer integer = depositoryRecordMapper.deleteApplicationOutRecordById(parentId); redisTemplateByDb.delete(mainRedisKey); - } else { + } + else { Object minRecord = redisTemplateByDb.opsForHash().get(mainRedisKey, "minRecord"); if (minRecord != null) { String minRecordList = minRecord.toString(); diff --git a/src/main/resources/templates/pages/depository/table-out.html b/src/main/resources/templates/pages/depository/table-out.html index 14e8ff21..5f2a6d29 100644 --- a/src/main/resources/templates/pages/depository/table-out.html +++ b/src/main/resources/templates/pages/depository/table-out.html @@ -122,7 +122,6 @@ let quantity = d.quantity; let colorString = ""; if (pass === 3) { - if (allApproval) { if(trueOutQuantity === quantity){ colorString = '#16b777a1'; @@ -616,7 +615,10 @@ success: function (data) { layer.close(this.layerIndex); if (data.status >= 300) { - layer.msg(data.statusInfo.message);//失败的表情 + layer.msg(data.statusInfo.detail,{ + icon:0, + time:1500 + })//失败的表情 } else { obj.del(); diff --git a/src/test/java/com/dreamchaser/depository_manage/QyWxCallBackTest.java b/src/test/java/com/dreamchaser/depository_manage/QyWxCallBackTest.java index 0185e391..2e32ba30 100644 --- a/src/test/java/com/dreamchaser/depository_manage/QyWxCallBackTest.java +++ b/src/test/java/com/dreamchaser/depository_manage/QyWxCallBackTest.java @@ -243,7 +243,7 @@ public class QyWxCallBackTest { ApprovalInfo approvalInfo = new ApprovalInfo(); approvalInfo.setTemplateId("3WKiKVCzyLv3Y1LaHZxp4DimQEpCdvYP52HsAUtF"); - approvalInfo.setSpNo("202307250014"); + approvalInfo.setSpNo("202307250018"); // 模拟第一个节点(部门负责人) @@ -253,7 +253,7 @@ public class QyWxCallBackTest { List approvalInfo_Details1 = new ArrayList<>(); ApprovalInfo_Details ad1 = new ApprovalInfo_Details(); ad1.setSpStatus("2"); - ad1.setSpTime("1690266027000"); + ad1.setSpTime("1690267027000"); ApprovalInfo_Details_Approver approver1 = new ApprovalInfo_Details_Approver(); approver1.setUserId("WoBenShanLiang_3"); ad1.setApprover(approver1);