From ea25d0bb100a95d043b420e5c32f86300bf19df4 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期六, 21 十月 2023 17:43:50 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS
---
models/location_product_amount.go | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/models/location_product_amount.go b/models/location_product_amount.go
index ec242ff..b51e00c 100644
--- a/models/location_product_amount.go
+++ b/models/location_product_amount.go
@@ -20,17 +20,18 @@
LocationProductAmountSearch struct {
LocationProductAmount
- Order string
- PageNum int
- PageSize int
- Keyword string
- Orm *gorm.DB
- Preload bool
+ Order string
+ PageNum int
+ PageSize int
+ Keyword string
+ Orm *gorm.DB
+ Preload bool
+ LocationProductIds []int
}
LocationProductAmountWithOperation struct {
//LocationProductAmount LocationProductAmount `json:"locationProductAmount"`
- LocationProductAmountId int `json:"locationProductAmount" gorm:"location_product_amount_id"`
+ LocationProductAmountId int `json:"locationProductAmountId" gorm:"location_product_amount_id"`
LocationId int `json:"locationId" gorm:"column:location_id"`
LocationName string `json:"locationName" gorm:"column:location_name"`
ProductId string `json:"productId" gorm:"column:product_id"`
@@ -83,6 +84,16 @@
return slf
}
+func (slf *LocationProductAmountSearch) SetLocationProductId(id int) *LocationProductAmountSearch {
+ slf.LocationProductId = id
+ return slf
+}
+
+func (slf *LocationProductAmountSearch) SetLocationProductIds(ids []int) *LocationProductAmountSearch {
+ slf.LocationProductIds = ids
+ return slf
+}
+
func (slf *LocationProductAmountSearch) build() *gorm.DB {
var db = slf.Orm.Model(&LocationProductAmount{})
@@ -100,6 +111,12 @@
if slf.Preload {
db = db.Model(&LocationProductAmount{}).Preload("LocationProduct").Preload("LocationProduct.Location").Preload("LocationProduct.Product")
}
+ if slf.LocationProductId != 0 {
+ db = db.Where("location_product_id=?", slf.LocationProductId)
+ }
+ if len(slf.LocationProductIds) > 0 {
+ db = db.Where("location_product_id in (?)", slf.LocationProductIds)
+ }
return db
}
--
Gitblit v1.8.0