From 79eca4ef507f418b88a0817f43a9ea25750a818a Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期六, 23 九月 2023 16:57:57 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS
---
docs/swagger.yaml | 341 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 317 insertions(+), 24 deletions(-)
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 0ffdc96..f0f0d6e 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -77,6 +77,7 @@
- 5
- 6
- 7
+ - 8
type: integer
x-enum-comments:
LocationTypeCustomer: 瀹㈡埛浣嶇疆
@@ -94,6 +95,7 @@
- LocationTypeInventoryLoss
- LocationTypeProduction
- LocationTypeTransit
+ - LocationTypeDisuse
constvar.MaterialMode:
enum:
- 鍘熸潗鏂�
@@ -241,6 +243,9 @@
isScrapLocation:
description: 鏄惁鎶ュ簾浣嶇疆
type: boolean
+ jointName:
+ description: 鎷兼帴鍚嶇О
+ type: string
name:
description: 浣嶇疆鍚嶇О
type: string
@@ -414,6 +419,84 @@
weight:
description: 閲嶉噺
type: number
+ type: object
+ models.Operation:
+ properties:
+ comment:
+ type: string
+ companyID:
+ type: integer
+ companyName:
+ type: string
+ contacterID:
+ type: integer
+ contacterName:
+ type: string
+ createTime:
+ type: string
+ details:
+ items:
+ $ref: '#/definitions/models.OperationDetails'
+ type: array
+ fromLocation:
+ allOf:
+ - $ref: '#/definitions/models.Location'
+ description: 婧愪綅缃�
+ fromLocationId:
+ description: 婧愪綅缃甶d
+ type: integer
+ id:
+ type: integer
+ number:
+ description: 鍗曞彿
+ type: string
+ operationDate:
+ type: string
+ operationTypeId:
+ description: 浣滀笟绫诲瀷id
+ type: integer
+ operationTypeName:
+ description: 浣滀笟绫诲瀷鍚嶇О
+ type: string
+ sourceNumber:
+ description: 婧愬崟鍙�
+ type: string
+ status:
+ allOf:
+ - $ref: '#/definitions/constvar.OperationStatus'
+ description: 鐘舵��
+ toLocation:
+ allOf:
+ - $ref: '#/definitions/models.Location'
+ description: 鐩爣浣嶇疆
+ toLocationId:
+ description: 鐩爣浣嶇疆id
+ type: integer
+ updateTime:
+ type: string
+ type: object
+ models.OperationDetails:
+ properties:
+ amount:
+ description: 鏁伴噺
+ type: number
+ createTime:
+ type: string
+ id:
+ type: integer
+ operationId:
+ description: 鎿嶄綔id
+ type: integer
+ productId:
+ description: 浜у搧id
+ type: string
+ productName:
+ description: 浜у搧鍚嶇О
+ type: string
+ unit:
+ type: string
+ updateTime:
+ type: string
type: object
models.OperationType:
properties:
@@ -598,6 +681,23 @@
description: 澶囨敞
type: string
type: object
+ request.AddDisuse:
+ properties:
+ amount:
+ type: number
+ fromLocationId:
+ type: integer
+ productId:
+ type: string
+ productName:
+ type: string
+ sourceNumber:
+ type: string
+ toLocationId:
+ type: integer
+ unit:
+ type: string
+ type: object
request.AddOperation:
properties:
comment:
@@ -633,6 +733,9 @@
operationTypeId:
description: 浣滀笟绫诲瀷id
type: integer
+ operationTypeName:
+ description: 浣滀笟绫诲瀷鍚嶇О
+ type: string
sourceNumber:
description: 婧愬崟鍙�
type: string
@@ -741,21 +844,73 @@
description: 姣忛〉澶у皬
type: integer
type: object
+ request.OperationAllList:
+ properties:
+ number:
+ type: string
+ page:
+ description: 椤电爜
+ type: integer
+ pageSize:
+ description: 姣忛〉澶у皬
+ type: integer
+ sourceNumber:
+ type: string
+ type: object
request.OperationDetails:
properties:
OperationId:
description: 鎿嶄綔id
type: integer
+ amount:
+ description: 鏁伴噺
+ type: number
productId:
description: 浜у搧id
type: string
productName:
description: 浜у搧鍚嶇О
type: string
- quantity:
- description: 鏁伴噺
- type: number
unit:
+ type: string
+ type: object
+ request.OperationList:
+ properties:
+ number:
+ type: string
+ operationTypeId:
+ type: integer
+ page:
+ description: 椤电爜
+ type: integer
+ pageSize:
+ description: 姣忛〉澶у皬
+ type: integer
+ sourceNumber:
+ type: string
+ type: object
+ request.QueryDisuseList:
+ properties:
+ number:
+ type: string
+ page:
+ description: 椤电爜
+ type: integer
+ pageSize:
+ description: 姣忛〉澶у皬
+ type: integer
+ sourceNumber:
+ type: string
+ type: object
+ request.QueryOperationList:
+ properties:
+ page:
+ description: 椤电爜
+ type: integer
+ pageSize:
+ description: 姣忛〉澶у皬
+ type: integer
+ productId:
type: string
type: object
request.UpdateCompany:
@@ -781,6 +936,31 @@
type: integer
remark:
description: 澶囨敞
+ type: string
+ type: object
+ request.UpdateDisuse:
+ properties:
+ amount:
+ type: number
+ fromLocationId:
+ type: integer
+ id:
+ type: integer
+ number:
+ type: string
+ operationDate:
+ type: string
+ productId:
+ type: string
+ productName:
+ type: string
+ sourceNumber:
+ type: string
+ status:
+ $ref: '#/definitions/constvar.OperationStatus'
+ toLocationId:
+ type: integer
+ unit:
type: string
type: object
request.UpdateOperation:
@@ -818,6 +998,9 @@
operationTypeId:
description: 浣滀笟绫诲瀷id
type: integer
+ operationTypeName:
+ description: 浣滀笟绫诲瀷鍚嶇О
+ type: string
sourceNumber:
description: 婧愬崟鍙�
type: string
@@ -1197,22 +1380,15 @@
summary: 鏇存敼璁板綍鐘舵��
tags:
- 鍏ュ簱/鍑哄簱
- /api-wms/v1/operation/operation:
- get:
- consumes:
- - application/json
+ /api-wms/v1/operation/list:
+ post:
parameters:
- - in: query
- name: operationTypeId
- type: integer
- - description: 椤电爜
- in: query
- name: page
- type: integer
- - description: 姣忛〉澶у皬
- in: query
- name: pageSize
- type: integer
+ - description: 鏌ヨ鍙傛暟
+ in: body
+ name: object
+ required: true
+ schema:
+ $ref: '#/definitions/request.OperationList'
produces:
- application/json
responses:
@@ -1223,6 +1399,26 @@
summary: 鍏ュ簱/鍑哄簱鍒楄〃
tags:
- 鍏ュ簱/鍑哄簱
+ /api-wms/v1/operation/listAll:
+ post:
+ parameters:
+ - description: 鍙傛暟
+ in: body
+ name: object
+ required: true
+ schema:
+ $ref: '#/definitions/request.OperationAllList'
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ $ref: '#/definitions/util.Response'
+ summary: 璋冩嫧
+ tags:
+ - 鍏ュ簱/鍑哄簱
+ /api-wms/v1/operation/operation:
post:
parameters:
- description: 鍏ュ簱/鍑哄簱淇℃伅
@@ -1259,7 +1455,8 @@
summary: 鍒犻櫎鍏ュ簱/鍑哄簱淇℃伅
tags:
- 鍏ュ簱/鍑哄簱
- put:
+ /api-wms/v1/operation/update:
+ post:
parameters:
- description: 鍏ュ簱淇℃伅
in: body
@@ -1267,11 +1464,6 @@
required: true
schema:
$ref: '#/definitions/request.UpdateOperation'
- - description: 鍏ュ簱淇℃伅id
- in: path
- name: id
- required: true
- type: integer
produces:
- application/json
responses:
@@ -1372,6 +1564,25 @@
summary: 缂栬緫浣滀笟绫诲瀷
tags:
- 涓氬姟绫诲瀷
+ /api-wms/v1/product/addDisuse:
+ post:
+ parameters:
+ - description: 鍏ュ簱/鍑哄簱淇℃伅
+ in: body
+ name: object
+ required: true
+ schema:
+ $ref: '#/definitions/request.AddDisuse'
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ $ref: '#/definitions/util.Response'
+ summary: 娣诲姞鎶ュ簾淇℃伅
+ tags:
+ - 浜у搧
/api-wms/v1/product/addProduct:
post:
parameters:
@@ -1446,6 +1657,24 @@
summary: 鍒犻櫎浜у搧绫诲瀷
tags:
- 浜у搧绫诲瀷
+ /api-wms/v1/product/finishDisuse/{id}:
+ put:
+ parameters:
+ - description: id
+ in: path
+ name: id
+ required: true
+ type: integer
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ $ref: '#/definitions/util.Response'
+ summary: 楠岃瘉鎶ュ簾
+ tags:
+ - 浜у搧
/api-wms/v1/product/getProductCategoryDetails/{id}:
get:
parameters:
@@ -1544,6 +1773,70 @@
summary: 鑾峰彇浜у搧鍒楄〃
tags:
- 浜у搧
+ /api-wms/v1/product/listDisuse:
+ post:
+ parameters:
+ - description: 鏌ヨ鍙傛暟
+ in: body
+ name: object
+ required: true
+ schema:
+ $ref: '#/definitions/request.QueryDisuseList'
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ $ref: '#/definitions/util.Response'
+ summary: 鎶ュ簾鍒楄〃
+ tags:
+ - 浜у搧
+ /api-wms/v1/product/listOperaton:
+ post:
+ parameters:
+ - description: 鏌ヨ鍙傛暟
+ in: body
+ name: object
+ required: true
+ schema:
+ $ref: '#/definitions/request.QueryOperationList'
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ allOf:
+ - $ref: '#/definitions/util.ResponseList'
+ - properties:
+ data:
+ items:
+ $ref: '#/definitions/models.Operation'
+ type: array
+ type: object
+ summary: 浜у搧鍘嗗彶鍑哄叆搴撲俊鎭�
+ tags:
+ - 浜у搧
+ /api-wms/v1/product/updateDisuse:
+ post:
+ parameters:
+ - description: 鍏ュ簱/鍑哄簱淇℃伅
+ in: body
+ name: object
+ required: true
+ schema:
+ $ref: '#/definitions/request.UpdateDisuse'
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ $ref: '#/definitions/util.Response'
+ summary: 淇敼鎶ュ簾淇℃伅
+ tags:
+ - 浜у搧
/api-wms/v1/product/updateProduct:
post:
parameters:
--
Gitblit v1.8.0