From 9b7f6f9406aef798ddb2f2d4df63245ed4554ceb Mon Sep 17 00:00:00 2001 From: liuqingkun Date: Tue, 10 Feb 2026 09:38:20 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/pojo/entity/PlateGoodsApply.java | 17 +++++++----- .../desk/order/pojo/vo/PlateGoodsApplyVo.java | 10 +++++++ .../controller/PlateGoodsApplyController.java | 9 +++---- .../PlateGoodsRecordController.java | 1 + .../order/mapper/PlateGoodsApplyMapper.xml | 7 +++-- .../impl/PlateGoodsApplyServiceImpl.java | 26 +++++++------------ .../order/wrapper/PlateGoodsApplyWrapper.java | 6 +++++ 7 files changed, 46 insertions(+), 30 deletions(-) diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/PlateGoodsApply.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/PlateGoodsApply.java index 4aa9b834..795646d8 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/PlateGoodsApply.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/PlateGoodsApply.java @@ -68,12 +68,6 @@ public class PlateGoodsApply extends BaseEntity { @TableField(value = "PGR_ID") private Long pgrId; - /** - * 涉及订单要添加的数量 - */ - @TableField(value = "CODE_NUM") - private String codeNum; - /** * 需求单号 */ @@ -164,10 +158,21 @@ public class PlateGoodsApply extends BaseEntity { @TableField(value = "INVOLVING_RECORD_CODE") private String involvingRecordCode; + /** + * 本次剩余单号余量 + */ + @TableField(value = "INVOLVING_SURPLUS") + private String involvingSurplus; + /** * 本次关联订单数量 */ @TableField(value = "DETAIL_ORDER_NUM") private Integer detailOrderNum; + /** + * 涉及订单要添加的数量 + */ + @TableField(value = "CODE_NUM") + private String codeNum; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/PlateGoodsApplyVo.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/PlateGoodsApplyVo.java index 3540ec75..d2d9d2ea 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/PlateGoodsApplyVo.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/PlateGoodsApplyVo.java @@ -39,5 +39,15 @@ public class PlateGoodsApplyVo extends PlateGoodsApply { */ String createUserName; + /** + * 审批人 + */ + String approvalManName; + + /** + * 审批结果 + */ + String approvalStatusName; + List yieldOrderList; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsApplyController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsApplyController.java index c896fa9a..bd4d97e2 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsApplyController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsApplyController.java @@ -20,7 +20,6 @@ import org.springblade.desk.order.pojo.entity.YieldOrder; import org.springblade.desk.order.pojo.request.PlateGoodsApplySave; import org.springblade.desk.order.pojo.vo.PlateGoodsApplyVo; import org.springblade.desk.order.service.IPlateGoodsApplyService; -import org.springblade.desk.order.service.IPlateGoodsRecordService; import org.springblade.desk.order.wrapper.PlateGoodsApplyWrapper; import org.springblade.desk.order.wrapper.YieldOrderWrapper; import org.springframework.web.bind.annotation.*; @@ -29,6 +28,7 @@ import java.util.List; /** * 应用管理控制器 - 镀层物料添加量申报 + * 参考旧mes：prPlateGoodsApply/queryApply * * @author lqk */ @@ -39,7 +39,6 @@ import java.util.List; public class PlateGoodsApplyController extends BladeController { private final IPlateGoodsApplyService plateGoodsApplyService; - private final IPlateGoodsRecordService plateGoodsRecordService; /** * 分页 @@ -61,12 +60,12 @@ public class PlateGoodsApplyController extends BladeController { @GetMapping("/detail") @Operation(summary = "详情", description = "") public R detail(String id) { - PlateGoodsApply detail = plateGoodsApplyService.getById(id); + PlateGoodsApply apply = plateGoodsApplyService.getById(id); - PlateGoodsApplyVo vo = PlateGoodsApplyWrapper.build().entityVO(detail); + PlateGoodsApplyVo vo = PlateGoodsApplyWrapper.build().entityVO(apply); // 查询关联订单列表 - List yieldOrderList = plateGoodsRecordService.listDetailYieldOrder(detail.getId()); + List yieldOrderList = plateGoodsApplyService.listDetailYieldOrder(apply.getId()); if(Func.isNotEmpty(yieldOrderList)) { vo.setYieldOrderList(YieldOrderWrapper.build().listVO(yieldOrderList)); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsRecordController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsRecordController.java index eebdb813..9b173278 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsRecordController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsRecordController.java @@ -30,6 +30,7 @@ import java.util.List; /** * 应用管理控制器 - 镀层物料需求申报 + * 参考旧mes：prPlateGoodsRecord/queryRecord * * @author lqk */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsApplyMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsApplyMapper.xml index 8505abc8..260d9b62 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsApplyMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsApplyMapper.xml @@ -4,8 +4,11 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - ID, TENANT_ID, CREATE_USER, CREATE_DEPT, CREATE_TIME, UPDATE_USER, UPDATE_TIME, STATUS, IS_DELETED, - APPROVAL_STATUS, BO_ID, BR_ID, AC_ID, PGR_ID, CODE_NUM, APPROVAL_MAN, APPROVAL_TIME, APPROVAL_MEMO, DEMAND_CODE + ID, TENANT_ID, CREATE_USER, CREATE_TIME, CREATE_DEPT, UPDATE_USER, UPDATE_TIME, STATUS, IS_DELETED, + APPROVAL_MAN, APPROVAL_TIME, APPROVAL_STATUS, APPROVAL_MEMO, BO_ID, BR_ID, AC_ID, PGR_ID, CODE_NUM, + WC_ID, GOODS_CODE, GOODS_DEMAND, SILVER_POTASSIUM, COEFFICIENT, DECLARED_QUOTA, DECLARED_SILVER, DECLARED_STATUS, + GOODS_BO_ID, COEFFICIENT_BO_ID, PGR_CODE, SURPLUS, SILVER_POTASSIUM_RESIDUE, DEMAND_CODE, INVOLVING_RECORD_CODE, + NOT_ADD_VAL, DETAIL_ORDER_NUM, GOODS_NAME