From 9cc7854c7262346a75b852afc65484be27c9537f Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期四, 16 十一月 2023 10:00:55 +0800
Subject: [PATCH] 出入库明细添加排序

---
 controllers/report_forms_controller.go |    2 +-
 models/location_product_amount.go      |    6 +++++-
 docs/docs.go                           |    2 ++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/controllers/report_forms_controller.go b/controllers/report_forms_controller.go
index d7bccab..ae4e689 100644
--- a/controllers/report_forms_controller.go
+++ b/controllers/report_forms_controller.go
@@ -166,7 +166,7 @@
 	if params.PageInfo.Check() {
 		detailsSearch.SetPage(params.Page, params.PageSize)
 	}
-	details, total, err := detailsSearch.SetPreload(true).SetProductId(params.ProduceId).Find()
+	details, total, err := detailsSearch.SetPreload(true).SetOrder("created_at desc").SetProductId(params.ProduceId).Find()
 	if err != nil {
 		util.ResponseFormat(c, code.RequestParamError, "鏌ヨ鎿嶄綔璇︽儏澶辫触")
 		return
diff --git a/docs/docs.go b/docs/docs.go
index 73253d7..b18d3bc 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -4639,6 +4639,8 @@
 	Description:      "",
 	InfoInstanceName: "swagger",
 	SwaggerTemplate:  docTemplate,
+	LeftDelim:        "{{",
+	RightDelim:       "}}",
 }
 
 func init() {
diff --git a/models/location_product_amount.go b/models/location_product_amount.go
index 94cf597..f076f91 100644
--- a/models/location_product_amount.go
+++ b/models/location_product_amount.go
@@ -124,7 +124,11 @@
 	}
 
 	if slf.Keyword != "" {
-		db = db.Where("product_name like ?", fmt.Sprintf("%%%v%%", slf.Keyword))
+		db = db.Joins("left join wms_location on wms_location_product_amount.location_id = wms_location.id").
+			Joins("left join material on wms_location_product_amount.product_id = material.id").
+			Joins("left join wms_product_category on wms_location_product_amount.product_category_id = wms_product_category.id").
+			Where("wms_location.name like ?", "%"+slf.Keyword+"%").Or("material.name like ?", "%"+slf.Keyword+"%").
+			Or("wms_product_category.name like ?", "%"+slf.Keyword+"%")
 	}
 
 	if slf.Preload {

--
Gitblit v1.8.0