luobang 2 سال پیش
والد
کامیت
3d077b324b
2فایلهای تغییر یافته به همراه12 افزوده شده و 5 حذف شده
  1. 1 1
      src/main/resources/application-prod.yml
  2. 11 4
      src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

+ 1 - 1
src/main/resources/application-prod.yml

@@ -11,7 +11,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.166:8079}
+    url: ${AMSFEIGN_URL:localhost:8079}
   BmsshipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
   BmstrainFeign:

+ 11 - 4
src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -1075,10 +1075,17 @@
     </update>
 
     <select id="getSteelOrderNum" resultType="java.lang.Integer">
-        SELECT COUNT(*) FROM OMSTRUCK_ORDER OO
-        WHERE OO.ORDER_LINE_SEQUENCE &gt;= 1
-        AND   OO.ORDER_STATUS = 5
-        AND   OO.ORDER_TYPE = 1
+        SELECT
+            COUNT( * )
+        FROM
+            OMSTRUCK_ORDER OO
+                LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR.ORDER_ID = OO.ORDER_ID
+                LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR ON TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        WHERE
+            OO.ORDER_LINE_SEQUENCE >= 1
+          AND OO.ORDER_STATUS = 5
+          AND TLFR.RESULT_OUT_GATE_TIME IS NULL
+          AND OO.ORDER_TYPE = 1
     </select>
     <select id="getInwardWeightMaterial" resultType="java.util.Map" parameterType="java.util.Map">
         SELECT * FROM (SELECT