zhangqian
2023-11-25 efec800478214f3a412f879d2b51c2968515995d
service/report_work.go
@@ -2,6 +2,7 @@
import (
   "apsClient/conf"
   "apsClient/constvar"
   "apsClient/model"
   "apsClient/model/request"
   "errors"
@@ -17,6 +18,11 @@
   if err != nil {
      return err
   }
   if procedure.Status != model.ProcedureStatusProcessing {
      return errors.New("当前工序未开始或已结束,不允许报工")
   }
   nowTs := time.Now().Unix()
   var startTs int64
   var workerName string
@@ -44,8 +50,20 @@
      Channel:      procedure.Channel,
      StartTime:    startTs,
      EndTime:      nowTs,
      ReportAmount: params.ReportAmount,
      WorkerID:     params.WorkerID,
      WorkerName:   workerName,
   }
   return model.NewReportWorkSearch(nil).Create(record)
   err = model.NewReportWorkSearch(nil).Create(record)
   if err != nil {
      return err
   }
   PlcCacheSet(conf.Conf.CurrentDeviceID, procedure.Channel, constvar.PlcCacheKeyFinishNumber, params.ReportAmount)
   return nil
}
// GetLastReportWork 获取最后一个报工
func GetLastReportWork(procedureId uint) (reportWork *model.ReportWork, err error) {
   return model.NewReportWorkSearch(nil).SetProceduresId(procedureId).SetDeviceId(conf.Conf.CurrentDeviceID).SetOrder("id desc").First()
}