From a1389272559edb10d3c7f0f18846861b455342d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=87=E5=AE=BD=20=E5=8F=B2?= <swk28379@163.com>
Date: Tue, 4 Jun 2024 18:17:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E5=90=8D=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../warehouse/entity/LocationEntity.java      |  2 ++
 .../modules/warehouse/entity/Warehouse.java   |  2 ++
 .../service/Impl/WarehouseServiceImpl.java    | 24 +++++++++----------
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/spring/modules/warehouse/entity/LocationEntity.java b/src/main/java/com/spring/modules/warehouse/entity/LocationEntity.java
index c3b7d4d..bbc8237 100644
--- a/src/main/java/com/spring/modules/warehouse/entity/LocationEntity.java
+++ b/src/main/java/com/spring/modules/warehouse/entity/LocationEntity.java
@@ -1,11 +1,13 @@
 package com.spring.modules.warehouse.entity;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.spring.common.utils.QueryPage;
 import lombok.Data;
 
 import java.io.Serializable;
 
 @Data
+@TableName("location")
 public class LocationEntity extends QueryPage implements Serializable  {
     //主键id
     private Integer id;
diff --git a/src/main/java/com/spring/modules/warehouse/entity/Warehouse.java b/src/main/java/com/spring/modules/warehouse/entity/Warehouse.java
index a4f58e2..68aac56 100644
--- a/src/main/java/com/spring/modules/warehouse/entity/Warehouse.java
+++ b/src/main/java/com/spring/modules/warehouse/entity/Warehouse.java
@@ -1,5 +1,6 @@
 package com.spring.modules.warehouse.entity;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.spring.common.utils.QueryPage;
 import lombok.Data;
@@ -8,6 +9,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 @Data
+@TableName("warehouse")
 public class Warehouse extends QueryPage implements Serializable {
     //自增id
     private Integer id;
diff --git a/src/main/java/com/spring/modules/warehouse/service/Impl/WarehouseServiceImpl.java b/src/main/java/com/spring/modules/warehouse/service/Impl/WarehouseServiceImpl.java
index 9118470..f5c6528 100644
--- a/src/main/java/com/spring/modules/warehouse/service/Impl/WarehouseServiceImpl.java
+++ b/src/main/java/com/spring/modules/warehouse/service/Impl/WarehouseServiceImpl.java
@@ -28,31 +28,31 @@ public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper, Warehouse
 
     //分页查询
     @Override
-    public PageUtils getInfo(Warehouse wareHouse) {
+    public PageUtils getInfo(Warehouse warehouse) {
         LambdaQueryWrapper<Warehouse> queryWrapper = new LambdaQueryWrapper<>();
         //根据条件查询
         //仓库编码
-        if (StringUtils.isNotEmpty(wareHouse.getWarehouseId())){
-            queryWrapper.eq(Warehouse::getWarehouseId,wareHouse.getWarehouseId());
+        if (StringUtils.isNotEmpty(warehouse.getWarehouseId())){
+            queryWrapper.eq(Warehouse::getWarehouseId,warehouse.getWarehouseId());
         }
         //工程编号
-        if (StringUtils.isNotEmpty(wareHouse.getSite())){
-            queryWrapper.eq(Warehouse::getSite,wareHouse.getSite());
+        if (StringUtils.isNotEmpty(warehouse.getSite())){
+            queryWrapper.eq(Warehouse::getSite,warehouse.getSite());
         }
         //仓库名称
-        if (StringUtils.isNotEmpty(wareHouse.getWarehouseName())){
-            queryWrapper.eq(Warehouse::getWarehouseName,wareHouse.getWarehouseName());
+        if (StringUtils.isNotEmpty(warehouse.getWarehouseName())){
+            queryWrapper.eq(Warehouse::getWarehouseName,warehouse.getWarehouseName());
         }
         //保管员
-        if (StringUtils.isNotEmpty(wareHouse.getKeeper())){
-            queryWrapper.eq(Warehouse::getKeeper,wareHouse.getKeeper());
+        if (StringUtils.isNotEmpty(warehouse.getKeeper())){
+            queryWrapper.eq(Warehouse::getKeeper,warehouse.getKeeper());
         }
         //是否有效仓库
-        if (StringUtils.isNotEmpty(wareHouse.getValidStock())){
-            queryWrapper.eq(Warehouse::getValidStock,wareHouse.getValidStock());
+        if (StringUtils.isNotEmpty(warehouse.getValidStock())){
+            queryWrapper.eq(Warehouse::getValidStock,warehouse.getValidStock());
         }
         queryWrapper.orderByAsc(Warehouse::getId);
-        IPage<Warehouse> page = this.page(new Page<>(wareHouse.getPage(),wareHouse.getLimit()), queryWrapper);
+        IPage<Warehouse> page = this.page(new Page<>(warehouse.getPage(),warehouse.getLimit()), queryWrapper);
         return new PageUtils(page);
     }