From 8fb1d1a1389c5f981248b459257ceb1ac4e2b28d Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期二, 31 十月 2023 14:37:02 +0800
Subject: [PATCH] 出入库明细分页修改
---
models/operation.go | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/models/operation.go b/models/operation.go
index 1fd2daf..7a62987 100644
--- a/models/operation.go
+++ b/models/operation.go
@@ -107,8 +107,14 @@
slf.Ids = ids
return slf
}
+
func (slf *OperationSearch) SetStatus(status constvar.OperationStatus) *OperationSearch {
slf.Status = status
+ return slf
+}
+
+func (slf *OperationSearch) SetBaseOperationType(baseOperationType constvar.BaseOperationType) *OperationSearch {
+ slf.BaseOperationType = baseOperationType
return slf
}
@@ -123,7 +129,7 @@
}
if slf.Keyword != "" {
- db = db.Where("product_name like ?", fmt.Sprintf("%%%v%%", slf.Keyword))
+ db = db.Where("number like ? or source_number like ?", fmt.Sprintf("%%%v%%", slf.Keyword), fmt.Sprintf("%%%v%%", slf.Keyword))
}
if slf.SourceNumber != "" {
@@ -152,6 +158,10 @@
if slf.Status > 0 {
db = db.Where("status = ?", slf.Status)
+ }
+
+ if slf.BaseOperationType != 0 {
+ db = db.Where("base_operation_type = ?", slf.BaseOperationType)
}
return db
@@ -254,7 +264,7 @@
if slf.PageNum*slf.PageSize > 0 {
db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
}
- if err := db.Preload("FromLocation").Preload("ToLocation").Find(&records).Error; err != nil {
+ if err := db.Preload("FromLocation").Preload("ToLocation").Order("created_at desc").Find(&records).Error; err != nil {
return records, total, fmt.Errorf("find records err: %v", err)
}
--
Gitblit v1.8.0