From bca70693877f417e23731305eac0e2700ebf5173 Mon Sep 17 00:00:00 2001 From: liwenxuan <1298531568@qq.com> Date: Tue, 7 Jan 2025 13:48:55 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E9=80=89=E6=8B=A9=E7=89=A9=E6=96=99=E5=8F=AF?= =?UTF-8?q?=E8=83=BD=E6=B2=A1=E5=8F=8D=E5=BA=94=E7=9A=84bug=202.=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E4=BA=86=E6=9F=90=E4=BA=9B=E7=94=A8=E6=88=B7=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E9=A1=B5=E9=9D=A2=E5=BC=82=E5=B8=B8=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../depository_manage/controller/MaterialController.java | 4 +++- .../depository_manage/controller/PageController.java | 4 ++-- .../{application-out.html => application-out1.html} | 0 3 files changed, 5 insertions(+), 3 deletions(-) rename src/main/resources/templates/pages/application/{application-out.html => application-out1.html} (100%) 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