From b06dff2254f73c8f7aeb0bc58c04025561b84dcc Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 01 八月 2024 16:11:32 +0800
Subject: [PATCH] 出入库明细单据多单位数据使用保存的多单位数据，拼接多个
---
controllers/operation.go | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/controllers/operation.go b/controllers/operation.go
index ae06b4b..a6c89c3 100644
--- a/controllers/operation.go
+++ b/controllers/operation.go
@@ -1125,14 +1125,17 @@
f.SetCellValue(sheet, "B"+strconv.Itoa(rowIndex), v.Product.Type) // 鍨嬪彿
f.SetCellValue(sheet, "C"+strconv.Itoa(rowIndex), v.Product.Unit) // 鍗曚綅
f.SetCellValue(sheet, "D"+strconv.Itoa(rowIndex), v.Amount.String()) // 鏁伴噺
- unit := service.CreateMoreUnit(v.Amount, v.Product.MoreUnitList)
- for _, v1 := range unit {
+ var moreAmount, moreUnit []string
+ for _, v1 := range v.MoreUnitList {
if !v1.Amount.IsZero() {
- f.SetCellValue(sheet, "E"+strconv.Itoa(rowIndex), v1.Amount) // 杈呮暟閲�
- f.SetCellValue(sheet, "F"+strconv.Itoa(rowIndex), v1.Unit) // 杈呭崟浣�
- break
+ moreAmount = append(moreAmount, v1.Amount.String())
+ moreUnit = append(moreUnit, v1.Unit)
}
}
+ if len(moreAmount) > 0 {
+ f.SetCellValue(sheet, "E"+strconv.Itoa(rowIndex), strings.Join(moreAmount, "/")) // 杈呮暟閲�
+ f.SetCellValue(sheet, "F"+strconv.Itoa(rowIndex), strings.Join(moreUnit, "/")) // 杈呭崟浣�
+ }
f.SetCellValue(sheet, "G"+strconv.Itoa(rowIndex), v.Product.SalePrice.String()) // 鍗曚环
// 閲戦
if !v.Product.SalePrice.IsZero() {
--
Gitblit v1.8.0