From a8914a16b23e93f6bfd12bcfd5cbe8b24cf7eb84 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期日, 07 四月 2024 21:49:01 +0800
Subject: [PATCH] 发货支持仓库传参

---
 docs/docs.go |  723 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 703 insertions(+), 20 deletions(-)

diff --git a/docs/docs.go b/docs/docs.go
index a25619b..07d8fc6 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -166,6 +166,112 @@
                 }
             }
         },
+        "/api-wms/v1/code/getAutoCode": {
+            "post": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "缂栫爜"
+                ],
+                "summary": "鑾峰彇鑷姩缂栫爜",
+                "parameters": [
+                    {
+                        "description": "鍙傛暟",
+                        "name": "object",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/code.CodeStandard"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "allOf": [
+                                {
+                                    "$ref": "#/definitions/util.ResponseList"
+                                },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "type": "object",
+                                            "additionalProperties": true
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                }
+            }
+        },
+        "/api-wms/v1/code/getCodeList": {
+            "get": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "缂栫爜"
+                ],
+                "summary": "鑾峰彇缂栫爜鍒楄〃",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "name": "codeStandID",
+                        "in": "query"
+                    },
+                    {
+                        "type": "string",
+                        "name": "name",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "椤电爜",
+                        "name": "page",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "姣忛〉澶у皬",
+                        "name": "pageSize",
+                        "in": "query"
+                    },
+                    {
+                        "type": "string",
+                        "name": "type",
+                        "in": "query"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "allOf": [
+                                {
+                                    "$ref": "#/definitions/util.ResponseList"
+                                },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "type": "array",
+                                            "items": {
+                                                "$ref": "#/definitions/code.CodeStandard"
+                                            }
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                }
+            }
+        },
         "/api-wms/v1/company/company": {
             "get": {
                 "produces": [
@@ -935,6 +1041,34 @@
                 }
             }
         },
+        "/api-wms/v1/operation/cancel/{id}": {
+            "put": {
+                "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/finish/{id}": {
             "put": {
                 "produces": [
@@ -953,6 +1087,25 @@
                         "required": true
                     }
                 ],
+                "responses": {
+                    "200": {
+                        "description": "鎴愬姛",
+                        "schema": {
+                            "$ref": "#/definitions/util.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/api-wms/v1/operation/getClientList": {
+            "get": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "鍏ュ簱/鍑哄簱"
+                ],
+                "summary": "鑾峰彇鐗╂祦鍏徃鍒楄〃",
                 "responses": {
                     "200": {
                         "description": "鎴愬姛",
@@ -997,6 +1150,53 @@
                 }
             }
         },
+        "/api-wms/v1/operation/getOperationInfo/{id}": {
+            "get": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "鍏ュ簱/鍑哄簱"
+                ],
+                "summary": "鍏ュ簱/鍑哄簱鍒楄〃",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "id",
+                        "name": "id",
+                        "in": "path",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "鎴愬姛",
+                        "schema": {
+                            "$ref": "#/definitions/util.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/api-wms/v1/operation/getSupplierList": {
+            "get": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "鍏ュ簱/鍑哄簱"
+                ],
+                "summary": "鑾峰彇鐗╂祦鍏徃鍒楄〃",
+                "responses": {
+                    "200": {
+                        "description": "鎴愬姛",
+                        "schema": {
+                            "$ref": "#/definitions/util.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/api-wms/v1/operation/list": {
             "post": {
                 "produces": [
@@ -1014,6 +1214,36 @@
                         "required": true,
                         "schema": {
                             "$ref": "#/definitions/request.OperationList"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "鎴愬姛",
+                        "schema": {
+                            "$ref": "#/definitions/util.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/api-wms/v1/operation/listByCondition": {
+            "post": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "鍏ュ簱/鍑哄簱"
+                ],
+                "summary": "鍑哄叆搴撴槑缁�",
+                "parameters": [
+                    {
+                        "description": "鍙傛暟",
+                        "name": "object",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/request.OperationCondition"
                         }
                     }
                 ],
@@ -1096,6 +1326,34 @@
                     "鍏ュ簱/鍑哄簱"
                 ],
                 "summary": "鍒犻櫎鍏ュ簱/鍑哄簱淇℃伅",
+                "parameters": [
+                    {
+                        "type": "integer",
+                        "description": "id",
+                        "name": "id",
+                        "in": "path",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "鎴愬姛",
+                        "schema": {
+                            "$ref": "#/definitions/util.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/api-wms/v1/operation/outputOperation/{id}": {
+            "put": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "鍏ュ簱/鍑哄簱"
+                ],
+                "summary": "鎵撳嵃",
                 "parameters": [
                     {
                         "type": "integer",
@@ -1390,6 +1648,34 @@
                 }
             }
         },
+        "/api-wms/v1/product/cancelDisuse/{id}": {
+            "put": {
+                "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/product/deleteProduct/{id}": {
             "delete": {
                 "produces": [
@@ -1635,6 +1921,72 @@
                                             "items": {
                                                 "$ref": "#/definitions/models.Material"
                                             }
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                }
+            }
+        },
+        "/api-wms/v1/product/getUnitInfo": {
+            "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.UnitDict"
+                                            }
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                }
+            }
+        },
+        "/api-wms/v1/product/getUserInfo": {
+            "get": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "浜у搧"
+                ],
+                "summary": "鑾峰彇鐧诲綍鐢ㄦ埛淇℃伅",
+                "responses": {
+                    "200": {
+                        "description": "鎴愬姛",
+                        "schema": {
+                            "allOf": [
+                                {
+                                    "$ref": "#/definitions/util.ResponseList"
+                                },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "type": "object",
+                                            "additionalProperties": true
                                         }
                                     }
                                 }
@@ -2005,6 +2357,36 @@
                 }
             }
         },
+        "/api-wms/v1/reorderRule/submitOrder": {
+            "post": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "閲嶈璐ц鍒�"
+                ],
+                "summary": "鍐嶈涓�娆�",
+                "parameters": [
+                    {
+                        "description": "鍙傛暟",
+                        "name": "object",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/models.ReorderRule"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "鎴愬姛",
+                        "schema": {
+                            "$ref": "#/definitions/util.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/api-wms/v1/reorderRule/updateReorderRule": {
             "post": {
                 "produces": [
@@ -2216,6 +2598,69 @@
         }
     },
     "definitions": {
+        "code.CodeAuto": {
+            "type": "object",
+            "properties": {
+                "AutoLength": {
+                    "type": "integer"
+                },
+                "Desc": {
+                    "type": "string"
+                },
+                "PrefixMethod": {
+                    "type": "integer"
+                },
+                "PrefixValue": {
+                    "type": "string"
+                },
+                "SuffixMethod": {
+                    "type": "integer"
+                }
+            }
+        },
+        "code.CodeRule": {
+            "type": "object",
+            "properties": {
+                "Desc": {
+                    "type": "string"
+                },
+                "Length": {
+                    "type": "integer"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            }
+        },
+        "code.CodeStandard": {
+            "type": "object",
+            "properties": {
+                "AutoRule": {
+                    "$ref": "#/definitions/code.CodeAuto"
+                },
+                "ID": {
+                    "type": "string"
+                },
+                "List": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/code.CodeRule"
+                    }
+                },
+                "Method": {
+                    "type": "integer"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Status": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            }
+        },
         "constvar.BaseOperationType": {
             "type": "integer",
             "enum": [
@@ -2369,12 +2814,26 @@
             "enum": [
                 "鍘熸潗鏂�",
                 "鍗婃垚鍝�",
-                "鎴愬搧"
+                "鎴愬搧",
+                "杈呮枡",
+                "鑰楁潗",
+                "鍏朵粬",
+                "铏氭嫙浠�"
             ],
+            "x-enum-comments": {
+                "MaterialModeAuxiliary": "杈呮枡",
+                "MaterialModeConsumables": "鑰楁潗",
+                "MaterialModeOther": "鍏朵粬",
+                "MaterialModeVirtual": "铏氭嫙浠�, 涓嶈兘閿�鍞紝涓嶈兘鍑哄叆搴擄紝涓嶈兘閲囪喘"
+            },
             "x-enum-varnames": [
                 "MaterialModeRaw",
                 "MaterialModeSemi",
-                "MaterialModeFinished"
+                "MaterialModeFinished",
+                "MaterialModeAuxiliary",
+                "MaterialModeConsumables",
+                "MaterialModeOther",
+                "MaterialModeVirtual"
             ]
         },
         "constvar.OperationStatus": {
@@ -2383,9 +2842,11 @@
                 1,
                 2,
                 3,
-                4
+                4,
+                5
             ],
             "x-enum-comments": {
+                "OperationStatus_Cancel": "鍙栨秷",
                 "OperationStatus_Draft": "鑽夌",
                 "OperationStatus_Finish": "瀹屾垚",
                 "OperationStatus_Ready": "灏辩华",
@@ -2395,7 +2856,8 @@
                 "OperationStatus_Draft",
                 "OperationStatus_Waiting",
                 "OperationStatus_Ready",
-                "OperationStatus_Finish"
+                "OperationStatus_Finish",
+                "OperationStatus_Cancel"
             ]
         },
         "constvar.OrderCreation": {
@@ -2435,6 +2897,24 @@
                 "Consumables",
                 "Server",
                 "StoredProduct"
+            ]
+        },
+        "constvar.PurchaseType": {
+            "type": "integer",
+            "enum": [
+                1,
+                2,
+                3
+            ],
+            "x-enum-comments": {
+                "PurchaseTypeEntrust": "濮斿",
+                "PurchaseTypeOutSource": "閲囪喘",
+                "PurchaseTypeSelf": "鑷埗"
+            },
+            "x-enum-varnames": [
+                "PurchaseTypeOutSource",
+                "PurchaseTypeSelf",
+                "PurchaseTypeEntrust"
             ]
         },
         "constvar.ReservationMethod": {
@@ -2679,6 +3159,7 @@
                     "type": "number"
                 },
                 "attachmentIDs": {
+                    "description": "浠ヤ笅涓轰笉瀛樺簱鐨勫瓧娈�",
                     "type": "array",
                     "items": {
                         "type": "integer"
@@ -2689,6 +3170,9 @@
                     "items": {
                         "$ref": "#/definitions/models.Attachment"
                     }
+                },
+                "autoIncr": {
+                    "type": "integer"
                 },
                 "barcode": {
                     "description": "鏉$爜",
@@ -2708,6 +3192,10 @@
                 },
                 "categoryName": {
                     "description": "浜у搧绫诲埆鍚嶇О",
+                    "type": "string"
+                },
+                "codeStandardID": {
+                    "description": "Explain           string                  ` + "`" + `gorm:\"type:varchar(512);comment:缂栧彿璇存槑\" json:\"explain\"` + "`" + `",
                     "type": "string"
                 },
                 "companyId": {
@@ -2749,6 +3237,9 @@
                     "description": "HSCode                  string                     ` + "`" + `gorm:\"type:varchar(255);comment:HS缂栫爜\" json:\"HSCode\"` + "`" + `                    //HS缂栫爜\nOriginCountryId         int                        ` + "`" + `gorm:\"type:int(11);comment:鍘熶骇鍦癷d\" json:\"originCountryId\"` + "`" + `               //鍘熶骇鍦癷d\nOriginCountryName       string                     ` + "`" + `gorm:\"type:varchar(255);comment:鍘熶骇鍦板悕绉癨" json:\"originCountryName\"` + "`" + `        //鍘熶骇鍦板悕绉�",
                     "type": "string"
                 },
+                "inputAmount": {
+                    "type": "number"
+                },
                 "internalNotes": {
                     "description": "鍐呴儴璇存槑",
                     "type": "string"
@@ -2770,8 +3261,16 @@
                     ]
                 },
                 "isSale": {
-                    "description": "PurchaseType      constvar.PurchaseType ` + "`" + `gorm:\"type:int(11);comment:閲囪喘绫诲瀷\" json:\"purchaseType\"` + "`" + `",
+                    "description": "鏄惁閿�鍞�",
                     "type": "boolean"
+                },
+                "isStorage": {
+                    "description": "鏃犲簱瀛樼殑鍦╳ms浠ュ強srm涓渶瑕佽繃婊ゆ帀",
+                    "type": "integer"
+                },
+                "isVirtual": {
+                    "description": "铏氭嫙鐗╂枡鍦∕RP璁$畻鏃惰烦杩囪灞傜骇鐩存帴棰嗙敤涓嬬骇鐗╂枡锛岃櫄鎷熺墿鏂欎笉鐢熸垚宸ュ崟",
+                    "type": "integer"
                 },
                 "makeAdvanceTime": {
                     "description": "鍒堕�犲墠缃椂闂�(澶�)",
@@ -2781,8 +3280,16 @@
                     "description": "鏈�澶у簱瀛�",
                     "type": "number"
                 },
+                "maxInventoryRule": {
+                    "description": "鏈�澶у簱瀛�",
+                    "type": "number"
+                },
                 "minInventory": {
-                    "description": "Explain           string                  ` + "`" + `gorm:\"type:varchar(512);comment:缂栧彿璇存槑\" json:\"explain\"` + "`" + `\nCodeStandardID    string                  ` + "`" + `gorm:\"type:varchar(191);comment:缂栫爜瑙勮寖ID\" json:\"codeStandardID\"` + "`" + `\nSpecs             string                  ` + "`" + `gorm:\"type:varchar(191);comment:鐗╂枡瑙勬牸\" json:\"specs\"` + "`" + `\nType              string                  ` + "`" + `gorm:\"type:varchar(191);comment:鐗╂枡鍨嬪彿\" json:\"type\"` + "`" + `",
+                    "description": "鏈�灏忓簱瀛�",
+                    "type": "number"
+                },
+                "minInventoryRule": {
+                    "description": "鏈�灏忓簱瀛�",
                     "type": "number"
                 },
                 "minPurchaseAmount": {
@@ -2801,6 +3308,9 @@
                     "description": "鐗╂枡鍚嶇О",
                     "type": "string"
                 },
+                "note": {
+                    "type": "string"
+                },
                 "orderAdvanceTime": {
                     "description": "璁㈠崟鍑嗗澶╂暟(澶�)",
                     "type": "number"
@@ -2816,6 +3326,12 @@
                 "outStorageExplain": {
                     "description": "鍑哄簱璇存槑",
                     "type": "string"
+                },
+                "outputAmount": {
+                    "type": "number"
+                },
+                "predictionAmount": {
+                    "type": "number"
                 },
                 "principal": {
                     "description": "璐熻矗浜�",
@@ -2841,6 +3357,18 @@
                     "description": "閲囪喘浠锋牸",
                     "type": "number"
                 },
+                "purchaseType": {
+                    "$ref": "#/definitions/constvar.PurchaseType"
+                },
+                "purchaseTypeList": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                },
+                "reorderRuleNum": {
+                    "type": "integer"
+                },
                 "salePrice": {
                     "description": "閿�鍞崟浠�",
                     "type": "number"
@@ -2853,12 +3381,18 @@
                     "description": "閿�鍞鏄�",
                     "type": "string"
                 },
+                "specs": {
+                    "type": "string"
+                },
                 "supplier": {
                     "description": "FSource           string                  ` + "`" + `gorm:\"type:varchar(191);comment:鐢熶骇杞﹂棿\" json:\"-\"` + "`" + `\nStatus            constvar.MaterialStatus ` + "`" + `gorm:\"type:int(11);comment:鐘舵�乗" json:\"status\"` + "`" + `",
                     "type": "string"
                 },
                 "templateID": {
-                    "description": "Note              string                  ` + "`" + `gorm:\"type:varchar(1024);comment:澶囨敞\" json:\"note\"` + "`" + `",
+                    "description": "妯℃澘ID",
+                    "type": "string"
+                },
+                "type": {
                     "type": "string"
                 },
                 "unit": {
@@ -2878,6 +3412,9 @@
         "models.Operation": {
             "type": "object",
             "properties": {
+                "auditDate": {
+                    "type": "string"
+                },
                 "baseOperationType": {
                     "description": "鍩虹浣滀笟绫诲瀷",
                     "allOf": [
@@ -2910,7 +3447,10 @@
                         "$ref": "#/definitions/models.OperationDetails"
                     }
                 },
-                "fromLocation": {
+                "id": {
+                    "type": "integer"
+                },
+                "location": {
                     "description": "婧愪綅缃�",
                     "allOf": [
                         {
@@ -2918,11 +3458,8 @@
                         }
                     ]
                 },
-                "fromLocationId": {
+                "locationID": {
                     "description": "婧愪綅缃甶d",
-                    "type": "integer"
-                },
-                "id": {
                     "type": "integer"
                 },
                 "logisticCompany": {
@@ -2940,6 +3477,7 @@
                     "type": "string"
                 },
                 "operationDate": {
+                    "description": "FromLocationID    int                      ` + "`" + `json:\"fromLocationId\"   gorm:\"type:int;not null;comment:婧愪綅缃甶d\"` + "`" + `         //婧愪綅缃甶d\nFromLocation      Location                 ` + "`" + `json:\"fromLocation\"     gorm:\"foreignKey:FromLocationID;references:Id\"` + "`" + ` //婧愪綅缃甛nToLocationID      int                      ` + "`" + `json:\"toLocationId\"    gorm:\"type:int;not null;comment:鐩爣浣嶇疆id\"` + "`" + `         //鐩爣浣嶇疆id\nToLocation        Location                 ` + "`" + `json:\"toLocation\"      gorm:\"foreignKey:ToLocationID;references:Id\"` + "`" + `    //鐩爣浣嶇疆",
                     "type": "string"
                 },
                 "operationTypeId": {
@@ -2948,6 +3486,18 @@
                 },
                 "operationTypeName": {
                     "description": "浣滀笟绫诲瀷鍚嶇О",
+                    "type": "string"
+                },
+                "receiverAddr": {
+                    "type": "string"
+                },
+                "receiverName": {
+                    "type": "string"
+                },
+                "receiverPhone": {
+                    "type": "string"
+                },
+                "source": {
                     "type": "string"
                 },
                 "sourceNumber": {
@@ -2997,6 +3547,18 @@
                 "createTime": {
                     "type": "string"
                 },
+                "fromLocation": {
+                    "description": "婧愪綅缃�",
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.Location"
+                        }
+                    ]
+                },
+                "fromLocationId": {
+                    "description": "婧愪綅缃甶d",
+                    "type": "integer"
+                },
                 "id": {
                     "type": "integer"
                 },
@@ -3016,6 +3578,18 @@
                     "description": "浜у搧id",
                     "type": "string"
                 },
+                "toLocation": {
+                    "description": "鐩爣浣嶇疆",
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.Location"
+                        }
+                    ]
+                },
+                "toLocationId": {
+                    "description": "鐩爣浣嶇疆id",
+                    "type": "integer"
+                },
                 "updateTime": {
                     "type": "string"
                 }
@@ -3031,6 +3605,9 @@
                             "$ref": "#/definitions/constvar.CostingMethod"
                         }
                     ]
+                },
+                "createTime": {
+                    "type": "string"
                 },
                 "forceRemovalStrategy": {
                     "description": "寮哄埗涓嬫灦绛栫暐",
@@ -3065,6 +3642,9 @@
                 },
                 "routeName": {
                     "description": "鍏徃",
+                    "type": "string"
+                },
+                "updateTime": {
                     "type": "string"
                 }
             }
@@ -3116,11 +3696,29 @@
                     "description": "璺嚎",
                     "type": "string"
                 },
+                "supplierId": {
+                    "description": "渚涘簲鍟唅d",
+                    "type": "integer"
+                },
                 "unit": {
                     "description": "鍗曚綅",
                     "type": "string"
                 },
                 "updateTime": {
+                    "type": "string"
+                }
+            }
+        },
+        "models.UnitDict": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "isDefault": {
+                    "type": "boolean"
+                },
+                "name": {
                     "type": "string"
                 }
             }
@@ -3154,6 +3752,10 @@
                 },
                 "companyId": {
                     "type": "integer"
+                },
+                "contacts": {
+                    "description": "鑱旂郴浜�",
+                    "type": "string"
                 },
                 "createTime": {
                     "type": "string"
@@ -3244,6 +3846,10 @@
                 "fromLocationId": {
                     "type": "integer"
                 },
+                "number": {
+                    "description": "Unit           string          ` + "`" + `json:\"unit\"` + "`" + `",
+                    "type": "string"
+                },
                 "productId": {
                     "type": "string"
                 },
@@ -3313,11 +3919,11 @@
                         "$ref": "#/definitions/request.OperationDetails"
                     }
                 },
-                "fromLocationId": {
-                    "description": "婧愪綅缃甶d",
+                "id": {
                     "type": "integer"
                 },
-                "id": {
+                "locationId": {
+                    "description": "婧愪綅缃甶d",
                     "type": "integer"
                 },
                 "logisticCompanyId": {
@@ -3332,7 +3938,7 @@
                     "type": "string"
                 },
                 "operationDate": {
-                    "description": "瀹夋帓鏃ユ湡",
+                    "description": "FromLocationId    int                      ` + "`" + `json:\"fromLocationId\"   gorm:\"type:int;not null;comment:婧愪綅缃甶d\"` + "`" + `   //婧愪綅缃甶d\nToLocationId      int                      ` + "`" + `json:\"toLocationId\"    gorm:\"type:int;not null;comment:鐩爣浣嶇疆id\"` + "`" + `   //鐩爣浣嶇疆id",
                     "type": "string"
                 },
                 "operationTypeId": {
@@ -3341,6 +3947,15 @@
                 },
                 "operationTypeName": {
                     "description": "浣滀笟绫诲瀷鍚嶇О",
+                    "type": "string"
+                },
+                "receiverAddr": {
+                    "type": "string"
+                },
+                "receiverName": {
+                    "type": "string"
+                },
+                "receiverPhone": {
                     "type": "string"
                 },
                 "sourceNumber": {
@@ -3468,6 +4083,10 @@
                     "type": "string",
                     "maxLength": 5,
                     "minLength": 1
+                },
+                "contacts": {
+                    "description": "鑱旂郴浜�",
+                    "type": "string"
                 },
                 "inboundTransportation": {
                     "description": "鍏ュ悜杩愯緭",
@@ -3597,6 +4216,9 @@
                 "keyWord": {
                     "type": "string"
                 },
+                "locationId": {
+                    "type": "integer"
+                },
                 "page": {
                     "description": "椤电爜",
                     "type": "integer"
@@ -3616,6 +4238,10 @@
         "request.GetLocationList": {
             "type": "object",
             "properties": {
+                "isScrapLocation": {
+                    "description": "鏄惁鎶ュ簾",
+                    "type": "boolean"
+                },
                 "jointName": {
                     "description": "鎷兼帴鍚嶇О",
                     "type": "string"
@@ -3713,6 +4339,22 @@
                 }
             }
         },
+        "request.OperationCondition": {
+            "type": "object",
+            "properties": {
+                "condition": {
+                    "type": "string"
+                },
+                "page": {
+                    "description": "椤电爜",
+                    "type": "integer"
+                },
+                "pageSize": {
+                    "description": "姣忛〉澶у皬",
+                    "type": "integer"
+                }
+            }
+        },
         "request.OperationDetails": {
             "type": "object",
             "properties": {
@@ -3724,9 +4366,17 @@
                     "description": "ProductName string          ` + "`" + `json:\"productName\" gorm:\"type:varchar(255);not null;comment:浜у搧鍚嶇О\"` + "`" + ` //浜у搧鍚嶇О",
                     "type": "number"
                 },
+                "fromLocationId": {
+                    "description": "Unit        string          ` + "`" + `json:\"unit\" gorm:\"type:varchar(31);comment:鍗曚綅\"` + "`" + `                    //鍗曚綅\nProduct models.Material ` + "`" + `json:\"product\" gorm:\"foreignKey:ProductId;references:ID\"` + "`" + `",
+                    "type": "integer"
+                },
                 "productId": {
                     "description": "浜у搧id",
                     "type": "string"
+                },
+                "toLocationId": {
+                    "description": "鐩爣浣嶇疆id",
+                    "type": "integer"
                 }
             }
         },
@@ -3989,11 +4639,11 @@
                         "$ref": "#/definitions/request.OperationDetails"
                     }
                 },
-                "fromLocationId": {
-                    "description": "婧愪綅缃甶d",
+                "id": {
                     "type": "integer"
                 },
-                "id": {
+                "locationId": {
+                    "description": "婧愪綅缃甶d",
                     "type": "integer"
                 },
                 "logisticCompanyId": {
@@ -4008,7 +4658,7 @@
                     "type": "string"
                 },
                 "operationDate": {
-                    "description": "瀹夋帓鏃ユ湡",
+                    "description": "FromLocationId    int                        ` + "`" + `json:\"fromLocationId\"   gorm:\"type:int;not null;comment:婧愪綅缃甶d\"` + "`" + `   //婧愪綅缃甶d\nToLocationId      int                        ` + "`" + `json:\"toLocationId\"    gorm:\"type:int;not null;comment:鐩爣浣嶇疆id\"` + "`" + `   //鐩爣浣嶇疆id",
                     "type": "string"
                 },
                 "operationTypeId": {
@@ -4017,6 +4667,15 @@
                 },
                 "operationTypeName": {
                     "description": "浣滀笟绫诲瀷鍚嶇О",
+                    "type": "string"
+                },
+                "receiverAddr": {
+                    "type": "string"
+                },
+                "receiverName": {
+                    "type": "string"
+                },
+                "receiverPhone": {
                     "type": "string"
                 },
                 "sourceNumber": {
@@ -4193,8 +4852,21 @@
                     "description": "婧愪綅缃�",
                     "type": "string"
                 },
+                "fromLocationId": {
+                    "type": "integer"
+                },
                 "number": {
                     "description": "鍗曞彿",
+                    "type": "string"
+                },
+                "operationId": {
+                    "type": "integer"
+                },
+                "operationTypeName": {
+                    "description": "浣滀笟绫诲瀷鍚嶇О",
+                    "type": "string"
+                },
+                "productId": {
                     "type": "string"
                 },
                 "productName": {
@@ -4209,9 +4881,16 @@
                     "description": "鐩爣浣嶇疆",
                     "type": "string"
                 },
+                "toLocationId": {
+                    "type": "integer"
+                },
                 "unit": {
                     "description": "鍗曚綅",
                     "type": "string"
+                },
+                "weight": {
+                    "description": "閲嶉噺",
+                    "type": "number"
                 }
             }
         },
@@ -4222,6 +4901,10 @@
                     "description": "鏁伴噺",
                     "type": "number"
                 },
+                "locationId": {
+                    "description": "浣嶇疆id",
+                    "type": "integer"
+                },
                 "locationName": {
                     "description": "浣嶇疆鍚嶇О",
                     "type": "string"

--
Gitblit v1.8.0