From a10d59528a36dc5a1fbe4d9caa6b4abf25ab828c Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 12 一月 2024 10:49:08 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS
---
docs/swagger.yaml | 86 +++++++++++++++++++++++++++++++++++++------
1 files changed, 74 insertions(+), 12 deletions(-)
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index a4cbae1..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
@@ -603,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'
@@ -623,6 +636,11 @@
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
@@ -669,6 +687,13 @@
type: number
createTime:
type: string
+ fromLocation:
+ allOf:
+ - $ref: '#/definitions/models.Location'
+ description: 婧愪綅缃�
+ fromLocationId:
+ description: 婧愪綅缃甶d
+ type: integer
id:
type: integer
operationId:
@@ -681,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
@@ -895,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
@@ -909,7 +941,9 @@
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
@@ -1202,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:
@@ -1384,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
@@ -1398,7 +1440,9 @@
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
@@ -2803,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