From fb409de4b6ad6bf4d4d0c5ddf652687fdfe7bacb Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 12 九月 2023 14:55:04 +0800
Subject: [PATCH] 仓库增删改查接口
---
/dev/null | 27 -
models/warehouse.go | 249 +++++++++++
request/warehouse.go | 20
models/db.go | 4
controllers/warehouse.go | 153 +++++++
main.go | 24
docs/swagger.yaml | 182 ++++++++
docs/docs.go | 271 ++++++++++++
models/model.go | 17
conf/config.yaml | 2
docs/swagger.json | 271 ++++++++++++
router/router.go | 12
12 files changed, 1,192 insertions(+), 40 deletions(-)
diff --git a/conf/config.yaml b/conf/config.yaml
index 0fa61e7..204b2ce 100644
--- a/conf/config.yaml
+++ b/conf/config.yaml
@@ -7,7 +7,7 @@
nodeId: wangpengfei
ossType: local
db:
- dsn: root:c++java123@tcp(192.168.20.119:3306)/aps_server2?charset=utf8&parseTime=True&loc=Local
+ dsn: root:c++java123@tcp(192.168.20.119:3306)/wms?charset=utf8&parseTime=True&loc=Local
logMode: true
maxIdleCon: 20
maxOpenCon: 100
diff --git a/constvar/global.go b/constvar/global.go
deleted file mode 100644
index e712d55..0000000
--- a/constvar/global.go
+++ /dev/null
@@ -1,9 +0,0 @@
-package constvar
-
-import (
- "google.golang.org/grpc"
-)
-
-var (
- GrpcClient *grpc.ClientConn
-)
diff --git a/controllers/warehouse.go b/controllers/warehouse.go
new file mode 100644
index 0000000..f4a297a
--- /dev/null
+++ b/controllers/warehouse.go
@@ -0,0 +1,153 @@
+package controllers
+
+import (
+ "errors"
+ "fmt"
+ "github.com/gin-gonic/gin"
+ "github.com/spf13/cast"
+ "gorm.io/gorm"
+ "wms/extend/code"
+ "wms/extend/util"
+ "wms/models"
+ "wms/pkg/logx"
+ "wms/pkg/structx"
+ "wms/request"
+)
+
+type WarehouseController struct{}
+
+// Add
+// @Tags 浠撳簱
+// @Summary 娣诲姞浠撳簱
+// @Produce application/json
+// @Param object body request.AddWarehouse true "浠撳簱淇℃伅"
+// @Success 200 {object} util.Response "鎴愬姛"
+// @Router /api-wms/v1/warehouse/warehouse [post]
+func (slf WarehouseController) Add(c *gin.Context) {
+ var reqParams request.AddWarehouse
+ var params models.Warehouse
+ if err := c.BindJSON(&reqParams); err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�")
+ return
+ }
+ if err := structx.AssignTo(reqParams, ¶ms); err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鏁版嵁杞崲閿欒")
+ return
+ }
+
+ if err := slf.ParamsCheck(params); err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+ if err := models.NewWarehouseSearch().Create(¶ms); err != nil {
+ logx.Errorf("warehouse create err: %v", err)
+ util.ResponseFormat(c, code.SaveFail, "鎻掑叆澶辫触")
+ return
+ }
+
+ util.ResponseFormat(c, code.Success, "娣诲姞鎴愬姛")
+}
+
+// Update
+// @Tags 浠撳簱
+// @Summary 缂栬緫浠撳簱
+// @Produce application/json
+// @Param object body request.UpdateWarehouse true "浠撳簱淇℃伅"
+// @Param id path string true "浠撳簱id"
+// @Success 200 {object} util.Response "鎴愬姛"
+// @Router /api-wms/v1/warehouse/warehouse/{id} [put]
+func (slf WarehouseController) Update(c *gin.Context) {
+ id := cast.ToUint(c.Param("id"))
+ if id == 0 {
+ util.ResponseFormat(c, code.RequestParamError, "绌虹殑璁板綍id")
+ return
+ }
+ var (
+ reqParams request.UpdateWarehouse
+ params models.Warehouse
+ )
+ if err := c.BindJSON(&reqParams); err != nil {
+ util.ResponseFormat(c, code.RequestParamError, fmt.Sprintf("鍙傛暟瑙ｆ瀽澶辫触: %v"+err.Error()))
+ return
+ }
+ if err := structx.AssignTo(reqParams, ¶ms); err != nil {
+ util.ResponseFormat(c, code.RequestParamError, fmt.Sprintf("鏁版嵁杞崲閿欒: %v", err.Error()))
+ return
+ }
+ params.ID = id
+ if err := slf.ParamsCheck(params); err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+
+ err := models.NewWarehouseSearch().SetID(params.ID).Update(¶ms)
+
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "淇敼澶辫触")
+ return
+ }
+
+ util.ResponseFormat(c, code.UpdateSuccess, "鏇存柊鎴愬姛")
+}
+
+func (slf WarehouseController) ParamsCheck(params models.Warehouse) (err error) {
+ var oldRecord *models.Warehouse
+ if params.ID != 0 {
+ oldRecord, err = models.NewWarehouseSearch().SetID(params.ID).First()
+ if err == gorm.ErrRecordNotFound {
+ return errors.New("璁板綍涓嶅瓨鍦�")
+ }
+ }
+ if oldRecord == nil || params.Code != oldRecord.Code {
+ _, err = models.NewWarehouseSearch().SetCode(params.Code).First()
+ if err != gorm.ErrRecordNotFound {
+ return errors.New("浠撳簱缂栧彿閲嶅")
+ }
+ }
+
+ return nil
+}
+
+// List
+// @Tags 浠撳簱
+// @Summary 鏌ヨ浠撳簱鍒楄〃
+// @Produce application/json
+// @Param object query request.GetWarehouseList true "鏌ヨ鍙傛暟"
+// @Success 200 {object} util.ResponseList{data=[]models.Warehouse} "鎴愬姛"
+// @Router /api-wms/v1/warehouse/warehouse [get]
+func (slf WarehouseController) List(c *gin.Context) {
+ var params request.GetWarehouseList
+ if err := c.ShouldBindQuery(¶ms); err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+ list, total, err := models.NewWarehouseSearch().SetPage(params.Page, params.PageSize).SetKeyword(params.Keyword).SetOrder("id desc").Find()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鏌ユ壘澶辫触")
+ return
+ }
+
+ util.ResponseFormatList(c, code.Success, list, cast.ToInt(total))
+}
+
+// Delete
+// @Tags 浠撳簱
+// @Summary 鍒犻櫎浠撳簱
+// @Produce application/json
+// @Param id path string true "浠撳簱id"
+// @Success 200 {object} util.Response "鎴愬姛"
+// @Router /api-wms/v1/warehouse/warehouse/{id} [delete]
+func (slf WarehouseController) Delete(c *gin.Context) {
+ id := cast.ToUint(c.Param("id"))
+ if id == 0 {
+ util.ResponseFormat(c, code.RequestParamError, "绌虹殑璁板綍id")
+ return
+ }
+
+ err := models.NewWarehouseSearch().SetID(id).Delete()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鍒犻櫎澶辫触")
+ return
+ }
+ util.ResponseFormat(c, code.UpdateSuccess, "鍒犻櫎鎴愬姛")
+}
diff --git a/docs/docs.go b/docs/docs.go
index 491292f..854c05e 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -149,6 +149,150 @@
}
}
}
+ },
+ "/api-wms/v1/warehouse/warehouse": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "浠撳簱"
+ ],
+ "summary": "鏌ヨ浠撳簱鍒楄〃",
+ "parameters": [
+ {
+ "type": "string",
+ "name": "keyword",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "椤电爜",
+ "name": "page",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "姣忛〉澶у皬",
+ "name": "pageSize",
+ "in": "query"
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/util.ResponseList"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.Warehouse"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ },
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "浠撳簱"
+ ],
+ "summary": "娣诲姞浠撳簱",
+ "parameters": [
+ {
+ "description": "浠撳簱淇℃伅",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.AddWarehouse"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
+ "/api-wms/v1/warehouse/warehouse/{id}": {
+ "put": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "浠撳簱"
+ ],
+ "summary": "缂栬緫浠撳簱",
+ "parameters": [
+ {
+ "description": "浠撳簱淇℃伅",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.UpdateWarehouse"
+ }
+ },
+ {
+ "type": "string",
+ "description": "浠撳簱id",
+ "name": "id",
+ "in": "path",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ },
+ "delete": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "浠撳簱"
+ ],
+ "summary": "鍒犻櫎浠撳簱",
+ "parameters": [
+ {
+ "type": "string",
+ "description": "浠撳簱id",
+ "name": "id",
+ "in": "path",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
}
},
"definitions": {
@@ -190,6 +334,56 @@
}
}
},
+ "models.Warehouse": {
+ "type": "object",
+ "required": [
+ "code"
+ ],
+ "properties": {
+ "active": {
+ "description": "鏄惁鍚敤锛屼紶true灏辫",
+ "type": "boolean"
+ },
+ "buyToResupply": {
+ "description": "鏄惁璐拱琛ョ粰锛屽凡璐拱浜у搧鑳藉鍙戦�佸埌姝や粨搴�",
+ "type": "boolean"
+ },
+ "code": {
+ "description": "浠撳簱缂栫爜",
+ "type": "string",
+ "maxLength": 5,
+ "minLength": 1
+ },
+ "createTime": {
+ "type": "string"
+ },
+ "name": {
+ "description": "浠撳簱鍚嶇О",
+ "type": "string"
+ },
+ "partnerId": {
+ "description": "鍚堜綔浼欎即id",
+ "type": "integer"
+ },
+ "resupplyWh": {
+ "description": "琛ョ粰鏉ユ簮浠撳簱",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.Warehouse"
+ }
+ },
+ "resupplyWhIds": {
+ "description": "琛ョ粰鏉ユ簮浠撳簱ID",
+ "type": "array",
+ "items": {
+ "type": "string"
+ }
+ },
+ "updateTime": {
+ "type": "string"
+ }
+ }
+ },
"request.AddDepartment": {
"type": "object",
"properties": {
@@ -208,6 +402,43 @@
"remark": {
"description": "澶囨敞",
"type": "string"
+ }
+ }
+ },
+ "request.AddWarehouse": {
+ "type": "object",
+ "required": [
+ "code"
+ ],
+ "properties": {
+ "active": {
+ "description": "鏄惁鍚敤锛屼紶true灏辫",
+ "type": "boolean"
+ },
+ "buyToResupply": {
+ "description": "璐拱琛ョ粰锛屽凡璐拱浜у搧鑳藉鍙戦�佸埌姝や粨搴�",
+ "type": "boolean"
+ },
+ "code": {
+ "description": "浠撳簱缂栫爜",
+ "type": "string",
+ "maxLength": 5,
+ "minLength": 1
+ },
+ "name": {
+ "description": "浠撳簱鍚嶇О",
+ "type": "string"
+ },
+ "partnerId": {
+ "description": "鍚堜綔浼欎即id",
+ "type": "integer"
+ },
+ "resupplyWhIds": {
+ "description": "琛ョ粰鏉ユ簮浠撳簱ID",
+ "type": "array",
+ "items": {
+ "type": "string"
+ }
}
}
},
@@ -235,6 +466,46 @@
}
}
},
+ "request.UpdateWarehouse": {
+ "type": "object",
+ "required": [
+ "code"
+ ],
+ "properties": {
+ "active": {
+ "description": "鏄惁鍚敤锛屼紶true灏辫",
+ "type": "boolean"
+ },
+ "buyToResupply": {
+ "description": "璐拱琛ョ粰锛屽凡璐拱浜у搧鑳藉鍙戦�佸埌姝や粨搴�",
+ "type": "boolean"
+ },
+ "code": {
+ "description": "浠撳簱缂栫爜",
+ "type": "string",
+ "maxLength": 5,
+ "minLength": 1
+ },
+ "id": {
+ "type": "integer"
+ },
+ "name": {
+ "description": "浠撳簱鍚嶇О",
+ "type": "string"
+ },
+ "partnerId": {
+ "description": "鍚堜綔浼欎即id",
+ "type": "integer"
+ },
+ "resupplyWhIds": {
+ "description": "琛ョ粰鏉ユ簮浠撳簱ID",
+ "type": "array",
+ "items": {
+ "type": "string"
+ }
+ }
+ }
+ },
"util.Response": {
"type": "object",
"properties": {
diff --git a/docs/swagger.json b/docs/swagger.json
index 2c096c4..9170dce 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -137,6 +137,150 @@
}
}
}
+ },
+ "/api-wms/v1/warehouse/warehouse": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "浠撳簱"
+ ],
+ "summary": "鏌ヨ浠撳簱鍒楄〃",
+ "parameters": [
+ {
+ "type": "string",
+ "name": "keyword",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "椤电爜",
+ "name": "page",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "姣忛〉澶у皬",
+ "name": "pageSize",
+ "in": "query"
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/util.ResponseList"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.Warehouse"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ },
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "浠撳簱"
+ ],
+ "summary": "娣诲姞浠撳簱",
+ "parameters": [
+ {
+ "description": "浠撳簱淇℃伅",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.AddWarehouse"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
+ "/api-wms/v1/warehouse/warehouse/{id}": {
+ "put": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "浠撳簱"
+ ],
+ "summary": "缂栬緫浠撳簱",
+ "parameters": [
+ {
+ "description": "浠撳簱淇℃伅",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.UpdateWarehouse"
+ }
+ },
+ {
+ "type": "string",
+ "description": "浠撳簱id",
+ "name": "id",
+ "in": "path",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ },
+ "delete": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "浠撳簱"
+ ],
+ "summary": "鍒犻櫎浠撳簱",
+ "parameters": [
+ {
+ "type": "string",
+ "description": "浠撳簱id",
+ "name": "id",
+ "in": "path",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
}
},
"definitions": {
@@ -178,6 +322,56 @@
}
}
},
+ "models.Warehouse": {
+ "type": "object",
+ "required": [
+ "code"
+ ],
+ "properties": {
+ "active": {
+ "description": "鏄惁鍚敤锛屼紶true灏辫",
+ "type": "boolean"
+ },
+ "buyToResupply": {
+ "description": "鏄惁璐拱琛ョ粰锛屽凡璐拱浜у搧鑳藉鍙戦�佸埌姝や粨搴�",
+ "type": "boolean"
+ },
+ "code": {
+ "description": "浠撳簱缂栫爜",
+ "type": "string",
+ "maxLength": 5,
+ "minLength": 1
+ },
+ "createTime": {
+ "type": "string"
+ },
+ "name": {
+ "description": "浠撳簱鍚嶇О",
+ "type": "string"
+ },
+ "partnerId": {
+ "description": "鍚堜綔浼欎即id",
+ "type": "integer"
+ },
+ "resupplyWh": {
+ "description": "琛ョ粰鏉ユ簮浠撳簱",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.Warehouse"
+ }
+ },
+ "resupplyWhIds": {
+ "description": "琛ョ粰鏉ユ簮浠撳簱ID",
+ "type": "array",
+ "items": {
+ "type": "string"
+ }
+ },
+ "updateTime": {
+ "type": "string"
+ }
+ }
+ },
"request.AddDepartment": {
"type": "object",
"properties": {
@@ -196,6 +390,43 @@
"remark": {
"description": "澶囨敞",
"type": "string"
+ }
+ }
+ },
+ "request.AddWarehouse": {
+ "type": "object",
+ "required": [
+ "code"
+ ],
+ "properties": {
+ "active": {
+ "description": "鏄惁鍚敤锛屼紶true灏辫",
+ "type": "boolean"
+ },
+ "buyToResupply": {
+ "description": "璐拱琛ョ粰锛屽凡璐拱浜у搧鑳藉鍙戦�佸埌姝や粨搴�",
+ "type": "boolean"
+ },
+ "code": {
+ "description": "浠撳簱缂栫爜",
+ "type": "string",
+ "maxLength": 5,
+ "minLength": 1
+ },
+ "name": {
+ "description": "浠撳簱鍚嶇О",
+ "type": "string"
+ },
+ "partnerId": {
+ "description": "鍚堜綔浼欎即id",
+ "type": "integer"
+ },
+ "resupplyWhIds": {
+ "description": "琛ョ粰鏉ユ簮浠撳簱ID",
+ "type": "array",
+ "items": {
+ "type": "string"
+ }
}
}
},
@@ -223,6 +454,46 @@
}
}
},
+ "request.UpdateWarehouse": {
+ "type": "object",
+ "required": [
+ "code"
+ ],
+ "properties": {
+ "active": {
+ "description": "鏄惁鍚敤锛屼紶true灏辫",
+ "type": "boolean"
+ },
+ "buyToResupply": {
+ "description": "璐拱琛ョ粰锛屽凡璐拱浜у搧鑳藉鍙戦�佸埌姝や粨搴�",
+ "type": "boolean"
+ },
+ "code": {
+ "description": "浠撳簱缂栫爜",
+ "type": "string",
+ "maxLength": 5,
+ "minLength": 1
+ },
+ "id": {
+ "type": "integer"
+ },
+ "name": {
+ "description": "浠撳簱鍚嶇О",
+ "type": "string"
+ },
+ "partnerId": {
+ "description": "鍚堜綔浼欎即id",
+ "type": "integer"
+ },
+ "resupplyWhIds": {
+ "description": "琛ョ粰鏉ユ簮浠撳簱ID",
+ "type": "array",
+ "items": {
+ "type": "string"
+ }
+ }
+ }
+ },
"util.Response": {
"type": "object",
"properties": {
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index de92cf1..034292b 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -26,6 +26,42 @@
description: 鎺掑簭
type: integer
type: object
+ models.Warehouse:
+ properties:
+ active:
+ description: 鏄惁鍚敤锛屼紶true灏辫
+ type: boolean
+ buyToResupply:
+ description: 鏄惁璐拱琛ョ粰锛屽凡璐拱浜у搧鑳藉鍙戦�佸埌姝や粨搴�
+ type: boolean
+ code:
+ description: 浠撳簱缂栫爜
+ maxLength: 5
+ minLength: 1
+ type: string
+ createTime:
+ type: string
+ name:
+ description: 浠撳簱鍚嶇О
+ type: string
+ partnerId:
+ description: 鍚堜綔浼欎即id
+ type: integer
+ resupplyWh:
+ description: 琛ョ粰鏉ユ簮浠撳簱
+ items:
+ $ref: '#/definitions/models.Warehouse'
+ type: array
+ resupplyWhIds:
+ description: 琛ョ粰鏉ユ簮浠撳簱ID
+ items:
+ type: string
+ type: array
+ updateTime:
+ type: string
+ required:
+ - code
+ type: object
request.AddDepartment:
properties:
name:
@@ -40,6 +76,33 @@
remark:
description: 澶囨敞
type: string
+ type: object
+ request.AddWarehouse:
+ properties:
+ active:
+ description: 鏄惁鍚敤锛屼紶true灏辫
+ type: boolean
+ buyToResupply:
+ description: 璐拱琛ョ粰锛屽凡璐拱浜у搧鑳藉鍙戦�佸埌姝や粨搴�
+ type: boolean
+ code:
+ description: 浠撳簱缂栫爜
+ maxLength: 5
+ minLength: 1
+ type: string
+ name:
+ description: 浠撳簱鍚嶇О
+ type: string
+ partnerId:
+ description: 鍚堜綔浼欎即id
+ type: integer
+ resupplyWhIds:
+ description: 琛ョ粰鏉ユ簮浠撳簱ID
+ items:
+ type: string
+ type: array
+ required:
+ - code
type: object
request.UpdateDepartment:
properties:
@@ -57,6 +120,35 @@
remark:
description: 澶囨敞
type: string
+ type: object
+ request.UpdateWarehouse:
+ properties:
+ active:
+ description: 鏄惁鍚敤锛屼紶true灏辫
+ type: boolean
+ buyToResupply:
+ description: 璐拱琛ョ粰锛屽凡璐拱浜у搧鑳藉鍙戦�佸埌姝や粨搴�
+ type: boolean
+ code:
+ description: 浠撳簱缂栫爜
+ maxLength: 5
+ minLength: 1
+ type: string
+ id:
+ type: integer
+ name:
+ description: 浠撳簱鍚嶇О
+ type: string
+ partnerId:
+ description: 鍚堜綔浼欎即id
+ type: integer
+ resupplyWhIds:
+ description: 琛ョ粰鏉ユ簮浠撳簱ID
+ items:
+ type: string
+ type: array
+ required:
+ - code
type: object
util.Response:
properties:
@@ -166,4 +258,94 @@
summary: 缂栬緫閮ㄩ棬淇℃伅
tags:
- 閮ㄩ棬淇℃伅
+ /api-wms/v1/warehouse/warehouse:
+ get:
+ parameters:
+ - in: query
+ name: keyword
+ type: string
+ - description: 椤电爜
+ in: query
+ name: page
+ type: integer
+ - description: 姣忛〉澶у皬
+ in: query
+ name: pageSize
+ type: integer
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ allOf:
+ - $ref: '#/definitions/util.ResponseList'
+ - properties:
+ data:
+ items:
+ $ref: '#/definitions/models.Warehouse'
+ type: array
+ type: object
+ summary: 鏌ヨ浠撳簱鍒楄〃
+ tags:
+ - 浠撳簱
+ post:
+ parameters:
+ - description: 浠撳簱淇℃伅
+ in: body
+ name: object
+ required: true
+ schema:
+ $ref: '#/definitions/request.AddWarehouse'
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ $ref: '#/definitions/util.Response'
+ summary: 娣诲姞浠撳簱
+ tags:
+ - 浠撳簱
+ /api-wms/v1/warehouse/warehouse/{id}:
+ delete:
+ parameters:
+ - description: 浠撳簱id
+ in: path
+ name: id
+ required: true
+ type: string
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ $ref: '#/definitions/util.Response'
+ summary: 鍒犻櫎浠撳簱
+ tags:
+ - 浠撳簱
+ put:
+ parameters:
+ - description: 浠撳簱淇℃伅
+ in: body
+ name: object
+ required: true
+ schema:
+ $ref: '#/definitions/request.UpdateWarehouse'
+ - description: 浠撳簱id
+ in: path
+ name: id
+ required: true
+ type: string
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ $ref: '#/definitions/util.Response'
+ summary: 缂栬緫浠撳簱
+ tags:
+ - 浠撳簱
swagger: "2.0"
diff --git a/main.go b/main.go
index caf375b..3ee1279 100644
--- a/main.go
+++ b/main.go
@@ -1,13 +1,13 @@
package main
import (
+ "context"
"net/http"
"os"
"os/signal"
"syscall"
"time"
"wms/conf"
- "wms/constvar"
"wms/models"
"wms/pkg/logx"
"wms/router"
@@ -30,10 +30,6 @@
return
}
- // 鍚姩APS RPC鏈嶅姟
- //safe.Go(service.StartAPServer)
-
- go shutdown()
logx.Infof("aps-server start serve...")
server := &http.Server{
Addr: ":" + conf.WebConf.Port,
@@ -41,16 +37,24 @@
ReadTimeout: 5 * time.Second,
WriteTimeout: 5 * time.Second,
}
-
+ go shutdown(server)
logx.Error(server.ListenAndServe().Error())
}
-func shutdown() {
+func shutdown(server *http.Server) {
quit := make(chan os.Signal, 1)
signal.Notify(quit, syscall.SIGKILL, syscall.SIGQUIT, syscall.SIGINT, syscall.SIGTERM)
<-quit
- _ = constvar.GrpcClient.Close()
- logx.Infof("aps-server exited...")
- os.Exit(0)
+ logx.Infof("server exiting...")
+ // 鍒涘缓涓�涓笂涓嬫枃锛岃缃秴鏃舵椂闂�
+ ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+ defer cancel()
+
+ // 鍏抽棴HTTP鏈嶅姟鍣�
+ if err := server.Shutdown(ctx); err != nil {
+ logx.Infof("鏈嶅姟浼橀泤閫�鍑哄け璐�: %v", err)
+ return
+ }
+ logx.Infof("server exited")
}
diff --git a/models/db.go b/models/db.go
index 620e5d8..1892385 100644
--- a/models/db.go
+++ b/models/db.go
@@ -72,7 +72,9 @@
func RegisterTables() error {
db := mysqlx.GetDB()
- err := db.AutoMigrate()
+ err := db.AutoMigrate(
+ Warehouse{},
+ )
return err
}
diff --git a/models/model.go b/models/model.go
new file mode 100644
index 0000000..c79c32e
--- /dev/null
+++ b/models/model.go
@@ -0,0 +1,17 @@
+package models
+
+import (
+ "gorm.io/gorm"
+)
+
+type WmsModel struct {
+ gorm.Model `json:"-"`
+ CreateTime string `json:"createTime" gorm:"-"`
+ UpdateTime string `json:"updateTime" gorm:"-"`
+}
+
+func (slf *WmsModel) AfterFind(tx *gorm.DB) (err error) {
+ slf.CreateTime = slf.CreatedAt.Format("2006-01-02 15:04")
+ slf.UpdateTime = slf.UpdatedAt.Format("2006-01-02 15:04")
+ return nil
+}
diff --git a/models/warehouse.go b/models/warehouse.go
new file mode 100644
index 0000000..42f6408
--- /dev/null
+++ b/models/warehouse.go
@@ -0,0 +1,249 @@
+package models
+
+import (
+ "fmt"
+ "gorm.io/gorm"
+ "strings"
+ "wms/pkg/mysqlx"
+)
+
+type (
+ // Warehouse 閮ㄩ棬淇℃伅
+ Warehouse struct {
+ WmsModel
+ Name string `json:"name" gorm:"index;type:varchar(255);not null;comment:浠撳簱鍚嶇О"` //浠撳簱鍚嶇О
+ Active bool `json:"active" gorm:"type:tinyint(1);not null;comment:鏄惁婵�娲�"` //鏄惁鍚敤锛屼紶true灏辫
+ Code string `json:"code" binding:"required,min=1,max=5" gorm:"index;type:varchar(255);not null;comment:浠撳簱缂栫爜"` //浠撳簱缂栫爜
+ PartnerID int `json:"partnerId" gorm:"type:int;not null;comment:鍚堜綔浼欎即id"` //鍚堜綔浼欎即id
+ BuyToResupply bool `json:"buyToResupply" gorm:"type:tinyint(1);not null;comment:鏄惁璐拱琛ョ粰"` //鏄惁璐拱琛ョ粰锛屽凡璐拱浜у搧鑳藉鍙戦�佸埌姝や粨搴�
+ ResupplyWhIdsStr string `json:"-" gorm:"column:resupply_wh_ids;type:varchar(255);not null;comment:琛ョ粰鏉ユ簮浠撳簱ID"` //琛ョ粰鏉ユ簮浠撳簱ID
+ ResupplyWhIds []string `json:"resupplyWhIds" gorm:"-"` //琛ョ粰鏉ユ簮浠撳簱ID
+ ResupplyWh []*Warehouse `json:"resupplyWh" gorm:"-"` //琛ョ粰鏉ユ簮浠撳簱
+ }
+
+ WarehouseSearch struct {
+ Warehouse
+ Order string
+ PageNum int
+ PageSize int
+ Keyword string
+ Orm *gorm.DB
+ }
+)
+
+func (slf *Warehouse) TableName() string {
+ return "warehouse"
+}
+
+func (slf *Warehouse) BeforeCreate(tx *gorm.DB) (err error) {
+ slf.ResupplyWhIdsStr = strings.Join(slf.ResupplyWhIds, ",")
+ return nil
+}
+
+func NewWarehouseSearch() *WarehouseSearch {
+ return &WarehouseSearch{Orm: mysqlx.GetDB()}
+}
+
+func (slf *WarehouseSearch) SetOrm(tx *gorm.DB) *WarehouseSearch {
+ slf.Orm = tx
+ return slf
+}
+
+func (slf *WarehouseSearch) SetPage(page, size int) *WarehouseSearch {
+ slf.PageNum, slf.PageSize = page, size
+ return slf
+}
+
+func (slf *WarehouseSearch) SetOrder(order string) *WarehouseSearch {
+ slf.Order = order
+ return slf
+}
+
+func (slf *WarehouseSearch) SetID(id uint) *WarehouseSearch {
+ slf.ID = id
+ return slf
+}
+
+func (slf *WarehouseSearch) SetCode(code string) *WarehouseSearch {
+ slf.Code = code
+ return slf
+}
+
+func (slf *WarehouseSearch) SetName(name string) *WarehouseSearch {
+ slf.Name = name
+ return slf
+}
+
+func (slf *WarehouseSearch) SetKeyword(keyword string) *WarehouseSearch {
+ slf.Keyword = keyword
+ return slf
+}
+
+func (slf *WarehouseSearch) build() *gorm.DB {
+ var db = slf.Orm.Table(slf.TableName())
+
+ if slf.ID != 0 {
+ db = db.Where("id = ?", slf.ID)
+ }
+
+ if slf.Order != "" {
+ db = db.Order(slf.Order)
+ }
+
+ if slf.Keyword != "" {
+ db = db.Where("name like ?", fmt.Sprintf("%%%v%%", slf.Keyword))
+ }
+ if slf.Name != "" {
+ db = db.Where("name = ?", slf.Name)
+ }
+
+ return db
+}
+
+// Create 鍗曟潯鎻掑叆
+func (slf *WarehouseSearch) Create(record *Warehouse) error {
+ var db = slf.build()
+
+ if err := db.Create(record).Error; err != nil {
+ return err
+ }
+
+ return nil
+}
+
+// CreateBatch 鎵归噺鎻掑叆
+func (slf *WarehouseSearch) CreateBatch(records []*Warehouse) error {
+ var db = slf.build()
+
+ if err := db.Create(&records).Error; err != nil {
+ return fmt.Errorf("create batch err: %v, records: %+v", err, records)
+ }
+
+ return nil
+}
+
+func (slf *WarehouseSearch) Update(record *Warehouse) error {
+ var db = slf.build()
+
+ if err := db.Omit("CreatedAt").Updates(record).Error; err != nil {
+ return fmt.Errorf("save err: %v, record: %+v", err, record)
+ }
+
+ return nil
+}
+
+func (slf *WarehouseSearch) UpdateByMap(upMap map[string]interface{}) error {
+ var (
+ db = slf.build()
+ )
+
+ if err := db.Updates(upMap).Error; err != nil {
+ return fmt.Errorf("update by map err: %v, upMap: %+v", err, upMap)
+ }
+
+ return nil
+}
+
+func (slf *WarehouseSearch) UpdateByQuery(query string, args []interface{}, upMap map[string]interface{}) error {
+ var (
+ db = slf.Orm.Table(slf.TableName()).Where(query, args...)
+ )
+
+ if err := db.Updates(upMap).Error; err != nil {
+ return fmt.Errorf("update by query err: %v, query: %s, args: %+v, upMap: %+v", err, query, args, upMap)
+ }
+
+ return nil
+}
+
+func (slf *WarehouseSearch) Delete() error {
+ var db = slf.build()
+ return db.Delete(&Warehouse{}).Error
+}
+
+func (slf *WarehouseSearch) First() (*Warehouse, error) {
+ var (
+ record = new(Warehouse)
+ db = slf.build()
+ )
+
+ if err := db.First(record).Error; err != nil {
+ return record, err
+ }
+
+ return record, nil
+}
+
+func (slf *WarehouseSearch) Find() ([]*Warehouse, int64, error) {
+ var (
+ records = make([]*Warehouse, 0)
+ total int64
+ db = slf.build()
+ )
+
+ if err := db.Count(&total).Error; err != nil {
+ return records, total, fmt.Errorf("find count err: %v", err)
+ }
+ if slf.PageNum*slf.PageSize > 0 {
+ db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
+ }
+ if err := db.Find(&records).Error; err != nil {
+ return records, total, fmt.Errorf("find records err: %v", err)
+ }
+
+ return records, total, nil
+}
+
+func (slf *WarehouseSearch) FindNotTotal() ([]*Warehouse, error) {
+ var (
+ records = make([]*Warehouse, 0)
+ db = slf.build()
+ )
+
+ if slf.PageNum*slf.PageSize > 0 {
+ db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
+ }
+ if err := db.Find(&records).Error; err != nil {
+ return records, fmt.Errorf("find records err: %v", err)
+ }
+
+ return records, nil
+}
+
+// FindByQuery 鎸囧畾鏉′欢鏌ヨ.
+func (slf *WarehouseSearch) FindByQuery(query string, args []interface{}) ([]*Warehouse, int64, error) {
+ var (
+ records = make([]*Warehouse, 0)
+ total int64
+ db = slf.Orm.Table(slf.TableName()).Where(query, args...)
+ )
+
+ if err := db.Count(&total).Error; err != nil {
+ return records, total, fmt.Errorf("find by query count err: %v", err)
+ }
+ if slf.PageNum*slf.PageSize > 0 {
+ db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
+ }
+ if err := db.Find(&records).Error; err != nil {
+ return records, total, fmt.Errorf("find by query records err: %v, query: %s, args: %+v", err, query, args)
+ }
+
+ return records, total, nil
+}
+
+// FindByQueryNotTotal 鎸囧畾鏉′欢鏌ヨ&涓嶆煡璇㈡�绘潯鏁�.
+func (slf *WarehouseSearch) FindByQueryNotTotal(query string, args []interface{}) ([]*Warehouse, error) {
+ var (
+ records = make([]*Warehouse, 0)
+ db = slf.Orm.Table(slf.TableName()).Where(query, args...)
+ )
+
+ if slf.PageNum*slf.PageSize > 0 {
+ db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
+ }
+ if err := db.Find(&records).Error; err != nil {
+ return records, fmt.Errorf("find by query records err: %v, query: %s, args: %+v", err, query, args)
+ }
+
+ return records, nil
+}
diff --git a/request/warehouse.go b/request/warehouse.go
new file mode 100644
index 0000000..c2c4fef
--- /dev/null
+++ b/request/warehouse.go
@@ -0,0 +1,20 @@
+package request
+
+type GetWarehouseList struct {
+ PageInfo
+ Keyword string `json:"keyword"`
+}
+
+type AddWarehouse struct {
+ Name string `json:"name" gorm:"index;type:varchar(255);not null;comment:浠撳簱鍚嶇О"` //浠撳簱鍚嶇О
+ Active bool `json:"active" gorm:"type:tinyint(1);not null;comment:鏄惁婵�娲�"` //鏄惁鍚敤锛屼紶true灏辫
+ Code string `json:"code" binding:"required,min=1,max=5" gorm:"index;type:varchar(255);not null;comment:浠撳簱缂栫爜"` //浠撳簱缂栫爜
+ PartnerID int `json:"partnerId" gorm:"type:int;not null;comment:鍚堜綔浼欎即id"` //鍚堜綔浼欎即id
+ BuyToResupply bool `json:"buyToResupply"` //璐拱琛ョ粰锛屽凡璐拱浜у搧鑳藉鍙戦�佸埌姝や粨搴�
+ ResupplyWhIds []string `json:"resupplyWhIds"` //琛ョ粰鏉ユ簮浠撳簱ID
+}
+
+type UpdateWarehouse struct {
+ ID uint `gorm:"comment:涓婚敭ID;primaryKey;" json:"id"`
+ AddWarehouse
+}
diff --git a/router/router.go b/router/router.go
index aad1e95..8637e3f 100644
--- a/router/router.go
+++ b/router/router.go
@@ -19,7 +19,7 @@
r.StaticFS(conf.LocalConf.StorePath, http.Dir(conf.LocalConf.StorePath)) // 涓虹敤鎴峰ご鍍忓拰鏂囦欢鎻愪緵闈欐�佸湴鍧�
r.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler))
- urlPrefix := "/api-s/v1"
+ urlPrefix := "/api-wms/v1"
// 缁勭粐绠＄悊
departmentController := new(controllers.DepartmentController)
@@ -31,5 +31,15 @@
organizeAPI.DELETE("department/:id", departmentController.Delete) // 鍒犻櫎閮ㄩ棬
}
+ // 浠撳簱绠＄悊
+ warehouseController := new(controllers.WarehouseController)
+ warehouseAPI := r.Group(urlPrefix + "/warehouse")
+ {
+ warehouseAPI.GET("warehouse", warehouseController.List) // 鑾峰彇浠撳簱鍒楄〃
+ warehouseAPI.POST("warehouse", warehouseController.Add) // 鏂板浠撳簱
+ warehouseAPI.PUT("warehouse/:id", warehouseController.Update) // 淇敼浠撳簱
+ warehouseAPI.DELETE("warehouse/:id", warehouseController.Delete) // 鍒犻櫎浠撳簱
+ }
+
return r
}
diff --git a/service/initdb.go b/service/initdb.go
deleted file mode 100644
index d4a999e..0000000
--- a/service/initdb.go
+++ /dev/null
@@ -1,79 +0,0 @@
-package service
-
-import (
- "context"
- "errors"
- "sort"
- "wms/pkg/logx"
-)
-
-// SubInitializer 鎻愪緵 source/*/init() 浣跨敤鐨勬帴鍙ｏ紝姣忎釜 initializer 瀹屾垚涓�涓垵濮嬪寲杩囩▼
-type SubInitializer interface {
- InitializerName() string // 涓嶄竴瀹氫唬琛ㄥ崟鐙竴涓〃锛屾墍浠ユ敼鎴愪簡鏇村娉涚殑璇箟
- InitializeData(ctx context.Context) (next context.Context, err error)
- DataInserted(ctx context.Context) bool
-}
-
-// orderedInitializer 缁勫悎涓�涓『搴忓瓧娈碉紝浠ヤ緵鎺掑簭
-type orderedInitializer struct {
- order int
- SubInitializer
-}
-
-// initSlice 渚� initializerList 鎺掑簭渚濊禆鏃朵娇鐢�
-type initSlice []*orderedInitializer
-
-func (a initSlice) Len() int {
- return len(a)
-}
-
-func (a initSlice) Less(i, j int) bool {
- return a[i].order < a[j].order
-}
-
-func (a initSlice) Swap(i, j int) {
- a[i], a[j] = a[j], a[i]
-}
-
-var (
- initializerList initSlice // 鍒濆鍖栧垪琛�
- initializerMap map[string]*orderedInitializer // 鍒濆鍖杕ap
-)
-
-// RegisterInit 娉ㄥ唽瑕佹墽琛岀殑鍒濆鍖栬繃绋嬶紝浼氬湪 InitDB() 鏃惰皟鐢�
-func RegisterInit(order int, subInit SubInitializer) {
- if initializerList == nil {
- initializerList = initSlice{}
- }
- if initializerMap == nil {
- initializerMap = map[string]*orderedInitializer{}
- }
- subInitName := subInit.InitializerName()
- if _, existed := initializerMap[subInitName]; existed {
- logx.Errorf("Name conflict on %s", subInitName)
- return
- }
- orderedSubInit := orderedInitializer{order, subInit}
- initializerList = append(initializerList, &orderedSubInit)
- initializerMap[subInitName] = &orderedSubInit
-}
-
-type InitDBService struct{}
-
-// InitDB 鍒濆鍖�
-func (initDBService *InitDBService) InitDB() (err error) {
- if len(initializerList) == 0 {
- return errors.New("鏃犲彲鐢ㄥ垵濮嬪寲杩囩▼锛岃妫�鏌ュ垵濮嬪寲鏄惁宸叉墽琛屽畬鎴�")
- }
- sort.Sort(&initializerList) // 淇濊瘉鏈変緷璧栫殑 initializer 鎺掑湪鍚庨潰鎵ц
-
- initHandler := NewMysqlInitHandler()
- if err = initHandler.InitData(context.TODO(), initializerList); err != nil {
- logx.Errorf("InitDB InitData err:%v", err)
- return err
- }
-
- initializerList = initSlice{}
- initializerMap = map[string]*orderedInitializer{}
- return nil
-}
diff --git a/service/initdb_mysql.go b/service/initdb_mysql.go
deleted file mode 100644
index e4ba97f..0000000
--- a/service/initdb_mysql.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package service
-
-import (
- "context"
-)
-
-type MysqlInitHandler struct{}
-
-func NewMysqlInitHandler() *MysqlInitHandler {
- return &MysqlInitHandler{}
-}
-
-func (h MysqlInitHandler) InitData(ctx context.Context, inits initSlice) error {
- next, cancel := context.WithCancel(ctx)
- defer func(c func()) { c() }(cancel)
- for _, init := range inits {
- if init.DataInserted(next) {
- continue
- }
- if n, err := init.InitializeData(next); err != nil {
- return err
- } else {
- next = n
- }
- }
- return nil
-}
--
Gitblit v1.8.0