From 7c03ac9182b338a13dce52631b2924da7793dd5e Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期六, 17 十月 2026 18:36:50 +0800
Subject: [PATCH] feat(mes): 仓储物流单据跨模块关联字段支持手工填写
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourceissue/MesWmOutsourceIssueServiceImpl.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourceissue/MesWmOutsourceIssueServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourceissue/MesWmOutsourceIssueServiceImpl.java
index c88f3a2..920d522 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourceissue/MesWmOutsourceIssueServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourceissue/MesWmOutsourceIssueServiceImpl.java
@@ -21,7 +21,7 @@
import cn.iocoder.yudao.module.mes.enums.wm.MesWmOutsourceIssueStatusEnum;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmTransactionTypeEnum;
import cn.iocoder.yudao.module.mes.service.md.autocode.MesMdAutoCodeRecordService;
-import cn.iocoder.yudao.module.erp.api.purchase.ErpSupplierApi;
+import cn.iocoder.yudao.module.srm.api.supplier.SrmSupplierApi;
import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService;
import cn.iocoder.yudao.module.mes.service.wm.transaction.MesWmTransactionService;
import cn.iocoder.yudao.module.mes.service.wm.transaction.dto.MesWmTransactionSaveReqDTO;
@@ -42,7 +42,7 @@
/**
* MES 澶栧崗鍙戞枡鍗� Service 瀹炵幇绫�
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠$悊鍛�
*/
@Service
@Validated
@@ -56,7 +56,7 @@
@Resource
private MesWmOutsourceIssueDetailService outsourceIssueDetailService;
@Resource
- private ErpSupplierApi supplierApi;
+ private SrmSupplierApi srmSupplierApi;
@Resource
private MesProWorkOrderService workOrderService;
@Resource
@@ -259,12 +259,14 @@
validateCodeUnique(saveReqVO.getId(), saveReqVO.getCode());
// 鏍¢獙渚涘簲鍟嗗瓨鍦�
if (saveReqVO.getVendorId() != null) {
- supplierApi.validateSupplier(saveReqVO.getVendorId());
+ srmSupplierApi.getSupplier(saveReqVO.getVendorId());
}
- // 鏍¢獙宸ュ崟瀛樺湪涓旂被鍨嬩负澶栧崗锛堜唬宸ワ級
- MesProWorkOrderDO workOrder = workOrderService.validateWorkOrderConfirmed(saveReqVO.getWorkOrderId());
- if (ObjUtil.notEqual(workOrder.getType(), MesProWorkOrderTypeEnum.OUTSOURCE.getType())) {
- throw exception(WM_OUTSOURCE_ISSUE_WORK_ORDER_TYPE_INVALID);
+ // 鏍¢獙宸ュ崟瀛樺湪涓旂被鍨嬩负澶栧崗锛堜唬宸ワ級锛涗粎鍏宠仈鐢熶骇宸ュ崟鏃舵牎楠岋紝鎵嬪伐濉啓宸ュ崟鍙蜂笉鏍¢獙
+ if (saveReqVO.getWorkOrderId() != null) {
+ MesProWorkOrderDO workOrder = workOrderService.validateWorkOrderConfirmed(saveReqVO.getWorkOrderId());
+ if (ObjUtil.notEqual(workOrder.getType(), MesProWorkOrderTypeEnum.OUTSOURCE.getType())) {
+ throw exception(WM_OUTSOURCE_ISSUE_WORK_ORDER_TYPE_INVALID);
+ }
}
}
--
Gitblit v1.9.3