From 1ba0dbfde5634c8bf2ec20891d6b226b996f6b59 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 02 九月 2026 14:24:38 +0800
Subject: [PATCH] refactor(mes): 优化MES生产扫码入库功能支持多类型扫码
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java | 99 ++++++++++++++++---------------------------------
1 files changed, 33 insertions(+), 66 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 3e2adf4..43748cd 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
@@ -19,9 +19,9 @@
import cn.iocoder.yudao.module.erp.service.sale.ErpSaleOrderService;
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.productsales.MesWmProductSalesLineApi;
-import cn.iocoder.yudao.module.mes.api.salesnotice.MesWmSalesNoticeApi;
+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.wms.MesWmStockApi;
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;
@@ -61,13 +61,11 @@
@Resource
private AdminUserApi adminUserApi;
@Resource
- private MesWmSalesNoticeApi salesNoticeApi;
- @Resource
- private MesWmProductSalesLineApi productSalesLineApi;
- @Resource
- private MesProMpsApi mpsApi;
- @Resource
private StorageAttachmentApi storageAttachmentApi;
+ @Resource
+ private MdmUnitMeasureApi mdmUnitMeasureApi;
+ @Resource
+ private MesWmStockApi mesWmStockApi;
@PostMapping("/create")
@Operation(summary = "鍒涘缓閿�鍞鍗�")
@@ -143,19 +141,27 @@
if (saleOrder == null) {
return success(null);
}
+ // 1. 鏌ヨ璁㈠崟椤�
List<ErpSaleOrderItemDO> saleOrderItemList = saleOrderService.getSaleOrderItemListByOrderId(id);
+ // 2. 鎵归噺鏌ヨ鍏宠仈鏁版嵁
Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemMap(
convertSet(saleOrderItemList, ErpSaleOrderItemDO::getProductId));
- Map<Long, String> batchCodeMap = productSalesLineApi.getBatchCodesBySaleOrderItemIds(
- convertSet(saleOrderItemList, ErpSaleOrderItemDO::getId));
- return success(BeanUtils.toBean(saleOrder, ErpSaleOrderRespVO.class, saleOrderVO ->
- saleOrderVO.setItems(BeanUtils.toBean(saleOrderItemList, ErpSaleOrderRespVO.Item.class, item -> {
- // 搴撳瓨淇℃伅鏆備笉鏌ヨ锛堜粨鍌ㄧ墿娴佹ā鍧楋級
- item.setStockCount(BigDecimal.ZERO);
- item.setBatchCode(batchCodeMap.get(item.getId()));
- MapUtils.findAndThen(itemMap, item.getProductId(), mdmItem -> item.setProductName(mdmItem.getName())
- .setProductBarCode(mdmItem.getBarCode()));
- })).setAttachmentList(storageAttachmentApi.listAttachments("erp_sale_order", id))));
+ Map<Long, MdmUnitMeasureRespDTO> unitMeasureMap = mdmUnitMeasureApi.getUnitMeasureMap(
+ convertSet(saleOrderItemList, ErpSaleOrderItemDO::getProductUnitId));
+ // 3. 杞崲璁㈠崟椤�
+ List<ErpSaleOrderRespVO.Item> itemVOList = BeanUtils.toBean(saleOrderItemList, ErpSaleOrderRespVO.Item.class, item -> {
+ item.setStockCount(mesWmStockApi.getStockQuantity(item.getProductId()));
+ MapUtils.findAndThen(itemMap, item.getProductId(), mdmItem ->
+ item.setProductName(mdmItem.getName()).setProductBarCode(mdmItem.getBarCode())
+ .setProductSpecification(mdmItem.getSpecification()));
+ MapUtils.findAndThen(unitMeasureMap, item.getProductUnitId(), unit ->
+ item.setProductUnitName(unit.getName()));
+ });
+ // 4. 缁勮鍝嶅簲
+ ErpSaleOrderRespVO saleOrderVO = BeanUtils.toBean(saleOrder, ErpSaleOrderRespVO.class);
+ saleOrderVO.setItems(itemVOList);
+ saleOrderVO.setAttachmentList(storageAttachmentApi.listAttachments("erp_sale_order", id));
+ return success(saleOrderVO);
}
@GetMapping("/page")
@@ -195,61 +201,22 @@
// 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 鍑哄簱鎵瑰彿
- Map<Long, String> batchCodeMap = productSalesLineApi.getBatchCodesBySaleOrderItemIds(
- convertSet(saleOrderItemList, ErpSaleOrderItemDO::getId));
- // 1.7 妫�鏌ユ槸鍚﹀彲浠ョ敓鎴愬彂璐ч�氱煡鍗曪紙闇�瑕佺敓浜х殑鏄庣粏瀵瑰簲鐨� 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));
- }
+ // 1.5 璁￠噺鍗曚綅
+ Map<Long, MdmUnitMeasureRespDTO> unitMeasureMap = mdmUnitMeasureApi.getUnitMeasureMap(
+ convertSet(saleOrderItemList, ErpSaleOrderItemDO::getProductUnitId));
// 2. 寮�濮嬫嫾鎺�
return BeanUtils.toBean(pageResult, ErpSaleOrderRespVO.class, saleOrder -> {
saleOrder.setItems(BeanUtils.toBean(saleOrderItemMap.get(saleOrder.getId()), ErpSaleOrderRespVO.Item.class,
item -> {
- item.setBatchCode(batchCodeMap.get(item.getId()));
- MapUtils.findAndThen(itemMap, item.getProductId(), mdmItem -> item.setProductName(mdmItem.getName())
- .setProductBarCode(mdmItem.getBarCode()));
+ MapUtils.findAndThen(itemMap, item.getProductId(), mdmItem ->
+ item.setProductName(mdmItem.getName()).setProductBarCode(mdmItem.getBarCode())
+ .setProductSpecification(mdmItem.getSpecification()));
+ MapUtils.findAndThen(unitMeasureMap, item.getProductUnitId(), unit ->
+ item.setProductUnitName(unit.getName()));
}));
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(!saleOrder.getHasSalesNotice() && canCreateSalesNoticeMap.getOrDefault(saleOrder.getId(), true));
// 璁剧疆鏄惁鏈夐渶瑕佺敓浜х殑鏄庣粏
boolean hasNeedProduction = saleOrder.getItems().stream()
.anyMatch(item -> item.getNeedProduction() != null && item.getNeedProduction() == 1);
--
Gitblit v1.9.3