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

1

Browse Source
master
范 1 year ago
parent 2a7aef2bca
commit 128328fc69
4 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File

5
src/Khd.Core.Wcs/Wcs/CreateTaskByRecord.cs
Unescape Escape View File

@ -1,4 +1,5 @@
using Khd.Core.Domain.Dto.TaskType; using Khd.Core.Domain.Dto.TaskType;
using Khd.Core.Domain.Dto.waring;
using Khd.Core.Domain.Models; using Khd.Core.Domain.Models;
using Khd.Core.EntityFramework; using Khd.Core.EntityFramework;
using Khd.Core.Library; using Khd.Core.Library;
@ -2482,6 +2483,7 @@ namespace Khd.Core.Wcs.Wcs
if (toLocation == null) if (toLocation == null)
{ {
// TODO : 没有找到可以移库的目标库位，添加报警 // TODO : 没有找到可以移库的目标库位，添加报警
SystemData.InsertWaringLog(dbContext, WaringType.五楼移库任务创建失败);
Console.WriteLine("5F原材料前往背板安装需要先移库，没有找到可以移库的目标库位，添加报警"); Console.WriteLine("5F原材料前往背板安装需要先移库，没有找到可以移库的目标库位，添加报警");
Thread.Sleep(1000 * 5); Thread.Sleep(1000 * 5);
continue; continue;
@ -2593,6 +2595,7 @@ namespace Khd.Core.Wcs.Wcs
WcsTaskLog wcsTaskLog1 = CoreMapper.Map<WcsTaskLog>(wcsTask); WcsTaskLog wcsTaskLog1 = CoreMapper.Map<WcsTaskLog>(wcsTask);
dbContext.Add(wcsTaskLog1); dbContext.Add(wcsTaskLog1);
dbContext.SaveChanges(); dbContext.SaveChanges();
SystemData.DeleteWaringLog(dbContext, WaringType.五楼移库任务创建失败);
} }
break; break;
@ -2702,6 +2705,7 @@ namespace Khd.Core.Wcs.Wcs
if (toLocation == null) if (toLocation == null)
{ {
// TODO : 没有找到可以移库的目标库位，添加报警 // TODO : 没有找到可以移库的目标库位，添加报警
SystemData.InsertWaringLog(dbContext, WaringType.五楼移库任务创建失败);
Console.WriteLine("5F原材料前往背板安装需要先移库，没有找到可以移库的目标库位，添加报警"); Console.WriteLine("5F原材料前往背板安装需要先移库，没有找到可以移库的目标库位，添加报警");
continue; continue;
} }
@ -2811,6 +2815,7 @@ namespace Khd.Core.Wcs.Wcs
dbContext.Update(stock); dbContext.Update(stock);
WcsTaskLog wcsTaskLog1 = CoreMapper.Map<WcsTaskLog>(wcsTask); WcsTaskLog wcsTaskLog1 = CoreMapper.Map<WcsTaskLog>(wcsTask);
dbContext.Add(wcsTaskLog1); dbContext.Add(wcsTaskLog1);
SystemData.DeleteWaringLog(dbContext, WaringType.五楼移库任务创建失败);
dbContext.SaveChanges(); dbContext.SaveChanges();
} }
} }

3
src/Khd.Core.Wcs/Wcs/SecondFloorLine.cs
Unescape Escape View File

@ -1,4 +1,5 @@
using Khd.Core.Domain.Dto.TaskType; using Khd.Core.Domain.Dto.TaskType;
using Khd.Core.Domain.Dto.waring;
using Khd.Core.Domain.Models; using Khd.Core.Domain.Models;
using Khd.Core.EntityFramework; using Khd.Core.EntityFramework;
using Khd.Core.Library; using Khd.Core.Library;
@ -360,6 +361,7 @@ namespace Khd.Core.Wcs.Wcs
dbContext.Add(wcsTask); dbContext.Add(wcsTask);
WcsTaskLog wcsTaskLog = CoreMapper.Map<WcsTaskLog>(wcsTask); WcsTaskLog wcsTaskLog = CoreMapper.Map<WcsTaskLog>(wcsTask);
dbContext.Add(wcsTaskLog); dbContext.Add(wcsTaskLog);
SystemData.DeleteWaringLog(dbContext, WaringType.二楼入库任务创建失败);
dbContext.SaveChanges(); dbContext.SaveChanges();
canNotIn.Clear(); canNotIn.Clear();
Console.WriteLine(DateTime.Now + ":二楼码垛输送线生成入库托盘任务成功:" + wcsTask.objid); Console.WriteLine(DateTime.Now + ":二楼码垛输送线生成入库托盘任务成功:" + wcsTask.objid);
@ -369,6 +371,7 @@ namespace Khd.Core.Wcs.Wcs
{ {
Console.WriteLine(DateTime.Now + ":2楼调度入库任务,未找到库位"); Console.WriteLine(DateTime.Now + ":2楼调度入库任务,未找到库位");
_logger.Info("2楼调度入库任务,未找到库位"); _logger.Info("2楼调度入库任务,未找到库位");
SystemData.InsertWaringLog(dbContext, WaringType.二楼入库任务创建失败);
// TODO: 没有找到库位,添加报警处理 // TODO: 没有找到库位,添加报警处理
Thread.Sleep(1000 * 5); Thread.Sleep(1000 * 5);
} }

7
src/Khd.Core.Wcs/Wcs/ThirdFloorPoint.cs
Unescape Escape View File

@ -1,4 +1,5 @@
using Khd.Core.Domain.Dto.TaskType; using Khd.Core.Domain.Dto.TaskType;
using Khd.Core.Domain.Dto.waring;
using Khd.Core.Domain.Models; using Khd.Core.Domain.Models;
using Khd.Core.EntityFramework; using Khd.Core.EntityFramework;
using Khd.Core.Library; using Khd.Core.Library;
@ -182,6 +183,7 @@ namespace Khd.Core.Wcs.Wcs
dbContext.Add(wcsTaskLog); dbContext.Add(wcsTaskLog);
dbContext.SaveChanges(); dbContext.SaveChanges();
canNotIn.Clear(); canNotIn.Clear();
SystemData.DeleteWaringLog(dbContext, WaringType.二楼入库任务创建失败);
Console.WriteLine(DateTime.Now + $":三楼接驳位调度入库任务,物料{mesBaseBarcodeInfo.materialId},托盘{rfid},库位{wmsBaseLocation.locationCode}"); Console.WriteLine(DateTime.Now + $":三楼接驳位调度入库任务,物料{mesBaseBarcodeInfo.materialId},托盘{rfid},库位{wmsBaseLocation.locationCode}");
_logger.Info($"三楼接驳位调度入库任务,物料{mesBaseBarcodeInfo.materialId},托盘{rfid},库位{wmsBaseLocation.locationCode}"); _logger.Info($"三楼接驳位调度入库任务,物料{mesBaseBarcodeInfo.materialId},托盘{rfid},库位{wmsBaseLocation.locationCode}");
} }
@ -190,6 +192,7 @@ namespace Khd.Core.Wcs.Wcs
Console.WriteLine(DateTime.Now + ":三楼楼接驳位调度入库任务,未找到库位"); Console.WriteLine(DateTime.Now + ":三楼楼接驳位调度入库任务,未找到库位");
_logger.Info("三楼接驳位调度入库任务,未找到库位"); _logger.Info("三楼接驳位调度入库任务,未找到库位");
// TODO: 没有找到库位,添加报警处理 // TODO: 没有找到库位,添加报警处理
SystemData.InsertWaringLog(dbContext,WaringType.二楼入库任务创建失败);
Thread.Sleep(1000 * 5); Thread.Sleep(1000 * 5);
} }
@ -219,6 +222,10 @@ namespace Khd.Core.Wcs.Wcs
} }
} }
} }
else
{
SystemData.DeleteWaringLog(dbContext, WaringType.二楼入库任务创建失败);
}
} }
} }
catch (Exception ex) catch (Exception ex)

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

@ -440,7 +440,7 @@
<Grid Width="1880" Height="1080"> <Grid Width="1880" Height="1080">
<TabControl x:Name="TabControl" Background="Transparent" BorderThickness="0" HorizontalAlignment="Center" VerticalContentAlignment="Center" SelectionChanged="TabControl_SelectionChanged" TabStripPlacement="Left" Width="1890" Margin="-10,0,0,0"> <TabControl x:Name="TabControl" Background="Transparent" BorderThickness="0" HorizontalAlignment="Center" VerticalContentAlignment="Center" SelectionChanged="TabControl_SelectionChanged" TabStripPlacement="Left" Width="1890" Margin="-10,0,0,0">
<TabItem Visibility="Collapsed" x:Name="FirstItem"></TabItem> <TabItem Visibility="Collapsed" x:Name="FirstItem"></TabItem>
<TabItem x:Name="TaskManager" Header="任务管理" Style="{StaticResource DefaultItem}" Background="#213269" Foreground="White" FontSize="25" Width="160" Height="80" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="2,0,0,0" > <TabItem x:Name="TaskManager" Header="任务管理" Style="{StaticResource DefaultItem}" Background="#213269" Foreground="White" FontSize="25" Width="160" Height="80" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="5" >
<StackPanel <StackPanel
x:Name="essentialData" x:Name="essentialData"
Orientation="Vertical" Orientation="Vertical"

Write Preview
Loading…
Cancel
Save