From 50e6c42fdcb24dffab15afe0f0aca0191490a4df Mon Sep 17 00:00:00 2001 From: zhangxin Date: Mon, 21 Feb 2022 14:33:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- meta/base/PLCErrorInfo.meta.go | 4 +++- meta/jit/PackOrderPlcError.meta.go | 4 +++- models/base/PLCErrorInfo.model.go | 1 + models/jit/PackOrderPlcError.model.go | 1 + services/base/implments/PLCErrorInfo.service.impl.go | 1 + services/jit/implments/PackOrderPlcError.service.impl.go | 1 + 6 files changed, 10 insertions(+), 2 deletions(-) diff --git a/meta/base/PLCErrorInfo.meta.go b/meta/base/PLCErrorInfo.meta.go index 5e63cc0..d4c59ff 100644 --- a/meta/base/PLCErrorInfo.meta.go +++ b/meta/base/PLCErrorInfo.meta.go @@ -24,6 +24,7 @@ var PLCErrorInfo_Step = grmi.NewField("Step", "[PLCErrorInfo].Step", "step", grm var PLCErrorInfo_ErrorInfo = grmi.NewField("ErrorInfo", "[PLCErrorInfo].ErrorInfo", "errorinfo", grmi.TypeString) var PLCErrorInfo_SeatData = grmi.NewField("SeatData", "[PLCErrorInfo].SeatData", "seatdata", grmi.TypeString) var PLCErrorInfo_Location = grmi.NewField("Location", "[PLCErrorInfo].Location", "location", grmi.TypeString) +var PLCErrorInfo_ErrorType = grmi.NewField("ErrorType", "[PLCErrorInfo].ErrorType", "errortype", grmi.TypeString) var PLCErrorInfo_SaveStr1 = grmi.NewField("SaveStr1", "[PLCErrorInfo].SaveStr1", "savestr1", grmi.TypeString) var PLCErrorInfo_SaveStr2 = grmi.NewField("SaveStr2", "[PLCErrorInfo].SaveStr2", "savestr2", grmi.TypeString) var PLCErrorInfo_SaveStr3 = grmi.NewField("SaveStr3", "[PLCErrorInfo].SaveStr3", "savestr3", grmi.TypeString) @@ -58,6 +59,7 @@ var PLCErrorInfo = grmi.NewEntity( PLCErrorInfo_ErrorInfo.Name: PLCErrorInfo_ErrorInfo, PLCErrorInfo_SeatData.Name: PLCErrorInfo_SeatData, PLCErrorInfo_Location.Name: PLCErrorInfo_Location, + PLCErrorInfo_ErrorType.Name: PLCErrorInfo_ErrorType, PLCErrorInfo_SaveStr1.Name: PLCErrorInfo_SaveStr1, PLCErrorInfo_SaveStr2.Name: PLCErrorInfo_SaveStr2, PLCErrorInfo_SaveStr3.Name: PLCErrorInfo_SaveStr3, @@ -72,4 +74,4 @@ var PLCErrorInfo = grmi.NewEntity( PLCErrorInfo_CreateTime.Name: PLCErrorInfo_CreateTime, }, []string{"PlantNr"}, - []string{"Status", "Step", "ErrorInfo", "SeatData", "Location", "SaveStr1", "SaveStr2", "SaveStr3", "SaveInt1", "SaveInt2", "SaveInt3", "SaveFloat1", "SaveFloat2", "SaveFloat3", "LastUser"}) + []string{"Status", "Step", "ErrorInfo", "SeatData", "Location", "ErrorType", "SaveStr1", "SaveStr2", "SaveStr3", "SaveInt1", "SaveInt2", "SaveInt3", "SaveFloat1", "SaveFloat2", "SaveFloat3", "LastUser"}) diff --git a/meta/jit/PackOrderPlcError.meta.go b/meta/jit/PackOrderPlcError.meta.go index f89b6da..05c7c2b 100644 --- a/meta/jit/PackOrderPlcError.meta.go +++ b/meta/jit/PackOrderPlcError.meta.go @@ -21,6 +21,7 @@ var PackOrderPlcError_PackOrderId = grmi.NewField("PackOrderId", "[JIT_PackOrder var PackOrderPlcError_Status = grmi.NewField("Status", "[JIT_PackOrderPlcError].Status", "status", grmi.TypeInt) var PackOrderPlcError_Step = grmi.NewField("Step", "[JIT_PackOrderPlcError].Step", "step", grmi.TypeInt) var PackOrderPlcError_ErrorInfo = grmi.NewField("ErrorInfo", "[JIT_PackOrderPlcError].ErrorInfo", "errorinfo", grmi.TypeString) +var PackOrderPlcError_ErrorType = grmi.NewField("ErrorType", "[JIT_PackOrderPlcError].ErrorType", "errortype", grmi.TypeString) var PackOrderPlcError_Location = grmi.NewField("Location", "[JIT_PackOrderPlcError].Location", "location", grmi.TypeString) var PackOrderPlcError_SeatData = grmi.NewField("SeatData", "[JIT_PackOrderPlcError].SeatData", "seatdata", grmi.TypeString) var PackOrderPlcError_LastModify = grmi.NewField("LastModify", "[JIT_PackOrderPlcError].LastModify", "lastmodify", grmi.TypeDateTime) @@ -45,6 +46,7 @@ var PackOrderPlcError = grmi.NewEntity( PackOrderPlcError_Status.Name: PackOrderPlcError_Status, PackOrderPlcError_Step.Name: PackOrderPlcError_Step, PackOrderPlcError_ErrorInfo.Name: PackOrderPlcError_ErrorInfo, + PackOrderPlcError_ErrorType.Name: PackOrderPlcError_ErrorType, PackOrderPlcError_Location.Name: PackOrderPlcError_Location, PackOrderPlcError_SeatData.Name: PackOrderPlcError_SeatData, PackOrderPlcError_LastModify.Name: PackOrderPlcError_LastModify, @@ -52,4 +54,4 @@ var PackOrderPlcError = grmi.NewEntity( PackOrderPlcError_CreateTime.Name: PackOrderPlcError_CreateTime, }, []string{"PlantNr"}, - []string{"Status", "Step", "ErrorInfo", "Location", "SeatData", "LastUser"}) + []string{"Status", "Step", "ErrorInfo", "ErrorType", "Location", "SeatData", "LastUser"}) diff --git a/models/base/PLCErrorInfo.model.go b/models/base/PLCErrorInfo.model.go index 6d3c47c..c0d3487 100644 --- a/models/base/PLCErrorInfo.model.go +++ b/models/base/PLCErrorInfo.model.go @@ -28,6 +28,7 @@ type PLCErrorInfo struct { ErrorInfo string `xorm:"nvarchar(500) 'ErrorInfo' not null" json:"PLCErrorInfo-ErrorInfo"` SeatData string `xorm:"nvarchar(100) 'SeatData' not null" json:"PLCErrorInfo-SeatData"` Location string `xorm:"nvarchar(40) 'Location' not null" json:"PLCErrorInfo-Location"` + ErrorType string `xorm:"nvarchar(20) 'ErrorType' not null" json:"PLCErrorInfo-ErrorType"` SaveStr1 string `xorm:"nvarchar(100) 'SaveStr1'" json:"PLCErrorInfo-SaveStr1"` SaveStr2 string `xorm:"nvarchar(100) 'SaveStr2'" json:"PLCErrorInfo-SaveStr2"` SaveStr3 string `xorm:"nvarchar(100) 'SaveStr3'" json:"PLCErrorInfo-SaveStr3"` diff --git a/models/jit/PackOrderPlcError.model.go b/models/jit/PackOrderPlcError.model.go index 377c06f..e526209 100644 --- a/models/jit/PackOrderPlcError.model.go +++ b/models/jit/PackOrderPlcError.model.go @@ -25,6 +25,7 @@ type PackOrderPlcError struct { Status int `xorm:"int 'Status' not null" json:"JIT_PackOrderPlcError-Status"` Step int `xorm:"int 'Step' not null" json:"JIT_PackOrderPlcError-Step"` ErrorInfo string `xorm:"nvarchar(500) 'ErrorInfo' not null" json:"JIT_PackOrderPlcError-ErrorInfo"` + ErrorType string `xorm:"nvarchar(20) 'ErrorType' not null" json:"PLCErrorInfo-ErrorType"` Location string `xorm:"nvarchar(40) 'Location' not null" json:"JIT_PackOrderPlcError-Location"` SeatData string `xorm:"nvarchar(100) 'SeatData' not null" json:"JIT_PackOrderPlcError-SeatData"` LastModify grmi.DateTime `xorm:"datetime 'LastModify' not null updated" json:"JIT_PackOrderPlcError-LastModify"` diff --git a/services/base/implments/PLCErrorInfo.service.impl.go b/services/base/implments/PLCErrorInfo.service.impl.go index 2440d95..ad2587b 100644 --- a/services/base/implments/PLCErrorInfo.service.impl.go +++ b/services/base/implments/PLCErrorInfo.service.impl.go @@ -29,6 +29,7 @@ var DefaultConditionOfPLCErrorInfo = grmi.NewCondition( meta.PLCErrorInfo_ErrorInfo.UrlParameterName: grmi.NewConditionItem(meta.PLCErrorInfo_ErrorInfo, grmi.Equal, false), meta.PLCErrorInfo_SeatData.UrlParameterName: grmi.NewConditionItem(meta.PLCErrorInfo_SeatData, grmi.Equal, false), meta.PLCErrorInfo_Location.UrlParameterName: grmi.NewConditionItem(meta.PLCErrorInfo_Location, grmi.Equal, false), + meta.PLCErrorInfo_ErrorType.UrlParameterName: grmi.NewConditionItem(meta.PLCErrorInfo_ErrorType, grmi.Equal, false), meta.PLCErrorInfo_SaveStr1.UrlParameterName: grmi.NewConditionItem(meta.PLCErrorInfo_SaveStr1, grmi.Equal, false), meta.PLCErrorInfo_SaveStr2.UrlParameterName: grmi.NewConditionItem(meta.PLCErrorInfo_SaveStr2, grmi.Equal, false), meta.PLCErrorInfo_SaveStr3.UrlParameterName: grmi.NewConditionItem(meta.PLCErrorInfo_SaveStr3, grmi.Equal, false), diff --git a/services/jit/implments/PackOrderPlcError.service.impl.go b/services/jit/implments/PackOrderPlcError.service.impl.go index 0e296fc..7c1eadc 100644 --- a/services/jit/implments/PackOrderPlcError.service.impl.go +++ b/services/jit/implments/PackOrderPlcError.service.impl.go @@ -26,6 +26,7 @@ var DefaultConditionOfPackOrderPlcError = grmi.NewCondition( meta.PackOrderPlcError_Status.UrlParameterName: grmi.NewConditionItem(meta.PackOrderPlcError_Status, grmi.Equal, false), meta.PackOrderPlcError_Step.UrlParameterName: grmi.NewConditionItem(meta.PackOrderPlcError_Step, grmi.Equal, false), meta.PackOrderPlcError_ErrorInfo.UrlParameterName: grmi.NewConditionItem(meta.PackOrderPlcError_ErrorInfo, grmi.Equal, false), + meta.PackOrderPlcError_ErrorType.UrlParameterName: grmi.NewConditionItem(meta.PackOrderPlcError_ErrorType, grmi.Equal, false), meta.PackOrderPlcError_Location.UrlParameterName: grmi.NewConditionItem(meta.PackOrderPlcError_Location, grmi.Equal, false), meta.PackOrderPlcError_SeatData.UrlParameterName: grmi.NewConditionItem(meta.PackOrderPlcError_SeatData, grmi.Equal, false), meta.PackOrderPlcError_LastModify.UrlParameterName: grmi.NewConditionItem(meta.PackOrderPlcError_LastModify, grmi.Approximate, false),