From 79eca4ef507f418b88a0817f43a9ea25750a818a Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期六, 23 九月 2023 16:57:57 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS

---
 docs/docs.go |  576 +++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 513 insertions(+), 63 deletions(-)

diff --git a/docs/docs.go b/docs/docs.go
index bce2dc6..3d921fd 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -495,11 +495,8 @@
                 }
             }
         },
-        "/api-wms/v1/operation/operation": {
-            "get": {
-                "consumes": [
-                    "application/json"
-                ],
+        "/api-wms/v1/operation/list": {
+            "post": {
                 "produces": [
                     "application/json"
                 ],
@@ -509,21 +506,13 @@
                 "summary": "鍏ュ簱/鍑哄簱鍒楄〃",
                 "parameters": [
                     {
-                        "type": "integer",
-                        "name": "operationTypeId",
-                        "in": "query"
-                    },
-                    {
-                        "type": "integer",
-                        "description": "椤电爜",
-                        "name": "page",
-                        "in": "query"
-                    },
-                    {
-                        "type": "integer",
-                        "description": "姣忛〉澶у皬",
-                        "name": "pageSize",
-                        "in": "query"
+                        "description": "鏌ヨ鍙傛暟",
+                        "name": "object",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/request.OperationList"
+                        }
                     }
                 ],
                 "responses": {
@@ -534,7 +523,39 @@
                         }
                     }
                 }
-            },
+            }
+        },
+        "/api-wms/v1/operation/listAll": {
+            "post": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "鍏ュ簱/鍑哄簱"
+                ],
+                "summary": "璋冩嫧",
+                "parameters": [
+                    {
+                        "description": "鍙傛暟",
+                        "name": "object",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/request.OperationAllList"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "鎴愬姛",
+                        "schema": {
+                            "$ref": "#/definitions/util.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/api-wms/v1/operation/operation": {
             "post": {
                 "produces": [
                     "application/json"
@@ -565,7 +586,35 @@
             }
         },
         "/api-wms/v1/operation/operation/{id}": {
-            "put": {
+            "delete": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "鍏ュ簱/鍑哄簱"
+                ],
+                "summary": "鍒犻櫎鍏ュ簱/鍑哄簱淇℃伅",
+                "parameters": [
+                    {
+                        "type": "integer",
+                        "description": "id",
+                        "name": "id",
+                        "in": "path",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "鎴愬姛",
+                        "schema": {
+                            "$ref": "#/definitions/util.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/api-wms/v1/operation/update": {
+            "post": {
                 "produces": [
                     "application/json"
                 ],
@@ -582,39 +631,6 @@
                         "schema": {
                             "$ref": "#/definitions/request.UpdateOperation"
                         }
-                    },
-                    {
-                        "type": "integer",
-                        "description": "鍏ュ簱淇℃伅id",
-                        "name": "id",
-                        "in": "path",
-                        "required": true
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "鎴愬姛",
-                        "schema": {
-                            "$ref": "#/definitions/util.Response"
-                        }
-                    }
-                }
-            },
-            "delete": {
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "鍏ュ簱/鍑哄簱"
-                ],
-                "summary": "鍒犻櫎鍏ュ簱/鍑哄簱淇℃伅",
-                "parameters": [
-                    {
-                        "type": "integer",
-                        "description": "id",
-                        "name": "id",
-                        "in": "path",
-                        "required": true
                     }
                 ],
                 "responses": {
@@ -771,6 +787,36 @@
                 }
             }
         },
+        "/api-wms/v1/product/addDisuse": {
+            "post": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "浜у搧"
+                ],
+                "summary": "娣诲姞鎶ュ簾淇℃伅",
+                "parameters": [
+                    {
+                        "description": "鍏ュ簱/鍑哄簱淇℃伅",
+                        "name": "object",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/request.AddDisuse"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "鎴愬姛",
+                        "schema": {
+                            "$ref": "#/definitions/util.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/api-wms/v1/product/addProduct": {
             "post": {
                 "produces": [
@@ -871,6 +917,34 @@
                 "parameters": [
                     {
                         "type": "string",
+                        "description": "id",
+                        "name": "id",
+                        "in": "path",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "鎴愬姛",
+                        "schema": {
+                            "$ref": "#/definitions/util.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/api-wms/v1/product/finishDisuse/{id}": {
+            "put": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "浜у搧"
+                ],
+                "summary": "楠岃瘉鎶ュ簾",
+                "parameters": [
+                    {
+                        "type": "integer",
                         "description": "id",
                         "name": "id",
                         "in": "path",
@@ -1052,6 +1126,111 @@
                                     }
                                 }
                             ]
+                        }
+                    }
+                }
+            }
+        },
+        "/api-wms/v1/product/listDisuse": {
+            "post": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "浜у搧"
+                ],
+                "summary": "鎶ュ簾鍒楄〃",
+                "parameters": [
+                    {
+                        "description": "鏌ヨ鍙傛暟",
+                        "name": "object",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/request.QueryDisuseList"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "鎴愬姛",
+                        "schema": {
+                            "$ref": "#/definitions/util.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/api-wms/v1/product/listOperaton": {
+            "post": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "浜у搧"
+                ],
+                "summary": "浜у搧鍘嗗彶鍑哄叆搴撲俊鎭�",
+                "parameters": [
+                    {
+                        "description": "鏌ヨ鍙傛暟",
+                        "name": "object",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/request.QueryOperationList"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "鎴愬姛",
+                        "schema": {
+                            "allOf": [
+                                {
+                                    "$ref": "#/definitions/util.ResponseList"
+                                },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "type": "array",
+                                            "items": {
+                                                "$ref": "#/definitions/models.Operation"
+                                            }
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                }
+            }
+        },
+        "/api-wms/v1/product/updateDisuse": {
+            "post": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "浜у搧"
+                ],
+                "summary": "淇敼鎶ュ簾淇℃伅",
+                "parameters": [
+                    {
+                        "description": "鍏ュ簱/鍑哄簱淇℃伅",
+                        "name": "object",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/request.UpdateDisuse"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "鎴愬姛",
+                        "schema": {
+                            "$ref": "#/definitions/util.Response"
                         }
                     }
                 }
@@ -1395,7 +1574,8 @@
                 4,
                 5,
                 6,
-                7
+                7,
+                8
             ],
             "x-enum-comments": {
                 "LocationTypeCustomer": "瀹㈡埛浣嶇疆",
@@ -1413,7 +1593,8 @@
                 "LocationTypeCustomer",
                 "LocationTypeInventoryLoss",
                 "LocationTypeProduction",
-                "LocationTypeTransit"
+                "LocationTypeTransit",
+                "LocationTypeDisuse"
             ]
         },
         "constvar.MaterialMode": {
@@ -1613,6 +1794,10 @@
                 "isScrapLocation": {
                     "description": "鏄惁鎶ュ簾浣嶇疆",
                     "type": "boolean"
+                },
+                "jointName": {
+                    "description": "鎷兼帴鍚嶇О",
+                    "type": "string"
                 },
                 "name": {
                     "description": "浣嶇疆鍚嶇О",
@@ -1840,6 +2025,125 @@
                 "weight": {
                     "description": "閲嶉噺",
                     "type": "number"
+                }
+            }
+        },
+        "models.Operation": {
+            "type": "object",
+            "properties": {
+                "comment": {
+                    "type": "string"
+                },
+                "companyID": {
+                    "type": "integer"
+                },
+                "companyName": {
+                    "type": "string"
+                },
+                "contacterID": {
+                    "type": "integer"
+                },
+                "contacterName": {
+                    "type": "string"
+                },
+                "createTime": {
+                    "type": "string"
+                },
+                "details": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/models.OperationDetails"
+                    }
+                },
+                "fromLocation": {
+                    "description": "婧愪綅缃�",
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.Location"
+                        }
+                    ]
+                },
+                "fromLocationId": {
+                    "description": "婧愪綅缃甶d",
+                    "type": "integer"
+                },
+                "id": {
+                    "type": "integer"
+                },
+                "number": {
+                    "description": "鍗曞彿",
+                    "type": "string"
+                },
+                "operationDate": {
+                    "type": "string"
+                },
+                "operationTypeId": {
+                    "description": "浣滀笟绫诲瀷id",
+                    "type": "integer"
+                },
+                "operationTypeName": {
+                    "description": "浣滀笟绫诲瀷鍚嶇О",
+                    "type": "string"
+                },
+                "sourceNumber": {
+                    "description": "婧愬崟鍙�",
+                    "type": "string"
+                },
+                "status": {
+                    "description": "鐘舵��",
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/constvar.OperationStatus"
+                        }
+                    ]
+                },
+                "toLocation": {
+                    "description": "鐩爣浣嶇疆",
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.Location"
+                        }
+                    ]
+                },
+                "toLocationId": {
+                    "description": "鐩爣浣嶇疆id",
+                    "type": "integer"
+                },
+                "updateTime": {
+                    "type": "string"
+                }
+            }
+        },
+        "models.OperationDetails": {
+            "type": "object",
+            "properties": {
+                "amount": {
+                    "description": "鏁伴噺",
+                    "type": "number"
+                },
+                "createTime": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "integer"
+                },
+                "operationId": {
+                    "description": "鎿嶄綔id",
+                    "type": "integer"
+                },
+                "productId": {
+                    "description": "浜у搧id",
+                    "type": "string"
+                },
+                "productName": {
+                    "description": "浜у搧鍚嶇О",
+                    "type": "string"
+                },
+                "unit": {
+                    "type": "string"
+                },
+                "updateTime": {
+                    "type": "string"
                 }
             }
         },
@@ -2122,6 +2426,32 @@
                 }
             }
         },
+        "request.AddDisuse": {
+            "type": "object",
+            "properties": {
+                "amount": {
+                    "type": "number"
+                },
+                "fromLocationId": {
+                    "type": "integer"
+                },
+                "productId": {
+                    "type": "string"
+                },
+                "productName": {
+                    "type": "string"
+                },
+                "sourceNumber": {
+                    "type": "string"
+                },
+                "toLocationId": {
+                    "type": "integer"
+                },
+                "unit": {
+                    "type": "string"
+                }
+            }
+        },
         "request.AddOperation": {
             "type": "object",
             "properties": {
@@ -2169,6 +2499,10 @@
                 "operationTypeId": {
                     "description": "浣滀笟绫诲瀷id",
                     "type": "integer"
+                },
+                "operationTypeName": {
+                    "description": "浣滀笟绫诲瀷鍚嶇О",
+                    "type": "string"
                 },
                 "sourceNumber": {
                     "description": "婧愬崟鍙�",
@@ -2329,12 +2663,35 @@
                 }
             }
         },
+        "request.OperationAllList": {
+            "type": "object",
+            "properties": {
+                "number": {
+                    "type": "string"
+                },
+                "page": {
+                    "description": "椤电爜",
+                    "type": "integer"
+                },
+                "pageSize": {
+                    "description": "姣忛〉澶у皬",
+                    "type": "integer"
+                },
+                "sourceNumber": {
+                    "type": "string"
+                }
+            }
+        },
         "request.OperationDetails": {
             "type": "object",
             "properties": {
                 "OperationId": {
                     "description": "鎿嶄綔id",
                     "type": "integer"
+                },
+                "amount": {
+                    "description": "鏁伴噺",
+                    "type": "number"
                 },
                 "productId": {
                     "description": "浜у搧id",
@@ -2344,11 +2701,64 @@
                     "description": "浜у搧鍚嶇О",
                     "type": "string"
                 },
-                "quantity": {
-                    "description": "鏁伴噺",
-                    "type": "number"
-                },
                 "unit": {
+                    "type": "string"
+                }
+            }
+        },
+        "request.OperationList": {
+            "type": "object",
+            "properties": {
+                "number": {
+                    "type": "string"
+                },
+                "operationTypeId": {
+                    "type": "integer"
+                },
+                "page": {
+                    "description": "椤电爜",
+                    "type": "integer"
+                },
+                "pageSize": {
+                    "description": "姣忛〉澶у皬",
+                    "type": "integer"
+                },
+                "sourceNumber": {
+                    "type": "string"
+                }
+            }
+        },
+        "request.QueryDisuseList": {
+            "type": "object",
+            "properties": {
+                "number": {
+                    "type": "string"
+                },
+                "page": {
+                    "description": "椤电爜",
+                    "type": "integer"
+                },
+                "pageSize": {
+                    "description": "姣忛〉澶у皬",
+                    "type": "integer"
+                },
+                "sourceNumber": {
+                    "type": "string"
+                }
+            }
+        },
+        "request.QueryOperationList": {
+            "type": "object",
+            "properties": {
+                "page": {
+                    "description": "椤电爜",
+                    "type": "integer"
+                },
+                "pageSize": {
+                    "description": "姣忛〉澶у皬",
+                    "type": "integer"
+                },
+                "productId": {
                     "type": "string"
                 }
             }
@@ -2385,6 +2795,44 @@
                 },
                 "remark": {
                     "description": "澶囨敞",
+                    "type": "string"
+                }
+            }
+        },
+        "request.UpdateDisuse": {
+            "type": "object",
+            "properties": {
+                "amount": {
+                    "type": "number"
+                },
+                "fromLocationId": {
+                    "type": "integer"
+                },
+                "id": {
+                    "type": "integer"
+                },
+                "number": {
+                    "type": "string"
+                },
+                "operationDate": {
+                    "type": "string"
+                },
+                "productId": {
+                    "type": "string"
+                },
+                "productName": {
+                    "type": "string"
+                },
+                "sourceNumber": {
+                    "type": "string"
+                },
+                "status": {
+                    "$ref": "#/definitions/constvar.OperationStatus"
+                },
+                "toLocationId": {
+                    "type": "integer"
+                },
+                "unit": {
                     "type": "string"
                 }
             }
@@ -2436,6 +2884,10 @@
                 "operationTypeId": {
                     "description": "浣滀笟绫诲瀷id",
                     "type": "integer"
+                },
+                "operationTypeName": {
+                    "description": "浣滀笟绫诲瀷鍚嶇О",
+                    "type": "string"
                 },
                 "sourceNumber": {
                     "description": "婧愬崟鍙�",
@@ -2573,8 +3025,6 @@
 	Description:      "",
 	InfoInstanceName: "swagger",
 	SwaggerTemplate:  docTemplate,
-	LeftDelim:        "{{",
-	RightDelim:       "}}",
 }
 
 func init() {

--
Gitblit v1.8.0