ayh

src/main/java/com/steerinfo/dil/service/impl/TmstruckLoadResultServiceImpl.java

@@ -313,12 +313,6 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
             }
             tmstruckLoadResult.setInsertUpdateRemark(insertUpdateRemark);
         }
-<<<<<<< HEAD
-//        if (j == 0) {
-//            throw new Exception("第二次委托发送失败");
-//        }
-=======
->>>>>>> bf4c2967e0e6aa0fe1e443c7ac538afb6341c61d
         tmstruckLoadResult.setCaseNumber((String) map.get("caseNumber"));
         i += tmstruckLoadResultMapper.updateByPrimaryKeySelective(tmstruckLoadResult);
         //推送消息到websocket

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">