From 829eabf256e29392ca63f6da48829dba3b075dfe Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期五, 24 一月 2025 08:59:53 +0800
Subject: [PATCH] 资料,优化程序

---
 代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs |  309 ++++++++++++++++++++++++++++----------------------
 1 files changed, 172 insertions(+), 137 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs"
index 62a7adc..a8377c2 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs"
@@ -20,6 +20,7 @@
 using OfficeOpenXml.FormulaParsing.Excel.Functions.DateTime;
 using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
 using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
+using OfficeOpenXml.Packaging.Ionic.Zip;
 using Quartz;
 using SqlSugar;
 using StackExchange.Profiling.Internal;
@@ -66,35 +67,33 @@
 
         public Task Execute(IJobExecutionContext context)
         {
-            
+
             try
             {
                 CommonConveyorLine conveyorLine = (CommonConveyorLine)context.JobDetail.JobDataMap.Get("JobParams");
-                if ( conveyorLine != null )
+                if (conveyorLine != null)
                 {
-                    if(conveyorLine.DeviceCode == "1002")
+                    if (conveyorLine.DeviceCode == "1002")
                     {
                         RequestInbound(conveyorLine);   //涓�妤糃,B鍖轰笟鍔�
                     }
                     if (conveyorLine.DeviceCode == "1003")
                     {
-                        _taskService.RequestWMSTask3("FK240711D2",1, "R02-002-027-011-01");
+                        RequestInbound2(conveyorLine);
                     }
                     if (conveyorLine.DeviceCode == "1004")
                     {
-                        RequestInbound3(conveyorLine);   //涓�妤糃,B鍖轰笟鍔�
+                        RequestInbound3(conveyorLine);   
                     }
 
 
 
                 }
-                //RequestInNextAddress(conveyorLine);
-
-
+                WriteLog.GetLog("Job鏃ュ織杩愯").Write(conveyorLine.DeviceCode + "杩愯鏃ュ織锛岀粨鏉熸椂闂�" + DateTime.Now, "Job鏃ュ織杩愯");
             }
             catch (Exception ex)
             {
-                //Console.Out.WriteLine(nameof(CommonConveyorLineJob) + ":" + ex.ToString());
+                WriteLog.Write_Log("杈撻�佺嚎浜や簰", "閿欒淇℃伅", "閿欒", new { 淇℃伅 = ex.Message });
             }
             finally
             {
@@ -106,12 +105,10 @@
         public void RequestInbound(CommonConveyorLine conveyorLine)
         {
             //1妤艰緭閫佺嚎鍒ゆ柇
-            HandleEvent2(conveyorLine, "PLC_WCS_B._03_PLC_EVENT", "PLC_WCS_B._03_PLC_LPN", "WCS_PLC_B._03_WCS_TO");  //鍒ゆ柇宸烽亾
-            HandleEvent2(conveyorLine, "PLC_WCS_C._02_PLC_EVENT", "PLC_WCS_C._02_PLC_LPN", "WCS_PLC_C._02_WCS_TO");  //鍒ゆ柇宸烽亾
+            HandleEvent2(conveyorLine, "PLC_WCS_B._03_PLC_EVENT", "PLC_WCS_B._03_PLC_LPN", "WCS_PLC_B._03_WCS_TO","鍘熸潗鏂欐壂鐮佺珯鍙�");  //鍒ゆ柇宸烽亾
+            HandleEvent2(conveyorLine, "PLC_WCS_C._02_PLC_EVENT", "PLC_WCS_C._02_PLC_LPN", "WCS_PLC_C._02_WCS_TO", "鎴愬搧鎵爜绔欏彴");  //鍒ゆ柇宸烽亾
             CheckForEmptyPallet(conveyorLine, "PLC_WCS_B._02_PLC_EVENT", "PLC_WCS_B._02_PLC_LPN", "PLC_WCS_B._02_PLC_PUT", "R02-002-027-001-01"); //鍒ゆ柇鏄惁鍙栫┖鎵樺嚭搴�
             CheckForEmptyPallet(conveyorLine, "PLC_WCS_C._01_PLC_EVENT", "PLC_WCS_C._01_PLC_LPN", "PLC_WCS_C._01_PLC_PUT", "R01-002-041-001-01"); //鍒ゆ柇鏄惁鍙栫┖鎵樺嚭搴�
-
-
             ProcessConveyorEvent(conveyorLine, "PLC_WCS_B._01_PLC_EVENT", "PLC_WCS_B._01_PLC_LPN", "R02-003-027-001-01", "WCS_PLC_B._03_WCS_TO");// 澶勭悊 B 
             ProcessConveyorEvent(conveyorLine, "PLC_WCS_C._03_PLC_EVENT", "PLC_WCS_C._03_PLC_LPN", "R01-003-041-001-01", "WCS_PLC_C._02_WCS_TO");// 澶勭悊 C
         }
@@ -119,40 +116,33 @@
         public void RequestInbound2(CommonConveyorLine conveyorLine)
         {
             //椤舵ゼ妤艰緭閫佺嚎鍒ゆ柇
-            HandleEvent(conveyorLine, "PLC_WCS_D._05_PLC_EVENT", "PLC_WCS_D._05_PLC_LPN", "WCS_PLC_D._05_WCS_TO");  //鍒ゆ柇鍏ュ簱宸烽亾
 
-            ProcessConveyorEvent(conveyorLine, "PLC_WCS_D._01_PLC_EVENT", "PLC_WCS_D._01_PLC_LPN", "R02-003-027-011-01", "WCS_PLC_D._05_WCS_TO");// 澶勭悊 1宸烽亾 绔欏彴浜嬩欢鍏ョ┖
-            ProcessConveyorEvent(conveyorLine, "PLC_WCS_D._03_PLC_EVENT", "PLC_WCS_D._03_PLC_LPN", "R01-003-041-011-01", "WCS_PLC_D._05_WCS_TO");// 澶勭悊 2宸烽亾 绔欏彴浜嬩欢 鍏ョ┖
-
-            CheckForEmptyPallet2(conveyorLine, "PLC_WCS_D._02_PLC_EVENT", "PLC_WCS_D._02_PLC_LPN", "PLC_WCS_D._02_PLC_PUT", "R02-002-027-011-01"); //鍘熸潗鏂欏嚭搴�    璇诲彇鏉$爜閫夊簱鍖哄嚭搴�
-            CheckForEmptyPallet2(conveyorLine, "PLC_WCS_D._04_PLC_EVENT", "PLC_WCS_D._04_PLC_LPN", "PLC_WCS_D._04_PLC_PUT", "R01-002-041-011-01"); //鍘熸潗鏂欏嚭搴�    璇诲彇鏉$爜閫夊簱鍖哄嚭搴�
-            //ConveyorLineInFinish(conveyorLine); //鐢ㄤ簬鍐欏叆杈撻�佺嚎鏉$爜淇℃伅锛屾殏鏃舵湭鐢�
+            ProcessConveyorEvent(conveyorLine, "PLC_WCS_D._01_PLC_EVENT", "PLC_WCS_D._01_PLC_LPN", "R01-003-041-011-01", "WCS_PLC_D._01_WCS_TO");// 澶勭悊 1宸烽亾 绔欏彴浜嬩欢鍏ョ┖
+            ProcessConveyorEvent(conveyorLine, "PLC_WCS_D._03_PLC_EVENT", "PLC_WCS_D._03_PLC_LPN", "R02-003-027-011-01", "WCS_PLC_D._03_WCS_TO");// 澶勭悊 2宸烽亾 绔欏彴浜嬩欢 鍏ョ┖
         }
 
         public void RequestInbound3(CommonConveyorLine conveyorLine)
         {
             ProcessConveyorEvent(conveyorLine, "PLC_WCS_A._02_PLC_EVENT", "PLC_WCS_A._02_PLC_LPN", "R01-002-043-001-01", "WCS_PLC_A._02_WCS_TO");// 澶勭悊 A21 绔欏彴浜嬩欢鍏ュ簱
 
-            //ProcessConveyorEvent(conveyorLine, "PLC_WCS_A._03_PLC_EVENT", "PLC_WCS_A._03_PLC_LPN", "R01-002-042-001-01", "WCS_PLC_A._03_WCS_TO");// 澶勭悊 A22 绔欏彴浜嬩欢 鍏ユ枡
-            
-            //ConveyorLineInFinish(conveyorLine,"R01-002-044-001-01"); //鐢ㄤ簬鍐欏叆杈撻�佺嚎鏉$爜淇℃伅锛岀敤浜庡嚭搴�
+            ProcessConveyorEvent(conveyorLine, "PLC_WCS_A._03_PLC_EVENT", "PLC_WCS_A._03_PLC_LPN", "R01-002-042-001-01", "WCS_PLC_A._03_WCS_TO");// 澶勭悊 A22 绔欏彴浜嬩欢 鍏ユ枡
         }
 
-        public void ConveyorLineInFinish(CommonConveyorLine conveyorLine,string SCAddress)
+        public void ConveyorLineInFinish(CommonConveyorLine conveyorLine, string SCAddress)
         {
-            DeviceProDTO? deviceProDTO2 = GetDeviceProDTO(conveyorLine,SCAddress, "R_StackerCraneLowered");    //璇诲彇杈撻�佺嚎 鈥滃爢鍨涙満鏀句笅鈥� 淇″彿
-            if ( deviceProDTO2 != null )
+            DeviceProDTO? deviceProDTO2 = GetDeviceProDTO(conveyorLine, SCAddress, "R_StackerCraneLowered");    //璇诲彇杈撻�佺嚎 鈥滃爢鍨涙満鏀句笅鈥� 淇″彿
+            if (deviceProDTO2 != null)
             {
                 byte strsd = GetLine(conveyorLine, deviceProDTO2.DeviceChildCode);
                 if (strsd == 1)
                 {
                     Dt_Task task = _taskService.IngStackerCraneTask2(conveyorLine.DeviceCode);
-                    if(task != null && task.TaskType==(int)TaskOutboundTypeEnum.Outbound)
+                    if (task != null && task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
                     {
-                        byte PalletType = 2;
-                        if (task.TargetAddress == "R02-002-027-001-01" || task.TargetAddress == "R01-002-041-001-01")
+                        byte PLCtypeTo = 1;
+                        if (task.TargetAddress == "R02-002-027-011-01")
                         {
-                            PalletType = 1;
+                            PLCtypeTo = 2;
                         }
                         DeviceProDTO? deviceProDTO3 = GetDeviceProDTO(conveyorLine, SCAddress, "W_PalletBarcode");          //鍐欏叆鏉$爜
                         DeviceProDTO? deviceProDTO4 = GetDeviceProDTO(conveyorLine, SCAddress, "W_PalletLayers");           //灞傛暟
@@ -160,7 +150,7 @@
                         DeviceProDTO? deviceProDTO6 = GetDeviceProDTO(conveyorLine, SCAddress, "W_Destination");           //绫诲瀷
                         if (deviceProDTO3 != null && deviceProDTO4 != null && deviceProDTO5 != null && deviceProDTO6 != null)
                         {
-                            if (SetLinestring(conveyorLine, deviceProDTO3.DeviceProDataBlock, task.PalletCode) && SetLine(conveyorLine, deviceProDTO4.DeviceProDataBlock, (byte)task.PalletCodequantity) && SetLine(conveyorLine, deviceProDTO5.DeviceProDataBlock, PalletType) && SetLine(conveyorLine, deviceProDTO6.DeviceProDataBlock, (byte)task.PLCTo))
+                            if (SetLinestring(conveyorLine, deviceProDTO3.DeviceProDataBlock, task.PalletCode) && SetLine(conveyorLine, deviceProDTO4.DeviceProDataBlock, (byte)task.PalletCodequantity) && SetLine(conveyorLine, deviceProDTO5.DeviceProDataBlock, PLCtypeTo) && SetLine(conveyorLine, deviceProDTO6.DeviceProDataBlock, (byte)task.PLCTo))
                             {
 
                                 LogSignalStatus($"鍐欏叆鏀捐揣瀹屾垚淇℃伅锛屾墭鐩樻潯鐮侊紝灞傛暟锛岀被鍨嬩俊鎭垚鍔�", deviceProDTO2.DeviceChildCode);
@@ -180,7 +170,7 @@
                     }
                 }
             }
-           
+
         }
         //鑾峰彇杈撻�佺嚎瀹炰緥
         public DeviceProDTO? GetDeviceProDTO(CommonConveyorLine conveyorLine, string SCAddress, string Interactivet)
@@ -195,7 +185,7 @@
         /// <param name="eventTag"></param>
         /// <param name="barcodeTag"></param>
         /// <param name="writeTag"></param>
-        private void HandleEvent(CommonConveyorLine conveyorLine,string eventTag, string barcodeTag, string writeTag)
+        private void HandleEvent(CommonConveyorLine conveyorLine, string eventTag, string barcodeTag, string writeTag)
         {
             try
             {
@@ -203,11 +193,11 @@
                 if (events == 1)
                 {
                     string barcode = conveyorLine.Communicator.Read<string>(barcodeTag); // 璇诲彇鏉$爜
-                    if(barcode != "1" || barcode != "0")    
+                    if (barcode != "1" || barcode != "0")
                     {
                         if ((_taskService.ToPlatform(barcode)).Status)
                         {
-                            if(conveyorLine.Communicator.Read<string>("PLC_WCS_B._01_PLC_LPN")=="")
+                            if (conveyorLine.Communicator.Read<string>("PLC_WCS_B._01_PLC_LPN") == "")
                             {
                                 // 鍐欏叆鍘诲悜2鍙峰爢鍨涙満
                                 bool result = conveyorLine.Communicator.Write(writeTag, (byte)3);   //鍘熸潗鏂欏幓鍚�
@@ -250,164 +240,187 @@
         }
 
         //鏂扮殑宸烽亾鍒ゆ柇
-        private void HandleEvent2(CommonConveyorLine conveyorLine, string eventTag, string barcodeTag, string writeTag)
+        private void HandleEvent2(CommonConveyorLine conveyorLine, string eventTag, string barcodeTag, string writeTag,string Platform)
         {
             byte events = conveyorLine.Communicator.Read<byte>(eventTag); // 璇诲彇浜嬩欢
-            if (events == 1)
+            string barcode = conveyorLine.Communicator.Read<string>(barcodeTag).Trim(); // 璇诲彇鏉$爜
+            if (events == 1 && barcode !="NoRead" && barcode !="" && barcode != null)
             {
-                string barcode = conveyorLine.Communicator.Read<string>(barcodeTag).Trim(); // 璇诲彇鏉$爜
-                if (barcode != "1" || barcode != "0")
+                WebResponseContent content = _taskService.ToPlatform(barcode);
+                if (content != null)
                 {
-                    WebResponseContent content = _taskService.ToPlatform(barcode);
-                    if(content != null)
+                    if (content.Status)
                     {
-                        if (content.Status)
+                        if (content.Data != null)
                         {
-                            if(content.Data != null)
+                            if (content.Data.ToString() == "1")
                             {
-                                if (content.Data.ToString() == "1")
+                                if (conveyorLine.Communicator.Read<string>("PLC_WCS_C._03_PLC_LPN") == "")
                                 {
-                                    if (conveyorLine.Communicator.Read<string>("PLC_WCS_C._03_PLC_LPN") == "")
+                                    // 鍐欏叆鍘诲悜2鍙峰爢鍨涙満
+                                    bool result = conveyorLine.Communicator.Write(writeTag, (byte)1);   //鍐欏叆鍘诲悜涓洪暱宸烽亾
+                                    if (result)
                                     {
-                                        // 鍐欏叆鍘诲悜2鍙峰爢鍨涙満
-                                        bool result = conveyorLine.Communicator.Write(writeTag, (byte)1);   //鍐欏叆鍘诲悜涓洪暱宸烽亾
-                                        if (result)
-                                        {
-                                            WriteLog.GetLog("PLC鏃ュ織").Write($"鏉$爜{barcode}锛屽啓鍏ュ幓鍚戯細1", "鍘诲悜");
-                                        }
+                                        wcs_PLCto01(Platform + "锛氭垚鍔熶俊鎭�", "鎴愬姛", $"鏉$爜{barcode},鍐欏叆鍘诲悜锛�1");
                                     }
                                 }
-                                else if (content.Data.ToString() == "3")
+                                else
                                 {
-
-                                    if (conveyorLine.Communicator.Read<string>("PLC_WCS_B._01_PLC_LPN") == "") 
-                                    {
-                                        // 鍐欏叆鍘诲悜2鍙峰爢鍨涙満
-                                        bool result = conveyorLine.Communicator.Write(writeTag, (byte)3);   //鍐欏叆鍘诲悜涓虹煭宸烽亾
-                                        if (result)
-                                        {
-                                            WriteLog.GetLog("PLC鏃ュ織").Write($"鏉$爜{barcode},鍐欏叆鍘诲悜锛�3", "鍘诲悜");
-                                        }
-                                    }
+                                    wcs_PLCto01(Platform + "锛氶敊璇俊鎭�", "閿欒", $"鏉$爜锛歿barcode}锛屽師鍥狅細褰撳墠闇�鍐欏叆鍘诲悜锛�1锛屼絾璇诲彇杈撻�佺嚎鈥滃爢鍨涙満鍙栬揣绔欏彴鈥濇湁鏉$爜锛屼笉鍙啓鍏ュ幓鍚�");
                                 }
                             }
-                        }
-                    }
-                }
-                else if (barcode == "1")
-                {
-                    bool result = conveyorLine.Communicator.Write(writeTag, (byte)1);   //绌烘墭鍘诲悜
-                    if (result)
-                    {
-                        WriteLog.GetLog("PLC鏃ュ織").Write("绌烘墭鍏ュ簱锛屽啓鍏ュ幓鍚戯細1", "鍘诲悜");
-                    }
-                }
-            }
-        }
-        
-        //鐢ㄤ簬鍒ゆ柇鏄惁琛ョ┖鎵� A鍖�
-        private void CheckForEmptyPallet(CommonConveyorLine conveyorLine,string eventTag, string barcodeTag,string plcput,string Loc)
-        {
-
-            try
-            {
-                Byte events = conveyorLine.Communicator.Read<Byte>(eventTag);  // 璇诲彇浜嬩欢
-                if (events == 1)        //1涓虹┖锛�0涓烘湁
-                {
-                    string barcode = conveyorLine.Communicator.Read<string>(barcodeTag); // 璇诲彇鏉$爜
-                    if(barcode == "")
-                    {
-                        WriteLog.GetLog("PLC鏃ュ織鍑哄簱鏃ュ織").Write($"璇诲彇鍒板嚭搴撳彛琛ョ┖鎵樹俊鍙凤細{events}", "闇�瑕佺┖鎵�");
-                        // 鐢熸垚鍫嗗灈鏈哄彇绌烘墭浠诲姟
-                        byte plcputts = conveyorLine.Communicator.Read<byte>(plcput);   
-                        if (plcputts != 1)
-                        {
-                            if ((_taskService.RequestWMSTask2("", Loc)).Status)
+                            else if (content.Data.ToString() == "3")
                             {
-                                WriteLog.GetLog("PLC鏃ュ織鍑哄簱鏃ュ織").Write($"宸茬敓鎴愮┖鎵樺嚭搴撲换鍔★細{events}", "闇�瑕佺┖鎵�");
+
+                                if (conveyorLine.Communicator.Read<string>("PLC_WCS_B._01_PLC_LPN") == "")
+                                {
+                                    // 鍐欏叆鍘诲悜2鍙峰爢鍨涙満
+                                    bool result = conveyorLine.Communicator.Write(writeTag, (byte)3);   //鍐欏叆鍘诲悜涓虹煭宸烽亾
+                                    if (result)
+                                    {
+                                        wcs_PLCto01(Platform + "锛氭垚鍔熶俊鎭�", "鎴愬姛", $"鏉$爜{barcode},鍐欏叆鍘诲悜锛�3");
+                                    }
+                                }
+                                else
+                                {
+                                    wcs_PLCto01(Platform + "锛氶敊璇俊鎭�", "閿欒", $"鏉$爜锛歿barcode}锛屽師鍥狅細褰撳墠闇�鍐欏叆鍘诲悜锛�3锛屼絾璇诲彇杈撻�佺嚎鈥滃爢鍨涙満鍙栬揣绔欏彴鈥濇湁鏉$爜锛屼笉鍙啓鍏ュ幓鍚�");
+                                }
                             }
                             else
                             {
-                                WriteLog.GetLog("PLC鏃ュ織鍑哄簱鏃ュ織").Write($"鏈敓鎴愮┖鎵樺嚭搴撲换鍔★細{events}", "闇�瑕佺┖鎵�");
+                                wcs_PLCto01(Platform + "锛氶敊璇俊鎭�", "閿欒", $"鏉$爜锛歿barcode}锛岀敵璇峰叆搴撳け璐ワ細鏈幏鍙栧埌鍘诲悜");
                             }
                         }
                     }
+                    else
+                    {
+                        wcs_PLCto01(Platform + "锛氶敊璇俊鎭�", "閿欒", $"鏉$爜锛歿barcode}锛岀敵璇峰叆搴撳け璐ワ細{content.Message}");
+                    }
                 }
             }
-            catch (Exception ex)
+            else
             {
-
-                throw;
+                wcs_PLCto01(Platform+"锛氶敊璇俊鎭�", "閿欒", $"璇诲彇鍒拌緭閫佺嚎,鐢宠锛歿events},鏉$爜锛歿barcode}");
             }
         }
 
-        //鐢ㄤ簬鍒ゆ柇鏄惁鍑虹┖鎵� D鍖�
-        private void CheckForEmptyPallet2(CommonConveyorLine conveyorLine, string eventTag, string barcodeTag, string plcput, string Loc)
+        //鐢ㄤ簬鍒ゆ柇鏄惁琛ョ┖鎵� A鍖�
+        private void CheckForEmptyPallet(CommonConveyorLine conveyorLine, string eventTag, string barcodeTag, string plcput, string Loc)
         {
+
             Byte events = conveyorLine.Communicator.Read<Byte>(eventTag);  // 璇诲彇浜嬩欢
             if (events == 1)        //1涓虹┖锛�0涓烘湁
             {
-                string barcode = conveyorLine.Communicator.Read<string>(barcodeTag); // 璇诲彇鏉$爜
-                if (barcode != "1" || barcode != "0")
+                WebResponseContent content = _taskService.RequestWMSTask2("", Loc);
+                // 鐢熸垚鍫嗗灈鏈哄彇绌烘墭浠诲姟
+                if (content.Status)
                 {
-                    WriteLog.GetLog("PLC鏃ュ織鍑哄簱鏃ュ織").Write($"璇诲彇鍒板師鏉愭枡鍑哄簱淇℃伅锛屾潯鐮佷俊鎭細{barcode}", "鍘熸潗鏂欏嚭搴�");
-
-                    byte outCount = conveyorLine.Communicator.Read<byte>(plcput);
-                    if ((_taskService.RequestWMSTask3(barcode, outCount,Loc)).Status)
-                    {
-                        //鍐欏叆杈撻�佺嚎娓呴櫎淇℃伅
-                        WriteLog.GetLog("PLC鏃ュ織鍑哄簱鏃ュ織").Write($"宸茬敓鎴愬師鏉愭枡鍑哄簱浠诲姟锛屾潯鐮佷俊鎭細{barcode}", "鍘熸潗鏂欏嚭搴�");
-                    }
-                    else
-                    {
-                        WriteLog.GetLog("PLC鏃ュ織鍑哄簱鏃ュ織").Write($"鏈敓鎴愬師鏉愭枡鍑哄簱浠诲姟锛屾潯鐮佷俊鎭細{barcode}", "鍘熸潗鏂欏嚭搴�");
-                    }
+                    wcs_PLCto02(Loc + "锛氭垚鍔熶俊鎭�", "鎴愬姛", $"宸茬敓鎴愮┖鎵樺嚭搴撲换鍔�");
+                }
+                else
+                {
+                    wcs_PLCto02(Loc + "锛氶敊璇俊鎭�", "閿欒", $"鏈敓鎴愮┖鎵樺嚭搴撲换鍔★紝閿欒淇℃伅锛歿content.Message}");
                 }
             }
-            
+            else
+            {
+                wcs_PLCto02(Loc + "锛氶敊璇俊鎭�", "閿欒", $"璇诲彇鍒拌緭閫佺嚎,鐢宠锛歿events}");
+            }
         }
 
+
         //鐢ㄤ簬鍒ゆ柇鍏ュ簱绔欏彴
-        private void ProcessConveyorEvent(CommonConveyorLine conveyorLine, string eventTag, string barcodeTag, string taskCode,string writeTag)
+        private void ProcessConveyorEvent(CommonConveyorLine conveyorLine, string eventTag, string barcodeTag, string taskCode, string writeTag)
         {
             byte eventStatus = conveyorLine.Communicator.Read<byte>(eventTag);
             if (eventStatus == 1)
             {
-                WriteLog.GetLog("PLC鍏ュ簱绔欏彴鏃ュ織").Write($"璇诲彇鍒拌緭閫佺嚎鐢宠鍏ュ簱淇℃伅EVENT涓猴細{eventStatus}锛岀珯鍙扮紪鍙蜂负锛歿taskCode}", "绔欏彴淇℃伅");
                 string barcode = conveyorLine.Communicator.Read<string>(barcodeTag).Trim();
-                /*if(barcode == "1")
-                {
-                    string currentTime = DateTime.Now.ToString("HHmmss");
-                    barcode = "KTP" + currentTime;
-
-                }*/
                 if (barcode != null)
                 {
                     bool result = conveyorLine.Communicator.Write(writeTag, (byte)0);
-                    /*if(taskCode== "R01-003-042-001-01")
-                    {
-                        if ((_taskService.ToPlatform(barcode)).Status)
-                        {
-                            WriteLog.GetLog("PLC鍏ュ簱绔欏彴鏃ュ織").Write($"缁勭洏鎴愬姛锛岀珯鍙扮紪鍙蜂负锛歿taskCode}", "绔欏彴淇℃伅");
-                        }
-                    }*/
-                    // 鎷垮彇鎵樼洏鏉$爜鐢宠鍏ュ簱淇℃伅
+                    wcs_PLCto03("鍘诲悜娓呴櫎", "鎴愬姛", $"鍦板潃锛歿writeTag}锛屽幓鍚戞竻闄や负锛�0");
                     WebResponseContent content = _taskService.RequestWMSTask(barcode, taskCode); // 鐢宠鍏ュ簱锛岀敓鎴愬爢鍨涙満浠诲姟
-                    if (content !=null)
+                    if (content != null)
                     {
                         if (content.Status)
                         {
-                            WriteLog.GetLog("PLC鍏ュ簱绔欏彴鏃ュ織").Write($"鐢宠鍏ュ簱鎴愬姛锛岀珯鍙扮紪鍙蜂负锛歿taskCode}", "绔欏彴淇℃伅");
+                            wcs_PLCto03(taskCode + "锛氭垚鍔熶俊鎭�", "鎴愬姛", $"鏉$爜锛歿barcode}锛岀敵璇峰叆搴撴垚鍔�");
                         }
                         else
                         {
-                            WriteLog.GetLog("PLC鍏ュ簱绔欏彴鏃ュ織").Write($"鐢宠鍏ュ簱澶辫触锛岀珯鍙扮紪鍙蜂负锛歿taskCode}", "绔欏彴淇℃伅");
+                            wcs_PLCto03(taskCode+ "锛氶敊璇俊鎭�", "閿欒", $"鏉$爜锛歿barcode}锛岀敵璇峰叆搴撳け璐ワ紝閿欒淇℃伅锛歿content.Message}");
                         }
+                    }
+                    else
+                    {
+                        wcs_PLCto03(taskCode + "锛氶敊璇俊鎭�", "閿欒", $"鏉$爜锛歿barcode}锛岀敵璇峰叆搴撳け璐ワ紝閿欒淇℃伅content杩斿洖鍊间负绌�");
                     }
                 }
                 else
                 {
-                    WriteLog.GetLog("PLC鍏ュ簱绔欏彴鏃ュ織").Write($"璇诲彇鍒拌緭閫佺嚎淇℃伅涓虹┖锛岀珯鍙扮紪鍙蜂负锛歿taskCode}", "绔欏彴淇℃伅");
+                    wcs_PLCto03(taskCode + "锛氶敊璇俊鎭�", "閿欒", $"璇诲彇鍒拌緭閫佺嚎淇℃伅涓虹┖");
+                }
+            }
+            else if (eventStatus == 6)
+            {
+                if (taskCode == "R02-003-027-011-01")
+                {
+                    WebResponseContent content = _taskService.RequestWMSTask4();
+                    if (content != null)
+                    {
+                        if(content.Status && content.Data != null)
+                        {
+                            if (content.Data.ToString() == "1")
+                            {
+                                if (conveyorLine.Communicator.Write(writeTag, (byte)1))
+                                {
+                                    wcs_PLCto04(taskCode + "锛氭垚鍔熶俊鎭�", "鎴愬姛", $"鍐欏叆鎴愬姛锛屽幓鍚戯細1");
+                                }
+                                else
+                                {
+                                    wcs_PLCto04(taskCode + "锛氶敊璇俊鎭�", "閿欒", $"鍐欏叆澶辫触锛屽幓鍚戯細1");
+                                }
+                            }
+                            else if (content.Data.ToString() == "3")
+                            {
+
+                                if (conveyorLine.Communicator.Write(writeTag, (byte)3))
+                                {
+                                    wcs_PLCto04(taskCode + "锛氭垚鍔熶俊鎭�", "鎴愬姛", $"鍐欏叆鎴愬姛锛屽幓鍚戯細3");
+                                }
+                                else
+                                {
+                                    wcs_PLCto04(taskCode + "锛氶敊璇俊鎭�", "閿欒", $"鍐欏叆澶辫触锛屽幓鍚戯細3");
+                                }
+                            }
+                            else
+                            {
+                                wcs_PLCto04(taskCode + "锛氶敊璇俊鎭�", "閿欒", $"鏈壘鍒板啓鍏ュ幓鍚�");
+                            }
+                        }
+                        else
+                        {
+                            wcs_PLCto04(taskCode + "锛氶敊璇俊鎭�", "閿欒", $"鐢宠鍏ュ簱澶辫触锛岄敊璇俊鎭細{content.Message}");
+                        }
+                    }
+                    else
+                    {
+                        wcs_PLCto04(taskCode + "锛氶敊璇俊鎭�", "閿欒", $"鐢宠鍏ュ簱澶辫触锛岄敊璇俊鎭細content杩斿洖鍊间负绌�");
+                    }
+
+                }
+                else if (taskCode == "R01-003-041-011-01")
+                {
+                    if (conveyorLine.Communicator.Write(writeTag, (byte)1))
+                    {
+                        wcs_PLCto04(taskCode + "锛氭垚鍔熶俊鎭�", "鎴愬姛", $"鍐欏叆澶辫触锛屽幓鍚戯細1");
+                    }
+                    else
+                    {
+                        wcs_PLCto04(taskCode + "锛氶敊璇俊鎭�", "閿欒", $"鍐欏叆澶辫触锛屽幓鍚戯細1");
+                    }
+
                 }
             }
         }
@@ -419,7 +432,7 @@
         {
             return conveyorLine.Communicator.Write(DeviceProDataBlock, Pali);
         }
-        
+
         public byte GetLine(CommonConveyorLine conveyorLine, string DeviceProDataBlock)
         {
             return conveyorLine.Communicator.Read<byte>(DeviceProDataBlock);
@@ -428,5 +441,27 @@
         {
             WriteLog.GetLog("鍫嗗灈鏈轰笌plc浜や簰淇″彿").Write($"绔欏彴缂栧彿锛歿sourceAddress},淇℃伅锛歿message}", $"{sourceAddress}");
         }
+
+
+
+
+        public void wcs_PLCto01(string SCLLinStack, string Logtype, string Magessadd)
+        {
+            WriteLog.Write_Log("涓�妤兼壂鐮佺珯鍙�", SCLLinStack, Logtype, new { 淇℃伅 = Magessadd });
+        }
+
+        public void wcs_PLCto02(string SCLLinStack, string Logtype, string Magessadd)
+        {
+            WriteLog.Write_Log("涓�妤艰ˉ绌烘墭", SCLLinStack, Logtype, new { 淇℃伅 = Magessadd });
+        }
+        public void wcs_PLCto03(string SCLLinStack, string Logtype, string Magessadd)
+        {
+            WriteLog.Write_Log("鍏ュ簱绔欏彴", SCLLinStack, Logtype, new { 淇℃伅 = Magessadd });
+        }
+        public void wcs_PLCto04(string SCLLinStack, string Logtype, string Magessadd)
+        {
+            WriteLog.Write_Log("椤舵ゼ绌烘墭鍥炲簱", SCLLinStack, Logtype, new { 淇℃伅 = Magessadd });
+        }
+
     }
 }

--
Gitblit v1.9.3