diff --git a/meta/base/Attribute.meta.go b/meta/base/Attribute.meta.go index 1898648..69b41e5 100644 --- a/meta/base/Attribute.meta.go +++ b/meta/base/Attribute.meta.go @@ -13,14 +13,13 @@ import ( * * @Author : 代码生成器创建 * - * @Date : 2021-04-20 10:57:41 + * @Date : 2021-04-27 14:21:19 * ******************************************************************************/ var Attribute_PlantNr = grmi.NewField("PlantNr", "Attribute.PlantNr", "plantnr", grmi.TypeInt) var Attribute_AttrCode = grmi.NewField("AttrCode", "Attribute.AttrCode", "attrcode", grmi.TypeInt) var Attribute_AttrName = grmi.NewField("AttrName", "Attribute.AttrName", "attrname", grmi.TypeString) var Attribute_Descr = grmi.NewField("Descr", "Attribute.Descr", "descr", grmi.TypeString) -var Attribute_AttrGroup = grmi.NewField("AttrGroup", "Attribute.AttrGroup", "attrgroup", grmi.TypeInt) var Attribute_ShortCode = grmi.NewField("ShortCode", "Attribute.ShortCode", "shortcode", grmi.TypeString) var Attribute_AttrType = grmi.NewField("AttrType", "Attribute.AttrType", "attrtype", grmi.TypeInt) var Attribute_AttrDataType = grmi.NewField("AttrDataType", "Attribute.AttrDataType", "attrdatatype", grmi.TypeInt) @@ -36,7 +35,7 @@ var Attribute_CreateTime = grmi.NewField("CreateTime", "Attribute.CreateTime", " * * @Author : 代码生成器创建 * - * @Date : 2021-04-20 10:57:41 + * @Date : 2021-04-27 14:21:19 * ******************************************************************************/ var Attribute = grmi.NewEntity( @@ -47,7 +46,6 @@ var Attribute = grmi.NewEntity( Attribute_AttrCode.Name: Attribute_AttrCode, Attribute_AttrName.Name: Attribute_AttrName, Attribute_Descr.Name: Attribute_Descr, - Attribute_AttrGroup.Name: Attribute_AttrGroup, Attribute_ShortCode.Name: Attribute_ShortCode, Attribute_AttrType.Name: Attribute_AttrType, Attribute_AttrDataType.Name: Attribute_AttrDataType, @@ -58,4 +56,4 @@ var Attribute = grmi.NewEntity( Attribute_CreateTime.Name: Attribute_CreateTime, }, []string{"PlantNr"}, - []string{"AttrName", "Descr", "AttrGroup", "ShortCode", "AttrType", "AttrDataType", "AttrValType", "ValFormat", "LastUser"}) + []string{"AttrName", "Descr", "ShortCode", "AttrType", "AttrDataType", "AttrValType", "ValFormat", "LastUser"}) diff --git a/meta/log/ArtDemandHead.meta.go b/meta/log/ArtDemandHead.meta.go index ae3d06f..782dc53 100644 --- a/meta/log/ArtDemandHead.meta.go +++ b/meta/log/ArtDemandHead.meta.go @@ -13,7 +13,7 @@ import ( * * @Author : 代码生成器创建 * - * @Date : 2021-04-20 10:57:41 + * @Date : 2021-04-27 14:21:19 * ******************************************************************************/ var ArtDemandHead_PlantNr = grmi.NewField("PlantNr", "LOG_ArtDemandHead.PlantNr", "plantnr", grmi.TypeInt) @@ -40,6 +40,7 @@ var ArtDemandHead_DemandCtrlPara3 = grmi.NewField("DemandCtrlPara3", "LOG_ArtDem var ArtDemandHead_DemandCtrlPara4 = grmi.NewField("DemandCtrlPara4", "LOG_ArtDemandHead.DemandCtrlPara4", "demandctrlpara4", grmi.TypeString) var ArtDemandHead_DemandCtrlTime1 = grmi.NewField("DemandCtrlTime1", "LOG_ArtDemandHead.DemandCtrlTime1", "demandctrltime1", grmi.TypeDateTime) var ArtDemandHead_DemandCtrlTime2 = grmi.NewField("DemandCtrlTime2", "LOG_ArtDemandHead.DemandCtrlTime2", "demandctrltime2", grmi.TypeDateTime) +var ArtDemandHead_OrderStatus = grmi.NewField("OrderStatus", "LOG_ArtDemandHead.OrderStatus", "orderstatus", grmi.TypeInt) var ArtDemandHead_LastModify = grmi.NewField("LastModify", "LOG_ArtDemandHead.LastModify", "lastmodify", grmi.TypeDateTime) var ArtDemandHead_LastUser = grmi.NewField("LastUser", "LOG_ArtDemandHead.LastUser", "lastuser", grmi.TypeString) var ArtDemandHead_CreateTime = grmi.NewField("CreateTime", "LOG_ArtDemandHead.CreateTime", "createtime", grmi.TypeDateTime) @@ -50,7 +51,7 @@ var ArtDemandHead_CreateTime = grmi.NewField("CreateTime", "LOG_ArtDemandHead.Cr * * @Author : 代码生成器创建 * - * @Date : 2021-04-20 10:57:41 + * @Date : 2021-04-27 14:21:19 * ******************************************************************************/ var ArtDemandHead = grmi.NewEntity( @@ -81,9 +82,10 @@ var ArtDemandHead = grmi.NewEntity( ArtDemandHead_DemandCtrlPara4.Name: ArtDemandHead_DemandCtrlPara4, ArtDemandHead_DemandCtrlTime1.Name: ArtDemandHead_DemandCtrlTime1, ArtDemandHead_DemandCtrlTime2.Name: ArtDemandHead_DemandCtrlTime2, + ArtDemandHead_OrderStatus.Name: ArtDemandHead_OrderStatus, ArtDemandHead_LastModify.Name: ArtDemandHead_LastModify, ArtDemandHead_LastUser.Name: ArtDemandHead_LastUser, ArtDemandHead_CreateTime.Name: ArtDemandHead_CreateTime, }, []string{"PlantNr"}, - []string{"DemandType", "DemandYear", "DemandMonth", "DemandWeek", "DemandDate", "DemandHour", "DemandTime", "DemandQty", "QtyUomId", "Status", "DemandSendTime", "DemandRecieveTime", "DemandConfirmTime", "DemandCloseTime", "DemandDeliveredQty", "DemandCtrlPara1", "DemandCtrlPara2", "DemandCtrlPara3", "DemandCtrlPara4", "DemandCtrlTime1", "DemandCtrlTime2", "LastUser"}) + []string{"DemandType", "DemandYear", "DemandMonth", "DemandWeek", "DemandDate", "DemandHour", "DemandTime", "DemandQty", "QtyUomId", "Status", "DemandSendTime", "DemandRecieveTime", "DemandConfirmTime", "DemandCloseTime", "DemandDeliveredQty", "DemandCtrlPara1", "DemandCtrlPara2", "DemandCtrlPara3", "DemandCtrlPara4", "DemandCtrlTime1", "DemandCtrlTime2", "OrderStatus", "LastUser"}) diff --git a/meta/log/ArtDemandLst.meta.go b/meta/log/ArtDemandLst.meta.go index 9595fd2..e77a6bf 100644 --- a/meta/log/ArtDemandLst.meta.go +++ b/meta/log/ArtDemandLst.meta.go @@ -13,7 +13,7 @@ import ( * * @Author : 代码生成器创建 * - * @Date : 2021-04-22 11:27:55 + * @Date : 2021-04-27 14:21:19 * ******************************************************************************/ var ArtDemandLst_PlantNr = grmi.NewField("PlantNr", "LOG_ArtDemandLst.PlantNr", "plantnr", grmi.TypeInt) @@ -42,6 +42,7 @@ var ArtDemandLst_DemandCtrlPara3 = grmi.NewField("DemandCtrlPara3", "LOG_ArtDema var ArtDemandLst_DemandCtrlPara4 = grmi.NewField("DemandCtrlPara4", "LOG_ArtDemandLst.DemandCtrlPara4", "demandctrlpara4", grmi.TypeString) var ArtDemandLst_DemandCtrlTime1 = grmi.NewField("DemandCtrlTime1", "LOG_ArtDemandLst.DemandCtrlTime1", "demandctrltime1", grmi.TypeDateTime) var ArtDemandLst_DemandCtrlTime2 = grmi.NewField("DemandCtrlTime2", "LOG_ArtDemandLst.DemandCtrlTime2", "demandctrltime2", grmi.TypeDateTime) +var ArtDemandLst_OrderStatus = grmi.NewField("OrderStatus", "LOG_ArtDemandLst.OrderStatus", "orderstatus", grmi.TypeInt) var ArtDemandLst_LastModify = grmi.NewField("LastModify", "LOG_ArtDemandLst.LastModify", "lastmodify", grmi.TypeDateTime) var ArtDemandLst_LastUser = grmi.NewField("LastUser", "LOG_ArtDemandLst.LastUser", "lastuser", grmi.TypeString) var ArtDemandLst_CreateTime = grmi.NewField("CreateTime", "LOG_ArtDemandLst.CreateTime", "createtime", grmi.TypeDateTime) @@ -52,7 +53,7 @@ var ArtDemandLst_CreateTime = grmi.NewField("CreateTime", "LOG_ArtDemandLst.Crea * * @Author : 代码生成器创建 * - * @Date : 2021-04-22 11:27:55 + * @Date : 2021-04-27 14:21:19 * ******************************************************************************/ var ArtDemandLst = grmi.NewEntity( @@ -85,9 +86,10 @@ var ArtDemandLst = grmi.NewEntity( ArtDemandLst_DemandCtrlPara4.Name: ArtDemandLst_DemandCtrlPara4, ArtDemandLst_DemandCtrlTime1.Name: ArtDemandLst_DemandCtrlTime1, ArtDemandLst_DemandCtrlTime2.Name: ArtDemandLst_DemandCtrlTime2, + ArtDemandLst_OrderStatus.Name: ArtDemandLst_OrderStatus, ArtDemandLst_LastModify.Name: ArtDemandLst_LastModify, ArtDemandLst_LastUser.Name: ArtDemandLst_LastUser, ArtDemandLst_CreateTime.Name: ArtDemandLst_CreateTime, }, []string{"PlantNr"}, - []string{"ArtId", "DemandTime", "DemandYear", "DemandMonth", "DemandWeek", "DemandDate", "DemandHour", "DemandQty", "QtyUomId", "DemandObjId", "DemandType", "Status", "DemandSendTime", "DemandRecieveTime", "DemandConfirmTime", "DemandCloseTime", "DemandDeliveredQty", "DemandCtrlPara1", "DemandCtrlPara2", "DemandCtrlPara3", "DemandCtrlPara4", "DemandCtrlTime1", "DemandCtrlTime2", "LastUser"}) + []string{"ArtId", "DemandTime", "DemandYear", "DemandMonth", "DemandWeek", "DemandDate", "DemandHour", "DemandQty", "QtyUomId", "DemandObjId", "DemandType", "Status", "DemandSendTime", "DemandRecieveTime", "DemandConfirmTime", "DemandCloseTime", "DemandDeliveredQty", "DemandCtrlPara1", "DemandCtrlPara2", "DemandCtrlPara3", "DemandCtrlPara4", "DemandCtrlTime1", "DemandCtrlTime2", "OrderStatus", "LastUser"}) diff --git a/models/base/Attribute.model.go b/models/base/Attribute.model.go index 53d0898..de07be8 100644 --- a/models/base/Attribute.model.go +++ b/models/base/Attribute.model.go @@ -16,7 +16,7 @@ import ( * * @Author : 代码生成器创建 * - * @Date : 2021-03-23 17:06:57 + * @Date : 2021-04-27 14:21:19 * ******************************************************************************/ type Attribute struct { @@ -24,7 +24,6 @@ type Attribute struct { AttrCode int `xorm:"pk int 'AttrCode'" json:"Attribute-AttrCode"` AttrName string `xorm:"nvarchar(100) 'AttrName' not null" json:"Attribute-AttrName"` Descr string `xorm:"nvarchar(100) 'Descr' not null" json:"Attribute-Descr"` - AttrGroup int `xorm:"int 'AttrGroup' not null" json:"Attribute-AttrGroup"` ShortCode string `xorm:"nvarchar(20) 'ShortCode' not null" json:"Attribute-ShortCode"` AttrType int `xorm:"int 'AttrType' not null" json:"Attribute-AttrType"` AttrDataType int `xorm:"int 'AttrDataType' not null" json:"Attribute-AttrDataType"` diff --git a/models/log/ArtDemandHead.model.go b/models/log/ArtDemandHead.model.go index 1ea79ec..b228336 100644 --- a/models/log/ArtDemandHead.model.go +++ b/models/log/ArtDemandHead.model.go @@ -16,7 +16,7 @@ import ( * * @Author : 代码生成器创建 * - * @Date : 2021-03-23 17:06:57 + * @Date : 2021-04-27 14:21:19 * ******************************************************************************/ type ArtDemandHead struct { @@ -44,6 +44,7 @@ type ArtDemandHead struct { DemandCtrlPara4 string `xorm:"nvarchar(100) 'DemandCtrlPara4' not null" json:"LOG_ArtDemandHead-DemandCtrlPara4"` DemandCtrlTime1 grmi.DateTime `xorm:"datetime 'DemandCtrlTime1'" json:"LOG_ArtDemandHead-DemandCtrlTime1"` DemandCtrlTime2 grmi.DateTime `xorm:"datetime 'DemandCtrlTime2'" json:"LOG_ArtDemandHead-DemandCtrlTime2"` + OrderStatus int `xorm:"int 'OrderStatus' not null" json:"LOG_ArtDemandHead-OrderStatus"` LastModify grmi.DateTime `xorm:"datetime 'LastModify' not null updated" json:"LOG_ArtDemandHead-LastModify"` LastUser string `xorm:"nvarchar(20) 'LastUser' not null" json:"LOG_ArtDemandHead-LastUser"` CreateTime grmi.DateTime `xorm:"datetime 'CreateTime' not null created" json:"LOG_ArtDemandHead-CreateTime"` diff --git a/models/log/ArtDemandLst.model.go b/models/log/ArtDemandLst.model.go index 60fb966..84a7bd6 100644 --- a/models/log/ArtDemandLst.model.go +++ b/models/log/ArtDemandLst.model.go @@ -16,7 +16,7 @@ import ( * * @Author : 代码生成器创建 * - * @Date : 2021-04-22 16:37:04 + * @Date : 2021-04-27 14:21:19 * ******************************************************************************/ type ArtDemandLst struct { @@ -46,6 +46,7 @@ type ArtDemandLst struct { DemandCtrlPara4 string `xorm:"nvarchar(100) 'DemandCtrlPara4' not null" json:"LOG_ArtDemandLst-DemandCtrlPara4"` DemandCtrlTime1 grmi.DateTime `xorm:"datetime 'DemandCtrlTime1'" json:"LOG_ArtDemandLst-DemandCtrlTime1"` DemandCtrlTime2 grmi.DateTime `xorm:"datetime 'DemandCtrlTime2'" json:"LOG_ArtDemandLst-DemandCtrlTime2"` + OrderStatus int `xorm:"int 'OrderStatus' not null" json:"LOG_ArtDemandLst-OrderStatus"` LastModify grmi.DateTime `xorm:"datetime 'LastModify' not null updated" json:"LOG_ArtDemandLst-LastModify"` LastUser string `xorm:"nvarchar(20) 'LastUser' not null" json:"LOG_ArtDemandLst-LastUser"` CreateTime grmi.DateTime `xorm:"datetime 'CreateTime' not null created" json:"LOG_ArtDemandLst-CreateTime"` diff --git a/services/base/implments/Attribute.service.impl.go b/services/base/implments/Attribute.service.impl.go index 24f7fe5..0641569 100644 --- a/services/base/implments/Attribute.service.impl.go +++ b/services/base/implments/Attribute.service.impl.go @@ -25,7 +25,6 @@ var DefaultConditionOfAttribute = grmi.NewCondition( meta.Attribute_AttrCode.UrlParameterName: grmi.NewConditionItem(meta.Attribute_AttrCode, grmi.Equal, true), meta.Attribute_AttrName.UrlParameterName: grmi.NewConditionItem(meta.Attribute_AttrName, grmi.Equal, false), meta.Attribute_Descr.UrlParameterName: grmi.NewConditionItem(meta.Attribute_Descr, grmi.Equal, false), - meta.Attribute_AttrGroup.UrlParameterName: grmi.NewConditionItem(meta.Attribute_AttrGroup, grmi.Equal, false), meta.Attribute_ShortCode.UrlParameterName: grmi.NewConditionItem(meta.Attribute_ShortCode, grmi.Equal, false), meta.Attribute_AttrType.UrlParameterName: grmi.NewConditionItem(meta.Attribute_AttrType, grmi.Equal, false), meta.Attribute_AttrDataType.UrlParameterName: grmi.NewConditionItem(meta.Attribute_AttrDataType, grmi.Equal, false),