diff --git a/meta/wm/StorageBin.meta.go b/meta/wm/StorageBin.meta.go index 207b3aa..5de202e 100644 --- a/meta/wm/StorageBin.meta.go +++ b/meta/wm/StorageBin.meta.go @@ -26,8 +26,7 @@ var StorageBin_BlockedStock = grmi.NewField("BlockedStock", "WM_StorageBin.Block var StorageBin_AvailableStock = grmi.NewField("AvailableStock", "WM_StorageBin.AvailableStock", "availablestock", grmi.TypeFloat64) var StorageBin_ReservedStock = grmi.NewField("ReservedStock", "WM_StorageBin.ReservedStock", "reservedstock", grmi.TypeFloat64) var StorageBin_ReservableStock = grmi.NewField("ReservableStock", "WM_StorageBin.ReservableStock", "reservablestock", grmi.TypeFloat64) -var StorageBin_LastRemovalBlock = grmi.NewField("LastRemovalBlock", "WM_StorageBin.LastRemovalBlock", "lastremovalblock", grmi.TypeDateTime) -var StorageBin_BlockRemovalReason = grmi.NewField("BlockRemovalReason", "WM_StorageBin.BlockRemovalReason", "blockremovalreason", grmi.TypeString) +var StorageBin_RemovalReason = grmi.NewField("RemovalReason", "WM_StorageBin.RemovalReason", "removalreason", grmi.TypeString) var StorageBin_RemovalPerson = grmi.NewField("RemovalPerson", "WM_StorageBin.RemovalPerson", "removalperson", grmi.TypeString) var StorageBin_LastStorageBlock = grmi.NewField("LastStorageBlock", "WM_StorageBin.LastStorageBlock", "laststorageblock", grmi.TypeDateTime) var StorageBin_StorageBlockReason = grmi.NewField("StorageBlockReason", "WM_StorageBin.StorageBlockReason", "storageblockreason", grmi.TypeString) @@ -90,8 +89,7 @@ var StorageBin = grmi.NewEntity( StorageBin_AvailableStock.Name: StorageBin_AvailableStock, StorageBin_ReservedStock.Name: StorageBin_ReservedStock, StorageBin_ReservableStock.Name: StorageBin_ReservableStock, - StorageBin_LastRemovalBlock.Name: StorageBin_LastRemovalBlock, - StorageBin_BlockRemovalReason.Name: StorageBin_BlockRemovalReason, + StorageBin_RemovalReason.Name: StorageBin_RemovalReason, StorageBin_RemovalPerson.Name: StorageBin_RemovalPerson, StorageBin_LastStorageBlock.Name: StorageBin_LastStorageBlock, StorageBin_StorageBlockReason.Name: StorageBin_StorageBlockReason, @@ -132,4 +130,4 @@ var StorageBin = grmi.NewEntity( StorageBin_CreateTime.Name: StorageBin_CreateTime, }, []string{}, - []string{"StorageAreaId", "Descr", "Status", "ActualStock", "BlockedStock", "AvailableStock", "ReservedStock", "ReservableStock", "LastRemovalBlock", "BlockRemovalReason", "RemovalPerson", "LastStorageBlock", "StorageBlockReason", "StoragePerson", "StorageCapacity", "LastRemoval", "LastStorage", "RemainStock", "LastStockTaking", "Weight", "WeightUom", "Length", "Width", "Height", "SizeUom", "MovementClass", "BinCtrlPara1", "BinCtrlPara2", "BinCtrlPara3", "BinCtrlPara4", "BinCtrlPara5", "BinCtrlPara6", "BinCtrlPara7", "BinCtrlPara8", "BinCtrlPara9", "BinCtrlPara10", "BinCtrlPara11", "BinCtrlPara12", "BinCtrlPara13", "BinCtrlPara14", "BinCtrlPara15", "BinCtrlPara16", "StorageRackId", "RowIndex", "ColIndex", "LastUser"}) + []string{"StorageAreaId", "Descr", "Status", "ActualStock", "BlockedStock", "AvailableStock", "ReservedStock", "ReservableStock", "RemovalReason", "RemovalPerson", "LastStorageBlock", "StorageBlockReason", "StoragePerson", "StorageCapacity", "LastRemoval", "LastStorage", "RemainStock", "LastStockTaking", "Weight", "WeightUom", "Length", "Width", "Height", "SizeUom", "MovementClass", "BinCtrlPara1", "BinCtrlPara2", "BinCtrlPara3", "BinCtrlPara4", "BinCtrlPara5", "BinCtrlPara6", "BinCtrlPara7", "BinCtrlPara8", "BinCtrlPara9", "BinCtrlPara10", "BinCtrlPara11", "BinCtrlPara12", "BinCtrlPara13", "BinCtrlPara14", "BinCtrlPara15", "BinCtrlPara16", "StorageRackId", "RowIndex", "ColIndex", "LastUser"}) diff --git a/models/wm/StorageBin.model.go b/models/wm/StorageBin.model.go index 3e20f93..2133087 100644 --- a/models/wm/StorageBin.model.go +++ b/models/wm/StorageBin.model.go @@ -30,8 +30,7 @@ type StorageBin struct { AvailableStock float64 `xorm:"float 'AvailableStock' not null" json:"WM_StorageBin-AvailableStock"` ReservedStock float64 `xorm:"float 'ReservedStock' not null" json:"WM_StorageBin-ReservedStock"` ReservableStock float64 `xorm:"float 'ReservableStock' not null" json:"WM_StorageBin-ReservableStock"` - LastRemovalBlock grmi.DateTime `xorm:"datetime 'LastRemovalBlock' not null" json:"WM_StorageBin-LastRemovalBlock"` - BlockRemovalReason string `xorm:"nvarchar(255) 'BlockRemovalReason' not null" json:"WM_StorageBin-BlockRemovalReason"` + RemovalReason string `xorm:"nvarchar(255) 'RemovalReason' not null" json:"WM_StorageBin-RemovalReason"` RemovalPerson string `xorm:"nvarchar(40) 'RemovalPerson' not null" json:"WM_StorageBin-RemovalPerson"` LastStorageBlock grmi.DateTime `xorm:"datetime 'LastStorageBlock' not null" json:"WM_StorageBin-LastStorageBlock"` StorageBlockReason string `xorm:"nvarchar(255) 'StorageBlockReason' not null" json:"WM_StorageBin-StorageBlockReason"` diff --git a/services/wm/implments/StorageBin.service.impl.go b/services/wm/implments/StorageBin.service.impl.go index 0f07971..f0cb1fc 100644 --- a/services/wm/implments/StorageBin.service.impl.go +++ b/services/wm/implments/StorageBin.service.impl.go @@ -32,8 +32,7 @@ var DefaultConditionOfStorageBin = grmi.NewCondition( meta.StorageBin_AvailableStock.UrlParameterName: grmi.NewConditionItem(meta.StorageBin_AvailableStock, grmi.Equal, false), meta.StorageBin_ReservedStock.UrlParameterName: grmi.NewConditionItem(meta.StorageBin_ReservedStock, grmi.Equal, false), meta.StorageBin_ReservableStock.UrlParameterName: grmi.NewConditionItem(meta.StorageBin_ReservableStock, grmi.Equal, false), - meta.StorageBin_LastRemovalBlock.UrlParameterName: grmi.NewConditionItem(meta.StorageBin_LastRemovalBlock, grmi.Approximate, false), - meta.StorageBin_BlockRemovalReason.UrlParameterName: grmi.NewConditionItem(meta.StorageBin_BlockRemovalReason, grmi.Equal, false), + meta.StorageBin_RemovalReason.UrlParameterName: grmi.NewConditionItem(meta.StorageBin_RemovalReason, grmi.Equal, false), meta.StorageBin_RemovalPerson.UrlParameterName: grmi.NewConditionItem(meta.StorageBin_RemovalPerson, grmi.Equal, false), meta.StorageBin_LastStorageBlock.UrlParameterName: grmi.NewConditionItem(meta.StorageBin_LastStorageBlock, grmi.Approximate, false), meta.StorageBin_StorageBlockReason.UrlParameterName: grmi.NewConditionItem(meta.StorageBin_StorageBlockReason, grmi.Equal, false),