Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-QMS-API

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

@@ -901,8 +901,11 @@
         ON ASTM.SALE_ORDER_MATERIAL_ID=OO.ORDER_PLAN_ID
         LEFT JOIN AMS_SALE_MATERIAL ASM
         ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
+        LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER
+        ON TER.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
         where oo.ORDER_STATUS = 5
         AND ASO.SALE_ORDER_STATUS = 4
+        AND TER.RESULT_ENTRY_GATE_TIME IS NULL
         AND RM.MATERIAL_ID||'' NOT IN (SELECT DISTINCT SPECTIONS_MODEL FROM QMS_MODEL_UNROOLED)
         <if test="capacityNumber != null">
             and instr(RC.CAPACITY_NUMBER, #{capacityNumber}) > 0
@@ -1023,8 +1026,11 @@
         LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
         LEFT JOIN AMS_SALE_ORDER ASO ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
         LEFT JOIN RMS_CONSIGNEE RCE ON RCE.CONSIGNEE_ID = ASO.RECEIVE_ID
+        LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER
+        ON TER.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
         where oo.ORDER_STATUS = 5
         AND ASO.SALE_ORDER_STATUS = 4
+        AND TER.RESULT_ENTRY_GATE_TIME IS NULL
         and QQSL.SPELILING_NUM not in (1,2)
         AND OO.ORDER_ID NOT IN (
         select
@@ -1111,8 +1117,11 @@
         LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
         LEFT JOIN AMS_SALE_ORDER ASO ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
         LEFT JOIN RMS_CONSIGNEE RCE ON RCE.CONSIGNEE_ID = ASO.RECEIVE_ID
+        LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER
+        ON TER.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
         where oo.ORDER_STATUS = 5
         AND ASO.SALE_ORDER_STATUS = 4
+        AND TER.RESULT_ENTRY_GATE_TIME IS NULL
         and QQSL.SPELILING_NUM =2
         AND OO.ORDER_ID NOT IN (
         select