修改入库管理 盘点管理联查

ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/domain/ViewProductAndStock.java

@@ -7,7 +7,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 可出库的库存物资信息对象 view_product_and_stock
- * 
+ *
  * @author ruoyi
  * @date 2025-05-21
  */
@@ -38,63 +38,72 @@ public class ViewProductAndStock extends BaseEntity
     /** 仓库 */
     @Excel(name = "仓库")
     private String warehouseId;
+    private String warehouseName;
 
-    public void setOnlyIdentity(Long onlyIdentity) 
+    public String getWarehouseName() {
+        return warehouseName;
+    }
+
+    public void setWarehouseName(String warehouseName) {
+        this.warehouseName = warehouseName;
+    }
+
+    public void setOnlyIdentity(Long onlyIdentity)
     {
         this.onlyIdentity = onlyIdentity;
     }
 
-    public Long getOnlyIdentity() 
+    public Long getOnlyIdentity()
     {
         return onlyIdentity;
     }
 
-    public void setProductId(String productId) 
+    public void setProductId(String productId)
     {
         this.productId = productId;
     }
 
-    public String getProductId() 
+    public String getProductId()
     {
         return productId;
     }
 
-    public void setLotNo(String lotNo) 
+    public void setLotNo(String lotNo)
     {
         this.lotNo = lotNo;
     }
 
-    public String getLotNo() 
+    public String getLotNo()
     {
         return lotNo;
     }
 
-    public void setProductName(String productName) 
+    public void setProductName(String productName)
     {
         this.productName = productName;
     }
 
-    public String getProductName() 
+    public String getProductName()
     {
         return productName;
     }
 
-    public void setQuantity(String quantity) 
+    public void setQuantity(String quantity)
     {
         this.quantity = quantity;
     }
 
-    public String getQuantity() 
+    public String getQuantity()
     {
         return quantity;
     }
 
-    public void setWarehouseId(String warehouseId) 
+    public void setWarehouseId(String warehouseId)
     {
         this.warehouseId = warehouseId;
     }
 
-    public String getWarehouseId() 
+    public String getWarehouseId()
     {
         return warehouseId;
     }