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

Merge branch 'master' of http://106.12.13.113:3000/jingyuanhuanbao/jingyuanhuanbao_wcs

Browse Source
master
LAPTOP-NLSJV9RB\91647 2 years ago
parent bbf2326634 006b561f78
commit 0964a4cd66
7 changed files with 308 additions and 211 deletions
Show Stats Download Patch File Download Diff File

2
src/Khd.Core.Api/Startup.cs
Unescape Escape View File

@ -66,7 +66,7 @@ namespace Khd.Core.Api
.WithMethods("GET", "POST", "PUT", "DELETE", "OPTIONS");
}));
//services.AddApplication();
services.AddApplication();
services.AddLibrary();
}

47
src/Khd.Core.Application/WcsTaskApplication.cs
Unescape Escape View File

@ -15,6 +15,7 @@ using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata.Internal;
using Microsoft.Extensions.DependencyInjection;
using Z.EntityFramework.Plus;
using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
namespace Khd.Core.Application
{
@ -54,13 +55,49 @@ namespace Khd.Core.Application
public ReponseagvCallbackDto AgvCallback(agvCallbackDto agvCallbackDto)
{
ReponseagvCallbackDto reponseagvCallbackDto = new ReponseagvCallbackDto();
//记录日志
LogManager.Info("AgvCallback入参:"+ agvCallbackDto.ToJsonString());
//处理逻辑
try
{
//处理逻辑
var wcscmd = _dbContext.WcsCmd.Where(t => t.objid == Convert.ToInt64(agvCallbackDto.taskCode)).FirstOrDefault();
if (wcscmd != null)
{
//待取货
if (agvCallbackDto.method == "")
{
wcscmd.cmdStatus = 2;
wcscmd.sendFlag = 1;
_dbContext.WcsCmd.Update(wcscmd);
_dbContext.SaveChanges();
}
//已取货待放货
if (agvCallbackDto.method == "")
{
wcscmd.cmdStatus = 3;
wcscmd.sendFlag = 1;
_dbContext.WcsCmd.Update(wcscmd);
_dbContext.SaveChanges();
var list = _dbContext.WcsTask.Where(t => t.objid == wcscmd.taskId).Update(a => new WcsTask() { currPointNo = wcscmd.equipmentNo });
}
//放货完成
if (agvCallbackDto.method == "outbin")
{
wcscmd.cmdStatus = 5;
wcscmd.sendFlag = 1;
_dbContext.WcsCmd.Update(wcscmd);
_dbContext.SaveChanges();
}
}
reponseagvCallbackDto.code = "S";
reponseagvCallbackDto.message = "成功";
}
catch (Exception ex)
{
reponseagvCallbackDto.code = "E";
reponseagvCallbackDto.message = ex.Message;
}
//返回请求
reponseagvCallbackDto.code = "0";
reponseagvCallbackDto.message = "成功";
reponseagvCallbackDto.reqCode = reponseagvCallbackDto.reqCode;
return reponseagvCallbackDto;

1
src/Khd.Core.Domain/Models/WcsCmdLog.cs
Unescape Escape View File

@ -22,6 +22,7 @@ namespace Khd.Core.Domain.Models
/// 主键
/// </summary>
[Column("objid")]
[Key]
public long objid { get; set; }
/// <summary>

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

@ -369,6 +369,30 @@
Width="1714"
Height="1060"
Background="#213269" Margin="0,-15,0,0">
<Label
Width="125"
Height="70"
Margin="-1500,20,0,-100"
Content="设备编号 :"
FontSize="25"
Foreground="White"
/>
<Border
></Border>
<TextBox x:Name="lba_ThrifTtitle1" Style="{StaticResource XingHaoBianMaYangShi}" IsEnabled="true"
Width="180" Height="50" Margin="-1150,-8,0,-100"></TextBox>
<Button Content="搜索" Margin="-800,-8,0,-100" Foreground="White" Height="50" Width="132" Click="Button_Click">
<Button.Template >
<ControlTemplate TargetType="{x:Type Button}" >
<Border BorderBrush="{TemplateBinding Control.BorderBrush}" BorderThickness="1" CornerRadius="4,4,4,4">
<Border.Background>#346DFF</Border.Background>
<ContentPresenter Content="{TemplateBinding ContentControl.Content}" HorizontalAlignment="Center" VerticalAlignment="Center" ></ContentPresenter>
</Border>
</ControlTemplate>
</Button.Template>
</Button>
<!-- 订单信息 -->
<Grid Width="1711" Height="1070" HorizontalAlignment="Left">
<Grid.RowDefinitions>
@ -413,7 +437,7 @@
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<DataGridTextColumn
Width="300*"
Width="200*"
Binding="{Binding serialNo}"
CanUserSort="False"
ElementStyle="{StaticResource dgCell}"
@ -422,26 +446,82 @@
IsReadOnly="True" />
<DataGridTextColumn
Width="400*"
Binding="{Binding MaterialName}"
Width="300*"
Binding="{Binding equipmentNo}"
CanUserSort="False"
ElementStyle="{StaticResource dgCell}"
FontSize="20"
Header="物料名称"
Header="设备编号"
IsReadOnly="True" />
<DataGridTextColumn
Width="300*"
Binding="{Binding containerNo}"
CanUserSort="False"
ElementStyle="{StaticResource dgCell}"
FontSize="20"
Header="容器号"
IsReadOnly="True" />
<DataGridTextColumn
Width="200*"
Binding="{Binding taskStatus}"
CanUserSort="False"
ElementStyle="{StaticResource dgCell}"
FontSize="20"
Header="任务状态"
IsReadOnly="True" />
<DataGridTextColumn
Width="180*"
Binding="{Binding DefineField1}"
Binding="{Binding qty}"
CanUserSort="False"
ElementStyle="{StaticResource dgCell}"
FontSize="20"
Header="物料类型"
Header="数量"
IsReadOnly="True" />
<DataGridTextColumn
Width="200*"
Binding="{Binding startPointNo}"
CanUserSort="False"
ElementStyle="{StaticResource dgCell}"
FontSize="20"
Header="起始站点"
IsReadOnly="True" />
<DataGridTextColumn
Width="200*"
Binding="{Binding currPointNo}"
CanUserSort="False"
ElementStyle="{StaticResource dgCell}"
FontSize="20"
Header="当前站点"
IsReadOnly="True" />
<DataGridTextColumn
Width="200*"
Binding="{Binding nextPointNo}"
CanUserSort="False"
ElementStyle="{StaticResource dgCell}"
FontSize="20"
Header="下一站点"
IsReadOnly="True" />
<DataGridTextColumn
Width="200*"
Binding="{Binding endPointNo}"
CanUserSort="False"
ElementStyle="{StaticResource dgCell}"
FontSize="20"
Header="目的站点"
IsReadOnly="True" />
<DataGridTextColumn
Width="200*"
Binding="{Binding floorNo}"
CanUserSort="False"
ElementStyle="{StaticResource dgCell}"
FontSize="20"
Header="所属楼层"
IsReadOnly="True" />
<DataGridTextColumn
Width="150*"
Binding="{Binding CreateTime,StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}"
Width="220*"
Binding="{Binding createTime,StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}"
CanUserSort="False"
ElementStyle="{StaticResource dgCell}"
FontSize="20"
@ -489,7 +569,7 @@
</Grid>
</StackPanel>
</TabItem>
<TabItem Header="指令管理" Foreground="White" FontSize="25" Width="160" Height="125" Margin="0,23,8,-23">
<TabItem Header="设备管理" Foreground="White" FontSize="25" Width="160" Height="125" Margin="0,23,8,-23">
<StackPanel
x:Name="materialBom"
Canvas.Left="174"
@ -497,6 +577,7 @@
Width="1714"
Height="1060"
Background="#213269" Margin="0,-15,0,0">
<!-- 订单信息 -->
<Grid Width="1711" Height="1070" HorizontalAlignment="Left">
<Grid.RowDefinitions>
@ -541,42 +622,55 @@
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<DataGridTextColumn
Width="300*"
Binding="{Binding lineNo}"
Width="200*"
Binding="{Binding equipmentNo}"
CanUserSort="False"
ElementStyle="{StaticResource dgCell}"
FontSize="20"
Header="产线编码"
Header="设备编号"
IsReadOnly="True" />
<DataGridTextColumn
Width="400*"
Binding="{Binding lineName}"
Width="300*"
Binding="{Binding equipName}"
CanUserSort="False"
ElementStyle="{StaticResource dgCell}"
FontSize="20"
Header="产线名称"
Header="设备名称"
IsReadOnly="True" />
<DataGridTextColumn
Width="180*"
Binding="{Binding areaNo}"
Binding="{Binding equipType}"
CanUserSort="False"
ElementStyle="{StaticResource dgCell}"
FontSize="20"
Header="下件点"
Header="设备类型"
IsReadOnly="True" />
<!--<DataGridTextColumn
Width="255*"
Binding="{Binding modifyTime,StringFormat='{}{0:yyyy-MM-dd}'}"
<DataGridTextColumn
Width="180*"
Binding="{Binding serverIp}"
CanUserSort="False"
ElementStyle="{StaticResource dgCell}"
FontSize="20"
Header="创建日期"
IsReadOnly="True" />-->
Header="IP地址"
IsReadOnly="True" />
<DataGridTextColumn
Width="180*"
Binding="{Binding equipStatus}"
CanUserSort="False"
ElementStyle="{StaticResource dgCell}"
FontSize="20"
Header="设备状态"
IsReadOnly="True" />
<DataGridTextColumn
Width="180*"
Binding="{Binding floorNo}"
CanUserSort="False"
ElementStyle="{StaticResource dgCell}"
FontSize="20"
Header="所属楼层"
IsReadOnly="True" />
</DataGrid.Columns>
<DataGrid.CellStyle>
<Style TargetType="{x:Type DataGridCell}">
@ -627,6 +721,7 @@
Width="1714"
Height="1060"
Background="#213269" Margin="0,-15,0,0" >
<!-- 订单信息 -->
<Grid Width="1711" Height="1070" HorizontalAlignment="Left">
<Grid.RowDefinitions>
@ -671,75 +766,84 @@
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<DataGridTextColumn
Width="300"
Binding="{Binding orderCode}"
Width="200"
Binding="{Binding materialCode}"
CanUserSort="False"
ElementStyle="{StaticResource dgCell}"
FontSize="20"
Header="订单编码"
Header="物料编码"
IsReadOnly="True" />
<DataGridTextColumn
Width="400"
Binding="{Binding prodDesc}"
Width="200"
Binding="{Binding materialName}"
CanUserSort="False"
ElementStyle="{StaticResource dgCell}"
FontSize="20"
Header="成品名称"
Header="物料名称"
IsReadOnly="True" />
<DataGridTextColumn
Width="180"
Binding="{Binding lineCode}"
Binding="{Binding warehouseId}"
CanUserSort="False"
ElementStyle="{StaticResource dgCell}"
FontSize="20"
Header="产线编码"
Header="仓库"
IsReadOnly="True" />
<DataGridTextColumn
Width="150"
Binding="{Binding siteId}"
Binding="{Binding locationCode}"
CanUserSort="False"
ElementStyle="{StaticResource dgCell}"
FontSize="20"
Header="车间编码"
Header="库位"
IsReadOnly="True" />
<DataGridTextColumn
Width="150"
Binding="{Binding quantity}"
Binding="{Binding layerNo}"
CanUserSort="False"
ElementStyle="{StaticResource dgCell}"
FontSize="20"
Header="订单数量"
Header="层"
IsReadOnly="True" />
<DataGridTextColumn
Width="180"
Binding="{Binding onlineQuantity}"
Binding="{Binding colNo}"
CanUserSort="False"
ElementStyle="{StaticResource dgCell}"
FontSize="20"
Header="上件数量"
Header="列"
IsReadOnly="True" />
<DataGridTextColumn
Width="180"
Binding="{Binding actualquantity}"
Binding="{Binding rowNo}"
CanUserSort="False"
ElementStyle="{StaticResource dgCell}"
FontSize="20"
Header="下件数量"
Header="排"
IsReadOnly="True" />
<DataGridTextColumn
Width="180"
Binding="{Binding deepNo}"
CanUserSort="False"
ElementStyle="{StaticResource dgCell}"
FontSize="20"
Header="深位"
IsReadOnly="True" />
<DataGridTextColumn
Width="180"
Binding="{Binding floorNo}"
CanUserSort="False"
ElementStyle="{StaticResource dgCell}"
FontSize="20"
Header="楼层"
IsReadOnly="True" />
<DataGridTextColumn
Width="255"
Binding="{Binding schedulingTime,StringFormat='{}{0:yyyy-MM-dd}'}"
CanUserSort="False"
ElementStyle="{StaticResource dgCell}"
FontSize="20"
Header="订单日期"
IsReadOnly="True" />
@ -785,7 +889,7 @@
</Grid>
</StackPanel>
</TabItem>
<TabItem Header="上件操作" Foreground="White" FontSize="25" Width="160" Height="125" Margin="0,69,8,-69" >
<TabItem Header="指令管理" Foreground="White" FontSize="25" Width="160" Height="125" Margin="0,69,8,-69" >
<StackPanel
x:Name="UpperStart"
Canvas.Left="174"
@ -793,70 +897,11 @@
Width="1724"
Height="1060"
Background="#213269" Margin="0,0,0,16">
<!-- 订单信息 -->
<StackPanel Width="1724" Height="110" HorizontalAlignment="Left">
<StackPanel Width="1724" Height="90" Margin="0" HorizontalAlignment="Left" Orientation="Horizontal">
<Label Width="125" Margin="40,0,0,0" Content="上件物料 :" FontSize="25" Foreground="White"
HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
<ComboBox x:Name="shangjianwuliaocombox" SelectionChanged="shangjianwuliaocombox_SelectionChanged"
VerticalAlignment="Center" Width="600" Height="50" FontSize="30" HorizontalContentAlignment="Left"
VerticalContentAlignment="Center" Margin="15,0,20,0"/>
<Label Width="125" Margin="100,0,0,0" Content="选择订单 :" FontSize="25" Foreground="White"
HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
<ComboBox x:Name="orderselect" SelectedValuePath="Id" DisplayMemberPath ="orderCode"
SelectionChanged="orderselect_SelectionChanged" VerticalAlignment="Center" Width="600" Height="50"
FontSize="30" HorizontalContentAlignment="Left" VerticalContentAlignment="Center" Margin="15,0,20,0"/>
</StackPanel>
<StackPanel Height="20" Margin="0" Background="#172557" />
</StackPanel>
<!-- 载具信息 -->
<StackPanel Width="1724" Height="110" HorizontalAlignment="Left">
<StackPanel Width="1724" Height="90" Margin="0" HorizontalAlignment="Left" Orientation="Horizontal">
<Label Background="Transparent" BorderThickness="0" Width="100" Margin="75,0,0,0" Content="载具号 :"
FontSize="25" Foreground="White" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
<TextBox x:Name="CarNo" HorizontalAlignment="Center" VerticalAlignment="Center" Width="280" Height="50"
IsEnabled="False" FontSize="30" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"
Margin="0,0,0,0" Style="{StaticResource XingHaoBianMaYangShi}" TextChanged="CarNo_TextChanged"/>
<Image x:Name="imgzjydw" Source="..\Resources\state-n@1x.png" Height="40" Width="40" Margin="20,0,0,0" Visibility="Hidden" />
<Label x:Name="labzjydw" Content="已到位" FontSize="20" Foreground="White" Width="100" Margin="0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Visibility="Hidden"/>
<Image x:Name="imgzjwdw" Source="..\Resources\state-b@1x.png" Height="40" Width="40" Margin="0" Visibility="Visible"/>
<Label x:Name="labzjwdw" Content="未到位" FontSize="20" Foreground="White" Width="100" Margin="0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Visibility="Visible"/>
<Label Width="125" Margin="140,0,0,0" Content="数量 :" FontSize="25" Foreground="White"
HorizontalContentAlignment="Right" VerticalContentAlignment="Center"/>
<ComboBox Width="180" Name="comnumber" Margin="20,0,20,0" Height="50" FontSize="30"/>
<Button Content="上 架" Margin="260,15,0,15" Foreground="White" Width="132" Click="Button_Click">
<Button.Template >
<ControlTemplate TargetType="{x:Type Button}" >
<Border BorderBrush="{TemplateBinding Control.BorderBrush}" BorderThickness="1" CornerRadius="4,4,4,4">
<Border.Background>#346DFF</Border.Background>
<ContentPresenter Content="{TemplateBinding ContentControl.Content}" HorizontalAlignment="Center" VerticalAlignment="Center" ></ContentPresenter>
</Border>
</ControlTemplate>
</Button.Template>
</Button>
</StackPanel>
<StackPanel Height="20" Margin="0" Background="#172557" />
</StackPanel>
<StackPanel
Width="1750"
Height="918"
HorizontalAlignment="Left"
Focusable="False">
<StackPanel Orientation="Horizontal" Visibility="Collapsed">
<Image
Width="40"
Height="40"
Margin="120,0,0,0"
Source="..\Resources\yizhuangzaichanpin.png" />
<Label
Width="110"
Margin="0"
HorizontalAlignment="Left"
Content="物料选择"
FontSize="25"
Foreground="White" />
</StackPanel>
<StackPanel
Height="80"
Width="1724"
@ -867,17 +912,17 @@
Width="125"
Height="70"
Margin="50,0,10,0"
Content="发车反馈 :"
Content="设备编号 :"
FontSize="25"
Foreground="White"
HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
<Border
></Border>
<TextBox x:Name="lba_ThrifTtitle" Style="{StaticResource XingHaoBianMaYangShi}" IsEnabled="False"
<TextBox x:Name="lba_ThrifTtitle" Style="{StaticResource XingHaoBianMaYangShi}" IsEnabled="true"
Width="180" Height="50"
VerticalAlignment="Center"
HorizontalAlignment="Left"
HorizontalContentAlignment="Center"
HorizontalContentAlignment="Left"
VerticalContentAlignment="Center"
FontSize="30"
Margin="-10,5,0,5"
@ -889,13 +934,13 @@
VerticalAlignment="Stretch"
HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"
Content="上件点记录查询 : "
Margin="210,0,0,0"/>
Content="容器编号 : "
Margin="20,0,0,0"/>
<Border></Border>
<ComboBox
<TextBox
x:Name="MoHuChaXunWuLiaoName"
HorizontalAlignment="Center"
SelectionChanged="MoHuChaXunWuLiaoName_SelectionChanged"
VerticalAlignment="Center"
Width="180"
Height="50"
@ -903,7 +948,37 @@
HorizontalContentAlignment="Left"
VerticalContentAlignment="Center"
Margin="10,0,20,0"
></ComboBox>
></TextBox>
<Button Content="搜索" Margin="20,15,0,15" Foreground="White" Width="132" Click="Button_Click">
<Button.Template >
<ControlTemplate TargetType="{x:Type Button}" >
<Border BorderBrush="{TemplateBinding Control.BorderBrush}" BorderThickness="1" CornerRadius="4,4,4,4">
<Border.Background>#346DFF</Border.Background>
<ContentPresenter Content="{TemplateBinding ContentControl.Content}" HorizontalAlignment="Center" VerticalAlignment="Center" ></ContentPresenter>
</Border>
</ControlTemplate>
</Button.Template>
</Button>
<Button Content="删除指令" Margin="20,15,0,15" Foreground="White" Width="132" Click="Button_Click">
<Button.Template >
<ControlTemplate TargetType="{x:Type Button}" >
<Border BorderBrush="{TemplateBinding Control.BorderBrush}" BorderThickness="1" CornerRadius="4,4,4,4">
<Border.Background>#346DFF</Border.Background>
<ContentPresenter Content="{TemplateBinding ContentControl.Content}" HorizontalAlignment="Center" VerticalAlignment="Center" ></ContentPresenter>
</Border>
</ControlTemplate>
</Button.Template>
</Button>
<Button Content="重发指令" Margin="20,15,0,15" Foreground="White" Width="132" Click="Button_Click">
<Button.Template >
<ControlTemplate TargetType="{x:Type Button}" >
<Border BorderBrush="{TemplateBinding Control.BorderBrush}" BorderThickness="1" CornerRadius="4,4,4,4">
<Border.Background>#346DFF</Border.Background>
<ContentPresenter Content="{TemplateBinding ContentControl.Content}" HorizontalAlignment="Center" VerticalAlignment="Center" ></ContentPresenter>
</Border>
</ControlTemplate>
</Button.Template>
</Button>
</StackPanel>
<DataGrid
Margin="-25,0,0,0"
@ -945,48 +1020,78 @@
</DataGridTemplateColumn>
<DataGridTextColumn
Width="370"
Binding="{Binding vinCode}"
Width="300*"
Binding="{Binding equipmentNo}"
CanUserSort="False"
ElementStyle="{StaticResource dgCell}"
FontSize="20"
Header="订单号"
Header="设备编号"
IsReadOnly="True" />
<DataGridTextColumn
Width="*"
Binding="{Binding materialName}"
Width="400*"
Binding="{Binding containerNo}"
CanUserSort="False"
ElementStyle="{StaticResource dgCell}"
FontSize="20"
Header="产品名称"
Header="容器编号"
IsReadOnly="True" />
<DataGridTextColumn
Width="100"
Binding="{Binding upSite}"
Width="180*"
Binding="{Binding cmdType}"
CanUserSort="False"
ElementStyle="{StaticResource dgCell}"
FontSize="20"
Header="上件点"
Header="指令类型"
IsReadOnly="True" />
<DataGridTextColumn
Width="150"
Binding="{Binding carNo}"
Width="180*"
Binding="{Binding qty}"
CanUserSort="False"
ElementStyle="{StaticResource dgCell}"
FontSize="20"
Header="挂具号"
Header="数量"
IsReadOnly="True" />
<DataGridTextColumn
Width="255"
Binding="{Binding est,StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}"
Width="180*"
Binding="{Binding serialNo}"
CanUserSort="False"
ElementStyle="{StaticResource dgCell}"
FontSize="20"
Header="上线时间"
Header="流水号"
IsReadOnly="True" />
<DataGridTextColumn
Width="180*"
Binding="{Binding cmdStatus}"
CanUserSort="False"
ElementStyle="{StaticResource dgCell}"
FontSize="20"
Header="指令状态"
IsReadOnly="True" />
<DataGridTextColumn
Width="180*"
Binding="{Binding sendFlag}"
CanUserSort="False"
ElementStyle="{StaticResource dgCell}"
FontSize="20"
Header="下发状态"
IsReadOnly="True" />
<DataGridTextColumn
Width="220*"
Binding="{Binding createTime,StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}"
CanUserSort="False"
ElementStyle="{StaticResource dgCell}"
FontSize="20"
Header="创建时间"
IsReadOnly="True" />
<DataGridTextColumn
Width="220*"
Binding="{Binding updateTime,StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}"
CanUserSort="False"
ElementStyle="{StaticResource dgCell}"
FontSize="20"
Header="修改时间"
IsReadOnly="True" />
@ -1045,18 +1150,18 @@
Source="..\Resources\chanpintiaoma.png" Visibility="Visible"/>
<Label Content="PLC交互信息" Foreground="White" FontSize="20" Width="150" Height="40" Margin="10,0,80,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
</StackPanel>
<Border Background="#213269" BorderBrush="Silver" BorderThickness="2" CornerRadius="10" Width="618" Margin="0,5,0,0">
<StackPanel Height="865" Width="600">
<Border Background="#213269" BorderBrush="Silver" BorderThickness="2" CornerRadius="10" Width="700" Margin="0,5,0,0">
<StackPanel Height="865" Width="800">
<StackPanel Orientation="Horizontal" Height="65">
<Label Content="交互点" Foreground="White" FontSize="20" Width="80" Height="60" Margin="40,0,70,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
<Label Content="载具号" Foreground="White" FontSize="12" Width="60" Height="60" Margin="-20,0,10,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
<Label Content="PLC到位" Foreground="White" FontSize="12" Width="60" Height="60" Margin="0,0,10,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
<Label Content="PLC处理状态" Foreground="White" FontSize="12" Width="80" Height="60" Margin="-10,0,0,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
<Label Content="小车去向" Foreground="White" FontSize="12" Width="60" Height="60" Margin="0,0,10,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
<Label Content="WCS处理状态" Foreground="White" FontSize="10" Width="80" Height="60" Margin="-10,0,10,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
<Label Content="交互点" Foreground="White" FontSize="20" Width="180" Height="60" Margin="40,0,70,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
<Label Content="RFID" Foreground="White" FontSize="12" Width="60" Height="60" Margin="-20,0,10,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
<Label Content="到位信号" Foreground="White" FontSize="12" Width="60" Height="60" Margin="0,0,10,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
<Label Content="是否有托盘" Foreground="White" FontSize="12" Width="80" Height="60" Margin="-10,0,0,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
<Label Content="去向" Foreground="White" FontSize="12" Width="60" Height="60" Margin="0,0,10,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
<Label Content="流水号" Foreground="White" FontSize="10" Width="80" Height="60" Margin="-10,0,10,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
</StackPanel>
<StackPanel Orientation="Horizontal" Height="65">
<Label Content="101" Foreground="White" FontSize="20" Width="100" Height="50" Margin="30,0,60,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
<Label Content="一楼输送线" Foreground="White" FontSize="20" Width="200" Height="50" Margin="30,0,60,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
<TextBox Text="0" x:Name="carno101" FontSize="15" Width="60" Height="50" Margin="-20,0,10,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" IsReadOnly="True" Style="{StaticResource tbxStyle}"/>
<TextBox Text="0" x:Name="carstate101" FontSize="15" Width="60" Height="50" Margin="0,0,10,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" IsReadOnly="True" Style="{StaticResource tbxStyle}"/>
<TextBox Text="0" x:Name="plcsend101" FontSize="15" Width="60" Height="50" Margin="0,0,10,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" IsReadOnly="True" Style="{StaticResource tbxStyle}"/>
@ -1064,7 +1169,7 @@
<TextBox Text="0" x:Name="wcsend101" FontSize="15" Width="60" Height="50" Margin="0,0,10,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Style="{StaticResource tbxStyle}" MaxLength="1"/>
</StackPanel>
<StackPanel Orientation="Horizontal" Height="65">
<Label Content="102" Foreground="White" FontSize="20" Width="100" Height="50" Margin="30,0,60,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
<Label Content="一楼提升机前输送线" Foreground="White" FontSize="20" Width="200" Height="50" Margin="30,0,60,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
<TextBox Text="0" x:Name="carno102" FontSize="15" Width="60" Height="50" Margin="-20,0,10,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" IsReadOnly="True" Style="{StaticResource tbxStyle}"/>
<TextBox Text="0" x:Name="carstate102" FontSize="15" Width="60" Height="50" Margin="0,0,10,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" IsReadOnly="True" Style="{StaticResource tbxStyle}"/>
<TextBox Text="0" x:Name="plcsend102" FontSize="15" Width="60" Height="50" Margin="0,0,10,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" IsReadOnly="True" Style="{StaticResource tbxStyle}"/>
@ -1072,7 +1177,7 @@
<TextBox Text="0" x:Name="wcsend102" FontSize="15" Width="60" Height="50" Margin="0,0,10,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" MaxLength="1" Style="{StaticResource tbxStyle}"/>
</StackPanel>
<StackPanel Orientation="Horizontal" Height="65">
<Label Content="103" Foreground="White" FontSize="20" Width="100" Height="50" Margin="30,0,60,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
<Label Content="二楼输送线" Foreground="White" FontSize="20" Width="200" Height="50" Margin="30,0,60,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
<TextBox Text="0" x:Name="carno103" FontSize="15" Width="60" Height="50" Margin="-20,0,10,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" IsReadOnly="True" Style="{StaticResource tbxStyle}"/>
<TextBox Text="0" x:Name="carstate103" FontSize="15" Width="60" Height="50" Margin="0,0,10,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" IsReadOnly="True" Style="{StaticResource tbxStyle}" />
<TextBox Text="0" x:Name="plcsend103" FontSize="15" Width="60" Height="50" Margin="0,0,10,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" IsReadOnly="True" Style="{StaticResource tbxStyle}"/>
@ -1080,7 +1185,7 @@
<TextBox Text="0" x:Name="wcsend103" FontSize="15" Width="60" Height="50" Margin="0,0,10,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" MaxLength="1" Style="{StaticResource tbxStyle}"/>
</StackPanel>
<StackPanel Orientation="Horizontal" Height="65">
<Label Content="201" Foreground="White" FontSize="20" Width="100" Height="50" Margin="30,0,60,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
<Label Content="二楼提升机前输送线" Foreground="White" FontSize="20" Width="200" Height="50" Margin="30,0,60,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
<TextBox Text="0" x:Name="carno201" FontSize="15" Width="60" Height="50" Margin="-20,0,10,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" IsReadOnly="True" Style="{StaticResource tbxStyle}"/>
<TextBox Text="0" x:Name="carstate201" FontSize="15" Width="60" Height="50" Margin="0,0,10,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" IsReadOnly="True" Style="{StaticResource tbxStyle}"/>
<TextBox Text="0" x:Name="plcsend201" FontSize="15" Width="60" Height="50" Margin="0,0,10,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" IsReadOnly="True" Style="{StaticResource tbxStyle}"/>
@ -1088,7 +1193,7 @@
<TextBox Text="0" x:Name="wcsend201" FontSize="15" Width="60" Height="50" Margin="0,0,10,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" MaxLength="1" Style="{StaticResource tbxStyle}"/>
</StackPanel>
<StackPanel Orientation="Horizontal" Height="65">
<Label Content="202" Foreground="White" FontSize="20" Width="100" Height="50" Margin="30,0,60,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
<Label Content="三楼输送线" Foreground="White" FontSize="20" Width="200" Height="50" Margin="30,0,60,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
<TextBox Text="0" x:Name="carno202" FontSize="15" Width="60" Height="50" Margin="-20,0,10,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" IsReadOnly="True" Style="{StaticResource tbxStyle}"/>
<TextBox Text="0" x:Name="carstate202" FontSize="15" Width="60" Height="50" Margin="0,0,10,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" IsReadOnly="True" Style="{StaticResource tbxStyle}"/>
<TextBox Text="0" x:Name="plcsend202" FontSize="15" Width="60" Height="50" Margin="0,0,10,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" IsReadOnly="True" Style="{StaticResource tbxStyle}"/>
@ -1096,7 +1201,7 @@
<TextBox Text="0" x:Name="wcsend202" FontSize="15" Width="60" Height="50" Margin="0,0,10,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" MaxLength="1" Style="{StaticResource tbxStyle}"/>
</StackPanel>
<StackPanel Orientation="Horizontal" Height="65">
<Label Content="203" Foreground="White" FontSize="20" Width="100" Height="50" Margin="30,0,60,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
<Label Content="三楼提升机前输送线" Foreground="White" FontSize="20" Width="200" Height="50" Margin="30,0,60,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
<TextBox Text="0" x:Name="carno203" FontSize="15" Width="60" Height="50" Margin="-20,0,10,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" IsReadOnly="True" Style="{StaticResource tbxStyle}" />
<TextBox Text="0" x:Name="carstate203" FontSize="15" Width="60" Height="50" Margin="0,0,10,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" IsReadOnly="True" Style="{StaticResource tbxStyle}"/>
<TextBox Text="0" x:Name="plcsend203" FontSize="15" Width="60" Height="50" Margin="0,0,10,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" IsReadOnly="True" Style="{StaticResource tbxStyle}"/>
@ -1104,7 +1209,7 @@
<TextBox Text="0" x:Name="wcsend203" FontSize="15" Width="60" Height="50" Margin="0,0,10,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" MaxLength="1" Style="{StaticResource tbxStyle}"/>
</StackPanel>
<StackPanel Orientation="Horizontal" Height="65">
<Label Content="501" Foreground="White" FontSize="20" Width="100" Height="50" Margin="30,0,60,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
<Label Content="四楼输送线" Foreground="White" FontSize="20" Width="200" Height="50" Margin="30,0,60,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
<TextBox Text="0" x:Name="carno501" FontSize="15" Width="60" Height="50" Margin="-20,0,10,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" IsReadOnly="True" Style="{StaticResource tbxStyle}" />
<TextBox Text="0" x:Name="carstate501" FontSize="15" Width="60" Height="50" Margin="0,0,10,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" IsReadOnly="True" Style="{StaticResource tbxStyle}"/>
<TextBox Text="0" x:Name="plcsend501" FontSize="15" Width="60" Height="50" Margin="0,0,10,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" IsReadOnly="True" Style="{StaticResource tbxStyle}"/>
@ -1112,7 +1217,7 @@
<TextBox Text="0" x:Name="wcsend501" FontSize="15" Width="60" Height="50" Margin="0,0,10,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" MaxLength="1" Style="{StaticResource tbxStyle}"/>
</StackPanel>
<StackPanel Orientation="Horizontal" Height="65">
<Label Content="502" Foreground="White" FontSize="20" Width="100" Height="50" Margin="30,0,60,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
<Label Content="四楼提升机前输送线" Foreground="White" FontSize="20" Width="200" Height="50" Margin="30,0,60,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
<TextBox Text="0" x:Name="carno502" FontSize="15" Width="60" Height="50" Margin="-20,0,10,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" IsReadOnly="True" Style="{StaticResource tbxStyle}" />
<TextBox Text="0" x:Name="carstate502" FontSize="15" Width="60" Height="50" Margin="0,0,10,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" IsReadOnly="True" Style="{StaticResource tbxStyle}"/>
<TextBox Text="0" x:Name="plcsend502" FontSize="15" Width="60" Height="50" Margin="0,0,10,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" IsReadOnly="True" Style="{StaticResource tbxStyle}"/>
@ -1120,7 +1225,7 @@
<TextBox Text="0" x:Name="wcsend502" FontSize="15" Width="60" Height="50" Margin="0,0,10,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" MaxLength="1" Style="{StaticResource tbxStyle}"/>
</StackPanel>
<StackPanel Orientation="Horizontal" Height="65">
<Label Content="503" Foreground="White" FontSize="20" Width="100" Height="50" Margin="30,0,60,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
<Label Content="五楼输送线" Foreground="White" FontSize="20" Width="200" Height="50" Margin="30,0,60,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
<TextBox Text="0" x:Name="carno503" FontSize="15" Width="60" Height="50" Margin="-20,0,10,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" IsReadOnly="True" Style="{StaticResource tbxStyle}" />
<TextBox Text="0" x:Name="carstate503" FontSize="15" Width="60" Height="50" Margin="0,0,10,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" IsReadOnly="True" Style="{StaticResource tbxStyle}"/>
<TextBox Text="0" x:Name="plcsend503" FontSize="15" Width="60" Height="50" Margin="0,0,10,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" IsReadOnly="True" Style="{StaticResource tbxStyle}"/>
@ -1128,21 +1233,14 @@
<TextBox Text="0" x:Name="wcsend503" FontSize="15" Width="60" Height="50" Margin="0,0,10,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" MaxLength="1" Style="{StaticResource tbxStyle}"/>
</StackPanel>
<StackPanel Orientation="Horizontal" Height="65">
<Label Content="504" Foreground="White" FontSize="20" Width="100" Height="50" Margin="30,0,60,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
<Label Content="五楼提升机前输送线" Foreground="White" FontSize="20" Width="200" Height="50" Margin="30,0,60,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
<TextBox Text="0" x:Name="carno504" FontSize="15" Width="60" Height="50" Margin="-20,0,10,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" IsReadOnly="True" Style="{StaticResource tbxStyle}" />
<TextBox Text="0" x:Name="carstate504" FontSize="15" Width="60" Height="50" Margin="0,0,10,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" IsReadOnly="True" Style="{StaticResource tbxStyle}"/>
<TextBox Text="0" x:Name="plcsend504" FontSize="15" Width="60" Height="50" Margin="0,0,10,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" IsReadOnly="True" Style="{StaticResource tbxStyle}"/>
<TextBox Text="0" x:Name="carrun504" FontSize="15" Width="60" Height="50" Margin="0,0,10,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" MaxLength="3" Style="{StaticResource tbxStyle}"/>
<TextBox Text="0" x:Name="wcsend504" FontSize="15" Width="60" Height="50" Margin="0,0,10,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" MaxLength="1" Style="{StaticResource tbxStyle}"/>
</StackPanel>
<StackPanel Orientation="Horizontal" Height="65">
<Label Content="505" Foreground="White" FontSize="20" Width="100" Height="50" Margin="30,0,60,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
<TextBox Text="0" x:Name="carno505" FontSize="15" Width="60" Height="50" Margin="-20,0,10,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" IsReadOnly="True" Style="{StaticResource tbxStyle}" />
<TextBox Text="0" x:Name="carstate505" FontSize="15" Width="60" Height="50" Margin="0,0,10,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" IsReadOnly="True" Style="{StaticResource tbxStyle}"/>
<TextBox Text="0" x:Name="plcsend505" FontSize="15" Width="60" Height="50" Margin="0,0,10,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" IsReadOnly="True" Style="{StaticResource tbxStyle}"/>
<TextBox Text="0" x:Name="carrun505" FontSize="15" Width="60" Height="50" Margin="0,0,10,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" MaxLength="3" Style="{StaticResource tbxStyle}"/>
<TextBox Text="0" x:Name="wcsend505" FontSize="15" Width="60" Height="50" Margin="0,0,10,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" MaxLength="1" Style="{StaticResource tbxStyle}"/>
</StackPanel>
</StackPanel>
</Border>
</StackPanel>

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

@ -114,25 +114,7 @@ namespace Khd.Core.Wpf.Form
"102上件点",
"103上件点"
};
MoHuChaXunWuLiaoName.ItemsSource = list;
MoHuChaXunWuLiaoName.SelectedIndex = 0;
List<string> list2 = new List<string>
{
"1",
"2",
"3",
"4",
"5",
"6",
"7",
"8",
"9",
"10"
};
comnumber.ItemsSource = list2;
comnumber.SelectedIndex = 5;
// shangjianwuliaocombox.ItemsSource= dbContext.BaseProductionOrderSplit.Where( t => t.isCompleted == "0" && t.quantity != t.onlineQuantity).GroupBy(c=>c.prodDesc).Select(r=>r.Key).ToList();
//StartThriftServer();
}
catch (Exception ex)
{
@ -192,11 +174,7 @@ namespace Khd.Core.Wpf.Form
delegate
{
//设置图片为未到位
this.CarNo.Text = "Null";
this.labzjydw.Visibility = System.Windows.Visibility.Hidden;
this.imgzjydw.Visibility = System.Windows.Visibility.Hidden;
this.labzjwdw.Visibility = System.Windows.Visibility.Visible;
this.imgzjwdw.Visibility = System.Windows.Visibility.Visible;
}));
LogManager.Error(ex);
}
@ -214,11 +192,7 @@ namespace Khd.Core.Wpf.Form
delegate
{
//设置图片为已到位、显示挂具号
this.CarNo.Text = name;
this.labzjydw.Visibility = System.Windows.Visibility.Visible;
this.imgzjydw.Visibility = System.Windows.Visibility.Visible;
this.labzjwdw.Visibility = System.Windows.Visibility.Hidden;
this.imgzjwdw.Visibility = System.Windows.Visibility.Hidden;
}));
}
else
@ -226,12 +200,7 @@ namespace Khd.Core.Wpf.Form
Application.Current.Dispatcher.Invoke(new Action(
delegate
{
//设置图片为未到位
//this.CarNo.Clear();
this.labzjydw.Visibility = System.Windows.Visibility.Hidden;
this.imgzjydw.Visibility = System.Windows.Visibility.Hidden;
this.labzjwdw.Visibility = System.Windows.Visibility.Visible;
this.imgzjwdw.Visibility = System.Windows.Visibility.Visible;
}));
}
}
@ -268,11 +237,7 @@ namespace Khd.Core.Wpf.Form
//发车成功提示反馈
this.lba_ThrifTtitle.Foreground = new SolidColorBrush(Colors.Green);
this.lba_ThrifTtitle.Text = "发车成功!";
//设置为未到位
this.labzjwdw.Visibility = System.Windows.Visibility.Visible;
this.imgzjwdw.Visibility = System.Windows.Visibility.Visible;
this.labzjydw.Visibility = System.Windows.Visibility.Hidden;
this.imgzjydw.Visibility = System.Windows.Visibility.Hidden;
}));
}
@ -284,11 +249,7 @@ namespace Khd.Core.Wpf.Form
{
this.lba_ThrifTtitle.Foreground = new SolidColorBrush(Colors.Red);
this.lba_ThrifTtitle.Text = $"Thrift交互失败!";
//发车失败依然显示到位
this.labzjwdw.Visibility = System.Windows.Visibility.Hidden;
this.imgzjwdw.Visibility = System.Windows.Visibility.Hidden;
this.labzjydw.Visibility = System.Windows.Visibility.Visible;
this.imgzjydw.Visibility = System.Windows.Visibility.Visible;
}));
}
}

BIN
src/Khd.Core.Wpf/Resources/amma.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 188 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
src/Khd.Core.Wpf/Resources/amma3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 154 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

Write Preview
Loading…
Cancel
Save