From cab6eea89a0d82710369604ecb51f1cdb122e433 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 19 十月 2023 17:26:34 +0800
Subject: [PATCH] fix
---
model/production_progress.go | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/model/production_progress.go b/model/production_progress.go
index 3fdb02c..d928936 100644
--- a/model/production_progress.go
+++ b/model/production_progress.go
@@ -9,21 +9,22 @@
type (
ProductionProgress struct {
gorm.Model
- WorkOrderID string `gorm:"index;type:varchar(191);not null;comment:宸ュ崟ID" json:"workOrderID"`
- OrderID string `gorm:"index;type:varchar(191);not null;comment:璁㈠崟ID" json:"orderID"`
- ProcedureID string `gorm:"type:varchar(191);comment:宸ュ簭ID" json:"procedureId"`
- DeviceID string `gorm:"type:varchar(191);not null;comment:璁惧ID" json:"deviceId"`
- FinishedQuantity int64 `gorm:"type:int;not null;comment:瀹屾垚鏁伴噺" json:"finishedQuantity"`
- Channel int32 `gorm:"type:int;comment:宸ヤ綔閫氶亾" json:"channel"` //閫氶亾
- TotalQuantity int64 `gorm:"type:int;not null;comment:鎬婚噺" json:"totalQuantity"`
+ WorkOrderID string `gorm:"index;type:varchar(191);not null" json:"workOrderID"`
+ OrderID string `gorm:"index;type:varchar(191);not null" json:"orderID"`
+ ProcedureID string `gorm:"type:varchar(191)" json:"procedureId"`
+ DeviceID string `gorm:"type:varchar(191);not null" json:"deviceId"`
+ FinishedQuantity int64 `gorm:"type:int;not null" json:"finishedQuantity"`
+ Channel int32 `gorm:"type:int" json:"channel"` //閫氶亾
+ TotalQuantity int64 `gorm:"type:int;not null" json:"totalQuantity"`
}
ProductionProgressSearch struct {
ProductionProgress
- Order string
- PageNum int
- PageSize int
- Orm *gorm.DB
+ Order string
+ PageNum int
+ PageSize int
+ Orm *gorm.DB
+ UnFinished bool
}
)
@@ -78,6 +79,11 @@
return slf
}
+func (slf *ProductionProgressSearch) SetUnFinished() *ProductionProgressSearch {
+ slf.UnFinished = true
+ return slf
+}
+
func (slf *ProductionProgressSearch) build() *gorm.DB {
var db = slf.Orm.Model(&ProductionProgress{})
@@ -109,6 +115,10 @@
db = db.Where("channel = ?", slf.Channel)
}
+ if slf.UnFinished {
+ db = db.Where("finished_quantity < total_quantity")
+ }
+
return db
}
--
Gitblit v1.8.0