From 42d665b58dd50ddd1e91fe8198a00e391fdf8202 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期五, 12 一月 2024 15:00:59 +0800
Subject: [PATCH] 仓库查询修改
---
docs/swagger.yaml | 193 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 180 insertions(+), 13 deletions(-)
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 3e83835..039abfe 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: 灏辩华
@@ -581,6 +594,8 @@
type: object
models.Operation:
properties:
+ auditDate:
+ type: string
baseOperationType:
allOf:
- $ref: '#/definitions/constvar.BaseOperationType'
@@ -601,14 +616,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'
@@ -621,12 +636,25 @@
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
type: integer
operationTypeName:
description: 浣滀笟绫诲瀷鍚嶇О
+ type: string
+ receiverAddr:
+ type: string
+ receiverName:
+ type: string
+ receiverPhone:
+ type: string
+ source:
type: string
sourceNumber:
description: 婧愬崟鍙�
@@ -659,6 +687,13 @@
type: number
createTime:
type: string
+ fromLocation:
+ allOf:
+ - $ref: '#/definitions/models.Location'
+ description: 婧愪綅缃�
+ fromLocationId:
+ description: 婧愪綅缃甶d
+ type: integer
id:
type: integer
operationId:
@@ -671,6 +706,13 @@
productId:
description: 浜у搧id
type: string
+ toLocation:
+ allOf:
+ - $ref: '#/definitions/models.Location'
+ description: 鐩爣浣嶇疆
+ toLocationId:
+ description: 鐩爣浣嶇疆id
+ type: integer
updateTime:
type: string
type: object
@@ -835,6 +877,9 @@
type: number
fromLocationId:
type: integer
+ number:
+ description: Unit string `json:"unit"`
+ type: string
productId:
type: string
sourceNumber:
@@ -882,10 +927,10 @@
items:
$ref: '#/definitions/request.OperationDetails'
type: array
- fromLocationId:
- description: 婧愪綅缃甶d
- type: integer
id:
+ type: integer
+ locationId:
+ description: 婧愪綅缃甶d
type: integer
logisticCompanyId:
type: string
@@ -896,13 +941,21 @@
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
type: integer
operationTypeName:
description: 浣滀笟绫诲瀷鍚嶇О
+ type: string
+ receiverAddr:
+ type: string
+ receiverName:
+ type: string
+ receiverPhone:
type: string
sourceNumber:
description: 婧愬崟鍙�
@@ -1163,6 +1216,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:
@@ -1172,9 +1236,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:
@@ -1354,10 +1426,10 @@
items:
$ref: '#/definitions/request.OperationDetails'
type: array
- fromLocationId:
- description: 婧愪綅缃甶d
- type: integer
id:
+ type: integer
+ locationId:
+ description: 婧愪綅缃甶d
type: integer
logisticCompanyId:
type: string
@@ -1368,13 +1440,21 @@
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
type: integer
operationTypeName:
description: 浣滀笟绫诲瀷鍚嶇О
+ type: string
+ receiverAddr:
+ type: string
+ receiverName:
+ type: string
+ receiverPhone:
type: string
sourceNumber:
description: 婧愬崟鍙�
@@ -1499,6 +1579,11 @@
number:
description: 鍗曞彿
type: string
+ operationId:
+ type: integer
+ operationTypeName:
+ description: 浣滀笟绫诲瀷鍚嶇О
+ type: string
productId:
type: string
productName:
@@ -1524,6 +1609,9 @@
amount:
description: 鏁伴噺
type: number
+ locationId:
+ description: 浣嶇疆id
+ type: integer
locationName:
description: 浣嶇疆鍚嶇О
type: string
@@ -2241,6 +2329,18 @@
summary: 鏇存敼璁板綍鐘舵��
tags:
- 鍏ュ簱/鍑哄簱
+ /api-wms/v1/operation/getClientList:
+ get:
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ $ref: '#/definitions/util.Response'
+ summary: 鑾峰彇鐗╂祦鍏徃鍒楄〃
+ tags:
+ - 鍏ュ簱/鍑哄簱
/api-wms/v1/operation/getLogisticCompanyList:
get:
produces:
@@ -2257,6 +2357,36 @@
$ref: '#/definitions/models.LogisticCompany'
type: array
type: object
+ summary: 鑾峰彇鐗╂祦鍏徃鍒楄〃
+ tags:
+ - 鍏ュ簱/鍑哄簱
+ /api-wms/v1/operation/getOperationInfo/{id}:
+ get:
+ parameters:
+ - description: id
+ in: path
+ name: id
+ required: true
+ type: string
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ $ref: '#/definitions/util.Response'
+ summary: 鍏ュ簱/鍑哄簱鍒楄〃
+ tags:
+ - 鍏ュ簱/鍑哄簱
+ /api-wms/v1/operation/getSupplierList:
+ get:
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ $ref: '#/definitions/util.Response'
summary: 鑾峰彇鐗╂祦鍏徃鍒楄〃
tags:
- 鍏ュ簱/鍑哄簱
@@ -2277,6 +2407,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:
@@ -2698,6 +2847,24 @@
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