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 | 536 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 514 insertions(+), 22 deletions(-)
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 83761e3..2f659b0 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -166,11 +166,47 @@
- 鍘熸潗鏂�
- 鍗婃垚鍝�
- 鎴愬搧
+ - 杈呮枡
+ - 鑰楁潗
+ - 鍏朵粬
+ - 铏氭嫙浠�
type: string
+ x-enum-comments:
+ MaterialModeAuxiliary: 杈呮枡
+ MaterialModeConsumables: 鑰楁潗
+ MaterialModeOther: 鍏朵粬
+ MaterialModeVirtual: 铏氭嫙浠�, 涓嶈兘閿�鍞紝涓嶈兘鍑哄叆搴擄紝涓嶈兘閲囪喘
x-enum-varnames:
- MaterialModeRaw
- MaterialModeSemi
- MaterialModeFinished
+ - MaterialModeAuxiliary
+ - MaterialModeConsumables
+ - MaterialModeOther
+ - MaterialModeVirtual
+ constvar.OperationSource:
+ enum:
+ - 1
+ - 2
+ - 3
+ - 4
+ - 5
+ - 6
+ type: integer
+ x-enum-comments:
+ OperationSourceOutsourcing: 濮斿鍏ュ簱
+ OperationSourceOutsourcingApply: 濮斿棰嗘枡
+ OperationSourceProduction: 鐢熶骇鍏ュ簱
+ OperationSourceProductionApply: 鐢熶骇棰嗘枡
+ OperationSourcePurchase: 閲囪喘鍏ュ簱
+ OperationSourceSaleDelivery: 閿�鍞彂璐�
+ x-enum-varnames:
+ - OperationSourcePurchase
+ - OperationSourceProduction
+ - OperationSourceOutsourcing
+ - OperationSourceProductionApply
+ - OperationSourceOutsourcingApply
+ - OperationSourceSaleDelivery
constvar.OperationStatus:
enum:
- 1
@@ -180,7 +216,7 @@
- 5
type: integer
x-enum-comments:
- OperationStatus_Cancel: 瀹屾垚
+ OperationStatus_Cancel: 鍙栨秷
OperationStatus_Draft: 鑽夌
OperationStatus_Finish: 瀹屾垚
OperationStatus_Ready: 灏辩华
@@ -275,6 +311,13 @@
- WhetherTypeAsk
- WhetherTypeAlways
- ReservationNever
+ inventory_order.WorkerInfo:
+ properties:
+ id:
+ type: string
+ name:
+ type: string
+ type: object
models.Attachment:
properties:
FileUrl:
@@ -381,6 +424,45 @@
gorm:"foreignKey:CompanyId"` //鍏徃
updateTime:
type: string
+ warehouse:
+ allOf:
+ - $ref: '#/definitions/models.Warehouse'
+ description: 浠撳簱
+ warehouseId:
+ 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:
@@ -407,6 +489,7 @@
description: 鏁伴噺
type: number
attachmentIDs:
+ description: 浠ヤ笅涓轰笉瀛樺簱鐨勫瓧娈�
items:
type: integer
type: array
@@ -457,6 +540,10 @@
deliveryAdvanceTime:
description: 瀹㈡埛鍓嶇疆鏃堕棿(澶�)
type: number
+ grossUnit:
+ type: string
+ grossWeight:
+ type: number
id:
type: string
inStorageExplain:
@@ -483,6 +570,12 @@
isSale:
description: 鏄惁閿�鍞�
type: boolean
+ isStorage:
+ description: 鏃犲簱瀛樼殑鍦╳ms浠ュ強srm涓渶瑕佽繃婊ゆ帀
+ type: integer
+ isVirtual:
+ description: 铏氭嫙鐗╂枡鍦∕RP璁$畻鏃惰烦杩囪灞傜骇鐩存帴棰嗙敤涓嬬骇鐗╂枡锛岃櫄鎷熺墿鏂欎笉鐢熸垚宸ュ崟
+ type: integer
makeAdvanceTime:
description: 鍒堕�犲墠缃椂闂�(澶�)
type: number
@@ -508,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:
@@ -545,6 +648,10 @@
type: number
purchaseType:
$ref: '#/definitions/constvar.PurchaseType'
+ purchaseTypeList:
+ items:
+ type: integer
+ type: array
reorderRuleNum:
type: integer
salePrice:
@@ -579,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:
@@ -590,7 +757,7 @@
comment:
type: string
companyID:
- type: integer
+ type: string
companyName:
type: string
contacterID:
@@ -599,18 +766,22 @@
type: string
createTime:
type: string
+ custodian:
+ type: string
+ custodianId:
+ type: string
details:
items:
$ref: '#/definitions/models.OperationDetails'
type: array
- fromLocation:
+ id:
+ type: integer
+ location:
allOf:
- $ref: '#/definitions/models.Location'
description: 婧愪綅缃�
- fromLocationId:
+ locationID:
description: 婧愪綅缃甶d
- type: integer
- id:
type: integer
logisticCompany:
$ref: '#/definitions/models.LogisticCompany'
@@ -619,11 +790,24 @@
logisticWeight:
description: 鐗╂祦閲嶉噺
type: number
+ manager:
+ type: string
+ managerId:
+ type: string
number:
description: 鍗曞彿
type: string
operationDate:
+ description: |-
+ FromLocationID int `json:"fromLocationId" gorm:"type:int;not null;comment:婧愪綅缃甶d"` //婧愪綅缃甶d
+ FromLocation Location `json:"fromLocation" gorm:"foreignKey:FromLocationID;references:Id"` //婧愪綅缃�
+ ToLocationID int `json:"toLocationId" gorm:"type:int;not null;comment:鐩爣浣嶇疆id"` //鐩爣浣嶇疆id
+ ToLocation Location `json:"toLocation" gorm:"foreignKey:ToLocationID;references:Id"` //鐩爣浣嶇疆
type: string
+ operationSource:
+ allOf:
+ - $ref: '#/definitions/constvar.OperationSource'
+ description: 鎿嶄綔鏉ユ簮
operationTypeId:
description: 浣滀笟绫诲瀷id
type: integer
@@ -635,6 +819,10 @@
receiverName:
type: string
receiverPhone:
+ type: string
+ salesDetailsNumber:
+ type: string
+ source:
type: string
sourceNumber:
description: 婧愬崟鍙�
@@ -665,8 +853,19 @@
description: ProductName string `json:"productName" gorm:"type:varchar(255);not
null;comment:浜у搧鍚嶇О"` //浜у搧鍚嶇О
type: number
+ auxiliaryAmount:
+ type: number
+ auxiliaryUnit:
+ type: string
createTime:
type: string
+ fromLocation:
+ allOf:
+ - $ref: '#/definitions/models.Location'
+ description: 婧愪綅缃�
+ fromLocationId:
+ description: 婧愪綅缃甶d
+ type: integer
id:
type: integer
operationId:
@@ -679,6 +878,17 @@
productId:
description: 浜у搧id
type: string
+ toLocation:
+ allOf:
+ - $ref: '#/definitions/models.Location'
+ description: 鐩爣浣嶇疆
+ toLocationId:
+ description: 鐩爣浣嶇疆id
+ type: integer
+ totalGrossWeight:
+ type: number
+ totalNetWeight:
+ type: number
updateTime:
type: string
type: object
@@ -758,6 +968,24 @@
updateTime:
type: string
type: object
+ models.UnitDict:
+ properties:
+ id:
+ type: integer
+ isDefault:
+ type: boolean
+ name:
+ type: string
+ type: object
+ models.UnitItems:
+ properties:
+ amount:
+ type: number
+ floating:
+ type: boolean
+ unit:
+ type: string
+ type: object
models.Warehouse:
properties:
active:
@@ -771,13 +999,14 @@
type: boolean
code:
description: 浠撳簱缂栫爜
- maxLength: 5
- minLength: 1
type: string
company:
$ref: '#/definitions/models.Company'
companyId:
type: integer
+ contacts:
+ description: 鑱旂郴浜�
+ type: string
createTime:
type: string
id:
@@ -786,7 +1015,7 @@
description: 鍏ュ悜杩愯緭
type: integer
locationId:
- description: 浣嶇疆id
+ description: 榛樿浣嶇疆id
type: integer
name:
description: 浠撳簱鍚嶇О
@@ -812,8 +1041,6 @@
warehouseLocation:
description: 搴撳瓨浣嶇疆
type: string
- required:
- - code
type: object
request.AddCompany:
properties:
@@ -843,6 +1070,9 @@
type: number
fromLocationId:
type: integer
+ number:
+ description: Unit string `json:"unit"`
+ type: string
productId:
type: string
sourceNumber:
@@ -871,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
@@ -886,25 +1120,35 @@
contacterName:
description: 鑱旂郴浜哄鍚�-闈炲繀濉�
type: string
+ custodian:
+ type: string
+ custodianId:
+ type: string
details:
items:
$ref: '#/definitions/request.OperationDetails'
type: array
- fromLocationId:
- description: 婧愪綅缃甶d
- type: integer
id:
+ type: integer
+ locationId:
+ description: 婧愪綅缃甶d
type: integer
logisticCompanyId:
type: string
logisticWeight:
description: 鐗╂祦閲嶉噺
type: number
+ manager:
+ type: string
+ managerId:
+ type: string
number:
description: 鍗曞彿
type: string
operationDate:
- description: 瀹夋帓鏃ユ湡
+ 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
type: string
operationTypeId:
description: 浣滀笟绫诲瀷id
@@ -1001,6 +1245,9 @@
maxLength: 5
minLength: 1
type: string
+ contacts:
+ description: 鑱旂郴浜�
+ type: string
inboundTransportation:
description: 鍏ュ悜杩愯緭
type: integer
@@ -1088,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:
@@ -1122,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:
@@ -1177,6 +1448,17 @@
sourceNumber:
type: string
type: object
+ request.OperationCondition:
+ properties:
+ condition:
+ type: string
+ page:
+ description: 椤电爜
+ type: integer
+ pageSize:
+ description: 姣忛〉澶у皬
+ type: integer
+ type: object
request.OperationDetails:
properties:
OperationId:
@@ -1186,9 +1468,29 @@
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:鍗曚綅"` //鍗曚綅
+ Product models.Material `json:"product" gorm:"foreignKey:ProductId;references:ID"`
+ type: integer
productId:
description: 浜у搧id
type: string
+ toLocationId:
+ description: 鐩爣浣嶇疆id
+ type: integer
+ totalGrossWeight:
+ description: 鎬绘瘺閲�
+ type: number
+ totalNetWeight:
+ description: 鎬诲噣閲�
+ type: number
type: object
request.OperationList:
properties:
@@ -1247,6 +1549,20 @@
description: 姣忛〉澶у皬
type: integer
productId:
+ type: string
+ type: object
+ request.SaveUnitDict:
+ properties:
+ data:
+ items:
+ $ref: '#/definitions/request.UnitDict'
+ type: array
+ type: object
+ request.UnitDict:
+ properties:
+ isDefault:
+ type: boolean
+ name:
type: string
type: object
request.UpdateCompany:
@@ -1345,6 +1661,10 @@
type: object
request.UpdateOperation:
properties:
+ accountant:
+ type: string
+ accountantId:
+ type: string
baseOperationType:
allOf:
- $ref: '#/definitions/constvar.BaseOperationType'
@@ -1354,7 +1674,7 @@
type: string
companyID:
description: 鍏徃ID-瀹㈡埛
- type: integer
+ type: string
companyName:
description: 鍏徃鍚嶇О-瀹㈡埛鍚嶇О
type: string
@@ -1364,25 +1684,35 @@
contacterName:
description: 鑱旂郴浜哄鍚�-闈炲繀濉�
type: string
+ custodian:
+ type: string
+ custodianId:
+ type: string
details:
items:
$ref: '#/definitions/request.OperationDetails'
type: array
- fromLocationId:
- description: 婧愪綅缃甶d
- type: integer
id:
+ type: integer
+ locationId:
+ description: 婧愪綅缃甶d
type: integer
logisticCompanyId:
type: string
logisticWeight:
description: 鐗╂祦閲嶉噺
type: number
+ manager:
+ type: string
+ managerId:
+ type: string
number:
description: 鍗曞彿
type: string
operationDate:
- description: 瀹夋帓鏃ユ湡
+ 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
type: string
operationTypeId:
description: 浣滀笟绫诲瀷id
@@ -1521,6 +1851,9 @@
type: string
operationId:
type: integer
+ operationTypeName:
+ description: 浣滀笟绫诲瀷鍚嶇О
+ type: string
productId:
type: string
productName:
@@ -1546,6 +1879,9 @@
amount:
description: 鏁伴噺
type: number
+ locationId:
+ description: 浣嶇疆id
+ type: integer
locationName:
description: 浣嶇疆鍚嶇О
type: string
@@ -1926,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:
@@ -2163,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:
@@ -2197,7 +2588,7 @@
name: object
required: true
schema:
- $ref: '#/definitions/request.PageInfo'
+ $ref: '#/definitions/request.GetList'
produces:
- application/json
responses:
@@ -2312,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:
@@ -2341,6 +2758,25 @@
schema:
$ref: '#/definitions/util.Response'
summary: 鍏ュ簱/鍑哄簱鍒楄〃
+ tags:
+ - 鍏ュ簱/鍑哄簱
+ /api-wms/v1/operation/listByCondition:
+ post:
+ parameters:
+ - description: 鍙傛暟
+ in: body
+ name: object
+ required: true
+ schema:
+ $ref: '#/definitions/request.OperationCondition'
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ $ref: '#/definitions/util.Response'
+ summary: 鍑哄叆搴撴槑缁�
tags:
- 鍏ュ簱/鍑哄簱
/api-wms/v1/operation/listTransfer:
@@ -2762,6 +3198,43 @@
summary: 鑾峰彇浜у搧鍒楄〃
tags:
- 浜у搧
+ /api-wms/v1/product/getUnitInfo:
+ get:
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ allOf:
+ - $ref: '#/definitions/util.ResponseList'
+ - properties:
+ data:
+ items:
+ $ref: '#/definitions/models.UnitDict'
+ type: array
+ type: object
+ summary: 鑾峰彇鍗曚綅淇℃伅
+ tags:
+ - 浜у搧
+ /api-wms/v1/product/getUserInfo:
+ get:
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ allOf:
+ - $ref: '#/definitions/util.ResponseList'
+ - properties:
+ data:
+ additionalProperties: true
+ type: object
+ type: object
+ summary: 鑾峰彇鐧诲綍鐢ㄦ埛淇℃伅
+ tags:
+ - 浜у搧
/api-wms/v1/product/listDisuse:
post:
parameters:
@@ -2833,6 +3306,25 @@
summary: 浜у搧鍘嗗彶鍑哄叆搴撲俊鎭�
tags:
- 浜у搧
+ /api-wms/v1/product/saveUnitDict:
+ post:
+ parameters:
+ - description: 鍙傛暟
+ in: body
+ name: object
+ required: true
+ schema:
+ $ref: '#/definitions/request.SaveUnitDict'
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ $ref: '#/definitions/util.Response'
+ summary: 鏇存柊璁¢噺鍗曚綅瀛楀吀
+ tags:
+ - 鏁版嵁瀛楀吀
/api-wms/v1/product/updateDisuse:
post:
parameters:
--
Gitblit v1.8.0