From a8914a16b23e93f6bfd12bcfd5cbe8b24cf7eb84 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期日, 07 四月 2024 21:49:01 +0800
Subject: [PATCH] 发货支持仓库传参

---
 controllers/location.go |   26 ++++++++++++++++++++++++--
 1 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/controllers/location.go b/controllers/location.go
index e1102fa..ecd21c0 100644
--- a/controllers/location.go
+++ b/controllers/location.go
@@ -24,7 +24,7 @@
 func (slf LocationController) AddLocation(c *gin.Context) {
 	var params models.Location
 	if err := c.BindJSON(&params); err != nil {
-		util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�")
+		util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�:"+err.Error())
 		return
 	}
 	if err := slf.CheckLocation(params); err != nil {
@@ -39,6 +39,19 @@
 			return
 		}
 		params.JointName = first.JointName + "/" + params.Name
+		if first.WarehouseId != 0 {
+			params.WarehouseId = first.Id
+		} else {
+			//鏍规嵁浠撳簱缂╁啓鏌ヨ浠撳簱
+			houseCode := strings.Split(first.JointName, "/")[0]
+			warehouse, err := models.NewWarehouseSearch().SetCode(houseCode).First()
+			if err != nil {
+				util.ResponseFormat(c, code.RequestParamError, err)
+				return
+			}
+			params.WarehouseId = warehouse.Id
+		}
+
 	} else {
 		params.JointName = params.Name
 	}
@@ -68,7 +81,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
@@ -98,6 +112,14 @@
 		if location.ParentId == 0 {
 			tree = append(tree, location)
 		} else {
+			if _, ok := m[location.ParentId]; !ok {
+				tree = append(tree, location)
+				continue
+			}
+			if m[location.ParentId].Children == nil {
+				m[location.ParentId].Children = make([]*models.Location, 0)
+			}
+
 			m[location.ParentId].Children = append(m[location.ParentId].Children, location)
 		}
 	}

--
Gitblit v1.8.0