e6b7593ab3157fcc63460639ebd0e7937e7592f2..d6e975fc8d240c6300a2303d42dc5496dd85b61a
2024-07-02 dsmzx
出库/入库打印 修改bug
d6e975 对比 | 目录
2024-07-02 dsmzx
出库/入库打印 修改bug
260b3f 对比 | 目录
1个文件已修改
32 ■■■■■ 已修改文件
controllers/operation.go 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
controllers/operation.go
@@ -9,7 +9,6 @@
    "github.com/shopspring/decimal"
    "github.com/xuri/excelize/v2"
    "gorm.io/gorm"
    "io/ioutil"
    "sort"
    "strconv"
    "strings"
@@ -785,22 +784,19 @@
                return
            }
            if warehouse.FileTemplateCategoryIn == constvar.FileTemplateCategory_JialianInput1 {
                fileUrl, err = JialianOperation2(warehouse.FileTemplateCategoryIn, operation)
                if err != nil {
                    util.ResponseFormat(c, code.RequestParamError, err.Error())
                    return
                }
            } else if warehouse.FileTemplateCategoryIn == constvar.FileWarehouseCategory_JialianInput2 {
            if warehouse.FileTemplateCategoryIn == constvar.FileWarehouseCategory_JialianInput2 {
                fileUrl, err = JialianOperation1(warehouse.FileTemplateCategoryIn, operation)
                if err != nil {
                    util.ResponseFormat(c, code.RequestParamError, err.Error())
                    return
                }
            } else {
                fileUrl, err = JialianOperation2(warehouse.FileTemplateCategoryIn, operation)
                if err != nil {
                    util.ResponseFormat(c, code.RequestParamError, err.Error())
                    return
                }
            }
        } else if companyName == "geruimi" {
            fileUrl, err = ExportInputSelfmade(constvar.FileTemplateCategory_Selfmade, operation)
            if err != nil {
@@ -825,15 +821,15 @@
                return
            }
            if warehouse.FileTemplateCategoryOut == constvar.FileTemplateCategory_JialianOutput1 {
                fileUrl, err = JialianOperation2(warehouse.FileTemplateCategoryOut, operation)
            if warehouse.FileTemplateCategoryOut == constvar.FileWarehouseCategory_JialianOutput2 {
                fileUrl, err = JialianOperation1(warehouse.FileTemplateCategoryOut, operation)
                if err != nil {
                    util.ResponseFormat(c, code.RequestParamError, err.Error())
                    return
                }
            } else if warehouse.FileTemplateCategoryOut == constvar.FileWarehouseCategory_JialianOutput2 {
                fileUrl, err = JialianOperation1(warehouse.FileTemplateCategoryOut, operation)
            } else {
                fileUrl, err = JialianOperation2(warehouse.FileTemplateCategoryOut, operation)
                if err != nil {
                    util.ResponseFormat(c, code.RequestParamError, err.Error())
                    return
@@ -873,8 +869,6 @@
    // 读取模板内容
    f, err := excelize.OpenReader(readerCloser)
    //fl, err := os.Open("E:\\家纺出入库单.xlsx")
    //f, err := excelize.OpenReader(fl)
    if err != nil {
        return "", errors.New("读取excel模版失败:" + err.Error())
    }
@@ -1001,9 +995,7 @@
    }
    fileUrl, err := upload.UploadFileToSeaWeed(string(constvar.FileType_File), uuid.NewV4().String()+".xlsx", buf.Bytes())
    ioutil.WriteFile("E:\\"+uuid.NewV4().String()+".xlsx", buf.Bytes(), 0644)
    if err != nil {
        //ioutil.WriteFile("E:\\"+uuid.NewV4().String()+".xlsx", buf.Bytes(), 0644)
        logx.Errorf("file upload err: %v", err)
        return "", err
    }
@@ -1121,7 +1113,6 @@
    }
    fileUrl, err := upload.UploadFileToSeaWeed(string(constvar.FileType_File), uuid.NewV4().String()+".xlsx", buf.Bytes())
    ioutil.WriteFile("E:\\"+uuid.NewV4().String()+".xlsx", buf.Bytes(), 0644)
    if err != nil {
        logx.Errorf("file upload err: %v", err)
        return "", err
@@ -1205,7 +1196,6 @@
        logx.Errorf("file upload err: %v", err)
        return "", err
    }
    return fileUrl, nil
}