Merge branch 'dev'

src/main/resources/application-dev.yml

@@ -11,13 +11,13 @@ spring:
 #feign设置
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8008}
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.166:8015}
+    url: ${AMSFEIGN_URL:172.16.33.162:8015}
   ImFeign:
-    url: ${IMFEIGN_URL:172.16.33.166:8055}
+    url: ${IMFEIGN_URL:172.16.33.162:8018}
 
 server:
   port: 8016

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

@@ -385,15 +385,16 @@
         *
         from
         (
-        select
-        OO.ORDER_ID "orderId",
-        TTR.RESULT_TOTAL_ID "resultTotalId",
-        ASO.SPORADIC_ORDER_NO "sporadicOrderNo",
-        OO.ORDER_NUMBER "orderNumber",
-        RS.SUPPLIER_NAME "sendCompany",
+        select OO.ORDER_ID         "orderId",
+        TTR.RESULT_TOTAL_ID        "resultTotalId",
+        ASO.SPORADIC_ORDER_NO      "sporadicOrderNo",
+        OO.ORDER_NUMBER            "orderNumber",
+        RS.SUPPLIER_NAME           "sendCompany",
         RC2.CONSIGNEE_COMPANY_NAME "receiveCompany",
-        ASO.INSERT_TIME "insertTime",
-        RC.CAPACITY_NUMBER "capacityNumber"
+        ASO.INSERT_TIME            "insertTime",
+        RC.CAPACITY_NUMBER         "capacityNumber",
+        RM.MATERIAL_NAME           "materialName",
+        rce.carrier_name           "carrierName"
         from OMSTRUCK_ORDER OO
         left join TMSTRUCK_TOTAL_RESULT TTR
         on TTR.ORDER_ID = OO.ORDER_ID
@@ -405,6 +406,12 @@
         on RS.SUPPLIER_ID = ASO.SEND_UNIT_ID
         left join RMS_CONSIGNEE RC2
         on RC2.CONSIGNEE_ID = ASO.RECEIVE_UNIT_ID
+        left join OMSTRUCK_ORDER_MATERIAL OOM
+        on oom.order_id = oo.order_id
+        left join rms_material rm
+        on rm.material_id = oom.material_id
+        left join rms_carrier rce
+        on rce.carrier_id = aso.carrier_id
         <where>
             OO.ORDER_STATUS = #{status}
             <if test="type == 1">