2025-10-14

库存标签补打 优化查询

src/main/java/com/gaotao/modules/inventoryStock/entity/InventoryStockOutData.java

@@ -1,10 +1,13 @@
 package com.gaotao.modules.inventoryStock.entity;
 
-import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.apache.ibatis.type.Alias;
 
+import java.util.List;
+
 @Data
+@EqualsAndHashCode(callSuper=false)
 @Alias("InventoryStockOutData")
 public class InventoryStockOutData extends InventoryStock {
 
@@ -14,5 +17,13 @@ public class InventoryStockOutData extends InventoryStock {
     private String umId;
     private String umName;
     private String parentRollType; // 父卷类型
+    private String userName;
+    private String warehouseName; // 仓库名称
+    private String warehouseId; // 仓库ID
+    private String locationName; // 库位名称
+    
+    // 查询条件 - 多选
+    private List<String> warehouseIdList; // 仓库ID列表（多选）
+    private List<String> statusList; // 状态列表（多选）
 
 }

src/main/java/com/gaotao/modules/wms/controller/WmsPrintController.java

@@ -115,5 +115,18 @@ public class WmsPrintController {
         return R.ok("属性变动成功");
     }
 
+    /**
+     * @description 获取仓库列表
+     * @author AI
+     * @date 2025/10/14
+     * @param inData 查询参数（site）
+     * @return R
+     */
+    @PostMapping("getWarehouseList")
+    public R getWarehouseList(@RequestBody InventoryStockOutData inData){
+        List<InventoryStockOutData> rows = wmsPrintService.getWarehouseList(inData);
+        return R.ok().put("rows", rows);
+    }
+
 
 } 

src/main/java/com/gaotao/modules/wms/dao/WmsPrintDao.java

@@ -50,4 +50,13 @@ public interface WmsPrintDao {
      */
     void updateInventoryStockAttribute(InventoryStockOutData data);
 
+    /**
+     * @description 获取仓库列表
+     * @author AI
+     * @date 2025/10/14
+     * @param data 查询参数（site）
+     * @return 仓库列表
+     */
+    List<InventoryStockOutData> getWarehouseList(InventoryStockOutData data);
+
 } 

src/main/java/com/gaotao/modules/wms/service/WmsPrintService.java

@@ -50,4 +50,13 @@ public interface WmsPrintService  {
      * @param inList 要更新的库存标签列表
      */
     void updateInventoryStockAttribute(List<InventoryStockOutData> inList);
+
+    /**
+     * @description 获取仓库列表
+     * @author AI
+     * @date 2025/10/14
+     * @param inData 查询参数（site）
+     * @return 仓库列表
+     */
+    List<InventoryStockOutData> getWarehouseList(InventoryStockOutData inData);
 } 

src/main/java/com/gaotao/modules/wms/service/impl/WmsPrintServiceImpl.java

@@ -132,4 +132,9 @@ public class WmsPrintServiceImpl implements WmsPrintService {
             wmsPrintDao.updateInventoryStockAttribute(data);
         }
     }
+
+    @Override
+    public List<InventoryStockOutData> getWarehouseList(InventoryStockOutData inData){
+        return wmsPrintDao.getWarehouseList(inData);
+    }
 } 

src/main/resources/mapper/wms/WmsPrintMapper.xml

@@ -150,15 +150,13 @@
         LEFT JOIN WareHouse W ON a.site = W.Site AND a.warehouse_id = W.WareHouseID
         LEFT JOIN Location L ON a.site = L.Site AND a.location_id = L.LocationName
         <where>
+            a.site in (select site from AccessSite where userID = #{query.userName})
             and a.status != '出库'
-            <if test="query.site != null and query.site != ''">
-                and A.site=#{query.site,jdbcType=VARCHAR}
-            </if>
-            <if test="query.buNo != null and query.buNo != ''">
-                and A.bu_no=#{query.buNo}
-            </if>
-            <if test="query.warehouseId != null and query.warehouseId != ''">
-                and A.warehouse_id like '%'+ #{query.warehouseId}+'%'
+            <if test="query.warehouseIdList != null and query.warehouseIdList.size() > 0">
+                and A.warehouse_id in
+                <foreach collection="query.warehouseIdList" item="warehouseId" open="(" separator="," close=")">
+                    #{warehouseId}
+                </foreach>
             </if>
             <if test="query.locationId != null and query.locationId != ''">
                 and A.location_id  like '%'+ #{query.locationId}+'%'
@@ -173,10 +171,13 @@
                 and A.part_no like '%'+ #{query.partNo}+'%'
             </if>
             <if test="query.partDescription != null and query.partDescription != ''">
-                and b.part_desc_en like '%'+ #{query.partDescEn}+'%'
+                and b.PartDescription like '%'+ #{query.partDescription}+'%'
             </if>
-            <if test="query.status != null and query.status != ''">
-                and a.status = #{query.status}
+            <if test="query.statusList != null and query.statusList.size() > 0">
+                and A.status in
+                <foreach collection="query.statusList" item="status" open="(" separator="," close=")">
+                    #{status}
+                </foreach>
             </if>
             <if test="query.labelType != null and query.labelType != ''">
                 and a.label_type = #{query.labelType}
@@ -199,4 +200,14 @@
           AND roll_no = #{rollNo,jdbcType=VARCHAR}
     </update>
 
+    <!-- 获取仓库列表 -->
+    <select id="getWarehouseList" resultType="InventoryStockOutData">
+        SELECT DISTINCT
+            WareHouseID as warehouseId,
+            WareHouseName as warehouseName
+        FROM WareHouse
+        WHERE site in (select site from AccessSite where userID = #{userName})
+        ORDER BY WareHouseID
+    </select>
+
 </mapper>