From f16252d8b4736a0212b14a2bfb0eeee411d0cc76 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期一, 13 十一月 2023 11:16:34 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS

---
 docs/docs.go |  177 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 177 insertions(+), 0 deletions(-)

diff --git a/docs/docs.go b/docs/docs.go
index 3b0d76d..a25619b 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -150,6 +150,22 @@
                 }
             }
         },
+        "/api-wms/v1/attachment/uploadFiles": {
+            "post": {
+                "tags": [
+                    "闄勪欢绠$悊"
+                ],
+                "summary": "涓婁紶闄勪欢",
+                "responses": {
+                    "200": {
+                        "description": "鎴愬姛",
+                        "schema": {
+                            "$ref": "#/definitions/util.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/api-wms/v1/company/company": {
             "get": {
                 "produces": [
@@ -942,6 +958,40 @@
                         "description": "鎴愬姛",
                         "schema": {
                             "$ref": "#/definitions/util.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/api-wms/v1/operation/getLogisticCompanyList": {
+            "get": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "鍏ュ簱/鍑哄簱"
+                ],
+                "summary": "鑾峰彇鐗╂祦鍏徃鍒楄〃",
+                "responses": {
+                    "200": {
+                        "description": "鎴愬姛",
+                        "schema": {
+                            "allOf": [
+                                {
+                                    "$ref": "#/definitions/util.ResponseList"
+                                },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "type": "array",
+                                            "items": {
+                                                "$ref": "#/definitions/models.LogisticCompany"
+                                            }
+                                        }
+                                    }
+                                }
+                            ]
                         }
                     }
                 }
@@ -2208,6 +2258,24 @@
                 "CostingMethodAverageCost"
             ]
         },
+        "constvar.FileType": {
+            "type": "string",
+            "enum": [
+                "file",
+                "picture",
+                "thumbnail"
+            ],
+            "x-enum-comments": {
+                "FileType_File": "鏂囦欢",
+                "FileType_Picture": "鍥剧墖",
+                "FileType_Thumbnail": "缂╃暐鍥�"
+            },
+            "x-enum-varnames": [
+                "FileType_File",
+                "FileType_Picture",
+                "FileType_Thumbnail"
+            ]
+        },
         "constvar.ForceRemovalStrategy": {
             "type": "integer",
             "enum": [
@@ -2420,6 +2488,26 @@
                 "ReservationNever"
             ]
         },
+        "models.Attachment": {
+            "type": "object",
+            "properties": {
+                "FileUrl": {
+                    "type": "string"
+                },
+                "ext": {
+                    "type": "string"
+                },
+                "fileName": {
+                    "type": "string"
+                },
+                "fileType": {
+                    "$ref": "#/definitions/constvar.FileType"
+                },
+                "id": {
+                    "type": "integer"
+                }
+            }
+        },
         "models.Company": {
             "type": "object",
             "properties": {
@@ -2556,12 +2644,51 @@
                 }
             }
         },
+        "models.LogisticCompany": {
+            "type": "object",
+            "properties": {
+                "contact": {
+                    "description": "鑱旂郴浜�",
+                    "type": "string"
+                },
+                "contact_phone": {
+                    "description": "鑱旂郴鐢佃瘽",
+                    "type": "string"
+                },
+                "hidden": {
+                    "description": "闅愯棌",
+                    "type": "boolean"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "monthly_account": {
+                    "description": "鏈堢粨璐﹀彿",
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                }
+            }
+        },
         "models.Material": {
             "type": "object",
             "properties": {
                 "amount": {
                     "description": "鏁伴噺",
                     "type": "number"
+                },
+                "attachmentIDs": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                },
+                "attachmentList": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/models.Attachment"
+                    }
                 },
                 "barcode": {
                     "description": "鏉$爜",
@@ -2798,6 +2925,16 @@
                 "id": {
                     "type": "integer"
                 },
+                "logisticCompany": {
+                    "$ref": "#/definitions/models.LogisticCompany"
+                },
+                "logisticCompanyId": {
+                    "type": "string"
+                },
+                "logisticWeight": {
+                    "description": "鐗╂祦閲嶉噺",
+                    "type": "number"
+                },
                 "number": {
                     "description": "鍗曞彿",
                     "type": "string"
@@ -2839,6 +2976,14 @@
                 },
                 "updateTime": {
                     "type": "string"
+                },
+                "waybillNumber": {
+                    "description": "杩愬崟鍙�",
+                    "type": "string"
+                },
+                "weight": {
+                    "description": "閲嶉噺",
+                    "type": "number"
                 }
             }
         },
@@ -3175,6 +3320,13 @@
                 "id": {
                     "type": "integer"
                 },
+                "logisticCompanyId": {
+                    "type": "string"
+                },
+                "logisticWeight": {
+                    "description": "鐗╂祦閲嶉噺",
+                    "type": "number"
+                },
                 "number": {
                     "description": "鍗曞彿",
                     "type": "string"
@@ -3206,6 +3358,14 @@
                 "toLocationId": {
                     "description": "鐩爣浣嶇疆id",
                     "type": "integer"
+                },
+                "waybillNumber": {
+                    "description": "杩愬崟鍙�",
+                    "type": "string"
+                },
+                "weight": {
+                    "description": "閲嶉噺",
+                    "type": "number"
                 }
             }
         },
@@ -3836,6 +3996,13 @@
                 "id": {
                     "type": "integer"
                 },
+                "logisticCompanyId": {
+                    "type": "string"
+                },
+                "logisticWeight": {
+                    "description": "鐗╂祦閲嶉噺",
+                    "type": "number"
+                },
                 "number": {
                     "description": "鍗曞彿",
                     "type": "string"
@@ -3867,6 +4034,14 @@
                 "toLocationId": {
                     "description": "鐩爣浣嶇疆id",
                     "type": "integer"
+                },
+                "waybillNumber": {
+                    "description": "杩愬崟鍙�",
+                    "type": "string"
+                },
+                "weight": {
+                    "description": "閲嶉噺",
+                    "type": "number"
                 }
             }
         },
@@ -4138,6 +4313,8 @@
 	Description:      "",
 	InfoInstanceName: "swagger",
 	SwaggerTemplate:  docTemplate,
+	LeftDelim:        "{{",
+	RightDelim:       "}}",
 }
 
 func init() {

--
Gitblit v1.8.0