tijiapo

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

@@ -1461,7 +1461,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         }
         result += amsSaleOrderMaterialMapper.updateByPrimaryKeySelective(amsSaleOrderMaterial);
         // 需要换车
-        if ((Integer) isNewCar == 0) {
+        if (isNewCar != null && (Integer) isNewCar == 0) {
             // 根据车序号得到定向派单表主键
             BigDecimal dispatchId = amsSaleOrderMapper.getDispatchId(saleOrderMaterialId);
             if (dispatchId != null) {
@@ -1725,7 +1725,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         //查询输入进来的车牌号是否与原有车牌号一致,如果一致则退出
         BigDecimal oldCapacityId = omstruckOrderMapper.getOldCapacityId(DataChange.dataToBigDecimal(mapValue.get("orderId")));
         if(oldCapacityId.compareTo(DataChange.dataToBigDecimal(mapValue.get("capacityId"))) == 0){
-            return 0;
+            return 1;
         }
         if (lineSequence == null || "0".equals(lineSequence.toString()) || "1".equals(lineSequence.toString()) || "2".equals(lineSequence.toString())) {
             //这是修改车牌号

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

@@ -3514,7 +3514,8 @@
                             ON OO.CAPACITY_ID = RCA.CAPACITY_ID
            WHERE RCA.CAPACITY_NUMBER = #{capacityNumber}
              AND OO.ORDER_TYPE = 1
-           ORDER BY OO.ORDER_ID
+             AND OO.DRIVER_TEL IS NOT NULL
+           ORDER BY OO.ORDER_ID DESC
          )
     WHERE ROWNUM <![CDATA[
     <