Merge branch 'master' into dev

src/main/java/com/steerinfo/dil/mapper/OmstruckOrderMapper.java

@@ -265,6 +265,8 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
     //通过订单查询趟次
     Map<String,Object> getSporadicOrderTimes(BigDecimal orderId);
 
+
+
     //根据运输订单id查找所有实绩id
     List<Map<String,Object>> getAllResultId(BigDecimal orderId);
 

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

@@ -539,6 +539,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         switch (orderType) {
             case 13:
             case 12:
+            case 20:
                 if (transStatus.intValue()==1){
                     amsFeign.addSporadicOrderTimes(addMapSporadicOrder);
                 }
@@ -587,8 +588,9 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         //删除所有实绩
         Integer orderType = omstruckOrderMapper.getOrderTypeByOrderNumber(new BigDecimal(orderId));
         switch (orderType){
-            case 12:
-            case 13:
+//            case 12:
+//            case 13:
+//            case 20:
             case 15:
             case 16:
                     Map<String, Object> sporadicOrderTimes = omstruckOrderMapper.getSporadicOrderTimes(new BigDecimal(orderId));
@@ -1922,6 +1924,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             case 13:
             case 15:
             case 16:
+            case 20:
                 mesMap = omstruckOrderMapper.getSporadicOrder(map);
         }
         mesMap.put("materialMesList", omstruckOrderMapper.getMaterialMes(orderId));

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

@@ -424,7 +424,7 @@
            </if>
 
             <if test="type == 1">
-                and OO.ORDER_TYPE in (12, 13)
+                and OO.ORDER_TYPE in (12, 13 , 20)
             </if>
             <if test="type == 2">
                 and OO.ORDER_TYPE = 14