sdfaj:

src/main/resources/application-prod.yml

@@ -10,7 +10,7 @@ spring:
 #feign设置
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
 
 server:
   port: 8076

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1/bmstruck
 spring:
   profiles:
-    include: ${SPRING_PROFILES:dev}
+    include: ${SPRING_PROFILES:prod}
   jackson:
       date-format: yyyy-MM-dd HH:mm:ss
       time-zone: GMT+8

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

@@ -1560,68 +1560,70 @@
           and oo.order_type = 11
     </select>
     <select id="getNoInwardDetails" resultType="java.util.Map" parameterType="java.util.Map">
-        select * from (SELECT oo.ORDER_ID as "orderId",
-                              oo.ORDER_NUMBER as "orderNumber",
-                              rc.CAPACITY_NUMBER as "capacityNumber",
-                              RCE.CARRIER_NAME as "carrierName",
-                              actp.PRICE_VALUE as "priceValue",
-                              twr.RESULT_NET_WEIGHT as "resultNetWeight",
-                              RW.WAREHOUSE_NAME as "unloadName",
-                              RW1.WAREHOUSE_NAME as "loadName",
-                              RS.SHIPPER_NAME as "shipperName",
-                              RM.MATERIAL_NAME as "materialName",
-                              GREATEST(TWR.RESULT_GROSS_WEIGHT_TIME, TWR.RESULT_TARE_WEIGHT_TIME) as "netTime",
-                              RMT.MATERIAL_TYPE_NAME as "materialTypeName",
-                              RTR.TRANS_RANGE_VALUE as "rangeValue"
-                       FROM OMSTRUCK_ORDER OO
-                                LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
-                                          ON TTR.ORDER_ID = OO.ORDER_ID
-                                LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
-                                          ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-                                LEFT JOIN BMSTRUCK_DETAILS_ORDER BDO
-                                          ON BDO.WEIGHT_TASK_RESULT_ID = TWR.WEIGHT_TASK_RESULT_ID
-                                LEFT JOIN RMS_MATERIAL RM
-                                          ON RM.MATERIAL_ID = TWR.MATERIAL_ID
-                                LEFT JOIN RMS_MATERIAL_TYPE RMT
-                                          ON RMT.MATERIAL_TYPE_ID = RM.MATERIAL_TYPE_ID
-                                LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
-                                          ON AIP.PLAN_ID = OO.ORDER_PLAN_ID
-                                LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
-                                          ON AIP.PLAN_ID = ARP.PLAN_ID
-                                LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
-                                          ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
-                                LEFT JOIN AMSTRUCK_REQUIREMENT_MATERIAL ARM
-                                          ON ARM.REQUIREMENT_ID = AIR.REQUIREMENT_ID
-                                LEFT JOIN RMS_WAREHOUSE RW
-                                          ON RW.WAREHOUSE_ID = ARM.REQUIREMENT_UNLOAD_UNIT_ID
-                                LEFT JOIN RMS_WAREHOUSE RW1
-                                          ON RW1.WAREHOUSE_ID = ARM.REQUIREMENT_PLATFORM_ID
-                                LEFT JOIN RMS_SHIPPER RS
-                                          ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
-                                LEFT JOIN RMS_CARRIER RCE
-                                          ON RCE.CARRIER_ID = AIP.CARRIER_ID
-                                LEFT JOIN RMS_CAPACITY rc
-                                          ON oo.CAPACITY_ID = rc.CAPACITY_ID
-                                LEFT JOIN AMS_CONTRACT_TRANSPORT_PRICE actp
-                                          ON actp.PRICE_ID = bdo.PRICE_ID
-                                LEFT JOIN RMS_TRANS_RANGE RTR
-                                          ON RTR.TRANS_RANGE_ID = AIR.LINE_ID
-                       WHERE RMT.MATERIAL_ISINWARD = 1
-                         AND BDO.DETAILS_ID IS NULL
-                         AND OO.ORDER_TYPE in (11, 15, 16, 23, 24)
-                         AND OO.ORDER_STATUS = 2
-                       order by twr.result_tare_weight_time desc
-                        <if test="userId != null" >
-                            AND  AIR.INSERT_USERNAME LIKE #{userId}
-                        </if>
-                        <if test="oneDate != null">
-                            and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= OO.ORDER_RECEIVE_REFUSE_TIME
-                        </if>
-                        <if test="startDate != null">
-                            and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= OO.ORDER_RECEIVE_REFUSE_TIME
-                            and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= OO.ORDER_RECEIVE_REFUSE_TIME
-                        </if>
-            )
+        select * from
+        (SELECT oo.ORDER_ID as "orderId",
+        oo.ORDER_NUMBER as "orderNumber",
+        rc.CAPACITY_NUMBER as "capacityNumber",
+        RCE.CARRIER_NAME as "carrierName",
+        actp.PRICE_VALUE as "priceValue",
+        twr.RESULT_NET_WEIGHT as "resultNetWeight",
+        RW.WAREHOUSE_NAME as "unloadName",
+        RW1.WAREHOUSE_NAME as "loadName",
+        RS.SHIPPER_NAME as "shipperName",
+        RM.MATERIAL_NAME as "materialName",
+        GREATEST(TWR.RESULT_GROSS_WEIGHT_TIME, TWR.RESULT_TARE_WEIGHT_TIME) as "netTime",
+        RMT.MATERIAL_TYPE_NAME as "materialTypeName",
+        RTR.TRANS_RANGE_VALUE as "rangeValue"
+        FROM OMSTRUCK_ORDER OO
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON TTR.ORDER_ID = OO.ORDER_ID
+        LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+        ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        LEFT JOIN BMSTRUCK_DETAILS_ORDER BDO
+        ON BDO.WEIGHT_TASK_RESULT_ID = TWR.WEIGHT_TASK_RESULT_ID
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID = TWR.MATERIAL_ID
+        LEFT JOIN RMS_MATERIAL_TYPE RMT
+        ON RMT.MATERIAL_TYPE_ID = RM.MATERIAL_TYPE_ID
+        LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
+        ON AIP.PLAN_ID = OO.ORDER_PLAN_ID
+        LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
+        ON AIP.PLAN_ID = ARP.PLAN_ID
+        LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
+        ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
+        LEFT JOIN AMSTRUCK_REQUIREMENT_MATERIAL ARM
+        ON ARM.REQUIREMENT_ID = AIR.REQUIREMENT_ID
+        LEFT JOIN RMS_WAREHOUSE RW
+        ON RW.WAREHOUSE_ID = ARM.REQUIREMENT_UNLOAD_UNIT_ID
+        LEFT JOIN RMS_WAREHOUSE RW1
+        ON RW1.WAREHOUSE_ID = ARM.REQUIREMENT_PLATFORM_ID
+        LEFT JOIN RMS_SHIPPER RS
+        ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
+        LEFT JOIN RMS_CARRIER RCE
+        ON RCE.CARRIER_ID = AIP.CARRIER_ID
+        LEFT JOIN RMS_CAPACITY rc
+        ON oo.CAPACITY_ID = rc.CAPACITY_ID
+        LEFT JOIN AMS_CONTRACT_TRANSPORT_PRICE actp
+        ON actp.PRICE_ID = bdo.PRICE_ID
+        LEFT JOIN RMS_TRANS_RANGE RTR
+        ON RTR.TRANS_RANGE_ID = AIR.LINE_ID
+        WHERE RMT.MATERIAL_ISINWARD = 1
+        AND BDO.DETAILS_ID IS NULL
+        AND OO.ORDER_TYPE in (11, 15, 16, 23, 24)
+        AND OO.ORDER_STATUS = 2
+        <if test="userId != null">
+        AND AIR.INSERT_USERNAME LIKE #{userId}
+        </if>
+        <if test="oneDate != null">
+        and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= OO.ORDER_RECEIVE_REFUSE_TIME
+        </if>
+        <if test="startDate != null">
+        and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= OO.ORDER_RECEIVE_REFUSE_TIME
+        and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= OO.ORDER_RECEIVE_REFUSE_TIME
+        </if>
+        order by twr.result_tare_weight_time desc
+        )
+
     </select>
 
 </mapper>