diff --git a/app/admin/models/purchase.go b/app/admin/models/purchase.go index d6e428e..712bc8a 100644 --- a/app/admin/models/purchase.go +++ b/app/admin/models/purchase.go @@ -3414,14 +3414,38 @@ func demandDataExport(list []DemandData) (string, error) { } for _, v := range list[i].StoreList { - row = append(row, v.LastMonthSales) // 上月销售数 - row = append(row, v.StockCount) // 库存数量 - row = append(row, v.NeedCount) // 需采购数 + if v.LastMonthSales != 0 { + row = append(row, v.LastMonthSales) // 上月销售数 + } else { + row = append(row, "") + } + + if v.StockCount != 0 { + row = append(row, v.StockCount) // 库存数量 + } else { + row = append(row, "") + } + + if v.NeedCount != 0 { + row = append(row, v.NeedCount) // 需采购数 + } else { + row = append(row, "") + } } - row = append(row, list[i].TotalCount) // 需采购总数量 - row = append(row, list[i].TotalAmount) // 需采购总金额 - row = append(row, list[i].Remark) // 备注 + if list[i].TotalCount != 0 { + row = append(row, list[i].TotalCount) // 需采购总数量 + } else { + row = append(row, "") + } + + if list[i].TotalAmount != 0 { + row = append(row, list[i].TotalAmount) // 需采购总金额 + } else { + row = append(row, "") + } + + row = append(row, list[i].Remark) // 备注 for j, _ := range row { cell, _ := excelize.CoordinatesToCellName(1+j, nExcelStartRow+3) @@ -3536,9 +3560,23 @@ func demandDataExportOnShopAssistant(list []DemandData) (string, error) { } for _, v := range list[i].StoreList { - row = append(row, v.LastMonthSales) // 上月销售数 - row = append(row, v.StockCount) // 库存数量 - row = append(row, v.NeedCount) // 需采购数 + if v.LastMonthSales != 0 { + row = append(row, v.LastMonthSales) // 上月销售数 + } else { + row = append(row, "") + } + + if v.StockCount != 0 { + row = append(row, v.StockCount) // 库存数量 + } else { + row = append(row, "") + } + + if v.NeedCount != 0 { + row = append(row, v.NeedCount) // 需采购数 + } else { + row = append(row, "") + } } row = append(row, list[i].Remark) // 备注