From 953396af5bef443ef61f097a17ae6ad9465a6cac Mon Sep 17 00:00:00 2001
From: wenjy <wenjy@mesnac.com>
Date: Mon, 30 Dec 2024 09:43:29 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20RGV=E8=AE=BE=E5=A4=87=E7=BC=96?=
 =?UTF-8?q?=E5=8F=B7=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AUCMA.STORE.Analysis/Implements/BaseTaskQueueBusiness.cs | 7 ++++---
 AUCMA.STORE.Analysis/TaskHandleBusiness.cs               | 8 ++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/AUCMA.STORE.Analysis/Implements/BaseTaskQueueBusiness.cs b/AUCMA.STORE.Analysis/Implements/BaseTaskQueueBusiness.cs
index 9c83939..05acab4 100644
--- a/AUCMA.STORE.Analysis/Implements/BaseTaskQueueBusiness.cs
+++ b/AUCMA.STORE.Analysis/Implements/BaseTaskQueueBusiness.cs
@@ -44,7 +44,7 @@ namespace AUCMA.STORE.Business.Implements
                 return 0;
             }
         }
-        private INIFile iNIFile = new INIFile(System.Environment.CurrentDirectory + "/PlcAddress/PlcAddress.InI");
+
         /// <summary>
         /// 获取任务队列
         /// </summary>
@@ -59,7 +59,6 @@ namespace AUCMA.STORE.Business.Implements
                 //exp = exp.And(s1 => s1.locationArea == locationArea && s1.pilerTaskType == taskType && s1.operationType == operationType && s1.storeCode == ConfigHelper.GetConfig("storeCode"));
 
                 exp = exp.And(s1 => s1.pilerTaskType == taskType && s1.operationType == operationType && s1.storeCode == ConfigHelper.GetConfig("storeCode"));
-
                 if (taskType == TaskType.InStore)
                 {
                     exp = exp.And(s1 => s1.locationArea == locationArea);
@@ -73,7 +72,9 @@ namespace AUCMA.STORE.Business.Implements
                     }
                 }
 
-                var outStoreType = iNIFile.IniReadValue("系统设置", "出库方式");
+                
+
+                //var outStoreType = iNIFile.IniReadValue("系统设置", "出库方式");
                 //if(outStoreType == "2")
                 //{
                 //    if(taskType == TaskType.OutStore)
diff --git a/AUCMA.STORE.Analysis/TaskHandleBusiness.cs b/AUCMA.STORE.Analysis/TaskHandleBusiness.cs
index 69d1e29..94100cb 100644
--- a/AUCMA.STORE.Analysis/TaskHandleBusiness.cs
+++ b/AUCMA.STORE.Analysis/TaskHandleBusiness.cs
@@ -98,7 +98,7 @@ namespace AUCMA.STORE.Business
                     Task.Delay(5000).Wait();
                 }
 
-                
+
             });
 
             Task.Run(() =>
@@ -189,7 +189,7 @@ namespace AUCMA.STORE.Business
             {
                 BaseDeviceInfo item = m_DeviceInfoList.Where(x => x.m_iDeviceId == 1003).FirstOrDefault();
 
-                BaseDeviceInfo rgvDeviceInfo = m_DeviceInfoList.Where(x => x.m_iDeviceId == 1005).FirstOrDefault();
+                BaseDeviceInfo rgvDeviceInfo = m_DeviceInfoList.Where(x => x.m_iDeviceId == 1001).FirstOrDefault();
 
                 int PilerState = item.m_IDeviceAdapter.ReadInt16ByAddress(ReadOnePilerPlcAddress[2].PLCAddress);
                 int iReadIsReadySignal = item.m_IDeviceAdapter.ReadInt16ByAddress(ReadOnePilerPlcAddress[8].PLCAddress);
@@ -384,11 +384,11 @@ namespace AUCMA.STORE.Business
                 taskQueue = null;
                 try
                 {
-                    BaseTaskQueue baseTaskQueue = baseTaskQueueBusiness.GetTaskQueue(LocationArea.Location_Left, TaskType.OutStore, OperationType.ManualOperation).Result;
+                    BaseTaskQueue baseTaskQueue = baseTaskQueueBusiness.GetTaskQueue(locationArea, TaskType.OutStore, OperationType.ManualOperation).Result;
 
                     if (baseTaskQueue == null)
                     {
-                        baseTaskQueue = baseTaskQueueBusiness.GetTaskQueue(LocationArea.Location_Left, TaskType.OutStore, OperationType.Automatic).Result;
+                        baseTaskQueue = baseTaskQueueBusiness.GetTaskQueue(locationArea, TaskType.OutStore, OperationType.Automatic).Result;
                     }
 
                     if (baseTaskQueue == null)