From 3643c9f7402f6413b30db44633ad6ddd64ef1124 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期三, 17 四月 2024 16:37:22 +0800
Subject: [PATCH] 嘉联出库打印
---
constvar/const.go | 6 ++++--
controllers/operation.go | 24 ++++++++++++++++--------
2 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/constvar/const.go b/constvar/const.go
index b7ff0c2..cf6367a 100644
--- a/constvar/const.go
+++ b/constvar/const.go
@@ -286,8 +286,10 @@
type FileTemplateCategory int
const (
- FileTemplateCategory_Selfmade FileTemplateCategory = iota + 1 //鍏ュ簱-鑷埗
- FileTemplateCategory_Output //鍑哄簱
+ FileTemplateCategory_Selfmade FileTemplateCategory = iota + 1 //鍏ュ簱-鑷埗
+ FileTemplateCategory_Output //鍑哄簱
+ FileTemplateCategory_JialianInput = 14 //鍢夎仈鍏ュ簱
+ FileTemplateCategory_JialianOutput = 15 //鍢夎仈鍑哄簱
)
type CodeStandardType string
diff --git a/controllers/operation.go b/controllers/operation.go
index dd7e6a7..229b1eb 100644
--- a/controllers/operation.go
+++ b/controllers/operation.go
@@ -873,12 +873,12 @@
var fileUrl string
if operation.BaseOperationType == constvar.BaseOperationTypeIncoming {
if conf.WebConf.CompanyName == "jialian" {
- fileUrl, err = JialianInputOperation(operation)
+ fileUrl, err = JialianOperation(constvar.FileTemplateCategory_JialianInput, operation)
if err != nil {
util.ResponseFormat(c, code.RequestParamError, err.Error())
return
}
- } else {
+ } else if conf.WebConf.CompanyName == "geruimi" {
fileUrl, err = ExportInputSelfmade(constvar.FileTemplateCategory_Selfmade, operation)
if err != nil {
util.ResponseFormat(c, code.RequestParamError, err.Error())
@@ -886,10 +886,18 @@
}
}
} else if operation.BaseOperationType == constvar.BaseOperationTypeOutgoing {
- fileUrl, err = ExportOutputOperation(constvar.FileTemplateCategory_Output, operation)
- if err != nil {
- util.ResponseFormat(c, code.RequestParamError, err.Error())
- return
+ if conf.WebConf.CompanyName == "jialian" {
+ fileUrl, err = JialianOperation(constvar.FileTemplateCategory_JialianOutput, operation)
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+ } else if conf.WebConf.CompanyName == "geruimi" {
+ fileUrl, err = ExportInputSelfmade(constvar.FileTemplateCategory_Selfmade, operation)
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
}
} else {
util.ResponseFormat(c, code.RequestParamError, "璇ヨ褰曚笉鏀寔鎵撳嵃")
@@ -899,8 +907,8 @@
util.ResponseFormat(c, code.Success, fileUrl)
}
-func JialianInputOperation(operation *models.Operation) (string, error) {
- template, err := models.NewFileTemplateAttachmentSearch().SetCategory(14).First()
+func JialianOperation(category constvar.FileTemplateCategory, operation *models.Operation) (string, error) {
+ template, err := models.NewFileTemplateAttachmentSearch().SetCategory(category).First()
if err != nil {
return "", errors.New("鑾峰彇妯＄増璁板綍澶辫触:" + err.Error())
}
--
Gitblit v1.8.0