From d05fb296608b77c8b8b2303e79a89560d5f03c0b Mon Sep 17 00:00:00 2001
From: zch <zangch@mesnac.com>
Date: Fri, 24 Apr 2026 16:13:19 +0800
Subject: [PATCH] =?UTF-8?q?change(=E8=BD=AE=E8=83=8E=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=E7=AD=BE):=20=E8=BD=AE=E8=83=8E=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E4=B8=AD=E6=B7=BB=E5=8A=A0=E5=85=A5=E5=BA=93=E7=BC=96=E7=A0=81?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=B9=B6=E4=BC=98=E5=8C=96=E8=BD=AE=E8=83=8E?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E7=AD=BE=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在轮胎管理中新增入库编码字段，支持导入时填写和展示
- 优化轮胎详情页的组织架构信息展示，区分公司、修理厂和车队
- 修改轮胎类型显示为字典标签，提升可读性
- 添加入库编码相关查询接口，支持按编码筛选轮胎
- 在导入模板中添加入库编码填写说明
---
 .../templates/tyre/tyre/typreDetill2.html     | 10 +++---
 .../resources/templates/tyre/tyre/tyre.html   | 27 +++++++++-----
 .../resources/mapper/tyre/BaseTyreMapper.xml  | 36 ++++++++++++++++---
 3 files changed, 56 insertions(+), 17 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/tyre/tyre/typreDetill2.html b/ruoyi-admin/src/main/resources/templates/tyre/tyre/typreDetill2.html
index 8cc81c0b..f4bfa38c 100644
--- a/ruoyi-admin/src/main/resources/templates/tyre/tyre/typreDetill2.html
+++ b/ruoyi-admin/src/main/resources/templates/tyre/tyre/typreDetill2.html
@@ -185,8 +185,10 @@
             <div>
                 <div class="summary-name" th:text="'胎号：' + ${tyre.tyreNo}">胎号：-</div>
                 <div class="summary-meta">
-                    <div th:text="'所属场站：' + (${#strings.isEmpty(tyre.deptName)} ? '-' : tyre.deptName)">所属场站：-</div>
-                    <div th:text="'所属车队：' + (${#strings.isEmpty(tyre.team)} ? '-' : tyre.team)">所属车队：-</div>
+                    <div th:text="'所在车辆：' + ${#strings.isEmpty(tyre.carNo) ? '-' : tyre.carNo}">所在车辆：-</div>
+                    <div th:text="'所属公司：' + ${#strings.isEmpty(tyre.company) ? '-' : tyre.company}">所属公司：-</div>
+                    <div th:text="'所属修理厂：' + ${#strings.isEmpty(tyre.team) ? '-' : tyre.team}">所属修理厂：-</div>
+                    <div th:text="'所属车队：' + ${#strings.isEmpty(tyre.carTeam) ? '-' : tyre.carTeam}">所属车队：-</div>
                 </div>
                 <span class="summary-link" th:text="${tyre.tyreNo}">-</span>
             </div>
@@ -244,8 +246,8 @@
 <!--                        <td th:text="${tyreStatusText}">在库</td>-->
 <!--                    </tr>-->
                     <tr>
-                        <th>轮胎类型</th>
-                        <td th:text="${#strings.isEmpty(tyre.tyreType) ? '-' : tyre.tyreType}">-</td>
+                        <th>轮胎类别</th>
+                        <td th:text="${#strings.isEmpty(tyre.tyreType) ? '-' : @dict.getLabel('tyre_type', tyre.tyreType)}">-</td>
                         <th>初始花纹深度(mm)</th>
                         <td th:text="${#strings.isEmpty(tyre.patternDepth) ? '-' : tyre.patternDepth}">-</td>
 <!--                        <th>剩余花纹深度(mm)</th>-->
diff --git a/ruoyi-admin/src/main/resources/templates/tyre/tyre/tyre.html b/ruoyi-admin/src/main/resources/templates/tyre/tyre/tyre.html
index 7a612228..993dd142 100644
--- a/ruoyi-admin/src/main/resources/templates/tyre/tyre/tyre.html
+++ b/ruoyi-admin/src/main/resources/templates/tyre/tyre/tyre.html
@@ -22,6 +22,10 @@
                                 <p>轮胎芯片：</p>
                                 <input type="text" name="tyreEpc"/>
                             </li>
+                            <li>
+                                <p>入库编码：</p>
+                                <input type="text" name="inboundCode"/>
+                            </li>
                             <li>
                                 轮胎品牌：<select name="tyreBrand" th:with="type=${@dict.getType('brand')}">
                                 <option value="">所有</option>
@@ -190,6 +194,10 @@
                         field : 'createBy',
                         title : '创建人'
                     },
+                    {
+                        field : 'inboundCode',
+                        title : '入库编码'
+                    },
                     {
                     title: '操作',
                     align: 'center',
@@ -208,15 +216,18 @@
          <form enctype="multipart/form-data" class="mt20 mb10">
              <div class="col-xs-offset-1">
                  <input type="file" id="file" name="file"/>
-                 <div class="mt10 pt5">
-                     <input type="checkbox" id="updateSupport" name="updateSupport" title="如果轮胎已经存在，更新这条数据。"> 是否更新已经存在的轮胎数据
-                     &nbsp;	<a onclick="$.table.importTemplate()" class="btn btn-default btn-xs"><i class="fa fa-file-excel-o"></i> 下载模板</a>
-                 </div>
-                 <font color="red" class="pull-left mt10">
-                     提示：仅允许导入“xls”或“xlsx”格式文件！
-                 </font>
+                  <div class="mt10 pt5">
+                      <input type="checkbox" id="updateSupport" name="updateSupport" title="如果轮胎已经存在，更新这条数据。"> 是否更新已经存在的轮胎数据
+                      &nbsp;	<a onclick="$.table.importTemplate()" class="btn btn-default btn-xs"><i class="fa fa-file-excel-o"></i> 下载模板</a>
+                  </div>
+                  <div class="mt10 pt5 text-danger">
+                      入库编码填写说明：Excel 第一行必须填写默认入库编码，后续空行自动沿用最近一次出现的编码；如中途填写新编码，则从该行开始切换为新批次，直到再次填写其他编码。
+                  </div>
+                  <font color="red" class="pull-left mt10">
+                      提示：仅允许导入“xls”或“xlsx”格式文件！
+                  </font>
              </div>
          </form>
      </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/ruoyi-system/src/main/resources/mapper/tyre/BaseTyreMapper.xml b/ruoyi-system/src/main/resources/mapper/tyre/BaseTyreMapper.xml
index 6a416277..94e546d0 100644
--- a/ruoyi-system/src/main/resources/mapper/tyre/BaseTyreMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/tyre/BaseTyreMapper.xml
@@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="tyreNo"    column="tyre_no"    />
         <result property="selfNo"    column="self_no"    />
         <result property="tyreEpc"    column="tyre_epc"    />
+        <result property="inboundCode"    column="inbound_code"    />
         <result property="tyreBrand"    column="tyre_brand"    />
         <result property="tyreModel"    column="tyre_model"    />
         <result property="tyreLevel"    column="tyre_level"    />
@@ -32,10 +33,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="selectBaseTyreVo">
         select d.tyre_id, d.tyre_no, d.self_no, d.tyre_epc, d.tyre_brand, d.tyre_model, d.tyre_level, d.tyre_pattern,
-               d.grooves, d.pattern_depth, d.tyre_type, d.team, d.create_by, d.create_time, d.update_by, d.update_time,
-               d.remark, d.car_no, d.wheel_postion, d.dept_id, sd.dept_name
+               d.grooves, d.pattern_depth, d.tyre_type, d.team, d.inbound_code, d.create_by, d.create_time, d.update_by, d.update_time,
+               d.remark, d.car_no, d.wheel_postion, d.dept_id, tyre_dept.dept_name,
+               company_dept.dept_name as company, car_dept.dept_name as carTeam
         from base_tyre d
-        left join sys_dept sd on sd.dept_id = d.dept_id
+        <!-- 详情页与 tyre.html 列表页保持同一口径：公司/车队跟随当前安装车辆，修理厂跟随轮胎档案 team。 -->
+        left join base_car bc on bc.car_no = d.car_no
+        left join sys_dept car_dept on car_dept.dept_id = bc.dept_id
+        left join sys_dept repair_dept on repair_dept.dept_id = car_dept.parent_id
+        left join sys_dept company_dept on company_dept.dept_id = repair_dept.parent_id
+        left join sys_dept tyre_dept on tyre_dept.dept_id = d.dept_id
     </sql>
 
     <select id="selectBaseTyreList" parameterType="BaseTyre" resultMap="BaseTyreResult">
@@ -44,6 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         tyre_no,
         self_no,
         tyre_epc,
+        d.inbound_code,
         tyre_brand,
         tyre_model,
         tyre_level,
@@ -71,6 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="tyreNo != null  and tyreNo != ''"> and tyre_no like concat('%', #{tyreNo}, '%')</if>
             <if test="selfNo != null  and selfNo != ''"> and self_no like concat('%', #{selfNo}, '%')</if>
             <if test="tyreEpc != null  and tyreEpc != ''"> and tyre_epc like concat('%', #{tyreEpc}, '%')</if>
+            <if test="inboundCode != null  and inboundCode != ''"> and d.inbound_code = #{inboundCode}</if>
             <if test="tyreBrand != null  and tyreBrand != ''"> and tyre_brand like concat('%', #{tyreBrand}, '%')</if>
             <if test="tyreModel != null  and tyreModel != ''"> and tyre_model = #{tyreModel}</if>
             <if test="tyreLevel != null  and tyreLevel != ''"> and tyre_level = #{tyreLevel}</if>
@@ -101,6 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="tyreEpc != null  and tyreEpc != ''"> and d.tyre_epc like concat('%', #{tyreEpc}, '%')</if>
         </where>
     </select>
+
     <select id="getTeamByUser" resultType="java.lang.String">
         SELECT
             dept_name
@@ -135,6 +145,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="tyreNo != null  and tyreNo != ''">tyre_no,</if>
             <if test="selfNo != null  and selfNo != ''">self_no,</if>
             <if test="tyreEpc != null  and tyreEpc != ''">tyre_epc,</if>
+            <if test="inboundCode != null  and inboundCode != ''">inbound_code,</if>
             <if test="tyreBrand != null  and tyreBrand != ''">tyre_brand,</if>
             <if test="tyreModel != null  and tyreModel != ''">tyre_model,</if>
             <if test="tyreLevel != null  and tyreLevel != ''">tyre_level,</if>
@@ -155,6 +166,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="tyreNo != null  and tyreNo != ''">#{tyreNo},</if>
             <if test="selfNo != null  and selfNo != ''">#{selfNo},</if>
             <if test="tyreEpc != null  and tyreEpc != ''">#{tyreEpc},</if>
+            <if test="inboundCode != null  and inboundCode != ''">#{inboundCode},</if>
             <if test="tyreBrand != null  and tyreBrand != ''">#{tyreBrand},</if>
             <if test="tyreModel != null  and tyreModel != ''">#{tyreModel},</if>
             <if test="tyreLevel != null  and tyreLevel != ''">#{tyreLevel},</if>
@@ -178,6 +190,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="tyreNo != null  and tyreNo != ''">tyre_no = #{tyreNo},</if>
             <if test="selfNo != null  and selfNo != ''">self_no = #{selfNo},</if>
             <if test="tyreEpc != null  and tyreEpc != ''">tyre_epc = #{tyreEpc},</if>
+            <if test="inboundCode != null  and inboundCode != ''">inbound_code = #{inboundCode},</if>
             <if test="tyreBrand != null  and tyreBrand != ''">tyre_brand = #{tyreBrand},</if>
             <if test="tyreModel != null  and tyreModel != ''">tyre_model = #{tyreModel},</if>
             <if test="tyreLevel != null  and tyreLevel != ''">tyre_level = #{tyreLevel},</if>
@@ -206,5 +219,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{tyreId}
         </foreach>
     </delete>
-    
-</mapper>
\ No newline at end of file
+
+    <select id="selectByInboundCode" resultMap="BaseTyreResult">
+        <include refid="selectBaseTyreVo"/>
+        where d.inbound_code = #{inboundCode}
+        and d.tyre_epc is not null
+        and d.tyre_epc &lt;&gt; ''
+        order by d.tyre_id
+    </select>
+    <select id="countBaseTyreByInboundCode" resultType="int">
+        select count(1)
+        from base_tyre
+        where inbound_code = #{inboundCode}
+    </select>
+
+</mapper>