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/AmsContractTruckPriceMapper.xml

@@ -868,6 +868,7 @@
     ON RRP.ADDRESS_ID=RRA.ADDRESS_ID
     LEFT JOIN AMS_CONTRACT_TRANSPORT_PRICE ACTP
     ON ACTP.PLACE_ID=RRP.PLACE_ID
+    WHERE ACTP.DELETED = 0
     ) RRRA
     <if test="con != null" >
       WHERE RRRA."address" LIKE #{con}

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

@@ -3389,6 +3389,7 @@
                      ON ASOM.SALE_SHIPPING_ADDRESS_ID = ACTP.PLACE_ID
     WHERE ACTP.CARRIER_ID = #{carrierId}
       AND ASOM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
+    AND ACTP.DELETED = 0
     ORDER BY ACTP.INSERT_TIME DESC
     FETCH NEXT 1 ROWS ONLY
   </select>
@@ -4429,6 +4430,7 @@
                      ON RRP.PLACE_ID = ACTP.PLACE_ID
     WHERE ACTP.CARRIER_ID = #{carrierId}
       AND RRP.ADDRESS_ID = #{addressId}
+      AND ACTP.DELETED = 0
       ORDER BY ACTP.OLD_DATE DESC
       NULLS LAST
   </select>