Merge branch 'feat-serf'

zhangqian

2023-10-19 eba4eb850f0ecfb5839395aa125955ceaa2a454f

 model/production_progress.go

@@ -3,28 +3,28 @@
import (
   "apsClient/pkg/sqlitex"
   "fmt"
   "gorm.io/gorm"
   "github.com/jinzhu/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"`
      Channel          int32  `gorm:"type:int;comment:工作通道" json:"channel"` //通道
      TotalQuantity    int64  `gorm:"type:int;not null;comment:总量" json:"totalQuantity"`
      gorm.Model
      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
   }
)

@@ -69,13 +69,18 @@
   return slf
}

func (slf *ProductionProgressSearch) SetId(id int) *ProductionProgressSearch {
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
}

@@ -110,6 +115,10 @@
      db = db.Where("channel = ?", slf.Channel)
   }

   if slf.UnFinished {
      db = db.Where("finished_quantity <  total_quantity")
   }

   return db
}