From 006b561f789e3c4586c39dc2dcdd67abf0413694 Mon Sep 17 00:00:00 2001 From: sunzy Date: Tue, 26 Mar 2024 17:42:43 +0800 Subject: [PATCH] wpf --- src/Khd.Core.Api/Startup.cs | 2 +- .../WcsTaskApplication.cs | 47 +- src/Khd.Core.Domain/Models/WcsCmdLog.cs | 1 + src/Khd.Core.Wpf/Form/FormBoardT.xaml | 418 +++++++++++------- src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs | 51 +-- src/Khd.Core.Wpf/Resources/amma.png | Bin 193009 -> 2791 bytes src/Khd.Core.Wpf/Resources/amma3.png | Bin 157509 -> 2791 bytes 7 files changed, 308 insertions(+), 211 deletions(-) diff --git a/src/Khd.Core.Api/Startup.cs b/src/Khd.Core.Api/Startup.cs index afb34be..a49089c 100644 --- a/src/Khd.Core.Api/Startup.cs +++ b/src/Khd.Core.Api/Startup.cs @@ -66,7 +66,7 @@ namespace Khd.Core.Api .WithMethods("GET", "POST", "PUT", "DELETE", "OPTIONS"); })); - //services.AddApplication(); + services.AddApplication(); services.AddLibrary(); } diff --git a/src/Khd.Core.Application/WcsTaskApplication.cs b/src/Khd.Core.Application/WcsTaskApplication.cs index 848ec27..4170dbb 100644 --- a/src/Khd.Core.Application/WcsTaskApplication.cs +++ b/src/Khd.Core.Application/WcsTaskApplication.cs @@ -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; diff --git a/src/Khd.Core.Domain/Models/WcsCmdLog.cs b/src/Khd.Core.Domain/Models/WcsCmdLog.cs index 1993cde..9c134d3 100644 --- a/src/Khd.Core.Domain/Models/WcsCmdLog.cs +++ b/src/Khd.Core.Domain/Models/WcsCmdLog.cs @@ -22,6 +22,7 @@ namespace Khd.Core.Domain.Models /// 主键 /// [Column("objid")] + [Key] public long objid { get; set; } /// diff --git a/src/Khd.Core.Wpf/Form/FormBoardT.xaml b/src/Khd.Core.Wpf/Form/FormBoardT.xaml index 7acde81..8337750 100644 --- a/src/Khd.Core.Wpf/Form/FormBoardT.xaml +++ b/src/Khd.Core.Wpf/Form/FormBoardT.xaml @@ -369,6 +369,30 @@ Width="1714" Height="1060" Background="#213269" Margin="0,-15,0,0"> +