From e50e65677099af628bb76f8e2415fa1c21a75cec Mon Sep 17 00:00:00 2001 From: zhangxin Date: Thu, 26 Aug 2021 11:11:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- meta/om/SerialOrder.meta.go | 4 +++- services/base/implments/OPCComRule.service.impl.go | 1 + services/om/implments/SerialOrder.service.impl.go | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/om/SerialOrder.meta.go b/meta/om/SerialOrder.meta.go index 73e4575..34137c6 100644 --- a/meta/om/SerialOrder.meta.go +++ b/meta/om/SerialOrder.meta.go @@ -37,6 +37,7 @@ var SerialOrder_PlanStartTime = grmi.NewField("PlanStartTime", "OM_SerialOrder.P var SerialOrder_PlanEndTime = grmi.NewField("PlanEndTime", "OM_SerialOrder.PlanEndTime", "planendtime", grmi.TypeDateTime) var SerialOrder_ActStartTime = grmi.NewField("ActStartTime", "OM_SerialOrder.ActStartTime", "actstarttime", grmi.TypeDateTime) var SerialOrder_ActEndTime = grmi.NewField("ActEndTime", "OM_SerialOrder.ActEndTime", "actendtime", grmi.TypeDateTime) +var SerialOrder_Sort = grmi.NewField("Sort", "OM_SerialOrder.Sort", "sort", grmi.TypeString) var SerialOrder_ProjectId = grmi.NewField("ProjectId", "OM_SerialOrder.ProjectId", "projectid", grmi.TypeString) var SerialOrder_LastModify = grmi.NewField("LastModify", "OM_SerialOrder.LastModify", "lastmodify", grmi.TypeDateTime) var SerialOrder_LastUser = grmi.NewField("LastUser", "OM_SerialOrder.LastUser", "lastuser", grmi.TypeString) @@ -77,9 +78,10 @@ var SerialOrder = grmi.NewEntity( SerialOrder_ActStartTime.Name: SerialOrder_ActStartTime, SerialOrder_ActEndTime.Name: SerialOrder_ActEndTime, SerialOrder_ProjectId.Name: SerialOrder_ProjectId, + SerialOrder_Sort.Name: SerialOrder_Sort, SerialOrder_LastModify.Name: SerialOrder_LastModify, SerialOrder_LastUser.Name: SerialOrder_LastUser, SerialOrder_CreateTime.Name: SerialOrder_CreateTime, }, []string{"PlantNr"}, - []string{"ArtId", "OrderType", "OrderType1", "OrderType2", "PlanResourceId", "UsedResourceId", "PlanQty", "QtyUomId", "OpTimePerItem", "TimeUomId", "PlanStartDate", "PlanEndDate", "SetupStartTime", "SetupEndTime", "PlanStartTime", "PlanEndTime", "ActStartTime", "ActEndTime", "ProjectId", "LastUser"}) + []string{"ArtId", "OrderType", "OrderType1", "OrderType2", "PlanResourceId", "UsedResourceId", "PlanQty", "QtyUomId", "OpTimePerItem", "TimeUomId", "PlanStartDate", "PlanEndDate", "SetupStartTime", "SetupEndTime", "PlanStartTime", "PlanEndTime", "ActStartTime", "ActEndTime", "ProjectId", "Sort", "LastUser"}) diff --git a/services/base/implments/OPCComRule.service.impl.go b/services/base/implments/OPCComRule.service.impl.go index 6ecf972..c4878da 100644 --- a/services/base/implments/OPCComRule.service.impl.go +++ b/services/base/implments/OPCComRule.service.impl.go @@ -28,6 +28,7 @@ var DefaultConditionOfOPCComRule = grmi.NewCondition( meta.OPCComRule_PO.UrlParameterName: grmi.NewConditionItem(meta.OPCComRule_PO, grmi.Equal, false), meta.OPCComRule_StepNo.UrlParameterName: grmi.NewConditionItem(meta.OPCComRule_StepNo, grmi.Equal, false), meta.OPCComRule_StepDesc.UrlParameterName: grmi.NewConditionItem(meta.OPCComRule_StepDesc, grmi.Equal, false), + meta.OPCComRule_OPCDesc.UrlParameterName: grmi.NewConditionItem(meta.OPCComRule_OPCDesc, grmi.Equal, false), meta.OPCComRule_ProjectId.UrlParameterName: grmi.NewConditionItem(meta.OPCComRule_ProjectId, grmi.Equal, false), meta.OPCComRule_ActionType.UrlParameterName: grmi.NewConditionItem(meta.OPCComRule_ActionType, grmi.Equal, false), meta.OPCComRule_DBlockAddress.UrlParameterName: grmi.NewConditionItem(meta.OPCComRule_DBlockAddress, grmi.Equal, false), diff --git a/services/om/implments/SerialOrder.service.impl.go b/services/om/implments/SerialOrder.service.impl.go index 7c4b398..0f37229 100644 --- a/services/om/implments/SerialOrder.service.impl.go +++ b/services/om/implments/SerialOrder.service.impl.go @@ -48,6 +48,7 @@ var DefaultConditionOfSerialOrder = grmi.NewCondition( meta.SerialOrder_ActStartTime.UrlParameterName: grmi.NewConditionItem(meta.SerialOrder_ActStartTime, grmi.Approximate, false), meta.SerialOrder_ActEndTime.UrlParameterName: grmi.NewConditionItem(meta.SerialOrder_ActEndTime, grmi.Approximate, false), meta.SerialOrder_ProjectId.UrlParameterName: grmi.NewConditionItem(meta.SerialOrder_ProjectId, grmi.Equal, false), + meta.SerialOrder_Sort.UrlParameterName: grmi.NewConditionItem(meta.SerialOrder_Sort, grmi.Equal, false), meta.SerialOrder_LastModify.UrlParameterName: grmi.NewConditionItem(meta.SerialOrder_LastModify, grmi.Approximate, false), meta.SerialOrder_LastUser.UrlParameterName: grmi.NewConditionItem(meta.SerialOrder_LastUser, grmi.Equal, false), meta.SerialOrder_CreateTime.UrlParameterName: grmi.NewConditionItem(meta.SerialOrder_CreateTime, grmi.Approximate, false),