diff --git a/Admin.Core.Api/Admin.Core.Model.xml b/Admin.Core.Api/Admin.Core.Model.xml index 0eeff5a8..b279f413 100644 --- a/Admin.Core.Api/Admin.Core.Model.xml +++ b/Admin.Core.Api/Admin.Core.Model.xml @@ -451,6 +451,61 @@ 接收从条码系统获取的校验字符串 + + + 箱体发泡数据 + + + + + 主键标识 + + + + + 夹具类型 + + + + + 夹具状态;1正常生产、0暂停生产 + + + + + 夹具产量 + + + + + 侧板温度 + + + + + 内模温度 + + + + + 节拍 + + + + + 发泡量 + + + + + 创建时间 + + + + + 创建时间 + + 物料完成记录 @@ -1061,6 +1116,51 @@ 创建时间 + + + 获取发泡机最后一枪记录 + + + + + 主键 + + + + + 所属系统;1系统 2系统 + + + + + POL注料压力 + + + + + ISO注料压力 + + + + + POL注料温度 + + + + + ISO注料温度 + + + + + 最后一次时间 + + + + + 创建时间 + + 条码绑定记录 diff --git a/Admin.Core.IRepository/IRepository_New/IBoxFoamDataRepository.cs b/Admin.Core.IRepository/IRepository_New/IBoxFoamDataRepository.cs new file mode 100644 index 00000000..57b37562 --- /dev/null +++ b/Admin.Core.IRepository/IRepository_New/IBoxFoamDataRepository.cs @@ -0,0 +1,12 @@ +using Admin.Core.Model; +using Admin.Core.Model.Model_New; + +namespace Admin.Core.IRepository +{ + /// + /// IBoxFoamDataRepository + /// + public interface IBoxFoamDataRepository : IBaseRepository + { + } +} \ No newline at end of file diff --git a/Admin.Core.IRepository/IRepository_New/IBoxLastShotRecordRepository.cs b/Admin.Core.IRepository/IRepository_New/IBoxLastShotRecordRepository.cs new file mode 100644 index 00000000..84c5a595 --- /dev/null +++ b/Admin.Core.IRepository/IRepository_New/IBoxLastShotRecordRepository.cs @@ -0,0 +1,11 @@ +using Admin.Core.Model; + +namespace Admin.Core.IRepository +{ + /// + /// IBoxLastShotRecordRepository + /// + public interface IBoxLastShotRecordRepository : IBaseRepository + { + } +} \ No newline at end of file diff --git a/Admin.Core.IService/IService_New/IBoxFoamDataServices.cs b/Admin.Core.IService/IService_New/IBoxFoamDataServices.cs new file mode 100644 index 00000000..d49c9fc3 --- /dev/null +++ b/Admin.Core.IService/IService_New/IBoxFoamDataServices.cs @@ -0,0 +1,15 @@ +using Admin.Core.IService; +using Admin.Core.Model; +using Admin.Core.Model.Model_New; +using System.Collections.Generic; +using System.Threading.Tasks; + +namespace Admin.Core.IService +{ + /// + /// IBoxFoamDataServices + /// + public interface IBoxFoamDataServices : IBaseServices + { + } +} \ No newline at end of file diff --git a/Admin.Core.IService/IService_New/IBoxLastShotRecordServices.cs b/Admin.Core.IService/IService_New/IBoxLastShotRecordServices.cs new file mode 100644 index 00000000..7c6a102a --- /dev/null +++ b/Admin.Core.IService/IService_New/IBoxLastShotRecordServices.cs @@ -0,0 +1,14 @@ +using Admin.Core.IService; +using Admin.Core.Model; +using System.Collections.Generic; +using System.Threading.Tasks; + +namespace Admin.Core.IService +{ + /// + /// IBoxLastShotRecordServices + /// + public interface IBoxLastShotRecordServices : IBaseServices + { + } +} \ No newline at end of file diff --git a/Admin.Core.Model/Model_New/BoxFoamData.cs b/Admin.Core.Model/Model_New/BoxFoamData.cs new file mode 100644 index 00000000..b994bcf6 --- /dev/null +++ b/Admin.Core.Model/Model_New/BoxFoamData.cs @@ -0,0 +1,73 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Admin.Core.Model.Model_New +{ + /// + /// 箱体发泡数据 + /// + [SugarTable("BOX_FOAMDATA", "AUCMA_SCADA")] + public class BoxFoamData + { + /// + /// 主键标识 + /// + [SugarColumn(ColumnName = "OBJ_ID", IsPrimaryKey = true)] + public int ObjId { get; set; } + + /// + /// 夹具类型 + /// + [SugarColumn(ColumnName = "BOX_FIXTURETYPE")] + public string BoxFixturetype { get; set; } + + /// + /// 夹具状态;1正常生产、0暂停生产 + /// + [SugarColumn(ColumnName = "BOX_FIXTURESTATUS")] + public int BoxFixturestatus { get; set; } + + /// + /// 夹具产量 + /// + [SugarColumn(ColumnName = "BOX_FIXTUREPRODUCTION")] + public int BoxFixtureproduction { get; set; } + + /// + /// 侧板温度 + /// + [SugarColumn(ColumnName = "BOX_FIXTURESIDEPLATE")] + public string BoxFixturesideplate { get; set; } + + /// + /// 内模温度 + /// + [SugarColumn(ColumnName = "BOX_CLOSEBETATEMPERATURE")] + public string BoxClosebetatemperature { get; set; } + + /// + /// 节拍 + /// + [SugarColumn(ColumnName = "BOX_BEAT")] + public int BoxBeat { get; set; } + /// + ///发泡量 + /// + [SugarColumn(ColumnName = "BOX_BEAT")] + public int FoamVolume { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "CREATETIME")] + public DateTime Createtime { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "CREATETIME")] + public DateTime UpdateTime { get; set; } + } +} diff --git a/Admin.Core.Model/Model_New/BoxLastShotRecord.cs b/Admin.Core.Model/Model_New/BoxLastShotRecord.cs new file mode 100644 index 00000000..f63293f6 --- /dev/null +++ b/Admin.Core.Model/Model_New/BoxLastShotRecord.cs @@ -0,0 +1,64 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Admin.Core.Model +{ + /// + /// 获取发泡机最后一枪记录 + /// + [SugarTable("BOX_LASTSHOTRECORD", "AUCMA_SCADA")] + public class BoxLastShotRecord + { + /// + /// 主键 + /// + [SugarColumn(ColumnName = "OBJ_ID", IsIdentity = true, IsPrimaryKey = true)] + public float ObjId { get; set; } + + /// + /// 所属系统;1系统 2系统 + /// + [SugarColumn(ColumnName = "SYSTEM")] + public string System { get; set; } + + /// + /// POL注料压力 + /// + [SugarColumn(ColumnName = "POL_INJECTIONPRESSURE")] + public string PolInjectionpressure { get; set; } + + /// + /// ISO注料压力 + /// + [SugarColumn(ColumnName = "ISO_INJECTIONPRESSURE")] + public string IsoInjectionpressure { get; set; } + + /// + /// POL注料温度 + /// + [SugarColumn(ColumnName = "POL_INJECTIONTEMPERATURE")] + public string PolInjectiontemperature { get; set; } + + /// + /// ISO注料温度 + /// + [SugarColumn(ColumnName = "ISO_INJECTIONTEMPERATURE")] + public string IsoInjectiontemperature { get; set; } + + /// + /// 最后一次时间 + /// + [SugarColumn(ColumnName = "LAST_TIME")] + public DateTime LastTime { get; set; } + + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "CREATETIME")] + public DateTime Createtime { get; set; } + } +} diff --git a/Admin.Core.Repository/Repository_New/BoxFoamDataRepository.cs b/Admin.Core.Repository/Repository_New/BoxFoamDataRepository.cs new file mode 100644 index 00000000..7080d0e8 --- /dev/null +++ b/Admin.Core.Repository/Repository_New/BoxFoamDataRepository.cs @@ -0,0 +1,16 @@ +using Admin.Core.IRepository; +using Admin.Core.Model; +using Admin.Core.Model.Model_New; + +namespace Admin.Core.Repository +{ + /// + /// BoxFoamDataRepository + /// + public class BoxFoamDataRepository : BaseRepository, IBoxFoamDataRepository + { + public BoxFoamDataRepository(IUnitOfWork unitOfWork) : base(unitOfWork) + { + } + } +} \ No newline at end of file diff --git a/Admin.Core.Repository/Repository_New/BoxLastShotRecordRepository.cs b/Admin.Core.Repository/Repository_New/BoxLastShotRecordRepository.cs new file mode 100644 index 00000000..474182ec --- /dev/null +++ b/Admin.Core.Repository/Repository_New/BoxLastShotRecordRepository.cs @@ -0,0 +1,15 @@ +using Admin.Core.IRepository; +using Admin.Core.Model; + +namespace Admin.Core.Repository +{ + /// + /// BoxLastShotRecordRepository + /// + public class BoxLastShotRecordRepository : BaseRepository, IBoxLastShotRecordRepository + { + public BoxLastShotRecordRepository(IUnitOfWork unitOfWork) : base(unitOfWork) + { + } + } +} \ No newline at end of file diff --git a/Admin.Core.Service/Service_New/BoxFoamDataServices.cs b/Admin.Core.Service/Service_New/BoxFoamDataServices.cs new file mode 100644 index 00000000..716ed288 --- /dev/null +++ b/Admin.Core.Service/Service_New/BoxFoamDataServices.cs @@ -0,0 +1,16 @@ +using Admin.Core.IRepository; +using Admin.Core.IService; +using Admin.Core.Model.Model_New; +using log4net; +namespace Admin.Core.Service +{ + public class BoxFoamDataServices : BaseServices, IBoxFoamDataServices + { + private readonly IBaseRepository _dal; + public BoxFoamDataServices(IBaseRepository dal) + { + this._dal = dal; + base.BaseDal = dal; + } + } +} \ No newline at end of file diff --git a/Admin.Core.Service/Service_New/BoxLastShotRecordServices.cs b/Admin.Core.Service/Service_New/BoxLastShotRecordServices.cs new file mode 100644 index 00000000..cbf4eb0a --- /dev/null +++ b/Admin.Core.Service/Service_New/BoxLastShotRecordServices.cs @@ -0,0 +1,24 @@ +using Admin.Core.IRepository; +using Admin.Core.IService; +using Admin.Core.Model; +using Admin.Core.Model.Model_New; +using log4net; +using Microsoft.AspNetCore.Razor.TagHelpers; +using Microsoft.IdentityModel.Logging; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace Admin.Core.Service +{ + public class BoxLastShotRecordServices : BaseServices, IBoxLastShotRecordServices + { + private readonly IBaseRepository _dal; + public BoxLastShotRecordServices(IBaseRepository dal) + { + this._dal = dal; + base.BaseDal = dal; + } + } +} \ No newline at end of file diff --git a/Admin.Core.Tasks/QuartzNet/Jobs/Job_BoxFoamData_Quartz.cs b/Admin.Core.Tasks/QuartzNet/Jobs/Job_BoxFoamData_Quartz.cs new file mode 100644 index 00000000..05309383 --- /dev/null +++ b/Admin.Core.Tasks/QuartzNet/Jobs/Job_BoxFoamData_Quartz.cs @@ -0,0 +1,233 @@ +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_BoxFoamData_Quartz : JobBase, IJob + { + public delegate Task RefreshBoxFoamDataDelegate(); + public static event RefreshBoxFoamDataDelegate RefreshBoxFoamDataDelegateEvent; + + private static readonly log4net.ILog logHelper = LogManager.GetLogger(typeof(Job_BoxFoamData_Quartz)); + private readonly IBoxFoamDataServices _boxFoamDataServices; + + public Job_BoxFoamData_Quartz(ISysTasksQzService SysTasksQzService, ISysJobLogService sysJobLogService, + IBoxFoamDataServices boxFoamDataServices) + { + _SysTasksQzService = SysTasksQzService; + _boxFoamDataServices= boxFoamDataServices; + } + + public async Task Execute(IJobExecutionContext context) + { + await ExecuteJob(context, async () => await Run(context)); + } + public async Task Run(IJobExecutionContext context) + { + await SaveData(); + } + + #region PLC 任务处理表 + /// + /// PLC 任务处理表 + /// + /// 仓库编码 + /// 物料编码 + /// + public async Task SaveData() + { + //扫描入库信号,入库完成 + try + { + var obj = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("发泡Plc")); + if (obj.plc.IsConnected) + { + var taskList = await _boxFoamDataServices.QueryAsync(); + foreach (var item in taskList) + { + await UpdateRealData(obj, item); + } + } + } + catch (Exception ex) + { + logHelper.Error($"入库数据处理异常:{ex.Message}"); + } + } + + private async Task UpdateRealData(PlcModel obj, BoxFoamData item) + { + + try + { + #region 更新PLC数据 + if (item.ObjId == 1) + { + item.BoxFixturetype = obj.plc.ReadString("DB8.DBX2.0"); + if (obj.plc.ReadInt16("DB8.DBW122.0") == 1) item.BoxFixturestatus = 1; + if (obj.plc.ReadInt16("DB8.DBW122.1") == 1) item.BoxFixturestatus = 0; + item.BoxFixtureproduction = obj.plc.ReadInt16("DB8.DBD146"); + item.BoxFixturesideplate = obj.plc.ReadString("DB8.DBD294"); + item.BoxClosebetatemperature = obj.plc.ReadString("DB8.DBD310"); + item.BoxBeat = obj.plc.ReadInt16("DB8.DBD578"); + item.UpdateTime = DateTime.Now; + } + if (item.ObjId == 2) + { + item.BoxFixturetype = obj.plc.ReadString("DB8.DBX12.0"); + if (obj.plc.ReadInt16("DB8.DBW124.0") == 1) item.BoxFixturestatus = 1; + if (obj.plc.ReadInt16("DB8.DBW124.1") == 1) item.BoxFixturestatus = 0; + item.BoxFixtureproduction = obj.plc.ReadInt16("DB8.DBD150"); + item.BoxFixturesideplate = obj.plc.ReadString("DB8.DBD318"); + item.BoxClosebetatemperature = obj.plc.ReadString("DB8.DBD334"); + item.BoxBeat = obj.plc.ReadInt16("DB8.DBD582"); + item.UpdateTime = DateTime.Now; + } + if (item.ObjId == 3) + { + item.BoxFixturetype = obj.plc.ReadString("DB8.DBX2.0"); + if (obj.plc.ReadInt16("DB8.DBW126.0") == 1) item.BoxFixturestatus = 1; + if (obj.plc.ReadInt16("DB8.DBW126.1") == 1) item.BoxFixturestatus = 0; + item.BoxFixtureproduction = obj.plc.ReadInt16("DB8.DBD154"); + item.BoxFixturesideplate = obj.plc.ReadString("DB8.DBD342"); + item.BoxClosebetatemperature = obj.plc.ReadString("DB8.DBD358"); + item.BoxBeat = obj.plc.ReadInt16("DB8.DBD586"); + item.UpdateTime = DateTime.Now; + } + if (item.ObjId == 4) + { + item.BoxFixturetype = obj.plc.ReadString("DB8.DBX2.0"); + if (obj.plc.ReadInt16("DB8.DBW128.0") == 1) item.BoxFixturestatus = 1; + if (obj.plc.ReadInt16("DB8.DBW128.1") == 1) item.BoxFixturestatus = 0; + item.BoxFixtureproduction = obj.plc.ReadInt16("DB8.DBD158"); + item.BoxFixturesideplate = obj.plc.ReadString("DB8.DBD366"); + item.BoxClosebetatemperature = obj.plc.ReadString("DB8.DBD382"); + item.BoxBeat = obj.plc.ReadInt16("DB8.DBD590"); + item.UpdateTime = DateTime.Now; + } + if (item.ObjId == 5) + { + item.BoxFixturetype = obj.plc.ReadString("DB8.DBX2.0"); + if (obj.plc.ReadInt16("DB8.DBW130.0") == 1) item.BoxFixturestatus = 1; + if (obj.plc.ReadInt16("DB8.DBW130.1") == 1) item.BoxFixturestatus = 0; + item.BoxFixtureproduction = obj.plc.ReadInt16("DB8.DBD162"); + item.BoxFixturesideplate = obj.plc.ReadString("DB8.DBD390"); + item.BoxClosebetatemperature = obj.plc.ReadString("DB8.DBD406"); + item.BoxBeat = obj.plc.ReadInt16("DB8.DBD594"); + item.UpdateTime = DateTime.Now; + } + if (item.ObjId == 6) + { + item.BoxFixturetype = obj.plc.ReadString("DB8.DBX2.0"); + if (obj.plc.ReadInt16("DB8.DBW122.0") == 1) item.BoxFixturestatus = 1; + if (obj.plc.ReadInt16("DB8.DBW122.1") == 1) item.BoxFixturestatus = 0; + item.BoxFixtureproduction = obj.plc.ReadInt16("DB8.DBD166"); + item.BoxFixturesideplate = obj.plc.ReadString("DB8.DBD414"); + item.BoxClosebetatemperature = obj.plc.ReadString("DB8.DBD430"); + item.BoxBeat = obj.plc.ReadInt16("DB8.DBD598"); + item.UpdateTime = DateTime.Now; + } + if (item.ObjId == 7) + { + item.BoxFixturetype = obj.plc.ReadString("DB8.DBX2.0"); + if (obj.plc.ReadInt16("DB8.DBW134.0") == 1) item.BoxFixturestatus = 1; + if (obj.plc.ReadInt16("DB8.DBW134.1") == 1) item.BoxFixturestatus = 0; + item.BoxFixtureproduction = obj.plc.ReadInt16("DB8.DBD170"); + item.BoxFixturesideplate = obj.plc.ReadString("DB8.DBD438"); + item.BoxClosebetatemperature = obj.plc.ReadString("DB8.DBD454"); + item.BoxBeat = obj.plc.ReadInt16("DB8.DBD602"); + item.UpdateTime = DateTime.Now; + } + if (item.ObjId == 8) + { + item.BoxFixturetype = obj.plc.ReadString("DB8.DBX2.0"); + if (obj.plc.ReadInt16("DB8.DBW136.0") == 1) item.BoxFixturestatus = 1; + if (obj.plc.ReadInt16("DB8.DBW136.1") == 1) item.BoxFixturestatus = 0; + item.BoxFixtureproduction = obj.plc.ReadInt16("DB8.DBD174"); + item.BoxFixturesideplate = obj.plc.ReadString("DB8.DBD462"); + item.BoxClosebetatemperature = obj.plc.ReadString("DB8.DBD478"); + item.BoxBeat = obj.plc.ReadInt16("DB8.DBD606"); + item.UpdateTime = DateTime.Now; + } + if (item.ObjId == 9) + { + item.BoxFixturetype = obj.plc.ReadString("DB8.DBX2.0"); + if (obj.plc.ReadInt16("DB8.DBW138.0") == 1) item.BoxFixturestatus = 1; + if (obj.plc.ReadInt16("DB8.DBW138.1") == 1) item.BoxFixturestatus = 0; + item.BoxFixtureproduction = obj.plc.ReadInt16("DB8.DBD178"); + item.BoxFixturesideplate = obj.plc.ReadString("DB8.DBD486"); + item.BoxClosebetatemperature = obj.plc.ReadString("DB8.DBD502"); + item.BoxBeat = obj.plc.ReadInt16("DB8.DBD610"); + item.UpdateTime = DateTime.Now; + } + if (item.ObjId == 10) + { + item.BoxFixturetype = obj.plc.ReadString("DB8.DBX2.0"); + if (obj.plc.ReadInt16("DB8.DBW140.0") == 1) item.BoxFixturestatus = 1; + if (obj.plc.ReadInt16("DB8.DBW140.1") == 1) item.BoxFixturestatus = 0; + item.BoxFixtureproduction = obj.plc.ReadInt16("DB8.DBD182"); + item.BoxFixturesideplate = obj.plc.ReadString("DB8.DBD510"); + item.BoxClosebetatemperature = obj.plc.ReadString("DB8.DBD526"); + item.BoxBeat = obj.plc.ReadInt16("DB8.DBD614"); + item.UpdateTime = DateTime.Now; + } + if (item.ObjId == 11) + { + item.BoxFixturetype = obj.plc.ReadString("DB8.DBX2.0"); + if (obj.plc.ReadInt16("DDB8.DBW142.0") == 1) item.BoxFixturestatus = 1; + if (obj.plc.ReadInt16("DB8.DBW142.1") == 1) item.BoxFixturestatus = 0; + item.BoxFixtureproduction = obj.plc.ReadInt16("DB8.DBD186"); + item.BoxFixturesideplate = obj.plc.ReadString("DB8.DBD534"); + item.BoxClosebetatemperature = obj.plc.ReadString("DB8.DBD550"); + item.BoxBeat = obj.plc.ReadInt16("DB8.DBD622"); + item.UpdateTime = DateTime.Now; + } + if (item.ObjId == 12) + { + item.BoxFixturetype = obj.plc.ReadString("DB8.DBX2.0"); + if (obj.plc.ReadInt16("DB8.DBW144.0") == 1) item.BoxFixturestatus = 1; + if (obj.plc.ReadInt16("DB8.DBW144.1") == 1) item.BoxFixturestatus = 0; + item.BoxFixtureproduction = obj.plc.ReadInt16("DB8.DBD190"); + item.BoxFixturesideplate = obj.plc.ReadString("DB8.DBD558"); + item.BoxClosebetatemperature = obj.plc.ReadString("DB8.DBD574"); + item.BoxBeat = obj.plc.ReadInt16("DB8.DBD626"); + item.UpdateTime = DateTime.Now; + } + #endregion + bool result = await _boxFoamDataServices.UpdateAsync(item); + if (result) + { + RefreshBoxFoamDataDelegateEvent?.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_BoxFoamOutStore_Quartz.cs b/Admin.Core.Tasks/QuartzNet/Jobs/Job_BoxFoamOutStore_Quartz.cs index 211b835b..50e559fd 100644 --- a/Admin.Core.Tasks/QuartzNet/Jobs/Job_BoxFoamOutStore_Quartz.cs +++ b/Admin.Core.Tasks/QuartzNet/Jobs/Job_BoxFoamOutStore_Quartz.cs @@ -52,17 +52,17 @@ namespace Admin.Core.Tasks } public async Task Run(IJobExecutionContext context) { - var obj = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("泡前库Plc")); - if (obj.IsConnect) - { - var val = obj.plc.ReadBool("M100");//出发出库点位 - if (val) - { - //获取发泡夹类型=》箱体类型 - var planInfo = await _executePlanInfoServices.FirstAsync(); - await PlanHandle(planInfo); - } - } + //var obj = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("泡前库Plc")); + //if (obj.IsConnect) + //{ + // var val = obj.plc.ReadBool("M100");//出发出库点位 + // if (val) + // { + // //获取发泡夹类型=》箱体类型 + // var planInfo = await _executePlanInfoServices.FirstAsync(); + // await PlanHandle(planInfo); + // } + //} } diff --git a/Aucma.Core.BoxFoam/App.xaml b/Aucma.Core.BoxFoam/App.xaml index b4ad6cd1..43e74b5e 100644 --- a/Aucma.Core.BoxFoam/App.xaml +++ b/Aucma.Core.BoxFoam/App.xaml @@ -26,8 +26,9 @@ diff --git a/Aucma.Core.BoxFoam/Aucma.Core.BoxFoam.csproj.user b/Aucma.Core.BoxFoam/Aucma.Core.BoxFoam.csproj.user index d04c1ffb..b1627fb3 100644 --- a/Aucma.Core.BoxFoam/Aucma.Core.BoxFoam.csproj.user +++ b/Aucma.Core.BoxFoam/Aucma.Core.BoxFoam.csproj.user @@ -10,6 +10,9 @@ Code + + Code + Code @@ -25,6 +28,12 @@ Code + + Code + + + Code + Code @@ -33,6 +42,9 @@ Designer + + Designer + Designer @@ -66,6 +78,12 @@ Designer + + Designer + + + Designer + Designer diff --git a/Aucma.Core.BoxFoam/Models/LastShotRecordModel.cs b/Aucma.Core.BoxFoam/Models/LastShotRecordModel.cs new file mode 100644 index 00000000..fe66a99f --- /dev/null +++ b/Aucma.Core.BoxFoam/Models/LastShotRecordModel.cs @@ -0,0 +1,48 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Aucma.Core.BoxFoam.Models +{ + public class LastShotRecordModel + { + public int No { get; set; } + /// + /// 所属系统;1系统 2系统 + /// + public string System { get; set; } + + /// + /// POL注料压力 + /// + public string PolInjectionpressure { get; set; } + + /// + /// ISO注料压力 + /// + public string IsoInjectionpressure { get; set; } + + /// + /// POL注料温度 + /// + public string PolInjectiontemperature { get; set; } + + /// + /// ISO注料温度 + /// + public string IsoInjectiontemperature { get; set; } + + /// + /// 最后一次时间 + /// + public DateTime LastTime { get; set; } + + /// + /// 创建时间 + /// + public DateTime Createtime { get; set; } + } +} diff --git a/Aucma.Core.BoxFoam/ViewModels/BeforeFoamingPageModelView.cs b/Aucma.Core.BoxFoam/ViewModels/BeforeFoamingPageModelView.cs index bc2c076c..05941689 100644 --- a/Aucma.Core.BoxFoam/ViewModels/BeforeFoamingPageModelView.cs +++ b/Aucma.Core.BoxFoam/ViewModels/BeforeFoamingPageModelView.cs @@ -1,5 +1,6 @@ using Admin.Core.Common; using Admin.Core.IService; +using Admin.Core.Model; using Admin.Core.Service; using Aucma.Core.BoxFoam.Models; using Aucma.Core.BoxFoam.Views.UserPage; @@ -8,6 +9,7 @@ using CommunityToolkit.Mvvm.Input; using log4net; using MaterialDesignThemes.Wpf; using Microsoft.Extensions.DependencyInjection; +using Microsoft.IdentityModel.Logging; using NPOI.SS.Formula.Functions; using System; using System.Collections.ObjectModel; @@ -132,5 +134,52 @@ namespace Aucma.Core.BoxFoam.ViewModels } #endregion + + /// + /// 货道入库标识设置 + /// + /// + private async void UpdateInStoreFlag(object obj) + { + string info = obj as string; + string shellStoreCode = Appsettings.app("StoreInfo", "BeforeStoreCode");//泡前库code + bool result =await UpdateInStoreFlag(shellStoreCode, info); + if (result) + { + //Query(); + //MessageBoxTimeoutA((IntPtr)0, $"货道入库状态修改成功，3秒后关闭提示", "提示", 0, 0, 3000); + } + else + { + MessageBox.Show("货道入库状态修改失败", "提示", MessageBoxButton.OK, MessageBoxImage.Error, MessageBoxResult.OK, MessageBoxOptions.DefaultDesktopOnly); + } + } + + /// + /// 修改货道入库标识 + /// + /// + /// + + public async Task UpdateInStoreFlag(string storeCode, string spaceCode) + { + bool result = false; + try + { + + BaseSpaceInfo spaceInfo =await _baseSpaceInfoServices.GetSpaceInfoBySpaceCode(storeCode, spaceCode); + if (spaceInfo != null) + { + spaceInfo.InStoreFlag = spaceInfo.InStoreFlag == 1 ? 2 : 1; + result =await _baseSpaceInfoServices.UpdateSpaceInfo(spaceInfo); + //logHelper.Info($"修改仓库：{storeCode}；货道：{spaceCode}；入库标识：{spaceInfo.inStoreFlag};修改{(result == true ? "成功" : "失败")}"); + } + } + catch (Exception ex) + { + //logHelper.Error("修改货道入库标识异常", ex); + } + return result; + } } } diff --git a/Aucma.Core.BoxFoam/ViewModels/FoamMachinesPageViewModel.cs b/Aucma.Core.BoxFoam/ViewModels/FoamMachinesPageViewModel.cs new file mode 100644 index 00000000..b082c419 --- /dev/null +++ b/Aucma.Core.BoxFoam/ViewModels/FoamMachinesPageViewModel.cs @@ -0,0 +1,453 @@ +using Admin.Core.Common; +using Admin.Core.IService; +using Admin.Core.Model.ViewModels; +using Admin.Core.Service; +using Aucma.Core.BoxFoam.Models; +using CommunityToolkit.Mvvm.ComponentModel; +using Microsoft.Extensions.DependencyInjection; +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Aucma.Core.BoxFoam.ViewModels +{ + public partial class FoamMachinesPageViewModel : ObservableObject + { + IBoxLastShotRecordServices _boxLastShotRecordServices; + + public FoamMachinesPageViewModel() + { + _boxLastShotRecordServices = App.ServiceProvider.GetService(); + Task.WaitAll(LoadData()); + } + #region 加载DataGrid数据 + private async Task LoadData() + { + System.Windows.Application.Current.Dispatcher.Invoke((Action)(async () => + { + LastShotRecordDataGrid.Clear(); + + int i = 1; + var list = await _boxLastShotRecordServices.QueryAsync(); + list.OrderByDescending(d => d.LastTime); + foreach (var item in list.Take(50)) + { + string system = string.Empty; + if (item.System == "1") { system = "1系统"; } + if (item.System == "2") { system = "2系统"; } + LastShotRecordDataGrid.Add(new LastShotRecordModel() + { + No = i, + System = system, + PolInjectionpressure = item.PolInjectionpressure, + IsoInjectionpressure = item.IsoInjectionpressure, + PolInjectiontemperature = item.PolInjectiontemperature, + IsoInjectiontemperature = item.IsoInjectiontemperature, + LastTime = item.LastTime, + Createtime = item.Createtime + }); + i++; + }; + //Datalist.Insert(0, Datalist[Datalist.Count - 1]); + //Datalist.RemoveAt(Datalist.Count - 1); + })); + } + + #endregion + + #region 初始化datagrid + private ObservableCollection _lastShotRecordDataGrid = new ObservableCollection(); + public ObservableCollection LastShotRecordDataGrid + { + get { return _lastShotRecordDataGrid; } + set + { + _lastShotRecordDataGrid = value; + OnPropertyChanged();//属性通知 + } + } + #endregion + + + #region 1系统属性 + /// + /// POL输入压力 + /// + private string _PolInputPressure = "0.00"; + public string PolInputPressure1 + { + get => _PolInputPressure; + set => SetProperty(ref _PolInputPressure, value); + } + /// + /// ISO输入压力 + /// + private string _IsoInputPressure = "0.00"; + public string IsoInputPressure1 + { + get => _IsoInputPressure; + set => SetProperty(ref _IsoInputPressure, value); + } + /// + /// POL输出压力 + /// + private string _polOutputPressure = "0.0"; + public string PolOutputPressure1 + { + get => _polOutputPressure; + set => SetProperty(ref _polOutputPressure, value); + } + /// + /// ISO输出压力 + /// + private string _isoOutputPressure1 = "0.0"; + public string IsoOutputPressure1 + { + get => _isoOutputPressure1; + set => SetProperty(ref _isoOutputPressure1, value); + } + /// + /// Pol流量 + /// + private string _Polflow1 = "0"; + public string PolFlow1 + { + get => _Polflow1; + set => SetProperty(ref _Polflow1, value); + } + /// + /// Iso流量 + /// + private string _isoflow1 = "0"; + public string IsoFlow1 + { + get => _isoflow1; + set => SetProperty(ref _isoflow1, value); + } + + /// + /// Pol温度 + /// + private string _PoleTmperature = "0"; + public string PoleTmperature1 + { + get => _PoleTmperature; + set => SetProperty(ref _PoleTmperature, value); + } + /// + /// Iso温度 + /// + private string _isoTemperature = "0"; + public string IsoTemperature1 + { + get => _isoTemperature; + set => SetProperty(ref _isoTemperature, value); + } + + /// + /// 料位 + /// + private string _PolMaterialLevel1 = "0"; + public string PolMaterialLevel1 + { + get => _PolMaterialLevel1; + set => SetProperty(ref _PolMaterialLevel1, value); + } + /// + /// Iso温度 + /// + private string _IsoMaterialLevel1 = "0"; + public string IsoMaterialLevel1 + { + get => _IsoMaterialLevel1; + set => SetProperty(ref _IsoMaterialLevel1, value); + } + + /// + /// 压力 + /// + private string _pressure1 = "0.00"; + public string Pressure1 + { + get => _pressure1; + set => SetProperty(ref _pressure1, value); + } + /// + /// 温度 + /// + private string _temperature1 = "0.00"; + public string Temperature1 + { + get => _temperature1; + set => SetProperty(ref _temperature1, value); + } + /// + /// A枪状态 + /// + private string _status1; + public string Status1 + { + get => _status1; + set => SetProperty(ref _status1, value); + } + /// + /// B枪状态 + /// + private string _status11; + public string Status11 + { + get => _status11; + set => SetProperty(ref _status11, value); + } + /// + /// 压力 + /// + private string _POLPressure1 = "0.00"; + public string POLPressure1 + { + get => _POLPressure1; + set => SetProperty(ref _POLPressure1, value); + } + /// + /// A枪POL温度 + /// + private string _POLTemperature1 = "0.00"; + public string POLTemperature1 + { + get => _POLTemperature1; + set => SetProperty(ref _POLTemperature1, value); + } + /// + /// B枪POL温度 + /// + private string _POLTemperature11 = "0.0"; + public string POLTemperature11 + { + get => _POLTemperature11; + set => SetProperty(ref _POLTemperature11, value); + } + /// + /// 压力 + /// + private string _ISOPressure1 = "0.00"; + public string ISOPressure1 + { + get => _ISOPressure1; + set => SetProperty(ref _ISOPressure1, value); + } + /// + /// 温度 + /// + private string _ISOTemperature11 = "0.0"; + public string ISOTemperature11 + { + get => _ISOTemperature11; + set => SetProperty(ref _ISOTemperature11, value); + } + + #endregion + + #region 2系统属性 + /// + /// POL输入压力 + /// + private string _PolInputPressure2 = "0.00"; + public string PolInputPressure2 + { + get => _PolInputPressure2; + set => SetProperty(ref _PolInputPressure2, value); + } + /// + /// ISO输入压力 + /// + private string _IsoInputPressure2 = "0.00"; + public string IsoInputPressure2 + { + get => _IsoInputPressure2; + set => SetProperty(ref _IsoInputPressure2, value); + } + /// + /// POL输出压力 + /// + private string _polOutputPressure2 = "0.00"; + public string PolOutputPressure2 + { + get => _polOutputPressure2; + set => SetProperty(ref _polOutputPressure2, value); + } + /// + /// ISO输出压力 + /// + private string _isoOutputPressure2 = "0.00"; + public string IsoOutputPressure2 + { + get => _isoOutputPressure2; + set => SetProperty(ref _isoOutputPressure2, value); + } + /// + /// Pol流量 + /// + private string _Polflow2 = "0"; + public string PolFlow2 + { + get => _Polflow2; + set => SetProperty(ref _Polflow2, value); + } + /// + /// Iso流量 + /// + private string _isoflow2 = "0"; + public string IsoFlow2 + { + get => _isoflow2; + set => SetProperty(ref _isoflow2, value); + } + + /// + /// Pol温度 + /// + private string _PoleTmperature2 = "0"; + public string PoleTmperature2 + { + get => _PoleTmperature2; + set => SetProperty(ref _PoleTmperature2, value); + } + /// + /// Iso温度 + /// + private string _isoTemperature2 = "0"; + public string IsoTemperature2 + { + get => _isoTemperature2; + set => SetProperty(ref _isoTemperature2, value); + } + + /// + /// 料位 + /// + private string _PolMaterialLevel2 = "0"; + public string PolMaterialLevel2 + { + get => _PolMaterialLevel2; + set => SetProperty(ref _PolMaterialLevel2, value); + } + /// + /// Iso温度 + /// + private string _IsoMaterialLevel2 = "0"; + public string IsoMaterialLevel2 + { + get => _IsoMaterialLevel2; + set => SetProperty(ref _IsoMaterialLevel2, value); + } + + /// + /// 压力 + /// + private string _pressure2 = "0.00"; + public string Pressure2 + { + get => _pressure2; + set => SetProperty(ref _pressure2, value); + } + /// + /// 温度 + /// + private string _temperature2 = "0.00"; + public string Temperature2 + { + get => _temperature2; + set => SetProperty(ref _temperature2, value); + } + /// + /// A枪状态 + /// + private string _status2 = ""; + public string Status2 + { + get => _status2; + set => SetProperty(ref _status2, value); + } + /// + /// B枪状态 + /// + private string _status12 = ""; + public string Status12 + { + get => _status12; + set => SetProperty(ref _status12, value); + } + /// + /// 压力 + /// + private string _POLPressure2 = "0.00"; + public string POLPressure2 + { + get => _POLPressure2; + set => SetProperty(ref _POLPressure2, value); + } + /// + /// 温度 + /// + private string _POLTemperature2 = "0.00"; + public string POLTemperature2 + { + get => _POLTemperature2; + set => SetProperty(ref _POLTemperature2, value); + } + /// + /// A枪压力 + /// + private string _ISOPressure2 = "0.00"; + public string ISOPressure2 + { + get => _ISOPressure2; + set => SetProperty(ref _ISOPressure2, value); + } + /// + /// B枪温度 + /// + private string _ISOTemperature22 = "0.0"; + public string ISOTemperature22 + { + get => _ISOTemperature22; + set => SetProperty(ref _ISOTemperature22, value); + } + + /// + /// B枪温度 + /// + private string _POLPressure22 = "0.0"; + public string POLPressure22 + { + get => _POLPressure22; + set => SetProperty(ref _POLPressure22, value); + } + + /// + /// B枪ISO温度 + /// + private string _POLTemperature22 = "0.0"; + public string POLTemperature22 + { + get => _POLTemperature22; + set => SetProperty(ref _POLTemperature22, value); + } + + /// + /// B枪ISO压力 + /// + private string _ISOPressure22 = "0.0"; + public string ISOPressure22 + { + get => _ISOPressure22; + set => SetProperty(ref _ISOPressure22, value); + } + + + #endregion + } +} diff --git a/Aucma.Core.BoxFoam/ViewModels/FoamMonitorPageViewModel.cs b/Aucma.Core.BoxFoam/ViewModels/FoamMonitorPageViewModel.cs index 927b24be..74aaae32 100644 --- a/Aucma.Core.BoxFoam/ViewModels/FoamMonitorPageViewModel.cs +++ b/Aucma.Core.BoxFoam/ViewModels/FoamMonitorPageViewModel.cs @@ -9,25 +9,33 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Media; using System.Collections.ObjectModel; +using Admin.Core.IService; +using Admin.Core.Service; +using Microsoft.Extensions.DependencyInjection; +using Admin.Core.Common; +using Admin.Core.Tasks; namespace Aucma.Core.BoxFoam.ViewModels { public partial class FoamMonitorPageViewModel : ObservableObject { + private readonly IBoxFoamDataServices _boxFoamDataServices; public FoamMonitorPageViewModel() { - Task.WaitAll(InitEveryDayMethod()); - InitStatus(); - } + _boxFoamDataServices = App.ServiceProvider.GetService(); + Job_BoxFoamData_Quartz.RefreshBoxFoamDataDelegateEvent += InitData; - public void InitStatus() - { - for (int i = 0; i < 12; i++) - { - Color.Add("Red"); - } + Task.WaitAll(InitEveryDayMethod(), InitData()); } + //public void InitStatus() + //{ + // for (int i = 0; i < 12; i++) + // { + // Color.Add("Red"); + // } + //} + #region 日产量 /// /// 每日生产 @@ -169,5 +177,111 @@ namespace Aucma.Core.BoxFoam.ViewModels set => SetProperty(ref _color, value); } #endregion + + #region 总计 + private int _totle = 0; + public int Totle + { + get => _totle; + set => SetProperty(ref _totle, value); + } + #endregion + + #region 夹具状态 + private ObservableCollection _statusColor = new ObservableCollection(); + public ObservableCollection StatusColor + { + get => _statusColor; + set => SetProperty(ref _statusColor, value); + } + #endregion + + #region 夹具名称 + private ObservableCollection _fixtureName = new ObservableCollection(); + public ObservableCollection FixtureName + { + get => _fixtureName; + set => SetProperty(ref _fixtureName, value); + } + #endregion + + #region 夹具产量 + /// + ///夹具产量 + /// + private ObservableCollection _production = new ObservableCollection(); + public ObservableCollection Production + { + get => _production; + set => SetProperty(ref _production, value); + } + #endregion + + #region 发泡量 + /// + /// 发泡量 + /// + private ObservableCollection _foamVolume = new ObservableCollection(); + public ObservableCollection FoamVolume + { + get => _foamVolume; + set => SetProperty(ref _foamVolume, value); + } + #endregion + + #region 内侧温度 + private ObservableCollection _internalTemperature = new ObservableCollection(); + public ObservableCollection InternalTemperature + { + get => _internalTemperature; + set => SetProperty(ref _internalTemperature, value); + } + #endregion + + #region 侧板温度温度 + private ObservableCollection _outsideTemperature = new ObservableCollection(); + public ObservableCollection OutsideTemperature + { + get => _outsideTemperature; + set => SetProperty(ref _outsideTemperature, value); + } + #endregion + + #region 夹具节拍 + private ObservableCollection _beat = new ObservableCollection(); + public ObservableCollection Beat + { + get => _beat; + set => SetProperty(ref _beat, value); + } + #endregion + + + /// + /// 初始化发泡数据 + /// + /// + public async Task InitData() + { + int total = 0; + var list = await _boxFoamDataServices.QueryAsync(); + foreach (var item in list) + { + if (item.BoxFixturestatus == 1) StatusColor.Add("Green"); + if (item.BoxFixturestatus == 0) StatusColor.Add("Red"); + + + FixtureName.Add(item.BoxFixturetype); + Production.Add(item.BoxFixtureproduction.ToString()); + FoamVolume.Add(item.FoamVolume); + InternalTemperature.Add(item.BoxClosebetatemperature.ToString()); + OutsideTemperature.Add(item.BoxFixturesideplate.ToString()); + Beat.Add(item.BoxBeat); + + total += item.BoxFixtureproduction; + } + + Totle = total; + } } } diff --git a/Aucma.Core.BoxFoam/ViewModels/LinerInventoryViewModel.cs b/Aucma.Core.BoxFoam/ViewModels/LinerInventoryViewModel.cs new file mode 100644 index 00000000..c6a4c06c --- /dev/null +++ b/Aucma.Core.BoxFoam/ViewModels/LinerInventoryViewModel.cs @@ -0,0 +1,96 @@ +using Admin.Core.Common; +using Admin.Core.IService; +using Admin.Core.Model; +using Admin.Core.Model.ViewModels; +using Admin.Core.Service; +using CommunityToolkit.Mvvm.ComponentModel; +using CommunityToolkit.Mvvm.Input; +using Microsoft.Extensions.DependencyInjection; +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Aucma.Core.BoxFoam.ViewModels +{ + public partial class LinerInventoryViewModel : ObservableObject + { + private IBaseSpaceInfoServices _spaceInfoService; + private IBaseSpaceDetailServices _spaceDetailService; + public LinerInventoryViewModel() { + _spaceInfoService = App.ServiceProvider.GetService(); + _spaceDetailService = App.ServiceProvider.GetService(); + Task.WaitAll(Query()); + } + + private async Task Query() + { + var storeCode = Appsettings.app("StoreInfo", "StoreCode"); + List info = await _spaceInfoService.QueryAsync(d => d.StoreCode.Equals(storeCode)); + if (info != null) + { + foreach (BaseSpaceInfo info2 in info) + { + shapes.Add(info2); + } + } + } + /// + /// 货道明细 + /// + /// + [RelayCommand] + private async void SpaceDetail(object obj) + { + string info = obj as string; + var storeCode = Appsettings.app("StoreInfo", "StoreCode"); + List list =await _spaceDetailService.GetSpaceDetailsBySpaceCode(storeCode, info); + + RefreshSpaceDetails(list); + } + /// + /// 刷新货道明细列表 + /// + /// + private void RefreshSpaceDetails(List spaceDetails) + { + SpaceDetailDataGrid = new ObservableCollection(); + if (spaceDetails != null) + { + spaceDetails.ForEach( + arg => + { + SpaceDetailDataGrid.Add(arg); + }); + } + } + + #region 初始化datagrid + private ObservableCollection shapes = new ObservableCollection(); + public ObservableCollection Shapes + { + get { return shapes; } + set + { + shapes = value; + OnPropertyChanged();//属性通知 + } + } + #endregion + + + private ObservableCollection spaceDetailDataGrid; + + public ObservableCollection SpaceDetailDataGrid + { + get { return spaceDetailDataGrid; } + set + { + spaceDetailDataGrid = value; + OnPropertyChanged();//属性通知 + } + } + } +} diff --git a/Aucma.Core.BoxFoam/ViewModels/MainWindowViewModel.cs b/Aucma.Core.BoxFoam/ViewModels/MainWindowViewModel.cs index e33ef0ea..11b3f847 100644 --- a/Aucma.Core.BoxFoam/ViewModels/MainWindowViewModel.cs +++ b/Aucma.Core.BoxFoam/ViewModels/MainWindowViewModel.cs @@ -18,6 +18,8 @@ namespace Aucma.Core.BoxFoam.ViewModels private RealTimeInventoryPageView realTimeInventoryPage = new RealTimeInventoryPageView(); private FoamPlanPageView foamPlanPageView = new FoamPlanPageView(); FoamMonitorPageView foamMonitorPageView = new FoamMonitorPageView(); + FoamMachinesPageView foamMachinesPageView = new FoamMachinesPageView(); + public MainWindowViewModel() { UserContent = firstPage; @@ -132,6 +134,10 @@ namespace Aucma.Core.BoxFoam.ViewModels case "FoamMonitorPage": UserContent = foamMonitorPageView; break; + case "FoamMachinesPage": + UserContent = foamMachinesPageView; + break; + default: break; } diff --git a/Aucma.Core.BoxFoam/ViewModels/RealTimeInventoryPageViewModel.cs b/Aucma.Core.BoxFoam/ViewModels/RealTimeInventoryPageViewModel.cs index 898aa8a9..3b79fcc3 100644 --- a/Aucma.Core.BoxFoam/ViewModels/RealTimeInventoryPageViewModel.cs +++ b/Aucma.Core.BoxFoam/ViewModels/RealTimeInventoryPageViewModel.cs @@ -12,6 +12,8 @@ namespace Aucma.Core.BoxFoam.ViewModels public readonly IRecordInStoreServices? _recordInstoreServices; private BeforeFoamingPageView beforeFoaming = new BeforeFoamingPageView(); private AfterFoamingPageView afterFoaming = new AfterFoamingPageView(); + LinerInventory linerInventoryView =new LinerInventory(); + ShellInventory shellInventoryView =new ShellInventory(); public RealTimeInventoryPageViewModel() { InventoryControl = beforeFoaming; @@ -42,6 +44,12 @@ namespace Aucma.Core.BoxFoam.ViewModels case "PhInventory": InventoryControl = afterFoaming; break; + case "ShellInventory"://壳库 + InventoryControl = shellInventoryView; + break; + case "LinerInventory"://胆库 + InventoryControl = linerInventoryView; + break; default: break; } diff --git a/Aucma.Core.BoxFoam/ViewModels/ShellInventoryViewModel.cs b/Aucma.Core.BoxFoam/ViewModels/ShellInventoryViewModel.cs new file mode 100644 index 00000000..80d73563 --- /dev/null +++ b/Aucma.Core.BoxFoam/ViewModels/ShellInventoryViewModel.cs @@ -0,0 +1,96 @@ +using Admin.Core.Common; +using Admin.Core.IService; +using Admin.Core.Model; +using CommunityToolkit.Mvvm.ComponentModel; +using CommunityToolkit.Mvvm.Input; +using Microsoft.Extensions.DependencyInjection; +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Aucma.Core.BoxFoam.ViewModels +{ + public partial class ShellInventoryViewModel : ObservableObject + { + private IBaseSpaceInfoServices _spaceInfoService; + private IBaseSpaceDetailServices _spaceDetailService; + public ShellInventoryViewModel() + { + _spaceInfoService = App.ServiceProvider.GetService(); + _spaceDetailService = App.ServiceProvider.GetService(); + Task.WaitAll(Query()); + } + + private async Task Query() + { + var storeCode = Appsettings.app("StoreInfo", "StoreCode"); + List info = await _spaceInfoService.QueryAsync(d => d.StoreCode.Equals(storeCode)); + if (info != null) + { + foreach (BaseSpaceInfo info2 in info) + { + shapes.Add(info2); + } + } + } + /// + /// 货道明细 + /// + /// + [RelayCommand] + private async void SpaceDetail(object obj) + { + string info = obj as string; + var storeCode = Appsettings.app("StoreInfo", "StoreCode"); + List list = await _spaceDetailService.GetSpaceDetailsBySpaceCode(storeCode, info); + + RefreshSpaceDetails(list); + } + /// + /// 刷新货道明细列表 + /// + /// + private void RefreshSpaceDetails(List spaceDetails) + { + SpaceDetailDataGrid = new ObservableCollection(); + if (spaceDetails != null) + { + spaceDetails.ForEach( + arg => + { + SpaceDetailDataGrid.Add(arg); + }); + } + } + + #region 初始化datagrid + private ObservableCollection shapes = new ObservableCollection(); + public ObservableCollection Shapes + { + get { return shapes; } + set + { + shapes = value; + OnPropertyChanged();//属性通知 + } + } + #endregion + + + private ObservableCollection spaceDetailDataGrid; + + public ObservableCollection SpaceDetailDataGrid + { + get { return spaceDetailDataGrid; } + set + { + spaceDetailDataGrid = value; + OnPropertyChanged();//属性通知 + } + } + } +} + diff --git a/Aucma.Core.BoxFoam/Views/EnterWarehouseStatisticsPageView.xaml b/Aucma.Core.BoxFoam/Views/EnterWarehouseStatisticsPageView.xaml index 395b69ee..a6d32ed4 100644 --- a/Aucma.Core.BoxFoam/Views/EnterWarehouseStatisticsPageView.xaml +++ b/Aucma.Core.BoxFoam/Views/EnterWarehouseStatisticsPageView.xaml @@ -6,7 +6,7 @@ xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" xmlns:cvt="clr-namespace:Aucma.Core.BoxFoam.ConvertTo" xmlns:local="clr-namespace:Aucma.Core.BoxFoam.Views" - mc:Ignorable="d" Background="#1152AC" + mc:Ignorable="d" Background="#1152AC" FontFamily="Microsoft YaHei" d:DesignHeight="450" d:DesignWidth="800"> @@ -43,7 +43,7 @@ - + @@ -105,7 +105,7 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Aucma.Core.BoxFoam/Views/FoamMachinesPageView.xaml.cs b/Aucma.Core.BoxFoam/Views/FoamMachinesPageView.xaml.cs new file mode 100644 index 00000000..a9875fcc --- /dev/null +++ b/Aucma.Core.BoxFoam/Views/FoamMachinesPageView.xaml.cs @@ -0,0 +1,30 @@ +using Aucma.Core.BoxFoam.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace Aucma.Core.BoxFoam.Views +{ + /// + /// FoamMachinesPageView.xaml 的交互逻辑 + /// + public partial class FoamMachinesPageView : UserControl + { + public FoamMachinesPageView() + { + InitializeComponent(); + this.DataContext = new FoamMachinesPageViewModel(); + } + } +} diff --git a/Aucma.Core.BoxFoam/Views/FoamMonitorPageView.xaml b/Aucma.Core.BoxFoam/Views/FoamMonitorPageView.xaml index 1f4bc9de..7dff1d00 100644 --- a/Aucma.Core.BoxFoam/Views/FoamMonitorPageView.xaml +++ b/Aucma.Core.BoxFoam/Views/FoamMonitorPageView.xaml @@ -5,7 +5,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:Aucma.Core.BoxFoam.Views" xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf" - mc:Ignorable="d" + mc:Ignorable="d" FontFamily="Microsoft YaHei" d:DesignHeight="1080" d:DesignWidth="1920"> @@ -52,227 +52,387 @@ + + + - - + + + - - + + - + - + - + - + - + - + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - + - + - + - + - + - + - + + + + + + - - - + + + - + - + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + - + + + + + - + + - + + - + + - + + - + + - - + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + - + + - + + + + + + + + - + + - + + diff --git a/Aucma.Core.BoxFoam/Views/FoamPlanPageView.xaml b/Aucma.Core.BoxFoam/Views/FoamPlanPageView.xaml index 5ea58c27..12182b10 100644 --- a/Aucma.Core.BoxFoam/Views/FoamPlanPageView.xaml +++ b/Aucma.Core.BoxFoam/Views/FoamPlanPageView.xaml @@ -4,7 +4,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:Aucma.Core.BoxFoam.Views" - mc:Ignorable="d" Background="#1152AC" + mc:Ignorable="d" Background="#1152AC" FontFamily="Microsoft YaHei" d:DesignHeight="1080" d:DesignWidth="1920"> diff --git a/Aucma.Core.BoxFoam/Views/IndexPageView.xaml b/Aucma.Core.BoxFoam/Views/IndexPageView.xaml index 5beccb41..a9cb67c5 100644 --- a/Aucma.Core.BoxFoam/Views/IndexPageView.xaml +++ b/Aucma.Core.BoxFoam/Views/IndexPageView.xaml @@ -5,14 +5,14 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" xmlns:local="clr-namespace:Aucma.Core.BoxFoam.Views" - mc:Ignorable="d" Background="#1152AC" + mc:Ignorable="d" Background="#1152AC" d:DesignHeight="1080" FontFamily="Microsoft YaHei" d:DesignWidth="1920" > + + + + + + + + + + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + \ No newline at end of file diff --git a/Aucma.Core.BoxFoam/Views/UserPage/BeforeFoamingPageView.xaml b/Aucma.Core.BoxFoam/Views/UserPage/BeforeFoamingPageView.xaml index f4a3ae2f..1c274a34 100644 --- a/Aucma.Core.BoxFoam/Views/UserPage/BeforeFoamingPageView.xaml +++ b/Aucma.Core.BoxFoam/Views/UserPage/BeforeFoamingPageView.xaml @@ -4,149 +4,254 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" - mc:Ignorable="d" Background="#1152AC" + mc:Ignorable="d" Background="#1152AC" FontFamily="Microsoft YaHei" d:DesignHeight="450" d:DesignWidth="800"> - + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Aucma.Core.BoxFoam/Views/UserPage/LinerInventory.xaml b/Aucma.Core.BoxFoam/Views/UserPage/LinerInventory.xaml new file mode 100644 index 00000000..2e3e2493 --- /dev/null +++ b/Aucma.Core.BoxFoam/Views/UserPage/LinerInventory.xaml @@ -0,0 +1,256 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Aucma.Core.BoxFoam/Views/UserPage/LinerInventory.xaml.cs b/Aucma.Core.BoxFoam/Views/UserPage/LinerInventory.xaml.cs new file mode 100644 index 00000000..fc69bd35 --- /dev/null +++ b/Aucma.Core.BoxFoam/Views/UserPage/LinerInventory.xaml.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace Aucma.Core.BoxFoam.Views.UserPage +{ + /// + /// LinerInventory.xaml 的交互逻辑 + /// + public partial class LinerInventory : UserControl + { + public LinerInventory() + { + InitializeComponent(); + } + } +} diff --git a/Aucma.Core.BoxFoam/Views/UserPage/ShellInventory.xaml b/Aucma.Core.BoxFoam/Views/UserPage/ShellInventory.xaml new file mode 100644 index 00000000..a93216de --- /dev/null +++ b/Aucma.Core.BoxFoam/Views/UserPage/ShellInventory.xaml @@ -0,0 +1,259 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Aucma.Core.BoxFoam/Views/UserPage/ShellInventory.xaml.cs b/Aucma.Core.BoxFoam/Views/UserPage/ShellInventory.xaml.cs new file mode 100644 index 00000000..cdd5f933 --- /dev/null +++ b/Aucma.Core.BoxFoam/Views/UserPage/ShellInventory.xaml.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace Aucma.Core.BoxFoam.Views.UserPage +{ + /// + /// ShellInventory.xaml 的交互逻辑 + /// + public partial class ShellInventory : UserControl + { + public ShellInventory() + { + InitializeComponent(); + } + } +} diff --git a/Aucma.Core.BoxFoam/Views/UserPage/SpaceDetailPageView.xaml b/Aucma.Core.BoxFoam/Views/UserPage/SpaceDetailPageView.xaml index f429cacb..e96921e4 100644 --- a/Aucma.Core.BoxFoam/Views/UserPage/SpaceDetailPageView.xaml +++ b/Aucma.Core.BoxFoam/Views/UserPage/SpaceDetailPageView.xaml @@ -5,7 +5,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:Aucma.Core.BoxFoam.Views.UserPage" mc:Ignorable="d" - Background="#1152AC" + Background="#1152AC" FontFamily="Microsoft YaHei" Title="货道明细" Height="450" Width="800"> @@ -40,7 +40,7 @@ - + diff --git a/Aucma.Core.PrintTo/App.xaml b/Aucma.Core.PrintTo/App.xaml index 13736002..fa814e4a 100644 --- a/Aucma.Core.PrintTo/App.xaml +++ b/Aucma.Core.PrintTo/App.xaml @@ -31,8 +31,6 @@ - - diff --git a/Aucma.Core.PrintTo/Views/IndexPageView.xaml b/Aucma.Core.PrintTo/Views/IndexPageView.xaml index dfb914dc..54d65ed1 100644 --- a/Aucma.Core.PrintTo/Views/IndexPageView.xaml +++ b/Aucma.Core.PrintTo/Views/IndexPageView.xaml @@ -43,8 +43,8 @@ - - + + diff --git a/Aucma.Core.PrintTo/Views/PrintToDevView.xaml b/Aucma.Core.PrintTo/Views/PrintToDevView.xaml index 12126a45..cdd82ffb 100644 --- a/Aucma.Core.PrintTo/Views/PrintToDevView.xaml +++ b/Aucma.Core.PrintTo/Views/PrintToDevView.xaml @@ -33,18 +33,18 @@ - - + + - - + - - + @@ -60,26 +60,26 @@ - + - - + - + - + -