From 58ed645a64204db71f4956e4bd4956607f0ea3dd Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Sat, 10 Jan 2026 21:15:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E7=AE=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/material/basic/service/impl/BmQrBoxServiceImpl.java | 4 ++--
 .../main/resources/mapper/material/basic/BmQrBoxMapper.xml    | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

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<Long> 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},'%')
             </if>
         </where>
+       ORDER BY
+       create_time
+       DESC
     </select>
 
     <select id="getNumList" resultType="com.bonus.material.basic.domain.BmQrBoxInfo">