From 6a5b4a640ec6a0340335229b5fd02f4a258fa9ca Mon Sep 17 00:00:00 2001
From: whm <2921535080@qq.com>
Date: Sun, 29 Sep 2024 16:37:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E5=90=8E=E5=8C=BA=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E5=88=86=E9=85=8D=EF=BC=9A=E7=AE=B1=E5=AD=90=E5=89=8D=E5=90=8E?=
 =?UTF-8?q?=E5=8C=BA=E9=83=BD=E6=8B=A3=E9=80=89=E4=BB=BB=E5=8A=A1=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=A0=B9=E6=8D=AE=E6=95=B0=E9=87=8F=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E5=8E=BB=E5=89=8D=E5=8C=BA=E5=90=8E=E5=8C=BA=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../HisGetData/StackerOutC1.cs                | 49 +++++++++++++++----
 1 file changed, 40 insertions(+), 9 deletions(-)

diff --git a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/StackerOutC1.cs b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/StackerOutC1.cs
index 26ddcec..729eb9a 100644
--- a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/StackerOutC1.cs
+++ b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/StackerOutC1.cs
@@ -129,18 +129,49 @@ public class StackerOutC1(ConveyOperation conveyOperation, DataBaseData dataBase
         }
         else // 两个地区都存在任务
         {
-            ConsoleLog.Info($"出库分流：{area} 箱码：{msg} 存在 1~5 站台任务且存在 6~9 区域任务");
-            Random random = new();
-            var id = random.Next(0, 100);
-            ConveyPLCTask plcTask = new(plcId, id < Convert.ToInt32(CommonData.AppConfig.Pick2Lv) ? (short)ConveyRouterEnum.Move : (short)ConveyRouterEnum.Go);
-            string errText = conveyOperation.WriteTask(area, plcTask);
-            if (string.IsNullOrEmpty(errText))
+            // 比对两个区的箱子数量
+            var readResult_1 = CommonTool.Siemens.ReadInt16WithName($"数量1");
+            var readResult_2 = CommonTool.Siemens.ReadInt16WithName($"数量2");
+            if (readResult_1.Value >= readResult_2.Value)//前区数量多去后区
             {
-                ConsoleLog.Success($"出库分流：{area} 箱码：{msg}，写入PLC成功，{plcTask}");
+                ConsoleLog.Info($"出库分流：{area} 箱码：{msg} 存在 1~5 站台任务且存在 6~9 区域任务");
+                ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.Move);
+                string errText = conveyOperation.WriteTask(area, plcTask);
+                if (string.IsNullOrEmpty(errText))
+                {
+                    ConsoleLog.Success($"出库分流：{area} 箱码：{msg}，写入PLC成功，{plcTask}");
+                    return;
+                }
+                ConsoleLog.Warning($"【警告】出库分流：{area} 箱码：{msg}，写入PLC失败，{plcTask}，信息：{errText}");
+                return ;
+            }
+            else//后区数量多去前区
+            {
+                ConsoleLog.Info($"出库分流：{area} 箱码：{msg} 存在 1~5 站台任务且存在 6~9 区域任务");
+                ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.Go);
+                string errText = conveyOperation.WriteTask(area, plcTask);
+                if (string.IsNullOrEmpty(errText))
+                {
+                    ConsoleLog.Success($"出库分流：{area} 箱码：{msg}，写入PLC成功，{plcTask}");
+                    return;
+                }
+                ConsoleLog.Warning($"【警告】出库分流：{area} 箱码：{msg}，写入PLC失败，{plcTask}，信息：{errText}");
                 return;
             }
-            ConsoleLog.Warning($"【警告】出库分流：{area} 箱码：{msg}，写入PLC失败，{plcTask}，信息：{errText}");
-            return;
+
+
+            //ConsoleLog.Info($"出库分流：{area} 箱码：{msg} 存在 1~5 站台任务且存在 6~9 区域任务");
+            //Random random = new();
+            //var id = random.Next(0, 100);
+            //ConveyPLCTask plcTask = new(plcId, id < Convert.ToInt32(CommonData.AppConfig.Pick2Lv) ? (short)ConveyRouterEnum.Move : (short)ConveyRouterEnum.Go);
+            //string errText = conveyOperation.WriteTask(area, plcTask);
+            //if (string.IsNullOrEmpty(errText))
+            //{
+            //    ConsoleLog.Success($"出库分流：{area} 箱码：{msg}，写入PLC成功，{plcTask}");
+            //    return;
+            //}
+            //ConsoleLog.Warning($"【警告】出库分流：{area} 箱码：{msg}，写入PLC失败，{plcTask}，信息：{errText}");
+            //return;
 
         }
     }