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/miscissue/MesWmMiscIssueServiceImpl.java | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 102 insertions(+), 1 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscissue/MesWmMiscIssueServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscissue/MesWmMiscIssueServiceImpl.java
index 1abd1f0..d5b0d55 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscissue/MesWmMiscIssueServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscissue/MesWmMiscIssueServiceImpl.java
@@ -6,6 +6,11 @@
import cn.iocoder.yudao.framework.common.pojo.PageResult;
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.miscissue.vo.MesWmMiscIssueImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.miscissue.vo.MesWmMiscIssueImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.miscissue.vo.MesWmMiscIssuePageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.miscissue.vo.MesWmMiscIssueSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.miscissue.MesWmMiscIssueDO;
@@ -25,8 +30,12 @@
import org.springframework.transaction.annotation.Transactional;
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;
@@ -48,8 +57,16 @@
*/
private static final String MISC_ISSUE_APPROVE_BIZ_TYPE = "misc_issue_approve";
+ /**
+ * 鏉傞」鍑哄簱鍗曞鎵圭殑 BPM 娴佺▼瀹氫箟 Key
+ */
+ private static final String MISC_ISSUE_APPROVE_PROCESS_KEY = "misc_issue_approve";
+
@Resource
private MesWmMiscIssueMapper miscIssueMapper;
+
+ @Resource
+ private BpmProcessInstanceApi bpmProcessInstanceApi;
@Resource
private MesWmMiscIssueLineService miscIssueLineService;
@@ -120,6 +137,30 @@
approvalConfigApi.validateApprovalEnabledAndGetApprovers(MISC_ISSUE_APPROVE_BIZ_TYPE);
// 4. 鎻愪氦瀹℃壒锛堣崏绋� 鈫� 瀹℃壒涓級锛屽苟娓呯┖涓婁竴杞鏍哥粨鏋�
miscIssueMapper.submitAndResetAuditInfo(id, MesWmMiscIssueStatusEnum.APPROVING.getStatus());
+ // 5. 鍒涘缓 BPM 娴佺▼瀹炰緥锛屼娇瀹℃壒鍑虹幇鍦ㄣ�屽崗鍚屽姙鍏� - 鎴戠殑娴佺▼銆�
+ bpmProcessInstanceApi.createProcessInstance(getLoginUserId(),
+ new BpmProcessInstanceCreateReqDTO()
+ .setProcessDefinitionKey(MISC_ISSUE_APPROVE_PROCESS_KEY)
+ .setBusinessKey(String.valueOf(id)));
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateMiscIssueAuditStatus(Long id, Integer bpmStatus, String reason) {
+ // BPM 瀹℃壒缁撴灉鏄犲皠涓哄崟鎹姸鎬侊細閫氳繃=寰呮墽琛屽嚭搴� / 涓嶉�氳繃=鑽夌 / 鍙栨秷=宸插彇娑�
+ Integer status;
+ if (BpmTaskStatusEnum.APPROVE.getStatus().equals(bpmStatus)) {
+ status = MesWmMiscIssueStatusEnum.APPROVED.getStatus();
+ } else if (BpmTaskStatusEnum.REJECT.getStatus().equals(bpmStatus)) {
+ status = MesWmMiscIssueStatusEnum.PREPARE.getStatus();
+ } else if (BpmTaskStatusEnum.CANCEL.getStatus().equals(bpmStatus)) {
+ status = MesWmMiscIssueStatusEnum.CANCELED.getStatus();
+ } else {
+ return;
+ }
+ if (miscIssueMapper.updateAuditStatusByBpm(id, status, reason) != 1) {
+ log.warn("[updateMiscIssueAuditStatus] 鏉傞」鍑哄簱鍗�({}) 涓嶅浜庡鎵逛腑鐘舵�侊紝蹇界暐 BPM 缁撴灉({})", id, bpmStatus);
+ }
}
@Override
@@ -193,10 +234,20 @@
List<MesWmMiscIssueLineDO> lines = miscIssueLineService.getMiscIssueLineListByIssueId(issue.getId());
wmTransactionService.createTransactionList(convertList(lines, line -> new MesWmTransactionSaveReqDTO()
.setType(MesWmTransactionTypeEnum.OUT.getType()).setItemId(line.getItemId())
- .setQuantity(line.getQuantity().negate()) // 鍑哄簱鏁伴噺涓鸿礋鏁�
+ .setQuantity(negateQuantity(line.getQuantity())) // 鍑哄簱鏁伴噺涓鸿礋鏁�
.setBatchId(line.getBatchId()).setBatchCode(line.getBatchCode())
.setWarehouseId(line.getWarehouseId()).setLocationId(line.getLocationId()).setAreaId(line.getAreaId())
.setBizType(MesBizTypeConstants.WM_MISC_ISSUE).setBizId(issue.getId()).setBizCode(issue.getCode()).setBizLineId(line.getId())));
+ }
+
+ /**
+ * 鍑哄簱鏁伴噺鍙栬礋锛氭暟閲忎负绌烘椂鎶涘嚭鏄庣‘鐨勪笟鍔″紓甯革紝閬垮厤 NPE
+ */
+ private BigDecimal negateQuantity(BigDecimal quantity) {
+ if (quantity == null) {
+ throw exception(WM_MISC_ISSUE_QUANTITY_INVALID);
+ }
+ return quantity.negate();
}
@Override
@@ -253,4 +304,54 @@
}
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public MesWmMiscIssueImportRespVO importMiscIssueList(List<MesWmMiscIssueImportExcelVO> importList, boolean updateSupport) {
+ // 鏍￠獙瀵煎叆鏁版嵁涓嶈兘涓虹┖
+ if (CollUtil.isEmpty(importList)) {
+ throw exception(WM_MISC_ISSUE_IMPORT_LIST_IS_EMPTY);
+ }
+ MesWmMiscIssueImportRespVO respVO = MesWmMiscIssueImportRespVO.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;
+ }
+ MesWmMiscIssueDO existing = miscIssueMapper.selectByCode(code);
+ if (existing != null && updateSupport) {
+ if (!MesWmMiscIssueStatusEnum.PREPARE.getStatus().equals(existing.getStatus())) {
+ respVO.getFailureCodes().put(key, "鍗曟嵁闈炶崏绋跨姸鎬侊紝涓嶅厑璁歌鐩栨洿鏂�");
+ return;
+ }
+ MesWmMiscIssueDO updateObj = BeanUtils.toBean(importItem, MesWmMiscIssueDO.class);
+ updateObj.setId(existing.getId());
+ updateObj.setStatus(existing.getStatus());
+ miscIssueMapper.updateById(updateObj);
+ respVO.getUpdateCodes().add(code);
+ } else if (existing != null) {
+ respVO.getFailureCodes().put(key, "鍗曞彿宸插瓨鍦細" + code);
+ } else {
+ MesWmMiscIssueDO createObj = BeanUtils.toBean(importItem, MesWmMiscIssueDO.class);
+ createObj.setId(null);
+ createObj.setStatus(MesWmMiscIssueStatusEnum.PREPARE.getStatus());
+ miscIssueMapper.insert(createObj);
+ respVO.getCreateCodes().add(code);
+ }
+ });
+ return respVO;
+ }
+
}
--
Gitblit v1.9.3