diff --git a/meta/base/LabelTemplateDetail.meta.go b/meta/base/LabelTemplateDetail.meta.go index 634fb48..5b66085 100644 --- a/meta/base/LabelTemplateDetail.meta.go +++ b/meta/base/LabelTemplateDetail.meta.go @@ -29,6 +29,7 @@ var LabelTemplateDetail_LabelItemValue = grmi.NewField("LabelItemValue", "[Label var LabelTemplateDetail_LabelItemPen = grmi.NewField("LabelItemPen", "[LabelTemplateDetail].LabelItemPen", "labelitempen", grmi.TypeString) var LabelTemplateDetail_LabelItemFilled = grmi.NewField("LabelItemFilled", "[LabelTemplateDetail].LabelItemFilled", "labelitemfilled", grmi.TypeBool) var LabelTemplateDetail_LabelItemFont = grmi.NewField("LabelItemFont", "[LabelTemplateDetail].LabelItemFont", "labelitemfont", grmi.TypeString) +var LabelTemplateDetail_PreviewValue = grmi.NewField("PreviewValue", "[LabelTemplateDetail].PreviewValue", "previewvalue", grmi.TypeString) var LabelTemplateDetail_ShowBarcodeText = grmi.NewField("ShowBarcodeText", "[LabelTemplateDetail].ShowBarcodeText", "showbarcodetext", grmi.TypeBool) var LabelTemplateDetail_LabelItemPara1 = grmi.NewField("LabelItemPara1", "[LabelTemplateDetail].LabelItemPara1", "labelitempara1", grmi.TypeInt) var LabelTemplateDetail_LabelItemPara2 = grmi.NewField("LabelItemPara2", "[LabelTemplateDetail].LabelItemPara2", "labelitempara2", grmi.TypeInt) @@ -61,6 +62,7 @@ var LabelTemplateDetail = grmi.NewEntity( LabelTemplateDetail_LabelItemType.Name: LabelTemplateDetail_LabelItemType, LabelTemplateDetail_ValueParseToggle.Name: LabelTemplateDetail_ValueParseToggle, LabelTemplateDetail_LabelItemValue.Name: LabelTemplateDetail_LabelItemValue, + LabelTemplateDetail_PreviewValue.Name: LabelTemplateDetail_PreviewValue, LabelTemplateDetail_LabelItemPen.Name: LabelTemplateDetail_LabelItemPen, LabelTemplateDetail_LabelItemFilled.Name: LabelTemplateDetail_LabelItemFilled, LabelTemplateDetail_LabelItemFont.Name: LabelTemplateDetail_LabelItemFont, @@ -74,4 +76,4 @@ var LabelTemplateDetail = grmi.NewEntity( LabelTemplateDetail_CreateTime.Name: LabelTemplateDetail_CreateTime, }, []string{"PlantNr"}, - []string{"X", "Y", "Height", "Width", "LabelItemType", "ValueParseToggle", "LabelItemValue", "LabelItemPen", "LabelItemFilled", "LabelItemFont", "ShowBarcodeText", "LabelItemPara1", "LabelItemPara2", "LabelItemPara3", "LabelItemPara4", "LastUser"}) + []string{"X", "Y", "Height", "Width", "LabelItemType", "PreviewValue", "ValueParseToggle", "LabelItemValue", "LabelItemPen", "LabelItemFilled", "LabelItemFont", "ShowBarcodeText", "LabelItemPara1", "LabelItemPara2", "LabelItemPara3", "LabelItemPara4", "LastUser"}) diff --git a/meta/base/LabelTemplateHead.meta.go b/meta/base/LabelTemplateHead.meta.go index d7ab892..c63ac99 100644 --- a/meta/base/LabelTemplateHead.meta.go +++ b/meta/base/LabelTemplateHead.meta.go @@ -28,6 +28,7 @@ var LabelTemplateHead_BackgroundColorToggle = grmi.NewField("BackgroundColorTogg var LabelTemplateHead_BackgroundColor = grmi.NewField("BackgroundColor", "[LabelTemplateHead].BackgroundColor", "backgroundcolor", grmi.TypeString) var LabelTemplateHead_BackgroundPictureToggle = grmi.NewField("BackgroundPictureToggle", "[LabelTemplateHead].BackgroundPictureToggle", "backgroundpicturetoggle", grmi.TypeBool) var LabelTemplateHead_BackgroundPicture = grmi.NewField("BackgroundPicture", "[LabelTemplateHead].BackgroundPicture", "backgroundpicture", grmi.TypeString) +var LabelTemplateHead_DPI = grmi.NewField("DPI", "[LabelTemplateHead].DPI", "dpi", grmi.TypeInt) var LabelTemplateHead_CtrlPara1 = grmi.NewField("CtrlPara1", "[LabelTemplateHead].CtrlPara1", "ctrlpara1", grmi.TypeInt) var LabelTemplateHead_CtrlPara2 = grmi.NewField("CtrlPara2", "[LabelTemplateHead].CtrlPara2", "ctrlpara2", grmi.TypeInt) var LabelTemplateHead_CtrlStr1 = grmi.NewField("CtrlStr1", "[LabelTemplateHead].CtrlStr1", "ctrlstr1", grmi.TypeString) @@ -61,6 +62,7 @@ var LabelTemplateHead = grmi.NewEntity( LabelTemplateHead_BackgroundColor.Name: LabelTemplateHead_BackgroundColor, LabelTemplateHead_BackgroundPictureToggle.Name: LabelTemplateHead_BackgroundPictureToggle, LabelTemplateHead_BackgroundPicture.Name: LabelTemplateHead_BackgroundPicture, + LabelTemplateHead_DPI.Name: LabelTemplateHead_DPI, LabelTemplateHead_CtrlPara1.Name: LabelTemplateHead_CtrlPara1, LabelTemplateHead_CtrlPara2.Name: LabelTemplateHead_CtrlPara2, LabelTemplateHead_CtrlStr1.Name: LabelTemplateHead_CtrlStr1, @@ -70,4 +72,4 @@ var LabelTemplateHead = grmi.NewEntity( LabelTemplateHead_CreateTime.Name: LabelTemplateHead_CreateTime, }, []string{"PlantNr"}, - []string{"Descr", "PrinterId", "LabelTemplateFile", "PictureTemplateToggle", "Height", "Width", "BackgroundColorToggle", "BackgroundColor", "BackgroundPictureToggle", "BackgroundPicture", "CtrlPara1", "CtrlPara2", "CtrlStr1", "CtrlStr2", "LastUser"}) + []string{"Descr", "PrinterId", "DPI", "LabelTemplateFile", "PictureTemplateToggle", "Height", "Width", "BackgroundColorToggle", "BackgroundColor", "BackgroundPictureToggle", "BackgroundPicture", "CtrlPara1", "CtrlPara2", "CtrlStr1", "CtrlStr2", "LastUser"}) diff --git a/models/base/LabelTemplateDetail.model.go b/models/base/LabelTemplateDetail.model.go index 319c8e1..b64dd8a 100644 --- a/models/base/LabelTemplateDetail.model.go +++ b/models/base/LabelTemplateDetail.model.go @@ -33,6 +33,7 @@ type LabelTemplateDetail struct { LabelItemPen string `xorm:"nvarchar(255) 'LabelItemPen' not null" json:"LabelTemplateDetail-LabelItemPen"` LabelItemFilled bool `xorm:"bit 'LabelItemFilled' not null" json:"LabelTemplateDetail-LabelItemFilled"` LabelItemFont string `xorm:"nvarchar(255) 'LabelItemFont' not null" json:"LabelTemplateDetail-LabelItemFont"` + PreviewValue string `xorm:"nvarchar(255) 'PreviewValue' not null" json:"LabelTemplateDetail-PreviewValue"` ShowBarcodeText bool `xorm:"bit 'ShowBarcodeText' not null" json:"LabelTemplateDetail-ShowBarcodeText"` LabelItemPara1 int `xorm:"int 'LabelItemPara1' not null" json:"LabelTemplateDetail-LabelItemPara1"` LabelItemPara2 int `xorm:"int 'LabelItemPara2' not null" json:"LabelTemplateDetail-LabelItemPara2"` diff --git a/models/base/LabelTemplateHead.model.go b/models/base/LabelTemplateHead.model.go index e0d0166..0d29343 100644 --- a/models/base/LabelTemplateHead.model.go +++ b/models/base/LabelTemplateHead.model.go @@ -32,6 +32,7 @@ type LabelTemplateHead struct { BackgroundColor string `xorm:"nvarchar(100) 'BackgroundColor' not null" json:"LabelTemplateHead-BackgroundColor"` BackgroundPictureToggle bool `xorm:"bit 'BackgroundPictureToggle' not null" json:"LabelTemplateHead-BackgroundPictureToggle"` BackgroundPicture string `xorm:"nvarchar(255) 'BackgroundPicture' not null" json:"LabelTemplateHead-BackgroundPicture"` + DPI int `xorm:"int 'DPI' not null" json:"LabelTemplateHead-DPI"` CtrlPara1 int `xorm:"int 'CtrlPara1' not null" json:"LabelTemplateHead-CtrlPara1"` CtrlPara2 int `xorm:"int 'CtrlPara2' not null" json:"LabelTemplateHead-CtrlPara2"` CtrlStr1 string `xorm:"nvarchar(255) 'CtrlStr1' not null" json:"LabelTemplateHead-CtrlStr1"` diff --git a/services/base/implments/LabelTemplateDetail.service.impl.go b/services/base/implments/LabelTemplateDetail.service.impl.go index 4ab013c..0c83422 100644 --- a/services/base/implments/LabelTemplateDetail.service.impl.go +++ b/services/base/implments/LabelTemplateDetail.service.impl.go @@ -35,6 +35,7 @@ var DefaultConditionOfLabelTemplateDetail = grmi.NewCondition( meta.LabelTemplateDetail_LabelItemFilled.UrlParameterName: grmi.NewConditionItem(meta.LabelTemplateDetail_LabelItemFilled, grmi.Equal, false), meta.LabelTemplateDetail_LabelItemFont.UrlParameterName: grmi.NewConditionItem(meta.LabelTemplateDetail_LabelItemFont, grmi.Equal, false), meta.LabelTemplateDetail_ShowBarcodeText.UrlParameterName: grmi.NewConditionItem(meta.LabelTemplateDetail_ShowBarcodeText, grmi.Equal, false), + meta.LabelTemplateDetail_PreviewValue.UrlParameterName: grmi.NewConditionItem(meta.LabelTemplateDetail_PreviewValue, grmi.Equal, false), meta.LabelTemplateDetail_LabelItemPara1.UrlParameterName: grmi.NewConditionItem(meta.LabelTemplateDetail_LabelItemPara1, grmi.Equal, false), meta.LabelTemplateDetail_LabelItemPara2.UrlParameterName: grmi.NewConditionItem(meta.LabelTemplateDetail_LabelItemPara2, grmi.Equal, false), meta.LabelTemplateDetail_LabelItemPara3.UrlParameterName: grmi.NewConditionItem(meta.LabelTemplateDetail_LabelItemPara3, grmi.Equal, false), diff --git a/services/base/implments/LabelTemplateHead.service.impl.go b/services/base/implments/LabelTemplateHead.service.impl.go index 3fda6ca..0adf191 100644 --- a/services/base/implments/LabelTemplateHead.service.impl.go +++ b/services/base/implments/LabelTemplateHead.service.impl.go @@ -32,6 +32,7 @@ var DefaultConditionOfLabelTemplateHead = grmi.NewCondition( meta.LabelTemplateHead_BackgroundColor.UrlParameterName: grmi.NewConditionItem(meta.LabelTemplateHead_BackgroundColor, grmi.Equal, false), meta.LabelTemplateHead_BackgroundPictureToggle.UrlParameterName: grmi.NewConditionItem(meta.LabelTemplateHead_BackgroundPictureToggle, grmi.Equal, false), meta.LabelTemplateHead_BackgroundPicture.UrlParameterName: grmi.NewConditionItem(meta.LabelTemplateHead_BackgroundPicture, grmi.Equal, false), + meta.LabelTemplateHead_DPI.UrlParameterName: grmi.NewConditionItem(meta.LabelTemplateHead_DPI, grmi.Equal, false), meta.LabelTemplateHead_CtrlPara1.UrlParameterName: grmi.NewConditionItem(meta.LabelTemplateHead_CtrlPara1, grmi.Equal, false), meta.LabelTemplateHead_CtrlPara2.UrlParameterName: grmi.NewConditionItem(meta.LabelTemplateHead_CtrlPara2, grmi.Equal, false), meta.LabelTemplateHead_CtrlStr1.UrlParameterName: grmi.NewConditionItem(meta.LabelTemplateHead_CtrlStr1, grmi.Equal, false),