From 69d77bb5c2052286b0eba9c0bf0abf5358689180 Mon Sep 17 00:00:00 2001 From: "DESKTOP-4672LME\\Xu Tengfei" Date: Mon, 16 Aug 2021 10:51:18 +0800 Subject: [PATCH] =?UTF-8?q?PackTemplate=20=E6=96=B0=E5=A2=9E=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- meta/log/PackTemplate.meta.go | 12 +++-- models/log/PackTemplate.model.go | 54 ++++++++++--------- .../implments/PackTemplate.service.impl.go | 3 ++ 3 files changed, 40 insertions(+), 29 deletions(-) diff --git a/meta/log/PackTemplate.meta.go b/meta/log/PackTemplate.meta.go index f4dc56e..e52312d 100644 --- a/meta/log/PackTemplate.meta.go +++ b/meta/log/PackTemplate.meta.go @@ -13,7 +13,7 @@ import ( * * @Author : 代码生成器创建 * - * @Date : 2021-04-20 10:57:41 + * @Date : 2021-08-16 10:30:42 * ******************************************************************************/ var PackTemplate_PlantNr = grmi.NewField("PlantNr", "LOG_PackTemplate.PlantNr", "plantnr", grmi.TypeInt) @@ -36,6 +36,9 @@ var PackTemplate_PKTMPCustC1 = grmi.NewField("PKTMPCustC1", "LOG_PackTemplate.PK var PackTemplate_PKTMPCustC2 = grmi.NewField("PKTMPCustC2", "LOG_PackTemplate.PKTMP_CustC2", "pktmpcustc2", grmi.TypeString) var PackTemplate_PKTMPCustI1 = grmi.NewField("PKTMPCustI1", "LOG_PackTemplate.PKTMP_CustI1", "pktmpcusti1", grmi.TypeInt) var PackTemplate_PKTMPCustI2 = grmi.NewField("PKTMPCustI2", "LOG_PackTemplate.PKTMP_CustI2", "pktmpcusti2", grmi.TypeInt) +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_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) @@ -46,7 +49,7 @@ var PackTemplate_CreateTime = grmi.NewField("CreateTime", "LOG_PackTemplate.Crea * * @Author : 代码生成器创建 * - * @Date : 2021-04-20 10:57:41 + * @Date : 2021-08-16 10:30:42 * ******************************************************************************/ var PackTemplate = grmi.NewEntity( @@ -73,9 +76,12 @@ var PackTemplate = grmi.NewEntity( PackTemplate_PKTMPCustC2.Name: PackTemplate_PKTMPCustC2, PackTemplate_PKTMPCustI1.Name: PackTemplate_PKTMPCustI1, PackTemplate_PKTMPCustI2.Name: PackTemplate_PKTMPCustI2, + PackTemplate_ShipTo.Name: PackTemplate_ShipTo, + PackTemplate_CustArtId.Name: PackTemplate_CustArtId, + PackTemplate_Descr2.Name: PackTemplate_Descr2, 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", "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", "LastUser"}) diff --git a/models/log/PackTemplate.model.go b/models/log/PackTemplate.model.go index c369856..b69bc4c 100644 --- a/models/log/PackTemplate.model.go +++ b/models/log/PackTemplate.model.go @@ -16,34 +16,36 @@ import ( * * @Author : 代码生成器创建 * - * @Date : 2021-03-23 17:06:57 + * @Date : 2021-08-16 10:30:42 * ******************************************************************************/ type PackTemplate struct { - PlantNr int `xorm:"pk int 'PlantNr'" json:"LOG_PackTemplate-PlantNr"` - PackTemplateId string `xorm:"pk nvarchar(40) 'PackTemplateId'" json:"LOG_PackTemplate-PackTemplateId"` - Descr string `xorm:"nvarchar(100) 'Descr' not null" json:"LOG_PackTemplate-Descr"` - ActiveToggle bool `xorm:"bit 'ActiveToggle' not null" json:"LOG_PackTemplate-ActiveToggle"` - PackTypeId string `xorm:"nvarchar(40) 'PackTypeId' not null" json:"LOG_PackTemplate-PackTypeId"` - PrinterId string `xorm:"nvarchar(40) 'PrinterId' not null" json:"LOG_PackTemplate-PrinterId"` - TemplateFile string `xorm:"nvarchar(40) 'TemplateFile' not null" json:"LOG_PackTemplate-TemplateFile"` - PrintQty int `xorm:"int 'PrintQty' not null" json:"LOG_PackTemplate-PrintQty"` - PackOrderSn string `xorm:"nvarchar(40) 'PackOrderSn' not null" json:"LOG_PackTemplate-PackOrderSn"` - BoxSn string `xorm:"nvarchar(40) 'BoxSn' not null" json:"LOG_PackTemplate-BoxSn"` - SyncToggle bool `xorm:"bit 'SyncToggle' not null" json:"LOG_PackTemplate-SyncToggle"` - SyncSn string `xorm:"nvarchar(40) 'SyncSn' not null" json:"LOG_PackTemplate-SyncSn"` - TwoDSheet int `xorm:"int 'TwoDSheet' not null" json:"LOG_PackTemplate-TwoDSheet"` - FullFillToggle bool `xorm:"bit 'FullFillToggle' not null" json:"LOG_PackTemplate-FullFillToggle"` - MaterialId string `xorm:"nvarchar(40) 'MaterialId' not null" json:"LOG_PackTemplate-MaterialId"` - PlanQty int `xorm:"int 'PlanQty' not null" json:"LOG_PackTemplate-PlanQty"` - PKTMPCustC1 string `xorm:"nvarchar(40) 'PKTMP_CustC1' not null" json:"LOG_PackTemplate-PKTMP_CustC1"` - PKTMPCustC2 string `xorm:"nvarchar(40) 'PKTMP_CustC2' not null" json:"LOG_PackTemplate-PKTMP_CustC2"` - PKTMPCustI1 int `xorm:"int 'PKTMP_CustI1' not null" json:"LOG_PackTemplate-PKTMP_CustI1"` - PKTMPCustI2 int `xorm:"int 'PKTMP_CustI2' not null" json:"LOG_PackTemplate-PKTMP_CustI2"` - 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"` - Items []PackTemplateItemlst `xorm:"-" json:"LOG_PackTemplate-Items"` + PlantNr int `xorm:"pk int 'PlantNr'" json:"LOG_PackTemplate-PlantNr"` + PackTemplateId string `xorm:"pk nvarchar(40) 'PackTemplateId'" json:"LOG_PackTemplate-PackTemplateId"` + Descr string `xorm:"nvarchar(100) 'Descr' not null" json:"LOG_PackTemplate-Descr"` + ActiveToggle bool `xorm:"bit 'ActiveToggle' not null" json:"LOG_PackTemplate-ActiveToggle"` + PackTypeId string `xorm:"nvarchar(40) 'PackTypeId' not null" json:"LOG_PackTemplate-PackTypeId"` + PrinterId string `xorm:"nvarchar(40) 'PrinterId' not null" json:"LOG_PackTemplate-PrinterId"` + TemplateFile string `xorm:"nvarchar(40) 'TemplateFile' not null" json:"LOG_PackTemplate-TemplateFile"` + PrintQty int `xorm:"int 'PrintQty' not null" json:"LOG_PackTemplate-PrintQty"` + PackOrderSn string `xorm:"nvarchar(40) 'PackOrderSn' not null" json:"LOG_PackTemplate-PackOrderSn"` + BoxSn string `xorm:"nvarchar(40) 'BoxSn' not null" json:"LOG_PackTemplate-BoxSn"` + SyncToggle bool `xorm:"bit 'SyncToggle' not null" json:"LOG_PackTemplate-SyncToggle"` + SyncSn string `xorm:"nvarchar(40) 'SyncSn' not null" json:"LOG_PackTemplate-SyncSn"` + TwoDSheet int `xorm:"int 'TwoDSheet' not null" json:"LOG_PackTemplate-TwoDSheet"` + FullFillToggle bool `xorm:"bit 'FullFillToggle' not null" json:"LOG_PackTemplate-FullFillToggle"` + MaterialId string `xorm:"nvarchar(40) 'MaterialId' not null" json:"LOG_PackTemplate-MaterialId"` + PlanQty int `xorm:"int 'PlanQty' not null" json:"LOG_PackTemplate-PlanQty"` + PKTMPCustC1 string `xorm:"nvarchar(40) 'PKTMP_CustC1' not null" json:"LOG_PackTemplate-PKTMP_CustC1"` + PKTMPCustC2 string `xorm:"nvarchar(40) 'PKTMP_CustC2' not null" json:"LOG_PackTemplate-PKTMP_CustC2"` + PKTMPCustI1 int `xorm:"int 'PKTMP_CustI1' not null" json:"LOG_PackTemplate-PKTMP_CustI1"` + PKTMPCustI2 int `xorm:"int 'PKTMP_CustI2' not null" json:"LOG_PackTemplate-PKTMP_CustI2"` + 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"` + 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"` } /****************************************************************************** @@ -57,7 +59,7 @@ type PackTemplate struct { * * @Author : 代码生成器创建 * - * @Date : 2021-03-23 17:06:57 + * @Date : 2021-08-16 10:30:42 * ******************************************************************************/ func (self *PackTemplate) GetKey() core.PK { diff --git a/services/log/implments/PackTemplate.service.impl.go b/services/log/implments/PackTemplate.service.impl.go index e138055..3b9b4db 100644 --- a/services/log/implments/PackTemplate.service.impl.go +++ b/services/log/implments/PackTemplate.service.impl.go @@ -41,6 +41,9 @@ var DefaultConditionOfPackTemplate = grmi.NewCondition( meta.PackTemplate_PKTMPCustC2.UrlParameterName: grmi.NewConditionItem(meta.PackTemplate_PKTMPCustC2, grmi.Equal, false), meta.PackTemplate_PKTMPCustI1.UrlParameterName: grmi.NewConditionItem(meta.PackTemplate_PKTMPCustI1, grmi.Equal, false), meta.PackTemplate_PKTMPCustI2.UrlParameterName: grmi.NewConditionItem(meta.PackTemplate_PKTMPCustI2, grmi.Equal, false), + 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_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),