adadlass

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

@@ -581,6 +581,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         OmstruckOrder omstruckOrder = new OmstruckOrder();
         omstruckOrder.setOrderId(DataChange.dataToBigDecimal(orderId));
         omstruckOrder.setOrderStatus(new BigDecimal(8));
+        omstruckOrder.setInsertUpdateRemark("司机撤销订单将订单删除");
         //讲路段顺序号设为空，适应进厂以后扫码
         omstruckOrder.setOrderLineSequence(new BigDecimal(0));
         result += omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);

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

@@ -3293,7 +3293,7 @@
     </select>
 
     <!--  通过车牌匹配所有已下发的 的订单Id -->
-    <select id="getOrderIdListByCapacityNumber" parameterType="string" resultType="map">
+    <select id="getOrderIdListByCapacityNumber" parameterType="string" resultType="java.util.LinkedHashMap">
         SELECT OO.ORDER_ID "orderId",
                OO.ORDER_TYPE  "orderType"
         FROM OMSTRUCK_ORDER OO
@@ -3301,6 +3301,7 @@
                            ON RC.CAPACITY_ID = OO.CAPACITY_ID
         WHERE RC.CAPACITY_NUMBER = #{capacityNumber}
           AND OO.ORDER_STATUS = 4
+        ORDER BY OO.ORDER_ID DESC
     </select>
 
     <!--  根据车牌号匹配所有已接收的运输订单Id  -->