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

Merge branch 'master' of https://gitee.com/ericxinstar/jywcs

Browse Source
master
liuwf 11 months ago
parent 8db327c867 82ecdb65c4
commit c77d941ad5
3 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File

2
src/Khd.Core.Wcs/Wcs/FiveFloorCTU.cs
Unescape Escape View File

@ -197,7 +197,7 @@ namespace Khd.Core.Wcs.Wcs
} }
} }
} }
else if (task.taskType == StaticTaskType.FiveAccessoryStorage) else if (task.taskType == StaticTaskType.FiveAccessoryStorage)//盘库
{ {
WmsInventoryCheck? wmsInventoryCheck = dbContext.WmsInventoryCheck.Where(t => t.InventoryCheckId == task.orderId).FirstOrDefault(); WmsInventoryCheck? wmsInventoryCheck = dbContext.WmsInventoryCheck.Where(t => t.InventoryCheckId == task.orderId).FirstOrDefault();
if (wmsInventoryCheck != null) if (wmsInventoryCheck != null)

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

@ -110,15 +110,25 @@
</Style> </Style>
<Style TargetType="TabItem" x:Key="DefaultItem"> <Style TargetType="TabItem" x:Key="DefaultItem">
<Setter Property="Background" Value="#213269"/> <Setter Property="Background" Value="#213269"/>
<!--设置背景色--> <Setter Property="Foreground" Value="White"/>
<Setter Property="BorderBrush" Value="#213269"/>
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="TabItem"> <ControlTemplate TargetType="TabItem">
<Grid> <Border x:Name="Border"
<Border Background="{TemplateBinding Background}" BorderThickness="1" BorderBrush="#213269"> Background="{TemplateBinding Background}"
<ContentPresenter ContentSource="Header" VerticalAlignment="Center" HorizontalAlignment="Center"/> BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="1">
<ContentPresenter x:Name="ContentSite"
ContentSource="Header"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</Border> </Border>
</Grid> <ControlTemplate.Triggers>
<Trigger Property="IsSelected" Value="True">
<Setter TargetName="Border" Property="Background" Value="#172557"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate> </ControlTemplate>
</Setter.Value> </Setter.Value>
</Setter> </Setter>
@ -1279,8 +1289,8 @@
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBlock Text="仓库位置:" FontSize="25" VerticalAlignment="Center" Foreground="White" /> <TextBlock Text="仓库位置:" FontSize="25" VerticalAlignment="Center" Foreground="White" />
<ComboBox x:Name="QueryPositionCombox" Height="50" Width="150" FontSize="25" SelectionChanged="QueryPositionCombox_SelectionChanged"> <ComboBox x:Name="QueryPositionCombox" Height="50" Width="150" FontSize="25" SelectionChanged="QueryPositionCombox_SelectionChanged">
<ComboBoxItem Content="南侧" Tag="1" /> <ComboBoxItem Content="北侧" Tag="1" />
<ComboBoxItem Content="北侧" Tag="2" /> <ComboBoxItem Content="南侧" Tag="2" />
</ComboBox> </ComboBox>
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="600 0 0 0"> <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="600 0 0 0">

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

@ -81,7 +81,7 @@ namespace Khd.Core.Wpf.Form
private ObservableCollection<SelectItemModel> itemsControlItems; private ObservableCollection<SelectItemModel> itemsControlItems;
//消息提示弹窗 //消息提示弹窗
private MessageBoxWindow messageBoxWindow ; private MessageBoxWindow messageBoxWindow ;
//3楼向其他楼层输出托盘流程时，AGV把托盘放置到接驳位后，在调度界面增加“托盘入轿厢等待确认”提示信息 //3楼向其他楼层输出托盘流程时，AGV把托盘放置到接驳位后，在调度界面增加"托盘入轿厢等待确认"提示信息
int systemRunTimerCount = 0; int systemRunTimerCount = 0;
System.Timers.Timer systemRunTimer = new System.Timers.Timer(1000 * 60); System.Timers.Timer systemRunTimer = new System.Timers.Timer(1000 * 60);
@ -143,7 +143,7 @@ namespace Khd.Core.Wpf.Form
/// <summary> /// <summary>
/// 3楼向其他楼层输出托盘流程时，AGV把托盘放置到接驳位后，在调度界面增加“托盘入轿厢等待确认”提示信息 /// 3楼向其他楼层输出托盘流程时，AGV把托盘放置到接驳位后，在调度界面增加"托盘入轿厢等待确认"提示信息
/// 计算任务等待时长 /// 计算任务等待时长
/// ///
/// </summary> /// </summary>
@ -506,7 +506,9 @@ namespace Khd.Core.Wpf.Form
var dbContext = scope.ServiceProvider.GetRequiredService<DefaultDbContext>(); var dbContext = scope.ServiceProvider.GetRequiredService<DefaultDbContext>();
// 该侧所有库位 // 该侧所有库位
var allLocationLists = dbContext.WmsBaseLocation.Where(x => x.warehouseId == 512 && x.locRow == rowPosition).ToList(); 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(); var inLocationList = allLocationLists.Where(x => x.ContainerStatus == "1").Select(x => x.locationCode).ToList();
//在库里有库存的库位 //在库里有库存的库位
@ -5737,16 +5739,16 @@ namespace Khd.Core.Wpf.Form
this.LocaltionGrid.Children.Clear(); this.LocaltionGrid.Children.Clear();
this.LocaltionGrid.RowDefinitions.Clear(); this.LocaltionGrid.RowDefinitions.Clear();
this.LocaltionGrid.ColumnDefinitions.Clear(); this.LocaltionGrid.ColumnDefinitions.Clear();
List<long> list = wmsBaseLocations.Select(t => t.warehouseId).Distinct().ToList(); List<long> list = wmsBaseLocations.Select(t => t.warehouseId).Distinct().ToList();//库位的楼层
int? column = 0; int? column = 0;
for (var i = 0; i < list.Count; i++) for (var i = 0; i < list.Count; i++)
{ {
this.LocaltionGrid.RowDefinitions.Add(new RowDefinition() { Height = new GridLength(1.0, GridUnitType.Star) }); this.LocaltionGrid.RowDefinitions.Add(new RowDefinition() { Height = new GridLength(1.0, GridUnitType.Star) });
var grid = new Grid(); var grid = new Grid();
List<WmsBaseLocation> locations = wmsBaseLocations.Where(t => t.warehouseId == list[i]).ToList(); List<WmsBaseLocation> locations = wmsBaseLocations.Where(t => t.warehouseId == list[i]).ToList();//本楼层库位数量
var row = locations.Max(t => t.locRow); var row = locations.Max(t => t.locRow);//最大行数
column = locations.Max(t => t.locColumn); column = locations.Max(t => t.locColumn);//最大列数
if (list[0] == 231 && i == 0) if (list[0] == 231 && i == 0)
{ {
grid.RowDefinitions.Add(new RowDefinition() { Height = new GridLength(1.0, GridUnitType.Star) }); grid.RowDefinitions.Add(new RowDefinition() { Height = new GridLength(1.0, GridUnitType.Star) });

Write Preview
Loading…
Cancel
Save