From 216c9e49dafdb7a5bd025f6d6fa899a33befc38c Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期三, 17 四月 2024 10:33:01 +0800
Subject: [PATCH] 产品添加字段
---
controllers/operation.go | 69 ++++++++++++++++++++++++++++++++--
models/operation_details.go | 2 +
2 files changed, 66 insertions(+), 5 deletions(-)
diff --git a/controllers/operation.go b/controllers/operation.go
index b9c4058..450d03c 100644
--- a/controllers/operation.go
+++ b/controllers/operation.go
@@ -15,6 +15,7 @@
"strconv"
"strings"
"time"
+ "wms/conf"
"wms/constvar"
"wms/extend/code"
"wms/extend/util"
@@ -871,10 +872,18 @@
var fileUrl string
if operation.BaseOperationType == constvar.BaseOperationTypeIncoming {
- fileUrl, err = ExportInputSelfmade(constvar.FileTemplateCategory_Selfmade, operation)
- if err != nil {
- util.ResponseFormat(c, code.RequestParamError, err.Error())
- return
+ if conf.WebConf.CompanyName == "jialian" {
+ fileUrl, err = JialianInputOperation(operation)
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+ } else {
+ fileUrl, err = ExportInputSelfmade(constvar.FileTemplateCategory_Selfmade, operation)
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
}
} else if operation.BaseOperationType == constvar.BaseOperationTypeOutgoing {
fileUrl, err = ExportOutputOperation(constvar.FileTemplateCategory_Output, operation)
@@ -890,8 +899,58 @@
util.ResponseFormat(c, code.Success, fileUrl)
}
-func JialianInputOperation() {
+func JialianInputOperation(operation *models.Operation) (string, error) {
+ template, err := models.NewFileTemplateAttachmentSearch().SetCategory(14).First()
+ if err != nil {
+ return "", errors.New("鑾峰彇妯＄増璁板綍澶辫触:" + err.Error())
+ }
+ readerCloser, err := http.HttpGetWithReadCloser(template.FileUrl)
+ if err != nil {
+ return "", errors.New("鑾峰彇妯＄増澶辫触:" + err.Error())
+ }
+ f, err := excelize.OpenReader(readerCloser)
+ if err != nil {
+ return "", errors.New("璇诲彇excel妯＄増澶辫触锛�" + err.Error())
+ }
+ readerCloser.Close()
+ defer f.Close()
+
+ f.SetCellValue("Sheet1", "C2", operation.CompanyName)
+ f.SetCellValue("Sheet1", "H2", operation.OperationDate)
+ f.SetCellValue("Sheet1", "O2", operation.Number)
+
+ rowIndex := 5
+ totalAmount := decimal.NewFromInt(0)
+ for i, v := range operation.Details {
+ //璁剧疆琛ㄥ崟鏈�澶�9鏉℃暟鎹�
+ if i > 8 {
+ break
+ }
+ f.SetCellValue("Sheet1", "A"+strconv.Itoa(rowIndex), v.Product.Name)
+ f.SetCellValue("Sheet1", "B"+strconv.Itoa(rowIndex), v.Product.Type)
+ f.SetCellValue("Sheet1", "C"+strconv.Itoa(rowIndex), v.Product.Unit)
+ f.SetCellValue("Sheet1", "D"+strconv.Itoa(rowIndex), v.Amount.String())
+ rowIndex++
+ totalAmount = totalAmount.Add(v.Amount)
+ }
+ f.SetCellValue("Sheet1", "D14", totalAmount)
+ f.SetCellValue("Sheet1", "B15", operation.Manager)
+ f.SetCellValue("Sheet1", "D15", operation.Accountant)
+ f.SetCellValue("Sheet1", "F15", operation.Custodian)
+
+ buf, err := f.WriteToBuffer()
+ if err != nil {
+ return "", err
+ }
+
+ fileUrl, err := upload.UploadFileToSeaWeed(string(constvar.FileType_File), uuid.NewV4().String()+".xlsx", buf.Bytes())
+ if err != nil {
+ logx.Errorf("file upload err: %v", err)
+ return "", err
+ }
+
+ return fileUrl, nil
}
func ExportInputSelfmade(category constvar.FileTemplateCategory, operation *models.Operation) (string, error) {
diff --git a/models/operation_details.go b/models/operation_details.go
index 13b8463..d332011 100644
--- a/models/operation_details.go
+++ b/models/operation_details.go
@@ -25,6 +25,8 @@
ToLocation Location `json:"toLocation" gorm:"foreignKey:ToLocationID;references:Id"` //鐩爣浣嶇疆
TotalGrossWeight decimal.Decimal `json:"totalGrossWeight" gorm:"type:decimal(20,3);comment:鎬绘瘺閲�"`
TotalNetWeight decimal.Decimal `json:"totalNetWeight" gorm:"type:decimal(20,3);comment:鎬诲噣閲�"`
+ AuxiliaryAmount decimal.Decimal `json:"auxiliaryAmount" gorm:"type:decimal(20,3);comment:杈呭姪鏁伴噺"`
+ AuxiliaryUnit string `json:"auxiliaryUnit" gorm:"type:varchar(191);comment:杈呭姪鍗曚綅"`
}
OperationDetailsSearch struct {
--
Gitblit v1.8.0