tijiao

src/main/resources/application-prod.yml

@@ -13,7 +13,7 @@ openfeign:
    ESFeign:
      url: ${ESFEIGN_URL:172.16.33.166:8089}
    ColumnDataFeign:
-     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+     url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
    TmsTruckFeign:
       url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
    ImFeign:

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

@@ -3438,15 +3438,17 @@
   </select>
 
   <select id="matchingAddressRecently" parameterType="DECIMAL" resultType="java.util.LinkedHashMap" >
-    SELECT  *
-    FROM (SELECT DISTINCT RRP.PLACE_ID "placeId",
+    SELECT
+    DISTINCT
+    RRP.PLACE_ID "placeId",
     RRP.ADDRESS_DELIVERY_ADDRESS "place",
     RRA.ADDRESS_ID "shipperAddressId",
     RRA.ADDRESS_PROVINCE "addressProvince",
     RRA.ADDRESS_DISTRICT "addressDistrict",
     RRA.ADDRESS_TOWN "addressTown",
     ASOM.SALE_ORDER_CONSIGNEE_TEL "saleOrderConsigneeTel",
-    RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT || RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS "addressPlace"
+    RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT || RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS "addressPlace",
+    max(ASOM.SALE_ORDER_MATERIAL_ID) as b
     FROM AMS_SALE_ORDER ASO
     LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
     ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
@@ -3456,8 +3458,12 @@
     ON RRA.ADDRESS_ID = RRP.ADDRESS_ID
     WHERE ASO.RECEIVE_ID = #{receiveId}
     AND RRP.PLACE_ID IS NOT NULL
-    ORDER BY ASOM.SALE_ORDER_MATERIAL_ID DESC
-    )
+    GROUP BY RRP.PLACE_ID , RRP.ADDRESS_DELIVERY_ADDRESS , RRA.ADDRESS_ID ,
+             RRA.ADDRESS_PROVINCE ,
+             RRA.ADDRESS_DISTRICT ,
+             RRA.ADDRESS_TOWN ,
+             ASOM.SALE_ORDER_CONSIGNEE_TEL
+    ORDER BY b DESC
   </select>
 
   <select id="getSalerByReceiveId" parameterType="DECIMAL" resultType="java.util.Map" >