From abf1c0a35d85d38239ff5d2ed746a4e4b797c9d1 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期四, 20 八月 2026 14:05:02 +0800
Subject: [PATCH] feat 功能修正
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderServiceImpl.java | 52 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 42 insertions(+), 10 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderServiceImpl.java
index c4cb972..ad02742 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderServiceImpl.java
@@ -24,7 +24,10 @@
import cn.iocoder.yudao.module.mes.service.pro.task.MesProTaskService;
import cn.iocoder.yudao.module.mes.service.wm.barcode.MesWmBarcodeService;
import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
+import cn.iocoder.yudao.module.erp.api.sale.ErpSaleOrderApi;
+import cn.iocoder.yudao.module.erp.api.sale.dto.ErpSaleOrderRespDTO;
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;
@@ -69,11 +72,17 @@
@Resource
private CrmCustomerApi customerApi;
+ @Resource
+ @Lazy // 閬垮厤 erpSaleOrderApiImpl -> ... -> mesProWorkOrderServiceImpl 鐨勫惊鐜緷璧�
+ private ErpSaleOrderApi saleOrderApi;
+
@Override
@Transactional(rollbackFor = Exception.class)
public Long createWorkOrder(MesProWorkOrderSaveReqVO createReqVO) {
// 1. 鏍￠獙鏁版嵁
validateWorkOrderSaveData(null, createReqVO);
+ // 1.1 鍏宠仈钀ラ攢璁㈠崟淇℃伅鍥炲～
+ fillSaleOrderInfo(createReqVO);
// 2.1 璁剧疆榛樿鍊�
if (createReqVO.getParentId() == null) {
@@ -84,8 +93,10 @@
workOrder.setStatus(MesProWorkOrderStatusEnum.PREPARE.getStatus());
workOrderMapper.insert(workOrder);
- // 3. 鑷姩鐢熸垚 BOM锛氭牴鎹骇鍝� BOM 鐢熸垚宸ュ崟 BOM
- workOrderBomService.generateWorkOrderBom(workOrder.getId(), createReqVO, false);
+ // 3. 鑷姩鐢熸垚 BOM锛氭牴鎹骇鍝� BOM 鐢熸垚宸ュ崟 BOM锛堟棤浜у搧鐨勮繍缁�/鍙戠數/妫�淇被宸ュ崟璺宠繃锛�
+ if (createReqVO.getProductId() != null) {
+ workOrderBomService.generateWorkOrderBom(workOrder.getId(), createReqVO, false);
+ }
// 4. 宸ュ簭鐢卞墠绔�夋嫨浜у搧鍚庡甫鍏ワ紝涓嶅啀鑷姩鐢熸垚
@@ -105,11 +116,13 @@
}
// 1.2 鏍￠獙鏁版嵁
validateWorkOrderSaveData(updateReqVO.getId(), updateReqVO);
+ // 1.3 鍏宠仈钀ラ攢璁㈠崟淇℃伅鍥炲～
+ fillSaleOrderInfo(updateReqVO);
- // 2. 鍒ゆ柇浜у搧鎴栨暟閲忔槸鍚﹀彉鏇达紝濡傛灉鍙樻洿鍒欓噸鏂扮敓鎴� BOM锛坲pdated=true 浼氬厛娓呯悊鏃ф暟鎹級
+ // 2. 鍒ゆ柇浜у搧鎴栨暟閲忔槸鍚﹀彉鏇达紝濡傛灉鍙樻洿鍒欓噸鏂扮敓鎴� BOM锛坲pdated=true 浼氬厛娓呯悊鏃ф暟鎹紱鏃犱骇鍝佺殑杩愮淮绫诲伐鍗曡烦杩囷級
boolean productChanged = ObjUtil.notEqual(oldWorkOrder.getProductId(), updateReqVO.getProductId());
boolean quantityChanged = oldWorkOrder.getQuantity().compareTo(updateReqVO.getQuantity()) != 0;
- if (productChanged || quantityChanged) {
+ if ((productChanged || quantityChanged) && updateReqVO.getProductId() != null) {
workOrderBomService.generateWorkOrderBom(updateReqVO.getId(), updateReqVO, true);
}
// 2.1 宸ュ簭鐢卞墠绔鐞嗭紝浜у搧鍙樻洿鏃跺墠绔細閲嶆柊鑾峰彇宸ヨ壓璺嚎宸ュ簭
@@ -245,12 +258,14 @@
private void validateWorkOrderSaveData(Long id, MesProWorkOrderSaveReqVO reqVO) {
// 1. 鏍￠獙缂栫爜鍞竴
validateWorkOrderCodeUnique(id, reqVO.getCode());
- // 2. 鏍￠獙浜у搧瀛樺湪
- itemService.validateItemExists(reqVO.getProductId());
- // 3. 鏍￠獙鎵规閰嶇疆锛堝鏋滀骇鍝佹湁 clientFlag=true锛屽垯 clientId 蹇呭～锛�
- MesMdItemBatchConfigDO batchConfig = itemBatchConfigService.getItemBatchConfigByItemId(reqVO.getProductId());
- if (batchConfig != null && Boolean.TRUE.equals(batchConfig.getClientFlag()) && reqVO.getClientId() == null) {
- throw exception(MD_CLIENT_NOT_EXISTS);
+ // 2. 浜у搧闈炵┖鏃舵牎楠屼骇鍝佸瓨鍦紙杩愮淮/鍙戠數/妫�淇被宸ュ崟鍙棤浜у搧锛�
+ if (reqVO.getProductId() != null) {
+ itemService.validateItemExists(reqVO.getProductId());
+ // 3. 鏍￠獙鎵规閰嶇疆锛堝鏋滀骇鍝佹湁 clientFlag=true锛屽垯 clientId 蹇呭～锛�
+ MesMdItemBatchConfigDO batchConfig = itemBatchConfigService.getItemBatchConfigByItemId(reqVO.getProductId());
+ if (batchConfig != null && Boolean.TRUE.equals(batchConfig.getClientFlag()) && reqVO.getClientId() == null) {
+ throw exception(MD_CLIENT_NOT_EXISTS);
+ }
}
}
@@ -267,6 +282,23 @@
}
}
+ /**
+ * 鍏宠仈钀ラ攢璁㈠崟锛圗RP 閿�鍞鍗曪級锛氭牎楠屽瓨鍦ㄦ�у苟鍥炲～鍗曞彿銆佸鎴�
+ */
+ private void fillSaleOrderInfo(MesProWorkOrderSaveReqVO reqVO) {
+ if (reqVO.getSaleOrderId() == null) {
+ return;
+ }
+ ErpSaleOrderRespDTO saleOrder = saleOrderApi.getSaleOrder(reqVO.getSaleOrderId()).getCheckedData();
+ if (saleOrder == null) {
+ throw exception(PRO_WORK_ORDER_SALE_ORDER_NOT_EXISTS);
+ }
+ reqVO.setSaleOrderNo(saleOrder.getNo());
+ if (reqVO.getClientId() == null && saleOrder.getCustomerId() != null) {
+ reqVO.setClientId(saleOrder.getCustomerId());
+ }
+ }
+
@Override
public void updateProducedQuantity(Long id, BigDecimal incrQuantityProduced) {
// 鏍￠獙宸ュ崟瀛樺湪
--
Gitblit v1.9.3