From 9e00c3b8e695e3c59ea1f3d951455d799ff24fb7 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期五, 10 四月 2026 10:28:34 +0800
Subject: [PATCH] 1

---
 代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/TSJJob.cs |  224 ++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 144 insertions(+), 80 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 870675c..770a40f 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"
@@ -41,7 +41,6 @@
 
         public Task Execute(IJobExecutionContext context)
         {
-
             bool flag = context.JobDetail.JobDataMap.TryGetValue("JobParams", out object? value);
             if (flag && value != null)
             {
@@ -49,7 +48,7 @@
                 //Example
                 //device.GetValue  璇诲彇
                 //device.SetValue  鍐欏叆
-                // _taskService.Repository 浠撳偍灞傦紝杩涜鏁版嵁搴撹闂�-
+                // _taskService.Repository 浠撳偍灞傦紝杩涜鏁版嵁搴撹闂�
                 try
                 {
                     List<Dt_Task> Uptasks = new List<Dt_Task>();
@@ -70,25 +69,41 @@
                             continue;
                             //throw new Exception("璁惧鏁呴殰");
                         }
-                        if (task.TaskType == TaskTypeEnum.RK3F.ObjToInt())
+                        if (task.TaskType == TaskTypeEnum.RK3F.ObjToInt() || task.TaskType == TaskTypeEnum.CHUKU1.ObjToInt() || task.TaskType == TaskTypeEnum.F04.ObjToInt())
                         {
-                            //鍒ゆ柇3妤煎叆搴撶鍙锋湁鏃�
-                            if (device.GetValue<HoistEnum, string>(HoistEnum.OutboundInplace, "TSJ") == "1")
+                            if (task.TaskType == TaskTypeEnum.RK3F.ObjToInt())
                             {
-                                if (task.ExceptionMessage == "3妤煎叆搴撶鍙锋湁璐э紝璇峰厛澶勭悊")
+                                //鍒ゆ柇3妤煎叆搴撶鍙锋湁鏃�
+                                if (device.GetValue<HoistEnum, short>(HoistEnum.OutboundInplace, task.TargetAddress) != 2)
                                 {
+                                    if (task.ExceptionMessage == "3妤煎叆搴撶鍙锋湁璐э紝璇峰厛澶勭悊")
+                                    {
+                                        continue;
+                                    }
+                                    task.ExceptionMessage = "3妤煎叆搴撶鍙锋湁璐э紝璇峰厛澶勭悊";
+                                    Uptasks.Add(task);
                                     continue;
                                 }
-                                task.ExceptionMessage = "3妤煎叆搴撶鍙锋湁璐э紝璇峰厛澶勭悊";
-                                Uptasks.Add(task);
-                                continue;
                             }
-                           
+                            else
+                            {
+                                if (device.GetValue<HoistEnum, short>(HoistEnum.ReturnbinAvailable, task.TargetAddress) != 2)
+                                {
+                                    if (task.ExceptionMessage != "4F鎻愬崌鏈哄叆鍙f湁璐�")
+                                    {
+                                        task.ExceptionMessage = "4F鎻愬崌鏈哄叆鍙f湁璐�";
+                                        Uptasks.Add(task);
+                                    }
+                                    continue;
+                                }
+                            }
+
+
                             //鐒跺悗璋冪敤杈撻�佺嚎鎺ュ彛锛岄�氱煡杈撻�佺嚎鏈夋枡绠遍渶瑕佸叆搴擄紝浠诲姟涓捐鎵ц
                             var result = _taskService.Hikvisiontaskscontinue(task.WMSTaskNum);
                             if (result.Status == false)
                             {
-                                if (task.ExceptionMessage!= result.Message)
+                                if (task.ExceptionMessage != result.Message)
                                 {
                                     task.ExceptionMessage = result.Message;
                                     Uptasks.Add(task);
@@ -98,89 +113,138 @@
                             task.TaskState = (int)TaskStatusEnum.AGV_ToExecute;
                             task.ExceptionMessage = "";
                             Uptasks.Add(task);
+
                             //杩欓噷浠诲姟鍙樻垚浜咰heckPalletCodeing
 
                         }
-                        else if(task.TaskType == TaskTypeEnum.CK3F.ObjToInt()) //鍑哄簱
+                        else if (task.TaskType == TaskTypeEnum.CK3F.ObjToInt() || task.TaskType == TaskTypeEnum.Q1TSJ4.ObjToInt() || task.TaskType == TaskTypeEnum.F03.ObjToInt()) //鍑哄簱
                         {
-                            ////鍑哄簱鏂欑缂撳瓨鏁伴噺
+                            ////鍑哄簱鏂欑缂撳瓨鏁伴噺(杩欎釜鏄簱鍖烘煡璇㈢殑鏃跺�欒鏌ヤ竴涓嬶紝杩旂粰wms)
                             //if (device.GetValue<HoistEnum, short>(HoistEnum.Outboundmaterialbox, "TSJ") == 0) throw new Exception("娌℃湁鍑哄簱鏂欑缂撳瓨鏁伴噺涓虹┖");
-                            //璇诲彇3妤煎嚭搴撴枡绠卞埌浣�
-                            if (device.GetValue<HoistEnum, short>(HoistEnum.SOutboundmaterialbox, "TSJ") != 1) throw new Exception("3妤煎嚭搴撴枡绠辨病鏈夊埌浣�");
+
+                            if (task.TaskType == TaskTypeEnum.CK3F.ObjToInt())
+                            {
+                                //璇诲彇3妤煎嚭搴撴枡绠卞埌浣�
+                                if (device.GetValue<HoistEnum, short>(HoistEnum.SOutboundmaterialbox, task.SourceAddress) != 1)
+                                {
+                                    if (task.ExceptionMessage != "3妤兼彁鍗囨満鍑哄彛鍏夌數鍙嶉鏃犺揣")
+                                    {
+                                        task.ExceptionMessage = "3妤兼彁鍗囨満鍑哄彛鍏夌數鍙嶉鏃犺揣";
+                                        Uptasks.Add(task);
+                                    }
+                                    continue;
+                                }
+                            }
+                            else
+                            {
+                                if (device.GetValue<HoistEnum, short>(HoistEnum.FOutboundmaterialbox, task.SourceAddress) != 1)
+                                {
+                                    if (task.ExceptionMessage != "4妤兼彁鍗囨満鍑哄彛鍏夌數鍙嶉鏃犺揣")
+                                    {
+                                        task.ExceptionMessage = "4妤兼彁鍗囨満鍑哄彛鍏夌數鍙嶉鏃犺揣";
+                                        Uptasks.Add(task);
+                                    }
+                                    continue;
+                                }
+
+                                if (device.GetValue<HoistEnum, short>(HoistEnum.ROutScanningCompletionSignal, task.SourceAddress) != 1)
+                                {
+                                    if (task.ExceptionMessage != "4妤兼彁鍗囨満鍑哄彛鎵爜瀹屾垚淇″彿娌℃湁瀹屾垚")
+                                    {
+                                        task.ExceptionMessage = "4妤兼彁鍗囨満鍑哄彛鎵爜瀹屾垚淇″彿娌℃湁瀹屾垚";
+                                        Uptasks.Add(task);
+                                    }
+                                    continue;
+                                }
+                            }
                             //鐒跺悗璋冪敤杈撻�佺嚎鎺ュ彛锛岄�氱煡杈撻�佺嚎鏈夋枡绠遍渶瑕佸叆搴擄紝浠诲姟涓捐鎵ц
-                            if (_taskService.Hikvisiontaskscontinue(task.WMSTaskNum).Status == false) throw new Exception($"3妤煎嚭搴撲换鍔′妇琛屾墽琛屽け璐ワ紝閿欒淇℃伅{_taskService.Hikvisiontaskscontinue(task.WMSTaskNum).Message}");//缁欎换鍔″彿
-
-                            //鍘绘洿鏂颁换鍔¢噷鍐欏��
-                            //鍐�3妤煎嚭搴撶鍙栬揣瀹屾垚
-                            device.SetValue<HoistEnum, short>(HoistEnum.Outboundboxon, 1);
-                        }
-                        else if (task.TaskType == TaskTypeEnum.Q1TSJ4.ObjToInt())//4妤煎叆搴�
-                        {
-                            //鍥炵┖绠辩殑鏃跺�欒璇讳竴涓悧
-                            if (device.GetValue<HoistEnum, short>(HoistEnum.Emptycontainernumber, "TSJ") == null) throw new Exception($"4妤肩┖绠�,璇荤爜鍣ㄦ病鏈夎鍒板��");
-                           
-                            //鍒ゆ柇4妤肩┖绠卞埌浣�
-                            if (device.GetValue<HoistEnum, short>(HoistEnum.ReturnbinAvailable, "TSJ") == 2) throw new Exception("4妤煎洖鏂欑涓虹┖");
-                            if (_taskService.Hikvisiontaskscontinue(task.WMSTaskNum).Status == false) throw new Exception($"3妤煎嚭搴撲换鍔′妇琛屾墽琛屽け璐ワ紝閿欒淇℃伅{_taskService.Hikvisiontaskscontinue(task.WMSTaskNum).Message}");//缁欎换鍔″彿
-                            //鍐欏叆绌虹鏀惧埌浣嶄俊鍙�
-                            device.SetValue(HoistEnum.Emptyboxplacedinposition, "TSJ", "1");
-                        }
-                        else if (task.TaskType == TaskTypeEnum.CHUKU1.ObjToInt()) //鍥涙ゼ搴撳唴鍒版彁鍗囨満 
-                        {
-                            
-                            //4妤煎嚭搴撴枡绠卞埌浣�
-                            if (device.GetValue<HoistEnum, short>(HoistEnum.FOutboundmaterialbox, "TSJ") == 2) throw new Exception("4妤煎嚭搴撴枡绠辨病鏈夊埌浣�");
-                            //鍐欎互涓�涓嚭搴撳畬鎴愪俊鍙�
-                            device.SetValue(HoistEnum.Outboundboxretrievalcompleted, "TSJ", "1");
-                        }
-                     
-                        
-                    }
-
-
-                    //鏌ユ壘涓夋ゼ鍏ュ簱浠诲姟鐘舵�佷负CheckPalletCodeing鐨勪换鍔℃墭鐩樺彿纭涓�
-                    var RK3FTasks = taskList.Where(x => x.TaskType == TaskTypeEnum.RK3F.ObjToInt()&&x.TaskState== (int)TaskStatusEnum.CheckPalletCodeing).ToList();
-                    foreach (var item in RK3FTasks)
-                    {
-                        var Barcode = device.SetValue<HoistEnum, short>(HoistEnum.Codereadingtriggered, 1);
-                        //妫�鏌�3妤煎叆搴撶鍙锋槸澶氬皯锛岀劧鍚庝紶缁檞ms
-                        var BinNumber = device.GetValue<HoistEnum, string>(HoistEnum.Inboxnumber, "TSJ");
-                        //鏍规嵁璇诲埌鐨勭鍙疯繘琛屾枡绠辨楠岋紝妫�楠岄�氳繃灏辫Е鍙戣鐮佸櫒璇诲彇锛屽鏋滀笉閫氳繃灏辨姏鍑哄紓甯�
-                        var Verification = _taskService.MaterialBoxInspection(item.WMSTaskNum, BinNumber.ToString());
-                        if (!Verification.Status) 
-                        {
-                            if (!(item.ExceptionMessage == Verification.Message))
+                            var result = _taskService.Hikvisiontaskscontinue(task.WMSTaskNum);
+                            if (result.Status == false)
                             {
-                                item.ExceptionMessage = Verification.Message;
-                                Uptasks.Add(item);
+                                if (task.ExceptionMessage != result.Message)
+                                {
+                                    task.ExceptionMessage = result.Message;
+                                    Uptasks.Add(task);
+                                }
+                                continue;
                             }
-                            //鏂欑楠岃瘉鍐欏ソ鍚庯紝闇�瑕佹洿鏀�
-                            item.TargetAddress = Verification.Data.ToString();
-                        } 
-                        
-                        //濡傛灉鏂欑妫�楠屾垚鍔熷氨鍐欏叆璇荤爜鍣ㄧ殑鍊�
-                        var result = _taskService.Hikvisiontaskscontinue(item.WMSTaskNum, item.TargetAddress);
-                        if (result.Status == false)
-                        {
-                            if (item.ExceptionMessage != result.Message)
-                            {
-                                item.ExceptionMessage = result.Message;
-                                Uptasks.Add(item);
-                            }
-                            continue;
+                            task.TaskState = (int)TaskStatusEnum.AGV_ToExecute;
+                            task.ExceptionMessage = "";
+                            Uptasks.Add(task);
                         }
-                        item.TaskState = (int)TaskStatusEnum.CheckPalletCodeFinish;
-
-
-                        Uptasks.Add(item);
                     }
                     if (Uptasks.Count > 0)
                     {
                         _taskService.UpdateData(Uptasks);
                     }
-                    WriteInfo(device.DeviceName, "infoLog");
 
-                    WriteDebug(device.DeviceName, "debugLog");
+                    #region 鎵樼洏鍙风‘璁や腑
+                    //鏌ユ壘涓夋ゼ鍏ュ簱浠诲姟鐘舵�佷负CheckPalletCodeing鐨勪换鍔℃墭鐩樺彿纭涓�
+                    var RK3FTask = _taskService.Repository.QueryFirst(x => x.TaskType == TaskTypeEnum.RK3F.ObjToInt() && x.TaskState == (int)TaskStatusEnum.CheckPalletCodeing);
+                    if (RK3FTask != null)
+                    {
+                        if (device.GetValue<HoistEnum, short>(HoistEnum.RInScanningCompletionSignal, RK3FTask.TargetAddress) != 1)
+                        {
+                            RK3FTask.ExceptionMessage = "3妤兼壂鐮佸畬鎴愪俊鍙锋病鏈夊畬鎴�";
+                            _taskService.UpdateData(RK3FTask);
+                        }
+                        else //瀹屾垚灏辨妸浠诲姟鐘舵�佹敼鎴愭墭鐩樺彿纭瀹屾垚
+                        {
+                            //妫�鏌�3妤煎叆搴撶鍙锋槸澶氬皯锛岀劧鍚庝紶缁檞ms
+                            var BinNumber = device.GetValue<HoistEnum, string>(HoistEnum.Inboxnumber, RK3FTask.TargetAddress);
+                            if (!string.IsNullOrEmpty(BinNumber))
+                            {
+                                BinNumber = BinNumber.TrimEnd('\0').Substring(2);
+                                //鏍规嵁璇诲埌鐨勭鍙疯繘琛屾枡绠辨楠岋紝妫�楠岄�氳繃灏辫Е鍙戣鐮佸櫒璇诲彇锛屽鏋滀笉閫氳繃灏辨姏鍑哄紓甯�
+                                var Verification = _taskService.MaterialBoxInspection(RK3FTask.WMSTaskNum, BinNumber);
+                                if (!Verification.Status)
+                                {
+                                    if (RK3FTask.ExceptionMessage != Verification.Message)
+                                    {
+                                        RK3FTask.ExceptionMessage = Verification.Message;
+                                        _taskService.UpdateData(RK3FTask);
+                                    }
+                                }
+                                else
+                                {
+                                    if (!string.IsNullOrEmpty(Verification.Message)) RK3FTask.TargetAddress = Verification.Message;
+                                    //濡傛灉鏂欑妫�楠屾垚鍔熷氨鍐欏叆璇荤爜鍣ㄧ殑鍊�
+                                    var result = _taskService.Hikvisiontaskscontinue(RK3FTask.WMSTaskNum, RK3FTask.TargetAddress);
+                                    if (result.Status)
+                                    {
+                                        RK3FTask.ExceptionMessage = "";
+                                        RK3FTask.TaskState = (int)TaskStatusEnum.CheckPalletCodeFinish;
+                                        _taskService.UpdateData(RK3FTask);
+                                    }
+                                    else
+                                    {
+                                        if (RK3FTask.ExceptionMessage != result.Message)
+                                        {
+                                            RK3FTask.ExceptionMessage = result.Message;
+                                            _taskService.UpdateData(RK3FTask);
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    #endregion
+
+                    #region 4F鎻愬崌鏈哄嚭鍙f墭鐩樺彿涓婃姤WMS
+                    var Address = "TSJC4F";
+                    if (device.GetValue<HoistEnum, short>(HoistEnum.ROutScanningCompletionSignal, Address) == 1)
+                    {
+                        var BinNumber = device.GetValue<HoistEnum, string>(HoistEnum.Emptycontainernumber, Address);
+                        if (!string.IsNullOrEmpty(BinNumber))
+                        {
+                            BinNumber = BinNumber.TrimEnd('\0').Substring(2);
+                            _taskService.InboundElevatorExit(Address, BinNumber);
+                        }
+                    }
+                    #endregion
+                    //WriteInfo(device.DeviceName, "infoLog");
+
+                    //WriteDebug(device.DeviceName, "debugLog");
                 }
                 catch (Exception ex)
                 {
@@ -189,7 +253,7 @@
             }
             else
             {
-                WriteError(nameof(TestJob), "鍙傛暟閿欒,鏈紶閫掕澶囧弬鏁版垨璁惧绫诲瀷閿欒");
+                WriteError(nameof(TSJJob), "鍙傛暟閿欒,鏈紶閫掕澶囧弬鏁版垨璁惧绫诲瀷閿欒");
             }
 
 

--
Gitblit v1.9.3