From ccbbcd467e1a80a708620dfd7f320d9b25a2201a Mon Sep 17 00:00:00 2001 From: erdanergou Date: Thu, 23 Feb 2023 11:15:28 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E5=90=88=E5=85=A5=E5=BA=93=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DepositoryRecordServiceImpl.java | 43 ++++++++++--------- .../service/impl/GroupServiceImpl.java | 3 +- .../depository_manage/TestOther.java | 2 +- 3 files changed, 24 insertions(+), 24 deletions(-) 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 ec01645b..b5dc849d 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 @@ -2079,8 +2079,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { if ("2".equals(spStatus)) { map.put("approverPass", 1); map.put("state", "已入库"); - } - else { + } else { // 如果驳回 map.put("state", "驳回"); map.put("approverPass", 2); @@ -2094,14 +2093,14 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 获取具体入库订单 ApplicationInRecordP recordP = depositoryRecordMapper.findApplicationInRecordPById(id); - if(Integer.compare(recordP.getAirapproverPass(),1) == 0){ + if (Integer.compare(recordP.getAirapproverPass(), 1) == 0) { // 如果当前入库单已经被处理过，则跳过 continue; } // 获取当前入库对应的物料 Material materialById = materialMapper.findMaterialById(recordP.getMid()); - if(recordP.getAirtoGroupId() != null){ + if (recordP.getAirtoGroupId() != null) { // 如果该申请是组合入库下的申请 flagForGroupInfoInDepository = true; } @@ -2136,8 +2135,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { Place placeById = placeMapper.findPlaceById(recordP.getPlaceId()); // 修改当前库存容量 updateInventoryInfoForApproval(paramForUpdateInventory, recordP.getQuantity(), materialById, placeById); - } - else { + } else { // 如果是拆单单位 // 查询拆单记录 @@ -2188,15 +2186,20 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { } } } - if(!flagForGroupInfoInDepository) { + if (!flagForGroupInfoInDepository) { map.put("id", sid); depositoryRecordMapper.updateApplicationInRecord(map); - }else{ + } else { depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toInteger(sid.trim())); - String mainGidId = (String)redisTemplate.opsForHash().get(spNo, "mainGidId"); - String replace = mainGidId.replace("[", "").replace("]", ""); - map.put("id",replace); - depositoryRecordMapper.updateApplicationInRecord(map); + String mainGidId = (String) redisTemplate.opsForHash().get(spNo, "mainGidId"); + String[] replace = mainGidId.replace("[", "").replace("]", "").split(","); + for (String rid : replace + ) { + if (!"".equals(rid)) { + map.put("id", rid.trim()); + depositoryRecordMapper.updateApplicationInRecord(map); + } + } } } redisTemplate.delete(spNo); @@ -2593,11 +2596,11 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { Object id = map.get("id"); // 主订单编号 // 获取当前审批结果 Integer approverPass = ObjectFormatUtil.toInteger(map.get("approverPass")); - map.put("approverId",userToken.getId()); - map.put("approverTime",System.currentTimeMillis()); - if(Integer.compare(approverPass,1) == 0){ + map.put("approverId", userToken.getId()); + map.put("approverTime", System.currentTimeMillis()); + if (Integer.compare(approverPass, 1) == 0) { // 如果审核通过 - map.put("state","已入库"); + map.put("state", "已入库"); // 获取具体入库订单 @@ -2636,8 +2639,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { paramForUpdateInventory.put("producedDate", recordP.getMproducedDate()); Place placeById = placeMapper.findPlaceById(recordP.getPlaceId()); updateInventoryInfoForApproval(paramForUpdateInventory, recordP.getQuantity(), materialById, placeById); - } - else { + } else { // 如果是拆单单位 // 查询拆单记录 @@ -2687,9 +2689,8 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { } } } - } - else{ - map.put("state","驳回"); + } else { + map.put("state", "驳回"); } return depositoryRecordMapper.updateApplicationInRecord(map); } diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java index b4b70d43..2e84344f 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java @@ -1089,7 +1089,6 @@ public class GroupServiceImpl implements GroupService { */ @Override public Integer reviewIn(Map map, Integer userId, UserByPort userToken, String userAgent) { - Integer result = 0; Object id = map.get("id"); // 主订单编号 // 获取当前主订单 @@ -1108,7 +1107,7 @@ public class GroupServiceImpl implements GroupService { for (ApplicationInRecordP minRecordP : minInRecordList) { map.put("id", minRecordP.getId()); - result += depositoryRecordService.reviewIn(map, userId, userToken, userAgent); + depositoryRecordService.reviewIn(map, userId, userToken, userAgent); deleteIds.add(minRecordP.getId()); } map.put("id", id); diff --git a/src/test/java/com/dreamchaser/depository_manage/TestOther.java b/src/test/java/com/dreamchaser/depository_manage/TestOther.java index cffd088b..1abae9e5 100644 --- a/src/test/java/com/dreamchaser/depository_manage/TestOther.java +++ b/src/test/java/com/dreamchaser/depository_manage/TestOther.java @@ -44,7 +44,7 @@ public class TestOther { @Test public void Test() throws IOException { - String spNo = "202302230016"; + String spNo = "202302230023"; String mainId = (String) redisTemplate.opsForHash().get(spNo, "mainId"); ApprovalInfo_Details finalApprovalInfo_details = new ApprovalInfo_Details(); ApprovalInfo_Details_Approver approver = new ApprovalInfo_Details_Approver();