diff --git a/main.go b/main.go index f1408da..278f564 100644 --- a/main.go +++ b/main.go @@ -125,7 +125,7 @@ func imain() { if err != nil { log.Fatal("init logger config failed, error:", err.Error()) } - //go task.Start() + go task.Start() //if err != nil { // log.Fatal("task start failed, error: " + err.Error()) //} diff --git a/meta/base/Article.meta.go b/meta/base/Article.meta.go index 8c11afb..f8582f2 100644 --- a/meta/base/Article.meta.go +++ b/meta/base/Article.meta.go @@ -27,6 +27,7 @@ var Article_LearArtId = grmi.NewField("LearArtId", "Article.LearArtId", "learart var Article_PartId = grmi.NewField("PartId", "Article.PartId", "partid", grmi.TypeString) var Article_CarModel = grmi.NewField("CarModel", "Article.CarModel", "carmodel", grmi.TypeString) var Article_Status = grmi.NewField("Status", "Article.Status", "status", grmi.TypeInt) +var Article_Version = grmi.NewField("Version", "Article.Version", "version", grmi.TypeString) var Article_AlternativeArtId = grmi.NewField("AlternativeArtId", "Article.AlternativeArtId", "alternativeartid", grmi.TypeString) var Article_PlanResourceGroupId = grmi.NewField("PlanResourceGroupId", "Article.PlanResourceGroupId", "planresourcegroupid", grmi.TypeString) var Article_PlanResourceId = grmi.NewField("PlanResourceId", "Article.PlanResourceId", "planresourceid", grmi.TypeString) @@ -90,6 +91,7 @@ var Article = grmi.NewEntity( Article_PartId.Name: Article_PartId, Article_CarModel.Name: Article_CarModel, Article_Status.Name: Article_Status, + Article_Version.Name: Article_Version, Article_AlternativeArtId.Name: Article_AlternativeArtId, Article_PlanResourceGroupId.Name: Article_PlanResourceGroupId, Article_PlanResourceId.Name: Article_PlanResourceId, @@ -130,4 +132,4 @@ var Article = grmi.NewEntity( Article_CreateTime.Name: Article_CreateTime, }, []string{"PlantNr"}, - []string{"Descr1", "Descr2", "ArtTypeId", "ProjectId", "CustArtId", "LearArtId", "PartId", "CarModel", "Status", "AlternativeArtId", "PlanResourceGroupId", "PlanResourceId", "UsedResourceId", "UomId", "PlanScrapRate", "RatePerHourToggle", "TimePerItemToggle", "TimePerBatchToggle", "BatchTimeFieldToggle", "OpTimePerItem", "BatchTime", "QuantityPerHour", "MidBatchQuantity", "MidBatchTime", "EffectiveOpTime", "BatchingMethod", "DeliveryBuffer", "Icon", "DisplayColor", "Document", "DefaultRoute", "DefaultInspectPlanId", "LotSize", "ABCClass", "ArtSize1", "ArtSize2", "ArtSize3", "ArtSize4", "ArtSize5", "ArtSpec1", "ArtSpec2", "ArtSpec3", "ArtSpec4", "ArtSpec5", "LastUser"}) + []string{"Descr1", "Descr2", "ArtTypeId", "ProjectId", "CustArtId", "LearArtId", "PartId", "CarModel", "Status", "Version", "AlternativeArtId", "PlanResourceGroupId", "PlanResourceId", "UsedResourceId", "UomId", "PlanScrapRate", "RatePerHourToggle", "TimePerItemToggle", "TimePerBatchToggle", "BatchTimeFieldToggle", "OpTimePerItem", "BatchTime", "QuantityPerHour", "MidBatchQuantity", "MidBatchTime", "EffectiveOpTime", "BatchingMethod", "DeliveryBuffer", "Icon", "DisplayColor", "Document", "DefaultRoute", "DefaultInspectPlanId", "LotSize", "ABCClass", "ArtSize1", "ArtSize2", "ArtSize3", "ArtSize4", "ArtSize5", "ArtSpec1", "ArtSpec2", "ArtSpec3", "ArtSpec4", "ArtSpec5", "LastUser"}) diff --git a/models/base/Article.model.go b/models/base/Article.model.go index d3caa49..6732987 100644 --- a/models/base/Article.model.go +++ b/models/base/Article.model.go @@ -30,7 +30,8 @@ type Article struct { PartId string `xorm:"nvarchar(40) 'PartId' not null" json:"Article-PartId"` CarModel string `xorm:"nvarchar(40) 'CarModel' not null" json:"Article-CarModel"` Status int `xorm:"int 'Status' not null" json:"Article-Status"` - LearArtId string `xorm:"nvarchar(40) 'LearArtId' not null" json:"Article-LearArtId"` + LearArtId string `xorm:"nvarchar(40) 'LearArtId'" json:"Article-LearArtId"` + Version string `xorm:"nvarchar(20) 'Version'" json:"Article-Version"` AlternativeArtId string `xorm:"nvarchar(40) 'AlternativeArtId' not null" json:"Article-AlternativeArtId"` PlanResourceGroupId string `xorm:"nvarchar(40) 'PlanResourceGroupId' not null" json:"Article-PlanResourceGroupId"` PlanResourceId string `xorm:"nvarchar(40) 'PlanResourceId' not null" json:"Article-PlanResourceId"` diff --git a/services/base/implments/Article.service.impl.go b/services/base/implments/Article.service.impl.go index 955d8c4..6f3ad32 100644 --- a/services/base/implments/Article.service.impl.go +++ b/services/base/implments/Article.service.impl.go @@ -33,6 +33,7 @@ var DefaultConditionOfArticle = grmi.NewCondition( meta.Article_PartId.UrlParameterName: grmi.NewConditionItem(meta.Article_PartId, grmi.Equal, false), meta.Article_CarModel.UrlParameterName: grmi.NewConditionItem(meta.Article_CarModel, grmi.Equal, false), meta.Article_Status.UrlParameterName: grmi.NewConditionItem(meta.Article_Status, grmi.Equal, false), + meta.Article_Version.UrlParameterName: grmi.NewConditionItem(meta.Article_Version, grmi.Equal, false), meta.Article_AlternativeArtId.UrlParameterName: grmi.NewConditionItem(meta.Article_AlternativeArtId, grmi.Equal, false), meta.Article_PlanResourceGroupId.UrlParameterName: grmi.NewConditionItem(meta.Article_PlanResourceGroupId, grmi.Equal, false), meta.Article_PlanResourceId.UrlParameterName: grmi.NewConditionItem(meta.Article_PlanResourceId, grmi.Equal, false),