From 5421b8af862890dcf187c2ad5ece55423959ba85 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期五, 23 十月 2026 19:27:14 +0800
Subject: [PATCH] feat(bpm): 全部业务审批流改回 BPM，审批统一进入协同办公
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImpl.java | 267 +++++++++++++++++++++++++++++++++++------------------
1 files changed, 175 insertions(+), 92 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 9611fdd..d7d831a 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
@@ -6,6 +6,11 @@
import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
+import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
+import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
+import cn.iocoder.yudao.module.bpm.enums.task.BpmTaskStatusEnum;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.MesWmItemReceiptImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.MesWmItemReceiptImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.MesWmItemReceiptPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.MesWmItemReceiptSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.arrivalnotice.MesWmArrivalNoticeDO;
@@ -16,21 +21,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;
@@ -39,12 +43,17 @@
import lombok.extern.slf4j.Slf4j;
import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.Collection;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
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.*;
/**
@@ -55,8 +64,23 @@
@Slf4j
public class MesWmItemReceiptServiceImpl implements MesWmItemReceiptService {
+ /**
+ * 閲囪喘鍏ュ簱鍗曞鎵圭殑涓氬姟绫诲瀷缂栫爜
+ *
+ * 涓� system_approval_config.biz_type 瀵瑰簲锛屽鏍镐汉鍦ㄣ�岀郴缁熺鐞� - 瀹℃壒閰嶇疆銆嶄腑缁存姢銆�
+ */
+ private static final String ITEM_RECEIPT_APPROVE_BIZ_TYPE = "item_receipt_approve";
+
+ /**
+ * 閲囪喘鍏ュ簱鍗曞鎵圭殑 BPM 娴佺▼瀹氫箟 Key
+ */
+ private static final String ITEM_RECEIPT_APPROVE_PROCESS_KEY = "item_receipt_approve";
+
@Resource
private MesWmItemReceiptMapper itemReceiptMapper;
+
+ @Resource
+ private BpmProcessInstanceApi bpmProcessInstanceApi;
@Resource
private MesWmItemReceiptLineService itemReceiptLineService;
@@ -67,7 +91,7 @@
private MesWmArrivalNoticeService arrivalNoticeService;
@Resource
@Lazy
- private ErpSupplierApi supplierApi;
+ private SrmSupplierApi srmSupplierApi;
@Resource
@Lazy
private MesQcIqcService iqcService;
@@ -78,10 +102,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 +141,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 +192,80 @@
// 鏍￠獙鐗╂枡鎵规绠＄悊锛氬鏋滅墿鏂欏紑鍚壒娆＄鐞嗭紝鍒欐槑缁嗙殑鎵规鍙蜂笉鑳戒负绌�
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());
+ // 鍒涘缓 BPM 娴佺▼瀹炰緥锛屼娇瀹℃壒鍑虹幇鍦ㄣ�屽崗鍚屽姙鍏� - 鎴戠殑娴佺▼銆�
+ bpmProcessInstanceApi.createProcessInstance(getLoginUserId(),
+ new BpmProcessInstanceCreateReqDTO()
+ .setProcessDefinitionKey(ITEM_RECEIPT_APPROVE_PROCESS_KEY)
+ .setBusinessKey(String.valueOf(id)));
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateItemReceiptAuditStatus(Long id, Integer bpmStatus, String reason) {
+ // BPM 瀹℃壒缁撴灉鏄犲皠涓哄崟鎹姸鎬侊細閫氳繃=寰呮墽琛屽叆搴� / 涓嶉�氳繃=鑽夌 / 鍙栨秷=宸插彇娑�
+ Integer status;
+ if (BpmTaskStatusEnum.APPROVE.getStatus().equals(bpmStatus)) {
+ status = MesWmItemReceiptStatusEnum.APPROVED.getStatus();
+ } else if (BpmTaskStatusEnum.REJECT.getStatus().equals(bpmStatus)) {
+ status = MesWmItemReceiptStatusEnum.PREPARE.getStatus();
+ } else if (BpmTaskStatusEnum.CANCEL.getStatus().equals(bpmStatus)) {
+ status = MesWmItemReceiptStatusEnum.CANCELED.getStatus();
+ } else {
+ return;
+ }
+ if (itemReceiptMapper.updateAuditStatusByBpm(id, status, reason) != 1) {
+ log.warn("[updateItemReceiptAuditStatus] 閲囪喘鍏ュ簱鍗�({}) 涓嶅浜庡鎵逛腑鐘舵�侊紝蹇界暐 BPM 缁撴灉({})", id, bpmStatus);
+ }
+ }
+
+ @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,19 +282,27 @@
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
@Transactional(rollbackFor = Exception.class)
public void stockItemReceipt(Long id) {
- // 鏍￠獙瀛樺湪
+ // 鏍￠獙瀛樺湪 + 宸插鎵癸紙鐘舵�佸彧鑳界敱 audit 鎺ㄨ繘锛欰PPROVING 鈫� APPROVED锛�
MesWmItemReceiptDO receipt = validateItemReceiptExists(id);
- if (ObjUtil.notEqual(MesWmItemReceiptStatusEnum.APPROVING.getStatus(), receipt.getStatus())) {
+ if (ObjUtil.notEqual(MesWmItemReceiptStatusEnum.APPROVED.getStatus(), receipt.getStatus())) {
throw exception(WM_ITEM_RECEIPT_STATUS_ERROR);
}
// 鏍￠獙姣忚鏄庣粏鏁伴噺涔嬪拰鏄惁绛変簬琛屽叆搴撴暟閲�
@@ -212,10 +318,8 @@
throw exception(WM_ITEM_RECEIPT_DETAIL_QUANTITY_MISMATCH);
}
}
-
- // 鎵ц涓婃灦锛堝緟涓婃灦 鈫� 寰呭叆搴擄級
- itemReceiptMapper.updateById(new MesWmItemReceiptDO()
- .setId(id).setStatus(MesWmItemReceiptStatusEnum.APPROVED.getStatus()));
+ // 娉ㄦ剰锛氭湰鏂规硶浠呭仛鏁伴噺涓�鑷存�ф牎楠岋紝涓嶅緱淇敼鍗曟嵁鐘舵�併��
+ // 鐘舵�佹祦杞敱 audit锛圓PPROVING 鈫� APPROVED锛変笌 finish锛圓PPROVED 鈫� FINISHED锛夎礋璐ｃ��
}
@Override
@@ -337,12 +441,8 @@
@Override
public MesWmItemReceiptDO validateItemReceiptEditable(Long id) {
- MesWmItemReceiptDO receipt = validateItemReceiptExists(id);
- if (ObjUtil.notEqual(receipt.getStatus(), MesWmItemReceiptStatusEnum.PREPARE.getStatus())
- && ObjUtil.notEqual(receipt.getStatus(), MesWmItemReceiptStatusEnum.APPROVING.getStatus())) {
- throw exception(WM_ITEM_RECEIPT_STATUS_NOT_PREPARE);
- }
- return receipt;
+ // 浠呰崏绋跨姸鎬佸厑璁哥紪杈戣/鏄庣粏锛涘鎵逛腑锛圓PPROVING锛夊凡閿佸畾锛岄伩鍏嶇粫杩囧鏍镐慨鏀规暟鎹�
+ return validateItemReceiptExistsAndDraft(id);
}
private MesWmItemReceiptDO validateItemReceiptExists(Long id) {
@@ -437,69 +537,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; // 榛樿鐢ㄦ埛
- }
-
/**
* 鐢熸垚鍏ュ簱鍗曠紪鐮�
*/
@@ -508,4 +545,50 @@
return "IR" + System.currentTimeMillis();
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public MesWmItemReceiptImportRespVO importItemReceiptList(List<MesWmItemReceiptImportExcelVO> importList, boolean updateSupport) {
+ if (CollUtil.isEmpty(importList)) {
+ throw exception(WM_ITEM_RECEIPT_IMPORT_LIST_IS_EMPTY);
+ }
+ MesWmItemReceiptImportRespVO respVO = MesWmItemReceiptImportRespVO.builder()
+ .createCodes(new ArrayList<>()).updateCodes(new ArrayList<>())
+ .failureCodes(new LinkedHashMap<>()).build();
+ AtomicInteger index = new AtomicInteger(1);
+ importList.forEach(importItem -> {
+ int currentIndex = index.getAndIncrement();
+ String code = importItem.getCode();
+ String key = StrUtil.blankToDefault(code, "绗� " + currentIndex + " 琛�");
+ if (StrUtil.isBlank(code)) {
+ respVO.getFailureCodes().put(key, "鍗曞彿涓嶈兘涓虹┖");
+ return;
+ }
+ if (StrUtil.isBlank(importItem.getName())) {
+ respVO.getFailureCodes().put(key, "鍚嶇О涓嶈兘涓虹┖");
+ return;
+ }
+ MesWmItemReceiptDO existing = itemReceiptMapper.selectByCode(code);
+ if (existing != null && updateSupport) {
+ if (!MesWmItemReceiptStatusEnum.PREPARE.getStatus().equals(existing.getStatus())) {
+ respVO.getFailureCodes().put(key, "鍗曟嵁闈炶崏绋跨姸鎬侊紝涓嶅厑璁歌鐩栨洿鏂�");
+ return;
+ }
+ MesWmItemReceiptDO updateObj = BeanUtils.toBean(importItem, MesWmItemReceiptDO.class);
+ updateObj.setId(existing.getId());
+ updateObj.setStatus(existing.getStatus());
+ itemReceiptMapper.updateById(updateObj);
+ respVO.getUpdateCodes().add(code);
+ } else if (existing != null) {
+ respVO.getFailureCodes().put(key, "鍗曞彿宸插瓨鍦細" + code);
+ } else {
+ MesWmItemReceiptDO createObj = BeanUtils.toBean(importItem, MesWmItemReceiptDO.class);
+ createObj.setId(null);
+ createObj.setStatus(MesWmItemReceiptStatusEnum.PREPARE.getStatus());
+ itemReceiptMapper.insert(createObj);
+ respVO.getCreateCodes().add(code);
+ }
+ });
+ return respVO;
+ }
+
}
--
Gitblit v1.9.3