From 61f1ad8d1fe79ada641a650609d275e2a5d0e0fb Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 12 九月 2023 19:36:20 +0800
Subject: [PATCH] 更改单词名字
---
constvar/const.go | 16 +-
models/operation_type.go | 84 +++++-----
/dev/null | 32 ----
controllers/operation_type.go | 50 +++---
models/db.go | 2
docs/swagger.yaml | 74 ++++----
request/operation_type.go | 32 ++++
docs/docs.go | 86 +++++-----
docs/swagger.json | 86 +++++-----
router/router.go | 12
10 files changed, 237 insertions(+), 237 deletions(-)
diff --git a/constvar/const.go b/constvar/const.go
index f5a9589..9a4e5c9 100644
--- a/constvar/const.go
+++ b/constvar/const.go
@@ -1,17 +1,17 @@
package constvar
-type BaseJobType int
+type BaseOperationType int
const (
- BaseJobTypeIncoming BaseJobType = iota + 1 //鏀惰揣
- BaseJobTypeOutgoing //浜よ揣
- BaseJobTypeInternal //鍐呴儴璋冩嫧
+ BaseOperationTypeIncoming BaseOperationType = iota + 1 //鏀惰揣
+ BaseOperationTypeOutgoing //浜よ揣
+ BaseOperationTypeInternal //鍐呴儴璋冩嫧
)
-func (slf BaseJobType) IsValid() bool {
- return slf == BaseJobTypeIncoming ||
- slf == BaseJobTypeOutgoing ||
- slf == BaseJobTypeInternal
+func (slf BaseOperationType) IsValid() bool {
+ return slf == BaseOperationTypeIncoming ||
+ slf == BaseOperationTypeOutgoing ||
+ slf == BaseOperationTypeInternal
}
type ReservationMethod int
diff --git a/controllers/job_type.go b/controllers/operation_type.go
similarity index 64%
rename from controllers/job_type.go
rename to controllers/operation_type.go
index 9ad6439..b2d5dc3 100644
--- a/controllers/job_type.go
+++ b/controllers/operation_type.go
@@ -14,18 +14,18 @@
"wms/request"
)
-type JobTypeController struct{}
+type OperationTypeController struct{}
// Add
// @Tags 浣滀笟绫诲瀷
// @Summary 娣诲姞浣滀笟绫诲瀷
// @Produce application/json
-// @Param object body request.AddJobType true "浣滀笟绫诲瀷淇℃伅"
+// @Param object body request.AddOperationType true "浣滀笟绫诲瀷淇℃伅"
// @Success 200 {object} util.Response "鎴愬姛"
-// @Router /api-wms/v1/warehouse/jobType [post]
-func (slf JobTypeController) Add(c *gin.Context) {
- var reqParams request.AddJobType
- var params models.JobType
+// @Router /api-wms/v1/warehouse/operationType [post]
+func (slf OperationTypeController) Add(c *gin.Context) {
+ var reqParams request.AddOperationType
+ var params models.OperationType
if err := c.BindJSON(&reqParams); err != nil {
util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�")
return
@@ -39,8 +39,8 @@
util.ResponseFormat(c, code.RequestParamError, err.Error())
return
}
- if err := models.NewJobTypeSearch().Create(¶ms); err != nil {
- logx.Errorf("JobType create err: %v", err)
+ if err := models.NewOperationTypeSearch().Create(¶ms); err != nil {
+ logx.Errorf("OperationType create err: %v", err)
util.ResponseFormat(c, code.SaveFail, "鎻掑叆澶辫触")
return
}
@@ -52,19 +52,19 @@
// @Tags 浣滀笟绫诲瀷
// @Summary 缂栬緫浣滀笟绫诲瀷
// @Produce application/json
-// @Param object body request.UpdateJobType true "浣滀笟绫诲瀷淇℃伅"
+// @Param object body request.UpdateOperationType true "浣滀笟绫诲瀷淇℃伅"
// @Param id path string true "浣滀笟绫诲瀷id"
// @Success 200 {object} util.Response "鎴愬姛"
-// @Router /api-wms/v1/warehouse/jobType/{id} [put]
-func (slf JobTypeController) Update(c *gin.Context) {
+// @Router /api-wms/v1/warehouse/operationType/{id} [put]
+func (slf OperationTypeController) Update(c *gin.Context) {
id := cast.ToUint(c.Param("id"))
if id == 0 {
util.ResponseFormat(c, code.RequestParamError, "绌虹殑璁板綍id")
return
}
var (
- reqParams request.UpdateJobType
- params models.JobType
+ reqParams request.UpdateOperationType
+ params models.OperationType
)
if err := c.BindJSON(&reqParams); err != nil {
util.ResponseFormat(c, code.RequestParamError, fmt.Sprintf("鍙傛暟瑙ｆ瀽澶辫触: %v"+err.Error()))
@@ -80,7 +80,7 @@
return
}
- err := models.NewJobTypeSearch().SetID(params.ID).Update(¶ms)
+ err := models.NewOperationTypeSearch().SetID(params.ID).Update(¶ms)
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "淇敼澶辫触")
@@ -90,9 +90,9 @@
util.ResponseFormat(c, code.UpdateSuccess, "鏇存柊鎴愬姛")
}
-func (slf JobTypeController) ParamsCheck(params models.JobType) (err error) {
+func (slf OperationTypeController) ParamsCheck(params models.OperationType) (err error) {
if params.ID != 0 {
- _, err = models.NewJobTypeSearch().SetID(params.ID).First()
+ _, err = models.NewOperationTypeSearch().SetID(params.ID).First()
if err == gorm.ErrRecordNotFound {
return errors.New("璁板綍涓嶅瓨鍦�")
}
@@ -105,16 +105,16 @@
// @Tags 浣滀笟绫诲瀷
// @Summary 鏌ヨ浣滀笟绫诲瀷鍒楄〃
// @Produce application/json
-// @Param object query request.GetJobTypeList true "鏌ヨ鍙傛暟"
-// @Success 200 {object} util.ResponseList{data=[]models.JobType} "鎴愬姛"
-// @Router /api-wms/v1/warehouse/jobType [get]
-func (slf JobTypeController) List(c *gin.Context) {
- var params request.GetJobTypeList
+// @Param object query request.GetOperationTypeList true "鏌ヨ鍙傛暟"
+// @Success 200 {object} util.ResponseList{data=[]models.OperationType} "鎴愬姛"
+// @Router /api-wms/v1/warehouse/operationType [get]
+func (slf OperationTypeController) List(c *gin.Context) {
+ var params request.GetOperationTypeList
if err := c.ShouldBindQuery(¶ms); err != nil {
util.ResponseFormat(c, code.RequestParamError, err.Error())
return
}
- list, total, err := models.NewJobTypeSearch().SetPage(params.Page, params.PageSize).SetKeyword(params.Keyword).SetOrder("id desc").SetPreload(true).Find()
+ list, total, err := models.NewOperationTypeSearch().SetPage(params.Page, params.PageSize).SetKeyword(params.Keyword).SetOrder("id desc").SetPreload(true).Find()
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "鏌ユ壘澶辫触")
return
@@ -129,15 +129,15 @@
// @Produce application/json
// @Param id path string true "浣滀笟绫诲瀷id"
// @Success 200 {object} util.Response "鎴愬姛"
-// @Router /api-wms/v1/warehouse/jobType/{id} [delete]
-func (slf JobTypeController) Delete(c *gin.Context) {
+// @Router /api-wms/v1/warehouse/operationType/{id} [delete]
+func (slf OperationTypeController) Delete(c *gin.Context) {
id := cast.ToUint(c.Param("id"))
if id == 0 {
util.ResponseFormat(c, code.RequestParamError, "绌虹殑璁板綍id")
return
}
- err := models.NewJobTypeSearch().SetID(id).Delete()
+ err := models.NewOperationTypeSearch().SetID(id).Delete()
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "鍒犻櫎澶辫触")
return
diff --git a/docs/docs.go b/docs/docs.go
index 5efc844..2922b77 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -294,7 +294,7 @@
}
}
},
- "/api-wms/v1/warehouse/jobType": {
+ "/api-wms/v1/warehouse/operationType": {
"get": {
"produces": [
"application/json"
@@ -336,7 +336,7 @@
"data": {
"type": "array",
"items": {
- "$ref": "#/definitions/models.JobType"
+ "$ref": "#/definitions/models.OperationType"
}
}
}
@@ -361,7 +361,7 @@
"in": "body",
"required": true,
"schema": {
- "$ref": "#/definitions/request.AddJobType"
+ "$ref": "#/definitions/request.AddOperationType"
}
}
],
@@ -375,7 +375,7 @@
}
}
},
- "/api-wms/v1/warehouse/jobType/{id}": {
+ "/api-wms/v1/warehouse/operationType/{id}": {
"put": {
"produces": [
"application/json"
@@ -391,7 +391,7 @@
"in": "body",
"required": true,
"schema": {
- "$ref": "#/definitions/request.UpdateJobType"
+ "$ref": "#/definitions/request.UpdateOperationType"
}
},
{
@@ -584,7 +584,7 @@
}
},
"definitions": {
- "constvar.BaseJobType": {
+ "constvar.BaseOperationType": {
"type": "integer",
"enum": [
1,
@@ -592,14 +592,14 @@
3
],
"x-enum-comments": {
- "BaseJobTypeIncoming": "鏀惰揣",
- "BaseJobTypeInternal": "鍐呴儴璋冩嫧",
- "BaseJobTypeOutgoing": "浜よ揣"
+ "BaseOperationTypeIncoming": "鏀惰揣",
+ "BaseOperationTypeInternal": "鍐呴儴璋冩嫧",
+ "BaseOperationTypeOutgoing": "浜よ揣"
},
"x-enum-varnames": [
- "BaseJobTypeIncoming",
- "BaseJobTypeOutgoing",
- "BaseJobTypeInternal"
+ "BaseOperationTypeIncoming",
+ "BaseOperationTypeOutgoing",
+ "BaseOperationTypeInternal"
]
},
"constvar.ReservationMethod": {
@@ -694,18 +694,36 @@
}
}
},
- "models.JobType": {
+ "models.Location": {
+ "type": "object",
+ "properties": {
+ "createTime": {
+ "type": "string"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "name": {
+ "description": "浣嶇疆鍚嶇О",
+ "type": "string"
+ },
+ "updateTime": {
+ "type": "string"
+ }
+ }
+ },
+ "models.OperationType": {
"type": "object",
"properties": {
"ReservationDaysBeforePriority": {
"description": "鍦ㄤ紭鍏堢骇鐨勫墠鍑犲ぉ",
"type": "integer"
},
- "baseJobType": {
+ "baseOperationType": {
"description": "鍩虹浣滀笟绫诲瀷",
"allOf": [
{
- "$ref": "#/definitions/constvar.BaseJobType"
+ "$ref": "#/definitions/constvar.BaseOperationType"
}
]
},
@@ -779,11 +797,11 @@
}
]
},
- "returnJobType": {
+ "returnOperationType": {
"description": "閫�璐х被鍨嬪悕绉�",
"type": "string"
},
- "returnJobTypeID": {
+ "returnOperationTypeID": {
"description": "閫�璐х被鍨婭D",
"type": "integer"
},
@@ -805,24 +823,6 @@
"warehouseId": {
"description": "浠撳簱id",
"type": "integer"
- }
- }
- },
- "models.Location": {
- "type": "object",
- "properties": {
- "createTime": {
- "type": "string"
- },
- "id": {
- "type": "integer"
- },
- "name": {
- "description": "浣嶇疆鍚嶇О",
- "type": "string"
- },
- "updateTime": {
- "type": "string"
}
}
},
@@ -915,18 +915,18 @@
}
}
},
- "request.AddJobType": {
+ "request.AddOperationType": {
"type": "object",
"properties": {
"ReservationDaysBeforePriority": {
"description": "鍦ㄤ紭鍏堢骇鐨勫墠鍑犲ぉ",
"type": "integer"
},
- "baseJobType": {
+ "baseOperationType": {
"description": "鍩虹浣滀笟绫诲瀷",
"allOf": [
{
- "$ref": "#/definitions/constvar.BaseJobType"
+ "$ref": "#/definitions/constvar.BaseOperationType"
}
]
},
@@ -973,7 +973,7 @@
}
]
},
- "returnJobTypeID": {
+ "returnOperationTypeID": {
"description": "閫�璐х被鍨婭D",
"type": "integer"
},
@@ -1060,18 +1060,18 @@
}
}
},
- "request.UpdateJobType": {
+ "request.UpdateOperationType": {
"type": "object",
"properties": {
"ReservationDaysBeforePriority": {
"description": "鍦ㄤ紭鍏堢骇鐨勫墠鍑犲ぉ",
"type": "integer"
},
- "baseJobType": {
+ "baseOperationType": {
"description": "鍩虹浣滀笟绫诲瀷",
"allOf": [
{
- "$ref": "#/definitions/constvar.BaseJobType"
+ "$ref": "#/definitions/constvar.BaseOperationType"
}
]
},
@@ -1118,7 +1118,7 @@
}
]
},
- "returnJobTypeID": {
+ "returnOperationTypeID": {
"description": "閫�璐х被鍨婭D",
"type": "integer"
},
diff --git a/docs/swagger.json b/docs/swagger.json
index ba4c8df..6700840 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -282,7 +282,7 @@
}
}
},
- "/api-wms/v1/warehouse/jobType": {
+ "/api-wms/v1/warehouse/operationType": {
"get": {
"produces": [
"application/json"
@@ -324,7 +324,7 @@
"data": {
"type": "array",
"items": {
- "$ref": "#/definitions/models.JobType"
+ "$ref": "#/definitions/models.OperationType"
}
}
}
@@ -349,7 +349,7 @@
"in": "body",
"required": true,
"schema": {
- "$ref": "#/definitions/request.AddJobType"
+ "$ref": "#/definitions/request.AddOperationType"
}
}
],
@@ -363,7 +363,7 @@
}
}
},
- "/api-wms/v1/warehouse/jobType/{id}": {
+ "/api-wms/v1/warehouse/operationType/{id}": {
"put": {
"produces": [
"application/json"
@@ -379,7 +379,7 @@
"in": "body",
"required": true,
"schema": {
- "$ref": "#/definitions/request.UpdateJobType"
+ "$ref": "#/definitions/request.UpdateOperationType"
}
},
{
@@ -572,7 +572,7 @@
}
},
"definitions": {
- "constvar.BaseJobType": {
+ "constvar.BaseOperationType": {
"type": "integer",
"enum": [
1,
@@ -580,14 +580,14 @@
3
],
"x-enum-comments": {
- "BaseJobTypeIncoming": "鏀惰揣",
- "BaseJobTypeInternal": "鍐呴儴璋冩嫧",
- "BaseJobTypeOutgoing": "浜よ揣"
+ "BaseOperationTypeIncoming": "鏀惰揣",
+ "BaseOperationTypeInternal": "鍐呴儴璋冩嫧",
+ "BaseOperationTypeOutgoing": "浜よ揣"
},
"x-enum-varnames": [
- "BaseJobTypeIncoming",
- "BaseJobTypeOutgoing",
- "BaseJobTypeInternal"
+ "BaseOperationTypeIncoming",
+ "BaseOperationTypeOutgoing",
+ "BaseOperationTypeInternal"
]
},
"constvar.ReservationMethod": {
@@ -682,18 +682,36 @@
}
}
},
- "models.JobType": {
+ "models.Location": {
+ "type": "object",
+ "properties": {
+ "createTime": {
+ "type": "string"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "name": {
+ "description": "浣嶇疆鍚嶇О",
+ "type": "string"
+ },
+ "updateTime": {
+ "type": "string"
+ }
+ }
+ },
+ "models.OperationType": {
"type": "object",
"properties": {
"ReservationDaysBeforePriority": {
"description": "鍦ㄤ紭鍏堢骇鐨勫墠鍑犲ぉ",
"type": "integer"
},
- "baseJobType": {
+ "baseOperationType": {
"description": "鍩虹浣滀笟绫诲瀷",
"allOf": [
{
- "$ref": "#/definitions/constvar.BaseJobType"
+ "$ref": "#/definitions/constvar.BaseOperationType"
}
]
},
@@ -767,11 +785,11 @@
}
]
},
- "returnJobType": {
+ "returnOperationType": {
"description": "閫�璐х被鍨嬪悕绉�",
"type": "string"
},
- "returnJobTypeID": {
+ "returnOperationTypeID": {
"description": "閫�璐х被鍨婭D",
"type": "integer"
},
@@ -793,24 +811,6 @@
"warehouseId": {
"description": "浠撳簱id",
"type": "integer"
- }
- }
- },
- "models.Location": {
- "type": "object",
- "properties": {
- "createTime": {
- "type": "string"
- },
- "id": {
- "type": "integer"
- },
- "name": {
- "description": "浣嶇疆鍚嶇О",
- "type": "string"
- },
- "updateTime": {
- "type": "string"
}
}
},
@@ -903,18 +903,18 @@
}
}
},
- "request.AddJobType": {
+ "request.AddOperationType": {
"type": "object",
"properties": {
"ReservationDaysBeforePriority": {
"description": "鍦ㄤ紭鍏堢骇鐨勫墠鍑犲ぉ",
"type": "integer"
},
- "baseJobType": {
+ "baseOperationType": {
"description": "鍩虹浣滀笟绫诲瀷",
"allOf": [
{
- "$ref": "#/definitions/constvar.BaseJobType"
+ "$ref": "#/definitions/constvar.BaseOperationType"
}
]
},
@@ -961,7 +961,7 @@
}
]
},
- "returnJobTypeID": {
+ "returnOperationTypeID": {
"description": "閫�璐х被鍨婭D",
"type": "integer"
},
@@ -1048,18 +1048,18 @@
}
}
},
- "request.UpdateJobType": {
+ "request.UpdateOperationType": {
"type": "object",
"properties": {
"ReservationDaysBeforePriority": {
"description": "鍦ㄤ紭鍏堢骇鐨勫墠鍑犲ぉ",
"type": "integer"
},
- "baseJobType": {
+ "baseOperationType": {
"description": "鍩虹浣滀笟绫诲瀷",
"allOf": [
{
- "$ref": "#/definitions/constvar.BaseJobType"
+ "$ref": "#/definitions/constvar.BaseOperationType"
}
]
},
@@ -1106,7 +1106,7 @@
}
]
},
- "returnJobTypeID": {
+ "returnOperationTypeID": {
"description": "閫�璐х被鍨婭D",
"type": "integer"
},
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 5a1e9a2..eb93df2 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -1,18 +1,18 @@
definitions:
- constvar.BaseJobType:
+ constvar.BaseOperationType:
enum:
- 1
- 2
- 3
type: integer
x-enum-comments:
- BaseJobTypeIncoming: 鏀惰揣
- BaseJobTypeInternal: 鍐呴儴璋冩嫧
- BaseJobTypeOutgoing: 浜よ揣
+ BaseOperationTypeIncoming: 鏀惰揣
+ BaseOperationTypeInternal: 鍐呴儴璋冩嫧
+ BaseOperationTypeOutgoing: 浜よ揣
x-enum-varnames:
- - BaseJobTypeIncoming
- - BaseJobTypeOutgoing
- - BaseJobTypeInternal
+ - BaseOperationTypeIncoming
+ - BaseOperationTypeOutgoing
+ - BaseOperationTypeInternal
constvar.ReservationMethod:
enum:
- 1
@@ -80,14 +80,26 @@
description: 鎺掑簭
type: integer
type: object
- models.JobType:
+ models.Location:
+ properties:
+ createTime:
+ type: string
+ id:
+ type: integer
+ name:
+ description: 浣嶇疆鍚嶇О
+ type: string
+ updateTime:
+ type: string
+ type: object
+ models.OperationType:
properties:
ReservationDaysBeforePriority:
description: 鍦ㄤ紭鍏堢骇鐨勫墠鍑犲ぉ
type: integer
- baseJobType:
+ baseOperationType:
allOf:
- - $ref: '#/definitions/constvar.BaseJobType'
+ - $ref: '#/definitions/constvar.BaseOperationType'
description: 鍩虹浣滀笟绫诲瀷
company:
allOf:
@@ -131,10 +143,10 @@
allOf:
- $ref: '#/definitions/constvar.ReservationMethod'
description: 淇濈暀鏂瑰紡
- returnJobType:
+ returnOperationType:
description: 閫�璐х被鍨嬪悕绉�
type: string
- returnJobTypeID:
+ returnOperationTypeID:
description: 閫�璐х被鍨婭D
type: integer
showOperations:
@@ -149,18 +161,6 @@
warehouseId:
description: 浠撳簱id
type: integer
- type: object
- models.Location:
- properties:
- createTime:
- type: string
- id:
- type: integer
- name:
- description: 浣嶇疆鍚嶇О
- type: string
- updateTime:
- type: string
type: object
models.Warehouse:
properties:
@@ -225,14 +225,14 @@
description: 澶囨敞
type: string
type: object
- request.AddJobType:
+ request.AddOperationType:
properties:
ReservationDaysBeforePriority:
description: 鍦ㄤ紭鍏堢骇鐨勫墠鍑犲ぉ
type: integer
- baseJobType:
+ baseOperationType:
allOf:
- - $ref: '#/definitions/constvar.BaseJobType'
+ - $ref: '#/definitions/constvar.BaseOperationType'
description: 鍩虹浣滀笟绫诲瀷
companyId:
description: 鍏徃id
@@ -262,7 +262,7 @@
allOf:
- $ref: '#/definitions/constvar.ReservationMethod'
description: 淇濈暀鏂瑰紡
- returnJobTypeID:
+ returnOperationTypeID:
description: 閫�璐х被鍨婭D
type: integer
showOperations:
@@ -324,14 +324,14 @@
description: 澶囨敞
type: string
type: object
- request.UpdateJobType:
+ request.UpdateOperationType:
properties:
ReservationDaysBeforePriority:
description: 鍦ㄤ紭鍏堢骇鐨勫墠鍑犲ぉ
type: integer
- baseJobType:
+ baseOperationType:
allOf:
- - $ref: '#/definitions/constvar.BaseJobType'
+ - $ref: '#/definitions/constvar.BaseOperationType'
description: 鍩虹浣滀笟绫诲瀷
companyId:
description: 鍏徃id
@@ -361,7 +361,7 @@
allOf:
- $ref: '#/definitions/constvar.ReservationMethod'
description: 淇濈暀鏂瑰紡
- returnJobTypeID:
+ returnOperationTypeID:
description: 閫�璐х被鍨婭D
type: integer
showOperations:
@@ -598,7 +598,7 @@
summary: 缂栬緫鍏徃
tags:
- 鍏徃
- /api-wms/v1/warehouse/jobType:
+ /api-wms/v1/warehouse/operationType:
get:
parameters:
- in: query
@@ -623,7 +623,7 @@
- properties:
data:
items:
- $ref: '#/definitions/models.JobType'
+ $ref: '#/definitions/models.OperationType'
type: array
type: object
summary: 鏌ヨ浣滀笟绫诲瀷鍒楄〃
@@ -636,7 +636,7 @@
name: object
required: true
schema:
- $ref: '#/definitions/request.AddJobType'
+ $ref: '#/definitions/request.AddOperationType'
produces:
- application/json
responses:
@@ -647,7 +647,7 @@
summary: 娣诲姞浣滀笟绫诲瀷
tags:
- 浣滀笟绫诲瀷
- /api-wms/v1/warehouse/jobType/{id}:
+ /api-wms/v1/warehouse/operationType/{id}:
delete:
parameters:
- description: 浣滀笟绫诲瀷id
@@ -672,7 +672,7 @@
name: object
required: true
schema:
- $ref: '#/definitions/request.UpdateJobType'
+ $ref: '#/definitions/request.UpdateOperationType'
- description: 浣滀笟绫诲瀷id
in: path
name: id
diff --git a/models/db.go b/models/db.go
index 230903e..fe88df7 100644
--- a/models/db.go
+++ b/models/db.go
@@ -75,7 +75,7 @@
err := db.AutoMigrate(
Company{},
Warehouse{},
- JobType{},
+ OperationType{},
Location{},
)
return err
diff --git a/models/job_type.go b/models/operation_type.go
similarity index 61%
rename from models/job_type.go
rename to models/operation_type.go
index 12947cb..acb9c79 100644
--- a/models/job_type.go
+++ b/models/operation_type.go
@@ -8,16 +8,16 @@
)
type (
- // JobType 浣滀笟绫诲瀷
- JobType struct {
+ // OperationType 浣滀笟绫诲瀷
+ OperationType struct {
WmsModel
- Id int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
- Name string `json:"name" gorm:"index;type:varchar(255);not null;comment:浠撳簱鍚嶇О"` //浠撳簱鍚嶇О
- BaseJobType constvar.BaseJobType `json:"baseJobType" gorm:"type:tinyint;not null;comment:鍩虹浣滀笟绫诲瀷"` //鍩虹浣滀笟绫诲瀷
- CompanyId int `json:"companyId" gorm:"type:int;not null;comment:鍏徃id"` //鍏徃id
- Company Company `json:"company" gorm:"foreignKey:CompanyId"` //鍏徃
- WarehouseId int `json:"warehouseId" gorm:"type:int;not null;comment:浠撳簱id"` //浠撳簱id
- Warehouse Warehouse `json:"warehouse" gorm:"foreignKey:WarehouseId"` //浠撳簱
+ Id int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
+ Name string `json:"name" gorm:"index;type:varchar(255);not null;comment:浠撳簱鍚嶇О"` //浠撳簱鍚嶇О
+ BaseOperationType constvar.BaseOperationType `json:"baseOperationType" gorm:"type:tinyint;not null;comment:鍩虹浣滀笟绫诲瀷"` //鍩虹浣滀笟绫诲瀷
+ CompanyId int `json:"companyId" gorm:"type:int;not null;comment:鍏徃id"` //鍏徃id
+ Company Company `json:"company" gorm:"foreignKey:CompanyId"` //鍏徃
+ WarehouseId int `json:"warehouseId" gorm:"type:int;not null;comment:浠撳簱id"` //浠撳簱id
+ Warehouse Warehouse `json:"warehouse" gorm:"foreignKey:WarehouseId"` //浠撳簱
DefaultLocationSrcId int `json:"defaultLocationSrcId" gorm:"type:int;not null;comment:榛樿婧愪綅缃甶d"` //榛樿婧愪綅缃甶d
DefaultLocationSrc Location `json:"defaultLocationSrc" gorm:"foreignKey:DefaultLocationSrcId"` //榛樿婧愪綅缃�
@@ -30,12 +30,12 @@
ReservationDaysBeforePriority int `json:"ReservationDaysBeforePriority" gorm:"type:int;"` //鍦ㄤ紭鍏堢骇鐨勫墠鍑犲ぉ
ShowOperations bool `json:"showOperations" gorm:"column:show_operations;type:int"` //鏄剧ず浣滀笟璇︽儏
CreateBackorder constvar.WhetherType `json:"createBackorder" gorm:"column:create_backorder"` //鍒涘缓娆犲崟
- ReturnJobTypeID int `json:"returnJobTypeID" gorm:"column:return_job_type_id"` //閫�璐х被鍨婭D
- ReturnJobType string `json:"returnJobType" gorm:"-"` //閫�璐х被鍨嬪悕绉�
+ ReturnOperationTypeID int `json:"returnOperationTypeID" gorm:"column:return_job_type_id"` //閫�璐х被鍨婭D
+ ReturnOperationType string `json:"returnOperationType" gorm:"-"` //閫�璐х被鍨嬪悕绉�
}
- JobTypeSearch struct {
- JobType
+ OperationTypeSearch struct {
+ OperationType
Order string
PageNum int
PageSize int
@@ -45,51 +45,51 @@
}
)
-func (slf *JobType) TableName() string {
+func (slf *OperationType) TableName() string {
return "job_type"
}
-func NewJobTypeSearch() *JobTypeSearch {
- return &JobTypeSearch{Orm: mysqlx.GetDB()}
+func NewOperationTypeSearch() *OperationTypeSearch {
+ return &OperationTypeSearch{Orm: mysqlx.GetDB()}
}
-func (slf *JobTypeSearch) SetOrm(tx *gorm.DB) *JobTypeSearch {
+func (slf *OperationTypeSearch) SetOrm(tx *gorm.DB) *OperationTypeSearch {
slf.Orm = tx
return slf
}
-func (slf *JobTypeSearch) SetPage(page, size int) *JobTypeSearch {
+func (slf *OperationTypeSearch) SetPage(page, size int) *OperationTypeSearch {
slf.PageNum, slf.PageSize = page, size
return slf
}
-func (slf *JobTypeSearch) SetOrder(order string) *JobTypeSearch {
+func (slf *OperationTypeSearch) SetOrder(order string) *OperationTypeSearch {
slf.Order = order
return slf
}
-func (slf *JobTypeSearch) SetID(id uint) *JobTypeSearch {
+func (slf *OperationTypeSearch) SetID(id uint) *OperationTypeSearch {
slf.ID = id
return slf
}
-func (slf *JobTypeSearch) SetName(name string) *JobTypeSearch {
+func (slf *OperationTypeSearch) SetName(name string) *OperationTypeSearch {
slf.Name = name
return slf
}
-func (slf *JobTypeSearch) SetKeyword(keyword string) *JobTypeSearch {
+func (slf *OperationTypeSearch) SetKeyword(keyword string) *OperationTypeSearch {
slf.Keyword = keyword
return slf
}
-func (slf *JobTypeSearch) SetPreload(preload bool) *JobTypeSearch {
+func (slf *OperationTypeSearch) SetPreload(preload bool) *OperationTypeSearch {
slf.Preload = preload
return slf
}
-func (slf *JobTypeSearch) build() *gorm.DB {
- var db = slf.Orm.Model(&JobType{})
+func (slf *OperationTypeSearch) build() *gorm.DB {
+ var db = slf.Orm.Model(&OperationType{})
if slf.ID != 0 {
db = db.Where("id = ?", slf.ID)
@@ -115,7 +115,7 @@
}
// Create 鍗曟潯鎻掑叆
-func (slf *JobTypeSearch) Create(record *JobType) error {
+func (slf *OperationTypeSearch) Create(record *OperationType) error {
var db = slf.build()
if err := db.Create(record).Error; err != nil {
@@ -126,7 +126,7 @@
}
// CreateBatch 鎵归噺鎻掑叆
-func (slf *JobTypeSearch) CreateBatch(records []*JobType) error {
+func (slf *OperationTypeSearch) CreateBatch(records []*OperationType) error {
var db = slf.build()
if err := db.Create(&records).Error; err != nil {
@@ -136,7 +136,7 @@
return nil
}
-func (slf *JobTypeSearch) Update(record *JobType) error {
+func (slf *OperationTypeSearch) Update(record *OperationType) error {
var db = slf.build()
if err := db.Omit("CreatedAt").Updates(record).Error; err != nil {
@@ -146,7 +146,7 @@
return nil
}
-func (slf *JobTypeSearch) UpdateByMap(upMap map[string]interface{}) error {
+func (slf *OperationTypeSearch) UpdateByMap(upMap map[string]interface{}) error {
var (
db = slf.build()
)
@@ -158,7 +158,7 @@
return nil
}
-func (slf *JobTypeSearch) UpdateByQuery(query string, args []interface{}, upMap map[string]interface{}) error {
+func (slf *OperationTypeSearch) UpdateByQuery(query string, args []interface{}, upMap map[string]interface{}) error {
var (
db = slf.Orm.Table(slf.TableName()).Where(query, args...)
)
@@ -170,14 +170,14 @@
return nil
}
-func (slf *JobTypeSearch) Delete() error {
+func (slf *OperationTypeSearch) Delete() error {
var db = slf.build()
- return db.Delete(&JobType{}).Error
+ return db.Delete(&OperationType{}).Error
}
-func (slf *JobTypeSearch) First() (*JobType, error) {
+func (slf *OperationTypeSearch) First() (*OperationType, error) {
var (
- record = new(JobType)
+ record = new(OperationType)
db = slf.build()
)
@@ -188,9 +188,9 @@
return record, nil
}
-func (slf *JobTypeSearch) Find() ([]*JobType, int64, error) {
+func (slf *OperationTypeSearch) Find() ([]*OperationType, int64, error) {
var (
- records = make([]*JobType, 0)
+ records = make([]*OperationType, 0)
total int64
db = slf.build()
)
@@ -208,9 +208,9 @@
return records, total, nil
}
-func (slf *JobTypeSearch) FindNotTotal() ([]*JobType, error) {
+func (slf *OperationTypeSearch) FindNotTotal() ([]*OperationType, error) {
var (
- records = make([]*JobType, 0)
+ records = make([]*OperationType, 0)
db = slf.build()
)
@@ -225,9 +225,9 @@
}
// FindByQuery 鎸囧畾鏉′欢鏌ヨ.
-func (slf *JobTypeSearch) FindByQuery(query string, args []interface{}) ([]*JobType, int64, error) {
+func (slf *OperationTypeSearch) FindByQuery(query string, args []interface{}) ([]*OperationType, int64, error) {
var (
- records = make([]*JobType, 0)
+ records = make([]*OperationType, 0)
total int64
db = slf.Orm.Table(slf.TableName()).Where(query, args...)
)
@@ -246,9 +246,9 @@
}
// FindByQueryNotTotal 鎸囧畾鏉′欢鏌ヨ&涓嶆煡璇㈡�绘潯鏁�.
-func (slf *JobTypeSearch) FindByQueryNotTotal(query string, args []interface{}) ([]*JobType, error) {
+func (slf *OperationTypeSearch) FindByQueryNotTotal(query string, args []interface{}) ([]*OperationType, error) {
var (
- records = make([]*JobType, 0)
+ records = make([]*OperationType, 0)
db = slf.Orm.Table(slf.TableName()).Where(query, args...)
)
diff --git a/request/job_type.go b/request/job_type.go
deleted file mode 100644
index 2ec6ecb..0000000
--- a/request/job_type.go
+++ /dev/null
@@ -1,32 +0,0 @@
-package request
-
-import "wms/constvar"
-
-type GetJobTypeList struct {
- PageInfo
- Keyword string `json:"keyword"`
-}
-
-type AddJobType struct {
- Id int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
- Name string `json:"name" gorm:"index;type:varchar(255);not null;comment:浠撳簱鍚嶇О"` //浠撳簱鍚嶇О
- BaseJobType constvar.BaseJobType `json:"baseJobType" gorm:"type:tinyint;not null;comment:鍩虹浣滀笟绫诲瀷"` //鍩虹浣滀笟绫诲瀷
- CompanyId int `json:"companyId" gorm:"type:int;not null;comment:鍏徃id"` //鍏徃id
- WarehouseId int `json:"warehouseId" gorm:"type:int;not null;comment:浠撳簱id"` //浠撳簱id
-
- DefaultLocationSrcId int `json:"defaultLocationSrcId" gorm:"type:int;not null;comment:榛樿婧愪綅缃甶d"` //榛樿婧愪綅缃甶d
- DefaultLocationDestId int `json:"defaultLocationDestId" gorm:"type:int;not null;comment:榛樿鐩爣浣嶇疆id"` //榛樿鐩爣浣嶇疆id
-
- PrintLabel bool `json:"printLabel" gorm:"column:print_label;type:tinyint;comment:鎵撳嵃鏍囩"` //鏄惁鎵撳嵃鏍囩
- ReservationMethod constvar.ReservationMethod `json:"reservationMethod" gorm:"column:reservation_method"` //淇濈暀鏂瑰紡
- ReservationDaysBefore int `json:"reservationDaysBefore" gorm:"type:int;"` //鏀惰揣鍓嶅嚑澶�
- ReservationDaysBeforePriority int `json:"ReservationDaysBeforePriority" gorm:"type:int;"` //鍦ㄤ紭鍏堢骇鐨勫墠鍑犲ぉ
- ShowOperations bool `json:"showOperations" gorm:"column:show_operations;type:int"` //鏄剧ず浣滀笟璇︽儏
- CreateBackorder constvar.WhetherType `json:"createBackorder" gorm:"column:create_backorder"` //鍒涘缓娆犲崟
- ReturnJobTypeID int `json:"returnJobTypeID" gorm:"column:return_job_type_id"` //閫�璐х被鍨婭D
-}
-
-type UpdateJobType struct {
- ID uint `gorm:"comment:涓婚敭ID;primaryKey;" json:"id"`
- AddJobType
-}
diff --git a/request/operation_type.go b/request/operation_type.go
new file mode 100644
index 0000000..46eb893
--- /dev/null
+++ b/request/operation_type.go
@@ -0,0 +1,32 @@
+package request
+
+import "wms/constvar"
+
+type GetOperationTypeList struct {
+ PageInfo
+ Keyword string `json:"keyword"`
+}
+
+type AddOperationType struct {
+ Id int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
+ Name string `json:"name" gorm:"index;type:varchar(255);not null;comment:浠撳簱鍚嶇О"` //浠撳簱鍚嶇О
+ BaseOperationType constvar.BaseOperationType `json:"baseOperationType" gorm:"type:tinyint;not null;comment:鍩虹浣滀笟绫诲瀷"` //鍩虹浣滀笟绫诲瀷
+ CompanyId int `json:"companyId" gorm:"type:int;not null;comment:鍏徃id"` //鍏徃id
+ WarehouseId int `json:"warehouseId" gorm:"type:int;not null;comment:浠撳簱id"` //浠撳簱id
+
+ DefaultLocationSrcId int `json:"defaultLocationSrcId" gorm:"type:int;not null;comment:榛樿婧愪綅缃甶d"` //榛樿婧愪綅缃甶d
+ DefaultLocationDestId int `json:"defaultLocationDestId" gorm:"type:int;not null;comment:榛樿鐩爣浣嶇疆id"` //榛樿鐩爣浣嶇疆id
+
+ PrintLabel bool `json:"printLabel" gorm:"column:print_label;type:tinyint;comment:鎵撳嵃鏍囩"` //鏄惁鎵撳嵃鏍囩
+ ReservationMethod constvar.ReservationMethod `json:"reservationMethod" gorm:"column:reservation_method"` //淇濈暀鏂瑰紡
+ ReservationDaysBefore int `json:"reservationDaysBefore" gorm:"type:int;"` //鏀惰揣鍓嶅嚑澶�
+ ReservationDaysBeforePriority int `json:"ReservationDaysBeforePriority" gorm:"type:int;"` //鍦ㄤ紭鍏堢骇鐨勫墠鍑犲ぉ
+ ShowOperations bool `json:"showOperations" gorm:"column:show_operations;type:int"` //鏄剧ず浣滀笟璇︽儏
+ CreateBackorder constvar.WhetherType `json:"createBackorder" gorm:"column:create_backorder"` //鍒涘缓娆犲崟
+ ReturnOperationTypeID int `json:"returnOperationTypeID" gorm:"column:return_job_type_id"` //閫�璐х被鍨婭D
+}
+
+type UpdateOperationType struct {
+ ID uint `gorm:"comment:涓婚敭ID;primaryKey;" json:"id"`
+ AddOperationType
+}
diff --git a/router/router.go b/router/router.go
index cfec672..ac1f0c5 100644
--- a/router/router.go
+++ b/router/router.go
@@ -52,13 +52,13 @@
}
// 浣滀笟绫诲瀷
- jobTypeController := new(controllers.JobTypeController)
- jobTypeAPI := r.Group(urlPrefix + "/warehouse")
+ operationTypeController := new(controllers.OperationTypeController)
+ operationTypeAPI := r.Group(urlPrefix + "/warehouse")
{
- jobTypeAPI.GET("jobType", jobTypeController.List) // 鑾峰彇浣滀笟绫诲瀷鍒楄〃
- jobTypeAPI.POST("jobType", jobTypeController.Add) // 鏂板浣滀笟绫诲瀷
- jobTypeAPI.PUT("jobType/:id", jobTypeController.Update) // 淇敼浣滀笟绫诲瀷
- jobTypeAPI.DELETE("jobType/:id", jobTypeController.Delete) // 鍒犻櫎浣滀笟绫诲瀷
+ operationTypeAPI.GET("operationType", operationTypeController.List) // 鑾峰彇浣滀笟绫诲瀷鍒楄〃
+ operationTypeAPI.POST("operationType", operationTypeController.Add) // 鏂板浣滀笟绫诲瀷
+ operationTypeAPI.PUT("operationType/:id", operationTypeController.Update) // 淇敼浣滀笟绫诲瀷
+ operationTypeAPI.DELETE("operationType/:id", operationTypeController.Delete) // 鍒犻櫎浣滀笟绫诲瀷
}
return r
--
Gitblit v1.8.0