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")

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);
 
     //********************************************************************************************************
 

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="," >