From 5140e16bd1cb2bdf974d47a4342f9e27ef804655 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 18 七月 2026 15:54:07 +0800
Subject: [PATCH] feat(erp): 增加销售订单MPS集成与发货通知单控制功能
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImpl.java | 82 +++++++++++++++++++++++++++++++++--------
1 files changed, 66 insertions(+), 16 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImpl.java
index 662cc0a..e474e63 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImpl.java
@@ -17,7 +17,6 @@
import cn.iocoder.yudao.module.mes.enums.wm.MesWmItemReceiptStatusEnum;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmTransactionTypeEnum;
import cn.iocoder.yudao.module.bpm.enums.task.BpmTaskStatusEnum;
-import cn.iocoder.yudao.module.mes.service.md.vendor.MesMdVendorService;
import cn.iocoder.yudao.module.mes.service.qc.iqc.MesQcIqcService;
import cn.iocoder.yudao.module.mes.service.wm.arrivalnotice.MesWmArrivalNoticeService;
import cn.iocoder.yudao.module.mes.service.wm.arrivalnotice.MesWmArrivalNoticeLineService;
@@ -27,6 +26,9 @@
import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
import cn.iocoder.yudao.module.erp.api.purchase.ErpPurchaseOrderApi;
+import cn.iocoder.yudao.module.erp.api.purchase.ErpSupplierApi;
+import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
+import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
import jakarta.annotation.Resource;
@@ -39,6 +41,7 @@
import java.math.BigDecimal;
import java.util.Collection;
import java.util.List;
+import java.util.Map;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
@@ -63,7 +66,8 @@
@Lazy
private MesWmArrivalNoticeService arrivalNoticeService;
@Resource
- private MesMdVendorService vendorService;
+ @Lazy
+ private ErpSupplierApi supplierApi;
@Resource
@Lazy
private MesQcIqcService iqcService;
@@ -78,6 +82,9 @@
@Resource
private ErpPurchaseOrderApi purchaseOrderApi;
+
+ @Resource
+ private MdmItemApi mdmItemApi;
@Override
public Long createItemReceipt(MesWmItemReceiptSaveReqVO createReqVO) {
@@ -106,8 +113,8 @@
private void validateItemReceiptSaveData(MesWmItemReceiptSaveReqVO reqVO) {
// 鏍￠獙缂栫爜鍞竴
validateCodeUnique(reqVO.getId(), reqVO.getCode());
- // 鏍￠獙渚涘簲鍟嗗瓨鍦�
- vendorService.validateVendorExistsAndEnable(reqVO.getVendorId());
+ // 鏍￠獙渚涘簲鍟嗗瓨鍦紙閲囪喘鍏ュ簱浣跨敤 ERP 渚涘簲鍟嗭級
+ supplierApi.validateSupplier(reqVO.getVendorId());
// 鏍￠獙鍒拌揣閫氱煡鍗曞瓨鍦�
if (reqVO.getNoticeId() != null) {
MesWmArrivalNoticeDO notice = arrivalNoticeService.validateArrivalNoticeReadyForReceipt(reqVO.getNoticeId());
@@ -155,9 +162,33 @@
throw exception(WM_ITEM_RECEIPT_NO_LINE);
}
+ // 鏍￠獙鐗╂枡鎵规绠＄悊锛氬鏋滅墿鏂欏紑鍚壒娆＄鐞嗭紝鍒欐槑缁嗙殑鎵规鍙蜂笉鑳戒负绌�
+ validateBatchManagement(lines);
+
// 鎻愪氦锛堣崏绋� 鈫� 寰呬笂鏋讹級
itemReceiptMapper.updateById(new MesWmItemReceiptDO()
.setId(id).setStatus(MesWmItemReceiptStatusEnum.APPROVING.getStatus()));
+ }
+
+ /**
+ * 鏍￠獙鐗╂枡鎵规绠＄悊锛氬鏋滅墿鏂欏紑鍚壒娆＄鐞嗭紝鍒欒鐨勬壒娆″彿涓嶈兘涓虹┖
+ */
+ private void validateBatchManagement(List<MesWmItemReceiptLineDO> lines) {
+ // 鑾峰彇鎵�鏈夌墿鏂橧D
+ List<Long> itemIds = CollectionUtils.convertList(lines, MesWmItemReceiptLineDO::getItemId);
+ Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemMap(itemIds);
+
+ // 閬嶅巻姣忎竴琛岋紝妫�鏌ョ墿鏂欐槸鍚﹀紑鍚壒娆＄鐞�
+ for (MesWmItemReceiptLineDO line : lines) {
+ MdmItemRespDTO item = itemMap.get(line.getItemId());
+ if (item == null) {
+ continue;
+ }
+ // 濡傛灉鐗╂枡寮�鍚壒娆＄鐞嗭紝妫�鏌ヨ涓婄殑鎵规鍙锋槸鍚︿负绌�
+ if (Boolean.TRUE.equals(item.getIsBatchManaged()) && line.getBatchId() == null) {
+ throw exception(WM_ITEM_RECEIPT_BATCH_REQUIRED, item.getCode(), item.getName());
+ }
+ }
}
@Override
@@ -245,14 +276,26 @@
private void createTransactionList(MesWmItemReceiptDO receipt) {
List<MesWmItemReceiptDetailDO> details = itemReceiptDetailService.getItemReceiptDetailListByReceiptId(receipt.getId());
- wmTransactionService.createTransactionList(convertList(details, detail -> new MesWmTransactionSaveReqDTO()
- .setType(MesWmTransactionTypeEnum.IN.getType()).setItemId(detail.getItemId())
- .setQuantity(detail.getQuantity()) // 鍏ュ簱鏁伴噺涓烘鏁�
- .setBatchId(detail.getBatchId())
- .setWarehouseId(detail.getWarehouseId()).setLocationId(detail.getLocationId()).setAreaId(detail.getAreaId())
- .setVendorId(receipt.getVendorId()).setReceiptTime(receipt.getReceiptDate())
- .setBizType(MesBizTypeConstants.WM_ITEM_RECEIPT_IN).setBizId(receipt.getId())
- .setBizCode(receipt.getCode()).setBizLineId(detail.getLineId())));
+ // 鑾峰彇鎵�鏈夎淇℃伅锛岀敤浜庤幏鍙栨壒娆″彿
+ List<MesWmItemReceiptLineDO> lines = itemReceiptLineService.getItemReceiptLineListByReceiptId(receipt.getId());
+ Map<Long, MesWmItemReceiptLineDO> lineMap = CollectionUtils.convertMap(lines, MesWmItemReceiptLineDO::getId);
+
+ wmTransactionService.createTransactionList(convertList(details, detail -> {
+ // 浠庤涓婅幏鍙栨壒娆′俊鎭紙濡傛灉鏄庣粏娌℃湁鎵规鍙凤級
+ MesWmItemReceiptLineDO line = lineMap.get(detail.getLineId());
+ Long batchId = detail.getBatchId() != null ? detail.getBatchId() :
+ (line != null ? line.getBatchId() : null);
+ String batchCode = line != null ? line.getBatchCode() : null;
+
+ return new MesWmTransactionSaveReqDTO()
+ .setType(MesWmTransactionTypeEnum.IN.getType()).setItemId(detail.getItemId())
+ .setQuantity(detail.getQuantity())
+ .setBatchId(batchId).setBatchCode(batchCode)
+ .setWarehouseId(detail.getWarehouseId()).setLocationId(detail.getLocationId()).setAreaId(detail.getAreaId())
+ .setVendorId(receipt.getVendorId()).setReceiptTime(receipt.getReceiptDate())
+ .setBizType(MesBizTypeConstants.WM_ITEM_RECEIPT_IN).setBizId(receipt.getId())
+ .setBizCode(receipt.getCode()).setBizLineId(detail.getLineId());
+ }));
}
@Override
@@ -331,26 +374,33 @@
// 1. 鏍￠獙鍒拌揣閫氱煡鍗曞瓨鍦ㄤ笖鐘舵�佷负寰呭叆搴�
MesWmArrivalNoticeDO notice = arrivalNoticeService.validateArrivalNoticeReadyForReceipt(arrivalNoticeId);
- // 2. 鑾峰彇鍒拌揣閫氱煡鍗曡
+ // 2. 鏍￠獙鏄惁宸茬敓鎴愯繃鍏ュ簱鍗曪紙闃叉閲嶅鐢熸垚锛�
+ MesWmItemReceiptDO existReceipt = itemReceiptMapper.selectByNoticeId(arrivalNoticeId);
+ if (existReceipt != null) {
+ throw exception(WM_ITEM_RECEIPT_ALREADY_EXISTS);
+ }
+
+ // 3. 鑾峰彇鍒拌揣閫氱煡鍗曡
List<MesWmArrivalNoticeLineDO> lines = arrivalNoticeLineService.getArrivalNoticeLineListByNoticeId(arrivalNoticeId);
if (CollUtil.isEmpty(lines)) {
throw exception(WM_ARRIVAL_NOTICE_NO_LINE);
}
- // 3. 鐢熸垚鍏ュ簱鍗曠紪鐮�
+ // 4. 鐢熸垚鍏ュ簱鍗曠紪鐮�
String code = generateItemReceiptCode();
- // 4. 鍒涘缓鍏ュ簱鍗曚富琛�
+ // 5. 鍒涘缓鍏ュ簱鍗曚富琛�
MesWmItemReceiptDO receipt = new MesWmItemReceiptDO();
receipt.setCode(code);
receipt.setName(notice.getName() + "鍏ュ簱鍗�");
receipt.setNoticeId(arrivalNoticeId);
receipt.setPurchaseOrderCode(notice.getPurchaseOrderCode());
receipt.setVendorId(notice.getVendorId());
+ receipt.setReceiptDate(java.time.LocalDateTime.now()); // 鍏ュ簱鏃堕棿涓哄綋鍓嶆椂闂�
receipt.setStatus(MesWmItemReceiptStatusEnum.PREPARE.getStatus());
itemReceiptMapper.insert(receipt);
- // 5. 閬嶅巻琛屽垱寤哄叆搴撳崟琛�
+ // 6. 閬嶅巻琛屽垱寤哄叆搴撳崟琛�
for (MesWmArrivalNoticeLineDO noticeLine : lines) {
MesWmItemReceiptLineDO receiptLine = new MesWmItemReceiptLineDO();
receiptLine.setReceiptId(receipt.getId());
--
Gitblit v1.9.3