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 @@
完成时间
</summary>
</member>
+ <member name="T:Admin.Core.Model.Model_New.OldBoxFoamType">
+ <summary>
+ 老发泡线泡前库
+ </summary>
+ </member>
+ <member name="P:Admin.Core.Model.Model_New.OldBoxFoamType.ObjId">
+ <summary>
+ 主键
+ </summary>
+ </member>
+ <member name="P:Admin.Core.Model.Model_New.OldBoxFoamType.Local">
+ <summary>
+ 位置;东线泡前库；西线泡前库
+ </summary>
+ </member>
+ <member name="P:Admin.Core.Model.Model_New.OldBoxFoamType.Boxtype">
+ <summary>
+ 货道类型
+ </summary>
+ </member>
+ <member name="P:Admin.Core.Model.Model_New.OldBoxFoamType.Storeamount">
+ <summary>
+ 库存数量
+ </summary>
+ </member>
+ <member name="P:Admin.Core.Model.Model_New.OldBoxFoamType.CreatedBy">
+ <summary>
+ 创建人
+ </summary>
+ </member>
+ <member name="P:Admin.Core.Model.Model_New.OldBoxFoamType.CreatedTime">
+ <summary>
+ 创建时间
+ </summary>
+ </member>
+ <member name="P:Admin.Core.Model.Model_New.OldBoxFoamType.UpdatedTime">
+ <summary>
+ 更新时间
+ </summary>
+ </member>
<member name="T:Admin.Core.Model.Model_New.OrderBomInfo">
<summary>
SAP BOM 信息
@@ -641,7 +681,7 @@
主键
</summary>
</member>
- <member name="P:Admin.Core.Model.Model_New.PrintBarCode.ProductCode">
+ <member name="P:Admin.Core.Model.Model_New.PrintBarCode.OrderCode">
<summary>
订单号
</summary>
@@ -1141,6 +1181,16 @@
所属系统;1系统 2系统
</summary>
</member>
+ <member name="P:Admin.Core.Model.BoxLastShotRecord.GunHead">
+ <summary>
+ 枪头
+ </summary>
+ </member>
+ <member name="P:Admin.Core.Model.BoxLastShotRecord.StationNumber">
+ <summary>
+ 工位号
+ </summary>
+ </member>
<member name="P:Admin.Core.Model.BoxLastShotRecord.PolInjectionpressure">
<summary>
POL注料压力
@@ -1571,6 +1621,11 @@
系统;0,右系统 1，左系统
</summary>
</member>
+ <member name="P:Admin.Core.Model.Perfusion_Record.PerfusionResult">
+ <summary>
+ 灌注结果
+ </summary>
+ </member>
<member name="P:Admin.Core.Model.Perfusion_Record.CreatedBy">
<summary>
创建人
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
+{
+ /// <summary>
+ /// IOldBoxFoamTypeRepository
+ /// </summary>
+ public interface IOldBoxFoamTypeRepository : IBaseRepository<OldBoxFoamType>
+ {
+ }
+}
\ 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
+{
+ /// <summary>
+ /// IOldBoxFoamTypeServices
+ /// </summary>
+ public interface IOldBoxFoamTypeServices : IBaseServices<OldBoxFoamType>
+ {
+
+
+ }
+}
\ 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
/// </summary>
[SugarColumn(ColumnName = "SYSTEM")]
public string System { get; set; }
-
+ /// <summary>
+ /// 枪头
+ /// </summary>
+ [SugarColumn(ColumnName = "GUNHEAD")]
+ public string GunHead { get; set; }
+ /// <summary>
+ /// 工位号
+ /// </summary>
+ [SugarColumn(ColumnName = "STATIONNUMBER")]
+ public string StationNumber { get; set; }
/// <summary>
/// POL注料压力
/// </summary>
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
+{
+ /// <summary>
+ /// 老发泡线泡前库
+ /// </summary>
+ public class OldBoxFoamType
+ {
+ /// <summary>
+ /// 主键
+ /// </summary>
+ [SugarColumn(ColumnName = "OBJ_ID", IsIdentity = true, IsPrimaryKey = true)]
+ public float ObjId { get; set; }
+
+ /// <summary>
+ /// 位置;东线泡前库；西线泡前库
+ /// </summary>
+ [SugarColumn(ColumnName = "LOCAL")]
+ public string Local { get; set; }
+
+ /// <summary>
+ /// 货道类型
+ /// </summary>
+ [SugarColumn(ColumnName = "BOXTYPE")]
+ public string Boxtype { get; set; }
+
+ /// <summary>
+ /// 库存数量
+ /// </summary>
+ [SugarColumn(ColumnName = "STOREAMOUNT")]
+ public float Storeamount { get; set; }
+
+ /// <summary>
+ /// 创建人
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATED_BY")]
+ public string CreatedBy { get; set; }
+
+ /// <summary>
+ /// 创建时间
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATED_TIME")]
+ public DateTime CreatedTime { get; set; }
+
+ /// <summary>
+ /// 更新时间
+ /// </summary>
+ [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
/// </summary>
[SugarColumn(ColumnName = "PERFUSION_SYSTEM")]
public string PerfusionSystem { get; set; }
-
+ /// <summary>
+ /// 灌注结果
+ /// </summary>
+ [SugarColumn(ColumnName = "PERFUSION_RESULT")]
+ public int PerfusionResult { get; set; }
/// <summary>
/// 创建人
/// </summary>
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
+{
+ /// <summary>
+ /// OldBoxFoamTypeRepository
+ /// </summary>
+ public class OldBoxFoamTypeRepository : BaseRepository<OldBoxFoamType>, 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<BaseSpaceDetail> spaceDetails = null;
try
{
- Expression<Func<BaseSpaceDetail, bool>> 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<OldBoxFoamType>, IOldBoxFoamTypeServices
+ {
+ private readonly IBaseRepository<OldBoxFoamType> _dal;
+ public OldBoxFoamTypeServices(IBaseRepository<OldBoxFoamType> 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;
+
+/// <summary>
+/// 老发泡数据采集
+/// </summary>
+namespace Admin.Core.Tasks
+{
+ public class Job_OldBoxFoamType_Quartz : JobBase, IJob
+ {
+ #region 事件
+ /// <summary>
+ /// 发泡线新事件
+ /// </summary>
+ /// <returns></returns>
+ public delegate Task RefreshBoxFoamDataDelegate();
+ public static event RefreshBoxFoamDataDelegate RefreshBoxFoamDataDelegateEvent;
+ /// <summary>
+ /// 老发泡线更新事件
+ /// </summary>
+ /// <returns></returns>
+ public delegate Task RefreshOldBoxFoamDataDelegate();
+ public static event RefreshOldBoxFoamDataDelegate RefreshOldBoxFoamDataDelegateEvent;
+ /// <summary>
+ /// 老泡前库更新事件
+ /// </summary>
+ /// <returns></returns>
+ 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 任务处理表
+ /// <summary>
+ /// PLC 任务处理表
+ /// </summary>
+ /// <param name="storeCode">仓库编码</param>
+ /// <param name="materialBarCode">物料编码</param>
+ /// <returns></returns>
+ 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}");
+ }
+ }
+
+ /// <summary>
+ /// 泡前库更新
+ /// </summary>
+ /// <param name="obj"></param>
+ /// <param name="item"></param>
+ /// <returns></returns>
+ private async Task<OldBoxFoamType> 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系统
/// </summary>
public string System { get; set; }
+ /// <summary>
+ /// 枪头
+ /// </summary>
+ public string GunHead { get; set; }
+ /// <summary>
+ /// 工位号
+ /// </summary>
+ public string StationNumber { get; set; }
/// <summary>
/// POL注料压力
/// </summary>
- public string PolInjectionpressure { get; set; }
+ public string PolInjectionpressure { get; set; }
/// <summary>
/// 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
+ {
+ /// <summary>
+ /// 主键
+ /// </summary>
+ public float ObjId { get; set; }
+
+ /// <summary>
+ /// 位置;东线泡前库；西线泡前库
+ /// </summary>
+ public string Local { get; set; }
+
+ /// <summary>
+ /// 货道类型
+ /// </summary>
+ public string Boxtype { get; set; }
+
+ /// <summary>
+ /// 库存数量
+ /// </summary>
+ public float Storeamount { get; set; }
+
+ /// <summary>
+ /// 创建人
+ /// </summary>
+ public string CreatedBy { get; set; }
+
+ /// <summary>
+ /// 创建时间
+ /// </summary>
+ public DateTime CreatedTime { get; set; }
+
+ /// <summary>
+ /// 更新人
+ /// </summary>
+ public string UpdatedBy { get; set; }
+
+ /// <summary>
+ /// 更新时间
+ /// </summary>
+ 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<IBaseSpaceDetailServices>();
+ _spaceDetailService = App.ServiceProvider.GetService<IBaseSpaceDetailServices>();
_baseSpaceInfoServices = App.ServiceProvider.GetService<IBaseSpaceInfoServices>();
- this.LoadSpaceStoreMedthAsync(); }
+ this.LoadSpaceStoreMedthAsync();
+ }
#region 加载泡后库货道信息
/// <summary>
/// 加载泡后库货道信息
/// </summary>
- 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<BaseSpaceDetail> list = _spaceDetailService.GetSpaceDetailsBySpaceCode(storeCode, info).Result;
+
+ RefreshSpaceDetails(list);
+ }
+ /// <summary>
+ /// 刷新货道明细列表
+ /// </summary>
+ /// <param name="spaceDetails"></param>
+ private void RefreshSpaceDetails(List<BaseSpaceDetail> spaceDetails)
+ {
+ SpaceDetailDataGrid = new ObservableCollection<BaseSpaceDetail>();
+ if (spaceDetails != null)
+ {
+ spaceDetails.ForEach(
+ arg =>
+ {
+ SpaceDetailDataGrid.Add(arg);
+ });
+ }
+ }
+ private ObservableCollection<BaseSpaceDetail> spaceDetailDataGrid;
+
+ public ObservableCollection<BaseSpaceDetail> 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
/// <summary>
/// 加载泡前库货道信息
/// </summary>
- 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<BaseSpaceDetail> list = _baseSpaceDetailServices.GetSpaceDetailsBySpaceCode(storeCode, info).Result;
+
+ RefreshSpaceDetails(list);
+ }
+ /// <summary>
+ /// 刷新货道明细列表
+ /// </summary>
+ /// <param name="spaceDetails"></param>
+ private void RefreshSpaceDetails(List<BaseSpaceDetail> spaceDetails)
+ {
+ SpaceDetailDataGrid = new ObservableCollection<BaseSpaceDetail>();
+ if (spaceDetails != null)
+ {
+ spaceDetails.ForEach(
+ arg =>
+ {
+ SpaceDetailDataGrid.Add(arg);
+ });
+ }
+ }
+ private ObservableCollection<BaseSpaceDetail> spaceDetailDataGrid;
+
+ public ObservableCollection<BaseSpaceDetail> 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);
}
/// <summary>
+ /// 压力
+ /// </summary>
+ private string _ISOPressure11 = "0.00";
+ public string ISOPressure11
+ {
+ get => _ISOPressure11;
+ set => SetProperty(ref _ISOPressure11, value);
+ }
+ /// <summary>
/// 温度
/// </summary>
private string _ISOTemperature11 = "0.0";
@@ -409,7 +420,7 @@ namespace Aucma.Core.BoxFoam.ViewModels
set => SetProperty(ref _ISOPressure2, value);
}
/// <summary>
- /// B枪温度
+ ///A枪温度
/// </summary>
private string _ISOTemperature22 = "0.0";
public string ISOTemperature22
@@ -417,7 +428,15 @@ namespace Aucma.Core.BoxFoam.ViewModels
get => _ISOTemperature22;
set => SetProperty(ref _ISOTemperature22, value);
}
-
+ /// <summary>
+ /// B枪温度
+ /// </summary>
+ private string _ISOTemperature222 = "0.0";
+ public string ISOTemperature222
+ {
+ get => _ISOTemperature222;
+ set => SetProperty(ref _ISOTemperature222, value);
+ }
/// <summary>
/// B枪温度
/// </summary>
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<IBaseSpaceInfoServices>();
+ _baseSpaceInfoServices = App.ServiceProvider.GetService<IBaseSpaceInfoServices>();
_spaceDetailService = App.ServiceProvider.GetService<IBaseSpaceDetailServices>();
Query();
}
- private async void Query()
+ private void Query()
{
var storeCode = Appsettings.app("StoreInfo", "LinerInventory");
- List<BaseSpaceInfo> 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);
}
}
/// <summary>
@@ -42,11 +63,10 @@ namespace Aucma.Core.BoxFoam.ViewModels
/// </summary>
/// <param name="obj"></param>
[RelayCommand]
- private async void SpaceDetail(object obj)
+ private void SpaceDetail(string info)
{
- string info = obj as string;
var storeCode = Appsettings.app("StoreInfo", "LinerInventory");//内胆库号
- List<BaseSpaceDetail> list =await _spaceDetailService.GetSpaceDetailsBySpaceCode(storeCode, info);
+ List<BaseSpaceDetail> list = _spaceDetailService.GetSpaceDetailsBySpaceCode(storeCode, info).Result;
RefreshSpaceDetails(list);
}
@@ -68,15 +88,11 @@ namespace Aucma.Core.BoxFoam.ViewModels
}
#region 初始化datagrid
- private ObservableCollection<BaseSpaceInfo> shapes = new ObservableCollection<BaseSpaceInfo>();
- public ObservableCollection<BaseSpaceInfo> Shapes
+ private ObservableCollection<SpaceInfoModel> _shapes = new ObservableCollection<SpaceInfoModel>();
+ public ObservableCollection<SpaceInfoModel> 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<BaseSpaceDetail> 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<IOldBoxFoamDataServices>();
- OnLoad();
+ _oldBoxFoamTypeServices = App.ServiceProvider.GetService<IOldBoxFoamTypeServices>();
+
+ Job_OldBoxFoamType_Quartz.RefreshOldBoxFoamTypeDataDelegateEvent += OldBoxFoamTypeOnLoad;
+
+ OldBoxFoamOnLoad();
+ OldBoxFoamTypeOnLoad();
}
- public async void OnLoad()
+ #region 初始化加载数据
+
+ public async Task OldBoxFoamOnLoad()
{
List<OldBoxFoamData> 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<OldBoxFoamDataModel> oldBoxFoamDataGrid = new ObservableCollection<OldBoxFoamDataModel>();
public ObservableCollection<OldBoxFoamDataModel> OldBoxFoamDataGrid
{
@@ -54,5 +78,18 @@ namespace Aucma.Core.BoxFoam.ViewModels
}
}
#endregion
+
+ #region 初始化泡前库 datagrid
+ private ObservableCollection<OldBoxFoamTypeModel> oldBoxFoamTypeDataGrid = new ObservableCollection<OldBoxFoamTypeModel>();
+ public ObservableCollection<OldBoxFoamTypeModel> 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<IBaseSpaceInfoServices>();
+ _baseSpaceInfoServices = App.ServiceProvider.GetService<IBaseSpaceInfoServices>();
_spaceDetailService = App.ServiceProvider.GetService<IBaseSpaceDetailServices>();
- Task.WaitAll(Query());
+ OnLoad();
}
- private async Task Query()
+ private void OnLoad()
{
- var storeCode = Appsettings.app("StoreInfo", "StoreCode");
- List<BaseSpaceInfo> 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);
}
}
/// <summary>
@@ -45,11 +63,10 @@ namespace Aucma.Core.BoxFoam.ViewModels
/// </summary>
/// <param name="obj"></param>
[RelayCommand]
- private async void SpaceDetail(object obj)
+ private void SpaceDetail(string info)
{
- string info = obj as string;
- var storeCode = Appsettings.app("StoreInfo", "StoreCode");
- List<BaseSpaceDetail> list = await _spaceDetailService.GetSpaceDetailsBySpaceCode(storeCode, info);
+ var storeCode = Appsettings.app("StoreInfo", "ShellInventoryStoreCode");
+ List<BaseSpaceDetail> list = _spaceDetailService.GetSpaceDetailsBySpaceCode(storeCode, info).Result;
RefreshSpaceDetails(list);
}
@@ -71,15 +88,11 @@ namespace Aucma.Core.BoxFoam.ViewModels
}
#region 初始化datagrid
- private ObservableCollection<BaseSpaceInfo> shapes = new ObservableCollection<BaseSpaceInfo>();
- public ObservableCollection<BaseSpaceInfo> Shapes
+ private ObservableCollection<SpaceInfoModel> _shapes = new ObservableCollection<SpaceInfoModel>();
+ public ObservableCollection<SpaceInfoModel> 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<BaseSpaceDetail> 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 @@
<RowDefinition Height="0.08*" />
<RowDefinition />
</Grid.RowDefinitions>
- <Border Grid.Row="0" BorderBrush="#0288d1" BorderThickness="1" CornerRadius="0" Background="#1157b9" Margin="1,1,5,5" >
+ <Border Grid.Row="0" BorderBrush="#0288d1" BorderThickness="1" CornerRadius="0" Background="#1157b9" Margin="1" >
<TextBlock Text="1系统" FontSize="23" FontWeight="Bold" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
<Border Grid.Row="1" BorderBrush="#0288d1" BorderThickness="0" CornerRadius="5" Background="Transparent" Margin="1,1,5,5">
@@ -147,11 +147,11 @@
<TextBlock Text="输入压力" FontSize="18" Foreground="White"/>
</StackPanel>
<WrapPanel Grid.Column="1" Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding PolInputPressure1}" FontSize="18" Margin="0 0 18 0" Foreground="Black" Width="50"/>
+ <TextBlock Text="{Binding PolInputPressure1}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
<TextBlock Text="MPa" FontSize="18" Foreground="White" />
</WrapPanel>
<WrapPanel Grid.Column="2" Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding IsoInputPressure1}" FontSize="18" Margin="0 0 18 0" Foreground="Black" Width="50"/>
+ <TextBlock Text="{Binding IsoInputPressure1}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
<TextBlock Text="MPa" FontSize="18" Foreground="White"/>
</WrapPanel>
@@ -160,11 +160,11 @@
<TextBlock Text="输出压力" FontSize="18" Foreground="White"/>
</WrapPanel>
<WrapPanel Grid.Column="1" Grid.Row="2" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding PolOutputPressure1}" FontSize="18" Margin="0 0 18 0" Foreground="Black" Width="50"/>
+ <TextBlock Text="{Binding PolOutputPressure1}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
<TextBlock Text="MPa" FontSize="18" Foreground="White"/>
</WrapPanel>
<WrapPanel Grid.Column="2" Grid.Row="2" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding IsoOutputPressure1}" FontSize="18" Margin="0 0 18 0" Foreground="Black" Width="50"/>
+ <TextBlock Text="{Binding IsoOutputPressure1}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
<TextBlock Text="MPa" FontSize="18" Foreground="White"/>
</WrapPanel>
@@ -172,11 +172,11 @@
<TextBlock Text="流量" FontSize="18" Foreground="White"/>
</WrapPanel>
<WrapPanel Grid.Column="1" Grid.Row="3" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding PolFlow1}" FontSize="18" Margin="0 0 18 0" Foreground="Black" Width="50"/>
+ <TextBlock Text="{Binding PolFlow1}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
<TextBlock Text="g/s" FontSize="18" Foreground="White"/>
</WrapPanel>
<WrapPanel Grid.Column="2" Grid.Row="3" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding IsoFlow1}" FontSize="18" Margin="0 0 18 0" Foreground="Black" Width="50"/>
+ <TextBlock Text="{Binding IsoFlow1}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
<TextBlock Text="g/s" FontSize="18" Foreground="White" />
</WrapPanel>
@@ -184,24 +184,24 @@
<TextBlock Text="温度" FontSize="18" Foreground="White"/>
</WrapPanel>
<WrapPanel Grid.Column="1" Grid.Row="4" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding PoleTmperature1}" FontSize="18" Margin="0 0 18 0" Foreground="Black" Width="50"/>
+ <TextBlock Text="{Binding PoleTmperature1}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
<TextBlock Text="℃" FontSize="18" Foreground="White" />
</WrapPanel>
<WrapPanel Grid.Column="2" Grid.Row="4" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding IsoTemperature1}" FontSize="18" Margin="0 0 18 0" Foreground="Black"/>
- <TextBlock Text="℃" FontSize="18" Foreground="White"/>
+ <TextBlock Text="{Binding IsoTemperature1}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="℃" FontSize="18" Foreground="White" />
</WrapPanel>
<WrapPanel Grid.Column="0" Grid.Row="5" VerticalAlignment="Center" HorizontalAlignment="Right">
<TextBlock Text="料位" FontSize="18" Foreground="White"/>
</WrapPanel>
<WrapPanel Grid.Column="1" Grid.Row="5" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding PolMaterialLevel1}" FontSize="18" Margin="0 0 18 0" Foreground="Black" Width="50"/>
+ <TextBlock Text="{Binding PolMaterialLevel1}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
<TextBlock Text="%" FontSize="18" Foreground="White"/>
</WrapPanel>
<WrapPanel Grid.Column="2" Grid.Row="5" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding IsoMaterialLevel1}" FontSize="18" Margin="0 0 18 0" Foreground="Black" Width="50"/>
- <TextBlock Text="%" FontSize="18" Foreground="White"/>
+ <TextBlock Text="{Binding IsoMaterialLevel1}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="%" FontSize="18" Foreground="White" />
</WrapPanel>
<Border Grid.Column="0" Grid.Row="6" Grid.ColumnSpan="3" BorderBrush="#0288d1" BorderThickness="1" CornerRadius="0" Background="#1157b9" >
@@ -211,7 +211,7 @@
<TextBlock Text="压力" FontSize="18" Foreground="White"/>
</WrapPanel>
<WrapPanel Grid.Column="1" Grid.Row="7" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding Pressure1}" FontSize="18" Margin="0 0 18 0" Foreground="Black" Width="50"/>
+ <TextBlock Text="{Binding Pressure1}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
<TextBlock Text="MPa" FontSize="18" Foreground="White"/>
</WrapPanel>
@@ -219,7 +219,7 @@
<TextBlock Text="温度" FontSize="18" Foreground="White"/>
</WrapPanel>
<WrapPanel Grid.Column="1" Grid.Row="8" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding Temperature1}" FontSize="18" Margin="0 0 18 0" Foreground="Black" Width="50"/>
+ <TextBlock Text="{Binding Temperature1}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
<TextBlock Text="℃" FontSize="18" Foreground="White"/>
</WrapPanel>
@@ -236,21 +236,21 @@
<TextBlock Text="状态" FontSize="18" Foreground="White"/>
</WrapPanel>
<WrapPanel Grid.Column="1" Grid.Row="10" VerticalAlignment="Center" HorizontalAlignment="Center">
- <TextBlock Text="{Binding Status1}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="50"/>
+ <TextBlock Text="{Binding Status1}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
</WrapPanel>
<WrapPanel Grid.Column="2" Grid.Row="10" VerticalAlignment="Center" HorizontalAlignment="Center">
- <TextBlock Text="{Binding Status11}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="50"/>
+ <TextBlock Text="{Binding Status11}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
</WrapPanel>
<WrapPanel Grid.Column="0" Grid.Row="11" VerticalAlignment="Center" HorizontalAlignment="Right">
<TextBlock Text="POL压力" FontSize="18" Foreground="White"/>
</WrapPanel>
<WrapPanel Grid.Column="1" Grid.Row="11" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding POLPressure1}" FontSize="18" Margin="0 0 18 0" Foreground="Black" Width="50"/>
+ <TextBlock Text="{Binding POLPressure1}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
<TextBlock Text="MPa" FontSize="18" Foreground="White"/>
</WrapPanel>
<WrapPanel Grid.Column="2" Grid.Row="11" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding POLPressure1}" FontSize="18" Margin="0 0 18 0" Foreground="Black" Width="50"/>
+ <TextBlock Text="{Binding POLPressure1}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
<TextBlock Text="MPa" FontSize="18" Foreground="White"/>
</WrapPanel>
@@ -258,11 +258,11 @@
<TextBlock Text="POL温度" FontSize="18" Foreground="White"/>
</WrapPanel>
<WrapPanel Grid.Column="1" Grid.Row="12" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding POLTemperature1}" FontSize="18" Margin="0 0 18 0" Foreground="Black" Width="50"/>
+ <TextBlock Text="{Binding POLTemperature1}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
<TextBlock Text="℃" FontSize="18" Foreground="White"/>
</WrapPanel>
<WrapPanel Grid.Column="2" Grid.Row="12" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding POLTemperature11}" FontSize="18" Margin="0 0 18 0" Foreground="Black" Width="50"/>
+ <TextBlock Text="{Binding POLTemperature11}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
<TextBlock Text="℃" FontSize="18" Foreground="White"/>
</WrapPanel>
@@ -270,22 +270,22 @@
<TextBlock Text="ISO压力" FontSize="18" Foreground="White"/>
</WrapPanel>
<WrapPanel Grid.Column="1" Grid.Row="13" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding ISOPressure1}" FontSize="18" Margin="0 0 18 0" Foreground="Black" Width="50"/>
+ <TextBlock Text="{Binding ISOPressure1}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
<TextBlock Text="MPa" FontSize="18" Foreground="White"/>
</WrapPanel>
<WrapPanel Grid.Column="2" Grid.Row="13" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding ISOPressure11}" FontSize="18" Margin="0 0 18 0" Foreground="Black" Width="50"/>
+ <TextBlock Text="{Binding ISOPressure11}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
<TextBlock Text="℃" FontSize="18" Foreground="White"/>
</WrapPanel>
<WrapPanel Grid.Column="0" Grid.Row="14" VerticalAlignment="Center" HorizontalAlignment="Right">
<TextBlock Text="ISO温度" FontSize="18" Foreground="White"/>
</WrapPanel>
<WrapPanel Grid.Column="1" Grid.Row="14" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding ISOTemperature11}" FontSize="18" Margin="0 0 18 0" Foreground="Black" Width="50"/>
+ <TextBlock Text="{Binding ISOTemperature11}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
<TextBlock Text="℃" FontSize="18" Foreground="White"/>
</WrapPanel>
<WrapPanel Grid.Column="2" Grid.Row="14" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding ISOTemperature11}" FontSize="18" Margin="0 0 18 0" Foreground="Black" Width="50"/>
+ <TextBlock Text="{Binding ISOTemperature11}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
<TextBlock Text="℃" FontSize="18" Foreground="White"/>
</WrapPanel>
</Grid>
@@ -300,7 +300,7 @@
<RowDefinition Height="0.08*" />
<RowDefinition />
</Grid.RowDefinitions>
- <Border Grid.Row="0" BorderBrush="#0288d1" BorderThickness="1" CornerRadius="0" Background="#1157b9" Margin="1,1,5,5" >
+ <Border Grid.Row="0" BorderBrush="#0288d1" BorderThickness="1" CornerRadius="0" Background="#1157b9" Margin="1" >
<TextBlock Text="2系统" FontSize="23" FontWeight="Bold" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
<Border Grid.Row="1" BorderBrush="#0288d1" BorderThickness="0" CornerRadius="5" Background="Transparent" Margin="1,1,5,5">
@@ -343,11 +343,11 @@
<TextBlock Text="输入压力" FontSize="18" Foreground="White"/>
</StackPanel>
<WrapPanel Grid.Column="1" Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding PolInputPressure2}" FontSize="18" Margin="0 0 18 0" Foreground="Black" Width="50"/>
+ <TextBlock Text="{Binding PolInputPressure2}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
<TextBlock Text="MPa" FontSize="18" Foreground="White" />
</WrapPanel>
<WrapPanel Grid.Column="2" Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding IsoInputPressure2}" FontSize="18" Margin="0 0 18 0" Foreground="Black" Width="50"/>
+ <TextBlock Text="{Binding IsoInputPressure2}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
<TextBlock Text="MPa" FontSize="18" Foreground="White"/>
</WrapPanel>
@@ -356,11 +356,11 @@
<TextBlock Text="输出压力" FontSize="18" Foreground="White"/>
</WrapPanel>
<WrapPanel Grid.Column="1" Grid.Row="2" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding PolOutputPressure2}" FontSize="18" Margin="0 0 18 0" Foreground="Black" Width="50"/>
+ <TextBlock Text="{Binding PolOutputPressure2}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
<TextBlock Text="MPa" FontSize="18" Foreground="White"/>
</WrapPanel>
<WrapPanel Grid.Column="2" Grid.Row="2" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding IsoOutputPressure2}" FontSize="18" Margin="0 0 18 0" Foreground="Black" Width="50"/>
+ <TextBlock Text="{Binding IsoOutputPressure2}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
<TextBlock Text="MPa" FontSize="18" Foreground="White"/>
</WrapPanel>
@@ -368,11 +368,11 @@
<TextBlock Text="流量" FontSize="18" Foreground="White"/>
</WrapPanel>
<WrapPanel Grid.Column="1" Grid.Row="3" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding PolFlow2}" FontSize="18" Margin="0 0 18 0" Foreground="Black" Width="50"/>
+ <TextBlock Text="{Binding PolFlow2}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
<TextBlock Text="g/s" FontSize="18" Foreground="White"/>
</WrapPanel>
<WrapPanel Grid.Column="2" Grid.Row="3" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding IsoFlow2}" FontSize="18" Margin="0 0 18 0" Foreground="Black" Width="50"/>
+ <TextBlock Text="{Binding IsoFlow2}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
<TextBlock Text="g/s" FontSize="18" Foreground="White" />
</WrapPanel>
@@ -380,11 +380,11 @@
<TextBlock Text="温度" FontSize="18" Foreground="White"/>
</WrapPanel>
<WrapPanel Grid.Column="1" Grid.Row="4" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding PoleTmperature2}" FontSize="18" Margin="0 0 18 0" Foreground="Black" Width="50"/>
+ <TextBlock Text="{Binding PoleTmperature2}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
<TextBlock Text="℃" FontSize="18" Foreground="White" />
</WrapPanel>
<WrapPanel Grid.Column="2" Grid.Row="4" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding IsoTemperature2}" FontSize="18" Margin="0 0 18 0" Foreground="Black"/>
+ <TextBlock Text="{Binding IsoTemperature2}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
<TextBlock Text="℃" FontSize="18" Foreground="White"/>
</WrapPanel>
@@ -392,11 +392,11 @@
<TextBlock Text="料位" FontSize="18" Foreground="White"/>
</WrapPanel>
<WrapPanel Grid.Column="1" Grid.Row="5" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding PolMaterialLevel2}" FontSize="18" Margin="0 0 18 0" Foreground="Black" Width="50"/>
+ <TextBlock Text="{Binding PolMaterialLevel2}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
<TextBlock Text="%" FontSize="18" Foreground="White"/>
</WrapPanel>
<WrapPanel Grid.Column="2" Grid.Row="5" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding IsoMaterialLevel2}" FontSize="18" Margin="0 0 18 0" Foreground="Black" Width="50"/>
+ <TextBlock Text="{Binding IsoMaterialLevel2}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
<TextBlock Text="%" FontSize="18" Foreground="White"/>
</WrapPanel>
@@ -407,7 +407,7 @@
<TextBlock Text="压力" FontSize="18" Foreground="White"/>
</WrapPanel>
<WrapPanel Grid.Column="1" Grid.Row="7" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding Pressure2}" FontSize="18" Margin="0 0 18 0" Foreground="Black" Width="50"/>
+ <TextBlock Text="{Binding Pressure2}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
<TextBlock Text="MPa" FontSize="18" Foreground="White"/>
</WrapPanel>
@@ -415,7 +415,7 @@
<TextBlock Text="温度" FontSize="18" Foreground="White"/>
</WrapPanel>
<WrapPanel Grid.Column="1" Grid.Row="8" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding Temperature2}" FontSize="18" Margin="0 0 18 0" Foreground="Black" Width="50"/>
+ <TextBlock Text="{Binding Temperature2}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
<TextBlock Text="℃" FontSize="18" Foreground="White"/>
</WrapPanel>
@@ -446,11 +446,11 @@
<TextBlock Text="POL压力" FontSize="18" Foreground="White"/>
</WrapPanel>
<WrapPanel Grid.Column="1" Grid.Row="11" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding POLPressure2}" FontSize="18" Margin="0 0 18 0" Foreground="Black" Width="50"/>
+ <TextBlock Text="{Binding POLPressure2}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
<TextBlock Text="MPa" FontSize="18" Foreground="White"/>
</WrapPanel>
<WrapPanel Grid.Column="2" Grid.Row="11" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding POLPressure22}" FontSize="18" Margin="0 0 18 0" Foreground="Black" Width="50"/>
+ <TextBlock Text="{Binding POLPressure22}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
<TextBlock Text="MPa" FontSize="18" Foreground="White"/>
</WrapPanel>
@@ -458,11 +458,11 @@
<TextBlock Text="POL温度" FontSize="18" Foreground="White"/>
</WrapPanel>
<WrapPanel Grid.Column="1" Grid.Row="12" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding POLTemperature2}" FontSize="18" Margin="0 0 18 0" Foreground="Black" Width="50"/>
+ <TextBlock Text="{Binding POLTemperature2}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
<TextBlock Text="℃" FontSize="18" Foreground="White"/>
</WrapPanel>
<WrapPanel Grid.Column="2" Grid.Row="12" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding POLTemperature22}" FontSize="18" Margin="0 0 18 0" Foreground="Black" Width="50"/>
+ <TextBlock Text="{Binding POLTemperature22}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
<TextBlock Text="℃" FontSize="18" Foreground="White"/>
</WrapPanel>
@@ -470,11 +470,11 @@
<TextBlock Text="ISO压力" FontSize="18" Foreground="White"/>
</WrapPanel>
<WrapPanel Grid.Column="1" Grid.Row="13" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding ISOPressure2}" FontSize="18" Margin="0 0 18 0" Foreground="Black" Width="50"/>
+ <TextBlock Text="{Binding ISOPressure2}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
<TextBlock Text="MPa" FontSize="18" Foreground="White"/>
</WrapPanel>
<WrapPanel Grid.Column="2" Grid.Row="13" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding ISOPressure22}" FontSize="18" Margin="0 0 18 0" Foreground="Black" Width="50"/>
+ <TextBlock Text="{Binding ISOPressure22}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
<TextBlock Text="MPa" FontSize="18" Foreground="White"/>
</WrapPanel>
@@ -482,11 +482,11 @@
<TextBlock Text="ISO温度" FontSize="18" Foreground="White"/>
</WrapPanel>
<WrapPanel Grid.Column="1" Grid.Row="14" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding ISOTemperature22}" FontSize="18" Margin="0 0 18 0" Foreground="Black" Width="50"/>
+ <TextBlock Text="{Binding ISOTemperature22}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
<TextBlock Text="℃" FontSize="18" Foreground="White"/>
</WrapPanel>
<WrapPanel Grid.Column="2" Grid.Row="14" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding ISOTemperature222}" FontSize="18" Margin="0 0 18 0" Foreground="Black" Width="50"/>
+ <TextBlock Text="{Binding ISOTemperature222}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
<TextBlock Text="℃" FontSize="18" Foreground="White"/>
</WrapPanel>
</Grid>
@@ -514,11 +514,13 @@
<DataGrid.Columns>
<DataGridTextColumn Binding="{Binding No}" Header="编号" Width="1*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding System}" Header="系统" Width="1*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
- <DataGridTextColumn Binding="{Binding PolInjectionpressure}" Header="POL注料压力" Width="1*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
- <DataGridTextColumn Binding="{Binding IsoInjectionpressure}" Header="ISO注料压力" Width="1*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
- <DataGridTextColumn Binding="{Binding PolInjectiontemperature}" Header="POL注料温度" Width="2*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
+ <DataGridTextColumn Binding="{Binding GunHead}" Header="注料枪头" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
+ <DataGridTextColumn Binding="{Binding StationNumber}" Header="注料工位号" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
+ <DataGridTextColumn Binding="{Binding PolInjectionpressure}" Header="POL注料压力" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
+ <DataGridTextColumn Binding="{Binding IsoInjectionpressure}" Header="ISO注料压力" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
+ <DataGridTextColumn Binding="{Binding PolInjectiontemperature}" Header="POL注料温度" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
<DataGridTextColumn Binding="{Binding IsoInjectiontemperature}" Header="ISO注料温度" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
- <DataGridTextColumn Binding="{Binding LastTime ,StringFormat=\{0:MM-dd HH:mm\}}" Header="最后时间" Width="1.5*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
+ <DataGridTextColumn Binding="{Binding LastTime ,StringFormat=\{0:MM-dd HH:mm\}}" Header="采集时间" Width="1.5*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
</DataGrid.Columns>
</DataGrid>
</Grid>
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 @@
<ColumnDefinition Width="2*"/>
<ColumnDefinition/>
<ColumnDefinition/>
- <ColumnDefinition/>
- <ColumnDefinition/>
+ <ColumnDefinition Width="0.5*"/>
<ColumnDefinition Width="0.5*"/>
<ColumnDefinition Width="0.5*"/>
<ColumnDefinition Width="2*"/>
<ColumnDefinition/>
<ColumnDefinition/>
- <ColumnDefinition/>
- <ColumnDefinition/>
+ <ColumnDefinition Width="0.5*"/>
</Grid.ColumnDefinitions>
<Border Grid.Row="0" Grid.ColumnSpan="5" Background="#1157b9">
<TextBlock Text="发泡线(南)" Foreground="White" FontSize="18" FontWeight="Bold"/>
@@ -158,71 +156,51 @@
<Border Grid.Row="7" Grid.Column="3">
<TextBlock Text="{Binding Production[5]}" Foreground="White" FontSize="18" FontWeight="Bold"/>
</Border>
- <Border Grid.Row="0" Grid.Column="5" Grid.ColumnSpan="5" >
+ <Border Grid.Row="0" Grid.Column="5" Grid.ColumnSpan="3" >
<TextBlock Text="{Binding Totle,Mode=TwoWay}" Foreground="White" FontSize="30" FontWeight="Bold"/>
</Border>
- <Border Grid.Row="1" Grid.Column="4" Background="#1157b9">
- <TextBlock Text="发泡量" Foreground="White" FontSize="18" FontWeight="Bold"/>
- </Border>
- <Border Grid.Row="2" Grid.Column="4" >
- <TextBlock Text="{Binding FoamVolume[0]}" Foreground="White" FontSize="18" FontWeight="Bold"/>
- </Border>
- <Border Grid.Row="3" Grid.Column="4">
- <TextBlock Text="{Binding FoamVolume[1]}" Foreground="White" FontSize="18" FontWeight="Bold"/>
- </Border>
- <Border Grid.Row="4" Grid.Column="4">
- <TextBlock Text="{Binding FoamVolume[2]}" Foreground="White" FontSize="18" FontWeight="Bold"/>
- </Border>
- <Border Grid.Row="5" Grid.Column="4">
- <TextBlock Text="{Binding FoamVolume[3]}" Foreground="White" FontSize="18" FontWeight="Bold"/>
- </Border>
- <Border Grid.Row="6" Grid.Column="4">
- <TextBlock Text="{Binding FoamVolume[4]}" Foreground="White" FontSize="18" FontWeight="Bold"/>
- </Border>
- <Border Grid.Row="7" Grid.Column="4">
- <TextBlock Text="{Binding FoamVolume[5]}" Foreground="White" FontSize="18" FontWeight="Bold"/>
- </Border>
+
- <Border Grid.Row="1" Grid.Column="5" Background="#1157b9">
+ <Border Grid.Row="1" Grid.Column="4" Background="#1157b9">
<TextBlock Text="内外模温度" Foreground="White" FontSize="18"/>
</Border>
- <Border Grid.Row="2" Grid.Column="5" >
+ <Border Grid.Row="2" Grid.Column="4" >
<WrapPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock Text="{Binding InternalTemperature[0]}" Foreground="White" FontSize="18" FontWeight="Bold"/>
<TextBlock Text="|" Foreground="White" FontSize="18" FontWeight="Bold"/>
<TextBlock Text="{Binding OutsideTemperature[0]}" Foreground="White" FontSize="18" FontWeight="Bold"/>
</WrapPanel>
</Border>
- <Border Grid.Row="3" Grid.Column="5">
+ <Border Grid.Row="3" Grid.Column="4">
<WrapPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock Text="{Binding InternalTemperature[1]}" Foreground="White" FontSize="18" FontWeight="Bold"/>
<TextBlock Text="|" Foreground="White" FontSize="18" FontWeight="Bold"/>
<TextBlock Text="{Binding OutsideTemperature[1]}" Foreground="White" FontSize="18" FontWeight="Bold"/>
</WrapPanel>
</Border>
- <Border Grid.Row="4" Grid.Column="5">
+ <Border Grid.Row="4" Grid.Column="4">
<WrapPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock Text="{Binding InternalTemperature[2]}" Foreground="White" FontSize="18" FontWeight="Bold"/>
<TextBlock Text="|" Foreground="White" FontSize="18" FontWeight="Bold"/>
<TextBlock Text="{Binding OutsideTemperature[2]}" Foreground="White" FontSize="18" FontWeight="Bold"/>
</WrapPanel>
</Border>
- <Border Grid.Row="5" Grid.Column="5">
+ <Border Grid.Row="5" Grid.Column="4">
<WrapPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock Text="{Binding InternalTemperature[3]}" Foreground="White" FontSize="18" FontWeight="Bold"/>
<TextBlock Text="|" Foreground="White" FontSize="18" FontWeight="Bold"/>
<TextBlock Text="{Binding OutsideTemperature[3]}" Foreground="White" FontSize="18" FontWeight="Bold"/>
</WrapPanel>
</Border>
- <Border Grid.Row="6" Grid.Column="5">
+ <Border Grid.Row="6" Grid.Column="4">
<WrapPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock Text="{Binding InternalTemperature[4]}" Foreground="White" FontSize="18" FontWeight="Bold"/>
<TextBlock Text="|" Foreground="White" FontSize="18" FontWeight="Bold"/>
<TextBlock Text="{Binding OutsideTemperature[4]}" Foreground="White" FontSize="18" FontWeight="Bold"/>
</WrapPanel>
</Border>
- <Border Grid.Row="7" Grid.Column="5">
+ <Border Grid.Row="7" Grid.Column="4">
<WrapPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock Text="{Binding InternalTemperature[5]}" Foreground="White" FontSize="18" FontWeight="Bold"/>
<TextBlock Text="|" Foreground="White" FontSize="18" FontWeight="Bold"/>
@@ -230,182 +208,161 @@
</WrapPanel>
</Border>
- <Border Grid.Row="1" Grid.Column="6" Background="#1157b9">
+ <Border Grid.Row="1" Grid.Column="5" Background="#1157b9">
<TextBlock Text="节拍" Foreground="White" FontSize="18"/>
</Border>
- <Border Grid.Row="2" Grid.Column="6" >
+ <Border Grid.Row="2" Grid.Column="5" >
<TextBlock Text="{Binding Beat[0]}" Foreground="White" FontSize="18"/>
</Border>
- <Border Grid.Row="3" Grid.Column="6">
+ <Border Grid.Row="3" Grid.Column="5">
<TextBlock Text="{Binding Beat[1]}" Foreground="White" FontSize="18"/>
</Border>
- <Border Grid.Row="4" Grid.Column="6">
+ <Border Grid.Row="4" Grid.Column="5">
<TextBlock Text="{Binding Beat[2]}" Foreground="White" FontSize="18"/>
</Border>
- <Border Grid.Row="5" Grid.Column="6">
+ <Border Grid.Row="5" Grid.Column="5">
<TextBlock Text="{Binding Beat[3]}" Foreground="White" FontSize="18"/>
</Border>
- <Border Grid.Row="6" Grid.Column="6">
+ <Border Grid.Row="6" Grid.Column="5">
<TextBlock Text="{Binding Beat[4]}" Foreground="White" FontSize="18"/>
</Border>
- <Border Grid.Row="7" Grid.Column="6">
+ <Border Grid.Row="7" Grid.Column="5">
<TextBlock Text="{Binding Beat[5]}" Foreground="White" FontSize="18"/>
</Border>
- <Border Grid.Row="0" Grid.Column="10" Grid.ColumnSpan="5" Background="#1157b9">
+ <Border Grid.Row="0" Grid.Column="8" Grid.ColumnSpan="5" Background="#1157b9">
<TextBlock Text="发泡线(北)" Foreground="White" FontSize="18" FontWeight="Bold"/>
</Border>
- <Border Grid.Row="1" Grid.Column="7" Background="#1157b9">
+ <Border Grid.Row="1" Grid.Column="6" Background="#1157b9">
<TextBlock Text="夹具号" Foreground="White" FontSize="18" FontWeight="Bold"/>
</Border>
- <Border Grid.Row="2" Grid.Column="7" Background="#1157b9">
+ <Border Grid.Row="2" Grid.Column="6" Background="#1157b9">
<TextBlock Text="1" Foreground="White" FontSize="18" FontWeight="Bold"/>
</Border>
- <Border Grid.Row="3" Grid.Column="7" Background="#1157b9">
+ <Border Grid.Row="3" Grid.Column="6" Background="#1157b9">
<TextBlock Text="2" Foreground="White" FontSize="18" FontWeight="Bold"/>
</Border>
- <Border Grid.Row="4" Grid.Column="7" Background="#1157b9">
+ <Border Grid.Row="4" Grid.Column="6" Background="#1157b9">
<TextBlock Text="3" Foreground="White" FontSize="18" FontWeight="Bold"/>
</Border>
- <Border Grid.Row="5" Grid.Column="7" Background="#1157b9">
+ <Border Grid.Row="5" Grid.Column="6" Background="#1157b9">
<TextBlock Text="4" Foreground="White" FontSize="18" FontWeight="Bold"/>
</Border>
- <Border Grid.Row="6" Grid.Column="7" Background="#1157b9">
+ <Border Grid.Row="6" Grid.Column="6" Background="#1157b9">
<TextBlock Text="5" Foreground="White" FontSize="18" FontWeight="Bold"/>
</Border>
- <Border Grid.Row="7" Grid.Column="7" Background="#1157b9">
+ <Border Grid.Row="7" Grid.Column="6" Background="#1157b9">
<TextBlock Text="6" Foreground="White" FontSize="18" FontWeight="Bold"/>
</Border>
- <Border Grid.Row="1" Grid.Column="8" Background="#1157b9">
+ <Border Grid.Row="1" Grid.Column="7" Background="#1157b9">
<TextBlock Text="状态" Foreground="White" FontSize="18" FontWeight="Bold"/>
</Border>
- <Border Grid.Row="2" Grid.Column="8" >
+ <Border Grid.Row="2" Grid.Column="7" >
<Path Data="M 5,5 A 15,15 45 1 1 0,1 Z" Stroke="{Binding StatusColor[6]}" StrokeThickness="1" Fill="{Binding StatusColor[6]}" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
- <Border Grid.Row="3" Grid.Column="8" >
+ <Border Grid.Row="3" Grid.Column="7" >
<Path Data="M 5,5 A 15,15 45 1 1 0,1 Z" Stroke="{Binding StatusColor[7]}" StrokeThickness="1" Fill="{Binding StatusColor[7]}" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
- <Border Grid.Row="4" Grid.Column="8" >
+ <Border Grid.Row="4" Grid.Column="7" >
<Path Data="M 5,5 A 15,15 45 1 1 0,1 Z" Stroke="{Binding StatusColor[8]}" StrokeThickness="1" Fill="{Binding StatusColor[8]}" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
- <Border Grid.Row="5" Grid.Column="8" >
+ <Border Grid.Row="5" Grid.Column="7" >
<Path Data="M 5,5 A 15,15 45 1 1 0,1 Z" Stroke="{Binding StatusColor[9]}" StrokeThickness="1" Fill="{Binding StatusColor[9]}" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
- <Border Grid.Row="6" Grid.Column="8" >
+ <Border Grid.Row="6" Grid.Column="7" >
<Path Data="M 5,5 A 15,15 45 1 1 0,1 Z" Stroke="{Binding StatusColor[10]}" StrokeThickness="1" Fill="{Binding StatusColor[10]}" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
- <Border Grid.Row="7" Grid.Column="8" >
+ <Border Grid.Row="7" Grid.Column="7" >
<Path Data="M 5,5 A 15,15 45 1 1 0,1 Z" Stroke="{Binding StatusColor[11]}" StrokeThickness="1" Fill="{Binding StatusColor[11]}" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
- <Border Grid.Row="1" Grid.Column="9" Background="#1157b9">
+ <Border Grid.Row="1" Grid.Column="8" Background="#1157b9">
<TextBlock Text="发泡型号" Foreground="White" FontSize="18" FontWeight="Bold"/>
</Border>
- <Border Grid.Row="2" Grid.Column="9" >
+ <Border Grid.Row="2" Grid.Column="8" >
<TextBlock Text="{Binding FixtureName[6]}" Foreground="White" FontSize="18"/>
</Border>
- <Border Grid.Row="3" Grid.Column="9" >
+ <Border Grid.Row="3" Grid.Column="8" >
<TextBlock Text="{Binding FixtureName[7]}" Foreground="White" FontSize="18"/>
</Border>
- <Border Grid.Row="4" Grid.Column="9" >
+ <Border Grid.Row="4" Grid.Column="8" >
<TextBlock Text="{Binding FixtureName[8]}" Foreground="White" FontSize="18"/>
</Border>
- <Border Grid.Row="5" Grid.Column="9">
+ <Border Grid.Row="5" Grid.Column="8">
<TextBlock Text="{Binding FixtureName[9]}" Foreground="White" FontSize="18"/>
</Border>
- <Border Grid.Row="6" Grid.Column="9" >
+ <Border Grid.Row="6" Grid.Column="8" >
<TextBlock Text="{Binding FixtureName[10]}" Foreground="White" FontSize="18"/>
</Border>
- <Border Grid.Row="7" Grid.Column="9" >
+ <Border Grid.Row="7" Grid.Column="8" >
<TextBlock Text="{Binding FixtureName[11]}" Foreground="White" FontSize="18"/>
</Border>
- <Border Grid.Row="1" Grid.Column="10" Background="#1157b9">
+ <Border Grid.Row="1" Grid.Column="9" Background="#1157b9">
<TextBlock Text="夹具产量" Foreground="White" FontSize="18" FontWeight="Bold"/>
</Border>
- <Border Grid.Row="2" Grid.Column="10" >
+ <Border Grid.Row="2" Grid.Column="9" >
<TextBlock Text="{Binding Production[6]}" Foreground="White" FontSize="18" FontWeight="Bold"/>
</Border>
- <Border Grid.Row="3" Grid.Column="10">
+ <Border Grid.Row="3" Grid.Column="9">
<TextBlock Text="{Binding Production[7]}" Foreground="White" FontSize="18" FontWeight="Bold"/>
</Border>
- <Border Grid.Row="4" Grid.Column="10">
+ <Border Grid.Row="4" Grid.Column="9">
<TextBlock Text="{Binding Production[8]}" Foreground="White" FontSize="18" FontWeight="Bold"/>
</Border>
- <Border Grid.Row="5" Grid.Column="10">
+ <Border Grid.Row="5" Grid.Column="9">
<TextBlock Text="{Binding Production[9]}" Foreground="White" FontSize="18" FontWeight="Bold"/>
</Border>
- <Border Grid.Row="6" Grid.Column="10">
+ <Border Grid.Row="6" Grid.Column="9">
<TextBlock Text="{Binding Production[10]}" Foreground="White" FontSize="18" FontWeight="Bold"/>
</Border>
- <Border Grid.Row="7" Grid.Column="10">
+ <Border Grid.Row="7" Grid.Column="9">
<TextBlock Text="{Binding Production[11]}" Foreground="White" FontSize="18" FontWeight="Bold"/>
</Border>
- <Border Grid.Row="1" Grid.Column="11" Background="#1157b9">
- <TextBlock Text="发泡量" Foreground="White" FontSize="18" FontWeight="Bold"/>
- </Border>
- <Border Grid.Row="2" Grid.Column="11" >
- <TextBlock Text="{Binding FoamVolume[6]}" Foreground="White" FontSize="18" FontWeight="Bold"/>
- </Border>
- <Border Grid.Row="3" Grid.Column="11">
- <TextBlock Text="{Binding FoamVolume[7]}" Foreground="White" FontSize="18" FontWeight="Bold"/>
- </Border>
- <Border Grid.Row="4" Grid.Column="11">
- <TextBlock Text="{Binding FoamVolume[8]}" Foreground="White" FontSize="18" FontWeight="Bold"/>
- </Border>
- <Border Grid.Row="5" Grid.Column="11">
- <TextBlock Text="{Binding FoamVolume[9]}" Foreground="White" FontSize="18" FontWeight="Bold"/>
- </Border>
- <Border Grid.Row="6" Grid.Column="11">
- <TextBlock Text="{Binding FoamVolume[10]}" Foreground="White" FontSize="18" FontWeight="Bold"/>
- </Border>
- <Border Grid.Row="7" Grid.Column="11">
- <TextBlock Text="{Binding FoamVolume[11]}" Foreground="White" FontSize="18" FontWeight="Bold"/>
- </Border>
- <Border Grid.Row="1" Grid.Column="12" Background="#1157b9">
+ <Border Grid.Row="1" Grid.Column="10" Background="#1157b9">
<TextBlock Text="内外模温度" Foreground="White" FontSize="18" FontWeight="Bold"/>
</Border>
- <Border Grid.Row="2" Grid.Column="12" >
+ <Border Grid.Row="2" Grid.Column="10" >
<WrapPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock Text="{Binding InternalTemperature[6]}" Foreground="White" FontSize="18" FontWeight="Bold"/>
<TextBlock Text="|" Foreground="White" FontSize="18" FontWeight="Bold"/>
<TextBlock Text="{Binding OutsideTemperature[6]}" Foreground="White" FontSize="18" FontWeight="Bold"/>
</WrapPanel>
</Border>
- <Border Grid.Row="3" Grid.Column="12">
+ <Border Grid.Row="3" Grid.Column="10">
<WrapPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock Text="{Binding InternalTemperature[7]}" Foreground="White" FontSize="18" FontWeight="Bold"/>
<TextBlock Text="|" Foreground="White" FontSize="18" FontWeight="Bold"/>
<TextBlock Text="{Binding OutsideTemperature[7]}" Foreground="White" FontSize="18" FontWeight="Bold"/>
</WrapPanel>
</Border>
- <Border Grid.Row="4" Grid.Column="12">
+ <Border Grid.Row="4" Grid.Column="10">
<WrapPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock Text="{Binding InternalTemperature[8]}" Foreground="White" FontSize="18" FontWeight="Bold"/>
<TextBlock Text="|" Foreground="White" FontSize="18" FontWeight="Bold"/>
<TextBlock Text="{Binding OutsideTemperature[8]}" Foreground="White" FontSize="18" FontWeight="Bold"/>
</WrapPanel>
</Border>
- <Border Grid.Row="5" Grid.Column="12">
+ <Border Grid.Row="5" Grid.Column="10">
<WrapPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock Text="{Binding InternalTemperature[9]}" Foreground="White" FontSize="18" FontWeight="Bold"/>
<TextBlock Text="|" Foreground="White" FontSize="18" FontWeight="Bold"/>
<TextBlock Text="{Binding OutsideTemperature[9]}" Foreground="White" FontSize="18" FontWeight="Bold"/>
</WrapPanel>
</Border>
- <Border Grid.Row="6" Grid.Column="12">
+ <Border Grid.Row="6" Grid.Column="10">
<WrapPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock Text="{Binding InternalTemperature[10]}" Foreground="White" FontSize="18" FontWeight="Bold"/>
<TextBlock Text="|" Foreground="White" FontSize="18" FontWeight="Bold"/>
<TextBlock Text="{Binding OutsideTemperature[10]}" Foreground="White" FontSize="18" FontWeight="Bold"/>
</WrapPanel>
</Border>
- <Border Grid.Row="7" Grid.Column="12">
+ <Border Grid.Row="7" Grid.Column="10">
<WrapPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock Text="{Binding InternalTemperature[11]}" Foreground="White" FontSize="18" FontWeight="Bold"/>
<TextBlock Text="|" Foreground="White" FontSize="18" FontWeight="Bold"/>
@@ -413,25 +370,25 @@
</WrapPanel>
</Border>
- <Border Grid.Row="1" Grid.Column="13" Background="#1157b9">
+ <Border Grid.Row="1" Grid.Column="11" Background="#1157b9">
<TextBlock Text="节拍" Foreground="White" FontSize="18" FontWeight="Bold"/>
</Border>
- <Border Grid.Row="2" Grid.Column="13" >
+ <Border Grid.Row="2" Grid.Column="11" >
<TextBlock Text="{Binding Beat[6]}" Foreground="White" FontSize="18"/>
</Border>
- <Border Grid.Row="3" Grid.Column="13">
+ <Border Grid.Row="3" Grid.Column="11">
<TextBlock Text="{Binding Beat[7]}" Foreground="White" FontSize="18"/>
</Border>
- <Border Grid.Row="4" Grid.Column="13">
+ <Border Grid.Row="4" Grid.Column="11">
<TextBlock Text="{Binding Beat[8]}" Foreground="White" FontSize="18"/>
</Border>
- <Border Grid.Row="5" Grid.Column="13">
+ <Border Grid.Row="5" Grid.Column="11">
<TextBlock Text="{Binding Beat[9]}" Foreground="White" FontSize="18"/>
</Border>
- <Border Grid.Row="6" Grid.Column="13">
+ <Border Grid.Row="6" Grid.Column="11">
<TextBlock Text="{Binding Beat[10]}" Foreground="White" FontSize="18"/>
</Border>
- <Border Grid.Row="7" Grid.Column="13">
+ <Border Grid.Row="7" Grid.Column="11">
<TextBlock Text="{Binding Beat[11]}" Foreground="White" FontSize="18"/>
</Border>
</Grid>
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 @@
<Grid>
<StackPanel Grid.Row="1" Height="50" Orientation="Horizontal" Margin="5 0" HorizontalAlignment="Left">
- <Button Content="实时监控" x:Name="FirstPage" FontSize="18" Margin="5 0" Command="{Binding SwitchPagesCommand}" CommandParameter="{Binding Name,ElementName=FirstPage}" />
- <Button Content="实时库存" x:Name="RealTimeInventoryPage" FontSize="18" Margin="5 0" Command="{Binding SwitchPagesCommand}" CommandParameter="{Binding Name,ElementName=RealTimeInventoryPage}" />
- <Button Content="任务监控" x:Name="MonitorPage" FontSize="18" Margin="5 0" Command="{Binding SwitchPagesCommand}" CommandParameter="{Binding Name,ElementName=MonitorPage}" />
- <Button Content="入库统计" x:Name="StatisticsPage" FontSize="18" Margin="5 0" Command="{Binding SwitchPagesCommand}" CommandParameter="{Binding Name,ElementName=StatisticsPage}" />
- <Button Content="发泡计划" x:Name="FoamPlanPage" FontSize="18" Margin="5 0" Command="{Binding SwitchPagesCommand}" CommandParameter="{Binding Name,ElementName=FoamPlanPage}" />
- <Button Content="发泡线监控" x:Name="FoamMonitorPage" FontSize="18" Margin="5 0" Command="{Binding SwitchPagesCommand}" CommandParameter="{Binding Name,ElementName=FoamMonitorPage}" />
- <Button Content="发泡机监控" x:Name="FoamMachinesPage" FontSize="18" Margin="5 0" Command="{Binding SwitchPagesCommand}" CommandParameter="{Binding Name,ElementName=FoamMachinesPage}" />
- <Button Content="老发泡线监控" x:Name="OldBoxFoamPage" FontSize="18" Margin="5 0" Command="{Binding SwitchPagesCommand}" CommandParameter="{Binding Name,ElementName=OldBoxFoamPage}" />
+ <Button Content="实时监控" Height="40" x:Name="FirstPage" FontSize="18" Margin="2 0" Command="{Binding SwitchPagesCommand}" CommandParameter="{Binding Name,ElementName=FirstPage}" />
+ <Button Content="实时库存" Height="40" x:Name="RealTimeInventoryPage" FontSize="18" Margin="2 0" Command="{Binding SwitchPagesCommand}" CommandParameter="{Binding Name,ElementName=RealTimeInventoryPage}" />
+ <Button Content="任务监控" Height="40" x:Name="MonitorPage" FontSize="18" Margin="2 0" Command="{Binding SwitchPagesCommand}" CommandParameter="{Binding Name,ElementName=MonitorPage}" />
+ <Button Content="入库统计" Height="40" x:Name="StatisticsPage" FontSize="18" Margin="2 0" Command="{Binding SwitchPagesCommand}" CommandParameter="{Binding Name,ElementName=StatisticsPage}" />
+ <Button Content="发泡计划" Height="40" x:Name="FoamPlanPage" FontSize="18" Margin="2 0" Command="{Binding SwitchPagesCommand}" CommandParameter="{Binding Name,ElementName=FoamPlanPage}" />
+ <Button Content="发泡线监控" Height="40" x:Name="FoamMonitorPage" FontSize="18" Margin="2 0" Command="{Binding SwitchPagesCommand}" CommandParameter="{Binding Name,ElementName=FoamMonitorPage}" />
+ <Button Content="发泡机监控" Height="40" x:Name="FoamMachinesPage" FontSize="18" Margin="2 0" Command="{Binding SwitchPagesCommand}" CommandParameter="{Binding Name,ElementName=FoamMachinesPage}" />
+ <Button Content="老发泡线监控" Height="40" x:Name="OldBoxFoamPage" FontSize="18" Margin="2 0" Command="{Binding SwitchPagesCommand}" CommandParameter="{Binding Name,ElementName=OldBoxFoamPage}" />
<!--<Button Content="泡前库监控" x:Name="OldWarehousePage" FontSize="18" Margin="5 0" Command="{Binding SwitchPagesCommand}" CommandParameter="{Binding Name,ElementName=OldWarehousePage}" />-->
<!--<Button Content="库存设置" x:Name="SetLibPage" Margin="5 0" Command="{Binding SwitchPagesCommand}" CommandParameter="{Binding Name,ElementName=StatisticsPage}" />-->
- <Button Content="键 盘" x:Name="TabTip" FontSize="18" Margin="5 0" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=TabTip}" />
- <Button Content="最小化" x:Name="Minimized" FontSize="18" Margin="5 0" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Minimized}" Background="#FF9900" BorderBrush="#FF9900" />
- <Button Content="退 出" x:Name="Exit" Margin="5 0" FontSize="18" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Exit}" Background="#FF0033" BorderBrush="#FF0033"/>
+ <Button Content="键 盘" Height="40" x:Name="TabTip" FontSize="18" Margin="2 0" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=TabTip}" />
+ <Button Content="最小化" Height="40" x:Name="Minimized" FontSize="18" Margin="2 0" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Minimized}" Background="#FF9900" BorderBrush="#FF9900" />
+ <Button Content="退 出" Height="40" x:Name="Exit" Margin="2 0" FontSize="18" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Exit}" Background="#FF0033" BorderBrush="#FF0033"/>
</StackPanel>
<StackPanel Height="50" Orientation="Horizontal" HorizontalAlignment="Right">
<Border Width="30" Height="30" CornerRadius="15">
@@ -81,19 +81,19 @@
<ImageBrush x:Name="MesDbStatus" ImageSource="{Binding MesUIIcon}"/>
</Border.Background>
</Border>
- <TextBlock x:Name="MesDbStateTxt" Text="{Binding MesDbUIStatusWb}" VerticalAlignment="Center" Foreground="{Binding MesDbUIColor}" FontSize="15" Margin="10,0"/>
+ <TextBlock x:Name="MesDbStateTxt" Text="{Binding MesDbUIStatusWb}" VerticalAlignment="Center" Foreground="{Binding MesDbUIColor}" FontSize="18" Margin="10,0"/>
<Border Width="30" Height="30" CornerRadius="15">
<Border.Background>
<ImageBrush x:Name="PlcStatus" ImageSource="{Binding PlcUIIcon}"/>
</Border.Background>
</Border>
- <TextBlock x:Name="PLCState" Text="{Binding PlcUIStatusWb}" VerticalAlignment="Center" Foreground="{Binding PlcUIColor}" FontSize="15" Margin="10,0"/>
+ <TextBlock x:Name="PLCState" Text="{Binding PlcUIStatusWb}" VerticalAlignment="Center" Foreground="{Binding PlcUIColor}" FontSize="18" Margin="10,0"/>
<Border Width="30" Height="30" CornerRadius="15">
<Border.Background>
<ImageBrush x:Name="Scanner1Status" ImageSource="{Binding Scanner1UIIcon}"/>
</Border.Background>
</Border>
- <TextBlock x:Name="Scanner1" Text="{Binding Scanner1UIStatusWb}" VerticalAlignment="Center" Foreground="{Binding Scanner1UIColor}" FontSize="15" Margin="10,0"/>
+ <TextBlock x:Name="Scanner1" Text="{Binding Scanner1UIStatusWb}" VerticalAlignment="Center" Foreground="{Binding Scanner1UIColor}" FontSize="18" Margin="10,0"/>
</StackPanel>
</Grid>
diff --git a/Aucma.Core.BoxFoam/Views/OldBoxFoamPageView.xaml b/Aucma.Core.BoxFoam/Views/OldBoxFoamPageView.xaml
index 0612b18e..edcea47b 100644
--- a/Aucma.Core.BoxFoam/Views/OldBoxFoamPageView.xaml
+++ b/Aucma.Core.BoxFoam/Views/OldBoxFoamPageView.xaml
@@ -34,7 +34,7 @@
</Style>
<!--列头标题栏样式-->
<Style TargetType="DataGridColumnHeader">
- <Setter Property="HorizontalContentAlignment" Value="Center" />
+ <Setter Property="HorizontalContentAlignment" Value="Left" />
<Setter Property="BorderBrush" Value="#dddddd" />
<Setter Property="Height" Value="40"/>
<Setter Property="FontSize" Value="18"/>
@@ -60,7 +60,7 @@
</Setter>
<Style.Triggers>
<Trigger Property="IsSelected" Value="True">
- <Setter Property="Background" Value="#4285DE"/>
+ <Setter Property="Background" Value="#1152AC"/>
<Setter Property="Foreground" Value="White"/>
</Trigger>
</Style.Triggers>
@@ -71,7 +71,7 @@
<Grid Margin="0 10 0 0">
<Grid.RowDefinitions>
<RowDefinition/>
- <RowDefinition/>
+ <RowDefinition Height="1.2*"/>
</Grid.RowDefinitions>
<Border Grid.Row="0" BorderBrush="#0288d1" BorderThickness="1" CornerRadius="5" Background="#1157b9">
<Grid>
@@ -91,7 +91,7 @@
ScrollViewer.VerticalScrollBarVisibility="Auto" BorderThickness="0" CanUserAddRows="False" SelectionMode="Single" IsReadOnly="True"
Foreground="White">
<DataGrid.Columns>
- <DataGridTextColumn Binding="{Binding Obj_ID}" Header="编号" Width="auto" />
+ <DataGridTextColumn Binding="{Binding ObjId}" Header="编号" Width="*" />
<DataGridTextColumn Binding="{Binding Fixtureboxtype}" Header="夹具箱型" Width="*" />
<DataGridTextColumn Binding="{Binding Fixturestatus}" Header="夹具状态" Width="*" />
<DataGridTextColumn Binding="{Binding Production}" Header="产量" Width="*" />
@@ -113,18 +113,18 @@
</Border>
<!--库存展示-->
<Border Grid.Row="1" BorderBrush="#0288d1" BorderThickness="0" CornerRadius="5" Background="Transparent" Margin="5">
- <DataGrid Grid.Row="0" ItemsSource="{Binding OldBoxFoamDataGrid}" Background="#00000000"
+ <DataGrid Grid.Row="0" ItemsSource="{Binding OldBoxFoamTypeDataGrid}" Background="#00000000"
ColumnHeaderHeight="35" Height="{Binding Path=ActualHeight, ElementName=ScanPanel}"
RowHeight="50" AutoGenerateColumns="False" RowHeaderWidth="0" FontSize="20"
GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Auto"
ScrollViewer.VerticalScrollBarVisibility="Auto" BorderThickness="0" CanUserAddRows="False" SelectionMode="Single" IsReadOnly="True"
Foreground="White">
<DataGrid.Columns>
- <DataGridTextColumn Binding="{Binding Obj_ID}" Header="编号" Width="auto" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
- <DataGridTextColumn Binding="{Binding Local}" Header="位置" Width="1*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
- <DataGridTextColumn Binding="{Binding Obj_ID}" Header="货道" Width="1*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
- <DataGridTextColumn Binding="{Binding BoxType}" Header="箱型" Width="1*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
- <DataGridTextColumn Binding="{Binding StoreAmount}" Header="库存数" Width="2*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
+ <DataGridTextColumn Binding="{Binding ObjId}" Header="编号" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
+ <DataGridTextColumn Binding="{Binding Local}" Header="位置" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
+ <DataGridTextColumn Binding="{Binding ObjId}" Header="货道" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
+ <DataGridTextColumn Binding="{Binding BoxType}" Header="箱型" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
+ <DataGridTextColumn Binding="{Binding Storeamount}" Header="库存数" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
</DataGrid.Columns>
</DataGrid>
</Border>
diff --git a/Aucma.Core.BoxFoam/Views/RealTimeInventoryPageView.xaml b/Aucma.Core.BoxFoam/Views/RealTimeInventoryPageView.xaml
index c022284a..0111665a 100644
--- a/Aucma.Core.BoxFoam/Views/RealTimeInventoryPageView.xaml
+++ b/Aucma.Core.BoxFoam/Views/RealTimeInventoryPageView.xaml
@@ -12,14 +12,14 @@
<Border Grid.Row="1" BorderBrush="#0288d1" BorderThickness="1" CornerRadius="5" Background="Transparent" Margin="5,5">
<Grid>
<Grid.RowDefinitions>
- <RowDefinition Height="0.1*"/>
+ <RowDefinition Height="0.05*"/>
<RowDefinition/>
</Grid.RowDefinitions>
<WrapPanel Grid.Row="0" Margin="10 5 0 0" HorizontalAlignment="Left" VerticalAlignment="Center" >
- <Button Content="箱壳库" Style="{StaticResource MaterialDesignRaisedButton}" Margin="0 0 5 0" x:Name="ShellInventory" Command="{Binding InventoryOnClickCommand}" CommandParameter="{Binding Name,ElementName=ShellInventory}"/>
- <Button Content="内胆库" Style="{StaticResource MaterialDesignRaisedButton}" Margin="0 0 5 0" x:Name="LinerInventory" Command="{Binding InventoryOnClickCommand}" CommandParameter="{Binding Name,ElementName=LinerInventory}"/>
- <Button Content="泡前库" Style="{StaticResource MaterialDesignRaisedButton}" Width="100" Margin="0 0 5 0" x:Name="PqInventory" Command="{Binding InventoryOnClickCommand}" CommandParameter="{Binding Name,ElementName=PqInventory}"/>
- <Button Content="泡后库" Style="{StaticResource MaterialDesignRaisedButton}" Width="100" x:Name="PhInventory" Command="{Binding InventoryOnClickCommand}" CommandParameter="{Binding Name,ElementName=PhInventory}"/>
+ <Button Content="箱壳库" Style="{StaticResource MaterialDesignRaisedButton}" FontSize="15" Margin="0 0 5 0" x:Name="ShellInventory" Command="{Binding InventoryOnClickCommand}" CommandParameter="{Binding Name,ElementName=ShellInventory}"/>
+ <Button Content="内胆库" Style="{StaticResource MaterialDesignRaisedButton}" FontSize="15" Margin="0 0 5 0" x:Name="LinerInventory" Command="{Binding InventoryOnClickCommand}" CommandParameter="{Binding Name,ElementName=LinerInventory}"/>
+ <Button Content="泡前库" Style="{StaticResource MaterialDesignRaisedButton}" FontSize="15" Width="100" Margin="0 0 5 0" x:Name="PqInventory" Command="{Binding InventoryOnClickCommand}" CommandParameter="{Binding Name,ElementName=PqInventory}"/>
+ <Button Content="泡后库" Style="{StaticResource MaterialDesignRaisedButton}" FontSize="15" Width="100" x:Name="PhInventory" Command="{Binding InventoryOnClickCommand}" CommandParameter="{Binding Name,ElementName=PhInventory}"/>
</WrapPanel>
<StackPanel Grid.Row="1">
<!--<Border BorderBrush="#0288d1" BorderThickness="1" CornerRadius="5" Background="Transparent" Margin="5,2" x:Name="HeightPanel">-->
diff --git a/Aucma.Core.BoxFoam/Views/UserPage/AfterFoamingPageView.xaml b/Aucma.Core.BoxFoam/Views/UserPage/AfterFoamingPageView.xaml
index 0ea5ce4d..7547d6ff 100644
--- a/Aucma.Core.BoxFoam/Views/UserPage/AfterFoamingPageView.xaml
+++ b/Aucma.Core.BoxFoam/Views/UserPage/AfterFoamingPageView.xaml
@@ -33,7 +33,7 @@
</Style>
<!--列头标题栏样式-->
<Style TargetType="DataGridColumnHeader">
- <Setter Property="HorizontalContentAlignment" Value="Center" />
+ <Setter Property="HorizontalContentAlignment" Value="Left" />
<Setter Property="BorderBrush" Value="#dddddd" />
<Setter Property="FontSize" Value="18"/>
<Setter Property="Background" Value="#4285DE"/>
@@ -89,13 +89,13 @@
<ItemsControl.ItemsPanel>
<!--布局-->
<ItemsPanelTemplate>
- <WrapPanel Orientation="Vertical"></WrapPanel>
+ <WrapPanel Orientation="Horizontal" VerticalAlignment="Top"></WrapPanel>
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
<!--控件模板-->
<ItemsControl.ItemTemplate>
<DataTemplate>
- <Control x:Name="ctrl" Width="450" Height="200" ></Control>
+ <Control x:Name="ctrl" Width="600" Height="200" VerticalAlignment="Top"></Control>
<DataTemplate.Triggers>
<!--根据不同类型选择不同模板-->
<DataTrigger Binding="{Binding spaceType}" Value="1">
@@ -113,7 +113,7 @@
<Border Grid.Row="0">
<Grid>
<Grid.ColumnDefinitions>
- <ColumnDefinition/>
+ <ColumnDefinition Width="1.5*"/>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
@@ -147,7 +147,7 @@
<Border Grid.Row="1">
<Grid>
<Grid.ColumnDefinitions>
- <ColumnDefinition Width="1*"/>
+ <ColumnDefinition Width="1.5*"/>
<ColumnDefinition Width="6*"/>
</Grid.ColumnDefinitions>
<Border Grid.Column="0" BorderBrush="White" BorderThickness="1">
@@ -162,7 +162,7 @@
<Border Grid.Row="2">
<Grid>
<Grid.ColumnDefinitions>
- <ColumnDefinition/>
+ <ColumnDefinition Width="1.5*"/>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
@@ -174,37 +174,24 @@
<TextBlock Text="状态" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
<Border Grid.Column="1" BorderBrush="White" BorderThickness="1">
- <!--<Button Command="{Binding DataContext.UpdateInStoreFlagCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding spaceCode}" Style="{StaticResource BUTTON_AGREE}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent">
- <TextBlock Text="入库" Foreground="{Binding inStoreFlag,Converter={StaticResource StatusLabelConverter}}" FontSize="18" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center" />
- </Button>-->
</Border>
<Border Grid.Column="2" BorderBrush="White" BorderThickness="1">
- <!--<Button Command="{Binding DataContext.UpdateOutStoreFlagCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding spaceCode}" Style="{StaticResource BUTTON_AGREE}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent">
- <TextBlock Text="出库" Foreground="{Binding outStoreFlag,Converter={StaticResource StatusLabelConverter}}" FontSize="18" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center"/>
- </Button>-->
</Border>
<Border Grid.Column="3" BorderBrush="White" BorderThickness="1">
- <!--<Button Command="{Binding DataContext.UpdateUnusualFlagCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding spaceCode}" Style="{StaticResource BUTTON_AGREE}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent">
- <TextBlock Text="异常" Foreground="{Binding unusualFlag,Converter={StaticResource StatusLabelConverter}}" FontSize="18" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center"/>
- </Button>-->
+
</Border>
<Border Grid.Column="4" BorderBrush="White" BorderThickness="1">
- <!--<Button Command="{Binding DataContext.UpdateSpaceStatusCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding spaceCode}" Style="{StaticResource BUTTON_AGREE}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent">
- <TextBlock Text="禁用" Foreground="{Binding spaceStatus,Converter={StaticResource StatusLabelConverter}}" FontSize="18" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center"/>
- </Button>-->
</Border>
<Border Grid.Column="5" BorderBrush="White" BorderThickness="1">
- <!--<Button Command="{Binding DataContext.SpaceDetailCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding spaceCode}" Style="{StaticResource BUTTON_AGREE}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent">
+ <Button Command="{Binding DataContext.SpaceDetailCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding spaceCode}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent">
<TextBlock Text="明细" FontSize="18" Foreground="Green" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center"/>
- </Button>-->
+ </Button>
</Border>
<Border Grid.Column="6" BorderBrush="White" BorderThickness="1">
- <!--<Button Command="{Binding DataContext.OutOnlyOneCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding spaceCode}" Style="{StaticResource BUTTON_AGREE}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent">
- <TextBlock Text="出一个" Foreground="Green" FontSize="17" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center" />
- </Button>-->
+
</Border>
</Grid>
</Border>
@@ -234,16 +221,16 @@
</StackPanel>
<DataGrid Grid.Row="1" ItemsSource="{Binding SpaceDetailDataGrid}" Background="Transparent"
- FontSize="15" ColumnHeaderHeight="35"
- RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0"
- GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden"
- ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False"
- Foreground="#FFFFFF" >
+ FontSize="15" ColumnHeaderHeight="35"
+ RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0"
+ GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden"
+ ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False"
+ Foreground="#FFFFFF" >
<!--resourceStyle 399行修改选中字体颜色-->
<DataGrid.Columns>
- <DataGridTextColumn Binding="{Binding spaceCode}" Header="货道编号" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
- <DataGridTextColumn Binding="{Binding materialCode}" Header="物料编号" Width="*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
- <DataGridTextColumn Binding="{Binding materialName}" Header="物料名称" Width="*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
+ <DataGridTextColumn Binding="{Binding SpaceCode}" Header="货道编号" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
+ <DataGridTextColumn Binding="{Binding MaterialCode}" Header="物料编号" Width="*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
+ <DataGridTextColumn Binding="{Binding MaterialName}" Header="物料名称" Width="*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
<!--<DataGridTextColumn Binding="{Binding materialType}" Header="物料类型" Width="1*" IsReadOnly="True"/>-->
</DataGrid.Columns>
</DataGrid>
diff --git a/Aucma.Core.BoxFoam/Views/UserPage/BeforeFoamingPageView.xaml b/Aucma.Core.BoxFoam/Views/UserPage/BeforeFoamingPageView.xaml
index 0757738c..e5e17a80 100644
--- a/Aucma.Core.BoxFoam/Views/UserPage/BeforeFoamingPageView.xaml
+++ b/Aucma.Core.BoxFoam/Views/UserPage/BeforeFoamingPageView.xaml
@@ -32,7 +32,7 @@
</Style>
<!--列头标题栏样式-->
<Style TargetType="DataGridColumnHeader">
- <Setter Property="HorizontalContentAlignment" Value="Center" />
+ <Setter Property="HorizontalContentAlignment" Value="Left" />
<Setter Property="BorderBrush" Value="#dddddd" />
<Setter Property="FontSize" Value="18"/>
<Setter Property="Background" Value="#4285DE"/>
@@ -71,7 +71,7 @@
<RowDefinition Height="12*"/>
</Grid.RowDefinitions>
<StackPanel Grid.Row="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center">
- <!--<TextBlock Text="泡前库实时库存" FontSize="18" FontWeight="Bold" Foreground="White"/>-->
+ <TextBlock Text="泡前库实时库存" FontSize="18" FontWeight="Bold" Foreground="White"/>
</StackPanel>
<Border Grid.Row="1">
<Grid>
@@ -88,13 +88,13 @@
<ItemsControl.ItemsPanel>
<!--布局-->
<ItemsPanelTemplate>
- <WrapPanel Orientation="Vertical"></WrapPanel>
+ <WrapPanel Orientation="Horizontal" VerticalAlignment="Top"></WrapPanel>
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
<!--控件模板-->
<ItemsControl.ItemTemplate>
<DataTemplate>
- <Control x:Name="ctrl" Width="900" Height="200" ></Control>
+ <Control x:Name="ctrl" Width="600" Height="200" VerticalAlignment="Top"></Control>
<DataTemplate.Triggers>
<!--根据不同类型选择不同模板-->
<DataTrigger Binding="{Binding spaceType}" Value="1">
@@ -112,7 +112,7 @@
<Border Grid.Row="0">
<Grid>
<Grid.ColumnDefinitions>
- <ColumnDefinition/>
+ <ColumnDefinition Width="1.5*"/>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
@@ -146,7 +146,7 @@
<Border Grid.Row="1">
<Grid>
<Grid.ColumnDefinitions>
- <ColumnDefinition Width="1*"/>
+ <ColumnDefinition Width="1.5*"/>
<ColumnDefinition Width="6*"/>
</Grid.ColumnDefinitions>
<Border Grid.Column="0" BorderBrush="White" BorderThickness="1">
@@ -161,7 +161,7 @@
<Border Grid.Row="2">
<Grid>
<Grid.ColumnDefinitions>
- <ColumnDefinition/>
+ <ColumnDefinition Width="1.5*"/>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
@@ -173,37 +173,24 @@
<TextBlock Text="状态" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
<Border Grid.Column="1" BorderBrush="White" BorderThickness="1">
- <!--<Button Command="{Binding DataContext.UpdateInStoreFlagCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding spaceCode}" Style="{StaticResource BUTTON_AGREE}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent">
- <TextBlock Text="入库" Foreground="{Binding inStoreFlag,Converter={StaticResource StatusLabelConverter}}" FontSize="18" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center" />
- </Button>-->
</Border>
<Border Grid.Column="2" BorderBrush="White" BorderThickness="1">
- <!--<Button Command="{Binding DataContext.UpdateOutStoreFlagCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding spaceCode}" Style="{StaticResource BUTTON_AGREE}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent">
- <TextBlock Text="出库" Foreground="{Binding outStoreFlag,Converter={StaticResource StatusLabelConverter}}" FontSize="18" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center"/>
- </Button>-->
</Border>
<Border Grid.Column="3" BorderBrush="White" BorderThickness="1">
- <!--<Button Command="{Binding DataContext.UpdateUnusualFlagCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding spaceCode}" Style="{StaticResource BUTTON_AGREE}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent">
- <TextBlock Text="异常" Foreground="{Binding unusualFlag,Converter={StaticResource StatusLabelConverter}}" FontSize="18" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center"/>
- </Button>-->
+
</Border>
<Border Grid.Column="4" BorderBrush="White" BorderThickness="1">
- <!--<Button Command="{Binding DataContext.UpdateSpaceStatusCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding spaceCode}" Style="{StaticResource BUTTON_AGREE}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent">
- <TextBlock Text="禁用" Foreground="{Binding spaceStatus,Converter={StaticResource StatusLabelConverter}}" FontSize="18" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center"/>
- </Button>-->
</Border>
<Border Grid.Column="5" BorderBrush="White" BorderThickness="1">
- <!--<Button Command="{Binding DataContext.SpaceDetailCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding spaceCode}" Style="{StaticResource BUTTON_AGREE}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent">
+ <Button Command="{Binding DataContext.SpaceDetailCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding spaceCode}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent">
<TextBlock Text="明细" FontSize="18" Foreground="Green" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center"/>
- </Button>-->
+ </Button>
</Border>
<Border Grid.Column="6" BorderBrush="White" BorderThickness="1">
- <!--<Button Command="{Binding DataContext.OutOnlyOneCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding spaceCode}" Style="{StaticResource BUTTON_AGREE}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent">
- <TextBlock Text="出一个" Foreground="Green" FontSize="17" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center" />
- </Button>-->
+
</Border>
</Grid>
</Border>
@@ -213,7 +200,6 @@
</Setter.Value>
</Setter>
</DataTrigger>
-
</DataTemplate.Triggers>
</DataTemplate>
</ItemsControl.ItemTemplate>
@@ -234,16 +220,16 @@
</StackPanel>
<DataGrid Grid.Row="1" ItemsSource="{Binding SpaceDetailDataGrid}" Background="Transparent"
- FontSize="15" ColumnHeaderHeight="35"
- RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0"
- GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden"
- ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False"
- Foreground="#FFFFFF" >
+ FontSize="15" ColumnHeaderHeight="35"
+ RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0"
+ GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden"
+ ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False"
+ Foreground="#FFFFFF" >
<!--resourceStyle 399行修改选中字体颜色-->
<DataGrid.Columns>
- <DataGridTextColumn Binding="{Binding spaceCode}" Header="货道编号" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
- <DataGridTextColumn Binding="{Binding materialCode}" Header="物料编号" Width="*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
- <DataGridTextColumn Binding="{Binding materialName}" Header="物料名称" Width="*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
+ <DataGridTextColumn Binding="{Binding SpaceCode}" Header="货道编号" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
+ <DataGridTextColumn Binding="{Binding MaterialCode}" Header="物料编号" Width="*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
+ <DataGridTextColumn Binding="{Binding MaterialName}" Header="物料名称" Width="*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
<!--<DataGridTextColumn Binding="{Binding materialType}" Header="物料类型" Width="1*" IsReadOnly="True"/>-->
</DataGrid.Columns>
</DataGrid>
diff --git a/Aucma.Core.BoxFoam/Views/UserPage/LinerInventory.xaml b/Aucma.Core.BoxFoam/Views/UserPage/LinerInventory.xaml
index 8c9aead3..37cc6658 100644
--- a/Aucma.Core.BoxFoam/Views/UserPage/LinerInventory.xaml
+++ b/Aucma.Core.BoxFoam/Views/UserPage/LinerInventory.xaml
@@ -32,7 +32,7 @@
</Style>
<!--列头标题栏样式-->
<Style TargetType="DataGridColumnHeader">
- <Setter Property="HorizontalContentAlignment" Value="Center" />
+ <Setter Property="HorizontalContentAlignment" Value="Left" />
<Setter Property="BorderBrush" Value="#dddddd" />
<Setter Property="FontSize" Value="18"/>
<Setter Property="Background" Value="#4285DE"/>
@@ -88,13 +88,13 @@
<ItemsControl.ItemsPanel>
<!--布局-->
<ItemsPanelTemplate>
- <WrapPanel Orientation="Vertical"></WrapPanel>
+ <WrapPanel Orientation="Horizontal"></WrapPanel>
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
<!--控件模板-->
<ItemsControl.ItemTemplate>
<DataTemplate>
- <Control x:Name="ctrl" Width="450" Height="200" ></Control>
+ <Control x:Name="ctrl" Width="600" Height="200" VerticalAlignment="Top"></Control>
<DataTemplate.Triggers>
<!--根据不同类型选择不同模板-->
<DataTrigger Binding="{Binding spaceType}" Value="1">
@@ -112,7 +112,7 @@
<Border Grid.Row="0">
<Grid>
<Grid.ColumnDefinitions>
- <ColumnDefinition/>
+ <ColumnDefinition Width="1.5*"/>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
@@ -146,7 +146,7 @@
<Border Grid.Row="1">
<Grid>
<Grid.ColumnDefinitions>
- <ColumnDefinition Width="1*"/>
+ <ColumnDefinition Width="1.5*"/>
<ColumnDefinition Width="6*"/>
</Grid.ColumnDefinitions>
<Border Grid.Column="0" BorderBrush="White" BorderThickness="1">
@@ -161,7 +161,7 @@
<Border Grid.Row="2">
<Grid>
<Grid.ColumnDefinitions>
- <ColumnDefinition/>
+ <ColumnDefinition Width="1.5*"/>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
@@ -173,24 +173,24 @@
<TextBlock Text="状态" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
<Border Grid.Column="1" BorderBrush="White" BorderThickness="1">
-
</Border>
<Border Grid.Column="2" BorderBrush="White" BorderThickness="1">
-
+
</Border>
<Border Grid.Column="3" BorderBrush="White" BorderThickness="1">
-
+
</Border>
<Border Grid.Column="4" BorderBrush="White" BorderThickness="1">
-
</Border>
<Border Grid.Column="5" BorderBrush="White" BorderThickness="1">
-
+ <Button Command="{Binding DataContext.SpaceDetailCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding spaceCode}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent">
+ <TextBlock Text="明细" FontSize="18" Foreground="Green" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+ </Button>
</Border>
<Border Grid.Column="6" BorderBrush="White" BorderThickness="1">
-
+
</Border>
</Grid>
</Border>
@@ -229,9 +229,9 @@
Foreground="#FFFFFF" >
<!--resourceStyle 399行修改选中字体颜色-->
<DataGrid.Columns>
- <DataGridTextColumn Binding="{Binding spaceCode}" Header="货道编号" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
- <DataGridTextColumn Binding="{Binding materialCode}" Header="物料编号" Width="*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
- <DataGridTextColumn Binding="{Binding materialName}" Header="物料名称" Width="*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
+ <DataGridTextColumn Binding="{Binding SpaceCode}" Header="货道编号" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
+ <DataGridTextColumn Binding="{Binding MaterialCode}" Header="物料编号" Width="*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
+ <DataGridTextColumn Binding="{Binding MaterialName}" Header="物料名称" Width="*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
<!--<DataGridTextColumn Binding="{Binding materialType}" Header="物料类型" Width="1*" IsReadOnly="True"/>-->
</DataGrid.Columns>
</DataGrid>
diff --git a/Aucma.Core.BoxFoam/Views/UserPage/ShellInventory.xaml b/Aucma.Core.BoxFoam/Views/UserPage/ShellInventory.xaml
index a8cb760f..a904a3a4 100644
--- a/Aucma.Core.BoxFoam/Views/UserPage/ShellInventory.xaml
+++ b/Aucma.Core.BoxFoam/Views/UserPage/ShellInventory.xaml
@@ -32,7 +32,7 @@
</Style>
<!--列头标题栏样式-->
<Style TargetType="DataGridColumnHeader">
- <Setter Property="HorizontalContentAlignment" Value="Center" />
+ <Setter Property="HorizontalContentAlignment" Value="Left" />
<Setter Property="BorderBrush" Value="#dddddd" />
<Setter Property="FontSize" Value="18"/>
<Setter Property="Background" Value="#4285DE"/>
@@ -71,7 +71,7 @@
<RowDefinition Height="12*"/>
</Grid.RowDefinitions>
<StackPanel Grid.Row="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center">
- <!--<TextBlock Text="内胆库实时库存" FontSize="18" FontWeight="Bold" Foreground="White"/>-->
+ <TextBlock Text="箱壳库实时库存" FontSize="18" FontWeight="Bold" Foreground="White"/>
</StackPanel>
<Border Grid.Row="1">
<Grid>
@@ -88,13 +88,13 @@
<ItemsControl.ItemsPanel>
<!--布局-->
<ItemsPanelTemplate>
- <WrapPanel Orientation="Vertical"></WrapPanel>
+ <WrapPanel Orientation="Horizontal" VerticalAlignment="Top"></WrapPanel>
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
<!--控件模板-->
<ItemsControl.ItemTemplate>
<DataTemplate>
- <Control x:Name="ctrl" Width="450" Height="200" ></Control>
+ <Control x:Name="ctrl" Width="600" Height="200" VerticalAlignment="Top"></Control>
<DataTemplate.Triggers>
<!--根据不同类型选择不同模板-->
<DataTrigger Binding="{Binding spaceType}" Value="1">
@@ -112,7 +112,7 @@
<Border Grid.Row="0">
<Grid>
<Grid.ColumnDefinitions>
- <ColumnDefinition/>
+ <ColumnDefinition Width="1.5*"/>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
@@ -146,7 +146,7 @@
<Border Grid.Row="1">
<Grid>
<Grid.ColumnDefinitions>
- <ColumnDefinition Width="1*"/>
+ <ColumnDefinition Width="1.5*"/>
<ColumnDefinition Width="6*"/>
</Grid.ColumnDefinitions>
<Border Grid.Column="0" BorderBrush="White" BorderThickness="1">
@@ -161,7 +161,7 @@
<Border Grid.Row="2">
<Grid>
<Grid.ColumnDefinitions>
- <ColumnDefinition/>
+ <ColumnDefinition Width="1.5*"/>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
@@ -173,34 +173,24 @@
<TextBlock Text="状态" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
<Border Grid.Column="1" BorderBrush="White" BorderThickness="1">
- <Button Command="{Binding DataContext.UpdateInStoreFlagCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding spaceCode}" Style="{StaticResource BUTTON_AGREE}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent">
- <TextBlock Text="入库" Foreground="{Binding inStoreFlag,Converter={StaticResource StatusLabelConverter}}" FontSize="18" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center" />
- </Button>
-
+
</Border>
<Border Grid.Column="2" BorderBrush="White" BorderThickness="1">
-
+
</Border>
<Border Grid.Column="3" BorderBrush="White" BorderThickness="1">
- <Button Command="{Binding DataContext.UpdateUnusualFlagCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding spaceCode}" Style="{StaticResource BUTTON_AGREE}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent">
- <TextBlock Text="异常" Foreground="{Binding unusualFlag,Converter={StaticResource StatusLabelConverter}}" FontSize="18" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center"/>
- </Button>
+
</Border>
<Border Grid.Column="4" BorderBrush="White" BorderThickness="1">
- <Button Command="{Binding DataContext.UpdateSpaceStatusCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding spaceCode}" Style="{StaticResource BUTTON_AGREE}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent">
- <TextBlock Text="禁用" Foreground="{Binding spaceStatus,Converter={StaticResource StatusLabelConverter}}" FontSize="18" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center"/>
- </Button>
-
+
</Border>
<Border Grid.Column="5" BorderBrush="White" BorderThickness="1">
- <Button Command="{Binding DataContext.SpaceDetailCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding spaceCode}" Style="{StaticResource BUTTON_AGREE}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent">
+ <Button Command="{Binding DataContext.SpaceDetailCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding spaceCode}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent">
<TextBlock Text="明细" FontSize="18" Foreground="Green" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Button>
</Border>
<Border Grid.Column="6" BorderBrush="White" BorderThickness="1">
- <Button Command="{Binding DataContext.OutOnlyOneCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding spaceCode}" Style="{StaticResource BUTTON_AGREE}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent">
- <TextBlock Text="出一个" Foreground="Green" FontSize="17" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center" />
- </Button>
+
</Border>
</Grid>
</Border>
@@ -210,11 +200,8 @@
</Setter.Value>
</Setter>
</DataTrigger>
-
</DataTemplate.Triggers>
</DataTemplate>
-
-
</ItemsControl.ItemTemplate>
</ItemsControl>
</Border>
@@ -232,7 +219,6 @@
<TextBlock Text="货道明细" Foreground="#FFFFFF" FontSize="15"/>
</StackPanel>
-
<DataGrid Grid.Row="1" ItemsSource="{Binding SpaceDetailDataGrid}" Background="Transparent"
FontSize="15" ColumnHeaderHeight="35"
RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0"
@@ -241,9 +227,9 @@
Foreground="#FFFFFF" >
<!--resourceStyle 399行修改选中字体颜色-->
<DataGrid.Columns>
- <DataGridTextColumn Binding="{Binding spaceCode}" Header="货道编号" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
- <DataGridTextColumn Binding="{Binding materialCode}" Header="物料编号" Width="*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
- <DataGridTextColumn Binding="{Binding materialName}" Header="物料名称" Width="*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
+ <DataGridTextColumn Binding="{Binding SpaceCode}" Header="货道编号" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
+ <DataGridTextColumn Binding="{Binding MaterialCode}" Header="物料编号" Width="*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
+ <DataGridTextColumn Binding="{Binding MaterialName}" Header="物料名称" Width="*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
<!--<DataGridTextColumn Binding="{Binding materialType}" Header="物料类型" Width="1*" IsReadOnly="True"/>-->
</DataGrid.Columns>
</DataGrid>
@@ -254,4 +240,4 @@
</Grid>
</Border>
</Grid>
-</UserControl>
+</UserControl>
\ No newline at end of file
diff --git a/Aucma.Core.BoxFoam/Views/UserPage/ShellInventory.xaml.cs b/Aucma.Core.BoxFoam/Views/UserPage/ShellInventory.xaml.cs
index cdd5f933..de96dd4c 100644
--- a/Aucma.Core.BoxFoam/Views/UserPage/ShellInventory.xaml.cs
+++ b/Aucma.Core.BoxFoam/Views/UserPage/ShellInventory.xaml.cs
@@ -1,4 +1,5 @@
-using System;
+using Aucma.Core.BoxFoam.ViewModels;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@@ -23,6 +24,7 @@ namespace Aucma.Core.BoxFoam.Views.UserPage
public ShellInventory()
{
InitializeComponent();
+ this.DataContext = new ShellInventoryViewModel();
}
}
}
diff --git a/Aucma.Core.BoxFoam/appsettings.json b/Aucma.Core.BoxFoam/appsettings.json
index 5252ee4e..e401f6a5 100644
--- a/Aucma.Core.BoxFoam/appsettings.json
+++ b/Aucma.Core.BoxFoam/appsettings.json
@@ -101,14 +101,14 @@
"Cron": "*/1 * * * * ?",
"AssemblyName": "Admin.Core.Tasks",
"ClassName": "Job_AllState_Quartz",
- "Remark": "执行任务调度系统",
+ "Remark": "执行老发泡线任务调度系统",
"RunTimes": 3881,
"BeginTime": "2023-04-23 11:08:50.000",
"EndTime": "2180-12-01 16:45:30.000",
"TriggerType": 1,
"IntervalSecond": 5,
"CycleRunTimes": 1,
- "IsStart": false,
+ "IsStart": true,
"JobParams": null,
"DelFlag": false,
"CreateBy": "admin",
@@ -167,18 +167,24 @@
"Enabled": false
},
"Scanner": { //扫码器
- "Enabled":false
+ "Enabled": false
}
},
"PLCServer": [
{
"Id": 1,
- "EquipName": "OldPlc",
+ "EquipName": "OldTypePlc",
"IP": "127.0.0.1",
"Port": 6000
}
],
+ "StoreInfo": {
+ "ShellInventoryStoreCode": "XKJCK-001",
+ "LinerInventory": "NDJCK-001",
+ "AfterStoreCode": "FPJCK-001",
+ "BeforeStoreCode": "PBSCK-001"
+ },
"IpRateLimiting": {
"EnableEndpointRateLimiting": false, //False: globally executed, true: executed for each
"StackBlockedRequests": false, //False: Number of rejections should be recorded on another counter
diff --git a/Aucma.Core.RunPlc/RunPlcService.cs b/Aucma.Core.RunPlc/RunPlcService.cs
index b87b801e..9877f635 100644
--- a/Aucma.Core.RunPlc/RunPlcService.cs
+++ b/Aucma.Core.RunPlc/RunPlcService.cs
@@ -46,7 +46,6 @@ namespace Aucma.Core.RunPlc
model.IP = item.IP;
model.Port = item.Port;
model.plc = new MelsecPlc(item.IP, item.Port);
- // model.IsConnect = model.plc.IsConnected;
PlcHelper.melsecList.Add(model);
}
return Task.CompletedTask;