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/ErpPurchaseRequestServiceImpl.java | 615 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 615 insertions(+), 0 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestServiceImpl.java
new file mode 100644
index 0000000..5b86be8
--- /dev/null
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestServiceImpl.java
@@ -0,0 +1,615 @@
+package cn.iocoder.yudao.module.erp.service.purchase;
+
+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.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.request.ErpPurchaseRequestImportExcelVO;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestImportReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestImportRespVO;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestPageReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestSaveReqVO;
+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.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.ErpPurchaseOrderStatusEnum;
+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.system.api.approval.ApprovalConfigApi;
+import cn.iocoder.yudao.module.system.api.dept.DeptApi;
+import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
+
+import java.math.BigDecimal;
+import java.util.*;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
+import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.*;
+
+/**
+ * ERP 閲囪喘鐢宠 Service 瀹炵幇绫�
+ */
+@Service
+@Validated
+@Slf4j
+public class ErpPurchaseRequestServiceImpl implements ErpPurchaseRequestService {
+
+ /**
+ * 閫氱敤瀹℃壒閰嶇疆鐨勪笟鍔＄被鍨嬬紪鐮侊紙瀵瑰簲 system_approval_config.biz_type锛�
+ */
+ private static final String PURCHASE_REQUEST_APPROVE_BIZ_TYPE = "purchase_request_approve";
+
+ /**
+ * 閲囪喘鐢宠瀹℃壒鐨� BPM 娴佺▼瀹氫箟 Key
+ */
+ private static final String PURCHASE_REQUEST_PROCESS_KEY = "purchase_request_approve";
+
+ @Resource
+ private ErpPurchaseRequestMapper purchaseRequestMapper;
+ @Resource
+ private ErpPurchaseRequestItemMapper purchaseRequestItemMapper;
+
+ @Resource
+ private ErpPurchaseOrderMapper purchaseOrderMapper;
+ @Resource
+ private ErpPurchaseOrderItemMapper purchaseOrderItemMapper;
+
+ @Resource
+ private ErpNoRedisDAO noRedisDAO;
+
+ @Resource
+ private ErpSupplierService supplierService;
+
+ @Resource
+ private ErpSupplierMapper supplierMapper;
+
+ @Resource
+ private MdmItemApi mdmItemApi;
+ @Resource
+ private MdmUnitMeasureApi mdmUnitMeasureApi;
+
+ @Resource
+ private ApprovalConfigApi approvalConfigApi;
+
+ @Resource
+ private BpmProcessInstanceApi bpmProcessInstanceApi;
+
+ @Resource
+ private AdminUserApi adminUserApi;
+ @Resource
+ private DeptApi deptApi;
+ @Resource
+ private StorageAttachmentApi storageAttachmentApi;
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Long createPurchaseRequest(ErpPurchaseRequestSaveReqVO createReqVO) {
+ // 1. 鏍￠獙璁㈠崟椤圭殑鏈夋晥鎬�
+ List<ErpPurchaseRequestItemDO> requestItems = validatePurchaseRequestItems(createReqVO.getItems());
+ // 2. 鏍￠獙渚涘簲鍟嗭紙濡傛灉鎸囧畾锛�
+ if (createReqVO.getSupplierId() != null) {
+ supplierService.validateSupplier(createReqVO.getSupplierId());
+ }
+ // 3. 鐢熸垚鐢宠鍗曞彿
+ String no = noRedisDAO.generate(ErpNoRedisDAO.PURCHASE_REQUEST_NO_PREFIX);
+ if (purchaseRequestMapper.selectByNo(no) != null) {
+ throw exception(PURCHASE_REQUEST_NO_EXISTS);
+ }
+
+ // 4. 鑾峰彇褰撳墠鐢ㄦ埛淇℃伅
+ Long userId = Long.parseLong(getCurrentUserId());
+ AdminUserRespDTO user = adminUserApi.getUser(userId);
+ Long deptId = user != null ? user.getDeptId() : null;
+
+ // 5. 鎻掑叆鐢宠鍗�
+ ErpPurchaseRequestDO purchaseRequest = BeanUtils.toBean(createReqVO, ErpPurchaseRequestDO.class, req -> req
+ .setNo(no)
+ .setStatus(ErpPurchaseRequestStatusEnum.DRAFT.getStatus())
+ .setRequestUserId(userId)
+ .setRequestDeptId(deptId));
+ // 鍏煎鏃у鎴风鏈紶瀹氶噾鐨勬儏鍐碉紝鏁版嵁搴撲笌涓氬姟灞傜粺涓�鎸� 0 澶勭悊
+ if (purchaseRequest.getDepositPrice() == null) {
+ purchaseRequest.setDepositPrice(BigDecimal.ZERO);
+ }
+ calculateTotalPrice(purchaseRequest, requestItems);
+ purchaseRequestMapper.insert(purchaseRequest);
+
+ // 6. 缁戝畾闄勪欢
+ storageAttachmentApi.bindAttachments("file", "erp_purchase_request",
+ purchaseRequest.getId(), createReqVO.getBlobIds());
+
+ // 7. 鎻掑叆鐢宠鏄庣粏
+ requestItems.forEach(o -> o.setRequestId(purchaseRequest.getId()));
+ purchaseRequestItemMapper.insertBatch(requestItems);
+
+ return purchaseRequest.getId();
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updatePurchaseRequest(ErpPurchaseRequestSaveReqVO updateReqVO) {
+ // 1. 鏍￠獙瀛樺湪 + 鑽夌鐘舵��
+ ErpPurchaseRequestDO purchaseRequest = validatePurchaseRequestCanModify(updateReqVO.getId());
+ // 2. 鏍￠獙渚涘簲鍟嗭紙濡傛灉鎸囧畾锛�
+ if (updateReqVO.getSupplierId() != null) {
+ supplierService.validateSupplier(updateReqVO.getSupplierId());
+ }
+ // 3. 鏍￠獙璁㈠崟椤圭殑鏈夋晥鎬�
+ List<ErpPurchaseRequestItemDO> requestItems = validatePurchaseRequestItems(updateReqVO.getItems());
+
+ // 4. 鏇存柊鐢宠鍗�
+ ErpPurchaseRequestDO updateObj = BeanUtils.toBean(updateReqVO, ErpPurchaseRequestDO.class);
+ if (updateObj.getDepositPrice() == null) {
+ updateObj.setDepositPrice(BigDecimal.ZERO);
+ }
+ calculateTotalPrice(updateObj, requestItems);
+ purchaseRequestMapper.updateById(updateObj);
+
+ // 5. 鏇存柊鐢宠鏄庣粏
+ updatePurchaseRequestItemList(updateReqVO.getId(), requestItems);
+
+ // 6. 鏇存柊闄勪欢
+ storageAttachmentApi.updateAttachments("file", "erp_purchase_request", updateReqVO.getId(), updateReqVO.getBlobIds());
+ }
+
+ private void calculateTotalPrice(ErpPurchaseRequestDO purchaseRequest, List<ErpPurchaseRequestItemDO> requestItems) {
+ purchaseRequest.setTotalCount(getSumValue(requestItems, ErpPurchaseRequestItemDO::getCount, BigDecimal::add));
+ purchaseRequest.setTotalProductPrice(getSumValue(requestItems, ErpPurchaseRequestItemDO::getTotalPrice, BigDecimal::add, BigDecimal.ZERO));
+ purchaseRequest.setTotalTaxPrice(getSumValue(requestItems, ErpPurchaseRequestItemDO::getTaxPrice, BigDecimal::add, BigDecimal.ZERO));
+ purchaseRequest.setTotalPrice(purchaseRequest.getTotalProductPrice().add(purchaseRequest.getTotalTaxPrice()));
+ // 璁＄畻浼樻儬浠锋牸
+ if (purchaseRequest.getDiscountPercent() == null) {
+ purchaseRequest.setDiscountPercent(BigDecimal.ZERO);
+ }
+ purchaseRequest.setDiscountPrice(MoneyUtils.priceMultiplyPercent(purchaseRequest.getTotalPrice(), purchaseRequest.getDiscountPercent()));
+ purchaseRequest.setTotalPrice(purchaseRequest.getTotalPrice().subtract(purchaseRequest.getDiscountPrice()));
+ }
+
+ private List<ErpPurchaseRequestItemDO> validatePurchaseRequestItems(List<ErpPurchaseRequestSaveReqVO.Item> list) {
+ return convertList(list, o -> BeanUtils.toBean(o, ErpPurchaseRequestItemDO.class, item -> {
+ if (item.getProductPrice() != null && item.getCount() != null) {
+ item.setTotalPrice(MoneyUtils.priceMultiply(item.getProductPrice(), item.getCount()));
+ if (item.getTaxPercent() != null) {
+ item.setTaxPrice(MoneyUtils.priceMultiplyPercent(item.getTotalPrice(), item.getTaxPercent()));
+ }
+ }
+ }));
+ }
+
+ private void updatePurchaseRequestItemList(Long id, List<ErpPurchaseRequestItemDO> newList) {
+ List<ErpPurchaseRequestItemDO> oldList = purchaseRequestItemMapper.selectListByRequestId(id);
+ List<List<ErpPurchaseRequestItemDO>> diffList = diffList(oldList, newList,
+ (oldVal, newVal) -> oldVal.getId().equals(newVal.getId()));
+
+ if (CollUtil.isNotEmpty(diffList.get(0))) {
+ diffList.get(0).forEach(o -> o.setRequestId(id));
+ purchaseRequestItemMapper.insertBatch(diffList.get(0));
+ }
+ if (CollUtil.isNotEmpty(diffList.get(1))) {
+ purchaseRequestItemMapper.updateBatch(diffList.get(1));
+ }
+ if (CollUtil.isNotEmpty(diffList.get(2))) {
+ purchaseRequestItemMapper.deleteByIds(convertList(diffList.get(2), ErpPurchaseRequestItemDO::getId));
+ }
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void deletePurchaseRequest(List<Long> ids) {
+ List<ErpPurchaseRequestDO> purchaseRequests = purchaseRequestMapper.selectRequestListByIds(ids);
+ if (CollUtil.isEmpty(purchaseRequests)) {
+ return;
+ }
+ purchaseRequests.forEach(purchaseRequest -> {
+ Integer status = purchaseRequest.getStatus();
+ if (!ErpPurchaseRequestStatusEnum.DRAFT.getStatus().equals(status)
+ && !ErpPurchaseRequestStatusEnum.REJECT.getStatus().equals(status)) {
+ throw exception(PURCHASE_REQUEST_DELETE_FAIL_NOT_DRAFT, purchaseRequest.getNo());
+ }
+ });
+
+ purchaseRequests.forEach(purchaseRequest -> {
+ storageAttachmentApi.deleteAttachmentsByRecord("erp_purchase_request", purchaseRequest.getId());
+ purchaseRequestMapper.deleteById(purchaseRequest.getId());
+ purchaseRequestItemMapper.deleteByRequestId(purchaseRequest.getId());
+ });
+ }
+
+ @Override
+ public ErpPurchaseRequestDO getPurchaseRequest(Long id) {
+ return purchaseRequestMapper.selectById(id);
+ }
+
+ @Override
+ public PageResult<ErpPurchaseRequestDO> getPurchaseRequestPage(ErpPurchaseRequestPageReqVO pageReqVO) {
+ return purchaseRequestMapper.selectPage(pageReqVO);
+ }
+
+ @Override
+ public List<ErpPurchaseRequestItemDO> getPurchaseRequestItemListByRequestId(Long requestId) {
+ return purchaseRequestItemMapper.selectListByRequestId(requestId);
+ }
+
+ @Override
+ public List<ErpPurchaseRequestItemDO> getPurchaseRequestItemListByRequestIds(Collection<Long> requestIds) {
+ if (CollUtil.isEmpty(requestIds)) {
+ return Collections.emptyList();
+ }
+ return purchaseRequestItemMapper.selectListByRequestIds(requestIds);
+ }
+
+ @Override
+ public List<ErpPurchaseRequestDO> getPurchaseRequestList(List<Long> ids) {
+ if (CollUtil.isEmpty(ids)) {
+ return Collections.emptyList();
+ }
+ return purchaseRequestMapper.selectRequestListByIds(ids);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void submitPurchaseRequest(Long id) {
+ // 1. 鏍￠獙瀛樺湪 + 鍙彁浜ょ姸鎬侊紙鏈彁浜� / 瀹℃牳涓嶉�氳繃锛�
+ ErpPurchaseRequestDO purchaseRequest = validatePurchaseRequestExists(id);
+ if (!ErpPurchaseRequestStatusEnum.DRAFT.getStatus().equals(purchaseRequest.getStatus())
+ && !ErpPurchaseRequestStatusEnum.REJECT.getStatus().equals(purchaseRequest.getStatus())) {
+ throw exception(PURCHASE_REQUEST_SUBMIT_FAIL_NOT_ALLOWED);
+ }
+ // 2. 鏍￠獙鏄惁鏈夋槑缁�
+ List<ErpPurchaseRequestItemDO> items = purchaseRequestItemMapper.selectListByRequestId(id);
+ if (CollUtil.isEmpty(items)) {
+ throw exception(PURCHASE_REQUEST_ITEM_EMPTY);
+ }
+ // 3. 鏍￠獙瀹℃壒閰嶇疆宸插惎鐢ㄤ笖閰嶇疆浜嗘湁鏁堝鎵逛汉
+ approvalConfigApi.validateApprovalEnabledAndGetApprovers(PURCHASE_REQUEST_APPROVE_BIZ_TYPE);
+ // 4. 鐘舵�佺疆涓哄鎵逛腑锛屽苟娓呯┖涓婁竴杞鏍哥粨鏋�
+ if (purchaseRequestMapper.submitAndResetAuditInfo(id, ErpPurchaseRequestStatusEnum.PROCESS.getStatus()) != 1) {
+ throw exception(PURCHASE_REQUEST_SUBMIT_FAIL_NOT_ALLOWED);
+ }
+ // 5. 鍒涘缓 BPM 娴佺▼瀹炰緥锛屼娇瀹℃壒鍑虹幇鍦ㄣ�屽崗鍚屽姙鍏� - 鎴戠殑娴佺▼銆�
+ bpmProcessInstanceApi.createProcessInstance(getLoginUserId(),
+ new BpmProcessInstanceCreateReqDTO()
+ .setProcessDefinitionKey(PURCHASE_REQUEST_PROCESS_KEY)
+ .setBusinessKey(String.valueOf(id)));
+ }
+
+ @Override
+ public Set<Long> getPurchaseRequestApproverUserIds() {
+ return approvalConfigApi.getApproverUserIds(PURCHASE_REQUEST_APPROVE_BIZ_TYPE);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void auditPurchaseRequest(Long id, Boolean pass, String reviewRemark) {
+ // 1. 鏍￠獙瀛樺湪
+ ErpPurchaseRequestDO purchaseRequest = validatePurchaseRequestExists(id);
+ // 2. 鏍￠獙澶勪簬瀹℃壒涓姸鎬�
+ if (!ErpPurchaseRequestStatusEnum.PROCESS.getStatus().equals(purchaseRequest.getStatus())) {
+ throw exception(PURCHASE_REQUEST_AUDIT_FAIL_NOT_PROCESS);
+ }
+ // 3. 鏍￠獙褰撳墠鐧诲綍鐢ㄦ埛鏄涓氬姟绫诲瀷鐨勫鎵逛汉锛堟垨绛撅細浠讳竴浜哄潎鍙鏍革級
+ Long userId = getLoginUserId();
+ approvalConfigApi.validateApprover(PURCHASE_REQUEST_APPROVE_BIZ_TYPE, userId);
+ // 4. 瀹℃牳涓嶉�氳繃锛氬繀椤诲～鍐欏師鍥狅紝閫�鍥炵敵璇蜂汉淇敼鍚庡彲閲嶆柊鎻愪氦
+ if (!Boolean.TRUE.equals(pass)) {
+ if (StrUtil.isBlank(reviewRemark)) {
+ throw exception(PURCHASE_REQUEST_AUDIT_REJECT_REASON_REQUIRED);
+ }
+ if (purchaseRequestMapper.auditPurchaseRequest(id, ErpPurchaseRequestStatusEnum.REJECT.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(PURCHASE_REQUEST_AUDIT_FAIL_NOT_PROCESS);
+ }
+ return;
+ }
+ // 5. 瀹℃牳閫氳繃锛氳褰曞鏍镐汉涓庡鏍告剰瑙�
+ if (purchaseRequestMapper.auditPurchaseRequest(id, ErpPurchaseRequestStatusEnum.APPROVE.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(PURCHASE_REQUEST_AUDIT_FAIL_NOT_PROCESS);
+ }
+ // 6. 瀹℃牳閫氳繃涓旀湁渚涘簲鍟嗐�佹湭鐢熸垚璁㈠崟鏃讹紝鑷姩鐢熸垚閲囪喘璁㈠崟
+ if (purchaseRequest.getSupplierId() != null && purchaseRequest.getOrderId() == null) {
+ try {
+ Long orderId = doGeneratePurchaseOrder(purchaseRequest);
+ log.info("[auditPurchaseRequest] 閲囪喘鐢宠({}) 鑷姩鐢熸垚閲囪喘璁㈠崟({})", id, orderId);
+ } catch (Exception e) {
+ // 涓嶆姏鍑哄紓甯革紝閬垮厤褰卞搷瀹℃牳缁撴灉钀藉簱锛涚敓鎴愬け璐ュ彲鐢辩敤鎴锋墜鍔ㄨЕ鍙�
+ log.error("[auditPurchaseRequest] 閲囪喘鐢宠({}) 鑷姩鐢熸垚閲囪喘璁㈠崟澶辫触", id, e);
+ }
+ }
+ }
+
+ /**
+ * 鑾峰彇鐢ㄦ埛鏄电О
+ *
+ * @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();
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updatePurchaseRequestAuditStatus(Long id, Integer bpmStatus, String reason) {
+ // 1. BPM 瀹℃壒缁撴灉鏄犲皠涓洪噰璐敵璇风姸鎬侊細閫氳繃=20 / 涓嶉�氳繃=30 / 鍙栨秷=40
+ Integer newStatus = convertBpmResultToStatus(bpmStatus);
+ if (newStatus == null) {
+ return;
+ }
+ // 2. 浠呭綋浠嶅浜庛�屽鎵逛腑銆嶆椂鍥炲啓锛岄伩鍏嶉噸澶嶈鐩�
+ if (purchaseRequestMapper.updateAuditStatusByBpm(id, newStatus, reason) != 1) {
+ log.warn("[updatePurchaseRequestAuditStatus] 閲囪喘鐢宠({}) 涓嶅浜庡鎵逛腑鐘舵�侊紝蹇界暐 BPM 缁撴灉({})", id, bpmStatus);
+ return;
+ }
+ // 3. 瀹℃壒閫氳繃涓旀湁渚涘簲鍟嗐�佹湭鐢熸垚璁㈠崟鏃讹紝鑷姩鐢熸垚閲囪喘璁㈠崟
+ if (!ErpPurchaseRequestStatusEnum.APPROVE.getStatus().equals(newStatus)) {
+ return;
+ }
+ ErpPurchaseRequestDO purchaseRequest = purchaseRequestMapper.selectById(id);
+ if (purchaseRequest == null || purchaseRequest.getSupplierId() == null
+ || purchaseRequest.getOrderId() != null) {
+ return;
+ }
+ try {
+ Long orderId = doGeneratePurchaseOrder(purchaseRequest);
+ log.info("[updatePurchaseRequestAuditStatus] 閲囪喘鐢宠({}) 鑷姩鐢熸垚閲囪喘璁㈠崟({})", id, orderId);
+ } catch (Exception e) {
+ // 涓嶆姏鍑哄紓甯革紝閬垮厤褰卞搷瀹℃壒缁撴灉钀藉簱锛涚敓鎴愬け璐ュ彲鐢辩敤鎴锋墜鍔ㄨЕ鍙�
+ log.error("[updatePurchaseRequestAuditStatus] 閲囪喘鐢宠({}) 鑷姩鐢熸垚閲囪喘璁㈠崟澶辫触", id, e);
+ }
+ }
+
+ /**
+ * 杞崲 BPM 瀹℃壒缁撴灉涓洪噰璐敵璇风姸鎬�
+ */
+ private Integer convertBpmResultToStatus(Integer bpmStatus) {
+ if (BpmTaskStatusEnum.APPROVE.getStatus().equals(bpmStatus)) {
+ return ErpPurchaseRequestStatusEnum.APPROVE.getStatus();
+ }
+ if (BpmTaskStatusEnum.REJECT.getStatus().equals(bpmStatus)) {
+ return ErpPurchaseRequestStatusEnum.REJECT.getStatus();
+ }
+ if (BpmTaskStatusEnum.CANCEL.getStatus().equals(bpmStatus)) {
+ return ErpPurchaseRequestStatusEnum.CANCEL.getStatus();
+ }
+ return null;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Long generatePurchaseOrder(Long id, Long supplierId) {
+ // 1. 鏍￠獙瀛樺湪 + 瀹℃牳閫氳繃鐘舵��
+ ErpPurchaseRequestDO purchaseRequest = validatePurchaseRequestExists(id);
+ if (!ErpPurchaseRequestStatusEnum.APPROVE.getStatus().equals(purchaseRequest.getStatus())) {
+ throw exception(PURCHASE_REQUEST_NOT_APPROVE);
+ }
+ // 2. 鏍￠獙鏄惁宸茬敓鎴愯鍗�
+ if (purchaseRequest.getOrderId() != null) {
+ throw exception(PURCHASE_REQUEST_ORDER_EXISTS);
+ }
+ // 3. 鏍￠獙渚涘簲鍟�
+ supplierService.validateSupplier(supplierId);
+
+ // 4. 璁剧疆渚涘簲鍟嗗苟鐢熸垚璁㈠崟
+ purchaseRequest.setSupplierId(supplierId);
+ return doGeneratePurchaseOrder(purchaseRequest);
+ }
+
+ /**
+ * 鎵ц鐢熸垚閲囪喘璁㈠崟
+ *
+ * @param purchaseRequest 閲囪喘鐢宠锛堥渶鍖呭惈 supplierId锛�
+ * @return 閲囪喘璁㈠崟 ID
+ */
+ private Long doGeneratePurchaseOrder(ErpPurchaseRequestDO purchaseRequest) {
+ Long id = purchaseRequest.getId();
+
+ // 1. 鑾峰彇鐢宠鏄庣粏
+ List<ErpPurchaseRequestItemDO> requestItems = purchaseRequestItemMapper.selectListByRequestId(id);
+ if (CollUtil.isEmpty(requestItems)) {
+ throw exception(PURCHASE_REQUEST_NOT_EXISTS);
+ }
+ requestItems.forEach(item -> {
+ if (item.getProductPrice() == null || item.getTotalPrice() == null || item.getTaxPrice() == null) {
+ throw exception(PURCHASE_REQUEST_ITEM_PRICE_EMPTY, item.getId());
+ }
+ });
+
+ // 2. 鐢熸垚閲囪喘璁㈠崟鍙�
+ String orderNo = noRedisDAO.generate(ErpNoRedisDAO.PURCHASE_ORDER_NO_PREFIX);
+ if (purchaseOrderMapper.selectByNo(orderNo) != null) {
+ throw exception(PURCHASE_ORDER_NO_EXISTS);
+ }
+
+ // 3. 鍒涘缓閲囪喘璁㈠崟
+ ErpPurchaseOrderDO purchaseOrder = new ErpPurchaseOrderDO();
+ purchaseOrder.setNo(orderNo);
+ // 鑷姩鐢熸垚鐨勯噰璐鍗曚粛涓鸿崏绋匡紝蹇呴』璧拌鍗曡嚜韬殑鎻愪氦/瀹℃壒娴佺▼锛岄伩鍏嶇粫杩囧鎵�
+ purchaseOrder.setStatus(ErpPurchaseOrderStatusEnum.DRAFT.getStatus());
+ purchaseOrder.setSupplierId(purchaseRequest.getSupplierId());
+ purchaseOrder.setOrderTime(purchaseRequest.getRequestTime());
+ purchaseOrder.setTotalCount(purchaseRequest.getTotalCount());
+ purchaseOrder.setTotalPrice(purchaseRequest.getTotalPrice());
+ purchaseOrder.setTotalProductPrice(purchaseRequest.getTotalProductPrice());
+ purchaseOrder.setTotalTaxPrice(purchaseRequest.getTotalTaxPrice());
+ purchaseOrder.setDiscountPercent(purchaseRequest.getDiscountPercent());
+ purchaseOrder.setDiscountPrice(purchaseRequest.getDiscountPrice());
+ purchaseOrder.setDepositPrice(purchaseRequest.getDepositPrice() != null ? purchaseRequest.getDepositPrice() : BigDecimal.ZERO);
+ purchaseOrder.setRemark(purchaseRequest.getRemark());
+ purchaseOrder.setInCount(BigDecimal.ZERO);
+ purchaseOrder.setInStatus(0);
+ purchaseOrderMapper.insert(purchaseOrder);
+
+ // 4. 鍒涘缓閲囪喘璁㈠崟鏄庣粏
+ List<ErpPurchaseOrderItemDO> orderItems = convertList(requestItems, item -> {
+ ErpPurchaseOrderItemDO orderItem = new ErpPurchaseOrderItemDO();
+ orderItem.setOrderId(purchaseOrder.getId());
+ orderItem.setRequestItemId(item.getId()); // 鍏宠仈閲囪喘鐢宠鏄庣粏
+ orderItem.setProductId(item.getProductId());
+ orderItem.setProductUnitId(item.getProductUnitId());
+ orderItem.setProductPrice(item.getProductPrice());
+ orderItem.setCount(item.getCount());
+ orderItem.setTotalPrice(item.getTotalPrice());
+ orderItem.setTaxPercent(item.getTaxPercent());
+ orderItem.setTaxPrice(item.getTaxPrice());
+ orderItem.setRemark(item.getRemark());
+ orderItem.setInCount(BigDecimal.ZERO);
+ orderItem.setQcCheckFlag(item.getQcCheckFlag() != null ? item.getQcCheckFlag() : false);
+ return orderItem;
+ });
+ purchaseOrderItemMapper.insertBatch(orderItems);
+
+ // 5. 鏇存柊閲囪喘鐢宠鐨勮鍗曚俊鎭紝骞跺洖鍐欐渶缁堜娇鐢ㄧ殑渚涘簲鍟�
+ purchaseRequestMapper.updateById(new ErpPurchaseRequestDO()
+ .setId(id)
+ .setSupplierId(purchaseRequest.getSupplierId())
+ .setOrderId(purchaseOrder.getId())
+ .setOrderNo(orderNo));
+
+ return purchaseOrder.getId();
+ }
+
+ private ErpPurchaseRequestDO validatePurchaseRequestExists(Long id) {
+ ErpPurchaseRequestDO purchaseRequest = purchaseRequestMapper.selectById(id);
+ if (purchaseRequest == null) {
+ throw exception(PURCHASE_REQUEST_NOT_EXISTS);
+ }
+ return purchaseRequest;
+ }
+
+ private ErpPurchaseRequestDO validatePurchaseRequestCanModify(Long id) {
+ ErpPurchaseRequestDO purchaseRequest = validatePurchaseRequestExists(id);
+ Integer status = purchaseRequest.getStatus();
+ if (!ErpPurchaseRequestStatusEnum.DRAFT.getStatus().equals(status)
+ && !ErpPurchaseRequestStatusEnum.REJECT.getStatus().equals(status)) {
+ throw exception(PURCHASE_REQUEST_UPDATE_FAIL_NOT_DRAFT, purchaseRequest.getNo());
+ }
+ return purchaseRequest;
+ }
+
+ private String getCurrentUserId() {
+ return cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId().toString();
+ }
+
+ @Override
+ public ErpPurchaseRequestImportRespVO importPurchaseRequestList(List<ErpPurchaseRequestImportExcelVO> importRequests,
+ ErpPurchaseRequestImportReqVO importReqVO) {
+ // 1. 鏍￠獙闈炵┖锛堣繃婊ゅ畬鍏ㄧ┖鐧界殑琛岋級
+ importRequests = filterList(importRequests, item -> StrUtil.isNotBlank(item.getProductCode()));
+ if (CollUtil.isEmpty(importRequests)) {
+ throw exception(PURCHASE_REQUEST_IMPORT_LIST_IS_EMPTY);
+ }
+ // 2. 鎸夈�屽崟鍙枫�嶅垎缁勶細鐩稿悓鍗曞彿鐨勫琛屽悎骞舵垚涓�寮犻噰璐敵璇凤紱鍗曞彿涓虹┖鏃舵瘡琛屽悇鑷垚涓�寮犵敵璇�
+ List<List<ErpPurchaseRequestImportExcelVO>> groups = new ArrayList<>();
+ Map<String, Integer> groupIndexMap = new LinkedHashMap<>();
+ int rowIndex = 0;
+ for (ErpPurchaseRequestImportExcelVO row : importRequests) {
+ 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. 閫愮粍鍚堝苟鍒涘缓閲囪喘鐢宠
+ ErpPurchaseRequestImportRespVO respVO = ErpPurchaseRequestImportRespVO.builder()
+ .createPurchaseRequestNos(new ArrayList<>())
+ .failurePurchaseRequestNos(new LinkedHashMap<>())
+ .build();
+ for (List<ErpPurchaseRequestImportExcelVO> group : groups) {
+ String groupKey = StrUtil.isNotBlank(group.get(0).getNo()) ? group.get(0).getNo()
+ : "绗�" + (importRequests.indexOf(group.get(0)) + 1) + "琛�";
+ try {
+ ErpPurchaseRequestSaveReqVO createReqVO = buildPurchaseRequestImportSaveReqVO(group);
+ Long requestId = createPurchaseRequest(createReqVO);
+ respVO.getCreatePurchaseRequestNos().add(purchaseRequestMapper.selectById(requestId).getNo());
+ } catch (ServiceException ex) {
+ respVO.getFailurePurchaseRequestNos().put(groupKey, ex.getMessage());
+ }
+ }
+ return respVO;
+ }
+
+ /**
+ * 灏嗗悓涓�寮犻噰璐敵璇风殑澶氳鏄庣粏杞崲鎴愬垱寤� Request VO
+ */
+ private ErpPurchaseRequestSaveReqVO buildPurchaseRequestImportSaveReqVO(List<ErpPurchaseRequestImportExcelVO> group) {
+ ErpPurchaseRequestImportExcelVO first = group.get(0);
+ // 1. 鏍￠獙鐢宠鏃堕棿
+ if (first.getRequestTime() == null) {
+ throw exception(PURCHASE_REQUEST_IMPORT_REQUEST_TIME_REQUIRED);
+ }
+ // 2. 瑙ｆ瀽渚涘簲鍟嗭紙鍙�夛級
+ Long supplierId = null;
+ if (StrUtil.isNotBlank(first.getSupplierName())) {
+ ErpSupplierDO supplier = supplierMapper.selectByName(first.getSupplierName());
+ if (supplier == null) {
+ throw exception(PURCHASE_REQUEST_IMPORT_SUPPLIER_NOT_EXISTS, first.getSupplierName());
+ }
+ supplierId = supplier.getId();
+ }
+ // 3. 缁勮鏄庣粏
+ List<ErpPurchaseRequestSaveReqVO.Item> items = new ArrayList<>();
+ for (ErpPurchaseRequestImportExcelVO row : group) {
+ MdmItemRespDTO product = mdmItemApi.getItemByCode(row.getProductCode()).getCheckedData();
+ if (product == null) {
+ throw exception(PURCHASE_REQUEST_IMPORT_PRODUCT_NOT_EXISTS, row.getProductCode());
+ }
+ MdmUnitMeasureRespDTO unit = mdmUnitMeasureApi.getUnitMeasureByCode(row.getProductUnitCode()).getCheckedData();
+ if (unit == null) {
+ throw exception(PURCHASE_REQUEST_IMPORT_UNIT_NOT_EXISTS, row.getProductUnitCode());
+ }
+ ErpPurchaseRequestSaveReqVO.Item item = new ErpPurchaseRequestSaveReqVO.Item()
+ .setProductId(product.getId())
+ .setProductUnitId(unit.getId())
+ .setProductPrice(row.getProductPrice())
+ .setCount(row.getCount())
+ .setTaxPercent(row.getTaxPercent())
+ .setDemandTime(row.getDemandTime())
+ .setQcCheckFlag(row.getQcCheckFlag())
+ .setRemark(row.getItemRemark());
+ items.add(item);
+ }
+ // 4. 缁勮涓昏〃
+ return new ErpPurchaseRequestSaveReqVO()
+ .setRequestTime(first.getRequestTime())
+ .setRequestReason(first.getRequestReason())
+ .setSupplierId(supplierId)
+ .setDiscountPercent(first.getDiscountPercent())
+ .setDepositPrice(first.getDepositPrice())
+ .setRemark(first.getRemark())
+ .setItems(items);
+ }
+
+}
--
Gitblit v1.9.3