diff --git a/EgtBEAMWALL.DataLayer/App.config b/EgtBEAMWALL.DataLayer/App.config index 392cea96..872413c8 100644 --- a/EgtBEAMWALL.DataLayer/App.config +++ b/EgtBEAMWALL.DataLayer/App.config @@ -12,7 +12,7 @@ - + diff --git a/EgtBEAMWALL.DataLayer/EgtBEAMWALL.DataLayer.csproj b/EgtBEAMWALL.DataLayer/EgtBEAMWALL.DataLayer.csproj index ebd8b8ab..419424ab 100644 --- a/EgtBEAMWALL.DataLayer/EgtBEAMWALL.DataLayer.csproj +++ b/EgtBEAMWALL.DataLayer/EgtBEAMWALL.DataLayer.csproj @@ -125,6 +125,10 @@ 202109141058345_AddMachine2ProjProd.cs + + + 202207051703296_UpgradeLockModel.cs + @@ -161,6 +165,9 @@ 202109141058345_AddMachine2ProjProd.cs + + 202207051703296_UpgradeLockModel.cs + diff --git a/EgtBEAMWALL.StressTest/EgtBEAMWALL.StressTest.csproj b/EgtBEAMWALL.StressTest/EgtBEAMWALL.StressTest.csproj index 88696c74..5ed101b8 100644 --- a/EgtBEAMWALL.StressTest/EgtBEAMWALL.StressTest.csproj +++ b/EgtBEAMWALL.StressTest/EgtBEAMWALL.StressTest.csproj @@ -35,8 +35,20 @@ false + + ..\packages\EgtWPFLib5.2.4.7.1\lib\EgtUILib.dll + + + ..\packages\EgtWPFLib5.2.4.7.1\lib\EgtWPFLib.dll + + + ..\packages\EgtWPFLib5.2.4.7.1\lib\EgtWPFLib5.dll + + + ..\packages\EgtWPFLib5.2.4.7.1\lib\System.Windows.Interactivity.dll + @@ -71,6 +83,7 @@ StressTest.cs + SettingsSingleFileGenerator Settings.Designer.cs diff --git a/EgtBEAMWALL.StressTest/Simulator.cs b/EgtBEAMWALL.StressTest/Simulator.cs index 911f3d47..b16c8fa6 100644 --- a/EgtBEAMWALL.StressTest/Simulator.cs +++ b/EgtBEAMWALL.StressTest/Simulator.cs @@ -79,7 +79,7 @@ namespace EgtBEAMWALL.StressTest List currPartList = new List(); List currMachGroupList = new List(); List currMGPartList = new List(); - ProjCtr.UpdateInfo(currProjId, $"{DateTime.Now:yyyyMMdd_HHmmssfff}", $"LN_{DateTime.Now:yyyyMMdd_HHmm}", DateTime.Now.AddSeconds(15)); + ProjCtr.UpdateInfo(currProjId, $"{DateTime.Now:yyyyMMdd_HHmmssfff}", $"LN_{DateTime.Now:yyyyMMdd_HHmm}", DateTime.Now.AddSeconds(15), Core.ConstBeam.BWType.BEAM, "SIM01"); // genero le BTLParts ed assegno.. for (int j = 0; j < currRandom.BtlPart2Proj; j++) { @@ -109,7 +109,7 @@ namespace EgtBEAMWALL.StressTest { // FixME!!! non può creare x loop in CreateBeamDL che vuole nParentMachGroup // genero le Part x MachGroup ed assegno - Core.PartM currPart = Core.BeamM.CreateBeamDL(null, currPartList[BPIdx].PartId, 1); + Core.PartM currPart = Core.PartM.CreatePart(Core.ConstBeam.BWType.BEAM, currMachGroupList.FirstOrDefault(), currPartList[BPIdx].PartId, 1); currMGPartList.Add(currPart); //currMGPartList.Add(new DataLayer.DatabaseModels.PartModel() { BTLPartDbId = currBTLPart.BTLPartDbId, PDN = l * k * currRandom.Part2MachGroup, PartId = l, H = 10 * l, L = 50 * l, W = 5 * l }); } diff --git a/EgtBEAMWALL.StressTest/packages.config b/EgtBEAMWALL.StressTest/packages.config new file mode 100644 index 00000000..9e8086ea --- /dev/null +++ b/EgtBEAMWALL.StressTest/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file