Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS

zhansan

2023-09-18 edf6810f2ff9ac32230f58f62a753454b8e24269

 docs/docs.go

@@ -294,7 +294,112 @@
                }
            }
        },
        "/api-wms/v1/warehouse/jobType": {
        "/api-wms/v1/operation/operation": {
            "post": {
                "produces": [
                    "application/json"
                ],
                "tags": [
                    "入库/出库"
                ],
                "summary": "添加入库/出库",
                "parameters": [
                    {
                        "description": "入库/出库信息",
                        "name": "object",
                        "in": "body",
                        "required": true,
                        "schema": {
                            "$ref": "#/definitions/request.AddOperation"
                        }
                    }
                ],
                "responses": {
                    "200": {
                        "description": "成功",
                        "schema": {
                            "$ref": "#/definitions/util.Response"
                        }
                    }
                }
            }
        },
        "/api-wms/v1/product/addProduct": {
            "post": {
                "produces": [
                    "application/json"
                ],
                "tags": [
                    "产品"
                ],
                "summary": "添加产品",
                "parameters": [
                    {
                        "description": "产品信息",
                        "name": "object",
                        "in": "body",
                        "required": true,
                        "schema": {
                            "$ref": "#/definitions/models.Product"
                        }
                    }
                ],
                "responses": {
                    "200": {
                        "description": "成功",
                        "schema": {
                            "$ref": "#/definitions/util.Response"
                        }
                    }
                }
            }
        },
        "/api-wms/v1/product/getProductList": {
            "post": {
                "produces": [
                    "application/json"
                ],
                "tags": [
                    "产品"
                ],
                "summary": "获取产品详情",
                "parameters": [
                    {
                        "description": "查询参数",
                        "name": "object",
                        "in": "body",
                        "required": true,
                        "schema": {
                            "$ref": "#/definitions/request.GetProductList"
                        }
                    }
                ],
                "responses": {
                    "200": {
                        "description": "成功",
                        "schema": {
                            "allOf": [
                                {
                                    "$ref": "#/definitions/util.ResponseList"
                                },
                                {
                                    "type": "object",
                                    "properties": {
                                        "data": {
                                            "type": "array",
                                            "items": {
                                                "$ref": "#/definitions/models.Product"
                                            }
                                        }
                                    }
                                }
                            ]
                        }
                    }
                }
            }
        },
        "/api-wms/v1/warehouse/operationType": {
            "get": {
                "produces": [
                    "application/json"
@@ -336,7 +441,7 @@
                                        "data": {
                                            "type": "array",
                                            "items": {
                                                "$ref": "#/definitions/models.JobType"
                                                "$ref": "#/definitions/models.OperationType"
                                            }
                                        }
                                    }
@@ -361,7 +466,7 @@
                        "in": "body",
                        "required": true,
                        "schema": {
                            "$ref": "#/definitions/request.AddJobType"
                            "$ref": "#/definitions/request.AddOperationType"
                        }
                    }
                ],
@@ -375,7 +480,7 @@
                }
            }
        },
        "/api-wms/v1/warehouse/jobType/{id}": {
        "/api-wms/v1/warehouse/operationType/{id}": {
            "put": {
                "produces": [
                    "application/json"
@@ -391,7 +496,7 @@
                        "in": "body",
                        "required": true,
                        "schema": {
                            "$ref": "#/definitions/request.UpdateJobType"
                            "$ref": "#/definitions/request.UpdateOperationType"
                        }
                    },
                    {
@@ -584,7 +689,7 @@
        }
    },
    "definitions": {
        "constvar.BaseJobType": {
        "constvar.BaseOperationType": {
            "type": "integer",
            "enum": [
                1,
@@ -592,14 +697,128 @@
                3
            ],
            "x-enum-comments": {
                "BaseJobTypeIncoming": "收货",
                "BaseJobTypeInternal": "内部调拨",
                "BaseJobTypeOutgoing": "交货"
                "BaseOperationTypeIncoming": "收货",
                "BaseOperationTypeInternal": "内部调拨",
                "BaseOperationTypeOutgoing": "交货"
            },
            "x-enum-varnames": [
                "BaseJobTypeIncoming",
                "BaseJobTypeOutgoing",
                "BaseJobTypeInternal"
                "BaseOperationTypeIncoming",
                "BaseOperationTypeOutgoing",
                "BaseOperationTypeInternal"
            ]
        },
        "constvar.InvoicingStrategy": {
            "type": "integer",
            "enum": [
                1,
                2,
                3,
                4,
                5
            ],
            "x-enum-comments": {
                "BasedDeliverNumber": "基于交付数量",
                "DeliverNumber": "交付数量",
                "IndentNumber": "订购数量",
                "Milestones": "基于里程碑",
                "PrepaidPrice": "预付\\固定价格"
            },
            "x-enum-varnames": [
                "IndentNumber",
                "DeliverNumber",
                "PrepaidPrice",
                "Milestones",
                "BasedDeliverNumber"
            ]
        },
        "constvar.LocationType": {
            "type": "integer",
            "enum": [
                1,
                2,
                3,
                4,
                5,
                6,
                7
            ],
            "x-enum-comments": {
                "LocationTypeCustomer": "客户位置",
                "LocationTypeInternal": "内部位置",
                "LocationTypeInventoryLoss": "库存损失",
                "LocationTypeProduction": "生产",
                "LocationTypeTransit": "中转位置",
                "LocationTypeVendor": "供应商位置",
                "LocationTypeView": "视图"
            },
            "x-enum-varnames": [
                "LocationTypeVendor",
                "LocationTypeView",
                "LocationTypeInternal",
                "LocationTypeCustomer",
                "LocationTypeInventoryLoss",
                "LocationTypeProduction",
                "LocationTypeTransit"
            ]
        },
        "constvar.OperationStatus": {
            "type": "integer",
            "enum": [
                1,
                2,
                3,
                4
            ],
            "x-enum-comments": {
                "OperationStatus_Draft": "草稿",
                "OperationStatus_Finish": "完成",
                "OperationStatus_Ready": "就绪",
                "OperationStatus_Waiting": "正在等待"
            },
            "x-enum-varnames": [
                "OperationStatus_Draft",
                "OperationStatus_Waiting",
                "OperationStatus_Ready",
                "OperationStatus_Finish"
            ]
        },
        "constvar.OrderCreation": {
            "type": "integer",
            "enum": [
                1,
                2,
                3,
                4
            ],
            "x-enum-comments": {
                "Nothing": "不操作",
                "Object": "项目",
                "Task": "任务",
                "TaskAndObject": "任务和项目"
            },
            "x-enum-varnames": [
                "Nothing",
                "Task",
                "Object",
                "TaskAndObject"
            ]
        },
        "constvar.ProductType": {
            "type": "integer",
            "enum": [
                1,
                2,
                3
            ],
            "x-enum-comments": {
                "Consumables": "消耗品",
                "Server": "服务",
                "StoredProduct": "可储存的产品"
            },
            "x-enum-varnames": [
                "Consumables",
                "Server",
                "StoredProduct"
            ]
        },
        "constvar.ReservationMethod": {
@@ -694,18 +913,76 @@
                }
            }
        },
        "models.JobType": {
        "models.Location": {
            "type": "object",
            "properties": {
                "company": {
                    "description": "公司",
                    "allOf": [
                        {
                            "$ref": "#/definitions/models.Company"
                        }
                    ]
                },
                "companyId": {
                    "description": "公司id",
                    "type": "integer"
                },
                "countFrequency": {
                    "description": "盘点频率（天）",
                    "type": "integer"
                },
                "createTime": {
                    "type": "string"
                },
                "id": {
                    "type": "integer"
                },
                "isReturnLocation": {
                    "description": "是否退货位置",
                    "type": "boolean"
                },
                "isScrapLocation": {
                    "description": "是否报废位置",
                    "type": "boolean"
                },
                "name": {
                    "description": "位置名称",
                    "type": "string"
                },
                "parentId": {
                    "description": "上级id",
                    "type": "integer"
                },
                "replenishLocation": {
                    "description": "是否补充位置",
                    "type": "boolean"
                },
                "type": {
                    "description": "位置类型",
                    "allOf": [
                        {
                            "$ref": "#/definitions/constvar.LocationType"
                        }
                    ]
                },
                "updateTime": {
                    "type": "string"
                }
            }
        },
        "models.OperationType": {
            "type": "object",
            "properties": {
                "ReservationDaysBeforePriority": {
                    "description": "在优先级的前几天",
                    "type": "integer"
                },
                "baseJobType": {
                "baseOperationType": {
                    "description": "基础作业类型",
                    "allOf": [
                        {
                            "$ref": "#/definitions/constvar.BaseJobType"
                            "$ref": "#/definitions/constvar.BaseOperationType"
                        }
                    ]
                },
@@ -779,11 +1056,11 @@
                        }
                    ]
                },
                "returnJobType": {
                "returnOperationType": {
                    "description": "退货类型名称",
                    "type": "string"
                },
                "returnJobTypeID": {
                "returnOperationTypeID": {
                    "description": "退货类型ID",
                    "type": "integer"
                },
@@ -808,21 +1085,150 @@
                }
            }
        },
        "models.Location": {
        "models.Product": {
            "type": "object",
            "properties": {
                "HSCode": {
                    "type": "string"
                },
                "barcode": {
                    "description": "条码",
                    "type": "string"
                },
                "buyExplain": {
                    "type": "string"
                },
                "canBePurchased": {
                    "description": "是否可采购",
                    "type": "boolean"
                },
                "canBeSell": {
                    "description": "是否销售",
                    "type": "boolean"
                },
                "categoryId": {
                    "description": "产品分类id",
                    "type": "integer"
                },
                "companyId": {
                    "type": "integer"
                },
                "companyName": {
                    "type": "string"
                },
                "controlStrategy": {
                    "$ref": "#/definitions/constvar.InvoicingStrategy"
                },
                "cost": {
                    "description": "成本",
                    "type": "number"
                },
                "createTime": {
                    "type": "string"
                },
                "currencyId": {
                    "type": "integer"
                },
                "currencyName": {
                    "type": "string"
                },
                "customerAdvanceTime": {
                    "type": "number"
                },
                "customerTaxes": {
                    "description": "客户税百分比",
                    "type": "number"
                },
                "deliveryAdvanceTime": {
                    "type": "number"
                },
                "id": {
                    "type": "integer"
                },
                "name": {
                    "description": "位置名称",
                "inStorageExplain": {
                    "type": "string"
                },
                "internalNotes": {
                    "description": "内部说明",
                    "type": "string"
                },
                "internalReference": {
                    "description": "内部参考",
                    "type": "string"
                },
                "internalTransferExplain": {
                    "type": "string"
                },
                "invoicingStrategy": {
                    "$ref": "#/definitions/constvar.InvoicingStrategy"
                },
                "name": {
                    "description": "产品名称",
                    "type": "string"
                },
                "objectTemplateId": {
                    "type": "string"
                },
                "orderCreation": {
                    "$ref": "#/definitions/constvar.OrderCreation"
                },
                "originCountryId": {
                    "type": "integer"
                },
                "originCountryName": {
                    "type": "string"
                },
                "outStorageExplain": {
                    "type": "string"
                },
                "price": {
                    "type": "number"
                },
                "principal": {
                    "description": "负责人",
                    "type": "string"
                },
                "productTagId": {
                    "description": "产品标签",
                    "type": "integer"
                },
                "productTagName": {
                    "type": "string"
                },
                "salePrice": {
                    "description": "销售价格",
                    "type": "number"
                },
                "selectProduct": {
                    "type": "integer"
                },
                "sellExplain": {
                    "type": "string"
                },
                "supplierId": {
                    "type": "integer"
                },
                "supplierName": {
                    "type": "string"
                },
                "type": {
                    "description": "产品类型",
                    "allOf": [
                        {
                            "$ref": "#/definitions/constvar.ProductType"
                        }
                    ]
                },
                "updateTime": {
                    "type": "string"
                },
                "volume": {
                    "description": "体积",
                    "type": "number"
                },
                "weight": {
                    "description": "重量",
                    "type": "number"
                }
            }
        },
@@ -915,18 +1321,63 @@
                }
            }
        },
        "request.AddJobType": {
        "request.AddOperation": {
            "type": "object",
            "properties": {
                "details": {
                    "type": "array",
                    "items": {
                        "$ref": "#/definitions/request.OperationDetails"
                    }
                },
                "fromLocationId": {
                    "description": "源位置id",
                    "type": "integer"
                },
                "id": {
                    "type": "integer"
                },
                "number": {
                    "description": "单号",
                    "type": "string"
                },
                "operationDate": {
                    "$ref": "#/definitions/util.JSONTime"
                },
                "operationTypeId": {
                    "description": "作业类型id",
                    "type": "integer"
                },
                "sourceNumber": {
                    "description": "源单号",
                    "type": "string"
                },
                "status": {
                    "description": "状态",
                    "allOf": [
                        {
                            "$ref": "#/definitions/constvar.OperationStatus"
                        }
                    ]
                },
                "toLocationId": {
                    "description": "目标位置id",
                    "type": "integer"
                }
            }
        },
        "request.AddOperationType": {
            "type": "object",
            "properties": {
                "ReservationDaysBeforePriority": {
                    "description": "在优先级的前几天",
                    "type": "integer"
                },
                "baseJobType": {
                "baseOperationType": {
                    "description": "基础作业类型",
                    "allOf": [
                        {
                            "$ref": "#/definitions/constvar.BaseJobType"
                            "$ref": "#/definitions/constvar.BaseOperationType"
                        }
                    ]
                },
@@ -973,7 +1424,7 @@
                        }
                    ]
                },
                "returnJobTypeID": {
                "returnOperationTypeID": {
                    "description": "退货类型ID",
                    "type": "integer"
                },
@@ -1024,6 +1475,43 @@
                }
            }
        },
        "request.GetProductList": {
            "type": "object",
            "properties": {
                "keyWord": {
                    "type": "string"
                },
                "page": {
                    "description": "页码",
                    "type": "integer"
                },
                "pageSize": {
                    "description": "每页大小",
                    "type": "integer"
                }
            }
        },
        "request.OperationDetails": {
            "type": "object",
            "properties": {
                "finishQuantity": {
                    "description": "完成数量",
                    "type": "number"
                },
                "productId": {
                    "description": "产品id",
                    "type": "integer"
                },
                "productName": {
                    "description": "产品名称",
                    "type": "string"
                },
                "quantity": {
                    "description": "数量",
                    "type": "number"
                }
            }
        },
        "request.UpdateCompany": {
            "type": "object",
            "properties": {
@@ -1060,18 +1548,18 @@
                }
            }
        },
        "request.UpdateJobType": {
        "request.UpdateOperationType": {
            "type": "object",
            "properties": {
                "ReservationDaysBeforePriority": {
                    "description": "在优先级的前几天",
                    "type": "integer"
                },
                "baseJobType": {
                "baseOperationType": {
                    "description": "基础作业类型",
                    "allOf": [
                        {
                            "$ref": "#/definitions/constvar.BaseJobType"
                            "$ref": "#/definitions/constvar.BaseOperationType"
                        }
                    ]
                },
@@ -1118,7 +1606,7 @@
                        }
                    ]
                },
                "returnJobTypeID": {
                "returnOperationTypeID": {
                    "description": "退货类型ID",
                    "type": "integer"
                },
@@ -1172,6 +1660,14 @@
                }
            }
        },
        "util.JSONTime": {
            "type": "object",
            "properties": {
                "time.Time": {
                    "type": "string"
                }
            }
        },
        "util.Response": {
            "type": "object",
            "properties": {