From 7d2ee3cef2e0d68ba6400bc5957640d2771bbf4c Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期三, 16 九月 2026 18:05:40 +0800
Subject: [PATCH] refactor: 单据审核改为审批配置状态机（新增:audit接口/审核人字段/DB变更脚本）
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImpl.java | 219 ++++++++++++++++++++++++++++++------------------------
1 files changed, 122 insertions(+), 97 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 e474e63..baadd8c 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,21 +16,20 @@
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.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.erp.api.purchase.PurchaseOrderApi;
+import cn.iocoder.yudao.module.srm.api.supplier.SrmSupplierApi;
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 cn.iocoder.yudao.module.system.api.approval.ApprovalConfigApi;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+import cn.hutool.core.util.StrUtil;
import jakarta.annotation.Resource;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
@@ -42,9 +41,11 @@
import java.util.Collection;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
/**
@@ -54,6 +55,13 @@
@Validated
@Slf4j
public class MesWmItemReceiptServiceImpl implements MesWmItemReceiptService {
+
+ /**
+ * 閲囪喘鍏ュ簱鍗曞鎵圭殑涓氬姟绫诲瀷缂栫爜
+ *
+ * 涓� system_approval_config.biz_type 瀵瑰簲锛屽鏍镐汉鍦ㄣ�岀郴缁熺鐞� - 瀹℃壒閰嶇疆銆嶄腑缁存姢銆�
+ */
+ private static final String ITEM_RECEIPT_APPROVE_BIZ_TYPE = "item_receipt_approve";
@Resource
private MesWmItemReceiptMapper itemReceiptMapper;
@@ -67,7 +75,7 @@
private MesWmArrivalNoticeService arrivalNoticeService;
@Resource
@Lazy
- private ErpSupplierApi supplierApi;
+ private SrmSupplierApi srmSupplierApi;
@Resource
@Lazy
private MesQcIqcService iqcService;
@@ -78,10 +86,13 @@
private MesWmArrivalNoticeLineService arrivalNoticeLineService;
@Resource
- private BpmProcessInstanceApi processInstanceApi;
+ private AdminUserApi adminUserApi;
@Resource
- private ErpPurchaseOrderApi purchaseOrderApi;
+ private ApprovalConfigApi approvalConfigApi;
+
+ @Resource
+ private PurchaseOrderApi purchaseOrderApi;
@Resource
private MdmItemApi mdmItemApi;
@@ -114,7 +125,7 @@
// 鏍￠獙缂栫爜鍞竴
validateCodeUnique(reqVO.getId(), reqVO.getCode());
// 鏍￠獙渚涘簲鍟嗗瓨鍦紙閲囪喘鍏ュ簱浣跨敤 ERP 渚涘簲鍟嗭級
- supplierApi.validateSupplier(reqVO.getVendorId());
+ srmSupplierApi.getSupplier(reqVO.getVendorId());
// 鏍￠獙鍒拌揣閫氱煡鍗曞瓨鍦�
if (reqVO.getNoticeId() != null) {
MesWmArrivalNoticeDO notice = arrivalNoticeService.validateArrivalNoticeReadyForReceipt(reqVO.getNoticeId());
@@ -165,9 +176,56 @@
// 鏍￠獙鐗╂枡鎵规绠＄悊锛氬鏋滅墿鏂欏紑鍚壒娆＄鐞嗭紝鍒欐槑缁嗙殑鎵规鍙蜂笉鑳戒负绌�
validateBatchManagement(lines);
- // 鎻愪氦锛堣崏绋� 鈫� 寰呬笂鏋讹級
- itemReceiptMapper.updateById(new MesWmItemReceiptDO()
- .setId(id).setStatus(MesWmItemReceiptStatusEnum.APPROVING.getStatus()));
+ // 鏍￠獙瀹℃壒閰嶇疆宸插惎鐢ㄤ笖閰嶇疆浜嗘湁鏁堝鏍镐汉锛堟湭閰嶇疆鏃舵姏鍑哄甫鏄庣‘鎻愮ず鐨勪笟鍔″紓甯革級
+ approvalConfigApi.validateApprovalEnabledAndGetApprovers(ITEM_RECEIPT_APPROVE_BIZ_TYPE);
+
+ // 鎻愪氦锛堣崏绋� 鈫� 寰呬笂鏋讹級锛屽苟娓呯┖涓婁竴杞鏍哥粨鏋�
+ itemReceiptMapper.submitAndResetAuditInfo(id, MesWmItemReceiptStatusEnum.APPROVING.getStatus());
+ }
+
+ @Override
+ public Set<Long> getItemReceiptApproverUserIds() {
+ return approvalConfigApi.getApproverUserIds(ITEM_RECEIPT_APPROVE_BIZ_TYPE);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void auditItemReceipt(Long id, Boolean pass, String reviewRemark) {
+ // 1. 鏍￠獙瀛樺湪
+ MesWmItemReceiptDO receipt = validateItemReceiptExists(id);
+ // 2. 鏍￠獙澶勪簬寰呬笂鏋剁姸鎬�
+ if (!MesWmItemReceiptStatusEnum.APPROVING.getStatus().equals(receipt.getStatus())) {
+ throw exception(WM_ITEM_RECEIPT_NOT_APPROVING);
+ }
+ // 3. 鏍￠獙褰撳墠鐧诲綍鐢ㄦ埛鏄涓氬姟绫诲瀷鐨勫鏍镐汉锛堟垨绛撅細浠讳竴浜哄潎鍙鏍革級
+ Long userId = getLoginUserId();
+ approvalConfigApi.validateApprover(ITEM_RECEIPT_APPROVE_BIZ_TYPE, userId);
+ // 4. 瀹℃牳涓嶉�氳繃锛氬繀椤诲～鍐欏師鍥狅紝閫�鍥炶崏绋垮彲淇敼鍚庨噸鏂版彁浜�
+ if (!Boolean.TRUE.equals(pass)) {
+ if (StrUtil.isBlank(reviewRemark)) {
+ throw exception(WM_ITEM_RECEIPT_REJECT_REASON_REQUIRED);
+ }
+ itemReceiptMapper.auditItemReceipt(id, MesWmItemReceiptStatusEnum.PREPARE.getStatus(),
+ userId, getUserNickname(userId), reviewRemark);
+ return;
+ }
+ // 5. 瀹℃牳閫氳繃锛氳褰曞鏍镐汉涓庡鏍告剰瑙侊紝鐘舵�佺疆涓哄緟鎵ц鍏ュ簱
+ itemReceiptMapper.auditItemReceipt(id, MesWmItemReceiptStatusEnum.APPROVED.getStatus(),
+ userId, getUserNickname(userId), reviewRemark);
+ }
+
+ /**
+ * 鑾峰彇鐢ㄦ埛鏄电О
+ *
+ * @param userId 鐢ㄦ埛缂栧彿
+ * @return 鏄电О锛岀敤鎴蜂笉瀛樺湪鏃惰繑鍥� null
+ */
+ private String getUserNickname(Long userId) {
+ if (userId == null) {
+ return null;
+ }
+ AdminUserRespDTO user = adminUserApi.getUser(userId);
+ return user == null ? null : user.getNickname();
}
/**
@@ -184,11 +242,19 @@
if (item == null) {
continue;
}
- // 濡傛灉鐗╂枡寮�鍚壒娆＄鐞嗭紝妫�鏌ヨ涓婄殑鎵规鍙锋槸鍚︿负绌�
- if (Boolean.TRUE.equals(item.getIsBatchManaged()) && line.getBatchId() == null) {
- throw exception(WM_ITEM_RECEIPT_BATCH_REQUIRED, item.getCode(), item.getName());
+ // 濡傛灉鐗╂枡寮�鍚壒娆＄鐞嗭紝琛屾垨鍏朵笂鏋舵槑缁嗗繀椤绘惡甯︽壒娆″彿锛屽惁鍒欐棤娉曠敓鎴愬簱瀛樹簨鍔�
+ if (Boolean.TRUE.equals(item.getIsBatchManaged())) {
+ boolean hasBatch = line.getBatchId() != null
+ || hasDetailBatch(itemReceiptDetailService.getItemReceiptDetailListByLineId(line.getId()));
+ if (!hasBatch) {
+ throw exception(WM_ITEM_RECEIPT_BATCH_REQUIRED, item.getCode(), item.getName());
+ }
}
}
+ }
+
+ private boolean hasDetailBatch(List<MesWmItemReceiptDetailDO> details) {
+ return details.stream().anyMatch(detail -> detail.getBatchId() != null);
}
@Override
@@ -247,28 +313,49 @@
* 鍥炲啓 ERP 閲囪喘璁㈠崟鐨勫叆搴撴暟閲�
*/
private void updateErpPurchaseOrderInCount(MesWmItemReceiptDO receipt) {
- // 鑾峰彇鍏ュ簱鍗曡
- List<MesWmItemReceiptLineDO> lines = itemReceiptLineService.getItemReceiptLineListByReceiptId(receipt.getId());
- if (CollUtil.isEmpty(lines)) {
- return;
+ // 1. 纭畾閲囪喘璁㈠崟 ID锛氫紭鍏堜粠鍏ュ簱鍗曞ご鍙栵紙浠庡埌璐ч�氱煡鍗曞甫鍏ワ級锛屽叾娆′粠琛屽弽鏌�
+ Long purchaseOrderId = receipt.getPurchaseOrderId();
+ if (purchaseOrderId == null && receipt.getNoticeId() != null) {
+ // 浠庡叧鑱旂殑鍒拌揣閫氱煡鍗曡幏鍙栭噰璐鍗� ID
+ MesWmArrivalNoticeDO notice = arrivalNoticeService.getArrivalNotice(receipt.getNoticeId());
+ if (notice != null) {
+ purchaseOrderId = notice.getPurchaseOrderId();
+ }
}
- // 鐢ㄤ簬瀛樺偍閲囪喘璁㈠崟 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();
+
+ // 2. 鑾峰彇鍏ュ簱鍗曡锛屾寜 purchaseOrderItemId 鏇存柊鍏ュ簱鏁伴噺
+ List<MesWmItemReceiptLineDO> lines = itemReceiptLineService.getItemReceiptLineListByReceiptId(receipt.getId());
+ if (CollUtil.isNotEmpty(lines)) {
+ for (MesWmItemReceiptLineDO line : lines) {
+ if (line.getPurchaseOrderItemId() != null && line.getReceivedQuantity() != null) {
+ purchaseOrderApi.updateOrderItemInCount(line.getPurchaseOrderItemId(), line.getReceivedQuantity());
+ // 濡傛灉杩樻病鎷垮埌 purchaseOrderId锛屼粠鏄庣粏椤瑰弽鏌�
+ 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();
+ }
+ }
+ }
+ }
+ } else if (receipt.getNoticeId() != null) {
+ // 鍏滃簳锛氬叆搴撹涓虹┖鏃讹紝浠庡埌璐ч�氱煡鍗曡鍥炲啓鍏ュ簱鏁伴噺
+ List<MesWmArrivalNoticeLineDO> noticeLines = arrivalNoticeLineService
+ .getArrivalNoticeLineListByNoticeId(receipt.getNoticeId());
+ for (MesWmArrivalNoticeLineDO noticeLine : noticeLines) {
+ if (noticeLine.getPurchaseOrderItemId() != null) {
+ // 浣跨敤鍚堟牸鏁伴噺锛堟湁 IQC 鏃朵负鍚堟牸鏁伴噺锛屽惁鍒欎负鍒拌揣鏁伴噺锛�
+ BigDecimal qty = noticeLine.getQualifiedQuantity() != null
+ ? noticeLine.getQualifiedQuantity() : noticeLine.getArrivalQuantity();
+ if (qty != null && qty.compareTo(BigDecimal.ZERO) > 0) {
+ purchaseOrderApi.updateOrderItemInCount(noticeLine.getPurchaseOrderItemId(), qty);
}
}
}
}
- // 鏇存柊閲囪喘璁㈠崟鐨勫叆搴撶姸鎬�
+
+ // 3. 鏇存柊閲囪喘璁㈠崟鐨勫叆搴撶姸鎬�
if (purchaseOrderId != null) {
purchaseOrderApi.updateOrderInStatus(purchaseOrderId);
}
@@ -394,6 +481,7 @@
receipt.setCode(code);
receipt.setName(notice.getName() + "鍏ュ簱鍗�");
receipt.setNoticeId(arrivalNoticeId);
+ receipt.setPurchaseOrderId(notice.getPurchaseOrderId());
receipt.setPurchaseOrderCode(notice.getPurchaseOrderCode());
receipt.setVendorId(notice.getVendorId());
receipt.setReceiptDate(java.time.LocalDateTime.now()); // 鍏ュ簱鏃堕棿涓哄綋鍓嶆椂闂�
@@ -413,69 +501,6 @@
}
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; // 榛樿鐢ㄦ埛
}
/**
--
Gitblit v1.9.3