料架和物料维护界面调整

smart-rack-base-system/src/main/java/com/zehong/system/domain/material/TRackMaterialRelation.java

@@ -29,6 +29,10 @@ public class TRackMaterialRelation extends BaseEntity
     @Excel(name = "物料代码")
     private String materialCode;
 
+    /** 料架号 */
+    @Excel(name = "料架号")
+    private String shelf;
+
     /** 名称 */
     @Excel(name = "名称")
     private String materialName;
@@ -37,7 +41,7 @@ public class TRackMaterialRelation extends BaseEntity
     @Excel(name = "规格型号")
     private String materialSpecifications;
 
-    public void setRelationId(Long relationId) 
+    public void setRelationId(Long relationId)
     {
         this.relationId = relationId;
     }
@@ -92,6 +96,14 @@ public class TRackMaterialRelation extends BaseEntity
         return materialSpecifications;
     }
 
+    public String getShelf() {
+        return shelf;
+    }
+
+    public void setShelf(String shelf) {
+        this.shelf = shelf;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

smart-rack-base-system/src/main/resources/mapper/material/TRackMaterialRelationMapper.xml

@@ -27,10 +27,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             relation.create_by,
             relation.create_time,
             relation.update_by,
-            relation.update_time
+            relation.update_time,
+            shelfInfo.f_shelf as shelf
         FROM
             t_rack_material_relation relation
         LEFT JOIN t_rack_material_info info ON info.material_id = relation.material_id
+        LEFT JOIN t_shelf_storage_location location ON location.f_rid = relation.rack_code
+        LEFT JOIN t_shelf_info shelfInfo ON shelfInfo.f_shelf_id = location.f_shelf_id
     </sql>
 
     <select id="selectTRackMaterialRelationList" parameterType="TRackMaterialRelation" resultMap="TRackMaterialRelationResult">
@@ -40,6 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="materialCode != null  and materialCode != ''"> and info.material_code like concat('%', #{materialCode}, '%')</if>
             <if test="materialName != null  and materialName != ''"> and info.material_name like concat('%', #{materialName}, '%')</if>
             <if test="materialSpecifications != null  and materialSpecifications != ''"> and info.material_specifications = #{materialSpecifications}</if>
+            <if test="shelf != null  and shelf != ''"> and shelfInfo.f_shelf like concat('%', #{shelf}, '%')</if>
         </where>
     </select>
     

smart-rack-base-system/src/main/resources/mapper/shelf/TShelfStorageLocationMapper.xml

@@ -37,20 +37,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectTShelfStorageLocationList" parameterType="TShelfStorageLocation" resultMap="TShelfStorageLocationResult">
         <include refid="selectTShelfStorageLocationVo"/>
         <where>  
-            <if test="shelfId != null "> and f_shelf_id = #{shelfId}</if>
-            <if test="label != null  and label != ''"> and f_label = #{label}</if>
-            <if test="location != null  and location != ''"> and f_location = #{location}</if>
-            <if test="index != null "> and f_index = #{index}</if>
-            <if test="rid != null  and rid != ''"> and f_rid = #{rid}</if>
-            <if test="inboundTime != null "> and f_inbound_time = #{inboundTime}</if>
-            <if test="outboundTime != null "> and f_outbound_time = #{outboundTime}</if>
+            <if test="shelfId != null "> and location.f_shelf_id = #{shelfId}</if>
+            <if test="label != null  and label != ''"> and location.f_label = #{label}</if>
+            <if test="location != null  and location != ''"> and location.f_location = #{location}</if>
+            <if test="index != null "> and location.f_index = #{index}</if>
+            <if test="rid != null  and rid != ''"> and location.f_rid = #{rid}</if>
+            <if test="inboundTime != null "> and location.f_inbound_time = #{inboundTime}</if>
+            <if test="outboundTime != null "> and location.f_outbound_time = #{outboundTime}</if>
         </where>
-        ORDER BY f_index
+        ORDER BY location.f_index
     </select>
     
     <select id="selectTShelfStorageLocationById" parameterType="Long" resultMap="TShelfStorageLocationResult">
         <include refid="selectTShelfStorageLocationVo"/>
-        where f_shelf_storage_location_id = #{shelfStorageLocationId}
+        where location.f_shelf_storage_location_id = #{shelfStorageLocationId}
     </select>
         
     <insert id="insertTShelfStorageLocation" parameterType="TShelfStorageLocation" useGeneratedKeys="true" keyProperty="fShelfStorageLocationId">

smart-rack-base-web/src/views/materialmanage/relation/index.vue

@@ -19,10 +19,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="名称" prop="materialName">
+      <el-form-item label="料架号" prop="shelf">
         <el-input
-          v-model="queryParams.materialName"
-          placeholder="请输入名称"
+          v-model="queryParams.shelf"
+          placeholder="请输入料架号"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -81,6 +81,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="料盘码" align="center" prop="rackCode" />
       <el-table-column label="物料代码" align="center" prop="materialCode" />
+      <el-table-column label="料架号" align="center" prop="shelf" />
       <el-table-column label="名称" align="center" prop="materialName" />
       <el-table-column label="规格型号" align="center" prop="materialSpecifications" />
       <!--<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -174,7 +175,7 @@ export default {
         pageSize: 10,
         rackCode: null,
         materialCode: null,
-        materialName: null,
+        shelf: null,
         materialSpecifications: null,
       },
       // 表单参数