From da3e478917dea118df075357cbd2e6f10833d9c6 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 14 六月 2024 20:08:22 +0800
Subject: [PATCH] 商品调整验证后生成入库单和出库单
---
docs/swagger.yaml | 537 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 481 insertions(+), 56 deletions(-)
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 223308f..206520a 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -311,6 +311,14 @@
- WhetherTypeAsk
- WhetherTypeAlways
- ReservationNever
+ gorm.DeletedAt:
+ properties:
+ time:
+ type: string
+ valid:
+ description: Valid is true if Time is not NULL
+ type: boolean
+ type: object
inventory_order.WorkerInfo:
properties:
id:
@@ -330,6 +338,34 @@
$ref: '#/definitions/constvar.FileType'
id:
type: integer
+ type: object
+ models.Attribute:
+ properties:
+ createdAt:
+ type: string
+ dataType:
+ description: 鍊肩被鍨嬶紙1瀛楃涓� 2 int 3 涓嬫媺妗� 锛�
+ type: integer
+ deletedAt:
+ $ref: '#/definitions/gorm.DeletedAt'
+ entityType:
+ description: 缁欒皝鐢ㄧ殑 1 鐗╂枡锛堜骇鍝侊級
+ type: integer
+ id:
+ type: integer
+ name:
+ description: 灞炴�у悕绉�
+ type: string
+ selectValues:
+ description: dateType=3鏃剁敤
+ items:
+ type: string
+ type: array
+ updatedAt:
+ type: string
+ value:
+ description: 浠嶢ttributeValue鍙栧埌鐨剉alue
+ type: string
type: object
models.Company:
properties:
@@ -497,6 +533,11 @@
items:
$ref: '#/definitions/models.Attachment'
type: array
+ attributes:
+ description: 鍔ㄦ�佸睘鎬�
+ items:
+ $ref: '#/definitions/models.Attribute'
+ type: array
autoIncr:
type: integer
barcode:
@@ -539,6 +580,10 @@
type: number
deliveryAdvanceTime:
description: 瀹㈡埛鍓嶇疆鏃堕棿(澶�)
+ type: number
+ grossUnit:
+ type: string
+ grossWeight:
type: number
id:
type: string
@@ -597,9 +642,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:
@@ -672,6 +727,117 @@
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.MoveHistory:
+ properties:
+ amount:
+ description: 鏁伴噺
+ type: number
+ baseOperationType:
+ allOf:
+ - $ref: '#/definitions/constvar.BaseOperationType'
+ description: 鍩虹浣滀笟绫诲瀷
+ createTime:
+ type: string
+ fromLocation:
+ description: 婧愪綅缃�
+ type: string
+ fromLocationId:
+ description: 婧愪綅缃甶d
+ type: integer
+ id:
+ type: integer
+ number:
+ description: 鍗曞彿
+ type: string
+ operationId:
+ description: 鎿嶄綔id
+ type: integer
+ operationTypeId:
+ description: 浣滀笟绫诲瀷id
+ type: integer
+ operationTypeName:
+ description: 浣滀笟绫诲瀷鍚嶇О
+ type: string
+ operator:
+ description: 鎿嶄綔鑰�
+ type: string
+ productId:
+ description: 浜у搧id
+ type: string
+ productName:
+ description: 浜у搧鍚嶇О
+ type: string
+ toLocation:
+ description: 鐩爣浣嶇疆
+ type: string
+ toLocationId:
+ description: 鐩爣浣嶇疆id
+ type: integer
+ unit:
+ description: 鍗曚綅
+ type: string
+ updateTime:
+ type: string
+ weight:
+ description: 閲嶉噺
+ type: number
+ type: object
models.Operation:
properties:
accountant:
@@ -684,15 +850,21 @@
allOf:
- $ref: '#/definitions/constvar.BaseOperationType'
description: 鍩虹浣滀笟绫诲瀷
+ checkedAt:
+ type: string
+ checkedBy:
+ type: string
comment:
type: string
companyID:
- type: integer
+ type: string
companyName:
type: string
contacterID:
type: integer
contacterName:
+ type: string
+ createBy:
type: string
createTime:
type: string
@@ -783,6 +955,10 @@
description: ProductName string `json:"productName" gorm:"type:varchar(255);not
null;comment:浜у搧鍚嶇О"` //浜у搧鍚嶇О
type: number
+ auxiliaryAmount:
+ type: number
+ auxiliaryUnit:
+ type: string
createTime:
type: string
fromLocation:
@@ -794,6 +970,8 @@
type: integer
id:
type: integer
+ note:
+ type: string
operationId:
description: 鎿嶄綔id
type: integer
@@ -811,6 +989,10 @@
toLocationId:
description: 鐩爣浣嶇疆id
type: integer
+ totalGrossWeight:
+ type: number
+ totalNetWeight:
+ type: number
updateTime:
type: string
type: object
@@ -897,6 +1079,16 @@
isDefault:
type: boolean
name:
+ type: string
+ type: object
+ models.UnitItems:
+ properties:
+ amount:
+ type: number
+ floating:
+ description: 鏄惁娴姩鍒╃巼
+ type: boolean
+ unit:
type: string
type: object
models.Warehouse:
@@ -1023,7 +1215,7 @@
type: string
companyID:
description: 鍏徃ID-瀹㈡埛
- type: integer
+ type: string
companyName:
description: 鍏徃鍚嶇О-瀹㈡埛鍚嶇О
type: string
@@ -1184,6 +1376,11 @@
required:
- code
type: object
+ request.DoMonthStats:
+ properties:
+ token:
+ type: string
+ type: object
request.FinishLocationProductAmount:
properties:
locationProductAmountId:
@@ -1248,6 +1445,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:
@@ -1282,6 +1490,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:
@@ -1341,11 +1562,20 @@
properties:
condition:
type: string
+ keyword:
+ description: 鍏抽敭瀛楁悳绱�
+ type: string
+ locationId:
+ description: 浣嶇疆ID
+ type: integer
page:
description: 椤电爜
type: integer
pageSize:
description: 姣忛〉澶у皬
+ type: integer
+ warehouseId:
+ description: 浠撳簱ID
type: integer
type: object
request.OperationDetails:
@@ -1357,6 +1587,12 @@
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:鍗曚綅"` //鍗曚綅
@@ -1368,6 +1604,12 @@
toLocationId:
description: 鐩爣浣嶇疆id
type: integer
+ totalGrossWeight:
+ description: 鎬绘瘺閲�
+ type: number
+ totalNetWeight:
+ description: 鎬诲噣閲�
+ type: number
type: object
request.OperationList:
properties:
@@ -1551,7 +1793,7 @@
type: string
companyID:
description: 鍏徃ID-瀹㈡埛
- type: integer
+ type: string
companyName:
description: 鍏徃鍚嶇О-瀹㈡埛鍚嶇О
type: string
@@ -1675,18 +1917,38 @@
amount:
description: 鍦ㄥ簱鏁伴噺
type: number
+ amountMoreUnits:
+ description: 鍦ㄥ簱鏁伴噺澶氬崟浣�
+ items:
+ $ref: '#/definitions/models.UnitItems'
+ type: array
availableNumber:
description: 鍙敤搴撳瓨
type: number
+ availableNumberMoreUnits:
+ description: 鍙敤搴撳瓨澶氬崟浣�
+ items:
+ $ref: '#/definitions/models.UnitItems'
+ type: array
cost:
description: 鎴愭湰
type: number
in:
description: 鍏ュ簱
type: number
+ inMoreUnits:
+ description: 鍏ュ簱澶氬崟浣�
+ items:
+ $ref: '#/definitions/models.UnitItems'
+ type: array
out:
description: 鍑哄簱
type: number
+ outMoreUnits:
+ description: 鍑哄簱澶氬崟浣�
+ items:
+ $ref: '#/definitions/models.UnitItems'
+ type: array
produceId:
description: 浜у搧id
type: string
@@ -1703,59 +1965,16 @@
description: 鎬讳环鍊�
type: number
type: object
- response.InventoryHistory:
- properties:
- amount:
- description: 鏁伴噺
- type: number
- baseOperationType:
- allOf:
- - $ref: '#/definitions/constvar.BaseOperationType'
- description: 鍩虹浣滀笟绫诲瀷
- contactedName:
- description: 瀹屾垚鑰�
- type: string
- date:
- description: 鏃ユ湡
- type: string
- fromLocation:
- description: 婧愪綅缃�
- type: string
- fromLocationId:
- type: integer
- number:
- description: 鍗曞彿
- type: string
- operationId:
- type: integer
- operationTypeName:
- description: 浣滀笟绫诲瀷鍚嶇О
- type: string
- productId:
- type: string
- productName:
- description: 浜у搧鍚嶇О
- type: string
- status:
- description: 鐘舵��
- type: string
- toLocation:
- description: 鐩爣浣嶇疆
- type: string
- toLocationId:
- type: integer
- unit:
- description: 鍗曚綅
- type: string
- weight:
- description: 閲嶉噺
- type: number
- type: object
response.LocationForms:
properties:
amount:
description: 鏁伴噺
type: number
+ amountMoreUnits:
+ description: 鍦ㄥ簱鏁伴噺澶氬崟浣�
+ items:
+ $ref: '#/definitions/models.UnitItems'
+ type: array
locationId:
description: 浣嶇疆id
type: integer
@@ -2061,9 +2280,45 @@
summary: 缂栬緫鍏徃
tags:
- 鍏徃
- /api-wms/v1/forms/getHistory:
+ /api-wms/v1/forms/doMonthStats:
post:
parameters:
+ - description: 鏌ヨ鍙傛暟
+ in: body
+ name: object
+ required: true
+ schema:
+ $ref: '#/definitions/request.DoMonthStats'
+ - 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/downloadHistory:
+ post:
+ parameters:
+ - description: token
+ in: header
+ name: Authorization
+ required: true
+ type: string
- description: 鏌ヨ鍙傛暟
in: body
name: object
@@ -2081,15 +2336,144 @@
- properties:
data:
items:
- $ref: '#/definitions/response.InventoryHistory'
+ $ref: '#/definitions/models.MoveHistory'
type: array
type: object
- summary: 鑾峰彇鍘嗗彶淇℃伅
+ summary: 涓嬭浇鍑哄叆搴撴槑缁嗘姤琛�
+ tags:
+ - 鎶ヨ〃
+ /api-wms/v1/forms/downloadInventoryForms:
+ post:
+ parameters:
+ - description: token
+ in: header
+ name: Authorization
+ required: true
+ type: string
+ - description: 鏌ヨ鍙傛暟
+ in: body
+ name: object
+ required: true
+ schema:
+ $ref: '#/definitions/request.GetInventoryForms'
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ allOf:
+ - $ref: '#/definitions/util.ResponseList'
+ - properties:
+ data:
+ items:
+ $ref: '#/definitions/response.InventoryForms'
+ type: array
+ type: object
+ summary: 涓嬭浇搴撳瓨鎶ヨ〃
+ tags:
+ - 鎶ヨ〃
+ /api-wms/v1/forms/downloadLocationForms:
+ post:
+ parameters:
+ - description: token
+ in: header
+ name: Authorization
+ required: true
+ type: string
+ - description: 鏌ヨ鍙傛暟
+ in: body
+ name: object
+ required: true
+ schema:
+ $ref: '#/definitions/request.GetLocationForms'
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ allOf:
+ - $ref: '#/definitions/util.ResponseList'
+ - properties:
+ data:
+ items:
+ $ref: '#/definitions/response.LocationForms'
+ type: array
+ type: object
+ summary: 涓嬭浇浣嶇疆鎶ヨ〃
+ tags:
+ - 鎶ヨ〃
+ /api-wms/v1/forms/downloadMonthStats:
+ 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:
+ - description: token
+ in: header
+ name: Authorization
+ required: true
+ type: string
+ - description: 鏌ヨ鍙傛暟
+ in: body
+ name: object
+ required: true
+ schema:
+ $ref: '#/definitions/request.GetInventoryHistory'
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ allOf:
+ - $ref: '#/definitions/util.ResponseList'
+ - properties:
+ data:
+ items:
+ $ref: '#/definitions/models.MoveHistory'
+ type: array
+ type: object
+ summary: 鑾峰彇鍑哄叆搴撴槑缁�
tags:
- 鎶ヨ〃
/api-wms/v1/forms/getInventoryForms:
post:
parameters:
+ - description: token
+ in: header
+ name: Authorization
+ required: true
+ type: string
- description: 鏌ヨ鍙傛暟
in: body
name: object
@@ -2116,6 +2500,11 @@
/api-wms/v1/forms/getLocationForms:
post:
parameters:
+ - description: token
+ in: header
+ name: Authorization
+ required: true
+ type: string
- description: 鏌ヨ鍙傛暟
in: body
name: object
@@ -2137,6 +2526,37 @@
type: array
type: object
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:
@@ -2434,7 +2854,7 @@
name: object
required: true
schema:
- $ref: '#/definitions/request.PageInfo'
+ $ref: '#/definitions/request.GetList'
produces:
- application/json
responses:
@@ -2737,7 +3157,8 @@
/api-wms/v1/operationType/operationType:
get:
parameters:
- - in: query
+ - description: 鍏抽敭瀛楁悳绱�
+ in: query
name: keyword
type: string
- description: 椤电爜
@@ -2748,6 +3169,10 @@
in: query
name: pageSize
type: integer
+ - description: 浠撳簱id
+ in: query
+ name: warehouseId
+ type: integer
produces:
- application/json
responses:
--
Gitblit v1.8.0