From 844f645172ebde7e94307004647e4a41f71030be Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 17 十一月 2023 18:57:37 +0800
Subject: [PATCH] 引入bleve全文搜索引擎，创建位置报表索引，支持位置报表全文搜索
---
controllers/report_forms_controller.go | 32 +++++++++++++++-----------------
1 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/controllers/report_forms_controller.go b/controllers/report_forms_controller.go
index 334b227..40488da 100644
--- a/controllers/report_forms_controller.go
+++ b/controllers/report_forms_controller.go
@@ -10,6 +10,7 @@
"wms/models"
"wms/request"
"wms/response"
+ "wms/service"
)
type ReportFormsController struct {
@@ -218,17 +219,6 @@
util.ResponseFormatList(c, code.Success, result, int(total))
}
-// GetOutOrInOperationList
-// @Tags 鎶ヨ〃
-// @Summary 鑾峰彇鍑哄叆搴撴搷浣滄槑缁�
-// @Produce application/json
-// @Param object body request.GetLocationForms true "鏌ヨ鍙傛暟"
-// @Success 200 {object} util.ResponseList{data=[]response.LocationForms} "鎴愬姛"
-// @Router /api-wms/v1/forms/getOutOrInOperationList [post]
-func (slf ReportFormsController) GetOutOrInOperationList(c *gin.Context) {
-
-}
-
// GetLocationForms
// @Tags 鎶ヨ〃
// @Summary 鑾峰彇浣嶇疆鎶ヨ〃
@@ -247,7 +237,7 @@
ids = append(ids, params.LocationId)
} else {
//鏌ヨ浣嶇疆
- locations, err := models.NewLocationSearch().SetJointName(params.WareHouseCode).FindAll()
+ locations, err := models.NewLocationSearch().SetJointName(params.WareHouseCode).SetType(3).FindAll()
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "鏌ヨ浣嶇疆澶辫触")
return
@@ -256,11 +246,19 @@
ids = append(ids, location.Id)
}
}
-
- amounts, total, err := models.NewLocationProductAmountSearch().SetPage(params.Page, params.PageSize).SetPreload(true).SetKeyword(params.KeyWord).SetProductId(params.ProductId).SetLocationIds(ids).FindByPage()
- if err != nil {
- util.ResponseFormat(c, code.RequestParamError, "鏌ヨ鏁伴噺澶辫触")
- return
+ var (
+ amounts []*models.LocationProductAmount
+ total int64
+ err error
+ )
+ if params.KeyWord != "" {
+ amounts, total, err = service.SearchLocationReport(params.KeyWord, params.Page, params.PageSize)
+ } else {
+ amounts, total, err = models.NewLocationProductAmountSearch().SetPage(params.Page, params.PageSize).SetPreload(true).SetKeyword(params.KeyWord).SetProductId(params.ProductId).SetLocationIds(ids).FindByPage()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鏌ヨ鏁伴噺澶辫触")
+ return
+ }
}
var result []response.LocationForms
--
Gitblit v1.8.0