Merge branch 'master' of http://git.picaiba.com/CaiXiang/cigs4

2023-04-03 10:59:41 +08:00 · 2023-04-03 10:59:41 +08:00 · 18c1c6cc15
commit 18c1c6cc15
parent 0e95d8c1d2 b0e88370b1
--- a/ym-packing/src/main/resources/mapper/WoPackagingBoxSubstrateMapper.xml
+++ b/ym-packing/src/main/resources/mapper/WoPackagingBoxSubstrateMapper.xml
@ -140,7 +140,7 @@
            </if>
            AND twpbs.valid = 1
        </where>
-        order by twpb.CREATE_TIME desc
+        order by twpb.CREATE_TIME desc, twpbs.PACKAGING_BOX_ID asc, twpbs.SLOT asc
    </select>

    <select id="substratePage" resultType="com.cnbm.packing.dto.WoPackagingBoxSubstrateDTO">
@ -161,7 +161,7 @@
            </if>
            AND twpbs.valid = 1
        </where>
-        order by twpb.CREATE_TIME desc
+        order by twpb.CREATE_TIME desc, twpbs.PACKAGING_BOX_ID asc, twpbs.SLOT asc
    </select>

    <select id="subIdPage" resultMap="ResultMap">