From 67b13bb40517145cfadc05d7b22411b16f1528d7 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期三, 17 四月 2024 10:33:07 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS

---
 docs/swagger.yaml |  133 ++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 133 insertions(+), 0 deletions(-)

diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 223308f..d32b9c0 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -540,6 +540,10 @@
       deliveryAdvanceTime:
         description: 瀹㈡埛鍓嶇疆鏃堕棿(澶�)
         type: number
+      grossUnit:
+        type: string
+      grossWeight:
+        type: number
       id:
         type: string
       inStorageExplain:
@@ -597,9 +601,19 @@
         - $ref: '#/definitions/constvar.MaterialMode'
         description: MaterialType constvar.ProductType  `gorm:"index;type:int(11);comment:鐗╂枡绫诲瀷(鏁板瓧)"
           json:"materialType"`
+      moreUnit:
+        type: boolean
+      moreUnitList:
+        items:
+          $ref: '#/definitions/models.UnitItems'
+        type: array
       name:
         description: 鐗╂枡鍚嶇О
         type: string
+      netUnit:
+        type: string
+      netWeight:
+        type: number
       note:
         type: string
       orderAdvanceTime:
@@ -668,6 +682,62 @@
       volume:
         description: 浣撶Н
         type: number
+      weight:
+        description: 閲嶉噺
+        type: number
+    type: object
+  models.MonthStats:
+    properties:
+      MoreUnitsArr:
+        description: 鏈熸湯鍏朵粬鍗曚綅鏁扮粍
+        items:
+          $ref: '#/definitions/models.UnitItems'
+        type: array
+      amount:
+        description: 鏈熸湯缁撲綑鏁伴噺
+        type: number
+      beginAmount:
+        description: 鏈熷垵鏁伴噺
+        type: number
+      beginMoreUnitsArr:
+        description: 鏈熷垵鍏朵粬鍗曚綅鏁扮粍
+        items:
+          $ref: '#/definitions/models.UnitItems'
+        type: array
+      createTime:
+        type: string
+      date:
+        description: 鏃ユ湡 2024-04
+        type: string
+      id:
+        type: integer
+      inputAmount:
+        description: 鍏ュ簱鏁伴噺
+        type: number
+      inputMoreUnitsArr:
+        description: 鍏ュ簱鍏朵粬鍗曚綅鏁扮粍
+        items:
+          $ref: '#/definitions/models.UnitItems'
+        type: array
+      outputAmount:
+        description: 鍑哄簱鏁伴噺
+        type: number
+      outputMoreUnitsArr:
+        description: 鍑哄簱鍏朵粬鍗曚綅鏁扮粍
+        items:
+          $ref: '#/definitions/models.UnitItems'
+        type: array
+      productId:
+        description: 浜у搧id
+        type: string
+      productName:
+        description: 浜у搧鍚嶇О
+        type: string
+      unit:
+        description: 鍗曚綅
+        type: string
+      updateTime:
+        type: string
       weight:
         description: 閲嶉噺
         type: number
@@ -811,6 +881,10 @@
       toLocationId:
         description: 鐩爣浣嶇疆id
         type: integer
+      totalGrossWeight:
+        type: number
+      totalNetWeight:
+        type: number
       updateTime:
         type: string
     type: object
@@ -897,6 +971,15 @@
       isDefault:
         type: boolean
       name:
+        type: string
+    type: object
+  models.UnitItems:
+    properties:
+      amount:
+        type: number
+      floating:
+        type: boolean
+      unit:
         type: string
     type: object
   models.Warehouse:
@@ -1284,6 +1367,19 @@
       type:
         type: integer
     type: object
+  request.GetMonthStats:
+    properties:
+      date:
+        type: string
+      keyword:
+        type: string
+      page:
+        description: 椤电爜
+        type: integer
+      pageSize:
+        description: 姣忛〉澶у皬
+        type: integer
+    type: object
   request.GetProductList:
     properties:
       categoryId:
@@ -1368,6 +1464,12 @@
       toLocationId:
         description: 鐩爣浣嶇疆id
         type: integer
+      totalGrossWeight:
+        description: 鎬绘瘺閲�
+        type: number
+      totalNetWeight:
+        description: 鎬诲噣閲�
+        type: number
     type: object
   request.OperationList:
     properties:
@@ -2139,6 +2241,37 @@
       summary: 鑾峰彇浣嶇疆鎶ヨ〃
       tags:
       - 鎶ヨ〃
+  /api-wms/v1/forms/monthStats:
+    post:
+      parameters:
+      - description: 鏌ヨ鍙傛暟
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.GetMonthStats'
+      - description: token
+        in: header
+        name: Authorization
+        required: true
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 鎴愬姛
+          schema:
+            allOf:
+            - $ref: '#/definitions/util.ResponseList'
+            - properties:
+                data:
+                  items:
+                    $ref: '#/definitions/models.MonthStats'
+                  type: array
+              type: object
+      summary: 鏈堝害缁熻搴撳瓨鎶ヨ〃
+      tags:
+      - 鎶ヨ〃
   /api-wms/v1/location/addLocation:
     post:
       parameters:

--
Gitblit v1.8.0