添加ControlId字段及响应的处理

meta/base/TightenWrenchRuleInfo.meta.go

@@ -22,6 +22,7 @@ var TightenWrenchRuleInfo_StepNo = grmi.NewField("StepNo", "TightenWrenchRuleInf
 var TightenWrenchRuleInfo_RuleId = grmi.NewField("RuleId", "TightenWrenchRuleInfo.RuleId", "ruleid", grmi.TypeInt)
 var TightenWrenchRuleInfo_StepDesc = grmi.NewField("StepDesc", "TightenWrenchRuleInfo.StepDesc", "stepdesc", grmi.TypeString)
 var TightenWrenchRuleInfo_MainControlAction = grmi.NewField("MainControlAction", "TightenWrenchRuleInfo.MainControlAction", "maincontrolaction", grmi.TypeString)
+var TightenWrenchRuleInfo_ControlId = grmi.NewField("ControlId", "TightenWrenchRuleInfo.ControlId", "controlid", grmi.TypeInt)
 var TightenWrenchRuleInfo_ControlTime = grmi.NewField("ControlTime", "TightenWrenchRuleInfo.ControlTime", "controltime", grmi.TypeInt)
 var TightenWrenchRuleInfo_LastModify = grmi.NewField("LastModify", "TightenWrenchRuleInfo.LastModify", "lastmodify", grmi.TypeDateTime)
 var TightenWrenchRuleInfo_LastUser = grmi.NewField("LastUser", "TightenWrenchRuleInfo.LastUser", "lastuser", grmi.TypeString)
@@ -46,10 +47,11 @@ var TightenWrenchRuleInfo = grmi.NewEntity(
 		TightenWrenchRuleInfo_RuleId.Name:            TightenWrenchRuleInfo_RuleId,
 		TightenWrenchRuleInfo_StepDesc.Name:          TightenWrenchRuleInfo_StepDesc,
 		TightenWrenchRuleInfo_MainControlAction.Name: TightenWrenchRuleInfo_MainControlAction,
+		TightenWrenchRuleInfo_ControlId.Name:         TightenWrenchRuleInfo_ControlId,
 		TightenWrenchRuleInfo_ControlTime.Name:       TightenWrenchRuleInfo_ControlTime,
 		TightenWrenchRuleInfo_LastModify.Name:        TightenWrenchRuleInfo_LastModify,
 		TightenWrenchRuleInfo_LastUser.Name:          TightenWrenchRuleInfo_LastUser,
 		TightenWrenchRuleInfo_CreateTime.Name:        TightenWrenchRuleInfo_CreateTime,
 	},
 	[]string{"PlantNr"},
-	[]string{"StepDesc", "MainControlAction", "ControlTime", "LastUser"})
+	[]string{"StepDesc", "MainControlAction", "ControlId", "ControlTime", "LastUser"})

models/base/Const.go

@@ -109,4 +109,7 @@ const (
 	ART_TYPE_FINISHED = "FINISHED"
 	ART_TYPE_SEMI_FINISHED = "SEMI_FINISHED"
 	ART_TYPE_MATERIALS = "MATERIALS"
+
+	CONTROL_ACTION_PSET = "选择PSet"
+	CONTROL_ACTION_JOB = "选择job"
 )

models/base/TightenWrenchRuleInfo.model.go

@@ -26,6 +26,7 @@ type TightenWrenchRuleInfo struct {
 	RuleId            int           `xorm:"pk int 'RuleId'" json:"TightenWrenchRuleInfo-RuleId"`
 	StepDesc          string        `xorm:"nvarchar(100) 'StepDesc' not null" json:"TightenWrenchRuleInfo-StepDesc"`
 	MainControlAction string        `xorm:"nvarchar(20) 'MainControlAction' not null" json:"TightenWrenchRuleInfo-MainControlAction"`
+	ControlId         int           `xorm:"int 'ControlId' not null" json:"TightenWrenchRuleInfo-ControlId"`
 	ControlTime       int           `xorm:"int 'ControlTime' not null" json:"TightenWrenchRuleInfo-ControlTime"`
 	LastModify        grmi.DateTime `xorm:"datetime 'LastModify' not null updated" json:"TightenWrenchRuleInfo-LastModify"`
 	LastUser          string        `xorm:"nvarchar(20) 'LastUser' not null" json:"TightenWrenchRuleInfo-LastUser"`

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

@@ -125,6 +125,18 @@ func (impl *TightenWrenchInfoServiceImplement) InsertOne(user *models.Usertab, e
 		return err
 	}
 	if len(ruleLi) != 0 {
+		for _, rule := range ruleLi {
+			if rule.MainControlAction != model.CONTROL_ACTION_PSET && rule.MainControlAction != model.CONTROL_ACTION_JOB {
+				if rule.ControlId != 1 || rule.ControlTime != 1 {
+					_ = session.Rollback()
+					return grmi.NewBusinessError("规则明细数据不合规")
+				}
+			}
+			if rule.ControlId >= 10 {
+				_ = session.Rollback()
+				return grmi.NewBusinessError("规则明细数据不合规")
+			}
+		}
 		err = ruleDao.Insert(&ruleLi)
 		if err != nil {
 			_ = session.Rollback()

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

@@ -27,6 +27,7 @@ var DefaultConditionOfTightenWrenchRuleInfo = grmi.NewCondition(
 		meta.TightenWrenchRuleInfo_RuleId.UrlParameterName:            grmi.NewConditionItem(meta.TightenWrenchRuleInfo_RuleId, grmi.Equal, true),
 		meta.TightenWrenchRuleInfo_StepDesc.UrlParameterName:          grmi.NewConditionItem(meta.TightenWrenchRuleInfo_StepDesc, grmi.Equal, false),
 		meta.TightenWrenchRuleInfo_MainControlAction.UrlParameterName: grmi.NewConditionItem(meta.TightenWrenchRuleInfo_MainControlAction, grmi.Equal, false),
+		meta.TightenWrenchRuleInfo_ControlId.UrlParameterName:         grmi.NewConditionItem(meta.TightenWrenchRuleInfo_ControlId, grmi.Equal, false),
 		meta.TightenWrenchRuleInfo_ControlTime.UrlParameterName:       grmi.NewConditionItem(meta.TightenWrenchRuleInfo_ControlTime, grmi.Equal, false),
 		meta.TightenWrenchRuleInfo_LastModify.UrlParameterName:        grmi.NewConditionItem(meta.TightenWrenchRuleInfo_LastModify, grmi.Approximate, false),
 		meta.TightenWrenchRuleInfo_LastUser.UrlParameterName:          grmi.NewConditionItem(meta.TightenWrenchRuleInfo_LastUser, grmi.Equal, false),