From 940c8481d2fdcf51341db4ccd6fd6fcc2d43debb Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 29 六月 2026 15:32:58 +0800
Subject: [PATCH] 初始化项目
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOutServiceImpl.java | 107 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 101 insertions(+), 6 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOutServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOutServiceImpl.java
index f8af202..45aad13 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOutServiceImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOutServiceImpl.java
@@ -5,6 +5,8 @@
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.erp.controller.admin.sale.vo.out.ErpSaleOutPageReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.sale.vo.out.ErpSaleOutSaveReqVO;
import cn.iocoder.yudao.module.erp.dal.dataobject.product.ErpProductDO;
@@ -22,6 +24,7 @@
import cn.iocoder.yudao.module.erp.service.stock.bo.ErpStockRecordCreateReqBO;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
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;
@@ -37,8 +40,6 @@
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.*;
-// TODO 鑺嬭壙锛氳褰曟搷浣滄棩蹇�
-
/**
* ERP 閿�鍞嚭搴� Service 瀹炵幇绫�
*
@@ -46,7 +47,13 @@
*/
@Service
@Validated
+@Slf4j
public class ErpSaleOutServiceImpl implements ErpSaleOutService {
+
+ /**
+ * BPM 閿�鍞嚭搴撳鎵规祦绋嬫爣璇�
+ */
+ public static final String BPM_PROCESS_DEFINITION_KEY = "erp-sale-out-audit";
@Resource
private ErpSaleOutMapper saleOutMapper;
@@ -69,6 +76,9 @@
@Resource
private AdminUserApi adminUserApi;
+ @Resource
+ private BpmProcessInstanceApi bpmProcessInstanceApi;
+
@Override
@Transactional(rollbackFor = Exception.class)
public Long createSaleOut(ErpSaleOutSaveReqVO createReqVO) {
@@ -90,7 +100,7 @@
// 2.1 鎻掑叆鍑哄簱
ErpSaleOutDO saleOut = BeanUtils.toBean(createReqVO, ErpSaleOutDO.class, in -> in
- .setNo(no).setStatus(ErpAuditStatus.PROCESS.getStatus()))
+ .setNo(no).setStatus(ErpAuditStatus.DRAFT.getStatus()))
.setOrderNo(saleOrder.getNo()).setCustomerId(saleOrder.getCustomerId());
calculateTotalPrice(saleOut, saleOutItems);
saleOutMapper.insert(saleOut);
@@ -189,9 +199,15 @@
: ErpStockRecordBizTypeEnum.SALE_OUT_CANCEL.getType();
saleOutItems.forEach(saleOutItem -> {
BigDecimal count = approve ? saleOutItem.getCount().negate() : saleOutItem.getCount();
- stockRecordService.createStockRecord(new ErpStockRecordCreateReqBO(
- saleOutItem.getProductId(), saleOutItem.getWarehouseId(), count,
- bizType, saleOutItem.getOutId(), saleOutItem.getId(), saleOut.getNo()));
+ ErpStockRecordCreateReqBO stockRecordBO = new ErpStockRecordCreateReqBO();
+ stockRecordBO.setProductId(saleOutItem.getProductId());
+ stockRecordBO.setWarehouseId(saleOutItem.getWarehouseId());
+ stockRecordBO.setCount(count);
+ stockRecordBO.setBizType(bizType);
+ stockRecordBO.setBizId(saleOutItem.getOutId());
+ stockRecordBO.setBizItemId(saleOutItem.getId());
+ stockRecordBO.setBizNo(saleOut.getNo());
+ stockRecordService.createStockRecord(stockRecordBO);
});
}
@@ -313,4 +329,83 @@
return saleOutItemMapper.selectListByOutIds(outIds);
}
+ // ==================== BPM 娴佺▼瀹℃壒 ====================
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void submitSaleOut(Long id, Long userId) {
+ // 1. 鏍￠獙閿�鍞嚭搴撳浜庤崏绋跨姸鎬�
+ ErpSaleOutDO saleOut = validateSaleOutExists(id);
+ if (ObjectUtil.notEqual(saleOut.getStatus(), ErpAuditStatus.DRAFT.getStatus())) {
+ throw exception(SALE_OUT_SUBMIT_FAIL_NOT_DRAFT);
+ }
+
+ // 2. 鍒涘缓閿�鍞嚭搴撳鎵规祦绋嬪疄渚�
+ String processInstanceId = bpmProcessInstanceApi.createProcessInstance(userId, new BpmProcessInstanceCreateReqDTO()
+ .setProcessDefinitionKey(BPM_PROCESS_DEFINITION_KEY)
+ .setBusinessKey(String.valueOf(id)));
+
+ // 3. 鏇存柊閿�鍞嚭搴撳伐浣滄祦缂栧彿銆佺姸鎬�
+ saleOutMapper.updateById(new ErpSaleOutDO()
+ .setId(id)
+ .setProcessInstanceId(processInstanceId)
+ .setStatus(ErpAuditStatus.PROCESS.getStatus()));
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateSaleOutAuditStatus(Long id, Integer bpmResult) {
+ // 1. 鏍￠獙閿�鍞嚭搴撳瓨鍦�
+ ErpSaleOutDO saleOut = validateSaleOutExists(id);
+
+ // 2. 鏍￠獙閿�鍞嚭搴撳浜庡鎵逛腑
+ if (ObjectUtil.notEqual(saleOut.getStatus(), ErpAuditStatus.PROCESS.getStatus())) {
+ log.error("[updateSaleOutAuditStatus][saleOut({}) 涓嶅浜庡鎵逛腑锛屾棤娉曟洿鏂板鎵圭粨鏋�({})]",
+ saleOut.getId(), bpmResult);
+ throw exception(SALE_OUT_UPDATE_AUDIT_STATUS_FAIL_NOT_PROCESS);
+ }
+
+ // 3. 鏇存柊閿�鍞嚭搴撳鎵圭粨鏋�
+ Integer auditStatus = convertBpmResultToAuditStatus(bpmResult);
+ saleOutMapper.updateById(new ErpSaleOutDO()
+ .setId(id)
+ .setStatus(auditStatus));
+
+ // 4. 瀹℃壒閫氳繃鏃跺彉鏇村簱瀛橈紙鍑忓皯搴撳瓨锛�
+ if (ErpAuditStatus.APPROVE.getStatus().equals(auditStatus)) {
+ List<ErpSaleOutItemDO> saleOutItems = saleOutItemMapper.selectListByOutId(id);
+ saleOutItems.forEach(saleOutItem -> {
+ ErpStockRecordCreateReqBO stockRecordBO = new ErpStockRecordCreateReqBO();
+ stockRecordBO.setProductId(saleOutItem.getProductId());
+ stockRecordBO.setWarehouseId(saleOutItem.getWarehouseId());
+ stockRecordBO.setCount(saleOutItem.getCount().negate());
+ stockRecordBO.setBizType(ErpStockRecordBizTypeEnum.SALE_OUT.getType());
+ stockRecordBO.setBizId(saleOutItem.getOutId());
+ stockRecordBO.setBizItemId(saleOutItem.getId());
+ stockRecordBO.setBizNo(saleOut.getNo());
+ stockRecordService.createStockRecord(stockRecordBO);
+ });
+ }
+ }
+
+ /**
+ * 灏� 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();
+ }
+ }
+
}
--
Gitblit v1.9.3