From be5783c8a7e13bbc76d33c95643d75779cce21db Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 18 七月 2026 15:39:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImpl.java | 238 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 226 insertions(+), 12 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 0875cbd..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
@@ -16,20 +16,32 @@
import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmItemReceiptStatusEnum;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmTransactionTypeEnum;
-import cn.iocoder.yudao.module.mes.service.md.vendor.MesMdVendorService;
+import cn.iocoder.yudao.module.bpm.enums.task.BpmTaskStatusEnum;
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;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.arrivalnotice.MesWmArrivalNoticeLineDO;
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.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;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
+import lombok.extern.slf4j.Slf4j;
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;
@@ -40,6 +52,7 @@
*/
@Service
@Validated
+@Slf4j
public class MesWmItemReceiptServiceImpl implements MesWmItemReceiptService {
@Resource
@@ -53,12 +66,25 @@
@Lazy
private MesWmArrivalNoticeService arrivalNoticeService;
@Resource
- private MesMdVendorService vendorService;
+ @Lazy
+ private ErpSupplierApi supplierApi;
@Resource
@Lazy
private MesQcIqcService iqcService;
@Resource
private MesWmTransactionService wmTransactionService;
+
+ @Resource
+ private MesWmArrivalNoticeLineService arrivalNoticeLineService;
+
+ @Resource
+ private BpmProcessInstanceApi processInstanceApi;
+
+ @Resource
+ private ErpPurchaseOrderApi purchaseOrderApi;
+
+ @Resource
+ private MdmItemApi mdmItemApi;
@Override
public Long createItemReceipt(MesWmItemReceiptSaveReqVO createReqVO) {
@@ -87,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());
@@ -136,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
@@ -188,18 +238,64 @@
if (receipt.getNoticeId() != null) {
arrivalNoticeService.finishArrivalNotice(receipt.getNoticeId());
}
+
+ // 5. 鍥炲啓 ERP 閲囪喘璁㈠崟鐨勫叆搴撴暟閲�
+ updateErpPurchaseOrderInCount(receipt);
+ }
+
+ /**
+ * 鍥炲啓 ERP 閲囪喘璁㈠崟鐨勫叆搴撴暟閲�
+ */
+ private void updateErpPurchaseOrderInCount(MesWmItemReceiptDO receipt) {
+ // 鑾峰彇鍏ュ簱鍗曡
+ List<MesWmItemReceiptLineDO> lines = itemReceiptLineService.getItemReceiptLineListByReceiptId(receipt.getId());
+ if (CollUtil.isEmpty(lines)) {
+ return;
+ }
+ // 鐢ㄤ簬瀛樺偍閲囪喘璁㈠崟 ID锛岄伩鍏嶉噸澶嶆洿鏂�
+ Long purchaseOrderId = null;
+ // 閬嶅巻琛岋紝鎸� purchaseOrderItemId 鏇存柊鍏ュ簱鏁伴噺
+ for (MesWmItemReceiptLineDO line : lines) {
+ if (line.getPurchaseOrderItemId() != null && line.getReceivedQuantity() != null) {
+ purchaseOrderApi.updateOrderItemInCount(line.getPurchaseOrderItemId(), line.getReceivedQuantity());
+ // 鑾峰彇閲囪喘璁㈠崟 ID锛堜粠绗竴涓湁鏁堢殑鏄庣粏椤硅幏鍙栵級
+ if (purchaseOrderId == null) {
+ cn.iocoder.yudao.module.erp.api.purchase.dto.ErpPurchaseOrderItemRespDTO itemDTO =
+ purchaseOrderApi.getPurchaseOrderItem(line.getPurchaseOrderItemId()).getCheckedData();
+ if (itemDTO != null && itemDTO.getOrderId() != null) {
+ purchaseOrderId = itemDTO.getOrderId();
+ }
+ }
+ }
+ }
+ // 鏇存柊閲囪喘璁㈠崟鐨勫叆搴撶姸鎬�
+ if (purchaseOrderId != null) {
+ purchaseOrderApi.updateOrderInStatus(purchaseOrderId);
+ }
}
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
@@ -272,4 +368,122 @@
return itemReceiptMapper.selectByIds(ids);
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Long generateItemReceiptFromArrivalNotice(Long arrivalNoticeId) {
+ // 1. 鏍￠獙鍒拌揣閫氱煡鍗曞瓨鍦ㄤ笖鐘舵�佷负寰呭叆搴�
+ MesWmArrivalNoticeDO notice = arrivalNoticeService.validateArrivalNoticeReadyForReceipt(arrivalNoticeId);
+
+ // 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);
+ }
+
+ // 4. 鐢熸垚鍏ュ簱鍗曠紪鐮�
+ String code = generateItemReceiptCode();
+
+ // 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);
+
+ // 6. 閬嶅巻琛屽垱寤哄叆搴撳崟琛�
+ for (MesWmArrivalNoticeLineDO noticeLine : lines) {
+ MesWmItemReceiptLineDO receiptLine = new MesWmItemReceiptLineDO();
+ receiptLine.setReceiptId(receipt.getId());
+ receiptLine.setArrivalNoticeLineId(noticeLine.getId());
+ receiptLine.setPurchaseOrderItemId(noticeLine.getPurchaseOrderItemId());
+ receiptLine.setItemId(noticeLine.getItemId());
+ // 浣跨敤鍚堟牸鏁伴噺锛堝鏋滄湁 IQC 鍒欐槸鍚堟牸鏁伴噺锛屽惁鍒欐槸鍒拌揣鏁伴噺锛�
+ receiptLine.setReceivedQuantity(noticeLine.getQualifiedQuantity() != null ? noticeLine.getQualifiedQuantity() : noticeLine.getArrivalQuantity());
+ itemReceiptLineService.createItemReceiptLineFromArrivalNoticeLine(receiptLine);
+ }
+
+ return receipt.getId();
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void submitItemReceiptApproval(Long id, String processDefinitionKey) {
+ // 1. 鏍￠獙瀛樺湪 + 鑽夌鐘舵��
+ validateItemReceiptExistsAndDraft(id);
+
+ // 2. 鍒涘缓 BPM 娴佺▼瀹炰緥
+ Long userId = getCurrentUserId();
+ String processInstanceId = processInstanceApi.createProcessInstance(userId,
+ new BpmProcessInstanceCreateReqDTO()
+ .setProcessDefinitionKey(processDefinitionKey)
+ .setBusinessKey(String.valueOf(id)));
+
+ // 3. 鏇存柊鍏ュ簱鍗曠姸鎬佷负瀹℃壒涓�
+ itemReceiptMapper.updateById(new MesWmItemReceiptDO()
+ .setId(id)
+ .setStatus(MesWmItemReceiptStatusEnum.APPROVING.getStatus())
+ .setProcessInstanceId(processInstanceId));
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateItemReceiptAuditStatus(Long id, Integer bpmResult) {
+ // 1. 鏍￠獙瀛樺湪
+ MesWmItemReceiptDO receipt = validateItemReceiptExists(id);
+ if (!MesWmItemReceiptStatusEnum.APPROVING.getStatus().equals(receipt.getStatus())) {
+ log.warn("[updateItemReceiptAuditStatus] 鍏ュ簱鍗�({}) 涓嶅浜庡鎵逛腑鐘舵��", id);
+ return;
+ }
+
+ // 2. 鏍规嵁瀹℃壒缁撴灉鏇存柊鐘舵��
+ Integer newStatus = convertBpmResultToReceiptStatus(bpmResult);
+ if (newStatus != null) {
+ itemReceiptMapper.updateById(new MesWmItemReceiptDO()
+ .setId(id).setStatus(newStatus));
+ }
+ }
+
+ /**
+ * 杞崲 BPM 瀹℃壒缁撴灉涓哄叆搴撳崟鐘舵��
+ */
+ private Integer convertBpmResultToReceiptStatus(Integer bpmResult) {
+ if (BpmTaskStatusEnum.APPROVE.getStatus().equals(bpmResult)) {
+ return MesWmItemReceiptStatusEnum.APPROVED.getStatus();
+ } else if (BpmTaskStatusEnum.REJECT.getStatus().equals(bpmResult)) {
+ return MesWmItemReceiptStatusEnum.PREPARE.getStatus();
+ } else if (BpmTaskStatusEnum.CANCEL.getStatus().equals(bpmResult)) {
+ return MesWmItemReceiptStatusEnum.CANCELED.getStatus();
+ }
+ return null;
+ }
+
+ /**
+ * 鑾峰彇褰撳墠鐢ㄦ埛 ID
+ */
+ private Long getCurrentUserId() {
+ Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+ if (authentication != null && authentication.getPrincipal() instanceof Long) {
+ return (Long) authentication.getPrincipal();
+ }
+ return 1L; // 榛樿鐢ㄦ埛
+ }
+
+ /**
+ * 鐢熸垚鍏ュ簱鍗曠紪鐮�
+ */
+ private String generateItemReceiptCode() {
+ // TODO: 浣跨敤缂栫爜瑙勫垯鏈嶅姟鐢熸垚缂栫爜
+ return "IR" + System.currentTimeMillis();
+ }
+
}
--
Gitblit v1.9.3