diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java b/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java index 64f6241..bf3e4ad 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java @@ -482,11 +482,13 @@ public class MaterialController { Map map = new HashMap<>(); Material materialById = materialService.findMaterialById(ObjectFormatUtil.toLong(mid)); - String mcode = materialById.getCode(); + String mcode ; Inventory inventoryById = null; if ("out".equals(type)) { inventoryById = materialService.findInventoryById(ObjectFormatUtil.toLong(mid)); mcode = inventoryById.getCode(); + }else{ + mcode = materialById.getCode(); } List placePList = new ArrayList<>(); List depositoryByAdminorg = depositoryService.findDepositoryByAdminorg(userToken.getMaindeparment().toString()); 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 738edeb..b41744d 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java @@ -1032,7 +1032,7 @@ public class PageController { } List businessTypeAll = businessTypeService.findBusinessTypeAll(); mv.addObject("btList", businessTypeAll); - mv.setViewName("pages/application/application-out"); + mv.setViewName("pages/application/application-out1"); Long maindeparment = userToken.getMaindeparment(); if (PublicConfig.roleAdminorgList.contains(maindeparment)) { mv.setViewName("pages/applicationForStorageCenter/application-out"); @@ -3512,7 +3512,7 @@ public class PageController { mv.setViewName("pages/applicationForStorageCenter/application-out_temporaryValue"); } } else { - mv.setViewName("pages/application/application-out"); + mv.setViewName("pages/application/application-out1"); if (PublicConfig.roleAdminorgList.contains(maindeparment)) { mv.setViewName("pages/applicationForStorageCenter/application-out"); } diff --git a/src/main/resources/templates/pages/application/application-out.html b/src/main/resources/templates/pages/application/application-out1.html similarity index 100% rename from src/main/resources/templates/pages/application/application-out.html rename to src/main/resources/templates/pages/application/application-out1.html