From 58dd4ecc7fe63d8cba1cb3f1265d7f7dc45f90ea Mon Sep 17 00:00:00 2001
From: wanghao <wangh@mesnac.com>
Date: Tue, 27 Jan 2026 09:50:40 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E7=82=B9=E5=87=BB=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E7=BB=B4=E4=BF=AE=E5=AD=90=E8=A1=A8=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-druid.yml  |  3 ++
 .../resources/templates/system/role/role.html |  6 ++-
 .../controller/BaseBasketInfoController.java  |  1 -
 .../RecordBasketRepairController.java         |  4 +-
 .../ruoyi/manager/domain/BaseBasketInfo.java  |  2 +-
 .../manager/domain/RecordBasketRepair.java    | 22 ++++++++++-
 .../mapper/RecordBasketRepairMapper.java      |  2 +
 .../service/IRecordBasketRepairService.java   |  2 +
 .../impl/RecordBasketRepairServiceImpl.java   | 11 ++++++
 .../resources/mapper/BaseBasketInfoMapper.xml |  4 +-
 .../mapper/RecordBasketRepairMapper.xml       | 32 ++++++++++++++--
 .../templates/base/basketInfo/basketInfo.html | 12 +++++-
 .../templates/system/repair/repair.html       | 38 ++++++++++++++++---
 13 files changed, 123 insertions(+), 16 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index e0db03d..98659f7 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -9,6 +9,9 @@ spring:
                 url: jdbc:mysql://1.13.177.47:3306/bgs_wms_2024?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
                 password: Haiwei123456
+#                url: jdbc:mysql://localhost:3306/bgs_wms_2024?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#                username: root
+#                password: haiwei@123
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
diff --git a/ruoyi-admin/src/main/resources/templates/system/role/role.html b/ruoyi-admin/src/main/resources/templates/system/role/role.html
index 991cfa9..24010e4 100644
--- a/ruoyi-admin/src/main/resources/templates/system/role/role.html
+++ b/ruoyi-admin/src/main/resources/templates/system/role/role.html
@@ -143,7 +143,11 @@
 		                    actions.push('<a tabindex="0" class="btn btn-info btn-xs" role="button" data-container="body" data-placement="left" data-toggle="popover" data-html="true" data-trigger="hover" data-content="' + more.join('') + '"><i class="fa fa-chevron-circle-right"></i>更多操作</a>');
 		                    return actions.join('');
 		            	} else {
-		                    return "";
+							var actions = [];
+							var more = [];
+							more.push("<a class='btn btn-default btn-xs " + editFlag + "' href='javascript:void(0)' onclick='authUser(" + row.roleId + ")'><i class='fa fa-user'></i>分配用户</a>");
+							actions.push('<a tabindex="0" class="btn btn-info btn-xs" role="button" data-container="body" data-placement="left" data-toggle="popover" data-html="true" data-trigger="hover" data-content="' + more.join('') + '"><i class="fa fa-chevron-circle-right"></i>更多操作</a>');
+							return actions.join('');
 		                }
 		            }
 		        }]
diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/controller/BaseBasketInfoController.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/controller/BaseBasketInfoController.java
index 0fc2477..29da93a 100644
--- a/ruoyi-manager/src/main/java/com/ruoyi/manager/controller/BaseBasketInfoController.java
+++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/controller/BaseBasketInfoController.java
@@ -78,7 +78,6 @@ public class BaseBasketInfoController extends BaseController {
         mmap.put("manufacturerList", manufacturerList);
         return prefix + "/add";
     }
-
     /**
      * 新增保存资产信息
      */
diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/controller/RecordBasketRepairController.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/controller/RecordBasketRepairController.java
index 475329c..dc59e7e 100644
--- a/ruoyi-manager/src/main/java/com/ruoyi/manager/controller/RecordBasketRepairController.java
+++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/controller/RecordBasketRepairController.java
@@ -63,8 +63,8 @@ public class RecordBasketRepairController extends BaseController
         startPage();
         // RecordBasketRepair recordBasketRepair=new RecordBasketRepair();
         // recordBasketRepair.setBasketEpc(epc);
-        System.out.println(recordBasketRepair.toString());
-        List<RecordBasketRepair> list = recordBasketRepairService.selectRecordBasketRepairList(recordBasketRepair);
+        // System.out.println(recordBasketRepair.toString());
+        List<RecordBasketRepair> list = recordBasketRepairService.selectRecordBasketRepairChildList(recordBasketRepair);
         return getDataTable(list);
     }
 
diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/BaseBasketInfo.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/BaseBasketInfo.java
index d88062b..b1e7982 100644
--- a/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/BaseBasketInfo.java
+++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/BaseBasketInfo.java
@@ -52,7 +52,7 @@ public class BaseBasketInfo extends BaseEntity {
     @Excel(name = "资产RFID副", cellType = Excel.ColumnType.STRING)
     private String basketEpc2;
 
-    @Excel(name = "资产类型", dictType = "basket_type",prompt="货筐，大散斗，大托盘，超大托盘")
+    @Excel(name = "资产类型", dictType = "basket_type",prompt="货筐，大散斗，大拖盘，超大拖盘")
     private Long basketType;
     @Excel(name = "资产状态", dictType = "basket_status")
     private Long basketStatus;
diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordBasketRepair.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordBasketRepair.java
index 6364841..083b341 100644
--- a/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordBasketRepair.java
+++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordBasketRepair.java
@@ -26,7 +26,27 @@ public class RecordBasketRepair extends BaseEntity
     @Excel(name = "维修情况")
     private String repairInfo;
 
-    public void setObjId(Long objId) 
+    private Long baseBasketId;
+    private BaseBasketInfo baseBasketInfo;
+
+
+    public BaseBasketInfo getBaseBasketInfo() {
+        return baseBasketInfo;
+    }
+
+    public void setBaseBasketInfo(BaseBasketInfo baseBasketInfo) {
+        this.baseBasketInfo = baseBasketInfo;
+    }
+
+    public Long getBaseBasketId() {
+        return baseBasketId;
+    }
+
+    public void setBaseBasketId(Long baseBasketId) {
+        this.baseBasketId = baseBasketId;
+    }
+
+    public void setObjId(Long objId)
     {
         this.objId = objId;
     }
diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordBasketRepairMapper.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordBasketRepairMapper.java
index 1f1607b..23eb7c2 100644
--- a/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordBasketRepairMapper.java
+++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordBasketRepairMapper.java
@@ -59,4 +59,6 @@ public interface RecordBasketRepairMapper
      * @return 结果
      */
     public int deleteRecordBasketRepairByObjIds(String[] objIds);
+
+    List<RecordBasketRepair> selectRecordBasketRepairChildList(RecordBasketRepair recordBasketRepair);
 }
diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordBasketRepairService.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordBasketRepairService.java
index a02b9b3..74389b2 100644
--- a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordBasketRepairService.java
+++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordBasketRepairService.java
@@ -59,4 +59,6 @@ public interface IRecordBasketRepairService
      * @return 结果
      */
     public int deleteRecordBasketRepairByObjId(Long objId);
+
+    List<RecordBasketRepair> selectRecordBasketRepairChildList(RecordBasketRepair recordBasketRepair);
 }
diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordBasketRepairServiceImpl.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordBasketRepairServiceImpl.java
index 9a7fa3a..cd4b232 100644
--- a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordBasketRepairServiceImpl.java
+++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordBasketRepairServiceImpl.java
@@ -94,4 +94,15 @@ public class RecordBasketRepairServiceImpl implements IRecordBasketRepairService
     {
         return recordBasketRepairMapper.deleteRecordBasketRepairByObjId(objId);
     }
+     /**
+     * 查询维修记录子列表
+     *
+     * @param recordBasketRepair 维修记录
+     * @return 维修记录集合
+     */
+    @Override
+    public List<RecordBasketRepair> selectRecordBasketRepairChildList(RecordBasketRepair recordBasketRepair)
+    {
+        return recordBasketRepairMapper.selectRecordBasketRepairChildList(recordBasketRepair);
+    }
 }
diff --git a/ruoyi-manager/src/main/resources/mapper/BaseBasketInfoMapper.xml b/ruoyi-manager/src/main/resources/mapper/BaseBasketInfoMapper.xml
index 7848436..bd55e0d 100644
--- a/ruoyi-manager/src/main/resources/mapper/BaseBasketInfoMapper.xml
+++ b/ruoyi-manager/src/main/resources/mapper/BaseBasketInfoMapper.xml
@@ -61,6 +61,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="basketEpc != null  and basketEpc != ''"> and basket_epc = #{basketEpc}</if>
             <if test="basketType != null "> and basket_type = #{basketType}</if>
             <if test="basketStatus != null "> and basket_status = #{basketStatus}</if>
+            <if test="steelGrade != null  and steelGrade != ''"> and steel_grade like concat('%', #{steelGrade}, '%')</if>
+            <if test="selfCode != null  and selfCode != ''"> and self_code like concat('%', #{selfCode}, '%')</if>
         </where>
     </select>
     
@@ -151,7 +153,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectBaseBasketInfoByEpc" parameterType="String" resultMap="BaseBasketInfoResult">
         <include refid="selectBaseBasketInfoVo"/>
-        where basket_epc = #{epc} limit 1
+        where basket_epc = #{epc} or basket_epc2 = #{epc} limit 1
     </select>
 
       <select id="selectBaseBasketInfoByCode" parameterType="String" resultMap="BaseBasketInfoResult">
diff --git a/ruoyi-manager/src/main/resources/mapper/RecordBasketRepairMapper.xml b/ruoyi-manager/src/main/resources/mapper/RecordBasketRepairMapper.xml
index f40c734..8eeec4c 100644
--- a/ruoyi-manager/src/main/resources/mapper/RecordBasketRepairMapper.xml
+++ b/ruoyi-manager/src/main/resources/mapper/RecordBasketRepairMapper.xml
@@ -10,16 +10,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="repairInfo"    column="repair_info"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
+        <result property="baseBasketId"    column="base_basket_id"    />
+        <association property="baseBasketInfo" javaType="com.ruoyi.manager.domain.BaseBasketInfo"
+                     resultMap="com.ruoyi.manager.mapper.BaseBasketInfoMapper.BaseBasketInfoResult">
+        </association>
     </resultMap>
 
     <sql id="selectRecordBasketRepairVo">
-        select obj_id, basket_epc, repair_info, create_by, create_time from record_basket_repair
+        select obj_id, basket_epc, repair_info, create_by, create_time,base_basket_id from record_basket_repair
+    </sql>
+  <sql id="selectRecordBasketRepairList">
+      select rbr.obj_id,
+             rbr.basket_epc,
+             repair_info,
+             create_by,
+             create_time,
+             base_basket_id,
+             basket_code,
+             basket_spe,
+             bbi.created_time,
+             basket_type,
+             steel_grade,
+             self_code,
+             manufacturer_name
+      from record_basket_repair rbr
+               left join base_basket_info bbi on rbr.base_basket_id = bbi.obj_id
     </sql>
 
     <select id="selectRecordBasketRepairList" parameterType="com.ruoyi.manager.domain.RecordBasketRepair" resultMap="RecordBasketRepairResult">
-        <include refid="selectRecordBasketRepairVo"/>
+        <include refid="selectRecordBasketRepairList"/>
         <where>  
-            <if test="basketEpc != null  and basketEpc != ''"> and basket_epc = #{basketEpc}</if>
+            <if test="basketEpc != null  and basketEpc != ''"> and rbr.basket_epc = #{basketEpc}</if>
         </where>
     </select>
     
@@ -66,4 +87,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 
+    <select id="selectRecordBasketRepairChildList" parameterType="com.ruoyi.manager.domain.RecordBasketRepair" resultMap="RecordBasketRepairResult">
+        <include refid="selectRecordBasketRepairVo"/>
+        where  base_basket_id = #{baseBasketId}
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/ruoyi-manager/src/main/resources/templates/base/basketInfo/basketInfo.html b/ruoyi-manager/src/main/resources/templates/base/basketInfo/basketInfo.html
index 7fbfe89..5f5cf8f 100644
--- a/ruoyi-manager/src/main/resources/templates/base/basketInfo/basketInfo.html
+++ b/ruoyi-manager/src/main/resources/templates/base/basketInfo/basketInfo.html
@@ -14,10 +14,20 @@
                             <label>资产编号：</label>
                             <input name="basketCode" type="text"/>
                         </li>
-                        <li>
+<!--                         <li>
                             <label>资产条码：</label>
                             <input name="basketEpc" type="text"/>
+                        </li> -->
+                        <li>
+                            <label>钢号：</label>
+                            <input name="steelGrade" type="text"/>
                         </li>
+                        <li>
+                            <label>自编号：</label>
+                            <input name="selfCode" type="text"/>
+                        </li>
+
+
                         <li>
                             <label>资产类型：</label>
                             <select name="basketType" th:with="type=${@dict.getType('basket_type')}">
diff --git a/ruoyi-manager/src/main/resources/templates/system/repair/repair.html b/ruoyi-manager/src/main/resources/templates/system/repair/repair.html
index 927d9a4..8a22c03 100644
--- a/ruoyi-manager/src/main/resources/templates/system/repair/repair.html
+++ b/ruoyi-manager/src/main/resources/templates/system/repair/repair.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<html lang="zh" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro" xmlns:th="http://www.thymeleaf.org">
 <head>
     <th:block th:include="include :: header('维修记录列表')"/>
 </head>
@@ -12,7 +12,7 @@
                     <ul>
                         <li>
                             资产RFID：
-                            <input type="text" name="basketEpc"/>
+                            <input name="basketEpc" type="text"/>
                         </li>
                         <li>
                             <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
@@ -52,7 +52,7 @@
     var editFlag = [[${@permission.hasPermi('system:repair:edit')}]];
     var removeFlag = [[${@permission.hasPermi('system:repair:remove')}]];
     var prefix = ctx + "system/repair";
-
+    var basketTypeDatas = [[${ @dict.getType('basket_type') }]];
     $(function () {
         var options = {
             url: prefix + "/list",
@@ -71,11 +71,39 @@
                 },
                 {
                     field: 'basketEpc',
-                    title: '资产RFID'
+                    title: '资产RFID',
+                    visible: false
+                },
+                {
+                    field: 'baseBasketInfo.basketCode',
+                    title: '资产编号'
+                },
+                {
+                    field: 'baseBasketInfo.basketType',
+                    title: '资产类型',
+                    formatter: function (value, row, index) {
+                        return $.table.selectDictLabel(basketTypeDatas, value);
+                    }
+                },
+                {
+                    field: 'baseBasketInfo.createdTime',
+                    title: '采购日期'
+                },
+                {
+                    field: 'baseBasketInfo.steelGrade',
+                    title: '钢号'
+                },
+                {
+                    field: 'baseBasketInfo.selfCode',
+                    title: '自编号'
+                },
+                {
+                    field: 'baseBasketInfo.manufacturerName',
+                    title: '生产商'
                 },
                 {
                     field: 'repairInfo',
-                    title: '维修情况'
+                    title: '维修说明'
                 },
                 {
                     field: 'createBy',