From 74ad846852f42b4e2258bfddd5c2a33cc1ce9847 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 29 八月 2026 18:03:46 +0800
Subject: [PATCH] feat(mes): 新增工序等待时长和报工数量配置功能
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productproduce/MesWmProductProduceServiceImpl.java | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 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 fd6f98a..1de46d4 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
@@ -4,6 +4,7 @@
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.feedback.vo.MesProFeedbackApproveReqVO;
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;
@@ -23,10 +24,12 @@
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;
+import cn.iocoder.yudao.module.mes.service.wm.productreceipt.MesWmProductReceiptService;
import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService;
import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseLocationService;
import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseService;
import jakarta.annotation.Resource;
+import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
@@ -65,6 +68,9 @@
private MesWmWarehouseLocationService locationService;
@Resource
private MesWmWarehouseAreaService areaService;
+ @Resource
+ @Lazy // 閬垮厤寰幆渚濊禆锛氫骇鍝佹敹璐у崟鑷姩鐢熸垚閫昏緫渚濊禆鐢熶骇鍏ュ簱鍗� Mapper/琛� Service
+ private MesWmProductReceiptService productReceiptService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -110,7 +116,8 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public MesWmProductProduceDO generateProductProduce(MesProFeedbackDO feedback, boolean checkFlag) {
+ public MesWmProductProduceDO generateProductProduce(MesProFeedbackDO feedback, boolean checkFlag,
+ MesProFeedbackApproveReqVO approveReqVO) {
// 0. 鏌ヨ鍏宠仈鐨勫伐鍗曪紙鐢ㄤ簬鑾峰彇 clientId 绛変俊鎭級
MesProWorkOrderDO workOrder = workOrderService.getWorkOrder(feedback.getWorkOrderId());
@@ -122,16 +129,30 @@
.build();
productProduceMapper.insert(produce);
- // 2. 鑾峰彇鎴栫敓鎴愭壒娆�
+ // 2. 鑾峰彇鎴栫敓鎴愭壒娆★紙瀹℃壒璇锋眰涓殑鎵规灞炴�т紭鍏堬級
MesWmBatchGenerateReqVO batchReqVO = new MesWmBatchGenerateReqVO()
.setItemId(feedback.getItemId())
.setProduceDate(LocalDate.now().atStartOfDay()) // 鎴柇鍒板綋澶╅浂鐐癸紝纭繚鍚屼竴澶╃殑鎶ュ伐鐢熸垚鐩稿悓鎵规鍙�
.setExpireDate(feedback.getExpireDate())
.setWorkOrderId(feedback.getWorkOrderId())
+ .setTaskId(feedback.getTaskId())
.setClientId(workOrder != null ? workOrder.getClientId() : null)
.setSalesOrderCode(workOrder != null ? workOrder.getOrderSourceCode() : null)
.setWorkstationId(feedback.getWorkstationId())
.setLotNumber(feedback.getLotNumber());
+ // 鍚堝苟瀹℃壒璇锋眰涓敤鎴峰～鍐欑殑鎵规灞炴�э紙鐢ㄦ埛杈撳叆鍊间紭鍏堬級
+ if (approveReqVO != null) {
+ if (approveReqVO.getExpireDate() != null) batchReqVO.setExpireDate(approveReqVO.getExpireDate());
+ if (approveReqVO.getReceiptDate() != null) batchReqVO.setReceiptDate(approveReqVO.getReceiptDate());
+ if (approveReqVO.getVendorId() != null) batchReqVO.setVendorId(approveReqVO.getVendorId());
+ if (approveReqVO.getClientId() != null) batchReqVO.setClientId(approveReqVO.getClientId());
+ if (approveReqVO.getSalesOrderCode() != null) batchReqVO.setSalesOrderCode(approveReqVO.getSalesOrderCode());
+ if (approveReqVO.getPurchaseOrderCode() != null) batchReqVO.setPurchaseOrderCode(approveReqVO.getPurchaseOrderCode());
+ if (approveReqVO.getToolId() != null) batchReqVO.setToolId(approveReqVO.getToolId());
+ if (approveReqVO.getMoldId() != null) batchReqVO.setMoldId(approveReqVO.getMoldId());
+ if (approveReqVO.getLotNumber() != null) batchReqVO.setLotNumber(approveReqVO.getLotNumber());
+ if (approveReqVO.getQualityStatus() != null) batchReqVO.setQualityStatus(approveReqVO.getQualityStatus());
+ }
MesWmBatchDO batch = batchService.getOrGenerateBatchCode(batchReqVO);
Long batchId = batch != null ? batch.getId() : null;
String batchCode = batch != null ? batch.getCode() : null;
@@ -152,6 +173,10 @@
// 3.2 鏃犻渶妫�楠岋細鎸夊悎鏍煎搧/涓嶅悎鏍煎搧鍚勭敓鎴愪竴琛� + 鏄庣粏
BigDecimal qualifiedQty = ObjectUtil.defaultIfNull(feedback.getQualifiedQuantity(), BigDecimal.ZERO);
BigDecimal unqualifiedQty = ObjectUtil.defaultIfNull(feedback.getUnqualifiedQuantity(), BigDecimal.ZERO);
+ // 3.2.0 鍏滃簳锛氬悎鏍�/涓嶈壇鏁伴噺閮芥湭濉啓鏃讹紙鎶ュ伐鍙～鎶ュ伐鏁伴噺锛夛紝榛樿鏁村崟涓哄悎鏍煎搧
+ if (qualifiedQty.compareTo(BigDecimal.ZERO) <= 0 && unqualifiedQty.compareTo(BigDecimal.ZERO) <= 0) {
+ qualifiedQty = feedback.getFeedbackQuantity();
+ }
// 3.2.1 涓嶅悎鏍煎搧琛� + 鏄庣粏
if (unqualifiedQty.compareTo(BigDecimal.ZERO) > 0) {
MesWmProductProduceLineDO unqualifiedLine = buildProduceLine(produce, feedback, batchId, batchCode,
@@ -280,6 +305,9 @@
// 4. 瀹屾垚浜у嚭鍗曪紙鍒涘缓搴撳瓨浜嬪姟 + 鏇存柊鐘舵�佷负宸插畬鎴愶級
finishProductProduce(produce.getId());
+
+ // 5. 鎶ュ伐浜у嚭瀹氱鍚庤嚜鍔ㄧ敓鎴愪骇鍝佸叆搴撳崟锛堜竴娆℃姤宸�=涓�鏉★紝骞傜瓑锛�
+ productReceiptService.createProductReceiptByFeedback(feedbackId);
}
}
--
Gitblit v1.9.3