diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApply.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApply.java
index e482898bba..741d54e00a 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApply.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApply.java
@@ -55,9 +55,9 @@ public class AsOldparthandleApply extends BaseEntity {
 	@ApiModelProperty("制单人姓名")
     private String createByName; // 制单人姓名
 	@ApiModelProperty("发起部门sid")
-    private String createDeptSid; // 发起部门sid
+    private String deptSid; // 发起部门sid
 	@ApiModelProperty("发起部门名称")
-    private String createDeptName; // 发起部门名称
+    private String deptName; // 发起部门名称
 	@ApiModelProperty("单据编号")
     private String billNo; // 单据编号
 	@ApiModelProperty("附件路径(多个附件之间英文逗号隔开)")
@@ -74,8 +74,6 @@ public class AsOldparthandleApply extends BaseEntity {
     private String useOrgSid; // 分公司sid
 	@ApiModelProperty("分公司名称")
     private String useOrgName; // 分公司名称
-	@ApiModelProperty("组织全路径")
-    private String orgSidPath; // 组织全路径
 	@ApiModelProperty("流程定义的id")
     private String procDefId; // 流程定义的id
 	@ApiModelProperty("环节定义的sid")
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyDetailsVo.java
index 9d76b05914..65966513c8 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyDetailsVo.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyDetailsVo.java
@@ -65,10 +65,10 @@ public class AsOldparthandleApplyDetailsVo implements Vo {
     private String createBySid;
 	@ApiModelProperty("制单人姓名")
     private String createByName; // 制单人姓名
-	@ApiModelProperty("发起部门sid")
-    private String createDeptSid; // 发起部门sid
-	@ApiModelProperty("发起部门名称")
-    private String createDeptName; // 发起部门名称
+    @ApiModelProperty("发起部门sid")
+    private String deptSid; // 发起部门sid
+    @ApiModelProperty("发起部门名称")
+    private String deptName; // 发起部门名称
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @ApiModelProperty("申请日期")
     private Date createTime;
@@ -88,8 +88,6 @@ public class AsOldparthandleApplyDetailsVo implements Vo {
     private String useOrgSid; // 分公司sid
 	@ApiModelProperty("分公司名称")
     private String useOrgName; // 分公司名称
-	@ApiModelProperty("组织全路径")
-    private String orgSidPath; // 组织全路径
 	@ApiModelProperty("流程定义的id")
     private String procDefId; // 流程定义的id
 	@ApiModelProperty("环节定义的sid")
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyDto.java
index 70ea517f4c..37ff46df34 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyDto.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyDto.java
@@ -64,10 +64,10 @@ public class AsOldparthandleApplyDto implements Dto {
     private String createBySid;
 	@ApiModelProperty("制单人姓名")
     private String createByName; // 制单人姓名
-	@ApiModelProperty("发起部门sid")
-    private String createDeptSid; // 发起部门sid
-	@ApiModelProperty("发起部门名称")
-    private String createDeptName; // 发起部门名称
+    @ApiModelProperty("发起部门sid")
+    private String deptSid; // 发起部门sid
+    @ApiModelProperty("发起部门名称")
+    private String deptName; // 发起部门名称
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @ApiModelProperty("申请日期")
     private Date createTime;
@@ -87,8 +87,6 @@ public class AsOldparthandleApplyDto implements Dto {
     private String useOrgSid; // 分公司sid
 	@ApiModelProperty("分公司名称")
     private String useOrgName; // 分公司名称
-	@ApiModelProperty("组织全路径")
-    private String orgSidPath; // 组织全路径
 	@ApiModelProperty("流程定义的id")
     private String procDefId; // 流程定义的id
 	@ApiModelProperty("环节定义的sid")
@@ -103,5 +101,5 @@ public class AsOldparthandleApplyDto implements Dto {
 	@ApiModelProperty("办结时间")
     private Date finishTime; // 办结时间
     @ApiModelProperty("待处理旧件列表")
-    private List<AsOldparthandleDto> asOldparthandleList;
+    private List<AsOldparthandleDto> asOldparthandleList = new ArrayList<>();
 }
\ No newline at end of file
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyQuery.java
index ef548b6b3a..0c042b2175 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyQuery.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyQuery.java
@@ -54,7 +54,7 @@ public class AsOldparthandleApplyQuery implements Query {
     @ApiModelProperty("分公司名称")
     private String useOrgName;
     @ApiModelProperty("申请部门")
-    private String createDeptName;
+    private String deptName;
     @ApiModelProperty("申请人")
     private String createByName;
     @ApiModelProperty("单据编号")
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyVo.java
index 6f5a9312ef..546054a8ae 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyVo.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyVo.java
@@ -60,7 +60,7 @@ public class AsOldparthandleApplyVo implements Vo {
     @ApiModelProperty("分公司名称")
     private String useOrgName;
     @ApiModelProperty("发起部门名称")
-    private String createDeptName;
+    private String deptName; // 发起部门名称
     @ApiModelProperty("制单人姓名")
     private String createByName;
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandle/AsOldparthandleService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandle/AsOldparthandleService.java
index f7bc497b8e..0ddd805555 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandle/AsOldparthandleService.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandle/AsOldparthandleService.java
@@ -58,59 +58,55 @@ import java.util.List;
  */
 @Service
 public class AsOldparthandleService extends MybatisBaseService<AsOldparthandleMapper, AsOldparthandle> {
-	private QueryWrapper<AsOldparthandle> createQueryWrapper(AsOldparthandleQuery query) {
-		// todo: 这里根据具体业务调整查询条件
-		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
-		QueryWrapper<AsOldparthandle> qw = new QueryWrapper<>();
-		return qw;
-	}
-	
-	public PagerVo<AsOldparthandleVo> listPageVo(PagerQuery<AsOldparthandleQuery> pq) {
-		AsOldparthandleQuery query = pq.getParams();
-		QueryWrapper<AsOldparthandle> qw = createQueryWrapper(query);
-		IPage<AsOldparthandle> page = PagerUtil.queryToPage(pq);
-		IPage<AsOldparthandleVo> pagging = baseMapper.selectPageVo(page, qw);
-		PagerVo<AsOldparthandleVo> p = PagerUtil.pageToVo(pagging, null);
-		return p;
-	}
-	
-	public void saveOrUpdateDto(AsOldparthandleDto dto){
+    private QueryWrapper<AsOldparthandle> createQueryWrapper(AsOldparthandleQuery query) {
+        // todo: 这里根据具体业务调整查询条件
+        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+        QueryWrapper<AsOldparthandle> qw = new QueryWrapper<>();
+        return qw;
+    }
+
+    public PagerVo<AsOldparthandleVo> listPageVo(PagerQuery<AsOldparthandleQuery> pq) {
+        AsOldparthandleQuery query = pq.getParams();
+        QueryWrapper<AsOldparthandle> qw = createQueryWrapper(query);
+        IPage<AsOldparthandle> page = PagerUtil.queryToPage(pq);
+        IPage<AsOldparthandleVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<AsOldparthandleVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public void saveOrUpdateDto(AsOldparthandleDto dto) {
+        this.insertByDto(dto);
+        return;
+    }
+
+    public void insertByDto(AsOldparthandleDto dto) {
+        AsOldparthandle entity = new AsOldparthandle();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.insert(entity);
+    }
+
+    public void updateByDto(AsOldparthandleDto dto) {
         String dtoSid = dto.getSid();
-        if (StringUtils.isBlank(dtoSid)) {
-            this.insertByDto(dto);
-            return; 
-        } 
-		this.updateByDto(dto);
-	}
-	
-	public void insertByDto(AsOldparthandleDto dto){
-		AsOldparthandle entity = new AsOldparthandle();
-		BeanUtil.copyProperties(dto, entity, "id", "sid");
-		baseMapper.insert(entity);
-	}
-	
-	public void updateByDto(AsOldparthandleDto dto){
-          String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
             return;
-        } 
-		AsOldparthandle entity = fetchBySid(dtoSid);
-		BeanUtil.copyProperties(dto, entity, "id", "sid");
-		baseMapper.updateById(entity);
-	}
-	
-	public AsOldparthandleDetailsVo fetchDetailsVoBySid(String sid){
-		AsOldparthandle entity = fetchBySid(sid);
-		AsOldparthandleDetailsVo vo = new AsOldparthandleDetailsVo();
-		BeanUtil.copyProperties(entity, vo);
-		return vo;
-	}
+        }
+        AsOldparthandle entity = fetchBySid(dtoSid);
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.updateById(entity);
+    }
+
+    public AsOldparthandleDetailsVo fetchDetailsVoBySid(String sid) {
+        AsOldparthandle entity = fetchBySid(sid);
+        AsOldparthandleDetailsVo vo = new AsOldparthandleDetailsVo();
+        BeanUtil.copyProperties(entity, vo);
+        return vo;
+    }
 
-	public void delByMainSid(String dtoSid) {
-		baseMapper.delByMainSid(dtoSid);
-	}
+    public void delByMainSid(String dtoSid) {
+        baseMapper.delByMainSid(dtoSid);
+    }
 
-	public List<AsOldparthandleDetailsVo> selByMainSid(String mainSid) {
-		return baseMapper.selByMainSid(mainSid);
-	}
+    public List<AsOldparthandleDetailsVo> selByMainSid(String mainSid) {
+        return baseMapper.selByMainSid(mainSid);
+    }
 }
\ No newline at end of file
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyMapper.xml
index af2c13f1ca..64304d25c7 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyMapper.xml
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyMapper.xml
@@ -4,7 +4,12 @@
 <!--    <where> ${ew.sqlSegment} </where>-->
 <!--    ${ew.customSqlSegment} -->
 	<select id="selectPageVo" resultType="com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApplyVo">
-		SELECT * FROM as_oldparthandle_apply <where> ${ew.sqlSegment} </where>
+		SELECT
+		aoa.*
+		FROM
+		as_oldparthandle_apply aoa
+		LEFT JOIN anrui_portal.sys_organization AS s ON aoa.deptSid = s.sid
+		<where> ${ew.sqlSegment} </where>
 	</select>
 	
 	<select id="selectListAllVo" resultType="com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApplyVo">
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyService.java
index 4e4bae5409..c40f843677 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyService.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyService.java
@@ -49,6 +49,8 @@ import com.yxt.anrui.as.feign.message.MessageFeign;
 import com.yxt.anrui.as.feign.message.MessageFlowVo;
 import com.yxt.anrui.as.feign.message.MessageFlowableQuery;
 import com.yxt.anrui.as.feign.portal.privilege.PrivilegeQuery;
+import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.as.feign.portal.sysuser.SysUserFeign;
 import com.yxt.common.base.config.component.FileUploadComponent;
@@ -89,7 +91,7 @@ public class AsOldparthandleApplyService extends MybatisBaseService<AsOldparthan
 	@Autowired
 	private FileUploadComponent fileUploadComponent;
 	@Autowired
-	private SysStaffOrgFeign sysStaffOrgFeign;
+	private SysOrganizationFeign sysOrganizationFeign;
 	@Autowired
 	private SysUserFeign sysUserFeign;
 	@Autowired
@@ -125,18 +127,18 @@ public class AsOldparthandleApplyService extends MybatisBaseService<AsOldparthan
 				String orgLevelKey = defaultIdReltBean.getData();
 				if ("1".equals(orgLevelKey)) {
 					orgSidPath = orgSidPath.substring(0, i1);
-					qw.like("orgSidPath", orgSidPath);
+					qw.like("s.orgSidPath", orgSidPath);
 				} else if ("2".equals(orgLevelKey)) {
 					orgSidPath = orgSidPath.substring(0, i2);
-					qw.like("orgSidPath", orgSidPath);
+					qw.like("s.orgSidPath", orgSidPath);
 				} else if ("3".equals(orgLevelKey)) {
 					orgSidPath = orgSidPath.substring(0, i3);
-					qw.like("orgSidPath", orgSidPath);
+					qw.like("s.orgSidPath", orgSidPath);
 				} else if ("4".equals(orgLevelKey)) {
 					orgSidPath = orgSidPath.substring(0, i4);
-					qw.like("orgSidPath", orgSidPath);
+					qw.like("s.orgSidPath", orgSidPath);
 				} else if ("5".equals(orgLevelKey)) {
-					qw.eq("createBySid", query.getUserSid());
+					qw.eq("aoa.createBySid", query.getUserSid());
 				} else {
 					PagerVo<AsOldparthandleApplyVo> p = new PagerVo<>();
 					return p;
@@ -147,32 +149,32 @@ public class AsOldparthandleApplyService extends MybatisBaseService<AsOldparthan
 			}
 		}
 		if (StringUtils.isNotBlank(query.getUseOrgName())){
-			qw.like("useOrgName",query.getUseOrgName());
+			qw.like("aoa.useOrgName",query.getUseOrgName());
 		}
-		if (StringUtils.isNotBlank(query.getCreateDeptName())){
-			qw.like("createDeptName",query.getCreateDeptName());
+		if (StringUtils.isNotBlank(query.getDeptName())){
+			qw.like("aoa.deptName",query.getDeptName());
 		}
 		if (StringUtils.isNotBlank(query.getCreateByName())){
-			qw.like("createByName",query.getCreateByName());
+			qw.like("aoa.createByName",query.getCreateByName());
 		}
 		if (StringUtils.isNotBlank(query.getBillNo())){
-			qw.like("billNo",query.getBillNo());
+			qw.like("aoa.billNo",query.getBillNo());
 		}
 		if (StringUtils.isNotBlank(query.getHandleReasonKey())){
-			qw.like("handleReasonKey",query.getHandleReasonKey());
+			qw.like("aoa.handleReasonKey",query.getHandleReasonKey());
 		}
 		if (StringUtils.isNotBlank(query.getHandleModeKey())){
-			qw.like("handleModeKey",query.getHandleModeKey());
+			qw.like("aoa.handleModeKey",query.getHandleModeKey());
 		}
 		String createStartTime = query.getCreateStartTime();
 		String createEndTime = query.getCreateEndTime();
-		qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
-				apply(StringUtils.isNotEmpty(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
+		qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (aoa.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
+				apply(StringUtils.isNotEmpty(createEndTime), "date_format (aoa.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
 				);
 		String finishStartTime = query.getFinishStartTime();
 		String finishEndTime = query.getFinishEndTime();
-		qw.apply(StringUtils.isNotEmpty(finishStartTime), "date_format (finishTime,'%Y-%m-%d') >= date_format('" + finishStartTime + "','%Y-%m-%d')").
-				apply(StringUtils.isNotEmpty(finishEndTime), "date_format (finishTime,'%Y-%m-%d') <= date_format('" + finishEndTime + "','%Y-%m-%d')"
+		qw.apply(StringUtils.isNotEmpty(finishStartTime), "date_format (aoa.finishTime,'%Y-%m-%d') >= date_format('" + finishStartTime + "','%Y-%m-%d')").
+				apply(StringUtils.isNotEmpty(finishEndTime), "date_format (aoa.finishTime,'%Y-%m-%d') <= date_format('" + finishEndTime + "','%Y-%m-%d')"
 				);
 		IPage<AsOldparthandleApply> page = PagerUtil.queryToPage(pq);
 		IPage<AsOldparthandleApplyVo> pagging = baseMapper.selectPageVo(page, qw);
@@ -274,7 +276,8 @@ public class AsOldparthandleApplyService extends MybatisBaseService<AsOldparthan
 		//流程中的参数赋值、若有网关，则赋值网关中判断的字段。
 		Map<String, Object> variables = new HashMap<>();
 		//用户的部门全路径sid
-		bv.setOrgSidPath(asOldparthandleApply.getOrgSidPath());
+		SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(asOldparthandleApply.getDeptSid()).getData();
+		bv.setOrgSidPath(deptVo.getOrgSidPath());
 		//业务sid
 		bv.setBusinessSid(businessSid);
 		//用户sid
@@ -363,7 +366,9 @@ public class AsOldparthandleApplyService extends MybatisBaseService<AsOldparthan
 		variables = flowableFeign.getMap(flowProcessMapQuery).getData();
 		//=======================================
 		bv.setFormVariables(variables);
-		bv.setOrgSidPath(asOldparthandleApply.getOrgSidPath());
+		//用户的部门全路径sid
+		SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(asOldparthandleApply.getDeptSid()).getData();
+		bv.setOrgSidPath(deptVo.getOrgSidPath());
 		if (bv.getTaskId().equals(asOldparthandleApply.getTaskId())) {
 			ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
 			if (!resultBean.getSuccess()) {
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryHandleSelectList.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryHandleSelectList.java
index fe2e17e2af..05b6f45c22 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryHandleSelectList.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryHandleSelectList.java
@@ -30,8 +30,6 @@ public class WmsInventoryHandleSelectList {
     private String warehouseRackSid;
     //库位编码
     private String warehouseRackCode;
-    //库位名称
-    private String areaName;
     //库存数量
     private String count;
 }
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryHandleSelectQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryHandleSelectQuery.java
index 1e77f89674..d4036753a9 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryHandleSelectQuery.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryHandleSelectQuery.java
@@ -19,8 +19,8 @@ public class WmsInventoryHandleSelectQuery implements Query {
     private String goodsSkuCode;
     //仓库
     private String warehouseName;
-    //库位
-    private String areaName;
+    //库位编码
+    private String warehouseRackCode;
     //供应商
     private String supplierName;
 }
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml
index ec92ea4544..c8fac9c55f 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml
@@ -279,12 +279,9 @@
         wi.warehouseName,
         wi.warehouseRackSid,
         wi.warehouseRackCode,
-        wwa.areaName,
         wi.count,
         wb.supplierName
         FROM wms_inventory wi
-        LEFT JOIN wms_warehouse_area wwa
-        ON wi.`warehouseRackSid` = wwa.`sid`
         LEFT JOIN wms_inventory_batch wb
         ON wi.sid = wb.inventorySid
         <where>
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java
index 6579b1a6c1..978be7bc1d 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java
@@ -485,8 +485,8 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
         if (StringUtils.isNotBlank(query.getWarehouseName())) {
             qw.like("wi.warehouseName", query.getWarehouseName());
         }
-        if (StringUtils.isNotBlank(query.getAreaName())) {
-            qw.like("wwa.areaName", query.getAreaName());
+        if (StringUtils.isNotBlank(query.getWarehouseRackCode())) {
+            qw.like("wi.warehouseRackCode", query.getWarehouseRackCode());
         }
         if (StringUtils.isNotBlank(query.getSupplierName())) {
             qw.like("wb.supplierName", query.getSupplierName());