From eccad5a129106377a275be4f7cdc58e99e9b95d4 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 21 七月 2026 13:45:14 +0800
Subject: [PATCH] feat(mes): 实现库存移库功能
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java | 132 ++++++++++++++++++++++++++++++++-----------
1 files changed, 98 insertions(+), 34 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 b9eddf9..a9ad090 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
@@ -15,15 +15,22 @@
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.api.sale.enums.ErpSaleOrderOutStatusEnum;
import cn.iocoder.yudao.module.erp.service.finance.ErpAccountService;
+import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
+import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
+import cn.iocoder.yudao.module.mes.api.mps.MesProMpsApi;
+import cn.iocoder.yudao.module.mes.api.mps.dto.MesProMpsCreateReqDTO;
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;
import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
@@ -40,6 +47,7 @@
*/
@Service
@Validated
+@Slf4j
public class ErpSaleOrderServiceImpl implements ErpSaleOrderService {
@Resource
@@ -59,6 +67,11 @@
@Resource
private AdminUserApi adminUserApi;
+
+ @Resource
+ private MdmItemApi mdmItemApi;
+ @Resource
+ private MesProMpsApi mpsApi;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -83,7 +96,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 鎻掑叆璁㈠崟椤�
@@ -149,11 +163,6 @@
if (!approve && outCount.compareTo(BigDecimal.ZERO) > 0) {
throw exception(SALE_ORDER_PROCESS_FAIL_EXISTS_OUT);
}
- // 1.4 瀛樺湪閿�鍞��璐у崟锛屾棤娉曞弽瀹℃牳
- BigDecimal returnCount = saleOrder.getReturnCount() != null ? saleOrder.getReturnCount() : BigDecimal.ZERO;
- if (!approve && returnCount.compareTo(BigDecimal.ZERO) > 0) {
- throw exception(SALE_ORDER_PROCESS_FAIL_EXISTS_RETURN);
- }
// 2. 鏇存柊鐘舵��
int updateCount = saleOrderMapper.updateByIdAndStatus(id, saleOrder.getStatus(),
@@ -161,6 +170,85 @@
if (updateCount == 0) {
throw exception(approve ? SALE_ORDER_APPROVE_FAIL : SALE_ORDER_PROCESS_FAIL);
}
+
+ // 3. 瀹℃牳閫氳繃鏃讹紝涓洪渶瑕佺敓浜х殑鏄庣粏鍒涘缓 MPS
+ if (approve) {
+ createMpsForSaleOrder(id, saleOrder);
+ }
+ }
+
+ /**
+ * 涓洪攢鍞鍗曚腑闇�瑕佺敓浜х殑鏄庣粏鍒涘缓 MPS
+ *
+ * @param orderId 閿�鍞鍗曠紪鍙�
+ * @param saleOrder 閿�鍞鍗�
+ */
+ private void createMpsForSaleOrder(Long orderId, ErpSaleOrderDO saleOrder) {
+ List<ErpSaleOrderItemDO> items = saleOrderItemMapper.selectListByOrderId(orderId);
+ if (CollUtil.isEmpty(items)) {
+ return;
+ }
+
+ int mpsCount = 0;
+ for (ErpSaleOrderItemDO item : items) {
+ if (item.getNeedProduction() == null || item.getNeedProduction() != 1) {
+ continue;
+ }
+ try {
+ Long mpsId = createMpsForSaleOrderItem(saleOrder, item);
+ if (mpsId != null) {
+ mpsCount++;
+ // 鏇存柊閿�鍞鍗曟槑缁嗙殑 MPS 鍏宠仈
+ saleOrderItemMapper.updateById(new ErpSaleOrderItemDO()
+ .setId(item.getId())
+ .setMpsId(mpsId));
+ }
+ } catch (Exception e) {
+ log.error("[createMpsForSaleOrder] 鍒涘缓 MPS 澶辫触锛宻aleOrderItemId={}", item.getId(), e);
+ }
+ }
+ log.info("[createMpsForSaleOrder] 閿�鍞鍗�({}) 瀹℃牳瀹屾垚锛屽垱寤� MPS {} 鏉�", orderId, mpsCount);
+ }
+
+ /**
+ * 涓洪攢鍞鍗曟槑缁嗗垱寤� MPS
+ */
+ private Long createMpsForSaleOrderItem(ErpSaleOrderDO saleOrder, ErpSaleOrderItemDO item) {
+ // 鑾峰彇 MDM 鐗╂枡淇℃伅锛堢敤浜庤幏鍙栦骇鍝佸悕绉帮級
+ String productName = null;
+ try {
+ MdmItemRespDTO mdmItem = mdmItemApi.getItem(item.getProductId()).getCheckedData();
+ if (mdmItem != null) {
+ productName = mdmItem.getName();
+ }
+ } catch (Exception e) {
+ log.warn("[createMpsForSaleOrderItem] 鑾峰彇 MDM 鐗╂枡淇℃伅澶辫触锛宲roductId={}", item.getProductId(), e);
+ }
+
+ MesProMpsCreateReqDTO createReqDTO = new MesProMpsCreateReqDTO();
+ createReqDTO.setSaleOrderId(saleOrder.getId());
+ createReqDTO.setSaleOrderNo(saleOrder.getNo());
+ createReqDTO.setSaleOrderItemId(item.getId());
+ createReqDTO.setMdmItemId(item.getProductId());
+ createReqDTO.setProductName(productName);
+ 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
@@ -176,11 +264,6 @@
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. 鏇存柊鐘舵�佷负宸蹭綔搴�
@@ -272,26 +355,6 @@
}
@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,
- "浜у搧ID:" + item.getProductId(), 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
@Transactional(rollbackFor = Exception.class)
public void deleteSaleOrder(List<Long> ids) {
// 1. 鏍￠獙涓嶅浜庡凡瀹℃壒
@@ -338,7 +401,8 @@
@Override
public PageResult<ErpSaleOrderDO> getSaleOrderPage(ErpSaleOrderPageReqVO pageReqVO) {
- return saleOrderMapper.selectPage(pageReqVO);
+ List<Long> permittedCustomerIds = customerApi.getPermittedCustomerIds();
+ return saleOrderMapper.selectPage(pageReqVO, permittedCustomerIds);
}
// ==================== 璁㈠崟椤� ====================
@@ -403,4 +467,4 @@
}
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3