Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS

jiangshuai

2023-09-21 f36fe3eca14e9a9543eb5dc8fa3bd9a7e3611b98

Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS

 controllers/location.go

@@ -60,6 +60,9 @@
        util.ResponseFormat(c, code.RequestParamError, "查找失败")
        return
    }
    for _, location := range list {
        location.JointName = location.ParentId + "/" + location.Name
    }

    util.ResponseFormatList(c, code.Success, list, int(total))
}

 docs/docs.go

@@ -2576,6 +2576,8 @@
    Description:      "",
    InfoInstanceName: "swagger",
    SwaggerTemplate:  docTemplate,
    LeftDelim:        "{{",
    RightDelim:       "}}",
}

func init() {

 models/location.go

@@ -25,6 +25,7 @@
        Notes                string                        `json:"notes" gorm:"type:varchar(255);comment:外部备注"`           //外部备注
        RecentlyCount        string                        `json:"recentlyCount" gorm:"type:varchar(255);comment:最近盘点"`   //最近盘点
        NextCount            string                        `json:"nextCount" gorm:"type:varchar(255);comment:下次盘点"`       //下次盘点
        JointName            string                        `json:"jointName" gorm:"-"`                                    //拼接名称
    }

    LocationSearch struct {