Redeem 2 年之前
父節點
當前提交
b0e1c6d4af

+ 1 - 1
src/main/java/com/steerinfo/dil/controller/UniversalController.java

@@ -124,7 +124,7 @@ public class UniversalController extends BaseRESTfulController {
     }
 
     @ApiModelProperty(value = "边输边查车牌号")
-    @GetMapping("/getCapacityByLike")
+    @PostMapping("/getCapacityByLike")
     public RESTfulResult getCapacityByLike(String index,String orgCode,@RequestParam(required = false) List<String> id) {
         Map<String,Object> map = new HashMap<>();
         map.put("index",index);

+ 1 - 1
src/main/resources/application-prod.yml

@@ -29,7 +29,7 @@ openfeign:
   BmsFeign:
     url: ${BMSFEIGN_URL:172.16.90.214:8078}
   TmsFeign:
-    url: ${TMSFEIGN_URL:172.16.90.214:8086}
+    url: ${TMSFEIGN_URL:localhost:8086}
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.90.214:8093}
   OMSFeign:

+ 10 - 5
src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -15,20 +15,23 @@
     <select id="getAllCalculateMes" resultType="java.util.Map">
         select RTC.TRUCK_CALCULATE_ID     "id",
                RTC.TRUCK_CALCULATE_ID     "value",
-               RTC.TRUCK_CALCULATE_NUMBER "label"
+               RTC.TRUCK_CALCULATE_NUMBER "label",
+               RTC.TRUCK_CALCULATE_NUMBER "text"
         from RMS_TRUCK_CALCULATE RTC
     </select>
 
     <select id="getAllGatepost" resultType="java.util.Map">
         select GATEPOST_ID   "id",
                GATEPOST_ID   "value",
-               GATEPOST_NAME "label"
+               GATEPOST_NAME "label",
+               GATEPOST_NAME "text"
         from RMS_GATEPOST
     </select>
     <select id="getAllWareHouse" resultType="java.util.Map">
         select WAREHOUSE_ID   "id",
                WAREHOUSE_ID   "value",
-               WAREHOUSE_NAME "label"
+               WAREHOUSE_NAME "label",
+               WAREHOUSE_NAME "text"
         from RMS_WAREHOUSE
     </select>
     <select id="getColumnNoRoutList" resultType="java.lang.String" parameterType="map">
@@ -110,7 +113,8 @@
         <if test="companyType==null">
             RC.COMPANY_TYPE || '-' ||
         </if>
-        RC.COMPANY_NAME "label"
+        RC.COMPANY_NAME "label",
+        RC.COMPANY_NAME "text"
         from RMS_COMPANY RC
         where DELETED = 0        )
         <where>
@@ -234,7 +238,8 @@
             SELECT DISTINCT
             RCA .CAPACITY_ID "id",
             RCA .CAPACITY_ID "value",
-            RCA .CAPACITY_NUMBER "label"
+            RCA .CAPACITY_NUMBER "label",
+            RCA .CAPACITY_NUMBER "text"
             FROM RMS_CAPACITY RCA
             LEFT JOIN RMS_CAPACITY_CARRIER RCC ON RCA .CAPACITY_ID = RCC .CAPACITY_ID
             LEFT JOIN RMS_COMPANY RC ON RC .COMPANY_ID = RCC .COMPANY_ID