tijiao

src/main/resources/application-prod.yml

@@ -11,7 +11,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:localhost:8079}
+    url: ${AMSFEIGN_URL:172.16.33.166:8079}
   BmsshipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
   BmstrainFeign:
@@ -23,7 +23,7 @@ openfeign:
   TmsTrainFeign:
     url: ${TMSTRAINFEIGN_URL:172.16.33.166:8086}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:localhost:8088}
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
   TmsshipFeign:
     url: ${TMSSHIPFEIGN_URL:172.16.33.166:8090}
   WMSHFeign:

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

@@ -1194,9 +1194,7 @@
                  ON TWR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
         WHERE OO.ORDER_TYPE = 1
           AND OO.ORDER_STATUS IN (4,5)
-          AND TER.RESULT_ENTRY_GATE_TIME IS NULL
-          and (TWR.RESULT_TARE_WEIGHT =0
-					or TWR.RESULT_TARE_WEIGHT is NULL)
+          and TWR.RESULT_NET_WEIGHT is null
           AND ASOM.SALE_DATE_OF_RECEIPT between
           sysdate-1 and sysdate
           ORDER BY OO.ORDER_ID DESC