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

装箱单信息查询排序
Merge pull request 'yanyang' (#30 ) from yanyang into master
2023-04-03 10:40:43 +08:00 · 2023-04-03 10:40:27 +08:00 · 2023-03-31 10:28:45 +08:00
1 changed files with 2 additions and 2 deletions
--- 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">
Author	SHA1	Message	Date
yanyang	cbc3983714	Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang	2023-04-03 10:40:43 +08:00
yanyang	0eb650ff50	装箱单信息查询排序	2023-04-03 10:40:27 +08:00
闫阳	3172934f4e	Merge pull request 'yanyang' (#30 ) from yanyang into master Reviewed-on: #30	2023-03-31 10:28:45 +08:00