From fe9a8f47ea30dbd9637c803563abd74bda46900a Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 06 五月 2024 17:24:11 +0800
Subject: [PATCH] 每月1号执行
---
docs/swagger.yaml | 287 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 283 insertions(+), 4 deletions(-)
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 7ffb926..2f659b0 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -311,6 +311,13 @@
- WhetherTypeAsk
- WhetherTypeAlways
- ReservationNever
+ inventory_order.WorkerInfo:
+ properties:
+ id:
+ type: string
+ name:
+ type: string
+ type: object
models.Attachment:
properties:
FileUrl:
@@ -425,6 +432,38 @@
description: 浠撳簱ID
type: integer
type: object
+ models.LocationProductAmount:
+ properties:
+ amount:
+ description: 搴撳瓨鏁伴噺
+ type: number
+ createDate:
+ description: 鏃ユ湡
+ type: string
+ createTime:
+ type: string
+ id:
+ type: integer
+ location:
+ $ref: '#/definitions/models.Location'
+ locationId:
+ description: |-
+ LocationProductId int `json:"locationProductId" gorm:"type:int;not null;comment:涓婃灦瑙勫垯id"` //涓婃灦瑙勫垯id
+ LocationProduct LocationProduct `json:"locationProduct" gorm:"foreignKey:LocationProductId;references:Id"`
+ type: integer
+ product:
+ $ref: '#/definitions/models.Material'
+ productCategory:
+ $ref: '#/definitions/models.ProductCategory'
+ productCategoryId:
+ description: 浜у搧绉嶇被id
+ type: integer
+ productId:
+ description: 浜у搧id
+ type: string
+ updateTime:
+ type: string
+ type: object
models.LogisticCompany:
properties:
contact:
@@ -501,6 +540,10 @@
deliveryAdvanceTime:
description: 瀹㈡埛鍓嶇疆鏃堕棿(澶�)
type: number
+ grossUnit:
+ type: string
+ grossWeight:
+ type: number
id:
type: string
inStorageExplain:
@@ -558,9 +601,19 @@
- $ref: '#/definitions/constvar.MaterialMode'
description: MaterialType constvar.ProductType `gorm:"index;type:int(11);comment:鐗╂枡绫诲瀷(鏁板瓧)"
json:"materialType"`
+ moreUnit:
+ type: boolean
+ moreUnitList:
+ items:
+ $ref: '#/definitions/models.UnitItems'
+ type: array
name:
description: 鐗╂枡鍚嶇О
type: string
+ netUnit:
+ type: string
+ netWeight:
+ type: number
note:
type: string
orderAdvanceTime:
@@ -633,8 +686,68 @@
description: 閲嶉噺
type: number
type: object
+ models.MonthStats:
+ properties:
+ MoreUnitsArr:
+ description: 鏈熸湯鍏朵粬鍗曚綅鏁扮粍
+ items:
+ $ref: '#/definitions/models.UnitItems'
+ type: array
+ amount:
+ description: 鏈熸湯缁撲綑鏁伴噺
+ type: number
+ beginAmount:
+ description: 鏈熷垵鏁伴噺
+ type: number
+ beginMoreUnitsArr:
+ description: 鏈熷垵鍏朵粬鍗曚綅鏁扮粍
+ items:
+ $ref: '#/definitions/models.UnitItems'
+ type: array
+ createTime:
+ type: string
+ date:
+ description: 鏃ユ湡 2024-04
+ type: string
+ id:
+ type: integer
+ inputAmount:
+ description: 鍏ュ簱鏁伴噺
+ type: number
+ inputMoreUnitsArr:
+ description: 鍏ュ簱鍏朵粬鍗曚綅鏁扮粍
+ items:
+ $ref: '#/definitions/models.UnitItems'
+ type: array
+ outputAmount:
+ description: 鍑哄簱鏁伴噺
+ type: number
+ outputMoreUnitsArr:
+ description: 鍑哄簱鍏朵粬鍗曚綅鏁扮粍
+ items:
+ $ref: '#/definitions/models.UnitItems'
+ type: array
+ productId:
+ description: 浜у搧id
+ type: string
+ productName:
+ description: 浜у搧鍚嶇О
+ type: string
+ unit:
+ description: 鍗曚綅
+ type: string
+ updateTime:
+ type: string
+ weight:
+ description: 閲嶉噺
+ type: number
+ type: object
models.Operation:
properties:
+ accountant:
+ type: string
+ accountantId:
+ type: string
auditDate:
type: string
baseOperationType:
@@ -644,7 +757,7 @@
comment:
type: string
companyID:
- type: integer
+ type: string
companyName:
type: string
contacterID:
@@ -652,6 +765,10 @@
contacterName:
type: string
createTime:
+ type: string
+ custodian:
+ type: string
+ custodianId:
type: string
details:
items:
@@ -673,6 +790,10 @@
logisticWeight:
description: 鐗╂祦閲嶉噺
type: number
+ manager:
+ type: string
+ managerId:
+ type: string
number:
description: 鍗曞彿
type: string
@@ -732,6 +853,10 @@
description: ProductName string `json:"productName" gorm:"type:varchar(255);not
null;comment:浜у搧鍚嶇О"` //浜у搧鍚嶇О
type: number
+ auxiliaryAmount:
+ type: number
+ auxiliaryUnit:
+ type: string
createTime:
type: string
fromLocation:
@@ -760,6 +885,10 @@
toLocationId:
description: 鐩爣浣嶇疆id
type: integer
+ totalGrossWeight:
+ type: number
+ totalNetWeight:
+ type: number
updateTime:
type: string
type: object
@@ -846,6 +975,15 @@
isDefault:
type: boolean
name:
+ type: string
+ type: object
+ models.UnitItems:
+ properties:
+ amount:
+ type: number
+ floating:
+ type: boolean
+ unit:
type: string
type: object
models.Warehouse:
@@ -963,12 +1101,16 @@
type: object
request.AddOperation:
properties:
+ accountant:
+ type: string
+ accountantId:
+ type: string
comment:
description: 澶囨敞
type: string
companyID:
description: 鍏徃ID-瀹㈡埛
- type: integer
+ type: string
companyName:
description: 鍏徃鍚嶇О-瀹㈡埛鍚嶇О
type: string
@@ -977,6 +1119,10 @@
type: integer
contacterName:
description: 鑱旂郴浜哄鍚�-闈炲繀濉�
+ type: string
+ custodian:
+ type: string
+ custodianId:
type: string
details:
items:
@@ -992,6 +1138,10 @@
logisticWeight:
description: 鐗╂祦閲嶉噺
type: number
+ manager:
+ type: string
+ managerId:
+ type: string
number:
description: 鍗曞彿
type: string
@@ -1185,6 +1335,17 @@
description: 鍗曚綅
type: string
type: object
+ request.GetList:
+ properties:
+ keyword:
+ type: string
+ page:
+ description: 椤电爜
+ type: integer
+ pageSize:
+ description: 姣忛〉澶у皬
+ type: integer
+ type: object
request.GetLocationForms:
properties:
keyWord:
@@ -1219,6 +1380,19 @@
description: 姣忛〉澶у皬
type: integer
type:
+ type: integer
+ type: object
+ request.GetMonthStats:
+ properties:
+ date:
+ type: string
+ keyword:
+ type: string
+ page:
+ description: 椤电爜
+ type: integer
+ pageSize:
+ description: 姣忛〉澶у皬
type: integer
type: object
request.GetProductList:
@@ -1294,6 +1468,12 @@
description: ProductName string `json:"productName" gorm:"type:varchar(255);not
null;comment:浜у搧鍚嶇О"` //浜у搧鍚嶇О
type: number
+ auxiliaryAmount:
+ description: 杈呭姪鏁伴噺
+ type: number
+ auxiliaryUnit:
+ description: 杈呭姪鍗曚綅
+ type: string
fromLocationId:
description: |-
Unit string `json:"unit" gorm:"type:varchar(31);comment:鍗曚綅"` //鍗曚綅
@@ -1305,6 +1485,12 @@
toLocationId:
description: 鐩爣浣嶇疆id
type: integer
+ totalGrossWeight:
+ description: 鎬绘瘺閲�
+ type: number
+ totalNetWeight:
+ description: 鎬诲噣閲�
+ type: number
type: object
request.OperationList:
properties:
@@ -1475,6 +1661,10 @@
type: object
request.UpdateOperation:
properties:
+ accountant:
+ type: string
+ accountantId:
+ type: string
baseOperationType:
allOf:
- $ref: '#/definitions/constvar.BaseOperationType'
@@ -1484,7 +1674,7 @@
type: string
companyID:
description: 鍏徃ID-瀹㈡埛
- type: integer
+ type: string
companyName:
description: 鍏徃鍚嶇О-瀹㈡埛鍚嶇О
type: string
@@ -1493,6 +1683,10 @@
type: integer
contacterName:
description: 鑱旂郴浜哄鍚�-闈炲繀濉�
+ type: string
+ custodian:
+ type: string
+ custodianId:
type: string
details:
items:
@@ -1508,6 +1702,10 @@
logisticWeight:
description: 鐗╂祦閲嶉噺
type: number
+ manager:
+ type: string
+ managerId:
+ type: string
number:
description: 鍗曞彿
type: string
@@ -2064,6 +2262,37 @@
summary: 鑾峰彇浣嶇疆鎶ヨ〃
tags:
- 鎶ヨ〃
+ /api-wms/v1/forms/monthStats:
+ post:
+ parameters:
+ - description: 鏌ヨ鍙傛暟
+ in: body
+ name: object
+ required: true
+ schema:
+ $ref: '#/definitions/request.GetMonthStats'
+ - description: token
+ in: header
+ name: Authorization
+ required: true
+ type: string
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ allOf:
+ - $ref: '#/definitions/util.ResponseList'
+ - properties:
+ data:
+ items:
+ $ref: '#/definitions/models.MonthStats'
+ type: array
+ type: object
+ summary: 鏈堝害缁熻搴撳瓨鎶ヨ〃
+ tags:
+ - 鎶ヨ〃
/api-wms/v1/location/addLocation:
post:
parameters:
@@ -2301,6 +2530,30 @@
summary: 搴旂敤銆侀獙璇�
tags:
- 搴撳瓨鐩樼偣
+ /api-wms/v1/locationProductAmount/getLocationProductAmount:
+ post:
+ parameters:
+ - description: 鍏ュ弬
+ in: body
+ name: object
+ required: true
+ schema:
+ $ref: '#/definitions/request.GetRuleList'
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ allOf:
+ - $ref: '#/definitions/util.Response'
+ - properties:
+ data:
+ $ref: '#/definitions/models.LocationProductAmount'
+ type: object
+ summary: 鑾峰彇浣嶇疆浜у搧淇℃伅
+ tags:
+ - 搴撳瓨鐩樼偣
/api-wms/v1/locationProductAmount/getRuleList:
post:
parameters:
@@ -2335,7 +2588,7 @@
name: object
required: true
schema:
- $ref: '#/definitions/request.PageInfo'
+ $ref: '#/definitions/request.GetList'
produces:
- application/json
responses:
@@ -2450,6 +2703,32 @@
summary: 鍏ュ簱/鍑哄簱鍒楄〃
tags:
- 鍏ュ簱/鍑哄簱
+ /api-wms/v1/operation/getPersonnelList:
+ get:
+ parameters:
+ - description: 鍙傛暟
+ in: body
+ name: object
+ required: true
+ schema:
+ $ref: '#/definitions/request.OperationCondition'
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ allOf:
+ - $ref: '#/definitions/util.ResponseList'
+ - properties:
+ data:
+ items:
+ $ref: '#/definitions/inventory_order.WorkerInfo'
+ type: array
+ type: object
+ summary: 鑾峰彇浜哄憳鍒楄〃
+ tags:
+ - 鍏ュ簱/鍑哄簱
/api-wms/v1/operation/getSupplierList:
get:
produces:
--
Gitblit v1.8.0