From 7661cf3c3725cd3a9057625ea4a5f1add9001f25 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 15 八月 2025 09:40:14 +0800
Subject: [PATCH] feat: 仓库货架修改
---
src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelvesRowcol.java | 7 ++++---
src/main/java/com/ruoyi/warehouse/pojo/Warehouse.java | 4 ++--
src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelves.java | 4 ++--
src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesRowcolController.java | 6 ++++--
src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java | 7 -------
5 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java b/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java
index f373b88..41dcdf8 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java
@@ -23,13 +23,6 @@
public class WarehouseGoodsShelvesController extends BaseController {
@Autowired
private WarehouseGoodsShelvesService warehouseGoodsShelvesService;
- @GetMapping("/listPage")
- @ApiOperation("鍟嗗搧璐ф灦-鍒嗛〉鏌ヨ")
- @Log(title = "鍟嗗搧璐ф灦-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
- public AjaxResult listPage(Page page, WarehouseGoodsShelves warehouseGoodsShelves) {
- IPage<WarehouseGoodsShelves> listPage = warehouseGoodsShelvesService.listPage(page, warehouseGoodsShelves);
- return AjaxResult.success(listPage);
- }
@GetMapping("/listById")
@ApiOperation("鍟嗗搧璐ф灦-鏌ヨ")
diff --git a/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesRowcolController.java b/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesRowcolController.java
index 8f6c136..c1914d8 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesRowcolController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesRowcolController.java
@@ -1,5 +1,6 @@
package com.ruoyi.warehouse.controller;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -28,8 +29,9 @@
@GetMapping("/list")
@ApiOperation("鍟嗗搧璐ф灦琛屽垪-鏌ヨ")
@Log(title = "鍟嗗搧璐ф灦琛屽垪-鏌ヨ", businessType = BusinessType.OTHER)
- public AjaxResult list() {
- List<WarehouseGoodsShelvesRowcol> list = warehouseGoodsShelvesRowcolService.list();
+ public AjaxResult list(Long warehouseGoodsShelvesId) {
+ List<WarehouseGoodsShelvesRowcol> list = warehouseGoodsShelvesRowcolService.list(new QueryWrapper<WarehouseGoodsShelvesRowcol>().lambda()
+ .eq(WarehouseGoodsShelvesRowcol::getWarehouseGoodsShelvesId, warehouseGoodsShelvesId));
return AjaxResult.success(list);
}
// @GetMapping("/listPage")
diff --git a/src/main/java/com/ruoyi/warehouse/pojo/Warehouse.java b/src/main/java/com/ruoyi/warehouse/pojo/Warehouse.java
index f8c522c..a8ae602 100644
--- a/src/main/java/com/ruoyi/warehouse/pojo/Warehouse.java
+++ b/src/main/java/com/ruoyi/warehouse/pojo/Warehouse.java
@@ -38,7 +38,7 @@
* 鍒涘缓鐢ㄦ埛
*/
@TableField(fill = FieldFill.INSERT)
- private Long createUser;
+ private Integer createUser;
/**
* 淇敼鏃堕棿
@@ -50,7 +50,7 @@
* 淇敼鐢ㄦ埛
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
- private Long updateUser;
+ private Integer updateUser;
/**
* 绉熸埛ID
diff --git a/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelves.java b/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelves.java
index ebe14b5..1a2e5ab 100644
--- a/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelves.java
+++ b/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelves.java
@@ -52,7 +52,7 @@
* 鍒涘缓鐢ㄦ埛
*/
@TableField(fill = FieldFill.INSERT)
- private Long createUser;
+ private Integer createUser;
/**
* 淇敼鏃堕棿
@@ -64,7 +64,7 @@
* 淇敼鐢ㄦ埛
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
- private Long updateUser;
+ private Integer updateUser;
/**
* 绉熸埛ID
diff --git a/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelvesRowcol.java b/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelvesRowcol.java
index 68c8772..a19e440 100644
--- a/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelvesRowcol.java
+++ b/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelvesRowcol.java
@@ -43,13 +43,14 @@
/**
* 鍒涘缓鏃堕棿
*/
-
+ @TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
/**
* 鍒涘缓鐢ㄦ埛
*/
- private Long createUser;
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
/**
* 淇敼鏃堕棿
@@ -61,7 +62,7 @@
* 淇敼鐢ㄦ埛
*/
@TableField(fill = FieldFill.INSERT)
- private Long updateUser;
+ private Integer updateUser;
/**
* 绉熸埛ID
--
Gitblit v1.9.3