From 7d80867c1d2d8340da8e106b4af2ceaba3fc9fc1 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 19 三月 2024 19:16:50 +0800
Subject: [PATCH] 增加发货完成按钮

---
 docs/swagger.yaml |  401 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 374 insertions(+), 27 deletions(-)

diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 076c9b8..a7535cd 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -193,14 +193,20 @@
     - 2
     - 3
     - 4
+    - 5
+    - 6
     type: integer
     x-enum-comments:
+      InStock: 澶囪揣涓�
       OverCLose: 宸插叧闂�
       OverOutbound: 鍑哄簱瀹屾垚
       WaitConfirmed: 寰呯‘璁�
+      WaitDecompose: 寰呭垎瑙�
       WaitOutbound: 寰呭嚭搴�
     x-enum-varnames:
     - WaitConfirmed
+    - WaitDecompose
+    - InStock
     - WaitOutbound
     - OverOutbound
     - OverCLose
@@ -1118,18 +1124,28 @@
     properties:
       amount:
         type: number
+      cost:
+        type: string
       desc:
         type: string
       id:
         type: integer
+      margin:
+        type: string
       name:
         type: string
       number:
         type: string
       price:
         type: number
+      profit:
+        type: string
+      specs:
+        type: string
       total:
         type: number
+      type:
+        type: string
       unit:
         type: string
     type: object
@@ -1146,6 +1162,9 @@
     type: object
   model.Quotation:
     properties:
+      amountTotal:
+        description: 浠锋牸鍚堣
+        type: number
       client:
         $ref: '#/definitions/model.Client'
       client_id:
@@ -2111,6 +2130,17 @@
           $ref: '#/definitions/model.Product'
         type: array
     type: object
+  model.SystemSet:
+    properties:
+      id:
+        type: integer
+      modeType:
+        type: string
+      name:
+        type: string
+      value:
+        type: string
+    type: object
   model.TimeSpent:
     properties:
       id:
@@ -2207,23 +2237,6 @@
         description: 鍨嬪彿
         type: string
       Unit:
-        type: string
-    type: object
-  product.WorkOrderInfo:
-    properties:
-      EndTime:
-        type: string
-      OrderId:
-        type: string
-      OrderStatus:
-        type: string
-      ProductName:
-        type: string
-      StartTime:
-        type: string
-      WorkOrderId:
-        type: string
-      WorkOrderStatus:
         type: string
     type: object
   request.AddAccountId:
@@ -3444,6 +3457,29 @@
     required:
     - ids
     type: object
+  request.ConfirmOutput:
+    properties:
+      products:
+        items:
+          $ref: '#/definitions/request.ConfirmOutputProducts'
+        type: array
+      saleDetailNumber:
+        type: string
+    type: object
+  request.ConfirmOutputOver:
+    properties:
+      saleDetailNumber:
+        type: string
+    type: object
+  request.ConfirmOutputProducts:
+    properties:
+      number:
+        description: 浜у搧缂栧彿
+        type: string
+      outputAmount:
+        description: 鏈鍙戣揣鏁伴噺
+        type: number
+    type: object
   request.Contact:
     properties:
       birthday:
@@ -3674,6 +3710,8 @@
     type: object
   request.GetContractList:
     properties:
+      keyword:
+        type: string
       page:
         description: 椤电爜
         type: integer
@@ -4152,6 +4190,13 @@
         allOf:
         - $ref: '#/definitions/constvar.SalesReturnSourceType'
         description: 婧愬崟绫诲瀷锛�1閿�鍞槑缁嗭級
+    type: object
+  request.SaveSystemSet:
+    properties:
+      sets:
+        items:
+          $ref: '#/definitions/model.SystemSet'
+        type: array
     type: object
   request.SetAuthorityMenu:
     properties:
@@ -6085,6 +6130,25 @@
           $ref: '#/definitions/model.Industry'
         type: array
     type: object
+  response.Info:
+    properties:
+      makeInfo:
+        items:
+          $ref: '#/definitions/response.WorkOrderInfo'
+        type: array
+      outsourcingInfo:
+        items:
+          $ref: '#/definitions/response.OutsourcingInfo'
+        type: array
+      productInfo:
+        items:
+          $ref: '#/definitions/response.SalesDetailsProductInfo'
+        type: array
+      purchaseInfo:
+        items:
+          $ref: '#/definitions/response.Purchase'
+        type: array
+    type: object
   response.IsInvoiceResponse:
     properties:
       list:
@@ -6150,6 +6214,36 @@
           $ref: '#/definitions/model.OrderType'
         type: array
     type: object
+  response.OutsourcingInfo:
+    properties:
+      amount:
+        description: 璁㈠崟鏁伴噺
+        type: integer
+      endTime:
+        type: string
+      finishAmount:
+        description: 瀹屾垚鏁伴噺
+        type: integer
+      outsourcingId:
+        description: 濮斿璁㈠崟id
+        type: string
+      outsourcingStatus:
+        type: string
+      productId:
+        type: string
+      productName:
+        type: string
+      specs:
+        description: 鐗╂枡瑙勬牸
+        type: string
+      startTime:
+        type: string
+      supplierName:
+        type: string
+      unit:
+        description: 鍗曚綅
+        type: string
+    type: object
   response.PlanResponse:
     properties:
       count:
@@ -6172,6 +6266,33 @@
         items:
           $ref: '#/definitions/model.Province'
         type: array
+    type: object
+  response.Purchase:
+    properties:
+      amount:
+        description: 璁㈠崟鏁伴噺
+        type: integer
+      finishAmount:
+        description: 瀹屾垚鏁伴噺
+        type: integer
+      productId:
+        type: string
+      productName:
+        type: string
+      purchaseName:
+        type: string
+      purchaseNumber:
+        type: string
+      specs:
+        description: 鐗╂枡瑙勬牸
+        type: string
+      status:
+        type: integer
+      supplierName:
+        type: string
+      unit:
+        description: 鍗曚綅
+        type: string
     type: object
   response.QuotationResponse:
     properties:
@@ -6254,6 +6375,61 @@
         items:
           $ref: '#/definitions/model.SaleType'
         type: array
+    type: object
+  response.SalesDetailsProductInfo:
+    properties:
+      amount:
+        description: 璁㈠崟鏁伴噺
+        type: number
+      cost:
+        description: 浜у搧鎴愭湰
+        type: string
+      deliveryAmount:
+        description: 鍙戣揣鏁伴噺
+        type: integer
+      finishAmount:
+        description: 瀹屾垚鏁伴噺
+        type: integer
+      makeAmount:
+        description: 鍒堕�犳暟閲�
+        type: integer
+      makeFinishAmount:
+        description: 鍒堕�犲畬鎴愭暟閲�
+        type: integer
+      margin:
+        description: 姣涘埄鐜�
+        type: string
+      outsourcingAmount:
+        description: 濮斿鏁伴噺
+        type: integer
+      outsourcingFinishAmount:
+        description: 濮斿瀹屾垚鏁伴噺
+        type: integer
+      price:
+        description: 浜у搧浠锋牸
+        type: number
+      productId:
+        type: string
+      productName:
+        type: string
+      profit:
+        description: 姣涘埄
+        type: string
+      purchaseAmount:
+        description: 閲囪喘鏁伴噺
+        type: integer
+      purchaseFinishAmount:
+        description: 閲囪喘瀹屾垚鏁伴噺
+        type: integer
+      specs:
+        description: 鐗╂枡瑙勬牸
+        type: string
+      total:
+        description: 浜у搧鎬讳环
+        type: number
+      unit:
+        description: 鍗曚綅
+        type: string
     type: object
   response.SalesDetailsResponse:
     properties:
@@ -6368,6 +6544,44 @@
         items:
           $ref: '#/definitions/model.TimelyRate'
         type: array
+    type: object
+  response.WorkOrderInfo:
+    properties:
+      amount:
+        description: 璁㈠崟鏁伴噺
+        type: integer
+      endTime:
+        type: string
+      finishAmount:
+        description: 瀹屾垚鏁伴噺
+        type: integer
+      orderId:
+        type: string
+      orderStatus:
+        type: string
+      productId:
+        type: string
+      productName:
+        type: string
+      specs:
+        description: 鐗╂枡瑙勬牸
+        type: string
+      startTime:
+        type: string
+      unit:
+        description: 鍗曚綅
+        type: string
+      workOrderId:
+        type: string
+      workOrderStatus:
+        type: string
+    type: object
+  v1.GetWarehouseProductInfoReq:
+    properties:
+      saleDetailID:
+        type: integer
+      saleDetailNumber:
+        type: string
     type: object
 info:
   contact: {}
@@ -9406,9 +9620,7 @@
             - $ref: '#/definitions/contextx.Response'
             - properties:
                 data:
-                  items:
-                    $ref: '#/definitions/product.WorkOrderInfo'
-                  type: array
+                  $ref: '#/definitions/response.Info'
               type: object
       summary: 鑾峰彇浜у搧璁㈠崟淇℃伅
       tags:
@@ -9454,6 +9666,10 @@
       - description: 浜у搧缂栫爜
         in: query
         name: productNumber
+        type: string
+      - description: 鎶ヤ环鍗曠紪鐮�
+        in: query
+        name: quotationNumber
         type: string
       produces:
       - application/json
@@ -9630,6 +9846,25 @@
                   $ref: '#/definitions/response.QuotationResponse'
               type: object
       summary: 鎶ヤ环鍗曞垪琛�
+      tags:
+      - Quotation
+  /api/quotation/statistics:
+    get:
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            allOf:
+            - $ref: '#/definitions/contextx.Response'
+            - properties:
+                data:
+                  additionalProperties:
+                    type: integer
+                  type: object
+              type: object
+      summary: 鎶ヤ环鍗曠粺璁�
       tags:
       - Quotation
   /api/quotation/update:
@@ -10655,15 +10890,15 @@
       summary: 娣诲姞閿�鍞槑缁�
       tags:
       - SalesDetails
-  /api/salesDetails/createOperation:
+  /api/salesDetails/confirmOutput:
     post:
       parameters:
-      - description: 鏌ヨ鍙傛暟
+      - description: 鏄庣粏缂栫爜
         in: body
         name: object
         required: true
         schema:
-          $ref: '#/definitions/request.SalesDetails'
+          $ref: '#/definitions/request.ConfirmOutput'
       produces:
       - application/json
       responses:
@@ -10671,7 +10906,26 @@
           description: OK
           schema:
             $ref: '#/definitions/response.ListResponse'
-      summary: 鍒涘缓浜у搧鍑哄簱淇℃伅
+      summary: 纭鍙戣揣
+      tags:
+      - SalesDetails
+  /api/salesDetails/confirmOutputOver:
+    post:
+      parameters:
+      - description: 鏄庣粏缂栫爜
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.ConfirmOutputOver'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/response.ListResponse'
+      summary: 纭鍙戣揣
       tags:
       - SalesDetails
   /api/salesDetails/delete:
@@ -10723,6 +10977,44 @@
       summary: 鑾峰彇aps椤圭洰鍒楄〃
       tags:
       - SalesDetails
+  /api/salesDetails/getDeliveryList:
+    post:
+      parameters:
+      - description: 鏄庣粏缂栫爜
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/v1.GetWarehouseProductInfoReq'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/response.ListResponse'
+      summary: 鍙戣揣鏄庣粏
+      tags:
+      - SalesDetails
+  /api/salesDetails/getDeliveryPrepareInfo:
+    post:
+      parameters:
+      - description: 鏄庣粏缂栫爜
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/v1.GetWarehouseProductInfoReq'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/response.ListResponse'
+      summary: 鑾峰彇浜у搧鍏ュ簱淇℃伅
+      tags:
+      - SalesDetails
   /api/salesDetails/getProductInventoryInfo/{number}:
     get:
       parameters:
@@ -10738,7 +11030,7 @@
           description: OK
           schema:
             $ref: '#/definitions/response.ListResponse'
-      summary: 鑾峰彇浜у搧搴撳瓨淇℃伅
+      summary: 鑾峰彇浜у搧鍙戣揣淇℃伅
       tags:
       - SalesDetails
   /api/salesDetails/list:
@@ -10765,7 +11057,7 @@
       summary: 閿�鍞槑缁嗗崟鍒楄〃
       tags:
       - SalesDetails
-  /api/salesDetails/sendSalesDetailsToApsProject:
+  /api/salesDetails/sendSalesDetailsToOtherSystem:
     post:
       parameters:
       - description: 鏌ヨ鍙傛暟
@@ -10781,7 +11073,7 @@
           description: OK
           schema:
             $ref: '#/definitions/response.ListResponse'
-      summary: 鎺ㄩ�侀攢鍞槑缁嗕俊鎭埌aps椤圭洰妯″潡
+      summary: 鎺ㄩ�侀攢鍞槑缁嗕俊鎭埌鍏朵粬绯荤粺
       tags:
       - SalesDetails
   /api/salesDetails/update:
@@ -12412,6 +12704,61 @@
       summary: 鏇存柊瀛愯鍗�
       tags:
       - SubOrder
+  /api/system/getSystemSet:
+    get:
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 鎴愬姛
+          schema:
+            allOf:
+            - $ref: '#/definitions/contextx.Response'
+            - properties:
+                data:
+                  additionalProperties: true
+                  type: object
+              type: object
+      summary: 鑾峰彇绯荤粺璁剧疆
+      tags:
+      - 绯荤粺璁剧疆
+  /api/system/saveSystemSet:
+    post:
+      parameters:
+      - description: 鏌ヨ鍙傛暟
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.SaveSystemSet'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 鎴愬姛
+          schema:
+            $ref: '#/definitions/contextx.Response'
+      summary: 淇濆瓨绯荤粺璁剧疆
+      tags:
+      - 绯荤粺璁剧疆
+  /api/system/useSystemSet/{modeType}:
+    get:
+      parameters:
+      - description: 鏌ヨ鍙傛暟
+        in: path
+        name: modeType
+        required: true
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/response.ListResponse'
+      summary: 浣跨敤绯荤粺璁剧疆
+      tags:
+      - 绯荤粺璁剧疆
   /api/timeSpent/add:
     post:
       parameters:

--
Gitblit v1.8.0