From 0ec0aef398704cd0219ed452f3aa96c8cdacd647 Mon Sep 17 00:00:00 2001
From: yinbentan <yinbentan@live.com>
Date: 星期六, 06 七月 2024 15:27:51 +0800
Subject: [PATCH] 出库、入库、盘点涉及产品重复性检查调整（从【产品编号】变更为以【产品编号、出库库房编号、入库库房编号】作为唯一标识）
---
docs/swagger.yaml | 257 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 209 insertions(+), 48 deletions(-)
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 08e97ae..336f0d7 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -212,17 +212,20 @@
- 2
- 3
- 4
+ - 5
type: integer
x-enum-comments:
+ DisuseType: 鎶ュ簾绫诲瀷
StockoutType: 鍑哄簱绫诲瀷
StorageType: 鍏ュ簱绫诲瀷
- TakeStock: 鐩樼偣绫诲瀷
+ TakeStockType: 鐩樼偣绫诲瀷
TransferType: 璋冩嫧绫诲瀷
x-enum-varnames:
- StorageType
- StockoutType
- TransferType
- - TakeStock
+ - TakeStockType
+ - DisuseType
constvar.OperationSource:
enum:
- 1
@@ -365,13 +368,6 @@
valid:
description: Valid is true if Time is not NULL
type: boolean
- type: object
- inventory_order.WorkerInfo:
- properties:
- id:
- type: string
- name:
- type: string
type: object
models.Attachment:
properties:
@@ -530,9 +526,7 @@
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"`
+ description: 浣嶇疆id
type: integer
product:
$ref: '#/definitions/models.Material'
@@ -546,6 +540,8 @@
type: string
updateTime:
type: string
+ warehouseId:
+ type: integer
type: object
models.LogisticCompany:
properties:
@@ -854,6 +850,17 @@
description: 閲嶉噺
type: number
type: object
+ models.MonthStatsItemsType:
+ enum:
+ - 1
+ - 2
+ type: integer
+ x-enum-comments:
+ MonthStatsItemsTypeInput: 鍏ュ簱
+ MonthStatsItemsTypeOutput: 鍑哄簱
+ x-enum-varnames:
+ - MonthStatsItemsTypeInput
+ - MonthStatsItemsTypeOutput
models.MoveHistory:
properties:
amount:
@@ -941,15 +948,13 @@
type: string
custodianId:
type: string
+ dealerType:
+ type: string
details:
items:
$ref: '#/definitions/models.OperationDetails'
type: array
id:
- type: integer
- inventoryDealer:
- $ref: '#/definitions/models.MiniDict'
- inventoryDealerType:
type: integer
isInternalOutput:
description: 鏄惁璋冩嫧浜х敓鐨勫嚭搴�
@@ -976,11 +981,6 @@
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:
@@ -1041,6 +1041,10 @@
type: number
auxiliaryUnit:
type: string
+ baseOperationType:
+ allOf:
+ - $ref: '#/definitions/constvar.BaseOperationType'
+ description: 鍩虹浣滀笟绫诲瀷
cost:
description: 鎴愭湰鍗曚环
type: number
@@ -1075,6 +1079,9 @@
type: string
salePrice:
description: 閿�鍞崟浠�
+ type: number
+ stockAmount:
+ description: 搴撳瓨鏁伴噺锛岀洏鐐规椂鐢�
type: number
toLocation:
allOf:
@@ -1268,6 +1275,68 @@
description: 搴撳瓨浣嶇疆
type: string
type: object
+ models.WarehouseMonthStats:
+ properties:
+ amount:
+ description: 鏈熸湯缁撲綑鏁伴噺
+ type: number
+ beginAmount:
+ description: 鏈熷垵鏁伴噺
+ type: number
+ createTime:
+ type: string
+ date:
+ description: 鏃ユ湡 2024-04
+ type: string
+ id:
+ type: integer
+ inputAmount:
+ description: 鍏ュ簱鏁伴噺
+ type: number
+ inputItems:
+ description: 鍏ュ簱鏄庣粏
+ items:
+ $ref: '#/definitions/models.WarehouseStatsItems'
+ type: array
+ outputAmount:
+ description: 鍑哄簱鏁伴噺
+ type: number
+ outputItems:
+ description: 鍑哄簱鏄庣粏
+ items:
+ $ref: '#/definitions/models.WarehouseStatsItems'
+ type: array
+ productId:
+ description: 浜у搧id
+ type: string
+ productName:
+ description: 浜у搧鍚嶇О
+ type: string
+ salePrice:
+ description: 閿�鍞崟浠�
+ type: number
+ unit:
+ description: 鍗曚綅
+ type: string
+ updateTime:
+ type: string
+ warehouseId:
+ description: 浠撳簱ID
+ type: integer
+ type: object
+ models.WarehouseStatsItems:
+ properties:
+ amount:
+ description: 鏁伴噺
+ type: number
+ name:
+ description: 鍏ュ簱鏉ユ簮锛屽嚭搴撳幓澶�
+ type: string
+ type:
+ $ref: '#/definitions/models.MonthStatsItemsType'
+ warehouseMonthStatsId:
+ type: integer
+ type: object
request.AddAttribute:
properties:
dataType:
@@ -1395,13 +1464,13 @@
type: string
custodianId:
type: string
+ dealerType:
+ type: string
details:
items:
$ref: '#/definitions/request.OperationDetails'
type: array
id:
- type: integer
- inventoryDealerType:
type: integer
locationId:
description: 婧愪綅缃甶d
@@ -1670,6 +1739,10 @@
type: string
locationId:
type: integer
+ locationIds:
+ items:
+ type: integer
+ type: array
page:
description: 椤电爜
type: integer
@@ -1698,6 +1771,24 @@
description: 姣忛〉澶у皬
type: integer
type:
+ type: integer
+ warehouseId:
+ description: 浠撳簱ID
+ type: integer
+ type: object
+ request.GetLocationProductList:
+ properties:
+ keyword:
+ type: string
+ locationId:
+ type: integer
+ page:
+ description: 椤电爜
+ type: integer
+ pageSize:
+ description: 姣忛〉澶у皬
+ type: integer
+ warehouseId:
type: integer
type: object
request.GetMiniDictList:
@@ -1839,6 +1930,9 @@
type: string
salePrice:
description: 閿�鍞崟浠�
+ type: number
+ stockAmount:
+ description: 搴撳瓨鏁伴噺锛岀洏鐐规椂鐢�
type: number
toLocationId:
description: 鐩爣浣嶇疆id
@@ -2965,6 +3059,37 @@
summary: 涓嬭浇鏈堝害缁熻搴撳瓨鎶ヨ〃
tags:
- 鎶ヨ〃
+ /api-wms/v1/forms/downloadWarehouseMonthStats:
+ 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/forms/getHistory:
post:
parameters:
@@ -3114,7 +3239,7 @@
- properties:
data:
items:
- $ref: '#/definitions/models.MonthStats'
+ $ref: '#/definitions/models.WarehouseMonthStats'
type: array
type: object
summary: 浠撳簱鏈堝害缁熻搴撳瓨鎶ヨ〃
@@ -3426,6 +3551,30 @@
summary: 搴撳瓨鐩樼偣鍒楄〃
tags:
- 搴撳瓨鐩樼偣
+ /api-wms/v1/locationProductAmount/locationProductList:
+ post:
+ parameters:
+ - description: 鏌ヨ鍙傛暟
+ in: body
+ name: object
+ required: true
+ schema:
+ $ref: '#/definitions/request.GetLocationProductList'
+ - description: token
+ in: header
+ name: Authorization
+ required: true
+ type: string
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: OK
+ schema:
+ $ref: '#/definitions/util.ResponseList'
+ summary: 鑾峰彇浣嶇疆瀵瑰簲浜у搧鍒楄〃
+ tags:
+ - 搴撳瓨鐩樼偣
/api-wms/v1/locationProductAmount/update:
post:
parameters:
@@ -3520,25 +3669,11 @@
name: id
required: true
type: string
- produces:
- - application/json
- responses:
- "200":
- description: 鎴愬姛
- schema:
- $ref: '#/definitions/util.Response'
- summary: 鍏ュ簱/鍑哄簱鍒楄〃
- tags:
- - 鍏ュ簱/鍑哄簱
- /api-wms/v1/operation/getPersonnelList:
- get:
- parameters:
- - description: 鍙傛暟
- in: body
- name: object
+ - description: token
+ in: header
+ name: Authorization
required: true
- schema:
- $ref: '#/definitions/request.OperationCondition'
+ type: string
produces:
- application/json
responses:
@@ -3546,13 +3681,23 @@
description: 鎴愬姛
schema:
allOf:
- - $ref: '#/definitions/util.ResponseList'
+ - $ref: '#/definitions/util.Response'
- properties:
data:
- items:
- $ref: '#/definitions/inventory_order.WorkerInfo'
- type: array
+ $ref: '#/definitions/models.Operation'
type: object
+ summary: 鎿嶄綔璇︽儏鎺ュ彛
+ tags:
+ - 鍏ュ簱/鍑哄簱
+ /api-wms/v1/operation/getPersonnelList:
+ get:
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ $ref: '#/definitions/util.Response'
summary: 鑾峰彇浜哄憳鍒楄〃
tags:
- 鍏ュ簱/鍑哄簱
@@ -4022,6 +4167,22 @@
summary: 鍒犻櫎浜у搧绫诲瀷
tags:
- 浜у搧绫诲瀷
+ /api-wms/v1/product/downloadInputFormat:
+ get:
+ parameters:
+ - description: token
+ in: header
+ name: Authorization
+ required: true
+ type: string
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ $ref: '#/definitions/util.Response'
+ summary: 涓嬭浇瀵煎叆鐗╂枡/浜у搧妯℃澘
+ tags:
+ - 浜у搧
/api-wms/v1/product/finishDisuse/{id}:
put:
parameters:
@@ -4230,9 +4391,9 @@
description: 鎴愬姛
schema:
$ref: '#/definitions/util.Response'
- summary: 瀵煎叆鐗╂枡
+ summary: 瀵煎叆鐗╂枡/浜у搧
tags:
- - 鐗╂枡绠＄悊
+ - 浜у搧
/api-wms/v1/product/listDisuse:
post:
parameters:
--
Gitblit v1.8.0