Browse Source

1.修复了出库申请选择物料可能没反应的bug

2.修复了某些用户出库页面异常的问题
master
liwenxuan 11 months ago
parent
commit
bca7069387
  1. 4
      src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java
  2. 4
      src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
  3. 0
      src/main/resources/templates/pages/application/application-out1.html

4
src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java

@ -482,11 +482,13 @@ public class MaterialController {
Map<String, Object> 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<PlaceP> placePList = new ArrayList<>();
List<Depository> depositoryByAdminorg = depositoryService.findDepositoryByAdminorg(userToken.getMaindeparment().toString());

4
src/main/java/com/dreamchaser/depository_manage/controller/PageController.java

@ -1032,7 +1032,7 @@ public class PageController {
}
List<BusinessType> 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");
}

0
src/main/resources/templates/pages/application/application-out.html → src/main/resources/templates/pages/application/application-out1.html

Loading…
Cancel
Save