From 73a3d53bfcfa0fde7b9ea2a14c8bcfea42ebf3ad Mon Sep 17 00:00:00 2001
From: lishihai <dslsh@dscom>
Date: 星期四, 13 六月 2024 10:50:00 +0800
Subject: [PATCH] 概述(一级模块)-入库(二级模块)-新建时保存新建单据人信息;验证时保存验证人信息
---
controllers/operation.go | 94 ++++++++++++++++++++++++++++++++--------------
1 files changed, 65 insertions(+), 29 deletions(-)
diff --git a/controllers/operation.go b/controllers/operation.go
index 229b1eb..7a6a2d0 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"
@@ -19,8 +17,8 @@
"wms/constvar"
"wms/extend/code"
"wms/extend/util"
+ "wms/middleware"
"wms/models"
- "wms/opa"
"wms/pkg/logx"
"wms/pkg/mysqlx"
"wms/pkg/structx"
@@ -78,7 +76,8 @@
util.ResponseFormat(c, code.RequestParamError, err.Error())
return
}
-
+ userInfo := middleware.GetUserInfo(c)
+ params.CreatedBy = userInfo.Username
params.Status = constvar.OperationStatus_Ready
//params.Number = strconv.FormatInt(time.Now().Unix(), 10)
params.BaseOperationType = operationType.BaseOperationType
@@ -414,9 +413,14 @@
mapLocAmount[strconv.Itoa(v.LocationId)+v.ProductId] = v
}
}
+ userInfo := middleware.GetUserInfo(c)
err = models.WithTransaction(func(tx *gorm.DB) error {
- if err := models.NewOperationSearch().SetOrm(tx).SetID(id).Update(&models.Operation{Status: constvar.OperationStatus_Finish, AuditDate: time.Now().Format("2006-01-02 15:04:05")}); err != nil {
+ if err := models.NewOperationSearch().SetOrm(tx).SetID(id).Update(&models.Operation{
+ Status: constvar.OperationStatus_Finish,
+ CheckedBy: userInfo.Username,
+ CheckedAt: time.Now(),
+ AuditDate: time.Now().Format("2006-01-02 15:04:05")}); err != nil {
return err
}
if err := AddMoveHistory([]*models.Operation{operation}, tx); err != nil {
@@ -535,6 +539,8 @@
Comment: operation.Comment,
BaseOperationType: constvar.BaseOperationTypeInternal,
Details: details,
+ CheckedAt: time.Now(),
+ CheckedBy: userInfo.Username,
}).Error; err != nil {
return err
}
@@ -542,23 +548,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()))
@@ -614,12 +620,34 @@
}
}
}
+
+ 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{
+ 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
+ }
+ }
+ }
+ }
return nil
})
if err != nil {
util.ResponseFormat(c, code.RequestError, err.Error())
return
}
+
//淇敼鍏朵粬绯荤粺璁㈠崟鐘舵��
if operation.BaseOperationType == constvar.BaseOperationTypeIncoming {
if operation.Source != "" {
@@ -871,14 +899,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" {
+ if companyName == "jialian" {
fileUrl, err = JialianOperation(constvar.FileTemplateCategory_JialianInput, operation)
if err != nil {
util.ResponseFormat(c, code.RequestParamError, err.Error())
return
}
- } else if conf.WebConf.CompanyName == "geruimi" {
+ } else if companyName == "geruimi" {
fileUrl, err = ExportInputSelfmade(constvar.FileTemplateCategory_Selfmade, operation)
if err != nil {
util.ResponseFormat(c, code.RequestParamError, err.Error())
@@ -886,14 +919,14 @@
}
}
} else if operation.BaseOperationType == constvar.BaseOperationTypeOutgoing {
- if conf.WebConf.CompanyName == "jialian" {
+ if 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)
+ } else if companyName == "geruimi" {
+ fileUrl, err = ExportInputSelfmade(constvar.FileTemplateCategory_Output, operation)
if err != nil {
util.ResponseFormat(c, code.RequestParamError, err.Error())
return
@@ -904,7 +937,10 @@
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 JialianOperation(category constvar.FileTemplateCategory, operation *models.Operation) (string, error) {
@@ -939,9 +975,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