From 5140e16bd1cb2bdf974d47a4342f9e27ef804655 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 18 七月 2026 15:54:07 +0800
Subject: [PATCH] feat(erp): 增加销售订单MPS集成与发货通知单控制功能
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java | 80 ++++++++++++++++++++++++++++++++--------
1 files changed, 64 insertions(+), 16 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java
index f0211bd..1280ab6 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java
@@ -10,15 +10,16 @@
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
import cn.iocoder.yudao.module.crm.api.customer.dto.CrmCustomerRespDTO;
-import cn.iocoder.yudao.module.erp.controller.admin.product.vo.product.ErpProductRespVO;
import cn.iocoder.yudao.module.erp.controller.admin.sale.vo.order.ErpSaleOrderPageReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.sale.vo.order.ErpSaleOrderRespVO;
import cn.iocoder.yudao.module.erp.controller.admin.sale.vo.order.ErpSaleOrderSaveReqVO;
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.service.product.ErpProductService;
import cn.iocoder.yudao.module.erp.service.sale.ErpSaleOrderService;
-import cn.iocoder.yudao.module.erp.service.stock.ErpStockService;
+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.salesnotice.MesWmSalesNoticeApi;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
import io.swagger.v3.oas.annotations.Operation;
@@ -50,14 +51,16 @@
@Resource
private ErpSaleOrderService saleOrderService;
@Resource
- private ErpStockService stockService;
- @Resource
- private ErpProductService productService;
- @Resource
private CrmCustomerApi customerApi;
@Resource
+ private MdmItemApi mdmItemApi;
+ @Resource
private AdminUserApi adminUserApi;
+ @Resource
+ private MesWmSalesNoticeApi salesNoticeApi;
+ @Resource
+ private MesProMpsApi mpsApi;
@PostMapping("/create")
@Operation(summary = "鍒涘缓閿�鍞鍗�")
@@ -120,14 +123,14 @@
return success(null);
}
List<ErpSaleOrderItemDO> saleOrderItemList = saleOrderService.getSaleOrderItemListByOrderId(id);
- Map<Long, ErpProductRespVO> productMap = productService.getProductVOMap(
+ Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemMap(
convertSet(saleOrderItemList, ErpSaleOrderItemDO::getProductId));
return success(BeanUtils.toBean(saleOrder, ErpSaleOrderRespVO.class, saleOrderVO ->
saleOrderVO.setItems(BeanUtils.toBean(saleOrderItemList, ErpSaleOrderRespVO.Item.class, item -> {
- BigDecimal stockCount = stockService.getStockCount(item.getProductId());
- item.setStockCount(stockCount != null ? stockCount : BigDecimal.ZERO);
- MapUtils.findAndThen(productMap, item.getProductId(), product -> item.setProductName(product.getName())
- .setProductBarCode(product.getBarCode()).setProductUnitName(product.getUnitName()));
+ // 搴撳瓨淇℃伅鏆備笉鏌ヨ锛堜粨鍌ㄧ墿娴佹ā鍧楋級
+ item.setStockCount(BigDecimal.ZERO);
+ MapUtils.findAndThen(itemMap, item.getProductId(), mdmItem -> item.setProductName(mdmItem.getName())
+ .setProductBarCode(mdmItem.getBarCode()));
}))));
}
@@ -159,8 +162,8 @@
List<ErpSaleOrderItemDO> saleOrderItemList = saleOrderService.getSaleOrderItemListByOrderIds(
convertSet(pageResult.getList(), ErpSaleOrderDO::getId));
Map<Long, List<ErpSaleOrderItemDO>> saleOrderItemMap = convertMultiMap(saleOrderItemList, ErpSaleOrderItemDO::getOrderId);
- // 1.2 浜у搧淇℃伅
- Map<Long, ErpProductRespVO> productMap = productService.getProductVOMap(
+ // 1.2 鐗╂枡淇℃伅
+ Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemMap(
convertSet(saleOrderItemList, ErpSaleOrderItemDO::getProductId));
// 1.3 瀹㈡埛淇℃伅锛堜娇鐢� CRM 瀹㈡埛 API锛�
Map<Long, CrmCustomerRespDTO> customerMap = customerApi.getCustomerMap(
@@ -168,14 +171,59 @@
// 1.4 绠＄悊鍛樹俊鎭�
Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
convertSet(pageResult.getList(), saleOrder -> Long.parseLong(saleOrder.getCreator())));
+ // 1.5 鍙戣揣閫氱煡鍗曚俊鎭�
+ Map<Long, Boolean> salesNoticeMap = salesNoticeApi.checkSalesNoticeBySaleOrderIds(
+ convertSet(pageResult.getList(), ErpSaleOrderDO::getId));
+ // 1.6 妫�鏌ユ槸鍚﹀彲浠ョ敓鎴愬彂璐ч�氱煡鍗曪紙闇�瑕佺敓浜х殑鏄庣粏瀵瑰簲鐨� MPS 鏄惁宸插畬鎴愶級
+ // 绛涢�夊嚭闇�瑕佺敓浜х殑鏄庣粏ID
+ List<Long> needProductionItemIds = saleOrderItemList.stream()
+ .filter(item -> item.getNeedProduction() != null && item.getNeedProduction() == 1)
+ .map(ErpSaleOrderItemDO::getId)
+ .toList();
+ Map<Long, Boolean> canCreateSalesNoticeMap = new java.util.HashMap<>();
+ if (!needProductionItemIds.isEmpty()) {
+ // 鎸夎鍗曞垎缁勬槑缁咺D
+ Map<Long, List<Long>> orderItemIdsMap = new java.util.HashMap<>();
+ for (ErpSaleOrderItemDO item : saleOrderItemList) {
+ orderItemIdsMap.computeIfAbsent(item.getOrderId(), k -> new java.util.ArrayList<>())
+ .add(item.getId());
+ }
+ // 妫�鏌ユ瘡涓鍗�
+ for (Map.Entry<Long, List<Long>> entry : orderItemIdsMap.entrySet()) {
+ List<Long> itemIds = entry.getValue().stream()
+ .filter(id -> {
+ ErpSaleOrderItemDO item = saleOrderItemList.stream()
+ .filter(i -> i.getId().equals(id))
+ .findFirst().orElse(null);
+ return item != null && item.getNeedProduction() != null && item.getNeedProduction() == 1;
+ }
+ ).toList();
+ if (itemIds.isEmpty()) {
+ canCreateSalesNoticeMap.put(entry.getKey(), true);
+ } else {
+ canCreateSalesNoticeMap.put(entry.getKey(), mpsApi.checkCanCreateSalesNotice(itemIds));
+ }
+ }
+ } else {
+ // 娌℃湁闇�瑕佺敓浜х殑鏄庣粏锛岄兘鍙互鐢熸垚鍙戣揣閫氱煡鍗�
+ pageResult.getList().forEach(order -> canCreateSalesNoticeMap.put(order.getId(), true));
+ }
// 2. 寮�濮嬫嫾鎺�
return BeanUtils.toBean(pageResult, ErpSaleOrderRespVO.class, saleOrder -> {
saleOrder.setItems(BeanUtils.toBean(saleOrderItemMap.get(saleOrder.getId()), ErpSaleOrderRespVO.Item.class,
- item -> MapUtils.findAndThen(productMap, item.getProductId(), product -> item.setProductName(product.getName())
- .setProductBarCode(product.getBarCode()).setProductUnitName(product.getUnitName()))));
+ item -> MapUtils.findAndThen(itemMap, item.getProductId(), mdmItem -> item.setProductName(mdmItem.getName())
+ .setProductBarCode(mdmItem.getBarCode()))));
saleOrder.setProductNames(CollUtil.join(saleOrder.getItems(), "锛�", ErpSaleOrderRespVO.Item::getProductName));
MapUtils.findAndThen(customerMap, saleOrder.getCustomerId(), supplier -> saleOrder.setCustomerName(supplier.getName()));
MapUtils.findAndThen(userMap, Long.parseLong(saleOrder.getCreator()), user -> saleOrder.setCreatorName(user.getNickname()));
+ // 璁剧疆鏄惁宸茬敓鎴愬彂璐ч�氱煡鍗�
+ saleOrder.setHasSalesNotice(salesNoticeMap.getOrDefault(saleOrder.getId(), false));
+ // 璁剧疆鏄惁鍙互鐢熸垚鍙戣揣閫氱煡鍗�
+ saleOrder.setCanCreateSalesNotice(canCreateSalesNoticeMap.getOrDefault(saleOrder.getId(), true));
+ // 璁剧疆鏄惁鏈夐渶瑕佺敓浜х殑鏄庣粏
+ boolean hasNeedProduction = saleOrder.getItems().stream()
+ .anyMatch(item -> item.getNeedProduction() != null && item.getNeedProduction() == 1);
+ saleOrder.setNeedProduction(hasNeedProduction ? 1 : 0);
});
}
--
Gitblit v1.9.3