|
@@ -195,7 +195,7 @@ func (b *PlanCostExcel) drawSupplierContent() error {
|
|
b.FormatToEmpty(&orderCount)
|
|
b.FormatToEmpty(&orderCount)
|
|
|
|
|
|
// 实际数量
|
|
// 实际数量
|
|
- realCount := fmt.Sprintf("%d", stage.RealCount)
|
|
|
|
|
|
+ realCount := fmt.Sprintf("%d", stage.ConfirmCount)
|
|
b.FormatToEmpty(&realCount)
|
|
b.FormatToEmpty(&realCount)
|
|
// 单价
|
|
// 单价
|
|
price := fmt.Sprintf("%.3f", stage.OrderPrice)
|
|
price := fmt.Sprintf("%.3f", stage.OrderPrice)
|
|
@@ -205,8 +205,8 @@ func (b *PlanCostExcel) drawSupplierContent() error {
|
|
perBudgetPrice += stage.OrderPrice * float64(stage.OrderCount)
|
|
perBudgetPrice += stage.OrderPrice * float64(stage.OrderCount)
|
|
b.FormatToEmpty(&budgetPrice)
|
|
b.FormatToEmpty(&budgetPrice)
|
|
// 实际金额
|
|
// 实际金额
|
|
- perRealPrice += stage.OrderPrice * float64(stage.RealCount)
|
|
|
|
- realPrice := fmt.Sprintf("%.3f", stage.OrderPrice*float64(stage.RealCount))
|
|
|
|
|
|
+ perRealPrice += stage.OrderPrice * float64(stage.ConfirmCount)
|
|
|
|
+ realPrice := fmt.Sprintf("%.3f", stage.OrderPrice*float64(stage.ConfirmCount))
|
|
b.FormatToEmpty(&realPrice)
|
|
b.FormatToEmpty(&realPrice)
|
|
if stage.Unit == "吨" || stage.Unit == "平方米" {
|
|
if stage.Unit == "吨" || stage.Unit == "平方米" {
|
|
stage.Unit = "张"
|
|
stage.Unit = "张"
|
|
@@ -314,7 +314,7 @@ func (b *PlanCostExcel) drawAllContent() error {
|
|
b.FormatToEmpty(&orderCount)
|
|
b.FormatToEmpty(&orderCount)
|
|
|
|
|
|
// 实际数量
|
|
// 实际数量
|
|
- realCount := fmt.Sprintf("%d", stage.RealCount)
|
|
|
|
|
|
+ realCount := fmt.Sprintf("%d", stage.ConfirmCount)
|
|
b.FormatToEmpty(&realCount)
|
|
b.FormatToEmpty(&realCount)
|
|
// 单价
|
|
// 单价
|
|
price := fmt.Sprintf("%.3f", stage.OrderPrice)
|
|
price := fmt.Sprintf("%.3f", stage.OrderPrice)
|
|
@@ -324,8 +324,8 @@ func (b *PlanCostExcel) drawAllContent() error {
|
|
perBudgetPrice += stage.OrderPrice * float64(stage.OrderCount)
|
|
perBudgetPrice += stage.OrderPrice * float64(stage.OrderCount)
|
|
b.FormatToEmpty(&budgetPrice)
|
|
b.FormatToEmpty(&budgetPrice)
|
|
// 实际金额
|
|
// 实际金额
|
|
- perRealPrice += stage.OrderPrice * float64(stage.RealCount)
|
|
|
|
- realPrice := fmt.Sprintf("%.3f", stage.RealPrice)
|
|
|
|
|
|
+ perRealPrice += stage.OrderPrice * float64(stage.ConfirmCount)
|
|
|
|
+ realPrice := fmt.Sprintf("%.3f", stage.OrderPrice*float64(stage.ConfirmCount))
|
|
b.FormatToEmpty(&realPrice)
|
|
b.FormatToEmpty(&realPrice)
|
|
if stage.Unit == "吨" || stage.Unit == "平方米" {
|
|
if stage.Unit == "吨" || stage.Unit == "平方米" {
|
|
stage.Unit = "张"
|
|
stage.Unit = "张"
|