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 | 14 ++++++++++++--
models/operation.go | 15 +++++++++------
2 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/controllers/operation.go b/controllers/operation.go
index e334da1..7a6a2d0 100644
--- a/controllers/operation.go
+++ b/controllers/operation.go
@@ -17,6 +17,7 @@
"wms/constvar"
"wms/extend/code"
"wms/extend/util"
+ "wms/middleware"
"wms/models"
"wms/pkg/logx"
"wms/pkg/mysqlx"
@@ -75,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
@@ -411,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 {
@@ -532,6 +539,8 @@
Comment: operation.Comment,
BaseOperationType: constvar.BaseOperationTypeInternal,
Details: details,
+ CheckedAt: time.Now(),
+ CheckedBy: userInfo.Username,
}).Error; err != nil {
return err
}
@@ -638,6 +647,7 @@
util.ResponseFormat(c, code.RequestError, err.Error())
return
}
+
//淇敼鍏朵粬绯荤粺璁㈠崟鐘舵��
if operation.BaseOperationType == constvar.BaseOperationTypeIncoming {
if operation.Source != "" {
diff --git a/models/operation.go b/models/operation.go
index ff81c5b..954306a 100644
--- a/models/operation.go
+++ b/models/operation.go
@@ -51,12 +51,15 @@
ToLocation Location `json:"toLocation" gorm:"foreignKey:ToLocationID;references:Id"` //鐩爣浣嶇疆
SalesDetailsNumber string `gorm:"type:varchar(191);comment:閿�鍞槑缁嗙紪鐮�" json:"salesDetailsNumber"`
- ManagerId string `json:"managerId" gorm:"type:varchar(255);comment:涓荤id"`
- Manager string `json:"manager" gorm:"type:varchar(255);comment:涓荤鍚嶇О"`
- AccountantId string `json:"accountantId" gorm:"type:varchar(255);comment:浼氳id"`
- Accountant string `json:"accountant" gorm:"type:varchar(255);comment:浼氳鍚嶇О"`
- CustodianId string `json:"custodianId" gorm:"type:varchar(255);comment:淇濈鍛榠d"`
- Custodian string `json:"custodian" gorm:"type:varchar(255);comment:淇濈鍛樺悕绉�"`
+ ManagerId string `json:"managerId" gorm:"type:varchar(255);comment:涓荤id"`
+ Manager string `json:"manager" gorm:"type:varchar(255);comment:涓荤鍚嶇О"`
+ AccountantId string `json:"accountantId" gorm:"type:varchar(255);comment:浼氳id"`
+ Accountant string `json:"accountant" gorm:"type:varchar(255);comment:浼氳鍚嶇О"`
+ CustodianId string `json:"custodianId" gorm:"type:varchar(255);comment:淇濈鍛榠d"`
+ Custodian string `json:"custodian" gorm:"type:varchar(255);comment:淇濈鍛樺悕绉�"`
+ CreatedBy string `json:"createBy" gorm:"type:varchar(255);comment:鍒涘缓鑰匲serId"`
+ CheckedBy string `json:"checkedBy" gorm:"type:varchar(255);comment:楠岃瘉鑰匲serId"`
+ CheckedAt time.Time `json:"checkedAt" gorm:"type:datetime;comment:楠岃瘉鑰呴獙璇佹搷浣滄椂闂�"`
}
OperationSearch struct {
--
Gitblit v1.8.0