From bee96a1d36c86068cd5a7eb69f4e3294a8123b04 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 03 七月 2026 18:02:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInServiceImpl.java | 107 +++--------------------------------------------------
1 files changed, 6 insertions(+), 101 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInServiceImpl.java
index 8481a93..adc2f40 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInServiceImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInServiceImpl.java
@@ -5,8 +5,6 @@
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.purchase.vo.in.ErpPurchaseInPageReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.in.ErpPurchaseInSaveReqVO;
import cn.iocoder.yudao.module.erp.dal.dataobject.product.ErpProductDO;
@@ -24,7 +22,6 @@
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;
@@ -40,6 +37,8 @@
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.*;
+// TODO 鑺嬭壙锛氳褰曟搷浣滄棩蹇�
+
/**
* ERP 閲囪喘鍏ュ簱 Service 瀹炵幇绫�
*
@@ -47,13 +46,7 @@
*/
@Service
@Validated
-@Slf4j
public class ErpPurchaseInServiceImpl implements ErpPurchaseInService {
-
- /**
- * BPM 閲囪喘鍏ュ簱瀹℃壒娴佺▼鏍囪瘑
- */
- public static final String BPM_PROCESS_DEFINITION_KEY = "erp-purchase-in-audit";
@Resource
private ErpPurchaseInMapper purchaseInMapper;
@@ -76,9 +69,6 @@
@Resource
private AdminUserApi adminUserApi;
- @Resource
- private BpmProcessInstanceApi bpmProcessInstanceApi;
-
@Override
@Transactional(rollbackFor = Exception.class)
public Long createPurchaseIn(ErpPurchaseInSaveReqVO createReqVO) {
@@ -96,7 +86,7 @@
// 2.1 鎻掑叆鍏ュ簱
ErpPurchaseInDO purchaseIn = BeanUtils.toBean(createReqVO, ErpPurchaseInDO.class, in -> in
- .setNo(no).setStatus(ErpAuditStatus.DRAFT.getStatus()))
+ .setNo(no).setStatus(ErpAuditStatus.PROCESS.getStatus()))
.setOrderNo(purchaseOrder.getNo()).setSupplierId(purchaseOrder.getSupplierId());
calculateTotalPrice(purchaseIn, purchaseInItems);
purchaseInMapper.insert(purchaseIn);
@@ -191,15 +181,9 @@
: ErpStockRecordBizTypeEnum.PURCHASE_IN_CANCEL.getType();
purchaseInItems.forEach(purchaseInItem -> {
BigDecimal count = approve ? purchaseInItem.getCount() : purchaseInItem.getCount().negate();
- ErpStockRecordCreateReqBO stockRecordBO = new ErpStockRecordCreateReqBO();
- stockRecordBO.setProductId(purchaseInItem.getProductId());
- stockRecordBO.setWarehouseId(purchaseInItem.getWarehouseId());
- stockRecordBO.setCount(count);
- stockRecordBO.setBizType(bizType);
- stockRecordBO.setBizId(purchaseInItem.getInId());
- stockRecordBO.setBizItemId(purchaseInItem.getId());
- stockRecordBO.setBizNo(purchaseIn.getNo());
- stockRecordService.createStockRecord(stockRecordBO);
+ stockRecordService.createStockRecord(new ErpStockRecordCreateReqBO(
+ purchaseInItem.getProductId(), purchaseInItem.getWarehouseId(), count,
+ bizType, purchaseInItem.getInId(), purchaseInItem.getId(), purchaseIn.getNo()));
});
}
@@ -319,85 +303,6 @@
return Collections.emptyList();
}
return purchaseInItemMapper.selectListByInIds(inIds);
- }
-
- // ==================== BPM 娴佺▼瀹℃壒 ====================
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void submitPurchaseIn(Long id, Long userId) {
- // 1. 鏍￠獙閲囪喘鍏ュ簱澶勪簬鑽夌鐘舵��
- ErpPurchaseInDO purchaseIn = validatePurchaseInExists(id);
- if (ObjectUtil.notEqual(purchaseIn.getStatus(), ErpAuditStatus.DRAFT.getStatus())) {
- throw exception(PURCHASE_IN_SUBMIT_FAIL_NOT_DRAFT);
- }
-
- // 2. 鍒涘缓閲囪喘鍏ュ簱瀹℃壒娴佺▼瀹炰緥
- String processInstanceId = bpmProcessInstanceApi.createProcessInstance(userId, new BpmProcessInstanceCreateReqDTO()
- .setProcessDefinitionKey(BPM_PROCESS_DEFINITION_KEY)
- .setBusinessKey(String.valueOf(id)));
-
- // 3. 鏇存柊閲囪喘鍏ュ簱宸ヤ綔娴佺紪鍙枫�佺姸鎬�
- purchaseInMapper.updateById(new ErpPurchaseInDO()
- .setId(id)
- .setProcessInstanceId(processInstanceId)
- .setStatus(ErpAuditStatus.PROCESS.getStatus()));
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void updatePurchaseInAuditStatus(Long id, Integer bpmResult) {
- // 1. 鏍￠獙閲囪喘鍏ュ簱瀛樺湪
- ErpPurchaseInDO purchaseIn = validatePurchaseInExists(id);
-
- // 2. 鏍￠獙閲囪喘鍏ュ簱澶勪簬瀹℃壒涓�
- if (ObjectUtil.notEqual(purchaseIn.getStatus(), ErpAuditStatus.PROCESS.getStatus())) {
- log.error("[updatePurchaseInAuditStatus][purchaseIn({}) 涓嶅浜庡鎵逛腑锛屾棤娉曟洿鏂板鎵圭粨鏋�({})]",
- purchaseIn.getId(), bpmResult);
- throw exception(PURCHASE_IN_UPDATE_AUDIT_STATUS_FAIL_NOT_PROCESS);
- }
-
- // 3. 鏇存柊閲囪喘鍏ュ簱瀹℃壒缁撴灉
- Integer auditStatus = convertBpmResultToAuditStatus(bpmResult);
- purchaseInMapper.updateById(new ErpPurchaseInDO()
- .setId(id)
- .setStatus(auditStatus));
-
- // 4. 瀹℃壒閫氳繃鏃跺彉鏇村簱瀛�
- if (ErpAuditStatus.APPROVE.getStatus().equals(auditStatus)) {
- List<ErpPurchaseInItemDO> purchaseInItems = purchaseInItemMapper.selectListByInId(id);
- purchaseInItems.forEach(purchaseInItem -> {
- ErpStockRecordCreateReqBO stockRecordBO = new ErpStockRecordCreateReqBO();
- stockRecordBO.setProductId(purchaseInItem.getProductId());
- stockRecordBO.setWarehouseId(purchaseInItem.getWarehouseId());
- stockRecordBO.setCount(purchaseInItem.getCount());
- stockRecordBO.setBizType(ErpStockRecordBizTypeEnum.PURCHASE_IN.getType());
- stockRecordBO.setBizId(purchaseInItem.getInId());
- stockRecordBO.setBizItemId(purchaseInItem.getId());
- stockRecordBO.setBizNo(purchaseIn.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