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-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchasePlanServiceImpl.java | 167 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 161 insertions(+), 6 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchasePlanServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchasePlanServiceImpl.java
index c0bcb87..48889a0 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchasePlanServiceImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchasePlanServiceImpl.java
@@ -2,9 +2,15 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+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.erp.controller.admin.purchase.vo.plan.ErpPurchasePlanImportExcelVO;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.plan.ErpPurchasePlanImportReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.plan.ErpPurchasePlanImportRespVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.plan.ErpPurchasePlanPageReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.plan.ErpPurchasePlanRespVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.plan.ErpPurchasePlanSaveReqVO;
@@ -12,15 +18,19 @@
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchasePlanItemDO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseRequestDO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseRequestItemDO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpSupplierDO;
import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchasePlanItemMapper;
import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchasePlanMapper;
import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchaseRequestItemMapper;
import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchaseRequestMapper;
+import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpSupplierMapper;
import cn.iocoder.yudao.module.erp.dal.redis.no.ErpNoRedisDAO;
import cn.iocoder.yudao.module.erp.enums.ErpPurchasePlanStatusEnum;
import cn.iocoder.yudao.module.erp.enums.ErpPurchaseRequestStatusEnum;
import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
+import cn.iocoder.yudao.module.mdm.api.unit.MdmUnitMeasureApi;
+import cn.iocoder.yudao.module.mdm.api.unit.dto.MdmUnitMeasureRespDTO;
import cn.iocoder.yudao.module.mes.api.wms.MesWmStockApi;
import cn.iocoder.yudao.module.system.api.approval.ApprovalConfigApi;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
@@ -38,6 +48,7 @@
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.common.util.collection.CollectionUtils.filterList;
import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.*;
@@ -55,6 +66,11 @@
* 閫氱敤瀹℃壒閰嶇疆鐨勪笟鍔＄被鍨嬬紪鐮侊紙瀵瑰簲 system_approval_config.biz_type锛�
*/
private static final String PURCHASE_PLAN_APPROVE_BIZ_TYPE = "purchase_plan_approve";
+
+ /**
+ * 閲囪喘璁″垝瀹℃壒鐨� BPM 娴佺▼瀹氫箟 Key
+ */
+ private static final String PURCHASE_PLAN_PROCESS_KEY = "purchase_plan_approve";
/**
* 闇�姹傛潵婧愶細搴撳瓨棰勮
@@ -82,10 +98,17 @@
private ApprovalConfigApi approvalConfigApi;
@Resource
+ private BpmProcessInstanceApi bpmProcessInstanceApi;
+
+ @Resource
private AdminUserApi adminUserApi;
@Resource
private MdmItemApi mdmItemApi;
+ @Resource
+ private MdmUnitMeasureApi mdmUnitMeasureApi;
+ @Resource
+ private ErpSupplierMapper supplierMapper;
@Resource
private MesWmStockApi mesWmStockApi;
@@ -203,7 +226,14 @@
// 3. 鏍￠獙瀹℃壒閰嶇疆宸插惎鐢ㄤ笖閰嶇疆浜嗘湁鏁堝鎵逛汉锛堟湭閰嶇疆鏃舵姏鍑哄甫鏄庣‘鎻愮ず鐨勪笟鍔″紓甯革級
approvalConfigApi.validateApprovalEnabledAndGetApprovers(PURCHASE_PLAN_APPROVE_BIZ_TYPE);
// 4. 鐘舵�佺疆涓哄鎵逛腑锛屽苟娓呯┖涓婁竴杞鏍哥粨鏋滐紝閬垮厤娈嬬暀銆屽鏍镐笉閫氳繃銆嶇殑鍘熷洜
- purchasePlanMapper.submitAndResetAuditInfo(id, ErpPurchasePlanStatusEnum.PROCESS.getStatus());
+ if (purchasePlanMapper.submitAndResetAuditInfo(id, ErpPurchasePlanStatusEnum.PROCESS.getStatus()) != 1) {
+ throw exception(PURCHASE_PLAN_SUBMIT_FAIL_NOT_ALLOWED);
+ }
+ // 5. 鍒涘缓 BPM 娴佺▼瀹炰緥锛屼娇瀹℃壒鍑虹幇鍦ㄣ�屽崗鍚屽姙鍏� - 鎴戠殑娴佺▼銆�
+ bpmProcessInstanceApi.createProcessInstance(getLoginUserId(),
+ new BpmProcessInstanceCreateReqDTO()
+ .setProcessDefinitionKey(PURCHASE_PLAN_PROCESS_KEY)
+ .setBusinessKey(String.valueOf(id)));
}
@Override
@@ -228,13 +258,17 @@
if (StrUtil.isBlank(reviewRemark)) {
throw exception(PURCHASE_PLAN_AUDIT_REJECT_REASON_REQUIRED);
}
- purchasePlanMapper.auditPurchasePlan(id, ErpPurchasePlanStatusEnum.REJECT.getStatus(),
- userId, getUserNickname(userId), reviewRemark);
+ if (purchasePlanMapper.auditPurchasePlan(id, ErpPurchasePlanStatusEnum.REJECT.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(PURCHASE_PLAN_AUDIT_FAIL_NOT_PROCESS);
+ }
return;
}
// 5. 瀹℃牳閫氳繃锛氳褰曞鏍镐汉涓庡鏍告剰瑙侊紝鐘舵�佺疆涓哄鏍搁�氳繃
- purchasePlanMapper.auditPurchasePlan(id, ErpPurchasePlanStatusEnum.APPROVE.getStatus(),
- userId, getUserNickname(userId), reviewRemark);
+ if (purchasePlanMapper.auditPurchasePlan(id, ErpPurchasePlanStatusEnum.APPROVE.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(PURCHASE_PLAN_AUDIT_FAIL_NOT_PROCESS);
+ }
// 6. 瀹℃牳閫氳繃涓旀湭鐢熸垚鐢宠锛岃嚜鍔ㄧ敓鎴愰噰璐敵璇�
if (!Boolean.TRUE.equals(plan.getGeneratedFlag())) {
try {
@@ -284,6 +318,34 @@
} catch (Exception e) {
log.error("[updatePurchasePlanAuditStatus] 閲囪喘璁″垝({}) 鑷姩鐢熸垚閲囪喘鐢宠澶辫触", id, e);
// 涓嶆姏鍑哄紓甯革紝閬垮厤褰卞搷鐘舵�佹洿鏂�
+ }
+ }
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updatePurchasePlanAuditStatus(Long id, Integer bpmStatus, String reason) {
+ // 1. BPM 瀹℃壒缁撴灉鏄犲皠涓洪噰璐鍒掔姸鎬侊細閫氳繃=20 / 涓嶉�氳繃=30 / 鍙栨秷=40
+ Integer newStatus = convertBpmResultToStatus(bpmStatus);
+ if (newStatus == null) {
+ return;
+ }
+ // 2. 浠呭綋浠嶅浜庛�屽鎵逛腑銆嶆椂鍥炲啓锛岄伩鍏嶉噸澶嶈鐩�
+ if (purchasePlanMapper.updateAuditStatusByBpm(id, newStatus, reason) != 1) {
+ log.warn("[updatePurchasePlanAuditStatus] 閲囪喘璁″垝({}) 涓嶅浜庡鎵逛腑鐘舵�侊紝蹇界暐 BPM 缁撴灉({})", id, bpmStatus);
+ return;
+ }
+ // 3. 瀹℃壒閫氳繃涓旀湭鐢熸垚鐢宠锛岃嚜鍔ㄧ敓鎴愰噰璐敵璇�
+ if (ErpPurchasePlanStatusEnum.APPROVE.getStatus().equals(newStatus)) {
+ ErpPurchasePlanDO plan = purchasePlanMapper.selectById(id);
+ if (plan != null && !Boolean.TRUE.equals(plan.getGeneratedFlag())) {
+ try {
+ List<Long> requestIds = doGeneratePurchaseRequests(plan);
+ log.info("[updatePurchasePlanAuditStatus] 閲囪喘璁″垝({}) 鑷姩鐢熸垚閲囪喘鐢宠({})", id, requestIds);
+ } catch (Exception e) {
+ log.error("[updatePurchasePlanAuditStatus] 閲囪喘璁″垝({}) 鑷姩鐢熸垚閲囪喘鐢宠澶辫触", id, e);
+ // 涓嶆姏鍑哄紓甯革紝閬垮厤褰卞搷鐘舵�佹洿鏂�
+ }
}
}
}
@@ -438,6 +500,98 @@
return List.of(request.getId());
}
+ @Override
+ public ErpPurchasePlanImportRespVO importPurchasePlanList(List<ErpPurchasePlanImportExcelVO> importPlans,
+ ErpPurchasePlanImportReqVO importReqVO) {
+ // 1. 鏍￠獙闈炵┖锛堣繃婊ゅ畬鍏ㄧ┖鐧界殑琛岋級
+ importPlans = filterList(importPlans, item -> StrUtil.isNotBlank(item.getProductCode()));
+ if (CollUtil.isEmpty(importPlans)) {
+ throw exception(PURCHASE_PLAN_IMPORT_LIST_IS_EMPTY);
+ }
+ // 2. 鎸夈�屽崟鍙枫�嶅垎缁勶細鐩稿悓鍗曞彿鐨勫琛屽悎骞舵垚涓�寮犻噰璐鍒掞紱鍗曞彿涓虹┖鏃舵瘡琛屽悇鑷垚涓�寮犺鍒�
+ List<List<ErpPurchasePlanImportExcelVO>> groups = new ArrayList<>();
+ Map<String, Integer> groupIndexMap = new LinkedHashMap<>();
+ int rowIndex = 0;
+ for (ErpPurchasePlanImportExcelVO row : importPlans) {
+ rowIndex++;
+ String groupKey = StrUtil.isNotBlank(row.getNo()) ? row.getNo() : ("__row_" + rowIndex);
+ Integer index = groupIndexMap.get(groupKey);
+ if (index == null) {
+ index = groups.size();
+ groupIndexMap.put(groupKey, index);
+ groups.add(new ArrayList<>());
+ }
+ groups.get(index).add(row);
+ }
+ // 3. 閫愮粍鍚堝苟鍒涘缓閲囪喘璁″垝
+ ErpPurchasePlanImportRespVO respVO = ErpPurchasePlanImportRespVO.builder()
+ .createPurchasePlanNos(new ArrayList<>())
+ .failurePurchasePlanNos(new LinkedHashMap<>())
+ .build();
+ for (List<ErpPurchasePlanImportExcelVO> group : groups) {
+ String groupKey = StrUtil.isNotBlank(group.get(0).getNo()) ? group.get(0).getNo()
+ : "绗�" + (importPlans.indexOf(group.get(0)) + 1) + "琛�";
+ try {
+ ErpPurchasePlanSaveReqVO createReqVO = buildPurchasePlanImportSaveReqVO(group);
+ Long planId = createPurchasePlan(createReqVO);
+ respVO.getCreatePurchasePlanNos().add(purchasePlanMapper.selectById(planId).getNo());
+ } catch (ServiceException ex) {
+ respVO.getFailurePurchasePlanNos().put(groupKey, ex.getMessage());
+ }
+ }
+ return respVO;
+ }
+
+ /**
+ * 灏嗗悓涓�寮犻噰璐鍒掔殑澶氳鏄庣粏杞崲鎴愬垱寤� Request VO
+ */
+ private ErpPurchasePlanSaveReqVO buildPurchasePlanImportSaveReqVO(List<ErpPurchasePlanImportExcelVO> group) {
+ ErpPurchasePlanImportExcelVO first = group.get(0);
+ // 1. 鏍￠獙璁″垝鍚嶇О涓庤鍒掓棩鏈�
+ if (StrUtil.isBlank(first.getName())) {
+ throw exception(PURCHASE_PLAN_IMPORT_NAME_REQUIRED);
+ }
+ if (first.getPlanDate() == null) {
+ throw exception(PURCHASE_PLAN_IMPORT_PLAN_DATE_REQUIRED);
+ }
+ // 2. 瑙ｆ瀽渚涘簲鍟嗭紙鍙�夛級
+ Long supplierId = null;
+ if (StrUtil.isNotBlank(first.getSupplierName())) {
+ ErpSupplierDO supplier = supplierMapper.selectByName(first.getSupplierName());
+ if (supplier == null) {
+ throw exception(PURCHASE_PLAN_IMPORT_SUPPLIER_NOT_EXISTS, first.getSupplierName());
+ }
+ supplierId = supplier.getId();
+ }
+ // 3. 缁勮鏄庣粏
+ List<ErpPurchasePlanSaveReqVO.Item> items = new ArrayList<>();
+ for (ErpPurchasePlanImportExcelVO row : group) {
+ MdmItemRespDTO product = mdmItemApi.getItemByCode(row.getProductCode()).getCheckedData();
+ if (product == null) {
+ throw exception(PURCHASE_PLAN_IMPORT_PRODUCT_NOT_EXISTS, row.getProductCode());
+ }
+ MdmUnitMeasureRespDTO unit = mdmUnitMeasureApi.getUnitMeasureByCode(row.getProductUnitCode()).getCheckedData();
+ if (unit == null) {
+ throw exception(PURCHASE_PLAN_IMPORT_UNIT_NOT_EXISTS, row.getProductUnitCode());
+ }
+ ErpPurchasePlanSaveReqVO.Item item = new ErpPurchasePlanSaveReqVO.Item()
+ .setProductId(product.getId())
+ .setProductUnitId(unit.getId())
+ .setCount(row.getCount())
+ .setDemandTime(row.getDemandTime())
+ .setRemark(row.getItemRemark());
+ items.add(item);
+ }
+ // 4. 缁勮涓昏〃
+ return new ErpPurchasePlanSaveReqVO()
+ .setName(first.getName())
+ .setDemandSource(first.getDemandSource())
+ .setPlanDate(first.getPlanDate())
+ .setSupplierId(supplierId)
+ .setRemark(first.getRemark())
+ .setItems(items);
+ }
+
private Integer convertBpmResultToStatus(Integer bpmResult) {
if (BpmTaskStatusEnum.APPROVE.getStatus().equals(bpmResult)) {
return ErpPurchasePlanStatusEnum.APPROVE.getStatus();
@@ -461,7 +615,8 @@
private ErpPurchasePlanDO validatePurchasePlanCanModify(Long id) {
ErpPurchasePlanDO plan = validatePurchasePlanExists(id);
- if (!ErpPurchasePlanStatusEnum.DRAFT.getStatus().equals(plan.getStatus())) {
+ if (!ErpPurchasePlanStatusEnum.DRAFT.getStatus().equals(plan.getStatus())
+ && !ErpPurchasePlanStatusEnum.REJECT.getStatus().equals(plan.getStatus())) {
throw exception(PURCHASE_PLAN_UPDATE_FAIL_NOT_DRAFT, plan.getNo());
}
return plan;
--
Gitblit v1.9.3