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

change-提交

Browse Source
master
liuwf 1 month ago
parent fba24e5b24
commit 03abdd3b46
5 changed files with 76 additions and 20 deletions
Show Stats Download Patch File Download Diff File

8
SlnMesnac.RfidUpload.UI/MainWindow.xaml
Unescape Escape View File

@ -147,10 +147,14 @@
<Label Content="数 量 :" FontSize="20" FontWeight="Black" Foreground="#00CC33" Margin="20,0,0,0"/>
<Label Content="{Binding LabelCountParam}" FontSize="20" FontWeight="Black" Foreground="#00CC33" Margin="5,0,10,0"/>
<Label Content="调拨单号 :" FontSize="20" FontWeight="Black" Foreground="#00CC33" Margin="20,0,0,0"/>
<Label Content="{Binding MainPageDbdh}" FontSize="20" FontWeight="Black" Foreground="#00CC33" Margin="5,0,10,0"/>
<Label Content="调拨单号 :" FontSize="20" FontWeight="Black" Foreground="#00CC33" Margin="20,0,0,0" Visibility="Collapsed"/>
<Label Content="{Binding MainPageDbdh}" FontSize="20" FontWeight="Black" Foreground="#00CC33" Margin="5,0,10,0" Visibility="Collapsed"/>
<Label Content="封发计划编号 :" FontSize="20" FontWeight="Black" Foreground="#00CC33" Margin="20,0,0,0"/>
<Label Content="{Binding MainPageFfjhNo}" FontSize="20" FontWeight="Black" Foreground="#00CC33" Margin="5,0,10,0"/>
<Label Content="提示信息 :" FontSize="20" FontWeight="Black" Foreground="#00CC33" Margin="20,0,0,0"/>
<Label Content="{Binding MainPageTipMessage}" FontSize="20" FontWeight="Black" Foreground="#00CC33" Margin="5,0,10,0"/>
</StackPanel>
</Border>
<Border Grid.Row="2" BorderThickness="2" CornerRadius="5" Background="White" Margin="5">

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

@ -113,11 +113,11 @@ 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}");
if (res.code == "200")
{
RefreshSubmitVerifyEvent?.Invoke(3, res.message, _transferOrderInfo);
RefreshSubmitVerifyEvent?.Invoke(3, res.GetMsg(), _transferOrderInfo);
this.Close();
}
}
@ -132,10 +132,10 @@ 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}");
// MessageBox.Show($"执行配发 6.12.容器直连配发-校验发运计划 容器封发完毕后直接向指定机构进行容器配发 :{res.message}");
if (res.code == "200")
{
RefreshSubmitVerifyEvent?.Invoke(3, res.message, _transferOrderInfo);
RefreshSubmitVerifyEvent?.Invoke(3, res.GetMsg(), _transferOrderInfo);
this.Close();
}
}

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

@ -85,11 +85,30 @@ namespace SlnMesnac.RfidUpload.UI.viewModel
get => _startDate;
set
{
if (_startDate != value)
{
OnDateChanged();
}
_startDate = value;
OnPropertyChanged(nameof(StartDate));
}
}
private DateTime? _endDate;
public DateTime? EndDate
{
get => _endDate;
set
{
if (_endDate != value)
{
OnDateChanged();
}
_endDate = value;
OnPropertyChanged(nameof(EndDate));
}
}
/// <summary>
/// 调拨单总数
/// </summary>
@ -101,16 +120,7 @@ namespace SlnMesnac.RfidUpload.UI.viewModel
}
private DateTime? _endDate;
public DateTime? EndDate
{
get => _endDate;
set
{
_endDate = value;
OnPropertyChanged(nameof(EndDate));
}
}
private ObservableCollection<TransferOrderInfo> _transferOrderInfoItems = new ObservableCollection<TransferOrderInfo>();
public ObservableCollection<TransferOrderInfo> TransferOrderInfoItems
@ -119,6 +129,18 @@ namespace SlnMesnac.RfidUpload.UI.viewModel
set => SetProperty(ref _transferOrderInfoItems, value);
}
private void OnDateChanged()
{
if (_startDate != null && _endDate != null)
{
// GetTransferOrder();
}
}
[RelayCommand]
private void Query()
{
@ -148,7 +170,7 @@ namespace SlnMesnac.RfidUpload.UI.viewModel
_endDate = _endDate.Value.AddDays(1);
#region 正式启用
CsbResult res = csbHandleBusiness.transferOrderFfjhByCsb("", _startDate.Value.ToString(), _endDate.Value.ToString());
MessageBox.Show("容器封发-获取调拨单和封发计划:"+res.message);
// MessageBox.Show("容器封发-获取调拨单和封发计划:"+res.message);
if (res.code == "200")
{
if (res.IsSuccess)

11
SlnMesnac.RfidUpload.UI/viewModel/MainWindowViewModel.cs
Unescape Escape View File

@ -148,6 +148,16 @@ namespace SlnMesnac.RfidUpload.UI.viewModel
set { _mainPageFfjhNo = value; RaisePropertyChanged(() => MainPageFfjhNo); }
}
/// <summary>
/// 主界面提示信息
/// </summary>
private string _mainPageTipMessage = "";
public string MainPageTipMessage
{
get { return _mainPageTipMessage; }
set { _mainPageTipMessage = value; RaisePropertyChanged(() => MainPageTipMessage); }
}
/// <summary>
/// 工作模式
/// </summary>
@ -638,6 +648,7 @@ namespace SlnMesnac.RfidUpload.UI.viewModel
/// <param name="dbdh"></param>
private void RefreshSubmitVerify(int model,string msg,TransferOrderInfo transferOrderInfo=null)
{
MainPageTipMessage = msg;
appConfig.workModel = model.ToString();
WorkModelParam = model ;
if (transferOrderInfo != null)

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

@ -99,6 +99,10 @@ namespace SlnMesnac.RfidUpload.UI.viewModel
get => _startDate;
set
{
if (_startDate != value)
{
OnDateChanged();
}
_startDate = value;
OnPropertyChanged(nameof(StartDate));
}
@ -110,6 +114,10 @@ namespace SlnMesnac.RfidUpload.UI.viewModel
get => _endDate;
set
{
if(_endDate != value)
{
OnDateChanged();
}
_endDate = value;
OnPropertyChanged(nameof(EndDate));
}
@ -132,6 +140,17 @@ namespace SlnMesnac.RfidUpload.UI.viewModel
}
private void OnDateChanged()
{
if (_startDate != null && _endDate != null)
{
GetTransferOrder();
}
}
private AppConfig appConfig = AppConfig.Instance;
private WebApiClientApp webApiClientApp = WebApiClientApp.Instance;
private static INIFile iNIFile = new INIFile(System.Environment.CurrentDirectory + "/App.InI");
@ -154,7 +173,7 @@ namespace SlnMesnac.RfidUpload.UI.viewModel
_endDate = _endDate.Value.AddDays(1);
#region 正式启用
CsbResult res = csbHandleBusiness.transferOrderFfjhByCsb(_drj, _startDate.Value.ToString(), _endDate.Value.ToString());
MessageBox.Show("容器封发-获取调拨单和封发计划:" + res.GetMsg());
// MessageBox.Show("容器封发-获取调拨单和封发计划:" + res.GetMsg());
if (res.code == "200")
{
@ -189,9 +208,9 @@ namespace SlnMesnac.RfidUpload.UI.viewModel
CsbResult res = csbHandleBusiness.transferOrderFfjhCheckByCsb(transferOrderInfo.ffjhNo, transferOrderInfo.ffjhscrq);
if (res.code== "200")
{ //封发计划正常可封发
MessageBox.Show($"验证调拨单结果,[{res.GetMsg()}];");
// MessageBox.Show($"验证调拨单结果,[{res.GetMsg()}];");
SuccessEvent?.Invoke();
RefreshSubmitVerifyEvent?.Invoke(2, res.message,transferOrderInfo);
RefreshSubmitVerifyEvent?.Invoke(2, res.GetMsg(), transferOrderInfo);
}

Write Preview
Loading…
Cancel
Save