From d80fa460742ddf052844746482801de355e85528 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 07 十一月 2026 14:24:30 +0800
Subject: [PATCH] feat(qc): 拆分部门审批流程并支持扫码自动识别
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transaction/MesWmTransactionController.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transaction/MesWmTransactionController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transaction/MesWmTransactionController.java
index 8f9469e..ca5ebef 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transaction/MesWmTransactionController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transaction/MesWmTransactionController.java
@@ -22,7 +22,9 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseLocationDO;
import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmTransactionTypeEnum;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemTypeService;
+import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService;
import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
import cn.iocoder.yudao.module.mes.service.wm.transaction.MesWmTransactionService;
import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService;
@@ -73,6 +75,7 @@
@Resource private MesWmProductSalesDetailMapper salesDetailMapper;
@Resource private MesMdItemMapper mesMdItemMapper;
@Resource private MesMdItemTypeService mesMdItemTypeService;
+ @Resource private MesMdUnitMeasureService unitMeasureService;
@GetMapping("/page")
@Operation(summary = "鑾峰彇搴撳瓨浜嬪姟娴佹按鍒嗛〉")
@@ -100,6 +103,9 @@
mesItemTypeIds.remove(null);
Map<Long, MesMdItemTypeDO> mesItemTypeMap = mesItemTypeIds.isEmpty() ? Map.of()
: mesMdItemTypeService.getItemTypeMap(mesItemTypeIds);
+ // 鍏宠仈鏌ヨ璁￠噺鍗曚綅锛岃鏍煎垪灞曠ず璁￠噺鍗曚綅鍚嶇О
+ Map<Long, MesMdUnitMeasureDO> unitMeasureMap = unitMeasureService.getUnitMeasureMap(
+ convertSet(itemMap.values(), MesMdmItemDO::getUnitMeasureId));
// 鍏宠仈鏌ヨ浠撳簱淇℃伅
Map<Long, MesWmWarehouseDO> warehouseMap = warehouseService.getWarehouseMap(
convertSet(pageResult.getList(), MesWmTransactionDO::getWarehouseId));
@@ -152,6 +158,10 @@
// 瑙勬牸锛氬搧绉嶇鐞嗘湭缁存姢鏃讹紝鍥為��鍙� MES 鐗╂枡瑙勬牸鍨嬪彿
vo.setSpecification(StrUtil.blankToDefault(item.getSpecification(),
mesItem != null ? mesItem.getSpecification() : null));
+ MesMdUnitMeasureDO unitMeasure = unitMeasureMap.get(item.getUnitMeasureId());
+ if (unitMeasure != null) {
+ vo.setUnitMeasureName(unitMeasure.getName());
+ }
// 绫诲埆锛氫紭鍏堝搧绉嶅垎绫伙紝鍏舵 MES 鐗╂枡鍒嗙被
MdmItemCategoryRespDTO category = itemCategoryMap.get(item.getCategoryId());
String itemTypeName = category != null ? category.getName() : null;
--
Gitblit v1.9.3