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 | 258 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 257 insertions(+), 1 deletions(-)
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index c46537f..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
@@ -1134,8 +1140,12 @@
type: number
profit:
type: string
+ specs:
+ type: string
total:
type: number
+ type:
+ type: string
unit:
type: string
type: object
@@ -3446,6 +3456,29 @@
type: array
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:
@@ -6103,6 +6136,14 @@
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'
@@ -6173,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:
@@ -6199,14 +6270,28 @@
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:
@@ -6290,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:
@@ -6407,19 +6547,40 @@
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:
@@ -9687,6 +9848,25 @@
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:
put:
parameters:
@@ -10710,6 +10890,44 @@
summary: 娣诲姞閿�鍞槑缁�
tags:
- SalesDetails
+ /api/salesDetails/confirmOutput:
+ post:
+ parameters:
+ - description: 鏄庣粏缂栫爜
+ in: body
+ name: object
+ required: true
+ schema:
+ $ref: '#/definitions/request.ConfirmOutput'
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: OK
+ schema:
+ $ref: '#/definitions/response.ListResponse'
+ 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:
delete:
parameters:
@@ -10759,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:
@@ -10774,7 +11030,7 @@
description: OK
schema:
$ref: '#/definitions/response.ListResponse'
- summary: 鑾峰彇浜у搧搴撳瓨淇℃伅
+ summary: 鑾峰彇浜у搧鍙戣揣淇℃伅
tags:
- SalesDetails
/api/salesDetails/list:
--
Gitblit v1.8.0