diff --git a/meta/base/OPCComRule.meta.go b/meta/base/OPCComRule.meta.go index 33d93c6..a5cf332 100644 --- a/meta/base/OPCComRule.meta.go +++ b/meta/base/OPCComRule.meta.go @@ -23,6 +23,7 @@ var OPCComRule_WorkPlaceNr = grmi.NewField("WorkPlaceNr", "OPCComRule.WorkPlaceN var OPCComRule_PO = grmi.NewField("PO", "OPCComRule.PO", "po", grmi.TypeInt) var OPCComRule_StepNo = grmi.NewField("StepNo", "OPCComRule.StepNo", "stepno", grmi.TypeInt) var OPCComRule_StepDesc = grmi.NewField("StepDesc", "OPCComRule.StepDesc", "stepdesc", grmi.TypeString) +var OPCComRule_OPCDesc = grmi.NewField("OPCDesc", "OPCComRule.OPCDesc", "opcdesc", grmi.TypeString) var OPCComRule_ProjectId = grmi.NewField("ProjectId", "OPCComRule.ProjectId", "projectid", grmi.TypeString) var OPCComRule_ActionType = grmi.NewField("ActionType", "OPCComRule.ActionType", "actiontype", grmi.TypeString) var OPCComRule_DBlockAddress = grmi.NewField("DBlockAddress", "OPCComRule.DBlockAddress", "dblockaddress", grmi.TypeString) @@ -54,16 +55,17 @@ var OPCComRule = grmi.NewEntity( OPCComRule_PO.Name: OPCComRule_PO, OPCComRule_StepNo.Name: OPCComRule_StepNo, OPCComRule_StepDesc.Name: OPCComRule_StepDesc, + OPCComRule_OPCDesc.Name: OPCComRule_OPCDesc, OPCComRule_ProjectId.Name: OPCComRule_ProjectId, OPCComRule_ActionType.Name: OPCComRule_ActionType, OPCComRule_DBlockAddress.Name: OPCComRule_DBlockAddress, OPCComRule_DBlockValueType.Name: OPCComRule_DBlockValueType, OPCComRule_DBlockValue.Name: OPCComRule_DBlockValue, - OPCComRule_Formula.Name: OPCComRule_Formula, - OPCComRule_OperatorSimbol.Name: OPCComRule_OperatorSimbol, + OPCComRule_Formula.Name: OPCComRule_Formula, + OPCComRule_OperatorSimbol.Name: OPCComRule_OperatorSimbol, OPCComRule_LastModify.Name: OPCComRule_LastModify, OPCComRule_LastUser.Name: OPCComRule_LastUser, OPCComRule_CreateTime.Name: OPCComRule_CreateTime, }, []string{"PlantNr"}, - []string{"PO", "StepNo", "StepDesc", "ProjectId", "ActionType", "DBlockAddress", "DBlockValueType", "DBlockValue", "Formula", "OperatorSimbol", "LastUser"}) + []string{"PO", "StepNo", "StepDesc", "OPCDesc", "ProjectId", "ActionType", "DBlockAddress", "DBlockValueType", "DBlockValue", "Formula", "OperatorSimbol", "LastUser"}) diff --git a/models/base/OPCComRule.model.go b/models/base/OPCComRule.model.go index 03e5eb2..b1d168b 100644 --- a/models/base/OPCComRule.model.go +++ b/models/base/OPCComRule.model.go @@ -27,6 +27,7 @@ type OPCComRule struct { PO int `xorm:"int 'PO' not null" json:"OPCComRule-PO"` StepNo int `xorm:"int 'StepNo' not null" json:"OPCComRule-StepNo"` StepDesc string `xorm:"nvarchar(100) 'StepDesc' not null" json:"OPCComRule-StepDesc"` + OPCDesc string `xorm:"nvarchar(100) 'OPCDesc' not null" json:"OPCComRule-OPCDesc"` ProjectId string `xorm:"nvarchar(40) 'ProjectId' not null" json:"OPCComRule-ProjectId"` ActionType string `xorm:"nvarchar(20) 'ActionType' not null" json:"OPCComRule-ActionType"` DBlockAddress string `xorm:"nvarchar(40) 'DBlockAddress' not null" json:"OPCComRule-DBlockAddress"` diff --git a/models/om/SerialOrder.model.go b/models/om/SerialOrder.model.go index e063ab2..87a7538 100644 --- a/models/om/SerialOrder.model.go +++ b/models/om/SerialOrder.model.go @@ -42,6 +42,7 @@ type SerialOrder struct { ActStartTime grmi.DateTime `xorm:"datetime 'ActStartTime' not null" json:"OM_SerialOrder-ActStartTime"` ActEndTime grmi.DateTime `xorm:"datetime 'ActEndTime' not null" json:"OM_SerialOrder-ActEndTime"` ProjectId string `xorm:"nvarchar(40) 'ProjectId' not null" json:"OM_SerialOrder-ProjectId"` + Sort string `xorm:"nvarchar(40) 'Sort' not null" json:"OM_SerialOrder-Sort"` LastModify grmi.DateTime `xorm:"datetime 'LastModify' not null updated" json:"OM_SerialOrder-LastModify"` LastUser string `xorm:"nvarchar(20) 'LastUser' not null" json:"OM_SerialOrder-LastUser"` CreateTime grmi.DateTime `xorm:"datetime 'CreateTime' not null created" json:"OM_SerialOrder-CreateTime"`