前后端修改

klp-wms/src/main/java/com/klp/controller/WmsActualWarehouseController.java

@@ -2,10 +2,13 @@ package com.klp.controller;
 
 import java.util.List;
 import java.util.Arrays;
+import java.util.ArrayList;
 
 import lombok.RequiredArgsConstructor;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.*;
+import org.springframework.http.MediaType;
+import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import com.klp.common.annotation.RepeatSubmit;
@@ -16,9 +19,13 @@ import com.klp.common.core.domain.R;
 import com.klp.common.core.validate.AddGroup;
 import com.klp.common.core.validate.EditGroup;
 import com.klp.common.enums.BusinessType;
+import com.klp.common.excel.ExcelResult;
 import com.klp.common.utils.poi.ExcelUtil;
 import com.klp.domain.vo.WmsActualWarehouseVo;
+import com.klp.domain.vo.WmsActualWarehouseTreeVo;
+import com.klp.domain.vo.WmsActualWarehouseImportVo;
 import com.klp.domain.bo.WmsActualWarehouseBo;
+import com.klp.domain.bo.WmsActualWarehouseHierarchyBo;
 import com.klp.service.IWmsActualWarehouseService;
 
 /**
@@ -44,6 +51,34 @@ public class WmsActualWarehouseController extends BaseController {
         return R.ok(list);
     }
 
+    /**
+     * 获取完整三级目录树
+     */
+    @GetMapping("/tree")
+    public R<List<WmsActualWarehouseTreeVo>> tree(WmsActualWarehouseBo bo) {
+        return R.ok(iWmsActualWarehouseService.queryTree(bo));
+    }
+
+    /**
+     * 导入实际库区/库位数据
+     */
+    @Log(title = "实际库区/库位自关联", businessType = BusinessType.IMPORT)
+    @PostMapping(value = "/importData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    public R<Void> importData(@RequestPart("file") MultipartFile file) throws Exception {
+        ExcelResult<WmsActualWarehouseImportVo> result = ExcelUtil.importExcel(file.getInputStream(), WmsActualWarehouseImportVo.class, true);
+        iWmsActualWarehouseService.importHierarchy(result.getList());
+        return R.ok(result.getAnalysis());
+    }
+
+    /**
+     * 下载导入模板
+     */
+    @PostMapping("/importTemplate")
+    public void importTemplate(HttpServletResponse response) {
+        List<WmsActualWarehouseImportVo> template = buildTemplateData();
+        ExcelUtil.exportExcel(template, "实际库区导入模板", WmsActualWarehouseImportVo.class, response);
+    }
+
     /**
      * 导出实际库区/库位自关联列表
      */
@@ -75,6 +110,15 @@ public class WmsActualWarehouseController extends BaseController {
         return toAjax(iWmsActualWarehouseService.insertByBo(bo));
     }
 
+    /**
+     * 批量新增或复用层级目录
+     */
+    @Log(title = "实际库区/库位自关联-批量新增", businessType = BusinessType.INSERT)
+    @PostMapping("/hierarchy")
+    public R<List<Long>> addHierarchy(@Validated @RequestBody WmsActualWarehouseHierarchyBo bo) {
+        return R.ok(iWmsActualWarehouseService.createHierarchy(bo));
+    }
+
     /**
      * 修改实际库区/库位自关联
      */
@@ -96,4 +140,30 @@ public class WmsActualWarehouseController extends BaseController {
                           @PathVariable Long[] actualWarehouseIds) {
         return toAjax(iWmsActualWarehouseService.deleteWithValidByIds(Arrays.asList(actualWarehouseIds), true));
     }
+
+    private List<WmsActualWarehouseImportVo> buildTemplateData() {
+        List<WmsActualWarehouseImportVo> list = new ArrayList<>();
+        list.add(buildRow("L1-001", "一号库区", 10L, "L1-001-A", "A通道", 10L, "L1-001-A-01", "A-01货位", 10L));
+        list.add(buildRow("L1-001", "一号库区", 10L, "L1-001-A", "A通道", 10L, "L1-001-A-02", "A-02货位", 20L));
+        list.add(buildRow("L1-001", "一号库区", 10L, "L1-001-B", "B通道", 20L, "L1-001-B-01", "B-01货位", 10L));
+        list.add(buildRow("L1-002", "二号库区", 20L, "L1-002-A", "冷藏区", 10L, null, null, null));
+        list.add(buildRow("L1-002", "二号库区", 20L, "L1-002-B", "常温区", 20L, "L1-002-B-01", "常温-01", 10L));
+        return list;
+    }
+
+    private WmsActualWarehouseImportVo buildRow(String l1Code, String l1Name, Long l1Sort,
+                                                String l2Code, String l2Name, Long l2Sort,
+                                                String l3Code, String l3Name, Long l3Sort) {
+        WmsActualWarehouseImportVo vo = new WmsActualWarehouseImportVo();
+        vo.setLevelOneCode(l1Code);
+        vo.setLevelOneName(l1Name);
+        vo.setLevelOneSort(l1Sort);
+        vo.setLevelTwoCode(l2Code);
+        vo.setLevelTwoName(l2Name);
+        vo.setLevelTwoSort(l2Sort);
+        vo.setLevelThreeCode(l3Code);
+        vo.setLevelThreeName(l3Name);
+        vo.setLevelThreeSort(l3Sort);
+        return vo;
+    }
 }