Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-TMS-TRUCK-API

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

@@ -1596,6 +1596,6 @@
         UPDATE OMSTRUCK_ORDER OO
         SET OO.ORDER_STATUS = 2,
             OO.INSERT_UPDATE_REMARK = '自动补扫出厂失败,自动完成订单'
-        WHERE OO.ORDER_ID = #{orderId}
+        WHERE OO.ORDER_ID = #{orderId} AND OO.ORDER_TYPE!=1
     </update>
 </mapper>