diff --git a/EgtBEAMWALL.Core/ProjectFileVM/ProdItem.vb b/EgtBEAMWALL.Core/ProjectFileVM/ProdItem.vb index c00abb2b..5bb31bb0 100644 --- a/EgtBEAMWALL.Core/ProjectFileVM/ProdItem.vb +++ b/EgtBEAMWALL.Core/ProjectFileVM/ProdItem.vb @@ -93,17 +93,24 @@ Public Class ProdItem End Sub - Public Shared Function CreateProdItem(nProdId As Integer, nProjIdList As List(Of Integer), dtCreateProjDate As DateTime, sName As String, nType As BWType, + Public Shared Function CreateProdItem(nProdId As Integer, nProjIdList As List(Of Integer), dtCreateProjDate As DateTime, sName As String, nType As BWType, sMachine As String, sLockedBy As String, dtLock As DateTime, bIsActive As Boolean, bIsProduced As Boolean, bIsArchived As Boolean, ProjMList As List(Of ProjFileM)) As ProdItem - Dim NewProdFileM = ProdFileM.CreateProdFileM(nProdId, nProjIdList, dtCreateProjDate, sName, nType, sMachine, sLockedBy, dtLock, bIsActive, bIsProduced, bIsArchived) - Dim NewProdFileVM = New ProdFileVM(NewProdFileM) - Dim NewProjFileVM As IEnumerable(Of ProjectFileVM) - NewProjFileVM = ProjMList.Select(Of ProjFileVM)(Function(j) New ProjFileVM(j)).ToList - Dim NewProdItem = New ProdItem(NewProdFileVM, NewProjFileVM.ToList) + Dim NewProdFileM = ProdFileM.CreateProdFileM(nProdId, nProjIdList, dtCreateProjDate, sName, nType, sMachine, sLockedBy, dtLock, bIsActive, bIsProduced, bIsArchived) + Dim NewProdFileVM = New ProdFileVM(NewProdFileM) + Dim NewProjFileVM As IEnumerable(Of ProjectFileVM) + NewProjFileVM = ProjMList.Select(Of ProjFileVM)(Function(j) New ProjFileVM(j)).ToList + Dim NewProdItem = New ProdItem(NewProdFileVM, NewProjFileVM.ToList) - Return NewProdItem - End Function + Return NewProdItem + End Function + + Public Shared Function CreateProdItem(ProjFileM As ProjFileM) As ProdItem + + Dim NewProdItem = New ProdItem(New ProjFileVM(ProjFileM)) + + Return NewProdItem + End Function End Class \ No newline at end of file