修改不关订单BUg

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

@@ -379,7 +379,9 @@ public class OmstruckOrderController extends BaseRESTfulController {
                                           Integer orderStatus,
                                           Integer planId,
                                           Integer orderType,
-                                          Integer fuelOrder, String con) {
+                                          Integer fuelOrder,
+                                          String con,
+                                          String carrierSSOId) {
         int count = 0;
         if (orderStatus != null) {
             mapValue.put("orderStatus", orderStatus);
@@ -397,6 +399,12 @@ public class OmstruckOrderController extends BaseRESTfulController {
             mapValue.put("fuelOrder", fuelOrder);
             count++;
         }
+        if(carrierSSOId != null){
+            if("".equals(carrierSSOId)) {
+                mapValue.put("carrierSSOId", carrierSSOId);
+                count++;
+            }
+        }
         //框计算
         if (con != null) {
             if (!"undefined".equals(con)) {

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

@@ -673,6 +673,10 @@
         </if>
         left join RMS_CAPACITY RC
         on RC.CAPACITY_ID = OO.CAPACITY_ID
+        <if test="carrierSSOId != null">
+            left join RMS_CARRIER RCA
+            on RCA.CARRIER_ID = RC.CARRIER_ID
+        </if>
         left join OMSTRUCK_ORDER_MATERIAL OOM
         on OOM.ORDER_ID = OO.ORDER_ID
         left join RMS_MATERIAL RM
@@ -701,6 +705,9 @@
             <if test="fuelOrder != null">
                 and OO.ORDER_TYPE in (6, 7)
             </if>
+            <if test="carrierSSOId != null">
+                and RCA.CARRIER_SSO_ID = #{carrierSSOId}
+            </if>
         </where>
         )
         <where>
@@ -2795,7 +2802,7 @@
            ON RW.WAREHOUSE_ID = air.requirement_unload_unit_id
          LEFT JOIN RMS_CAPACITY RC
            ON RC.CAPACITY_ID = OO.CAPACITY_ID
-        WHERE OO.ORDER_ID = #{orderId}
+        WHERE OO.ORDER_ID = #{orderId} AND OO.ORDER_STATUS in (4, 5)
     </select>
     <!--  查询发运计划运输订单给APP  2 3 4 -->
     <select id="getFYJHOrderMessageToApp" parameterType="java.math.BigDecimal" resultType="java.util.Map">
@@ -2817,7 +2824,7 @@
                            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}
+        WHERE OO.ORDER_ID = #{orderId} AND OO.ORDER_STATUS in (4, 5)
     </select>
     <!--  查询销售运输订单给APP 1 -->
     <select id="getXSOrderMessageToApp" parameterType="java.math.BigDecimal" resultType="java.util.Map">
@@ -2845,7 +2852,7 @@
                            ON RC.CAPACITY_ID = OO.CAPACITY_ID
                  LEFT JOIN RMS_RECEIVE_ADDRESS RDA
                            ON RDA.ADDRESS_ID = ASOM.SALE_SHIPPING_ADDRESS_ID
-        WHERE OO.ORDER_ID = #{orderId}
+        WHERE OO.ORDER_ID = #{orderId} AND OO.ORDER_STATUS in (4, 5)
     </select>