Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z

src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml

@@ -28,7 +28,7 @@
                sw.workplaceName,
                ico.id,
                ico.orderTime,
-               row_number() over ( order by ico.orderTime desc ) as orderSequence
+               row_number() over ( order by case when ico.orderTime is null then ico.createTime else ico.orderTime end desc ) as orderSequence
         FROM io_collect_order ico
                  left join sys_workplace_document on ico.busType = sys_workplace_document.documentTypeCode
                  left join basic_corp bc on ico.fromCorp = bc.erpId
@@ -91,7 +91,7 @@
                 </foreach>
             </if>
         </where>
-        order by orderTime desc
+        order by case when ico.orderTime is null then ico.createTime else ico.orderTime end desc
     </select>