From 9075785a9e14f6220783d052d231f915c6930b87 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期三, 04 十一月 2026 10:21:45 +0800
Subject: [PATCH] revert(collect): 撤销 collect 数采模块（新高设备管理已有自己的采集方式）
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/route/MesProRouteProductServiceImpl.java | 71 ++++++++++++++++++++++++++++++++++-
1 files changed, 69 insertions(+), 2 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 d5089de..731f644 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,9 +2,19 @@
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;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemTypeDO;
import cn.iocoder.yudao.module.mes.dal.mysql.pro.route.MesProRouteProductMapper;
+import cn.iocoder.yudao.module.mes.enums.md.MesMdItemTypeEnum;
+import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
+import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemTypeService;
+import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService;
import jakarta.annotation.Resource;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
@@ -27,6 +37,8 @@
@Resource
private MesProRouteProductMapper routeProductMapper;
+ @Resource
+ private MesProRouteMapper routeMapper;
@Resource
@Lazy
@@ -34,13 +46,44 @@
@Resource
@Lazy
private MesProRouteProductBomService routeProductBomService;
+ @Resource
+ private MesMdItemService itemService;
+ @Resource
+ 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) {
// 1.0 宸插惎鐢ㄧ殑宸ヨ壓璺嚎锛屼笉鍏佽鎿嶄綔
routeService.validateRouteNotEnable(createReqVO.getRouteId());
- // 1.1 鏍￠獙浜у搧鍞竴鎬э紙涓�涓骇鍝佸彧鑳藉叧鑱斾竴鏉″伐鑹鸿矾绾匡級
+ // 1.1 鏍￠獙浜у搧瀛樺湪銆佸惎鐢ㄤ笖绫诲瀷姝ｇ‘
+ validateProductItem(createReqVO.getItemId());
+ // 1.2 鏍￠獙浜у搧鍞竴鎬э紙涓�涓骇鍝佸彧鑳藉叧鑱斾竴鏉″伐鑹鸿矾绾匡級
validateItemUnique(null, createReqVO.getItemId());
+ warehouseAreaService.validateWarehouseAreaExists(createReqVO.getWarehouseId(),
+ createReqVO.getLocationId(), createReqVO.getAreaId());
// 2. 鎻掑叆
MesProRouteProductDO routeProduct = BeanUtils.toBean(createReqVO, MesProRouteProductDO.class);
@@ -54,8 +97,12 @@
routeService.validateRouteNotEnable(updateReqVO.getRouteId());
// 1.1 鏍￠獙瀛樺湪
validateRouteProductExists(updateReqVO.getId());
- // 1.2 鏍￠獙浜у搧鍞竴鎬�
+ // 1.2 鏍￠獙浜у搧瀛樺湪銆佸惎鐢ㄤ笖绫诲瀷姝ｇ‘
+ validateProductItem(updateReqVO.getItemId());
+ // 1.3 鏍￠獙浜у搧鍞竴鎬�
validateItemUnique(updateReqVO.getId(), updateReqVO.getItemId());
+ warehouseAreaService.validateWarehouseAreaExists(updateReqVO.getWarehouseId(),
+ updateReqVO.getLocationId(), updateReqVO.getAreaId());
// 2. 鏇存柊
MesProRouteProductDO updateObj = BeanUtils.toBean(updateReqVO, MesProRouteProductDO.class);
@@ -89,6 +136,26 @@
}
}
+ 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())) {
+ throw exception(PRO_ROUTE_PRODUCT_ITEM_TYPE_INVALID);
+ }
+ }
+
private void validateItemUnique(Long id, Long itemId) {
MesProRouteProductDO existing = routeProductMapper.selectByItemId(itemId);
if (existing == null) {
--
Gitblit v1.9.3