From 88e384da863bb2f7324cb1e1474885df3b7cce91 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 13 七月 2026 11:27:49 +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 | 164 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 164 insertions(+), 0 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..662cc0a 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,16 +16,25 @@
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.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;
+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 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;
@@ -40,6 +49,7 @@
*/
@Service
@Validated
+@Slf4j
public class MesWmItemReceiptServiceImpl implements MesWmItemReceiptService {
@Resource
@@ -59,6 +69,15 @@
private MesQcIqcService iqcService;
@Resource
private MesWmTransactionService wmTransactionService;
+
+ @Resource
+ private MesWmArrivalNoticeLineService arrivalNoticeLineService;
+
+ @Resource
+ private BpmProcessInstanceApi processInstanceApi;
+
+ @Resource
+ private ErpPurchaseOrderApi purchaseOrderApi;
@Override
public Long createItemReceipt(MesWmItemReceiptSaveReqVO createReqVO) {
@@ -188,6 +207,40 @@
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) {
@@ -272,4 +325,115 @@
return itemReceiptMapper.selectByIds(ids);
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Long generateItemReceiptFromArrivalNotice(Long arrivalNoticeId) {
+ // 1. 鏍￠獙鍒拌揣閫氱煡鍗曞瓨鍦ㄤ笖鐘舵�佷负寰呭叆搴�
+ MesWmArrivalNoticeDO notice = arrivalNoticeService.validateArrivalNoticeReadyForReceipt(arrivalNoticeId);
+
+ // 2. 鑾峰彇鍒拌揣閫氱煡鍗曡
+ List<MesWmArrivalNoticeLineDO> lines = arrivalNoticeLineService.getArrivalNoticeLineListByNoticeId(arrivalNoticeId);
+ if (CollUtil.isEmpty(lines)) {
+ throw exception(WM_ARRIVAL_NOTICE_NO_LINE);
+ }
+
+ // 3. 鐢熸垚鍏ュ簱鍗曠紪鐮�
+ String code = generateItemReceiptCode();
+
+ // 4. 鍒涘缓鍏ュ簱鍗曚富琛�
+ MesWmItemReceiptDO receipt = new MesWmItemReceiptDO();
+ receipt.setCode(code);
+ receipt.setName(notice.getName() + "鍏ュ簱鍗�");
+ receipt.setNoticeId(arrivalNoticeId);
+ receipt.setPurchaseOrderCode(notice.getPurchaseOrderCode());
+ receipt.setVendorId(notice.getVendorId());
+ receipt.setStatus(MesWmItemReceiptStatusEnum.PREPARE.getStatus());
+ itemReceiptMapper.insert(receipt);
+
+ // 5. 閬嶅巻琛屽垱寤哄叆搴撳崟琛�
+ 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