CaiXiang/cigs4
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request 'yanyang' (#31) from yanyang into master

Browse Source 
Reviewed-on: #31
This commit is contained in:
闫阳 2023-04-03 10:41:32 +08:00
commit b0e88370b1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ym-packing/src/main/resources/mapper/WoPackagingBoxSubstrateMapper.xml
View File

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