修改物资件数

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

@@ -870,7 +870,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 throw new RuntimeException("订单已被接收或已被拒绝!");
             }
             int orderType = DataChange.dataToBigDecimal(orderMessage.get("orderType")).intValue();
-            if(orderType == 1||orderType==4){
+            if(orderType == 1){
                 //订阅车辆 查询车牌号
                 String capacityNumber = omstruckOrderMapper.getCapacityNumberByCapacityId(DataChange.dataToBigDecimal(orderMessage.get("capacityId")));
                 Map<String, Object> subMap = new HashMap<>();
@@ -1987,11 +1987,10 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             BigDecimal orderLineSequence = DataChange.dataToBigDecimal(seqMap.get("orderLineSequence"));
             BigDecimal maxSegmentSqe = DataChange.dataToBigDecimal(seqMap.get("segmentSqe"));
             int i = maxSegmentSqe.intValue() - orderLineSequence.intValue();
-            if( i != 1){
+            if( i != 1 || i != 2){
                 return 0;
             }
         }
-
         omstruckOrder.setOrderId(orderId);
         //设置司机确认订单
         omstruckOrder.setDriverConfirmation(new BigDecimal(1));

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

@@ -3846,7 +3846,8 @@
         CONCAT(CONCAT( CONCAT( CONCAT( RDA.ADDRESS_PROVINCE, RDA.ADDRESS_DISTRICT ), RDA.ADDRESS_TOWN ),RDA.ADDRESS_DELIVERY_ADDRESS ),RRP.ADDRESS_DELIVERY_ADDRESS) "receiveAddressName",
         TTR.RESULT_TOTAL_ID "resultTotalId",
         OO.CAN_WORK "canWork",
-        OO.ORDER_STATUS "orderStatus"
+        OO.ORDER_STATUS "orderStatus",
+        ASO.SALE_ORDER_ID   "saleOrderId"
         FROM
         OMSTRUCK_ORDER OO
         LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID