diff --git a/meapi/src/main/resources/mapper/LogisticsTurnoverMapper.xml b/meapi/src/main/resources/mapper/LogisticsTurnoverMapper.xml index 9d3e1c91..e6b7624d 100644 --- a/meapi/src/main/resources/mapper/LogisticsTurnoverMapper.xml +++ b/meapi/src/main/resources/mapper/LogisticsTurnoverMapper.xml @@ -825,6 +825,7 @@ AND C1.VALUE LIKE '%'||#{workOrder}||'%' AND SO.SHOP_ORDER=#{shopOrder} AND ZSD.SFC LIKE '%'||#{sfc}||'%' + AND ZNU.FULL_NAME = #{comfirmUser} AND ZLT.COM_DATE_TIME >= TO_DATE(#{startFromDate}, 'YYYY-MM-DD') @@ -837,8 +838,14 @@ AND ZLT.OTHER4 <= TO_DATE(#{completeToDate}|| '15:59:59', 'YYYY-MM-DD HH24:MI:SS') - - ORDER BY ZLT.COM_DATE_TIME DESC + + + ORDER BY ZLT.COM_DATE_TIME DESC + + + ORDER BY ZLT.CREATED_DATE_TIME + +