tijio

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

@@ -1098,11 +1098,11 @@ public class AMScontroller{
                                           Integer pageSize,
                                           Integer apiId,
                                           Integer requirementStatus,
-                                          String con) {
+                                          String orgCode) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getTruckRequirementList(mapValue, pageNum, pageSize, apiId,requirementStatus,con);
+        return amsFeign.getTruckRequirementList(mapValue, pageNum, pageSize, apiId,requirementStatus,orgCode);
     }
 
     @PostMapping("/getPurRequirementList")

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

@@ -213,6 +213,13 @@ public class UniversalController extends BaseRESTfulController {
         return success(list);
     }
 
+    @ApiModelProperty(value = "边输边查用车单位")
+    @PostMapping("/getRequireUnitName")
+    public RESTfulResult getRequireUnitName(@RequestParam("index") String index) {
+        List<Map<String,Object>>list = universalMapper.getRequireUnitName(index == null ? "" : "%" + index + "%");
+        return success(list);
+    }
+
     @ApiModelProperty(value = "边输边查收货单位")
     @PostMapping("/getConsigneeByLike")
     public RESTfulResult getConsigneeByLike(@RequestParam("index") String index) {

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

@@ -1173,8 +1173,8 @@ public interface AmsFeign {
                                    @RequestParam Integer pageNum,
                                    @RequestParam Integer pageSize,
                                    @RequestParam Integer apiId,
-                                                @RequestParam Integer requirementStatus,
-                                                @RequestParam String con);
+                                   @RequestParam Integer requirementStatus,
+                                   @RequestParam String orgCode);
 
     @ApiOperation(value="查询app端公开抢单")
     @PostMapping(value = "/api/v1/ams/amsdispatchsaleorders/getDispatchSaleOrderList")

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

@@ -96,4 +96,7 @@ public interface UniversalMapper {
 
     //查询所有的焦炭子类
     List<Map<String, Object>> getAllMaterialCoke();
+
+    //边输边查用车单位
+    List<Map<String, Object>> getRequireUnitName(String index);
 }

src/main/resources/application-dev.yml

@@ -10,7 +10,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.166:8015}
+    url: ${AMSFEIGN_URL:localhost:8015}
   BmsshipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
   BmstrainFeign:
@@ -30,9 +30,9 @@ openfeign:
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.33.162:8012}
   OMSFeign:
-    url: ${OMSFEIGN_URL:172.16.33.162:8016}
+    url: ${OMSFEIGN_URL:localhost:8016}
   RmsFeign:
-    url: ${RMSFEIGN_HRL:172.16.33.162:8014}
+    url: ${RMSFEIGN_HRL:172.16.33.162:8060}
 
 server:
   port: 8019

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

@@ -72,7 +72,7 @@
                         ON RM.MATERIAL_ID = DB.MATERIAL_ID
                 <where>
                     <if test="index != null">
-                        instr(RM.MATERIAL_NAME, #{index}) > 0
+                        (instr(RM.MATERIAL_NAME, #{index}) > 0 or instr(RM.MATERIAL_SPECIFICATION,#{index}) >0 or instr(RM.MATERIAL_MODEL,#{index}) >0)
                     </if>
                 </where>
                  group by RM.MATERIAL_ID,RM.MATERIAL_NAME,RM.MATERIAL_CODE,RM.MATERIAL_SPECIFICATION,RM.MATERIAL_MODEL
@@ -347,7 +347,7 @@
         FROM RMS_MATERIAL RM
         <where>
             <if test="index != null">
-                instr(RM.MATERIAL_NAM, #{index}) > 0
+                (instr(RM.MATERIAL_NAME, #{index}) > 0 or instr(RM.MATERIAL_SPECIFICATION,#{index}) >0 or instr(RM.MATERIAL_MODEL,#{index}) >0)
             </if>
         </where>
         )
@@ -473,9 +473,6 @@
         where instr(RC.CONSIGNEE_COMPANY_NAME, #{index}) > 0 and rownum &lt; 10
         order by "value"
     </select>
-
-
-
     <select id="getCarrierListByLike" parameterType="java.util.Map" resultType="java.util.Map" >
         select
         *
@@ -613,5 +610,17 @@
                RMC.MATERIAL_COKE_NAME "label"
         FROM RMS_MATERIAL_COKE RMC
     </select>
+    <select id="getRequireUnitName" resultType="java.util.Map">
+        SELECT
+	    RS.SHIPPER_ID "shipperId",
+	    RS.SHIPPER_NAME "shipperName"
+        FROM
+	    RMS_SHIPPER RS
+        <where>
+            <if test="index != null">
+                RS.SHIPPER_NAME like #{index}
+            </if>
+        </where>
+    </select>
 
 </mapper>