出库/入库 打印 fileTemplateAttachment中添加仓库id和const中添加两个模板属性

dsmzx

2024-06-25 ea0cff094c11ffe6c16daf5faf4b4e02aa234412

出库/入库 打印 fileTemplateAttachment中添加仓库id和const中添加两个模板属性

 constvar/const.go

@@ -286,10 +286,12 @@
type FileTemplateCategory int

const (
    FileTemplateCategory_Selfmade      FileTemplateCategory = iota + 1 //入库-自制
    FileTemplateCategory_Output                                        //出库
    FileTemplateCategory_JialianInput  = 14                            //嘉联入库
    FileTemplateCategory_JialianOutput = 15                            //嘉联出库
    FileTemplateCategory_Selfmade        FileTemplateCategory = iota + 1 //入库-自制
    FileTemplateCategory_Output                                          //出库
    FileTemplateCategory_JialianInput1   = 14                            //嘉联入库模板1
    FileTemplateCategory_JialianOutput1  = 15                            //嘉联出库模块1
    FileWarehouseCategory_JialianInput2  = 16                            //嘉联入库模板2
    FileWarehouseCategory_JialianOutput2 = 17                            //嘉联出库模块2
)

type CodeStandardType string

 controllers/operation.go

@@ -697,7 +697,7 @@
    util.ResponseFormat(c, code.Success, "操作成功")
}

// outputOperation
// OutputOperation
//
//    @Tags        入库/出库
//    @Summary    打印
@@ -737,10 +737,37 @@
    if operation.BaseOperationType == constvar.BaseOperationTypeIncoming {
        if companyName == "jialian" {
            // 入库
            fileUrl, err = JialianOperation(constvar.FileTemplateCategory_JialianInput, operation)
            oT, err := models.NewOperationTypeSearch().SetID(uint(operation.OperationTypeId)).First()
            if err != nil {
                util.ResponseFormat(c, code.RequestParamError, err.Error())
                return
            }
            fileTemplateAttachments, err := models.NewFileTemplateAttachmentSearch().SetWarehouseId(oT.WarehouseId).Find()
            if err != nil {
                util.ResponseFormat(c, code.RequestParamError, err.Error())
                return
            }
            for _, fileTemplateAttachment := range fileTemplateAttachments {
                if fileTemplateAttachment.Category == constvar.FileTemplateCategory_JialianInput1 {
                    //fileUrl, err = JialianOperation(constvar.FileTemplateCategory_JialianInput1, operation)
                    fileUrl, err = JialianOperation(fileTemplateAttachment.Category, operation)
                    // 出库
                    //fileUrl, err = JialianOperation(constvar.FileTemplateCategory_JialianOutput1, operation)
                    if err != nil {
                        util.ResponseFormat(c, code.RequestParamError, err.Error())
                        return
                    }
                    break
                } else if fileTemplateAttachment.Category == constvar.FileWarehouseCategory_JialianInput2 {
                    fileUrl, err = JialianOperation(fileTemplateAttachment.Category, operation)
                    // 出库
                    //fileUrl, err = JialianOperation(constvar.FileTemplateCategory_JialianOutput1, operation)
                    if err != nil {
                        util.ResponseFormat(c, code.RequestParamError, err.Error())
                        return
                    }
                    break
                }
            }
        } else if companyName == "geruimi" {
            fileUrl, err = ExportInputSelfmade(constvar.FileTemplateCategory_Selfmade, operation)
@@ -751,12 +778,39 @@
        }
    } else if operation.BaseOperationType == constvar.BaseOperationTypeOutgoing { // 交货
        if companyName == "jialian" {
            // 出库
            fileUrl, err = JialianOperation(constvar.FileTemplateCategory_JialianOutput, operation)
            oT, err := models.NewOperationTypeSearch().SetID(uint(operation.OperationTypeId)).First()
            if err != nil {
                util.ResponseFormat(c, code.RequestParamError, err.Error())
                return
            }
            fileTemplateAttachments, err := models.NewFileTemplateAttachmentSearch().SetWarehouseId(oT.WarehouseId).Find()
            if err != nil {
                util.ResponseFormat(c, code.RequestParamError, err.Error())
                return
            }
            for _, fileTemplateAttachment := range fileTemplateAttachments {
                if fileTemplateAttachment.Category == constvar.FileTemplateCategory_JialianOutput1 {
                    //fileUrl, err = JialianOperation(constvar.FileTemplateCategory_JialianInput1, operation)
                    fileUrl, err = JialianOperation(fileTemplateAttachment.Category, operation)
                    // 出库
                    //fileUrl, err = JialianOperation(constvar.FileTemplateCategory_JialianOutput1, operation)
                    if err != nil {
                        util.ResponseFormat(c, code.RequestParamError, err.Error())
                        return
                    }
                    break
                } else if fileTemplateAttachment.Category == constvar.FileWarehouseCategory_JialianOutput2 {
                    fileUrl, err = JialianOperation(fileTemplateAttachment.Category, operation)
                    // 出库
                    //fileUrl, err = JialianOperation(constvar.FileTemplateCategory_JialianOutput1, operation)
                    if err != nil {
                        util.ResponseFormat(c, code.RequestParamError, err.Error())
                        return
                    }
                    break
                }
            }

        } else if companyName == "geruimi" {
            fileUrl, err = ExportInputSelfmade(constvar.FileTemplateCategory_Output, operation)
            if err != nil {
@@ -800,9 +854,9 @@
    defer f.Close()

    sheet := "Sheet1"
    if category == constvar.FileTemplateCategory_JialianInput {
    if category == constvar.FileTemplateCategory_JialianInput1 {
        sheet = "入库单"
    } else if category == constvar.FileTemplateCategory_JialianOutput {
    } else if category == constvar.FileTemplateCategory_JialianOutput1 {
        sheet = "出库单"
    }


 models/file_template_attachment.go

@@ -10,9 +10,10 @@
type (
    FileTemplateAttachment struct {
        WmsModel
        Id       int                           `json:"id"  gorm:"column:id;primary_key;AUTO_INCREMENT"`
        Category constvar.FileTemplateCategory `json:"category" gorm:"type:int(11);comment:模版种类"`
        Name     string                        `json:"name" gorm:"type:varchar(63);comment:模版名称"`
        Id          int                           `json:"id"  gorm:"column:id;primary_key;AUTO_INCREMENT"`
        Category    constvar.FileTemplateCategory `json:"category" gorm:"type:int(11);comment:模版种类"`
        WarehouseId int                           `json:"warehouseId" gorm:"type:int(11);comment:仓库id"`
        Name        string                        `json:"name" gorm:"type:varchar(63);comment:模版名称"`
        //AttachmentId uint                          `json:"attachmentId" gorm:"comment:附件表外键"`
        //Attachment   Attachment                    `json:"attachment" gorm:"foreignKey:AttachmentId;references:Id"`
        TableInfo string `json:"tableInfo" gorm:"type:varchar(31);comment:表名"`
@@ -51,6 +52,10 @@
    slf.Order = order
    return slf
}
func (slf *FileTemplateAttachmentSearch) SetWarehouseId(warehouseId int) *FileTemplateAttachmentSearch {
    slf.WarehouseId = warehouseId
    return slf
}

func (slf *FileTemplateAttachmentSearch) SetID(id int) *FileTemplateAttachmentSearch {
    slf.Id = id
@@ -78,6 +83,9 @@
    if slf.Id != 0 {
        db = db.Where("id = ?", slf.Id)
    }
    if slf.WarehouseId != 0 {
        db = db.Where("warehouse_id = ?", slf.Id)
    }
    if slf.Order != "" {
        db = db.Order(slf.Order)
    }