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 e38948a6..c6882fe6 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 @@ -1296,7 +1296,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { insertForSplitInventory.put("mid",inventory.getMid()); insertForSplitInventory.put("mcode",inventory.getCode()); insertForSplitInventory.put("price",inventory.getPrice() / scale); - insertForSplitInventory.put("quantity",splitInfo.getQuantity() - residue_realQuantity); + insertForSplitInventory.put("quantity",residue_realQuantity); insertForSplitInventory.put("unit",unit); insertForSplitInventory.put("depositoryId",applicationOutMinById.getDepositoryId()); insertForSplitInventory.put("placeId",placeAndMaterialByMidAndPid.getPid()); @@ -1677,9 +1677,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 获取所有子订单键值 String[] split = minRecordList.replace("[", "").replace("]", "").split(","); int pass = 1; // 设置主订单最终状态 - for (int i = 0; i < split.length; i++) { + for (String value : split) { // 获取所有子订单状态 - String state = (String) redisTemplate.opsForHash().get(split[i], "state"); + String state = (String) redisTemplate.opsForHash().get(value, "state"); if ("1".equals(state)) { // 如果有子订单未完成 pass = 3; // 设置主订单状态为处理中 @@ -1687,6 +1687,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { } } if (pass == 1) { // 如果最终状态为完成 + + redisTemplate.delete(redisMainRecordKey); + Map map = new HashMap<>(); map.put("pass", pass); map.put("id", record.getId()); @@ -2112,7 +2115,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { boolean flagForHasOtherDepository = true; for (ApplicationOutRecordMin min : minByParent ) { - Depository depositoryById = depositoryMapper.findDepositoryById(min.getId()); + Depository depositoryById = depositoryMapper.findDepositoryById(min.getDepositoryId()); if (Integer.compare(depositoryById.getParentId(), 0) != 0) { // 如果不是 List depositoryAll = depositoryMapper.findDepositoryAll(); @@ -2126,7 +2129,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { } - if (map.containsKey("departmentheadPass") && flagForHasOtherDepository) { + if (map.containsKey("departmentheadPass") && !flagForHasOtherDepository) { String result = ""; String simpleTime = DateUtil.getSimpleTime(new Date()); map.put("departmentheadTime", DateUtil.DateTimeToTimeStamp(simpleTime)); @@ -2219,6 +2222,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // map.put("mid", record.getMid()); // Material material = materialMapper.findMaterialById(record.getMid()); Integer depositoryManagerPass = (Integer) map.get("depositoryManagerPass"); + if(depositoryManagerPass == null){ + depositoryManagerPass = (Integer) map.get("departmentheadPass"); + } if (depositoryManagerPass == 1) { // 如果审核通过 result = "通过"; @@ -2303,7 +2309,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { }).start(); } - for (int i = 0; i < depositoryIdList.size(); i++) { + /*for (int i = 0; i < depositoryIdList.size(); i++) { Object o = minIdByDepository.get("depository" + depositoryIdList.get(i)); if (o != null) { List minIdList = (List) o; @@ -2330,7 +2336,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { } else { continue; } - } + }*/ // 开启流程通知其他人忽略审批流程 new Thread(new Runnable() { diff --git a/src/main/resources/templates/pages/application/application-review.html b/src/main/resources/templates/pages/application/application-review.html index b09b42b2..c958fc04 100644 --- a/src/main/resources/templates/pages/application/application-review.html +++ b/src/main/resources/templates/pages/application/application-review.html @@ -36,7 +36,7 @@ 物料名称 + style="margin: 1px;" onclick="selectThisMinRecord(this)">