tijiao

src/main/resources/bootstrap.yml

@@ -45,9 +45,9 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
+    url: ${TMSTRUCKFEIGN_URL:localhost:8088}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.166:8079}
+    url: ${AMSFEIGN_URL:localhost:8079}
   ImFeign:
     url: ${IMFEIGN_URL:172.16.33.166:8055}
     #测试环境

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

@@ -2768,29 +2768,28 @@
 
     <!--  查询内转运输订单给APP 9 10 11-->
     <select id="getNZOrderMessageToApp" parameterType="java.math.BigDecimal" resultType="java.util.Map">
-       SELECT OO.ORDER_ID            "orderId",
-              OO.ORDER_NUMBER        "orderNumber",
-              OO.ORDER_LINE_SEQUENCE "orderLineSequence",
-              RC.CAPACITY_NUMBER     "capacityNumber",
-              rwl.warehouse_name     "loadName",
-              RW.WAREHOUSE_NAME      "unloadName",
-              OO.ORDER_TYPE          "orderType"
-         FROM OMSTRUCK_ORDER OO
-         LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
-           ON OO.ORDER_PLAN_ID = ARP.PLAN_ID
-         LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
-           ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
-         left join rms_warehouse rwl
-           on rwl.warehouse_id = air.requirement_platform_id
-         LEFT JOIN AMS_PURCHASE_ORDER APO
-           ON APO.PURCHASE_ORDER_ID = AIR.PURCHASE_ORDER_ID
-         LEFT JOIN RMS_SUPPLIER RS
-           ON RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
-         LEFT JOIN RMS_WAREHOUSE RW
-           ON RW.WAREHOUSE_ID = air.requirement_unload_unit_id
-         LEFT JOIN RMS_CAPACITY RC
-           ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        SELECT OO.ORDER_ID        "orderId",
+               OO.ORDER_NUMBER    "orderNumber",
+               OO.ORDER_LINE_SEQUENCE   "orderLineSequence",
+               RC.CAPACITY_NUMBER "capacityNumber",
+               RS.SUPPLIER_NAME   "loadName",
+               RW.WAREHOUSE_NAME  "unloadName",
+               OO.ORDER_TYPE      "orderType"
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
+                           ON OO.ORDER_PLAN_ID = ARP.PLAN_ID
+                 LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
+                           ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
+                 LEFT JOIN AMS_PURCHASE_ORDER APO
+                           ON APO.PURCHASE_ORDER_ID = AIR.PURCHASE_ORDER_ID
+                 LEFT JOIN RMS_SUPPLIER RS
+                           ON RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
+                 LEFT JOIN RMS_WAREHOUSE RW
+                           ON RW.WAREHOUSE_ID = OO.UNLOAD_POINT_ID
+                 LEFT JOIN RMS_CAPACITY RC
+                           ON RC.CAPACITY_ID = OO.CAPACITY_ID
         WHERE OO.ORDER_ID = #{orderId}
+
     </select>
     <!--  查询发运计划运输订单给APP  2 3 4 -->
     <select id="getFYJHOrderMessageToApp" parameterType="java.math.BigDecimal" resultType="java.util.Map">