fix

zhangqian

2023-12-01 8324f872ef3a4d0c978a9b1d062800c6a1701c12

 model/report_work.go

@@ -9,18 +9,20 @@
type (
   ReportWork 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"`
      DeviceID     string `gorm:"index;type:varchar(191)" json:"deviceId"`
      DeviceName   string `gorm:"index;type:varchar(191)" json:"deviceName"`
      ProcedureID  string `gorm:"index;type:varchar(191)" json:"procedureId"`
      Channel      int32  `gorm:"index;" json:"channel"` //通道
      StartTime    int64  `json:"startTime"`
      EndTime      int64  `json:"endTime"`
      ReportAmount int    `json:"reportAmount"` //报工数量
      FinishAmount int    `json:"finishAmount"` //本次报工 - 上次报工
      WorkerID     string `json:"workerID"`     //报工人id
      WorkerName   string `json:"workerName"`   //报工人姓名
      ProceduresID       uint   `gorm:"index;type:varchar(191)" json:"proceduresId"`        //procedures表的id
      ProductProcedureID string `gorm:"index;type:varchar(191);" json:"productProcedureID"` //产品工序id
      WorkOrderID        string `gorm:"index;type:varchar(191);" json:"workOrderId"`
      DeviceID           string `gorm:"index;type:varchar(191)" json:"deviceId"`
      DeviceName         string `gorm:"index;type:varchar(191)" json:"deviceName"`
      ProcedureID        string `gorm:"index;type:varchar(191)" json:"procedureId"`
      StartTime          int64  `json:"startTime"`
      EndTime            int64  `json:"endTime"`
      ReportAmount       int    `json:"reportAmount"` //报工数量
      FinishAmount       int    `json:"finishAmount"` //本次报工 - 上次报工
      WorkerID           string `json:"workerID"`     //报工人id
      WorkerName         string `json:"workerName"`   //报工人姓名
      WorkerTime         int64  `json:"workerTime"`   //工时，单位秒
      BarCode            string `json:"barCode"`      //条形码
   }

   ReportWorkSearch struct {
@@ -103,11 +105,6 @@
   return slf
}

func (slf *ReportWorkSearch) SetChannel(channel int32) *ReportWorkSearch {
   slf.Channel = channel
   return slf
}

func (slf *ReportWorkSearch) build() *gorm.DB {
   var db = slf.Orm.Model(&ReportWork{})

@@ -139,6 +136,10 @@
      db = db.Where("procedure_id = ?", slf.ProcedureID)
   }

   if slf.ProceduresID != 0 {
      db = db.Where("procedures_id = ?", slf.ProceduresID)
   }

   if len(slf.Channels) > 0 {
      db = db.Where("channel IN (?)", slf.Channels)
   }