From d80428a19673e819440a34f2565b6dbbbe6ac567 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 18 七月 2024 22:32:08 +0800
Subject: [PATCH] fix

---
 docs/swagger.yaml |  287 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 268 insertions(+), 19 deletions(-)

diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index ff40eef..86a7c4e 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -213,9 +213,11 @@
     - 3
     - 4
     - 5
+    - 6
     type: integer
     x-enum-comments:
       DisuseType: 鎶ュ簾绫诲瀷
+      ProductSource: 浜у搧鏉ユ簮
       StockoutType: 鍑哄簱绫诲瀷
       StorageType: 鍏ュ簱绫诲瀷
       TakeStockType: 鐩樼偣绫诲瀷
@@ -226,6 +228,7 @@
     - TransferType
     - TakeStockType
     - DisuseType
+    - ProductSource
   constvar.OperationSource:
     enum:
     - 1
@@ -361,6 +364,21 @@
     - WhetherTypeAsk
     - WhetherTypeAlways
     - ReservationNever
+  controllers.saveProductImagesFromExcelRequest:
+    properties:
+      excelFilePath:
+        description: excel璺緞 鐢╠ocker cp浼犲埌瀹瑰櫒閲�
+        type: string
+      imageColumn:
+        description: 鍥剧墖鎵�鍦ㄥ垪鍚�
+        type: string
+      productIdColumnIndex:
+        description: 浜у搧ID鏄鍑犲垪(浠�0寮�濮�)
+        type: integer
+      sheetIndex:
+        description: 绗嚑涓猻heet
+        type: integer
+    type: object
   gorm.DeletedAt:
     properties:
       time:
@@ -541,6 +559,7 @@
       updateTime:
         type: string
       warehouseId:
+        description: 浠撳簱id
         type: integer
     type: object
   models.LogisticCompany:
@@ -919,38 +938,52 @@
   models.Operation:
     properties:
       accountant:
+        description: 浼氳鍚嶇О
         type: string
       accountantId:
+        description: 浼氳id
         type: string
       auditDate:
+        description: 瀹℃壒鏃堕棿
         type: string
       baseOperationType:
         allOf:
         - $ref: '#/definitions/constvar.BaseOperationType'
         description: 鍩虹浣滀笟绫诲瀷
       checkedBy:
+        description: 楠岃瘉鑰匲serId
         type: string
       comment:
+        description: 澶囨敞
         type: string
       companyID:
+        description: 鍏徃ID-瀹㈡埛
         type: string
       companyName:
+        description: 鍏徃鍚嶇О-瀹㈡埛
         type: string
       contacterID:
+        description: 鑱旂郴浜篒D
         type: integer
       contacterName:
+        description: 鑱旂郴浜哄鍚�
         type: string
       createBy:
+        description: 鍒涘缓鑰匲serId
         type: string
       createTime:
         type: string
       custodian:
+        description: 淇濈鍛樺悕绉�
         type: string
       custodianId:
+        description: 淇濈鍛榠d
         type: string
       dealerType:
+        description: 璋冩嫧鍑哄叆搴撶被鍨�
         type: string
       details:
+        description: 鎿嶄綔鏄庣粏
         items:
           $ref: '#/definitions/models.OperationDetails'
         type: array
@@ -967,20 +1000,26 @@
         description: 婧愪綅缃甶d
         type: integer
       logisticCompany:
-        $ref: '#/definitions/models.LogisticCompany'
+        allOf:
+        - $ref: '#/definitions/models.LogisticCompany'
+        description: 鐗╂祦鍏徃淇℃伅
       logisticCompanyId:
+        description: 鐗╂祦鍏徃id
         type: string
       logisticWeight:
         description: 鐗╂祦閲嶉噺
         type: number
       manager:
+        description: 涓荤鍚嶇О
         type: string
       managerId:
+        description: 涓荤id
         type: string
       number:
         description: 鍗曞彿
         type: string
       operationDate:
+        description: 瀹夋帓鏃ユ湡
         type: string
       operationSource:
         allOf:
@@ -993,16 +1032,25 @@
         description: 浣滀笟绫诲瀷鍚嶇О
         type: string
       receiverAddr:
+        description: 鏀惰揣鍦板潃
         type: string
       receiverName:
+        description: 鏀惰揣浜哄鍚�
         type: string
       receiverPhone:
+        description: 鑱旂郴鐢佃瘽
         type: string
       remark:
+        description: 澶囨敞
         type: string
       salesDetailsNumber:
+        description: 閿�鍞槑缁嗙紪鐮�
+        type: string
+      silkMarket:
+        description: 鍢夎仈浠撳偍娣诲姞 SilkMarket
         type: string
       source:
+        description: 鏉ユ簮绯荤粺
         type: string
       sourceNumber:
         description: 婧愬崟鍙�
@@ -1021,8 +1069,11 @@
       updateTime:
         type: string
       warehouse:
-        $ref: '#/definitions/models.Warehouse'
+        allOf:
+        - $ref: '#/definitions/models.Warehouse'
+        description: 浠撳簱淇℃伅
       warehouseId:
+        description: 浠撳簱id
         type: integer
       waybillNumber:
         description: 杩愬崟鍙�
@@ -1038,8 +1089,10 @@
           null;comment:浜у搧鍚嶇О"` //浜у搧鍚嶇О
         type: number
       auxiliaryAmount:
+        description: 杈呭姪鏁伴噺
         type: number
       auxiliaryUnit:
+        description: 杈呭姪鍗曚綅
         type: string
       baseOperationType:
         allOf:
@@ -1066,7 +1119,7 @@
         description: 鏄惁璋冩嫧浜х敓鐨勫嚭搴�
         type: boolean
       operationId:
-        description: 鎿嶄綔id
+        description: 鎿嶄綔璁板綍id
         type: integer
       product:
         allOf:
@@ -1076,10 +1129,17 @@
         description: 浜у搧id
         type: string
       remark:
+        description: 澶囨敞
         type: string
       salePrice:
         description: 閿�鍞崟浠�
         type: number
+      silkMarket:
+        description: 鍢夎仈浠撳偍娣诲姞 SilkMarket銆丼ilkMarketClose
+        type: string
+      silkMarketClose:
+        description: 搴勫彛鍏抽棴
+        type: string
       stockAmount:
         description: 搴撳瓨鏁伴噺锛岀洏鐐规椂鐢�
         type: number
@@ -1091,8 +1151,10 @@
         description: 鐩爣浣嶇疆id
         type: integer
       totalGrossWeight:
+        description: 鎬绘瘺閲�
         type: number
       totalNetWeight:
+        description: 鎬诲噣閲�
         type: number
       updateTime:
         type: string
@@ -1421,6 +1483,9 @@
     type: object
   request.AddMiniDict:
     properties:
+      code:
+        description: 缂栫爜
+        type: string
       isDefault:
         description: 鏄惁榛樿
         type: boolean
@@ -1438,13 +1503,15 @@
   request.AddOperation:
     properties:
       accountant:
+        description: 浼氳鍚嶇О
         type: string
       accountantId:
+        description: 浼氳id
         type: string
       baseOperationType:
         allOf:
         - $ref: '#/definitions/constvar.BaseOperationType'
-        description: 鍩虹浣滀笟绫诲瀷 5搴撳瓨鐩樼偣
+        description: 鍩虹浣滀笟绫诲瀷 1 鍏ュ簱 2 鍑哄簱 3 鍐呴儴璋冩嫧 4 鎶ュ簾 5 搴撳瓨鐩樼偣
       comment:
         description: 澶囨敞
         type: string
@@ -1461,12 +1528,16 @@
         description: 鑱旂郴浜哄鍚�-闈炲繀濉�
         type: string
       custodian:
+        description: 淇濈鍛樺悕绉�
         type: string
       custodianId:
+        description: 淇濈鍛榠d
         type: string
       dealerType:
+        description: 璋冩嫧鍑哄叆搴撶被鍨�
         type: string
       details:
+        description: 璇︽儏
         items:
           $ref: '#/definitions/request.OperationDetails'
         type: array
@@ -1476,21 +1547,24 @@
         description: 婧愪綅缃甶d
         type: integer
       logisticCompanyId:
+        description: 鐗╂祦鍏徃id
         type: string
       logisticWeight:
         description: 鐗╂祦閲嶉噺
         type: number
       manager:
+        description: 涓荤鍚嶇О
         type: string
       managerId:
+        description: 涓荤id
         type: string
       number:
         description: 鍗曞彿
         type: string
       operationDate:
         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
+          FromLocationId    int                      `json:"fromLocationId" `   //婧愪綅缃甶d
+          ToLocationId      int                      `json:"toLocationId" `   //鐩爣浣嶇疆id
         type: string
       operationTypeId:
         description: 浣滀笟绫诲瀷id
@@ -1499,10 +1573,16 @@
         description: 浣滀笟绫诲瀷鍚嶇О
         type: string
       receiverAddr:
+        description: 鏀惰揣鍦板潃
         type: string
       receiverName:
+        description: 鏀惰揣浜哄鍚�
         type: string
       receiverPhone:
+        description: 鑱旂郴鐢佃瘽
+        type: string
+      silkMarket:
+        description: 搴勫彛缂栫爜
         type: string
       sourceNumber:
         description: 婧愬崟鍙�
@@ -1641,6 +1721,9 @@
     type: object
   request.EditMiniDict:
     properties:
+      code:
+        description: 缂栫爜
+        type: string
       id:
         description: 瀛楀吀绫诲瀷
         type: integer
@@ -1693,9 +1776,9 @@
       pageSize:
         description: 姣忛〉澶у皬
         type: integer
-      warehouseCode:
-        description: 浠撳簱缂╁啓
-        type: string
+      warehouseId:
+        description: WarehouseCode string `json:"warehouseCode"` //浠撳簱缂╁啓
+        type: integer
     type: object
   request.GetInventoryHistory:
     properties:
@@ -1720,6 +1803,11 @@
         type: string
       unit:
         description: 鍗曚綅
+        type: string
+      warehouseCode:
+        type: string
+      warehouseId:
+        description: 浠撳簱ID
         type: string
     type: object
   request.GetList:
@@ -1793,6 +1881,9 @@
     type: object
   request.GetMiniDictList:
     properties:
+      keyword:
+        description: 鍏抽敭瀛楁煡璇�
+        type: string
       type:
         allOf:
         - $ref: '#/definitions/constvar.MiniDictType'
@@ -1857,6 +1948,9 @@
     type: object
   request.MiniDict:
     properties:
+      code:
+        description: 缂栫爜
+        type: string
       isDefault:
         description: 鏄惁榛樿
         type: boolean
@@ -1870,6 +1964,7 @@
   request.OperationAllList:
     properties:
       number:
+        description: 鍗曞彿
         type: string
       page:
         description: 椤电爜
@@ -1878,11 +1973,13 @@
         description: 姣忛〉澶у皬
         type: integer
       sourceNumber:
+        description: 婧愬崟鍙�
         type: string
     type: object
   request.OperationCondition:
     properties:
       condition:
+        description: 妯＄硦鏌ヨ鏉′欢
         type: string
       keyword:
         description: 鍏抽敭瀛楁悳绱�
@@ -1906,8 +2003,7 @@
         description: 鎿嶄綔id
         type: integer
       amount:
-        description: ProductName string          `json:"productName" gorm:"type:varchar(255);not
-          null;comment:浜у搧鍚嶇О"` //浜у搧鍚嶇О
+        description: ProductName string          `json:"productName" ` //浜у搧鍚嶇О
         type: number
       auxiliaryAmount:
         description: 杈呭姪鏁伴噺
@@ -1920,17 +2016,24 @@
         type: number
       fromLocationId:
         description: |-
-          Unit        string          `json:"unit" gorm:"type:varchar(31);comment:鍗曚綅"`                    //鍗曚綅
-          Product models.Material `json:"product" gorm:"foreignKey:ProductId;references:ID"`
+          Unit        string          `json:"unit"`                    //鍗曚綅
+          Product models.Material `json:"product" ` // 浜у搧
         type: integer
       productId:
         description: 浜у搧id
         type: string
       remark:
+        description: 澶囨敞
         type: string
       salePrice:
         description: 閿�鍞崟浠�
         type: number
+      silkMarket:
+        description: 搴勫彛缂栫爜
+        type: string
+      silkMarketClose:
+        description: 搴勫彛鍏抽棴
+        type: string
       stockAmount:
         description: 搴撳瓨鏁伴噺锛岀洏鐐规椂鐢�
         type: number
@@ -1949,10 +2052,12 @@
       baseOperationType:
         allOf:
         - $ref: '#/definitions/constvar.BaseOperationType'
-        description: 1 鍏ュ簱 2 鍑哄簱 3 鍐呴儴璋冩嫧 4 鎶ュ簾 5 搴撳瓨鐩樼偣
+        description: 鍩虹浣滀笟绫诲瀷 1 鍏ュ簱 2 鍑哄簱 3 鍐呴儴璋冩嫧 4 鎶ュ簾 5 搴撳瓨鐩樼偣
       number:
+        description: 鍗曞彿
         type: string
       operationTypeId:
+        description: 浣滀笟绫诲瀷id
         type: integer
       page:
         description: 椤电爜
@@ -1961,7 +2066,9 @@
         description: 姣忛〉澶у皬
         type: integer
       status:
-        $ref: '#/definitions/constvar.OperationStatus'
+        allOf:
+        - $ref: '#/definitions/constvar.OperationStatus'
+        description: 鐘舵��
     type: object
   request.PageInfo:
     properties:
@@ -2173,8 +2280,10 @@
   request.UpdateOperation:
     properties:
       accountant:
+        description: 浼氳鍚嶇О
         type: string
       accountantId:
+        description: 浼氳id
         type: string
       baseOperationType:
         allOf:
@@ -2196,16 +2305,20 @@
         description: 鑱旂郴浜哄鍚�-闈炲繀濉�
         type: string
       custodian:
+        description: 淇濈鍛樺悕绉�
         type: string
       custodianId:
+        description: 淇濈鍛榠d
         type: string
       details:
+        description: 璇︽儏
         items:
           $ref: '#/definitions/request.OperationDetails'
         type: array
       id:
         type: integer
       inventoryDealerType:
+        description: 璋冩嫧鍑哄叆搴撳垎绫�(瀵瑰簲dict瀛楀吀琛ㄧ殑ID)
         type: integer
       locationId:
         description: 婧愪綅缃甶d
@@ -2216,16 +2329,18 @@
         description: 鐗╂祦閲嶉噺
         type: number
       manager:
+        description: 涓荤鍚嶇О
         type: string
       managerId:
+        description: 涓荤id
         type: string
       number:
         description: 鍗曞彿
         type: string
       operationDate:
         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
+          FromLocationId    int                        `json:"fromLocationId"  `   //婧愪綅缃甶d
+          ToLocationId      int                        `json:"toLocationId" `   //鐩爣浣嶇疆id
         type: string
       operationTypeId:
         description: 浣滀笟绫诲瀷id
@@ -2234,10 +2349,16 @@
         description: 浣滀笟绫诲瀷鍚嶇О
         type: string
       receiverAddr:
+        description: 鏀惰揣鍦板潃
         type: string
       receiverName:
+        description: 鏀惰揣浜哄鍚�
         type: string
       receiverPhone:
+        description: 鑱旂郴鐢佃瘽
+        type: string
+      silkMarket:
+        description: 搴勫彛缂栫爜
         type: string
       sourceNumber:
         description: 婧愬崟鍙�
@@ -2349,8 +2470,14 @@
       produceId:
         description: 浜у搧id
         type: string
+      productCategory:
+        description: 浜у搧绫诲埆
+        type: string
       productName:
         description: 浜у搧鍚嶇О
+        type: string
+      productSpecs:
+        description: 浜у搧瑙勬牸
         type: string
       productType:
         description: 浜у搧绫诲瀷
@@ -2406,6 +2533,21 @@
         items:
           $ref: '#/definitions/models.Material'
         type: array
+    type: object
+  user.GetUserRequest:
+    properties:
+      id:
+        type: string
+      nickName:
+        type: string
+      parentId:
+        type: string
+      pos:
+        type: string
+      userName:
+        type: string
+      userType:
+        type: integer
     type: object
   util.Response:
     properties:
@@ -2852,6 +2994,44 @@
                   type: array
               type: object
       summary: 鑾峰彇瀛楀吀淇℃伅鍒楄〃
+      tags:
+      - 鏁版嵁瀛楀吀
+  /api-wms/v1/dict/getUserList:
+    get:
+      parameters:
+      - in: query
+        name: id
+        type: string
+      - in: query
+        name: nickName
+        type: string
+      - in: query
+        name: parentId
+        type: string
+      - in: query
+        name: pos
+        type: string
+      - in: query
+        name: userName
+        type: string
+      - in: query
+        name: userType
+        type: integer
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 鎴愬姛
+          schema:
+            allOf:
+            - $ref: '#/definitions/util.ResponseList'
+            - properties:
+                data:
+                  items:
+                    $ref: '#/definitions/user.GetUserRequest'
+                  type: array
+              type: object
+      summary: 鑾峰彇鐢ㄦ埛鍒楄〃
       tags:
       - 鏁版嵁瀛楀吀
   /api-wms/v1/dict/save:
@@ -3447,6 +3627,11 @@
   /api-wms/v1/locationProductAmount/add:
     post:
       parameters:
+      - description: token
+        in: header
+        name: Authorization
+        required: true
+        type: string
       - description: 鍏ュ簱/鍑哄簱淇℃伅
         in: body
         name: object
@@ -3466,6 +3651,11 @@
   /api-wms/v1/locationProductAmount/finish:
     post:
       parameters:
+      - description: token
+        in: header
+        name: Authorization
+        required: true
+        type: string
       - description: 鍏ュ弬
         in: body
         name: object
@@ -3578,6 +3768,11 @@
   /api-wms/v1/locationProductAmount/update:
     post:
       parameters:
+      - description: token
+        in: header
+        name: Authorization
+        required: true
+        type: string
       - description: 鍏ュ簱/鍑哄簱淇℃伅
         in: body
         name: object
@@ -3615,6 +3810,11 @@
   /api-wms/v1/operation/finish/{id}:
     put:
       parameters:
+      - description: token
+        in: header
+        name: Authorization
+        required: true
+        type: string
       - description: id
         in: path
         name: id
@@ -3669,14 +3869,24 @@
         name: id
         required: true
         type: string
+      - description: token
+        in: header
+        name: Authorization
+        required: true
+        type: string
       produces:
       - application/json
       responses:
         "200":
           description: 鎴愬姛
           schema:
-            $ref: '#/definitions/util.Response'
-      summary: 鍏ュ簱/鍑哄簱鍒楄〃
+            allOf:
+            - $ref: '#/definitions/util.Response'
+            - properties:
+                data:
+                  $ref: '#/definitions/models.Operation'
+              type: object
+      summary: 鎿嶄綔璇︽儏鎺ュ彛
       tags:
       - 鍏ュ簱/鍑哄簱
   /api-wms/v1/operation/getPersonnelList:
@@ -3706,6 +3916,11 @@
   /api-wms/v1/operation/list:
     post:
       parameters:
+      - description: token
+        in: header
+        name: Authorization
+        required: true
+        type: string
       - description: 鏌ヨ鍙傛暟
         in: body
         name: object
@@ -3770,6 +3985,11 @@
   /api-wms/v1/operation/operation:
     post:
       parameters:
+      - description: token
+        in: header
+        name: Authorization
+        required: true
+        type: string
       - description: 鍏ュ簱/鍑哄簱淇℃伅
         in: body
         name: object
@@ -3789,6 +4009,11 @@
   /api-wms/v1/operation/operation/{id}:
     delete:
       parameters:
+      - description: token
+        in: header
+        name: Authorization
+        required: true
+        type: string
       - description: id
         in: path
         name: id
@@ -4028,6 +4253,30 @@
       summary: 缂栬緫閮ㄩ棬淇℃伅
       tags:
       - 閮ㄩ棬淇℃伅
+  /api-wms/v1/other/saveProductImagesFromExcel:
+    post:
+      parameters:
+      - description: 灞炴�т俊鎭�
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/controllers.saveProductImagesFromExcelRequest'
+      - description: token
+        in: header
+        name: Authorization
+        required: true
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 鎴愬姛
+          schema:
+            $ref: '#/definitions/util.Response'
+      summary: 浠巈xcel涓幏鍙栦骇鍝佸浘鐗囧苟淇濆瓨
+      tags:
+      - 鍏朵粬
   /api-wms/v1/product/addDisuse:
     post:
       parameters:

--
Gitblit v1.8.0