From 5cf3151ec11165b150bf6c77a02aef4f161929b1 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期三, 17 四月 2024 15:08:41 +0800
Subject: [PATCH] 出入库明细打印修改
---
controllers/product_controller.go | 1 +
controllers/operation.go | 54 +++++++++++++++++++++++++++---------------------------
controllers/location_product_amount.go | 1 +
3 files changed, 29 insertions(+), 27 deletions(-)
diff --git a/controllers/location_product_amount.go b/controllers/location_product_amount.go
index 4b65a15..0ca586e 100644
--- a/controllers/location_product_amount.go
+++ b/controllers/location_product_amount.go
@@ -168,6 +168,7 @@
BaseOperationType: constvar.BaseOperationTypeAdjust,
Details: []*models.OperationDetails{detail},
LocationID: location.Id,
+ OperationTypeName: "搴撳瓨璋冩暣",
}
if err := models.WithTransaction(func(tx *gorm.DB) error {
diff --git a/controllers/operation.go b/controllers/operation.go
index af53200..dd7e6a7 100644
--- a/controllers/operation.go
+++ b/controllers/operation.go
@@ -921,7 +921,7 @@
rowIndex := 5
totalAmount := decimal.NewFromInt(0)
- //totalPrice := decimal.NewFromInt(0)
+ totalPrice := decimal.NewFromInt(0)
for i, v := range operation.Details {
//璁剧疆琛ㄥ崟鏈�澶�9鏉℃暟鎹�
if i > 8 {
@@ -933,16 +933,14 @@
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()
+ ap := v.Amount.Mul(v.Product.PurchasePrice)
+ totalPrice = totalPrice.Add(ap)
+ price := ap.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
@@ -960,27 +958,29 @@
totalAmount = totalAmount.Add(v.Amount)
}
//鍚堣
- //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)
+ if !totalPrice.IsZero() {
+ price := 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))
+ }
+ } else {
+ f.SetCellValue("Sheet1", "M14", "0")
+ f.SetCellValue("Sheet1", "N14", "0")
+ }
+ 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", "B15", operation.Manager)
f.SetCellValue("Sheet1", "D15", operation.Accountant)
diff --git a/controllers/product_controller.go b/controllers/product_controller.go
index a99ac83..9539f60 100644
--- a/controllers/product_controller.go
+++ b/controllers/product_controller.go
@@ -480,6 +480,7 @@
OperationDate: time.Now().Format("2006-01-02 15:04:05"),
Details: []*models.OperationDetails{detail},
BaseOperationType: constvar.BaseOperationTypeDisuse,
+ OperationTypeName: "搴撳瓨鎶ュ簾",
}
if err := models.NewOperationSearch().Create(&operation); err != nil {
logx.Errorf("Operation create err: %v", err)
--
Gitblit v1.8.0