kelvin/wms-dj-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Compare commits

base: kelvin:c44cd027c5f2a400122d7cae9cac48535ff9a580
Branches Tags
kelvin:master
kelvin:1.2.0_241127_beta
...
compare: kelvin:78494b7370a29b0c59624852dc295aef138e3447
Branches Tags
kelvin:master
kelvin:1.2.0_241127_beta

2 Commits
c44cd027c5 ... 78494b7370

Author SHA1 Message Date
刘名喜
78494b7370 Merge remote-tracking branch 'origin/master' 2024-12-12 16:16:09 +08:00
刘名喜
d66f5d21dc 绑定料箱包含隐藏物料 2024-12-12 16:13:20 +08:00
2 changed files with 6 additions and 3 deletions
Show Stats Expand all files Collapse all files

4
ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/UcmCtBaseServiceImpl.java
View File

@ -200,7 +200,7 @@ public class UcmCtBaseServiceImpl implements IUcmCtBaseService {
BaseKnife baseKnifeQuery = new BaseKnife();
baseKnifeQuery.setRfid(boxItem.getBoxItemRfid().trim());
List<BaseKnife> baseKnifeList = baseKnifeMapper.selectBaseKnifeList(baseKnifeQuery);
List<BaseKnife> baseKnifeList = baseKnifeMapper.selectBaseKnifeNotValidList(baseKnifeQuery);
if (baseKnifeList.isEmpty())
throw new RuntimeException(String.format("绑定失败，物料“%s”不存在", boxItem.getBoxItemRfid().trim()));
@ -226,7 +226,7 @@ public class UcmCtBaseServiceImpl implements IUcmCtBaseService {
BaseKnife baseKnifeQuery = new BaseKnife();
baseKnifeQuery.setRfid(boxItem.getBoxItemRfid().trim());
List<BaseKnife> baseKnifeList = baseKnifeMapper.selectBaseKnifeList(baseKnifeQuery);
List<BaseKnife> baseKnifeList = baseKnifeMapper.selectBaseKnifeNotValidList(baseKnifeQuery);
if (baseKnifeList.isEmpty())
throw new RuntimeException(String.format("解绑失败，物料“%s”不存在", boxItem.getBoxItemRfid().trim()));

5
ktg-mes/src/main/resources/mapper/md/BaseKnifeMapper.xml
View File

@ -192,10 +192,13 @@
order by create_time desc
</select>
<!-- IS_VALID = 1 出粗则添加该指令 -->
<select id="selectBaseKnifeNotValidList" parameterType="BaseKnife" resultMap="BaseKnifeResult">
<include refid="selectBaseKnifeVo"/>
<where>
IS_VALID = 1
<if test="rfid != null and rfid != ''">
and RFID = #{rfid}
</if>
<if test="mbbBdMrlId != null and mbbBdMrlId != ''">
and MBB_BD_MRL_ID = #{mbbBdMrlId}
</if>