From 67b13bb40517145cfadc05d7b22411b16f1528d7 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期三, 17 四月 2024 10:33:07 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS
---
controllers/location.go | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/controllers/location.go b/controllers/location.go
index 327c689..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(¶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.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
}
--
Gitblit v1.8.0