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/wm/productproduce/MesWmProductProduceServiceImpl.java | 96 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 77 insertions(+), 19 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 ef11a06..42d30cb 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
@@ -8,11 +8,14 @@
import cn.iocoder.yudao.module.mes.controller.admin.wm.batch.vo.MesWmBatchGenerateReqVO;
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;
@@ -21,7 +24,10 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO;
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;
import cn.iocoder.yudao.module.mes.service.wm.transaction.dto.MesWmTransactionSaveReqDTO;
import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService;
@@ -49,6 +55,8 @@
@Resource
private MesWmProductProduceMapper productProduceMapper;
+ @Resource
+ private MesProFeedbackMapper feedbackMapper;
@Resource
private MesWmProductProduceLineService productProduceLineService;
@@ -56,6 +64,12 @@
private MesWmProductProduceDetailService productProduceDetailService;
@Resource
private MesProWorkOrderService workOrderService;
+ @Resource
+ private MesProWorkOrderProcessService workOrderProcessService;
+ @Resource
+ private MesProRouteProductService routeProductService;
+ @Resource
+ private MesWmProductReceiptService productReceiptService;
@Resource
private MesWmBatchService batchService;
@Resource
@@ -71,7 +85,7 @@
@Transactional(rollbackFor = Exception.class)
public void finishProductProduce(Long id) {
// 1.1 鏍¢獙瀛樺湪 + 鑽夌鐘舵��
- validateProductProduceExistsAndPrepare(id);
+ MesWmProductProduceDO produce = validateProductProduceExistsAndPrepare(id);
// 1.2 鏍¢獙鑷冲皯鏈変竴鏉¤
List<MesWmProductProduceLineDO> lines = productProduceLineService.getProductProduceLineListByProduceId(id);
if (CollUtil.isEmpty(lines)) {
@@ -79,14 +93,25 @@
}
// 2. 鍒涘缓搴撳瓨浜嬪姟
- createTransactionList(id, lines);
+ createTransactionList(produce, lines);
// 3. 鏇存柊鍏ュ簱鍗曠姸鎬�
productProduceMapper.updateById(new MesWmProductProduceDO()
.setId(id).setStatus(MesWmProductProduceStatusEnum.FINISHED.getStatus()));
+
+ // 4. 鍙湁鏈亾宸ュ簭鐨勫悎鏍间骇鍑烘墠鐢熸垚浜у搧鍏ュ簱鍗曪紝閬垮厤涓棿宸ュ簭閲嶅鐢熸垚鎴愬搧鍏ュ簱
+ MesProWorkOrderProcessDO lastProcess = workOrderProcessService
+ .getLastWorkOrderProcessByWorkOrderId(produce.getWorkOrderId());
+ if (lastProcess != null && ObjUtil.equal(lastProcess.getProcessId(), produce.getProcessId())) {
+ productReceiptService.generateProductReceipt(produce, lines);
+ }
}
- 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(
@@ -103,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()));
}
}
}
@@ -113,6 +138,11 @@
@Transactional(rollbackFor = Exception.class)
public MesWmProductProduceDO generateProductProduce(MesProFeedbackDO feedback, boolean checkFlag,
MesProFeedbackApproveReqVO approveReqVO) {
+ // 涓�涓姤宸ュ彧鑳界敓鎴愪竴寮犵敓浜т骇鍑哄崟锛涘鎵规帴鍙i噸璇曟椂鐩存帴杩斿洖鏃㈡湁鍗曟嵁
+ MesWmProductProduceDO existingProduce = productProduceMapper.selectByFeedbackId(feedback.getId());
+ if (existingProduce != null) {
+ return existingProduce;
+ }
// 0. 鏌ヨ鍏宠仈鐨勫伐鍗曪紙鐢ㄤ簬鑾峰彇 clientId 绛変俊鎭級
MesProWorkOrderDO workOrder = workOrderService.getWorkOrder(feedback.getWorkOrderId());
@@ -152,10 +182,9 @@
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.getWorkOrderId(),
+ feedback.getProcessId(), feedback.getItemId());
// 3. 鏍规嵁鏄惁闇�瑕佹楠屽垎鏀鐞�
if (checkFlag) {
@@ -175,7 +204,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 鍚堟牸鍝佽 + 鏄庣粏
@@ -185,7 +214,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);
}
}
@@ -245,13 +274,10 @@
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(produce.getWorkOrderId(),
+ produce.getProcessId(), pendingLine.getItemId());
// 3A. 鎯呭喌涓�锛氬瓨鍦ㄤ笉鍚堟牸鍝佹暟閲忥紝闇�瑕佹媶鍒嗚
if (unqualifiedQty != null && unqualifiedQty.compareTo(BigDecimal.ZERO) > 0) {
@@ -268,7 +294,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));
@@ -279,7 +305,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 {
@@ -290,7 +316,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());
}
@@ -298,4 +324,36 @@
finishProductProduce(produce.getId());
}
+ private WarehouseTarget resolveOutputTarget(Long workOrderId, Long processId, Long itemId) {
+ // 1. 宸ュ崟宸ュ簭閰嶇疆锛堜笅鍗曟椂鍙紪杈戯級
+ if (workOrderId != null && processId != null) {
+ MesProWorkOrderProcessDO workOrderProcess = workOrderProcessService
+ .getWorkOrderProcessByWorkOrderIdAndProcessId(workOrderId, processId);
+ if (workOrderProcess != null && workOrderProcess.getWarehouseId() != null
+ && workOrderProcess.getLocationId() != null && workOrderProcess.getAreaId() != null) {
+ areaService.validateWarehouseAreaExists(workOrderProcess.getWarehouseId(),
+ workOrderProcess.getLocationId(), workOrderProcess.getAreaId());
+ return new WarehouseTarget(workOrderProcess.getWarehouseId(),
+ workOrderProcess.getLocationId(), workOrderProcess.getAreaId());
+ }
+ }
+ // 2. 宸ヨ壓璺嚎浜у搧閰嶇疆
+ 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