From d1cb09e7a23e7221b6c090ad33e4481a5b79f615 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 29 十一月 2023 17:44:29 +0800
Subject: [PATCH] 出入库报表搜索增加几个字段
---
controllers/location.go | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/controllers/location.go b/controllers/location.go
index 0860808..80adda5 100644
--- a/controllers/location.go
+++ b/controllers/location.go
@@ -4,6 +4,7 @@
"errors"
"github.com/gin-gonic/gin"
"strconv"
+ "strings"
"wms/extend/code"
"wms/extend/util"
"wms/models"
@@ -54,7 +55,7 @@
// @Tags 浣嶇疆
// @Summary 鑾峰彇浣嶇疆鍒楄〃
// @Produce application/json
-// @Param object body request.GetProductList true "鏌ヨ鍙傛暟"
+// @Param object body request.GetLocationList true "鏌ヨ鍙傛暟"
// @Success 200 {object} util.ResponseList{data=[]models.Location} "鎴愬姛"
// @Router /api-wms/v1/location/getLocationList [post]
func (slf LocationController) GetLocationList(c *gin.Context) {
@@ -67,7 +68,8 @@
if params.PageInfo.Check() {
search.SetPage(params.Page, params.PageSize)
}
- list, total, err := search.SetKeyword(params.KeyWord).SetType(params.Type).SetJointName(params.JointName).SetOrder("created_at desc").Find()
+ list, total, err := search.SetKeyword(params.KeyWord).SetType(params.Type).SetJointName(params.JointName).
+ SetIsScrapLocation(params.IsScrapLocation).SetOrder("created_at desc").Find()
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "鏌ユ壘澶辫触")
return
@@ -97,6 +99,11 @@
if location.ParentId == 0 {
tree = append(tree, location)
} else {
+ if _, ok := m[location.ParentId]; !ok {
+ tree = append(tree, location)
+ continue
+ }
+ m[location.ParentId].Children = make([]*models.Location, 0)
m[location.ParentId].Children = append(m[location.ParentId].Children, location)
}
}
@@ -159,7 +166,7 @@
}
params.JointName = first.JointName + "/" + params.Name
} else {
- params.JointName = params.Name
+ params.JointName = strings.Split(params.JointName, "/")[0] + "/" + params.Name
}
err := models.NewLocationSearch().Update(¶ms)
if err != nil {
--
Gitblit v1.8.0