From b28a7f52e8df5889572f86a9422c62c10334f70c Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期一, 25 九月 2023 10:17:49 +0800
Subject: [PATCH] 1.修改出入库模块的新增、修改、列表，operation_details不再保存产品名称和单位，改为读取material 2.修改报废模块的新增，修改、列表，不再使用productName和unit字段

---
 docs/swagger.yaml |   31 +++++++++++--------------------
 1 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index f0f0d6e..0e09a58 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -478,7 +478,8 @@
   models.OperationDetails:
     properties:
       amount:
-        description: 鏁伴噺
+        description: ProductName string          `json:"productName" gorm:"type:varchar(255);not
+          null;comment:浜у搧鍚嶇О"` //浜у搧鍚嶇О
         type: number
       createTime:
         type: string
@@ -487,13 +488,12 @@
       operationId:
         description: 鎿嶄綔id
         type: integer
+      product:
+        allOf:
+        - $ref: '#/definitions/models.Material'
+        description: Unit        string          `json:"unit" gorm:"type:varchar(31);comment:鍗曚綅"`                    //鍗曚綅
       productId:
         description: 浜у搧id
-        type: string
-      productName:
-        description: 浜у搧鍚嶇О
-        type: string
-      unit:
         type: string
       updateTime:
         type: string
@@ -684,19 +684,16 @@
   request.AddDisuse:
     properties:
       amount:
+        description: ProductName    string          `json:"productName"`
         type: number
       fromLocationId:
         type: integer
       productId:
         type: string
-      productName:
-        type: string
       sourceNumber:
         type: string
       toLocationId:
         type: integer
-      unit:
-        type: string
     type: object
   request.AddOperation:
     properties:
@@ -863,15 +860,11 @@
         description: 鎿嶄綔id
         type: integer
       amount:
-        description: 鏁伴噺
+        description: ProductName string          `json:"productName" gorm:"type:varchar(255);not
+          null;comment:浜у搧鍚嶇О"` //浜у搧鍚嶇О
         type: number
       productId:
         description: 浜у搧id
-        type: string
-      productName:
-        description: 浜у搧鍚嶇О
-        type: string
-      unit:
         type: string
     type: object
   request.OperationList:
@@ -941,18 +934,18 @@
   request.UpdateDisuse:
     properties:
       amount:
+        description: ProductName    string                   `json:"productName"`
         type: number
       fromLocationId:
         type: integer
       id:
         type: integer
       number:
+        description: Unit           string                   `json:"unit"`
         type: string
       operationDate:
         type: string
       productId:
-        type: string
-      productName:
         type: string
       sourceNumber:
         type: string
@@ -960,8 +953,6 @@
         $ref: '#/definitions/constvar.OperationStatus'
       toLocationId:
         type: integer
-      unit:
-        type: string
     type: object
   request.UpdateOperation:
     properties:

--
Gitblit v1.8.0