Merge branch 'master' of https://gitee.com/antai-wuliu/ANTAI-API

src/main/java/com/steerinfo/dil/controller/AMScontroller.java

@@ -860,4 +860,10 @@ public class AMScontroller  extends BaseRESTfulController {
     RESTfulResult deactivateOrEnable(@RequestBody Map<String,Object> map) {
         return amsFeign.deactivateOrEnable(map);
     }
+
+    @ApiOperation("销售物流单停用或启用")
+    @PostMapping("/updateBalancePl")
+    RESTfulResult updateBalancePl(@RequestBody Map<String,Object> map) {
+        return amsFeign.updateBalancePl(map);
+    }
 }

src/main/java/com/steerinfo/dil/controller/BackgroundProcessingController.java

@@ -97,6 +97,7 @@ public class BackgroundProcessingController extends BaseRESTfulController {
                 return success();
             }
             dilAppCid.setPrimaryId(dilAppCidMapper.nextId());
+            dilAppCid.setInsertTime(new Date());
             dilAppCidMapper.insertSelective(dilAppCid);
         } catch (Exception e) {
             e.printStackTrace();

src/main/java/com/steerinfo/dil/controller/RMScontroller.java

@@ -774,6 +774,14 @@ public class RMScontroller extends BaseRESTfulController {
         return rmsFeign.insertCapacity(map);
     }
 
+    @ApiOperation(value = "新增车牌号", notes = "根据rmsCapacity对象创建")
+    @ApiImplicitParam(name = "rmsCapacity", value = "详细实体rmsCapacity", required = true, dataType = "rmsCapacity")
+    @PostMapping(value = "/insertCapacityName")
+    @LogAround(foreignKeys = {"capacityId"}, foreignKeyTypes = {"车牌号"})
+    public Map<String, Object> insertCapacityName(@RequestBody(required = false) Map<String, Object> map) {
+        return rmsFeign.insertCapacityName(map);
+    }
+
     @ApiOperation(value = "删除", notes = "根据rmsCarrier对象创建")
     @ApiImplicitParam(name = "运力id", value = "id", required = true, dataType = "int")
     @PostMapping(value = "/deleteCapacity")
@@ -1810,4 +1818,79 @@ public class RMScontroller extends BaseRESTfulController {
     public Map<String, Object> cancelRelevance(@RequestBody HashMap<String,Object> map){
         return rmsFeign.cancelRelevance(map);
     }
+
+    @PostMapping(value = "/getMaterialMapList")
+    public RESTfulResult getMaterialMapList(@RequestBody HashMap<String,Object> map,
+                                            Integer apiId,
+                                            Integer pageNum,
+                                            Integer pageSize){
+        return rmsFeign.getMaterialMapList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
+
+    //================客户-到站
+    @PostMapping("/getCompanyArrivalList")
+    public Map<String, Object> getCompanyArrivalList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                              Integer apiId,
+                                              Integer pageNum,
+                                              Integer pageSize
+    ) {
+        return rmsFeign.getCompanyArrivalList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+    }
+
+    @PostMapping(value = "/insertCompanyArrival")
+    @LogAround(foreignKeys = {"companyId"}, foreignKeyTypes = "公司", description = "新增公司单位")
+    public Map<String, Object> insertCompanyArrival(@RequestBody(required = false) Map<String, Object> map) {
+        return rmsFeign.insertCompanyArrival(map);
+    }
+
+    @PostMapping(value = "/deleteCompanyArrival")
+    @LogAround(foreignKeys = {"companyId"}, foreignKeyTypes = "公司", description = "删除公司单位")
+    public Map<String, Object> deleteCompanyArrival(@RequestBody Map<String, Object> map) {
+        return rmsFeign.deleteCompanyArrival(map);
+    }
+
+    @PostMapping("/importCompanyArrival")
+    public RESTfulResult importCompanyArrival(@RequestBody MultipartFile file,
+                                       String remark,
+                                       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);
+        Set<String> set = new HashSet<>();
+        for (Map<String, Object> item : list) {
+            //校验行
+            if(
+                    item.get("客户")==null || item.get("客户").equals("")
+                            || item.get("到站")==null || item.get("到站").equals("")
+            ){
+                throw new Exception("单元格数据异常，请检查模板或数据是否正确!");
+            }
+            set.add(item.get("客户").toString()+"-"+item.get("到站").toString());
+            map.put(item.get("客户").toString()+"-"+item.get("到站").toString(),item);
+        }
+        //去重
+        String[] setList = set.toArray(new String[0]);
+        if (setList.length != list.size()) {
+            throw new Exception("客户-到站不允许重复！");
+        }
+        map.put("setList",setList);
+        map.put("userId",userId);
+        map.put("userName",userName);
+        map.put("remark",remark);
+        return rmsFeign.importCompanyArrival(map);
+    }
+
+    @PostMapping(value = "/addMaterialMap")
+    @LogAround(foreignKeys = {"materialCode"}, foreignKeyTypes = "物料编码", description = "增加精准物料")
+    public RESTfulResult addMaterialMap(@RequestBody Map<String, Object> map) {
+        return rmsFeign.addMaterialMap(map);
+    }
+
+    @PostMapping(value = "/delMaterialMap")
+    @LogAround(foreignKeys = {"prodCodePk"}, foreignKeyTypes = "物料编码", description = "删除精准物料")
+    public RESTfulResult delMaterialMap(@RequestBody Map<String, Object> map) {
+        return rmsFeign.delMaterialMap(map);
+    }
 }

src/main/java/com/steerinfo/dil/feign/AmsFeign.java

@@ -320,4 +320,7 @@ public interface AmsFeign {
 
     @PostMapping(value = "api/v1/ams/amstransplans/deactivateOrEnable")
     RESTfulResult deactivateOrEnable(@RequestBody Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/ams/amstransrequirements/updateBalancePl")
+    RESTfulResult updateBalancePl(@RequestBody Map<String, Object> map);
 }

src/main/java/com/steerinfo/dil/feign/RmsFeign.java

@@ -307,6 +307,10 @@ public interface RmsFeign {
     @PostMapping(value = "api/v1/rms/rmscapacity/insertCapacity")
     Map<String, Object> insertCapacity(@RequestBody(required = false) Map<String, Object> map);
 
+    //新增车牌号
+    @PostMapping(value = "api/v1/rms/rmscapacity/insertCapacityName")
+    Map<String, Object> insertCapacityName(@RequestBody(required = false) Map<String, Object> map);
+
     @PostMapping(value = "api/v1/rms/rmscapacity/batchInsertCapacityTrain")
     Map<String, Object> batchInsertCapacityTrain(@RequestBody(required = false) Map<String, Object> map);
 
@@ -897,6 +901,33 @@ public interface RmsFeign {
 
     @PostMapping(value = "api/v1/rms/rmspersonnel/importPersonnelSyncSSO")
     RESTfulResult importPersonnelSyncSSO(@RequestBody(required = false)Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/rms/rmsmaterial/getMaterialMapList")
+    RESTfulResult getMaterialMapList(@RequestBody(required = false)Map<String, Object> map,
+                                     @RequestParam("apiId") Integer apiId,
+                                     @RequestParam("pageNum") Integer pageNum,
+                                     @RequestParam("pageSize") Integer pageSize);
+
+    @PostMapping(value = "api/v1/rms/rmscompanyarrivals/getCompanyArrivalList")
+    Map<String, Object> getCompanyArrivalList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                       @RequestParam("apiId") Integer apiId,
+                                       @RequestParam("pageNum") Integer pageNum,
+                                       @RequestParam("pageSize") Integer pageSize);
+
+    @PostMapping(value = "api/v1/rms/rmscompanyarrivals/insertCompanyArrival")
+    Map<String, Object> insertCompanyArrival(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/rms/rmscompanyarrivals/deleteCompanyArrival")
+    Map<String, Object> deleteCompanyArrival(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/rms/rmscompanyarrivals/importCompanyArrival")
+    RESTfulResult importCompanyArrival(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/rms/rmsmaterial/addMaterialMap")
+    RESTfulResult addMaterialMap(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/rms/rmsmaterial/delMaterialMap")
+    RESTfulResult delMaterialMap(@RequestBody(required = false) Map<String, Object> map);
 }