From 91d7ca06128f996844aa7d2d691d083c944bdf1d Mon Sep 17 00:00:00 2001
From: lishihai <dslsh@dscom>
Date: 星期三, 03 七月 2024 17:22:16 +0800
Subject: [PATCH] 导入物料/产品->新模版BUG修复
---
controllers/location.go | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/controllers/location.go b/controllers/location.go
index 80adda5..5a4a3f9 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(¶ms); 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.WarehouseId
+ } 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
}
@@ -103,7 +116,10 @@
tree = append(tree, location)
continue
}
- m[location.ParentId].Children = make([]*models.Location, 0)
+ 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