From 1cd1206c18ed14dd9ebf2baf477f46c847a271b0 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 15 三月 2024 16:39:19 +0800
Subject: [PATCH] merge

---
 docs/docs.go |  202 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 200 insertions(+), 2 deletions(-)

diff --git a/docs/docs.go b/docs/docs.go
index 1455302..35d02d0 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -7085,6 +7085,66 @@
                 }
             }
         },
+        "/api/salesDetails/getDeliveryList": {
+            "post": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "SalesDetails"
+                ],
+                "summary": "鍙戣揣鏄庣粏",
+                "parameters": [
+                    {
+                        "description": "鏄庣粏缂栫爜",
+                        "name": "object",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/v1.GetWarehouseProductInfoReq"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/response.ListResponse"
+                        }
+                    }
+                }
+            }
+        },
+        "/api/salesDetails/getDeliveryPrepareInfo": {
+            "post": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "SalesDetails"
+                ],
+                "summary": "鑾峰彇浜у搧鍏ュ簱淇℃伅",
+                "parameters": [
+                    {
+                        "description": "鏄庣粏缂栫爜",
+                        "name": "object",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/v1.GetWarehouseProductInfoReq"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/response.ListResponse"
+                        }
+                    }
+                }
+            }
+        },
         "/api/salesDetails/getProductInventoryInfo/{number}": {
             "get": {
                 "produces": [
@@ -7093,7 +7153,35 @@
                 "tags": [
                     "SalesDetails"
                 ],
-                "summary": "鑾峰彇浜у搧搴撳瓨淇℃伅",
+                "summary": "鑾峰彇浜у搧鍙戣揣淇℃伅",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "鏄庣粏缂栫爜",
+                        "name": "number",
+                        "in": "path",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/response.ListResponse"
+                        }
+                    }
+                }
+            }
+        },
+        "/api/salesDetails/getSalesDetailsProductInfo/{number}": {
+            "get": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "SalesDetails"
+                ],
+                "summary": "鑾峰彇閿�鍞槑缁嗕骇鍝佷俊鎭�",
                 "parameters": [
                     {
                         "type": "string",
@@ -10653,16 +10741,22 @@
                 1,
                 2,
                 3,
-                4
+                4,
+                5,
+                6
             ],
             "x-enum-comments": {
+                "InStock": "澶囪揣涓�",
                 "OverCLose": "宸插叧闂�",
                 "OverOutbound": "鍑哄簱瀹屾垚",
                 "WaitConfirmed": "寰呯‘璁�",
+                "WaitDecompose": "寰呭垎瑙�",
                 "WaitOutbound": "寰呭嚭搴�"
             },
             "x-enum-varnames": [
                 "WaitConfirmed",
+                "WaitDecompose",
+                "InStock",
                 "WaitOutbound",
                 "OverOutbound",
                 "OverCLose"
@@ -11994,8 +12088,14 @@
                 "profit": {
                     "type": "string"
                 },
+                "specs": {
+                    "type": "string"
+                },
                 "total": {
                     "type": "number"
+                },
+                "type": {
+                    "type": "string"
                 },
                 "unit": {
                     "type": "string"
@@ -19324,6 +19424,12 @@
                         "$ref": "#/definitions/response.WorkOrderInfo"
                     }
                 },
+                "outsourcingInfo": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/response.OutsourcingInfo"
+                    }
+                },
                 "purchaseInfo": {
                     "type": "array",
                     "items": {
@@ -19433,6 +19539,49 @@
                 }
             }
         },
+        "response.OutsourcingInfo": {
+            "type": "object",
+            "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"
+                }
+            }
+        },
         "response.PlanResponse": {
             "type": "object",
             "properties": {
@@ -19473,7 +19622,18 @@
             "type": "object",
             "properties": {
                 "amount": {
+                    "description": "璁㈠崟鏁伴噺",
                     "type": "integer"
+                },
+                "finishAmount": {
+                    "description": "瀹屾垚鏁伴噺",
+                    "type": "integer"
+                },
+                "productId": {
+                    "type": "string"
+                },
+                "productName": {
+                    "type": "string"
                 },
                 "purchaseName": {
                     "type": "string"
@@ -19481,10 +19641,18 @@
                 "purchaseNumber": {
                     "type": "string"
                 },
+                "specs": {
+                    "description": "鐗╂枡瑙勬牸",
+                    "type": "string"
+                },
                 "status": {
                     "type": "integer"
                 },
                 "supplierName": {
+                    "type": "string"
+                },
+                "unit": {
+                    "description": "鍗曚綅",
                     "type": "string"
                 }
             }
@@ -19798,8 +19966,16 @@
         "response.WorkOrderInfo": {
             "type": "object",
             "properties": {
+                "amount": {
+                    "description": "璁㈠崟鏁伴噺",
+                    "type": "integer"
+                },
                 "endTime": {
                     "type": "string"
+                },
+                "finishAmount": {
+                    "description": "瀹屾垚鏁伴噺",
+                    "type": "integer"
                 },
                 "orderId": {
                     "type": "string"
@@ -19807,10 +19983,21 @@
                 "orderStatus": {
                     "type": "string"
                 },
+                "productId": {
+                    "type": "string"
+                },
                 "productName": {
                     "type": "string"
                 },
+                "specs": {
+                    "description": "鐗╂枡瑙勬牸",
+                    "type": "string"
+                },
                 "startTime": {
+                    "type": "string"
+                },
+                "unit": {
+                    "description": "鍗曚綅",
                     "type": "string"
                 },
                 "workOrderId": {
@@ -19820,6 +20007,17 @@
                     "type": "string"
                 }
             }
+        },
+        "v1.GetWarehouseProductInfoReq": {
+            "type": "object",
+            "properties": {
+                "saleDetailID": {
+                    "type": "integer"
+                },
+                "saleDetailNumber": {
+                    "type": "string"
+                }
+            }
         }
     }
 }`

--
Gitblit v1.8.0