修改采购内转

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

@@ -1914,6 +1914,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 break;
             case 9:
             case 10:
+            case 20:
                 mesMap = omstruckOrderMapper.getNZOrderMessageToApp(map);
                 mesMap.put("loadName","化工园区铁专线");
                 break;
@@ -1924,7 +1925,6 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             case 13:
             case 15:
             case 16:
-            case 20:
                 mesMap = omstruckOrderMapper.getSporadicOrder(map);
         }
         mesMap.put("materialMesList", omstruckOrderMapper.getMaterialMes(orderId));
@@ -1951,7 +1951,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                     continue;
                 }
             }
-            if(DataChange.dataToBigDecimal(orderMesMap.get("orderType")).intValue() == 10){
+            if(DataChange.dataToBigDecimal(orderMesMap.get("orderType")).intValue() == 10||DataChange.dataToBigDecimal(orderMesMap.get("orderType")).intValue() == 20){
                 Integer planEnable = omstruckOrderSeparateMapper.getOrderPlanEnable(orderMesMap.get("orderId"));
                 if(planEnable == 0){ // 数据为0则失效
                     continue;

src/main/resources/application-dev.yml

@@ -13,7 +13,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8083}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:localhost:8008}
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
   AmsFeign:
     url: ${AMSFEIGN_URL:172.16.33.162:8015}
   ImFeign:

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

@@ -3159,7 +3159,7 @@
         LEFT JOIN RMS_CONSIGNEE RCE
         ON RCE.CONSIGNEE_ID = APO.RECEIVE_UNIT_ID
         WHERE AIP.DELETED = 0
-        AND OO.ORDER_TYPE IN (4, 9, 10, 11)
+        AND OO.ORDER_TYPE IN (4, 9, 10, 11 , 20)
         AND OO.ORDER_STATUS = #{orderStatus}
         <if test="carrierId !=null">
             AND AIP.CARRIER_ID = (SELECT RCR.CARRIER_ID FROM RMS_CARRIER RCR WHERE RCR.CARRIER_SSO_ID = #{carrierId})