From e96957ade2486cb81928529ff77c67c410c7f7ac Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 02 九月 2026 16:56:28 +0800
Subject: [PATCH] feat(mes): 新增库存现有量导入功能
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/MesWmMaterialStockController.java | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/MesWmMaterialStockController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/MesWmMaterialStockController.java
index 4c519db..a1ee7ca 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/MesWmMaterialStockController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/MesWmMaterialStockController.java
@@ -10,11 +10,14 @@
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockAdjustReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockFreezeReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockImportReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockMoveReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockRespVO;
-import cn.iocoder.yudao.module.erp.api.purchase.ErpSupplierApi;
-import cn.iocoder.yudao.module.erp.api.purchase.dto.ErpSupplierRespDTO;
+import cn.iocoder.yudao.module.srm.api.supplier.SrmSupplierApi;
+import cn.iocoder.yudao.module.srm.api.supplier.dto.SrmSupplierRespDTO;
import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
@@ -69,7 +72,7 @@
@Resource
private MesWmWarehouseAreaService areaService;
@Resource
- private ErpSupplierApi supplierApi;
+ private SrmSupplierApi srmSupplierApi;
@GetMapping("/get")
@Operation(summary = "鑾峰緱搴撳瓨璁板綍")
@@ -135,6 +138,30 @@
buildRespVOList(pageResult.getList()));
}
+ @GetMapping("/import-template")
+ @Operation(summary = "涓嬭浇搴撳瓨鐜版湁閲忓鍏ユā鏉�")
+ @PreAuthorize("@ss.hasPermission('mes:wm-material-stock:import')")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 杈撳嚭绀轰緥鏁版嵁锛屾柟渚夸娇鐢ㄨ�呭弬鑰�
+ List<MesWmMaterialStockImportExcelVO> list = List.of(
+ MesWmMaterialStockImportExcelVO.builder().itemCode("M001").warehouse("鍘熸枡浠�")
+ .location("A鍖�").area("A-01").batchCode("B20260101").vendor("XX渚涘簲鍟�")
+ .operationType("瑕嗙洊").quantity(new BigDecimal("100")).build()
+ );
+ ExcelUtils.write(response, "搴撳瓨鐜版湁閲忓鍏ユā鏉�.xls", "搴撳瓨鍒楄〃",
+ MesWmMaterialStockImportExcelVO.class, list);
+ }
+
+ @PostMapping("/import")
+ @Operation(summary = "瀵煎叆搴撳瓨鐜版湁閲�")
+ @PreAuthorize("@ss.hasPermission('mes:wm-material-stock:import')")
+ public CommonResult<MesWmMaterialStockImportRespVO> importExcel(
+ @Valid MesWmMaterialStockImportReqVO importReqVO) throws Exception {
+ List<MesWmMaterialStockImportExcelVO> list = ExcelUtils.read(
+ importReqVO.getFile(), MesWmMaterialStockImportExcelVO.class);
+ return success(materialStockService.importMaterialStockList(list));
+ }
+
// ==================== 鎷兼帴 VO ====================
private List<MesWmMaterialStockRespVO> buildRespVOList(List<MesWmMaterialStockDO> list) {
@@ -153,9 +180,9 @@
convertSet(list, MesWmMaterialStockDO::getLocationId));
Map<Long, MesWmWarehouseAreaDO> areaMap = areaService.getWarehouseAreaMap(
convertSet(list, MesWmMaterialStockDO::getAreaId));
- Map<Long, ErpSupplierRespDTO> vendorMap = supplierApi.getSupplierList(
+ Map<Long, SrmSupplierRespDTO> vendorMap = srmSupplierApi.getSupplierList(
convertSet(list, MesWmMaterialStockDO::getVendorId)).getCheckedData().stream()
- .collect(Collectors.toMap(ErpSupplierRespDTO::getId, s -> s));
+ .collect(Collectors.toMap(SrmSupplierRespDTO::getId, s -> s));
// 2. 鏋勫缓缁撴灉
return BeanUtils.toBean(list, MesWmMaterialStockRespVO.class, vo -> {
MapUtils.findAndThen(itemMap, vo.getItemId(), item -> {
--
Gitblit v1.9.3