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/ErpPurchaseOrderServiceImpl.java | 174 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 165 insertions(+), 9 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java
index 0015037..9bb1002 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java
@@ -3,25 +3,39 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
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.number.MoneyUtils;
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.order.ErpPurchaseOrderImportExcelVO;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.order.ErpPurchaseOrderImportReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.order.ErpPurchaseOrderImportRespVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.order.ErpPurchaseOrderPageReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.order.ErpPurchaseOrderSaveReqVO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.finance.ErpAccountDO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseOrderDO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseOrderItemDO;
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.finance.ErpAccountMapper;
import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchaseOrderItemMapper;
import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchaseOrderMapper;
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.ErpAuditStatus;
import cn.iocoder.yudao.module.erp.enums.ErpPurchaseOrderInStatusEnum;
import cn.iocoder.yudao.module.erp.enums.ErpPurchaseOrderStatusEnum;
import cn.iocoder.yudao.module.erp.service.finance.ErpAccountService;
+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.arrivalnotice.MesArrivalNoticeApi;
import cn.iocoder.yudao.module.system.api.approval.ApprovalConfigApi;
import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
@@ -62,6 +76,11 @@
*/
private static final String PURCHASE_ORDER_APPROVE_BIZ_TYPE = "erp_purchase_order_approve";
+ /**
+ * 閲囪喘璁㈠崟瀹℃壒鐨� BPM 娴佺▼瀹氫箟 Key
+ */
+ private static final String PURCHASE_ORDER_PROCESS_KEY = "purchase_approve";
+
@Resource
private ErpPurchaseOrderMapper purchaseOrderMapper;
@Resource
@@ -74,9 +93,19 @@
private ErpSupplierService supplierService;
@Resource
private ErpAccountService accountService;
+ @Resource
+ private ErpSupplierMapper supplierMapper;
+ @Resource
+ private ErpAccountMapper accountMapper;
+ @Resource
+ private MdmItemApi mdmItemApi;
+ @Resource
+ private MdmUnitMeasureApi mdmUnitMeasureApi;
@Resource
private ApprovalConfigApi approvalConfigApi;
+ @Resource
+ private BpmProcessInstanceApi bpmProcessInstanceApi;
@Resource
private AdminUserApi adminUserApi;
@@ -222,7 +251,15 @@
approvalConfigApi.validateApprovalEnabledAndGetApprovers(PURCHASE_ORDER_APPROVE_BIZ_TYPE);
// 3. 缃负瀹℃壒涓紝骞舵竻绌轰笂涓�杞鏍镐俊鎭紝閬垮厤椹冲洖鍘熷洜娈嬬暀
- purchaseOrderMapper.submitAndResetAuditInfo(id, ErpPurchaseOrderStatusEnum.PROCESS.getStatus());
+ if (purchaseOrderMapper.submitAndResetAuditInfo(id, ErpPurchaseOrderStatusEnum.PROCESS.getStatus()) != 1) {
+ throw exception(PURCHASE_ORDER_SUBMIT_FAIL_NOT_ALLOWED);
+ }
+
+ // 4. 鍒涘缓 BPM 娴佺▼瀹炰緥锛屼娇瀹℃壒鍑虹幇鍦ㄣ�屽崗鍚屽姙鍏� - 鎴戠殑娴佺▼銆�
+ bpmProcessInstanceApi.createProcessInstance(getLoginUserId(),
+ new BpmProcessInstanceCreateReqDTO()
+ .setProcessDefinitionKey(PURCHASE_ORDER_PROCESS_KEY)
+ .setBusinessKey(String.valueOf(id)));
}
@Override
@@ -247,14 +284,18 @@
if (StrUtil.isBlank(reviewRemark)) {
throw exception(PURCHASE_ORDER_AUDIT_REJECT_REASON_REQUIRED);
}
- purchaseOrderMapper.auditPurchaseOrder(id, ErpPurchaseOrderStatusEnum.REJECT.getStatus(),
- userId, getUserNickname(userId), reviewRemark);
+ if (purchaseOrderMapper.auditPurchaseOrder(id, ErpPurchaseOrderStatusEnum.REJECT.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(PURCHASE_ORDER_AUDIT_FAIL_NOT_PROCESS);
+ }
return;
}
// 3. 瀹℃牳閫氳繃
- purchaseOrderMapper.auditPurchaseOrder(id, ErpPurchaseOrderStatusEnum.APPROVE.getStatus(),
- userId, getUserNickname(userId), reviewRemark);
+ if (purchaseOrderMapper.auditPurchaseOrder(id, ErpPurchaseOrderStatusEnum.APPROVE.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(PURCHASE_ORDER_AUDIT_FAIL_NOT_PROCESS);
+ }
}
/**
@@ -286,12 +327,23 @@
}
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updatePurchaseOrderAuditStatus(Long id, Integer bpmStatus, String reason) {
+ // 1. BPM 瀹℃壒缁撴灉鏄犲皠涓洪噰璐鍗曠姸鎬侊細閫氳繃=20 / 涓嶉�氳繃=30 / 鍙栨秷=40
+ Integer newStatus = convertBpmResultToAuditStatus(bpmStatus);
+ if (newStatus == null) {
+ return;
+ }
+ // 2. 浠呭綋浠嶅浜庛�屽鎵逛腑銆嶆椂鍥炲啓锛岄伩鍏嶉噸澶嶈鐩�
+ if (purchaseOrderMapper.updateAuditStatusByBpm(id, newStatus, reason) != 1) {
+ log.warn("[updatePurchaseOrderAuditStatus] 閲囪喘璁㈠崟({}) 涓嶅浜庡鎵逛腑鐘舵�侊紝蹇界暐 BPM 缁撴灉({})", id, bpmStatus);
+ }
+ }
+
/**
* 杞崲 BPM 瀹℃壒缁撴灉涓哄鏍哥姸鎬�
- *
- * 宸插簾寮冿細閲囪喘璁㈠崟涓嶅啀璧� BPM 娴佺▼锛屾湰鏂规硶浠呬负鍘嗗彶浠ｇ爜淇濈暀锛屼笉鍐嶈璋冪敤銆�
*/
- @Deprecated
private Integer convertBpmResultToAuditStatus(Integer bpmResult) {
if (BpmTaskStatusEnum.APPROVE.getStatus().equals(bpmResult)) {
return ErpPurchaseOrderStatusEnum.APPROVE.getStatus();
@@ -384,8 +436,12 @@
return;
}
purchaseOrders.forEach(purchaseOrder -> {
- if (ErpAuditStatus.APPROVE.getStatus().equals(purchaseOrder.getStatus())) {
+ if (ErpPurchaseOrderStatusEnum.APPROVE.getStatus().equals(purchaseOrder.getStatus())) {
throw exception(PURCHASE_ORDER_DELETE_FAIL_APPROVE, purchaseOrder.getNo());
+ }
+ // 瀹℃壒涓姝㈠垹闄わ紝闇�鍏堢敱瀹℃壒浜恒�屽鏍镐笉閫氳繃銆嶉��鍥�
+ if (ErpPurchaseOrderStatusEnum.PROCESS.getStatus().equals(purchaseOrder.getStatus())) {
+ throw exception(PURCHASE_ORDER_UPDATE_FAIL_PROCESS, purchaseOrder.getNo());
}
});
@@ -590,4 +646,104 @@
return arrivalNoticeId;
}
+ @Override
+ public ErpPurchaseOrderImportRespVO importPurchaseOrderList(List<ErpPurchaseOrderImportExcelVO> importOrders,
+ ErpPurchaseOrderImportReqVO importReqVO) {
+ // 1. 鏍￠獙闈炵┖锛堣繃婊ゅ畬鍏ㄧ┖鐧界殑琛岋級
+ importOrders = filterList(importOrders, item -> StrUtil.isNotBlank(item.getProductCode()));
+ if (CollUtil.isEmpty(importOrders)) {
+ throw exception(PURCHASE_ORDER_IMPORT_LIST_IS_EMPTY);
+ }
+ // 2. 鎸夈�屽崟鍙枫�嶅垎缁勶細鐩稿悓鍗曞彿鐨勫琛屽悎骞舵垚涓�寮犻噰璐鍗曪紱鍗曞彿涓虹┖鏃舵瘡琛屽悇鑷垚涓�寮犺鍗�
+ List<List<ErpPurchaseOrderImportExcelVO>> groups = new ArrayList<>();
+ Map<String, Integer> groupIndexMap = new LinkedHashMap<>();
+ int rowIndex = 0;
+ for (ErpPurchaseOrderImportExcelVO row : importOrders) {
+ 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. 閫愮粍鍚堝苟鍒涘缓閲囪喘璁㈠崟
+ ErpPurchaseOrderImportRespVO respVO = ErpPurchaseOrderImportRespVO.builder()
+ .createPurchaseOrderNos(new ArrayList<>())
+ .failurePurchaseOrderNos(new LinkedHashMap<>())
+ .build();
+ for (List<ErpPurchaseOrderImportExcelVO> group : groups) {
+ String groupKey = StrUtil.isNotBlank(group.get(0).getNo()) ? group.get(0).getNo()
+ : "绗�" + (importOrders.indexOf(group.get(0)) + 1) + "琛�";
+ try {
+ ErpPurchaseOrderSaveReqVO createReqVO = buildPurchaseOrderImportSaveReqVO(group);
+ Long orderId = createPurchaseOrder(createReqVO);
+ respVO.getCreatePurchaseOrderNos().add(purchaseOrderMapper.selectById(orderId).getNo());
+ } catch (ServiceException ex) {
+ respVO.getFailurePurchaseOrderNos().put(groupKey, ex.getMessage());
+ }
+ }
+ return respVO;
+ }
+
+ /**
+ * 灏嗗悓涓�寮犻噰璐鍗曠殑澶氳鏄庣粏杞崲鎴愬垱寤� Request VO
+ */
+ private ErpPurchaseOrderSaveReqVO buildPurchaseOrderImportSaveReqVO(List<ErpPurchaseOrderImportExcelVO> group) {
+ ErpPurchaseOrderImportExcelVO first = group.get(0);
+ // 1. 鏍￠獙骞惰В鏋愪緵搴斿晢
+ if (StrUtil.isBlank(first.getSupplierName())) {
+ throw exception(PURCHASE_ORDER_IMPORT_SUPPLIER_NOT_EXISTS, "");
+ }
+ ErpSupplierDO supplier = supplierMapper.selectByName(first.getSupplierName());
+ if (supplier == null) {
+ throw exception(PURCHASE_ORDER_IMPORT_SUPPLIER_NOT_EXISTS, first.getSupplierName());
+ }
+ if (first.getOrderTime() == null) {
+ throw exception(PURCHASE_ORDER_IMPORT_ORDER_TIME_REQUIRED);
+ }
+ // 2. 瑙ｆ瀽缁撶畻璐︽埛锛堝彲閫夛級
+ Long accountId = null;
+ if (StrUtil.isNotBlank(first.getAccountName())) {
+ ErpAccountDO account = accountMapper.selectByName(first.getAccountName());
+ if (account == null) {
+ throw exception(PURCHASE_ORDER_IMPORT_ACCOUNT_NOT_EXISTS, first.getAccountName());
+ }
+ accountId = account.getId();
+ }
+ // 3. 缁勮鏄庣粏
+ List<ErpPurchaseOrderSaveReqVO.Item> items = new ArrayList<>();
+ for (ErpPurchaseOrderImportExcelVO row : group) {
+ MdmItemRespDTO product = mdmItemApi.getItemByCode(row.getProductCode()).getCheckedData();
+ if (product == null) {
+ throw exception(PURCHASE_ORDER_IMPORT_PRODUCT_NOT_EXISTS, row.getProductCode());
+ }
+ MdmUnitMeasureRespDTO unit = mdmUnitMeasureApi.getUnitMeasureByCode(row.getProductUnitCode()).getCheckedData();
+ if (unit == null) {
+ throw exception(PURCHASE_ORDER_IMPORT_UNIT_NOT_EXISTS, row.getProductUnitCode());
+ }
+ ErpPurchaseOrderSaveReqVO.Item item = new ErpPurchaseOrderSaveReqVO.Item()
+ .setProductId(product.getId())
+ .setProductUnitId(unit.getId())
+ .setProductPrice(row.getProductPrice())
+ .setCount(row.getCount())
+ .setTaxPercent(row.getTaxPercent())
+ .setQcCheckFlag(row.getQcCheckFlag())
+ .setRemark(row.getItemRemark());
+ items.add(item);
+ }
+ // 4. 缁勮涓昏〃
+ ErpPurchaseOrderSaveReqVO createReqVO = new ErpPurchaseOrderSaveReqVO()
+ .setSupplierId(supplier.getId())
+ .setAccountId(accountId)
+ .setOrderTime(first.getOrderTime())
+ .setDiscountPercent(ObjectUtil.defaultIfNull(first.getDiscountPercent(), BigDecimal.ZERO))
+ .setDepositPrice(ObjectUtil.defaultIfNull(first.getDepositPrice(), BigDecimal.ZERO))
+ .setRemark(first.getRemark())
+ .setItems(items);
+ return createReqVO;
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3