From e864fb9b3e2a376444311c8248ab2e0323df0bfb Mon Sep 17 00:00:00 2001
From: fanzongzhe0036 <fan6088588>
Date: Thu, 27 Feb 2025 15:00:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A7=E4=BB=B6=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E3=80=81=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml  | 7 +++++--
 .../biz/inventory/wmsinventory/WmsInventoryService.java    | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

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 6fba8b09bf..086ca43d69 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
@@ -479,12 +479,13 @@
         i.supplierName provider,
         i.taxRate rate,
         i.unit,
-        CONCAT(i.warehouseName, '-',a.areaName, '-',i.warehouseRackCode ) title
+        CONCAT(i.warehouseName, '-',z.zoneName,'-',a.areaName, ' ',i.warehouseRackCode ) title
         FROM
         wms_inventory AS i
         LEFT JOIN wms_warehouse_rack as r ON i.warehouseRackSid = r.sid
         LEFT JOIN wms_warehouse_area as a ON r.locationSid = a.sid
         LEFT JOIN wms_warehouse_info as wi ON wi.sid = i.warehouseSid
+        LEFT JOIN wms_warehouse_zone as z ON z.sid = r.zoneSid
         LEFT JOIN anrui_portal.sys_organization as s ON i.useOrgSid = s.sid
         <where>
             ${ew.sqlSegment}
@@ -529,7 +530,7 @@
         DATEDIFF( NOW(), i.firstInDate ) inventoryAge,
         i.cost price,
         i.unit,
-        CONCAT( i.warehouseName, '-', a.areaName, '-', i.warehouseRackCode ) title,
+        CONCAT( i.warehouseName,'-', z.zoneName, '-', a.areaName, ' ', i.warehouseRackCode ) title,
         i.sid,
         s.orgSidPath,
         i.createBySid
@@ -538,7 +539,9 @@
         LEFT JOIN wms_warehouse_rack AS r ON i.warehouseRackSid = r.sid
         LEFT JOIN wms_warehouse_area AS a ON r.locationSid = a.sid
         LEFT JOIN wms_warehouse_info AS w ON i.warehouseSid = w.sid
+        LEFT JOIN wms_warehouse_zone AS z ON z.sid = r.zoneSid
         LEFT JOIN anrui_portal.sys_organization AS s ON i.useOrgSid = s.sid
+        where w.warehouseTypeValue = '旧件库'
         ) e) a
         <where>
             ${ew.sqlSegment}
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 7239e0e72d..a1135ed27b 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
@@ -984,6 +984,7 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
                     .or().like("i.manufacturerName", query.getName())
                     .or().like("i.supplierName", query.getName())
                     .or().like("i.goodsSkuCode", query.getName())
+                    .or().like("z.zoneName", query.getName())
             );
         }
         qw.notLike("i.goodsID","-O");
@@ -1109,7 +1110,7 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
         if (StringUtils.isNotBlank(query.getName())) {
             qw.and(wrapper -> wrapper.like("a.title", query.getName())
                     .or().like("a.goodsSpuName", query.getName())
-                    .or().like("a.manufacturerName", query.getName())
+                    .or().like("a.factory", query.getName())
                     .or().like("a.goodsSkuCode", query.getName())
                     .or().like("a.repairId", query.getName())
             );