bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

标准箱

This commit is contained in:
mashuai 2026-01-10 21:15:35 +08:00
parent 2da9fa931b
commit 58ed645a64
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java
View File

@ -842,7 +842,7 @@ public class BmQrBoxServiceImpl implements BmQrBoxService {
if (0 < bmQrBoxMapper.getMaCode(machine.getMaCode(), machine.getModelId())) { if (0 < bmQrBoxMapper.getMaCode(machine.getMaCode(), machine.getModelId())) {
return AjaxResult.error("该设备已绑定，无法再次绑定!"); return AjaxResult.error("该设备已绑定，无法再次绑定!");
} }
// 一个标准型只有1种类型 /*// 一个标准型只有1种类型
final List<Long> boxMaTypeList = bmQrBoxMapper.getBoxWsTypeList(machine.getBoxId()); final List<Long> boxMaTypeList = bmQrBoxMapper.getBoxWsTypeList(machine.getBoxId());
if (!boxMaTypeList.isEmpty()) { if (!boxMaTypeList.isEmpty()) {
if (1 < boxMaTypeList.size()) { if (1 < boxMaTypeList.size()) {
@ -851,7 +851,7 @@ public class BmQrBoxServiceImpl implements BmQrBoxService {
if (!Objects.equals(boxMaTypeList.get(0).toString(), machine.getModelId())) { if (!Objects.equals(boxMaTypeList.get(0).toString(), machine.getModelId())) {
return AjaxResult.error("该标准箱已绑定其他类型物资，无法绑定此类型!"); return AjaxResult.error("该标准箱已绑定其他类型物资，无法绑定此类型!");
} }
} }*/
WsMaInfo info = new WsMaInfo(); WsMaInfo info = new WsMaInfo();
info.setMaName(machine.getMaName()); info.setMaName(machine.getMaName());
info.setMaModel(machine.getMaModel()); info.setMaModel(machine.getMaModel());

3
bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmQrBoxMapper.xml
View File

@ -491,6 +491,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and ma_code LIKE concat('%',#{keyWord},'%') and ma_code LIKE concat('%',#{keyWord},'%')
</if> </if>
</where> </where>
ORDER BY
create_time
DESC
</select> </select>
<select id="getNumList" resultType="com.bonus.material.basic.domain.BmQrBoxInfo"> <select id="getNumList" resultType="com.bonus.material.basic.domain.BmQrBoxInfo">