From 8c14b50773a1e582b652c03f5a63bb2233d069b8 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 13 七月 2026 08:55:20 +0800
Subject: [PATCH] 1.仓储物流-采购模块联动 2.仓储物流-销售模块联动 3.清理表数据
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java | 190 +++++++++++++++++++++++++++--------------------
1 files changed, 108 insertions(+), 82 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java
index 4abe8c6..b9eddf9 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java
@@ -5,22 +5,20 @@
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.crm.api.customer.CrmCustomerApi;
+import cn.iocoder.yudao.module.crm.api.contract.CrmContractApi;
import cn.iocoder.yudao.module.erp.controller.admin.sale.vo.order.ErpSaleOrderPageReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.sale.vo.order.ErpSaleOrderSaveReqVO;
-import cn.iocoder.yudao.module.erp.dal.dataobject.product.ErpProductDO;
import cn.iocoder.yudao.module.erp.dal.dataobject.sale.ErpSaleOrderDO;
import cn.iocoder.yudao.module.erp.dal.dataobject.sale.ErpSaleOrderItemDO;
import cn.iocoder.yudao.module.erp.dal.mysql.sale.ErpSaleOrderItemMapper;
import cn.iocoder.yudao.module.erp.dal.mysql.sale.ErpSaleOrderMapper;
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.ErpSaleOrderOutStatusEnum;
import cn.iocoder.yudao.module.erp.service.finance.ErpAccountService;
-import cn.iocoder.yudao.module.erp.service.product.ErpProductService;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
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;
@@ -42,13 +40,7 @@
*/
@Service
@Validated
-@Slf4j
public class ErpSaleOrderServiceImpl implements ErpSaleOrderService {
-
- /**
- * BPM 閿�鍞鍗曞鎵规祦绋嬫爣璇�
- */
- public static final String BPM_PROCESS_DEFINITION_KEY = "erp-sale-order-audit";
@Resource
private ErpSaleOrderMapper saleOrderMapper;
@@ -59,25 +51,22 @@
private ErpNoRedisDAO noRedisDAO;
@Resource
- private ErpProductService productService;
+ private CrmCustomerApi customerApi;
@Resource
- private ErpCustomerService customerService;
+ private CrmContractApi contractApi;
@Resource
private ErpAccountService accountService;
@Resource
private AdminUserApi adminUserApi;
- @Resource
- private BpmProcessInstanceApi bpmProcessInstanceApi;
-
@Override
@Transactional(rollbackFor = Exception.class)
public Long createSaleOrder(ErpSaleOrderSaveReqVO createReqVO) {
// 1.1 鏍￠獙璁㈠崟椤圭殑鏈夋晥鎬�
List<ErpSaleOrderItemDO> saleOrderItems = validateSaleOrderItems(createReqVO.getItems());
- // 1.2 鏍￠獙瀹㈡埛
- customerService.validateCustomer(createReqVO.getCustomerId());
+ // 1.2 鏍￠獙瀹㈡埛锛堜娇鐢� CRM 瀹㈡埛 API锛�
+ customerApi.validateCustomer(createReqVO.getCustomerId());
// 1.3 鏍￠獙缁撶畻璐︽埛
if (createReqVO.getAccountId() != null) {
accountService.validateAccount(createReqVO.getAccountId());
@@ -94,7 +83,7 @@
// 2.1 鎻掑叆璁㈠崟
ErpSaleOrderDO saleOrder = BeanUtils.toBean(createReqVO, ErpSaleOrderDO.class, in -> in
- .setNo(no).setStatus(ErpAuditStatus.DRAFT.getStatus()));
+ .setNo(no).setStatus(ErpAuditStatus.PROCESS.getStatus()));
calculateTotalPrice(saleOrder, saleOrderItems);
saleOrderMapper.insert(saleOrder);
// 2.2 鎻掑叆璁㈠崟椤�
@@ -111,8 +100,8 @@
if (ErpAuditStatus.APPROVE.getStatus().equals(saleOrder.getStatus())) {
throw exception(SALE_ORDER_UPDATE_FAIL_APPROVE, saleOrder.getNo());
}
- // 1.2 鏍￠獙瀹㈡埛
- customerService.validateCustomer(updateReqVO.getCustomerId());
+ // 1.2 鏍￠獙瀹㈡埛锛堜娇鐢� CRM 瀹㈡埛 API锛�
+ customerApi.validateCustomer(updateReqVO.getCustomerId());
// 1.3 鏍￠獙缁撶畻璐︽埛
if (updateReqVO.getAccountId() != null) {
accountService.validateAccount(updateReqVO.getAccountId());
@@ -156,11 +145,13 @@
throw exception(approve ? SALE_ORDER_APPROVE_FAIL : SALE_ORDER_PROCESS_FAIL);
}
// 1.3 瀛樺湪閿�鍞嚭搴撳崟锛屾棤娉曞弽瀹℃牳
- if (!approve && saleOrder.getOutCount().compareTo(BigDecimal.ZERO) > 0) {
+ BigDecimal outCount = saleOrder.getOutCount() != null ? saleOrder.getOutCount() : BigDecimal.ZERO;
+ if (!approve && outCount.compareTo(BigDecimal.ZERO) > 0) {
throw exception(SALE_ORDER_PROCESS_FAIL_EXISTS_OUT);
}
// 1.4 瀛樺湪閿�鍞��璐у崟锛屾棤娉曞弽瀹℃牳
- if (!approve && saleOrder.getReturnCount().compareTo(BigDecimal.ZERO) > 0) {
+ BigDecimal returnCount = saleOrder.getReturnCount() != null ? saleOrder.getReturnCount() : BigDecimal.ZERO;
+ if (!approve && returnCount.compareTo(BigDecimal.ZERO) > 0) {
throw exception(SALE_ORDER_PROCESS_FAIL_EXISTS_RETURN);
}
@@ -172,14 +163,65 @@
}
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void cancelSaleOrder(Long id) {
+ // 1.1 鏍￠獙瀛樺湪
+ ErpSaleOrderDO saleOrder = validateSaleOrderExists(id);
+ // 1.2 鏍￠獙鐘舵�侊細鍙湁宸插鏍哥殑璁㈠崟鎵嶈兘浣滃簾
+ if (!ErpAuditStatus.APPROVE.getStatus().equals(saleOrder.getStatus())) {
+ throw exception(SALE_ORDER_CANCEL_FAIL_NOT_APPROVE, saleOrder.getNo());
+ }
+ // 1.3 瀛樺湪閿�鍞嚭搴撳崟锛屾棤娉曚綔搴�
+ BigDecimal outCount = saleOrder.getOutCount() != null ? saleOrder.getOutCount() : BigDecimal.ZERO;
+ if (outCount.compareTo(BigDecimal.ZERO) > 0) {
+ throw exception(SALE_ORDER_CANCEL_FAIL_EXISTS_OUT);
+ }
+ // 1.4 瀛樺湪閿�鍞��璐у崟锛屾棤娉曚綔搴�
+ BigDecimal returnCount = saleOrder.getReturnCount() != null ? saleOrder.getReturnCount() : BigDecimal.ZERO;
+ if (returnCount.compareTo(BigDecimal.ZERO) > 0) {
+ throw exception(SALE_ORDER_CANCEL_FAIL_EXISTS_RETURN);
+ }
+
+ // 2. 鏇存柊鐘舵�佷负宸蹭綔搴�
+ int updateCount = saleOrderMapper.updateByIdAndStatus(id, saleOrder.getStatus(),
+ new ErpSaleOrderDO().setStatus(ErpAuditStatus.CANCEL.getStatus()));
+ if (updateCount == 0) {
+ throw exception(SALE_ORDER_CANCEL_FAIL);
+ }
+
+ // 3. 鍚屾鏇存柊鍏宠仈鍚堝悓鐘舵�佷负宸蹭綔搴�
+ if (saleOrder.getContractId() != null) {
+ contractApi.updateContractStatus(saleOrder.getContractId(), 50).getCheckedData(); // 50 = 宸蹭綔搴�
+ }
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void enableSaleOrder(Long id) {
+ // 1.1 鏍￠獙瀛樺湪
+ ErpSaleOrderDO saleOrder = validateSaleOrderExists(id);
+ // 1.2 鏍￠獙鐘舵�侊細鍙湁宸蹭綔搴熺殑璁㈠崟鎵嶈兘閲嶆柊鍚敤
+ if (!ErpAuditStatus.CANCEL.getStatus().equals(saleOrder.getStatus())) {
+ throw exception(SALE_ORDER_ENABLE_FAIL_NOT_CANCEL, saleOrder.getNo());
+ }
+
+ // 2. 鏇存柊鐘舵�佷负宸插鏍�
+ int updateCount = saleOrderMapper.updateByIdAndStatus(id, saleOrder.getStatus(),
+ new ErpSaleOrderDO().setStatus(ErpAuditStatus.APPROVE.getStatus()));
+ if (updateCount == 0) {
+ throw exception(SALE_ORDER_ENABLE_FAIL);
+ }
+
+ // 3. 鍚屾鏇存柊鍏宠仈鍚堝悓鐘舵�佷负瀹℃牳閫氳繃
+ if (saleOrder.getContractId() != null) {
+ contractApi.updateContractStatus(saleOrder.getContractId(), 20).getCheckedData(); // 20 = 瀹℃牳閫氳繃
+ }
+ }
+
private List<ErpSaleOrderItemDO> validateSaleOrderItems(List<ErpSaleOrderSaveReqVO.Item> list) {
- // 1. 鏍￠獙浜у搧瀛樺湪
- List<ErpProductDO> productList = productService.validProductList(
- convertSet(list, ErpSaleOrderSaveReqVO.Item::getProductId));
- Map<Long, ErpProductDO> productMap = convertMap(productList, ErpProductDO::getId);
- // 2. 杞寲涓� ErpSaleOrderItemDO 鍒楄〃
+ // 杞寲涓� ErpSaleOrderItemDO 鍒楄〃锛堜骇鍝侀獙璇佸凡绉婚櫎锛�
return convertList(list, o -> BeanUtils.toBean(o, ErpSaleOrderItemDO.class, item -> {
- item.setProductUnitId(productMap.get(item.getProductId()).getUnitId());
item.setTotalPrice(MoneyUtils.priceMultiply(item.getProductPrice(), item.getCount()));
if (item.getTotalPrice() == null) {
return;
@@ -220,7 +262,7 @@
}
if (outCount.compareTo(item.getCount()) > 0) {
throw exception(SALE_ORDER_ITEM_OUT_FAIL_PRODUCT_EXCEED,
- productService.getProduct(item.getProductId()).getName(), item.getCount());
+ "浜у搧ID:" + item.getProductId(), item.getCount());
}
saleOrderItemMapper.updateById(new ErpSaleOrderItemDO().setId(item.getId()).setOutCount(outCount));
});
@@ -240,7 +282,7 @@
}
if (returnCount.compareTo(item.getOutCount()) > 0) {
throw exception(SALE_ORDER_ITEM_RETURN_FAIL_OUT_EXCEED,
- productService.getProduct(item.getProductId()).getName(), item.getOutCount());
+ "浜у搧ID:" + item.getProductId(), item.getOutCount());
}
saleOrderItemMapper.updateById(new ErpSaleOrderItemDO().setId(item.getId()).setReturnCount(returnCount));
});
@@ -314,66 +356,50 @@
return saleOrderItemMapper.selectListByOrderIds(orderIds);
}
- // ==================== BPM 娴佺▼瀹℃壒 ====================
-
@Override
- @Transactional(rollbackFor = Exception.class)
- public void submitSaleOrder(Long id, Long userId) {
- // 1. 鏍￠獙閿�鍞鍗曞浜庤崏绋跨姸鎬�
- ErpSaleOrderDO saleOrder = validateSaleOrderExists(id);
- if (ObjectUtil.notEqual(saleOrder.getStatus(), ErpAuditStatus.DRAFT.getStatus())) {
- throw exception(SALE_ORDER_SUBMIT_FAIL_NOT_DRAFT);
+ public void updateSaleOrderOutStatus(Long orderId) {
+ // 1. 鑾峰彇閿�鍞鍗�
+ ErpSaleOrderDO order = validateSaleOrderExists(orderId);
+ // 2. 鑾峰彇閿�鍞鍗曟槑缁�
+ List<ErpSaleOrderItemDO> items = saleOrderItemMapper.selectListByOrderId(orderId);
+ if (CollUtil.isEmpty(items)) {
+ return;
}
-
- // 2. 鍒涘缓閿�鍞鍗曞鎵规祦绋嬪疄渚�
- String processInstanceId = bpmProcessInstanceApi.createProcessInstance(userId, new BpmProcessInstanceCreateReqDTO()
- .setProcessDefinitionKey(BPM_PROCESS_DEFINITION_KEY)
- .setBusinessKey(String.valueOf(id)));
-
- // 3. 鏇存柊閿�鍞鍗曞伐浣滄祦缂栧彿銆佺姸鎬�
+ // 3. 璁＄畻鍑哄簱鐘舵��
+ int outStatus = calculateOutStatus(items);
+ // 4. 鏇存柊閿�鍞鍗曞嚭搴撶姸鎬�
saleOrderMapper.updateById(new ErpSaleOrderDO()
- .setId(id)
- .setProcessInstanceId(processInstanceId)
- .setStatus(ErpAuditStatus.PROCESS.getStatus()));
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void updateSaleOrderAuditStatus(Long id, Integer bpmResult) {
- // 1. 鏍￠獙閿�鍞鍗曞瓨鍦�
- ErpSaleOrderDO saleOrder = validateSaleOrderExists(id);
-
- // 2. 鏍￠獙閿�鍞鍗曞浜庡鎵逛腑
- if (ObjectUtil.notEqual(saleOrder.getStatus(), ErpAuditStatus.PROCESS.getStatus())) {
- log.error("[updateSaleOrderAuditStatus][saleOrder({}) 涓嶅浜庡鎵逛腑锛屾棤娉曟洿鏂板鎵圭粨鏋�({})]",
- saleOrder.getId(), bpmResult);
- throw exception(SALE_ORDER_UPDATE_AUDIT_STATUS_FAIL_NOT_PROCESS);
- }
-
- // 3. 鏇存柊閿�鍞鍗曞鎵圭粨鏋�
- Integer auditStatus = convertBpmResultToAuditStatus(bpmResult);
- saleOrderMapper.updateById(new ErpSaleOrderDO()
- .setId(id)
- .setStatus(auditStatus));
+ .setId(orderId).setOutStatus(outStatus));
}
/**
- * 灏� BPM 瀹℃壒缁撴灉杞崲涓� ERP 瀹℃壒鐘舵��
+ * 璁＄畻鍑哄簱鐘舵��
*
- * @param bpmResult BPM 瀹℃壒缁撴灉
- * @return ERP 瀹℃壒鐘舵��
+ * @param items 閿�鍞鍗曟槑缁嗗垪琛�
+ * @return 鍑哄簱鐘舵��
*/
- 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();
+ private int calculateOutStatus(List<ErpSaleOrderItemDO> items) {
+ boolean allOut = true;
+ boolean anyOut = false;
+
+ for (ErpSaleOrderItemDO item : items) {
+ BigDecimal count = item.getCount() != null ? item.getCount() : BigDecimal.ZERO;
+ BigDecimal outCount = item.getOutCount() != null ? item.getOutCount() : BigDecimal.ZERO;
+
+ if (outCount.compareTo(BigDecimal.ZERO) > 0) {
+ anyOut = true;
+ }
+ if (outCount.compareTo(count) < 0) {
+ allOut = false;
+ }
+ }
+
+ if (allOut) {
+ return ErpSaleOrderOutStatusEnum.ALL_OUT.getStatus();
+ } else if (anyOut) {
+ return ErpSaleOrderOutStatusEnum.PART_OUT.getStatus();
} else {
- log.warn("[convertBpmResultToAuditStatus][鏈煡鐨� BPM 瀹℃壒缁撴灉({})]", bpmResult);
- return ErpAuditStatus.PROCESS.getStatus();
+ return ErpSaleOrderOutStatusEnum.NOT_OUT.getStatus();
}
}
--
Gitblit v1.9.3