From b53678158b2bf2c409962e822444e558f8ac08cd Mon Sep 17 00:00:00 2001 From: liweidong-hj Date: Tue, 16 Jun 2026 11:27:49 +0800 Subject: [PATCH] =?UTF-8?q?=E9=95=80=E5=B1=82=E7=89=A9=E6=96=99=E5=AE=A1?= =?UTF-8?q?=E6=89=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enums/MesApprovalRecordBizTypeEnum.java | 1 + .../impl/MesPlateGoodsRecordServiceImpl.java | 51 +++++++++++++++++++ .../impl/PlateGoodsRecordServiceImpl.java | 21 +++++++- 3 files changed, 71 insertions(+), 2 deletions(-) create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/common/service/impl/MesPlateGoodsRecordServiceImpl.java diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/common/enums/MesApprovalRecordBizTypeEnum.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/common/enums/MesApprovalRecordBizTypeEnum.java index 87a230bb2..4a47fd517 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/common/enums/MesApprovalRecordBizTypeEnum.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/common/enums/MesApprovalRecordBizTypeEnum.java @@ -21,6 +21,7 @@ public enum MesApprovalRecordBizTypeEnum { PRO_RE_TEMPLATE("过程记录模板审核"), BATCH_PLANNING_CATEGORY("槽液计划类/审核"), BATCH_PLANNING_TASK("槽液任务/审核"), + PLATE_GOODS_RECORD("镀层物料需求申报/审核"), ; private final String desc; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/common/service/impl/MesPlateGoodsRecordServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/common/service/impl/MesPlateGoodsRecordServiceImpl.java new file mode 100644 index 000000000..280d6e716 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/common/service/impl/MesPlateGoodsRecordServiceImpl.java @@ -0,0 +1,51 @@ +package org.springblade.desk.common.service.impl; + +import jakarta.annotation.Resource; +import org.springblade.desk.common.enums.MesApprovalRecordBizTypeEnum; +import org.springblade.desk.common.service.ApprovalRecordDetailStrategy; +import org.springblade.desk.dashboard.pojo.entity.BsWorkCenterEntity; +import org.springblade.desk.dashboard.pojo.entity.DsBatchPreservePlanEntity; +import org.springblade.desk.dashboard.pojo.vo.DsBatchPreservePlanVO; +import org.springblade.desk.dashboard.service.IBsWorkCenterService; +import org.springblade.desk.dashboard.service.IDsBatchPreservePlanService; +import org.springblade.desk.order.pojo.entity.PlateGoodsRecord; +import org.springblade.desk.order.pojo.entity.YieldOrder; +import org.springblade.desk.order.pojo.vo.PlateGoodsRecordVo; +import org.springblade.desk.order.service.IPlateGoodsRecordService; +import org.springblade.desk.order.wrapper.PlateGoodsRecordWrapper; +import org.springblade.desk.order.wrapper.YieldOrderWrapper; +import org.springblade.system.feign.IUserClient; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 物料需求申报审核待办策略实现类 + */ +@Service +public class MesPlateGoodsRecordServiceImpl implements ApprovalRecordDetailStrategy { + + @Autowired + IPlateGoodsRecordService goodsRecordService; + + + @Override + public String getBizType() { + return MesApprovalRecordBizTypeEnum.PLATE_GOODS_RECORD.getDesc(); + } + + @Override + public PlateGoodsRecordVo getDetail(Long bizId) { + PlateGoodsRecord detail = goodsRecordService.getById(bizId); + + PlateGoodsRecordVo vo = PlateGoodsRecordWrapper.build().entityVO(detail); + + // 查询关联订单列表 + List yieldOrderList = goodsRecordService.listDetailYieldOrder(detail.getId()); + vo.setYieldOrderList(YieldOrderWrapper.build().listVO(yieldOrderList)); + + return vo; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsRecordServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsRecordServiceImpl.java index 28b7335aa..938e1d697 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsRecordServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsRecordServiceImpl.java @@ -21,6 +21,8 @@ import org.springblade.desk.basic.service.ICoatingThicknessService; import org.springblade.desk.basic.service.ICraftAbilityService; import org.springblade.desk.basic.service.IMaterialQuotaService; import org.springblade.desk.basic.service.IQualityGradeService; +import org.springblade.desk.common.enums.MesApprovalRecordBizTypeEnum; +import org.springblade.desk.common.service.IMesApprovalRecordService; import org.springblade.desk.dashboard.pojo.entity.BsPlatingEntity; import org.springblade.desk.dashboard.pojo.entity.DsCraftEntity; import org.springblade.desk.dashboard.pojo.entity.DsPartEntity; @@ -46,6 +48,7 @@ import org.springblade.scheduling.pojo.entity.CraftAbilityEntity; import org.springblade.scheduling.pojo.entity.QualityGradeEntity; import org.springblade.system.cache.DictCache; import org.springblade.wms.feign.WmsTaskClient; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; @@ -53,6 +56,7 @@ import org.springframework.util.CollectionUtils; import java.math.BigDecimal; import java.math.RoundingMode; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; @@ -78,6 +82,9 @@ public class PlateGoodsRecordServiceImpl extends BaseServiceImpl selectPage(IPage page, PlateGoodsRecord entity) { List dataList = baseMapper.selectPage(page, entity); @@ -179,8 +186,10 @@ public class PlateGoodsRecordServiceImpl extends BaseServiceImpl