From abf1c0a35d85d38239ff5d2ed746a4e4b797c9d1 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期四, 20 八月 2026 14:05:02 +0800
Subject: [PATCH] feat 功能修正
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/MesWmStockTakingTaskLineController.java | 48 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 39 insertions(+), 9 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/MesWmStockTakingTaskLineController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/MesWmStockTakingTaskLineController.java
index 39c8b4b..4385c79 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/MesWmStockTakingTaskLineController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/MesWmStockTakingTaskLineController.java
@@ -4,17 +4,22 @@
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.stocktaking.task.vo.line.MesWmStockTakingTaskLineImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.stocktaking.task.vo.line.MesWmStockTakingTaskLineImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.stocktaking.task.vo.line.MesWmStockTakingTaskLinePageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.stocktaking.task.vo.line.MesWmStockTakingTaskLineRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.stocktaking.task.vo.line.MesWmStockTakingTaskLineSaveReqVO;
-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.stocktaking.task.MesWmStockTakingTaskLineDO;
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.stocktaking.task.MesWmStockTakingTaskLineService;
import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService;
import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseLocationService;
@@ -23,14 +28,18 @@
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import java.io.IOException;
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;
@@ -45,9 +54,9 @@
@Resource
private MesWmStockTakingTaskLineService stockTakingTaskLineService;
@Resource
- private MesMdItemService itemService;
+ private MdmItemApi mdmItemApi;
@Resource
- private MesMdUnitMeasureService unitMeasureService;
+ private MdmUnitMeasureApi mdmUnitMeasureApi;
@Resource
private MesWmWarehouseService warehouseService;
@Resource
@@ -109,6 +118,26 @@
return success(buildStockTakingTaskLineRespVOList(list));
}
+ @PostMapping("/import-excel")
+ @Operation(summary = "瀵煎叆鐩樼偣瀹炵洏鏁伴噺", description = "鎸� 鐗╂枡缂栫爜 + 鎵规鍙� 鍖归厤鐩樼偣琛岋紝鍐欏叆瀹炵洏鏁伴噺")
+ @Parameter(name = "file", description = "Excel 鏂囦欢", required = true)
+ @PreAuthorize("@ss.hasPermission('mes:wm-stock-taking-task:update')")
+ public CommonResult<MesWmStockTakingTaskLineImportRespVO> importStockTakingQuantity(
+ @RequestParam("taskId") Long taskId,
+ @RequestParam("file") MultipartFile file) throws IOException {
+ List<MesWmStockTakingTaskLineImportExcelVO> list =
+ ExcelUtils.read(file, MesWmStockTakingTaskLineImportExcelVO.class);
+ return success(stockTakingTaskLineService.importTakingQuantity(taskId, list));
+ }
+
+ @GetMapping("/get-import-template")
+ @Operation(summary = "涓嬭浇鐩樼偣瀵煎叆妯℃澘")
+ @PreAuthorize("@ss.hasPermission('mes:wm-stock-taking-task:query')")
+ public void getImportTemplate(HttpServletResponse response) throws IOException {
+ ExcelUtils.write(response, "鐩樼偣瀹炵洏鏁板鍏ユā鏉�.xls", "瀹炵洏鏁�",
+ MesWmStockTakingTaskLineImportExcelVO.class, Collections.emptyList());
+ }
+
// ==================== 鎷兼帴 VO ====================
private List<MesWmStockTakingTaskLineRespVO> buildStockTakingTaskLineRespVOList(List<MesWmStockTakingTaskLineDO> list) {
@@ -116,9 +145,10 @@
return Collections.emptyList();
}
// 鏌ヨ鍏宠仈鏁版嵁
- Map<Long, MesMdItemDO> itemMap = itemService.getItemMap(convertSet(list, MesWmStockTakingTaskLineDO::getItemId));
- Map<Long, MesMdUnitMeasureDO> unitMeasureMap = unitMeasureService.getUnitMeasureMap(
- convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
+ Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemMap(convertSet(list, MesWmStockTakingTaskLineDO::getItemId));
+ 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, MesWmStockTakingTaskLineDO::getWarehouseId));
Map<Long, MesWmWarehouseLocationDO> locationMap = locationService.getWarehouseLocationMap(
--
Gitblit v1.9.3