From d54fbc9d4f8981fa0f7f613b33a28a8cd4f764ea Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期日, 25 十月 2026 16:29:53 +0800
Subject: [PATCH] feat(system): 优化用户搜索功能并完善ERP和MES模块验证逻辑
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorServiceImpl.java | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 107 insertions(+), 6 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorServiceImpl.java
index 271d5d1..e56923e 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorServiceImpl.java
@@ -7,6 +7,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.returnvendor.vo.MesWmReturnVendorImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.returnvendor.vo.MesWmReturnVendorImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.returnvendor.vo.MesWmReturnVendorPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.returnvendor.vo.MesWmReturnVendorSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnvendor.MesWmReturnVendorDO;
@@ -29,8 +34,11 @@
import org.springframework.validation.annotation.Validated;
import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
import java.util.List;
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;
@@ -52,8 +60,16 @@
*/
private static final String RETURN_VENDOR_APPROVE_BIZ_TYPE = "return_vendor_approve";
+ /**
+ * 渚涘簲鍟嗛��璐у崟瀹℃壒鐨� BPM 娴佺▼瀹氫箟 Key
+ */
+ private static final String RETURN_VENDOR_APPROVE_PROCESS_KEY = "return_vendor_approve";
+
@Resource
private MesWmReturnVendorMapper returnVendorMapper;
+
+ @Resource
+ private BpmProcessInstanceApi bpmProcessInstanceApi;
@Resource
private MesWmReturnVendorLineService returnVendorLineService;
@@ -130,6 +146,30 @@
approvalConfigApi.validateApprovalEnabledAndGetApprovers(RETURN_VENDOR_APPROVE_BIZ_TYPE);
// 4. 鎻愪氦瀹℃壒锛堣崏绋� 鈫� 寰呮嫞璐э級锛屽苟娓呯┖涓婁竴杞鏍哥粨鏋�
returnVendorMapper.submitAndResetAuditInfo(id, MesWmReturnVendorStatusEnum.APPROVING.getStatus());
+ // 5. 鍒涘缓 BPM 娴佺▼瀹炰緥锛屼娇瀹℃壒鍑虹幇鍦ㄣ�屽崗鍚屽姙鍏� - 鎴戠殑娴佺▼銆�
+ bpmProcessInstanceApi.createProcessInstance(getLoginUserId(),
+ new BpmProcessInstanceCreateReqDTO()
+ .setProcessDefinitionKey(RETURN_VENDOR_APPROVE_PROCESS_KEY)
+ .setBusinessKey(String.valueOf(id)));
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateReturnVendorAuditStatus(Long id, Integer bpmStatus, String reason) {
+ // BPM 瀹℃壒缁撴灉鏄犲皠涓哄崟鎹姸鎬侊細閫氳繃=寰呮墽琛岄��璐� / 涓嶉�氳繃=鑽夌 / 鍙栨秷=宸插彇娑�
+ Integer status;
+ if (BpmTaskStatusEnum.APPROVE.getStatus().equals(bpmStatus)) {
+ status = MesWmReturnVendorStatusEnum.APPROVED.getStatus();
+ } else if (BpmTaskStatusEnum.REJECT.getStatus().equals(bpmStatus)) {
+ status = MesWmReturnVendorStatusEnum.PREPARE.getStatus();
+ } else if (BpmTaskStatusEnum.CANCEL.getStatus().equals(bpmStatus)) {
+ status = MesWmReturnVendorStatusEnum.CANCELED.getStatus();
+ } else {
+ return;
+ }
+ if (returnVendorMapper.updateAuditStatusByBpm(id, status, reason) != 1) {
+ log.warn("[updateReturnVendorAuditStatus] 渚涘簲鍟嗛��璐у崟({}) 涓嶅浜庡鎵逛腑鐘舵�侊紝蹇界暐 BPM 缁撴灉({})", id, bpmStatus);
+ }
}
@Override
@@ -180,14 +220,15 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void stockReturnVendor(Long id) {
- // 鏍￠獙瀛樺湪
+ // 鏍￠獙瀛樺湪 + 宸插鎵癸紙鐘舵�佸彧鑳界敱 audit 鎺ㄨ繘锛欰PPROVING 鈫� APPROVED锛�
MesWmReturnVendorDO returnVendor = validateReturnVendorExists(id);
- if (ObjUtil.notEqual(MesWmReturnVendorStatusEnum.APPROVING.getStatus(), returnVendor.getStatus())) {
+ if (ObjUtil.notEqual(MesWmReturnVendorStatusEnum.APPROVED.getStatus(), returnVendor.getStatus())) {
throw exception(WM_RETURN_VENDOR_STATUS_INVALID);
}
- // 鎵ц鎷ｈ揣锛堝緟鎷ｈ揣 -> 寰呮墽琛岄��璐э級
- returnVendorMapper.updateById(new MesWmReturnVendorDO()
- .setId(id).setStatus(MesWmReturnVendorStatusEnum.APPROVED.getStatus()));
+ // 浠呮牎楠岃鏁伴噺涓庢槑缁嗘暟閲忎竴鑷达紝涓嶄慨鏀瑰崟鎹姸鎬�
+ if (!Boolean.TRUE.equals(checkReturnVendorQuantity(id))) {
+ throw exception(WM_RETURN_VENDOR_DETAIL_QUANTITY_MISMATCH);
+ }
}
@Override
@@ -203,6 +244,10 @@
if (CollUtil.isEmpty(details)) {
throw exception(WM_RETURN_VENDOR_NO_DETAIL);
}
+ // 1.3 鏍￠獙姣忚鏄庣粏鏁伴噺涔嬪拰绛変簬琛岄��璐ф暟閲忥紝閬垮厤鍑哄簱鏁伴噺涓庡崟鎹笉涓�鑷�
+ if (!Boolean.TRUE.equals(checkReturnVendorQuantity(id))) {
+ throw exception(WM_RETURN_VENDOR_DETAIL_QUANTITY_MISMATCH);
+ }
// 2. 閬嶅巻鎵�鏈夋槑缁嗭紝鍒涘缓搴撳瓨浜嬪姟锛堟墸鍑忓簱瀛� + 璁板綍娴佹按锛�
createTransactionList(returnVendor, details);
@@ -215,12 +260,22 @@
private void createTransactionList(MesWmReturnVendorDO returnVendor, List<MesWmReturnVendorDetailDO> details) {
wmTransactionService.createTransactionList(convertList(details, detail -> new MesWmTransactionSaveReqDTO()
.setType(MesWmTransactionTypeEnum.OUT.getType()).setItemId(detail.getItemId())
- .setQuantity(detail.getQuantity().negate()) // 鍑哄簱鏁伴噺涓鸿礋鏁�
+ .setQuantity(negateQuantity(detail.getQuantity())) // 鍑哄簱鏁伴噺涓鸿礋鏁�
.setBatchId(detail.getBatchId()).setBatchCode(detail.getBatchCode())
.setWarehouseId(detail.getWarehouseId()).setLocationId(detail.getLocationId()).setAreaId(detail.getAreaId())
.setVendorId(returnVendor.getVendorId())
.setBizType(MesBizTypeConstants.WM_RETURN_VENDOR).setBizId(returnVendor.getId())
.setBizCode(returnVendor.getCode()).setBizLineId(detail.getLineId())));
+ }
+
+ /**
+ * 鍑哄簱鏁伴噺鍙栬礋锛氭暟閲忎负绌烘椂鎶涘嚭鏄庣‘鐨勪笟鍔″紓甯革紝閬垮厤 NPE
+ */
+ private BigDecimal negateQuantity(BigDecimal quantity) {
+ if (quantity == null) {
+ throw exception(WM_RETURN_VENDOR_DETAIL_QUANTITY_INVALID);
+ }
+ return quantity.negate();
}
@Override
@@ -304,4 +359,50 @@
return returnVendorMapper.selectCountByVendorId(vendorId);
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public MesWmReturnVendorImportRespVO importReturnVendorList(List<MesWmReturnVendorImportExcelVO> importList, boolean updateSupport) {
+ if (CollUtil.isEmpty(importList)) {
+ throw exception(WM_RETURN_VENDOR_IMPORT_LIST_IS_EMPTY);
+ }
+ MesWmReturnVendorImportRespVO respVO = MesWmReturnVendorImportRespVO.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;
+ }
+ MesWmReturnVendorDO existing = returnVendorMapper.selectByCode(code);
+ if (existing != null && updateSupport) {
+ if (!MesWmReturnVendorStatusEnum.PREPARE.getStatus().equals(existing.getStatus())) {
+ respVO.getFailureCodes().put(key, "鍗曟嵁闈炶崏绋跨姸鎬侊紝涓嶅厑璁歌鐩栨洿鏂�");
+ return;
+ }
+ MesWmReturnVendorDO updateObj = BeanUtils.toBean(importItem, MesWmReturnVendorDO.class);
+ updateObj.setId(existing.getId());
+ updateObj.setStatus(existing.getStatus());
+ returnVendorMapper.updateById(updateObj);
+ respVO.getUpdateCodes().add(code);
+ } else if (existing != null) {
+ respVO.getFailureCodes().put(key, "鍗曞彿宸插瓨鍦細" + code);
+ } else {
+ MesWmReturnVendorDO createObj = BeanUtils.toBean(importItem, MesWmReturnVendorDO.class);
+ createObj.setId(null);
+ createObj.setStatus(MesWmReturnVendorStatusEnum.PREPARE.getStatus());
+ returnVendorMapper.insert(createObj);
+ respVO.getCreateCodes().add(code);
+ }
+ });
+ return respVO;
+ }
+
}
--
Gitblit v1.9.3