| | |
| | | logx.Infof("plc read finish number err: %v", err) |
| | | continue |
| | | } |
| | | finishNumber := cast.ToInt64(value) |
| | | finishNumber := cast.ToInt(value) |
| | | if finishNumber != 0 { |
| | | service.PlcCacheSet(conf.Conf.CurrentDeviceID, addressItem.Channel, constvar.PlcCacheKeyFinishNumber, finishNumber) |
| | | _ = service.NewProgressService().UpdateProgress(conf.Conf.CurrentDeviceID, addressItem.Channel, cast.ToInt64(finishNumber)) |
| | | _ = service.NewProgressService().UpdateProgress(conf.Conf.CurrentDeviceID, addressItem.Channel, finishNumber) |
| | | } |
| | | logx.Infof("plc read finish number: %v", finishNumber) |
| | | } |
| | |
| | | } |
| | | syncOkIds := make([]uint, 0, len(records)) |
| | | for _, record := range records { |
| | | var finishAmount int |
| | | if record.IsFinish { |
| | | progress, err := model.NewProductionProgressSearch(nil).SetWorkOrderId(record.WorkOrderId).SetProductProcedureId(record.ProductProcedureID).First() |
| | | if err == nil { |
| | | finishAmount = int(progress.FinishedQuantity) |
| | | } |
| | | } |
| | | msg := &common.MsgTaskStatusUpdate{ |
| | | WorkOrderId: record.WorkOrderId, |
| | | ProcedureID: record.ProcedureID, |
| | | DeviceId: record.DeviceId, |
| | | IsProcessing: record.IsProcessing, |
| | | IsFinish: record.IsFinish, |
| | | FinishAmount: finishAmount, |
| | | FinishAmount: record.FinishedQuantity, |
| | | ProductProcedureID: record.ProductProcedureID, |
| | | StartTs: record.StartTs, |
| | | FinishTs: record.FinishTs, |
| | |
| | | syncOkIds = append(syncOkIds, record.ID) |
| | | } |
| | | if len(syncOkIds) > 0 { |
| | | err = service.NewTaskService().RemoveTaskStatusSync(syncOkIds) |
| | | err = service.NewTaskService().FinishTaskStatusSync(syncOkIds) |
| | | if err != nil { |
| | | logx.Errorf("sync task status delete sync ok records error:%v", err) |
| | | } |