修改扫码返回库位接口3

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTagMapper.xml

@@ -45,6 +45,8 @@
         FROM
         (
         SELECT
+        CONCAT(z.zoneName, '-', ar.areaName,' ',r.rackCode) houseInfo,
+        i.warehouseName store,
         CONCAT( i.warehouseName, '-', ar.areaName ) AS houseName,
         r.sid AS houseSid,
         r.printCount AS printNum,
@@ -54,6 +56,7 @@
         wms_warehouse_rack AS r
         LEFT JOIN wms_warehouse_info AS i ON r.warehouseSid = i.sid
         LEFT JOIN wms_warehouse_area as ar ON r.locationSid = ar.sid
+        LEFT JOIN wms_warehouse_zone AS z ON r.zoneSid = z.sid
         ) AS a
         <where>
             ${ew.sqlSegment}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTagService.java

@@ -203,8 +203,8 @@ public class WmsGoodsTagService extends MybatisBaseService<WmsGoodsTagMapper, Wm
             qw.eq("a.useOrgSid", useOrgSid);
         }
         if (StringUtils.isNotBlank(query.getName())) {
-            qw.and(wrapper -> wrapper.like("a.houseName", query.getName())
+            qw.and(wrapper -> wrapper.like("a.store", query.getName())
-                    .or().like("a.houseNum", query.getName())
+                    .or().like("a.houseInfo", query.getName())
             );
         }
         //ToDo:添加查询条件

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/app/HouseRackVo.java

@@ -26,4 +26,13 @@ public class HouseRackVo implements Vo {
      * 打印次数
      */
     private String printNum;
+
+    /**
+     * 仓库
+     */
+    private String store;
+    /**
+     * 格式例：区域-库区 库位编码
+     */
+    private String houseInfo;
 }