From ee20ffe2a2d1494af0a1285440605d67a5846da6 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期四, 21 九月 2023 09:34:50 +0800
Subject: [PATCH] 1.出入库一部分代码
---
docs/swagger.yaml | 94 +++++++++++++++++++++++++++-------------------
1 files changed, 55 insertions(+), 39 deletions(-)
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 0294966..024ec46 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -263,9 +263,6 @@
type: object
models.Material:
properties:
- HSCode:
- description: HS缂栫爜
- type: string
amount:
description: 鏁伴噺
type: number
@@ -304,12 +301,15 @@
description: 瀹㈡埛绋庣櫨鍒嗘瘮
type: number
deliveryAdvanceTime:
- description: 浜よ揣鎻愬墠鏃堕棿(澶�)
- type: integer
+ description: 瀹㈡埛鍓嶇疆鏃堕棿(澶�)
+ type: number
id:
type: string
inStorageExplain:
- description: 鍏ュ簱璇存槑
+ description: |-
+ HSCode string `gorm:"type:varchar(255);comment:HS缂栫爜" json:"HSCode"` //HS缂栫爜
+ OriginCountryId int `gorm:"type:int(11);comment:鍘熶骇鍦癷d" json:"originCountryId"` //鍘熶骇鍦癷d
+ OriginCountryName string `gorm:"type:varchar(255);comment:鍘熶骇鍦板悕绉�" json:"originCountryName"` //鍘熶骇鍦板悕绉�
type: string
internalNotes:
description: 鍐呴儴璇存槑
@@ -328,6 +328,9 @@
description: PurchaseType constvar.PurchaseType `gorm:"type:int(11);comment:閲囪喘绫诲瀷"
json:"purchaseType"`
type: boolean
+ makeAdvanceTime:
+ description: 鍒堕�犲墠缃椂闂�(澶�)
+ type: number
maxInventory:
description: 鏈�澶у簱瀛�
type: number
@@ -351,16 +354,13 @@
name:
description: 鐗╂枡鍚嶇О
type: string
+ orderAdvanceTime:
+ description: 璁㈠崟鍑嗗澶╂暟(澶�)
+ type: number
orderCreation:
allOf:
- $ref: '#/definitions/constvar.OrderCreation'
description: 璁㈠崟鍒涘缓
- originCountryId:
- description: 鍘熶骇鍦癷d
- type: integer
- originCountryName:
- description: 鍘熶骇鍦板悕绉�
- type: string
outStorageExplain:
description: 鍑哄簱璇存槑
type: string
@@ -588,17 +588,20 @@
type: object
request.AddOperation:
properties:
- carrierID:
- type: integer
- carrierName:
+ comment:
+ description: 澶囨敞
type: string
companyID:
+ description: 鍏徃ID-瀹㈡埛
type: integer
companyName:
+ description: 鍏徃鍚嶇О-瀹㈡埛鍚嶇О
type: string
contacterID:
+ description: 鑱旂郴浜篒D-闈炲繀濉�
type: integer
contacterName:
+ description: 鑱旂郴浜哄鍚�-闈炲繀濉�
type: string
details:
items:
@@ -613,6 +616,7 @@
description: 鍗曞彿
type: string
operationDate:
+ description: 瀹夋帓鏃ユ湡
type: string
operationTypeId:
description: 浣滀笟绫诲瀷id
@@ -627,12 +631,6 @@
toLocationId:
description: 鐩爣浣嶇疆id
type: integer
- tracking:
- type: string
- transferWeight:
- type: number
- weight:
- type: number
type: object
request.AddOperationType:
properties:
@@ -733,18 +731,20 @@
type: object
request.OperationDetails:
properties:
- finishQuantity:
- description: 瀹屾垚鏁伴噺
- type: number
+ OperationId:
+ description: 鎿嶄綔id
+ type: integer
productId:
description: 浜у搧id
- type: integer
+ type: string
productName:
description: 浜у搧鍚嶇О
type: string
quantity:
description: 鏁伴噺
type: number
+ unit:
+ type: string
type: object
request.UpdateCompany:
properties:
@@ -773,17 +773,20 @@
type: object
request.UpdateOperation:
properties:
- carrierID:
- type: integer
- carrierName:
+ comment:
+ description: 澶囨敞
type: string
companyID:
+ description: 鍏徃ID-瀹㈡埛
type: integer
companyName:
+ description: 鍏徃鍚嶇О-瀹㈡埛鍚嶇О
type: string
contacterID:
+ description: 鑱旂郴浜篒D-闈炲繀濉�
type: integer
contacterName:
+ description: 鑱旂郴浜哄鍚�-闈炲繀濉�
type: string
details:
items:
@@ -798,6 +801,7 @@
description: 鍗曞彿
type: string
operationDate:
+ description: 瀹夋帓鏃ユ湡
type: string
operationTypeId:
description: 浣滀笟绫诲瀷id
@@ -812,12 +816,6 @@
toLocationId:
description: 鐩爣浣嶇疆id
type: integer
- tracking:
- type: string
- transferWeight:
- type: number
- weight:
- type: number
type: object
request.UpdateOperationType:
properties:
@@ -1169,6 +1167,24 @@
summary: 淇敼浣嶇疆
tags:
- 浣嶇疆
+ /api-wms/v1/operation/finish/{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/operation/operation:
get:
consumes:
@@ -1231,7 +1247,7 @@
summary: 鍒犻櫎鍏ュ簱/鍑哄簱淇℃伅
tags:
- 鍏ュ簱/鍑哄簱
- put:
+ post:
parameters:
- description: 鍏ュ簱淇℃伅
in: body
@@ -1284,7 +1300,7 @@
type: object
summary: 鏌ヨ浣滀笟绫诲瀷鍒楄〃
tags:
- - 浣滀笟绫诲瀷
+ - 涓氬姟绫诲瀷
post:
parameters:
- description: 浣滀笟绫诲瀷淇℃伅
@@ -1302,7 +1318,7 @@
$ref: '#/definitions/util.Response'
summary: 娣诲姞浣滀笟绫诲瀷
tags:
- - 浣滀笟绫诲瀷
+ - 涓氬姟绫诲瀷
/api-wms/v1/operationType/operationType/{id}:
delete:
parameters:
@@ -1320,7 +1336,7 @@
$ref: '#/definitions/util.Response'
summary: 鍒犻櫎浣滀笟绫诲瀷
tags:
- - 浣滀笟绫诲瀷
+ - 涓氬姟绫诲瀷
put:
parameters:
- description: 浣滀笟绫诲瀷淇℃伅
@@ -1343,7 +1359,7 @@
$ref: '#/definitions/util.Response'
summary: 缂栬緫浣滀笟绫诲瀷
tags:
- - 浣滀笟绫诲瀷
+ - 涓氬姟绫诲瀷
/api-wms/v1/product/addProduct:
post:
parameters:
--
Gitblit v1.8.0