下道工序取用方式更改

zhangqian

2023-08-21 2c96bc009ce9b92049293949d563a80fca9cd6c8

下道工序取用方式更改

 docs/docs.go

@@ -490,6 +490,12 @@
                        "$ref": "#/definitions/common.ProcedureMaterial"
                    }
                },
                "nextProcedureId": {
                    "type": "string"
                },
                "nextProcedureName": {
                    "type": "string"
                },
                "outputMaterials": {
                    "description": "输出物料列表",
                    "type": "array",
@@ -857,9 +863,6 @@
                },
                "deviceStatus": {
                    "type": "string"
                },
                "nextProcedure": {
                    "$ref": "#/definitions/model.Procedures"
                },
                "order": {
                    "$ref": "#/definitions/model.Order"

 docs/swagger.json

@@ -478,6 +478,12 @@
                        "$ref": "#/definitions/common.ProcedureMaterial"
                    }
                },
                "nextProcedureId": {
                    "type": "string"
                },
                "nextProcedureName": {
                    "type": "string"
                },
                "outputMaterials": {
                    "description": "输出物料列表",
                    "type": "array",
@@ -845,9 +851,6 @@
                },
                "deviceStatus": {
                    "type": "string"
                },
                "nextProcedure": {
                    "$ref": "#/definitions/model.Procedures"
                },
                "order": {
                    "$ref": "#/definitions/model.Order"

 docs/swagger.yaml

@@ -36,6 +36,10 @@
        items:
          $ref: '#/definitions/common.ProcedureMaterial'
        type: array
      nextProcedureId:
        type: string
      nextProcedureName:
        type: string
      outputMaterials:
        description: 输出物料列表
        items:
@@ -282,8 +286,6 @@
        type: string
      deviceStatus:
        type: string
      nextProcedure:
        $ref: '#/definitions/model.Procedures'
      order:
        $ref: '#/definitions/model.Order'
      procedure:

 model/common/common.go

@@ -35,16 +35,18 @@
    }

    ProductProcedure struct {
        ProcedureID     string               `gorm:"uniqueIndex:idx_product_procedure;type:varchar(191);comment:工序ID" json:"procedureId"`
        ProcedureName   string               `gorm:"type:varchar(191);comment:工序名称，仅查询用" json:"procedureName"`
        DeviceID        string               `gorm:"type:varchar(191);not null;comment:设备ID" json:"deviceId"`
        DeviceName      string               `gorm:"type:varchar(191);not null;comment:设备名称" json:"deviceName"`
        StartTime       int64                `gorm:"comment:计划开始时间" json:"startTime"`
        EndTime         int64                `gorm:"comment:计划结束时间" json:"endTime"`
        WorkHours       decimal.Decimal      `gorm:"type:decimal(35,18);comment:工时" json:"workHours"`
        InputMaterials  []*ProcedureMaterial `json:"inputMaterials"`  // 输入物料列表
        OutputMaterials []*ProcedureMaterial `json:"outputMaterials"` // 输出物料列表
        Workers         []*ProcedureWorker   `json:"workers"`         // 人员列表
        ProcedureID       string               `gorm:"uniqueIndex:idx_product_procedure;type:varchar(191);comment:工序ID" json:"procedureId"`
        ProcedureName     string               `gorm:"type:varchar(191);comment:工序名称，仅查询用" json:"procedureName"`
        NextProcedureID   string               `json:"nextProcedureId"`
        NextProcedureName string               `json:"nextProcedureName"`
        DeviceID          string               `gorm:"type:varchar(191);not null;comment:设备ID" json:"deviceId"`
        DeviceName        string               `json:"deviceName"`
        StartTime         int64                `gorm:"comment:计划开始时间" json:"startTime"`
        EndTime           int64                `gorm:"comment:计划结束时间" json:"endTime"`
        WorkHours         decimal.Decimal      `gorm:"type:decimal(35,18);comment:工时" json:"workHours"`
        InputMaterials    []*ProcedureMaterial `json:"inputMaterials"`  // 输入物料列表
        OutputMaterials   []*ProcedureMaterial `json:"outputMaterials"` // 输出物料列表
        Workers           []*ProcedureWorker   `json:"workers"`         // 人员列表
    }

    DeliverScheduleTask struct {

 model/response/common.go

@@ -19,9 +19,8 @@
}

type TaskData struct {
    Order         *model.Order
    Procedure     *model.Procedures
    NextProcedure *model.Procedures
    Order     *model.Order
    Procedure *model.Procedures
    Config
}


 service/task.go

@@ -52,18 +52,9 @@
    if err != nil {
        return nil, ecode.DBErr
    }
    nextProcedure := new(model.Procedures)
    nextProcedure, err = model.NewProceduresSearch(nil).
        SetWorkOrderId(order.WorkOrderID).
        SetStatus(model.ProcedureStatusUnFinished).
        SetId(procedure.ID + 1).First()
    if err == nil {
        nextProcedure.ProceduresInfo.ProcedureName = "--"
    }
    taskData = new(response.TaskData)
    taskData.Order = order
    taskData.Procedure = procedure
    taskData.NextProcedure = nextProcedure
    return taskData, ecode.OK
}