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 | 101 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 82 insertions(+), 19 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 383a7d9..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
@@ -10,15 +10,19 @@
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.ErpSaleOrderItemRespVO;
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.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;
import io.swagger.v3.oas.annotations.Operation;
@@ -50,14 +54,18 @@
@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 StorageAttachmentApi storageAttachmentApi;
+ @Resource
+ private MdmUnitMeasureApi mdmUnitMeasureApi;
+ @Resource
+ private MesWmStockApi mesWmStockApi;
@PostMapping("/create")
@Operation(summary = "鍒涘缓閿�鍞鍗�")
@@ -83,6 +91,24 @@
return success(true);
}
+ @PutMapping("/cancel")
+ @Operation(summary = "浣滃簾閿�鍞鍗�")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('erp:sale-order:cancel')")
+ public CommonResult<Boolean> cancelSaleOrder(@RequestParam("id") Long id) {
+ saleOrderService.cancelSaleOrder(id);
+ return success(true);
+ }
+
+ @PutMapping("/enable")
+ @Operation(summary = "閲嶆柊鍚敤閿�鍞鍗�")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('erp:sale-order:enable')")
+ public CommonResult<Boolean> enableSaleOrder(@RequestParam("id") Long id) {
+ saleOrderService.enableSaleOrder(id);
+ return success(true);
+ }
+
@DeleteMapping("/delete")
@Operation(summary = "鍒犻櫎閿�鍞鍗�")
@Parameter(name = "ids", description = "缂栧彿鏁扮粍", required = true)
@@ -90,6 +116,20 @@
public CommonResult<Boolean> deleteSaleOrder(@RequestParam("ids") List<Long> ids) {
saleOrderService.deleteSaleOrder(ids);
return success(true);
+ }
+
+ @GetMapping("/item/list-by-order-id")
+ @Operation(summary = "鏌ヨ閿�鍞鍗曠殑鐗╂枡鏄庣粏鍒楄〃锛堢敤浜庡彂璐ч�氱煡鍗曞垱寤猴級")
+ @Parameter(name = "orderId", description = "閿�鍞鍗曠紪鍙�", required = true, example = "1")
+ @PreAuthorize("@ss.hasPermission('erp:sale-order:query')")
+ public CommonResult<List<ErpSaleOrderItemRespVO>> getSaleOrderItemListByOrderId(@RequestParam("orderId") Long orderId) {
+ List<ErpSaleOrderItemDO> itemList = saleOrderService.getSaleOrderItemListByOrderId(orderId);
+ Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemMap(
+ convertSet(itemList, ErpSaleOrderItemDO::getProductId));
+ return success(BeanUtils.toBean(itemList, ErpSaleOrderItemRespVO.class, vo -> {
+ MapUtils.findAndThen(itemMap, vo.getProductId(), item ->
+ vo.setProductName(item.getName()).setProductBarCode(item.getBarCode()));
+ }));
}
@GetMapping("/get")
@@ -101,16 +141,27 @@
if (saleOrder == null) {
return success(null);
}
+ // 1. 鏌ヨ璁㈠崟椤�
List<ErpSaleOrderItemDO> saleOrderItemList = saleOrderService.getSaleOrderItemListByOrderId(id);
- Map<Long, ErpProductRespVO> productMap = productService.getProductVOMap(
+ // 2. 鎵归噺鏌ヨ鍏宠仈鏁版嵁
+ 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()));
- }))));
+ 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")
@@ -141,8 +192,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(
@@ -150,14 +201,26 @@
// 1.4 绠＄悊鍛樹俊鎭�
Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
convertSet(pageResult.getList(), saleOrder -> Long.parseLong(saleOrder.getCreator())));
+ // 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 -> 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())
+ .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()));
+ // 璁剧疆鏄惁鏈夐渶瑕佺敓浜х殑鏄庣粏
+ boolean hasNeedProduction = saleOrder.getItems().stream()
+ .anyMatch(item -> item.getNeedProduction() != null && item.getNeedProduction() == 1);
+ saleOrder.setNeedProduction(hasNeedProduction ? 1 : 0);
});
}
--
Gitblit v1.9.3