From a0125ef3d6ce35be7b6dc4919c4192dba4a7329a Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期四, 16 十一月 2023 14:33:51 +0800
Subject: [PATCH] 报废数量bug
---
models/db.go | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/models/db.go b/models/db.go
index 8f47201..53e3be6 100644
--- a/models/db.go
+++ b/models/db.go
@@ -3,11 +3,14 @@
import (
"fmt"
"gorm.io/gorm/schema"
+ "strconv"
+ "time"
"wms/conf"
"wms/extend/util"
"wms/pkg/logx"
"wms/pkg/mysqlx"
"wms/pkg/snowflake"
+ "wms/proto/code"
"gorm.io/gorm"
)
@@ -55,6 +58,31 @@
return nil
}
+func GetAutoCode(id int, codeStandard *code.CodeStandard) string {
+ autoCode := ""
+ var prefixValue string
+ if codeStandard.AutoRule.PrefixMethod == 2 { // 鏉ユ簮鍗曟嵁
+ prefixValue = ""
+ } else { // 鍥哄畾鍊�
+ prefixValue = codeStandard.AutoRule.PrefixValue
+ }
+ strMaxAutoIncr := strconv.Itoa(id + 1)
+ count := int(codeStandard.AutoRule.AutoLength) - len(strMaxAutoIncr)
+ for i := 0; i < count; i++ {
+ strMaxAutoIncr = "0" + strMaxAutoIncr
+ }
+
+ var suffixValue string
+ if codeStandard.AutoRule.SuffixMethod == 2 { // 骞存湀鏃�+鑷闀�
+ suffixValue = fmt.Sprintf("%v%v", time.Now().Format("20060102"), strMaxAutoIncr)
+ } else { // 鑷闀�
+ suffixValue = strMaxAutoIncr
+ }
+
+ autoCode = prefixValue + suffixValue
+ return autoCode
+}
+
func Init() error {
fmt.Printf("dsn=%v\n", conf.DbConf.Dsn)
if err := mysqlx.Init(conf.DbConf, logx.GetLogger()); err != nil {
@@ -81,12 +109,13 @@
Operation{},
OperationDetails{},
Scrap{},
- MoveHistory{},
- //Product{},
ProductCategory{},
Material{},
LocationProduct{},
LocationProductAmount{},
+ ReorderRule{},
+ Attachment{},
+ LogisticCompany{},
)
return err
}
@@ -98,6 +127,7 @@
func InsertDefaultData() {
models := []interface{}{
NewDepartmentSearch(),
+ NewLocationSearch(),
}
for _, model := range models {
if id, ok := model.(InitDefaultData); ok {
--
Gitblit v1.8.0