From 8324f872ef3a4d0c978a9b1d062800c6a1701c12 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 01 十二月 2023 09:58:17 +0800
Subject: [PATCH] fix
---
model/production_progress.go | 549 ++++++++++++++++++++++++++++--------------------------
1 files changed, 284 insertions(+), 265 deletions(-)
diff --git a/model/production_progress.go b/model/production_progress.go
index 898b186..c6deb29 100644
--- a/model/production_progress.go
+++ b/model/production_progress.go
@@ -1,267 +1,286 @@
package model
-import (
- "apsClient/pkg/sqlitex"
- "fmt"
- "gorm.io/gorm"
-)
-
-type (
- ProductionProgress struct {
- gorm.Model `json:"-"`
- ID int `gorm:"primarykey"`
- 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"`
- Position int `gorm:"type:int;comment:宸ヤ綔浣嶇疆" json:"position"` //姣忎釜璁惧鍙兘鏈夊涓満浣嶅悓鏃剁敓浜э紝鐢╬osition琛ㄧず浣嶇疆
- TotalQuantity int64 `gorm:"type:int;not null;comment:鎬婚噺" json:"totalQuantity"`
- }
-
- ProductionProgressSearch struct {
- ProductionProgress
- Order string
- PageNum int
- PageSize int
- Orm *gorm.DB
- }
-)
-
-func (slf *ProductionProgress) TableName() string {
- return "production_progress"
-}
-
-func NewProductionProgressSearch(db *gorm.DB) *ProductionProgressSearch {
- if db == nil {
- db = sqlitex.GetDB()
- }
- return &ProductionProgressSearch{Orm: db}
-}
-
-func (slf *ProductionProgressSearch) SetOrm(tx *gorm.DB) *ProductionProgressSearch {
- slf.Orm = tx
- return slf
-}
-
-func (slf *ProductionProgressSearch) SetPage(page, size int) *ProductionProgressSearch {
- slf.PageNum, slf.PageSize = page, size
- return slf
-}
-
-func (slf *ProductionProgressSearch) SetOrder(order string) *ProductionProgressSearch {
- slf.Order = order
- return slf
-}
-
-func (slf *ProductionProgressSearch) SetWorkOrderId(orderId string) *ProductionProgressSearch {
- slf.WorkOrderID = orderId
- return slf
-}
-
-func (slf *ProductionProgressSearch) SetProcedureId(procedureId string) *ProductionProgressSearch {
- slf.ProcedureID = procedureId
- return slf
-}
-
-func (slf *ProductionProgressSearch) SetDeviceId(id string) *ProductionProgressSearch {
- slf.DeviceID = id
- return slf
-}
-
-func (slf *ProductionProgressSearch) SetId(id int) *ProductionProgressSearch {
- slf.ID = id
- return slf
-}
-
-func (slf *ProductionProgressSearch) SetPosition(position int) *ProductionProgressSearch {
- slf.Position = position
- return slf
-}
-
-func (slf *ProductionProgressSearch) build() *gorm.DB {
- var db = slf.Orm.Model(&ProductionProgress{})
-
- if slf.Order != "" {
- db = db.Order(slf.Order)
- }
-
- if slf.ID != 0 {
- db = db.Where("id = ?", slf.ID)
- }
-
- if slf.WorkOrderID != "" {
- db = db.Where("work_order_id = ?", slf.WorkOrderID)
- }
-
- if slf.OrderID != "" {
- db = db.Where("order_id = ?", slf.OrderID)
- }
-
- if slf.ProcedureID != "" {
- db = db.Where("procedure_id = ?", slf.ProcedureID)
- }
-
- if slf.DeviceID != "" {
- db = db.Where("device_id = ?", slf.DeviceID)
- }
-
- if slf.Position != 0 {
- db = db.Where("position = ?", slf.Position)
- }
-
- return db
-}
-
-// Create 鍗曟潯鎻掑叆
-func (slf *ProductionProgressSearch) Create(record *ProductionProgress) error {
- var db = slf.build()
-
- if err := db.Create(record).Error; err != nil {
- return fmt.Errorf("create err: %v, record: %+v", err, record)
- }
-
- return nil
-}
-
-// CreateBatch 鎵归噺鎻掑叆
-func (slf *ProductionProgressSearch) CreateBatch(records []*ProductionProgress) error {
- var db = slf.build()
-
- if err := db.Create(&records).Error; err != nil {
- return fmt.Errorf("create batch err: %v, records: %+v", err, records)
- }
-
- return nil
-}
-
-func (slf *ProductionProgressSearch) Save(record *ProductionProgress) error {
- var db = slf.build()
-
- if err := db.Save(record).Error; err != nil {
- return fmt.Errorf("save err: %v, record: %+v", err, record)
- }
-
- return nil
-}
-
-func (slf *ProductionProgressSearch) UpdateByMap(upMap map[string]interface{}) error {
- var (
- db = slf.build()
- )
-
- if err := db.Updates(upMap).Error; err != nil {
- return fmt.Errorf("update by map err: %v, upMap: %+v", err, upMap)
- }
-
- return nil
-}
-
-func (slf *ProductionProgressSearch) UpdateByQuery(query string, args []interface{}, upMap map[string]interface{}) error {
- var (
- db = slf.Orm.Table(slf.TableName()).Where(query, args...)
- )
-
- if err := db.Updates(upMap).Error; err != nil {
- return fmt.Errorf("update by query err: %v, query: %s, args: %+v, upMap: %+v", err, query, args, upMap)
- }
-
- return nil
-}
-
-func (slf *ProductionProgressSearch) Delete() error {
- var db = slf.build()
-
- if err := db.Unscoped().Delete(&ProductionProgress{}).Error; err != nil {
- return err
- }
-
- return nil
-}
-
-func (slf *ProductionProgressSearch) First() (*ProductionProgress, error) {
- var (
- record = new(ProductionProgress)
- db = slf.build()
- )
-
- if err := db.First(record).Error; err != nil {
- return record, err
- }
-
- return record, nil
-}
-
-func (slf *ProductionProgressSearch) Find() ([]*ProductionProgress, int64, error) {
- var (
- records = make([]*ProductionProgress, 0)
- total int64
- db = slf.build()
- )
-
- if err := db.Count(&total).Error; err != nil {
- return records, total, fmt.Errorf("find count err: %v", err)
- }
- if slf.PageNum*slf.PageSize > 0 {
- db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
- }
- if err := db.Find(&records).Error; err != nil {
- return records, total, fmt.Errorf("find records err: %v", err)
- }
-
- return records, total, nil
-}
-
-func (slf *ProductionProgressSearch) FindNotTotal() ([]*ProductionProgress, error) {
- var (
- records = make([]*ProductionProgress, 0)
- db = slf.build()
- )
-
- if slf.PageNum*slf.PageSize > 0 {
- db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
- }
- if err := db.Find(&records).Error; err != nil {
- return records, fmt.Errorf("find records err: %v", err)
- }
-
- return records, nil
-}
-
-// FindByQuery 鎸囧畾鏉′欢鏌ヨ.
-func (slf *ProductionProgressSearch) FindByQuery(query string, args []interface{}) ([]*ProductionProgress, int64, error) {
- var (
- records = make([]*ProductionProgress, 0)
- total int64
- db = slf.Orm.Table(slf.TableName()).Where(query, args...)
- )
-
- if err := db.Count(&total).Error; err != nil {
- return records, total, fmt.Errorf("find by query count err: %v", err)
- }
- if slf.PageNum*slf.PageSize > 0 {
- db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
- }
- if err := db.Find(&records).Error; err != nil {
- return records, total, fmt.Errorf("find by query records err: %v, query: %s, args: %+v", err, query, args)
- }
-
- return records, total, nil
-}
-
-// FindByQueryNotTotal 鎸囧畾鏉′欢鏌ヨ&涓嶆煡璇㈡�绘潯鏁�.
-func (slf *ProductionProgressSearch) FindByQueryNotTotal(query string, args []interface{}) ([]*ProductionProgress, error) {
- var (
- records = make([]*ProductionProgress, 0)
- db = slf.Orm.Table(slf.TableName()).Where(query, args...)
- )
-
- if slf.PageNum*slf.PageSize > 0 {
- db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
- }
- if err := db.Find(&records).Error; err != nil {
- return records, fmt.Errorf("find by query records err: %v, query: %s, args: %+v", err, query, args)
- }
-
- return records, nil
-}
+//
+//import (
+// "apsClient/pkg/sqlitex"
+// "fmt"
+// "github.com/jinzhu/gorm"
+//)
+//
+//type (
+// ProductionProgress struct {
+// gorm.Model
+// ProceduresID uint `gorm:"index;type:varchar(191)" json:"proceduresId"` //procedures琛ㄧ殑id
+// 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"`
+// ProductProcedureID string `gorm:"type:varchar(191);" json:"productProcedureID"` //浜у搧宸ュ簭id
+// 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
+// UnFinished bool
+// }
+//)
+//
+//func (slf *ProductionProgress) TableName() string {
+// return "production_progress"
+//}
+//
+//func NewProductionProgressSearch(db *gorm.DB) *ProductionProgressSearch {
+// if db == nil {
+// db = sqlitex.GetDB()
+// }
+// return &ProductionProgressSearch{Orm: db}
+//}
+//
+//func (slf *ProductionProgressSearch) SetOrm(tx *gorm.DB) *ProductionProgressSearch {
+// slf.Orm = tx
+// return slf
+//}
+//
+//func (slf *ProductionProgressSearch) SetPage(page, size int) *ProductionProgressSearch {
+// slf.PageNum, slf.PageSize = page, size
+// return slf
+//}
+//
+//func (slf *ProductionProgressSearch) SetOrder(order string) *ProductionProgressSearch {
+// slf.Order = order
+// return slf
+//}
+//
+//func (slf *ProductionProgressSearch) SetWorkOrderId(orderId string) *ProductionProgressSearch {
+// slf.WorkOrderID = orderId
+// return slf
+//}
+//
+//func (slf *ProductionProgressSearch) SetProcedureId(procedureId string) *ProductionProgressSearch {
+// slf.ProcedureID = procedureId
+// return slf
+//}
+//
+//func (slf *ProductionProgressSearch) SetProceduresId(proceduresId uint) *ProductionProgressSearch {
+// slf.ProceduresID = proceduresId
+// return slf
+//}
+//
+//func (slf *ProductionProgressSearch) SetDeviceId(id string) *ProductionProgressSearch {
+// slf.DeviceID = id
+// return slf
+//}
+//
+//func (slf *ProductionProgressSearch) SetProductProcedureId(productProcedureId string) *ProductionProgressSearch {
+// slf.ProductProcedureID = productProcedureId
+// return slf
+//}
+//
+//func (slf *ProductionProgressSearch) SetId(id uint) *ProductionProgressSearch {
+// slf.ID = id
+// return slf
+//}
+//
+//func (slf *ProductionProgressSearch) SetChannel(channel int32) *ProductionProgressSearch {
+// slf.Channel = channel
+// return slf
+//}
+//
+//func (slf *ProductionProgressSearch) SetUnFinished() *ProductionProgressSearch {
+// slf.UnFinished = true
+// return slf
+//}
+//
+//func (slf *ProductionProgressSearch) build() *gorm.DB {
+// var db = slf.Orm.Model(&ProductionProgress{})
+//
+// if slf.Order != "" {
+// db = db.Order(slf.Order)
+// }
+//
+// if slf.ID != 0 {
+// db = db.Where("id = ?", slf.ID)
+// }
+//
+// if slf.WorkOrderID != "" {
+// db = db.Where("work_order_id = ?", slf.WorkOrderID)
+// }
+//
+// if slf.OrderID != "" {
+// db = db.Where("order_id = ?", slf.OrderID)
+// }
+//
+// if slf.ProcedureID != "" {
+// db = db.Where("procedure_id = ?", slf.ProcedureID)
+// }
+//
+// if slf.ProceduresID != 0 {
+// db = db.Where("procedures_id = ?", slf.ProceduresID)
+// }
+//
+// if slf.DeviceID != "" {
+// db = db.Where("device_id = ?", slf.DeviceID)
+// }
+//
+// if slf.Channel != 0 {
+// db = db.Where("channel = ?", slf.Channel)
+// }
+//
+// if slf.UnFinished {
+// db = db.Where("finished_quantity < total_quantity")
+// }
+//
+// if slf.ProductProcedureID != "" {
+// db = db.Where("product_procedure_id = ?", slf.ProductProcedureID)
+// }
+//
+// return db
+//}
+//
+//// Create 鍗曟潯鎻掑叆
+//func (slf *ProductionProgressSearch) Create(record *ProductionProgress) error {
+// var db = slf.build()
+//
+// if err := db.Create(record).Error; err != nil {
+// return fmt.Errorf("create err: %v, record: %+v", err, record)
+// }
+//
+// return nil
+//}
+//
+//func (slf *ProductionProgressSearch) Save(record *ProductionProgress) error {
+// var db = slf.build()
+//
+// if err := db.Save(record).Error; err != nil {
+// return fmt.Errorf("save err: %v, record: %+v", err, record)
+// }
+//
+// return nil
+//}
+//
+//func (slf *ProductionProgressSearch) UpdateByMap(upMap map[string]interface{}) error {
+// var (
+// db = slf.build()
+// )
+//
+// if err := db.Updates(upMap).Error; err != nil {
+// return fmt.Errorf("update by map err: %v, upMap: %+v", err, upMap)
+// }
+//
+// return nil
+//}
+//
+//func (slf *ProductionProgressSearch) UpdateByQuery(query string, args []interface{}, upMap map[string]interface{}) error {
+// var (
+// db = slf.Orm.Table(slf.TableName()).Where(query, args...)
+// )
+//
+// if err := db.Updates(upMap).Error; err != nil {
+// return fmt.Errorf("update by query err: %v, query: %s, args: %+v, upMap: %+v", err, query, args, upMap)
+// }
+//
+// return nil
+//}
+//
+//func (slf *ProductionProgressSearch) Delete() error {
+// var db = slf.build()
+//
+// if err := db.Unscoped().Delete(&ProductionProgress{}).Error; err != nil {
+// return err
+// }
+//
+// return nil
+//}
+//
+//func (slf *ProductionProgressSearch) First() (*ProductionProgress, error) {
+// var (
+// record = new(ProductionProgress)
+// db = slf.build()
+// )
+//
+// if err := db.First(record).Error; err != nil {
+// return record, err
+// }
+//
+// return record, nil
+//}
+//
+//func (slf *ProductionProgressSearch) Find() ([]*ProductionProgress, int64, error) {
+// var (
+// records = make([]*ProductionProgress, 0)
+// total int64
+// db = slf.build()
+// )
+//
+// if err := db.Count(&total).Error; err != nil {
+// return records, total, fmt.Errorf("find count err: %v", err)
+// }
+// if slf.PageNum*slf.PageSize > 0 {
+// db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
+// }
+// if err := db.Find(&records).Error; err != nil {
+// return records, total, fmt.Errorf("find records err: %v", err)
+// }
+//
+// return records, total, nil
+//}
+//
+//func (slf *ProductionProgressSearch) FindNotTotal() ([]*ProductionProgress, error) {
+// var (
+// records = make([]*ProductionProgress, 0)
+// db = slf.build()
+// )
+//
+// if slf.PageNum*slf.PageSize > 0 {
+// db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
+// }
+// if err := db.Find(&records).Error; err != nil {
+// return records, fmt.Errorf("find records err: %v", err)
+// }
+//
+// return records, nil
+//}
+//
+//// FindByQuery 鎸囧畾鏉′欢鏌ヨ.
+//func (slf *ProductionProgressSearch) FindByQuery(query string, args []interface{}) ([]*ProductionProgress, int64, error) {
+// var (
+// records = make([]*ProductionProgress, 0)
+// total int64
+// db = slf.Orm.Table(slf.TableName()).Where(query, args...)
+// )
+//
+// if err := db.Count(&total).Error; err != nil {
+// return records, total, fmt.Errorf("find by query count err: %v", err)
+// }
+// if slf.PageNum*slf.PageSize > 0 {
+// db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
+// }
+// if err := db.Find(&records).Error; err != nil {
+// return records, total, fmt.Errorf("find by query records err: %v, query: %s, args: %+v", err, query, args)
+// }
+//
+// return records, total, nil
+//}
+//
+//// FindByQueryNotTotal 鎸囧畾鏉′欢鏌ヨ&涓嶆煡璇㈡�绘潯鏁�.
+//func (slf *ProductionProgressSearch) FindByQueryNotTotal(query string, args []interface{}) ([]*ProductionProgress, error) {
+// var (
+// records = make([]*ProductionProgress, 0)
+// db = slf.Orm.Table(slf.TableName()).Where(query, args...)
+// )
+//
+// if slf.PageNum*slf.PageSize > 0 {
+// db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
+// }
+// if err := db.Find(&records).Error; err != nil {
+// return records, fmt.Errorf("find by query records err: %v, query: %s, args: %+v", err, query, args)
+// }
+//
+// return records, nil
+//}
--
Gitblit v1.8.0