From fe9a8f47ea30dbd9637c803563abd74bda46900a Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 06 五月 2024 17:24:11 +0800
Subject: [PATCH] 每月1号执行
---
controllers/operation.go | 96 ++++++++++++++++++++++++++++++++---------------
1 files changed, 65 insertions(+), 31 deletions(-)
diff --git a/controllers/operation.go b/controllers/operation.go
index dd7e6a7..e334da1 100644
--- a/controllers/operation.go
+++ b/controllers/operation.go
@@ -2,7 +2,6 @@
import (
"context"
- "encoding/json"
"errors"
"fmt"
"github.com/gin-gonic/gin"
@@ -10,7 +9,6 @@
"github.com/shopspring/decimal"
"github.com/xuri/excelize/v2"
"gorm.io/gorm"
- "os"
"sort"
"strconv"
"strings"
@@ -20,7 +18,6 @@
"wms/extend/code"
"wms/extend/util"
"wms/models"
- "wms/opa"
"wms/pkg/logx"
"wms/pkg/mysqlx"
"wms/pkg/structx"
@@ -542,23 +539,23 @@
}
- if operation.BaseOperationType == constvar.BaseOperationTypeOutgoing {
+ if operation.BaseOperationType == constvar.BaseOperationTypeOutgoing || operation.BaseOperationType == constvar.BaseOperationTypeDisuse {
for k, v := range listDetails {
//todo 婕旂ず娴嬭瘯鏁版嵁
- data, err := os.ReadFile("conf/input.json")
- if err != nil {
- return errors.New("鏂囦欢璇诲彇澶辫触")
- }
- m := make(map[string]interface{})
- err = json.Unmarshal(data, &m)
- if err != nil {
- return errors.New("鏍煎紡杞崲澶辫触")
- }
- if opa.OpaCheck(c, m, "operation") {
- if v.Product.Amount.LessThan(v.Amount) {
- return errors.New(fmt.Sprintf("浜у搧锛�%v,搴撳瓨锛�%v,鍑哄簱锛�%v,鏁伴噺涓嶅锛屾棤娉曞畬鎴愬嚭搴撴搷浣�", v.Product.Name, v.Product.Amount.String(), v.Amount.String()))
- }
- }
+ //data, err := os.ReadFile("conf/input.json")
+ //if err != nil {
+ // return errors.New("鏂囦欢璇诲彇澶辫触")
+ //}
+ //m := make(map[string]interface{})
+ //err = json.Unmarshal(data, &m)
+ //if err != nil {
+ // return errors.New("鏍煎紡杞崲澶辫触")
+ //}
+ //if opa.OpaCheck(c, m, "operation") {
+ // if v.Product.Amount.LessThan(v.Amount) {
+ // return errors.New(fmt.Sprintf("浜у搧锛�%v,搴撳瓨锛�%v,鍑哄簱锛�%v,鏁伴噺涓嶅锛屾棤娉曞畬鎴愬嚭搴撴搷浣�", v.Product.Name, v.Product.Amount.String(), v.Amount.String()))
+ // }
+ //}
//todo ================end===============================
if v.Product.Amount.LessThan(v.Amount) {
return errors.New(fmt.Sprintf("浜у搧锛�%v,搴撳瓨锛�%v,鍑哄簱锛�%v,鏁伴噺涓嶅锛屾棤娉曞畬鎴愬嚭搴撴搷浣�", v.Product.Name, v.Product.Amount.String(), v.Amount.String()))
@@ -600,6 +597,27 @@
toLocAmount.Amount = toLocAmount.Amount.Add(v.Amount)
if err := models.NewLocationProductAmountSearch().SetID(toLocAmount.Id).Update(toLocAmount); err != nil {
return err
+ }
+ } else {
+ if err := models.NewLocationProductAmountSearch().Create(&models.LocationProductAmount{
+ LocationId: v.ToLocationID,
+ ProductCategoryID: v.Product.CategoryId,
+ ProductId: v.ProductId,
+ Amount: v.Amount,
+ CreateDate: time.Now().Format("2006-01-02 15:04:05"),
+ }); err != nil {
+ return err
+ }
+ }
+ }
+ }
+
+ if operation.BaseOperationType == constvar.BaseOperationTypeAdjust {
+ for _, v := range listDetails {
+ if locAmount, aok := mapLocAmount[strconv.Itoa(v.ToLocationID)+v.ProductId]; aok {
+ locAmount.Amount = v.Amount
+ if res := models.NewLocationProductAmountSearch().Orm.Where("id=?", locAmount.ID).Save(locAmount); res.Error != nil {
+ return res.Error
}
} else {
if err := models.NewLocationProductAmountSearch().Create(&models.LocationProductAmount{
@@ -871,14 +889,19 @@
}
var fileUrl string
+ companyName := conf.WebConf.CompanyName
+ if companyName == "" {
+ util.ResponseFormat(c, code.RequestParamError, "缂哄皯宸ュ巶鍚嶇О閰嶇疆")
+ return
+ }
if operation.BaseOperationType == constvar.BaseOperationTypeIncoming {
- if conf.WebConf.CompanyName == "jialian" {
- fileUrl, err = JialianInputOperation(operation)
+ if companyName == "jialian" {
+ fileUrl, err = JialianOperation(constvar.FileTemplateCategory_JialianInput, operation)
if err != nil {
util.ResponseFormat(c, code.RequestParamError, err.Error())
return
}
- } else {
+ } else if companyName == "geruimi" {
fileUrl, err = ExportInputSelfmade(constvar.FileTemplateCategory_Selfmade, operation)
if err != nil {
util.ResponseFormat(c, code.RequestParamError, err.Error())
@@ -886,21 +909,32 @@
}
}
} 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 companyName == "jialian" {
+ fileUrl, err = JialianOperation(constvar.FileTemplateCategory_JialianOutput, operation)
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+ } else if companyName == "geruimi" {
+ fileUrl, err = ExportInputSelfmade(constvar.FileTemplateCategory_Output, operation)
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
}
} else {
util.ResponseFormat(c, code.RequestParamError, "璇ヨ褰曚笉鏀寔鎵撳嵃")
return
}
- util.ResponseFormat(c, code.Success, fileUrl)
+ m := make(map[string]string)
+ m["url"] = fileUrl
+ m["name"] = companyName
+ util.ResponseFormat(c, code.Success, m)
}
-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())
}
@@ -931,9 +965,9 @@
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())
- f.SetCellValue("Sheet1", "E"+strconv.Itoa(rowIndex), v.Product.PurchasePrice.String())
- if !v.Product.PurchasePrice.IsZero() {
- ap := v.Amount.Mul(v.Product.PurchasePrice)
+ f.SetCellValue("Sheet1", "E"+strconv.Itoa(rowIndex), v.Product.SalePrice.String())
+ if !v.Product.SalePrice.IsZero() {
+ ap := v.Amount.Mul(v.Product.SalePrice)
totalPrice = totalPrice.Add(ap)
price := ap.String()
split := strings.Split(price, ".")
--
Gitblit v1.8.0