From b243875e653a35649dc7090203d640cba9b814fd Mon Sep 17 00:00:00 2001
From: yinbentan <yinbentan@live.com>
Date: 星期六, 06 七月 2024 16:50:39 +0800
Subject: [PATCH] 未选仓库的时候统计产品数量错误bug修复
---
service/more_units.go | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 56 insertions(+), 1 deletions(-)
diff --git a/service/more_units.go b/service/more_units.go
index 8671ce3..5abdb09 100644
--- a/service/more_units.go
+++ b/service/more_units.go
@@ -1,6 +1,7 @@
package service
import (
+ "errors"
"github.com/shopspring/decimal"
"github.com/xuri/excelize/v2"
"strconv"
@@ -10,8 +11,11 @@
func CreateMoreUnit(amount decimal.Decimal, units []models.UnitItems) []models.UnitItems {
moreValueArr := make([]models.UnitItems, 0, len(units))
for _, unitItem := range units {
+ if unitItem.Amount.IsZero() {
+ continue
+ }
moreValueArr = append(moreValueArr, models.UnitItems{
- Amount: amount.Mul(unitItem.Amount),
+ Amount: amount.Div(unitItem.Amount),
Unit: unitItem.Unit,
Floating: unitItem.Floating,
})
@@ -33,3 +37,54 @@
}
return
}
+
+func SetExcelHeader(headers []interface{}, f *excelize.File) (err error) {
+ // 璁剧疆琛ㄥご
+ var i int
+ for _, h := range headers {
+ if v, ok := h.(string); ok {
+ err = f.SetCellValue("Sheet1", getColumnAlphabet(i)+"1", v)
+ if err != nil {
+ return
+ }
+ i++
+ } else if childHeaders, ok := h.(map[string][]string); ok {
+ for title, list := range childHeaders {
+ err = f.SetCellValue("Sheet1", getColumnAlphabet(i)+"1", title)
+ if err != nil {
+ return err
+ }
+ err = f.MergeCell("Sheet1", getColumnAlphabet(i)+"1", getColumnAlphabet(i-1+len(list))+"1") // 鍚堝苟鍗曞厓鏍�
+ for _, t := range list {
+ err = f.SetCellValue("Sheet1", getColumnAlphabet(i)+"2", t)
+ if err != nil {
+ return err
+ }
+ i++
+ }
+ }
+ } else {
+ return errors.New("unsupported header value")
+ }
+ }
+ return nil
+}
+
+func SetHeaderStyle(f *excelize.File) (styleInt int, err error) {
+ // 璁剧疆琛ㄥご鏍峰紡
+ style := &excelize.Style{
+ Border: nil,
+ Fill: excelize.Fill{
+ Type: "pattern",
+ Pattern: 1,
+ Shading: 0,
+ },
+ Font: &excelize.Font{
+ Bold: true,
+ },
+ Alignment: &excelize.Alignment{
+ Horizontal: "center",
+ },
+ }
+ return f.NewStyle(style)
+}
--
Gitblit v1.8.0