From efec800478214f3a412f879d2b51c2968515995d Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 25 十一月 2023 17:04:25 +0800
Subject: [PATCH] plc断开连接时获取工序最后一次报工数量作为加工数

---
 model/procedures.go |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/model/procedures.go b/model/procedures.go
index c1df06c..d2d85d5 100644
--- a/model/procedures.go
+++ b/model/procedures.go
@@ -193,7 +193,7 @@
 	}
 
 	if slf.StartTimeMin != 0 {
-		db = db.Where("start_time >= ?", slf.EndTimeMin)
+		db = db.Where("start_time >= ?", slf.StartTimeMin)
 	}
 
 	if slf.EndTimeMin != 0 {
@@ -201,7 +201,7 @@
 	}
 
 	if slf.EndTimeMax != 0 {
-		db = db.Where("end_time < ?", slf.StartTimeMax)
+		db = db.Where("end_time < ?", slf.EndTimeMax)
 	}
 
 	if slf.Status != 0 {
@@ -336,7 +336,7 @@
 		db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
 	}
 
-	if slf.Offset*slf.Limit > 0 {
+	if slf.Limit > 0 {
 		db = db.Offset(slf.Offset).Limit(slf.Limit)
 	}
 

--
Gitblit v1.8.0