tijia

src/main/resources/application-prod.yml

@@ -23,15 +23,15 @@ openfeign:
   TmsTrainFeign:
     url: ${TMSTRAINFEIGN_URL:172.16.33.166:8086}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
+    url: ${TMSTRUCKFEIGN_URL:localhost:8088}
   TmsshipFeign:
     url: ${TMSSHIPFEIGN_URL:172.16.33.166:8090}
   WMSHFeign:
     url: ${WMSHFEIGN_URL:172.16.33.166:8070}
   WMSFeign:
-    url: ${WMSFEIGN_URL:172.16.33.166:8093}
+    url: ${WMSFEIGN_URL:localhost:8094}
   OMSFeign:
-    url: ${OMSFEIGN_URL:172.16.33.166:8095}
+    url: ${OMSFEIGN_URL:localhost:8095}
   RmsFeign:
     url: ${RMSFEIGN_URL:172.16.33.166:8060}
   JoinFeign:
@@ -45,4 +45,4 @@ piction:
   path: /shared
   # path: C:\Users\zx\Pictures\test
 server:
-  port: 8080
+  port: 8081

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

@@ -1256,7 +1256,8 @@
     </select>
 
     <select id="getInwardInboundResult" resultType="java.util.Map" parameterType="java.util.Map">
-        SELECT RC.CAPACITY_NUMBER "capacityNumber",
+        SELECT DISTINCT
+               RC.CAPACITY_NUMBER "capacityNumber",
                OO.ORDER_NUMBER "orderNumber",
                OO.ORDER_ID "orderId",
                RPG.INSERT_TIME "insertTime",