From d39e4f7d839167c16425086dfa2f8747bccfdff9 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 05 十一月 2026 17:39:01 +0800
Subject: [PATCH] feat: 打通销售采购财务闭环并完成累计业务优化
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productproduce/MesWmProductProduceServiceImpl.java | 127 +++++++++++++++++++++---------------------
1 files changed, 64 insertions(+), 63 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..c50473e 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,6 +8,8 @@
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;
@@ -21,6 +23,8 @@
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.transaction.MesWmTransactionService;
import cn.iocoder.yudao.module.mes.service.wm.transaction.dto.MesWmTransactionSaveReqDTO;
@@ -57,6 +61,10 @@
@Resource
private MesProWorkOrderService workOrderService;
@Resource
+ private MesProWorkOrderProcessService workOrderProcessService;
+ @Resource
+ private MesProRouteProductService routeProductService;
+ @Resource
private MesWmBatchService batchService;
@Resource
private MesWmTransactionService wmTransactionService;
@@ -88,6 +96,13 @@
private void createTransactionList(Long produceId, List<MesWmProductProduceLineDO> lines) {
for (MesWmProductProduceLineDO line : lines) {
+ if (MesWmQualityStatusEnum.FAIL.getStatus().equals(line.getQualityStatus())) {
+ // 涓嶅悎鏍间骇鍑轰繚鐣欒褰曪紝浜ょ敱涓嶅悎鏍煎搧澶勭悊锛屼笉鐢熸垚鍚堟牸搴撳瓨娴佹按銆�
+ continue;
+ }
+ if (!MesWmQualityStatusEnum.PASS.getStatus().equals(line.getQualityStatus())) {
+ throw exception(WM_PRODUCT_PRODUCE_QUALITY_PENDING);
+ }
// 1. 鏍￠獙姣忚鏄庣粏鏁伴噺涔嬪拰绛変簬琛屾暟閲�
List<MesWmProductProduceDetailDO> details = productProduceDetailService.getProductProduceDetailListByLineId(
line.getId());
@@ -113,6 +128,7 @@
@Transactional(rollbackFor = Exception.class)
public MesWmProductProduceDO generateProductProduce(MesProFeedbackDO feedback, boolean checkFlag,
MesProFeedbackApproveReqVO approveReqVO) {
+ if (!checkFlag) throw exception(WM_PRODUCT_PRODUCE_QUALITY_PENDING);
// 0. 鏌ヨ鍏宠仈鐨勫伐鍗曪紙鐢ㄤ簬鑾峰彇 clientId 绛変俊鎭級
MesProWorkOrderDO workOrder = workOrderService.getWorkOrder(feedback.getWorkOrderId());
@@ -127,6 +143,7 @@
// 2. 鑾峰彇鎴栫敓鎴愭壒娆★紙瀹℃壒璇锋眰涓殑鎵规灞炴�т紭鍏堬級
MesWmBatchGenerateReqVO batchReqVO = new MesWmBatchGenerateReqVO()
.setItemId(feedback.getItemId())
+ .setReelNo(workOrder != null ? workOrder.getReelNo() : null)
.setProduceDate(LocalDate.now().atStartOfDay()) // 鎴柇鍒板綋澶╅浂鐐癸紝纭繚鍚屼竴澶╃殑鎶ュ伐鐢熸垚鐩稿悓鎵规鍙�
.setExpireDate(feedback.getExpireDate())
.setWorkOrderId(feedback.getWorkOrderId())
@@ -152,67 +169,23 @@
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);
-
- // 3. 鏍规嵁鏄惁闇�瑕佹楠屽垎鏀鐞�
- if (checkFlag) {
- // 3.1 闇�瑕佹楠岋細鍒涘缓涓�鏉¤锛堣川閲忕姸鎬�=寰呮楠岋級锛屼笉鐢熸垚鏄庣粏
- MesWmProductProduceLineDO line = buildProduceLine(produce, feedback, batchId, batchCode,
- feedback.getFeedbackQuantity(), MesWmQualityStatusEnum.PENDING.getStatus());
- productProduceLineService.createProductProduceLine(line);
- // 娉ㄦ剰锛歝heckFlag=true 鏃朵笉鐢熸垚鏄庣粏琛岋紝绛� IPQC 妫�楠屽畬鎴愬悗鐢� splitPendingAndFinishProduce 鎸夎川閲忕粨鏋滄媶琛�+鐢熸垚鏄庣粏
- } else {
- // 3.2 鏃犻渶妫�楠岋細鎸夊悎鏍煎搧/涓嶅悎鏍煎搧鍚勭敓鎴愪竴琛� + 鏄庣粏
- BigDecimal qualifiedQty = ObjectUtil.defaultIfNull(feedback.getQualifiedQuantity(), BigDecimal.ZERO);
- BigDecimal unqualifiedQty = ObjectUtil.defaultIfNull(feedback.getUnqualifiedQuantity(), BigDecimal.ZERO);
- // 3.2.1 涓嶅悎鏍煎搧琛� + 鏄庣粏
- if (unqualifiedQty.compareTo(BigDecimal.ZERO) > 0) {
- MesWmProductProduceLineDO unqualifiedLine = buildProduceLine(produce, feedback, batchId, batchCode,
- unqualifiedQty, MesWmQualityStatusEnum.FAIL.getStatus());
- productProduceLineService.createProductProduceLine(unqualifiedLine);
- MesWmProductProduceDetailDO unqualifiedDetail = buildProduceDetail(produce, feedback, batchId, batchCode,
- unqualifiedLine.getId(), unqualifiedQty,
- virtualWarehouse.getId(), virtualLocation.getId(), virtualArea.getId());
- productProduceDetailService.createProductProduceDetail(unqualifiedDetail);
- }
- // 3.2.2 鍚堟牸鍝佽 + 鏄庣粏
- if (qualifiedQty.compareTo(BigDecimal.ZERO) > 0) {
- MesWmProductProduceLineDO qualifiedLine = buildProduceLine(produce, feedback, batchId, batchCode,
- qualifiedQty, MesWmQualityStatusEnum.PASS.getStatus());
- productProduceLineService.createProductProduceLine(qualifiedLine);
- MesWmProductProduceDetailDO qualifiedDetail = buildProduceDetail(produce, feedback, batchId, batchCode,
- qualifiedLine.getId(), qualifiedQty,
- virtualWarehouse.getId(), virtualLocation.getId(), virtualArea.getId());
- productProduceDetailService.createProductProduceDetail(qualifiedDetail);
- }
- }
+ // 鏂版姤宸ヤ骇鍑虹粺涓�寰呮锛屽巻鍙蹭笉妫�楠屽嵆鍏ュ簱鍒嗘敮宸茬Щ闄ゃ��
+ MesWmProductProduceLineDO line = buildProduceLine(produce, feedback, batchId, batchCode,
+ feedback.getFeedbackQuantity(), MesWmQualityStatusEnum.PENDING.getStatus(),
+ workOrder != null ? workOrder.getReelNo() : null);
+ productProduceLineService.createProductProduceLine(line);
return produce;
}
private MesWmProductProduceLineDO buildProduceLine(MesWmProductProduceDO produce, MesProFeedbackDO feedback,
Long batchId, String batchCode,
- BigDecimal quantity, Integer qualityStatus) {
+ BigDecimal quantity, Integer qualityStatus, String reelNo) {
return MesWmProductProduceLineDO.builder()
.produceId(produce.getId()).feedbackId(feedback.getId())
.itemId(feedback.getItemId()).quantity(quantity)
- .batchId(batchId).batchCode(batchCode)
+ .batchId(batchId).batchCode(batchCode).reelNo(reelNo)
.expireDate(feedback.getExpireDate()).lotNumber(feedback.getLotNumber())
.qualityStatus(qualityStatus)
- .build();
- }
-
- private MesWmProductProduceDetailDO buildProduceDetail(MesWmProductProduceDO produce, MesProFeedbackDO feedback,
- Long batchId, String batchCode,
- Long lineId, BigDecimal quantity,
- Long warehouseId, Long locationId, Long areaId) {
- return MesWmProductProduceDetailDO.builder()
- .produceId(produce.getId()).lineId(lineId)
- .itemId(feedback.getItemId()).quantity(quantity)
- .batchId(batchId).batchCode(batchCode)
- .warehouseId(warehouseId).locationId(locationId).areaId(areaId)
.build();
}
@@ -245,13 +218,17 @@
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);
+ if (!ObjUtil.equal(pendingLine.getProduceId(), produce.getId())
+ || !ObjUtil.equal(pendingLine.getFeedbackId(), feedbackId)
+ || !ObjUtil.equal(pendingLine.getQualityStatus(), MesWmQualityStatusEnum.PENDING.getStatus())
+ || qualifiedQty == null || unqualifiedQty == null || pendingLine.getQuantity() == null
+ || qualifiedQty.signum() < 0 || unqualifiedQty.signum() < 0
+ || qualifiedQty.add(unqualifiedQty).compareTo(pendingLine.getQuantity()) != 0) {
+ throw exception(WM_PRODUCT_PRODUCE_INSPECTION_INVALID);
+ }
+ WarehouseTarget outputTarget = resolveOutputTarget(produce.getWorkOrderId(), produce.getProcessId(), pendingLine.getItemId());
// 3A. 鎯呭喌涓�锛氬瓨鍦ㄤ笉鍚堟牸鍝佹暟閲忥紝闇�瑕佹媶鍒嗚
if (unqualifiedQty != null && unqualifiedQty.compareTo(BigDecimal.ZERO) > 0) {
@@ -260,15 +237,15 @@
.produceId(produce.getId()).feedbackId(feedbackId)
.itemId(pendingLine.getItemId()).quantity(unqualifiedQty)
.batchId(pendingLine.getBatchId()).batchCode(pendingLine.getBatchCode())
- .expireDate(pendingLine.getExpireDate()).lotNumber(pendingLine.getLotNumber())
+ .expireDate(pendingLine.getExpireDate()).lotNumber(pendingLine.getLotNumber()).reelNo(pendingLine.getReelNo())
.qualityStatus(MesWmQualityStatusEnum.FAIL.getStatus())
.build();
productProduceLineService.createProductProduceLine(unqualifiedLine);
productProduceDetailService.createProductProduceDetail(MesWmProductProduceDetailDO.builder()
.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())
+ .batchId(pendingLine.getBatchId()).batchCode(pendingLine.getBatchCode()).reelNo(pendingLine.getReelNo())
+ .warehouseId(outputTarget.warehouseId()).locationId(outputTarget.locationId()).areaId(outputTarget.areaId())
.build());
// 3A.2 鍚堟牸鍝侊細澶嶇敤鍘熷緟妫�琛岋紝鏇存柊鏁伴噺鍜岀姸鎬� + 鏄庣粏
pendingLine.setQuantity(ObjectUtil.defaultIfNull(qualifiedQty, BigDecimal.ZERO));
@@ -278,8 +255,8 @@
productProduceDetailService.createProductProduceDetail(MesWmProductProduceDetailDO.builder()
.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())
+ .batchId(pendingLine.getBatchId()).batchCode(pendingLine.getBatchCode()).reelNo(pendingLine.getReelNo())
+ .warehouseId(outputTarget.warehouseId()).locationId(outputTarget.locationId()).areaId(outputTarget.areaId())
.build());
}
} else {
@@ -289,8 +266,8 @@
productProduceDetailService.createProductProduceDetail(MesWmProductProduceDetailDO.builder()
.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())
+ .batchId(pendingLine.getBatchId()).batchCode(pendingLine.getBatchCode()).reelNo(pendingLine.getReelNo())
+ .warehouseId(outputTarget.warehouseId()).locationId(outputTarget.locationId()).areaId(outputTarget.areaId())
.build());
}
@@ -298,4 +275,28 @@
finishProductProduce(produce.getId());
}
+ private WarehouseTarget resolveOutputTarget(Long workOrderId, Long processId, Long itemId) {
+ if (workOrderId != null && processId != null) {
+ MesProWorkOrderProcessDO process = workOrderProcessService
+ .getWorkOrderProcessByWorkOrderIdAndProcessId(workOrderId, processId);
+ if (process != null && process.getWarehouseId() != null
+ && process.getLocationId() != null && process.getAreaId() != null) {
+ areaService.validateWarehouseAreaExists(process.getWarehouseId(), process.getLocationId(), process.getAreaId());
+ return new WarehouseTarget(process.getWarehouseId(), process.getLocationId(), process.getAreaId());
+ }
+ }
+ MesProRouteProductDO product = itemId == null ? null : routeProductService.getRouteProductByItemId(itemId);
+ if (product != null && product.getWarehouseId() != null
+ && product.getLocationId() != null && product.getAreaId() != null) {
+ areaService.validateWarehouseAreaExists(product.getWarehouseId(), product.getLocationId(), product.getAreaId());
+ return new WarehouseTarget(product.getWarehouseId(), product.getLocationId(), product.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