leo
/
LAPP_LF_MOM_BACKEND
2
1
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

增加字段

pull/93/head
zhangxin 3 years ago
parent
dbedc9d0ca
commit
e617ddb983
5 changed files with 68 additions and 50 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +5
    -1
      meta/base/OPCComRule.meta.go
  2. +30
    -24
      meta/base/WorkPlace.meta.go
  3. +2
    -0
      models/base/OPCComRule.model.go
  4. +26
    -23
      models/base/WorkPlace.model.go
  5. +5
    -2
      services/base/implments/WorkPlace.service.impl.go

+ 5
- 1
meta/base/OPCComRule.meta.go View File

@ -28,6 +28,8 @@ var OPCComRule_ActionType = grmi.NewField("ActionType", "OPCComRule.ActionType",
var OPCComRule_DBlockAddress = grmi.NewField("DBlockAddress", "OPCComRule.DBlockAddress", "dblockaddress", grmi.TypeString)
var OPCComRule_DBlockValueType = grmi.NewField("DBlockValueType", "OPCComRule.DBlockValueType", "dblockvaluetype", grmi.TypeString)
var OPCComRule_DBlockValue = grmi.NewField("DBlockValue", "OPCComRule.DBlockValue", "dblockvalue", grmi.TypeString)
var OPCComRule_Formula = grmi.NewField("Formula", "OPCComRule.Formula", "formula", grmi.TypeString)
var OPCComRule_OperatorSimbol = grmi.NewField("OperatorSimbol", "OPCComRule.OperatorSimbol", "operatorsimbol", grmi.TypeString)
var OPCComRule_LastModify = grmi.NewField("LastModify", "OPCComRule.LastModify", "lastmodify", grmi.TypeDateTime)
var OPCComRule_LastUser = grmi.NewField("LastUser", "OPCComRule.LastUser", "lastuser", grmi.TypeString)
var OPCComRule_CreateTime = grmi.NewField("CreateTime", "OPCComRule.CreateTime", "createtime", grmi.TypeDateTime)
@ -57,9 +59,11 @@ var OPCComRule = grmi.NewEntity(
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_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", "LastUser"})
[]string{"PO", "StepNo", "StepDesc", "ProjectId", "ActionType", "DBlockAddress", "DBlockValueType", "DBlockValue", "Formula", "OperatorSimbol", "LastUser"})

+ 30
- 24
meta/base/WorkPlace.meta.go View File

@ -36,6 +36,9 @@ var WorkPlace_RequireSkillRank3 = grmi.NewField("RequireSkillRank3", "WorkPlace.
var WorkPlace_RequireSkillRank4 = grmi.NewField("RequireSkillRank4", "WorkPlace.RequireSkillRank4", "requireskillrank4", grmi.TypeFloat64)
var WorkPlace_TriggerFrom = grmi.NewField("TriggerFrom", "WorkPlace.TriggerFrom", "triggerfrom", grmi.TypeString)
var WorkPlace_TriggerDependOn = grmi.NewField("TriggerDependOn", "WorkPlace.TriggerDependOn", "triggerdependon", grmi.TypeString)
var WorkPlace_MonitorPalletInPlace = grmi.NewField("MonitorPalletInPlace", "WorkPlace.MonitorPalletInPlace", "monitorpalletinplace", grmi.TypeInt)
var WorkPlace_MonitorManualRelease = grmi.NewField("MonitorManualRelease", "WorkPlace.MonitorManualRelease", "monitormanualrelease", grmi.TypeInt)
var WorkPlace_MonitorProblemPieceRelease = grmi.NewField("MonitorProblemPieceRelease", "WorkPlace.MonitorProblemPieceRelease", "monitorproblempiecerelease", grmi.TypeInt)
var WorkPlace_LastModify = grmi.NewField("LastModify", "WorkPlace.LastModify", "lastmodify", grmi.TypeDateTime)
var WorkPlace_LastUser = grmi.NewField("LastUser", "WorkPlace.LastUser", "lastuser", grmi.TypeString)
var WorkPlace_CreateTime = grmi.NewField("CreateTime", "WorkPlace.CreateTime", "createtime", grmi.TypeDateTime)
@ -53,29 +56,32 @@ var WorkPlace = grmi.NewEntity(
"WorkPlace",
func() interface{} { return &model.WorkPlace{} },
map[string]grmi.Field{
WorkPlace_PlantNr.Name: WorkPlace_PlantNr,
WorkPlace_WorkPlaceNr.Name: WorkPlace_WorkPlaceNr,
WorkPlace_WorkPlaceId.Name: WorkPlace_WorkPlaceId,
WorkPlace_Descr.Name: WorkPlace_Descr,
WorkPlace_WorkPlaceGrpNr.Name: WorkPlace_WorkPlaceGrpNr,
WorkPlace_WorkPlaceType.Name: WorkPlace_WorkPlaceType,
WorkPlace_CapacityType.Name: WorkPlace_CapacityType,
WorkPlace_CapacityFactor.Name: WorkPlace_CapacityFactor,
WorkPlace_PlanEfficiency.Name: WorkPlace_PlanEfficiency,
WorkPlace_CostRate.Name: WorkPlace_CostRate,
WorkPlace_WeekModelNr.Name: WorkPlace_WeekModelNr,
WorkPlace_WorkCalendarNr.Name: WorkPlace_WorkCalendarNr,
WorkPlace_CostCenterId.Name: WorkPlace_CostCenterId,
WorkPlace_LocationId.Name: WorkPlace_LocationId,
WorkPlace_RequireSkillRank1.Name: WorkPlace_RequireSkillRank1,
WorkPlace_RequireSkillRank2.Name: WorkPlace_RequireSkillRank2,
WorkPlace_RequireSkillRank3.Name: WorkPlace_RequireSkillRank3,
WorkPlace_RequireSkillRank4.Name: WorkPlace_RequireSkillRank4,
WorkPlace_TriggerFrom.Name: WorkPlace_TriggerFrom,
WorkPlace_TriggerDependOn.Name: WorkPlace_TriggerDependOn,
WorkPlace_LastModify.Name: WorkPlace_LastModify,
WorkPlace_LastUser.Name: WorkPlace_LastUser,
WorkPlace_CreateTime.Name: WorkPlace_CreateTime,
WorkPlace_PlantNr.Name: WorkPlace_PlantNr,
WorkPlace_WorkPlaceNr.Name: WorkPlace_WorkPlaceNr,
WorkPlace_WorkPlaceId.Name: WorkPlace_WorkPlaceId,
WorkPlace_Descr.Name: WorkPlace_Descr,
WorkPlace_WorkPlaceGrpNr.Name: WorkPlace_WorkPlaceGrpNr,
WorkPlace_WorkPlaceType.Name: WorkPlace_WorkPlaceType,
WorkPlace_CapacityType.Name: WorkPlace_CapacityType,
WorkPlace_CapacityFactor.Name: WorkPlace_CapacityFactor,
WorkPlace_PlanEfficiency.Name: WorkPlace_PlanEfficiency,
WorkPlace_CostRate.Name: WorkPlace_CostRate,
WorkPlace_WeekModelNr.Name: WorkPlace_WeekModelNr,
WorkPlace_WorkCalendarNr.Name: WorkPlace_WorkCalendarNr,
WorkPlace_CostCenterId.Name: WorkPlace_CostCenterId,
WorkPlace_LocationId.Name: WorkPlace_LocationId,
WorkPlace_RequireSkillRank1.Name: WorkPlace_RequireSkillRank1,
WorkPlace_RequireSkillRank2.Name: WorkPlace_RequireSkillRank2,
WorkPlace_RequireSkillRank3.Name: WorkPlace_RequireSkillRank3,
WorkPlace_RequireSkillRank4.Name: WorkPlace_RequireSkillRank4,
WorkPlace_TriggerFrom.Name: WorkPlace_TriggerFrom,
WorkPlace_TriggerDependOn.Name: WorkPlace_TriggerDependOn,
WorkPlace_MonitorPalletInPlace.Name: WorkPlace_MonitorPalletInPlace,
WorkPlace_MonitorManualRelease.Name: WorkPlace_MonitorManualRelease,
WorkPlace_MonitorProblemPieceRelease.Name: WorkPlace_MonitorProblemPieceRelease,
WorkPlace_LastModify.Name: WorkPlace_LastModify,
WorkPlace_LastUser.Name: WorkPlace_LastUser,
WorkPlace_CreateTime.Name: WorkPlace_CreateTime,
},
[]string{"PlantNr"},
[]string{"WorkPlaceId", "Descr", "WorkPlaceGrpNr", "WorkPlaceType", "CapacityType", "CapacityFactor", "PlanEfficiency", "CostRate", "WeekModelNr", "WorkCalendarNr", "CostCenterId", "LocationId", "RequireSkillRank1", "RequireSkillRank2", "RequireSkillRank3", "RequireSkillRank4", "TriggerFrom", "TriggerDependOn", "LastUser"})
[]string{"WorkPlaceId", "Descr", "WorkPlaceGrpNr", "WorkPlaceType", "CapacityType", "CapacityFactor", "PlanEfficiency", "CostRate", "WeekModelNr", "WorkCalendarNr", "CostCenterId", "LocationId", "RequireSkillRank1", "RequireSkillRank2", "RequireSkillRank3", "RequireSkillRank4", "TriggerFrom", "TriggerDependOn", "MonitorPalletInPlace", "MonitorManualRelease", "MonitorProblemPieceRelease", "LastUser"})

+ 2
- 0
models/base/OPCComRule.model.go View File

@ -32,6 +32,8 @@ type OPCComRule struct {
DBlockAddress string `xorm:"nvarchar(40) 'DBlockAddress' not null" json:"OPCComRule-DBlockAddress"`
DBlockValueType string `xorm:"nvarchar(40) 'DBlockValueType' not null" json:"OPCComRule-DBlockValueType"`
DBlockValue string `xorm:"nvarchar(100) 'DBlockValue' not null" json:"OPCComRule-DBlockValue"`
Formula string `xorm:"nvarchar(40) 'Formula' not null" json:"OPCComRule-Formula"`
OperatorSimbol string `xorm:"nvarchar(40) 'OperatorSimbol' not null" json:"OPCComRule-OperatorSimbol"`
LastModify grmi.DateTime `xorm:"datetime 'LastModify' not null updated" json:"OPCComRule-LastModify"`
LastUser string `xorm:"nvarchar(20) 'LastUser' not null" json:"OPCComRule-LastUser"`
CreateTime grmi.DateTime `xorm:"datetime 'CreateTime' not null created" json:"OPCComRule-CreateTime"`


+ 26
- 23
models/base/WorkPlace.model.go View File

@ -20,29 +20,32 @@ import (
*
******************************************************************************/
type WorkPlace struct {
PlantNr int `xorm:"pk int 'PlantNr'" json:"WorkPlace-PlantNr"`
WorkPlaceNr int `xorm:"pk int 'WorkPlaceNr' autoincr" json:"WorkPlace-WorkPlaceNr"`
WorkPlaceId string `xorm:"nvarchar(40) 'WorkPlaceId' not null" json:"WorkPlace-WorkPlaceId"`
Descr string `xorm:"nvarchar(100) 'Descr' not null" json:"WorkPlace-Descr"`
WorkPlaceGrpNr int `xorm:"int 'WorkPlaceGrpNr' not null" json:"WorkPlace-WorkPlaceGrpNr"`
WorkPlaceType string `xorm:"nvarchar(40) 'WorkPlaceType' not null" json:"WorkPlace-WorkPlaceType"`
CapacityType string `xorm:"nvarchar(40) 'CapacityType' not null" json:"WorkPlace-CapacityType"`
CapacityFactor float64 `xorm:"float 'CapacityFactor' not null" json:"WorkPlace-CapacityFactor"`
PlanEfficiency float64 `xorm:"float 'PlanEfficiency' not null" json:"WorkPlace-PlanEfficiency"`
CostRate float64 `xorm:"float 'CostRate' not null" json:"WorkPlace-CostRate"`
WeekModelNr int `xorm:"int 'WeekModelNr' not null" json:"WorkPlace-WeekModelNr"`
WorkCalendarNr int `xorm:"int 'WorkCalendarNr' not null" json:"WorkPlace-WorkCalendarNr"`
CostCenterId string `xorm:"nvarchar(40) 'CostCenterId' not null" json:"WorkPlace-CostCenterId"`
LocationId string `xorm:"nvarchar(40) 'LocationId' not null" json:"WorkPlace-LocationId"`
RequireSkillRank1 int `xorm:"int 'RequireSkillRank1' not null" json:"WorkPlace-RequireSkillRank1"`
RequireSkillRank2 int `xorm:"int 'RequireSkillRank2' not null" json:"WorkPlace-RequireSkillRank2"`
RequireSkillRank3 float64 `xorm:"float 'RequireSkillRank3' not null" json:"WorkPlace-RequireSkillRank3"`
RequireSkillRank4 float64 `xorm:"float 'RequireSkillRank4' not null" json:"WorkPlace-RequireSkillRank4"`
TriggerFrom string `xorm:"nvarchar(40) 'TriggerFrom' not null" json:"WorkPlace-TriggerFrom"`
TriggerDependOn string `xorm:"nvarchar(40) 'TriggerDependOn' not null" json:"WorkPlace-TriggerDependOn"`
LastModify grmi.DateTime `xorm:"datetime 'LastModify' not null updated" json:"WorkPlace-LastModify"`
LastUser string `xorm:"nvarchar(20) 'LastUser' not null" json:"WorkPlace-LastUser"`
CreateTime grmi.DateTime `xorm:"datetime 'CreateTime' not null created" json:"WorkPlace-CreateTime"`
PlantNr int `xorm:"pk int 'PlantNr'" json:"WorkPlace-PlantNr"`
WorkPlaceNr int `xorm:"pk int 'WorkPlaceNr' autoincr" json:"WorkPlace-WorkPlaceNr"`
WorkPlaceId string `xorm:"nvarchar(40) 'WorkPlaceId' not null" json:"WorkPlace-WorkPlaceId"`
Descr string `xorm:"nvarchar(100) 'Descr' not null" json:"WorkPlace-Descr"`
WorkPlaceGrpNr int `xorm:"int 'WorkPlaceGrpNr' not null" json:"WorkPlace-WorkPlaceGrpNr"`
WorkPlaceType string `xorm:"nvarchar(40) 'WorkPlaceType' not null" json:"WorkPlace-WorkPlaceType"`
CapacityType string `xorm:"nvarchar(40) 'CapacityType' not null" json:"WorkPlace-CapacityType"`
CapacityFactor float64 `xorm:"float 'CapacityFactor' not null" json:"WorkPlace-CapacityFactor"`
PlanEfficiency float64 `xorm:"float 'PlanEfficiency' not null" json:"WorkPlace-PlanEfficiency"`
CostRate float64 `xorm:"float 'CostRate' not null" json:"WorkPlace-CostRate"`
WeekModelNr int `xorm:"int 'WeekModelNr' not null" json:"WorkPlace-WeekModelNr"`
WorkCalendarNr int `xorm:"int 'WorkCalendarNr' not null" json:"WorkPlace-WorkCalendarNr"`
CostCenterId string `xorm:"nvarchar(40) 'CostCenterId' not null" json:"WorkPlace-CostCenterId"`
LocationId string `xorm:"nvarchar(40) 'LocationId' not null" json:"WorkPlace-LocationId"`
RequireSkillRank1 int `xorm:"int 'RequireSkillRank1' not null" json:"WorkPlace-RequireSkillRank1"`
RequireSkillRank2 int `xorm:"int 'RequireSkillRank2' not null" json:"WorkPlace-RequireSkillRank2"`
RequireSkillRank3 float64 `xorm:"float 'RequireSkillRank3' not null" json:"WorkPlace-RequireSkillRank3"`
RequireSkillRank4 float64 `xorm:"float 'RequireSkillRank4' not null" json:"WorkPlace-RequireSkillRank4"`
TriggerFrom string `xorm:"nvarchar(40) 'TriggerFrom' not null" json:"WorkPlace-TriggerFrom"`
TriggerDependOn string `xorm:"nvarchar(40) 'TriggerDependOn' not null" json:"WorkPlace-TriggerDependOn"`
MonitorPalletInPlace int `xorm:"int 'MonitorPalletInPlace' not null" json:"WorkPlace-MonitorPalletInPlace"`
MonitorManualRelease int `xorm:"int 'MonitorManualRelease' not null" json:"WorkPlace-MonitorManualRelease"`
MonitorProblemPieceRelease int `xorm:"int 'MonitorProblemPieceRelease' not null" json:"WorkPlace-MonitorProblemPieceRelease"`
LastModify grmi.DateTime `xorm:"datetime 'LastModify' not null updated" json:"WorkPlace-LastModify"`
LastUser string `xorm:"nvarchar(20) 'LastUser' not null" json:"WorkPlace-LastUser"`
CreateTime grmi.DateTime `xorm:"datetime 'CreateTime' not null created" json:"WorkPlace-CreateTime"`
}
/******************************************************************************


+ 5
- 2
services/base/implments/WorkPlace.service.impl.go View File

@ -39,8 +39,11 @@ var DefaultConditionOfWorkPlace = grmi.NewCondition(
meta.WorkPlace_RequireSkillRank2.UrlParameterName: grmi.NewConditionItem(meta.WorkPlace_RequireSkillRank2, grmi.Equal, false),
meta.WorkPlace_RequireSkillRank3.UrlParameterName: grmi.NewConditionItem(meta.WorkPlace_RequireSkillRank3, grmi.Equal, false),
meta.WorkPlace_RequireSkillRank4.UrlParameterName: grmi.NewConditionItem(meta.WorkPlace_RequireSkillRank4, grmi.Equal, false),
meta.WorkPlace_TriggerFrom.UrlParameterName: grmi.NewConditionItem(meta.WorkPlace_TriggerFrom, grmi.Equal, false),
meta.WorkPlace_TriggerDependOn.UrlParameterName: grmi.NewConditionItem(meta.WorkPlace_TriggerDependOn, grmi.Equal, false),
meta.WorkPlace_TriggerFrom.UrlParameterName: grmi.NewConditionItem(meta.WorkPlace_TriggerFrom, grmi.Equal, false),
meta.WorkPlace_TriggerDependOn.UrlParameterName: grmi.NewConditionItem(meta.WorkPlace_TriggerDependOn, grmi.Equal, false),
meta.WorkPlace_MonitorPalletInPlace.Name: grmi.NewConditionItem(meta.WorkPlace_MonitorPalletInPlace, grmi.Equal, false),
meta.WorkPlace_MonitorManualRelease.Name: grmi.NewConditionItem(meta.WorkPlace_MonitorManualRelease, grmi.Equal, false),
meta.WorkPlace_MonitorProblemPieceRelease.Name: grmi.NewConditionItem(meta.WorkPlace_MonitorProblemPieceRelease, grmi.Equal, false),
meta.WorkPlace_LastModify.UrlParameterName: grmi.NewConditionItem(meta.WorkPlace_LastModify, grmi.Approximate, false),
meta.WorkPlace_LastUser.UrlParameterName: grmi.NewConditionItem(meta.WorkPlace_LastUser, grmi.Equal, false),
meta.WorkPlace_CreateTime.UrlParameterName: grmi.NewConditionItem(meta.WorkPlace_CreateTime, grmi.Approximate, false),


Write Preview
Loading…
Cancel
Save