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 | 180 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 176 insertions(+), 4 deletions(-)
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 2fb4dd5..2f659b0 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -540,6 +540,10 @@
deliveryAdvanceTime:
description: 瀹㈡埛鍓嶇疆鏃堕棿(澶�)
type: number
+ grossUnit:
+ type: string
+ grossWeight:
+ type: number
id:
type: string
inStorageExplain:
@@ -597,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:
@@ -672,9 +686,67 @@
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
@@ -685,7 +757,7 @@
comment:
type: string
companyID:
- type: integer
+ type: string
companyName:
type: string
contacterID:
@@ -695,6 +767,8 @@
createTime:
type: string
custodian:
+ type: string
+ custodianId:
type: string
details:
items:
@@ -717,6 +791,8 @@
description: 鐗╂祦閲嶉噺
type: number
manager:
+ type: string
+ managerId:
type: string
number:
description: 鍗曞彿
@@ -777,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:
@@ -805,6 +885,10 @@
toLocationId:
description: 鐩爣浣嶇疆id
type: integer
+ totalGrossWeight:
+ type: number
+ totalNetWeight:
+ type: number
updateTime:
type: string
type: object
@@ -891,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:
@@ -1010,12 +1103,14 @@
properties:
accountant:
type: string
+ accountantId:
+ type: string
comment:
description: 澶囨敞
type: string
companyID:
description: 鍏徃ID-瀹㈡埛
- type: integer
+ type: string
companyName:
description: 鍏徃鍚嶇О-瀹㈡埛鍚嶇О
type: string
@@ -1026,6 +1121,8 @@
description: 鑱旂郴浜哄鍚�-闈炲繀濉�
type: string
custodian:
+ type: string
+ custodianId:
type: string
details:
items:
@@ -1042,6 +1139,8 @@
description: 鐗╂祦閲嶉噺
type: number
manager:
+ type: string
+ managerId:
type: string
number:
description: 鍗曞彿
@@ -1236,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:
@@ -1270,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:
@@ -1345,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:鍗曚綅"` //鍗曚綅
@@ -1356,6 +1485,12 @@
toLocationId:
description: 鐩爣浣嶇疆id
type: integer
+ totalGrossWeight:
+ description: 鎬绘瘺閲�
+ type: number
+ totalNetWeight:
+ description: 鎬诲噣閲�
+ type: number
type: object
request.OperationList:
properties:
@@ -1528,6 +1663,8 @@
properties:
accountant:
type: string
+ accountantId:
+ type: string
baseOperationType:
allOf:
- $ref: '#/definitions/constvar.BaseOperationType'
@@ -1537,7 +1674,7 @@
type: string
companyID:
description: 鍏徃ID-瀹㈡埛
- type: integer
+ type: string
companyName:
description: 鍏徃鍚嶇О-瀹㈡埛鍚嶇О
type: string
@@ -1548,6 +1685,8 @@
description: 鑱旂郴浜哄鍚�-闈炲繀濉�
type: string
custodian:
+ type: string
+ custodianId:
type: string
details:
items:
@@ -1564,6 +1703,8 @@
description: 鐗╂祦閲嶉噺
type: number
manager:
+ type: string
+ managerId:
type: string
number:
description: 鍗曞彿
@@ -2121,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:
@@ -2416,7 +2588,7 @@
name: object
required: true
schema:
- $ref: '#/definitions/request.PageInfo'
+ $ref: '#/definitions/request.GetList'
produces:
- application/json
responses:
--
Gitblit v1.8.0