change -调换辅料库立库南北侧,库位显示与现场保持一致,层数从下往上递增

master
启龙 曹 1 year ago
parent bcfe0d7f42
commit 82ecdb65c4

@ -1289,8 +1289,8 @@
<StackPanel Orientation="Horizontal">
<TextBlock Text="仓库位置:" FontSize="25" VerticalAlignment="Center" Foreground="White" />
<ComboBox x:Name="QueryPositionCombox" Height="50" Width="150" FontSize="25" SelectionChanged="QueryPositionCombox_SelectionChanged">
<ComboBoxItem Content="侧" Tag="1" />
<ComboBoxItem Content="侧" Tag="2" />
<ComboBoxItem Content="侧" Tag="1" />
<ComboBoxItem Content="侧" Tag="2" />
</ComboBox>
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="600 0 0 0">

@ -81,7 +81,7 @@ namespace Khd.Core.Wpf.Form
private ObservableCollection<SelectItemModel> itemsControlItems;
//消息提示弹窗
private MessageBoxWindow messageBoxWindow ;
//3楼向其他楼层输出托盘流程时AGV把托盘放置到接驳位后在调度界面增加“托盘入轿厢等待确认”提示信息
//3楼向其他楼层输出托盘流程时AGV把托盘放置到接驳位后在调度界面增加"托盘入轿厢等待确认"提示信息
int systemRunTimerCount = 0;
System.Timers.Timer systemRunTimer = new System.Timers.Timer(1000 * 60);
@ -143,7 +143,7 @@ namespace Khd.Core.Wpf.Form
/// <summary>
/// 3楼向其他楼层输出托盘流程时AGV把托盘放置到接驳位后在调度界面增加“托盘入轿厢等待确认”提示信息
/// 3楼向其他楼层输出托盘流程时AGV把托盘放置到接驳位后在调度界面增加"托盘入轿厢等待确认"提示信息
/// 计算任务等待时长
///
/// </summary>
@ -506,7 +506,9 @@ namespace Khd.Core.Wpf.Form
var dbContext = scope.ServiceProvider.GetRequiredService<DefaultDbContext>();
// 该侧所有库位
var allLocationLists = dbContext.WmsBaseLocation.Where(x => x.warehouseId == 512 && x.locRow == rowPosition).ToList();
allLocationLists = allLocationLists.OrderBy(x => x.layerNum).ThenBy(x => x.locColumn).ToList();
// 修改排序逻辑 - 按层号降序排列,然后按列号升序排列
allLocationLists = allLocationLists.OrderByDescending(x => x.layerNum).ThenBy(x => x.locColumn).ToList();
//在库里的库位
var inLocationList = allLocationLists.Where(x => x.ContainerStatus == "1").Select(x => x.locationCode).ToList();
//在库里有库存的库位

Loading…
Cancel
Save