zhangqian
2023-11-28 a53e35776e80a493ce5bbe49ea5ec8958044c546
兼容
2个文件已修改
26 ■■■■ 已修改文件
crontask/cron_task.go 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
model/common/common.go 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
crontask/cron_task.go
@@ -123,12 +123,13 @@
            }
        }
        msg := &common.MsgTaskStatusUpdate{
            WorkOrderId:  record.WorkOrderId,
            ProcedureID:  record.ProcedureID,
            DeviceId:     record.DeviceId,
            IsProcessing: record.IsProcessing,
            IsFinish:     record.IsFinish,
            FinishAmount: finishAmount,
            WorkOrderId:        record.WorkOrderId,
            ProcedureID:        record.ProcedureID,
            DeviceId:           record.DeviceId,
            IsProcessing:       record.IsProcessing,
            IsFinish:           record.IsFinish,
            FinishAmount:       finishAmount,
            ProductProcedureID: record.ProductProcedureID,
        }
        caller := nsq.NewCaller(fmt.Sprintf(constvar.NsqTopicTaskProcedureStatusUpdate, conf.Conf.NsqConf.NodeId), "")
        err = caller.Send(msg)
model/common/common.go
@@ -121,12 +121,13 @@
// MsgTaskStatusUpdate 任务状态改变
type MsgTaskStatusUpdate struct {
    WorkOrderId  string `json:"workOrderId"` //工单编号
    ProcedureID  string `json:"procedureId"` // 工序
    DeviceId     string `json:"deviceId"`    //用于过滤获取nsq消息
    IsProcessing bool   //是否处理中
    IsFinish     bool   //是否完成
    FinishAmount int    `json:"finishAmount"` //isFinish = true时取工序最终加工数传上去
    WorkOrderId        string `json:"workOrderId"` //工单编号
    ProcedureID        string `json:"procedureId"` // 工序
    DeviceId           string `json:"deviceId"`    //用于过滤获取nsq消息
    IsProcessing       bool   //是否处理中
    IsFinish           bool   //是否完成
    FinishAmount       int    `json:"finishAmount"`       //isFinish = true时取工序最终加工数传上去
    ProductProcedureID string `json:"productProcedureID"` //产品工序id
}
// DeviceMsg 下发到终端的设备信息