yourName 1 년 전
부모
커밋
234f51eed5
2개의 변경된 파일18개의 추가작업 그리고 0개의 파일을 삭제
  1. 15 0
      src/main/java/com/steerinfo/dil/controller/RMScontroller.java
  2. 3 0
      src/main/java/com/steerinfo/dil/feign/RmsFeign.java

+ 15 - 0
src/main/java/com/steerinfo/dil/controller/RMScontroller.java

@@ -737,6 +737,21 @@ public class RMScontroller extends BaseRESTfulController {
         return rmsFeign.importCapacity(map);
     }
 
+    @ApiOperation("导入车辆")
+    @PostMapping("/importCapacityDriver")
+    public Map<String, Object> importCapacityDriver(@RequestBody MultipartFile file,
+                                              String userId,
+                                              String userName) throws Exception {
+        Map<String, Object> map = new HashMap<>();
+        //获取Excel中包含的对象数组
+        List<Map<String, Object>> list = ExcelToolUtils.getExcelList(file, 0);
+        map.put("list", list);
+        map.put("setList",list);
+        map.put("userId",userId);
+        map.put("userName",userName);
+        return rmsFeign.importCapacityDriver(map);
+    }
+
 
     @ApiOperation(value = "删除", notes = "根据rmsCarrier对象创建")
     @ApiImplicitParam(name = "仓库id", value = "id", required = true, dataType = "int")

+ 3 - 0
src/main/java/com/steerinfo/dil/feign/RmsFeign.java

@@ -289,6 +289,9 @@ public interface RmsFeign {
     @PostMapping(value = "api/v1/rms/rmscapacity/importCapacity")
     Map<String, Object> importCapacity(Map<String, Object> map);
 
+    @PostMapping(value = "api/v1/rms/rmscapacitydrivers/importCapacityDriver")
+    Map<String, Object> importCapacityDriver(Map<String, Object> map);
+
     //==============仓库
     //新增仓库
     @PostMapping(value = "api/v1/rms/rmswarehouse/insertWarehouse")