oms修改

src/main/resources/bootstrap.yml

@@ -42,23 +42,23 @@ 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:8083}
+#    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8001}
 #  TmsTruckFeign:
-#    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
+#    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8008}
 #  AmsFeign:
-#    url: ${AMSFEIGN_URL:172.16.33.166:8079}
+#    url: ${AMSFEIGN_URL:172.16.33.166:8015}
 #  ImFeign:
-#    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}
+#    url: ${IMFEIGN_URL:172.16.33.166:8018}
 
 
 mybatis:
@@ -71,6 +71,6 @@ mybatis:
 
 server:
   #正式
-#  port: 8095
+  port: 8095
   #测试
-  port: 8016
+#  port: 8016

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

@@ -644,15 +644,17 @@
         select
                 OO.ORDER_ID "orderId",
                 APO.PURCHASE_ORDER_ID "purchaseOrderId",
-                AP.PLAN_ID "planId",
                 APO.PURCHASE_ORDER_NO "purchaseOrderNo",
                 RM.MATERIAL_NAME "materialName",
+            <if test="orderTypee = 8">
                 AP.PLAN_NO "planNo",
+                AP.PLAN_ID "planId",
+                to_char(AP.PLAN_TRUCK_TIME, 'yyyy-mm-dd')"planTruckTime",
+                to_char(AP.PLAN_INCOMING_TIME, 'yyyy-mm-dd') "planIncomingTime",
+            </if>
                 RC.CAPACITY_NUMBER "capacityNumber",
                 RC.CAPACITY_ID "capacityId",
                 OOM.ORDER_MATERIAL_WEIGHT "orderMaterialWeight",
-                to_char(AP.PLAN_TRUCK_TIME, 'yyyy-mm-dd')"planTruckTime",
-                to_char(AP.PLAN_INCOMING_TIME, 'yyyy-mm-dd') "planIncomingTime",
                 OO.INSERT_USERNAME "insertUsername",
                 OO.INSERT_TIME "insertTime",
                 OO.ORDER_NUMBER "orderNumber",
@@ -665,8 +667,10 @@
         from OMSTRUCK_ORDER OO
         left join AMS_PURCHASE_ORDER APO
         on OO.ORDER_PLAN_ID = APO.PURCHASE_ORDER_ID
-        left join AMSTRUCK_PURPLAN AP
-        on AP.BATCH_ID = APO.BATCH_ID and AP.PLAN_STATUS != 3
+        <if test="orderTypee = 8">
+            left join AMSTRUCK_PURPLAN AP
+            on AP.BATCH_ID = APO.BATCH_ID and AP.PLAN_STATUS != 3
+        </if>
         left join RMS_CAPACITY RC
         on RC.CAPACITY_ID = OO.CAPACITY_ID
         left join OMSTRUCK_ORDER_MATERIAL OOM