From 2b6b5128653ca122c8136e557351ac11246da20a Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期四, 28 十二月 2023 15:48:18 +0800
Subject: [PATCH] operation 中 location定义的bug

---
 docs/swagger.yaml |   81 ++++++++++++++++++++++++++++------------
 1 files changed, 56 insertions(+), 25 deletions(-)

diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index a4cbae1..515cef4 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
@@ -645,13 +663,6 @@
         allOf:
         - $ref: '#/definitions/constvar.OperationStatus'
         description: 鐘舵��
-      toLocation:
-        allOf:
-        - $ref: '#/definitions/models.Location'
-        description: 鐩爣浣嶇疆
-      toLocationId:
-        description: 鐩爣浣嶇疆id
-        type: integer
       updateTime:
         type: string
       waybillNumber:
@@ -669,6 +680,13 @@
         type: number
       createTime:
         type: string
+      fromLocation:
+        allOf:
+        - $ref: '#/definitions/models.Location'
+        description: 婧愪綅缃�
+      fromLocationId:
+        description: 婧愪綅缃甶d
+        type: integer
       id:
         type: integer
       operationId:
@@ -681,6 +699,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 +920,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 +934,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
@@ -930,9 +957,6 @@
         allOf:
         - $ref: '#/definitions/constvar.OperationStatus'
         description: 鐘舵��
-      toLocationId:
-        description: 鐩爣浣嶇疆id
-        type: integer
       waybillNumber:
         description: 杩愬崟鍙�
         type: string
@@ -1202,9 +1226,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 +1416,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 +1430,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
@@ -1419,9 +1453,6 @@
         allOf:
         - $ref: '#/definitions/constvar.OperationStatus'
         description: 鐘舵��
-      toLocationId:
-        description: 鐩爣浣嶇疆id
-        type: integer
       waybillNumber:
         description: 杩愬崟鍙�
         type: string

--
Gitblit v1.8.0