From ea0cff094c11ffe6c16daf5faf4b4e02aa234412 Mon Sep 17 00:00:00 2001
From: dsmzx <dsmzx@123.com>
Date: 星期二, 25 六月 2024 13:53:36 +0800
Subject: [PATCH] 出库/入库 打印 fileTemplateAttachment中添加仓库id和const中添加两个模板属性
---
controllers/operation.go | 66 ++++++++++++++++++++++++++++++---
1 files changed, 60 insertions(+), 6 deletions(-)
diff --git a/controllers/operation.go b/controllers/operation.go
index 2b5fdc5..cc7030d 100644
--- a/controllers/operation.go
+++ b/controllers/operation.go
@@ -697,7 +697,7 @@
util.ResponseFormat(c, code.Success, "鎿嶄綔鎴愬姛")
}
-// outputOperation
+// OutputOperation
//
// @Tags 鍏ュ簱/鍑哄簱
// @Summary 鎵撳嵃
@@ -737,10 +737,37 @@
if operation.BaseOperationType == constvar.BaseOperationTypeIncoming {
if companyName == "jialian" {
// 鍏ュ簱
- fileUrl, err = JialianOperation(constvar.FileTemplateCategory_JialianInput, operation)
+ oT, err := models.NewOperationTypeSearch().SetID(uint(operation.OperationTypeId)).First()
if err != nil {
util.ResponseFormat(c, code.RequestParamError, err.Error())
return
+ }
+ fileTemplateAttachments, err := models.NewFileTemplateAttachmentSearch().SetWarehouseId(oT.WarehouseId).Find()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+ for _, fileTemplateAttachment := range fileTemplateAttachments {
+ if fileTemplateAttachment.Category == constvar.FileTemplateCategory_JialianInput1 {
+ //fileUrl, err = JialianOperation(constvar.FileTemplateCategory_JialianInput1, operation)
+ fileUrl, err = JialianOperation(fileTemplateAttachment.Category, operation)
+ // 鍑哄簱
+ //fileUrl, err = JialianOperation(constvar.FileTemplateCategory_JialianOutput1, operation)
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+ break
+ } else if fileTemplateAttachment.Category == constvar.FileWarehouseCategory_JialianInput2 {
+ fileUrl, err = JialianOperation(fileTemplateAttachment.Category, operation)
+ // 鍑哄簱
+ //fileUrl, err = JialianOperation(constvar.FileTemplateCategory_JialianOutput1, operation)
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+ break
+ }
}
} else if companyName == "geruimi" {
fileUrl, err = ExportInputSelfmade(constvar.FileTemplateCategory_Selfmade, operation)
@@ -751,12 +778,39 @@
}
} else if operation.BaseOperationType == constvar.BaseOperationTypeOutgoing { // 浜よ揣
if companyName == "jialian" {
- // 鍑哄簱
- fileUrl, err = JialianOperation(constvar.FileTemplateCategory_JialianOutput, operation)
+ oT, err := models.NewOperationTypeSearch().SetID(uint(operation.OperationTypeId)).First()
if err != nil {
util.ResponseFormat(c, code.RequestParamError, err.Error())
return
}
+ fileTemplateAttachments, err := models.NewFileTemplateAttachmentSearch().SetWarehouseId(oT.WarehouseId).Find()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+ for _, fileTemplateAttachment := range fileTemplateAttachments {
+ if fileTemplateAttachment.Category == constvar.FileTemplateCategory_JialianOutput1 {
+ //fileUrl, err = JialianOperation(constvar.FileTemplateCategory_JialianInput1, operation)
+ fileUrl, err = JialianOperation(fileTemplateAttachment.Category, operation)
+ // 鍑哄簱
+ //fileUrl, err = JialianOperation(constvar.FileTemplateCategory_JialianOutput1, operation)
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+ break
+ } else if fileTemplateAttachment.Category == constvar.FileWarehouseCategory_JialianOutput2 {
+ fileUrl, err = JialianOperation(fileTemplateAttachment.Category, operation)
+ // 鍑哄簱
+ //fileUrl, err = JialianOperation(constvar.FileTemplateCategory_JialianOutput1, operation)
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+ break
+ }
+ }
+
} else if companyName == "geruimi" {
fileUrl, err = ExportInputSelfmade(constvar.FileTemplateCategory_Output, operation)
if err != nil {
@@ -800,9 +854,9 @@
defer f.Close()
sheet := "Sheet1"
- if category == constvar.FileTemplateCategory_JialianInput {
+ if category == constvar.FileTemplateCategory_JialianInput1 {
sheet = "鍏ュ簱鍗�"
- } else if category == constvar.FileTemplateCategory_JialianOutput {
+ } else if category == constvar.FileTemplateCategory_JialianOutput1 {
sheet = "鍑哄簱鍗�"
}
--
Gitblit v1.8.0