From e3e12cb62b643f591370bac843306d7e4baf5d35 Mon Sep 17 00:00:00 2001
From: zhangzhuo <512464164@qq.com>
Date: Wed, 26 Mar 2025 15:02:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DBUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Plc/HyosungPlcService.cs                  | 12 ++---
 Seyounth.Hyosung.Runtime/HyosungRuntime.cs    | 48 +++++++++++--------
 2 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/Seyounth.Hyosung.Core/Plc/HyosungPlcService.cs b/Seyounth.Hyosung.Core/Plc/HyosungPlcService.cs
index 8f5b57a..62b178c 100644
--- a/Seyounth.Hyosung.Core/Plc/HyosungPlcService.cs
+++ b/Seyounth.Hyosung.Core/Plc/HyosungPlcService.cs
@@ -132,23 +132,23 @@ public class HyosungPlcService(ILogger<HyosungPlcService> logger) : IHyosungPlcS
         switch (slave)
         {
             case 0:
-                masterCount = 1;
+                slaveCount = 1;
                 break;
             case 1:
-                masterCount = 2;
+                slaveCount = 2;
                 break;
             case 2:
-                masterCount = 6;
+                slaveCount = 6;
                 break;
             case 3:
-                masterCount = 14;
+                slaveCount = 14;
                 break;
             case 4:
-                masterCount = 30;
+                slaveCount = 30;
                 break;
         }
 
-        await _writer.WriteShortsAsync(13050, [1, 1, slaveCount, masterCount]);
+        await _writer.WriteShortsAsync(13050, [1, 1, 1, masterCount]);
     }
 
     public async Task WritePrintLabelResultAsync(int index, bool result)
diff --git a/Seyounth.Hyosung.Runtime/HyosungRuntime.cs b/Seyounth.Hyosung.Runtime/HyosungRuntime.cs
index 5e2628e..4244c61 100644
--- a/Seyounth.Hyosung.Runtime/HyosungRuntime.cs
+++ b/Seyounth.Hyosung.Runtime/HyosungRuntime.cs
@@ -365,25 +365,35 @@ public class HyosungRuntime(
 
     private async Task OnRequestGetPrintLabel(string arg)
     {
-        currentPrintTrayCode = arg;
-        var tray = await trayService.GetByCode(arg);
-        var variety = await varietyService.GetById(tray.VarietyId);
-        var mod = await hyosungWmsService.GetItemInfoByItemCode(variety.Code);
-        // var grade = "1";
-        // if (mod.GRADE != "AA") grade = mod.GRADE;
-        // int? controlNo;
-        // if (tray.ControlNo is null || tray.ControlNo == 0)
-        // {
-        //     controlNo = await varietyService.GetLastNo(variety.Id);
-        //     if (controlNo is null)
-        //         controlNo = await hyosungWmsService.GetControlNo(variety, grade);
-        //     else
-        //         controlNo += 1;
-        //    
-        // }
-        tray = await trayService.PrintTrayAsync(arg, mod,variety);
-        await dictService.SetValue("System", "CurrentPackingTrayCode", arg);
-        await hyosungPlcService.WritePrintLableOptionsAsync(variety.MasterLabelCount,variety.SubLabelCount);
+        try
+        {
+            logger.LogInformation("request print option");
+            currentPrintTrayCode = arg;
+            var tray = await trayService.GetByCode(arg);
+            var variety = await varietyService.GetById(tray.VarietyId);
+            var mod = await hyosungWmsService.GetItemInfoByItemCode(variety.Code);
+            // var grade = "1";
+            // if (mod.GRADE != "AA") grade = mod.GRADE;
+            // int? controlNo;
+            // if (tray.ControlNo is null || tray.ControlNo == 0)
+            // {
+            //     controlNo = await varietyService.GetLastNo(variety.Id);
+            //     if (controlNo is null)
+            //         controlNo = await hyosungWmsService.GetControlNo(variety, grade);
+            //     else
+            //         controlNo += 1;
+            //    
+            // }
+            tray = await trayService.PrintTrayAsync(arg, mod, variety);
+            await dictService.SetValue("System", "CurrentPackingTrayCode", arg);
+            await hyosungPlcService.WritePrintLableOptionsAsync(variety.MasterLabelCount, variety.SubLabelCount);
+            logger.LogInformation("request print option succeed");
+        }
+        catch(Exception e)
+        {
+            logger.LogError(e, "GetPrintOptionError");
+        }
+        
     }
 
     /// <summary>