From 786dac7ade6ecad5e28f0d1a643e721c69e1038d Mon Sep 17 00:00:00 2001 From: "DESKTOP-4672LME\\Xu Tengfei" Date: Wed, 18 Aug 2021 11:10:46 +0800 Subject: [PATCH] =?UTF-8?q?Log=5FPackTemplate=E6=B7=BB=E5=8A=A0SiteCode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- meta/log/PackTemplate.meta.go | 4 +++- models/log/PackTemplate.model.go | 1 + services/log/implments/PackTemplate.service.impl.go | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/log/PackTemplate.meta.go b/meta/log/PackTemplate.meta.go index e52312d..8f2ffba 100644 --- a/meta/log/PackTemplate.meta.go +++ b/meta/log/PackTemplate.meta.go @@ -39,6 +39,7 @@ var PackTemplate_PKTMPCustI2 = grmi.NewField("PKTMPCustI2", "LOG_PackTemplate.PK var PackTemplate_ShipTo = grmi.NewField("ShipTo", "LOG_PackTemplate.ShipTo", "shipto", grmi.TypeString) var PackTemplate_CustArtId = grmi.NewField("CustArtId", "LOG_PackTemplate.CustArtId", "custartid", grmi.TypeString) var PackTemplate_Descr2 = grmi.NewField("Descr2", "LOG_PackTemplate.Descr2", "descr2", grmi.TypeString) +var PackTemplate_SiteCode = grmi.NewField("SiteCode", "LOG_PackTemplate.SiteCode", "sitecode", grmi.TypeString) var PackTemplate_LastModify = grmi.NewField("LastModify", "LOG_PackTemplate.LastModify", "lastmodify", grmi.TypeDateTime) var PackTemplate_LastUser = grmi.NewField("LastUser", "LOG_PackTemplate.LastUser", "lastuser", grmi.TypeString) var PackTemplate_CreateTime = grmi.NewField("CreateTime", "LOG_PackTemplate.CreateTime", "createtime", grmi.TypeDateTime) @@ -79,9 +80,10 @@ var PackTemplate = grmi.NewEntity( PackTemplate_ShipTo.Name: PackTemplate_ShipTo, PackTemplate_CustArtId.Name: PackTemplate_CustArtId, PackTemplate_Descr2.Name: PackTemplate_Descr2, + PackTemplate_SiteCode.Name: PackTemplate_SiteCode, PackTemplate_LastModify.Name: PackTemplate_LastModify, PackTemplate_LastUser.Name: PackTemplate_LastUser, PackTemplate_CreateTime.Name: PackTemplate_CreateTime, }, []string{"PlantNr"}, - []string{"Descr", "ActiveToggle", "PackTypeId", "PrinterId", "TemplateFile", "PrintQty", "PackOrderSn", "BoxSn", "SyncToggle", "SyncSn", "TwoDSheet", "FullFillToggle", "MaterialId", "PlanQty", "PKTMP_CustC1", "PKTMP_CustC2", "PKTMP_CustI1", "PKTMP_CustI2", "ShipTo", "CustArtId", "Descr2", "LastUser"}) + []string{"Descr", "ActiveToggle", "PackTypeId", "PrinterId", "TemplateFile", "PrintQty", "PackOrderSn", "BoxSn", "SyncToggle", "SyncSn", "TwoDSheet", "FullFillToggle", "MaterialId", "PlanQty", "PKTMP_CustC1", "PKTMP_CustC2", "PKTMP_CustI1", "PKTMP_CustI2", "ShipTo", "CustArtId", "Descr2","SiteCode", "LastUser"}) diff --git a/models/log/PackTemplate.model.go b/models/log/PackTemplate.model.go index 03fd01d..f024e86 100644 --- a/models/log/PackTemplate.model.go +++ b/models/log/PackTemplate.model.go @@ -43,6 +43,7 @@ type PackTemplate struct { ShipTo string `xorm:"nvarchar(40) 'ShipTo'" json:"LOG_PackTemplate-ShipTo"` CustArtId string `xorm:"nvarchar(40) 'CustArtId'" json:"LOG_PackTemplate-CustArtId"` Descr2 string `xorm:"nvarchar(40) 'Descr2'" json:"LOG_PackTemplate-Descr2"` + SiteCode string `xorm:"nvarchar(40) 'SiteCode'" json:"LOG_PackTemplate-SiteCode"` LastModify grmi.DateTime `xorm:"datetime 'LastModify' not null updated" json:"LOG_PackTemplate-LastModify"` LastUser string `xorm:"nvarchar(20) 'LastUser' not null" json:"LOG_PackTemplate-LastUser"` CreateTime grmi.DateTime `xorm:"datetime 'CreateTime' not null created" json:"LOG_PackTemplate-CreateTime"` diff --git a/services/log/implments/PackTemplate.service.impl.go b/services/log/implments/PackTemplate.service.impl.go index 3b9b4db..f6fafc3 100644 --- a/services/log/implments/PackTemplate.service.impl.go +++ b/services/log/implments/PackTemplate.service.impl.go @@ -44,6 +44,7 @@ var DefaultConditionOfPackTemplate = grmi.NewCondition( meta.PackTemplate_ShipTo.UrlParameterName: grmi.NewConditionItem(meta.PackTemplate_ShipTo, grmi.Equal, false), meta.PackTemplate_CustArtId.UrlParameterName: grmi.NewConditionItem(meta.PackTemplate_CustArtId, grmi.Equal, false), meta.PackTemplate_Descr2.UrlParameterName: grmi.NewConditionItem(meta.PackTemplate_Descr2, grmi.Equal, false), + meta.PackTemplate_SiteCode.UrlParameterName: grmi.NewConditionItem(meta.PackTemplate_SiteCode, grmi.Equal, false), meta.PackTemplate_LastModify.UrlParameterName: grmi.NewConditionItem(meta.PackTemplate_LastModify, grmi.Approximate, false), meta.PackTemplate_LastUser.UrlParameterName: grmi.NewConditionItem(meta.PackTemplate_LastUser, grmi.Equal, false), meta.PackTemplate_CreateTime.UrlParameterName: grmi.NewConditionItem(meta.PackTemplate_CreateTime, grmi.Approximate, false),