From 431caa4055c117b413736e302206c1089c486b36 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期五, 15 十二月 2023 16:14:48 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS
---
models/operation.go | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/models/operation.go b/models/operation.go
index c866d0f..2009733 100644
--- a/models/operation.go
+++ b/models/operation.go
@@ -158,8 +158,7 @@
}
if slf.Preload {
- db = db.Model(&Operation{}).Preload("Details").Preload("Details.Product").Preload("FromLocation").
- Preload("ToLocation").Preload("LogisticCompany")
+ db = db.Model(&Operation{}).Preload("Details").Preload("Details.Product").Preload("LogisticCompany").Preload("FromLocation").Preload("ToLocation")
}
if slf.Disuse {
@@ -338,3 +337,15 @@
return records, nil
}
+
+func (slf *OperationSearch) MaxAutoIncr() (int, error) {
+ var (
+ db = slf.build()
+ total int64
+ )
+
+ if err := db.Count(&total).Error; err != nil {
+ return int(total), fmt.Errorf("max err: %v", err)
+ }
+ return int(total), nil
+}
--
Gitblit v1.8.0