diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/controller/SchBaseVehiclematerialgroupController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/controller/SchBaseVehiclematerialgroupController.java
index 8238b70..73b8333 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/controller/SchBaseVehiclematerialgroupController.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/controller/SchBaseVehiclematerialgroupController.java
@@ -8,6 +8,7 @@ import org.nl.common.domain.query.PageQuery;
 import org.nl.common.logging.annotation.Log;
 import org.nl.wms.sch.group.service.ISchBaseVehiclematerialgroupService;
 import org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup;
+import org.nl.wms.sch.group.service.dto.SchBaseVehiclematerialgroupQuery;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -33,7 +34,7 @@ public class SchBaseVehiclematerialgroupController {
     @Log("查询组盘信息管理")
     @ApiOperation("查询组盘信息管理")
     //@SaCheckPermission("@el.check('schBaseVehiclematerialgroup:list')")
-    public ResponseEntity<Object> query(@RequestParam Map whereJson, PageQuery page){
+    public ResponseEntity<Object> query(SchBaseVehiclematerialgroupQuery whereJson, PageQuery page){
         return new ResponseEntity<>(TableDataInfo.build(schBaseVehiclematerialgroupService.queryAll(whereJson,page)),HttpStatus.OK);
     }
 
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/ISchBaseVehiclematerialgroupService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/ISchBaseVehiclematerialgroupService.java
index 182b6a3..9587046 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/ISchBaseVehiclematerialgroupService.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/ISchBaseVehiclematerialgroupService.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.nl.common.domain.query.PageQuery;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup;
+import org.nl.wms.sch.group.service.dto.SchBaseVehiclematerialgroupQuery;
 
 import java.util.Map;
 import java.util.Set;
@@ -21,7 +22,7 @@ public interface ISchBaseVehiclematerialgroupService extends IService<SchBaseVeh
     * @param pageable 分页参数
     * @return IPage<SchBaseVehiclematerialgroup>
     */
-    IPage<SchBaseVehiclematerialgroup> queryAll(Map whereJson, PageQuery pageable);
+    IPage<SchBaseVehiclematerialgroup> queryAll(SchBaseVehiclematerialgroupQuery whereJson, PageQuery pageable);
 
     /**
     * 创建
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/SchBaseVehiclematerialgroup.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/SchBaseVehiclematerialgroup.java
index 6582430..c74a8fa 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/SchBaseVehiclematerialgroup.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/SchBaseVehiclematerialgroup.java
@@ -1,6 +1,7 @@
 package org.nl.wms.sch.group.service.dao;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;
@@ -128,4 +129,11 @@ public class SchBaseVehiclematerialgroup implements Serializable {
     @ApiModelProperty(value = "修改时间")
     private String update_time;
 
+    @TableField(exist = false)
+    private String material_name;
+    @TableField(exist = false)
+    private String material_code;
+    @TableField(exist = false)
+    private String material_spec;
+
 }
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.java
index 5f282f5..741686a 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.java
@@ -1,7 +1,9 @@
 package org.nl.wms.sch.group.service.dao.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup;
+import org.nl.wms.sch.group.service.dto.SchBaseVehiclematerialgroupQuery;
 
 /**
 * @author lyd
@@ -9,4 +11,5 @@ import org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup;
 **/
 public interface SchBaseVehiclematerialgroupMapper extends BaseMapper<SchBaseVehiclematerialgroup> {
 
+    IPage<SchBaseVehiclematerialgroup> selectPageLeftJoin(IPage<SchBaseVehiclematerialgroup> pages, SchBaseVehiclematerialgroupQuery query);
 }
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.xml
index cca11e6..0ceeb66 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.xml
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.xml
@@ -2,4 +2,19 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.nl.wms.sch.group.service.dao.mapper.SchBaseVehiclematerialgroupMapper">
 
+    <select id="selectPageLeftJoin" resultType="org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup">
+        SELECT vg.*
+            , ma.material_name
+            , ma.material_code
+            , ma.material_spec
+        FROM sch_base_vehiclematerialgroup vg
+        LEFT JOIN md_base_material ma ON vg.material_id = ma.material_id
+        WHERE 1 = 1
+        <if test="query.vehicle_code != null">
+            AND vg.vehicle_code = #{query.vehicle_code}
+        </if>
+        <if test="query.workshop_code != null">
+            AND vg.workshop_code = #{query.workshop_code}
+        </if>
+    </select>
 </mapper>
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dto/SchBaseVehiclematerialgroupQuery.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dto/SchBaseVehiclematerialgroupQuery.java
index 0c124b8..50d4648 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dto/SchBaseVehiclematerialgroupQuery.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dto/SchBaseVehiclematerialgroupQuery.java
@@ -1,12 +1,17 @@
 package org.nl.wms.sch.group.service.dto;
 
+import lombok.Data;
 import org.nl.common.domain.query.BaseQuery;
 import org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup;
 
+import java.io.Serializable;
+
 /**
 * @author lyd
 * @date 2023-05-16
 **/
-public class SchBaseVehiclematerialgroupQuery extends BaseQuery<SchBaseVehiclematerialgroup> {
-
+@Data
+public class SchBaseVehiclematerialgroupQuery implements Serializable {
+    private String vehicle_code;
+    private String workshop_code;
 }
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/impl/SchBaseVehiclematerialgroupServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/impl/SchBaseVehiclematerialgroupServiceImpl.java
index 3fe6760..a830d83 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/impl/SchBaseVehiclematerialgroupServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/impl/SchBaseVehiclematerialgroupServiceImpl.java
@@ -13,6 +13,7 @@ import org.nl.common.utils.SecurityUtils;
 import org.nl.wms.sch.group.service.ISchBaseVehiclematerialgroupService;
 import org.nl.wms.sch.group.service.dao.mapper.SchBaseVehiclematerialgroupMapper;
 import org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup;
+import org.nl.wms.sch.group.service.dto.SchBaseVehiclematerialgroupQuery;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -32,10 +33,9 @@ public class SchBaseVehiclematerialgroupServiceImpl extends ServiceImpl<SchBaseV
     private SchBaseVehiclematerialgroupMapper vehiclematerialgroupMapper;
 
     @Override
-    public IPage<SchBaseVehiclematerialgroup> queryAll(Map whereJson, PageQuery page){
-        LambdaQueryWrapper<SchBaseVehiclematerialgroup> lam = new LambdaQueryWrapper<>();
+    public IPage<SchBaseVehiclematerialgroup> queryAll(SchBaseVehiclematerialgroupQuery whereJson, PageQuery page){
         IPage<SchBaseVehiclematerialgroup> pages = new Page<>(page.getPage() + 1, page.getSize());
-        vehiclematerialgroupMapper.selectPage(pages, lam);
+        pages = vehiclematerialgroupMapper.selectPageLeftJoin(pages, whereJson);
         return pages;
     }
 
diff --git a/nladmin-ui/src/views/wms/sch/group/index.vue b/nladmin-ui/src/views/wms/sch/group/index.vue
index 278f28a..777dec6 100644
--- a/nladmin-ui/src/views/wms/sch/group/index.vue
+++ b/nladmin-ui/src/views/wms/sch/group/index.vue
@@ -25,6 +25,15 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="载具编码">
+            <el-input
+              v-model="query.vehicle_code"
+              clearable
+              size="mini"
+              placeholder="载具编码"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
           <rrOperation />
         </el-form>
       </div>
@@ -164,6 +173,9 @@
         <el-table-column prop="workorder_code" label="工单编码" :min-width="flexWidth('workorder_code',crud.data,'工单编码')" />
         <el-table-column prop="instorage_time" label="入库时间" :min-width="flexWidth('instorage_time',crud.data,'入库时间')" />
         <el-table-column prop="standing_time" label="静置时间(分钟)" :min-width="flexWidth('standing_time',crud.data,'静置时间(分钟)')" />
+        <el-table-column prop="material_name" label="物料名称" :min-width="flexWidth('material_qty',crud.data,'物料数量')" />
+        <el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_qty',crud.data,'物料数量')" />
+        <el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_qty',crud.data,'物料数量')" />
         <el-table-column prop="material_qty" label="物料数量" :min-width="flexWidth('material_qty',crud.data,'物料数量')" />
         <el-table-column prop="material_weight" label="物料重量" :min-width="flexWidth('material_weight',crud.data,'物料重量')" />
         <el-table-column prop="group_number" label="组盘次数" :min-width="flexWidth('group_number',crud.data,'组盘次数')" />