From 507d2a7ac24e79a1a4c1c606962d2f184a927f80 Mon Sep 17 00:00:00 2001 From: erdanergou Date: Mon, 30 Jan 2023 14:13:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=87=BA=E5=BA=93=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E5=AE=A1=E6=89=B9=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PageController.java | 16 +- .../entity/ApplicationOutRecordMin.java | 5 + .../pages/application/application-review.html | 174 +++++++++++------- .../application/form-step-look_back.html | 4 +- .../pages/application/application-review.html | 174 +++++++++++------- .../application/form-step-look_back.html | 4 +- 6 files changed, 230 insertions(+), 147 deletions(-) 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 9bd8a25d..35696a2b 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java @@ -1241,10 +1241,6 @@ public class PageController { // 获取所有子订单 List applicationOutRecordMinByParent = depositoryRecordService.findApplicationOutRecordMinByParent(recordP.getId()); - // 展示物料名 - StringBuilder mname = new StringBuilder(); - // 展示物料编码 - StringBuilder mcode = new StringBuilder(); // 展示出库的仓库名 StringBuilder depositoryName = new StringBuilder(); // 展示出库的库位编码 @@ -1265,10 +1261,13 @@ public class PageController { // 获取出库库位 Place placeById = placeService.findPlaceById(applicationOutRecordMin.getPlaceId()); if (placeById != null) { - placeCode.append(placeById.getCode()).append(","); + if ("0000".equals(placeById.getCode())) { + placeCode.append("默认库位").append(","); + } else { + placeCode.append(placeById.getCode()).append(","); + } } - mname.append(inventoryById.getMname()).append(","); - mcode.append(inventoryById.getCode()).append(","); + applicationOutRecordMin.setMname(inventoryById.getMname()); depositoryName.append(depository.getDname()).append(","); sumQuantity += applicationOutRecordMin.getQuantity(); @@ -1320,13 +1319,12 @@ public class PageController { recordP.setDepositoryManagerName(depositoryManagerNames.toString()); recordP.setApplicantName(userByPort.getName()); recordP.setDepartmentheadName(departmentHeadName.toString()); - recordP.setMcode(mcode.toString()); - recordP.setMname(mname.toString()); recordP.setDepositoryName(depositoryName.toString()); recordP.setQuantity(sumQuantity); recordP.setPrice(sumPrice); recordP.setUnit(sumUnit.toString()); mv.addObject("record", recordP); + mv.addObject("recordMinList", applicationOutRecordMinByParent); return mv; } diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecordMin.java b/src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecordMin.java index 4f62ef80..ffa20552 100644 --- a/src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecordMin.java +++ b/src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecordMin.java @@ -64,4 +64,9 @@ public class ApplicationOutRecordMin { */ private String unit; + /** + * 出库物料名称 + */ + private String mname; + } diff --git a/src/main/resources/templates/pages/application/application-review.html b/src/main/resources/templates/pages/application/application-review.html index 262a6738..b09b42b2 100644 --- a/src/main/resources/templates/pages/application/application-review.html +++ b/src/main/resources/templates/pages/application/application-review.html @@ -34,7 +34,10 @@ 物料名称 - 骁龙888芯片 + + + 仓库名称 @@ -67,9 +70,11 @@ 请求提交时间 - 1970-01-01 08:00:00 + 1970-01-01 08:00:00 + + 申请备注 申请备注 @@ -80,15 +85,21 @@ 审核意见 - 审核意见 + 审核意见 + 审核时间 - 1970-01-01 08:00:00 + + 1970-01-01 08:00:00 + 仓储负责人 - 仓储负责人 + + 仓储负责人 + @@ -100,7 +111,8 @@
- +
@@ -128,7 +140,8 @@
- +
@@ -152,7 +165,6 @@ - @@ -163,114 +175,140 @@ diff --git a/src/main/resources/templates/pages/application/form-step-look_back.html b/src/main/resources/templates/pages/application/form-step-look_back.html index 6aa2c791..e20ab07c 100644 --- a/src/main/resources/templates/pages/application/form-step-look_back.html +++ b/src/main/resources/templates/pages/application/form-step-look_back.html @@ -113,7 +113,9 @@ diff --git a/target/classes/templates/pages/application/form-step-look_back.html b/target/classes/templates/pages/application/form-step-look_back.html index 6aa2c791..e20ab07c 100644 --- a/target/classes/templates/pages/application/form-step-look_back.html +++ b/target/classes/templates/pages/application/form-step-look_back.html @@ -113,7 +113,9 @@