From 3aa3f9e730127147236c9e7627920dd8aacf3a36 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 15 七月 2026 15:49:59 +0800
Subject: [PATCH] 1.仓储物流-批次号优化覆盖数据 2.仓储物流-新增自定义出入库流水查询 3.采购管理-清理无用代码和表 4.销售管理-清理无用代码和表 5.销售流程状态字段数据回游
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java | 149 ++++++++++++++++++++++++++++++++++++-------------
1 files changed, 109 insertions(+), 40 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 c3bf261..1451e01 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
@@ -6,17 +6,17 @@
import cn.iocoder.yudao.framework.common.util.number.MoneyUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
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.api.sale.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 org.springframework.stereotype.Service;
@@ -32,8 +32,6 @@
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.module.erp.enums.ErrorCodeConstants.*;
-
-// TODO 鑺嬭壙锛氳褰曟搷浣滄棩蹇�
/**
* ERP 閿�鍞鍗� Service 瀹炵幇绫�
@@ -53,9 +51,9 @@
private ErpNoRedisDAO noRedisDAO;
@Resource
- private ErpProductService productService;
- @Resource
private CrmCustomerApi customerApi;
+ @Resource
+ private CrmContractApi contractApi;
@Resource
private ErpAccountService accountService;
@@ -85,7 +83,8 @@
// 2.1 鎻掑叆璁㈠崟
ErpSaleOrderDO saleOrder = BeanUtils.toBean(createReqVO, ErpSaleOrderDO.class, in -> in
- .setNo(no).setStatus(ErpAuditStatus.PROCESS.getStatus()));
+ .setNo(no).setStatus(ErpAuditStatus.PROCESS.getStatus())
+ .setOutCount(BigDecimal.ZERO).setOutStatus(ErpSaleOrderOutStatusEnum.NOT_OUT.getStatus()));
calculateTotalPrice(saleOrder, saleOrderItems);
saleOrderMapper.insert(saleOrder);
// 2.2 鎻掑叆璁㈠崟椤�
@@ -147,12 +146,9 @@
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) {
- throw exception(SALE_ORDER_PROCESS_FAIL_EXISTS_RETURN);
}
// 2. 鏇存柊鐘舵��
@@ -163,14 +159,60 @@
}
}
+ @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);
+ }
+
+ // 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;
@@ -211,33 +253,13 @@
}
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));
});
// 2. 鏇存柊閿�鍞鍗�
BigDecimal totalOutCount = getSumValue(outCountMap.values(), value -> value, BigDecimal::add, BigDecimal.ZERO);
saleOrderMapper.updateById(new ErpSaleOrderDO().setId(id).setOutCount(totalOutCount));
- }
-
- @Override
- public void updateSaleOrderReturnCount(Long orderId, Map<Long, BigDecimal> returnCountMap) {
- List<ErpSaleOrderItemDO> orderItems = saleOrderItemMapper.selectListByOrderId(orderId);
- // 1. 鏇存柊姣忎釜閿�鍞鍗曢」
- orderItems.forEach(item -> {
- BigDecimal returnCount = returnCountMap.getOrDefault(item.getId(), BigDecimal.ZERO);
- if (item.getReturnCount().equals(returnCount)) {
- return;
- }
- if (returnCount.compareTo(item.getOutCount()) > 0) {
- throw exception(SALE_ORDER_ITEM_RETURN_FAIL_OUT_EXCEED,
- productService.getProduct(item.getProductId()).getName(), item.getOutCount());
- }
- saleOrderItemMapper.updateById(new ErpSaleOrderItemDO().setId(item.getId()).setReturnCount(returnCount));
- });
- // 2. 鏇存柊閿�鍞鍗�
- BigDecimal totalReturnCount = getSumValue(returnCountMap.values(), value -> value, BigDecimal::add, BigDecimal.ZERO);
- saleOrderMapper.updateById(new ErpSaleOrderDO().setId(orderId).setReturnCount(totalReturnCount));
}
@Override
@@ -305,4 +327,51 @@
return saleOrderItemMapper.selectListByOrderIds(orderIds);
}
-}
+ @Override
+ public void updateSaleOrderOutStatus(Long orderId) {
+ // 1. 鑾峰彇閿�鍞鍗�
+ ErpSaleOrderDO order = validateSaleOrderExists(orderId);
+ // 2. 鑾峰彇閿�鍞鍗曟槑缁�
+ List<ErpSaleOrderItemDO> items = saleOrderItemMapper.selectListByOrderId(orderId);
+ if (CollUtil.isEmpty(items)) {
+ return;
+ }
+ // 3. 璁＄畻鍑哄簱鐘舵��
+ int outStatus = calculateOutStatus(items);
+ // 4. 鏇存柊閿�鍞鍗曞嚭搴撶姸鎬�
+ saleOrderMapper.updateById(new ErpSaleOrderDO()
+ .setId(orderId).setOutStatus(outStatus));
+ }
+
+ /**
+ * 璁＄畻鍑哄簱鐘舵��
+ *
+ * @param items 閿�鍞鍗曟槑缁嗗垪琛�
+ * @return 鍑哄簱鐘舵��
+ */
+ 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 {
+ return ErpSaleOrderOutStatusEnum.NOT_OUT.getStatus();
+ }
+ }
+
+}
\ No newline at end of file
--
Gitblit v1.9.3