From 832849939f9b0654aff3fa2acf2d4967f15ceeb8 Mon Sep 17 00:00:00 2001 From: liweidong-hj Date: Mon, 15 Jun 2026 18:51:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=AE=A1=E6=89=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/common/constant/BizTypeConstant.java | 2 +- .../enums/MesApprovalRecordBizTypeEnum.java | 3 +- .../entity/DsBatchPreserveTaskEntity.java | 3 -- .../impl/BatchPreservePlanServiceImpl.java | 28 ++++++++++++++++-- .../impl/BatchPreserveTaskServiceImpl.java | 29 +++++++++++++++++++ .../impl/DsBatchPreservePlanServiceImpl.java | 12 ++++++++ .../impl/DsBatchPreserveTaskServiceImpl.java | 16 +++++++++- 7 files changed, 84 insertions(+), 9 deletions(-) create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/common/service/impl/BatchPreserveTaskServiceImpl.java diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/common/constant/BizTypeConstant.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/common/constant/BizTypeConstant.java index 4ca6ebe2a..a18f98983 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/common/constant/BizTypeConstant.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/common/constant/BizTypeConstant.java @@ -19,5 +19,5 @@ public interface BizTypeConstant { String SET_SUITE_FLOW = "齐套流转"; - String INVENTORY_WRITE_OFF = "库存报废"; + String INVENTORY_WRITE_OFF = "磨具变更-库存报废"; } 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 e8c50ed24..87a230bb2 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 @@ -16,10 +16,11 @@ public enum MesApprovalRecordBizTypeEnum { TOOL_PLAN_APPLY_AUDIT("工装计划申报审批"), TEAM_GROUP_PROCESS_AUDIT("班组提请工艺审批"), WMS_SCRAP_AUDIT("仓库报废审批"), - BATCH_PLANNING_CATEGORY("槽液计划类/审核"), LIQUID_TANK_TASK("槽液加药量审核"), RAISE_HAND("举手免责审核"), PRO_RE_TEMPLATE("过程记录模板审核"), + BATCH_PLANNING_CATEGORY("槽液计划类/审核"), + BATCH_PLANNING_TASK("槽液任务/审核"), ; private final String desc; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsBatchPreserveTaskEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsBatchPreserveTaskEntity.java index 27c7f1280..b54875153 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsBatchPreserveTaskEntity.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsBatchPreserveTaskEntity.java @@ -103,10 +103,7 @@ public class DsBatchPreserveTaskEntity extends BaseEntity { private String auditDescribe; /** * 审核状态 - * 维护状态 和 审核状态 用taskStatus - * auditStatus 作废 */ - @Deprecated @Schema(description = "审核状态") private Long auditStatus; /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/common/service/impl/BatchPreservePlanServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/common/service/impl/BatchPreservePlanServiceImpl.java index 0c6bde399..442318ebb 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/common/service/impl/BatchPreservePlanServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/common/service/impl/BatchPreservePlanServiceImpl.java @@ -3,27 +3,49 @@ 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.system.feign.IUserClient; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; /** * 槽液计划类审核待办策略实现类 */ @Service -public class BatchPreservePlanServiceImpl implements ApprovalRecordDetailStrategy { +public class BatchPreservePlanServiceImpl implements ApprovalRecordDetailStrategy { @Resource private IDsBatchPreservePlanService batchPreservePlanService; + @Autowired + IBsWorkCenterService workCenterService; + + @Autowired + IUserClient userClient; + @Override public String getBizType() { return MesApprovalRecordBizTypeEnum.BATCH_PLANNING_CATEGORY.getDesc(); } @Override - public DsBatchPreservePlanEntity getDetail(Long bizId) { + public DsBatchPreservePlanVO getDetail(Long bizId) { DsBatchPreservePlanEntity detail = batchPreservePlanService.getById(bizId); - return detail; + DsBatchPreservePlanVO vo = new DsBatchPreservePlanVO(); + BeanUtils.copyProperties(detail, vo); + if(null != vo.getWcId()){ + BsWorkCenterEntity workCenterEntity = workCenterService.getById(vo.getWcId()); + vo.setWcName(workCenterEntity.getWcName()); + } + if(null != vo.getKeepMan()){ + String name = userClient.userInfo(vo.getKeepMan()).getData().getUser().getName(); + vo.setKeepManStr(name); + } + return vo; } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/common/service/impl/BatchPreserveTaskServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/common/service/impl/BatchPreserveTaskServiceImpl.java new file mode 100644 index 000000000..b6c745746 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/common/service/impl/BatchPreserveTaskServiceImpl.java @@ -0,0 +1,29 @@ +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.DsBatchPreserveTaskEntity; +import org.springblade.desk.dashboard.service.IDsBatchPreserveTaskService; +import org.springframework.stereotype.Service; + +/** + * 槽液任务审核待办策略实现类 + */ +@Service +public class BatchPreserveTaskServiceImpl implements ApprovalRecordDetailStrategy { + + @Resource + private IDsBatchPreserveTaskService dsBatchPreserveTaskService; + + @Override + public String getBizType() { + return MesApprovalRecordBizTypeEnum.BATCH_PLANNING_TASK.getDesc(); + } + + @Override + public DsBatchPreserveTaskEntity getDetail(Long bizId) { + DsBatchPreserveTaskEntity batchPreserveTaskEntity = dsBatchPreserveTaskService.getById(bizId); + return batchPreserveTaskEntity; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsBatchPreservePlanServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsBatchPreservePlanServiceImpl.java index 3d9909470..367c8cb5b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsBatchPreservePlanServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsBatchPreservePlanServiceImpl.java @@ -195,6 +195,10 @@ public class DsBatchPreservePlanServiceImpl extends BaseServiceImpl selectDsBatchPreserveTaskPage(IPage page, DsBatchPreserveTaskVO dsBatchPreserveTask) { List taskStatusList = new ArrayList<>(Arrays.asList( @@ -135,12 +140,21 @@ public class DsBatchPreserveTaskServiceImpl extends BaseServiceImpl