From ac2e2b5af3726ee64dc37c3ebf26989a0346f22a Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 07 十一月 2026 19:16:05 +0800
Subject: [PATCH] feat(feedback): 优化报工审批流程并增加报工人校验
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/route/MesProRouteProductServiceImpl.java | 41 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 40 insertions(+), 1 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/route/MesProRouteProductServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/route/MesProRouteProductServiceImpl.java
index 77e3b0c..88d5774 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/route/MesProRouteProductServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/route/MesProRouteProductServiceImpl.java
@@ -2,6 +2,10 @@
import cn.hutool.core.util.ObjUtil;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.pro.route.MesProRouteMapper;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteDO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.route.vo.product.MesProRouteProductSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteProductDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
@@ -33,6 +37,8 @@
@Resource
private MesProRouteProductMapper routeProductMapper;
+ @Resource
+ private MesProRouteMapper routeMapper;
@Resource
@Lazy
@@ -46,6 +52,27 @@
private MesMdItemTypeService itemTypeService;
@Resource
private MesWmWarehouseAreaService warehouseAreaService;
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void setTemplateReference(Long id) {
+ MesProRouteProductDO initial = routeProductMapper.selectById(id);
+ validateRouteProductExists(initial);
+ MesProRouteDO route = routeMapper.selectOne(new LambdaQueryWrapperX<MesProRouteDO>()
+ .eq(MesProRouteDO::getId, initial.getRouteId()).last("FOR UPDATE"));
+ if (route == null) throw exception(PRO_ROUTE_NOT_EXISTS);
+ MesProRouteProductDO current = routeProductMapper.selectById(id);
+ validateRouteProductExists(current);
+ if (!java.util.Objects.equals(current.getRouteId(), route.getId())) throw exception(PRO_ROUTE_PRODUCT_NOT_EXISTS);
+ if (!isFinishedProduct(current.getItemId())) throw exception(PRO_ROUTE_TEMPLATE_REFERENCE_NOT_FINISHED);
+ routeProductMapper.update(null, new LambdaUpdateWrapper<MesProRouteProductDO>()
+ .eq(MesProRouteProductDO::getRouteId, route.getId())
+ .eq(MesProRouteProductDO::getTemplateReference, true)
+ .set(MesProRouteProductDO::getTemplateReference, false));
+ if (routeProductMapper.updateById(new MesProRouteProductDO().setId(id).setTemplateReference(true)) != 1) {
+ throw exception(PRO_ROUTE_PRODUCT_NOT_EXISTS);
+ }
+ }
@Override
public Long createRouteProduct(MesProRouteProductSaveReqVO createReqVO) {
@@ -109,10 +136,22 @@
}
}
+ private boolean isFinishedProduct(Long itemId) {
+ MesMdItemDO item = itemService.validateItemExists(itemId);
+ MesMdItemTypeDO type = itemTypeService.getItemType(item.getItemTypeId());
+ java.util.Set<Long> seen = new java.util.HashSet<>();
+ while (type != null && seen.add(type.getId())) {
+ if ("FG".equals(type.getCode())) return true;
+ if (type.getParentId() == null || MesMdItemTypeDO.PARENT_ID_ROOT.equals(type.getParentId())) break;
+ type = itemTypeService.getItemType(type.getParentId());
+ }
+ return false;
+ }
+
private void validateProductItem(Long itemId) {
MesMdItemDO item = itemService.validateItemExistsAndEnable(itemId);
MesMdItemTypeDO itemType = itemTypeService.getItemType(item.getItemTypeId());
- if (itemType == null || !MesMdItemTypeEnum.isProduct(itemType.getItemOrProduct())) {
+ if (itemType == null || !isFinishedProduct(itemId)) {
throw exception(PRO_ROUTE_PRODUCT_ITEM_TYPE_INVALID);
}
}
--
Gitblit v1.9.3