baogq
/
JYHB-WCS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change-扫描入库界面添加备注字段

Browse Source
master
liuwf 1 year ago
parent 9fa863273b
commit 7bc52796e4
3 changed files with 36 additions and 18 deletions
Show Stats Download Patch File Download Diff File

7
src/Khd.Core.Domain/Models/WmsRawInstock.cs
Unescape Escape View File

@ -171,6 +171,13 @@ namespace Khd.Core.Domain.Models
/// </summary> /// </summary>
[Column("purchase_order_id")] [Column("purchase_order_id")]
public long? purchaseOrderId { get; set; } public long? purchaseOrderId { get; set; }
/// <summary>
/// 调度CTU辅料入库人工可添加入库备注
/// </summary>
[Column("tips")]
public string? tips { get; set; }
} }
} }

29
src/Khd.Core.Wpf/Form/FormBoardT.xaml
Unescape Escape View File

@ -2159,6 +2159,7 @@
<RowDefinition/> <RowDefinition/>
<RowDefinition/> <RowDefinition/>
<RowDefinition/> <RowDefinition/>
<RowDefinition/>
<RowDefinition Height="166.667"/> <RowDefinition Height="166.667"/>
<RowDefinition/> <RowDefinition/>
<RowDefinition/> <RowDefinition/>
@ -2170,22 +2171,24 @@
<TextBlock Text="物料名称:" Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75"/> <TextBlock Text="物料名称:" Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75"/>
<TextBlock Text="物料规格:" Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75"/> <TextBlock Text="物料规格:" Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75"/>
<TextBlock Text="入库数量:" Grid.Row="5" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75"/> <TextBlock Text="入库数量:" Grid.Row="5" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75"/>
<hc:TextBox x:Name="txtInBox" hc:InfoElement.ShowClearButton="True" FontSize="50" LostFocus="txtInBox_TextChanged" TextChanged="txtInBox_TextChanged" Width="900" HorizontalAlignment="Left" VerticalAlignment="Center" Height="100" Grid.Row="1" Grid.Column="2" Grid.ColumnSpan="4"/> <TextBlock Text="备注信息:" Grid.Row="6" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75"/>
<Button Click="barClear_Click" HorizontalAlignment="Right" Height="100" Panel.ZIndex="1" Width="100" Margin="0,0,130,0" Grid.Column="5" Grid.Row="2"> <hc:TextBox x:Name="txtInBox" hc:InfoElement.ShowClearButton="True" FontSize="50" LostFocus="txtInBox_TextChanged" TextChanged="txtInBox_TextChanged" Width="900" HorizontalAlignment="Left" VerticalAlignment="Center" Height="80" Grid.Row="1" Grid.Column="2" Grid.ColumnSpan="4"/>
<Button Click="barClear_Click" HorizontalAlignment="Right" Height="80" Panel.ZIndex="1" Width="100" Margin="0,0,130,0" Grid.Column="5" Grid.Row="2">
<Image Source="..\Resources\cancel.png"/> <Image Source="..\Resources\cancel.png"/>
</Button> </Button>
<Button Click="boxClear_Click" HorizontalAlignment="Right" Height="100" Panel.ZIndex="1" Width="100" Margin="0,0,130,0" Grid.Column="5" Grid.Row="1"> <Button Click="boxClear_Click" HorizontalAlignment="Right" Height="80" Panel.ZIndex="1" Width="100" Margin="0,0,130,0" Grid.Column="5" Grid.Row="1">
<Image Source="..\Resources\cancel.png"/> <Image Source="..\Resources\cancel.png" />
</Button> </Button>
<hc:TextBox x:Name="txtInBarCode" hc:InfoElement.ShowClearButton="True" FontSize="50" LostFocus="txtInBarCode_TextChanged" TextChanged="txtInBarCode_TextChanged" Width="900" HorizontalAlignment="Left" VerticalAlignment="Center" Height="100" Grid.Row="2" Grid.Column="2" Grid.ColumnSpan="4"/> <hc:TextBox x:Name="txtInBarCode" hc:InfoElement.ShowClearButton="True" FontSize="50" LostFocus="txtInBarCode_TextChanged" TextChanged="txtInBarCode_TextChanged" Width="900" HorizontalAlignment="Left" VerticalAlignment="Center" Height="80" Grid.Row="2" Grid.Column="2" Grid.ColumnSpan="4"/>
<hc:TextBox x:Name="materialName" IsReadOnly="True" hc:InfoElement.ShowClearButton="True" FontSize="50" Width="900" HorizontalAlignment="Left" VerticalAlignment="Center" Height="100" Grid.Row="3" Grid.Column="2" Grid.ColumnSpan="3"/> <hc:TextBox x:Name="txtInStoreRemark" hc:InfoElement.ShowClearButton="True" FontSize="50" Width="726" HorizontalAlignment="Left" VerticalAlignment="Center" Height="80" Grid.Row="6" Grid.Column="2" Grid.ColumnSpan="3"/>
<hc:TextBox x:Name="materialSpec" IsReadOnly="True" hc:InfoElement.ShowClearButton="True" FontSize="50" Width="900" HorizontalAlignment="Left" VerticalAlignment="Center" Height="100" Grid.Row="4" Grid.Column="2" Grid.ColumnSpan="3"/> <hc:TextBox x:Name="materialName" IsReadOnly="True" hc:InfoElement.ShowClearButton="True" FontSize="50" Width="900" HorizontalAlignment="Left" VerticalAlignment="Center" Height="80" Grid.Row="3" Grid.Column="2" Grid.ColumnSpan="3"/>
<hc:TextBox x:Name="txtInScan" FontSize="50" IsReadOnly="True" Width="900" HorizontalAlignment="Left" VerticalAlignment="Center" Height="100" Grid.Row="5" Grid.Column="2" Grid.ColumnSpan="3" KeyDown="ScanInKeyDown" /> <hc:TextBox x:Name="materialSpec" IsReadOnly="True" hc:InfoElement.ShowClearButton="True" FontSize="50" Width="900" HorizontalAlignment="Left" VerticalAlignment="Center" Height="80" Grid.Row="4" Grid.Column="2" Grid.ColumnSpan="3"/>
<Button Content="确认入库" Grid.Row="6" Grid.ColumnSpan="2" Width="300" Height="100" FontSize="50" Background="#346DFF" Foreground="White" Click="InRawBaseLocaltion_Click" Grid.Column="2" HorizontalAlignment="Left" Margin="125,0,0,10" VerticalAlignment="Bottom"/> <hc:TextBox x:Name="txtInScan" FontSize="50" IsReadOnly="True" Width="400" HorizontalAlignment="Left" VerticalAlignment="Center" Height="80" Grid.Row="5" Grid.Column="2" Grid.ColumnSpan="3" KeyDown="ScanInKeyDown" />
<Button Content="取消预调度" x:Name="CancelPreScheduling" Grid.Row="6" Grid.ColumnSpan="2" Width="328" Height="100" FontSize="50" Background="#346DFF" Foreground="White" HorizontalAlignment="Left" Grid.Column="4" Margin="222,0,0,0" Click="CancelPreScheduling_Click"/> <Button Content="确认入库" Grid.Row="7" Grid.ColumnSpan="2" Width="300" Height="80" FontSize="50" Background="#346DFF" Foreground="White" Click="InRawBaseLocaltion_Click" Grid.Column="2" HorizontalAlignment="Left" Margin="125,0,0,10" VerticalAlignment="Bottom"/>
<Button Content="一键收料" Grid.Row="7" Grid.ColumnSpan="2" Width="328" Height="100" FontSize="50" Background="#346DFF" Foreground="White" Click="callPlc_Click" HorizontalAlignment="Left" Grid.Column="4" Margin="222,0,0,0"/> <Button Content="取消预调度" x:Name="CancelPreScheduling" Grid.Row="6" Grid.ColumnSpan="2" Width="328" Height="80" FontSize="50" Background="#346DFF" Foreground="White" HorizontalAlignment="Left" Grid.Column="4" Margin="222,0,0,0" Click="CancelPreScheduling_Click"/>
<TextBlock Grid.Row="7" Text="提示信息:" HorizontalAlignment="Center" Grid.Column="1" Grid.ColumnSpan="1" Width="250" Height="100" FontSize="50" Foreground="White" /> <Button Content="一键收料" Grid.Row="7" Grid.ColumnSpan="2" Width="328" Height="80" FontSize="50" Background="#346DFF" Foreground="White" Click="callPlc_Click" HorizontalAlignment="Left" Grid.Column="4" Margin="222,0,0,0"/>
<TextBlock x:Name="MsgText" Grid.Row="7" FontSize="50" Grid.ColumnSpan="5" Width="800" Height="100" Foreground="White" HorizontalAlignment="Right" /> <TextBlock Grid.Row="8" Text="提示信息:" HorizontalAlignment="Center" Grid.Column="1" Grid.ColumnSpan="1" Width="250" Height="100" FontSize="50" Foreground="White" />
<TextBlock x:Name="MsgText" Grid.Row="8" FontSize="50" Grid.ColumnSpan="5" Width="800" Height="100" Foreground="White" HorizontalAlignment="Right" />
<Button Content="执行CTU入库任务" Visibility="Hidden" Click="btnCtuInConfirmBox_Click" Grid.Row="5" Grid.ColumnSpan="6" Width="500" Height="100" FontSize="50" Background="#346DFF" Foreground="White"/> <Button Content="执行CTU入库任务" Visibility="Hidden" Click="btnCtuInConfirmBox_Click" Grid.Row="5" Grid.ColumnSpan="6" Width="500" Height="100" FontSize="50" Background="#346DFF" Foreground="White"/>
</Grid> </Grid>
</StackPanel> </StackPanel>

18
src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
Unescape Escape View File

@ -2248,7 +2248,7 @@ namespace Khd.Core.Wpf.Form
txtInBox.Text = string.Empty; txtInBox.Text = string.Empty;
txtInBarCode.Text = string.Empty; txtInBarCode.Text = string.Empty;
txtInScan.Text = string.Empty; txtInScan.Text = string.Empty;
this.txtInStoreRemark.Text = string.Empty;
return; return;
} }
if (material == null) if (material == null)
@ -2257,6 +2257,7 @@ namespace Khd.Core.Wpf.Form
txtInBox.Text = string.Empty; txtInBox.Text = string.Empty;
txtInBarCode.Text = string.Empty; txtInBarCode.Text = string.Empty;
txtInScan.Text = string.Empty; txtInScan.Text = string.Empty;
this.txtInStoreRemark.Text = string.Empty;
txtInBox.Focus(); txtInBox.Focus();
return; return;
} }
@ -2269,6 +2270,7 @@ namespace Khd.Core.Wpf.Form
txtInBox.Text = string.Empty; txtInBox.Text = string.Empty;
txtInBarCode.Text = string.Empty; txtInBarCode.Text = string.Empty;
txtInScan.Text = string.Empty; txtInScan.Text = string.Empty;
this.txtInStoreRemark.Text = string.Empty;
txtInBox.Focus(); txtInBox.Focus();
return; return;
} }
@ -2287,7 +2289,6 @@ namespace Khd.Core.Wpf.Form
applyBy = "WPF", applyBy = "WPF",
applyDate = System.DateTime.Now, applyDate = System.DateTime.Now,
purchaseOrderId = mesBaseBarcodeInfo.PurchaseOrderId, purchaseOrderId = mesBaseBarcodeInfo.PurchaseOrderId,
beginTime = System.DateTime.Now, beginTime = System.DateTime.Now,
endTime = DateTime.Now, endTime = DateTime.Now,
locationCode = container.locationCode, locationCode = container.locationCode,
@ -2298,7 +2299,8 @@ namespace Khd.Core.Wpf.Form
operationType = "1", operationType = "1",
palletInfoCode = container.containerCode, palletInfoCode = container.containerCode,
poNo = mesBaseBarcodeInfo.poNo, poNo = mesBaseBarcodeInfo.poNo,
warehouseId = 512 warehouseId = 512,
tips = this.txtInStoreRemark.Text
}; };
dbContext.Add(wmsRawInstock); dbContext.Add(wmsRawInstock);
@ -2352,7 +2354,8 @@ namespace Khd.Core.Wpf.Form
operationType = "1", operationType = "1",
palletInfoCode = container.containerCode, palletInfoCode = container.containerCode,
poNo = mesBaseBarcodeInfo.poNo, poNo = mesBaseBarcodeInfo.poNo,
warehouseId = 512 warehouseId = 512,
tips = this.txtInStoreRemark.Text
}; };
dbContext.Add(wmsRawInstock); dbContext.Add(wmsRawInstock);
dbContext.SaveChanges(); dbContext.SaveChanges();
@ -2362,6 +2365,7 @@ namespace Khd.Core.Wpf.Form
txtInBox.Focus(); txtInBox.Focus();
MsgText.Text = $"入库成功!当前库存:{totalMessage}"; MsgText.Text = $"入库成功!当前库存:{totalMessage}";
this.txtInStoreRemark.Text = string.Empty;
txtInBox.Text = string.Empty; txtInBox.Text = string.Empty;
txtInBarCode.Text = string.Empty; txtInBarCode.Text = string.Empty;
txtInScan.Text = string.Empty; txtInScan.Text = string.Empty;
@ -2567,7 +2571,11 @@ namespace Khd.Core.Wpf.Form
{ {
string containerCode = txtInBox.Text; string containerCode = txtInBox.Text;
if (containerCode.Length >= 1) MsgText.Text = string.Empty; if (containerCode.Length >= 1)
{
MsgText.Text = string.Empty;
txtInStoreRemark.Text = string.Empty;
}
if (containerCode.Length < 15) if (containerCode.Length < 15)
return; return;
if (!string.IsNullOrEmpty(containerCode)) if (!string.IsNullOrEmpty(containerCode))

Write Preview
Loading…
Cancel
Save