From e598e4d2718c41352eafae19284ffe358b8c8181 Mon Sep 17 00:00:00 2001
From: yinbentan <yinbentan@live.com>
Date: 星期三, 17 七月 2024 18:18:19 +0800
Subject: [PATCH] 修改方法，去除庄口获取庄口列表方法；添加产品来源字典类型；添加字典模糊搜索
---
constvar/const.go | 1
request/dict.go | 9
models/mini_dict.go | 37 ++
docs/swagger.yaml | 226 +++++++++++++
controllers/dict_controller.go | 75 ++--
docs/docs.go | 296 +++++++++++++++++
docs/swagger.json | 296 +++++++++++++++++
router/router.go | 13
8 files changed, 866 insertions(+), 87 deletions(-)
diff --git a/constvar/const.go b/constvar/const.go
index a932954..335b6d5 100644
--- a/constvar/const.go
+++ b/constvar/const.go
@@ -333,6 +333,7 @@
TransferType // 璋冩嫧绫诲瀷
TakeStockType // 鐩樼偣绫诲瀷
DisuseType // 鎶ュ簾绫诲瀷
+ ProductSource // 浜у搧鏉ユ簮
)
const (
diff --git a/controllers/dict_controller.go b/controllers/dict_controller.go
index a9c1a8e..fa042a9 100644
--- a/controllers/dict_controller.go
+++ b/controllers/dict_controller.go
@@ -3,9 +3,11 @@
import (
"context"
"errors"
+ "fmt"
"github.com/gin-gonic/gin"
"gorm.io/gorm"
"strconv"
+ "wms/constvar"
"wms/extend/code"
"wms/extend/util"
"wms/models"
@@ -48,8 +50,10 @@
return
}
+ autoCode, _ := getAutoCode(params.Type)
record := models.MiniDict{
Type: params.Type,
+ Code: autoCode,
Name: params.Name,
Value: params.Value,
IsDefault: params.IsDefault,
@@ -95,6 +99,7 @@
record := models.MiniDict{
Type: params.Type,
+ Code: params.Code,
Name: params.Name,
Value: params.Value,
IsDefault: params.IsDefault,
@@ -201,47 +206,13 @@
return
}
- //if !params.Type.Valid() {
- // util.ResponseFormat(c, code.RequestParamError, "瀛楀吀绫诲瀷閿欒")
- // return
- //}
- dictSearch := models.NewMiniDictSearch()
- if params.Type.Valid() {
- dictSearch.SetType(params.Type)
- }
-
- list, total, err := dictSearch.Find()
+ list, total, err := models.NewMiniDictSearch().SetKeyword(params.Keyword).SetType(params.Type).Find()
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "鏌ユ壘澶辫触")
return
}
util.ResponseFormatList(c, code.Success, list, int(total))
-}
-
-// GetSilkDictList
-//
-// @Tags 鏁版嵁瀛楀吀
-// @Summary 鑾峰彇搴勫彛鍒楄〃
-// @Produce application/json
-// @Param Authorization header string true "token"
-// @Param type path string true "瀛楀吀绫诲瀷"
-// @Success 200 {object} util.ResponseList{data=[]models.SilkDict} "鎴愬姛"
-// @Router /api-wms/v1/dict/getSilkDictList/{type} [get]
-func (slf DictController) GetSilkDictList(c *gin.Context) {
-
- dictType, err := strconv.Atoi(c.Param("type"))
- if err != nil {
- util.ResponseFormat(c, code.RequestParamError, "璇蜂紶鍏ユ纭殑瀛楀吀绫诲瀷")
- return
- }
-
- list, err := models.NewSilkDictSearch().SetDictType(models.SilkDictType(dictType)).FindAll()
- if err != nil {
- util.ResponseFormat(c, code.RequestParamError, "鏌ユ壘澶辫触")
- return
- }
- util.ResponseFormat(c, code.Success, list)
}
// GetUserList
@@ -281,3 +252,37 @@
}
util.ResponseFormat(c, code.Success, list.List)
}
+
+// GetAutoCode 鑾峰彇瀛楀吀鑷姩缂栫爜
+func getAutoCode(dictType constvar.MiniDictType) (string, error) {
+
+ var prefix string
+ switch constvar.MiniDictType(dictType) {
+ case constvar.StorageType:
+ prefix = "IN0"
+ case constvar.StockoutType:
+ prefix = "OUT"
+ case constvar.TransferType:
+ prefix = "TF0"
+ case constvar.TakeStockType:
+ prefix = "TS0"
+ case constvar.DisuseType:
+ prefix = "DIS"
+ case constvar.ProductSource:
+ prefix = "PS0"
+ default:
+ return "", errors.New("缂栫爜瑙勫垯涓嶅瓨鍦�")
+ }
+ id, err := models.NewMiniDictSearch().SetType(constvar.MiniDictType(dictType)).MaxAutoIncr()
+ if err != nil {
+ return "", errors.New("鑾峰彇鏈�澶у�煎け璐�")
+ }
+
+ strMaxAutoIncr := strconv.Itoa(id + 1)
+ count := 5 - len(strMaxAutoIncr)
+ for i := 0; i < count; i++ {
+ strMaxAutoIncr = "0" + strMaxAutoIncr
+ }
+
+ return fmt.Sprintf("%v%v", prefix, strMaxAutoIncr), nil
+}
diff --git a/docs/docs.go b/docs/docs.go
index f46a305..95b1f70 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -691,6 +691,72 @@
}
}
},
+ "/api-wms/v1/dict/getUserList": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鏁版嵁瀛楀吀"
+ ],
+ "summary": "鑾峰彇鐢ㄦ埛鍒楄〃",
+ "parameters": [
+ {
+ "type": "string",
+ "name": "id",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "nickName",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "parentId",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "pos",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "userName",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "name": "userType",
+ "in": "query"
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/util.ResponseList"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/user.GetUserRequest"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
"/api-wms/v1/dict/save": {
"post": {
"produces": [
@@ -1681,6 +1747,13 @@
"summary": "娣诲姞搴撳瓨鐩樼偣淇℃伅",
"parameters": [
{
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ },
+ {
"description": "鍏ュ簱/鍑哄簱淇℃伅",
"name": "object",
"in": "body",
@@ -1710,6 +1783,13 @@
],
"summary": "搴旂敤銆侀獙璇�",
"parameters": [
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ },
{
"description": "鍏ュ弬",
"name": "object",
@@ -1895,6 +1975,13 @@
"summary": "淇敼搴撳瓨鐩樼偣淇℃伅",
"parameters": [
{
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ },
+ {
"description": "鍏ュ簱/鍑哄簱淇℃伅",
"name": "object",
"in": "body",
@@ -1952,6 +2039,13 @@
],
"summary": "鏇存敼璁板綍鐘舵��",
"parameters": [
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ },
{
"type": "integer",
"description": "id",
@@ -2119,6 +2213,13 @@
"summary": "鍏ュ簱/鍑哄簱鍒楄〃",
"parameters": [
{
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ },
+ {
"description": "鏌ヨ鍙傛暟",
"name": "object",
"in": "body",
@@ -2224,6 +2325,13 @@
"summary": "娣诲姞鍏ュ簱/鍑哄簱",
"parameters": [
{
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ },
+ {
"description": "鍏ュ簱/鍑哄簱淇℃伅",
"name": "object",
"in": "body",
@@ -2253,6 +2361,13 @@
],
"summary": "鍒犻櫎鍏ュ簱/鍑哄簱淇℃伅",
"parameters": [
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ },
{
"type": "integer",
"description": "id",
@@ -4245,10 +4360,12 @@
2,
3,
4,
- 5
+ 5,
+ 6
],
"x-enum-comments": {
"DisuseType": "鎶ュ簾绫诲瀷",
+ "ProductSource": "浜у搧鏉ユ簮",
"StockoutType": "鍑哄簱绫诲瀷",
"StorageType": "鍏ュ簱绫诲瀷",
"TakeStockType": "鐩樼偣绫诲瀷",
@@ -4259,7 +4376,8 @@
"StockoutType",
"TransferType",
"TakeStockType",
- "DisuseType"
+ "DisuseType",
+ "ProductSource"
]
},
"constvar.OperationSource": {
@@ -4716,6 +4834,7 @@
"type": "string"
},
"warehouseId": {
+ "description": "浠撳簱id",
"type": "integer"
}
}
@@ -5244,12 +5363,15 @@
"type": "object",
"properties": {
"accountant": {
+ "description": "浼氳鍚嶇О",
"type": "string"
},
"accountantId": {
+ "description": "浼氳id",
"type": "string"
},
"auditDate": {
+ "description": "瀹℃壒鏃堕棿",
"type": "string"
},
"baseOperationType": {
@@ -5261,39 +5383,50 @@
]
},
"checkedBy": {
+ "description": "楠岃瘉鑰匲serId",
"type": "string"
},
"comment": {
+ "description": "澶囨敞",
"type": "string"
},
"companyID": {
+ "description": "鍏徃ID-瀹㈡埛",
"type": "string"
},
"companyName": {
+ "description": "鍏徃鍚嶇О-瀹㈡埛",
"type": "string"
},
"contacterID": {
+ "description": "鑱旂郴浜篒D",
"type": "integer"
},
"contacterName": {
+ "description": "鑱旂郴浜哄鍚�",
"type": "string"
},
"createBy": {
+ "description": "鍒涘缓鑰匲serId",
"type": "string"
},
"createTime": {
"type": "string"
},
"custodian": {
+ "description": "淇濈鍛樺悕绉�",
"type": "string"
},
"custodianId": {
+ "description": "淇濈鍛榠d",
"type": "string"
},
"dealerType": {
+ "description": "璋冩嫧鍑哄叆搴撶被鍨�",
"type": "string"
},
"details": {
+ "description": "鎿嶄綔鏄庣粏",
"type": "array",
"items": {
"$ref": "#/definitions/models.OperationDetails"
@@ -5319,9 +5452,15 @@
"type": "integer"
},
"logisticCompany": {
- "$ref": "#/definitions/models.LogisticCompany"
+ "description": "鐗╂祦鍏徃淇℃伅",
+ "allOf": [
+ {
+ "$ref": "#/definitions/models.LogisticCompany"
+ }
+ ]
},
"logisticCompanyId": {
+ "description": "鐗╂祦鍏徃id",
"type": "string"
},
"logisticWeight": {
@@ -5329,9 +5468,11 @@
"type": "number"
},
"manager": {
+ "description": "涓荤鍚嶇О",
"type": "string"
},
"managerId": {
+ "description": "涓荤id",
"type": "string"
},
"number": {
@@ -5339,6 +5480,7 @@
"type": "string"
},
"operationDate": {
+ "description": "瀹夋帓鏃ユ湡",
"type": "string"
},
"operationSource": {
@@ -5358,21 +5500,31 @@
"type": "string"
},
"receiverAddr": {
+ "description": "鏀惰揣鍦板潃",
"type": "string"
},
"receiverName": {
+ "description": "鏀惰揣浜哄鍚�",
"type": "string"
},
"receiverPhone": {
+ "description": "鑱旂郴鐢佃瘽",
"type": "string"
},
"remark": {
+ "description": "澶囨敞",
"type": "string"
},
"salesDetailsNumber": {
+ "description": "閿�鍞槑缁嗙紪鐮�",
+ "type": "string"
+ },
+ "silkMarket": {
+ "description": "鍢夎仈浠撳偍娣诲姞 SilkMarket",
"type": "string"
},
"source": {
+ "description": "鏉ユ簮绯荤粺",
"type": "string"
},
"sourceNumber": {
@@ -5403,9 +5555,15 @@
"type": "string"
},
"warehouse": {
- "$ref": "#/definitions/models.Warehouse"
+ "description": "浠撳簱淇℃伅",
+ "allOf": [
+ {
+ "$ref": "#/definitions/models.Warehouse"
+ }
+ ]
},
"warehouseId": {
+ "description": "浠撳簱id",
"type": "integer"
},
"waybillNumber": {
@@ -5426,9 +5584,11 @@
"type": "number"
},
"auxiliaryAmount": {
+ "description": "杈呭姪鏁伴噺",
"type": "number"
},
"auxiliaryUnit": {
+ "description": "杈呭姪鍗曚綅",
"type": "string"
},
"baseOperationType": {
@@ -5470,7 +5630,7 @@
"type": "boolean"
},
"operationId": {
- "description": "鎿嶄綔id",
+ "description": "鎿嶄綔璁板綍id",
"type": "integer"
},
"product": {
@@ -5486,11 +5646,20 @@
"type": "string"
},
"remark": {
+ "description": "澶囨敞",
"type": "string"
},
"salePrice": {
"description": "閿�鍞崟浠�",
"type": "number"
+ },
+ "silkMarket": {
+ "description": "鍢夎仈浠撳偍娣诲姞 SilkMarket銆丼ilkMarketClose",
+ "type": "string"
+ },
+ "silkMarketClose": {
+ "description": "搴勫彛鍏抽棴",
+ "type": "string"
},
"stockAmount": {
"description": "搴撳瓨鏁伴噺锛岀洏鐐规椂鐢�",
@@ -5509,9 +5678,11 @@
"type": "integer"
},
"totalGrossWeight": {
+ "description": "鎬绘瘺閲�",
"type": "number"
},
"totalNetWeight": {
+ "description": "鎬诲噣閲�",
"type": "number"
},
"updateTime": {
@@ -5995,6 +6166,10 @@
"request.AddMiniDict": {
"type": "object",
"properties": {
+ "code": {
+ "description": "缂栫爜",
+ "type": "string"
+ },
"isDefault": {
"description": "鏄惁榛樿",
"type": "boolean"
@@ -6021,13 +6196,15 @@
"type": "object",
"properties": {
"accountant": {
+ "description": "浼氳鍚嶇О",
"type": "string"
},
"accountantId": {
+ "description": "浼氳id",
"type": "string"
},
"baseOperationType": {
- "description": "鍩虹浣滀笟绫诲瀷 5搴撳瓨鐩樼偣",
+ "description": "鍩虹浣滀笟绫诲瀷 1 鍏ュ簱 2 鍑哄簱 3 鍐呴儴璋冩嫧 4 鎶ュ簾 5 搴撳瓨鐩樼偣",
"allOf": [
{
"$ref": "#/definitions/constvar.BaseOperationType"
@@ -6055,15 +6232,19 @@
"type": "string"
},
"custodian": {
+ "description": "淇濈鍛樺悕绉�",
"type": "string"
},
"custodianId": {
+ "description": "淇濈鍛榠d",
"type": "string"
},
"dealerType": {
+ "description": "璋冩嫧鍑哄叆搴撶被鍨�",
"type": "string"
},
"details": {
+ "description": "璇︽儏",
"type": "array",
"items": {
"$ref": "#/definitions/request.OperationDetails"
@@ -6077,6 +6258,7 @@
"type": "integer"
},
"logisticCompanyId": {
+ "description": "鐗╂祦鍏徃id",
"type": "string"
},
"logisticWeight": {
@@ -6084,9 +6266,11 @@
"type": "number"
},
"manager": {
+ "description": "涓荤鍚嶇О",
"type": "string"
},
"managerId": {
+ "description": "涓荤id",
"type": "string"
},
"number": {
@@ -6094,7 +6278,7 @@
"type": "string"
},
"operationDate": {
- "description": "FromLocationId int ` + "`" + `json:\"fromLocationId\" gorm:\"type:int;not null;comment:婧愪綅缃甶d\"` + "`" + ` //婧愪綅缃甶d\nToLocationId int ` + "`" + `json:\"toLocationId\" gorm:\"type:int;not null;comment:鐩爣浣嶇疆id\"` + "`" + ` //鐩爣浣嶇疆id",
+ "description": "FromLocationId int ` + "`" + `json:\"fromLocationId\" ` + "`" + ` //婧愪綅缃甶d\nToLocationId int ` + "`" + `json:\"toLocationId\" ` + "`" + ` //鐩爣浣嶇疆id",
"type": "string"
},
"operationTypeId": {
@@ -6106,12 +6290,19 @@
"type": "string"
},
"receiverAddr": {
+ "description": "鏀惰揣鍦板潃",
"type": "string"
},
"receiverName": {
+ "description": "鏀惰揣浜哄鍚�",
"type": "string"
},
"receiverPhone": {
+ "description": "鑱旂郴鐢佃瘽",
+ "type": "string"
+ },
+ "silkMarket": {
+ "description": "搴勫彛缂栫爜",
"type": "string"
},
"sourceNumber": {
@@ -6315,6 +6506,10 @@
"request.EditMiniDict": {
"type": "object",
"properties": {
+ "code": {
+ "description": "缂栫爜",
+ "type": "string"
+ },
"id": {
"description": "瀛楀吀绫诲瀷",
"type": "integer"
@@ -6434,6 +6629,10 @@
},
"warehouseCode": {
"type": "string"
+ },
+ "warehouseId": {
+ "description": "浠撳簱ID",
+ "type": "string"
}
}
},
@@ -6540,6 +6739,10 @@
"request.GetMiniDictList": {
"type": "object",
"properties": {
+ "keyword": {
+ "description": "鍏抽敭瀛楁煡璇�",
+ "type": "string"
+ },
"type": {
"description": "瀛楀吀绫诲瀷",
"allOf": [
@@ -6636,6 +6839,10 @@
"request.MiniDict": {
"type": "object",
"properties": {
+ "code": {
+ "description": "缂栫爜",
+ "type": "string"
+ },
"isDefault": {
"description": "鏄惁榛樿",
"type": "boolean"
@@ -6654,6 +6861,7 @@
"type": "object",
"properties": {
"number": {
+ "description": "鍗曞彿",
"type": "string"
},
"page": {
@@ -6665,6 +6873,7 @@
"type": "integer"
},
"sourceNumber": {
+ "description": "婧愬崟鍙�",
"type": "string"
}
}
@@ -6673,6 +6882,7 @@
"type": "object",
"properties": {
"condition": {
+ "description": "妯＄硦鏌ヨ鏉′欢",
"type": "string"
},
"keyword": {
@@ -6705,7 +6915,7 @@
"type": "integer"
},
"amount": {
- "description": "ProductName string ` + "`" + `json:\"productName\" gorm:\"type:varchar(255);not null;comment:浜у搧鍚嶇О\"` + "`" + ` //浜у搧鍚嶇О",
+ "description": "ProductName string ` + "`" + `json:\"productName\" ` + "`" + ` //浜у搧鍚嶇О",
"type": "number"
},
"auxiliaryAmount": {
@@ -6721,7 +6931,7 @@
"type": "number"
},
"fromLocationId": {
- "description": "Unit string ` + "`" + `json:\"unit\" gorm:\"type:varchar(31);comment:鍗曚綅\"` + "`" + ` //鍗曚綅\nProduct models.Material ` + "`" + `json:\"product\" gorm:\"foreignKey:ProductId;references:ID\"` + "`" + `",
+ "description": "Unit string ` + "`" + `json:\"unit\"` + "`" + ` //鍗曚綅\nProduct models.Material ` + "`" + `json:\"product\" ` + "`" + ` // 浜у搧",
"type": "integer"
},
"productId": {
@@ -6729,11 +6939,20 @@
"type": "string"
},
"remark": {
+ "description": "澶囨敞",
"type": "string"
},
"salePrice": {
"description": "閿�鍞崟浠�",
"type": "number"
+ },
+ "silkMarket": {
+ "description": "搴勫彛缂栫爜",
+ "type": "string"
+ },
+ "silkMarketClose": {
+ "description": "搴勫彛鍏抽棴",
+ "type": "string"
},
"stockAmount": {
"description": "搴撳瓨鏁伴噺锛岀洏鐐规椂鐢�",
@@ -6757,7 +6976,7 @@
"type": "object",
"properties": {
"baseOperationType": {
- "description": "1 鍏ュ簱 2 鍑哄簱 3 鍐呴儴璋冩嫧 4 鎶ュ簾 5 搴撳瓨鐩樼偣",
+ "description": "鍩虹浣滀笟绫诲瀷 1 鍏ュ簱 2 鍑哄簱 3 鍐呴儴璋冩嫧 4 鎶ュ簾 5 搴撳瓨鐩樼偣",
"allOf": [
{
"$ref": "#/definitions/constvar.BaseOperationType"
@@ -6765,9 +6984,11 @@
]
},
"number": {
+ "description": "鍗曞彿",
"type": "string"
},
"operationTypeId": {
+ "description": "浣滀笟绫诲瀷id",
"type": "integer"
},
"page": {
@@ -6779,7 +7000,12 @@
"type": "integer"
},
"status": {
- "$ref": "#/definitions/constvar.OperationStatus"
+ "description": "鐘舵��",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.OperationStatus"
+ }
+ ]
}
}
},
@@ -7095,9 +7321,11 @@
"type": "object",
"properties": {
"accountant": {
+ "description": "浼氳鍚嶇О",
"type": "string"
},
"accountantId": {
+ "description": "浼氳id",
"type": "string"
},
"baseOperationType": {
@@ -7129,12 +7357,15 @@
"type": "string"
},
"custodian": {
+ "description": "淇濈鍛樺悕绉�",
"type": "string"
},
"custodianId": {
+ "description": "淇濈鍛榠d",
"type": "string"
},
"details": {
+ "description": "璇︽儏",
"type": "array",
"items": {
"$ref": "#/definitions/request.OperationDetails"
@@ -7144,6 +7375,7 @@
"type": "integer"
},
"inventoryDealerType": {
+ "description": "璋冩嫧鍑哄叆搴撳垎绫�(瀵瑰簲dict瀛楀吀琛ㄧ殑ID)",
"type": "integer"
},
"locationId": {
@@ -7158,9 +7390,11 @@
"type": "number"
},
"manager": {
+ "description": "涓荤鍚嶇О",
"type": "string"
},
"managerId": {
+ "description": "涓荤id",
"type": "string"
},
"number": {
@@ -7168,7 +7402,7 @@
"type": "string"
},
"operationDate": {
- "description": "FromLocationId int ` + "`" + `json:\"fromLocationId\" gorm:\"type:int;not null;comment:婧愪綅缃甶d\"` + "`" + ` //婧愪綅缃甶d\nToLocationId int ` + "`" + `json:\"toLocationId\" gorm:\"type:int;not null;comment:鐩爣浣嶇疆id\"` + "`" + ` //鐩爣浣嶇疆id",
+ "description": "FromLocationId int ` + "`" + `json:\"fromLocationId\" ` + "`" + ` //婧愪綅缃甶d\nToLocationId int ` + "`" + `json:\"toLocationId\" ` + "`" + ` //鐩爣浣嶇疆id",
"type": "string"
},
"operationTypeId": {
@@ -7180,12 +7414,19 @@
"type": "string"
},
"receiverAddr": {
+ "description": "鏀惰揣鍦板潃",
"type": "string"
},
"receiverName": {
+ "description": "鏀惰揣浜哄鍚�",
"type": "string"
},
"receiverPhone": {
+ "description": "鑱旂郴鐢佃瘽",
+ "type": "string"
+ },
+ "silkMarket": {
+ "description": "搴勫彛缂栫爜",
"type": "string"
},
"sourceNumber": {
@@ -7349,8 +7590,16 @@
"description": "浜у搧id",
"type": "string"
},
+ "productCategory": {
+ "description": "浜у搧绫诲埆",
+ "type": "string"
+ },
"productName": {
"description": "浜у搧鍚嶇О",
+ "type": "string"
+ },
+ "productSpecs": {
+ "description": "浜у搧瑙勬牸",
"type": "string"
},
"productType": {
@@ -7430,6 +7679,29 @@
}
}
},
+ "user.GetUserRequest": {
+ "type": "object",
+ "properties": {
+ "id": {
+ "type": "string"
+ },
+ "nickName": {
+ "type": "string"
+ },
+ "parentId": {
+ "type": "string"
+ },
+ "pos": {
+ "type": "string"
+ },
+ "userName": {
+ "type": "string"
+ },
+ "userType": {
+ "type": "integer"
+ }
+ }
+ },
"util.Response": {
"type": "object",
"properties": {
diff --git a/docs/swagger.json b/docs/swagger.json
index e32dcf8..760e12d 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -680,6 +680,72 @@
}
}
},
+ "/api-wms/v1/dict/getUserList": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鏁版嵁瀛楀吀"
+ ],
+ "summary": "鑾峰彇鐢ㄦ埛鍒楄〃",
+ "parameters": [
+ {
+ "type": "string",
+ "name": "id",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "nickName",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "parentId",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "pos",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "userName",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "name": "userType",
+ "in": "query"
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/util.ResponseList"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/user.GetUserRequest"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
"/api-wms/v1/dict/save": {
"post": {
"produces": [
@@ -1670,6 +1736,13 @@
"summary": "娣诲姞搴撳瓨鐩樼偣淇℃伅",
"parameters": [
{
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ },
+ {
"description": "鍏ュ簱/鍑哄簱淇℃伅",
"name": "object",
"in": "body",
@@ -1699,6 +1772,13 @@
],
"summary": "搴旂敤銆侀獙璇�",
"parameters": [
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ },
{
"description": "鍏ュ弬",
"name": "object",
@@ -1884,6 +1964,13 @@
"summary": "淇敼搴撳瓨鐩樼偣淇℃伅",
"parameters": [
{
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ },
+ {
"description": "鍏ュ簱/鍑哄簱淇℃伅",
"name": "object",
"in": "body",
@@ -1941,6 +2028,13 @@
],
"summary": "鏇存敼璁板綍鐘舵��",
"parameters": [
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ },
{
"type": "integer",
"description": "id",
@@ -2108,6 +2202,13 @@
"summary": "鍏ュ簱/鍑哄簱鍒楄〃",
"parameters": [
{
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ },
+ {
"description": "鏌ヨ鍙傛暟",
"name": "object",
"in": "body",
@@ -2213,6 +2314,13 @@
"summary": "娣诲姞鍏ュ簱/鍑哄簱",
"parameters": [
{
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ },
+ {
"description": "鍏ュ簱/鍑哄簱淇℃伅",
"name": "object",
"in": "body",
@@ -2242,6 +2350,13 @@
],
"summary": "鍒犻櫎鍏ュ簱/鍑哄簱淇℃伅",
"parameters": [
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ },
{
"type": "integer",
"description": "id",
@@ -4234,10 +4349,12 @@
2,
3,
4,
- 5
+ 5,
+ 6
],
"x-enum-comments": {
"DisuseType": "鎶ュ簾绫诲瀷",
+ "ProductSource": "浜у搧鏉ユ簮",
"StockoutType": "鍑哄簱绫诲瀷",
"StorageType": "鍏ュ簱绫诲瀷",
"TakeStockType": "鐩樼偣绫诲瀷",
@@ -4248,7 +4365,8 @@
"StockoutType",
"TransferType",
"TakeStockType",
- "DisuseType"
+ "DisuseType",
+ "ProductSource"
]
},
"constvar.OperationSource": {
@@ -4705,6 +4823,7 @@
"type": "string"
},
"warehouseId": {
+ "description": "浠撳簱id",
"type": "integer"
}
}
@@ -5233,12 +5352,15 @@
"type": "object",
"properties": {
"accountant": {
+ "description": "浼氳鍚嶇О",
"type": "string"
},
"accountantId": {
+ "description": "浼氳id",
"type": "string"
},
"auditDate": {
+ "description": "瀹℃壒鏃堕棿",
"type": "string"
},
"baseOperationType": {
@@ -5250,39 +5372,50 @@
]
},
"checkedBy": {
+ "description": "楠岃瘉鑰匲serId",
"type": "string"
},
"comment": {
+ "description": "澶囨敞",
"type": "string"
},
"companyID": {
+ "description": "鍏徃ID-瀹㈡埛",
"type": "string"
},
"companyName": {
+ "description": "鍏徃鍚嶇О-瀹㈡埛",
"type": "string"
},
"contacterID": {
+ "description": "鑱旂郴浜篒D",
"type": "integer"
},
"contacterName": {
+ "description": "鑱旂郴浜哄鍚�",
"type": "string"
},
"createBy": {
+ "description": "鍒涘缓鑰匲serId",
"type": "string"
},
"createTime": {
"type": "string"
},
"custodian": {
+ "description": "淇濈鍛樺悕绉�",
"type": "string"
},
"custodianId": {
+ "description": "淇濈鍛榠d",
"type": "string"
},
"dealerType": {
+ "description": "璋冩嫧鍑哄叆搴撶被鍨�",
"type": "string"
},
"details": {
+ "description": "鎿嶄綔鏄庣粏",
"type": "array",
"items": {
"$ref": "#/definitions/models.OperationDetails"
@@ -5308,9 +5441,15 @@
"type": "integer"
},
"logisticCompany": {
- "$ref": "#/definitions/models.LogisticCompany"
+ "description": "鐗╂祦鍏徃淇℃伅",
+ "allOf": [
+ {
+ "$ref": "#/definitions/models.LogisticCompany"
+ }
+ ]
},
"logisticCompanyId": {
+ "description": "鐗╂祦鍏徃id",
"type": "string"
},
"logisticWeight": {
@@ -5318,9 +5457,11 @@
"type": "number"
},
"manager": {
+ "description": "涓荤鍚嶇О",
"type": "string"
},
"managerId": {
+ "description": "涓荤id",
"type": "string"
},
"number": {
@@ -5328,6 +5469,7 @@
"type": "string"
},
"operationDate": {
+ "description": "瀹夋帓鏃ユ湡",
"type": "string"
},
"operationSource": {
@@ -5347,21 +5489,31 @@
"type": "string"
},
"receiverAddr": {
+ "description": "鏀惰揣鍦板潃",
"type": "string"
},
"receiverName": {
+ "description": "鏀惰揣浜哄鍚�",
"type": "string"
},
"receiverPhone": {
+ "description": "鑱旂郴鐢佃瘽",
"type": "string"
},
"remark": {
+ "description": "澶囨敞",
"type": "string"
},
"salesDetailsNumber": {
+ "description": "閿�鍞槑缁嗙紪鐮�",
+ "type": "string"
+ },
+ "silkMarket": {
+ "description": "鍢夎仈浠撳偍娣诲姞 SilkMarket",
"type": "string"
},
"source": {
+ "description": "鏉ユ簮绯荤粺",
"type": "string"
},
"sourceNumber": {
@@ -5392,9 +5544,15 @@
"type": "string"
},
"warehouse": {
- "$ref": "#/definitions/models.Warehouse"
+ "description": "浠撳簱淇℃伅",
+ "allOf": [
+ {
+ "$ref": "#/definitions/models.Warehouse"
+ }
+ ]
},
"warehouseId": {
+ "description": "浠撳簱id",
"type": "integer"
},
"waybillNumber": {
@@ -5415,9 +5573,11 @@
"type": "number"
},
"auxiliaryAmount": {
+ "description": "杈呭姪鏁伴噺",
"type": "number"
},
"auxiliaryUnit": {
+ "description": "杈呭姪鍗曚綅",
"type": "string"
},
"baseOperationType": {
@@ -5459,7 +5619,7 @@
"type": "boolean"
},
"operationId": {
- "description": "鎿嶄綔id",
+ "description": "鎿嶄綔璁板綍id",
"type": "integer"
},
"product": {
@@ -5475,11 +5635,20 @@
"type": "string"
},
"remark": {
+ "description": "澶囨敞",
"type": "string"
},
"salePrice": {
"description": "閿�鍞崟浠�",
"type": "number"
+ },
+ "silkMarket": {
+ "description": "鍢夎仈浠撳偍娣诲姞 SilkMarket銆丼ilkMarketClose",
+ "type": "string"
+ },
+ "silkMarketClose": {
+ "description": "搴勫彛鍏抽棴",
+ "type": "string"
},
"stockAmount": {
"description": "搴撳瓨鏁伴噺锛岀洏鐐规椂鐢�",
@@ -5498,9 +5667,11 @@
"type": "integer"
},
"totalGrossWeight": {
+ "description": "鎬绘瘺閲�",
"type": "number"
},
"totalNetWeight": {
+ "description": "鎬诲噣閲�",
"type": "number"
},
"updateTime": {
@@ -5984,6 +6155,10 @@
"request.AddMiniDict": {
"type": "object",
"properties": {
+ "code": {
+ "description": "缂栫爜",
+ "type": "string"
+ },
"isDefault": {
"description": "鏄惁榛樿",
"type": "boolean"
@@ -6010,13 +6185,15 @@
"type": "object",
"properties": {
"accountant": {
+ "description": "浼氳鍚嶇О",
"type": "string"
},
"accountantId": {
+ "description": "浼氳id",
"type": "string"
},
"baseOperationType": {
- "description": "鍩虹浣滀笟绫诲瀷 5搴撳瓨鐩樼偣",
+ "description": "鍩虹浣滀笟绫诲瀷 1 鍏ュ簱 2 鍑哄簱 3 鍐呴儴璋冩嫧 4 鎶ュ簾 5 搴撳瓨鐩樼偣",
"allOf": [
{
"$ref": "#/definitions/constvar.BaseOperationType"
@@ -6044,15 +6221,19 @@
"type": "string"
},
"custodian": {
+ "description": "淇濈鍛樺悕绉�",
"type": "string"
},
"custodianId": {
+ "description": "淇濈鍛榠d",
"type": "string"
},
"dealerType": {
+ "description": "璋冩嫧鍑哄叆搴撶被鍨�",
"type": "string"
},
"details": {
+ "description": "璇︽儏",
"type": "array",
"items": {
"$ref": "#/definitions/request.OperationDetails"
@@ -6066,6 +6247,7 @@
"type": "integer"
},
"logisticCompanyId": {
+ "description": "鐗╂祦鍏徃id",
"type": "string"
},
"logisticWeight": {
@@ -6073,9 +6255,11 @@
"type": "number"
},
"manager": {
+ "description": "涓荤鍚嶇О",
"type": "string"
},
"managerId": {
+ "description": "涓荤id",
"type": "string"
},
"number": {
@@ -6083,7 +6267,7 @@
"type": "string"
},
"operationDate": {
- "description": "FromLocationId int `json:\"fromLocationId\" gorm:\"type:int;not null;comment:婧愪綅缃甶d\"` //婧愪綅缃甶d\nToLocationId int `json:\"toLocationId\" gorm:\"type:int;not null;comment:鐩爣浣嶇疆id\"` //鐩爣浣嶇疆id",
+ "description": "FromLocationId int `json:\"fromLocationId\" ` //婧愪綅缃甶d\nToLocationId int `json:\"toLocationId\" ` //鐩爣浣嶇疆id",
"type": "string"
},
"operationTypeId": {
@@ -6095,12 +6279,19 @@
"type": "string"
},
"receiverAddr": {
+ "description": "鏀惰揣鍦板潃",
"type": "string"
},
"receiverName": {
+ "description": "鏀惰揣浜哄鍚�",
"type": "string"
},
"receiverPhone": {
+ "description": "鑱旂郴鐢佃瘽",
+ "type": "string"
+ },
+ "silkMarket": {
+ "description": "搴勫彛缂栫爜",
"type": "string"
},
"sourceNumber": {
@@ -6304,6 +6495,10 @@
"request.EditMiniDict": {
"type": "object",
"properties": {
+ "code": {
+ "description": "缂栫爜",
+ "type": "string"
+ },
"id": {
"description": "瀛楀吀绫诲瀷",
"type": "integer"
@@ -6423,6 +6618,10 @@
},
"warehouseCode": {
"type": "string"
+ },
+ "warehouseId": {
+ "description": "浠撳簱ID",
+ "type": "string"
}
}
},
@@ -6529,6 +6728,10 @@
"request.GetMiniDictList": {
"type": "object",
"properties": {
+ "keyword": {
+ "description": "鍏抽敭瀛楁煡璇�",
+ "type": "string"
+ },
"type": {
"description": "瀛楀吀绫诲瀷",
"allOf": [
@@ -6625,6 +6828,10 @@
"request.MiniDict": {
"type": "object",
"properties": {
+ "code": {
+ "description": "缂栫爜",
+ "type": "string"
+ },
"isDefault": {
"description": "鏄惁榛樿",
"type": "boolean"
@@ -6643,6 +6850,7 @@
"type": "object",
"properties": {
"number": {
+ "description": "鍗曞彿",
"type": "string"
},
"page": {
@@ -6654,6 +6862,7 @@
"type": "integer"
},
"sourceNumber": {
+ "description": "婧愬崟鍙�",
"type": "string"
}
}
@@ -6662,6 +6871,7 @@
"type": "object",
"properties": {
"condition": {
+ "description": "妯＄硦鏌ヨ鏉′欢",
"type": "string"
},
"keyword": {
@@ -6694,7 +6904,7 @@
"type": "integer"
},
"amount": {
- "description": "ProductName string `json:\"productName\" gorm:\"type:varchar(255);not null;comment:浜у搧鍚嶇О\"` //浜у搧鍚嶇О",
+ "description": "ProductName string `json:\"productName\" ` //浜у搧鍚嶇О",
"type": "number"
},
"auxiliaryAmount": {
@@ -6710,7 +6920,7 @@
"type": "number"
},
"fromLocationId": {
- "description": "Unit string `json:\"unit\" gorm:\"type:varchar(31);comment:鍗曚綅\"` //鍗曚綅\nProduct models.Material `json:\"product\" gorm:\"foreignKey:ProductId;references:ID\"`",
+ "description": "Unit string `json:\"unit\"` //鍗曚綅\nProduct models.Material `json:\"product\" ` // 浜у搧",
"type": "integer"
},
"productId": {
@@ -6718,11 +6928,20 @@
"type": "string"
},
"remark": {
+ "description": "澶囨敞",
"type": "string"
},
"salePrice": {
"description": "閿�鍞崟浠�",
"type": "number"
+ },
+ "silkMarket": {
+ "description": "搴勫彛缂栫爜",
+ "type": "string"
+ },
+ "silkMarketClose": {
+ "description": "搴勫彛鍏抽棴",
+ "type": "string"
},
"stockAmount": {
"description": "搴撳瓨鏁伴噺锛岀洏鐐规椂鐢�",
@@ -6746,7 +6965,7 @@
"type": "object",
"properties": {
"baseOperationType": {
- "description": "1 鍏ュ簱 2 鍑哄簱 3 鍐呴儴璋冩嫧 4 鎶ュ簾 5 搴撳瓨鐩樼偣",
+ "description": "鍩虹浣滀笟绫诲瀷 1 鍏ュ簱 2 鍑哄簱 3 鍐呴儴璋冩嫧 4 鎶ュ簾 5 搴撳瓨鐩樼偣",
"allOf": [
{
"$ref": "#/definitions/constvar.BaseOperationType"
@@ -6754,9 +6973,11 @@
]
},
"number": {
+ "description": "鍗曞彿",
"type": "string"
},
"operationTypeId": {
+ "description": "浣滀笟绫诲瀷id",
"type": "integer"
},
"page": {
@@ -6768,7 +6989,12 @@
"type": "integer"
},
"status": {
- "$ref": "#/definitions/constvar.OperationStatus"
+ "description": "鐘舵��",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.OperationStatus"
+ }
+ ]
}
}
},
@@ -7084,9 +7310,11 @@
"type": "object",
"properties": {
"accountant": {
+ "description": "浼氳鍚嶇О",
"type": "string"
},
"accountantId": {
+ "description": "浼氳id",
"type": "string"
},
"baseOperationType": {
@@ -7118,12 +7346,15 @@
"type": "string"
},
"custodian": {
+ "description": "淇濈鍛樺悕绉�",
"type": "string"
},
"custodianId": {
+ "description": "淇濈鍛榠d",
"type": "string"
},
"details": {
+ "description": "璇︽儏",
"type": "array",
"items": {
"$ref": "#/definitions/request.OperationDetails"
@@ -7133,6 +7364,7 @@
"type": "integer"
},
"inventoryDealerType": {
+ "description": "璋冩嫧鍑哄叆搴撳垎绫�(瀵瑰簲dict瀛楀吀琛ㄧ殑ID)",
"type": "integer"
},
"locationId": {
@@ -7147,9 +7379,11 @@
"type": "number"
},
"manager": {
+ "description": "涓荤鍚嶇О",
"type": "string"
},
"managerId": {
+ "description": "涓荤id",
"type": "string"
},
"number": {
@@ -7157,7 +7391,7 @@
"type": "string"
},
"operationDate": {
- "description": "FromLocationId int `json:\"fromLocationId\" gorm:\"type:int;not null;comment:婧愪綅缃甶d\"` //婧愪綅缃甶d\nToLocationId int `json:\"toLocationId\" gorm:\"type:int;not null;comment:鐩爣浣嶇疆id\"` //鐩爣浣嶇疆id",
+ "description": "FromLocationId int `json:\"fromLocationId\" ` //婧愪綅缃甶d\nToLocationId int `json:\"toLocationId\" ` //鐩爣浣嶇疆id",
"type": "string"
},
"operationTypeId": {
@@ -7169,12 +7403,19 @@
"type": "string"
},
"receiverAddr": {
+ "description": "鏀惰揣鍦板潃",
"type": "string"
},
"receiverName": {
+ "description": "鏀惰揣浜哄鍚�",
"type": "string"
},
"receiverPhone": {
+ "description": "鑱旂郴鐢佃瘽",
+ "type": "string"
+ },
+ "silkMarket": {
+ "description": "搴勫彛缂栫爜",
"type": "string"
},
"sourceNumber": {
@@ -7338,8 +7579,16 @@
"description": "浜у搧id",
"type": "string"
},
+ "productCategory": {
+ "description": "浜у搧绫诲埆",
+ "type": "string"
+ },
"productName": {
"description": "浜у搧鍚嶇О",
+ "type": "string"
+ },
+ "productSpecs": {
+ "description": "浜у搧瑙勬牸",
"type": "string"
},
"productType": {
@@ -7419,6 +7668,29 @@
}
}
},
+ "user.GetUserRequest": {
+ "type": "object",
+ "properties": {
+ "id": {
+ "type": "string"
+ },
+ "nickName": {
+ "type": "string"
+ },
+ "parentId": {
+ "type": "string"
+ },
+ "pos": {
+ "type": "string"
+ },
+ "userName": {
+ "type": "string"
+ },
+ "userType": {
+ "type": "integer"
+ }
+ }
+ },
"util.Response": {
"type": "object",
"properties": {
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 3504c9f..86a7c4e 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -213,9 +213,11 @@
- 3
- 4
- 5
+ - 6
type: integer
x-enum-comments:
DisuseType: 鎶ュ簾绫诲瀷
+ ProductSource: 浜у搧鏉ユ簮
StockoutType: 鍑哄簱绫诲瀷
StorageType: 鍏ュ簱绫诲瀷
TakeStockType: 鐩樼偣绫诲瀷
@@ -226,6 +228,7 @@
- TransferType
- TakeStockType
- DisuseType
+ - ProductSource
constvar.OperationSource:
enum:
- 1
@@ -556,6 +559,7 @@
updateTime:
type: string
warehouseId:
+ description: 浠撳簱id
type: integer
type: object
models.LogisticCompany:
@@ -934,38 +938,52 @@
models.Operation:
properties:
accountant:
+ description: 浼氳鍚嶇О
type: string
accountantId:
+ description: 浼氳id
type: string
auditDate:
+ description: 瀹℃壒鏃堕棿
type: string
baseOperationType:
allOf:
- $ref: '#/definitions/constvar.BaseOperationType'
description: 鍩虹浣滀笟绫诲瀷
checkedBy:
+ description: 楠岃瘉鑰匲serId
type: string
comment:
+ description: 澶囨敞
type: string
companyID:
+ description: 鍏徃ID-瀹㈡埛
type: string
companyName:
+ description: 鍏徃鍚嶇О-瀹㈡埛
type: string
contacterID:
+ description: 鑱旂郴浜篒D
type: integer
contacterName:
+ description: 鑱旂郴浜哄鍚�
type: string
createBy:
+ description: 鍒涘缓鑰匲serId
type: string
createTime:
type: string
custodian:
+ description: 淇濈鍛樺悕绉�
type: string
custodianId:
+ description: 淇濈鍛榠d
type: string
dealerType:
+ description: 璋冩嫧鍑哄叆搴撶被鍨�
type: string
details:
+ description: 鎿嶄綔鏄庣粏
items:
$ref: '#/definitions/models.OperationDetails'
type: array
@@ -982,20 +1000,26 @@
description: 婧愪綅缃甶d
type: integer
logisticCompany:
- $ref: '#/definitions/models.LogisticCompany'
+ allOf:
+ - $ref: '#/definitions/models.LogisticCompany'
+ description: 鐗╂祦鍏徃淇℃伅
logisticCompanyId:
+ description: 鐗╂祦鍏徃id
type: string
logisticWeight:
description: 鐗╂祦閲嶉噺
type: number
manager:
+ description: 涓荤鍚嶇О
type: string
managerId:
+ description: 涓荤id
type: string
number:
description: 鍗曞彿
type: string
operationDate:
+ description: 瀹夋帓鏃ユ湡
type: string
operationSource:
allOf:
@@ -1008,16 +1032,25 @@
description: 浣滀笟绫诲瀷鍚嶇О
type: string
receiverAddr:
+ description: 鏀惰揣鍦板潃
type: string
receiverName:
+ description: 鏀惰揣浜哄鍚�
type: string
receiverPhone:
+ description: 鑱旂郴鐢佃瘽
type: string
remark:
+ description: 澶囨敞
type: string
salesDetailsNumber:
+ description: 閿�鍞槑缁嗙紪鐮�
+ type: string
+ silkMarket:
+ description: 鍢夎仈浠撳偍娣诲姞 SilkMarket
type: string
source:
+ description: 鏉ユ簮绯荤粺
type: string
sourceNumber:
description: 婧愬崟鍙�
@@ -1036,8 +1069,11 @@
updateTime:
type: string
warehouse:
- $ref: '#/definitions/models.Warehouse'
+ allOf:
+ - $ref: '#/definitions/models.Warehouse'
+ description: 浠撳簱淇℃伅
warehouseId:
+ description: 浠撳簱id
type: integer
waybillNumber:
description: 杩愬崟鍙�
@@ -1053,8 +1089,10 @@
null;comment:浜у搧鍚嶇О"` //浜у搧鍚嶇О
type: number
auxiliaryAmount:
+ description: 杈呭姪鏁伴噺
type: number
auxiliaryUnit:
+ description: 杈呭姪鍗曚綅
type: string
baseOperationType:
allOf:
@@ -1081,7 +1119,7 @@
description: 鏄惁璋冩嫧浜х敓鐨勫嚭搴�
type: boolean
operationId:
- description: 鎿嶄綔id
+ description: 鎿嶄綔璁板綍id
type: integer
product:
allOf:
@@ -1091,10 +1129,17 @@
description: 浜у搧id
type: string
remark:
+ description: 澶囨敞
type: string
salePrice:
description: 閿�鍞崟浠�
type: number
+ silkMarket:
+ description: 鍢夎仈浠撳偍娣诲姞 SilkMarket銆丼ilkMarketClose
+ type: string
+ silkMarketClose:
+ description: 搴勫彛鍏抽棴
+ type: string
stockAmount:
description: 搴撳瓨鏁伴噺锛岀洏鐐规椂鐢�
type: number
@@ -1106,8 +1151,10 @@
description: 鐩爣浣嶇疆id
type: integer
totalGrossWeight:
+ description: 鎬绘瘺閲�
type: number
totalNetWeight:
+ description: 鎬诲噣閲�
type: number
updateTime:
type: string
@@ -1436,6 +1483,9 @@
type: object
request.AddMiniDict:
properties:
+ code:
+ description: 缂栫爜
+ type: string
isDefault:
description: 鏄惁榛樿
type: boolean
@@ -1453,13 +1503,15 @@
request.AddOperation:
properties:
accountant:
+ description: 浼氳鍚嶇О
type: string
accountantId:
+ description: 浼氳id
type: string
baseOperationType:
allOf:
- $ref: '#/definitions/constvar.BaseOperationType'
- description: 鍩虹浣滀笟绫诲瀷 5搴撳瓨鐩樼偣
+ description: 鍩虹浣滀笟绫诲瀷 1 鍏ュ簱 2 鍑哄簱 3 鍐呴儴璋冩嫧 4 鎶ュ簾 5 搴撳瓨鐩樼偣
comment:
description: 澶囨敞
type: string
@@ -1476,12 +1528,16 @@
description: 鑱旂郴浜哄鍚�-闈炲繀濉�
type: string
custodian:
+ description: 淇濈鍛樺悕绉�
type: string
custodianId:
+ description: 淇濈鍛榠d
type: string
dealerType:
+ description: 璋冩嫧鍑哄叆搴撶被鍨�
type: string
details:
+ description: 璇︽儏
items:
$ref: '#/definitions/request.OperationDetails'
type: array
@@ -1491,21 +1547,24 @@
description: 婧愪綅缃甶d
type: integer
logisticCompanyId:
+ description: 鐗╂祦鍏徃id
type: string
logisticWeight:
description: 鐗╂祦閲嶉噺
type: number
manager:
+ description: 涓荤鍚嶇О
type: string
managerId:
+ description: 涓荤id
type: string
number:
description: 鍗曞彿
type: string
operationDate:
description: |-
- FromLocationId int `json:"fromLocationId" gorm:"type:int;not null;comment:婧愪綅缃甶d"` //婧愪綅缃甶d
- ToLocationId int `json:"toLocationId" gorm:"type:int;not null;comment:鐩爣浣嶇疆id"` //鐩爣浣嶇疆id
+ FromLocationId int `json:"fromLocationId" ` //婧愪綅缃甶d
+ ToLocationId int `json:"toLocationId" ` //鐩爣浣嶇疆id
type: string
operationTypeId:
description: 浣滀笟绫诲瀷id
@@ -1514,10 +1573,16 @@
description: 浣滀笟绫诲瀷鍚嶇О
type: string
receiverAddr:
+ description: 鏀惰揣鍦板潃
type: string
receiverName:
+ description: 鏀惰揣浜哄鍚�
type: string
receiverPhone:
+ description: 鑱旂郴鐢佃瘽
+ type: string
+ silkMarket:
+ description: 搴勫彛缂栫爜
type: string
sourceNumber:
description: 婧愬崟鍙�
@@ -1656,6 +1721,9 @@
type: object
request.EditMiniDict:
properties:
+ code:
+ description: 缂栫爜
+ type: string
id:
description: 瀛楀吀绫诲瀷
type: integer
@@ -1738,6 +1806,9 @@
type: string
warehouseCode:
type: string
+ warehouseId:
+ description: 浠撳簱ID
+ type: string
type: object
request.GetList:
properties:
@@ -1810,6 +1881,9 @@
type: object
request.GetMiniDictList:
properties:
+ keyword:
+ description: 鍏抽敭瀛楁煡璇�
+ type: string
type:
allOf:
- $ref: '#/definitions/constvar.MiniDictType'
@@ -1874,6 +1948,9 @@
type: object
request.MiniDict:
properties:
+ code:
+ description: 缂栫爜
+ type: string
isDefault:
description: 鏄惁榛樿
type: boolean
@@ -1887,6 +1964,7 @@
request.OperationAllList:
properties:
number:
+ description: 鍗曞彿
type: string
page:
description: 椤电爜
@@ -1895,11 +1973,13 @@
description: 姣忛〉澶у皬
type: integer
sourceNumber:
+ description: 婧愬崟鍙�
type: string
type: object
request.OperationCondition:
properties:
condition:
+ description: 妯＄硦鏌ヨ鏉′欢
type: string
keyword:
description: 鍏抽敭瀛楁悳绱�
@@ -1923,8 +2003,7 @@
description: 鎿嶄綔id
type: integer
amount:
- description: ProductName string `json:"productName" gorm:"type:varchar(255);not
- null;comment:浜у搧鍚嶇О"` //浜у搧鍚嶇О
+ description: ProductName string `json:"productName" ` //浜у搧鍚嶇О
type: number
auxiliaryAmount:
description: 杈呭姪鏁伴噺
@@ -1937,17 +2016,24 @@
type: number
fromLocationId:
description: |-
- Unit string `json:"unit" gorm:"type:varchar(31);comment:鍗曚綅"` //鍗曚綅
- Product models.Material `json:"product" gorm:"foreignKey:ProductId;references:ID"`
+ Unit string `json:"unit"` //鍗曚綅
+ Product models.Material `json:"product" ` // 浜у搧
type: integer
productId:
description: 浜у搧id
type: string
remark:
+ description: 澶囨敞
type: string
salePrice:
description: 閿�鍞崟浠�
type: number
+ silkMarket:
+ description: 搴勫彛缂栫爜
+ type: string
+ silkMarketClose:
+ description: 搴勫彛鍏抽棴
+ type: string
stockAmount:
description: 搴撳瓨鏁伴噺锛岀洏鐐规椂鐢�
type: number
@@ -1966,10 +2052,12 @@
baseOperationType:
allOf:
- $ref: '#/definitions/constvar.BaseOperationType'
- description: 1 鍏ュ簱 2 鍑哄簱 3 鍐呴儴璋冩嫧 4 鎶ュ簾 5 搴撳瓨鐩樼偣
+ description: 鍩虹浣滀笟绫诲瀷 1 鍏ュ簱 2 鍑哄簱 3 鍐呴儴璋冩嫧 4 鎶ュ簾 5 搴撳瓨鐩樼偣
number:
+ description: 鍗曞彿
type: string
operationTypeId:
+ description: 浣滀笟绫诲瀷id
type: integer
page:
description: 椤电爜
@@ -1978,7 +2066,9 @@
description: 姣忛〉澶у皬
type: integer
status:
- $ref: '#/definitions/constvar.OperationStatus'
+ allOf:
+ - $ref: '#/definitions/constvar.OperationStatus'
+ description: 鐘舵��
type: object
request.PageInfo:
properties:
@@ -2190,8 +2280,10 @@
request.UpdateOperation:
properties:
accountant:
+ description: 浼氳鍚嶇О
type: string
accountantId:
+ description: 浼氳id
type: string
baseOperationType:
allOf:
@@ -2213,16 +2305,20 @@
description: 鑱旂郴浜哄鍚�-闈炲繀濉�
type: string
custodian:
+ description: 淇濈鍛樺悕绉�
type: string
custodianId:
+ description: 淇濈鍛榠d
type: string
details:
+ description: 璇︽儏
items:
$ref: '#/definitions/request.OperationDetails'
type: array
id:
type: integer
inventoryDealerType:
+ description: 璋冩嫧鍑哄叆搴撳垎绫�(瀵瑰簲dict瀛楀吀琛ㄧ殑ID)
type: integer
locationId:
description: 婧愪綅缃甶d
@@ -2233,16 +2329,18 @@
description: 鐗╂祦閲嶉噺
type: number
manager:
+ description: 涓荤鍚嶇О
type: string
managerId:
+ description: 涓荤id
type: string
number:
description: 鍗曞彿
type: string
operationDate:
description: |-
- FromLocationId int `json:"fromLocationId" gorm:"type:int;not null;comment:婧愪綅缃甶d"` //婧愪綅缃甶d
- ToLocationId int `json:"toLocationId" gorm:"type:int;not null;comment:鐩爣浣嶇疆id"` //鐩爣浣嶇疆id
+ FromLocationId int `json:"fromLocationId" ` //婧愪綅缃甶d
+ ToLocationId int `json:"toLocationId" ` //鐩爣浣嶇疆id
type: string
operationTypeId:
description: 浣滀笟绫诲瀷id
@@ -2251,10 +2349,16 @@
description: 浣滀笟绫诲瀷鍚嶇О
type: string
receiverAddr:
+ description: 鏀惰揣鍦板潃
type: string
receiverName:
+ description: 鏀惰揣浜哄鍚�
type: string
receiverPhone:
+ description: 鑱旂郴鐢佃瘽
+ type: string
+ silkMarket:
+ description: 搴勫彛缂栫爜
type: string
sourceNumber:
description: 婧愬崟鍙�
@@ -2366,8 +2470,14 @@
produceId:
description: 浜у搧id
type: string
+ productCategory:
+ description: 浜у搧绫诲埆
+ type: string
productName:
description: 浜у搧鍚嶇О
+ type: string
+ productSpecs:
+ description: 浜у搧瑙勬牸
type: string
productType:
description: 浜у搧绫诲瀷
@@ -2423,6 +2533,21 @@
items:
$ref: '#/definitions/models.Material'
type: array
+ type: object
+ user.GetUserRequest:
+ properties:
+ id:
+ type: string
+ nickName:
+ type: string
+ parentId:
+ type: string
+ pos:
+ type: string
+ userName:
+ type: string
+ userType:
+ type: integer
type: object
util.Response:
properties:
@@ -2869,6 +2994,44 @@
type: array
type: object
summary: 鑾峰彇瀛楀吀淇℃伅鍒楄〃
+ tags:
+ - 鏁版嵁瀛楀吀
+ /api-wms/v1/dict/getUserList:
+ get:
+ parameters:
+ - in: query
+ name: id
+ type: string
+ - in: query
+ name: nickName
+ type: string
+ - in: query
+ name: parentId
+ type: string
+ - in: query
+ name: pos
+ type: string
+ - in: query
+ name: userName
+ type: string
+ - in: query
+ name: userType
+ type: integer
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ allOf:
+ - $ref: '#/definitions/util.ResponseList'
+ - properties:
+ data:
+ items:
+ $ref: '#/definitions/user.GetUserRequest'
+ type: array
+ type: object
+ summary: 鑾峰彇鐢ㄦ埛鍒楄〃
tags:
- 鏁版嵁瀛楀吀
/api-wms/v1/dict/save:
@@ -3464,6 +3627,11 @@
/api-wms/v1/locationProductAmount/add:
post:
parameters:
+ - description: token
+ in: header
+ name: Authorization
+ required: true
+ type: string
- description: 鍏ュ簱/鍑哄簱淇℃伅
in: body
name: object
@@ -3483,6 +3651,11 @@
/api-wms/v1/locationProductAmount/finish:
post:
parameters:
+ - description: token
+ in: header
+ name: Authorization
+ required: true
+ type: string
- description: 鍏ュ弬
in: body
name: object
@@ -3595,6 +3768,11 @@
/api-wms/v1/locationProductAmount/update:
post:
parameters:
+ - description: token
+ in: header
+ name: Authorization
+ required: true
+ type: string
- description: 鍏ュ簱/鍑哄簱淇℃伅
in: body
name: object
@@ -3632,6 +3810,11 @@
/api-wms/v1/operation/finish/{id}:
put:
parameters:
+ - description: token
+ in: header
+ name: Authorization
+ required: true
+ type: string
- description: id
in: path
name: id
@@ -3733,6 +3916,11 @@
/api-wms/v1/operation/list:
post:
parameters:
+ - description: token
+ in: header
+ name: Authorization
+ required: true
+ type: string
- description: 鏌ヨ鍙傛暟
in: body
name: object
@@ -3797,6 +3985,11 @@
/api-wms/v1/operation/operation:
post:
parameters:
+ - description: token
+ in: header
+ name: Authorization
+ required: true
+ type: string
- description: 鍏ュ簱/鍑哄簱淇℃伅
in: body
name: object
@@ -3816,6 +4009,11 @@
/api-wms/v1/operation/operation/{id}:
delete:
parameters:
+ - description: token
+ in: header
+ name: Authorization
+ required: true
+ type: string
- description: id
in: path
name: id
diff --git a/models/mini_dict.go b/models/mini_dict.go
index 37813c8..46670e8 100644
--- a/models/mini_dict.go
+++ b/models/mini_dict.go
@@ -20,6 +20,7 @@
MiniDictSearch struct {
MiniDict
+ Keyword string
Order string
PageNum int
PageSize int
@@ -70,6 +71,11 @@
return slf
}
+func (slf *MiniDictSearch) SetKeyword(keyword string) *MiniDictSearch {
+ slf.Keyword = keyword
+ return slf
+}
+
func (slf *MiniDictSearch) build() *gorm.DB {
var db = slf.Orm.Table(slf.TableName())
@@ -87,6 +93,10 @@
if slf.Value != "" {
db = db.Where("value = ?", slf.Value)
+ }
+
+ if slf.Keyword != "" {
+ db = db.Where("name like ?", fmt.Sprintf("%%%s%%", slf.Keyword))
}
db.Where("1 = 1")
@@ -250,6 +260,23 @@
return records, nil
}
+func (slf *MiniDictSearch) MaxAutoIncr() (int, error) {
+ type Result struct {
+ Max int
+ }
+
+ var (
+ result Result
+ db = slf.build()
+ )
+
+ err := db.Select("COUNT(id) as max").Scan(&result).Error
+ if err != nil {
+ return result.Max, fmt.Errorf("max err: %v", err)
+ }
+ return result.Max, nil
+}
+
// InitDefaultData 鍒濆鍖栨暟鎹�
func (slf *MiniDictSearch) InitDefaultData() error {
var (
@@ -263,14 +290,16 @@
return nil
}
dict := make([]*MiniDict, 0)
- dict = append(dict, &MiniDict{Type: constvar.TransferType, Name: "鍐呴儴璋冩嫧", Value: "1"})
- dict = append(dict, &MiniDict{Type: constvar.TransferType, Name: "澶栭儴璋冩嫧", Value: "2"})
- dict = append(dict, &MiniDict{Type: constvar.StorageType, Name: "閲囪喘", Value: "1"})
+ dict = append(dict, &MiniDict{Type: constvar.StorageType, Name: "閲囪喘", Value: "1", IsDefault: true})
dict = append(dict, &MiniDict{Type: constvar.StorageType, Name: "鍏朵粬", Value: "99"})
dict = append(dict, &MiniDict{Type: constvar.StockoutType, Name: "灞曞巺", Value: "1"})
dict = append(dict, &MiniDict{Type: constvar.StockoutType, Name: "缁忛攢鍟�", Value: "2"})
- dict = append(dict, &MiniDict{Type: constvar.StockoutType, Name: "閫�搴�", Value: "9"})
+ dict = append(dict, &MiniDict{Type: constvar.StockoutType, Name: "閫�搴�", Value: "9", IsDefault: true})
dict = append(dict, &MiniDict{Type: constvar.StockoutType, Name: "鍏朵粬", Value: "99"})
+ dict = append(dict, &MiniDict{Type: constvar.TransferType, Name: "鍐呴儴璋冩嫧", Value: "1", IsDefault: true})
+ dict = append(dict, &MiniDict{Type: constvar.TransferType, Name: "澶栭儴璋冩嫧", Value: "2"})
+ dict = append(dict, &MiniDict{Type: constvar.TakeStockType, Name: "鍏朵粬", Value: "99"})
+ dict = append(dict, &MiniDict{Type: constvar.DisuseType, Name: "鍏朵粬", Value: "99"})
err := slf.CreateBatch(dict)
return err
}
diff --git a/request/dict.go b/request/dict.go
index f7be713..d11c060 100644
--- a/request/dict.go
+++ b/request/dict.go
@@ -4,6 +4,7 @@
type MiniDict struct {
Name string `json:"name"` // 鍚嶇О
+ Code string `json:"code"` // 缂栫爜
Value string `json:"value"` // 鍊�
IsDefault bool `json:"isDefault"` // 鏄惁榛樿
}
@@ -25,10 +26,12 @@
}
type GetMiniDict struct {
- Type constvar.MiniDictType `json:"type"` // 瀛楀吀绫诲瀷
- Name string `json:"name"` // 瀛楀吀鍚嶇О
+ Type constvar.MiniDictType `json:"type"` // 瀛楀吀绫诲瀷
+ Name string `json:"name"` // 瀛楀吀鍚嶇О
+ Keyword string `json:"keyword"` // 鍏抽敭瀛楁煡璇�
}
type GetMiniDictList struct {
- Type constvar.MiniDictType `json:"type"` // 瀛楀吀绫诲瀷
+ Type constvar.MiniDictType `json:"type"` // 瀛楀吀绫诲瀷
+ Keyword string `json:"keyword"` // 鍏抽敭瀛楁煡璇�
}
diff --git a/router/router.go b/router/router.go
index c5137d8..a14168c 100644
--- a/router/router.go
+++ b/router/router.go
@@ -224,13 +224,12 @@
dictController := new(controllers.DictController)
dictApi := r.Group(urlPrefix + "/dict")
{
- dictApi.POST("add", dictController.AddMiniDict) //娣诲姞瀛楀吀淇℃伅
- dictApi.POST("edit", dictController.EditMiniDict) //淇敼瀛楀吀淇℃伅
- dictApi.DELETE("delete/:id", dictController.DeleteMiniDict) //鍒犻櫎瀛楀吀淇℃伅
- dictApi.POST("save", dictController.SaveMiniDict) //鎵归噺淇濆瓨绯荤粺璁剧疆
- dictApi.POST("getDictList", dictController.GetMiniDictList) //鑾峰彇瀛楀吀淇℃伅鍒楄〃
- dictApi.GET("getSilkDictList/:type", dictController.GetSilkDictList) // 鑾峰彇搴勫彛鍒楄〃
- dictApi.GET("getUserList", dictController.GetUserList) // 鑾峰彇鐢ㄦ埛鍒楄〃
+ dictApi.POST("add", dictController.AddMiniDict) //娣诲姞瀛楀吀淇℃伅
+ dictApi.POST("edit", dictController.EditMiniDict) //淇敼瀛楀吀淇℃伅
+ dictApi.DELETE("delete/:id", dictController.DeleteMiniDict) //鍒犻櫎瀛楀吀淇℃伅
+ dictApi.POST("save", dictController.SaveMiniDict) //鎵归噺淇濆瓨绯荤粺璁剧疆
+ dictApi.POST("getDictList", dictController.GetMiniDictList) //鑾峰彇瀛楀吀淇℃伅鍒楄〃
+ dictApi.GET("getUserList", dictController.GetUserList) // 鑾峰彇鐢ㄦ埛鍒楄〃
}
//绯荤粺閰嶇疆
--
Gitblit v1.8.0