修改获取工艺参数等待超时，修改生产进度返回值参数

zhangqian

2023-08-23 06cff5f59c72d36b745515d98b9e645e92bb91a3

修改获取工艺参数等待超时，修改生产进度返回值参数

 api/v1/task.go

@@ -98,7 +98,7 @@
        OrderId:   procedure.OrderID,
        Product:   order.ProductName,
        Procedure: procedure.ProceduresInfo.ProcedureName,
        Device:    procedure.ProceduresInfo.DeviceName}, &result, time.Second*5)
        Device:    procedure.ProceduresInfo.DeviceName}, &result, time.Second*3)
    if err != nil {
        logx.Errorf("TaskStart GetProcessModel error:%v", err.Error())
        ctx.FailWithMsg(ecode.UnknownErr, "未获取到工艺参数")
@@ -194,7 +194,7 @@
        OrderId:   procedure.OrderID,
        Product:   order.ProductName,
        Procedure: procedure.ProceduresInfo.ProcedureName,
        Device:    procedure.ProceduresInfo.DeviceName}, &result, time.Second*5)
        Device:    procedure.ProceduresInfo.DeviceName}, &result, time.Second*3)
    if err != nil {
        logx.Errorf("SendProcessParams GetProcessModel error:%v", err.Error())
        ctx.FailWithMsg(ecode.UnknownErr, "未获取到工艺参数")

 model/response/common.go

@@ -39,11 +39,6 @@
    Value interface{}
}

type NetConfig struct {
    DeviceName   string
    DeviceStatus string
}

type ProductProgress struct {
    FinishNumber int
    FinishNumber int `json:"finishNumber"`
}