From 3f4f2d033f63296ad7e80415cfe2af41f136bfc0 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期一, 13 十一月 2023 11:18:53 +0800
Subject: [PATCH] 修改文件服务器端口号
---
controllers/location.go | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/controllers/location.go b/controllers/location.go
index 5bfec45..ff2d5c4 100644
--- a/controllers/location.go
+++ b/controllers/location.go
@@ -54,7 +54,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 +67,7 @@
if params.PageInfo.Check() {
search.SetPage(params.Page, params.PageSize)
}
- list, total, err := search.SetKeyword(params.KeyWord).SetJointName(params.JointName).SetOrder("created_at desc").Find()
+ list, total, err := search.SetKeyword(params.KeyWord).SetType(params.Type).SetJointName(params.JointName).SetOrder("created_at desc").Find()
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "鏌ユ壘澶辫触")
return
@@ -76,6 +76,34 @@
util.ResponseFormatList(c, code.Success, list, int(total))
}
+// GetLocationTreeList
+// @Tags 浣嶇疆
+// @Summary 鑾峰彇浣嶇疆鍒楄〃鏍�
+// @Produce application/json
+// @Success 200 {object} util.ResponseList{data=[]models.Location} "鎴愬姛"
+// @Router /api-wms/v1/location/getLocationTreeList [get]
+func (slf LocationController) GetLocationTreeList(c *gin.Context) {
+ all, err := models.NewLocationSearch().SetType(3).FindAll()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鏌ユ壘澶辫触")
+ return
+ }
+ var tree []*models.Location
+ m := make(map[int]*models.Location)
+ for _, location := range all {
+ m[location.Id] = location
+ }
+ for _, location := range all {
+ if location.ParentId == 0 {
+ tree = append(tree, location)
+ } else {
+ m[location.ParentId].Children = append(m[location.ParentId].Children, location)
+ }
+ }
+
+ util.ResponseFormat(c, code.Success, tree)
+}
+
// GetLocationDetails
// @Tags 浣嶇疆
// @Summary 鑾峰彇浣嶇疆璇︽儏
--
Gitblit v1.8.0