s

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

@@ -492,7 +492,7 @@
             on RC.CAPACITY_ID = OO.CAPACITY_ID
         <if test="carrierSsoId != null">
             left join RMS_CARRIER RCA
-                on RCA.CARRIER_ID = RC.CARRIER_ID
+                on RCA.CARRIER_ID = OO.CARRIER_ID
         </if>
         left join RMS_GATEPOST RG
             on RG.GATEPOST_ID = TLFR.GATEPOST_ID

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

@@ -202,13 +202,9 @@
         from OMSTRUCK_ORDER OO
         left join TMSTRUCK_TOTAL_RESULT TTR
             on TTR.ORDER_ID = OO.ORDER_ID
-<<<<<<< HEAD
-        where  OO.ORDER_NUMBER=#{orderNumber}
-=======
         left join RMS_CAPACITY RC
             on OO.CAPACITY_ID = RC.CAPACITY_ID
         where  OO.order_Number=#{orderNumber}
->>>>>>> bf4c2967e0e6aa0fe1e443c7ac538afb6341c61d
     </select>
 
     <select id="getLineSequenceByOrderNumber" parameterType="string" resultType="java.lang.Integer">