diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java index 3b786880..fb57d614 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java @@ -842,7 +842,7 @@ public class BmQrBoxServiceImpl implements BmQrBoxService { if (0 < bmQrBoxMapper.getMaCode(machine.getMaCode(), machine.getModelId())) { return AjaxResult.error("该设备已绑定,无法再次绑定!"); } - // 一个标准型只有1种类型 + /*// 一个标准型只有1种类型 final List boxMaTypeList = bmQrBoxMapper.getBoxWsTypeList(machine.getBoxId()); if (!boxMaTypeList.isEmpty()) { if (1 < boxMaTypeList.size()) { @@ -851,7 +851,7 @@ public class BmQrBoxServiceImpl implements BmQrBoxService { if (!Objects.equals(boxMaTypeList.get(0).toString(), machine.getModelId())) { return AjaxResult.error("该标准箱已绑定其他类型物资,无法绑定此类型!"); } - } + }*/ WsMaInfo info = new WsMaInfo(); info.setMaName(machine.getMaName()); info.setMaModel(machine.getMaModel()); diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmQrBoxMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmQrBoxMapper.xml index 22982cb6..444c3507 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmQrBoxMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmQrBoxMapper.xml @@ -491,6 +491,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and ma_code LIKE concat('%',#{keyWord},'%') + ORDER BY + create_time + DESC