diff --git a/Aucma.Core.Palletiz/Business/InstoreBusiness.cs b/Aucma.Core.Palletiz/Business/InstoreBusiness.cs index 30531092..a7e6e8d0 100644 --- a/Aucma.Core.Palletiz/Business/InstoreBusiness.cs +++ b/Aucma.Core.Palletiz/Business/InstoreBusiness.cs @@ -69,7 +69,8 @@ namespace Aucma.Core.Palletiz.Business { try { - + // 刷新页面 + List allScanners = Appsettings.app("ScannerServer").ToList(); ScannerModel model = allScanners.FirstOrDefault(x => x.Ip == scannerIp); // plc下发结果 @@ -78,7 +79,7 @@ namespace Aucma.Core.Palletiz.Business List spaceNumList = new List(); // 入库记录 RecordInStore recordInstore = new RecordInStore(); - + //1.根据成品码找货道 List spaceList = getSpaceBySNCode(SNCode,recordInstore); // 根据货道信息判断下发plc信号 diff --git a/Aucma.Core.Palletiz/Models/IndexInfo.cs b/Aucma.Core.Palletiz/Models/IndexInfo.cs new file mode 100644 index 00000000..6afe96d8 --- /dev/null +++ b/Aucma.Core.Palletiz/Models/IndexInfo.cs @@ -0,0 +1,68 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Aucma.Core.Palletiz.Models +{ + /// + /// 分垛首页数据刷新实体 + /// + public class IndexInfo + { + /// + /// 序号 + /// + public int No { get; set; } + + /// + /// //公司条码 + /// + public string ProductSNCode { get; set; } + + /// + /// //扫描时间 + /// + public DateTime ProductScanTime { get; set; } + + /// + /// //产品型号 + /// + public string ProductModel { get; set; } + + + /// + /// 订单编号 + /// + public string ProductOrderNo { get; set; } + + /// + /// 订单计划数 + /// + public string OrderQty { get; set; } + + /// + /// 订单实际数 + /// + public string ActQty { get; set; } + + + /// + /// 刷新标志,定时器检测true刷新 + /// + public bool ProductRefreshFlag { get; set; } + + /// + /// 界面提示信息 + /// + public string MsgInfo { get; set; } + /// + /// 是否报警信息 + /// + public bool MsgAlarmFlag { get; set; } + + + + } +} diff --git a/Aucma.Core.Palletiz/ViewModels/IndexPageViewModel.cs b/Aucma.Core.Palletiz/ViewModels/IndexPageViewModel.cs index 04832890..90be5dbf 100644 --- a/Aucma.Core.Palletiz/ViewModels/IndexPageViewModel.cs +++ b/Aucma.Core.Palletiz/ViewModels/IndexPageViewModel.cs @@ -142,6 +142,115 @@ namespace Aucma.Core.Palletiz.ViewModels } + + + #region 界面变量定义 + + #region 产品条码 + private string _productSNCode; + public string ProductSNCode + { + get { return _productSNCode; } + set + { + _productSNCode = value; + OnPropertyChanged(nameof(ProductSNCode)); + } + } + #endregion + + #region 扫描时间 + private string _productScanTime; + public string ProductScanTime + { + get { return _productScanTime; } + set + { + _productScanTime = value; + OnPropertyChanged(nameof(ProductScanTime)); + } + } + #endregion + + #region 产品型号 + private string _productModel; + public string ProductModel + { + get { return _productModel; } + set + { + _productModel = value; + OnPropertyChanged(nameof(ProductModel)); + } + } + #endregion + + #region 订单编号 + private string _productOrderNo; + public string ProductOrderNo + { + get { return _productOrderNo; } + set + { + _productOrderNo = value; + OnPropertyChanged(nameof(ProductOrderNo)); + } + } + #endregion + + #region 订单数量 + private string _orderQty; + public string OrderQty + { + get { return _orderQty; } + set + { + _orderQty = value; + OnPropertyChanged(nameof(OrderQty)); + } + } + #endregion + + #region 订单已上传 + private string _actQty; + public string ActQty + { + get { return _actQty; } + set + { + _actQty = value; + OnPropertyChanged(nameof(ActQty)); + } + } + #endregion + + #region 界面提示信息 + private string _msgInfo; + public string MsgInfo + { + get { return _msgInfo; } + set + { + _msgInfo = value; + OnPropertyChanged(nameof(MsgInfo)); + } + } + private Brush _msgColor; + public Brush MsgColor + { + get { return _msgColor; } + set + { + _msgColor = value; + OnPropertyChanged(nameof(MsgColor)); + } + } + + #endregion + + #endregion + + #region 日产量柱状图 /// diff --git a/Aucma.Core.Palletiz/Views/IndexPageView.xaml b/Aucma.Core.Palletiz/Views/IndexPageView.xaml index d4f70402..cc238f14 100644 --- a/Aucma.Core.Palletiz/Views/IndexPageView.xaml +++ b/Aucma.Core.Palletiz/Views/IndexPageView.xaml @@ -112,46 +112,46 @@ - + - - + + - - + + - - + + - - + + - + - - + + - - + + - - + + - - + + - + - - + + - - + + - - + + @@ -199,7 +199,7 @@ - + @@ -230,7 +230,7 @@ - +