Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API

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

@@ -2004,4 +2004,10 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> sendMeasureCommission(@RequestBody(required = false) Map<String, Object> map){
         return  tmsTruckFeign.sendMeasureCommission(map);
     }
+
+    @ApiOperation(value="发送留皮计量委托(neizhuan)")
+    @GetMapping("/sendLiuPiMeasureCommission")
+    public Map<String, Object> sendLiuPiMeasureCommission(String capacityNumber){
+        return tmsTruckFeign.sendLiuPiMeasureCommission(capacityNumber);
+    }
 }

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

@@ -614,6 +614,13 @@ public class UniversalController extends BaseRESTfulController {
         return success(i);
     }
 
+    @ApiModelProperty(value = "边输边查物资")
+    @GetMapping("/getMaterialByLike")
+    public RESTfulResult getMaterialByLike(@RequestParam("index") String index) {
+        List<Map<String, Object>> list = universalMapper.getMaterialByLike(index == null ? "" : index);
+        return success(list);
+    }
+
     @ApiOperation(value="通过一个carrierSsoId获得承运商对象")
     @GetMapping("/getRmsCarrierByCarrierSsoId")
     public RESTfulResult getRmsCarrierByCarrierSsoId(String carrierSsoId){

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

@@ -440,6 +440,10 @@ public interface TmsTruckFeign {
     @PostMapping("api/v1/truckTms/tmstruckmeasurecommissions/sendMeasureCommission")
     Map<String, Object> sendMeasureCommission(@RequestBody(required = false) Map<String, Object> map);
 
+
+    //发送留皮计量委托
+    @GetMapping("api/v1/truckTms/tmstruckmeasurecommissions/sendLiuPiMeasureCommission")
+    Map<String, Object> sendLiuPiMeasureCommission(@RequestParam("capacityNumber")String capacityNumber);
     }
 
 

src/main/java/com/steerinfo/dil/mapper/UniversalMapper.java

@@ -134,5 +134,9 @@ public interface UniversalMapper {
     //根据订单Id查询物资
     List<Map<String, Object>> getMaterialIdByOrderId(Integer orderId);
 
+    //边输边查物资
+    List<Map<String, Object>> getMaterialByLike(String index);
+
     Map<String, Object> getRmsCarrierByCarrierSsoId(String carrierSsoId);
+
 }

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

@@ -730,7 +730,24 @@
                 on RM.MATERIAL_ID = OOM.MATERIAL_ID
         where OOM.ORDER_ID = #{orderId}
     </select>
+
+
+    <select id="getMaterialByLike" parameterType="string" resultType="java.util.Map">
+        select *
+        from (
+                 select RM.MATERIAL_ID   "materialId",
+                        CONCAT(RM.MATERIAL_NAME, RM.MATERIAL_SPECIFICATION) || RM.MATERIAL_MODEL "value",
+                        CONCAT(RM.MATERIAL_NAME, RM.MATERIAL_SPECIFICATION) || RM.MATERIAL_MODEL "materialName"
+                 from RMS_MATERIAL RM
+                 where instr(RM.MATERIAL_NAME, #{index}) > 0
+             )
+        where rownum &lt; 10
+    </select>
+
     <select id="getRmsCarrierByCarrierSsoId" resultType="java.util.Map">
-        select r_carrier.CARRIER_NAME "carrierName",r_carrier.CARRIER_ID "carrierId" from RMS_CARRIER r_carrier where  r_carrier.CARRIER_SSO_ID=#{carrierSsoId}
+        select r_carrier.CARRIER_NAME "carrierName", r_carrier.CARRIER_ID "carrierId"
+        from RMS_CARRIER r_carrier
+        where r_carrier.CARRIER_SSO_ID = #{carrierSsoId}
+
     </select>
 </mapper>