aps/WMS.git - Gitblit

parent: 137441e2 | 补丁 | 提交 | ignore whitespace

Merge remote-tracking branch 'origin/jialian' into jialian

yinbentan

2024-07-16 33cb0eb308c1b62e25211600383371c31907025e

Merge remote-tracking branch 'origin/jialian' into jialian

# Conflicts:
#	docs/docs.go
#	docs/swagger.json
#	docs/swagger.yaml

1个文件已添加

4个文件已修改

	controllers/other.go	188 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	docs/docs.go	439 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	docs/swagger.json	439 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	docs/swagger.yaml	321 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	router/router.go	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 controllers/other.go

New file
@@ -0,0 +1,188 @@
package controllers

import (
    "fmt"
    "github.com/gin-gonic/gin"
    "github.com/xuri/excelize/v2"
    "gorm.io/gorm"
    "strings"
    "wms/constvar"
    "wms/extend/code"
    "wms/extend/util"
    "wms/models"
    "wms/pkg/logx"
    "wms/utils/upload"
)

type OtherController struct{}

type saveProductImagesFromExcelRequest struct {
    ExcelFilePath        string `json:"excelFilePath"`        //excel路径 用docker cp传到容器里
    SheetIndex           int    `json:"sheetIndex"`           //第几个sheet
    ProductIdColumnIndex int    `json:"productIdColumnIndex"` //产品ID是第几列(从0开始)
    ImageColumn          string `json:"imageColumn"`          //图片所在列名
}

// SaveProductImagesFromExcel
// @Tags      其他
// @Summary   从excel中获取产品图片并保存
// @Produce   application/json
// @Param     object  body  saveProductImagesFromExcelRequest true  "属性信息"
// @Param     Authorization    header string true "token"
// @Success   200 {object} util.Response "成功"
// @Router    /api-wms/v1/other/saveProductImagesFromExcel [post]
func (slf OtherController) SaveProductImagesFromExcel(c *gin.Context) {
    var params saveProductImagesFromExcelRequest
    if err := c.BindJSON(&params); err != nil {
        util.ResponseFormat(c, code.RequestParamError, "参数解析失败，数据类型错误:"+err.Error())
        return
    }
    if params.ExcelFilePath == "" || params.ImageColumn == "" {
        util.ResponseFormat(c, code.RequestParamError, "参数缺失")
        return
    }

    productImageMap, err := UploadProductImagesFromExcel(params.ExcelFilePath, params.SheetIndex, params.ProductIdColumnIndex, params.ImageColumn)
    if err != nil {
        logx.Errorf("SaveProductImagesFromExcel err:%v", err)
        util.ResponseFormat(c, code.SaveFail, "操作失败")
        return
    }

    for productId, urls := range productImageMap {
        if len(urls) == 0 {
            continue
        }
        attachmentList := make([]*models.Attachment, 0)
        materialAttachmentList := make([]*models.MaterialAttachment, 0)
        for _, url := range urls {
            attachmentList = append(attachmentList, &models.Attachment{
                FileUrl:  url,
                FileType: constvar.FileType_Picture,
            })
        }

        err = models.WithTransaction(func(db *gorm.DB) error {
            //保存附件
            if attachmentList, err = models.NewAttachmentSearch().CreateBatchWithResp(attachmentList); err != nil {
                logx.Errorf("attachment create err: %v", err)
                return err
            }

            //保存物料和附件映射
            for _, v := range attachmentList {
                ma := &models.MaterialAttachment{MaterialID: productId, AttachmentID: v.Id}
                materialAttachmentList = append(materialAttachmentList, ma)
            }
            if err := models.NewMaterialAttachmentSearch().SetOrm(db).CreateBatch(materialAttachmentList); err != nil {
                return err
            }
            return nil
        })
        if err != nil {
            logx.Errorf("SaveProductImagesFromExcel save db  err:%v, productId:%v, urls:%v", err, productId, urls)
        }
    }

    util.ResponseFormat(c, code.Success, "保存成功")
}

// UploadProductImagesFromExcel 从Excel文件中上传产品图片
func UploadProductImagesFromExcel(filePath string, sheetIndex int, productIdColumn int, imageColumn string) (productImageMap map[string][]string, err error) {
    productImageMap = make(map[string][]string)
    // 加载Excel文件
    f, err := excelize.OpenFile(filePath)
    if err != nil {
        logx.Errorf("Failed to open Excel file: %v", err)
        return
    }
    defer f.Close()

    // 获取工作表名称
    sheetName := f.GetSheetName(sheetIndex)
    // 读取工作表中的所有行
    rows, err := f.GetRows(sheetName)
    if err != nil {
        logx.Errorf("Failed to get rows from sheet:%v", err)
        return
    }

    // 获取指定列的合并单元格信息
    mergedCells, err := getColumnMergeCells(f, sheetName, imageColumn)
    if err != nil {
        logx.Errorf("Failed to get merged cells:%v", err)
        return
    }

    mergeCellMap := make(map[string]excelize.MergeCell)
    for _, cell := range mergedCells {
        mergeCellMap[cell.GetStartAxis()] = cell
    }

    var imagePaths []string
    // 遍历Excel行，读取数据
    for rowIndex, row := range rows[1:] { // 假设第一行是标题行，跳过
        if len(row) < 1 {
            continue
        }
        productId := row[productIdColumn]
        currentCell := fmt.Sprintf("%s%d", imageColumn, rowIndex+2)

        // 检查当前单元格是否在合并单元格中
        if mergeCell, ok := mergeCellMap[currentCell]; ok {
            imagePaths = make([]string, 0)
            imageCell := mergeCell.GetStartAxis()

            // 获取图片
            pictures, err := f.GetPictures(sheetName, imageCell)
            if err != nil {
                logx.Errorf("Failed to get picture for cell %s: %v", imageCell, err)
                continue
            }

            if len(pictures) == 0 {
                logx.Errorf("No picture found for cell %s", imageCell)
                continue
            }

            for k, picture := range pictures {
                fileBytes := picture.File
                fileName := fmt.Sprintf("image_%s_%d.png", imageCell, k+1)

                // 保存图片到本地并获取路径
                imagePath, err := upload.UploadFileToSeaWeed(string(constvar.FileType_Picture), fileName, fileBytes)
                if err != nil {
                    logx.Errorf("Failed to save image for product %s: %v\n", productId, err)
                    continue
                }
                imagePaths = append(imagePaths, imagePath)
            }
        }

        if productId == "" {
            continue
        }

        // imagePaths
        productImageMap[productId] = imagePaths
        logx.Infof("UploadProductImagesFromExcel Product ID: %s, Image Urls: %s\n", productId, imagePaths)
    }
    return productImageMap, nil
}

// getColumnMergeCells 获取指定列的合并单元格
func getColumnMergeCells(f *excelize.File, sheetName string, targetColumn string) ([]excelize.MergeCell, error) {
    // 获取所有合并单元格
    mergeCells, err := f.GetMergeCells(sheetName)
    if err != nil {
        return nil, err
    }

    var columnMergeCells []excelize.MergeCell
    for _, mergeCell := range mergeCells {
        if strings.HasPrefix(mergeCell.GetStartAxis(), targetColumn) {
            columnMergeCells = append(columnMergeCells, mergeCell)
        }
    }
    return columnMergeCells, nil
}

 docs/docs.go

@@ -691,122 +691,6 @@
                }
            }
        },
        "/api-wms/v1/dict/getSilkDictList/{type}": {
            "get": {
                "produces": [
                    "application/json"
                ],
                "tags": [
                    "数据字典"
                ],
                "summary": "获取庄口列表",
                "parameters": [
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    },
                    {
                        "type": "string",
                        "description": "字典类型",
                        "name": "type",
                        "in": "path",
                        "required": true
                    }
                ],
                "responses": {
                    "200": {
                        "description": "成功",
                        "schema": {
                            "allOf": [
                                {
                                    "$ref": "#/definitions/util.ResponseList"
                                },
                                {
                                    "type": "object",
                                    "properties": {
                                        "data": {
                                            "type": "array",
                                            "items": {
                                                "$ref": "#/definitions/models.SilkDict"
                                            }
                                        }
                                    }
                                }
                            ]
                        }
                    }
                }
            }
        },
        "/api-wms/v1/dict/getUserList": {
            "get": {
                "produces": [
                    "application/json"
                ],
                "tags": [
                    "数据字典"
                ],
                "summary": "获取用户列表",
                "parameters": [
                    {
                        "type": "string",
                        "name": "id",
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "name": "nickName",
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "name": "parentId",
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "name": "pos",
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "name": "userName",
                        "in": "query"
                    },
                    {
                        "type": "integer",
                        "name": "userType",
                        "in": "query"
                    }
                ],
                "responses": {
                    "200": {
                        "description": "成功",
                        "schema": {
                            "allOf": [
                                {
                                    "$ref": "#/definitions/util.ResponseList"
                                },
                                {
                                    "type": "object",
                                    "properties": {
                                        "data": {
                                            "type": "array",
                                            "items": {
                                                "$ref": "#/definitions/user.GetUserRequest"
                                            }
                                        }
                                    }
                                }
                            ]
                        }
                    }
                }
            }
        },
        "/api-wms/v1/dict/save": {
            "post": {
                "produces": [
@@ -1797,13 +1681,6 @@
                "summary": "添加库存盘点信息",
                "parameters": [
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    },
                    {
                        "description": "入库/出库信息",
                        "name": "object",
                        "in": "body",
@@ -1833,13 +1710,6 @@
                ],
                "summary": "应用、验证",
                "parameters": [
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    },
                    {
                        "description": "入参",
                        "name": "object",
@@ -2025,13 +1895,6 @@
                "summary": "修改库存盘点信息",
                "parameters": [
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    },
                    {
                        "description": "入库/出库信息",
                        "name": "object",
                        "in": "body",
@@ -2089,13 +1952,6 @@
                ],
                "summary": "更改记录状态",
                "parameters": [
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    },
                    {
                        "type": "integer",
                        "description": "id",
@@ -2263,13 +2119,6 @@
                "summary": "入库/出库列表",
                "parameters": [
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    },
                    {
                        "description": "查询参数",
                        "name": "object",
                        "in": "body",
@@ -2375,13 +2224,6 @@
                "summary": "添加入库/出库",
                "parameters": [
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    },
                    {
                        "description": "入库/出库信息",
                        "name": "object",
                        "in": "body",
@@ -2411,13 +2253,6 @@
                ],
                "summary": "删除入库/出库信息",
                "parameters": [
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    },
                    {
                        "type": "integer",
                        "description": "id",
@@ -2778,6 +2613,43 @@
                        "schema": {
                            "$ref": "#/definitions/request.UpdateDepartment"
                        }
                    }
                ],
                "responses": {
                    "200": {
                        "description": "成功",
                        "schema": {
                            "$ref": "#/definitions/util.Response"
                        }
                    }
                }
            }
        },
        "/api-wms/v1/other/saveProductImagesFromExcel": {
            "post": {
                "produces": [
                    "application/json"
                ],
                "tags": [
                    "其他"
                ],
                "summary": "从excel中获取产品图片并保存",
                "parameters": [
                    {
                        "description": "属性信息",
                        "name": "object",
                        "in": "body",
                        "required": true,
                        "schema": {
                            "$ref": "#/definitions/controllers.saveProductImagesFromExcelRequest"
                        }
                    },
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    }
                ],
                "responses": {
@@ -4561,6 +4433,27 @@
                "ReservationNever"
            ]
        },
        "controllers.saveProductImagesFromExcelRequest": {
            "type": "object",
            "properties": {
                "excelFilePath": {
                    "description": "excel路径 用docker cp传到容器里",
                    "type": "string"
                },
                "imageColumn": {
                    "description": "图片所在列名",
                    "type": "string"
                },
                "productIdColumnIndex": {
                    "description": "产品ID是第几列(从0开始)",
                    "type": "integer"
                },
                "sheetIndex": {
                    "description": "第几个sheet",
                    "type": "integer"
                }
            }
        },
        "gorm.DeletedAt": {
            "type": "object",
            "properties": {
@@ -4823,7 +4716,6 @@
                    "type": "string"
                },
                "warehouseId": {
                    "description": "仓库id",
                    "type": "integer"
                }
            }
@@ -5352,15 +5244,12 @@
            "type": "object",
            "properties": {
                "accountant": {
                    "description": "会计名称",
                    "type": "string"
                },
                "accountantId": {
                    "description": "会计id",
                    "type": "string"
                },
                "auditDate": {
                    "description": "审批时间",
                    "type": "string"
                },
                "baseOperationType": {
@@ -5372,50 +5261,39 @@
                    ]
                },
                "checkedBy": {
                    "description": "验证者UserId",
                    "type": "string"
                },
                "comment": {
                    "description": "备注",
                    "type": "string"
                },
                "companyID": {
                    "description": "公司ID-客户",
                    "type": "string"
                },
                "companyName": {
                    "description": "公司名称-客户",
                    "type": "string"
                },
                "contacterID": {
                    "description": "联系人ID",
                    "type": "integer"
                },
                "contacterName": {
                    "description": "联系人姓名",
                    "type": "string"
                },
                "createBy": {
                    "description": "创建者UserId",
                    "type": "string"
                },
                "createTime": {
                    "type": "string"
                },
                "custodian": {
                    "description": "保管员名称",
                    "type": "string"
                },
                "custodianId": {
                    "description": "保管员id",
                    "type": "string"
                },
                "dealerType": {
                    "description": "调拨出入库类型",
                    "type": "string"
                },
                "details": {
                    "description": "操作明细",
                    "type": "array",
                    "items": {
                        "$ref": "#/definitions/models.OperationDetails"
@@ -5441,15 +5319,9 @@
                    "type": "integer"
                },
                "logisticCompany": {
                    "description": "物流公司信息",
                    "allOf": [
                        {
                            "$ref": "#/definitions/models.LogisticCompany"
                        }
                    ]
                    "$ref": "#/definitions/models.LogisticCompany"
                },
                "logisticCompanyId": {
                    "description": "物流公司id",
                    "type": "string"
                },
                "logisticWeight": {
@@ -5457,11 +5329,9 @@
                    "type": "number"
                },
                "manager": {
                    "description": "主管名称",
                    "type": "string"
                },
                "managerId": {
                    "description": "主管id",
                    "type": "string"
                },
                "number": {
@@ -5469,7 +5339,6 @@
                    "type": "string"
                },
                "operationDate": {
                    "description": "安排日期",
                    "type": "string"
                },
                "operationSource": {
@@ -5489,31 +5358,21 @@
                    "type": "string"
                },
                "receiverAddr": {
                    "description": "收货地址",
                    "type": "string"
                },
                "receiverName": {
                    "description": "收货人姓名",
                    "type": "string"
                },
                "receiverPhone": {
                    "description": "联系电话",
                    "type": "string"
                },
                "remark": {
                    "description": "备注",
                    "type": "string"
                },
                "salesDetailsNumber": {
                    "description": "销售明细编码",
                    "type": "string"
                },
                "silkMarket": {
                    "description": "嘉联仓储添加 SilkMarket",
                    "type": "string"
                },
                "source": {
                    "description": "来源系统",
                    "type": "string"
                },
                "sourceNumber": {
@@ -5544,15 +5403,9 @@
                    "type": "string"
                },
                "warehouse": {
                    "description": "仓库信息",
                    "allOf": [
                        {
                            "$ref": "#/definitions/models.Warehouse"
                        }
                    ]
                    "$ref": "#/definitions/models.Warehouse"
                },
                "warehouseId": {
                    "description": "仓库id",
                    "type": "integer"
                },
                "waybillNumber": {
@@ -5573,11 +5426,9 @@
                    "type": "number"
                },
                "auxiliaryAmount": {
                    "description": "辅助数量",
                    "type": "number"
                },
                "auxiliaryUnit": {
                    "description": "辅助单位",
                    "type": "string"
                },
                "baseOperationType": {
@@ -5619,7 +5470,7 @@
                    "type": "boolean"
                },
                "operationId": {
                    "description": "操作记录id",
                    "description": "操作id",
                    "type": "integer"
                },
                "product": {
@@ -5635,20 +5486,11 @@
                    "type": "string"
                },
                "remark": {
                    "description": "备注",
                    "type": "string"
                },
                "salePrice": {
                    "description": "销售单价",
                    "type": "number"
                },
                "silkMarket": {
                    "description": "嘉联仓储添加 SilkMarket、SilkMarketClose",
                    "type": "string"
                },
                "silkMarketClose": {
                    "description": "庄口关闭",
                    "type": "string"
                },
                "stockAmount": {
                    "description": "库存数量，盘点时用",
@@ -5667,11 +5509,9 @@
                    "type": "integer"
                },
                "totalGrossWeight": {
                    "description": "总毛重",
                    "type": "number"
                },
                "totalNetWeight": {
                    "description": "总净重",
                    "type": "number"
                },
                "updateTime": {
@@ -5792,64 +5632,6 @@
                    "type": "string"
                }
            }
        },
        "models.SilkDict": {
            "type": "object",
            "properties": {
                "createdAt": {
                    "type": "string"
                },
                "deletedAt": {
                    "$ref": "#/definitions/gorm.DeletedAt"
                },
                "dictType": {
                    "description": "字典类型",
                    "allOf": [
                        {
                            "$ref": "#/definitions/models.SilkDictType"
                        }
                    ]
                },
                "id": {
                    "type": "integer"
                },
                "name": {
                    "description": "名称",
                    "type": "string"
                },
                "number": {
                    "description": "编号",
                    "type": "string"
                },
                "remark": {
                    "description": "备注",
                    "type": "string"
                },
                "updatedAt": {
                    "type": "string"
                }
            }
        },
        "models.SilkDictType": {
            "type": "integer",
            "enum": [
                1,
                2,
                3,
                4
            ],
            "x-enum-comments": {
                "DictTypeColor": "颜色",
                "DictTypeMarket": "庄口",
                "DictTypeSpec": "规格",
                "DictTypeWorkshop": "车间"
            },
            "x-enum-varnames": [
                "DictTypeMarket",
                "DictTypeWorkshop",
                "DictTypeColor",
                "DictTypeSpec"
            ]
        },
        "models.SystemConfig": {
            "type": "object",
@@ -6239,15 +6021,13 @@
            "type": "object",
            "properties": {
                "accountant": {
                    "description": "会计名称",
                    "type": "string"
                },
                "accountantId": {
                    "description": "会计id",
                    "type": "string"
                },
                "baseOperationType": {
                    "description": "基础作业类型 1 入库 2 出库 3 内部调拨 4 报废 5 库存盘点",
                    "description": "基础作业类型 5库存盘点",
                    "allOf": [
                        {
                            "$ref": "#/definitions/constvar.BaseOperationType"
@@ -6275,19 +6055,15 @@
                    "type": "string"
                },
                "custodian": {
                    "description": "保管员名称",
                    "type": "string"
                },
                "custodianId": {
                    "description": "保管员id",
                    "type": "string"
                },
                "dealerType": {
                    "description": "调拨出入库类型",
                    "type": "string"
                },
                "details": {
                    "description": "详情",
                    "type": "array",
                    "items": {
                        "$ref": "#/definitions/request.OperationDetails"
@@ -6301,7 +6077,6 @@
                    "type": "integer"
                },
                "logisticCompanyId": {
                    "description": "物流公司id",
                    "type": "string"
                },
                "logisticWeight": {
@@ -6309,11 +6084,9 @@
                    "type": "number"
                },
                "manager": {
                    "description": "主管名称",
                    "type": "string"
                },
                "managerId": {
                    "description": "主管id",
                    "type": "string"
                },
                "number": {
@@ -6321,7 +6094,7 @@
                    "type": "string"
                },
                "operationDate": {
                    "description": "FromLocationId    int                      ` + "`" + `json:\"fromLocationId\" ` + "`" + `   //源位置id\nToLocationId      int                      ` + "`" + `json:\"toLocationId\" ` + "`" + `   //目标位置id",
                    "description": "FromLocationId    int                      ` + "`" + `json:\"fromLocationId\"   gorm:\"type:int;not null;comment:源位置id\"` + "`" + `   //源位置id\nToLocationId      int                      ` + "`" + `json:\"toLocationId\"    gorm:\"type:int;not null;comment:目标位置id\"` + "`" + `   //目标位置id",
                    "type": "string"
                },
                "operationTypeId": {
@@ -6333,19 +6106,12 @@
                    "type": "string"
                },
                "receiverAddr": {
                    "description": "收货地址",
                    "type": "string"
                },
                "receiverName": {
                    "description": "收货人姓名",
                    "type": "string"
                },
                "receiverPhone": {
                    "description": "联系电话",
                    "type": "string"
                },
                "silkMarket": {
                    "description": "庄口",
                    "type": "string"
                },
                "sourceNumber": {
@@ -6668,10 +6434,6 @@
                },
                "warehouseCode": {
                    "type": "string"
                },
                "warehouseId": {
                    "description": "仓库ID",
                    "type": "string"
                }
            }
        },
@@ -6892,7 +6654,6 @@
            "type": "object",
            "properties": {
                "number": {
                    "description": "单号",
                    "type": "string"
                },
                "page": {
@@ -6904,7 +6665,6 @@
                    "type": "integer"
                },
                "sourceNumber": {
                    "description": "源单号",
                    "type": "string"
                }
            }
@@ -6913,7 +6673,6 @@
            "type": "object",
            "properties": {
                "condition": {
                    "description": "模糊查询条件",
                    "type": "string"
                },
                "keyword": {
@@ -6946,7 +6705,7 @@
                    "type": "integer"
                },
                "amount": {
                    "description": "ProductName string          ` + "`" + `json:\"productName\" ` + "`" + ` //产品名称",
                    "description": "ProductName string          ` + "`" + `json:\"productName\" gorm:\"type:varchar(255);not null;comment:产品名称\"` + "`" + ` //产品名称",
                    "type": "number"
                },
                "auxiliaryAmount": {
@@ -6962,7 +6721,7 @@
                    "type": "number"
                },
                "fromLocationId": {
                    "description": "Unit        string          ` + "`" + `json:\"unit\"` + "`" + `                    //单位\nProduct models.Material ` + "`" + `json:\"product\" ` + "`" + ` // 产品",
                    "description": "Unit        string          ` + "`" + `json:\"unit\" gorm:\"type:varchar(31);comment:单位\"` + "`" + `                    //单位\nProduct models.Material ` + "`" + `json:\"product\" gorm:\"foreignKey:ProductId;references:ID\"` + "`" + `",
                    "type": "integer"
                },
                "productId": {
@@ -6970,20 +6729,11 @@
                    "type": "string"
                },
                "remark": {
                    "description": "备注",
                    "type": "string"
                },
                "salePrice": {
                    "description": "销售单价",
                    "type": "number"
                },
                "silkMarket": {
                    "description": "庄口",
                    "type": "string"
                },
                "silkMarketClose": {
                    "description": "庄口关闭",
                    "type": "string"
                },
                "stockAmount": {
                    "description": "库存数量，盘点时用",
@@ -7007,7 +6757,7 @@
            "type": "object",
            "properties": {
                "baseOperationType": {
                    "description": "基础作业类型 1 入库 2 出库 3 内部调拨 4 报废 5 库存盘点",
                    "description": "1 入库 2 出库 3 内部调拨 4 报废 5 库存盘点",
                    "allOf": [
                        {
                            "$ref": "#/definitions/constvar.BaseOperationType"
@@ -7015,11 +6765,9 @@
                    ]
                },
                "number": {
                    "description": "单号",
                    "type": "string"
                },
                "operationTypeId": {
                    "description": "作业类型id",
                    "type": "integer"
                },
                "page": {
@@ -7031,12 +6779,7 @@
                    "type": "integer"
                },
                "status": {
                    "description": "状态",
                    "allOf": [
                        {
                            "$ref": "#/definitions/constvar.OperationStatus"
                        }
                    ]
                    "$ref": "#/definitions/constvar.OperationStatus"
                }
            }
        },
@@ -7352,11 +7095,9 @@
            "type": "object",
            "properties": {
                "accountant": {
                    "description": "会计名称",
                    "type": "string"
                },
                "accountantId": {
                    "description": "会计id",
                    "type": "string"
                },
                "baseOperationType": {
@@ -7388,15 +7129,12 @@
                    "type": "string"
                },
                "custodian": {
                    "description": "保管员名称",
                    "type": "string"
                },
                "custodianId": {
                    "description": "保管员id",
                    "type": "string"
                },
                "details": {
                    "description": "详情",
                    "type": "array",
                    "items": {
                        "$ref": "#/definitions/request.OperationDetails"
@@ -7406,7 +7144,6 @@
                    "type": "integer"
                },
                "inventoryDealerType": {
                    "description": "调拨出入库分类(对应dict字典表的ID)",
                    "type": "integer"
                },
                "locationId": {
@@ -7421,11 +7158,9 @@
                    "type": "number"
                },
                "manager": {
                    "description": "主管名称",
                    "type": "string"
                },
                "managerId": {
                    "description": "主管id",
                    "type": "string"
                },
                "number": {
@@ -7433,7 +7168,7 @@
                    "type": "string"
                },
                "operationDate": {
                    "description": "FromLocationId    int                        ` + "`" + `json:\"fromLocationId\"  ` + "`" + `   //源位置id\nToLocationId      int                        ` + "`" + `json:\"toLocationId\" ` + "`" + `   //目标位置id",
                    "description": "FromLocationId    int                        ` + "`" + `json:\"fromLocationId\"   gorm:\"type:int;not null;comment:源位置id\"` + "`" + `   //源位置id\nToLocationId      int                        ` + "`" + `json:\"toLocationId\"    gorm:\"type:int;not null;comment:目标位置id\"` + "`" + `   //目标位置id",
                    "type": "string"
                },
                "operationTypeId": {
@@ -7445,19 +7180,12 @@
                    "type": "string"
                },
                "receiverAddr": {
                    "description": "收货地址",
                    "type": "string"
                },
                "receiverName": {
                    "description": "收货人姓名",
                    "type": "string"
                },
                "receiverPhone": {
                    "description": "联系电话",
                    "type": "string"
                },
                "silkMarket": {
                    "description": "庄口",
                    "type": "string"
                },
                "sourceNumber": {
@@ -7621,16 +7349,8 @@
                    "description": "产品id",
                    "type": "string"
                },
                "productCategory": {
                    "description": "产品类别",
                    "type": "string"
                },
                "productName": {
                    "description": "产品名称",
                    "type": "string"
                },
                "productSpecs": {
                    "description": "产品规格",
                    "type": "string"
                },
                "productType": {
@@ -7707,29 +7427,6 @@
                    "items": {
                        "$ref": "#/definitions/models.Material"
                    }
                }
            }
        },
        "user.GetUserRequest": {
            "type": "object",
            "properties": {
                "id": {
                    "type": "string"
                },
                "nickName": {
                    "type": "string"
                },
                "parentId": {
                    "type": "string"
                },
                "pos": {
                    "type": "string"
                },
                "userName": {
                    "type": "string"
                },
                "userType": {
                    "type": "integer"
                }
            }
        },

 docs/swagger.json

@@ -680,122 +680,6 @@
                }
            }
        },
        "/api-wms/v1/dict/getSilkDictList/{type}": {
            "get": {
                "produces": [
                    "application/json"
                ],
                "tags": [
                    "数据字典"
                ],
                "summary": "获取庄口列表",
                "parameters": [
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    },
                    {
                        "type": "string",
                        "description": "字典类型",
                        "name": "type",
                        "in": "path",
                        "required": true
                    }
                ],
                "responses": {
                    "200": {
                        "description": "成功",
                        "schema": {
                            "allOf": [
                                {
                                    "$ref": "#/definitions/util.ResponseList"
                                },
                                {
                                    "type": "object",
                                    "properties": {
                                        "data": {
                                            "type": "array",
                                            "items": {
                                                "$ref": "#/definitions/models.SilkDict"
                                            }
                                        }
                                    }
                                }
                            ]
                        }
                    }
                }
            }
        },
        "/api-wms/v1/dict/getUserList": {
            "get": {
                "produces": [
                    "application/json"
                ],
                "tags": [
                    "数据字典"
                ],
                "summary": "获取用户列表",
                "parameters": [
                    {
                        "type": "string",
                        "name": "id",
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "name": "nickName",
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "name": "parentId",
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "name": "pos",
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "name": "userName",
                        "in": "query"
                    },
                    {
                        "type": "integer",
                        "name": "userType",
                        "in": "query"
                    }
                ],
                "responses": {
                    "200": {
                        "description": "成功",
                        "schema": {
                            "allOf": [
                                {
                                    "$ref": "#/definitions/util.ResponseList"
                                },
                                {
                                    "type": "object",
                                    "properties": {
                                        "data": {
                                            "type": "array",
                                            "items": {
                                                "$ref": "#/definitions/user.GetUserRequest"
                                            }
                                        }
                                    }
                                }
                            ]
                        }
                    }
                }
            }
        },
        "/api-wms/v1/dict/save": {
            "post": {
                "produces": [
@@ -1786,13 +1670,6 @@
                "summary": "添加库存盘点信息",
                "parameters": [
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    },
                    {
                        "description": "入库/出库信息",
                        "name": "object",
                        "in": "body",
@@ -1822,13 +1699,6 @@
                ],
                "summary": "应用、验证",
                "parameters": [
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    },
                    {
                        "description": "入参",
                        "name": "object",
@@ -2014,13 +1884,6 @@
                "summary": "修改库存盘点信息",
                "parameters": [
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    },
                    {
                        "description": "入库/出库信息",
                        "name": "object",
                        "in": "body",
@@ -2078,13 +1941,6 @@
                ],
                "summary": "更改记录状态",
                "parameters": [
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    },
                    {
                        "type": "integer",
                        "description": "id",
@@ -2252,13 +2108,6 @@
                "summary": "入库/出库列表",
                "parameters": [
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    },
                    {
                        "description": "查询参数",
                        "name": "object",
                        "in": "body",
@@ -2364,13 +2213,6 @@
                "summary": "添加入库/出库",
                "parameters": [
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    },
                    {
                        "description": "入库/出库信息",
                        "name": "object",
                        "in": "body",
@@ -2400,13 +2242,6 @@
                ],
                "summary": "删除入库/出库信息",
                "parameters": [
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    },
                    {
                        "type": "integer",
                        "description": "id",
@@ -2767,6 +2602,43 @@
                        "schema": {
                            "$ref": "#/definitions/request.UpdateDepartment"
                        }
                    }
                ],
                "responses": {
                    "200": {
                        "description": "成功",
                        "schema": {
                            "$ref": "#/definitions/util.Response"
                        }
                    }
                }
            }
        },
        "/api-wms/v1/other/saveProductImagesFromExcel": {
            "post": {
                "produces": [
                    "application/json"
                ],
                "tags": [
                    "其他"
                ],
                "summary": "从excel中获取产品图片并保存",
                "parameters": [
                    {
                        "description": "属性信息",
                        "name": "object",
                        "in": "body",
                        "required": true,
                        "schema": {
                            "$ref": "#/definitions/controllers.saveProductImagesFromExcelRequest"
                        }
                    },
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    }
                ],
                "responses": {
@@ -4550,6 +4422,27 @@
                "ReservationNever"
            ]
        },
        "controllers.saveProductImagesFromExcelRequest": {
            "type": "object",
            "properties": {
                "excelFilePath": {
                    "description": "excel路径 用docker cp传到容器里",
                    "type": "string"
                },
                "imageColumn": {
                    "description": "图片所在列名",
                    "type": "string"
                },
                "productIdColumnIndex": {
                    "description": "产品ID是第几列(从0开始)",
                    "type": "integer"
                },
                "sheetIndex": {
                    "description": "第几个sheet",
                    "type": "integer"
                }
            }
        },
        "gorm.DeletedAt": {
            "type": "object",
            "properties": {
@@ -4812,7 +4705,6 @@
                    "type": "string"
                },
                "warehouseId": {
                    "description": "仓库id",
                    "type": "integer"
                }
            }
@@ -5341,15 +5233,12 @@
            "type": "object",
            "properties": {
                "accountant": {
                    "description": "会计名称",
                    "type": "string"
                },
                "accountantId": {
                    "description": "会计id",
                    "type": "string"
                },
                "auditDate": {
                    "description": "审批时间",
                    "type": "string"
                },
                "baseOperationType": {
@@ -5361,50 +5250,39 @@
                    ]
                },
                "checkedBy": {
                    "description": "验证者UserId",
                    "type": "string"
                },
                "comment": {
                    "description": "备注",
                    "type": "string"
                },
                "companyID": {
                    "description": "公司ID-客户",
                    "type": "string"
                },
                "companyName": {
                    "description": "公司名称-客户",
                    "type": "string"
                },
                "contacterID": {
                    "description": "联系人ID",
                    "type": "integer"
                },
                "contacterName": {
                    "description": "联系人姓名",
                    "type": "string"
                },
                "createBy": {
                    "description": "创建者UserId",
                    "type": "string"
                },
                "createTime": {
                    "type": "string"
                },
                "custodian": {
                    "description": "保管员名称",
                    "type": "string"
                },
                "custodianId": {
                    "description": "保管员id",
                    "type": "string"
                },
                "dealerType": {
                    "description": "调拨出入库类型",
                    "type": "string"
                },
                "details": {
                    "description": "操作明细",
                    "type": "array",
                    "items": {
                        "$ref": "#/definitions/models.OperationDetails"
@@ -5430,15 +5308,9 @@
                    "type": "integer"
                },
                "logisticCompany": {
                    "description": "物流公司信息",
                    "allOf": [
                        {
                            "$ref": "#/definitions/models.LogisticCompany"
                        }
                    ]
                    "$ref": "#/definitions/models.LogisticCompany"
                },
                "logisticCompanyId": {
                    "description": "物流公司id",
                    "type": "string"
                },
                "logisticWeight": {
@@ -5446,11 +5318,9 @@
                    "type": "number"
                },
                "manager": {
                    "description": "主管名称",
                    "type": "string"
                },
                "managerId": {
                    "description": "主管id",
                    "type": "string"
                },
                "number": {
@@ -5458,7 +5328,6 @@
                    "type": "string"
                },
                "operationDate": {
                    "description": "安排日期",
                    "type": "string"
                },
                "operationSource": {
@@ -5478,31 +5347,21 @@
                    "type": "string"
                },
                "receiverAddr": {
                    "description": "收货地址",
                    "type": "string"
                },
                "receiverName": {
                    "description": "收货人姓名",
                    "type": "string"
                },
                "receiverPhone": {
                    "description": "联系电话",
                    "type": "string"
                },
                "remark": {
                    "description": "备注",
                    "type": "string"
                },
                "salesDetailsNumber": {
                    "description": "销售明细编码",
                    "type": "string"
                },
                "silkMarket": {
                    "description": "嘉联仓储添加 SilkMarket",
                    "type": "string"
                },
                "source": {
                    "description": "来源系统",
                    "type": "string"
                },
                "sourceNumber": {
@@ -5533,15 +5392,9 @@
                    "type": "string"
                },
                "warehouse": {
                    "description": "仓库信息",
                    "allOf": [
                        {
                            "$ref": "#/definitions/models.Warehouse"
                        }
                    ]
                    "$ref": "#/definitions/models.Warehouse"
                },
                "warehouseId": {
                    "description": "仓库id",
                    "type": "integer"
                },
                "waybillNumber": {
@@ -5562,11 +5415,9 @@
                    "type": "number"
                },
                "auxiliaryAmount": {
                    "description": "辅助数量",
                    "type": "number"
                },
                "auxiliaryUnit": {
                    "description": "辅助单位",
                    "type": "string"
                },
                "baseOperationType": {
@@ -5608,7 +5459,7 @@
                    "type": "boolean"
                },
                "operationId": {
                    "description": "操作记录id",
                    "description": "操作id",
                    "type": "integer"
                },
                "product": {
@@ -5624,20 +5475,11 @@
                    "type": "string"
                },
                "remark": {
                    "description": "备注",
                    "type": "string"
                },
                "salePrice": {
                    "description": "销售单价",
                    "type": "number"
                },
                "silkMarket": {
                    "description": "嘉联仓储添加 SilkMarket、SilkMarketClose",
                    "type": "string"
                },
                "silkMarketClose": {
                    "description": "庄口关闭",
                    "type": "string"
                },
                "stockAmount": {
                    "description": "库存数量，盘点时用",
@@ -5656,11 +5498,9 @@
                    "type": "integer"
                },
                "totalGrossWeight": {
                    "description": "总毛重",
                    "type": "number"
                },
                "totalNetWeight": {
                    "description": "总净重",
                    "type": "number"
                },
                "updateTime": {
@@ -5781,64 +5621,6 @@
                    "type": "string"
                }
            }
        },
        "models.SilkDict": {
            "type": "object",
            "properties": {
                "createdAt": {
                    "type": "string"
                },
                "deletedAt": {
                    "$ref": "#/definitions/gorm.DeletedAt"
                },
                "dictType": {
                    "description": "字典类型",
                    "allOf": [
                        {
                            "$ref": "#/definitions/models.SilkDictType"
                        }
                    ]
                },
                "id": {
                    "type": "integer"
                },
                "name": {
                    "description": "名称",
                    "type": "string"
                },
                "number": {
                    "description": "编号",
                    "type": "string"
                },
                "remark": {
                    "description": "备注",
                    "type": "string"
                },
                "updatedAt": {
                    "type": "string"
                }
            }
        },
        "models.SilkDictType": {
            "type": "integer",
            "enum": [
                1,
                2,
                3,
                4
            ],
            "x-enum-comments": {
                "DictTypeColor": "颜色",
                "DictTypeMarket": "庄口",
                "DictTypeSpec": "规格",
                "DictTypeWorkshop": "车间"
            },
            "x-enum-varnames": [
                "DictTypeMarket",
                "DictTypeWorkshop",
                "DictTypeColor",
                "DictTypeSpec"
            ]
        },
        "models.SystemConfig": {
            "type": "object",
@@ -6228,15 +6010,13 @@
            "type": "object",
            "properties": {
                "accountant": {
                    "description": "会计名称",
                    "type": "string"
                },
                "accountantId": {
                    "description": "会计id",
                    "type": "string"
                },
                "baseOperationType": {
                    "description": "基础作业类型 1 入库 2 出库 3 内部调拨 4 报废 5 库存盘点",
                    "description": "基础作业类型 5库存盘点",
                    "allOf": [
                        {
                            "$ref": "#/definitions/constvar.BaseOperationType"
@@ -6264,19 +6044,15 @@
                    "type": "string"
                },
                "custodian": {
                    "description": "保管员名称",
                    "type": "string"
                },
                "custodianId": {
                    "description": "保管员id",
                    "type": "string"
                },
                "dealerType": {
                    "description": "调拨出入库类型",
                    "type": "string"
                },
                "details": {
                    "description": "详情",
                    "type": "array",
                    "items": {
                        "$ref": "#/definitions/request.OperationDetails"
@@ -6290,7 +6066,6 @@
                    "type": "integer"
                },
                "logisticCompanyId": {
                    "description": "物流公司id",
                    "type": "string"
                },
                "logisticWeight": {
@@ -6298,11 +6073,9 @@
                    "type": "number"
                },
                "manager": {
                    "description": "主管名称",
                    "type": "string"
                },
                "managerId": {
                    "description": "主管id",
                    "type": "string"
                },
                "number": {
@@ -6310,7 +6083,7 @@
                    "type": "string"
                },
                "operationDate": {
                    "description": "FromLocationId    int                      `json:\"fromLocationId\" `   //源位置id\nToLocationId      int                      `json:\"toLocationId\" `   //目标位置id",
                    "description": "FromLocationId    int                      `json:\"fromLocationId\"   gorm:\"type:int;not null;comment:源位置id\"`   //源位置id\nToLocationId      int                      `json:\"toLocationId\"    gorm:\"type:int;not null;comment:目标位置id\"`   //目标位置id",
                    "type": "string"
                },
                "operationTypeId": {
@@ -6322,19 +6095,12 @@
                    "type": "string"
                },
                "receiverAddr": {
                    "description": "收货地址",
                    "type": "string"
                },
                "receiverName": {
                    "description": "收货人姓名",
                    "type": "string"
                },
                "receiverPhone": {
                    "description": "联系电话",
                    "type": "string"
                },
                "silkMarket": {
                    "description": "庄口",
                    "type": "string"
                },
                "sourceNumber": {
@@ -6657,10 +6423,6 @@
                },
                "warehouseCode": {
                    "type": "string"
                },
                "warehouseId": {
                    "description": "仓库ID",
                    "type": "string"
                }
            }
        },
@@ -6881,7 +6643,6 @@
            "type": "object",
            "properties": {
                "number": {
                    "description": "单号",
                    "type": "string"
                },
                "page": {
@@ -6893,7 +6654,6 @@
                    "type": "integer"
                },
                "sourceNumber": {
                    "description": "源单号",
                    "type": "string"
                }
            }
@@ -6902,7 +6662,6 @@
            "type": "object",
            "properties": {
                "condition": {
                    "description": "模糊查询条件",
                    "type": "string"
                },
                "keyword": {
@@ -6935,7 +6694,7 @@
                    "type": "integer"
                },
                "amount": {
                    "description": "ProductName string          `json:\"productName\" ` //产品名称",
                    "description": "ProductName string          `json:\"productName\" gorm:\"type:varchar(255);not null;comment:产品名称\"` //产品名称",
                    "type": "number"
                },
                "auxiliaryAmount": {
@@ -6951,7 +6710,7 @@
                    "type": "number"
                },
                "fromLocationId": {
                    "description": "Unit        string          `json:\"unit\"`                    //单位\nProduct models.Material `json:\"product\" ` // 产品",
                    "description": "Unit        string          `json:\"unit\" gorm:\"type:varchar(31);comment:单位\"`                    //单位\nProduct models.Material `json:\"product\" gorm:\"foreignKey:ProductId;references:ID\"`",
                    "type": "integer"
                },
                "productId": {
@@ -6959,20 +6718,11 @@
                    "type": "string"
                },
                "remark": {
                    "description": "备注",
                    "type": "string"
                },
                "salePrice": {
                    "description": "销售单价",
                    "type": "number"
                },
                "silkMarket": {
                    "description": "庄口",
                    "type": "string"
                },
                "silkMarketClose": {
                    "description": "庄口关闭",
                    "type": "string"
                },
                "stockAmount": {
                    "description": "库存数量，盘点时用",
@@ -6996,7 +6746,7 @@
            "type": "object",
            "properties": {
                "baseOperationType": {
                    "description": "基础作业类型 1 入库 2 出库 3 内部调拨 4 报废 5 库存盘点",
                    "description": "1 入库 2 出库 3 内部调拨 4 报废 5 库存盘点",
                    "allOf": [
                        {
                            "$ref": "#/definitions/constvar.BaseOperationType"
@@ -7004,11 +6754,9 @@
                    ]
                },
                "number": {
                    "description": "单号",
                    "type": "string"
                },
                "operationTypeId": {
                    "description": "作业类型id",
                    "type": "integer"
                },
                "page": {
@@ -7020,12 +6768,7 @@
                    "type": "integer"
                },
                "status": {
                    "description": "状态",
                    "allOf": [
                        {
                            "$ref": "#/definitions/constvar.OperationStatus"
                        }
                    ]
                    "$ref": "#/definitions/constvar.OperationStatus"
                }
            }
        },
@@ -7341,11 +7084,9 @@
            "type": "object",
            "properties": {
                "accountant": {
                    "description": "会计名称",
                    "type": "string"
                },
                "accountantId": {
                    "description": "会计id",
                    "type": "string"
                },
                "baseOperationType": {
@@ -7377,15 +7118,12 @@
                    "type": "string"
                },
                "custodian": {
                    "description": "保管员名称",
                    "type": "string"
                },
                "custodianId": {
                    "description": "保管员id",
                    "type": "string"
                },
                "details": {
                    "description": "详情",
                    "type": "array",
                    "items": {
                        "$ref": "#/definitions/request.OperationDetails"
@@ -7395,7 +7133,6 @@
                    "type": "integer"
                },
                "inventoryDealerType": {
                    "description": "调拨出入库分类(对应dict字典表的ID)",
                    "type": "integer"
                },
                "locationId": {
@@ -7410,11 +7147,9 @@
                    "type": "number"
                },
                "manager": {
                    "description": "主管名称",
                    "type": "string"
                },
                "managerId": {
                    "description": "主管id",
                    "type": "string"
                },
                "number": {
@@ -7422,7 +7157,7 @@
                    "type": "string"
                },
                "operationDate": {
                    "description": "FromLocationId    int                        `json:\"fromLocationId\"  `   //源位置id\nToLocationId      int                        `json:\"toLocationId\" `   //目标位置id",
                    "description": "FromLocationId    int                        `json:\"fromLocationId\"   gorm:\"type:int;not null;comment:源位置id\"`   //源位置id\nToLocationId      int                        `json:\"toLocationId\"    gorm:\"type:int;not null;comment:目标位置id\"`   //目标位置id",
                    "type": "string"
                },
                "operationTypeId": {
@@ -7434,19 +7169,12 @@
                    "type": "string"
                },
                "receiverAddr": {
                    "description": "收货地址",
                    "type": "string"
                },
                "receiverName": {
                    "description": "收货人姓名",
                    "type": "string"
                },
                "receiverPhone": {
                    "description": "联系电话",
                    "type": "string"
                },
                "silkMarket": {
                    "description": "庄口",
                    "type": "string"
                },
                "sourceNumber": {
@@ -7610,16 +7338,8 @@
                    "description": "产品id",
                    "type": "string"
                },
                "productCategory": {
                    "description": "产品类别",
                    "type": "string"
                },
                "productName": {
                    "description": "产品名称",
                    "type": "string"
                },
                "productSpecs": {
                    "description": "产品规格",
                    "type": "string"
                },
                "productType": {
@@ -7696,29 +7416,6 @@
                    "items": {
                        "$ref": "#/definitions/models.Material"
                    }
                }
            }
        },
        "user.GetUserRequest": {
            "type": "object",
            "properties": {
                "id": {
                    "type": "string"
                },
                "nickName": {
                    "type": "string"
                },
                "parentId": {
                    "type": "string"
                },
                "pos": {
                    "type": "string"
                },
                "userName": {
                    "type": "string"
                },
                "userType": {
                    "type": "integer"
                }
            }
        },

 docs/swagger.yaml

@@ -361,6 +361,21 @@
    - WhetherTypeAsk
    - WhetherTypeAlways
    - ReservationNever
  controllers.saveProductImagesFromExcelRequest:
    properties:
      excelFilePath:
        description: excel路径 用docker cp传到容器里
        type: string
      imageColumn:
        description: 图片所在列名
        type: string
      productIdColumnIndex:
        description: 产品ID是第几列(从0开始)
        type: integer
      sheetIndex:
        description: 第几个sheet
        type: integer
    type: object
  gorm.DeletedAt:
    properties:
      time:
@@ -541,7 +556,6 @@
      updateTime:
        type: string
      warehouseId:
        description: 仓库id
        type: integer
    type: object
  models.LogisticCompany:
@@ -920,52 +934,38 @@
  models.Operation:
    properties:
      accountant:
        description: 会计名称
        type: string
      accountantId:
        description: 会计id
        type: string
      auditDate:
        description: 审批时间
        type: string
      baseOperationType:
        allOf:
        - $ref: '#/definitions/constvar.BaseOperationType'
        description: 基础作业类型
      checkedBy:
        description: 验证者UserId
        type: string
      comment:
        description: 备注
        type: string
      companyID:
        description: 公司ID-客户
        type: string
      companyName:
        description: 公司名称-客户
        type: string
      contacterID:
        description: 联系人ID
        type: integer
      contacterName:
        description: 联系人姓名
        type: string
      createBy:
        description: 创建者UserId
        type: string
      createTime:
        type: string
      custodian:
        description: 保管员名称
        type: string
      custodianId:
        description: 保管员id
        type: string
      dealerType:
        description: 调拨出入库类型
        type: string
      details:
        description: 操作明细
        items:
          $ref: '#/definitions/models.OperationDetails'
        type: array
@@ -982,26 +982,20 @@
        description: 源位置id
        type: integer
      logisticCompany:
        allOf:
        - $ref: '#/definitions/models.LogisticCompany'
        description: 物流公司信息
        $ref: '#/definitions/models.LogisticCompany'
      logisticCompanyId:
        description: 物流公司id
        type: string
      logisticWeight:
        description: 物流重量
        type: number
      manager:
        description: 主管名称
        type: string
      managerId:
        description: 主管id
        type: string
      number:
        description: 单号
        type: string
      operationDate:
        description: 安排日期
        type: string
      operationSource:
        allOf:
@@ -1014,25 +1008,16 @@
        description: 作业类型名称
        type: string
      receiverAddr:
        description: 收货地址
        type: string
      receiverName:
        description: 收货人姓名
        type: string
      receiverPhone:
        description: 联系电话
        type: string
      remark:
        description: 备注
        type: string
      salesDetailsNumber:
        description: 销售明细编码
        type: string
      silkMarket:
        description: 嘉联仓储添加 SilkMarket
        type: string
      source:
        description: 来源系统
        type: string
      sourceNumber:
        description: 源单号
@@ -1051,11 +1036,8 @@
      updateTime:
        type: string
      warehouse:
        allOf:
        - $ref: '#/definitions/models.Warehouse'
        description: 仓库信息
        $ref: '#/definitions/models.Warehouse'
      warehouseId:
        description: 仓库id
        type: integer
      waybillNumber:
        description: 运单号
@@ -1071,10 +1053,8 @@
          null;comment:产品名称"` //产品名称
        type: number
      auxiliaryAmount:
        description: 辅助数量
        type: number
      auxiliaryUnit:
        description: 辅助单位
        type: string
      baseOperationType:
        allOf:
@@ -1101,7 +1081,7 @@
        description: 是否调拨产生的出库
        type: boolean
      operationId:
        description: 操作记录id
        description: 操作id
        type: integer
      product:
        allOf:
@@ -1111,17 +1091,10 @@
        description: 产品id
        type: string
      remark:
        description: 备注
        type: string
      salePrice:
        description: 销售单价
        type: number
      silkMarket:
        description: 嘉联仓储添加 SilkMarket、SilkMarketClose
        type: string
      silkMarketClose:
        description: 庄口关闭
        type: string
      stockAmount:
        description: 库存数量，盘点时用
        type: number
@@ -1133,10 +1106,8 @@
        description: 目标位置id
        type: integer
      totalGrossWeight:
        description: 总毛重
        type: number
      totalNetWeight:
        description: 总净重
        type: number
      updateTime:
        type: string
@@ -1217,47 +1188,6 @@
      updateTime:
        type: string
    type: object
  models.SilkDict:
    properties:
      createdAt:
        type: string
      deletedAt:
        $ref: '#/definitions/gorm.DeletedAt'
      dictType:
        allOf:
        - $ref: '#/definitions/models.SilkDictType'
        description: 字典类型
      id:
        type: integer
      name:
        description: 名称
        type: string
      number:
        description: 编号
        type: string
      remark:
        description: 备注
        type: string
      updatedAt:
        type: string
    type: object
  models.SilkDictType:
    enum:
    - 1
    - 2
    - 3
    - 4
    type: integer
    x-enum-comments:
      DictTypeColor: 颜色
      DictTypeMarket: 庄口
      DictTypeSpec: 规格
      DictTypeWorkshop: 车间
    x-enum-varnames:
    - DictTypeMarket
    - DictTypeWorkshop
    - DictTypeColor
    - DictTypeSpec
  models.SystemConfig:
    properties:
      configType:
@@ -1523,15 +1453,13 @@
  request.AddOperation:
    properties:
      accountant:
        description: 会计名称
        type: string
      accountantId:
        description: 会计id
        type: string
      baseOperationType:
        allOf:
        - $ref: '#/definitions/constvar.BaseOperationType'
        description: 基础作业类型 1 入库 2 出库 3 内部调拨 4 报废 5 库存盘点
        description: 基础作业类型 5库存盘点
      comment:
        description: 备注
        type: string
@@ -1548,16 +1476,12 @@
        description: 联系人姓名-非必填
        type: string
      custodian:
        description: 保管员名称
        type: string
      custodianId:
        description: 保管员id
        type: string
      dealerType:
        description: 调拨出入库类型
        type: string
      details:
        description: 详情
        items:
          $ref: '#/definitions/request.OperationDetails'
        type: array
@@ -1567,24 +1491,21 @@
        description: 源位置id
        type: integer
      logisticCompanyId:
        description: 物流公司id
        type: string
      logisticWeight:
        description: 物流重量
        type: number
      manager:
        description: 主管名称
        type: string
      managerId:
        description: 主管id
        type: string
      number:
        description: 单号
        type: string
      operationDate:
        description: |-
          FromLocationId    int                      `json:"fromLocationId" `   //源位置id
          ToLocationId      int                      `json:"toLocationId" `   //目标位置id
          FromLocationId    int                      `json:"fromLocationId"   gorm:"type:int;not null;comment:源位置id"`   //源位置id
          ToLocationId      int                      `json:"toLocationId"    gorm:"type:int;not null;comment:目标位置id"`   //目标位置id
        type: string
      operationTypeId:
        description: 作业类型id
@@ -1593,16 +1514,10 @@
        description: 作业类型名称
        type: string
      receiverAddr:
        description: 收货地址
        type: string
      receiverName:
        description: 收货人姓名
        type: string
      receiverPhone:
        description: 联系电话
        type: string
      silkMarket:
        description: 庄口
        type: string
      sourceNumber:
        description: 源单号
@@ -1823,9 +1738,6 @@
        type: string
      warehouseCode:
        type: string
      warehouseId:
        description: 仓库ID
        type: string
    type: object
  request.GetList:
    properties:
@@ -1975,7 +1887,6 @@
  request.OperationAllList:
    properties:
      number:
        description: 单号
        type: string
      page:
        description: 页码
@@ -1984,13 +1895,11 @@
        description: 每页大小
        type: integer
      sourceNumber:
        description: 源单号
        type: string
    type: object
  request.OperationCondition:
    properties:
      condition:
        description: 模糊查询条件
        type: string
      keyword:
        description: 关键字搜索
@@ -2014,7 +1923,8 @@
        description: 操作id
        type: integer
      amount:
        description: ProductName string          `json:"productName" ` //产品名称
        description: ProductName string          `json:"productName" gorm:"type:varchar(255);not
          null;comment:产品名称"` //产品名称
        type: number
      auxiliaryAmount:
        description: 辅助数量
@@ -2027,24 +1937,17 @@
        type: number
      fromLocationId:
        description: |-
          Unit        string          `json:"unit"`                    //单位
          Product models.Material `json:"product" ` // 产品
          Unit        string          `json:"unit" gorm:"type:varchar(31);comment:单位"`                    //单位
          Product models.Material `json:"product" gorm:"foreignKey:ProductId;references:ID"`
        type: integer
      productId:
        description: 产品id
        type: string
      remark:
        description: 备注
        type: string
      salePrice:
        description: 销售单价
        type: number
      silkMarket:
        description: 庄口
        type: string
      silkMarketClose:
        description: 庄口关闭
        type: string
      stockAmount:
        description: 库存数量，盘点时用
        type: number
@@ -2063,12 +1966,10 @@
      baseOperationType:
        allOf:
        - $ref: '#/definitions/constvar.BaseOperationType'
        description: 基础作业类型 1 入库 2 出库 3 内部调拨 4 报废 5 库存盘点
        description: 1 入库 2 出库 3 内部调拨 4 报废 5 库存盘点
      number:
        description: 单号
        type: string
      operationTypeId:
        description: 作业类型id
        type: integer
      page:
        description: 页码
@@ -2077,9 +1978,7 @@
        description: 每页大小
        type: integer
      status:
        allOf:
        - $ref: '#/definitions/constvar.OperationStatus'
        description: 状态
        $ref: '#/definitions/constvar.OperationStatus'
    type: object
  request.PageInfo:
    properties:
@@ -2291,10 +2190,8 @@
  request.UpdateOperation:
    properties:
      accountant:
        description: 会计名称
        type: string
      accountantId:
        description: 会计id
        type: string
      baseOperationType:
        allOf:
@@ -2316,20 +2213,16 @@
        description: 联系人姓名-非必填
        type: string
      custodian:
        description: 保管员名称
        type: string
      custodianId:
        description: 保管员id
        type: string
      details:
        description: 详情
        items:
          $ref: '#/definitions/request.OperationDetails'
        type: array
      id:
        type: integer
      inventoryDealerType:
        description: 调拨出入库分类(对应dict字典表的ID)
        type: integer
      locationId:
        description: 源位置id
@@ -2340,18 +2233,16 @@
        description: 物流重量
        type: number
      manager:
        description: 主管名称
        type: string
      managerId:
        description: 主管id
        type: string
      number:
        description: 单号
        type: string
      operationDate:
        description: |-
          FromLocationId    int                        `json:"fromLocationId"  `   //源位置id
          ToLocationId      int                        `json:"toLocationId" `   //目标位置id
          FromLocationId    int                        `json:"fromLocationId"   gorm:"type:int;not null;comment:源位置id"`   //源位置id
          ToLocationId      int                        `json:"toLocationId"    gorm:"type:int;not null;comment:目标位置id"`   //目标位置id
        type: string
      operationTypeId:
        description: 作业类型id
@@ -2360,16 +2251,10 @@
        description: 作业类型名称
        type: string
      receiverAddr:
        description: 收货地址
        type: string
      receiverName:
        description: 收货人姓名
        type: string
      receiverPhone:
        description: 联系电话
        type: string
      silkMarket:
        description: 庄口
        type: string
      sourceNumber:
        description: 源单号
@@ -2481,14 +2366,8 @@
      produceId:
        description: 产品id
        type: string
      productCategory:
        description: 产品类别
        type: string
      productName:
        description: 产品名称
        type: string
      productSpecs:
        description: 产品规格
        type: string
      productType:
        description: 产品类型
@@ -2544,21 +2423,6 @@
        items:
          $ref: '#/definitions/models.Material'
        type: array
    type: object
  user.GetUserRequest:
    properties:
      id:
        type: string
      nickName:
        type: string
      parentId:
        type: string
      pos:
        type: string
      userName:
        type: string
      userType:
        type: integer
    type: object
  util.Response:
    properties:
@@ -3005,74 +2869,6 @@
                  type: array
              type: object
      summary: 获取字典信息列表
      tags:
      - 数据字典
  /api-wms/v1/dict/getSilkDictList/{type}:
    get:
      parameters:
      - description: token
        in: header
        name: Authorization
        required: true
        type: string
      - description: 字典类型
        in: path
        name: type
        required: true
        type: string
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            allOf:
            - $ref: '#/definitions/util.ResponseList'
            - properties:
                data:
                  items:
                    $ref: '#/definitions/models.SilkDict'
                  type: array
              type: object
      summary: 获取庄口列表
      tags:
      - 数据字典
  /api-wms/v1/dict/getUserList:
    get:
      parameters:
      - in: query
        name: id
        type: string
      - in: query
        name: nickName
        type: string
      - in: query
        name: parentId
        type: string
      - in: query
        name: pos
        type: string
      - in: query
        name: userName
        type: string
      - in: query
        name: userType
        type: integer
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            allOf:
            - $ref: '#/definitions/util.ResponseList'
            - properties:
                data:
                  items:
                    $ref: '#/definitions/user.GetUserRequest'
                  type: array
              type: object
      summary: 获取用户列表
      tags:
      - 数据字典
  /api-wms/v1/dict/save:
@@ -3668,11 +3464,6 @@
  /api-wms/v1/locationProductAmount/add:
    post:
      parameters:
      - description: token
        in: header
        name: Authorization
        required: true
        type: string
      - description: 入库/出库信息
        in: body
        name: object
@@ -3692,11 +3483,6 @@
  /api-wms/v1/locationProductAmount/finish:
    post:
      parameters:
      - description: token
        in: header
        name: Authorization
        required: true
        type: string
      - description: 入参
        in: body
        name: object
@@ -3809,11 +3595,6 @@
  /api-wms/v1/locationProductAmount/update:
    post:
      parameters:
      - description: token
        in: header
        name: Authorization
        required: true
        type: string
      - description: 入库/出库信息
        in: body
        name: object
@@ -3851,11 +3632,6 @@
  /api-wms/v1/operation/finish/{id}:
    put:
      parameters:
      - description: token
        in: header
        name: Authorization
        required: true
        type: string
      - description: id
        in: path
        name: id
@@ -3957,11 +3733,6 @@
  /api-wms/v1/operation/list:
    post:
      parameters:
      - description: token
        in: header
        name: Authorization
        required: true
        type: string
      - description: 查询参数
        in: body
        name: object
@@ -4026,11 +3797,6 @@
  /api-wms/v1/operation/operation:
    post:
      parameters:
      - description: token
        in: header
        name: Authorization
        required: true
        type: string
      - description: 入库/出库信息
        in: body
        name: object
@@ -4050,11 +3816,6 @@
  /api-wms/v1/operation/operation/{id}:
    delete:
      parameters:
      - description: token
        in: header
        name: Authorization
        required: true
        type: string
      - description: id
        in: path
        name: id
@@ -4294,6 +4055,30 @@
      summary: 编辑部门信息
      tags:
      - 部门信息
  /api-wms/v1/other/saveProductImagesFromExcel:
    post:
      parameters:
      - description: 属性信息
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/controllers.saveProductImagesFromExcelRequest'
      - description: token
        in: header
        name: Authorization
        required: true
        type: string
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            $ref: '#/definitions/util.Response'
      summary: 从excel中获取产品图片并保存
      tags:
      - 其他
  /api-wms/v1/product/addDisuse:
    post:
      parameters:

 router/router.go

@@ -241,5 +241,12 @@
        sysCfgApi.GET("get", sysCfgCtl.GetSystemConfig) //获取系统配置
    }

    //其他
    otherCtl := new(controllers.OtherController)
    otherApi := r.Group(urlPrefix + "/other")
    {
        otherApi.POST("saveProductImagesFromExcel", otherCtl.SaveProductImagesFromExcel) //从指定路径的excel获取产品编号和图片，上传并保存
    }

    return r
}

New file
			@@ -0,0 +1,188 @@
			package controllers

			import (
			"fmt"
			"github.com/gin-gonic/gin"
			"github.com/xuri/excelize/v2"
			"gorm.io/gorm"
			"strings"
			"wms/constvar"
			"wms/extend/code"
			"wms/extend/util"
			"wms/models"
			"wms/pkg/logx"
			"wms/utils/upload"
			)

			type OtherController struct{}

			type saveProductImagesFromExcelRequest struct {
			ExcelFilePath string `json:"excelFilePath"` //excel路径用docker cp传到容器里
			SheetIndex int `json:"sheetIndex"` //第几个sheet
			ProductIdColumnIndex int `json:"productIdColumnIndex"` //产品ID是第几列(从0开始)
			ImageColumn string `json:"imageColumn"` //图片所在列名
			}

			// SaveProductImagesFromExcel
			// @Tags 其他
			// @Summary 从excel中获取产品图片并保存
			// @Produce application/json
			// @Param object body saveProductImagesFromExcelRequest true "属性信息"
			// @Param Authorization header string true "token"
			// @Success 200 {object} util.Response "成功"
			// @Router /api-wms/v1/other/saveProductImagesFromExcel [post]
			func (slf OtherController) SaveProductImagesFromExcel(c *gin.Context) {
			var params saveProductImagesFromExcelRequest
			if err := c.BindJSON(&params); err != nil {
			util.ResponseFormat(c, code.RequestParamError, "参数解析失败，数据类型错误:"+err.Error())
			return
			}
			if params.ExcelFilePath == "" \|\| params.ImageColumn == "" {
			util.ResponseFormat(c, code.RequestParamError, "参数缺失")
			return
			}

			productImageMap, err := UploadProductImagesFromExcel(params.ExcelFilePath, params.SheetIndex, params.ProductIdColumnIndex, params.ImageColumn)
			if err != nil {
			logx.Errorf("SaveProductImagesFromExcel err:%v", err)
			util.ResponseFormat(c, code.SaveFail, "操作失败")
			return
			}

			for productId, urls := range productImageMap {
			if len(urls) == 0 {
			continue
			}
			attachmentList := make([]*models.Attachment, 0)
			materialAttachmentList := make([]*models.MaterialAttachment, 0)
			for _, url := range urls {
			attachmentList = append(attachmentList, &models.Attachment{
			FileUrl: url,
			FileType: constvar.FileType_Picture,
			})
			}

			err = models.WithTransaction(func(db *gorm.DB) error {
			//保存附件
			if attachmentList, err = models.NewAttachmentSearch().CreateBatchWithResp(attachmentList); err != nil {
			logx.Errorf("attachment create err: %v", err)
			return err
			}

			//保存物料和附件映射
			for _, v := range attachmentList {
			ma := &models.MaterialAttachment{MaterialID: productId, AttachmentID: v.Id}
			materialAttachmentList = append(materialAttachmentList, ma)
			}
			if err := models.NewMaterialAttachmentSearch().SetOrm(db).CreateBatch(materialAttachmentList); err != nil {
			return err
			}
			return nil
			})
			if err != nil {
			logx.Errorf("SaveProductImagesFromExcel save db err:%v, productId:%v, urls:%v", err, productId, urls)
			}
			}

			util.ResponseFormat(c, code.Success, "保存成功")
			}

			// UploadProductImagesFromExcel 从Excel文件中上传产品图片
			func UploadProductImagesFromExcel(filePath string, sheetIndex int, productIdColumn int, imageColumn string) (productImageMap map[string][]string, err error) {
			productImageMap = make(map[string][]string)
			// 加载Excel文件
			f, err := excelize.OpenFile(filePath)
			if err != nil {
			logx.Errorf("Failed to open Excel file: %v", err)
			return
			}
			defer f.Close()

			// 获取工作表名称
			sheetName := f.GetSheetName(sheetIndex)
			// 读取工作表中的所有行
			rows, err := f.GetRows(sheetName)
			if err != nil {
			logx.Errorf("Failed to get rows from sheet:%v", err)
			return
			}

			// 获取指定列的合并单元格信息
			mergedCells, err := getColumnMergeCells(f, sheetName, imageColumn)
			if err != nil {
			logx.Errorf("Failed to get merged cells:%v", err)
			return
			}

			mergeCellMap := make(map[string]excelize.MergeCell)
			for _, cell := range mergedCells {
			mergeCellMap[cell.GetStartAxis()] = cell
			}

			var imagePaths []string
			// 遍历Excel行，读取数据
			for rowIndex, row := range rows[1:] { // 假设第一行是标题行，跳过
			if len(row) < 1 {
			continue
			}
			productId := row[productIdColumn]
			currentCell := fmt.Sprintf("%s%d", imageColumn, rowIndex+2)

			// 检查当前单元格是否在合并单元格中
			if mergeCell, ok := mergeCellMap[currentCell]; ok {
			imagePaths = make([]string, 0)
			imageCell := mergeCell.GetStartAxis()

			// 获取图片
			pictures, err := f.GetPictures(sheetName, imageCell)
			if err != nil {
			logx.Errorf("Failed to get picture for cell %s: %v", imageCell, err)
			continue
			}

			if len(pictures) == 0 {
			logx.Errorf("No picture found for cell %s", imageCell)
			continue
			}

			for k, picture := range pictures {
			fileBytes := picture.File
			fileName := fmt.Sprintf("image_%s_%d.png", imageCell, k+1)

			// 保存图片到本地并获取路径
			imagePath, err := upload.UploadFileToSeaWeed(string(constvar.FileType_Picture), fileName, fileBytes)
			if err != nil {
			logx.Errorf("Failed to save image for product %s: %v\n", productId, err)
			continue
			}
			imagePaths = append(imagePaths, imagePath)
			}
			}

			if productId == "" {
			continue
			}

			// imagePaths
			productImageMap[productId] = imagePaths
			logx.Infof("UploadProductImagesFromExcel Product ID: %s, Image Urls: %s\n", productId, imagePaths)
			}
			return productImageMap, nil
			}

			// getColumnMergeCells 获取指定列的合并单元格
			func getColumnMergeCells(f *excelize.File, sheetName string, targetColumn string) ([]excelize.MergeCell, error) {
			// 获取所有合并单元格
			mergeCells, err := f.GetMergeCells(sheetName)
			if err != nil {
			return nil, err
			}

			var columnMergeCells []excelize.MergeCell
			for _, mergeCell := range mergeCells {
			if strings.HasPrefix(mergeCell.GetStartAxis(), targetColumn) {
			columnMergeCells = append(columnMergeCells, mergeCell)
			}
			}
			return columnMergeCells, nil
			}

			@@ -691,122 +691,6 @@
			}
			}
			},
			"/api-wms/v1/dict/getSilkDictList/{type}": {
			"get": {
			"produces": [
			"application/json"
			],
			"tags": [
			"数据字典"
			],
			"summary": "获取庄口列表",
			"parameters": [
			{
			"type": "string",
			"description": "token",
			"name": "Authorization",
			"in": "header",
			"required": true
			},
			{
			"type": "string",
			"description": "字典类型",
			"name": "type",
			"in": "path",
			"required": true
			}
			],
			"responses": {
			"200": {
			"description": "成功",
			"schema": {
			"allOf": [
			{
			"$ref": "#/definitions/util.ResponseList"
			},
			{
			"type": "object",
			"properties": {
			"data": {
			"type": "array",
			"items": {
			"$ref": "#/definitions/models.SilkDict"
			}
			}
			}
			}
			]
			}
			}
			}
			}
			},
			"/api-wms/v1/dict/getUserList": {
			"get": {
			"produces": [
			"application/json"
			],
			"tags": [
			"数据字典"
			],
			"summary": "获取用户列表",
			"parameters": [
			{
			"type": "string",
			"name": "id",
			"in": "query"
			},
			{
			"type": "string",
			"name": "nickName",
			"in": "query"
			},
			{
			"type": "string",
			"name": "parentId",
			"in": "query"
			},
			{
			"type": "string",
			"name": "pos",
			"in": "query"
			},
			{
			"type": "string",
			"name": "userName",
			"in": "query"
			},
			{
			"type": "integer",
			"name": "userType",
			"in": "query"
			}
			],
			"responses": {
			"200": {
			"description": "成功",
			"schema": {
			"allOf": [
			{
			"$ref": "#/definitions/util.ResponseList"
			},
			{
			"type": "object",
			"properties": {
			"data": {
			"type": "array",
			"items": {
			"$ref": "#/definitions/user.GetUserRequest"
			}
			}
			}
			}
			]
			}
			}
			}
			}
			},
			"/api-wms/v1/dict/save": {
			"post": {
			"produces": [
			@@ -1797,13 +1681,6 @@
			"summary": "添加库存盘点信息",
			"parameters": [
			{
			"type": "string",
			"description": "token",
			"name": "Authorization",
			"in": "header",
			"required": true
			},
			{
			"description": "入库/出库信息",
			"name": "object",
			"in": "body",
			@@ -1833,13 +1710,6 @@
			],
			"summary": "应用、验证",
			"parameters": [
			{
			"type": "string",
			"description": "token",
			"name": "Authorization",
			"in": "header",
			"required": true
			},
			{
			"description": "入参",
			"name": "object",
			@@ -2025,13 +1895,6 @@
			"summary": "修改库存盘点信息",
			"parameters": [
			{
			"type": "string",
			"description": "token",
			"name": "Authorization",
			"in": "header",
			"required": true
			},
			{
			"description": "入库/出库信息",
			"name": "object",
			"in": "body",
			@@ -2089,13 +1952,6 @@
			],
			"summary": "更改记录状态",
			"parameters": [
			{
			"type": "string",
			"description": "token",
			"name": "Authorization",
			"in": "header",
			"required": true
			},
			{
			"type": "integer",
			"description": "id",
			@@ -2263,13 +2119,6 @@
			"summary": "入库/出库列表",
			"parameters": [
			{
			"type": "string",
			"description": "token",
			"name": "Authorization",
			"in": "header",
			"required": true
			},
			{
			"description": "查询参数",
			"name": "object",
			"in": "body",
			@@ -2375,13 +2224,6 @@
			"summary": "添加入库/出库",
			"parameters": [
			{
			"type": "string",
			"description": "token",
			"name": "Authorization",
			"in": "header",
			"required": true
			},
			{
			"description": "入库/出库信息",
			"name": "object",
			"in": "body",
			@@ -2411,13 +2253,6 @@
			],
			"summary": "删除入库/出库信息",
			"parameters": [
			{
			"type": "string",
			"description": "token",
			"name": "Authorization",
			"in": "header",
			"required": true
			},
			{
			"type": "integer",
			"description": "id",
			@@ -2778,6 +2613,43 @@
			"schema": {
			"$ref": "#/definitions/request.UpdateDepartment"
			}
			}
			],
			"responses": {
			"200": {
			"description": "成功",
			"schema": {
			"$ref": "#/definitions/util.Response"
			}
			}
			}
			}
			},
			"/api-wms/v1/other/saveProductImagesFromExcel": {
			"post": {
			"produces": [
			"application/json"
			],
			"tags": [
			"其他"
			],
			"summary": "从excel中获取产品图片并保存",
			"parameters": [
			{
			"description": "属性信息",
			"name": "object",
			"in": "body",
			"required": true,
			"schema": {
			"$ref": "#/definitions/controllers.saveProductImagesFromExcelRequest"
			}
			},
			{
			"type": "string",
			"description": "token",
			"name": "Authorization",
			"in": "header",
			"required": true
			}
			],
			"responses": {
			@@ -4561,6 +4433,27 @@
			"ReservationNever"
			]
			},
			"controllers.saveProductImagesFromExcelRequest": {
			"type": "object",
			"properties": {
			"excelFilePath": {
			"description": "excel路径用docker cp传到容器里",
			"type": "string"
			},
			"imageColumn": {
			"description": "图片所在列名",
			"type": "string"
			},
			"productIdColumnIndex": {
			"description": "产品ID是第几列(从0开始)",
			"type": "integer"
			},
			"sheetIndex": {
			"description": "第几个sheet",
			"type": "integer"
			}
			}
			},
			"gorm.DeletedAt": {
			"type": "object",
			"properties": {
			@@ -4823,7 +4716,6 @@
			"type": "string"
			},
			"warehouseId": {
			"description": "仓库id",
			"type": "integer"
			}
			}
			@@ -5352,15 +5244,12 @@
			"type": "object",
			"properties": {
			"accountant": {
			"description": "会计名称",
			"type": "string"
			},
			"accountantId": {
			"description": "会计id",
			"type": "string"
			},
			"auditDate": {
			"description": "审批时间",
			"type": "string"
			},
			"baseOperationType": {
			@@ -5372,50 +5261,39 @@
			]
			},
			"checkedBy": {
			"description": "验证者UserId",
			"type": "string"
			},
			"comment": {
			"description": "备注",
			"type": "string"
			},
			"companyID": {
			"description": "公司ID-客户",
			"type": "string"
			},
			"companyName": {
			"description": "公司名称-客户",
			"type": "string"
			},
			"contacterID": {
			"description": "联系人ID",
			"type": "integer"
			},
			"contacterName": {
			"description": "联系人姓名",
			"type": "string"
			},
			"createBy": {
			"description": "创建者UserId",
			"type": "string"
			},
			"createTime": {
			"type": "string"
			},
			"custodian": {
			"description": "保管员名称",
			"type": "string"
			},
			"custodianId": {
			"description": "保管员id",
			"type": "string"
			},
			"dealerType": {
			"description": "调拨出入库类型",
			"type": "string"
			},
			"details": {
			"description": "操作明细",
			"type": "array",
			"items": {
			"$ref": "#/definitions/models.OperationDetails"
			@@ -5441,15 +5319,9 @@
			"type": "integer"
			},
			"logisticCompany": {
			"description": "物流公司信息",
			"allOf": [
			{
			"$ref": "#/definitions/models.LogisticCompany"
			}
			]
			"$ref": "#/definitions/models.LogisticCompany"
			},
			"logisticCompanyId": {
			"description": "物流公司id",
			"type": "string"
			},
			"logisticWeight": {
			@@ -5457,11 +5329,9 @@
			"type": "number"
			},
			"manager": {
			"description": "主管名称",
			"type": "string"
			},
			"managerId": {
			"description": "主管id",
			"type": "string"
			},
			"number": {
			@@ -5469,7 +5339,6 @@
			"type": "string"
			},
			"operationDate": {
			"description": "安排日期",
			"type": "string"
			},
			"operationSource": {
			@@ -5489,31 +5358,21 @@
			"type": "string"
			},
			"receiverAddr": {
			"description": "收货地址",
			"type": "string"
			},
			"receiverName": {
			"description": "收货人姓名",
			"type": "string"
			},
			"receiverPhone": {
			"description": "联系电话",
			"type": "string"
			},
			"remark": {
			"description": "备注",
			"type": "string"
			},
			"salesDetailsNumber": {
			"description": "销售明细编码",
			"type": "string"
			},
			"silkMarket": {
			"description": "嘉联仓储添加 SilkMarket",
			"type": "string"
			},
			"source": {
			"description": "来源系统",
			"type": "string"
			},
			"sourceNumber": {
			@@ -5544,15 +5403,9 @@
			"type": "string"
			},
			"warehouse": {
			"description": "仓库信息",
			"allOf": [
			{
			"$ref": "#/definitions/models.Warehouse"
			}
			]
			"$ref": "#/definitions/models.Warehouse"
			},
			"warehouseId": {
			"description": "仓库id",
			"type": "integer"
			},
			"waybillNumber": {
			@@ -5573,11 +5426,9 @@
			"type": "number"
			},
			"auxiliaryAmount": {
			"description": "辅助数量",
			"type": "number"
			},
			"auxiliaryUnit": {
			"description": "辅助单位",
			"type": "string"
			},
			"baseOperationType": {
			@@ -5619,7 +5470,7 @@
			"type": "boolean"
			},
			"operationId": {
			"description": "操作记录id",
			"description": "操作id",
			"type": "integer"
			},
			"product": {
			@@ -5635,20 +5486,11 @@
			"type": "string"
			},
			"remark": {
			"description": "备注",
			"type": "string"
			},
			"salePrice": {
			"description": "销售单价",
			"type": "number"
			},
			"silkMarket": {
			"description": "嘉联仓储添加 SilkMarket、SilkMarketClose",
			"type": "string"
			},
			"silkMarketClose": {
			"description": "庄口关闭",
			"type": "string"
			},
			"stockAmount": {
			"description": "库存数量，盘点时用",
			@@ -5667,11 +5509,9 @@
			"type": "integer"
			},
			"totalGrossWeight": {
			"description": "总毛重",
			"type": "number"
			},
			"totalNetWeight": {
			"description": "总净重",
			"type": "number"
			},
			"updateTime": {
			@@ -5792,64 +5632,6 @@
			"type": "string"
			}
			}
			},
			"models.SilkDict": {
			"type": "object",
			"properties": {
			"createdAt": {
			"type": "string"
			},
			"deletedAt": {
			"$ref": "#/definitions/gorm.DeletedAt"
			},
			"dictType": {
			"description": "字典类型",
			"allOf": [
			{
			"$ref": "#/definitions/models.SilkDictType"
			}
			]
			},
			"id": {
			"type": "integer"
			},
			"name": {
			"description": "名称",
			"type": "string"
			},
			"number": {
			"description": "编号",
			"type": "string"
			},
			"remark": {
			"description": "备注",
			"type": "string"
			},
			"updatedAt": {
			"type": "string"
			}
			}
			},
			"models.SilkDictType": {
			"type": "integer",
			"enum": [
			1,
			2,
			3,
			4
			],
			"x-enum-comments": {
			"DictTypeColor": "颜色",
			"DictTypeMarket": "庄口",
			"DictTypeSpec": "规格",
			"DictTypeWorkshop": "车间"
			},
			"x-enum-varnames": [
			"DictTypeMarket",
			"DictTypeWorkshop",
			"DictTypeColor",
			"DictTypeSpec"
			]
			},
			"models.SystemConfig": {
			"type": "object",
			@@ -6239,15 +6021,13 @@
			"type": "object",
			"properties": {
			"accountant": {
			"description": "会计名称",
			"type": "string"
			},
			"accountantId": {
			"description": "会计id",
			"type": "string"
			},
			"baseOperationType": {
			"description": "基础作业类型 1 入库 2 出库 3 内部调拨 4 报废 5 库存盘点",
			"description": "基础作业类型 5库存盘点",
			"allOf": [
			{
			"$ref": "#/definitions/constvar.BaseOperationType"
			@@ -6275,19 +6055,15 @@
			"type": "string"
			},
			"custodian": {
			"description": "保管员名称",
			"type": "string"
			},
			"custodianId": {
			"description": "保管员id",
			"type": "string"
			},
			"dealerType": {
			"description": "调拨出入库类型",
			"type": "string"
			},
			"details": {
			"description": "详情",
			"type": "array",
			"items": {
			"$ref": "#/definitions/request.OperationDetails"
			@@ -6301,7 +6077,6 @@
			"type": "integer"
			},
			"logisticCompanyId": {
			"description": "物流公司id",
			"type": "string"
			},
			"logisticWeight": {
			@@ -6309,11 +6084,9 @@
			"type": "number"
			},
			"manager": {
			"description": "主管名称",
			"type": "string"
			},
			"managerId": {
			"description": "主管id",
			"type": "string"
			},
			"number": {
			@@ -6321,7 +6094,7 @@
			"type": "string"
			},
			"operationDate": {
			"description": "FromLocationId int ` + "`" + `json:\"fromLocationId\" ` + "`" + ` //源位置id\nToLocationId int ` + "`" + `json:\"toLocationId\" ` + "`" + ` //目标位置id",
			"description": "FromLocationId int ` + "`" + `json:\"fromLocationId\" gorm:\"type:int;not null;comment:源位置id\"` + "`" + ` //源位置id\nToLocationId int ` + "`" + `json:\"toLocationId\" gorm:\"type:int;not null;comment:目标位置id\"` + "`" + ` //目标位置id",
			"type": "string"
			},
			"operationTypeId": {
			@@ -6333,19 +6106,12 @@
			"type": "string"
			},
			"receiverAddr": {
			"description": "收货地址",
			"type": "string"
			},
			"receiverName": {
			"description": "收货人姓名",
			"type": "string"
			},
			"receiverPhone": {
			"description": "联系电话",
			"type": "string"
			},
			"silkMarket": {
			"description": "庄口",
			"type": "string"
			},
			"sourceNumber": {
			@@ -6668,10 +6434,6 @@
			},
			"warehouseCode": {
			"type": "string"
			},
			"warehouseId": {
			"description": "仓库ID",
			"type": "string"
			}
			}
			},
			@@ -6892,7 +6654,6 @@
			"type": "object",
			"properties": {
			"number": {
			"description": "单号",
			"type": "string"
			},
			"page": {
			@@ -6904,7 +6665,6 @@
			"type": "integer"
			},
			"sourceNumber": {
			"description": "源单号",
			"type": "string"
			}
			}
			@@ -6913,7 +6673,6 @@
			"type": "object",
			"properties": {
			"condition": {
			"description": "模糊查询条件",
			"type": "string"
			},
			"keyword": {
			@@ -6946,7 +6705,7 @@
			"type": "integer"
			},
			"amount": {
			"description": "ProductName string ` + "`" + `json:\"productName\" ` + "`" + ` //产品名称",
			"description": "ProductName string ` + "`" + `json:\"productName\" gorm:\"type:varchar(255);not null;comment:产品名称\"` + "`" + ` //产品名称",
			"type": "number"
			},
			"auxiliaryAmount": {
			@@ -6962,7 +6721,7 @@
			"type": "number"
			},
			"fromLocationId": {
			"description": "Unit string ` + "`" + `json:\"unit\"` + "`" + ` //单位\nProduct models.Material ` + "`" + `json:\"product\" ` + "`" + ` // 产品",
			"description": "Unit string ` + "`" + `json:\"unit\" gorm:\"type:varchar(31);comment:单位\"` + "`" + ` //单位\nProduct models.Material ` + "`" + `json:\"product\" gorm:\"foreignKey:ProductId;references:ID\"` + "`" + `",
			"type": "integer"
			},
			"productId": {
			@@ -6970,20 +6729,11 @@
			"type": "string"
			},
			"remark": {
			"description": "备注",
			"type": "string"
			},
			"salePrice": {
			"description": "销售单价",
			"type": "number"
			},
			"silkMarket": {
			"description": "庄口",
			"type": "string"
			},
			"silkMarketClose": {
			"description": "庄口关闭",
			"type": "string"
			},
			"stockAmount": {
			"description": "库存数量，盘点时用",
			@@ -7007,7 +6757,7 @@
			"type": "object",
			"properties": {
			"baseOperationType": {
			"description": "基础作业类型 1 入库 2 出库 3 内部调拨 4 报废 5 库存盘点",
			"description": "1 入库 2 出库 3 内部调拨 4 报废 5 库存盘点",
			"allOf": [
			{
			"$ref": "#/definitions/constvar.BaseOperationType"
			@@ -7015,11 +6765,9 @@
			]
			},
			"number": {
			"description": "单号",
			"type": "string"
			},
			"operationTypeId": {
			"description": "作业类型id",
			"type": "integer"
			},
			"page": {
			@@ -7031,12 +6779,7 @@
			"type": "integer"
			},
			"status": {
			"description": "状态",
			"allOf": [
			{
			"$ref": "#/definitions/constvar.OperationStatus"
			}
			]
			"$ref": "#/definitions/constvar.OperationStatus"
			}
			}
			},
			@@ -7352,11 +7095,9 @@
			"type": "object",
			"properties": {
			"accountant": {
			"description": "会计名称",
			"type": "string"
			},
			"accountantId": {
			"description": "会计id",
			"type": "string"
			},
			"baseOperationType": {
			@@ -7388,15 +7129,12 @@
			"type": "string"
			},
			"custodian": {
			"description": "保管员名称",
			"type": "string"
			},
			"custodianId": {
			"description": "保管员id",
			"type": "string"
			},
			"details": {
			"description": "详情",
			"type": "array",
			"items": {
			"$ref": "#/definitions/request.OperationDetails"
			@@ -7406,7 +7144,6 @@
			"type": "integer"
			},
			"inventoryDealerType": {
			"description": "调拨出入库分类(对应dict字典表的ID)",
			"type": "integer"
			},
			"locationId": {
			@@ -7421,11 +7158,9 @@
			"type": "number"
			},
			"manager": {
			"description": "主管名称",
			"type": "string"
			},
			"managerId": {
			"description": "主管id",
			"type": "string"
			},
			"number": {
			@@ -7433,7 +7168,7 @@
			"type": "string"
			},
			"operationDate": {
			"description": "FromLocationId int ` + "`" + `json:\"fromLocationId\" ` + "`" + ` //源位置id\nToLocationId int ` + "`" + `json:\"toLocationId\" ` + "`" + ` //目标位置id",
			"description": "FromLocationId int ` + "`" + `json:\"fromLocationId\" gorm:\"type:int;not null;comment:源位置id\"` + "`" + ` //源位置id\nToLocationId int ` + "`" + `json:\"toLocationId\" gorm:\"type:int;not null;comment:目标位置id\"` + "`" + ` //目标位置id",
			"type": "string"
			},
			"operationTypeId": {
			@@ -7445,19 +7180,12 @@
			"type": "string"
			},
			"receiverAddr": {
			"description": "收货地址",
			"type": "string"
			},
			"receiverName": {
			"description": "收货人姓名",
			"type": "string"
			},
			"receiverPhone": {
			"description": "联系电话",
			"type": "string"
			},
			"silkMarket": {
			"description": "庄口",
			"type": "string"
			},
			"sourceNumber": {
			@@ -7621,16 +7349,8 @@
			"description": "产品id",
			"type": "string"
			},
			"productCategory": {
			"description": "产品类别",
			"type": "string"
			},
			"productName": {
			"description": "产品名称",
			"type": "string"
			},
			"productSpecs": {
			"description": "产品规格",
			"type": "string"
			},
			"productType": {
			@@ -7707,29 +7427,6 @@
			"items": {
			"$ref": "#/definitions/models.Material"
			}
			}
			}
			},
			"user.GetUserRequest": {
			"type": "object",
			"properties": {
			"id": {
			"type": "string"
			},
			"nickName": {
			"type": "string"
			},
			"parentId": {
			"type": "string"
			},
			"pos": {
			"type": "string"
			},
			"userName": {
			"type": "string"
			},
			"userType": {
			"type": "integer"
			}
			}
			},

			@@ -680,122 +680,6 @@
			}
			}
			},
			"/api-wms/v1/dict/getSilkDictList/{type}": {
			"get": {
			"produces": [
			"application/json"
			],
			"tags": [
			"数据字典"
			],
			"summary": "获取庄口列表",
			"parameters": [
			{
			"type": "string",
			"description": "token",
			"name": "Authorization",
			"in": "header",
			"required": true
			},
			{
			"type": "string",
			"description": "字典类型",
			"name": "type",
			"in": "path",
			"required": true
			}
			],
			"responses": {
			"200": {
			"description": "成功",
			"schema": {
			"allOf": [
			{
			"$ref": "#/definitions/util.ResponseList"
			},
			{
			"type": "object",
			"properties": {
			"data": {
			"type": "array",
			"items": {
			"$ref": "#/definitions/models.SilkDict"
			}
			}
			}
			}
			]
			}
			}
			}
			}
			},
			"/api-wms/v1/dict/getUserList": {
			"get": {
			"produces": [
			"application/json"
			],
			"tags": [
			"数据字典"
			],
			"summary": "获取用户列表",
			"parameters": [
			{
			"type": "string",
			"name": "id",
			"in": "query"
			},
			{
			"type": "string",
			"name": "nickName",
			"in": "query"
			},
			{
			"type": "string",
			"name": "parentId",
			"in": "query"
			},
			{
			"type": "string",
			"name": "pos",
			"in": "query"
			},
			{
			"type": "string",
			"name": "userName",
			"in": "query"
			},
			{
			"type": "integer",
			"name": "userType",
			"in": "query"
			}
			],
			"responses": {
			"200": {
			"description": "成功",
			"schema": {
			"allOf": [
			{
			"$ref": "#/definitions/util.ResponseList"
			},
			{
			"type": "object",
			"properties": {
			"data": {
			"type": "array",
			"items": {
			"$ref": "#/definitions/user.GetUserRequest"
			}
			}
			}
			}
			]
			}
			}
			}
			}
			},
			"/api-wms/v1/dict/save": {
			"post": {
			"produces": [
			@@ -1786,13 +1670,6 @@
			"summary": "添加库存盘点信息",
			"parameters": [
			{
			"type": "string",
			"description": "token",
			"name": "Authorization",
			"in": "header",
			"required": true
			},
			{
			"description": "入库/出库信息",
			"name": "object",
			"in": "body",
			@@ -1822,13 +1699,6 @@
			],
			"summary": "应用、验证",
			"parameters": [
			{
			"type": "string",
			"description": "token",
			"name": "Authorization",
			"in": "header",
			"required": true
			},
			{
			"description": "入参",
			"name": "object",
			@@ -2014,13 +1884,6 @@
			"summary": "修改库存盘点信息",
			"parameters": [
			{
			"type": "string",
			"description": "token",
			"name": "Authorization",
			"in": "header",
			"required": true
			},
			{
			"description": "入库/出库信息",
			"name": "object",
			"in": "body",
			@@ -2078,13 +1941,6 @@
			],
			"summary": "更改记录状态",
			"parameters": [
			{
			"type": "string",
			"description": "token",
			"name": "Authorization",
			"in": "header",
			"required": true
			},
			{
			"type": "integer",
			"description": "id",
			@@ -2252,13 +2108,6 @@
			"summary": "入库/出库列表",
			"parameters": [
			{
			"type": "string",
			"description": "token",
			"name": "Authorization",
			"in": "header",
			"required": true
			},
			{
			"description": "查询参数",
			"name": "object",
			"in": "body",
			@@ -2364,13 +2213,6 @@
			"summary": "添加入库/出库",
			"parameters": [
			{
			"type": "string",
			"description": "token",
			"name": "Authorization",
			"in": "header",
			"required": true
			},
			{
			"description": "入库/出库信息",
			"name": "object",
			"in": "body",
			@@ -2400,13 +2242,6 @@
			],
			"summary": "删除入库/出库信息",
			"parameters": [
			{
			"type": "string",
			"description": "token",
			"name": "Authorization",
			"in": "header",
			"required": true
			},
			{
			"type": "integer",
			"description": "id",
			@@ -2767,6 +2602,43 @@
			"schema": {
			"$ref": "#/definitions/request.UpdateDepartment"
			}
			}
			],
			"responses": {
			"200": {
			"description": "成功",
			"schema": {
			"$ref": "#/definitions/util.Response"
			}
			}
			}
			}
			},
			"/api-wms/v1/other/saveProductImagesFromExcel": {
			"post": {
			"produces": [
			"application/json"
			],
			"tags": [
			"其他"
			],
			"summary": "从excel中获取产品图片并保存",
			"parameters": [
			{
			"description": "属性信息",
			"name": "object",
			"in": "body",
			"required": true,
			"schema": {
			"$ref": "#/definitions/controllers.saveProductImagesFromExcelRequest"
			}
			},
			{
			"type": "string",
			"description": "token",
			"name": "Authorization",
			"in": "header",
			"required": true
			}
			],
			"responses": {
			@@ -4550,6 +4422,27 @@
			"ReservationNever"
			]
			},
			"controllers.saveProductImagesFromExcelRequest": {
			"type": "object",
			"properties": {
			"excelFilePath": {
			"description": "excel路径用docker cp传到容器里",
			"type": "string"
			},
			"imageColumn": {
			"description": "图片所在列名",
			"type": "string"
			},
			"productIdColumnIndex": {
			"description": "产品ID是第几列(从0开始)",
			"type": "integer"
			},
			"sheetIndex": {
			"description": "第几个sheet",
			"type": "integer"
			}
			}
			},
			"gorm.DeletedAt": {
			"type": "object",
			"properties": {
			@@ -4812,7 +4705,6 @@
			"type": "string"
			},
			"warehouseId": {
			"description": "仓库id",
			"type": "integer"
			}
			}
			@@ -5341,15 +5233,12 @@
			"type": "object",
			"properties": {
			"accountant": {
			"description": "会计名称",
			"type": "string"
			},
			"accountantId": {
			"description": "会计id",
			"type": "string"
			},
			"auditDate": {
			"description": "审批时间",
			"type": "string"
			},
			"baseOperationType": {
			@@ -5361,50 +5250,39 @@
			]
			},
			"checkedBy": {
			"description": "验证者UserId",
			"type": "string"
			},
			"comment": {
			"description": "备注",
			"type": "string"
			},
			"companyID": {
			"description": "公司ID-客户",
			"type": "string"
			},
			"companyName": {
			"description": "公司名称-客户",
			"type": "string"
			},
			"contacterID": {
			"description": "联系人ID",
			"type": "integer"
			},
			"contacterName": {
			"description": "联系人姓名",
			"type": "string"
			},
			"createBy": {
			"description": "创建者UserId",
			"type": "string"
			},
			"createTime": {
			"type": "string"
			},
			"custodian": {
			"description": "保管员名称",
			"type": "string"
			},
			"custodianId": {
			"description": "保管员id",
			"type": "string"
			},
			"dealerType": {
			"description": "调拨出入库类型",
			"type": "string"
			},
			"details": {
			"description": "操作明细",
			"type": "array",
			"items": {
			"$ref": "#/definitions/models.OperationDetails"
			@@ -5430,15 +5308,9 @@
			"type": "integer"
			},
			"logisticCompany": {
			"description": "物流公司信息",
			"allOf": [
			{
			"$ref": "#/definitions/models.LogisticCompany"
			}
			]
			"$ref": "#/definitions/models.LogisticCompany"
			},
			"logisticCompanyId": {
			"description": "物流公司id",
			"type": "string"
			},
			"logisticWeight": {
			@@ -5446,11 +5318,9 @@
			"type": "number"
			},
			"manager": {
			"description": "主管名称",
			"type": "string"
			},
			"managerId": {
			"description": "主管id",
			"type": "string"
			},
			"number": {
			@@ -5458,7 +5328,6 @@
			"type": "string"
			},
			"operationDate": {
			"description": "安排日期",
			"type": "string"
			},
			"operationSource": {
			@@ -5478,31 +5347,21 @@
			"type": "string"
			},
			"receiverAddr": {
			"description": "收货地址",
			"type": "string"
			},
			"receiverName": {
			"description": "收货人姓名",
			"type": "string"
			},
			"receiverPhone": {
			"description": "联系电话",
			"type": "string"
			},
			"remark": {
			"description": "备注",
			"type": "string"
			},
			"salesDetailsNumber": {
			"description": "销售明细编码",
			"type": "string"
			},
			"silkMarket": {
			"description": "嘉联仓储添加 SilkMarket",
			"type": "string"
			},
			"source": {
			"description": "来源系统",
			"type": "string"
			},
			"sourceNumber": {
			@@ -5533,15 +5392,9 @@
			"type": "string"
			},
			"warehouse": {
			"description": "仓库信息",
			"allOf": [
			{
			"$ref": "#/definitions/models.Warehouse"
			}
			]
			"$ref": "#/definitions/models.Warehouse"
			},
			"warehouseId": {
			"description": "仓库id",
			"type": "integer"
			},
			"waybillNumber": {
			@@ -5562,11 +5415,9 @@
			"type": "number"
			},
			"auxiliaryAmount": {
			"description": "辅助数量",
			"type": "number"
			},
			"auxiliaryUnit": {
			"description": "辅助单位",
			"type": "string"
			},
			"baseOperationType": {
			@@ -5608,7 +5459,7 @@
			"type": "boolean"
			},
			"operationId": {
			"description": "操作记录id",
			"description": "操作id",
			"type": "integer"
			},
			"product": {
			@@ -5624,20 +5475,11 @@
			"type": "string"
			},
			"remark": {
			"description": "备注",
			"type": "string"
			},
			"salePrice": {
			"description": "销售单价",
			"type": "number"
			},
			"silkMarket": {
			"description": "嘉联仓储添加 SilkMarket、SilkMarketClose",
			"type": "string"
			},
			"silkMarketClose": {
			"description": "庄口关闭",
			"type": "string"
			},
			"stockAmount": {
			"description": "库存数量，盘点时用",
			@@ -5656,11 +5498,9 @@
			"type": "integer"
			},
			"totalGrossWeight": {
			"description": "总毛重",
			"type": "number"
			},
			"totalNetWeight": {
			"description": "总净重",
			"type": "number"
			},
			"updateTime": {
			@@ -5781,64 +5621,6 @@
			"type": "string"
			}
			}
			},
			"models.SilkDict": {
			"type": "object",
			"properties": {
			"createdAt": {
			"type": "string"
			},
			"deletedAt": {
			"$ref": "#/definitions/gorm.DeletedAt"
			},
			"dictType": {
			"description": "字典类型",
			"allOf": [
			{
			"$ref": "#/definitions/models.SilkDictType"
			}
			]
			},
			"id": {
			"type": "integer"
			},
			"name": {
			"description": "名称",
			"type": "string"
			},
			"number": {
			"description": "编号",
			"type": "string"
			},
			"remark": {
			"description": "备注",
			"type": "string"
			},
			"updatedAt": {
			"type": "string"
			}
			}
			},
			"models.SilkDictType": {
			"type": "integer",
			"enum": [
			1,
			2,
			3,
			4
			],
			"x-enum-comments": {
			"DictTypeColor": "颜色",
			"DictTypeMarket": "庄口",
			"DictTypeSpec": "规格",
			"DictTypeWorkshop": "车间"
			},
			"x-enum-varnames": [
			"DictTypeMarket",
			"DictTypeWorkshop",
			"DictTypeColor",
			"DictTypeSpec"
			]
			},
			"models.SystemConfig": {
			"type": "object",
			@@ -6228,15 +6010,13 @@
			"type": "object",
			"properties": {
			"accountant": {
			"description": "会计名称",
			"type": "string"
			},
			"accountantId": {
			"description": "会计id",
			"type": "string"
			},
			"baseOperationType": {
			"description": "基础作业类型 1 入库 2 出库 3 内部调拨 4 报废 5 库存盘点",
			"description": "基础作业类型 5库存盘点",
			"allOf": [
			{
			"$ref": "#/definitions/constvar.BaseOperationType"
			@@ -6264,19 +6044,15 @@
			"type": "string"
			},
			"custodian": {
			"description": "保管员名称",
			"type": "string"
			},
			"custodianId": {
			"description": "保管员id",
			"type": "string"
			},
			"dealerType": {
			"description": "调拨出入库类型",
			"type": "string"
			},
			"details": {
			"description": "详情",
			"type": "array",
			"items": {
			"$ref": "#/definitions/request.OperationDetails"
			@@ -6290,7 +6066,6 @@
			"type": "integer"
			},
			"logisticCompanyId": {
			"description": "物流公司id",
			"type": "string"
			},
			"logisticWeight": {
			@@ -6298,11 +6073,9 @@
			"type": "number"
			},
			"manager": {
			"description": "主管名称",
			"type": "string"
			},
			"managerId": {
			"description": "主管id",
			"type": "string"
			},
			"number": {
			@@ -6310,7 +6083,7 @@
			"type": "string"
			},
			"operationDate": {
			"description": "FromLocationId int `json:\"fromLocationId\" ` //源位置id\nToLocationId int `json:\"toLocationId\" ` //目标位置id",
			"description": "FromLocationId int `json:\"fromLocationId\" gorm:\"type:int;not null;comment:源位置id\"` //源位置id\nToLocationId int `json:\"toLocationId\" gorm:\"type:int;not null;comment:目标位置id\"` //目标位置id",
			"type": "string"
			},
			"operationTypeId": {
			@@ -6322,19 +6095,12 @@
			"type": "string"
			},
			"receiverAddr": {
			"description": "收货地址",
			"type": "string"
			},
			"receiverName": {
			"description": "收货人姓名",
			"type": "string"
			},
			"receiverPhone": {
			"description": "联系电话",
			"type": "string"
			},
			"silkMarket": {
			"description": "庄口",
			"type": "string"
			},
			"sourceNumber": {
			@@ -6657,10 +6423,6 @@
			},
			"warehouseCode": {
			"type": "string"
			},
			"warehouseId": {
			"description": "仓库ID",
			"type": "string"
			}
			}
			},
			@@ -6881,7 +6643,6 @@
			"type": "object",
			"properties": {
			"number": {
			"description": "单号",
			"type": "string"
			},
			"page": {
			@@ -6893,7 +6654,6 @@
			"type": "integer"
			},
			"sourceNumber": {
			"description": "源单号",
			"type": "string"
			}
			}
			@@ -6902,7 +6662,6 @@
			"type": "object",
			"properties": {
			"condition": {
			"description": "模糊查询条件",
			"type": "string"
			},
			"keyword": {
			@@ -6935,7 +6694,7 @@
			"type": "integer"
			},
			"amount": {
			"description": "ProductName string `json:\"productName\" ` //产品名称",
			"description": "ProductName string `json:\"productName\" gorm:\"type:varchar(255);not null;comment:产品名称\"` //产品名称",
			"type": "number"
			},
			"auxiliaryAmount": {
			@@ -6951,7 +6710,7 @@
			"type": "number"
			},
			"fromLocationId": {
			"description": "Unit string `json:\"unit\"` //单位\nProduct models.Material `json:\"product\" ` // 产品",
			"description": "Unit string `json:\"unit\" gorm:\"type:varchar(31);comment:单位\"` //单位\nProduct models.Material `json:\"product\" gorm:\"foreignKey:ProductId;references:ID\"`",
			"type": "integer"
			},
			"productId": {
			@@ -6959,20 +6718,11 @@
			"type": "string"
			},
			"remark": {
			"description": "备注",
			"type": "string"
			},
			"salePrice": {
			"description": "销售单价",
			"type": "number"
			},
			"silkMarket": {
			"description": "庄口",
			"type": "string"
			},
			"silkMarketClose": {
			"description": "庄口关闭",
			"type": "string"
			},
			"stockAmount": {
			"description": "库存数量，盘点时用",
			@@ -6996,7 +6746,7 @@
			"type": "object",
			"properties": {
			"baseOperationType": {
			"description": "基础作业类型 1 入库 2 出库 3 内部调拨 4 报废 5 库存盘点",
			"description": "1 入库 2 出库 3 内部调拨 4 报废 5 库存盘点",
			"allOf": [
			{
			"$ref": "#/definitions/constvar.BaseOperationType"
			@@ -7004,11 +6754,9 @@
			]
			},
			"number": {
			"description": "单号",
			"type": "string"
			},
			"operationTypeId": {
			"description": "作业类型id",
			"type": "integer"
			},
			"page": {
			@@ -7020,12 +6768,7 @@
			"type": "integer"
			},
			"status": {
			"description": "状态",
			"allOf": [
			{
			"$ref": "#/definitions/constvar.OperationStatus"
			}
			]
			"$ref": "#/definitions/constvar.OperationStatus"
			}
			}
			},
			@@ -7341,11 +7084,9 @@
			"type": "object",
			"properties": {
			"accountant": {
			"description": "会计名称",
			"type": "string"
			},
			"accountantId": {
			"description": "会计id",
			"type": "string"
			},
			"baseOperationType": {
			@@ -7377,15 +7118,12 @@
			"type": "string"
			},
			"custodian": {
			"description": "保管员名称",
			"type": "string"
			},
			"custodianId": {
			"description": "保管员id",
			"type": "string"
			},
			"details": {
			"description": "详情",
			"type": "array",
			"items": {
			"$ref": "#/definitions/request.OperationDetails"
			@@ -7395,7 +7133,6 @@
			"type": "integer"
			},
			"inventoryDealerType": {
			"description": "调拨出入库分类(对应dict字典表的ID)",
			"type": "integer"
			},
			"locationId": {
			@@ -7410,11 +7147,9 @@
			"type": "number"
			},
			"manager": {
			"description": "主管名称",
			"type": "string"
			},
			"managerId": {
			"description": "主管id",
			"type": "string"
			},
			"number": {
			@@ -7422,7 +7157,7 @@
			"type": "string"
			},
			"operationDate": {
			"description": "FromLocationId int `json:\"fromLocationId\" ` //源位置id\nToLocationId int `json:\"toLocationId\" ` //目标位置id",
			"description": "FromLocationId int `json:\"fromLocationId\" gorm:\"type:int;not null;comment:源位置id\"` //源位置id\nToLocationId int `json:\"toLocationId\" gorm:\"type:int;not null;comment:目标位置id\"` //目标位置id",
			"type": "string"
			},
			"operationTypeId": {
			@@ -7434,19 +7169,12 @@
			"type": "string"
			},
			"receiverAddr": {
			"description": "收货地址",
			"type": "string"
			},
			"receiverName": {
			"description": "收货人姓名",
			"type": "string"
			},
			"receiverPhone": {
			"description": "联系电话",
			"type": "string"
			},
			"silkMarket": {
			"description": "庄口",
			"type": "string"
			},
			"sourceNumber": {
			@@ -7610,16 +7338,8 @@
			"description": "产品id",
			"type": "string"
			},
			"productCategory": {
			"description": "产品类别",
			"type": "string"
			},
			"productName": {
			"description": "产品名称",
			"type": "string"
			},
			"productSpecs": {
			"description": "产品规格",
			"type": "string"
			},
			"productType": {
			@@ -7696,29 +7416,6 @@
			"items": {
			"$ref": "#/definitions/models.Material"
			}
			}
			}
			},
			"user.GetUserRequest": {
			"type": "object",
			"properties": {
			"id": {
			"type": "string"
			},
			"nickName": {
			"type": "string"
			},
			"parentId": {
			"type": "string"
			},
			"pos": {
			"type": "string"
			},
			"userName": {
			"type": "string"
			},
			"userType": {
			"type": "integer"
			}
			}
			},

			@@ -361,6 +361,21 @@
			- WhetherTypeAsk
			- WhetherTypeAlways
			- ReservationNever
			controllers.saveProductImagesFromExcelRequest:
			properties:
			excelFilePath:
			description: excel路径用docker cp传到容器里
			type: string
			imageColumn:
			description: 图片所在列名
			type: string
			productIdColumnIndex:
			description: 产品ID是第几列(从0开始)
			type: integer
			sheetIndex:
			description: 第几个sheet
			type: integer
			type: object
			gorm.DeletedAt:
			properties:
			time:
			@@ -541,7 +556,6 @@
			updateTime:
			type: string
			warehouseId:
			description: 仓库id
			type: integer
			type: object
			models.LogisticCompany:
			@@ -920,52 +934,38 @@
			models.Operation:
			properties:
			accountant:
			description: 会计名称
			type: string
			accountantId:
			description: 会计id
			type: string
			auditDate:
			description: 审批时间
			type: string
			baseOperationType:
			allOf:
			- $ref: '#/definitions/constvar.BaseOperationType'
			description: 基础作业类型
			checkedBy:
			description: 验证者UserId
			type: string
			comment:
			description: 备注
			type: string
			companyID:
			description: 公司ID-客户
			type: string
			companyName:
			description: 公司名称-客户
			type: string
			contacterID:
			description: 联系人ID
			type: integer
			contacterName:
			description: 联系人姓名
			type: string
			createBy:
			description: 创建者UserId
			type: string
			createTime:
			type: string
			custodian:
			description: 保管员名称
			type: string
			custodianId:
			description: 保管员id
			type: string
			dealerType:
			description: 调拨出入库类型
			type: string
			details:
			description: 操作明细
			items:
			$ref: '#/definitions/models.OperationDetails'
			type: array
			@@ -982,26 +982,20 @@
			description: 源位置id
			type: integer
			logisticCompany:
			allOf:
			- $ref: '#/definitions/models.LogisticCompany'
			description: 物流公司信息
			$ref: '#/definitions/models.LogisticCompany'
			logisticCompanyId:
			description: 物流公司id
			type: string
			logisticWeight:
			description: 物流重量
			type: number
			manager:
			description: 主管名称
			type: string
			managerId:
			description: 主管id
			type: string
			number:
			description: 单号
			type: string
			operationDate:
			description: 安排日期
			type: string
			operationSource:
			allOf:
			@@ -1014,25 +1008,16 @@
			description: 作业类型名称
			type: string
			receiverAddr:
			description: 收货地址
			type: string
			receiverName:
			description: 收货人姓名
			type: string
			receiverPhone:
			description: 联系电话
			type: string
			remark:
			description: 备注
			type: string
			salesDetailsNumber:
			description: 销售明细编码
			type: string
			silkMarket:
			description: 嘉联仓储添加 SilkMarket
			type: string
			source:
			description: 来源系统
			type: string
			sourceNumber:
			description: 源单号
			@@ -1051,11 +1036,8 @@
			updateTime:
			type: string
			warehouse:
			allOf:
			- $ref: '#/definitions/models.Warehouse'
			description: 仓库信息
			$ref: '#/definitions/models.Warehouse'
			warehouseId:
			description: 仓库id
			type: integer
			waybillNumber:
			description: 运单号
			@@ -1071,10 +1053,8 @@
			null;comment:产品名称"` //产品名称
			type: number
			auxiliaryAmount:
			description: 辅助数量
			type: number
			auxiliaryUnit:
			description: 辅助单位
			type: string
			baseOperationType:
			allOf:
			@@ -1101,7 +1081,7 @@
			description: 是否调拨产生的出库
			type: boolean
			operationId:
			description: 操作记录id
			description: 操作id
			type: integer
			product:
			allOf:
			@@ -1111,17 +1091,10 @@
			description: 产品id
			type: string
			remark:
			description: 备注
			type: string
			salePrice:
			description: 销售单价
			type: number
			silkMarket:
			description: 嘉联仓储添加 SilkMarket、SilkMarketClose
			type: string
			silkMarketClose:
			description: 庄口关闭
			type: string
			stockAmount:
			description: 库存数量，盘点时用
			type: number
			@@ -1133,10 +1106,8 @@
			description: 目标位置id
			type: integer
			totalGrossWeight:
			description: 总毛重
			type: number
			totalNetWeight:
			description: 总净重
			type: number
			updateTime:
			type: string
			@@ -1217,47 +1188,6 @@
			updateTime:
			type: string
			type: object
			models.SilkDict:
			properties:
			createdAt:
			type: string
			deletedAt:
			$ref: '#/definitions/gorm.DeletedAt'
			dictType:
			allOf:
			- $ref: '#/definitions/models.SilkDictType'
			description: 字典类型
			id:
			type: integer
			name:
			description: 名称
			type: string
			number:
			description: 编号
			type: string
			remark:
			description: 备注
			type: string
			updatedAt:
			type: string
			type: object
			models.SilkDictType:
			enum:
			- 1
			- 2
			- 3
			- 4
			type: integer
			x-enum-comments:
			DictTypeColor: 颜色
			DictTypeMarket: 庄口
			DictTypeSpec: 规格
			DictTypeWorkshop: 车间
			x-enum-varnames:
			- DictTypeMarket
			- DictTypeWorkshop
			- DictTypeColor
			- DictTypeSpec
			models.SystemConfig:
			properties:
			configType:
			@@ -1523,15 +1453,13 @@
			request.AddOperation:
			properties:
			accountant:
			description: 会计名称
			type: string
			accountantId:
			description: 会计id
			type: string
			baseOperationType:
			allOf:
			- $ref: '#/definitions/constvar.BaseOperationType'
			description: 基础作业类型 1 入库 2 出库 3 内部调拨 4 报废 5 库存盘点
			description: 基础作业类型 5库存盘点
			comment:
			description: 备注
			type: string
			@@ -1548,16 +1476,12 @@
			description: 联系人姓名-非必填
			type: string
			custodian:
			description: 保管员名称
			type: string
			custodianId:
			description: 保管员id
			type: string
			dealerType:
			description: 调拨出入库类型
			type: string
			details:
			description: 详情
			items:
			$ref: '#/definitions/request.OperationDetails'
			type: array
			@@ -1567,24 +1491,21 @@
			description: 源位置id
			type: integer
			logisticCompanyId:
			description: 物流公司id
			type: string
			logisticWeight:
			description: 物流重量
			type: number
			manager:
			description: 主管名称
			type: string
			managerId:
			description: 主管id
			type: string
			number:
			description: 单号
			type: string
			operationDate:
			description: \|-
			FromLocationId int `json:"fromLocationId" ` //源位置id
			ToLocationId int `json:"toLocationId" ` //目标位置id
			FromLocationId int `json:"fromLocationId" gorm:"type:int;not null;comment:源位置id"` //源位置id
			ToLocationId int `json:"toLocationId" gorm:"type:int;not null;comment:目标位置id"` //目标位置id
			type: string
			operationTypeId:
			description: 作业类型id
			@@ -1593,16 +1514,10 @@
			description: 作业类型名称
			type: string
			receiverAddr:
			description: 收货地址
			type: string
			receiverName:
			description: 收货人姓名
			type: string
			receiverPhone:
			description: 联系电话
			type: string
			silkMarket:
			description: 庄口
			type: string
			sourceNumber:
			description: 源单号
			@@ -1823,9 +1738,6 @@
			type: string
			warehouseCode:
			type: string
			warehouseId:
			description: 仓库ID
			type: string
			type: object
			request.GetList:
			properties:
			@@ -1975,7 +1887,6 @@
			request.OperationAllList:
			properties:
			number:
			description: 单号
			type: string
			page:
			description: 页码
			@@ -1984,13 +1895,11 @@
			description: 每页大小
			type: integer
			sourceNumber:
			description: 源单号
			type: string
			type: object
			request.OperationCondition:
			properties:
			condition:
			description: 模糊查询条件
			type: string
			keyword:
			description: 关键字搜索
			@@ -2014,7 +1923,8 @@
			description: 操作id
			type: integer
			amount:
			description: ProductName string `json:"productName" ` //产品名称
			description: ProductName string `json:"productName" gorm:"type:varchar(255);not
			null;comment:产品名称"` //产品名称
			type: number
			auxiliaryAmount:
			description: 辅助数量
			@@ -2027,24 +1937,17 @@
			type: number
			fromLocationId:
			description: \|-
			Unit string `json:"unit"` //单位
			Product models.Material `json:"product" ` // 产品
			Unit string `json:"unit" gorm:"type:varchar(31);comment:单位"` //单位
			Product models.Material `json:"product" gorm:"foreignKey:ProductId;references:ID"`
			type: integer
			productId:
			description: 产品id
			type: string
			remark:
			description: 备注
			type: string
			salePrice:
			description: 销售单价
			type: number
			silkMarket:
			description: 庄口
			type: string
			silkMarketClose:
			description: 庄口关闭
			type: string
			stockAmount:
			description: 库存数量，盘点时用
			type: number
			@@ -2063,12 +1966,10 @@
			baseOperationType:
			allOf:
			- $ref: '#/definitions/constvar.BaseOperationType'
			description: 基础作业类型 1 入库 2 出库 3 内部调拨 4 报废 5 库存盘点
			description: 1 入库 2 出库 3 内部调拨 4 报废 5 库存盘点
			number:
			description: 单号
			type: string
			operationTypeId:
			description: 作业类型id
			type: integer
			page:
			description: 页码
			@@ -2077,9 +1978,7 @@
			description: 每页大小
			type: integer
			status:
			allOf:
			- $ref: '#/definitions/constvar.OperationStatus'
			description: 状态
			$ref: '#/definitions/constvar.OperationStatus'
			type: object
			request.PageInfo:
			properties:
			@@ -2291,10 +2190,8 @@
			request.UpdateOperation:
			properties:
			accountant:
			description: 会计名称
			type: string
			accountantId:
			description: 会计id
			type: string
			baseOperationType:
			allOf:
			@@ -2316,20 +2213,16 @@
			description: 联系人姓名-非必填
			type: string
			custodian:
			description: 保管员名称
			type: string
			custodianId:
			description: 保管员id
			type: string
			details:
			description: 详情
			items:
			$ref: '#/definitions/request.OperationDetails'
			type: array
			id:
			type: integer
			inventoryDealerType:
			description: 调拨出入库分类(对应dict字典表的ID)
			type: integer
			locationId:
			description: 源位置id
			@@ -2340,18 +2233,16 @@
			description: 物流重量
			type: number
			manager:
			description: 主管名称
			type: string
			managerId:
			description: 主管id
			type: string
			number:
			description: 单号
			type: string
			operationDate:
			description: \|-
			FromLocationId int `json:"fromLocationId" ` //源位置id
			ToLocationId int `json:"toLocationId" ` //目标位置id
			FromLocationId int `json:"fromLocationId" gorm:"type:int;not null;comment:源位置id"` //源位置id
			ToLocationId int `json:"toLocationId" gorm:"type:int;not null;comment:目标位置id"` //目标位置id
			type: string
			operationTypeId:
			description: 作业类型id
			@@ -2360,16 +2251,10 @@
			description: 作业类型名称
			type: string
			receiverAddr:
			description: 收货地址
			type: string
			receiverName:
			description: 收货人姓名
			type: string
			receiverPhone:
			description: 联系电话
			type: string
			silkMarket:
			description: 庄口
			type: string
			sourceNumber:
			description: 源单号
			@@ -2481,14 +2366,8 @@
			produceId:
			description: 产品id
			type: string
			productCategory:
			description: 产品类别
			type: string
			productName:
			description: 产品名称
			type: string
			productSpecs:
			description: 产品规格
			type: string
			productType:
			description: 产品类型
			@@ -2544,21 +2423,6 @@
			items:
			$ref: '#/definitions/models.Material'
			type: array
			type: object
			user.GetUserRequest:
			properties:
			id:
			type: string
			nickName:
			type: string
			parentId:
			type: string
			pos:
			type: string
			userName:
			type: string
			userType:
			type: integer
			type: object
			util.Response:
			properties:
			@@ -3005,74 +2869,6 @@
			type: array
			type: object
			summary: 获取字典信息列表
			tags:
			- 数据字典
			/api-wms/v1/dict/getSilkDictList/{type}:
			get:
			parameters:
			- description: token
			in: header
			name: Authorization
			required: true
			type: string
			- description: 字典类型
			in: path
			name: type
			required: true
			type: string
			produces:
			- application/json
			responses:
			"200":
			description: 成功
			schema:
			allOf:
			- $ref: '#/definitions/util.ResponseList'
			- properties:
			data:
			items:
			$ref: '#/definitions/models.SilkDict'
			type: array
			type: object
			summary: 获取庄口列表
			tags:
			- 数据字典
			/api-wms/v1/dict/getUserList:
			get:
			parameters:
			- in: query
			name: id
			type: string
			- in: query
			name: nickName
			type: string
			- in: query
			name: parentId
			type: string
			- in: query
			name: pos
			type: string
			- in: query
			name: userName
			type: string
			- in: query
			name: userType
			type: integer
			produces:
			- application/json
			responses:
			"200":
			description: 成功
			schema:
			allOf:
			- $ref: '#/definitions/util.ResponseList'
			- properties:
			data:
			items:
			$ref: '#/definitions/user.GetUserRequest'
			type: array
			type: object
			summary: 获取用户列表
			tags:
			- 数据字典
			/api-wms/v1/dict/save:
			@@ -3668,11 +3464,6 @@
			/api-wms/v1/locationProductAmount/add:
			post:
			parameters:
			- description: token
			in: header
			name: Authorization
			required: true
			type: string
			- description: 入库/出库信息
			in: body
			name: object
			@@ -3692,11 +3483,6 @@
			/api-wms/v1/locationProductAmount/finish:
			post:
			parameters:
			- description: token
			in: header
			name: Authorization
			required: true
			type: string
			- description: 入参
			in: body
			name: object
			@@ -3809,11 +3595,6 @@
			/api-wms/v1/locationProductAmount/update:
			post:
			parameters:
			- description: token
			in: header
			name: Authorization
			required: true
			type: string
			- description: 入库/出库信息
			in: body
			name: object
			@@ -3851,11 +3632,6 @@
			/api-wms/v1/operation/finish/{id}:
			put:
			parameters:
			- description: token
			in: header
			name: Authorization
			required: true
			type: string
			- description: id
			in: path
			name: id
			@@ -3957,11 +3733,6 @@
			/api-wms/v1/operation/list:
			post:
			parameters:
			- description: token
			in: header
			name: Authorization
			required: true
			type: string
			- description: 查询参数
			in: body
			name: object
			@@ -4026,11 +3797,6 @@
			/api-wms/v1/operation/operation:
			post:
			parameters:
			- description: token
			in: header
			name: Authorization
			required: true
			type: string
			- description: 入库/出库信息
			in: body
			name: object
			@@ -4050,11 +3816,6 @@
			/api-wms/v1/operation/operation/{id}:
			delete:
			parameters:
			- description: token
			in: header
			name: Authorization
			required: true
			type: string
			- description: id
			in: path
			name: id
			@@ -4294,6 +4055,30 @@
			summary: 编辑部门信息
			tags:
			- 部门信息
			/api-wms/v1/other/saveProductImagesFromExcel:
			post:
			parameters:
			- description: 属性信息
			in: body
			name: object
			required: true
			schema:
			$ref: '#/definitions/controllers.saveProductImagesFromExcelRequest'
			- description: token
			in: header
			name: Authorization
			required: true
			type: string
			produces:
			- application/json
			responses:
			"200":
			description: 成功
			schema:
			$ref: '#/definitions/util.Response'
			summary: 从excel中获取产品图片并保存
			tags:
			- 其他
			/api-wms/v1/product/addDisuse:
			post:
			parameters:

			@@ -241,5 +241,12 @@
			sysCfgApi.GET("get", sysCfgCtl.GetSystemConfig) //获取系统配置
			}

			//其他
			otherCtl := new(controllers.OtherController)
			otherApi := r.Group(urlPrefix + "/other")
			{
			otherApi.POST("saveProductImagesFromExcel", otherCtl.SaveProductImagesFromExcel) //从指定路径的excel获取产品编号和图片，上传并保存
			}

			return r
			}