From 6ea34c961a0f9ba0eb5d268aaf4aaf9849dac9a9 Mon Sep 17 00:00:00 2001
From: Xq Yang <2290299376@qq.com>
Date: Wed, 10 Jul 2024 10:42:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../WmsEntity/SendWmsTaskStatusRequest.cs | 3 ++-
.../CirculationTask/Stacker/ExecuteWcsTask.cs | 3 +--
.../Business/CommonAction/SendWmsTaskStatus.cs | 3 +++
.../CommonAction/WCSTaskExecuteEvent.cs | 13 ++++++++++++-
WcsMain/DataBase/Dao/AppWmsTaskDao.cs | 9 +++++++++
WcsMain/DataBase/MixDao/TaskDao.cs | 6 +++++-
WcsMain/DataBase/TableEntity/AppWmsTask.cs | 1 +
.../EquipOperation/Stacker/StackerOperation.cs | 3 ++-
.../StackerConvey/StackerConveyOperation.cs | 5 +++--
WcsMain/Program.cs | 18 ++++++++++++++++--
.../PublishProfiles/FolderProfile.pubxml.user | 2 +-
11 files changed, 55 insertions(+), 11 deletions(-)
diff --git a/WcsMain/ApiClient/DataEntity/WmsEntity/SendWmsTaskStatusRequest.cs b/WcsMain/ApiClient/DataEntity/WmsEntity/SendWmsTaskStatusRequest.cs
index 16600c6..de6d0ac 100644
--- a/WcsMain/ApiClient/DataEntity/WmsEntity/SendWmsTaskStatusRequest.cs
+++ b/WcsMain/ApiClient/DataEntity/WmsEntity/SendWmsTaskStatusRequest.cs
@@ -1,4 +1,5 @@
-using System.Text.Json.Serialization;
+
+using System.Text.Json.Serialization;
namespace WcsMain.ApiClient.DataEntity.WmsEntity;
diff --git a/WcsMain/Business/CirculationTask/Stacker/ExecuteWcsTask.cs b/WcsMain/Business/CirculationTask/Stacker/ExecuteWcsTask.cs
index 0faa458..125a37e 100644
--- a/WcsMain/Business/CirculationTask/Stacker/ExecuteWcsTask.cs
+++ b/WcsMain/Business/CirculationTask/Stacker/ExecuteWcsTask.cs
@@ -84,10 +84,9 @@ public class ExecuteWcsTask(StackerOperation stackerOperation, AppWcsTaskDao wcs
var wcsTask = wcsTasks[0]; // 取第一条任务
/* 校验入库站台是否可以取货 */
(bool isSuccess, uint value) = _stackerConveyOperation.ReadSenserStatus(wcsTask.Origin);
- if (!isSuccess || value == 0) return false; //站台不允许取货
+ //if (!isSuccess || value == 0) return false; //站台不允许取货
// TODO
/* 检验并返回起点终点信息 */
-
var originLocationInfo = CommonData.AppLocations.DetailWithWcsLocation(wcsTask.Origin);
var destinationLocationInfo = CommonData.AppLocations.DetailWithWcsLocation(wcsTask.Destination);
if (destinationLocationInfo == default || originLocationInfo == default) // 起点终点错误，直接标记错误
diff --git a/WcsMain/Business/CommonAction/SendWmsTaskStatus.cs b/WcsMain/Business/CommonAction/SendWmsTaskStatus.cs
index a2fe8ac..c0ca8e0 100644
--- a/WcsMain/Business/CommonAction/SendWmsTaskStatus.cs
+++ b/WcsMain/Business/CommonAction/SendWmsTaskStatus.cs
@@ -12,11 +12,14 @@ namespace WcsMain.Business.CommonAction;
/// 用于发送WMS任务状态的类
///
[Component]
+
public class SendWmsTaskStatus(AppWmsTaskDao wmsTaskDao, WmsWebApiPost wmsWebApiPost)
{
private readonly WmsWebApiPost _wmsWebApiPost = wmsWebApiPost;
private readonly AppWmsTaskDao _wmsTaskDao = wmsTaskDao;
+ //YXQ
+
///
/// 发送 WMS 任务异常
///
diff --git a/WcsMain/Business/CommonAction/WCSTaskExecuteEvent.cs b/WcsMain/Business/CommonAction/WCSTaskExecuteEvent.cs
index c7d5f8d..e5fa3b0 100644
--- a/WcsMain/Business/CommonAction/WCSTaskExecuteEvent.cs
+++ b/WcsMain/Business/CommonAction/WCSTaskExecuteEvent.cs
@@ -115,8 +115,19 @@ public class WCSTaskExecuteEvent(TaskDao taskDao, SendWmsTaskStatus sendWmsTaskS
{
ConsoleLog.Error($"【异常】PlcId：{task.PlcId} 任务完成失败，异常信息：{errMsg}");
}
+ if (task.CreatePerson == StaticString.WMS) {
+ _sendWmsTaskStatus.SendTaskComplete(task.TaskId);
+ }
}
-
+ /*
+ AppWmsTaskDao.Instance().CompleteTaskWithTaskId(wcsTask.TaskId, "完成");
+ // 发送WMS任务完成
+ if (wcsTask.CreatePerson is "WMS")
+ {
+ //SendWmsTaskStatus.Instance().SendTaskComplete
+ SendWmsTaskStatus.SendTaskComplete(wcsTask.TaskId);
+ }
+ */
///
/// 更新库位的相关信息，
diff --git a/WcsMain/DataBase/Dao/AppWmsTaskDao.cs b/WcsMain/DataBase/Dao/AppWmsTaskDao.cs
index 0522076..0798938 100644
--- a/WcsMain/DataBase/Dao/AppWmsTaskDao.cs
+++ b/WcsMain/DataBase/Dao/AppWmsTaskDao.cs
@@ -12,6 +12,15 @@ namespace WcsMain.DataBase.Dao;
[Component]
public class AppWmsTaskDao
{
+ //yxq
+ private static AppWmsTaskDao? _instance;
+ public static AppWmsTaskDao Instance()
+ {
+ return _instance ??= new AppWmsTaskDao();
+ }
+ //yxq
+
+
///
/// 添加记录
/// 注意：尚未清楚是否为事务插入
diff --git a/WcsMain/DataBase/MixDao/TaskDao.cs b/WcsMain/DataBase/MixDao/TaskDao.cs
index f0e7913..f0222be 100644
--- a/WcsMain/DataBase/MixDao/TaskDao.cs
+++ b/WcsMain/DataBase/MixDao/TaskDao.cs
@@ -1,7 +1,11 @@
-using WcsMain.Common;
+using System.Threading.Tasks;
+using WcsMain.Business.CommonAction;
+using WcsMain.Common;
+using WcsMain.DataBase.Dao;
using WcsMain.DataBase.TableEntity;
using WcsMain.Enum.TaskEnum;
using WcsMain.ExtendMethod;
+using WcsMain.Plugins;
using WcsMain.WcsAttribute.AutoFacAttribute;
namespace WcsMain.DataBase.MixDao;
diff --git a/WcsMain/DataBase/TableEntity/AppWmsTask.cs b/WcsMain/DataBase/TableEntity/AppWmsTask.cs
index 13ae70e..8624e53 100644
--- a/WcsMain/DataBase/TableEntity/AppWmsTask.cs
+++ b/WcsMain/DataBase/TableEntity/AppWmsTask.cs
@@ -1,4 +1,5 @@
using System.Text.Json.Serialization;
+using Newtonsoft.Json;
using SqlSugar;
namespace WcsMain.DataBase.TableEntity;
diff --git a/WcsMain/EquipOperation/Stacker/StackerOperation.cs b/WcsMain/EquipOperation/Stacker/StackerOperation.cs
index 6064278..1a92c85 100644
--- a/WcsMain/EquipOperation/Stacker/StackerOperation.cs
+++ b/WcsMain/EquipOperation/Stacker/StackerOperation.cs
@@ -199,6 +199,7 @@ public class StackerOperation
/// 任务数据
/// 货叉编号
///
+
public string WriteTask(StackerPlcTask task, int forkId = 0)
{
if (!CommonData.IsConnectPlc || CommonTool.Siemens == default) return "PLC尚未连接。"; // 未连接PLC
@@ -225,7 +226,7 @@ public class StackerOperation
);
return writeResult.Success ? string.Empty : writeResult.Message ?? "写入失败，未知原因";
}
-
+
///
/// 获取过账数据
diff --git a/WcsMain/EquipOperation/StackerConvey/StackerConveyOperation.cs b/WcsMain/EquipOperation/StackerConvey/StackerConveyOperation.cs
index 4de4b6e..fdcb2d6 100644
--- a/WcsMain/EquipOperation/StackerConvey/StackerConveyOperation.cs
+++ b/WcsMain/EquipOperation/StackerConvey/StackerConveyOperation.cs
@@ -176,8 +176,9 @@ public class StackerConveyOperation
///
///
///
+
public string WriteTask(StackerConveyPlcTask task)
- {
+ {
if (!CommonData.IsConnectPlc || CommonTool.Siemens == default)
{
return "PLC尚未连接。"; // 未连接PLC
@@ -204,7 +205,7 @@ public class StackerConveyOperation
return writeResult.Success ? string.Empty : "写入失败";
}
-
+
///
diff --git a/WcsMain/Program.cs b/WcsMain/Program.cs
index ae92182..748d040 100644
--- a/WcsMain/Program.cs
+++ b/WcsMain/Program.cs
@@ -1,8 +1,14 @@
+using ApiTool;
using Autofac;
using Autofac.Extensions.DependencyInjection;
using System.Text;
+using System.Threading.Tasks;
using WcsMain;
+using WcsMain.ApiClient.DataEntity.WmsEntity;
+using WcsMain.Business.CommonAction;
using WcsMain.Common;
+using WcsMain.Enum;
+using WcsMain.Plugins;
using WcsMain.StartAction;
Console.Title = "WCS豸ϵͳ";
@@ -57,9 +63,17 @@ if (app.Environment.IsDevelopment())
}
app.UseCors("any");
-
app.UseAuthorization();
-
app.MapControllers();
+WebApiPost _wmsWebApiPost = new WebApiPost();
+SendWmsTaskStatusRequest request = new()
+{
+ TaskId = "11111",
+ TaskStatus = (int)SendWmsTaskStatusEnum.complete,
+ Destination = "12kk",
+ VehicleNo = "wmsTask.VehicleNo",
+ Message = ""
+};
+_wmsWebApiPost.HttpPost(request, "");
app.Run();
diff --git a/WcsMain/Properties/PublishProfiles/FolderProfile.pubxml.user b/WcsMain/Properties/PublishProfiles/FolderProfile.pubxml.user
index 2075663..271704e 100644
--- a/WcsMain/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WcsMain/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<_PublishTargetUrl>D:\file4\2024-5-6 苏州卡特\应用程序\WcsService\WcsMain\bin\Release\net8.0\publish\
- True|2024-06-19T01:50:26.9671568Z;False|2024-06-19T09:46:12.9177219+08:00;
+ True|2024-07-10T00:12:30.9273573Z;True|2024-07-09T14:43:30.5015300+08:00;True|2024-07-08T16:34:48.9723414+08:00;True|2024-06-26T15:10:13.7440501+08:00;True|2024-06-19T09:50:26.9671568+08:00;False|2024-06-19T09:46:12.9177219+08:00;
\ No newline at end of file