diff --git a/meta/me/BomLst.meta.go b/meta/me/BomLst.meta.go index dca2b2e..4a5b2e3 100644 --- a/meta/me/BomLst.meta.go +++ b/meta/me/BomLst.meta.go @@ -35,7 +35,7 @@ var BomLst_LossRate = grmi.NewField("LossRate", "ME_BomLst.LossRate", "lossrate" var BomLst_BackFlushItem = grmi.NewField("BackFlushItem", "ME_BomLst.BackFlushItem", "backflushitem", grmi.TypeInt) var BomLst_CriticalItem = grmi.NewField("CriticalItem", "ME_BomLst.CriticalItem", "criticalitem", grmi.TypeInt) var BomLst_ValidFrom = grmi.NewField("ValidFrom", "ME_BomLst.ValidFrom", "validfrom", grmi.TypeString) -var BomLst_ValiDto = grmi.NewField("ValiDto", "ME_BomLst.ValiDto", "validto", grmi.TypeString) +var BomLst_ValidTo = grmi.NewField("ValidTo", "ME_BomLst.ValidTo", "ValidTo", grmi.TypeString) var BomLst_BomlstCval1 = grmi.NewField("BomlstCval1", "ME_BomLst.BomlstCval1", "bomlstcval1", grmi.TypeString) var BomLst_BomlstCval2 = grmi.NewField("BomlstCval2", "ME_BomLst.BomlstCval2", "bomlstcval2", grmi.TypeString) var BomLst_BomlstIval1 = grmi.NewField("BomlstIval1", "ME_BomLst.BomlstIval1", "bomlstival1", grmi.TypeInt) @@ -77,7 +77,7 @@ var BomLst = grmi.NewEntity( BomLst_BackFlushItem.Name: BomLst_BackFlushItem, BomLst_CriticalItem.Name: BomLst_CriticalItem, BomLst_ValidFrom.Name: BomLst_ValidFrom, - BomLst_ValiDto.Name: BomLst_ValiDto, + BomLst_ValidTo.Name: BomLst_ValidTo, BomLst_BomlstCval1.Name: BomLst_BomlstCval1, BomLst_BomlstCval2.Name: BomLst_BomlstCval2, BomLst_BomlstIval1.Name: BomLst_BomlstIval1, @@ -88,4 +88,4 @@ var BomLst = grmi.NewEntity( BomLst_CreateTime.Name: BomLst_CreateTime, }, []string{"PlantNr"}, - []string{"FmatName", "FmatSpec", "FmatQty", "FmatUom", "CmatName", "CmatQty", "CmatUom", "CmatType", "Position", "LeadTime", "TimeUom", "LossRate", "BackFlushItem", "CriticalItem", "ValidFrom", "ValiDto", "BomlstCval1", "BomlstCval2", "BomlstIval1", "BomlstIval2", "LevelNr", "LastUser"}) + []string{"FmatName", "FmatSpec", "FmatQty", "FmatUom", "CmatName", "CmatQty", "CmatUom", "CmatType", "Position", "LeadTime", "TimeUom", "LossRate", "BackFlushItem", "CriticalItem", "ValidFrom", "ValidTo", "BomlstCval1", "BomlstCval2", "BomlstIval1", "BomlstIval2", "LevelNr", "LastUser"}) diff --git a/models/me/BomHead.model.go b/models/me/BomHead.model.go index c2b1b73..9353d64 100644 --- a/models/me/BomHead.model.go +++ b/models/me/BomHead.model.go @@ -33,6 +33,7 @@ type BomHead struct { LastModify grmi.DateTime `xorm:"datetime 'LastModify' not null updated" json:"ME_BomHead-LastModify"` LastUser string `xorm:"nvarchar(20) 'LastUser' not null" json:"ME_BomHead-LastUser"` CreateTime grmi.DateTime `xorm:"datetime 'CreateTime' not null created" json:"ME_BomHead-CreateTime"` + Valst []BomLst `xorm:"-" json:"valst"` } /****************************************************************************** diff --git a/models/me/BomLst.model.go b/models/me/BomLst.model.go index ca18ab5..6e3e27b 100644 --- a/models/me/BomLst.model.go +++ b/models/me/BomLst.model.go @@ -39,7 +39,7 @@ type BomLst struct { BackFlushItem int `xorm:"smallint 'BackFlushItem' not null" json:"ME_BomLst-BackFlushItem"` CriticalItem int `xorm:"smallint 'CriticalItem' not null" json:"ME_BomLst-CriticalItem"` ValidFrom string `xorm:"nvarchar(14) 'ValidFrom'" json:"ME_BomLst-ValidFrom"` - ValiDto string `xorm:"nvarchar(14) 'ValiDto'" json:"ME_BomLst-ValiDto"` + ValidTo string `xorm:"nvarchar(14) 'ValidTo'" json:"ME_BomLst-ValidTo"` BomlstCval1 string `xorm:"nvarchar(40) 'BomlstCval1' not null" json:"ME_BomLst-BomlstCval1"` BomlstCval2 string `xorm:"nvarchar(40) 'BomlstCval2' not null" json:"ME_BomLst-BomlstCval2"` BomlstIval1 int `xorm:"int 'BomlstIval1' not null" json:"ME_BomLst-BomlstIval1"` diff --git a/services/me/implments/BomLst.service.impl.go b/services/me/implments/BomLst.service.impl.go index d212da6..57225f6 100644 --- a/services/me/implments/BomLst.service.impl.go +++ b/services/me/implments/BomLst.service.impl.go @@ -40,7 +40,7 @@ var DefaultConditionOfBomLst = grmi.NewCondition( meta.BomLst_BackFlushItem.UrlParameterName: grmi.NewConditionItem(meta.BomLst_BackFlushItem, grmi.Equal, false), meta.BomLst_CriticalItem.UrlParameterName: grmi.NewConditionItem(meta.BomLst_CriticalItem, grmi.Equal, false), meta.BomLst_ValidFrom.UrlParameterName: grmi.NewConditionItem(meta.BomLst_ValidFrom, grmi.Equal, false), - meta.BomLst_ValiDto.UrlParameterName: grmi.NewConditionItem(meta.BomLst_ValiDto, grmi.Equal, false), + meta.BomLst_ValidTo.UrlParameterName: grmi.NewConditionItem(meta.BomLst_ValidTo, grmi.Equal, false), meta.BomLst_BomlstCval1.UrlParameterName: grmi.NewConditionItem(meta.BomLst_BomlstCval1, grmi.Equal, false), meta.BomLst_BomlstCval2.UrlParameterName: grmi.NewConditionItem(meta.BomLst_BomlstCval2, grmi.Equal, false), meta.BomLst_BomlstIval1.UrlParameterName: grmi.NewConditionItem(meta.BomLst_BomlstIval1, grmi.Equal, false), diff --git a/web/controllers/me/me.go b/web/controllers/me/me.go index af6deee..020762c 100644 --- a/web/controllers/me/me.go +++ b/web/controllers/me/me.go @@ -71,11 +71,11 @@ func RegisterRoutes() { // BomHead的服务实例 var serviceOfBomHead = svr.NewBomHeadService() // BomHead插入一条 - // RegisterInsertOneBomHead(bomhead, "/insertone", serviceOfBomHead.InsertOne) + RegisterInsertOneBomHead(bomhead, "/insertone", serviceOfBomHead.InsertOne) // BomHead插入多条 // RegisterInsertBomHead(bomhead, "/insert", serviceOfBomHead.Insert) // BomHead删除一条 - // RegisterDeleteOneBomHead(bomhead, "/deleteone", serviceOfBomHead.DeleteOne) + RegisterDeleteOneBomHead(bomhead, "/deleteone", serviceOfBomHead.DeleteOne) // BomHead删除多条 // RegisterDeleteBomHead(bomhead, "/delete", serviceOfBomHead.Delete) // BomHead查询多条 @@ -83,7 +83,7 @@ func RegisterRoutes() { // BomHead查询一条 RegisterSelectOneBomHead(bomhead, "/get", serviceOfBomHead.SelectOne) // BomHead修改一条 - // RegisterUpdateOneBomHead(bomhead, "/updateone", serviceOfBomHead.UpdateOne) + RegisterUpdateOneBomHead(bomhead, "/updateone", serviceOfBomHead.UpdateOne) // BomHead修改多条 // RegisterUpdateBomHead(bomhead, "/update", serviceOfBomHead.Update) @@ -92,19 +92,19 @@ func RegisterRoutes() { // BomLst的服务实例 var serviceOfBomLst = svr.NewBomLstService() // BomLst插入一条 - // RegisterInsertOneBomLst(bomlst, "/insertone", serviceOfBomLst.InsertOne) + RegisterInsertOneBomLst(bomlst, "/insertone", serviceOfBomLst.InsertOne) // BomLst插入多条 // RegisterInsertBomLst(bomlst, "/insert", serviceOfBomLst.Insert) // BomLst删除一条 - // RegisterDeleteOneBomLst(bomlst, "/deleteone", serviceOfBomLst.DeleteOne) + RegisterDeleteOneBomLst(bomlst, "/deleteone", serviceOfBomLst.DeleteOne) // BomLst删除多条 // RegisterDeleteBomLst(bomlst, "/delete", serviceOfBomLst.Delete) // BomLst查询多条 - RegisterSelectBomLst(bomlst, "/query", serviceOfBomLst.Select) + //RegisterSelectBomLst(bomlst, "/query", serviceOfBomLst.Select) // BomLst查询一条 - RegisterSelectOneBomLst(bomlst, "/get", serviceOfBomLst.SelectOne) + //RegisterSelectOneBomLst(bomlst, "/get", serviceOfBomLst.SelectOne) // BomLst修改一条 - // RegisterUpdateOneBomLst(bomlst, "/updateone", serviceOfBomLst.UpdateOne) + RegisterUpdateOneBomLst(bomlst, "/updateone", serviceOfBomLst.UpdateOne) // BomLst修改多条 // RegisterUpdateBomLst(bomlst, "/update", serviceOfBomLst.Update) })