diff --git a/SlnMesnac.RfidUpload.UI/ContainerTransferOrderWindow.xaml b/SlnMesnac.RfidUpload.UI/ContainerTransferOrderWindow.xaml
index 1d2c744..ba2295b 100644
--- a/SlnMesnac.RfidUpload.UI/ContainerTransferOrderWindow.xaml
+++ b/SlnMesnac.RfidUpload.UI/ContainerTransferOrderWindow.xaml
@@ -56,7 +56,10 @@
-
+
+
+
+
diff --git a/SlnMesnac.RfidUpload.UI/SelectRouterWindow.xaml b/SlnMesnac.RfidUpload.UI/SelectRouterWindow.xaml
index abae57c..bd5561e 100644
--- a/SlnMesnac.RfidUpload.UI/SelectRouterWindow.xaml
+++ b/SlnMesnac.RfidUpload.UI/SelectRouterWindow.xaml
@@ -15,7 +15,7 @@
-
+
@@ -31,6 +31,8 @@
+
+
diff --git a/SlnMesnac.RfidUpload.UI/SelectRouterWindow.xaml.cs b/SlnMesnac.RfidUpload.UI/SelectRouterWindow.xaml.cs
index 8b447d8..26fb4c6 100644
--- a/SlnMesnac.RfidUpload.UI/SelectRouterWindow.xaml.cs
+++ b/SlnMesnac.RfidUpload.UI/SelectRouterWindow.xaml.cs
@@ -62,7 +62,8 @@ namespace SlnMesnac.RfidUpload.UI
{
if (string.IsNullOrEmpty(this.RouteCode.Text))
{
- MessageBox.Show("请先输入邮路代码");
+ this.PageMessage.Content = "请先输入邮路代码";
+ // MessageBox.Show("请先输入邮路代码");
return;
}
CsbHandleBusiness.iNIFile.IniWriteValue("TdjContainerAllotQuery", "routeCode", this.RouteCode.Text);
@@ -70,6 +71,7 @@ namespace SlnMesnac.RfidUpload.UI
// 自动生成opBatch
string opBatch = Guid.NewGuid().ToString("N").Substring(0, 20);
CsbResult res = csbHandleBusiness.findStationSequenceByCsb(_transferOrderInfo.ffjhNo, opBatch);
+ this.PageMessage.Content = res.GetMsg();
if (res.code == "200")
{
if (res.IsSuccess)
@@ -96,7 +98,8 @@ namespace SlnMesnac.RfidUpload.UI
}
catch (Exception ex)
{
- MessageBox.Show($"获取卸交站异常:{ex.Message}");
+ this.PageMessage.Content = $"获取卸交站异常:{ex.Message}";
+ // MessageBox.Show($"获取卸交站异常:{ex.Message}");
}
}
@@ -113,8 +116,8 @@ namespace SlnMesnac.RfidUpload.UI
string opBatch = Guid.NewGuid().ToString("N").Substring(0, 20);
CsbResult res = csbHandleBusiness.tranPlanCheckByCsb(_transferOrderInfo.ffjhNo,opBatch,"","");
- // MessageBox.Show($"封发配发 6.12.容器直连配发-校验发运计划 可不指定机构直接完成容器封发配发 :{res.message}");
-
+ // MessageBox.Show($"封发配发 6.12.容器直连配发-校验发运计划 可不指定机构直接完成容器封发配发 :{res.message}");
+ this.PageMessage.Content = "校验发运计划结果:"+res.GetMsg();
if (res.code == "200")
{
RefreshSubmitVerifyEvent?.Invoke(3, res.GetMsg(), _transferOrderInfo);
diff --git a/SlnMesnac.RfidUpload.UI/TransferOrderWindow.xaml b/SlnMesnac.RfidUpload.UI/TransferOrderWindow.xaml
index fbb4a6b..958b2e4 100644
--- a/SlnMesnac.RfidUpload.UI/TransferOrderWindow.xaml
+++ b/SlnMesnac.RfidUpload.UI/TransferOrderWindow.xaml
@@ -57,6 +57,9 @@
+
+
+
diff --git a/SlnMesnac.RfidUpload.UI/viewModel/ContainerTransferOrderViewModel.cs b/SlnMesnac.RfidUpload.UI/viewModel/ContainerTransferOrderViewModel.cs
index f772eaa..a770e26 100644
--- a/SlnMesnac.RfidUpload.UI/viewModel/ContainerTransferOrderViewModel.cs
+++ b/SlnMesnac.RfidUpload.UI/viewModel/ContainerTransferOrderViewModel.cs
@@ -120,7 +120,21 @@ namespace SlnMesnac.RfidUpload.UI.viewModel
}
-
+ ///
+ /// 界面提示信息
+ ///
+ private string? _transferMsg;
+ public string? TransferMsg
+ {
+ get => _transferMsg;
+ set
+ {
+ _transferMsg = value;
+ OnPropertyChanged(nameof(TransferMsg));
+ }
+ }
+
+
private ObservableCollection _transferOrderInfoItems = new ObservableCollection();
public ObservableCollection TransferOrderInfoItems
@@ -159,17 +173,20 @@ namespace SlnMesnac.RfidUpload.UI.viewModel
{
if (_startDate == null || _endDate == null)
{
- MessageBox.Show("请选择开始日期或者结束日期");
+ TransferMsg = "请选择开始日期或者结束日期";
+ // MessageBox.Show("请选择开始日期或者结束日期");
return;
}
else if (_startDate > _endDate)
{
- MessageBox.Show("开始日期不能大于结束日期");
+ TransferMsg = "开始日期不能大于结束日期";
+ // MessageBox.Show("开始日期不能大于结束日期");
return;
}
_endDate = _endDate.Value.AddDays(1);
#region 正式启用
CsbResult res = csbHandleBusiness.transferOrderFfjhByCsb("", _startDate.Value.ToString(), _endDate.Value.ToString());
+ TransferMsg = "获取调拨单结果:" + res.GetMsg();
// MessageBox.Show("容器封发-获取调拨单和封发计划:"+res.message);
if (res.code == "200")
{
diff --git a/SlnMesnac.RfidUpload.UI/viewModel/TransferOrderViewModel.cs b/SlnMesnac.RfidUpload.UI/viewModel/TransferOrderViewModel.cs
index 7403ed1..da89dfd 100644
--- a/SlnMesnac.RfidUpload.UI/viewModel/TransferOrderViewModel.cs
+++ b/SlnMesnac.RfidUpload.UI/viewModel/TransferOrderViewModel.cs
@@ -123,6 +123,22 @@ namespace SlnMesnac.RfidUpload.UI.viewModel
}
}
+
+ ///
+ /// 界面提示信息
+ ///
+ private string? _transferMsg;
+ public string? TransferMsg
+ {
+ get => _transferMsg;
+ set
+ {
+ _transferMsg = value;
+ OnPropertyChanged(nameof(TransferMsg));
+ }
+ }
+
+
private ObservableCollection _transferOrderInfoItems = new ObservableCollection();
public ObservableCollection TransferOrderInfoItems
{
@@ -161,18 +177,21 @@ namespace SlnMesnac.RfidUpload.UI.viewModel
{
if (_startDate == null || _endDate == null)
{
- MessageBox.Show("请选择开始日期或者结束日期");
+ TransferMsg = "请选择开始日期或者结束日期";
+ // MessageBox.Show("请选择开始日期或者结束日期");
return;
}
else if (_startDate > _endDate)
{
- MessageBox.Show("开始日期不能大于结束日期");
+ TransferMsg = "开始日期不能大于结束日期";
+ // MessageBox.Show("开始日期不能大于结束日期");
return;
}
_endDate = _endDate.Value.AddDays(1);
#region 正式启用
CsbResult res = csbHandleBusiness.transferOrderFfjhByCsb(_drj, _startDate.Value.ToString(), _endDate.Value.ToString());
+ TransferMsg = $"获取调拨单结果:{res.GetMsg()}";
// MessageBox.Show("容器封发-获取调拨单和封发计划:" + res.GetMsg());
if (res.code == "200")
{
@@ -191,7 +210,8 @@ namespace SlnMesnac.RfidUpload.UI.viewModel
}catch (Exception ex)
{
- MessageBox.Show(ex.Message);
+ TransferMsg = ex.Message;
+ // MessageBox.Show(ex.Message);
}
}
@@ -206,6 +226,7 @@ namespace SlnMesnac.RfidUpload.UI.viewModel
#region 正式启用
CsbResult res = csbHandleBusiness.transferOrderFfjhCheckByCsb(transferOrderInfo.ffjhNo, transferOrderInfo.ffjhscrq);
+ TransferMsg = $"验证调拨单结果:{res.GetMsg()}";
if (res.code== "200")
{ //封发计划正常可封发
// MessageBox.Show($"验证调拨单结果,[{res.GetMsg()}];");
@@ -216,7 +237,8 @@ namespace SlnMesnac.RfidUpload.UI.viewModel
}
else
{
- MessageBox.Show(res.message);
+ TransferMsg = res.GetMsg();
+ // MessageBox.Show(res.message);
return;
}
#endregion