From 730382c7478adb7062b9ca7d48f5253095b4a13a Mon Sep 17 00:00:00 2001 From: allanwei Date: Fri, 7 May 2021 16:26:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BAWorkLine=E6=B7=BB=E5=8A=A0=E4=BA=86?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dao/base/WorkLine.dao.go | 22 +++--- dao/base/implments/WorkLine.dao.impl.go | 10 +-- meta/base/WorkLine.meta.go | 56 +++++++------- models/base/WorkLine.model.go | 55 +++++++------- services/base/WorkLine.service.go | 24 +++--- .../base/implments/WorkLine.service.impl.go | 75 ++++++++++--------- 6 files changed, 123 insertions(+), 119 deletions(-) diff --git a/dao/base/WorkLine.dao.go b/dao/base/WorkLine.dao.go index c3cd0f1..e7aa413 100644 --- a/dao/base/WorkLine.dao.go +++ b/dao/base/WorkLine.dao.go @@ -10,17 +10,17 @@ import ( ) /****************************************************************************** -* -* @Interface Name : WorkLineDAO -*----------------------------------------------------------------------------- -* -* @Description : WorkLine的数据访问对象接口 -* -* @Author : 代码生成器创建 -* -* @Date : 2021-03-24 09:53:49 -* -******************************************************************************/ + * + * @Interface Name : WorkLineDAO + *----------------------------------------------------------------------------- + * + * @Description : WorkLine的数据访问对象接口 + * + * @Author : 代码生成器创建 + * + * @Date : 2021-05-07 16:20:28 + * + ******************************************************************************/ type WorkLineDAO interface { /****************************************************************************** * diff --git a/dao/base/implments/WorkLine.dao.impl.go b/dao/base/implments/WorkLine.dao.impl.go index 8f0839e..bbcbe3c 100644 --- a/dao/base/implments/WorkLine.dao.impl.go +++ b/dao/base/implments/WorkLine.dao.impl.go @@ -309,12 +309,12 @@ func (impl *WorkLineDAOImplement) UpdateWhere(predicates []grmi.Predicate, entit * ******************************************************************************/ func (impl *WorkLineDAOImplement) SelectByType(wltype string) ([]model.WorkLine, error) { - datalst := make([]model.WorkLine,0) + datalst := make([]model.WorkLine, 0) session := impl.session.Table(impl.meta.TableName) if err := session.Where("Plantnr = ? and Linetype = ?", impl.plantNr, wltype).OrderBy("WorkLineId").Find(&datalst); err != nil { return nil, grmi.NewDataBaseError(err) } - return datalst,nil + return datalst, nil } /****************************************************************************** @@ -323,10 +323,10 @@ func (impl *WorkLineDAOImplement) SelectByType(wltype string) ([]model.WorkLine, * ******************************************************************************/ func (impl *WorkLineDAOImplement) SelectAll() ([]model.WorkLine, error) { - datalst := make([]model.WorkLine,0) + datalst := make([]model.WorkLine, 0) session := impl.session.Table(impl.meta.TableName) if err := session.Where("Plantnr = ?", impl.plantNr).OrderBy("WorkLineId").Find(&datalst); err != nil { return nil, grmi.NewDataBaseError(err) } - return datalst,nil -} \ No newline at end of file + return datalst, nil +} diff --git a/meta/base/WorkLine.meta.go b/meta/base/WorkLine.meta.go index 59cf8bb..1ea82cf 100644 --- a/meta/base/WorkLine.meta.go +++ b/meta/base/WorkLine.meta.go @@ -13,7 +13,7 @@ import ( * * @Author : 代码生成器创建 * - * @Date : 2021-04-20 10:57:41 + * @Date : 2021-05-07 16:20:28 * ******************************************************************************/ var WorkLine_PlantNr = grmi.NewField("PlantNr", "WorkLine.PlantNr", "plantnr", grmi.TypeInt) @@ -37,6 +37,7 @@ var WorkLine_TaskReleaseWay = grmi.NewField("TaskReleaseWay", "WorkLine.TaskRele var WorkLine_ReleaseQtyParameter = grmi.NewField("ReleaseQtyParameter", "WorkLine.ReleaseQtyParameter", "releaseqtyparameter", grmi.TypeInt) var WorkLine_ReleaseTimeParameter = grmi.NewField("ReleaseTimeParameter", "WorkLine.ReleaseTimeParameter", "releasetimeparameter", grmi.TypeDateTime) var WorkLine_ReleaseCtrlParameter = grmi.NewField("ReleaseCtrlParameter", "WorkLine.ReleaseCtrlParameter", "releasectrlparameter", grmi.TypeString) +var WorkLine_ReleaseDurationParameter = grmi.NewField("ReleaseDurationParameter", "WorkLine.ReleaseDurationParameter", "releasedurationparameter", grmi.TypeInt) var WorkLine_LastModify = grmi.NewField("LastModify", "WorkLine.LastModify", "lastmodify", grmi.TypeDateTime) var WorkLine_LastUser = grmi.NewField("LastUser", "WorkLine.LastUser", "lastuser", grmi.TypeString) var WorkLine_CreateTime = grmi.NewField("CreateTime", "WorkLine.CreateTime", "createtime", grmi.TypeDateTime) @@ -47,37 +48,38 @@ var WorkLine_CreateTime = grmi.NewField("CreateTime", "WorkLine.CreateTime", "cr * * @Author : 代码生成器创建 * - * @Date : 2021-04-20 10:57:41 + * @Date : 2021-05-07 16:20:28 * ******************************************************************************/ var WorkLine = grmi.NewEntity( "WorkLine", func() interface{} { return &model.WorkLine{} }, map[string]grmi.Field{ - WorkLine_PlantNr.Name: WorkLine_PlantNr, - WorkLine_WorkLineid.Name: WorkLine_WorkLineid, - WorkLine_Descr.Name: WorkLine_Descr, - WorkLine_LineType.Name: WorkLine_LineType, - WorkLine_LinePlanMode.Name: WorkLine_LinePlanMode, - WorkLine_WeekModelNr.Name: WorkLine_WeekModelNr, - WorkLine_WorkCalendarNr.Name: WorkLine_WorkCalendarNr, - WorkLine_Location.Name: WorkLine_Location, - WorkLine_CostCenterId.Name: WorkLine_CostCenterId, - WorkLine_CostRate.Name: WorkLine_CostRate, - WorkLine_ProdEff.Name: WorkLine_ProdEff, - WorkLine_ReqWorkers.Name: WorkLine_ReqWorkers, - WorkLine_Pos.Name: WorkLine_Pos, - WorkLine_TaskQueueSortWay.Name: WorkLine_TaskQueueSortWay, - WorkLine_MultiQueueMixSortToggle.Name: WorkLine_MultiQueueMixSortToggle, - WorkLine_TaskQueueMixSortWay.Name: WorkLine_TaskQueueMixSortWay, - WorkLine_MixSortLogic.Name: WorkLine_MixSortLogic, - WorkLine_TaskReleaseWay.Name: WorkLine_TaskReleaseWay, - WorkLine_ReleaseQtyParameter.Name: WorkLine_ReleaseQtyParameter, - WorkLine_ReleaseTimeParameter.Name: WorkLine_ReleaseTimeParameter, - WorkLine_ReleaseCtrlParameter.Name: WorkLine_ReleaseCtrlParameter, - WorkLine_LastModify.Name: WorkLine_LastModify, - WorkLine_LastUser.Name: WorkLine_LastUser, - WorkLine_CreateTime.Name: WorkLine_CreateTime, + WorkLine_PlantNr.Name: WorkLine_PlantNr, + WorkLine_WorkLineid.Name: WorkLine_WorkLineid, + WorkLine_Descr.Name: WorkLine_Descr, + WorkLine_LineType.Name: WorkLine_LineType, + WorkLine_LinePlanMode.Name: WorkLine_LinePlanMode, + WorkLine_WeekModelNr.Name: WorkLine_WeekModelNr, + WorkLine_WorkCalendarNr.Name: WorkLine_WorkCalendarNr, + WorkLine_Location.Name: WorkLine_Location, + WorkLine_CostCenterId.Name: WorkLine_CostCenterId, + WorkLine_CostRate.Name: WorkLine_CostRate, + WorkLine_ProdEff.Name: WorkLine_ProdEff, + WorkLine_ReqWorkers.Name: WorkLine_ReqWorkers, + WorkLine_Pos.Name: WorkLine_Pos, + WorkLine_TaskQueueSortWay.Name: WorkLine_TaskQueueSortWay, + WorkLine_MultiQueueMixSortToggle.Name: WorkLine_MultiQueueMixSortToggle, + WorkLine_TaskQueueMixSortWay.Name: WorkLine_TaskQueueMixSortWay, + WorkLine_MixSortLogic.Name: WorkLine_MixSortLogic, + WorkLine_TaskReleaseWay.Name: WorkLine_TaskReleaseWay, + WorkLine_ReleaseQtyParameter.Name: WorkLine_ReleaseQtyParameter, + WorkLine_ReleaseTimeParameter.Name: WorkLine_ReleaseTimeParameter, + WorkLine_ReleaseCtrlParameter.Name: WorkLine_ReleaseCtrlParameter, + WorkLine_ReleaseDurationParameter.Name: WorkLine_ReleaseDurationParameter, + WorkLine_LastModify.Name: WorkLine_LastModify, + WorkLine_LastUser.Name: WorkLine_LastUser, + WorkLine_CreateTime.Name: WorkLine_CreateTime, }, []string{"PlantNr"}, - []string{"Descr", "LineType", "LinePlanMode", "WeekModelNr", "WorkCalendarNr", "Location", "CostCenterId", "CostRate", "ProdEff", "ReqWorkers", "Pos", "TaskQueueSortWay", "MultiQueueMixSortToggle", "TaskQueueMixSortWay", "MixSortLogic", "TaskReleaseWay", "ReleaseQtyParameter", "ReleaseTimeParameter", "ReleaseCtrlParameter", "LastUser"}) + []string{"Descr", "LineType", "LinePlanMode", "WeekModelNr", "WorkCalendarNr", "Location", "CostCenterId", "CostRate", "ProdEff", "ReqWorkers", "Pos", "TaskQueueSortWay", "MultiQueueMixSortToggle", "TaskQueueMixSortWay", "MixSortLogic", "TaskReleaseWay", "ReleaseQtyParameter", "ReleaseTimeParameter", "ReleaseCtrlParameter", "ReleaseDurationParameter", "LastUser"}) diff --git a/models/base/WorkLine.model.go b/models/base/WorkLine.model.go index 812f151..9690177 100644 --- a/models/base/WorkLine.model.go +++ b/models/base/WorkLine.model.go @@ -16,36 +16,37 @@ import ( * * @Author : 代码生成器创建 * - * @Date : 2021-03-23 17:06:57 + * @Date : 2021-05-07 16:20:28 * ******************************************************************************/ type WorkLine struct { - PlantNr int `xorm:"pk int 'PlantNr'" json:"WorkLine-PlantNr"` - WorkLineid string `xorm:"pk nvarchar(40) 'WorkLineid'" json:"WorkLine-WorkLineid"` - Descr string `xorm:"nvarchar(100) 'Descr' not null" json:"WorkLine-Descr"` - LineType string `xorm:"nvarchar(1) 'LineType' not null" json:"WorkLine-LineType"` - LinePlanMode string `xorm:"nvarchar(3) 'LinePlanMode' not null" json:"WorkLine-LinePlanMode"` - WeekModelNr int `xorm:"int 'WeekModelNr' not null" json:"WorkLine-WeekModelNr"` - WorkCalendarNr int `xorm:"int 'WorkCalendarNr' not null" json:"WorkLine-WorkCalendarNr"` - Location string `xorm:"nvarchar(40) 'Location' not null" json:"WorkLine-Location"` - CostCenterId string `xorm:"nvarchar(40) 'CostCenterId' not null" json:"WorkLine-CostCenterId"` - CostRate float64 `xorm:"float 'CostRate' not null" json:"WorkLine-CostRate"` - ProdEff float64 `xorm:"float 'ProdEff' not null" json:"WorkLine-ProdEff"` - ReqWorkers int `xorm:"int 'ReqWorkers' not null" json:"WorkLine-ReqWorkers"` - Pos int `xorm:"int 'Pos' not null" json:"WorkLine-Pos"` - TaskQueueSortWay string `xorm:"nvarchar(10) 'TaskQueueSortWay' not null" json:"WorkLine-TaskQueueSortWay"` - MultiQueueMixSortToggle bool `xorm:"bit 'MultiQueueMixSortToggle' not null" json:"WorkLine-MultiQueueMixSortToggle"` - TaskQueueMixSortWay string `xorm:"nvarchar(10) 'TaskQueueMixSortWay' not null" json:"WorkLine-TaskQueueMixSortWay"` - MixSortLogic string `xorm:"nvarchar(100) 'MixSortLogic' not null" json:"WorkLine-MixSortLogic"` - TaskReleaseWay string `xorm:"nvarchar(10) 'TaskReleaseWay' not null" json:"WorkLine-TaskReleaseWay"` - ReleaseQtyParameter int `xorm:"int 'ReleaseQtyParameter' not null" json:"WorkLine-ReleaseQtyParameter"` - ReleaseTimeParameter grmi.DateTime `xorm:"datetime 'ReleaseTimeParameter'" json:"WorkLine-ReleaseTimeParameter"` - ReleaseCtrlParameter string `xorm:"nvarchar(100) 'ReleaseCtrlParameter' not null" json:"WorkLine-ReleaseCtrlParameter"` - LastModify grmi.DateTime `xorm:"datetime 'LastModify' not null updated" json:"WorkLine-LastModify"` - LastUser string `xorm:"nvarchar(20) 'LastUser' not null" json:"WorkLine-LastUser"` - CreateTime grmi.DateTime `xorm:"datetime 'CreateTime' not null created" json:"WorkLine-CreateTime"` - WorkPlaceValst []WorkPlace `json:"WorkPlaceValst" xorm:"-"` - WorkPlaceUnValst []WorkPlace `json:"WorkPlaceUnvalst" xorm:"-"` + PlantNr int `xorm:"pk int 'PlantNr'" json:"WorkLine-PlantNr"` + WorkLineid string `xorm:"pk nvarchar(40) 'WorkLineid'" json:"WorkLine-WorkLineid"` + Descr string `xorm:"nvarchar(100) 'Descr' not null" json:"WorkLine-Descr"` + LineType string `xorm:"nvarchar(1) 'LineType' not null" json:"WorkLine-LineType"` + LinePlanMode string `xorm:"nvarchar(3) 'LinePlanMode' not null" json:"WorkLine-LinePlanMode"` + WeekModelNr int `xorm:"int 'WeekModelNr' not null" json:"WorkLine-WeekModelNr"` + WorkCalendarNr int `xorm:"int 'WorkCalendarNr' not null" json:"WorkLine-WorkCalendarNr"` + Location string `xorm:"nvarchar(40) 'Location' not null" json:"WorkLine-Location"` + CostCenterId string `xorm:"nvarchar(40) 'CostCenterId' not null" json:"WorkLine-CostCenterId"` + CostRate float64 `xorm:"float 'CostRate' not null" json:"WorkLine-CostRate"` + ProdEff float64 `xorm:"float 'ProdEff' not null" json:"WorkLine-ProdEff"` + ReqWorkers int `xorm:"int 'ReqWorkers' not null" json:"WorkLine-ReqWorkers"` + Pos int `xorm:"int 'Pos' not null" json:"WorkLine-Pos"` + TaskQueueSortWay string `xorm:"nvarchar(10) 'TaskQueueSortWay' not null" json:"WorkLine-TaskQueueSortWay"` + MultiQueueMixSortToggle bool `xorm:"bit 'MultiQueueMixSortToggle' not null" json:"WorkLine-MultiQueueMixSortToggle"` + TaskQueueMixSortWay string `xorm:"nvarchar(10) 'TaskQueueMixSortWay' not null" json:"WorkLine-TaskQueueMixSortWay"` + MixSortLogic string `xorm:"nvarchar(100) 'MixSortLogic' not null" json:"WorkLine-MixSortLogic"` + TaskReleaseWay string `xorm:"nvarchar(10) 'TaskReleaseWay' not null" json:"WorkLine-TaskReleaseWay"` + ReleaseQtyParameter int `xorm:"int 'ReleaseQtyParameter' not null" json:"WorkLine-ReleaseQtyParameter"` + ReleaseTimeParameter grmi.DateTime `xorm:"datetime 'ReleaseTimeParameter'" json:"WorkLine-ReleaseTimeParameter"` + ReleaseCtrlParameter string `xorm:"nvarchar(100) 'ReleaseCtrlParameter' not null" json:"WorkLine-ReleaseCtrlParameter"` + ReleaseDurationParameter int `xorm:"int 'ReleaseDurationParameter'" json:"WorkLine-ReleaseDurationParameter"` + LastModify grmi.DateTime `xorm:"datetime 'LastModify' not null updated" json:"WorkLine-LastModify"` + LastUser string `xorm:"nvarchar(20) 'LastUser' not null" json:"WorkLine-LastUser"` + CreateTime grmi.DateTime `xorm:"datetime 'CreateTime' not null created" json:"WorkLine-CreateTime"` + WorkPlaceValst []WorkPlace `json:"WorkPlaceValst" xorm:"-"` + WorkPlaceUnValst []WorkPlace `json:"WorkPlaceUnvalst" xorm:"-"` } /****************************************************************************** diff --git a/services/base/WorkLine.service.go b/services/base/WorkLine.service.go index 2df51e7..475ecdb 100644 --- a/services/base/WorkLine.service.go +++ b/services/base/WorkLine.service.go @@ -9,17 +9,17 @@ import ( ) /****************************************************************************** -* -* @Interface Name : WorkLineService -*----------------------------------------------------------------------------- -* -* @Description : WorkLine的服务接口 -* -* @Author : 代码生成器创建 -* -* @Date : 2021-03-18 23:20:31 -* -******************************************************************************/ + * + * @Interface Name : WorkLineService + *----------------------------------------------------------------------------- + * + * @Description : WorkLine的服务接口 + * + * @Author : 代码生成器创建 + * + * @Date : 2021-05-07 16:20:28 + * + ******************************************************************************/ type WorkLineService interface { /****************************************************************************** * @@ -189,7 +189,7 @@ type WorkLineService interface { * @Date : 2021-03-18 23:20:31 * ******************************************************************************/ - SelectJoinWorkPlace(*models.Usertab) ([]model.WorkLine,error) + SelectJoinWorkPlace(*models.Usertab) ([]model.WorkLine, error) } /****************************************************************************** diff --git a/services/base/implments/WorkLine.service.impl.go b/services/base/implments/WorkLine.service.impl.go index 217ac5d..0cea785 100644 --- a/services/base/implments/WorkLine.service.impl.go +++ b/services/base/implments/WorkLine.service.impl.go @@ -18,34 +18,35 @@ import ( * * @Author : 代码生成器创建 * - * @Date : 2021-03-23 10:43:27 + * @Date : 2021-05-07 16:20:28 * ******************************************************************************/ var DefaultConditionOfWorkLine = grmi.NewCondition( map[string]grmi.ConditionItem{ - meta.WorkLine_WorkLineid.UrlParameterName: grmi.NewConditionItem(meta.WorkLine_WorkLineid, grmi.Equal, true), - meta.WorkLine_Descr.UrlParameterName: grmi.NewConditionItem(meta.WorkLine_Descr, grmi.Equal, false), - meta.WorkLine_LineType.UrlParameterName: grmi.NewConditionItem(meta.WorkLine_LineType, grmi.Equal, false), - meta.WorkLine_LinePlanMode.UrlParameterName: grmi.NewConditionItem(meta.WorkLine_LinePlanMode, grmi.Equal, false), - meta.WorkLine_WeekModelNr.UrlParameterName: grmi.NewConditionItem(meta.WorkLine_WeekModelNr, grmi.Equal, false), - meta.WorkLine_WorkCalendarNr.UrlParameterName: grmi.NewConditionItem(meta.WorkLine_WorkCalendarNr, grmi.Equal, false), - meta.WorkLine_Location.UrlParameterName: grmi.NewConditionItem(meta.WorkLine_Location, grmi.Equal, false), - meta.WorkLine_CostCenterId.UrlParameterName: grmi.NewConditionItem(meta.WorkLine_CostCenterId, grmi.Equal, false), - meta.WorkLine_CostRate.UrlParameterName: grmi.NewConditionItem(meta.WorkLine_CostRate, grmi.Equal, false), - meta.WorkLine_ProdEff.UrlParameterName: grmi.NewConditionItem(meta.WorkLine_ProdEff, grmi.Equal, false), - meta.WorkLine_ReqWorkers.UrlParameterName: grmi.NewConditionItem(meta.WorkLine_ReqWorkers, grmi.Equal, false), - meta.WorkLine_Pos.UrlParameterName: grmi.NewConditionItem(meta.WorkLine_Pos, grmi.Equal, false), - meta.WorkLine_TaskQueueSortWay.UrlParameterName: grmi.NewConditionItem(meta.WorkLine_TaskQueueSortWay, grmi.Equal, false), - meta.WorkLine_MultiQueueMixSortToggle.UrlParameterName: grmi.NewConditionItem(meta.WorkLine_MultiQueueMixSortToggle, grmi.Equal, false), - meta.WorkLine_TaskQueueMixSortWay.UrlParameterName: grmi.NewConditionItem(meta.WorkLine_TaskQueueMixSortWay, grmi.Equal, false), - meta.WorkLine_MixSortLogic.UrlParameterName: grmi.NewConditionItem(meta.WorkLine_MixSortLogic, grmi.Equal, false), - meta.WorkLine_TaskReleaseWay.UrlParameterName: grmi.NewConditionItem(meta.WorkLine_TaskReleaseWay, grmi.Equal, false), - meta.WorkLine_ReleaseQtyParameter.UrlParameterName: grmi.NewConditionItem(meta.WorkLine_ReleaseQtyParameter, grmi.Equal, false), - meta.WorkLine_ReleaseTimeParameter.UrlParameterName: grmi.NewConditionItem(meta.WorkLine_ReleaseTimeParameter, grmi.Approximate, false), - meta.WorkLine_ReleaseCtrlParameter.UrlParameterName: grmi.NewConditionItem(meta.WorkLine_ReleaseCtrlParameter, grmi.Equal, false), - meta.WorkLine_LastModify.UrlParameterName: grmi.NewConditionItem(meta.WorkLine_LastModify, grmi.Approximate, false), - meta.WorkLine_LastUser.UrlParameterName: grmi.NewConditionItem(meta.WorkLine_LastUser, grmi.Equal, false), - meta.WorkLine_CreateTime.UrlParameterName: grmi.NewConditionItem(meta.WorkLine_CreateTime, grmi.Approximate, false), + meta.WorkLine_WorkLineid.UrlParameterName: grmi.NewConditionItem(meta.WorkLine_WorkLineid, grmi.Equal, true), + meta.WorkLine_Descr.UrlParameterName: grmi.NewConditionItem(meta.WorkLine_Descr, grmi.Equal, false), + meta.WorkLine_LineType.UrlParameterName: grmi.NewConditionItem(meta.WorkLine_LineType, grmi.Equal, false), + meta.WorkLine_LinePlanMode.UrlParameterName: grmi.NewConditionItem(meta.WorkLine_LinePlanMode, grmi.Equal, false), + meta.WorkLine_WeekModelNr.UrlParameterName: grmi.NewConditionItem(meta.WorkLine_WeekModelNr, grmi.Equal, false), + meta.WorkLine_WorkCalendarNr.UrlParameterName: grmi.NewConditionItem(meta.WorkLine_WorkCalendarNr, grmi.Equal, false), + meta.WorkLine_Location.UrlParameterName: grmi.NewConditionItem(meta.WorkLine_Location, grmi.Equal, false), + meta.WorkLine_CostCenterId.UrlParameterName: grmi.NewConditionItem(meta.WorkLine_CostCenterId, grmi.Equal, false), + meta.WorkLine_CostRate.UrlParameterName: grmi.NewConditionItem(meta.WorkLine_CostRate, grmi.Equal, false), + meta.WorkLine_ProdEff.UrlParameterName: grmi.NewConditionItem(meta.WorkLine_ProdEff, grmi.Equal, false), + meta.WorkLine_ReqWorkers.UrlParameterName: grmi.NewConditionItem(meta.WorkLine_ReqWorkers, grmi.Equal, false), + meta.WorkLine_Pos.UrlParameterName: grmi.NewConditionItem(meta.WorkLine_Pos, grmi.Equal, false), + meta.WorkLine_TaskQueueSortWay.UrlParameterName: grmi.NewConditionItem(meta.WorkLine_TaskQueueSortWay, grmi.Equal, false), + meta.WorkLine_MultiQueueMixSortToggle.UrlParameterName: grmi.NewConditionItem(meta.WorkLine_MultiQueueMixSortToggle, grmi.Equal, false), + meta.WorkLine_TaskQueueMixSortWay.UrlParameterName: grmi.NewConditionItem(meta.WorkLine_TaskQueueMixSortWay, grmi.Equal, false), + meta.WorkLine_MixSortLogic.UrlParameterName: grmi.NewConditionItem(meta.WorkLine_MixSortLogic, grmi.Equal, false), + meta.WorkLine_TaskReleaseWay.UrlParameterName: grmi.NewConditionItem(meta.WorkLine_TaskReleaseWay, grmi.Equal, false), + meta.WorkLine_ReleaseQtyParameter.UrlParameterName: grmi.NewConditionItem(meta.WorkLine_ReleaseQtyParameter, grmi.Equal, false), + meta.WorkLine_ReleaseTimeParameter.UrlParameterName: grmi.NewConditionItem(meta.WorkLine_ReleaseTimeParameter, grmi.Approximate, false), + meta.WorkLine_ReleaseCtrlParameter.UrlParameterName: grmi.NewConditionItem(meta.WorkLine_ReleaseCtrlParameter, grmi.Equal, false), + meta.WorkLine_ReleaseDurationParameter.UrlParameterName: grmi.NewConditionItem(meta.WorkLine_ReleaseDurationParameter, grmi.Equal, false), + meta.WorkLine_LastModify.UrlParameterName: grmi.NewConditionItem(meta.WorkLine_LastModify, grmi.Approximate, false), + meta.WorkLine_LastUser.UrlParameterName: grmi.NewConditionItem(meta.WorkLine_LastUser, grmi.Equal, false), + meta.WorkLine_CreateTime.UrlParameterName: grmi.NewConditionItem(meta.WorkLine_CreateTime, grmi.Approximate, false), }, nil, ) @@ -56,7 +57,7 @@ var DefaultConditionOfWorkLine = grmi.NewCondition( * * @Author : 代码生成器创建 * - * @Date : 2021-03-23 10:43:27 + * @Date : 2021-05-07 16:20:28 * ******************************************************************************/ var DefaultConditionOfWorkLineAndPaging = grmi.NewCondition( @@ -65,17 +66,17 @@ var DefaultConditionOfWorkLineAndPaging = grmi.NewCondition( ) /****************************************************************************** -* -* @Struct Name : WorkLineServiceImplement -*----------------------------------------------------------------------------- -* -* @Description : WorkLine的服务实现 -* -* @Author : 代码生成器创建 -* -* @Date : 2021-03-23 10:43:27 -* -******************************************************************************/ + * + * @Struct Name : WorkLineServiceImplement + *----------------------------------------------------------------------------- + * + * @Description : WorkLine的服务实现 + * + * @Author : 代码生成器创建 + * + * @Date : 2021-05-07 16:20:28 + * + ******************************************************************************/ type WorkLineServiceImplement struct { } @@ -496,5 +497,5 @@ func (impl *WorkLineServiceImplement) SelectJoinWorkPlace(user *models.Usertab) } list[k].WorkPlaceValst = record } - return list,nil + return list, nil }