排程任务下发增加productProcedureID，报工表和工序表增加productProcedureID

zhangqian

2023-11-27 dcf393c077af5638ea12c05dd6e1754fa535be20

排程任务下发增加productProcedureID，报工表和工序表增加productProcedureID

 docs/docs.go

@@ -987,6 +987,9 @@
                "procedureName": {
                    "type": "string"
                },
                "productProcedureID": {
                    "type": "string"
                },
                "startTime": {
                    "type": "integer"
                },
@@ -1466,6 +1469,10 @@
                    "description": "工艺模型编号",
                    "type": "string"
                },
                "productProcedureID": {
                    "description": "产品工序id",
                    "type": "string"
                },
                "realEndTime": {
                    "type": "integer"
                },
@@ -1539,7 +1546,7 @@
            "properties": {
                "barCode": {
                    "description": "条形码",
                    "type": "integer"
                    "type": "string"
                },
                "channel": {
                    "description": "通道",
@@ -1574,6 +1581,10 @@
                    "description": "procedures表的id",
                    "type": "integer"
                },
                "productProcedureID": {
                    "description": "产品工序id",
                    "type": "string"
                },
                "reportAmount": {
                    "description": "报工数量",
                    "type": "integer"

 docs/swagger.json

@@ -975,6 +975,9 @@
                "procedureName": {
                    "type": "string"
                },
                "productProcedureID": {
                    "type": "string"
                },
                "startTime": {
                    "type": "integer"
                },
@@ -1454,6 +1457,10 @@
                    "description": "工艺模型编号",
                    "type": "string"
                },
                "productProcedureID": {
                    "description": "产品工序id",
                    "type": "string"
                },
                "realEndTime": {
                    "type": "integer"
                },
@@ -1527,7 +1534,7 @@
            "properties": {
                "barCode": {
                    "description": "条形码",
                    "type": "integer"
                    "type": "string"
                },
                "channel": {
                    "description": "通道",
@@ -1562,6 +1569,10 @@
                    "description": "procedures表的id",
                    "type": "integer"
                },
                "productProcedureID": {
                    "description": "产品工序id",
                    "type": "string"
                },
                "reportAmount": {
                    "description": "报工数量",
                    "type": "integer"

 docs/swagger.yaml

@@ -57,6 +57,8 @@
        type: string
      procedureName:
        type: string
      productProcedureID:
        type: string
      startTime:
        type: integer
      workHours:
@@ -397,6 +399,9 @@
      processModelNumber:
        description: 工艺模型编号
        type: string
      productProcedureID:
        description: 产品工序id
        type: string
      realEndTime:
        type: integer
      realStartTime:
@@ -448,7 +453,7 @@
    properties:
      barCode:
        description: 条形码
        type: integer
        type: string
      channel:
        description: 通道
        type: integer
@@ -472,6 +477,9 @@
      proceduresId:
        description: procedures表的id
        type: integer
      productProcedureID:
        description: 产品工序id
        type: string
      reportAmount:
        description: 报工数量
        type: integer

 model/common/common.go

@@ -38,6 +38,7 @@
    }

    ProductProcedure struct {
        ProductProcedureID string               `gorm:"index;type:varchar(191);not null;comment:产品工序ID" json:"productProcedureID"`
        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"`

 model/procedures.go

@@ -12,6 +12,7 @@
type (
    Procedures struct {
        gorm.Model
        ProductProcedureID string `gorm:"index;type:varchar(191);not null" json:"productProcedureID"` //产品工序id
        WorkOrderID        string `gorm:"index;type:varchar(191);not null" json:"-"`
        OrderID            string `gorm:"index;type:varchar(191);not null" json:"-"`
        DeviceID           string `gorm:"index;type:varchar(191)" json:"deviceId"`

 model/report_work.go

@@ -10,6 +10,7 @@
    ReportWork struct {
        gorm.Model
        ProceduresID uint   `gorm:"index;type:varchar(191)" json:"proceduresId"` //procedures表的id
        ProductProcedureID string `gorm:"index;type:varchar(191);not null" json:"productProcedureID"` //产品工序id
        WorkOrderID  string `gorm:"index;type:varchar(191);not null" json:"workOrderId"`
        DeviceID     string `gorm:"index;type:varchar(191)" json:"deviceId"`
        DeviceName   string `gorm:"index;type:varchar(191)" json:"deviceName"`

 nsq/msg_handler.go

@@ -52,6 +52,7 @@
        procedureRecords := make([]*model.Procedures, 0, len(task.Procedures))
        for _, procedure := range task.Procedures {
            procedureRecord := model.Procedures{
                ProductProcedureID: procedure.ProductProcedureID,
                WorkOrderID:    task.WorkOrder.WorkOrderID,
                OrderID:        task.WorkOrder.OrderID,
                DeviceID:       procedure.DeviceID,

 service/report_work.go

@@ -50,6 +50,7 @@

    record := &model.ReportWork{
        ProceduresID: params.ProcedureId,
        ProductProcedureID: procedure.ProductProcedureID,
        WorkOrderID:  procedure.WorkOrderID,
        DeviceID:     procedure.DeviceID,
        DeviceName:   procedure.ProceduresInfo.DeviceName,