From 6d1bf32bc0b51dc12048fe6bb70badfbd31d67ac Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期六, 07 十一月 2026 13:44:10 +0800
Subject: [PATCH] fix: 修复销售订单审批及开票回款搜索
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java | 569 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 452 insertions(+), 117 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..32cd823 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
@@ -1,24 +1,45 @@
package cn.iocoder.yudao.module.erp.service.sale;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.extra.spring.SpringUtil;
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.crm.api.customer.CrmCustomerApi;
+import cn.iocoder.yudao.module.crm.api.contract.CrmContractApi;
+import cn.iocoder.yudao.module.crm.api.contract.dto.CrmContractForSaleDTO;
+import cn.iocoder.yudao.module.crm.api.customer.dto.CrmCustomerRespDTO;
+import cn.iocoder.yudao.module.erp.controller.admin.sale.vo.order.ErpSaleOrderImportExcelVO;
+import cn.iocoder.yudao.module.erp.controller.admin.sale.vo.order.ErpSaleOrderImportReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.sale.vo.order.ErpSaleOrderImportRespVO;
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.finance.ErpAccountDO;
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.finance.ErpAccountMapper;
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.ErpSaleOrderProductionStatusEnum;
+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.mdm.api.item.MdmItemApi;
+import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
+import cn.iocoder.yudao.module.mdm.enums.MdmItemTypeEnum;
+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.mps.MesProMpsApi;
+import cn.iocoder.yudao.module.mes.api.mps.dto.MesProMpsCreateReqDTO;
+import cn.iocoder.yudao.module.mes.api.mps.dto.MesProMpsRespDTO;
+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 com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -26,8 +47,12 @@
import org.springframework.validation.annotation.Validated;
import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -38,17 +63,14 @@
/**
* ERP 閿�鍞鍗� Service 瀹炵幇绫�
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Service
@Validated
@Slf4j
public class ErpSaleOrderServiceImpl implements ErpSaleOrderService {
- /**
- * BPM 閿�鍞鍗曞鎵规祦绋嬫爣璇�
- */
- public static final String BPM_PROCESS_DEFINITION_KEY = "erp-sale-order-audit";
+ private static final Integer MPS_STATUS_CANCELED = 3;
@Resource
private ErpSaleOrderMapper saleOrderMapper;
@@ -59,9 +81,9 @@
private ErpNoRedisDAO noRedisDAO;
@Resource
- private ErpProductService productService;
+ private CrmCustomerApi customerApi;
@Resource
- private ErpCustomerService customerService;
+ private CrmContractApi contractApi;
@Resource
private ErpAccountService accountService;
@@ -69,15 +91,24 @@
private AdminUserApi adminUserApi;
@Resource
- private BpmProcessInstanceApi bpmProcessInstanceApi;
+ private MdmItemApi mdmItemApi;
+ @Resource
+ private MdmUnitMeasureApi mdmUnitMeasureApi;
+ @Resource
+ private ErpAccountMapper accountMapper;
+ @Resource
+ private MesProMpsApi mpsApi;
+
+ @Resource
+ private StorageAttachmentApi storageAttachmentApi;
@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());
@@ -85,6 +116,9 @@
// 1.4 鏍￠獙閿�鍞汉鍛�
if (createReqVO.getSaleUserId() != null) {
adminUserApi.validateUser(createReqVO.getSaleUserId());
+ }
+ if (createReqVO.getContractId() != null && saleOrderMapper.selectByContractId(createReqVO.getContractId()) != null) {
+ throw exception(SALE_ORDER_IMPORT_INVALID_ROW, "璇ュ悎鍚屽凡鍏宠仈閿�鍞鍗�");
}
// 1.5 鐢熸垚璁㈠崟鍙凤紝骞舵牎楠屽敮涓�鎬�
String no = noRedisDAO.generate(ErpNoRedisDAO.SALE_ORDER_NO_PREFIX);
@@ -94,12 +128,17 @@
// 2.1 鎻掑叆璁㈠崟
ErpSaleOrderDO saleOrder = BeanUtils.toBean(createReqVO, ErpSaleOrderDO.class, in -> in
- .setNo(no).setStatus(ErpAuditStatus.DRAFT.getStatus()));
+ .setNo(no).setStatus(ErpAuditStatus.PROCESS.getStatus())
+ .setDepositPrice(ObjectUtil.defaultIfNull(createReqVO.getDepositPrice(), BigDecimal.ZERO))
+ .setOutCount(BigDecimal.ZERO).setOutStatus(ErpSaleOrderOutStatusEnum.NOT_OUT.getStatus()));
calculateTotalPrice(saleOrder, saleOrderItems);
saleOrderMapper.insert(saleOrder);
// 2.2 鎻掑叆璁㈠崟椤�
saleOrderItems.forEach(o -> o.setOrderId(saleOrder.getId()));
saleOrderItemMapper.insertBatch(saleOrderItems);
+ // 2.3 缁戝畾闄勪欢
+ storageAttachmentApi.bindAttachments("file", "erp_sale_order",
+ saleOrder.getId(), createReqVO.getBlobIds());
return saleOrder.getId();
}
@@ -108,11 +147,11 @@
public void updateSaleOrder(ErpSaleOrderSaveReqVO updateReqVO) {
// 1.1 鏍￠獙瀛樺湪
ErpSaleOrderDO saleOrder = validateSaleOrderExists(updateReqVO.getId());
- if (ErpAuditStatus.APPROVE.getStatus().equals(saleOrder.getStatus())) {
+ if (!ErpAuditStatus.PROCESS.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());
@@ -126,10 +165,13 @@
// 2.1 鏇存柊璁㈠崟
ErpSaleOrderDO updateObj = BeanUtils.toBean(updateReqVO, ErpSaleOrderDO.class);
+ updateObj.setDepositPrice(ObjectUtil.defaultIfNull(updateReqVO.getDepositPrice(), BigDecimal.ZERO));
calculateTotalPrice(updateObj, saleOrderItems);
saleOrderMapper.updateById(updateObj);
// 2.2 鏇存柊璁㈠崟椤�
updateSaleOrderItemList(updateReqVO.getId(), saleOrderItems);
+ // 2.3 鏇存柊闄勪欢
+ storageAttachmentApi.updateAttachments("file", "erp_sale_order", updateReqVO.getId(), updateReqVO.getBlobIds());
}
private void calculateTotalPrice(ErpSaleOrderDO saleOrder, List<ErpSaleOrderItemDO> saleOrderItems) {
@@ -149,37 +191,177 @@
@Transactional(rollbackFor = Exception.class)
public void updateSaleOrderStatus(Long id, Integer status) {
boolean approve = ErpAuditStatus.APPROVE.getStatus().equals(status);
- // 1.1 鏍￠獙瀛樺湪
- ErpSaleOrderDO saleOrder = validateSaleOrderExists(id);
- // 1.2 鏍￠獙鐘舵��
- if (saleOrder.getStatus().equals(status)) {
+ ErpSaleOrderDO order = validateSaleOrderExists(id);
+ if (approve && !ErpAuditStatus.PROCESS.getStatus().equals(order.getStatus())
+ || !approve && (!ErpAuditStatus.PROCESS.getStatus().equals(status)
+ || !ErpAuditStatus.APPROVE.getStatus().equals(order.getStatus()))) {
throw exception(approve ? SALE_ORDER_APPROVE_FAIL : SALE_ORDER_PROCESS_FAIL);
}
- // 1.3 瀛樺湪閿�鍞嚭搴撳崟锛屾棤娉曞弽瀹℃牳
- if (!approve && saleOrder.getOutCount().compareTo(BigDecimal.ZERO) > 0) {
- throw exception(SALE_ORDER_PROCESS_FAIL_EXISTS_OUT);
+ if (!approve) {
+ BigDecimal outCount = order.getOutCount() == null ? BigDecimal.ZERO : order.getOutCount();
+ if (outCount.signum() > 0) throw exception(SALE_ORDER_PROCESS_FAIL_EXISTS_OUT);
+ validateNoActiveMps(id);
}
- // 1.4 瀛樺湪閿�鍞��璐у崟锛屾棤娉曞弽瀹℃牳
- if (!approve && saleOrder.getReturnCount().compareTo(BigDecimal.ZERO) > 0) {
- throw exception(SALE_ORDER_PROCESS_FAIL_EXISTS_RETURN);
- }
-
- // 2. 鏇存柊鐘舵��
- int updateCount = saleOrderMapper.updateByIdAndStatus(id, saleOrder.getStatus(),
- new ErpSaleOrderDO().setStatus(status));
- if (updateCount == 0) {
+ if (saleOrderMapper.updateByIdAndStatus(id, order.getStatus(), new ErpSaleOrderDO().setStatus(status)) != 1) {
throw exception(approve ? SALE_ORDER_APPROVE_FAIL : SALE_ORDER_PROCESS_FAIL);
}
+ if (approve) createMpsForSaleOrder(id, order);
}
+ /**
+ * 涓洪攢鍞鍗曚腑闇�瑕佺敓浜х殑鏄庣粏鍒涘缓 MPS
+ *
+ * @param orderId 閿�鍞鍗曠紪鍙�
+ * @param saleOrder 閿�鍞鍗�
+ */
+ private void createMpsForSaleOrder(Long orderId, ErpSaleOrderDO saleOrder) {
+ List<ErpSaleOrderItemDO> items = saleOrderItemMapper.selectListByOrderId(orderId);
+ if (CollUtil.isEmpty(items)) {
+ return;
+ }
+
+ int createdCount = 0;
+ int reusedCount = 0;
+ int skippedCount = 0;
+ for (ErpSaleOrderItemDO item : items) {
+ if (item.getNeedProduction() == null || item.getNeedProduction() != 1) {
+ continue;
+ }
+
+ MdmItemRespDTO mdmItem = mdmItemApi.getItem(item.getProductId()).getCheckedData();
+ if (mdmItem == null || !MdmItemTypeEnum.isProduct(mdmItem.getItemType())) {
+ // 鍏煎淇鍓嶇敱鍚堝悓鐢熸垚鐨勫巻鍙茶鍗曪細褰撴椂鎵�鏈夋槑缁嗛兘浼氳鏍囪涓洪渶瑕佺敓浜с��
+ // 闈炰骇鍝佹槑缁嗕笉搴斿垱寤� MPS锛屽悓鏃剁籂姝ｆ爣璁帮紝閬垮厤鍚庣画鍙戣揣鐘舵�佷竴鐩寸瓑寰呯敓浜у畬鎴愩��
+ saleOrderItemMapper.updateById(new ErpSaleOrderItemDO()
+ .setId(item.getId())
+ .setNeedProduction(0));
+ skippedCount++;
+ log.info("[createMpsForSaleOrder] 閿�鍞鍗曟槑缁�({}) 涓洪潪浜у搧鐗╂枡({})锛岃烦杩� MPS 骞跺彇娑堥渶瑕佺敓浜ф爣璁�",
+ item.getId(), item.getProductId());
+ continue;
+ }
+
+ // 鍚屼竴閿�鍞槑缁嗗彧淇濈暀涓�鏉℃湁鏁� MPS锛岄伩鍏嶅弽瀹℃牳鍚庡啀娆″鏍镐骇鐢熼噸澶嶈鍒�
+ MesProMpsRespDTO existingMps = mpsApi.getMpsBySaleOrderItemId(item.getId());
+ if (existingMps != null && ObjectUtil.notEqual(existingMps.getStatus(), MPS_STATUS_CANCELED)) {
+ if (ObjectUtil.notEqual(item.getMpsId(), existingMps.getId())) {
+ saleOrderItemMapper.updateById(new ErpSaleOrderItemDO()
+ .setId(item.getId())
+ .setMpsId(existingMps.getId()));
+ }
+ reusedCount++;
+ log.info("[createMpsForSaleOrder] 閿�鍞鍗曟槑缁�({}) 宸插瓨鍦ㄦ湁鏁� MPS({})锛岃烦杩囬噸澶嶅垱寤�",
+ item.getId(), existingMps.getId());
+ continue;
+ }
+
+ // 涓庨攢鍞鍗曞鏍稿叡鐢ㄤ簨鍔★紱浠讳竴鏄庣粏鍒涘缓澶辫触閮戒細鍥炴粴瀹℃牳鐘舵�佸拰鏈宸插垱寤虹殑 MPS
+ Long mpsId = createMpsForSaleOrderItem(saleOrder, item, mdmItem);
+ saleOrderItemMapper.updateById(new ErpSaleOrderItemDO()
+ .setId(item.getId())
+ .setMpsId(mpsId));
+ createdCount++;
+ }
+ // 閲嶆柊鐢熸垚鐢熶骇璁″垝鍚庯紝璁㈠崟鐢熶骇鐘舵�佸洖鍒版湭瀹屾垚锛堣鐩栨鍓嶇殑鈥滃凡鍙栨秷鈥濓級
+ if (createdCount > 0) {
+ saleOrderMapper.update(null, new LambdaUpdateWrapper<ErpSaleOrderDO>()
+ .eq(ErpSaleOrderDO::getId, orderId)
+ .set(ErpSaleOrderDO::getProductionStatus, ErpSaleOrderProductionStatusEnum.NOT_FINISHED.getStatus())
+ .set(ErpSaleOrderDO::getProductionFinishTime, null));
+ }
+ log.info("[createMpsForSaleOrder] 閿�鍞鍗�({}) 瀹℃牳瀹屾垚锛屽垱寤� MPS {} 鏉★紝澶嶇敤 MPS {} 鏉★紝璺宠繃闈炰骇鍝� {} 鏉�",
+ orderId, createdCount, reusedCount, skippedCount);
+ }
+
+ /**
+ * 涓洪攢鍞鍗曟槑缁嗗垱寤� MPS
+ */
+ private Long createMpsForSaleOrderItem(ErpSaleOrderDO saleOrder, ErpSaleOrderItemDO item,
+ MdmItemRespDTO mdmItem) {
+ MesProMpsCreateReqDTO createReqDTO = new MesProMpsCreateReqDTO();
+ createReqDTO.setSaleOrderId(saleOrder.getId());
+ createReqDTO.setSaleOrderNo(saleOrder.getNo());
+ createReqDTO.setSaleOrderItemId(item.getId());
+ createReqDTO.setMdmItemId(item.getProductId());
+ createReqDTO.setProductName(mdmItem.getName());
+ createReqDTO.setQuantity(item.getCount());
+ createReqDTO.setClientId(saleOrder.getCustomerId());
+ createReqDTO.setRequestDate(formatRequestDate(saleOrder.getOrderTime()));
+ createReqDTO.setRemark("鑷姩鐢熸垚锛屾潵鑷攢鍞鍗曪細" + saleOrder.getNo());
+
+ Long mpsId = mpsApi.createMps(createReqDTO);
+ log.info("[createMpsForSaleOrderItem] MPS 鍒涘缓鎴愬姛锛宮psId={}, saleOrderItemId={}", mpsId, item.getId());
+ return mpsId;
+ }
+
+ /**
+ * 鏍煎紡鍖栭渶姹傛棩鏈�
+ */
+ private String formatRequestDate(LocalDateTime dateTime) {
+ if (dateTime == null) {
+ return null;
+ }
+ return dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ }
+
+ @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);
+ }
+
+ validateNoActiveMps(id);
+
+ // 2. 鏇存柊鐘舵�佷负宸蹭綔搴�
+ int updateCount = saleOrderMapper.updateByIdAndStatus(id, saleOrder.getStatus(),
+ new ErpSaleOrderDO().setStatus(ErpAuditStatus.CANCEL.getStatus()));
+ if (updateCount == 0) {
+ throw exception(SALE_ORDER_CANCEL_FAIL);
+ }
+
+ // 鍚堝悓瀹℃壒鐘舵�佺敱鍚堝悓鍙婂叾 BPM 娴佺▼缁存姢锛岃鍗曚綔搴熶笉鏀瑰彉鍚堝悓瀹℃壒缁撴灉銆�
+ }
+
+ @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);
+ }
+
+ // 璁㈠崟鍚敤涓嶆敼鍙樺叧鑱斿悎鍚岀殑瀹℃壒缁撴灉銆�
+ }
+
+ private void validateNoActiveMps(Long orderId) {
+ for (ErpSaleOrderItemDO item : saleOrderItemMapper.selectListByOrderId(orderId)) {
+ MesProMpsRespDTO mps = mpsApi.getMpsBySaleOrderItemId(item.getId());
+ if (mps != null && ObjectUtil.notEqual(mps.getStatus(), MPS_STATUS_CANCELED)) {
+ throw exception(SALE_ORDER_HAS_ACTIVE_MPS);
+ }
+ }
+ }
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,33 +402,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
@@ -258,16 +420,18 @@
return;
}
saleOrders.forEach(saleOrder -> {
- if (ErpAuditStatus.APPROVE.getStatus().equals(saleOrder.getStatus())) {
+ if (!ErpAuditStatus.PROCESS.getStatus().equals(saleOrder.getStatus())) {
throw exception(SALE_ORDER_DELETE_FAIL_APPROVE, saleOrder.getNo());
}
});
// 2. 閬嶅巻鍒犻櫎锛屽苟璁板綍鎿嶄綔鏃ュ織
saleOrders.forEach(saleOrder -> {
- // 2.1 鍒犻櫎璁㈠崟
+ // 2.1 鍒犻櫎闄勪欢
+ storageAttachmentApi.deleteAttachmentsByRecord("erp_sale_order", saleOrder.getId());
+ // 2.2 鍒犻櫎璁㈠崟
saleOrderMapper.deleteById(saleOrder.getId());
- // 2.2 鍒犻櫎璁㈠崟椤�
+ // 2.3 鍒犻櫎璁㈠崟椤�
saleOrderItemMapper.deleteByOrderId(saleOrder.getId());
});
}
@@ -296,7 +460,8 @@
@Override
public PageResult<ErpSaleOrderDO> getSaleOrderPage(ErpSaleOrderPageReqVO pageReqVO) {
- return saleOrderMapper.selectPage(pageReqVO);
+ List<Long> permittedCustomerIds = customerApi.getPermittedCustomerIds();
+ return saleOrderMapper.selectPage(pageReqVO, permittedCustomerIds);
}
// ==================== 璁㈠崟椤� ====================
@@ -314,67 +479,237 @@
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();
- } else {
- log.warn("[convertBpmResultToAuditStatus][鏈煡鐨� BPM 瀹℃壒缁撴灉({})]", bpmResult);
- return ErpAuditStatus.PROCESS.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 {
+ return ErpSaleOrderOutStatusEnum.NOT_OUT.getStatus();
+ }
+ }
+
+ @Override
+ public ErpSaleOrderImportRespVO importSaleOrderList(List<ErpSaleOrderImportExcelVO> importOrders,
+ ErpSaleOrderImportReqVO importReqVO) {
+ if (Boolean.TRUE.equals(importReqVO.getUpdateSupport())) {
+ throw exception(SALE_ORDER_IMPORT_INVALID_ROW, "閿�鍞鍗曞鍏ヤ粎鏀寔鏂板锛屼笉鏀寔瑕嗙洊");
+ }
+ // 1. 鏍￠獙闈炵┖锛堣繃婊ゅ畬鍏ㄧ┖鐧界殑琛岋級
+ importOrders = filterList(importOrders, item -> item != null && (StrUtil.isNotBlank(item.getNo()) || StrUtil.isNotBlank(item.getCustomerName()) || StrUtil.isNotBlank(item.getProductCode()) || item.getCount() != null || item.getProductPrice() != null));
+ if (CollUtil.isEmpty(importOrders)) {
+ throw exception(SALE_ORDER_IMPORT_LIST_IS_EMPTY);
+ }
+ // 2. 鎸夈�屽崟鍙枫�嶅垎缁勶細鐩稿悓鍗曞彿鐨勫琛屽悎骞舵垚涓�寮犻攢鍞鍗曪紱鍗曞彿涓虹┖鏃舵瘡琛屽悇鑷垚涓�寮犺鍗�
+ List<List<ErpSaleOrderImportExcelVO>> groups = new ArrayList<>();
+ Map<String, Integer> groupIndexMap = new LinkedHashMap<>();
+ for (ErpSaleOrderImportExcelVO row : importOrders) {
+ if (StrUtil.isBlank(row.getNo())) {
+ groups.add(new ArrayList<>(Collections.singletonList(row)));
+ continue;
+ }
+ String groupKey = row.getNo().trim();
+ 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. 閫愮粍鍚堝苟鍒涘缓閿�鍞鍗�
+ ErpSaleOrderImportRespVO respVO = ErpSaleOrderImportRespVO.builder()
+ .createSaleOrderNos(new ArrayList<>())
+ .failureSaleOrderNos(new LinkedHashMap<>())
+ .build();
+ for (List<ErpSaleOrderImportExcelVO> group : groups) {
+ String groupKey = StrUtil.isNotBlank(group.get(0).getNo()) ? group.get(0).getNo()
+ : "绗�" + (importOrders.indexOf(group.get(0)) + 1) + "琛�";
+ try {
+ Long orderId = SpringUtil.getBean(ErpSaleOrderServiceImpl.class).createImportedOrder(group);
+ respVO.getCreateSaleOrderNos().add(saleOrderMapper.selectById(orderId).getNo());
+ } catch (ServiceException ex) {
+ respVO.getFailureSaleOrderNos().put(groupKey, ex.getMessage());
+ }
+ }
+ return respVO;
+ }
+
+ @Transactional(rollbackFor = Exception.class)
+ public Long createImportedOrder(List<ErpSaleOrderImportExcelVO> group) {
+ return createSaleOrder(buildSaleOrderImportSaveReqVO(group));
+ }
+ /**
+ * 灏嗗悓涓�寮犻攢鍞鍗曠殑澶氳鏄庣粏杞崲鎴愬垱寤� Request VO
+ */
+ private ErpSaleOrderSaveReqVO buildSaleOrderImportSaveReqVO(List<ErpSaleOrderImportExcelVO> group) {
+ ErpSaleOrderImportExcelVO first = group.get(0);
+ for (ErpSaleOrderImportExcelVO row : group) {
+ if (StrUtil.isNotBlank(row.getCustomerName()) && !StrUtil.equals(first.getCustomerName(), row.getCustomerName())
+ || row.getOrderTime() != null && !row.getOrderTime().equals(first.getOrderTime())
+ || StrUtil.isNotBlank(row.getSaleUserName()) && !StrUtil.equals(first.getSaleUserName(), row.getSaleUserName())
+ || StrUtil.isNotBlank(row.getAccountName()) && !StrUtil.equals(first.getAccountName(), row.getAccountName())
+ || StrUtil.isNotBlank(row.getContractNo()) && !StrUtil.equals(first.getContractNo(), row.getContractNo())) {
+ throw exception(SALE_ORDER_IMPORT_INVALID_ROW, "鍚屼竴璁㈠崟鐨勫鎴枫�佷笅鍗曟椂闂淬�侀攢鍞憳鍜岀粨绠楄处鎴峰繀椤讳竴鑷�");
+ }
+ }
+ // 1. 鏍￠獙骞惰В鏋愬鎴�
+ if (StrUtil.isBlank(first.getCustomerName())) {
+ throw exception(SALE_ORDER_IMPORT_CUSTOMER_NOT_EXISTS, "");
+ }
+ CrmCustomerRespDTO customer = customerApi.getCustomerByName(first.getCustomerName());
+ if (customer == null) {
+ throw exception(SALE_ORDER_IMPORT_CUSTOMER_NOT_EXISTS, first.getCustomerName());
+ }
+ if (first.getOrderTime() == null) {
+ throw exception(SALE_ORDER_IMPORT_ORDER_TIME_REQUIRED);
+ }
+ if (first.getDiscountPercent() != null && (first.getDiscountPercent().signum() < 0 || first.getDiscountPercent().compareTo(new BigDecimal("100")) > 0)) {
+ throw exception(SALE_ORDER_IMPORT_INVALID_ROW, "浼樻儬鐜囧繀椤诲湪 0 鍒� 100 涔嬮棿");
+ }
+ if (first.getDepositPrice() != null && first.getDepositPrice().signum() < 0) {
+ throw exception(SALE_ORDER_IMPORT_INVALID_ROW, "瀹氶噾涓嶈兘涓鸿礋鏁�");
+ }
+ // 2. 瑙ｆ瀽缁撶畻璐︽埛锛堝彲閫夛級
+ Long accountId = null;
+ if (StrUtil.isNotBlank(first.getAccountName())) {
+ ErpAccountDO account = accountMapper.selectByName(first.getAccountName());
+ if (account == null) {
+ throw exception(SALE_ORDER_IMPORT_ACCOUNT_NOT_EXISTS, first.getAccountName());
+ }
+ accountId = account.getId();
+ }
+ // 3. 瑙ｆ瀽閿�鍞憳锛堝彲閫夛級
+ Long saleUserId = null;
+ if (StrUtil.isNotBlank(first.getSaleUserName())) {
+ List<AdminUserRespDTO> users = adminUserApi.getUserListByNickname(first.getSaleUserName());
+ if (CollUtil.isEmpty(users)) {
+ throw exception(SALE_ORDER_IMPORT_SALE_USER_NOT_EXISTS, first.getSaleUserName());
+ }
+ saleUserId = users.get(0).getId();
+ }
+ // 4. 缁勮鏄庣粏
+ List<ErpSaleOrderSaveReqVO.Item> items = new ArrayList<>();
+ for (ErpSaleOrderImportExcelVO row : group) {
+ if (StrUtil.isBlank(row.getProductCode()) || StrUtil.isBlank(row.getProductUnitCode())) {
+ throw exception(SALE_ORDER_IMPORT_INVALID_ROW, "鐗╂枡缂栫爜鍜屽崟浣嶇紪鐮佷笉鑳戒负绌�");
+ }
+ if (row.getCount() == null || row.getCount().compareTo(BigDecimal.ZERO) <= 0) {
+ throw exception(SALE_ORDER_IMPORT_INVALID_ROW, "鐗╂枡 " + row.getProductCode() + " 鐨勬暟閲忓繀椤诲ぇ浜庨浂");
+ }
+ if (row.getProductPrice() == null || row.getProductPrice().compareTo(BigDecimal.ZERO) < 0) {
+ throw exception(SALE_ORDER_IMPORT_INVALID_ROW, "鐗╂枡 " + row.getProductCode() + " 鐨勫崟浠蜂笉鑳戒负绌烘垨涓鸿礋鏁�");
+ }
+ if (row.getNeedProduction() != null && row.getNeedProduction() != 0 && row.getNeedProduction() != 1) {
+ throw exception(SALE_ORDER_IMPORT_INVALID_ROW, "鏄惁闇�瑕佺敓浜у彧鑳藉～鍐� 0 鎴� 1");
+ }
+ if (row.getTaxPercent() != null && (row.getTaxPercent().signum() < 0 || row.getTaxPercent().compareTo(new BigDecimal("100")) > 0)) {
+ throw exception(SALE_ORDER_IMPORT_INVALID_ROW, "绋庣巼蹇呴』鍦� 0 鍒� 100 涔嬮棿");
+ }
+ MdmItemRespDTO product = mdmItemApi.getItemByCode(row.getProductCode()).getCheckedData();
+ if (product == null) {
+ throw exception(SALE_ORDER_IMPORT_PRODUCT_NOT_EXISTS, row.getProductCode());
+ }
+ MdmUnitMeasureRespDTO unit = mdmUnitMeasureApi.getUnitMeasureByCode(row.getProductUnitCode()).getCheckedData();
+ if (unit == null) {
+ throw exception(SALE_ORDER_IMPORT_UNIT_NOT_EXISTS, row.getProductUnitCode());
+ }
+ ErpSaleOrderSaveReqVO.Item item = new ErpSaleOrderSaveReqVO.Item()
+ .setProductId(product.getId())
+ .setProductUnitId(unit.getId())
+ .setProductPrice(row.getProductPrice())
+ .setCount(row.getCount())
+ .setTaxPercent(row.getTaxPercent())
+ .setNeedProduction(row.getNeedProduction())
+ .setRemark(row.getItemRemark());
+ items.add(item);
+ }
+ CrmContractForSaleDTO contract = null;
+ if (StrUtil.isNotBlank(first.getContractNo())) {
+ contract = contractApi.getContractForSaleByNo(first.getContractNo().trim()).getCheckedData();
+ if (contract == null || !Integer.valueOf(20).equals(contract.getAuditStatus())) {
+ throw exception(SALE_ORDER_IMPORT_INVALID_ROW, "鍚堝悓涓嶅瓨鍦ㄦ垨灏氭湭瀹℃壒閫氳繃");
+ }
+ if (!customer.getId().equals(contract.getCustomerId())) {
+ throw exception(SALE_ORDER_IMPORT_INVALID_ROW, "鍚堝悓瀹㈡埛涓庤鍗曞鎴蜂笉涓�鑷�");
+ }
+ if (saleOrderMapper.selectByContractId(contract.getId()) != null) {
+ throw exception(SALE_ORDER_IMPORT_INVALID_ROW, "璇ュ悎鍚屽凡鍏宠仈閿�鍞鍗�");
+ }
+ Map<String, BigDecimal> expected = new LinkedHashMap<>();
+ if (contract.getItems() != null) {
+ for (CrmContractForSaleDTO.Item item : contract.getItems()) {
+ if (item.getItemId() == null || item.getItemUnitId() == null || item.getContractPrice() == null || item.getCount() == null) {
+ throw exception(SALE_ORDER_IMPORT_INVALID_ROW, "鍚堝悓鏄庣粏涓嶅畬鏁达紝鏃犳硶鍏宠仈璁㈠崟");
+ }
+ String key = item.getItemId() + ":" + item.getItemUnitId() + ":" + item.getContractPrice().stripTrailingZeros().toPlainString();
+ expected.merge(key, item.getCount(), BigDecimal::add);
+ }
+ }
+ Map<String, BigDecimal> actual = new LinkedHashMap<>();
+ for (ErpSaleOrderSaveReqVO.Item item : items) {
+ String key = item.getProductId() + ":" + item.getProductUnitId() + ":" + item.getProductPrice().stripTrailingZeros().toPlainString();
+ actual.merge(key, item.getCount(), BigDecimal::add);
+ }
+ if (expected.isEmpty() || expected.size() != actual.size() || expected.entrySet().stream()
+ .anyMatch(entry -> !actual.containsKey(entry.getKey()) || entry.getValue().compareTo(actual.get(entry.getKey())) != 0)) {
+ throw exception(SALE_ORDER_IMPORT_INVALID_ROW, "璁㈠崟鐗╂枡銆佸崟浣嶃�佸崟浠峰強鏁伴噺椤讳笌鍚堝悓鏄庣粏涓�鑷�");
+ }
+ BigDecimal expectedDiscount = ObjectUtil.defaultIfNull(contract.getDiscountPercent(), BigDecimal.ZERO);
+ if (expectedDiscount.compareTo(ObjectUtil.defaultIfNull(first.getDiscountPercent(), BigDecimal.ZERO)) != 0) {
+ throw exception(SALE_ORDER_IMPORT_INVALID_ROW, "璁㈠崟浼樻儬鐜囬』涓庡悎鍚屼竴鑷�");
+ }
+ }
+ // 5. 缁勮涓昏〃
+ ErpSaleOrderSaveReqVO createReqVO = new ErpSaleOrderSaveReqVO()
+ .setCustomerId(customer.getId())
+ .setContractId(contract == null ? null : contract.getId())
+ .setContractNo(contract == null ? null : first.getContractNo().trim())
+ .setOrderTime(first.getOrderTime())
+ .setSaleUserId(saleUserId)
+ .setAccountId(accountId)
+ .setDiscountPercent(ObjectUtil.defaultIfNull(first.getDiscountPercent(), BigDecimal.ZERO))
+ .setDepositPrice(ObjectUtil.defaultIfNull(first.getDepositPrice(), BigDecimal.ZERO))
+ .setRemark(first.getRemark())
+ .setItems(items);
+ return createReqVO;
}
}
--
Gitblit v1.9.3