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

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

Browse Source 
# Conflicts:
#	ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxServiceBiz.java
#	ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxSubstrateServiceBiz.java
#	ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxServiceBizImpl.java
This commit is contained in:
caixiang
2023-02-24 08:47:56 +08:00
parent 6d3b1e9cbb e8629b9ced
commit 161b5b5be4
12 changed files with 141 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,7 +55,13 @@
<select id="list" resultType="com.cnbm.packing.dto.WoPackagingBoxSubstrateDTO">
select * from t_wo_packaging_box_substrate
order by id asc
<where>
valid = 1
<if test="packagingBoxId != null">
and PACKAGING_BOX_ID = #{packagingBoxId}
</if>
</where>
order by slot asc
</select>
<select id="getOneByWoSubstrateId" resultMap="WoPackagingBoxSubstrateMap">
select