From c950586b718ae6fc198bedf424609a4ac94cb5d1 Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期四, 04 七月 2024 18:16:07 +0800 Subject: [PATCH] 增加根据位置或仓库查询产品及库存列表 --- models/location_product_amount.go | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/models/location_product_amount.go b/models/location_product_amount.go index d4990b1..98abd13 100644 --- a/models/location_product_amount.go +++ b/models/location_product_amount.go @@ -11,10 +11,9 @@ type ( LocationProductAmount struct { WmsModel - Id int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"` - //LocationProductId int `json:"locationProductId" gorm:"type:int;not null;comment:涓婃灦瑙勫垯id"` //涓婃灦瑙勫垯id - //LocationProduct LocationProduct `json:"locationProduct" gorm:"foreignKey:LocationProductId;references:Id"` + Id int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"` LocationId int `json:"locationId" gorm:"type:int;not null;comment:浣嶇疆id"` //浣嶇疆id + WarehouseId int `json:"warehouseId" gorm:"type:int;not null;default:0;comment:浠撳簱id"` Location Location `json:"location" gorm:"foreignKey:LocationId;references:id"` ProductCategoryID int `json:"productCategoryId" gorm:"type:int;not null;comment:浜у搧绉嶇被id"` //浜у搧绉嶇被id ProductCategory ProductCategory `json:"productCategory" gorm:"foreignKey:ProductCategoryID;references:Id"` @@ -127,6 +126,11 @@ return slf } +func (slf *LocationProductAmountSearch) SetWarehouseId(wid int) *LocationProductAmountSearch { + slf.WarehouseId = wid + return slf +} + func (slf *LocationProductAmountSearch) build() *gorm.DB { var db = slf.Orm.Model(&LocationProductAmount{}) @@ -148,9 +152,7 @@ if slf.Preload { db = db.Model(&LocationProductAmount{}).Preload("Location").Preload("Product").Preload("ProductCategory") } - //if slf.LocationProductId != 0 { - // db = db.Where("location_product_id=?", slf.LocationProductId) - //} + if len(slf.ProductIds) > 0 { db = db.Where("product_id in (?)", slf.ProductIds) } @@ -175,6 +177,10 @@ db = db.Where(slf.Query) } + if slf.WarehouseId != 0 { + db = db.Where("warehouse_id = ?", slf.WarehouseId) + } + return db } -- Gitblit v1.8.0