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 e28107ec..c6f82ef9 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java @@ -2100,7 +2100,6 @@ public class PageController { UserByPort userToken = (UserByPort) request.getAttribute("userToken"); String url = PortConfig.external_url + "/org/positionlist"; ModelAndView mv = new ModelAndView(); - mv.setViewName("pages/post/post-out"); mv.addObject("parentId", organization); if (organization != null) { Map map = new HashMap<>(); 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 95c20188..af4e8044 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 @@ -4053,7 +4053,10 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { new Thread(new Runnable() { @Override public void run() { - updateInventoryForErrorInRecord(record.getMid(), record.getQuantity(), record.getAirUnit(), record.getPlaceId(), record.getDepositoryId()); + if (Integer.compare(record.getAirapproverPass(), 4) == 0 || Integer.compare(record.getAirapproverPass(), 1) == 0) { + // 如果已经入库 + updateInventoryForErrorInRecord(record.getMid(), record.getQuantity(), record.getAirUnit(), record.getPlaceId(), record.getDepositoryId()); + } } }).start(); return depositoryRecordMapper.deleteApplicationInRecordById(id); @@ -4073,7 +4076,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { public void run() { for (ApplicationInRecordP record : applicationInRecordsByIds ) { - updateInventoryForErrorInRecord(record.getMid(), record.getQuantity(), record.getAirUnit(), record.getPlaceId(), record.getDepositoryId()); + if (Integer.compare(record.getAirapproverPass(), 4) == 0 || Integer.compare(record.getAirapproverPass(), 1) == 0) { + updateInventoryForErrorInRecord(record.getMid(), record.getQuantity(), record.getAirUnit(), record.getPlaceId(), record.getDepositoryId()); + } } } }).start(); diff --git a/src/main/resources/templates/pages/application/form-step-look.html b/src/main/resources/templates/pages/application/form-step-look.html index a53d7dae..5b651ea8 100644 --- a/src/main/resources/templates/pages/application/form-step-look.html +++ b/src/main/resources/templates/pages/application/form-step-look.html @@ -34,6 +34,10 @@ 物料名称 骁龙888芯片 + + 物料型号 + 骁龙888芯片 + 存货编码 外芯仓库 @@ -46,10 +50,6 @@ 数量 409 - - 金额 - 2016-11-28 - 仓库名称 外芯仓库 diff --git a/src/main/resources/templates/pages/application/form-step-look_in_review.html b/src/main/resources/templates/pages/application/form-step-look_in_review.html index b713b39f..d041f8bb 100644 --- a/src/main/resources/templates/pages/application/form-step-look_in_review.html +++ b/src/main/resources/templates/pages/application/form-step-look_in_review.html @@ -35,6 +35,10 @@ 物料名称 骁龙888芯片 + + 物料型号 + 骁龙888芯片 + 存货编码 外芯仓库 @@ -47,10 +51,6 @@ 数量 409 - - 金额 - 2016-11-28 - 仓库名称 外芯仓库 diff --git a/src/main/resources/templates/pages/post/post-out.html b/src/main/resources/templates/pages/post/post-out.html index 396fd6cd..7574cd95 100644 --- a/src/main/resources/templates/pages/post/post-out.html +++ b/src/main/resources/templates/pages/post/post-out.html @@ -57,7 +57,7 @@ 子类别 详情 设置权限 - 入库审核权 + 入库审核权 diff --git a/target/classes/templates/pages/application/form-step-look.html b/target/classes/templates/pages/application/form-step-look.html index a53d7dae..5b651ea8 100644 --- a/target/classes/templates/pages/application/form-step-look.html +++ b/target/classes/templates/pages/application/form-step-look.html @@ -34,6 +34,10 @@ 物料名称 骁龙888芯片 + + 物料型号 + 骁龙888芯片 + 存货编码 外芯仓库 @@ -46,10 +50,6 @@ 数量 409 - - 金额 - 2016-11-28 - 仓库名称 外芯仓库 diff --git a/target/classes/templates/pages/application/form-step-look_in_review.html b/target/classes/templates/pages/application/form-step-look_in_review.html index b713b39f..d041f8bb 100644 --- a/target/classes/templates/pages/application/form-step-look_in_review.html +++ b/target/classes/templates/pages/application/form-step-look_in_review.html @@ -35,6 +35,10 @@ 物料名称 骁龙888芯片 + + 物料型号 + 骁龙888芯片 + 存货编码 外芯仓库 @@ -47,10 +51,6 @@ 数量 409 - - 金额 - 2016-11-28 - 仓库名称 外芯仓库 diff --git a/target/classes/templates/pages/post/post-out.html b/target/classes/templates/pages/post/post-out.html index 396fd6cd..7574cd95 100644 --- a/target/classes/templates/pages/post/post-out.html +++ b/target/classes/templates/pages/post/post-out.html @@ -57,7 +57,7 @@ 子类别 详情 设置权限 - 入库审核权 + 入库审核权