From 87733eb3623593da247c051593d64b8ff9e1d3a4 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 06 十一月 2026 19:00:39 +0800
Subject: [PATCH] feat(crm,mes): 扩展客户字段与重构批次号生成逻辑

---
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/MesWmProductSalesDetailController.java |   31 ++++++++++++++++++++++---------
 1 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/MesWmProductSalesDetailController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/MesWmProductSalesDetailController.java
index 2038e4c..6db93ca 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/MesWmProductSalesDetailController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/MesWmProductSalesDetailController.java
@@ -6,14 +6,16 @@
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.mes.controller.admin.wm.productsales.vo.detail.MesWmProductSalesDetailRespVO;
 import cn.iocoder.yudao.module.mes.controller.admin.wm.productsales.vo.detail.MesWmProductSalesDetailSaveReqVO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
+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.dal.dataobject.wm.productsales.MesWmProductSalesDetailDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseLocationDO;
-import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
-import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService;
+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.service.wm.productsales.MesWmProductSalesDetailService;
 import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService;
 import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseLocationService;
@@ -30,6 +32,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
@@ -43,9 +46,9 @@
     @Resource
     private MesWmProductSalesDetailService productSalesDetailService;
     @Resource
-    private MesMdItemService itemService;
+    private MdmItemApi mdmItemApi;
     @Resource
-    private MesMdUnitMeasureService unitMeasureService;
+    private MdmUnitMeasureApi mdmUnitMeasureApi;
     @Resource
     private MesWmWarehouseService warehouseService;
     @Resource
@@ -58,6 +61,15 @@
     @PreAuthorize("@ss.hasPermission('mes:wm-product-sales:create')")
     public CommonResult<Long> createProductSalesDetail(@Valid @RequestBody MesWmProductSalesDetailSaveReqVO createReqVO) {
         return success(productSalesDetailService.createProductSalesDetail(createReqVO));
+    }
+
+    @PostMapping("/create-mobile-manual")
+    @Operation(summary = "绉诲姩绔寜鏁伴噺鎷i�夋棤琚嬬爜鍘嗗彶搴撳瓨")
+    @PreAuthorize("@ss.hasPermission('mes:wm-product-sales:stock')")
+    public CommonResult<Long> createMobileManual(@Valid @RequestBody MesWmProductSalesDetailSaveReqVO reqVO) {
+        if (reqVO.getRemark() == null || !reqVO.getRemark().matches("绉诲姩绔棤琚嬬爜鎷h揣 #[a-f0-9-]{36}"))
+            throw new IllegalArgumentException("缂哄皯鏈夋晥鐨勬嫞璐ц姹傛爣璇�");
+        return success(productSalesDetailService.createProductSalesDetail(reqVO));
     }
 
     @PutMapping("/update")
@@ -106,10 +118,11 @@
             return Collections.emptyList();
         }
         // 1. 鑾峰緱鍏宠仈鏁版嵁
-        Map<Long, MesMdItemDO> itemMap = itemService.getItemMap(
+        Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemMap(
                 convertSet(list, MesWmProductSalesDetailDO::getItemId));
-        Map<Long, MesMdUnitMeasureDO> unitMeasureMap = unitMeasureService.getUnitMeasureMap(
-                convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
+        Map<Long, MdmUnitMeasureRespDTO> unitMeasureMap = mdmUnitMeasureApi.getUnitMeasureList(
+                convertSet(itemMap.values(), MdmItemRespDTO::getUnitMeasureId)).getCheckedData()
+                .stream().collect(Collectors.toMap(MdmUnitMeasureRespDTO::getId, e -> e));
         Map<Long, MesWmWarehouseDO> warehouseMap = warehouseService.getWarehouseMap(
                 convertSet(list, MesWmProductSalesDetailDO::getWarehouseId));
         Map<Long, MesWmWarehouseLocationDO> locationMap = locationService.getWarehouseLocationMap(

--
Gitblit v1.9.3