修改

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

@@ -1619,19 +1619,12 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 mesMap = omstruckOrderMapper.getNZOrderMessageToApp(orderId);
                 break;
             case 12:
-<<<<<<< HEAD
                 mesMap =omstruckOrderMapper.getSporadicOrder(orderId);
                 break;
             case 13:
                 mesMap = omstruckOrderMapper.getSporadicOrder(orderId);
                 break;
 
-=======
-                mesMap = omstruckOrderMapper.getSporadicOrder(orderId);
-                break;
-            case 13:
-                mesMap = omstruckOrderMapper.getLxOutFactoryOrder(orderId);
->>>>>>> 5382b19b47db1e83cc7b6baadce33bb1fb6fa264
         }
         mesMap.put("materialMesList", omstruckOrderMapper.getMaterialMes(orderId));
         return mesMap;

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

@@ -2764,15 +2764,9 @@
                  left join AMSTRUCK_SPORADIC_ORDER ASO
                            ON ASO.SPORADIC_ORDER_ID=OO.ORDER_PLAN_ID
                  LEFT JOIN RMS_SUPPLIER RS
-<<<<<<< HEAD
-                           ON RS.SUPPLIER_ID=ASO.SEND_UNIT_ID
-                 LEFT JOIN RMS_CONSIGNEE RC2
-                           ON RC2.CONSIGNEE_ID=ASO.RECEIVE_UNIT_ID
-=======
                            ON RS.SUPPLIER_ID=ASO.RECEIVE_UNIT_ID
                  LEFT JOIN RMS_CONSIGNEE RC2
                            ON RC2.CONSIGNEE_ID=ASO.SEND_UNIT_ID
->>>>>>> 5382b19b47db1e83cc7b6baadce33bb1fb6fa264
         WHERE OO.ORDER_ID = #{orderId}
           AND OO.ORDER_STATUS in (4, 5)
     </select>