From 81dd727204296b6b3c636007c2e8d19b309df335 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 28 三月 2024 20:02:41 +0800
Subject: [PATCH] 出入库增加操作来源
---
docs/swagger.yaml | 184 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 167 insertions(+), 17 deletions(-)
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 8660f8a..7c2ffd4 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -166,11 +166,24 @@
- 鍘熸潗鏂�
- 鍗婃垚鍝�
- 鎴愬搧
+ - 杈呮枡
+ - 鑰楁潗
+ - 鍏朵粬
+ - 铏氭嫙浠�
type: string
+ x-enum-comments:
+ MaterialModeAuxiliary: 杈呮枡
+ MaterialModeConsumables: 鑰楁潗
+ MaterialModeOther: 鍏朵粬
+ MaterialModeVirtual: 铏氭嫙浠�, 涓嶈兘閿�鍞紝涓嶈兘鍑哄叆搴擄紝涓嶈兘閲囪喘
x-enum-varnames:
- MaterialModeRaw
- MaterialModeSemi
- MaterialModeFinished
+ - MaterialModeAuxiliary
+ - MaterialModeConsumables
+ - MaterialModeOther
+ - MaterialModeVirtual
constvar.OperationStatus:
enum:
- 1
@@ -180,7 +193,7 @@
- 5
type: integer
x-enum-comments:
- OperationStatus_Cancel: 瀹屾垚
+ OperationStatus_Cancel: 鍙栨秷
OperationStatus_Draft: 鑽夌
OperationStatus_Finish: 瀹屾垚
OperationStatus_Ready: 灏辩华
@@ -407,6 +420,7 @@
description: 鏁伴噺
type: number
attachmentIDs:
+ description: 浠ヤ笅涓轰笉瀛樺簱鐨勫瓧娈�
items:
type: integer
type: array
@@ -483,6 +497,12 @@
isSale:
description: 鏄惁閿�鍞�
type: boolean
+ isStorage:
+ description: 鏃犲簱瀛樼殑鍦╳ms浠ュ強srm涓渶瑕佽繃婊ゆ帀
+ type: integer
+ isVirtual:
+ description: 铏氭嫙鐗╂枡鍦∕RP璁＄畻鏃惰烦杩囪灞傜骇鐩存帴棰嗙敤涓嬬骇鐗╂枡锛岃櫄鎷熺墿鏂欎笉鐢熸垚宸ュ崟
+ type: integer
makeAdvanceTime:
description: 鍒堕�犲墠缃椂闂�(澶�)
type: number
@@ -545,6 +565,10 @@
type: number
purchaseType:
$ref: '#/definitions/constvar.PurchaseType'
+ purchaseTypeList:
+ items:
+ type: integer
+ type: array
reorderRuleNum:
type: integer
salePrice:
@@ -603,14 +627,14 @@
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'
@@ -623,6 +647,11 @@
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
operationTypeId:
description: 浣滀笟绫诲瀷id
@@ -635,6 +664,8 @@
receiverName:
type: string
receiverPhone:
+ type: string
+ source:
type: string
sourceNumber:
description: 婧愬崟鍙�
@@ -667,6 +698,13 @@
type: number
createTime:
type: string
+ fromLocation:
+ allOf:
+ - $ref: '#/definitions/models.Location'
+ description: 婧愪綅缃�
+ fromLocationId:
+ description: 婧愪綅缃甶d
+ type: integer
id:
type: integer
operationId:
@@ -679,6 +717,13 @@
productId:
description: 浜у搧id
type: string
+ toLocation:
+ allOf:
+ - $ref: '#/definitions/models.Location'
+ description: 鐩爣浣嶇疆
+ toLocationId:
+ description: 鐩爣浣嶇疆id
+ type: integer
updateTime:
type: string
type: object
@@ -758,6 +803,15 @@
updateTime:
type: string
type: object
+ models.UnitDict:
+ properties:
+ id:
+ type: integer
+ isDefault:
+ type: boolean
+ name:
+ type: string
+ type: object
models.Warehouse:
properties:
active:
@@ -778,6 +832,9 @@
$ref: '#/definitions/models.Company'
companyId:
type: integer
+ contacts:
+ description: 鑱旂郴浜�
+ type: string
createTime:
type: string
id:
@@ -843,6 +900,9 @@
type: number
fromLocationId:
type: integer
+ number:
+ description: Unit string `json:"unit"`
+ type: string
productId:
type: string
sourceNumber:
@@ -890,10 +950,10 @@
items:
$ref: '#/definitions/request.OperationDetails'
type: array
- fromLocationId:
- description: 婧愪綅缃甶d
- type: integer
id:
+ type: integer
+ locationId:
+ description: 婧愪綅缃甶d
type: integer
logisticCompanyId:
type: string
@@ -904,7 +964,9 @@
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
@@ -1000,6 +1062,9 @@
description: 浠撳簱缂栫爜
maxLength: 5
minLength: 1
+ type: string
+ contacts:
+ description: 鑱旂郴浜�
type: string
inboundTransportation:
description: 鍏ュ悜杩愯緭
@@ -1177,6 +1242,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 +1262,17 @@
description: ProductName string `json:"productName" gorm:"type:varchar(255);not
null;comment:浜у搧鍚嶇О"` //浜у搧鍚嶇О
type: number
+ 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
type: object
request.OperationList:
properties:
@@ -1368,10 +1452,10 @@
items:
$ref: '#/definitions/request.OperationDetails'
type: array
- fromLocationId:
- description: 婧愪綅缃甶d
- type: integer
id:
+ type: integer
+ locationId:
+ description: 婧愪綅缃甶d
type: integer
logisticCompanyId:
type: string
@@ -1382,7 +1466,9 @@
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
@@ -1519,6 +1605,11 @@
number:
description: 鍗曞彿
type: string
+ operationId:
+ type: integer
+ operationTypeName:
+ description: 浣滀笟绫诲瀷鍚嶇О
+ type: string
productId:
type: string
productName:
@@ -1544,6 +1635,9 @@
amount:
description: 鏁伴噺
type: number
+ locationId:
+ description: 浣嶇疆id
+ type: integer
locationName:
description: 浣嶇疆鍚嶇О
type: string
@@ -2292,12 +2386,12 @@
summary: 鑾峰彇鐗╂祦鍏徃鍒楄〃
tags:
- 鍏ュ簱/鍑哄簱
- /api-wms/v1/operation/getOperationInfo/{number}:
- post:
+ /api-wms/v1/operation/getOperationInfo/{id}:
+ get:
parameters:
- - description: 鍗曞彿
+ - description: id
in: path
- name: number
+ name: id
required: true
type: string
produces:
@@ -2339,6 +2433,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:
@@ -2760,6 +2873,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:
--
Gitblit v1.8.0