From cba2c0ff983f40757aa9840a3bd520c28a9896d9 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期三, 15 四月 2026 17:37:10 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/RuiShengZhiNeng/GaoPuLiTiKu
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/TSJJob.cs | 213 ++--------------------------------------------------
1 files changed, 10 insertions(+), 203 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/TSJJob.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/TSJJob.cs"
index f667d86..1338406 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/TSJJob.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/TSJJob.cs"
@@ -14,6 +14,7 @@
using System.Text;
using System.Threading.Tasks;
using WIDESEAWCS_Common;
+using WIDESEAWCS_Common.LocationEnum;
using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Communicator;
using WIDESEAWCS_Core.Helper;
@@ -29,14 +30,17 @@
namespace WIDESEAWCS_Tasks
{
[DisallowConcurrentExecution]
- public class TSJJob : JobBase, IJob
+ public partial class TSJJob : JobBase, IJob
{
private readonly ITaskService _taskService;
private readonly IStationMangerService _stationMangerService;
- public TSJJob(ITaskService taskService, IStationMangerService stationMangerService)
+ private readonly IStationInfoService _stationInfoService;
+
+ public TSJJob(ITaskService taskService, IStationMangerService stationMangerService, IStationInfoService stationInfoService)
{
_taskService = taskService;//娉ㄥ叆
_stationMangerService = stationMangerService;
+ _stationInfoService = stationInfoService;
}
public Task Execute(IJobExecutionContext context)
@@ -45,212 +49,15 @@
if (flag && value != null)
{
OtherDevice device = (OtherDevice)value;
- //Example
- //device.GetValue 璇诲彇
- //device.SetValue 鍐欏叆
- // _taskService.Repository 浠撳偍灞傦紝杩涜鏁版嵁搴撹闂�
- try
- {
- List<Dt_Task> Uptasks = new List<Dt_Task>();
- //鏌ヨ鎵�鏈変换鍔＄被鍨嬩负3,4妤肩殑鍏ュ簱浠诲姟绫诲瀷涓斾换鍔＄姸鎬佷负AGV_WaitToExecute鐨勪换鍔�
- var taskList = _taskService.Repository.QueryData(x => x.TaskState == TaskStatusEnum.AGV_WaitToExecute.ObjToInt());
- //浠诲姟鐨勭洰鏍囧湴鍧�瀵逛簬绔欏彴鍙凤紱
- foreach (var task in taskList)
- {
- //鍏堟鏌ヨ澶囩姸鎬�
- if (device.GetValue<HoistEnum, short>(HoistEnum.EquipmentStatus, "TSJ") == 2)
- {
- if (task.ExceptionMessage == "鎻愬崌鏈鸿澶囨晠闅�")
- {
- continue;
- }
- task.ExceptionMessage = "鎻愬崌鏈鸿澶囨晠闅�";
- Uptasks.Add(task);
- continue;
- //throw new Exception("璁惧鏁呴殰");
- }
- if (task.TaskType == TaskTypeEnum.RK3F.ObjToInt()|| task.TaskType == TaskTypeEnum.Q1TSJ4.ObjToInt())
- {
- if (task.TaskType == TaskTypeEnum.RK3F.ObjToInt())
- {
- //鍒ゆ柇3妤煎叆搴撶鍙锋湁鏃�
- if (device.GetValue<HoistEnum, short>(HoistEnum.OutboundInplace, task.TargetAddress) != 2)
- {
- if (task.ExceptionMessage == "3妤煎叆搴撶鍙锋湁璐э紝璇峰厛澶勭悊")
- {
- continue;
- }
- task.ExceptionMessage = "3妤煎叆搴撶鍙锋湁璐э紝璇峰厛澶勭悊";
- Uptasks.Add(task);
- continue;
- }
- }
- else
- {
+ HKConexecutTask(device);
- #region 4妤煎叆搴�
- //4妤煎嚭搴撴枡绠卞埌浣�
- if (device.GetValue<HoistEnum, short>(HoistEnum.FOutboundmaterialbox, task.SourceAddress) != 1)
- {
- if (task.ExceptionMessage != "4妤煎叆搴撴枡绠辨病鏈夊埌浣�")
- {
- task.ExceptionMessage = "4妤煎叆搴撴枡绠辨病鏈夊埌浣�";
- Uptasks.Add(task);
- }
- continue;
- }
+ PalletNumConfirmation(device);
- #endregion
-
- }
-
-
- //鐒跺悗璋冪敤杈撻�佺嚎鎺ュ彛锛岄�氱煡杈撻�佺嚎鏈夋枡绠遍渶瑕佸叆搴擄紝浠诲姟涓捐鎵ц
- var result = _taskService.Hikvisiontaskscontinue(task.WMSTaskNum);
- if (result.Status == false)
- {
- if (task.ExceptionMessage!= result.Message)
- {
- task.ExceptionMessage = result.Message;
- Uptasks.Add(task);
- }
- continue;
- }
- task.TaskState = (int)TaskStatusEnum.AGV_ToExecute;
- task.ExceptionMessage = "";
- Uptasks.Add(task);
-
- //杩欓噷浠诲姟鍙樻垚浜咰heckPalletCodeing
-
- }
- else if(task.TaskType == TaskTypeEnum.CK3F.ObjToInt()) //鍑哄簱
- {
- ////鍑哄簱鏂欑缂撳瓨鏁伴噺(杩欎釜鏄簱鍖烘煡璇㈢殑鏃跺�欒鏌ヤ竴涓嬶紝杩旂粰wms)
- //if (device.GetValue<HoistEnum, short>(HoistEnum.Outboundmaterialbox, "TSJ") == 0) throw new Exception("娌℃湁鍑哄簱鏂欑缂撳瓨鏁伴噺涓虹┖");
-
-
- //璇诲彇3妤煎嚭搴撴枡绠卞埌浣�
- if (device.GetValue<HoistEnum, short>(HoistEnum.SOutboundmaterialbox, task.SourceAddress) != 1)
- {
- if (task.ExceptionMessage != "3妤煎嚭搴撴枡绠辨病鏈夊埌浣�")
- {
- task.ExceptionMessage = "3妤煎嚭搴撴枡绠辨病鏈夊埌浣�";
- Uptasks.Add(task);
- }
- continue;
- }
- //鐒跺悗璋冪敤杈撻�佺嚎鎺ュ彛锛岄�氱煡杈撻�佺嚎鏈夋枡绠遍渶瑕佸叆搴擄紝浠诲姟涓捐鎵ц
- var result = _taskService.Hikvisiontaskscontinue(task.WMSTaskNum);
- if (result.Status == false)
- {
- if (task.ExceptionMessage != result.Message)
- {
- task.ExceptionMessage = result.Message;
- Uptasks.Add(task);
- }
- continue;
- }
- task.TaskState = (int)TaskStatusEnum.AGV_ToExecute;
- task.ExceptionMessage = "";
- Uptasks.Add(task);
- }
- else if (task.TaskType == TaskTypeEnum.CHUKU1.ObjToInt())//4妤煎嚭搴撲换鍔�
- {
-
- #region 鍑哄簱淇″彿
- //鍥炵┖绠辩殑鏃跺�欒璇讳竴涓悧
- if (device.GetValue<HoistEnum, string>(HoistEnum.Emptycontainernumber, task.TargetAddress) == null)
- {
- if (task.ExceptionMessage != "4妤肩┖绠�,璇荤爜鍣ㄦ病鏈夎鍒板��")
- {
- task.ExceptionMessage = "4妤肩┖绠�,璇荤爜鍣ㄦ病鏈夎鍒板��";
- Uptasks.Add(task);
- }
- continue;
- }
- //鍒ゆ柇4妤肩┖绠卞埌浣�
- if (device.GetValue<HoistEnum, short>(HoistEnum.ReturnbinAvailable, task.TargetAddress) != 2)
- {
- if (task.ExceptionMessage != "鎻愬崌鏈哄叆搴撶┖鏃犺揣")
- {
- task.ExceptionMessage = "鎻愬崌鏈哄叆搴撶┖鏃犺揣";
- Uptasks.Add(task);
- }
- continue;
- }
- #endregion
- //鐒跺悗璋冪敤杈撻�佺嚎鎺ュ彛锛岄�氱煡杈撻�佺嚎鏈夋枡绠遍渶瑕佸叆搴擄紝浠诲姟涓捐鎵ц
- var result = _taskService.Hikvisiontaskscontinue(task.WMSTaskNum);
- if (result.Status == false)
- {
- if (task.ExceptionMessage != result.Message)
- {
- task.ExceptionMessage = result.Message;
- Uptasks.Add(task);
- }
- continue;
- }
-
- task.TaskState = (int)TaskStatusEnum.AGV_ToExecute;
- task.ExceptionMessage = "";
- Uptasks.Add(task);
- }
- //else if (task.TaskType == TaskTypeEnum.CHUKU1.ObjToInt()) //鍥涙ゼ搴撳唴鍒版彁鍗囨満
- //{
-
-
- //}
- }
-
- //鏌ユ壘涓夋ゼ鍏ュ簱浠诲姟鐘舵�佷负CheckPalletCodeing鐨勪换鍔℃墭鐩樺彿纭涓�
- var RK3FTasks = _taskService.Repository.QueryFirst(x => x.TaskType == TaskTypeEnum.RK3F.ObjToInt() && x.TaskState == (int)TaskStatusEnum.CheckPalletCodeing);
- if (RK3FTasks!=null)
- {
- var Barcode = device.SetValue<HoistEnum, short>(HoistEnum.Codereadingtriggered, 1);
- //妫�鏌�3妤煎叆搴撶鍙锋槸澶氬皯锛岀劧鍚庝紶缁檞ms
- var BinNumber = device.GetValue<HoistEnum, string>(HoistEnum.Inboxnumber, RK3FTasks.TargetAddress);
- //鏍规嵁璇诲埌鐨勭鍙疯繘琛屾枡绠辨楠岋紝妫�楠岄�氳繃灏辫Е鍙戣鐮佸櫒璇诲彇锛屽鏋滀笉閫氳繃灏辨姏鍑哄紓甯�
- //var Verification = _taskService.MaterialBoxInspection(RK3FTasks.WMSTaskNum, BinNumber.ToString());
- //if (!Verification.Status)
- //{
- // if (!(RK3FTasks.ExceptionMessage == Verification.Message))
- // {
- // RK3FTasks.ExceptionMessage = Verification.Message;
- // Uptasks.Add(RK3FTasks);
- // }
- // //鏂欑楠岃瘉鍐欏ソ鍚庯紝闇�瑕佹洿鏀�
- // RK3FTasks.TargetAddress = Verification.Data.ToString();
- //}
-
- //濡傛灉鏂欑妫�楠屾垚鍔熷氨鍐欏叆璇荤爜鍣ㄧ殑鍊�
- var result = _taskService.Hikvisiontaskscontinue(RK3FTasks.WMSTaskNum, RK3FTasks.TargetAddress);
- if (result.Status == false)
- {
- if (RK3FTasks.ExceptionMessage != result.Message)
- {
- RK3FTasks.ExceptionMessage = result.Message;
- Uptasks.Add(RK3FTasks);
- }
- }
- RK3FTasks.TaskState = (int)TaskStatusEnum.CheckPalletCodeFinish;
- Uptasks.Add(RK3FTasks);
- }
- if (Uptasks.Count > 0)
- {
- _taskService.UpdateData(Uptasks);
- }
- WriteInfo(device.DeviceName, "infoLog");
-
- WriteDebug(device.DeviceName, "debugLog");
- }
- catch (Exception ex)
- {
- WriteError(device.DeviceName, "閿欒", ex);
- }
+ PalletReportingToWMS(device);
}
else
{
- WriteError(nameof(TestJob), "鍙傛暟閿欒,鏈紶閫掕澶囧弬鏁版垨璁惧绫诲瀷閿欒");
+ WriteError(nameof(TSJJob), "鍙傛暟閿欒,鏈紶閫掕澶囧弬鏁版垨璁惧绫诲瀷閿欒");
}
--
Gitblit v1.9.3