Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS

liujiandao

2023-09-27 5c1dfdd9f0d51821ac47a46cba74ef94bfe0141e

 models/location_product.go

@@ -69,6 +69,16 @@
   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) build() *gorm.DB {
   var db = slf.Orm.Model(&LocationProduct{})

@@ -87,6 +97,14 @@
      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)
   }

   return db
}