From 962f78c8383e7c884ddb08c951c15e5ba6eb4cb8 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期五, 23 十月 2026 15:43:33 +0800
Subject: [PATCH] fix: 完善审批流程与业务状态校验
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java | 519 ++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 437 insertions(+), 82 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 ccd1dd1..cf9e52c 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
@@ -2,42 +2,62 @@
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.product.ErpProductDO;
+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.erp.service.product.ErpProductService;
+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;
+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.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import java.math.BigDecimal;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+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 瀹炵幇绫�
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Service
@Validated
@@ -45,9 +65,14 @@
public class ErpPurchaseOrderServiceImpl implements ErpPurchaseOrderService {
/**
- * BPM 閲囪喘璁㈠崟瀹℃壒娴佺▼鏍囪瘑
+ * 閲囪喘璁㈠崟瀹℃壒涓氬姟绫诲瀷缂栫爜锛堝搴� system_approval_config.biz_type锛�
+ *
+ * 娉ㄦ剰锛氭敼閫犱负杞婚噺绾х姸鎬佹満瀹℃壒鍓嶏紝姝ゅ鍘熶负 "purchase_request_approve"锛�
+ * 涓庨噰璐敵璇凤紙ErpPurchaseRequestServiceImpl锛夌殑 BPM 鍒嗙被缂栫爜瀹屽叏鐩稿悓锛�
+ * 瀵艰嚧閲囪喘璁㈠崟鏌ヨ瀹℃壒娴佺▼鏃朵細鍛戒腑閲囪喘鐢宠鐨勬祦绋嬪畾涔夛紝涓よ�呬簰鐩镐覆鐢ㄣ��
+ * 鐜版洿姝ｄ负閲囪喘璁㈠崟涓撳睘缂栫爜銆�
*/
- public static final String BPM_PROCESS_DEFINITION_KEY = "erp-purchase-order-audit";
+ private static final String PURCHASE_ORDER_APPROVE_BIZ_TYPE = "erp_purchase_order_approve";
@Resource
private ErpPurchaseOrderMapper purchaseOrderMapper;
@@ -58,14 +83,34 @@
private ErpNoRedisDAO noRedisDAO;
@Resource
- private ErpProductService productService;
- @Resource
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 BpmProcessInstanceApi bpmProcessInstanceApi;
+ private ApprovalConfigApi approvalConfigApi;
+ @Resource
+ private AdminUserApi adminUserApi;
+
+ @Resource
+ @Lazy
+ private MesArrivalNoticeApi arrivalNoticeApi;
+
+ @Resource
+ private ErpPurchaseRequestItemMapper purchaseRequestItemMapper;
+ @Resource
+ private ErpPurchaseRequestMapper purchaseRequestMapper;
+
+ @Resource
+ private StorageAttachmentApi storageAttachmentApi;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -84,14 +129,18 @@
throw exception(PURCHASE_ORDER_NO_EXISTS);
}
- // 2.1 鎻掑叆璁㈠崟
+ // 2.1 鎻掑叆璁㈠崟锛堥噰璐鍗曞垱寤哄悗涓恒�愭湭鎻愪氦銆戠姸鎬侊紝闇�鎻愪氦杩涘叆瀹℃壒娴佺▼锛�
ErpPurchaseOrderDO purchaseOrder = BeanUtils.toBean(createReqVO, ErpPurchaseOrderDO.class, in -> in
- .setNo(no).setStatus(ErpAuditStatus.DRAFT.getStatus()));
+ .setNo(no).setStatus(ErpPurchaseOrderStatusEnum.DRAFT.getStatus())
+ .setInCount(BigDecimal.ZERO).setInStatus(ErpPurchaseOrderInStatusEnum.NOT_IN.getStatus()));
calculateTotalPrice(purchaseOrder, purchaseOrderItems);
purchaseOrderMapper.insert(purchaseOrder);
// 2.2 鎻掑叆璁㈠崟椤�
purchaseOrderItems.forEach(o -> o.setOrderId(purchaseOrder.getId()));
purchaseOrderItemMapper.insertBatch(purchaseOrderItems);
+ // 2.3 缁戝畾闄勪欢
+ storageAttachmentApi.bindAttachments("file", "erp_purchase_order",
+ purchaseOrder.getId(), createReqVO.getBlobIds());
return purchaseOrder.getId();
}
@@ -100,8 +149,13 @@
public void updatePurchaseOrder(ErpPurchaseOrderSaveReqVO updateReqVO) {
// 1.1 鏍￠獙瀛樺湪
ErpPurchaseOrderDO purchaseOrder = validatePurchaseOrderExists(updateReqVO.getId());
- if (ErpAuditStatus.APPROVE.getStatus().equals(purchaseOrder.getStatus())) {
+ // 宸插鏍哥姸鎬佷笉鍏佽淇敼
+ if (ErpPurchaseOrderStatusEnum.APPROVE.getStatus().equals(purchaseOrder.getStatus())) {
throw exception(PURCHASE_ORDER_UPDATE_FAIL_APPROVE, purchaseOrder.getNo());
+ }
+ // 瀹℃壒涓笉鍏佽淇敼锛氶渶鍏堢敱瀹℃壒浜恒�屽鏍镐笉閫氳繃銆嶉��鍥烇紝鎵嶈兘閲嶆柊淇敼骞舵彁浜�
+ if (ErpPurchaseOrderStatusEnum.PROCESS.getStatus().equals(purchaseOrder.getStatus())) {
+ throw exception(PURCHASE_ORDER_UPDATE_FAIL_PROCESS, purchaseOrder.getNo());
}
// 1.2 鏍￠獙渚涘簲鍟�
supplierService.validateSupplier(updateReqVO.getSupplierId());
@@ -118,6 +172,8 @@
purchaseOrderMapper.updateById(updateObj);
// 2.2 鏇存柊璁㈠崟椤�
updatePurchaseOrderItemList(updateReqVO.getId(), purchaseOrderItems);
+ // 2.3 鏇存柊闄勪欢
+ storageAttachmentApi.updateAttachments("file", "erp_purchase_order", updateReqVO.getId(), updateReqVO.getBlobIds());
}
private void calculateTotalPrice(ErpPurchaseOrderDO purchaseOrder, List<ErpPurchaseOrderItemDO> purchaseOrderItems) {
@@ -139,16 +195,22 @@
boolean approve = ErpAuditStatus.APPROVE.getStatus().equals(status);
// 1.1 鏍￠獙瀛樺湪
ErpPurchaseOrderDO purchaseOrder = validatePurchaseOrderExists(id);
+ // 1.1.1 瀹℃牳閫氳繃灞炰簬瀹℃壒鍔ㄤ綔锛屽繀椤荤敱閰嶇疆鍐呯殑瀹℃壒浜烘墽琛岋紙鏈嶅姟绔己鍒讹紝閬垮厤缁曡繃瀹℃牳鎸夐挳鑷姪閫氳繃锛�
+ if (approve) {
+ approvalConfigApi.validateApprover(PURCHASE_ORDER_APPROVE_BIZ_TYPE, getLoginUserId());
+ }
// 1.2 鏍￠獙鐘舵��
if (purchaseOrder.getStatus().equals(status)) {
throw exception(approve ? PURCHASE_ORDER_APPROVE_FAIL : PURCHASE_ORDER_PROCESS_FAIL);
}
- // 1.3 瀛樺湪閲囪喘鍏ュ崟锛屾棤娉曞弽瀹℃牳
- if (!approve && purchaseOrder.getInCount().compareTo(BigDecimal.ZERO) > 0) {
+ // 1.3 瀛樺湪閲囪喘鍏ュ簱鍗曪紝鏃犳硶鍙嶅鏍�
+ BigDecimal inCount = purchaseOrder.getInCount();
+ if (!approve && inCount != null && inCount.compareTo(BigDecimal.ZERO) > 0) {
throw exception(PURCHASE_ORDER_PROCESS_FAIL_EXISTS_IN);
}
// 1.4 瀛樺湪閲囪喘閫�璐у崟锛屾棤娉曞弽瀹℃牳
- if (!approve && purchaseOrder.getReturnCount().compareTo(BigDecimal.ZERO) > 0) {
+ BigDecimal returnCount = purchaseOrder.getReturnCount();
+ if (!approve && returnCount != null && returnCount.compareTo(BigDecimal.ZERO) > 0) {
throw exception(PURCHASE_ORDER_PROCESS_FAIL_EXISTS_RETURN);
}
@@ -160,14 +222,116 @@
}
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void submitPurchaseOrder(Long id) {
+ // 1.1 鏍￠獙瀛樺湪
+ ErpPurchaseOrderDO purchaseOrder = validatePurchaseOrderExists(id);
+ // 1.2 鍙湁銆愭湭鎻愪氦銆戞垨銆愬鏍镐笉閫氳繃銆戞墠鍏佽鎻愪氦
+ if (!ErpPurchaseOrderStatusEnum.DRAFT.getStatus().equals(purchaseOrder.getStatus())
+ && !ErpPurchaseOrderStatusEnum.REJECT.getStatus().equals(purchaseOrder.getStatus())) {
+ throw exception(PURCHASE_ORDER_SUBMIT_FAIL_NOT_ALLOWED);
+ }
+ // 1.3 蹇呴』閰嶇疆璁㈠崟椤�
+ List<ErpPurchaseOrderItemDO> items = purchaseOrderItemMapper.selectListByOrderId(id);
+ if (CollUtil.isEmpty(items)) {
+ throw exception(PURCHASE_ORDER_SUBMIT_FAIL_ITEM_EMPTY);
+ }
+
+ // 2. 鏍￠獙瀹℃壒宸插紑鍚笖閰嶇疆浜嗘湁鏁堝鎵逛汉锛堟湭寮�鍚鎵规椂涓嶅厑璁告彁浜わ級
+ approvalConfigApi.validateApprovalEnabledAndGetApprovers(PURCHASE_ORDER_APPROVE_BIZ_TYPE);
+
+ // 3. 缃负瀹℃壒涓紝骞舵竻绌轰笂涓�杞鏍镐俊鎭紝閬垮厤椹冲洖鍘熷洜娈嬬暀
+ if (purchaseOrderMapper.submitAndResetAuditInfo(id, ErpPurchaseOrderStatusEnum.PROCESS.getStatus()) != 1) {
+ throw exception(PURCHASE_ORDER_SUBMIT_FAIL_NOT_ALLOWED);
+ }
+ }
+
+ @Override
+ public Set<Long> getPurchaseOrderApproverUserIds() {
+ return approvalConfigApi.getApproverUserIds(PURCHASE_ORDER_APPROVE_BIZ_TYPE);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void auditPurchaseOrder(Long id, Boolean pass, String reviewRemark) {
+ // 1.1 鏍￠獙瀛樺湪 + 瀹℃壒涓姸鎬�
+ ErpPurchaseOrderDO purchaseOrder = validatePurchaseOrderExists(id);
+ if (!ErpPurchaseOrderStatusEnum.PROCESS.getStatus().equals(purchaseOrder.getStatus())) {
+ throw exception(PURCHASE_ORDER_AUDIT_FAIL_NOT_PROCESS);
+ }
+ // 1.2 鏍￠獙褰撳墠鐧诲綍浜烘槸閰嶇疆鐨勫鎵逛汉锛堟垨绛撅細浠讳竴浜哄鏍稿嵆鍙級
+ Long userId = getLoginUserId();
+ approvalConfigApi.validateApprover(PURCHASE_ORDER_APPROVE_BIZ_TYPE, userId);
+
+ // 2. 瀹℃牳涓嶉�氳繃锛氬繀椤诲～鍐欓┏鍥炲師鍥狅紝鍗曟嵁閫�鍥炲悗鍙紪杈戝苟閲嶆柊鎻愪氦
+ if (!Boolean.TRUE.equals(pass)) {
+ if (StrUtil.isBlank(reviewRemark)) {
+ throw exception(PURCHASE_ORDER_AUDIT_REJECT_REASON_REQUIRED);
+ }
+ if (purchaseOrderMapper.auditPurchaseOrder(id, ErpPurchaseOrderStatusEnum.REJECT.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(PURCHASE_ORDER_AUDIT_FAIL_NOT_PROCESS);
+ }
+ return;
+ }
+
+ // 3. 瀹℃牳閫氳繃
+ if (purchaseOrderMapper.auditPurchaseOrder(id, ErpPurchaseOrderStatusEnum.APPROVE.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(PURCHASE_ORDER_AUDIT_FAIL_NOT_PROCESS);
+ }
+ }
+
+ /**
+ * 鑾峰彇鐢ㄦ埛鏄电О锛岀敤浜庡啑浣欏瓨鍌ㄥ鏍镐汉濮撳悕
+ */
+ 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 updatePurchaseOrderAuditStatus(Long id, Integer bpmResult) {
+ // 1. 鏍￠獙瀛樺湪
+ ErpPurchaseOrderDO purchaseOrder = validatePurchaseOrderExists(id);
+ if (!ErpPurchaseOrderStatusEnum.PROCESS.getStatus().equals(purchaseOrder.getStatus())) {
+ log.warn("[updatePurchaseOrderAuditStatus] 閲囪喘璁㈠崟({}) 涓嶅浜庡鎵逛腑鐘舵��", id);
+ return;
+ }
+
+ // 2. 鏍规嵁瀹℃壒缁撴灉鏇存柊鐘舵��
+ Integer newStatus = convertBpmResultToAuditStatus(bpmResult);
+ if (newStatus != null) {
+ purchaseOrderMapper.updateById(new ErpPurchaseOrderDO()
+ .setId(id).setStatus(newStatus));
+ }
+ }
+
+ /**
+ * 杞崲 BPM 瀹℃壒缁撴灉涓哄鏍哥姸鎬�
+ *
+ * 宸插簾寮冿細閲囪喘璁㈠崟涓嶅啀璧� BPM 娴佺▼锛屾湰鏂规硶浠呬负鍘嗗彶浠ｇ爜淇濈暀锛屼笉鍐嶈璋冪敤銆�
+ */
+ @Deprecated
+ private Integer convertBpmResultToAuditStatus(Integer bpmResult) {
+ if (BpmTaskStatusEnum.APPROVE.getStatus().equals(bpmResult)) {
+ return ErpPurchaseOrderStatusEnum.APPROVE.getStatus();
+ } else if (BpmTaskStatusEnum.REJECT.getStatus().equals(bpmResult)) {
+ return ErpPurchaseOrderStatusEnum.REJECT.getStatus();
+ } else if (BpmTaskStatusEnum.CANCEL.getStatus().equals(bpmResult)) {
+ return ErpPurchaseOrderStatusEnum.CANCEL.getStatus();
+ }
+ return null;
+ }
+
private List<ErpPurchaseOrderItemDO> validatePurchaseOrderItems(List<ErpPurchaseOrderSaveReqVO.Item> list) {
- // 1. 鏍￠獙浜у搧瀛樺湪
- List<ErpProductDO> productList = productService.validProductList(
- convertSet(list, ErpPurchaseOrderSaveReqVO.Item::getProductId));
- Map<Long, ErpProductDO> productMap = convertMap(productList, ErpProductDO::getId);
- // 2. 杞寲涓� ErpPurchaseOrderItemDO 鍒楄〃
+ // 杞寲涓� ErpPurchaseOrderItemDO 鍒楄〃锛堜骇鍝侀獙璇佸凡绉婚櫎锛�
return convertList(list, o -> BeanUtils.toBean(o, ErpPurchaseOrderItemDO.class, item -> {
- item.setProductUnitId(productMap.get(item.getProductId()).getUnitId());
item.setTotalPrice(MoneyUtils.priceMultiply(item.getProductPrice(), item.getCount()));
if (item.getTotalPrice() == null) {
return;
@@ -181,7 +345,7 @@
private void updatePurchaseOrderItemList(Long id, List<ErpPurchaseOrderItemDO> newList) {
// 绗竴姝ワ紝瀵规瘮鏂拌�佹暟鎹紝鑾峰緱娣诲姞銆佷慨鏀广�佸垹闄ょ殑鍒楄〃
List<ErpPurchaseOrderItemDO> oldList = purchaseOrderItemMapper.selectListByOrderId(id);
- List<List<ErpPurchaseOrderItemDO>> diffList = diffList(oldList, newList, // id 涓嶅悓锛屽氨璁や负鏄笉鍚岀殑璁板綍
+ List<List<ErpPurchaseOrderItemDO>> diffList = diffList(oldList, newList,
(oldVal, newVal) -> oldVal.getId().equals(newVal.getId()));
// 绗簩姝ワ紝鎵归噺娣诲姞銆佷慨鏀广�佸垹闄�
@@ -208,7 +372,7 @@
}
if (inCount.compareTo(item.getCount()) > 0) {
throw exception(PURCHASE_ORDER_ITEM_IN_FAIL_PRODUCT_EXCEED,
- productService.getProduct(item.getProductId()).getName(), item.getCount());
+ "浜у搧ID:" + item.getProductId(), item.getCount());
}
purchaseOrderItemMapper.updateById(new ErpPurchaseOrderItemDO().setId(item.getId()).setInCount(inCount));
});
@@ -228,7 +392,7 @@
}
if (returnCount.compareTo(item.getInCount()) > 0) {
throw exception(PURCHASE_ORDER_ITEM_RETURN_FAIL_IN_EXCEED,
- productService.getProduct(item.getProductId()).getName(), item.getInCount());
+ "浜у搧ID:" + item.getProductId(), item.getInCount());
}
purchaseOrderItemMapper.updateById(new ErpPurchaseOrderItemDO().setId(item.getId()).setReturnCount(returnCount));
});
@@ -246,16 +410,22 @@
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());
}
});
- // 2. 閬嶅巻鍒犻櫎锛屽苟璁板綍鎿嶄綔鏃ュ織
+ // 2. 閬嶅巻鍒犻櫎
purchaseOrders.forEach(purchaseOrder -> {
- // 2.1 鍒犻櫎璁㈠崟
+ // 2.1 鍒犻櫎闄勪欢
+ storageAttachmentApi.deleteAttachmentsByRecord("erp_purchase_order", purchaseOrder.getId());
+ // 2.2 鍒犻櫎璁㈠崟
purchaseOrderMapper.deleteById(purchaseOrder.getId());
- // 2.2 鍒犻櫎璁㈠崟椤�
+ // 2.3 鍒犻櫎璁㈠崟椤�
purchaseOrderItemMapper.deleteByOrderId(purchaseOrder.getId());
});
}
@@ -302,67 +472,252 @@
return purchaseOrderItemMapper.selectListByOrderIds(orderIds);
}
- // ==================== BPM 娴佺▼瀹℃壒 ====================
-
@Override
- @Transactional(rollbackFor = Exception.class)
- public void submitPurchaseOrder(Long id, Long userId) {
- // 1. 鏍￠獙閲囪喘璁㈠崟澶勪簬鑽夌鐘舵��
- ErpPurchaseOrderDO purchaseOrder = validatePurchaseOrderExists(id);
- if (ObjectUtil.notEqual(purchaseOrder.getStatus(), ErpAuditStatus.DRAFT.getStatus())) {
- throw exception(PURCHASE_ORDER_SUBMIT_FAIL_NOT_DRAFT);
+ public List<ErpPurchaseOrderDO> getPurchaseOrderListBySupplierIdAndStatus(Long supplierId, Integer status) {
+ if (supplierId == null) {
+ return Collections.emptyList();
}
-
- // 2. 鍒涘缓閲囪喘璁㈠崟瀹℃壒娴佺▼瀹炰緥
- String processInstanceId = bpmProcessInstanceApi.createProcessInstance(userId, new BpmProcessInstanceCreateReqDTO()
- .setProcessDefinitionKey(BPM_PROCESS_DEFINITION_KEY)
- .setBusinessKey(String.valueOf(id)));
-
- // 3. 鏇存柊閲囪喘璁㈠崟宸ヤ綔娴佺紪鍙枫�佺姸鎬�
- purchaseOrderMapper.updateById(new ErpPurchaseOrderDO()
- .setId(id)
- .setProcessInstanceId(processInstanceId)
- .setStatus(ErpAuditStatus.PROCESS.getStatus()));
+ return purchaseOrderMapper.selectList(supplierId, status);
}
@Override
- @Transactional(rollbackFor = Exception.class)
- public void updatePurchaseOrderAuditStatus(Long id, Integer bpmResult) {
- // 1. 鏍￠獙閲囪喘璁㈠崟瀛樺湪
- ErpPurchaseOrderDO purchaseOrder = validatePurchaseOrderExists(id);
-
- // 2. 鏍￠獙閲囪喘璁㈠崟澶勪簬瀹℃壒涓�
- if (ObjectUtil.notEqual(purchaseOrder.getStatus(), ErpAuditStatus.PROCESS.getStatus())) {
- log.error("[updatePurchaseOrderAuditStatus][purchaseOrder({}) 涓嶅浜庡鎵逛腑锛屾棤娉曟洿鏂板鎵圭粨鏋�({})]",
- purchaseOrder.getId(), bpmResult);
- throw exception(PURCHASE_ORDER_UPDATE_AUDIT_STATUS_FAIL_NOT_PROCESS);
+ public List<ErpPurchaseOrderDO> getPurchaseOrderList(List<Long> ids) {
+ if (CollUtil.isEmpty(ids)) {
+ return Collections.emptyList();
}
+ return purchaseOrderMapper.selectByIds(ids);
+ }
- // 3. 鏇存柊閲囪喘璁㈠崟瀹℃壒缁撴灉
- Integer auditStatus = convertBpmResultToAuditStatus(bpmResult);
+ @Override
+ public List<ErpPurchaseOrderDO> getPurchaseOrderListBySource(Integer sourceType, Long sourceId) {
+ if (sourceType == null || sourceId == null) {
+ return Collections.emptyList();
+ }
+ return purchaseOrderMapper.selectListBySource(sourceType, sourceId);
+ }
+
+ @Override
+ public void updatePurchaseOrderInStatus(Long orderId) {
+ // 1. 鑾峰彇閲囪喘璁㈠崟
+ ErpPurchaseOrderDO order = validatePurchaseOrderExists(orderId);
+ // 2. 鑾峰彇閲囪喘璁㈠崟鏄庣粏
+ List<ErpPurchaseOrderItemDO> items = purchaseOrderItemMapper.selectListByOrderId(orderId);
+ if (CollUtil.isEmpty(items)) {
+ return;
+ }
+ // 3. 璁＄畻鍏ュ簱鐘舵�佸拰鎬诲叆搴撴暟閲�
+ int inStatus = calculateInStatus(items);
+ BigDecimal totalInCount = calculateTotalInCount(items);
+ // 4. 鏇存柊閲囪喘璁㈠崟鍏ュ簱鐘舵�佸拰鍏ュ簱鏁伴噺
purchaseOrderMapper.updateById(new ErpPurchaseOrderDO()
- .setId(id)
- .setStatus(auditStatus));
+ .setId(orderId).setInStatus(inStatus).setInCount(totalInCount));
+
+ // 5. 鍥炲啓閲囪喘鐢宠鏄庣粏鐨勫叆搴撴暟閲忓拰閲囪喘鐢宠鐨勫叆搴撶姸鎬�
+ updatePurchaseRequestInStatus(items, inStatus);
}
/**
- * 灏� BPM 瀹℃壒缁撴灉杞崲涓� ERP 瀹℃壒鐘舵��
- *
- * @param bpmResult BPM 瀹℃壒缁撴灉
- * @return ERP 瀹℃壒鐘舵��
+ * 璁＄畻鎬诲叆搴撴暟閲�
*/
- private Integer convertBpmResultToAuditStatus(Integer bpmResult) {
- // BPM 瀹℃壒缁撴灉锛�2=閫氳繃锛�3=涓嶉�氳繃锛�4=宸插彇娑�
- if (bpmResult == 2) {
- return ErpAuditStatus.APPROVE.getStatus();
- } else if (bpmResult == 3) {
- return ErpAuditStatus.REJECT.getStatus();
- } else if (bpmResult == 4) {
- return ErpAuditStatus.DRAFT.getStatus();
- } else {
- log.warn("[convertBpmResultToAuditStatus][鏈煡鐨� BPM 瀹℃壒缁撴灉({})]", bpmResult);
- return ErpAuditStatus.PROCESS.getStatus();
+ private BigDecimal calculateTotalInCount(List<ErpPurchaseOrderItemDO> items) {
+ BigDecimal total = BigDecimal.ZERO;
+ for (ErpPurchaseOrderItemDO item : items) {
+ if (item.getInCount() != null) {
+ total = total.add(item.getInCount());
+ }
+ }
+ return total;
+ }
+
+ /**
+ * 鍥炲啓閲囪喘鐢宠鍏ュ簱鏁伴噺鍜屽叆搴撶姸鎬�
+ *
+ * @param orderItems 閲囪喘璁㈠崟鏄庣粏鍒楄〃
+ * @param orderInStatus 閲囪喘璁㈠崟鍏ュ簱鐘舵��
+ */
+ private void updatePurchaseRequestInStatus(List<ErpPurchaseOrderItemDO> orderItems, int orderInStatus) {
+ // 鑾峰彇鎵�鏈夊叧鑱旂殑閲囪喘鐢宠鏄庣粏 ID
+ Set<Long> requestItemIds = new HashSet<>();
+ for (ErpPurchaseOrderItemDO item : orderItems) {
+ if (item.getRequestItemId() != null) {
+ requestItemIds.add(item.getRequestItemId());
+ }
+ }
+ if (requestItemIds.isEmpty()) {
+ return;
+ }
+
+ // 鏇存柊閲囪喘鐢宠鏄庣粏鐨勫叆搴撴暟閲�
+ for (ErpPurchaseOrderItemDO orderItem : orderItems) {
+ if (orderItem.getRequestItemId() != null && orderItem.getInCount() != null) {
+ purchaseRequestItemMapper.updateById(new ErpPurchaseRequestItemDO()
+ .setId(orderItem.getRequestItemId())
+ .setInCount(orderItem.getInCount()));
+ }
+ }
+
+ // 鑾峰彇閲囪喘鐢宠鏄庣粏锛屾壘鍒板搴旂殑閲囪喘鐢宠 ID
+ List<ErpPurchaseRequestItemDO> requestItems = purchaseRequestItemMapper.selectBatchIds(requestItemIds);
+ if (CollUtil.isEmpty(requestItems)) {
+ return;
+ }
+ Set<Long> requestIds = convertSet(requestItems, ErpPurchaseRequestItemDO::getRequestId);
+
+ // 鏇存柊閲囪喘鐢宠鐨勫叆搴撶姸鎬�
+ for (Long requestId : requestIds) {
+ purchaseRequestMapper.updateById(new ErpPurchaseRequestDO()
+ .setId(requestId)
+ .setInStatus(orderInStatus));
}
}
-}
+ /**
+ * 璁＄畻鍏ュ簱鐘舵��
+ *
+ * @param items 閲囪喘璁㈠崟鏄庣粏鍒楄〃
+ * @return 鍏ュ簱鐘舵��
+ */
+ private int calculateInStatus(List<ErpPurchaseOrderItemDO> items) {
+ boolean allIn = true;
+ boolean anyIn = false;
+
+ for (ErpPurchaseOrderItemDO item : items) {
+ BigDecimal count = item.getCount() != null ? item.getCount() : BigDecimal.ZERO;
+ BigDecimal inCount = item.getInCount() != null ? item.getInCount() : BigDecimal.ZERO;
+
+ if (inCount.compareTo(BigDecimal.ZERO) > 0) {
+ anyIn = true;
+ }
+ if (inCount.compareTo(count) < 0) {
+ allIn = false;
+ }
+ }
+
+ if (allIn) {
+ return ErpPurchaseOrderInStatusEnum.ALL_IN.getStatus();
+ } else if (anyIn) {
+ return ErpPurchaseOrderInStatusEnum.PART_IN.getStatus();
+ } else {
+ return ErpPurchaseOrderInStatusEnum.NOT_IN.getStatus();
+ }
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Long confirmReceipt(Long id) {
+ // 1. 鏍￠獙閲囪喘璁㈠崟瀛樺湪涓斿凡瀹℃牳
+ ErpPurchaseOrderDO purchaseOrder = validatePurchaseOrder(id);
+
+ // 2. 鏍￠獙閲囪喘璁㈠崟鏈叏閮ㄥ叆搴�
+ if (ErpPurchaseOrderInStatusEnum.ALL_IN.getStatus().equals(purchaseOrder.getInStatus())) {
+ throw exception(PURCHASE_ORDER_ALL_IN);
+ }
+
+ // 3. 璋冪敤 MES 鎺ュ彛鐢熸垚鍒拌揣閫氱煡鍗�
+ Long arrivalNoticeId = arrivalNoticeApi.generateArrivalNoticeFromPurchaseOrder(id);
+ log.info("[confirmReceipt] 閲囪喘璁㈠崟({}) 纭鏀惰揣锛岀敓鎴愬埌璐ч�氱煡鍗�({})", id, arrivalNoticeId);
+
+ 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