wenjy
/
SlnMesnac.RfidUpload
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change-修改提示信息

Browse Source
master
liuwf 2 months ago
parent 8a4b5f5db8
commit c51ea40729
6 changed files with 65 additions and 14 deletions
Show Stats Download Patch File Download Diff File

3
SlnMesnac.RfidUpload.UI/ContainerTransferOrderWindow.xaml
Unescape Escape View File

@ -57,6 +57,9 @@
<Label Content="记录总数 :" FontSize="20" FontWeight="Black" Foreground="#00CC33" Margin="50,0,0,0"/>
<Label Content="{Binding TotalAmount}" FontSize="20" FontWeight="Black" Foreground="#00CC33" Margin="5,0,10,0"/>
<Label Content="提示信息 :" FontSize="20" FontWeight="Black" Foreground="#00CC33" Margin="50,0,0,0"/>
<Label Content="{Binding TransferMsg}" FontSize="20" FontWeight="Black" Foreground="#00CC33" Margin="5,0,10,0"/>
</StackPanel>
</Grid>

4
SlnMesnac.RfidUpload.UI/SelectRouterWindow.xaml
Unescape Escape View File

@ -15,7 +15,7 @@
<Border Grid.Row="0" BorderBrush="Gray" BorderThickness="0,0,0,2" CornerRadius="0" >
<StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center">
<TextBlock Text="邮路代码:" FontSize="16" FontWeight="Black" Foreground="#006699" Margin="10,0,0,0"/>
<TextBox x:Name="RouteCode" FontSize="16" Grid.Row="1" Width="180" Height="30" VerticalContentAlignment="Center" HorizontalAlignment="Center" Padding="5">
<TextBox x:Name="RouteCode" FontSize="16" Grid.Row="1" Width="120" Height="30" VerticalContentAlignment="Center" HorizontalAlignment="Center" Padding="5">
<TextBox.Template>
<ControlTemplate TargetType="TextBox">
<Border Background="#EBF4FD" BorderBrush="White" BorderThickness="1" CornerRadius="5">
@ -31,6 +31,8 @@
<Button Content="封发配发" Background="GreenYellow" x:Name="HandOutButton" Style="{StaticResource BUTTON_AGREE}" Width="80" Height="30" BorderBrush="#007DFA" Margin="10,0,10,0" Click="HandOutButton_Click"/>
<Label Content="提示信息 :" FontSize="20" FontWeight="Black" Foreground="#00CC33" Margin="0,0,0,0"/>
<Label x:Name="PageMessage" FontSize="20" FontWeight="Black" Foreground="#00CC33" Margin="5,0,10,0"/>
</StackPanel>
</Border>

14
SlnMesnac.RfidUpload.UI/SelectRouterWindow.xaml.cs
Unescape Escape View File

@ -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);
@ -132,7 +135,8 @@ namespace SlnMesnac.RfidUpload.UI
{
string opBatch = Guid.NewGuid().ToString("N").Substring(0, 20);
CsbResult res = csbHandleBusiness.tranPlanCheckByCsb(_transferOrderInfo.ffjhNo, opBatch, institution.stationOrgCode,institution.stationOrgName);
// MessageBox.Show($"执行配发 6.12.容器直连配发-校验发运计划 容器封发完毕后直接向指定机构进行容器配发 :{res.message}");
this.PageMessage.Content = "校验发运计划结果：" + res.GetMsg();
// MessageBox.Show($"执行配发 6.12.容器直连配发-校验发运计划 容器封发完毕后直接向指定机构进行容器配发 :{res.message}");
if (res.code == "200")
{
RefreshSubmitVerifyEvent?.Invoke(3, res.GetMsg(), _transferOrderInfo);

3
SlnMesnac.RfidUpload.UI/TransferOrderWindow.xaml
Unescape Escape View File

@ -57,6 +57,9 @@
<Label Content="记录总数 :" FontSize="20" FontWeight="Black" Foreground="#00CC33" Margin="50,0,0,0"/>
<Label Content="{Binding TotalAmount}" FontSize="20" FontWeight="Black" Foreground="#00CC33" Margin="5,0,10,0"/>
<Label Content="提示信息 :" FontSize="20" FontWeight="Black" Foreground="#00CC33" Margin="50,0,0,0"/>
<Label Content="{Binding TransferMsg}" FontSize="20" FontWeight="Black" Foreground="#00CC33" Margin="5,0,10,0"/>
</StackPanel>
</Grid>

21
SlnMesnac.RfidUpload.UI/viewModel/ContainerTransferOrderViewModel.cs
Unescape Escape View File

@ -120,6 +120,20 @@ namespace SlnMesnac.RfidUpload.UI.viewModel
}
/// <summary>
/// 界面提示信息
/// </summary>
private string? _transferMsg;
public string? TransferMsg
{
get => _transferMsg;
set
{
_transferMsg = value;
OnPropertyChanged(nameof(TransferMsg));
}
}
private ObservableCollection<TransferOrderInfo> _transferOrderInfoItems = new ObservableCollection<TransferOrderInfo>();
@ -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")
{

30
SlnMesnac.RfidUpload.UI/viewModel/TransferOrderViewModel.cs
Unescape Escape View File

@ -123,6 +123,22 @@ namespace SlnMesnac.RfidUpload.UI.viewModel
}
}
/// <summary>
/// 界面提示信息
/// </summary>
private string? _transferMsg;
public string? TransferMsg
{
get => _transferMsg;
set
{
_transferMsg = value;
OnPropertyChanged(nameof(TransferMsg));
}
}
private ObservableCollection<TransferOrderInfo> _transferOrderInfoItems = new ObservableCollection<TransferOrderInfo>();
public ObservableCollection<TransferOrderInfo> 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

Write Preview
Loading…
Cancel
Save