修改零星物资

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

@@ -223,6 +223,7 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
     //查询销售运输订单给APP 1
     Map<String, Object> getXSOrderMessageToApp(@Param("orderId") BigDecimal orderId);
 
+
     //通过运输订单号查询运输订单类型
     Integer getOrderTypeByOrderNumber(@Param("orderId") BigDecimal orderId);
 

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

@@ -1620,6 +1620,10 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 break;
             case 12:
                 mesMap =omstruckOrderMapper.getSporadicOrder(orderId);
+                break;
+            case 13:
+                mesMap = omstruckOrderMapper.getSporadicOrder(orderId);
+                break;
 
         }
         mesMap.put("materialMesList", omstruckOrderMapper.getMaterialMes(orderId));

src/main/resources/application-dev.yml

@@ -1,8 +1,8 @@
 spring:
   datasource:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
-    password: root123
-    username: dagang
+    password: Dil123789
+    username: dil
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: DAL-OMS-API-DEV

src/main/resources/application-prod.yml

@@ -1,8 +1,8 @@
 spring:
   datasource:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
-    password: root123
-    username: dagang
+    password: Dil123789
+    username: dil
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: DAL-OMS-API-PROD

src/main/resources/bootstrap.yml

@@ -43,25 +43,25 @@ redis:
 #feign设置
 openfeign:
 #正式环境
-#  ColumnDataFeign:
-#    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
-#  TmsTruckFeign:
-#    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
-#  AmsFeign:
-#    url: ${AMSFEIGN_URL:172.16.33.166:8079}
-#  ImFeign:
-#    url: ${IMFEIGN_URL:172.16.33.166:8055}
-
-
-    #测试环境
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8001}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8008}
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.166:8015}
+    url: ${AMSFEIGN_URL:172.16.33.166:8079}
   ImFeign:
-    url: ${IMFEIGN_URL:172.16.33.166:8018}
+    url: ${IMFEIGN_URL:172.16.33.166:8055}
+
+
+    #测试环境
+#  ColumnDataFeign:
+#    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8001}
+#  TmsTruckFeign:
+#    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8008}
+#  AmsFeign:
+#    url: ${AMSFEIGN_URL:172.16.33.166:8015}
+#  ImFeign:
+#    url: ${IMFEIGN_URL:172.16.33.166:8018}
 
 
 mybatis:
@@ -74,6 +74,6 @@ mybatis:
 
 server:
   #正式
-#   port: 8095
+   port: 8095
   #测试
-  port: 8016
+#  port: 8016

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

@@ -2754,10 +2754,19 @@
                 OO.ORDER_NUMBER    "orderNumber",
                 OO.ORDER_LINE_SEQUENCE   "orderLineSequence",
                 RC.CAPACITY_NUMBER "capacityNumber",
-                OO.ORDER_TYPE      "orderType"
+                OO.ORDER_TYPE      "orderType",
+                RS.SHIPPER_NAME "consigneeCompanyName",
+                RC2.CONSIGNEE_COMPANY_NAME "receiveAddressName"
+
         FROM OMSTRUCK_ORDER OO
         LEFT JOIN RMS_CAPACITY RC
         ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        left join AMSTRUCK_SPORADIC_ORDER ASO
+        ON ASO.SPORADIC_ORDER_ID=OO.ORDER_PLAN_ID
+        LEFT JOIN RMS_SHIPPER RS
+        ON RS.SHIPPER_ID=ASO.RECEIVE_UNIT_ID
+        LEFT JOIN RMS_CONSIGNEE RC2
+        ON RC2.CONSIGNEE_ID=ASO.SEND_UNIT_ID
         WHERE OO.ORDER_ID = #{orderId}
         AND OO.ORDER_STATUS in (4, 5)
     </select>
@@ -2839,6 +2848,7 @@
         WHERE OO.ORDER_ID = #{orderId}
     </select>
 
+
     <!--  通过运输订单号查询订单类型  -->
     <select id="getOrderTypeByOrderNumber" parameterType="java.math.BigDecimal" resultType="java.lang.Integer">
         SELECT OO.ORDER_TYPE