From 80f0aae87e8766157f30a785f38acc21388056b7 Mon Sep 17 00:00:00 2001 From: zhangxin Date: Thu, 17 Mar 2022 09:35:12 +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/LabelHead.meta.go | 4 +++- models/base/LabelHead.model.go | 1 + services/base/implments/LabelHead.service.impl.go | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/base/LabelHead.meta.go b/meta/base/LabelHead.meta.go index 539dd23..fb0400d 100644 --- a/meta/base/LabelHead.meta.go +++ b/meta/base/LabelHead.meta.go @@ -18,6 +18,7 @@ import ( ******************************************************************************/ var LabelHead_PlantNr = grmi.NewField("PlantNr", "[LabelHead].PlantNr", "plantnr", grmi.TypeInt) var LabelHead_LabelId = grmi.NewField("LabelId", "[LabelHead].LabelId", "labelid", grmi.TypeString) +var LableHead_OperationId = grmi.NewField("OperationId", "[LabelHead].OperationId", "operationid", grmi.TypeInt) var LabelHead_LabelTemplateId = grmi.NewField("LabelTemplateId", "[LabelHead].LabelTemplateId", "labeltemplateid", grmi.TypeString) var LabelHead_PrinterId = grmi.NewField("PrinterId", "[LabelHead].PrinterId", "printerid", grmi.TypeString) var LabelHead_BusinessObjType = grmi.NewField("BusinessObjType", "[LabelHead].BusinessObjType", "businessobjtype", grmi.TypeString) @@ -44,6 +45,7 @@ var LabelHead = grmi.NewEntity( map[string]grmi.Field{ LabelHead_PlantNr.Name: LabelHead_PlantNr, LabelHead_LabelId.Name: LabelHead_LabelId, + LableHead_OperationId.Name: LableHead_OperationId, LabelHead_LabelTemplateId.Name: LabelHead_LabelTemplateId, LabelHead_PrinterId.Name: LabelHead_PrinterId, LabelHead_BusinessObjType.Name: LabelHead_BusinessObjType, @@ -56,4 +58,4 @@ var LabelHead = grmi.NewEntity( LabelHead_CreateTime.Name: LabelHead_CreateTime, }, []string{"PlantNr"}, - []string{"LabelTemplateId", "PrinterId", "BusinessObjType", "BusinessObjId", "Status", "PrintQty", "PrintTime", "LastUser"}) + []string{"OperationId", "LabelTemplateId", "PrinterId", "BusinessObjType", "BusinessObjId", "Status", "PrintQty", "PrintTime", "LastUser"}) diff --git a/models/base/LabelHead.model.go b/models/base/LabelHead.model.go index 2f5c68d..7f6fc21 100644 --- a/models/base/LabelHead.model.go +++ b/models/base/LabelHead.model.go @@ -22,6 +22,7 @@ import ( type LabelHead struct { PlantNr int `xorm:"pk int 'PlantNr'" json:"LabelHead-PlantNr"` LabelId string `xorm:"pk nvarchar(40) 'LabelId'" json:"LabelHead-LabelId"` + OperationId int `xorm:"int 'OperationId'" json:"LabelHead-OperationId"` LabelTemplateId string `xorm:"nvarchar(40) 'LabelTemplateId' not null" json:"LabelHead-LabelTemplateId"` PrinterId string `xorm:"nvarchar(40) 'PrinterId' not null" json:"LabelHead-PrinterId"` BusinessObjType string `xorm:"nvarchar(40) 'BusinessObjType' not null" json:"LabelHead-BusinessObjType"` diff --git a/services/base/implments/LabelHead.service.impl.go b/services/base/implments/LabelHead.service.impl.go index 9cc75aa..62ba4f5 100644 --- a/services/base/implments/LabelHead.service.impl.go +++ b/services/base/implments/LabelHead.service.impl.go @@ -23,6 +23,7 @@ import ( var DefaultConditionOfLabelHead = grmi.NewCondition( map[string]grmi.ConditionItem{ meta.LabelHead_LabelId.UrlParameterName: grmi.NewConditionItem(meta.LabelHead_LabelId, grmi.Equal, true), + meta.LableHead_OperationId.UrlParameterName: grmi.NewConditionItem(meta.LableHead_OperationId, grmi.Equal, false), meta.LabelHead_LabelTemplateId.UrlParameterName: grmi.NewConditionItem(meta.LabelHead_LabelTemplateId, grmi.Equal, false), meta.LabelHead_PrinterId.UrlParameterName: grmi.NewConditionItem(meta.LabelHead_PrinterId, grmi.Equal, false), meta.LabelHead_BusinessObjType.UrlParameterName: grmi.NewConditionItem(meta.LabelHead_BusinessObjType, grmi.Equal, false),