1

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

@@ -87,6 +87,20 @@ public class RMScontroller extends BaseRESTfulController {
         return rmsFeign.getRmsLineStep(id);
     }
 
+    @ApiOperation(value = "根据id查询线路匹配规则", notes = "")
+    @ApiImplicitParam(name = "rmsLineRule", value = "rmsLineRule", required = true, dataType = "rmsLineRule")
+    @PostMapping(value = "/getRulesByLineId")
+    public Map<String, Object> getRulesByLineId(@RequestBody(required = false) Map<String, Object> map) {
+        return rmsFeign.getRulesByLineId(map);
+    }
+
+    @ApiOperation(value = "保存运输路线的匹配规则", notes = "")
+    @ApiImplicitParam(name = "rmsLineRule", value = "rmsLineRule", required = true, dataType = "rmsLineRule")
+    @PostMapping(value = "/saveLineRule")
+    public Map<String, Object> saveLineRule(@RequestBody(required = false) Map<String, Object> map) {
+        return rmsFeign.saveLineRule(map);
+    }
+
 
     //================物资类型
     @PostMapping("/getMaterialTypeList")
@@ -1389,4 +1403,63 @@ public class RMScontroller extends BaseRESTfulController {
     public Map<String, Object> navigation(@RequestBody(required = false) Map<String, Object> map) {
         return rmsFeign.navigation(map);
     }
+
+    //查询公共代码
+    @PostMapping("/getPublicCode")
+    @ApiOperation(value = "查询公共代码列表")
+    public Map<String, Object> getPublicCode(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                    Integer apiId,
+                                                    Integer pageNum,
+                                                    Integer pageSize) {
+        return rmsFeign.getPublicCode(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+    }
+
+    //标准信息
+    @PostMapping("/getStandardInfo")
+    public Map<String, Object> getStandardInfo(@RequestBody(required = false) Map<String, Object> mapValue,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize) {
+        return rmsFeign.getStandardInfo(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+    }
+
+    @PostMapping("/addStandardInfo")
+    public Map<String, Object> addStandardInfo(@RequestBody(required = false) Map<String, Object> mapValue) {
+        return rmsFeign.addStandardInfo(mapValue);
+    }
+
+    @PostMapping("/updStandardInfo")
+    public Map<String, Object> updStandardInfo(@RequestBody(required = false) Map<String, Object> mapValue) {
+        return rmsFeign.updStandardInfo(mapValue);
+    }
+
+    @PostMapping("/delStandardInfo")
+    public Map<String, Object> delStandardInfo(@RequestBody(required = false) Map<String, Object> mapValue) {
+        return rmsFeign.delStandardInfo(mapValue);
+    }
+
+
+    //油价
+    @PostMapping("/getOilPrice")
+    public Map<String, Object> getOilPrice(@RequestBody(required = false) Map<String, Object> mapValue,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize) {
+        return rmsFeign.getOilPrice(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+    }
+
+    @PostMapping("/addOilPrice")
+    public Map<String, Object> addOilPrice(@RequestBody(required = false) Map<String, Object> mapValue) {
+        return rmsFeign.addOilPrice(mapValue);
+    }
+
+    @PostMapping("/updOilPrice")
+    public Map<String, Object> updOilPrice(@RequestBody(required = false) Map<String, Object> mapValue) {
+        return rmsFeign.updOilPrice(mapValue);
+    }
+
+    @PostMapping("/delOilPrice")
+    public Map<String, Object> delOilPrice(@RequestBody(required = false) Map<String, Object> mapValue) {
+        return rmsFeign.delOilPrice(mapValue);
+    }
 }

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

@@ -271,7 +271,11 @@ public interface AmsFeign {
     @PostMapping(value = "api/v1/ams/amstransrequirements/saleUpdate")
     RESTfulResult saleUpdate(@RequestBody Map<String, Object> map);
 
+
     @PostMapping(value = "api/v1/ams/amstransrequirements/saleDispatchList")
     RESTfulResult saleDispatchList(@RequestBody Map<String, Object> map);
 
+    @PostMapping(value = "api/v1/ams/amstransrequirements/amsTransRequirementcorn")
+    RESTfulResult amsTransRequirementcorn();
+
 }

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

@@ -39,6 +39,11 @@ public interface RmsFeign {
     @PostMapping("api/v1/rms/rmslines/getRmsLineStep/{id}")
     Map<String, Object> getRmsLineStep(@PathVariable("id") BigDecimal id);
 
+    @PostMapping("/api/v1/rms/rmslines/getRulesByLineId")
+    Map<String, Object> getRulesByLineId(@RequestBody(required = false) Map<String, Object> mapVal);
+
+    @PostMapping("/api/v1/rms/rmslines/saveLineRule")
+    Map<String, Object> saveLineRule(@RequestBody(required = false) Map<String, Object> mapVal);
 
     //********************************************************************************************************
 
@@ -718,6 +723,43 @@ public interface RmsFeign {
 
     @PostMapping(value = "api/v1/rms/rmsmapvertexs/navigation")
     Map<String, Object> navigation(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/rms/rmsstandardinfos/getPublicCode")
+    Map<String, Object> getPublicCode(@RequestBody(required = false) Map<String, Object> mapValue,
+                                        @RequestParam("apiId") Integer apiId,
+                                        @RequestParam("pageNum") Integer pageNum,
+                                        @RequestParam("pageSize") Integer pageSize);
+
+    @PostMapping(value = "api/v1/rms/rmsstandardinfos/getStandardInfo")
+    Map<String, Object> getStandardInfo(@RequestBody(required = false) Map<String, Object> mapValue,
+                                      @RequestParam("apiId") Integer apiId,
+                                      @RequestParam("pageNum") Integer pageNum,
+                                      @RequestParam("pageSize") Integer pageSize);
+
+    @PostMapping(value = "api/v1/rms/rmsstandardinfos/addStandardInfo")
+    Map<String, Object> addStandardInfo(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/rms/rmsstandardinfos/updStandardInfo")
+    Map<String, Object> updStandardInfo(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/rms/rmsstandardinfos/delStandardInfo")
+    Map<String, Object> delStandardInfo(@RequestBody(required = false) Map<String, Object> map);
+
+    //油价
+    @PostMapping(value = "api/v1/rms/rmsoilprice/getOilPrice")
+    Map<String, Object> getOilPrice(@RequestBody(required = false) Map<String, Object> mapValue,
+                                        @RequestParam("apiId") Integer apiId,
+                                        @RequestParam("pageNum") Integer pageNum,
+                                        @RequestParam("pageSize") Integer pageSize);
+
+    @PostMapping(value = "api/v1/rms/rmsoilprice/addOilPrice")
+    Map<String, Object> addOilPrice(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/rms/rmsoilprice/updOilPrice")
+    Map<String, Object> updOilPrice(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/rms/rmsoilprice/delOilPrice")
+    Map<String, Object> delOilPrice(@RequestBody(required = false) Map<String, Object> map);
 }
 
 

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -766,6 +766,8 @@
         <if test="id!=null and id.size>0">
         UNION
             select
+            RC.MATERIAL_ID "materialId",
+            RC.MATERIAL_NAME "materialName",
             RC.MATERIAL_ID "id",
             RC.MATERIAL_ID "value",
             RC.MATERIAL_CODE || '-' || RC.MATERIAL_NAME ||
@@ -775,7 +777,8 @@
             THEN '-' || RC.MATERIAL_MODEL
             ELSE ''
             END) "label",
-            RC.MATERIAL_NAME "text"
+            RC.MATERIAL_NAME "text",
+            'materialName' "prop"
             from RMS_MATERIAL RC
             WHERE RC.MATERIAL_ID in
             <foreach collection="id" item="item"  open="(" close=")" separator="," >