修改冲突

src/main/resources/application-dev.yml

@@ -31,7 +31,7 @@ openfeign:
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.33.162:8012}
   OmsFeign:
-    url: ${OMSFEIGN_URL:localhost:8016}
+    url: ${OMSFEIGN_URL:172.16.33.162:8016}
   JoinFeign:
     url: ${JOINFEIGN_URL:172.16.33.162:8006}
   QmsFeign:
@@ -39,7 +39,7 @@ openfeign:
   ImFeign:
     url: ${IMFEIGN_URL:172.16.33.166:8055}
   AmsFeign:
-    url: ${AMSFEIGN_URL:localhost:8015}
+    url: ${AMSFEIGN_URL:172.16.33.162:8015}
 
 server:
   port: 8008

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

@@ -1164,8 +1164,7 @@
     <select id="getSporadicSuppliesEnFactoryResult" parameterType="java.util.Map" resultType="java.util.Map">
         select *
         from (
-        select Distinct
-               TER.RESULT_ID "resultId",
+        select distinct TER.RESULT_ID "resultId",
                OO.ORDER_ID    "orderId",
                 OO.ORDER_NUMBER "orderNumber",
                 RC.CAPACITY_NUMBER "capacityNumber",

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

@@ -1093,7 +1093,7 @@
     <select id="getSporadicLeaveFactory" parameterType="java.util.Map" resultType="java.util.Map">
         select *
         from (
-        select TLFR.RESULT_ID              "resultId",
+        select distinct TLFR.RESULT_ID              "resultId",
         OO.ORDER_NUMBER                    "orderNumber",
         RC.CAPACITY_NUMBER                 "capacityNumber",
         RG.GATEPOST_NAME                   "gatepostName",

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

@@ -1513,7 +1513,7 @@
   <select id="getSporadicSuppliesLoadResult" resultType="java.util.Map">
     select *
     from (
-    select
+    select distinct
     TLR.RESULT_ID "resultId",
     OO.ORDER_NUMBER "orderNumber",
     RC.CAPACITY_NUMBER "capacityNumber",

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

@@ -949,7 +949,7 @@
     <select id="getSporadicSuppliesUnloadResult" resultType="java.util.Map">
         SELECT *
         FROM (
-        SELECT
+        SELECT distinct
         TUR.RESULT_ID             "resultId",
         OO.ORDER_NUMBER           "orderNumber",
         RC.CAPACITY_NUMBER        "capacityNumber",

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

@@ -2172,7 +2172,7 @@
     <select id="getSporadicSuppliesJiMiaoResult" resultType="java.util.Map">
         select *
         from (
-        select
+        select distinct
         TWR.WEIGHT_TASK_RESULT_ID "weightTaskResultId",
         OO.ORDER_NUMBER "orderNumber",
         RC.CAPACITY_NUMBER "capacityNumber",
@@ -2364,7 +2364,7 @@
     <select id="getFactorySkinSporadicWeight" resultType="java.util.Map">
         select *
         from (
-        select
+        select distinct
         TWR.WEIGHT_TASK_RESULT_ID "weightTaskResultId",
         ASO.SPORADIC_ORDER_NO "purchaseOrderNo",
         RM.MATERIAL_NAME "materialName",