diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java index ee38792d..bb41746f 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java @@ -951,13 +951,13 @@ public class PageController { List depositoryAndRole = roleService.findDepositoryAndRole(userToken.getId()); List depositoryIdList = new ArrayList<>(); - for (Depository depository:depositoryByAdminorg - ) { + for (Depository depository : depositoryByAdminorg + ) { depositoryIdList.add(depository.getId()); } - for (RoleAndDepository rad:depositoryAndRole - ) { - if(!depositoryIdList.contains(rad.getDepositoryId())){ + for (RoleAndDepository rad : depositoryAndRole + ) { + if (!depositoryIdList.contains(rad.getDepositoryId())) { depositoryIdList.add(rad.getDepositoryId()); } } @@ -1001,19 +1001,19 @@ public class PageController { List depositoryAndRole = roleService.findDepositoryAndRole(userToken.getId()); List depositoryIdList = new ArrayList<>(); - for (Depository depository:depositoryByAdminorg + for (Depository depository : depositoryByAdminorg ) { depositoryIdList.add(depository.getId()); } - for (RoleAndDepository rad:depositoryAndRole + for (RoleAndDepository rad : depositoryAndRole ) { - if(!depositoryIdList.contains(rad.getDepositoryId())){ + if (!depositoryIdList.contains(rad.getDepositoryId())) { depositoryIdList.add(rad.getDepositoryId()); } } // 获取已经出库的记录数据 - Map mapForOut = depositoryRecordService.CalculateAllApplicationOutCount("已出库",depositoryIdList); + Map mapForOut = depositoryRecordService.CalculateAllApplicationOutCount("已出库", depositoryIdList); // 转出物料数量 mv.addObject("OutCount", mapForOut.get("count")); // 获取数量比值 @@ -1024,7 +1024,7 @@ public class PageController { mv.addObject("outPriceRadio", mapForOut.get("radioForPrice")); // 获取要出库的记录数据 - Map mapForTrueOut = depositoryRecordService.CalculateAllApplicationOutCount("",depositoryIdList); + Map mapForTrueOut = depositoryRecordService.CalculateAllApplicationOutCount("", depositoryIdList); // 转出物料金额 mv.addObject("allOutCount", mapForTrueOut.get("count")); // 获取数量比值 @@ -1501,10 +1501,10 @@ public class PageController { price = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); recordMinP.setPrice(price); } - mv.addObject("display","none"); + mv.addObject("display", "none"); if (recordMinP.getTransferId() != null) { // 如果是转移订单 - mv.addObject("display","table-row"); + mv.addObject("display", "table-row"); // 获取订单详情 TransferRecord transferRecord = depositoryRecordService.findTransferRecordById(recordMin.getTransferId()); Place place = placeService.findPlaceById(transferRecord.getToPlaceId()); @@ -2469,8 +2469,10 @@ public class PageController { for (SplitInfo splitInfo : splitInfoByMid) { SplitInventory splitInventory = splitUnitService.findSplitInventoryByIidAndSid(placeAndMaterial.getId(), splitInfo.getId()); - splitInventory.setSplitInfo(splitInfo); - splitInventoryByIid.add(splitInventory); + if (splitInventory != null) { + splitInventory.setSplitInfo(splitInfo); + splitInventoryByIid.add(splitInventory); + } } mv.addObject("record", placeAndMaterial); mv.addObject("inventory", inventoryById); diff --git a/src/main/resources/templates/pages/depository/table-stock.html b/src/main/resources/templates/pages/depository/table-stock.html index c54827d7..9a0eeb18 100644 --- a/src/main/resources/templates/pages/depository/table-stock.html +++ b/src/main/resources/templates/pages/depository/table-stock.html @@ -318,7 +318,7 @@ } } else if (obj.event === 'dispose') { var index = layer.open({ - title: '入库申请', + title: '批量处理', type: 2, shade: 0.2, maxmin: true,