From 4933e01ef86c26e3e372378dc250c6a71901d822 Mon Sep 17 00:00:00 2001 From: "liulb@mesnac.com" Date: Sat, 16 Dec 2023 00:33:56 +0800 Subject: [PATCH] new --- Admin.Core.Api/Admin.Core.Model.xml | 57 ++- .../IOldBoxFoamTypeRepository.cs | 12 + .../IService_New/IOldBoxFoamTypeServices.cs | 18 + .../Model_New/BoxLastShotRecord.cs | 11 +- Admin.Core.Model/Model_New/OldBoxFoamType.cs | 57 +++ .../Model_New/Perfusion_Record.cs | 6 +- Admin.Core.RealTimeService/appsettings.json | 4 +- .../OldBoxFoamTypeRepository.cs | 16 + .../Service_New/BaseSpaceDetailServices.cs | 4 +- .../Service_New/OldBoxFoamTypeServices.cs | 28 ++ .../Jobs/Job_OldBoxFoamType_Quartz.cs | 359 ++++++++++++++++++ .../QuartzNet/Jobs/Job_Perfusion_Quartz.cs | 5 +- .../Models/LastShotRecordModel.cs | 10 +- .../Models/OldBoxFoamTypeModel.cs | 47 +++ .../ViewModels/AfterFoamingPageModelView.cs | 44 ++- .../ViewModels/BeforeFoamingPageModelView.cs | 37 +- .../ViewModels/FoamMachinesPageViewModel.cs | 23 +- .../ViewModels/LinerInventoryViewModel.cs | 60 +-- .../ViewModels/MainWindowViewModel.cs | 12 +- .../ViewModels/OldBoxFoamPageViewModel.cs | 45 ++- .../ViewModels/ShellInventoryViewModel.cs | 67 ++-- .../Views/FoamMachinesPageView.xaml | 102 ++--- .../Views/FoamMonitorPageView.xaml | 165 +++----- Aucma.Core.BoxFoam/Views/MainWindow.xaml | 28 +- .../Views/OldBoxFoamPageView.xaml | 20 +- .../Views/RealTimeInventoryPageView.xaml | 10 +- .../Views/UserPage/AfterFoamingPageView.xaml | 49 +-- .../Views/UserPage/BeforeFoamingPageView.xaml | 52 +-- .../Views/UserPage/LinerInventory.xaml | 30 +- .../Views/UserPage/ShellInventory.xaml | 48 +-- .../Views/UserPage/ShellInventory.xaml.cs | 4 +- Aucma.Core.BoxFoam/appsettings.json | 14 +- Aucma.Core.RunPlc/RunPlcService.cs | 1 - 33 files changed, 1055 insertions(+), 390 deletions(-) create mode 100644 Admin.Core.IRepository/IRepository_New/IOldBoxFoamTypeRepository.cs create mode 100644 Admin.Core.IService/IService_New/IOldBoxFoamTypeServices.cs create mode 100644 Admin.Core.Model/Model_New/OldBoxFoamType.cs create mode 100644 Admin.Core.Repository/Repository_New/OldBoxFoamTypeRepository.cs create mode 100644 Admin.Core.Service/Service_New/OldBoxFoamTypeServices.cs create mode 100644 Admin.Core.Tasks/QuartzNet/Jobs/Job_OldBoxFoamType_Quartz.cs create mode 100644 Aucma.Core.BoxFoam/Models/OldBoxFoamTypeModel.cs diff --git a/Admin.Core.Api/Admin.Core.Model.xml b/Admin.Core.Api/Admin.Core.Model.xml index 15d060ac..92b7aa6d 100644 --- a/Admin.Core.Api/Admin.Core.Model.xml +++ b/Admin.Core.Api/Admin.Core.Model.xml @@ -546,6 +546,46 @@ 完成时间 + + + 老发泡线泡前库 + + + + + 主键 + + + + + 位置;东线泡前库；西线泡前库 + + + + + 货道类型 + + + + + 库存数量 + + + + + 创建人 + + + + + 创建时间 + + + + + 更新时间 + + SAP BOM 信息 @@ -641,7 +681,7 @@ 主键 - + 订单号 @@ -1141,6 +1181,16 @@ 所属系统;1系统 2系统 + + + 枪头 + + + + + 工位号 + + POL注料压力 @@ -1571,6 +1621,11 @@ 系统;0,右系统 1，左系统 + + + 灌注结果 + + 创建人 diff --git a/Admin.Core.IRepository/IRepository_New/IOldBoxFoamTypeRepository.cs b/Admin.Core.IRepository/IRepository_New/IOldBoxFoamTypeRepository.cs new file mode 100644 index 00000000..0c077357 --- /dev/null +++ b/Admin.Core.IRepository/IRepository_New/IOldBoxFoamTypeRepository.cs @@ -0,0 +1,12 @@ +using Admin.Core.Model; +using Admin.Core.Model.Model_New; + +namespace Admin.Core.IRepository +{ + /// + /// IOldBoxFoamTypeRepository + /// + public interface IOldBoxFoamTypeRepository : IBaseRepository + { + } +} \ No newline at end of file diff --git a/Admin.Core.IService/IService_New/IOldBoxFoamTypeServices.cs b/Admin.Core.IService/IService_New/IOldBoxFoamTypeServices.cs new file mode 100644 index 00000000..cf164161 --- /dev/null +++ b/Admin.Core.IService/IService_New/IOldBoxFoamTypeServices.cs @@ -0,0 +1,18 @@ +using Admin.Core.IService; +using Admin.Core.Model; +using Admin.Core.Model.Model_New; +using Admin.Core.Model.ViewModels; +using System.Collections.Generic; +using System.Threading.Tasks; + +namespace Admin.Core.IService +{ + /// + /// IOldBoxFoamTypeServices + /// + public interface IOldBoxFoamTypeServices : IBaseServices + { + + + } +} \ No newline at end of file diff --git a/Admin.Core.Model/Model_New/BoxLastShotRecord.cs b/Admin.Core.Model/Model_New/BoxLastShotRecord.cs index f63293f6..f020632e 100644 --- a/Admin.Core.Model/Model_New/BoxLastShotRecord.cs +++ b/Admin.Core.Model/Model_New/BoxLastShotRecord.cs @@ -24,7 +24,16 @@ namespace Admin.Core.Model /// [SugarColumn(ColumnName = "SYSTEM")] public string System { get; set; } - + /// + /// 枪头 + /// + [SugarColumn(ColumnName = "GUNHEAD")] + public string GunHead { get; set; } + /// + /// 工位号 + /// + [SugarColumn(ColumnName = "STATIONNUMBER")] + public string StationNumber { get; set; } /// /// POL注料压力 /// diff --git a/Admin.Core.Model/Model_New/OldBoxFoamType.cs b/Admin.Core.Model/Model_New/OldBoxFoamType.cs new file mode 100644 index 00000000..67ca1f47 --- /dev/null +++ b/Admin.Core.Model/Model_New/OldBoxFoamType.cs @@ -0,0 +1,57 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Admin.Core.Model.Model_New +{ + /// + /// 老发泡线泡前库 + /// + public class OldBoxFoamType + { + /// + /// 主键 + /// + [SugarColumn(ColumnName = "OBJ_ID", IsIdentity = true, IsPrimaryKey = true)] + public float ObjId { get; set; } + + /// + /// 位置;东线泡前库；西线泡前库 + /// + [SugarColumn(ColumnName = "LOCAL")] + public string Local { get; set; } + + /// + /// 货道类型 + /// + [SugarColumn(ColumnName = "BOXTYPE")] + public string Boxtype { get; set; } + + /// + /// 库存数量 + /// + [SugarColumn(ColumnName = "STOREAMOUNT")] + public float Storeamount { get; set; } + + /// + /// 创建人 + /// + [SugarColumn(ColumnName = "CREATED_BY")] + public string CreatedBy { get; set; } + + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "CREATED_TIME")] + public DateTime CreatedTime { get; set; } + + /// + /// 更新时间 + /// + [SugarColumn(ColumnName = "UPDATED_TIME")] + public DateTime UpdatedTime { get; set; } + } +} diff --git a/Admin.Core.Model/Model_New/Perfusion_Record.cs b/Admin.Core.Model/Model_New/Perfusion_Record.cs index 6186f1cf..e12c5ee1 100644 --- a/Admin.Core.Model/Model_New/Perfusion_Record.cs +++ b/Admin.Core.Model/Model_New/Perfusion_Record.cs @@ -71,7 +71,11 @@ namespace Admin.Core.Model /// [SugarColumn(ColumnName = "PERFUSION_SYSTEM")] public string PerfusionSystem { get; set; } - + /// + /// 灌注结果 + /// + [SugarColumn(ColumnName = "PERFUSION_RESULT")] + public int PerfusionResult { get; set; } /// /// 创建人 /// diff --git a/Admin.Core.RealTimeService/appsettings.json b/Admin.Core.RealTimeService/appsettings.json index 4a6f2cf5..acb47422 100644 --- a/Admin.Core.RealTimeService/appsettings.json +++ b/Admin.Core.RealTimeService/appsettings.json @@ -82,7 +82,7 @@ "Enabled": true, "HitRate": 50, //"Connection": "Data Source=localhost;Initial Catalog=Hsdb;User ID=sa;Password=sa;Integrated Security=false;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False", - "Connection": "Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=175.27.215.92)(PORT=1521)))(CONNECT_DATA=(SERVICE_NAME=helowin)));User ID=aucma_scada;Password=aucma;", + "Connection": "Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=10.100.72.20)(PORT=1521)))(CONNECT_DATA=(SERVICE_NAME=helowin)));User ID=aucma_scada;Password=aucma;", "ProviderName": "System.Data.SqlClient" }, { @@ -90,7 +90,7 @@ "DBType": 3, "Enabled": true, "HitRate": 40, - "Connection": "Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=175.27.215.92)(PORT=1521)))(CONNECT_DATA=(SERVICE_NAME=helowin)));User ID=aucma_mes;Password=aucma;", + "Connection": "Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=10.100.72.20)(PORT=1521)))(CONNECT_DATA=(SERVICE_NAME=helowin)));User ID=aucma_mes;Password=aucma;", "ProviderName": "System.Data.SqlClient" } ], diff --git a/Admin.Core.Repository/Repository_New/OldBoxFoamTypeRepository.cs b/Admin.Core.Repository/Repository_New/OldBoxFoamTypeRepository.cs new file mode 100644 index 00000000..b403f3c3 --- /dev/null +++ b/Admin.Core.Repository/Repository_New/OldBoxFoamTypeRepository.cs @@ -0,0 +1,16 @@ +using Admin.Core.IRepository; +using Admin.Core.Model; +using Admin.Core.Model.Model_New; + +namespace Admin.Core.Repository +{ + /// + /// OldBoxFoamTypeRepository + /// + public class OldBoxFoamTypeRepository : BaseRepository, IOldBoxFoamTypeRepository + { + public OldBoxFoamTypeRepository(IUnitOfWork unitOfWork) : base(unitOfWork) + { + } + } +} \ No newline at end of file diff --git a/Admin.Core.Service/Service_New/BaseSpaceDetailServices.cs b/Admin.Core.Service/Service_New/BaseSpaceDetailServices.cs index e38c7ded..4abc2e38 100644 --- a/Admin.Core.Service/Service_New/BaseSpaceDetailServices.cs +++ b/Admin.Core.Service/Service_New/BaseSpaceDetailServices.cs @@ -101,9 +101,7 @@ namespace Admin.Core.Service List spaceDetails = null; try { - Expression> exp = s1 => true; - exp = exp.And(x => x.StoreCode == storeCode && x.SpaceCode == spaceCode); - spaceDetails =await _dal.QueryAsync(exp); + spaceDetails =await _dal.QueryAsync(x => x.StoreCode == storeCode && x.SpaceCode == spaceCode); logHelper.Info($"根据仓库编号：{storeCode}；货道编号：{spaceCode}；获取到的执货道明细：{spaceDetails.ToJson()}"); } diff --git a/Admin.Core.Service/Service_New/OldBoxFoamTypeServices.cs b/Admin.Core.Service/Service_New/OldBoxFoamTypeServices.cs new file mode 100644 index 00000000..4a6b94ee --- /dev/null +++ b/Admin.Core.Service/Service_New/OldBoxFoamTypeServices.cs @@ -0,0 +1,28 @@ +using Admin.Core.IRepository; +using Admin.Core.IService; +using Admin.Core.Model; +using Admin.Core.Model.Model_New; +using Admin.Core.Model.ViewModels; +using log4net; +using Microsoft.AspNetCore.Razor.TagHelpers; +using Microsoft.IdentityModel.Logging; +using NPOI.XSSF.UserModel; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace Admin.Core.Service +{ + public class OldBoxFoamTypeServices : BaseServices, IOldBoxFoamTypeServices + { + private readonly IBaseRepository _dal; + public OldBoxFoamTypeServices(IBaseRepository dal) + { + this._dal = dal; + base.BaseDal = dal; + } + + + } +} \ No newline at end of file diff --git a/Admin.Core.Tasks/QuartzNet/Jobs/Job_OldBoxFoamType_Quartz.cs b/Admin.Core.Tasks/QuartzNet/Jobs/Job_OldBoxFoamType_Quartz.cs new file mode 100644 index 00000000..d1f81588 --- /dev/null +++ b/Admin.Core.Tasks/QuartzNet/Jobs/Job_OldBoxFoamType_Quartz.cs @@ -0,0 +1,359 @@ +using Admin.Core.IService.ISys; +using Admin.Core.IService; +using Admin.Core.Service; +using Quartz; +using System; +using System.Threading.Tasks; +using log4net; +using Admin.Core.Model; +using Admin.Core.Common; +using System.Linq; +using StackExchange.Profiling.Internal; +using Admin.Core.Model.Model_New; +using NPOI.POIFS.Crypt.Dsig; +using Aucma.Core.PLc; +using System.Diagnostics; + +/// +/// 老发泡数据采集 +/// +namespace Admin.Core.Tasks +{ + public class Job_OldBoxFoamType_Quartz : JobBase, IJob + { + #region 事件 + /// + /// 发泡线新事件 + /// + /// + public delegate Task RefreshBoxFoamDataDelegate(); + public static event RefreshBoxFoamDataDelegate RefreshBoxFoamDataDelegateEvent; + /// + /// 老发泡线更新事件 + /// + /// + public delegate Task RefreshOldBoxFoamDataDelegate(); + public static event RefreshOldBoxFoamDataDelegate RefreshOldBoxFoamDataDelegateEvent; + /// + /// 老泡前库更新事件 + /// + /// + public delegate Task RefreshOldBoxFoamTypeDataDelegate(); + public static event RefreshOldBoxFoamTypeDataDelegate RefreshOldBoxFoamTypeDataDelegateEvent; + + #endregion + + private static readonly log4net.ILog logHelper = LogManager.GetLogger(typeof(Job_BoxFoamData_Quartz)); + + private readonly IOldBoxFoamTypeServices _oldBoxFoamTypeServices; + + public Job_OldBoxFoamType_Quartz(ISysTasksQzService SysTasksQzService, ISysJobLogService sysJobLogService, + IOldBoxFoamTypeServices oldBoxFoamTypeServices) + { + _SysTasksQzService = SysTasksQzService; + _oldBoxFoamTypeServices = oldBoxFoamTypeServices; + } + + public async Task Execute(IJobExecutionContext context) + { + await ExecuteJob(context, async () => await OldBoxFoamDataRun(context)); + } + + + + public async Task OldBoxFoamDataRun(IJobExecutionContext context) + { + await SaveOldBoxFoamData(); + } + + #region PLC 任务处理表 + /// + /// PLC 任务处理表 + /// + /// 仓库编码 + /// 物料编码 + /// + public async Task SaveOldBoxFoamData() + { + try + { + var obj = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("OldTypePlc")); + if (obj.plc.IsConnected) + { + var taskList = await _oldBoxFoamTypeServices.QueryAsync(); + foreach (var item in taskList) + { + await UpdateRealOldBoxFoamTypeData(obj, item); + } + } + } + catch (Exception ex) + { + logHelper.Error($"入库数据处理异常:{ex.Message}"); + } + } + + /// + /// 泡前库更新 + /// + /// + /// + /// + private async Task UpdateRealOldBoxFoamTypeData(PlcModel obj, OldBoxFoamType item) + { + try + { + #region 更新PLC数据 + if (item.ObjId == 1) + { + int amount = 0; + var str = obj.plc.ReadInt16("L101").ToString() + obj.plc.ReadString("L102").ToString() + obj.plc.ReadString("L103").ToString(); + if (str.IsNotEmptyOrNull()) + { + int r=Convert.ToInt32(str); + switch (r) + { + case 0: + amount = 0; + break; + case 1: + amount=1; + break; + case 11: + amount = 2; + break; + case 111: + amount = 3; + break; + default: + break; + } + item.Boxtype = obj.plc.ReadString("D2010"); + item.Storeamount = amount; + item.UpdatedTime = DateTime.Now; + } + } + if (item.ObjId == 2) + { + int amount = 0; + var str = obj.plc.ReadInt16("L201").ToString() + obj.plc.ReadString("L202").ToString() + obj.plc.ReadString("L303").ToString(); + if (str.IsNotEmptyOrNull()) + { + int r = Convert.ToInt32(str); + switch (r) + { + case 0: + amount = 0; + break; + case 1: + amount = 1; + break; + case 11: + amount = 2; + break; + case 111: + amount = 3; + break; + default: + break; + } + item.Boxtype = obj.plc.ReadString("D2020"); + item.Storeamount = amount; + item.UpdatedTime = DateTime.Now; + } + } + if (item.ObjId == 3) + { + int amount = 0; + var str = obj.plc.ReadInt16("L301").ToString() + obj.plc.ReadString("L302").ToString() + obj.plc.ReadString("L303").ToString(); + if (str.IsNotEmptyOrNull()) + { + int r = Convert.ToInt32(str); + switch (r) + { + case 0: + amount = 0; + break; + case 1: + amount = 1; + break; + case 11: + amount = 2; + break; + case 111: + amount = 3; + break; + default: + break; + } + item.Boxtype = obj.plc.ReadString("D2030"); + item.Storeamount = amount; + item.UpdatedTime = DateTime.Now; + } + } + if (item.ObjId == 4) + { + int amount = 0; + var str = obj.plc.ReadInt16("L401").ToString() + obj.plc.ReadString("L402").ToString() + obj.plc.ReadString("L403").ToString(); + if (str.IsNotEmptyOrNull()) + { + int r = Convert.ToInt32(str); + switch (r) + { + case 0: + amount = 0; + break; + case 1: + amount = 1; + break; + case 11: + amount = 2; + break; + case 111: + amount = 3; + break; + default: + break; + } + item.Boxtype = obj.plc.ReadString("D2040"); + item.Storeamount = amount; + item.UpdatedTime = DateTime.Now; + } + } + if (item.ObjId == 5) + { + int amount = 0; + var str = obj.plc.ReadInt16("L101").ToString() + obj.plc.ReadString("L102").ToString() + obj.plc.ReadString("L103").ToString(); + if (str.IsNotEmptyOrNull()) + { + int r = Convert.ToInt32(str); + switch (r) + { + case 0: + amount = 0; + break; + case 1: + amount = 1; + break; + case 11: + amount = 2; + break; + case 111: + amount = 3; + break; + default: + break; + } + item.Boxtype = obj.plc.ReadString("D2010"); + item.Storeamount = amount; + item.UpdatedTime = DateTime.Now; + } + } + if (item.ObjId == 6) + { + int amount = 0; + var str = obj.plc.ReadInt16("L201").ToString() + obj.plc.ReadString("L202").ToString() + obj.plc.ReadString("L203").ToString(); + if (str.IsNotEmptyOrNull()) + { + int r = Convert.ToInt32(str); + switch (r) + { + case 0: + amount = 0; + break; + case 1: + amount = 1; + break; + case 11: + amount = 2; + break; + case 111: + amount = 3; + break; + default: + break; + } + item.Boxtype = obj.plc.ReadString("D2020"); + item.Storeamount = amount; + item.UpdatedTime = DateTime.Now; + } + } + if (item.ObjId == 7) + { + int amount = 0; + var str = obj.plc.ReadInt16("L301").ToString() + obj.plc.ReadString("L302").ToString() + obj.plc.ReadString("L303").ToString(); + if (str.IsNotEmptyOrNull()) + { + int r = Convert.ToInt32(str); + switch (r) + { + case 0: + amount = 0; + break; + case 1: + amount = 1; + break; + case 11: + amount = 2; + break; + case 111: + amount = 3; + break; + default: + break; + } + item.Boxtype = obj.plc.ReadString("D2030"); + item.Storeamount = amount; + item.UpdatedTime = DateTime.Now; + } + } + if (item.ObjId == 8) + { + int amount = 0; + var str = obj.plc.ReadInt16("L401").ToString() + obj.plc.ReadString("L402").ToString() + obj.plc.ReadString("L403").ToString(); + if (str.IsNotEmptyOrNull()) + { + int r = Convert.ToInt32(str); + switch (r) + { + case 0: + amount = 0; + break; + case 1: + amount = 1; + break; + case 11: + amount = 2; + break; + case 111: + amount = 3; + break; + default: + break; + } + item.Boxtype = obj.plc.ReadString("D2040"); + item.Storeamount = amount; + item.UpdatedTime = DateTime.Now; + } + } + #endregion + bool result = await _oldBoxFoamTypeServices.UpdateAsync(item); + if (result) + { + RefreshOldBoxFoamTypeDataDelegateEvent?.Invoke(); + } + else + { + // LogDelegateEvent?.Invoke($"物料[{planInfo.MaterialName}], 入库[{baseSpace.SpaceName}]失败，任务回滚！"); + } + } + catch (Exception ex) + { + logHelper.Error($"更新老箱体发泡数据失败"); + } + + return await Task.FromResult(item); + } + #endregion + } +} diff --git a/Admin.Core.Tasks/QuartzNet/Jobs/Job_Perfusion_Quartz.cs b/Admin.Core.Tasks/QuartzNet/Jobs/Job_Perfusion_Quartz.cs index 9b6eb0a3..e8b1662d 100644 --- a/Admin.Core.Tasks/QuartzNet/Jobs/Job_Perfusion_Quartz.cs +++ b/Admin.Core.Tasks/QuartzNet/Jobs/Job_Perfusion_Quartz.cs @@ -86,6 +86,7 @@ namespace Admin.Core.Tasks var pressureL = obj.plc.ReadDouble("DB55.50.0");//灌注压力——灌注压力_L var duration = obj.plc.ReadInt16("DB55.12.0");//灌注时长 var system = obj.plc.ReadInt32("DB55.82.0");//0,右系统 1，左系统 + var result = obj.plc.ReadInt16("DB55.44.0");//灌注结果 Perfusion_Record record = new Perfusion_Record(); record.PerfusionBoxCode = barCode; @@ -96,13 +97,13 @@ namespace Admin.Core.Tasks record.PerfusionR = pressureR.ToString(); record.PerfusionL = pressureL.ToString(); record.PerfusionDuration = duration.ToString(); - record.PerfusionSystem = system.ToString(); + record.PerfusionResult =Convert.ToInt32(result);//灌注结果 var r = await _perfusionRecordServices.AddAsync(record); if (r > 0) { //数据采集完成设为2 - obj.plc.WriteInt32("DB55.44.0", 2);//应答字:1数据采集，2存盘成功 + obj.plc.WriteInt32("DB55.444.0", 2);//应答字:1数据采集，2存盘成功 } else { diff --git a/Aucma.Core.BoxFoam/Models/LastShotRecordModel.cs b/Aucma.Core.BoxFoam/Models/LastShotRecordModel.cs index fe66a99f..eb62ff43 100644 --- a/Aucma.Core.BoxFoam/Models/LastShotRecordModel.cs +++ b/Aucma.Core.BoxFoam/Models/LastShotRecordModel.cs @@ -14,11 +14,19 @@ namespace Aucma.Core.BoxFoam.Models /// 所属系统;1系统 2系统 /// public string System { get; set; } + /// + /// 枪头 + /// + public string GunHead { get; set; } + /// + /// 工位号 + /// + public string StationNumber { get; set; } /// /// POL注料压力 /// - public string PolInjectionpressure { get; set; } + public string PolInjectionpressure { get; set; } /// /// ISO注料压力 diff --git a/Aucma.Core.BoxFoam/Models/OldBoxFoamTypeModel.cs b/Aucma.Core.BoxFoam/Models/OldBoxFoamTypeModel.cs new file mode 100644 index 00000000..a5fb8e1b --- /dev/null +++ b/Aucma.Core.BoxFoam/Models/OldBoxFoamTypeModel.cs @@ -0,0 +1,47 @@ +using System; + +namespace Aucma.Core.BoxFoam.Models +{ + public class OldBoxFoamTypeModel + { + /// + /// 主键 + /// + public float ObjId { get; set; } + + /// + /// 位置;东线泡前库；西线泡前库 + /// + public string Local { get; set; } + + /// + /// 货道类型 + /// + public string Boxtype { get; set; } + + /// + /// 库存数量 + /// + public float Storeamount { get; set; } + + /// + /// 创建人 + /// + public string CreatedBy { get; set; } + + /// + /// 创建时间 + /// + public DateTime CreatedTime { get; set; } + + /// + /// 更新人 + /// + public string UpdatedBy { get; set; } + + /// + /// 更新时间 + /// + public DateTime UpdatedTime { get; set; } = DateTime.Now; + } +} diff --git a/Aucma.Core.BoxFoam/ViewModels/AfterFoamingPageModelView.cs b/Aucma.Core.BoxFoam/ViewModels/AfterFoamingPageModelView.cs index 265a0541..6fce19bc 100644 --- a/Aucma.Core.BoxFoam/ViewModels/AfterFoamingPageModelView.cs +++ b/Aucma.Core.BoxFoam/ViewModels/AfterFoamingPageModelView.cs @@ -1,5 +1,6 @@ using Admin.Core.Common; using Admin.Core.IService; +using Admin.Core.Model; using Aucma.Core.BoxFoam.Models; using Aucma.Core.BoxFoam.Views.UserPage; using CommunityToolkit.Mvvm.ComponentModel; @@ -16,23 +17,24 @@ namespace Aucma.Core.BoxFoam.ViewModels { public partial class AfterFoamingPageModelView : ObservableObject { - private readonly IBaseSpaceDetailServices? _baseSpaceDetailServices; + private readonly IBaseSpaceDetailServices? _spaceDetailService; private readonly IBaseSpaceInfoServices? _baseSpaceInfoServices; public AfterFoamingPageModelView() { - _baseSpaceDetailServices = App.ServiceProvider.GetService(); + _spaceDetailService = App.ServiceProvider.GetService(); _baseSpaceInfoServices = App.ServiceProvider.GetService(); - this.LoadSpaceStoreMedthAsync(); } + this.LoadSpaceStoreMedthAsync(); + } #region 加载泡后库货道信息 /// /// 加载泡后库货道信息 /// - private async void LoadSpaceStoreMedthAsync() + private void LoadSpaceStoreMedthAsync() { string storeCode = Appsettings.app("StoreInfo", "AfterStoreCode");//泡前库code - var baseSpaceInfolist = await _baseSpaceInfoServices.QueryAsync(d => d.StoreCode.Equals(storeCode));//仓库 + var baseSpaceInfolist = _baseSpaceInfoServices.QueryAsync(d => d.StoreCode.Equals(storeCode)).Result;//仓库 if (baseSpaceInfolist == null) return; foreach (var item in baseSpaceInfolist) @@ -74,12 +76,36 @@ namespace Aucma.Core.BoxFoam.ViewModels #region 明细 [RelayCommand] - private void SpaceDetail(string spaceCode) + private void SpaceDetail(string info) { string storeCode = Appsettings.app("StoreInfo", "AfterStoreCode");//泡前库code - SpaceDetailPageView page = new SpaceDetailPageView(storeCode, spaceCode); - page.ShowDialog(); - } + List list = _spaceDetailService.GetSpaceDetailsBySpaceCode(storeCode, info).Result; + + RefreshSpaceDetails(list); + } + /// + /// 刷新货道明细列表 + /// + /// + private void RefreshSpaceDetails(List spaceDetails) + { + SpaceDetailDataGrid = new ObservableCollection(); + if (spaceDetails != null) + { + spaceDetails.ForEach( + arg => + { + SpaceDetailDataGrid.Add(arg); + }); + } + } + private ObservableCollection spaceDetailDataGrid; + + public ObservableCollection SpaceDetailDataGrid + { + get => spaceDetailDataGrid; + set => SetProperty(ref spaceDetailDataGrid, value); + } #endregion } } diff --git a/Aucma.Core.BoxFoam/ViewModels/BeforeFoamingPageModelView.cs b/Aucma.Core.BoxFoam/ViewModels/BeforeFoamingPageModelView.cs index a2bfcaaa..c3b49231 100644 --- a/Aucma.Core.BoxFoam/ViewModels/BeforeFoamingPageModelView.cs +++ b/Aucma.Core.BoxFoam/ViewModels/BeforeFoamingPageModelView.cs @@ -12,6 +12,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.IdentityModel.Logging; using NPOI.SS.Formula.Functions; using System; +using System.Collections.Generic; using System.Collections.ObjectModel; using System.Threading.Tasks; using System.Windows; @@ -37,11 +38,11 @@ namespace Aucma.Core.BoxFoam.ViewModels /// /// 加载泡前库货道信息 /// - private async void LoadSpaceStoreMedthAsync() + private void LoadSpaceStoreMedthAsync() { string storeCode = Appsettings.app("StoreInfo", "BeforeStoreCode");//泡前库code - var baseSpaceInfolist = await _baseSpaceInfoServices.QueryAsync(d => d.StoreCode.Equals(storeCode));//仓库 + var baseSpaceInfolist = _baseSpaceInfoServices.QueryAsync(d => d.StoreCode.Equals(storeCode)).Result;//仓库 if (baseSpaceInfolist == null) return; Shapes.Clear(); @@ -85,11 +86,35 @@ namespace Aucma.Core.BoxFoam.ViewModels #region 货道明细 [RelayCommand] - private void SpaceDetail(string spaceCode) + private void SpaceDetail(string info) { - string storeCode = Appsettings.app("StoreInfo", "BeforeStoreCode");//泡前库code - SpaceDetailPageView page = new SpaceDetailPageView(storeCode, spaceCode); - page.ShowDialog(); + var storeCode = Appsettings.app("StoreInfo", "BeforeStoreCode");//内胆库号 + List list = _baseSpaceDetailServices.GetSpaceDetailsBySpaceCode(storeCode, info).Result; + + RefreshSpaceDetails(list); + } + /// + /// 刷新货道明细列表 + /// + /// + private void RefreshSpaceDetails(List spaceDetails) + { + SpaceDetailDataGrid = new ObservableCollection(); + if (spaceDetails != null) + { + spaceDetails.ForEach( + arg => + { + SpaceDetailDataGrid.Add(arg); + }); + } + } + private ObservableCollection spaceDetailDataGrid; + + public ObservableCollection SpaceDetailDataGrid + { + get => spaceDetailDataGrid; + set => SetProperty(ref spaceDetailDataGrid, value); } #endregion diff --git a/Aucma.Core.BoxFoam/ViewModels/FoamMachinesPageViewModel.cs b/Aucma.Core.BoxFoam/ViewModels/FoamMachinesPageViewModel.cs index 399758d0..d4a52429 100644 --- a/Aucma.Core.BoxFoam/ViewModels/FoamMachinesPageViewModel.cs +++ b/Aucma.Core.BoxFoam/ViewModels/FoamMachinesPageViewModel.cs @@ -43,6 +43,8 @@ namespace Aucma.Core.BoxFoam.ViewModels { No = i, System = system, + GunHead=item.GunHead, + StationNumber=item.StationNumber, PolInjectionpressure = item.PolInjectionpressure, IsoInjectionpressure = item.IsoInjectionpressure, PolInjectiontemperature = item.PolInjectiontemperature, @@ -240,6 +242,15 @@ namespace Aucma.Core.BoxFoam.ViewModels set => SetProperty(ref _ISOPressure1, value); } /// + /// 压力 + /// + private string _ISOPressure11 = "0.00"; + public string ISOPressure11 + { + get => _ISOPressure11; + set => SetProperty(ref _ISOPressure11, value); + } + /// /// 温度 /// private string _ISOTemperature11 = "0.0"; @@ -409,7 +420,7 @@ namespace Aucma.Core.BoxFoam.ViewModels set => SetProperty(ref _ISOPressure2, value); } /// - /// B枪温度 + ///A枪温度 /// private string _ISOTemperature22 = "0.0"; public string ISOTemperature22 @@ -417,7 +428,15 @@ namespace Aucma.Core.BoxFoam.ViewModels get => _ISOTemperature22; set => SetProperty(ref _ISOTemperature22, value); } - + /// + /// B枪温度 + /// + private string _ISOTemperature222 = "0.0"; + public string ISOTemperature222 + { + get => _ISOTemperature222; + set => SetProperty(ref _ISOTemperature222, value); + } /// /// B枪温度 /// diff --git a/Aucma.Core.BoxFoam/ViewModels/LinerInventoryViewModel.cs b/Aucma.Core.BoxFoam/ViewModels/LinerInventoryViewModel.cs index 9fb5b8c8..44f8f906 100644 --- a/Aucma.Core.BoxFoam/ViewModels/LinerInventoryViewModel.cs +++ b/Aucma.Core.BoxFoam/ViewModels/LinerInventoryViewModel.cs @@ -3,6 +3,7 @@ using Admin.Core.IService; using Admin.Core.Model; using Admin.Core.Model.ViewModels; using Admin.Core.Service; +using Aucma.Core.BoxFoam.Models; using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; using Microsoft.Extensions.DependencyInjection; @@ -17,24 +18,44 @@ namespace Aucma.Core.BoxFoam.ViewModels { public partial class LinerInventoryViewModel : ObservableObject { - private IBaseSpaceInfoServices _spaceInfoService; + private IBaseSpaceInfoServices _baseSpaceInfoServices; private IBaseSpaceDetailServices _spaceDetailService; public LinerInventoryViewModel() { - _spaceInfoService = App.ServiceProvider.GetService(); + _baseSpaceInfoServices = App.ServiceProvider.GetService(); _spaceDetailService = App.ServiceProvider.GetService(); Query(); } - private async void Query() + private void Query() { var storeCode = Appsettings.app("StoreInfo", "LinerInventory"); - List info = await _spaceInfoService.QueryAsync(d => d.StoreCode.Equals(storeCode)); - if (info != null) + var baseSpaceInfolist = _baseSpaceInfoServices.QueryAsync(d => d.StoreCode.Equals(storeCode)).Result;//仓库 + if (baseSpaceInfolist == null) return; + + foreach (var item in baseSpaceInfolist) { - foreach (BaseSpaceInfo info2 in info) + SpaceInfoModel model = new SpaceInfoModel(); + model.spaceCode = item.SpaceCode; + model.spaceStock = item.SpaceStock; + model.onTheWay = item.OnRouteAmount; + model.totalAmount = item.SpaceStock + item.OnRouteAmount; + model.materialType = item.MaterialType; + model.unusualFlag = item.UnusualFlag == 2 ? "Red" : "White"; + if (item.SpaceStatus == 2) + { + model.setEnable = "False"; + model.inStoreFlag = "Red";//item.inStoreFlag == 2 ? "Red" : "White"; + model.isFlag = "Red"; + } + else { - shapes.Add(info2); + model.isFlag = item.IsFlag.ToString(); //禁用状态 } + + model.onlyOne = 1; + model.spaceType = item.SpaceType; + + Shapes.Add(model); } } /// @@ -42,11 +63,10 @@ namespace Aucma.Core.BoxFoam.ViewModels /// /// [RelayCommand] - private async void SpaceDetail(object obj) + private void SpaceDetail(string info) { - string info = obj as string; var storeCode = Appsettings.app("StoreInfo", "LinerInventory");//内胆库号 - List list =await _spaceDetailService.GetSpaceDetailsBySpaceCode(storeCode, info); + List list = _spaceDetailService.GetSpaceDetailsBySpaceCode(storeCode, info).Result; RefreshSpaceDetails(list); } @@ -68,15 +88,11 @@ namespace Aucma.Core.BoxFoam.ViewModels } #region 初始化datagrid - private ObservableCollection shapes = new ObservableCollection(); - public ObservableCollection Shapes + private ObservableCollection _shapes = new ObservableCollection(); + public ObservableCollection Shapes { - get { return shapes; } - set - { - shapes = value; - OnPropertyChanged();//属性通知 - } + get => _shapes; + set => SetProperty(ref _shapes, value); } #endregion @@ -85,12 +101,8 @@ namespace Aucma.Core.BoxFoam.ViewModels public ObservableCollection SpaceDetailDataGrid { - get { return spaceDetailDataGrid; } - set - { - spaceDetailDataGrid = value; - OnPropertyChanged();//属性通知 - } + get => spaceDetailDataGrid; + set => SetProperty(ref spaceDetailDataGrid, value); } } } diff --git a/Aucma.Core.BoxFoam/ViewModels/MainWindowViewModel.cs b/Aucma.Core.BoxFoam/ViewModels/MainWindowViewModel.cs index 04a030b5..407b51fa 100644 --- a/Aucma.Core.BoxFoam/ViewModels/MainWindowViewModel.cs +++ b/Aucma.Core.BoxFoam/ViewModels/MainWindowViewModel.cs @@ -272,13 +272,13 @@ namespace Aucma.Core.BoxFoam.ViewModels { if (type) { - MesDbUIStatusWb = "MES数据库连接成功"; + MesDbUIStatusWb = "MES数据库"; MesDbUIColor = "Green"; MesUIIcon = "Assets/Images/Green.png"; } else { - MesDbUIStatusWb = "MES数据库异常"; + MesDbUIStatusWb = "MES数据库"; MesDbUIColor = "Red"; MesUIIcon = "Assets/Images/Red.png"; } @@ -325,13 +325,13 @@ namespace Aucma.Core.BoxFoam.ViewModels { if (type) { - PlcUIStatusWb = "PLC连接成功"; + PlcUIStatusWb = "PLC"; PlcUIColor = "Green"; PlcUIIcon = "Assets/Images/Green.png"; } else { - PlcUIStatusWb = "PLC状态异常"; + PlcUIStatusWb = "PLC"; PlcUIColor = "Red"; PlcUIIcon = "Assets/Images/Red.png"; } @@ -384,13 +384,13 @@ namespace Aucma.Core.BoxFoam.ViewModels { if (type) { - Scanner1UIStatusWb = "扫码器1连接成功"; + Scanner1UIStatusWb = "扫码器"; Scanner1UIColor = "Green"; Scanner1UIIcon = "Assets/Images/Green.png"; } else { - Scanner1UIStatusWb = "扫码器1状态异常"; + Scanner1UIStatusWb = "扫码器"; Scanner1UIColor = "Red"; Scanner1UIIcon = "Assets/Images/Red.png"; } diff --git a/Aucma.Core.BoxFoam/ViewModels/OldBoxFoamPageViewModel.cs b/Aucma.Core.BoxFoam/ViewModels/OldBoxFoamPageViewModel.cs index 33b21fe6..e9cfb3d9 100644 --- a/Aucma.Core.BoxFoam/ViewModels/OldBoxFoamPageViewModel.cs +++ b/Aucma.Core.BoxFoam/ViewModels/OldBoxFoamPageViewModel.cs @@ -2,6 +2,7 @@ using Admin.Core.Model; using Admin.Core.Model.ViewModels; using Admin.Core.Service; +using Admin.Core.Tasks; using Aucma.Core.BoxFoam.Models; using CommunityToolkit.Mvvm.ComponentModel; using Microsoft.Extensions.DependencyInjection; @@ -19,18 +20,26 @@ namespace Aucma.Core.BoxFoam.ViewModels public partial class OldBoxFoamPageViewModel : ObservableObject { IOldBoxFoamDataServices? _oldBoxFoamDataServices; + IOldBoxFoamTypeServices _oldBoxFoamTypeServices; public OldBoxFoamPageViewModel() { _oldBoxFoamDataServices = App.ServiceProvider.GetService(); - OnLoad(); + _oldBoxFoamTypeServices = App.ServiceProvider.GetService(); + + Job_OldBoxFoamType_Quartz.RefreshOldBoxFoamTypeDataDelegateEvent += OldBoxFoamTypeOnLoad; + + OldBoxFoamOnLoad(); + OldBoxFoamTypeOnLoad(); } - public async void OnLoad() + #region 初始化加载数据 + + public async Task OldBoxFoamOnLoad() { List list = await _oldBoxFoamDataServices.QueryAsync(); if (list == null) return; foreach (var item in list) { - OldBoxFoamDataModel model=new OldBoxFoamDataModel(); + OldBoxFoamDataModel model = new OldBoxFoamDataModel(); model.ObjId = item.ObjId; model.Fixtureboxtype = item.Fixtureboxtype; model.Fixturestatus = item.Fixturestatus; @@ -41,8 +50,23 @@ namespace Aucma.Core.BoxFoam.ViewModels OldBoxFoamDataGrid.Add(model); } } + public async Task OldBoxFoamTypeOnLoad() + { + var list =await _oldBoxFoamTypeServices.QueryAsync(); + if (list == null) return; + foreach (var item in list) + { + OldBoxFoamTypeModel model = new OldBoxFoamTypeModel(); + model.ObjId = item.ObjId; + model.Local = item.Local; + model.Boxtype = item.Boxtype; + model.Storeamount = item.Storeamount; + OldBoxFoamTypeDataGrid.Add(model); + } + } + #endregion - #region 初始化datagrid + #region 初始化发泡线 datagrid private ObservableCollection oldBoxFoamDataGrid = new ObservableCollection(); public ObservableCollection OldBoxFoamDataGrid { @@ -54,5 +78,18 @@ namespace Aucma.Core.BoxFoam.ViewModels } } #endregion + + #region 初始化泡前库 datagrid + private ObservableCollection oldBoxFoamTypeDataGrid = new ObservableCollection(); + public ObservableCollection OldBoxFoamTypeDataGrid + { + get { return oldBoxFoamTypeDataGrid; } + set + { + oldBoxFoamTypeDataGrid = value; + OnPropertyChanged();//属性通知 + } + } + #endregion } } diff --git a/Aucma.Core.BoxFoam/ViewModels/ShellInventoryViewModel.cs b/Aucma.Core.BoxFoam/ViewModels/ShellInventoryViewModel.cs index 6f75f698..36aff552 100644 --- a/Aucma.Core.BoxFoam/ViewModels/ShellInventoryViewModel.cs +++ b/Aucma.Core.BoxFoam/ViewModels/ShellInventoryViewModel.cs @@ -1,6 +1,8 @@ using Admin.Core.Common; using Admin.Core.IService; using Admin.Core.Model; +using Admin.Core.Service; +using Aucma.Core.BoxFoam.Models; using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; using Microsoft.Extensions.DependencyInjection; @@ -15,29 +17,45 @@ namespace Aucma.Core.BoxFoam.ViewModels { public partial class ShellInventoryViewModel : ObservableObject { - private IBaseSpaceInfoServices _spaceInfoService; + private IBaseSpaceInfoServices _baseSpaceInfoServices; private IBaseSpaceDetailServices _spaceDetailService; public ShellInventoryViewModel() { - _spaceInfoService = App.ServiceProvider.GetService(); + _baseSpaceInfoServices = App.ServiceProvider.GetService(); _spaceDetailService = App.ServiceProvider.GetService(); - Task.WaitAll(Query()); + OnLoad(); } - private async Task Query() + private void OnLoad() { - var storeCode = Appsettings.app("StoreInfo", "StoreCode"); - List info = await _spaceInfoService.QueryAsync(d => d.StoreCode.Equals(storeCode)); - if (info != null) + var storeCode = Appsettings.app("StoreInfo", "ShellInventoryStoreCode"); + var baseSpaceInfolist = _baseSpaceInfoServices.QueryAsync(d => d.StoreCode.Equals(storeCode)).Result;//仓库 + if (baseSpaceInfolist == null) return; + + foreach (var item in baseSpaceInfolist) { - if (shapes.Count > 0) + SpaceInfoModel model = new SpaceInfoModel(); + model.spaceCode = item.SpaceCode; + model.spaceStock = item.SpaceStock; + model.onTheWay = item.OnRouteAmount; + model.totalAmount = item.SpaceStock + item.OnRouteAmount; + model.materialType = item.MaterialType; + model.unusualFlag = item.UnusualFlag == 2 ? "Red" : "White"; + if (item.SpaceStatus == 2) { - shapes.Clear(); + model.setEnable = "False"; + model.inStoreFlag = "Red";//item.inStoreFlag == 2 ? "Red" : "White"; + model.isFlag = "Red"; } - foreach (BaseSpaceInfo info2 in info) + else { - shapes.Add(info2); + model.isFlag = item.IsFlag.ToString(); //禁用状态 } + + model.onlyOne = 1; + model.spaceType = item.SpaceType; + + Shapes.Add(model); } } /// @@ -45,11 +63,10 @@ namespace Aucma.Core.BoxFoam.ViewModels /// /// [RelayCommand] - private async void SpaceDetail(object obj) + private void SpaceDetail(string info) { - string info = obj as string; - var storeCode = Appsettings.app("StoreInfo", "StoreCode"); - List list = await _spaceDetailService.GetSpaceDetailsBySpaceCode(storeCode, info); + var storeCode = Appsettings.app("StoreInfo", "ShellInventoryStoreCode"); + List list = _spaceDetailService.GetSpaceDetailsBySpaceCode(storeCode, info).Result; RefreshSpaceDetails(list); } @@ -71,15 +88,11 @@ namespace Aucma.Core.BoxFoam.ViewModels } #region 初始化datagrid - private ObservableCollection shapes = new ObservableCollection(); - public ObservableCollection Shapes + private ObservableCollection _shapes = new ObservableCollection(); + public ObservableCollection Shapes { - get { return shapes; } - set - { - shapes = value; - OnPropertyChanged();//属性通知 - } + get => _shapes; + set => SetProperty(ref _shapes, value); } #endregion @@ -88,12 +101,8 @@ namespace Aucma.Core.BoxFoam.ViewModels public ObservableCollection SpaceDetailDataGrid { - get { return spaceDetailDataGrid; } - set - { - spaceDetailDataGrid = value; - OnPropertyChanged();//属性通知 - } + get => spaceDetailDataGrid; + set => SetProperty(ref spaceDetailDataGrid, value); } } } diff --git a/Aucma.Core.BoxFoam/Views/FoamMachinesPageView.xaml b/Aucma.Core.BoxFoam/Views/FoamMachinesPageView.xaml index 73beba52..86a317b9 100644 --- a/Aucma.Core.BoxFoam/Views/FoamMachinesPageView.xaml +++ b/Aucma.Core.BoxFoam/Views/FoamMachinesPageView.xaml @@ -104,7 +104,7 @@ - + @@ -147,11 +147,11 @@ - + - + @@ -160,11 +160,11 @@ - + - + @@ -172,11 +172,11 @@ - + - + @@ -184,24 +184,24 @@ - + - - + + - + - - + + @@ -211,7 +211,7 @@ - + @@ -219,7 +219,7 @@ - + @@ -236,21 +236,21 @@ - + - + - + - + @@ -258,11 +258,11 @@ - + - + @@ -270,22 +270,22 @@ - + - + - + - + @@ -300,7 +300,7 @@ - + @@ -343,11 +343,11 @@ - + - + @@ -356,11 +356,11 @@ - + - + @@ -368,11 +368,11 @@ - + - + @@ -380,11 +380,11 @@ - + - + @@ -392,11 +392,11 @@ - + - + @@ -407,7 +407,7 @@ - + @@ -415,7 +415,7 @@ - + @@ -446,11 +446,11 @@ - + - + @@ -458,11 +458,11 @@ - + - + @@ -470,11 +470,11 @@ - + - + @@ -482,11 +482,11 @@ - + - + @@ -514,11 +514,13 @@ - - - + + + + + - + diff --git a/Aucma.Core.BoxFoam/Views/FoamMonitorPageView.xaml b/Aucma.Core.BoxFoam/Views/FoamMonitorPageView.xaml index 7dff1d00..9aa069f2 100644 --- a/Aucma.Core.BoxFoam/Views/FoamMonitorPageView.xaml +++ b/Aucma.Core.BoxFoam/Views/FoamMonitorPageView.xaml @@ -57,15 +57,13 @@ - - + - - + @@ -158,71 +156,51 @@ - + - - - - - - - - - - - - - - - - - - - - - + - + - + - + - + - + - + - + @@ -230,182 +208,161 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - + - + - + @@ -413,25 +370,25 @@ - + - + - + - + - + - + - + diff --git a/Aucma.Core.BoxFoam/Views/MainWindow.xaml b/Aucma.Core.BoxFoam/Views/MainWindow.xaml index 71e40958..899cfc34 100644 --- a/Aucma.Core.BoxFoam/Views/MainWindow.xaml +++ b/Aucma.Core.BoxFoam/Views/MainWindow.xaml @@ -61,19 +61,19 @@ -