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

change-根据客户要求文档修改内容

Browse Source
master
liuwf 2 days ago
parent dca7a748b1
commit fe8cc4307a
5 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File

2
SlnMesnac.RfidUpload.Business/SerialPortBusiness.cs
Unescape Escape View File

@ -111,7 +111,7 @@ namespace SlnMesnac.RfidUpload.Business
_serialPort.Read(buffer, 0, bytesToRead);
RefreshLogMessageEvent?.Invoke("Received data: " + BitConverter.ToString(buffer).Replace("-", " "));
// RefreshLogMessageEvent?.Invoke("Received data: " + BitConverter.ToString(buffer).Replace("-", " "));
if (CheckReceivedData(buffer))
{

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

@ -75,11 +75,11 @@
<DataGridTextColumn Binding="{Binding dbdh}" Header="调拨单号" Width="200*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding jsdw}" Header="调入局" Width="100*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding ffjhNo}" Header="封发计划编号" Width="150*" IsReadOnly="True" />
<DataGridTextColumn Binding="{Binding rqzlmc}" Header="容器种类名称" Width="150*" IsReadOnly="True" Visibility="Collapsed"/>
<DataGridTextColumn Binding="{Binding rqxhbm}" Header="容器型号编码" Width="150*" IsReadOnly="True" Visibility="Collapsed"/>
<DataGridTextColumn Binding="{Binding rqzlmc}" Header="容器种类名称" Width="150*" IsReadOnly="True" />
<DataGridTextColumn Binding="{Binding rqxhbm}" Header="容器型号编码" Width="150*" IsReadOnly="True" />
<DataGridTextColumn Binding="{Binding rqxhmc}" Header="容器型号名称" Width="150*" IsReadOnly="True" Visibility="Collapsed"/>
<DataGridTextColumn Binding="{Binding kdbsl}" Header="可调拨数量" Width="80*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding ffjhscrq,StringFormat=\{0:MM月dd日 HH:mm.ss.ffff\}}" Header="生成日期" Width="170*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding kdbsl}" Header="可调拨数量" Width="120*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding ffjhscrq,StringFormat=\{0:MM月dd日 HH:mm.ss.ffff\}}" Header="生成日期" Width="150*" IsReadOnly="True"/>
<DataGridTemplateColumn Header="操作" Width="220">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>

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

@ -46,7 +46,7 @@
<Grid.RowDefinitions>
<RowDefinition Height="2*"/>
<RowDefinition Height="*"/>
<RowDefinition Height="*"/>
<RowDefinition Height="2*"/>
<RowDefinition Height="8*"/>
<RowDefinition Height="5*"/>
</Grid.RowDefinitions>
@ -162,7 +162,7 @@
<Border Grid.Row="2">
<StackPanel Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Left" Orientation="Horizontal">
<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"/>
<TextBox Width="700" Text="{Binding MainPageTipMessage}" TextWrapping="Wrap" FontSize="18" FontWeight="Black" Foreground="#00CC33" Margin="5,0,10,0"/>
</StackPanel>
</Border>
<Border Grid.Row="3" BorderThickness="2" CornerRadius="5" Background="White" Margin="5">

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

@ -77,11 +77,11 @@
<DataGridTextColumn Binding="{Binding jsdw}" Header="调入局" Width="100*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding ffjhNo}" Header="封发计划编号" Width="150*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding rqzlbm}" Header="容器种类编码" Width="150*" IsReadOnly="True" Visibility="Collapsed"/>
<DataGridTextColumn Binding="{Binding rqzlmc}" Header="容器种类名称" Width="150*" IsReadOnly="True" Visibility="Collapsed"/>
<DataGridTextColumn Binding="{Binding rqzlmc}" Header="容器种类名称" Width="150*" IsReadOnly="True" />
<DataGridTextColumn Binding="{Binding rqxhbm}" Header="容器型号编码" Width="150*" IsReadOnly="True" Visibility="Collapsed"/>
<DataGridTextColumn Binding="{Binding rqxhmc}" Header="容器型号名称" Width="150*" IsReadOnly="True" Visibility="Collapsed"/>
<DataGridTextColumn Binding="{Binding kdbsl}" Header="可调拨数量" Width="80*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding ffjhscrq,StringFormat=\{0:MM月dd日 HH:mm.ss.ffff\}}" Header="生成日期" Width="170" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding rqxhmc}" Header="容器型号名称" Width="150*" IsReadOnly="True" />
<DataGridTextColumn Binding="{Binding kdbsl}" Header="可调拨数量" Width="130*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding ffjhscrq,StringFormat=\{0:MM月dd日 HH:mm.ss.ffff\}}" Header="生成日期" Width="150" IsReadOnly="True"/>
<DataGridTemplateColumn Header="操作" Width="220">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>

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

@ -296,6 +296,10 @@ namespace SlnMesnac.RfidUpload.UI.viewModel
private void Init()
{
//程序启动默认打开串口7
_selectedSerialPortItems = "COM7";
OpenSerialPort();
WorkModelParam = Convert.ToInt32(appConfig.workModel);
//webApiServerApp.Init();
@ -448,8 +452,10 @@ namespace SlnMesnac.RfidUpload.UI.viewModel
{
batchNo++;
res = csbHandleBusiness.containerStorageBatchQueryByCsb(TrackNo,batchNo.ToString(), enumerable.ToList());
PrintMessageToListBox($"新容器入库结果 [{res.GetMsg()}]");
}
MainPageTipMessage = $"新容器入库 [{res.GetMsg()}]";
if (res.IsSuccess)
{
Task.Run(() =>
@ -457,7 +463,7 @@ namespace SlnMesnac.RfidUpload.UI.viewModel
Thread.Sleep(3000);
CsbResult res = csbHandleBusiness.receContainerStorageByCsb(TrackNo, "1");
PrintMessageToListBox($"新容器入库反馈接口 [{res.GetMsg()}]");
Application.Current.Dispatcher.Invoke(() =>
{
MainPageTipMessage = $"新容器入库反馈接口，[{res.GetMsg()}]";
@ -482,6 +488,7 @@ namespace SlnMesnac.RfidUpload.UI.viewModel
res = csbHandleBusiness.containerScanSealByCsb(TransferOrderInfoItem.ffjhNo,
opBatch,
TransferOrderInfoItem.ffjhscrq, batchNo.ToString(), enumerable.ToList());
PrintMessageToListBox($"封发-按调拨单结果 [{res.GetMsg()}]");
}
// MessageBox.Show($"封发-按调拨单 [{res.GetMsg()}]");
@ -500,6 +507,7 @@ namespace SlnMesnac.RfidUpload.UI.viewModel
Application.Current.Dispatcher.Invoke(() =>
{
MainPageTipMessage = $"封发-按调拨单反馈接口，[{res.GetMsg()}]";
PrintMessageToListBox($"封发-按调拨单反馈接口结果 [{res.GetMsg()}]");
// 如果需要弹出消息框，也需要在 UI 线程调用 MessageBox
// MessageBox.Show($"封发-按调拨单反馈接口，[{res.GetMsg()}]");
});
@ -525,6 +533,7 @@ namespace SlnMesnac.RfidUpload.UI.viewModel
res = csbHandleBusiness.containerScanSealByCsb(TransferOrderInfoItem.ffjhNo,
opBatch,
TransferOrderInfoItem.ffjhscrq, batchNo.ToString(), enumerable.ToList());
PrintMessageToListBox($"封发-按调拨单接口结果 [{res.GetMsg()}]");
}
MainPageTipMessage = $"封发-按调拨单 [{res.GetMsg()}]";
@ -536,20 +545,22 @@ namespace SlnMesnac.RfidUpload.UI.viewModel
Task.Delay(3000);
CsbResult res1 = csbHandleBusiness.containerScanSealResultByCsb(TransferOrderInfoItem.ffjhNo, opBatch);
MainPageTipMessage = $"封发-按调拨单反馈接口，[{res1.GetMsg()}]";
if(!res1.IsSuccess) return;
PrintMessageToListBox($"封发-按调拨单反馈接口，[{res1.GetMsg()}]");
if (!res1.IsSuccess) return;
//六、6.12 效验发运计划(利用上一步的opBatch)
string stationOrgCode = Institution != null ? Institution.stationOrgCode : "";
string stationOrgName = Institution != null ? Institution.stationOrgName : "";
CsbResult res2 = csbHandleBusiness.tranPlanCheckByCsb(_transferOrderInfo.ffjhNo, opBatch, stationOrgCode, stationOrgName);
MainPageTipMessage = "校验发运计划结果：" + res2.GetMsg();
PrintMessageToListBox("校验发运计划结果：" + res2.GetMsg());
if (res2.IsSuccess)
{
// 七、6.13.容器直连配发-开始配发
CsbResult res3 = csbHandleBusiness.containerAllotByCsb(TransferOrderInfoItem.ffjhNo, opBatch);
MainPageTipMessage = $"库存容器封发配发 -- 6.13.容器直连配发-开始配发 [{res3.GetMsg()}]";
PrintMessageToListBox($"库存容器封发配发 -- 6.13.容器直连配发-开始配发 [{res3.GetMsg()}]");
if (res3.IsSuccess)
{
Task.Delay(3000);
@ -562,6 +573,7 @@ namespace SlnMesnac.RfidUpload.UI.viewModel
{
CsbResult res4 = csbHandleBusiness.containerAllotResultByCsb(TransferOrderInfoItem.ffjhNo, opBatch);
MainPageTipMessage = $"八、反馈接收接口，确认是否和实际相符[{res4.GetMsg()}]";
PrintMessageToListBox($"库存容器封发配发反馈接收接口 [{res4.GetMsg()}]");
if (res4.IsSuccess)
{
break;

Write Preview
Loading…
Cancel
Save