From a3245b70135debfd3978e477c676caedf48822a4 Mon Sep 17 00:00:00 2001
From: anerx <512464164@qq.com>
Date: Tue, 18 Mar 2025 21:18:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Plc/HyosungPlcService.cs                  | 26 +++++++++----------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/Seyounth.Hyosung.Core/Plc/HyosungPlcService.cs b/Seyounth.Hyosung.Core/Plc/HyosungPlcService.cs
index 37f0c36..872fbde 100644
--- a/Seyounth.Hyosung.Core/Plc/HyosungPlcService.cs
+++ b/Seyounth.Hyosung.Core/Plc/HyosungPlcService.cs
@@ -144,11 +144,9 @@ public class HyosungPlcService(ILogger<HyosungPlcService> logger) : IHyosungPlcS
                 await QueryPrintLabel();
                 await Task.Delay(100, token);
             }
-            catch(Exception e)
+            catch (Exception e)
             {
-
             }
-           
         }
     }
 
@@ -160,9 +158,8 @@ public class HyosungPlcService(ILogger<HyosungPlcService> logger) : IHyosungPlcS
         var requestScanProduct = await _reader.ReadShortsAsync(4500, 2);
         if (requestScanProduct[0] == 1)
         {
-            OnPlcRequestScanProduct?.Invoke(requestScanProduct[1]);
-            //清空请求标志位
             await _writer.WriteShortsAsync(4500, 0, 0);
+            OnPlcRequestScanProduct?.Invoke(requestScanProduct[1]);
         }
     }
 
@@ -177,24 +174,24 @@ public class HyosungPlcService(ILogger<HyosungPlcService> logger) : IHyosungPlcS
             await _writer.WriteShortsAsync(4505, 0);
             OnPlcRequestScanFixture?.Invoke(1);
         }
-           
+
         if (requestScanFixture[1] == 1)
         {
             await _writer.WriteShortsAsync(4506, 0);
             OnPlcRequestScanFixture?.Invoke(2);
         }
-    
+
         if (requestScanFixture[2] == 1)
         {
             await _writer.WriteShortsAsync(4507, 0);
-           await OnPlcRequestScanFixture?.Invoke(3);
+            await OnPlcRequestScanFixture?.Invoke(3);
         }
+
         if (requestScanFixture[3] == 1)
         {
             await _writer.WriteShortsAsync(4508, 0);
             await OnPlcRequestScanFixture?.Invoke(4);
         }
-        
     }
 
     /// <summary>
@@ -203,9 +200,10 @@ public class HyosungPlcService(ILogger<HyosungPlcService> logger) : IHyosungPlcS
     private async Task QueryLeavingProductionLine()
     {
         var leavingProductionLine = await _reader.ReadShortsAsync(4020, 1);
-       // var stackStatus = await _reader.ReadShortsAsync(12110, 1);
+        // var stackStatus = await _reader.ReadShortsAsync(12110, 1);
         if (leavingProductionLine[0] == 1)
         {
+            await _writer.WriteShortsAsync(4020, 0);
             var trayCode = await _reader.ReadStringAsync(12600);
             if (!string.IsNullOrEmpty(trayCode))
             {
@@ -228,21 +226,21 @@ public class HyosungPlcService(ILogger<HyosungPlcService> logger) : IHyosungPlcS
         var n2 = await _reader.ReadShortsAsync(4610, 2);
         if (n1[0] == 1)
         {
-            OnPlcNeedNewTrayCode?.Invoke(1, n1[1]);
             await _writer.WriteShortsAsync(4600, 0);
+            OnPlcNeedNewTrayCode?.Invoke(1, n1[1]);
         }
 
         if (n2[0] == 1)
         {
-            OnPlcNeedNewTrayCode?.Invoke(2, n2[1]);
             await _writer.WriteShortsAsync(4610, 0);
+            OnPlcNeedNewTrayCode?.Invoke(2, n2[1]);
         }
     }
 
     private async Task QueryPutOnceCompleted()
     {
         var status = await _reader.ReadShortsAsync(4691, 2);
-        if (status[0] >0 )
+        if (status[0] > 0)
         {
             await _writer.WriteShortsAsync(4690, 0, 0, 0);
             var trayCode = await _reader.ReadStringAsync(4620);
@@ -267,7 +265,7 @@ public class HyosungPlcService(ILogger<HyosungPlcService> logger) : IHyosungPlcS
                 return;
             }
 
-            
+
             await _writer.WriteShortsAsync(4620, new short[40]);
             OnPlcPutCompleted?.Invoke(info);
         }