From 201be38fd71ee487d887e686cf07773ec750a8de Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期四, 26 十月 2023 17:56:50 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS

---
 models/location_product.go |   69 ++++++++++++++++++++++++++++++----
 1 files changed, 60 insertions(+), 9 deletions(-)

diff --git a/models/location_product.go b/models/location_product.go
index b3edb61..f737765 100644
--- a/models/location_product.go
+++ b/models/location_product.go
@@ -22,12 +22,13 @@
 
 	LocationProductSearch struct {
 		LocationProduct
-		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
+		LocationIds []int
 	}
 )
 
@@ -69,6 +70,26 @@
 	return slf
 }
 
+func (slf *LocationProductSearch) SetProductId(productId string) *LocationProductSearch {
+	slf.ProductId = productId
+	return slf
+}
+
+func (slf *LocationProductSearch) SetLocationId(locationId int) *LocationProductSearch {
+	slf.LocationId = locationId
+	return slf
+}
+
+func (slf *LocationProductSearch) SetLocationIds(locationIds []int) *LocationProductSearch {
+	slf.LocationIds = locationIds
+	return slf
+}
+
+func (slf *LocationProductSearch) SetAreaId(areaId int) *LocationProductSearch {
+	slf.AreaId = areaId
+	return slf
+}
+
 func (slf *LocationProductSearch) build() *gorm.DB {
 	var db = slf.Orm.Model(&LocationProduct{})
 
@@ -80,11 +101,33 @@
 	}
 
 	if slf.Keyword != "" {
-		db = db.Where("product_name like ?", fmt.Sprintf("%%%v%%", slf.Keyword))
+		//db = db.Where("Product.name like ?", fmt.Sprintf("%%%v%%", slf.Keyword))
+		db.Joins("left join wms_location on wms_location_product.location_id = wms_location.id").
+			Joins("left join material on wms_location_product.product_id = material.id").
+			Joins("left join wms_product_category on wms_location_product.product_category_id = wms_product_category.id").
+			Where("wms_location.name like ?", fmt.Sprintf("%%%v%%", slf.Keyword)).
+			Or("material.name like ?", fmt.Sprintf("%%%v%%", slf.Keyword)).
+			Or("wms_product_category.name like ?", fmt.Sprintf("%%%v%%", slf.Keyword))
 	}
 
 	if slf.Preload {
 		db = db.Model(&LocationProduct{}).Preload("Location").Preload("Area").Preload("ProductCategory").Preload("Product")
+	}
+
+	if slf.LocationId != 0 {
+		db = db.Where("location_id = ?", slf.LocationId)
+	}
+
+	if slf.ProductId != "" {
+		db = db.Where("product_id=?", slf.ProductId)
+	}
+
+	if len(slf.LocationIds) > 0 {
+		db = db.Where("location_id in (?)", slf.LocationIds)
+	}
+
+	if slf.AreaId != 0 {
+		db = db.Where("area_id = ?", slf.AreaId)
 	}
 
 	return db
@@ -153,7 +196,7 @@
 	if slf.PageNum*slf.PageSize > 0 {
 		db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
 	}
-	if err := db.Find(&records).Error; err != nil {
+	if err := db.Preload("Location").Preload("ProductCategory").Preload("Product").Find(&records).Error; err != nil {
 		return records, total, fmt.Errorf("find records err: %v", err)
 	}
 
@@ -166,9 +209,17 @@
 		db      = slf.build()
 	)
 
-	if err := db.Find(&records).Error; err != nil {
+	if err := db.Preload("Location").Preload("ProductCategory").Preload("Product").Find(&records).Error; err != nil {
 		return records, fmt.Errorf("find records err: %v", err)
 	}
 
 	return records, nil
 }
+
+func (slf *LocationProductSearch) FirstRes() (*LocationProduct, *gorm.DB) {
+	var (
+		record = new(LocationProduct)
+		db     = slf.build()
+	)
+	return record, db.First(record)
+}

--
Gitblit v1.8.0