liujiandao
2024-04-17 c6e4c58288053493fe62c9a390dfdf8cf1bedf98
产品添加字段2
5个文件已修改
91 ■■■■■ 已修改文件
controllers/operation.go 51 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
docs/docs.go 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
docs/swagger.json 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
docs/swagger.yaml 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
request/operation.go 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
controllers/operation.go
@@ -916,12 +916,12 @@
    readerCloser.Close()
    defer f.Close()
    f.SetCellValue("Sheet1", "C2", operation.CompanyName)
    f.SetCellValue("Sheet1", "H2", operation.OperationDate)
    f.SetCellValue("Sheet1", "O2", operation.Number)
    rowIndex := 5
    totalAmount := decimal.NewFromInt(0)
    //totalPrice := decimal.NewFromInt(0)
    for i, v := range operation.Details {
        //设置表单最多9条数据
        if i > 8 {
@@ -931,10 +931,57 @@
        f.SetCellValue("Sheet1", "B"+strconv.Itoa(rowIndex), v.Product.Type)
        f.SetCellValue("Sheet1", "C"+strconv.Itoa(rowIndex), v.Product.Unit)
        f.SetCellValue("Sheet1", "D"+strconv.Itoa(rowIndex), v.Amount.String())
        f.SetCellValue("Sheet1", "E"+strconv.Itoa(rowIndex), v.Product.PurchasePrice.String())
        if !v.Product.PurchasePrice.IsZero() {
            //totalPrice = totalPrice.Add(v.Product.PurchasePrice)
            price := v.Amount.Mul(v.Product.PurchasePrice).String()
            split := strings.Split(price, ".")
            if len(split) == 2 {
                for n, a := range split[1] {
                    f.SetCellValue("Sheet1", string('M'+n)+strconv.Itoa(rowIndex), string(a))
                }
            } else {
                f.SetCellValue("Sheet1", "M"+strconv.Itoa(rowIndex), "0")
                f.SetCellValue("Sheet1", "N"+strconv.Itoa(rowIndex), "0")
            }
            s := split[0]
            n := 0
            for j := len(s) - 1; j >= 0; j-- {
                if n == 6 {
                    f.SetCellValue("Sheet1", string('L'-n)+strconv.Itoa(rowIndex), s[:j])
                    break
                }
                f.SetCellValue("Sheet1", string('L'-n)+strconv.Itoa(rowIndex), string(s[j]))
                n++
            }
        }
        rowIndex++
        totalAmount = totalAmount.Add(v.Amount)
    }
    f.SetCellValue("Sheet1", "D14", totalAmount)
    //合计
    //if !totalPrice.IsZero() {
    //    price := totalAmount.Mul(totalPrice).String()
    //    split := strings.Split(price, ".")
    //    if len(split) == 2 {
    //        for n, a := range split[1] {
    //            f.SetCellValue("Sheet1", string('M'+n)+"14", string(a))
    //        }
    //    }
    //    s := split[0]
    //    n := 0
    //    for j := len(s) - 1; j >= 0; j-- {
    //        if n == 6 {
    //            f.SetCellValue("Sheet1", string('L'-n)+"14", s[:j])
    //            break
    //        }
    //        f.SetCellValue("Sheet1", string('L'-n)+"14", string(s[j]))
    //        n++
    //    }
    //}
    //f.SetCellValue("Sheet1", "D14", totalAmount)
    //f.SetCellValue("Sheet1", "E14", totalPrice)
    f.SetCellValue("Sheet1", "B15", operation.Manager)
    f.SetCellValue("Sheet1", "D15", operation.Accountant)
    f.SetCellValue("Sheet1", "F15", operation.Custodian)
docs/docs.go
@@ -3934,6 +3934,12 @@
                    "description": "ProductName string          ` + "`" + `json:\"productName\" gorm:\"type:varchar(255);not null;comment:产品名称\"` + "`" + ` //产品名称",
                    "type": "number"
                },
                "auxiliaryAmount": {
                    "type": "number"
                },
                "auxiliaryUnit": {
                    "type": "string"
                },
                "createTime": {
                    "type": "string"
                },
@@ -4808,6 +4814,14 @@
                    "description": "ProductName string          ` + "`" + `json:\"productName\" gorm:\"type:varchar(255);not null;comment:产品名称\"` + "`" + ` //产品名称",
                    "type": "number"
                },
                "auxiliaryAmount": {
                    "description": "辅助数量",
                    "type": "number"
                },
                "auxiliaryUnit": {
                    "description": "辅助单位",
                    "type": "string"
                },
                "fromLocationId": {
                    "description": "Unit        string          ` + "`" + `json:\"unit\" gorm:\"type:varchar(31);comment:单位\"` + "`" + `                    //单位\nProduct models.Material ` + "`" + `json:\"product\" gorm:\"foreignKey:ProductId;references:ID\"` + "`" + `",
                    "type": "integer"
docs/swagger.json
@@ -3922,6 +3922,12 @@
                    "description": "ProductName string          `json:\"productName\" gorm:\"type:varchar(255);not null;comment:产品名称\"` //产品名称",
                    "type": "number"
                },
                "auxiliaryAmount": {
                    "type": "number"
                },
                "auxiliaryUnit": {
                    "type": "string"
                },
                "createTime": {
                    "type": "string"
                },
@@ -4796,6 +4802,14 @@
                    "description": "ProductName string          `json:\"productName\" gorm:\"type:varchar(255);not null;comment:产品名称\"` //产品名称",
                    "type": "number"
                },
                "auxiliaryAmount": {
                    "description": "辅助数量",
                    "type": "number"
                },
                "auxiliaryUnit": {
                    "description": "辅助单位",
                    "type": "string"
                },
                "fromLocationId": {
                    "description": "Unit        string          `json:\"unit\" gorm:\"type:varchar(31);comment:单位\"`                    //单位\nProduct models.Material `json:\"product\" gorm:\"foreignKey:ProductId;references:ID\"`",
                    "type": "integer"
docs/swagger.yaml
@@ -853,6 +853,10 @@
        description: ProductName string          `json:"productName" gorm:"type:varchar(255);not
          null;comment:产品名称"` //产品名称
        type: number
      auxiliaryAmount:
        type: number
      auxiliaryUnit:
        type: string
      createTime:
        type: string
      fromLocation:
@@ -1453,6 +1457,12 @@
        description: ProductName string          `json:"productName" gorm:"type:varchar(255);not
          null;comment:产品名称"` //产品名称
        type: number
      auxiliaryAmount:
        description: 辅助数量
        type: number
      auxiliaryUnit:
        description: 辅助单位
        type: string
      fromLocationId:
        description: |-
          Unit        string          `json:"unit" gorm:"type:varchar(31);comment:单位"`                    //单位
request/operation.go
@@ -49,6 +49,8 @@
    ToLocationId     int             `json:"toLocationId"    gorm:"type:int;not null;comment:目标位置id"` //目标位置id
    TotalGrossWeight decimal.Decimal `json:"totalGrossWeight" gorm:"type:decimal(20,3);comment:总毛重"`  //总毛重
    TotalNetWeight   decimal.Decimal `json:"totalNetWeight" gorm:"type:decimal(20,3);comment:总净重"`    //总净重
    AuxiliaryAmount  decimal.Decimal `json:"auxiliaryAmount" gorm:"type:decimal(20,3);comment:辅助数量"`  //辅助数量
    AuxiliaryUnit    string          `json:"auxiliaryUnit" gorm:"type:varchar(191);comment:辅助单位"`     //辅助单位
}
type OperationList struct {