debug

zhangqian

2023-12-08 84fb8e390b83dc9482524c12d7af6c93405c3fc1

 service/report_work.go

@@ -2,9 +2,15 @@

import (
   "apsClient/conf"
   "apsClient/constvar"
   "apsClient/model"
   "apsClient/model/request"
   "apsClient/pkg/logx"
   "apsClient/pkg/snowflake"
   "encoding/json"
   "errors"
   "github.com/jinzhu/gorm"
   "github.com/spf13/cast"
   "time"
)

@@ -17,35 +23,82 @@
   if err != nil {
      return err
   }

   if procedure.Status != model.ProcedureStatusProcessing {
      return errors.New("当前工序未开始或已结束，不允许报工")
   }

   nowTs := time.Now().Unix()
   var startTs int64
   var workerName string
   for _, worker := range procedure.ProceduresInfo.Workers {
      if params.WorkerID == worker.WorkerID {
         workerName = worker.WorkerName
         if worker.StartTime < nowTs {
            startTs = worker.StartTime
         }
      }
   }
   if workerName == "" {
      return errors.New("没有找到当前值班人员")
   }
   if startTs == 0 {
      return errors.New("没有找到当前值班人员开始时间")

   finishAmount := params.ReportAmount
   lastReportWork, err := GetLastReportWork(params.ProcedureId)
   if err == nil {
      if params.ReportAmount < lastReportWork.ReportAmount {
         return errors.New("报工数量不能少于上次报工数")
      }
      finishAmount = params.ReportAmount - lastReportWork.ReportAmount
      startTs = lastReportWork.EndTime
   } else {
      startTs = procedure.RealStartTime
   }

   record := &model.ReportWork{
      ProceduresID: params.ProcedureId,
      WorkOrderID:  procedure.WorkOrderID,
      DeviceID:     procedure.DeviceID,
      DeviceName:   procedure.ProceduresInfo.DeviceName,
      ProcedureID:  procedure.ProcedureID,
      Channel:      procedure.Channel,
      StartTime:    startTs,
      EndTime:      nowTs,
      WorkerID:     params.WorkerID,
      WorkerName:   workerName,
      ProceduresID:       params.ProcedureId,
      ProductProcedureID: procedure.ProductProcedureID,
      WorkOrderID:        procedure.WorkOrderID,
      DeviceID:           procedure.DeviceID,
      DeviceName:         procedure.ProceduresInfo.DeviceName,
      ProcedureID:        procedure.ProcedureID,
      StartTime:          startTs,
      EndTime:            nowTs,
      ReportAmount:       params.ReportAmount,
      FinishAmount:       finishAmount,
      WorkerID:           params.WorkerID,
      WorkerName:         workerName,
      WorkerTime:         nowTs - startTs,
      BarCode:            cast.ToString(snowflake.GenerateID()),
   }
   return model.NewReportWorkSearch(nil).Create(record)
   err = model.WithTransaction(func(db *gorm.DB) error {
      err = model.NewReportWorkSearch(db).Create(record)
      if err != nil {
         return err
      }

      content, err := json.Marshal(record)
      if err != nil {
         return err
      }
      err = model.NewReportsToCloudSearch(db).Create(&model.ReportsToCloud{
         ReportType: constvar.ReportTypeReportWork,
         Content:    string(content),
      })
      if err != nil {
         return err
      }

      return nil
   })
   if err != nil {
      logx.Errorf("save report work transaction error: %v", err)
      return err
   }

   err = NewProgressService().UpdateProgressByProceduresId(procedure.ID, 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()
}