From d2d23500c5bdc4f9f61ae5faf12785bb4d5eef17 Mon Sep 17 00:00:00 2001 From: zhangxin Date: Tue, 14 Sep 2021 10:47:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=92=E5=BA=8Fid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- meta/om/SerialOrder.meta.go | 2 ++ models/om/SerialOrder.model.go | 1 + services/om/implments/SerialOrder.service.impl.go | 1 + 3 files changed, 4 insertions(+) diff --git a/meta/om/SerialOrder.meta.go b/meta/om/SerialOrder.meta.go index 34137c6..ace660f 100644 --- a/meta/om/SerialOrder.meta.go +++ b/meta/om/SerialOrder.meta.go @@ -19,6 +19,7 @@ import ( var SerialOrder_PlantNr = grmi.NewField("PlantNr", "OM_SerialOrder.PlantNr", "plantnr", grmi.TypeInt) var SerialOrder_WorkOrderId = grmi.NewField("WorkOrderId", "OM_SerialOrder.WorkOrderId", "workorderid", grmi.TypeString) var SerialOrder_SerialOrderId = grmi.NewField("SerialOrderId", "OM_SerialOrder.SerialOrderId", "serialorderid", grmi.TypeString) +var SerialOrder_SerialId = grmi.NewField("SerialId", "OM_SerialOrder.SerialId", "serialid", grmi.TypeInt) var SerialOrder_ArtId = grmi.NewField("ArtId", "OM_SerialOrder.ArtId", "artid", grmi.TypeString) var SerialOrder_OrderType = grmi.NewField("OrderType", "OM_SerialOrder.OrderType", "ordertype", grmi.TypeString) var SerialOrder_OrderType1 = grmi.NewField("OrderType1", "OM_SerialOrder.OrderType1", "ordertype1", grmi.TypeString) @@ -59,6 +60,7 @@ var SerialOrder = grmi.NewEntity( SerialOrder_PlantNr.Name: SerialOrder_PlantNr, SerialOrder_WorkOrderId.Name: SerialOrder_WorkOrderId, SerialOrder_SerialOrderId.Name: SerialOrder_SerialOrderId, + SerialOrder_SerialId.Name: SerialOrder_SerialId, SerialOrder_ArtId.Name: SerialOrder_ArtId, SerialOrder_OrderType.Name: SerialOrder_OrderType, SerialOrder_OrderType1.Name: SerialOrder_OrderType1, diff --git a/models/om/SerialOrder.model.go b/models/om/SerialOrder.model.go index 87a7538..ef4ab0e 100644 --- a/models/om/SerialOrder.model.go +++ b/models/om/SerialOrder.model.go @@ -23,6 +23,7 @@ type SerialOrder struct { PlantNr int `xorm:"pk int 'PlantNr'" json:"OM_SerialOrder-PlantNr"` WorkOrderId string `xorm:"pk nvarchar(40) 'WorkOrderId'" json:"OM_SerialOrder-WorkOrderId"` SerialOrderId string `xorm:"pk nvarchar(100) 'SerialOrderId'" json:"OM_SerialOrder-SerialOrderId"` + SerialId int `xorm:"int 'SerialId' autoincr" json:"OM_SerialOrder-SerialId"` ArtId string `xorm:"nvarchar(40) 'ArtId' not null" json:"OM_SerialOrder-ArtId"` OrderType string `xorm:"nvarchar(20) 'OrderType' not null" json:"OM_SerialOrder-OrderType"` OrderType1 string `xorm:"nvarchar(20) 'OrderType1' not null" json:"OM_SerialOrder-OrderType1"` diff --git a/services/om/implments/SerialOrder.service.impl.go b/services/om/implments/SerialOrder.service.impl.go index 0f37229..00141b4 100644 --- a/services/om/implments/SerialOrder.service.impl.go +++ b/services/om/implments/SerialOrder.service.impl.go @@ -29,6 +29,7 @@ var DefaultConditionOfSerialOrder = grmi.NewCondition( map[string]grmi.ConditionItem{ meta.SerialOrder_WorkOrderId.UrlParameterName: grmi.NewConditionItem(meta.SerialOrder_WorkOrderId, grmi.Equal, true), meta.SerialOrder_SerialOrderId.UrlParameterName: grmi.NewConditionItem(meta.SerialOrder_SerialOrderId, grmi.Equal, true), + meta.SerialOrder_SerialId.UrlParameterName: grmi.NewConditionItem(meta.SerialOrder_SerialId, grmi.Equal, false), meta.SerialOrder_ArtId.UrlParameterName: grmi.NewConditionItem(meta.SerialOrder_ArtId, grmi.Equal, false), meta.SerialOrder_OrderType.UrlParameterName: grmi.NewConditionItem(meta.SerialOrder_OrderType, grmi.Equal, false), meta.SerialOrder_OrderType1.UrlParameterName: grmi.NewConditionItem(meta.SerialOrder_OrderType1, grmi.Equal, false),