From d54fbc9d4f8981fa0f7f613b33a28a8cd4f764ea Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期日, 25 十月 2026 16:29:53 +0800
Subject: [PATCH] feat(system): 优化用户搜索功能并完善ERP和MES模块验证逻辑
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productproduce/MesWmProductProduceServiceImpl.java | 65 +++++++++++++++++++++++---------
1 files changed, 47 insertions(+), 18 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productproduce/MesWmProductProduceServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productproduce/MesWmProductProduceServiceImpl.java
index d70dea9..8a33ace 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productproduce/MesWmProductProduceServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productproduce/MesWmProductProduceServiceImpl.java
@@ -9,11 +9,13 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.feedback.MesProFeedbackDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderProcessDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteProductDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.batch.MesWmBatchDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productproduce.MesWmProductProduceDetailDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productproduce.MesWmProductProduceDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productproduce.MesWmProductProduceLineDO;
import cn.iocoder.yudao.module.mes.dal.mysql.wm.productproduce.MesWmProductProduceMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.pro.feedback.MesProFeedbackMapper;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmProductProduceStatusEnum;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmQualityStatusEnum;
import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;
@@ -23,6 +25,7 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseLocationDO;
import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService;
import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderProcessService;
+import cn.iocoder.yudao.module.mes.service.pro.route.MesProRouteProductService;
import cn.iocoder.yudao.module.mes.service.wm.batch.MesWmBatchService;
import cn.iocoder.yudao.module.mes.service.wm.productreceipt.MesWmProductReceiptService;
import cn.iocoder.yudao.module.mes.service.wm.transaction.MesWmTransactionService;
@@ -52,6 +55,8 @@
@Resource
private MesWmProductProduceMapper productProduceMapper;
+ @Resource
+ private MesProFeedbackMapper feedbackMapper;
@Resource
private MesWmProductProduceLineService productProduceLineService;
@@ -61,6 +66,8 @@
private MesProWorkOrderService workOrderService;
@Resource
private MesProWorkOrderProcessService workOrderProcessService;
+ @Resource
+ private MesProRouteProductService routeProductService;
@Resource
private MesWmProductReceiptService productReceiptService;
@Resource
@@ -86,7 +93,7 @@
}
// 2. 鍒涘缓搴撳瓨浜嬪姟
- createTransactionList(id, lines);
+ createTransactionList(produce, lines);
// 3. 鏇存柊鍏ュ簱鍗曠姸鎬�
productProduceMapper.updateById(new MesWmProductProduceDO()
@@ -100,7 +107,11 @@
}
}
- private void createTransactionList(Long produceId, List<MesWmProductProduceLineDO> lines) {
+ private void createTransactionList(MesWmProductProduceDO produce, List<MesWmProductProduceLineDO> lines) {
+ MesProFeedbackDO feedback = produce.getFeedbackId() != null
+ ? feedbackMapper.selectById(produce.getFeedbackId()) : null;
+ String bizCode = feedback != null && cn.hutool.core.util.StrUtil.isNotBlank(feedback.getCode())
+ ? feedback.getCode() : "PRODUCE-" + produce.getId();
for (MesWmProductProduceLineDO line : lines) {
// 1. 鏍￠獙姣忚鏄庣粏鏁伴噺涔嬪拰绛変簬琛屾暟閲�
List<MesWmProductProduceDetailDO> details = productProduceDetailService.getProductProduceDetailListByLineId(
@@ -117,8 +128,8 @@
.setQuantity(detail.getQuantity())
.setBatchId(detail.getBatchId()).setBatchCode(detail.getBatchCode())
.setWarehouseId(detail.getWarehouseId()).setLocationId(detail.getLocationId()).setAreaId(detail.getAreaId())
- .setBizType(MesBizTypeConstants.WM_PRODUCT_PRODUCE).setBizId(produceId)
- .setBizCode("").setBizLineId(line.getId()));
+ .setBizType(MesBizTypeConstants.WM_PRODUCT_PRODUCE).setBizId(produce.getId())
+ .setBizCode(bizCode).setBizLineId(line.getId()));
}
}
}
@@ -127,6 +138,11 @@
@Transactional(rollbackFor = Exception.class)
public MesWmProductProduceDO generateProductProduce(MesProFeedbackDO feedback, boolean checkFlag,
MesProFeedbackApproveReqVO approveReqVO) {
+ // 涓�涓姤宸ュ彧鑳界敓鎴愪竴寮犵敓浜т骇鍑哄崟锛涘鎵规帴鍙ｉ噸璇曟椂鐩存帴杩斿洖鏃㈡湁鍗曟嵁
+ MesWmProductProduceDO existingProduce = productProduceMapper.selectByFeedbackId(feedback.getId());
+ if (existingProduce != null) {
+ return existingProduce;
+ }
// 0. 鏌ヨ鍏宠仈鐨勫伐鍗曪紙鐢ㄤ簬鑾峰彇 clientId 绛変俊鎭級
MesProWorkOrderDO workOrder = workOrderService.getWorkOrder(feedback.getWorkOrderId());
@@ -166,10 +182,8 @@
Long batchId = batch != null ? batch.getId() : null;
String batchCode = batch != null ? batch.getCode() : null;
- // 1.5 鑾峰彇铏氭嫙绾胯竟搴�
- MesWmWarehouseDO virtualWarehouse = warehouseService.getWarehouseByCode(MesWmWarehouseDO.WIP_VIRTUAL_WAREHOUSE);
- MesWmWarehouseLocationDO virtualLocation = locationService.getWarehouseLocationByCode(MesWmWarehouseLocationDO.WIP_VIRTUAL_LOCATION);
- MesWmWarehouseAreaDO virtualArea = areaService.getWarehouseAreaByCode(MesWmWarehouseAreaDO.WIP_VIRTUAL_AREA);
+ // 1.5 浼樺厛浣跨敤宸ヨ壓璺嚎浜у搧缁戝畾鐨勬姤宸ヤ粨搴擄紱鍘嗗彶鏁版嵁鏈厤缃椂鍥為��铏氭嫙绾胯竟搴撱��
+ WarehouseTarget outputTarget = resolveOutputTarget(feedback.getItemId());
// 3. 鏍规嵁鏄惁闇�瑕佹楠屽垎鏀鐞�
if (checkFlag) {
@@ -189,7 +203,7 @@
productProduceLineService.createProductProduceLine(unqualifiedLine);
MesWmProductProduceDetailDO unqualifiedDetail = buildProduceDetail(produce, feedback, batchId, batchCode,
unqualifiedLine.getId(), unqualifiedQty,
- virtualWarehouse.getId(), virtualLocation.getId(), virtualArea.getId());
+ outputTarget.warehouseId(), outputTarget.locationId(), outputTarget.areaId());
productProduceDetailService.createProductProduceDetail(unqualifiedDetail);
}
// 3.2.2 鍚堟牸鍝佽 + 鏄庣粏
@@ -199,7 +213,7 @@
productProduceLineService.createProductProduceLine(qualifiedLine);
MesWmProductProduceDetailDO qualifiedDetail = buildProduceDetail(produce, feedback, batchId, batchCode,
qualifiedLine.getId(), qualifiedQty,
- virtualWarehouse.getId(), virtualLocation.getId(), virtualArea.getId());
+ outputTarget.warehouseId(), outputTarget.locationId(), outputTarget.areaId());
productProduceDetailService.createProductProduceDetail(qualifiedDetail);
}
}
@@ -259,13 +273,9 @@
if (produce == null) {
throw exception(WM_PRODUCT_PRODUCE_NOT_EXISTS);
}
- // 1.2 鑾峰彇铏氭嫙绾胯竟搴�
- MesWmWarehouseDO virtualWarehouse = warehouseService.getWarehouseByCode(MesWmWarehouseDO.WIP_VIRTUAL_WAREHOUSE);
- MesWmWarehouseLocationDO virtualLocation = locationService.getWarehouseLocationByCode(MesWmWarehouseLocationDO.WIP_VIRTUAL_LOCATION);
- MesWmWarehouseAreaDO virtualArea = areaService.getWarehouseAreaByCode(MesWmWarehouseAreaDO.WIP_VIRTUAL_AREA);
-
// 2. 閫氳繃 sourceLineId 鐩存帴瀹氫綅寰呮楠岃
MesWmProductProduceLineDO pendingLine = productProduceLineService.validateProductProduceLineExists(sourceLineId);
+ WarehouseTarget outputTarget = resolveOutputTarget(pendingLine.getItemId());
// 3A. 鎯呭喌涓�锛氬瓨鍦ㄤ笉鍚堟牸鍝佹暟閲忥紝闇�瑕佹媶鍒嗚
if (unqualifiedQty != null && unqualifiedQty.compareTo(BigDecimal.ZERO) > 0) {
@@ -282,7 +292,7 @@
.produceId(produce.getId()).lineId(unqualifiedLine.getId())
.itemId(pendingLine.getItemId()).quantity(unqualifiedQty)
.batchId(pendingLine.getBatchId()).batchCode(pendingLine.getBatchCode())
- .warehouseId(virtualWarehouse.getId()).locationId(virtualLocation.getId()).areaId(virtualArea.getId())
+ .warehouseId(outputTarget.warehouseId()).locationId(outputTarget.locationId()).areaId(outputTarget.areaId())
.build());
// 3A.2 鍚堟牸鍝侊細澶嶇敤鍘熷緟妫�琛岋紝鏇存柊鏁伴噺鍜岀姸鎬� + 鏄庣粏
pendingLine.setQuantity(ObjectUtil.defaultIfNull(qualifiedQty, BigDecimal.ZERO));
@@ -293,7 +303,7 @@
.produceId(produce.getId()).lineId(pendingLine.getId())
.itemId(pendingLine.getItemId()).quantity(qualifiedQty)
.batchId(pendingLine.getBatchId()).batchCode(pendingLine.getBatchCode())
- .warehouseId(virtualWarehouse.getId()).locationId(virtualLocation.getId()).areaId(virtualArea.getId())
+ .warehouseId(outputTarget.warehouseId()).locationId(outputTarget.locationId()).areaId(outputTarget.areaId())
.build());
}
} else {
@@ -304,7 +314,7 @@
.produceId(produce.getId()).lineId(pendingLine.getId())
.itemId(pendingLine.getItemId()).quantity(pendingLine.getQuantity())
.batchId(pendingLine.getBatchId()).batchCode(pendingLine.getBatchCode())
- .warehouseId(virtualWarehouse.getId()).locationId(virtualLocation.getId()).areaId(virtualArea.getId())
+ .warehouseId(outputTarget.warehouseId()).locationId(outputTarget.locationId()).areaId(outputTarget.areaId())
.build());
}
@@ -312,4 +322,23 @@
finishProductProduce(produce.getId());
}
+ private WarehouseTarget resolveOutputTarget(Long itemId) {
+ MesProRouteProductDO routeProduct = itemId != null
+ ? routeProductService.getRouteProductByItemId(itemId) : null;
+ if (routeProduct != null && routeProduct.getWarehouseId() != null
+ && routeProduct.getLocationId() != null && routeProduct.getAreaId() != null) {
+ areaService.validateWarehouseAreaExists(routeProduct.getWarehouseId(),
+ routeProduct.getLocationId(), routeProduct.getAreaId());
+ return new WarehouseTarget(routeProduct.getWarehouseId(), routeProduct.getLocationId(), routeProduct.getAreaId());
+ }
+ MesWmWarehouseDO warehouse = warehouseService.getWarehouseByCode(MesWmWarehouseDO.WIP_VIRTUAL_WAREHOUSE);
+ MesWmWarehouseLocationDO location = locationService.getWarehouseLocationByCode(
+ MesWmWarehouseLocationDO.WIP_VIRTUAL_LOCATION);
+ MesWmWarehouseAreaDO area = areaService.getWarehouseAreaByCode(MesWmWarehouseAreaDO.WIP_VIRTUAL_AREA);
+ return new WarehouseTarget(warehouse.getId(), location.getId(), area.getId());
+ }
+
+ private record WarehouseTarget(Long warehouseId, Long locationId, Long areaId) {
+ }
+
}
--
Gitblit v1.9.3