Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU2/DAI_DAZHOU-OMS

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

@@ -105,4 +105,6 @@ public interface OmstruckOrderSeparateMapper {
 
     //通过装卸工SSOID查询装过的订单信息
     List<Map<String, Object>> getAllLoaderLoadingOrder(Map<String, Object> map);
+  
+    Integer getOrderPlanEnable(Object orderId);
 }

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

@@ -521,7 +521,10 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         Map<String,Object> mapAddOrder  =omstruckOrderMapper.getSporadicOrdermapAddOrder(new BigDecimal(mapValue.get("orderId").toString()));
         BigDecimal sporadicOrderTimes = DataChange.dataToBigDecimal(mapAddOrder.get("sporadicOrderTimes"));
         BigDecimal sporadicOrderId = DataChange.dataToBigDecimal(mapAddOrder.get("sporadicOrderId"));
+        BigDecimal transStatus = DataChange.dataToBigDecimal(mapAddOrder.get("transStatus"));
         BigDecimal orderId = DataChange.dataToBigDecimal(mapValue.get("orderId"));
+        //获取运输订单类型
+        Integer orderType = omstruckOrderMapper.getOrderTypeByOrderId(orderId);
         BigDecimal capacityId = DataChange.dataToBigDecimal(mapAddOrder.get("capacityId"));
         Map<String, Object> addMapSporadicOrder = new HashMap<>();
         addMapSporadicOrder.put("sporadicOrderId",sporadicOrderId);
@@ -531,9 +534,20 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         map.put("capacityId",capacityId);
         mapList.add(map);
         addMapSporadicOrder.put("mapList",mapList);
-        if (sporadicOrderTimes.intValue()>0){
-            //mapvalue需要orderId,零星订单id，maplist放一个运力id
-            amsFeign.addSporadicOrderTimes(addMapSporadicOrder);
+        switch (orderType) {
+            case 13:
+            case 12:
+                if (transStatus.intValue()==1){
+                    amsFeign.addSporadicOrderTimes(addMapSporadicOrder);
+                }
+                break;
+            //内转零星
+            case  15:
+            case  16:
+                if (sporadicOrderTimes.intValue() > 0) {
+                    //mapvalue需要orderId,零星订单id，maplist放一个运力id
+                    amsFeign.addSporadicOrderTimes(addMapSporadicOrder);
+                }
         }
     }
 
@@ -785,7 +799,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             omstruckOrderSeparateService.addAllSonResult(orderMessage);
             //判断订单是否是一车多单
             BigDecimal orderType = (BigDecimal) orderMessage.get("orderType");
-            if (orderType.intValue()==15 || orderType.intValue()==16 || orderType.intValue()==12 ||orderType.intValue()==13) {
+            if (orderType.intValue()==15 || orderType.intValue()==16 ) {
                 //通过订单查询趟次
                 Map<String, Object> sporadicOrderTimes = omstruckOrderMapper.getSporadicOrderTimes(orderId);
                 BigDecimal orderTimes = DataChange.dataToBigDecimal(sporadicOrderTimes.get("orderTimes"));
@@ -1892,9 +1906,6 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 break;
             case 9:
             case 10:
-                mesMap = omstruckOrderMapper.getNZOrderMessageToApp(map);
-                mesMap.get("orderStatus");
-                map.put("orderStatus",mesMap.get("orderStatus"));
                 mesMap = omstruckOrderMapper.getNZOrderMessageToApp(map);
                 mesMap.put("loadName","化工园区铁专线");
                 break;
@@ -1929,6 +1940,12 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 if(judgeDate == null){ // 数据为空则不是当天的订单
                     continue;
                 }
+            }
+          	if(DataChange.dataToBigDecimal(orderMesMap.get("orderType")).intValue() == 10){
+                Integer planEnable = omstruckOrderSeparateMapper.getOrderPlanEnable(orderMesMap.get("orderId"));
+                if(planEnable == 0){ // 数据为0则失效
+                    continue;
+                }
             }
             Map<String, Object> mesMap = getMessageToApp(orderMesMap);
             mesMapList.add(mesMap);

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

@@ -3048,7 +3048,8 @@
     <select id="getSporadicOrdermapAddOrder" resultType="java.util.Map">
         select aso.sporadic_order_times "sporadicOrderTimes",
                aso.SPORADIC_ORDER_ID "sporadicOrderId",
-               oo.CAPACITY_ID "capacityId"
+               oo.CAPACITY_ID "capacityId",
+               ASO.TRANS_STATUS "transStatus"
             from OMSTRUCK_ORDER oo
             left join  AMSTRUCK_SPORADIC_ORDER  aso
             on oo.ORDER_PLAN_ID=aso.sporadic_order_id

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

@@ -622,5 +622,13 @@
                 rownum < 100
             </if>
         </where>
+    </select>  
+  	<select id="getOrderPlanEnable" resultType="java.lang.Integer">
+        SELECT  AIP.PLAN_EABLE_STATUS
+        FROM
+	    OMSTRUCK_ORDER oo
+	    LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
+	    ON AIP.PLAN_ID = OO.ORDER_PLAN_ID
+        WHERE	OO.ORDER_ID = #{orderId}
     </select>
 </mapper>