修改字段名

meta/base/WorkOrderIdentifyRuleDetail.meta.go

@@ -32,8 +32,8 @@ var WorkOrderIdentifyRuleDetail_Formula = grmi.NewField("Formula", "[WorkOrderId
 var WorkOrderIdentifyRuleDetail_OperatorSimbol = grmi.NewField("OperatorSimbol", "[WorkOrderIdentifyRuleDetail].OperatorSimbol", "operatorsimbol", grmi.TypeString)
 var WorkOrderIdentifyRuleDetail_CheckObject = grmi.NewField("CheckObject", "[WorkOrderIdentifyRuleDetail].CheckObject", "checkobject", grmi.TypeString)
 var WorkOrderIdentifyRuleDetail_AssociatedObject = grmi.NewField("AssociatedObject", "[WorkOrderIdentifyRuleDetail].AssociatedObject", "associatedobject", grmi.TypeString)
-var WorkOrderIdentifyRuleDetail_AssociatedAssembly = grmi.NewField("AssociatedAssembly", "[WorkOrderIdentifyRuleDetail].AssociatedAssembly", "associatedassembly", grmi.TypeString)
-var WorkOrderIdentifyRuleDetail_AssociatedAssemblyDesc = grmi.NewField("AssociatedAssemblyDesc", "[WorkOrderIdentifyRuleDetail].AssociatedAssemblyDesc", "associatedassemblydesc", grmi.TypeString)
+var WorkOrderIdentifyRuleDetail_AssociatedAttrCode = grmi.NewField("AssociatedAttrCode", "[WorkOrderIdentifyRuleDetail].AssociatedAttrCode", "associatedattrcode", grmi.TypeInt)
+var WorkOrderIdentifyRuleDetail_AssociatedAttrValue = grmi.NewField("AssociatedAttrValue", "[WorkOrderIdentifyRuleDetail].AssociatedAttrValue", "associatedattrvalue", grmi.TypeString)
 var WorkOrderIdentifyRuleDetail_AssociatedProjectId = grmi.NewField("AssociatedProjectId", "[WorkOrderIdentifyRuleDetail].AssociatedProjectId", "associatedprojectid", grmi.TypeString)
 var WorkOrderIdentifyRuleDetail_LastModify = grmi.NewField("LastModify", "[WorkOrderIdentifyRuleDetail].LastModify", "lastmodify", grmi.TypeDateTime)
 var WorkOrderIdentifyRuleDetail_LastUser = grmi.NewField("LastUser", "[WorkOrderIdentifyRuleDetail].LastUser", "lastuser", grmi.TypeString)
@@ -68,12 +68,12 @@ var WorkOrderIdentifyRuleDetail = grmi.NewEntity(
 		WorkOrderIdentifyRuleDetail_OperatorSimbol.Name:         WorkOrderIdentifyRuleDetail_OperatorSimbol,
 		WorkOrderIdentifyRuleDetail_CheckObject.Name:            WorkOrderIdentifyRuleDetail_CheckObject,
 		WorkOrderIdentifyRuleDetail_AssociatedObject.Name:       WorkOrderIdentifyRuleDetail_AssociatedObject,
-		WorkOrderIdentifyRuleDetail_AssociatedAssembly.Name:     WorkOrderIdentifyRuleDetail_AssociatedAssembly,
-		WorkOrderIdentifyRuleDetail_AssociatedAssemblyDesc.Name: WorkOrderIdentifyRuleDetail_AssociatedAssemblyDesc,
+		WorkOrderIdentifyRuleDetail_AssociatedAttrCode.Name:     WorkOrderIdentifyRuleDetail_AssociatedAttrCode,
+		WorkOrderIdentifyRuleDetail_AssociatedAttrValue.Name: WorkOrderIdentifyRuleDetail_AssociatedAttrValue,
 		WorkOrderIdentifyRuleDetail_AssociatedProjectId.Name:    WorkOrderIdentifyRuleDetail_AssociatedProjectId,
 		WorkOrderIdentifyRuleDetail_LastModify.Name:             WorkOrderIdentifyRuleDetail_LastModify,
 		WorkOrderIdentifyRuleDetail_LastUser.Name:               WorkOrderIdentifyRuleDetail_LastUser,
 		WorkOrderIdentifyRuleDetail_CreateTime.Name:             WorkOrderIdentifyRuleDetail_CreateTime,
 	},
 	[]string{"PlantNr"},
-	[]string{"PO", "OpenPlan", "IdentifyPlan", "CombinePlan", "CollerationRuleId", "MapBy", "StartCheckPos", "CheckLength", "Formula", "OperatorSimbol", "CheckObject", "AssociatedObject", "AssociatedAssembly", "AssociatedAssemblyDesc", "AssociatedProjectId", "LastUser"})
+	[]string{"PO", "OpenPlan", "IdentifyPlan", "CombinePlan", "CollerationRuleId", "MapBy", "StartCheckPos", "CheckLength", "Formula", "OperatorSimbol", "CheckObject", "AssociatedObject", "AssociatedAttrCode", "AssociatedAttrValue", "AssociatedProjectId", "LastUser"})

models/base/WorkOrderIdentifyRuleDetail.model.go

@@ -36,8 +36,8 @@ type WorkOrderIdentifyRuleDetail struct {
 	OperatorSimbol         string        `xorm:"nvarchar(4) 'OperatorSimbol' not null" json:"WorkOrderIdentifyRuleDetail-OperatorSimbol"`
 	CheckObject            string        `xorm:"nvarchar(40) 'CheckObject' not null" json:"WorkOrderIdentifyRuleDetail-CheckObject"`
 	AssociatedObject       string        `xorm:"nvarchar(30) 'AssociatedObject' not null" json:"WorkOrderIdentifyRuleDetail-AssociatedObject"`
-	AssociatedAssembly     string        `xorm:"nvarchar(100) 'AssociatedAssembly' not null" json:"WorkOrderIdentifyRuleDetail-AssociatedAssembly"`
-	AssociatedAssemblyDesc string        `xorm:"nvarchar(100) 'AssociatedAssemblyDesc' not null" json:"WorkOrderIdentifyRuleDetail-AssociatedAssemblyDesc"`
+	AssociatedAttrCode     int           `xorm:"int 'AssociatedAttrCode' not null" json:"WorkOrderIdentifyRuleDetail-AssociatedAttrCode"`
+	AssociatedAttrValue    string        `xorm:"nvarchar(30) 'AssociatedAttrValue' not null" json:"WorkOrderIdentifyRuleDetail-AssociatedAttrValue"`
 	AssociatedProjectId    string        `xorm:"nvarchar(30) 'AssociatedProjectId' not null" json:"WorkOrderIdentifyRuleDetail-AssociatedProjectId"`
 	LastModify             grmi.DateTime `xorm:"datetime 'LastModify' not null updated" json:"WorkOrderIdentifyRuleDetail-LastModify"`
 	LastUser               string        `xorm:"nvarchar(20) 'LastUser' not null" json:"WorkOrderIdentifyRuleDetail-LastUser"`

services/base/implments/WorkOrderIdentifyRuleDetail.service.impl.go

@@ -37,8 +37,8 @@ var DefaultConditionOfWorkOrderIdentifyRuleDetail = grmi.NewCondition(
 		meta.WorkOrderIdentifyRuleDetail_OperatorSimbol.UrlParameterName:         grmi.NewConditionItem(meta.WorkOrderIdentifyRuleDetail_OperatorSimbol, grmi.Equal, false),
 		meta.WorkOrderIdentifyRuleDetail_CheckObject.UrlParameterName:            grmi.NewConditionItem(meta.WorkOrderIdentifyRuleDetail_CheckObject, grmi.Equal, false),
 		meta.WorkOrderIdentifyRuleDetail_AssociatedObject.UrlParameterName:       grmi.NewConditionItem(meta.WorkOrderIdentifyRuleDetail_AssociatedObject, grmi.Equal, false),
-		meta.WorkOrderIdentifyRuleDetail_AssociatedAssembly.UrlParameterName:     grmi.NewConditionItem(meta.WorkOrderIdentifyRuleDetail_AssociatedAssembly, grmi.Equal, false),
-		meta.WorkOrderIdentifyRuleDetail_AssociatedAssemblyDesc.UrlParameterName: grmi.NewConditionItem(meta.WorkOrderIdentifyRuleDetail_AssociatedAssemblyDesc, grmi.Equal, false),
+		meta.WorkOrderIdentifyRuleDetail_AssociatedAttrCode.UrlParameterName:     grmi.NewConditionItem(meta.WorkOrderIdentifyRuleDetail_AssociatedAttrCode, grmi.Equal, false),
+		meta.WorkOrderIdentifyRuleDetail_AssociatedAttrValue.UrlParameterName: grmi.NewConditionItem(meta.WorkOrderIdentifyRuleDetail_AssociatedAttrValue, grmi.Equal, false),
 		meta.WorkOrderIdentifyRuleDetail_AssociatedProjectId.UrlParameterName:    grmi.NewConditionItem(meta.WorkOrderIdentifyRuleDetail_AssociatedProjectId, grmi.Equal, false),
 		meta.WorkOrderIdentifyRuleDetail_LastModify.UrlParameterName:             grmi.NewConditionItem(meta.WorkOrderIdentifyRuleDetail_LastModify, grmi.Approximate, false),
 		meta.WorkOrderIdentifyRuleDetail_LastUser.UrlParameterName:               grmi.NewConditionItem(meta.WorkOrderIdentifyRuleDetail_LastUser, grmi.Equal, false),