change - 出入库货道筛选改为实时获取PLC信息

Aucma.Scada.Business/InStoreBusiness.cs

@@ -5,6 +5,7 @@ using HighWayIot.Log4net;
 using HighWayIot.Repository.service;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
@@ -38,6 +39,7 @@ namespace Aucma.Scada.Business
         private InStoreTaskHandle taskHandle = InStoreTaskHandle.Instance;
 
         private GrabImage grabImage = GrabImage.Instance;
+
         #endregion
 
         #region 接口引用
@@ -100,12 +102,12 @@ namespace Aucma.Scada.Business
             //Task.Run(() =>
             //{
             //    Thread.Sleep(6000);
-            //    for (int i = 1; i < 15; i++)
+            //    for (int i = 1; i < 2; i++)
             //    {
-            //        InStore(appConfig.shellStoreCode, "B2360000078110240" + i.ToString().PadLeft(2, '0'));
-            //        Thread.Sleep(1000);
-            //        InStore(appConfig.linerStoreCode, "L2360000078810240" + i.ToString().PadLeft(2, '0'));
-            //        Thread.Sleep(1000);
+            //        //InStore(appConfig.shellStoreCode, "B2360000078110300" + i.ToString().PadLeft(2, '0'));
+            //        //Thread.Sleep(1000);
+            //        //InStore(appConfig.linerStoreCode, "L2360000078810240" + i.ToString().PadLeft(2, '0'));
+            //        //Thread.Sleep(1000);
             //    }
             //});
         }
@@ -121,7 +123,10 @@ namespace Aucma.Scada.Business
             {
                 PrintLogInfoMessage($"扫码成功，物料码：{materialCode}");
                 string materialType = SubStringMaterialCode(materialCode);
-                var spaceInfo = _spaceInfoService.InStoreGetSpaceInfoByMaterialType(storeCode, materialType);
+                #region Delete By wenjy 2023-10-30 11:41:00 取消通过数据库获取货道数量、在途量，改为实时读取PLC数据
+                //var spaceInfo = _spaceInfoService.InStoreGetSpaceInfoByMaterialType(storeCode, materialType);
+                #endregion
+                var spaceInfo = GetSpaceInfoByMaterialType(storeCode, materialType);
                 if (spaceInfo != null)
                 {
                     PrintLogInfoMessage($"匹配货道：{spaceInfo.spaceName}");
@@ -501,5 +506,43 @@ namespace Aucma.Scada.Business
         {
             return _spaceInfoService.GetMaterialStock(appConfig.shellStoreCode, appConfig.linerStoreCode);
         }
+
+        /// <summary>
+        /// 通过PLC读取货道信息（在途数量、在库数量、货道状态)
+        /// </summary>
+        /// <param name="storeCode"></param>
+        /// <param name="materialType"></param>
+        /// <returns></returns>
+        private BaseSpaceInfo GetSpaceInfoByMaterialType(string storeCode,string materialType)
+        {
+            BaseSpaceInfo result = null;
+
+            try
+            {
+                List<BaseSpaceInfo> info = _spaceInfoService.GetBaseSpaceInfosByMaterialType(storeCode, materialType);
+
+                if (info != null)
+                {
+                    if (info.Count > 0)
+                    {
+                        foreach (BaseSpaceInfo item in info)
+                        {
+                            var spaceInfo = taskHandle.ReadSpaceInfoByPlc(item);
+                            item.spaceStock = spaceInfo.spaceStock;
+                            item.onRouteAmount = spaceInfo.onRouteAmount;
+                            item.spaceStatus = spaceInfo.spaceStatus;
+                        }
+
+                        result = info.Where(x=>x.spaceStatus == 1 && x.spaceCapacity > 0 ? x.spaceCapacity > (x.spaceStock + x.onRouteAmount) : 1 == 1).OrderByDescending(x => x.spaceStock).OrderBy(x=>x.spaceCode).First();
+
+                    }
+                }
+            }catch (Exception ex)
+            {
+                PrintLogErrorMessage("货道信息读取异常", ex);
+            }
+
+            return result;
+        }
     }
 }

Aucma.Scada.Business/InStoreTaskHandle.cs

@@ -33,6 +33,8 @@ namespace Aucma.Scada.Business
         private PlcConfig plcConfig = PlcConfig.Instance;
 
         private PlcPool _pool = PlcPool.Instance;
+
+        private PlcSpaceConfig spaceConfig = PlcSpaceConfig.Instance;
         #endregion
 
         #region 私有变量
@@ -368,5 +370,28 @@ namespace Aucma.Scada.Business
             }
         }
         #endregion
+
+        /// <summary>
+        /// 通过PLC获取货道信息
+        /// </summary>
+        /// <param name="spaceInfo"></param>
+        /// <returns></returns>
+        public BaseSpaceInfo ReadSpaceInfoByPlc(BaseSpaceInfo spaceInfo)
+        {
+            var spaceAddress = spaceConfig.GetSpaceAddress(spaceInfo.storeCode, spaceInfo.spaceCode);
+            IPlc _plc = _plcDictionary[spaceInfo.storeCode];
+
+            if (_plc != null)
+            {
+                if (_plc.IsConnected)
+                {
+                    spaceInfo.spaceStock = _plc.readInt32ByAddress(spaceAddress.onStore);
+                    spaceInfo.onRouteAmount = _plc.readInt32ByAddress(spaceAddress.onRoute);
+                    spaceInfo.spaceStatus = _plc.readInt32ByAddress(spaceAddress.spaceStatus);
+                }
+            }
+
+            return spaceInfo;
+        }
     }
 }

Aucma.Scada.Business/MainBusiness.cs

@@ -25,6 +25,8 @@ namespace Aucma.Scada.Business
 
         private PlcConfig plcConfig = PlcConfig.Instance;
 
+        private PlcSpaceConfig spaceConfig = PlcSpaceConfig.Instance;
+
         private PlcPool plcPool = PlcPool.Instance;
 
         private GrabImage grabImage = GrabImage.Instance;
@@ -42,6 +44,7 @@ namespace Aucma.Scada.Business
             //初始化Plc
             plcPool.InitPlc("MelsecBinaryPlc", plcConfig.shell_Plc_Ip, plcConfig.shell_Plc_Port, appConfig.shellStoreCode);
             plcPool.InitPlc("MelsecBinaryPlc", plcConfig.liner_Plc_Ip, plcConfig.liner_Plc_Port, appConfig.linerStoreCode);
+
         }
 
         /// <summary>

Aucma.Scada.Business/OutStoreBusiness.cs

@@ -166,7 +166,10 @@ namespace Aucma.Scada.Business
             try
             {
                 PrintLogInfoMessage($"收到出库计划，物料码：{bomInfo.materialCode}");
-                BaseSpaceInfo spaceInfo = _spaceInfoService.OutStoreGetSpaceInfoByMaterialCode(storeCode, bomInfo.materialCode);
+                #region Delete By wenjy 2023-10-30 11:41:00 取消通过数据库获取货道数量、在途量，改为实时读取PLC数据
+                //BaseSpaceInfo spaceInfo = _spaceInfoService.OutStoreGetSpaceInfoByMaterialCode(storeCode, bomInfo.materialCode);
+                #endregion
+                BaseSpaceInfo spaceInfo = GetSpaceInfoByMaterialType(storeCode, bomInfo.materialCode);
                 if (spaceInfo != null)
                 {
                     PrintLogInfoMessage($"匹配货道：{spaceInfo.spaceName}");
@@ -739,5 +742,44 @@ namespace Aucma.Scada.Business
 
             return materialName;
         }
+
+        /// <summary>
+        /// 通过PLC读取货道信息（在库数量、货道状态)
+        /// </summary>
+        /// <param name="storeCode"></param>
+        /// <param name="materialType"></param>
+        /// <returns></returns>
+        private BaseSpaceInfo GetSpaceInfoByMaterialType(string storeCode, string materialType)
+        {
+            BaseSpaceInfo result = null;
+
+            try
+            {
+                List<BaseSpaceInfo> info = _spaceInfoService.GetBaseSpaceInfosByMaterialType(storeCode, materialType);
+
+                if (info != null)
+                {
+                    if (info.Count > 0)
+                    {
+                        foreach (BaseSpaceInfo item in info)
+                        {
+                            var spaceInfo = taskHandleBusiness.ReadSpaceInfoByPlc(item);
+                            item.spaceStock = spaceInfo.spaceStock;
+                            item.onRouteAmount = spaceInfo.onRouteAmount;
+                            item.spaceStatus = spaceInfo.spaceStatus;
+                        }
+
+                        result = info.Where(x => x.spaceStatus == 1 && x.spaceStock > 0).OrderBy(x => x.spaceStock).OrderBy(x => x.spaceCode).First();
+
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                PrintLogErrorMessage("货道信息读取异常", ex);
+            }
+
+            return result;
+        }
     }
 }

Aucma.Scada.Business/OutStoreTaskHandle.cs

@@ -34,6 +34,8 @@ namespace Aucma.Scada.Business
         private PlcConfig plcConfig = PlcConfig.Instance;
 
         private PlcPool _pool = PlcPool.Instance;
+
+        private PlcSpaceConfig spaceConfig = PlcSpaceConfig.Instance;
         #endregion
 
         #region 私有变量
@@ -386,6 +388,27 @@ namespace Aucma.Scada.Business
         }
         #endregion
 
+        /// <summary>
+        /// 通过PLC获取货道信息
+        /// </summary>
+        /// <param name="spaceInfo"></param>
+        /// <returns></returns>
+        public BaseSpaceInfo ReadSpaceInfoByPlc(BaseSpaceInfo spaceInfo)
+        {
+            var spaceAddress = spaceConfig.GetSpaceAddress(spaceInfo.storeCode, spaceInfo.spaceCode);
+            IPlc _plc = _plcDictionary[spaceInfo.storeCode];
+
+            if (_plc != null)
+            {
+                if (_plc.IsConnected)
+                {
+                    spaceInfo.spaceStock = _plc.readInt32ByAddress(spaceAddress.onStore);
+                    spaceInfo.onRouteAmount = _plc.readInt32ByAddress(spaceAddress.onRoute);
+                    spaceInfo.spaceStatus = _plc.readInt32ByAddress(spaceAddress.spaceStatus);
+                }
+            }
 
+            return spaceInfo;
+        }
     }
 }

Aucma.Scada.UI/bin/Debug/config/PlcSpace.Ini

@@ -0,0 +1,42 @@
+[XKJCK-001_XK_001]
+在库数量=D7201
+在途数量=D7211
+是否已满=D7221
+货道状态=D7231
+仓库状态=D7300
+出库完成=D7240
+[XKJCK-001_XK_002]
+在库数量=D7202
+在途数量=D7212
+是否已满=D7222
+货道状态=D7232
+仓库状态=D7300
+出库完成=D7240
+[XKJCK-001_XK_003]
+在库数量=D7203
+在途数量=D7213
+是否已满=D7223
+货道状态=D7233
+仓库状态=D7300
+出库完成=D7240
+[XKJCK-001_XK_004]
+在库数量=D7204
+在途数量=D7214
+是否已满=D7224
+货道状态=D7234
+仓库状态=D7300
+出库完成=D7240
+[XKJCK-001_XK_005]
+在库数量=D7205
+在途数量=D7215
+是否已满=D7225
+货道状态=D7235
+仓库状态=D7300
+出库完成=D7240
+[XKJCK-001_XK_006]
+在库数量=D7206
+在途数量=D7216
+是否已满=D7226
+货道状态=D7236
+仓库状态=D7300
+出库完成=D7240

HighWayIot.Config/HighWayIot.Config.csproj

@@ -43,6 +43,7 @@
   <ItemGroup>
     <Compile Include="PlcConfig.cs" />
     <Compile Include="AppConfig.cs" />
+    <Compile Include="PlcSpaceConfig.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>

HighWayIot.Config/PlcSpaceConfig.cs

@@ -0,0 +1,61 @@
+using HighWayIot.Common;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace HighWayIot.Config
+{
+    public sealed class PlcSpaceConfig
+    {
+        private static IniHelper iniHelper = new IniHelper(System.Environment.CurrentDirectory + "/config/PlcSpace.Ini");
+
+
+        private static readonly Lazy<PlcSpaceConfig> lazy = new Lazy<PlcSpaceConfig>(() => new PlcSpaceConfig());
+        public static PlcSpaceConfig Instance
+        {
+            get
+            {
+                return lazy.Value;
+            }
+        }
+
+        private PlcSpaceConfig()
+        {
+
+        }
+
+
+        public SpaceAddress GetSpaceAddress(string storeCode,string spaceCode)
+        {
+            SpaceAddress spaceAddress = new SpaceAddress();
+            spaceAddress.onStore = iniHelper.IniReadValue($"{storeCode}_{spaceCode}", "在库数量");
+            spaceAddress.onRoute = iniHelper.IniReadValue($"{storeCode}_{spaceCode}", "在途数量");
+            spaceAddress.isFull = iniHelper.IniReadValue($"{storeCode}_{spaceCode}", "是否已满");
+            spaceAddress.spaceStatus = iniHelper.IniReadValue($"{storeCode}_{spaceCode}", "货道状态");
+            spaceAddress.storeStatus = iniHelper.IniReadValue($"{storeCode}_{spaceCode}", "仓库状态");
+            spaceAddress.alarmInfo = iniHelper.IniReadValue($"{storeCode}_{spaceCode}", "报警信息");
+            spaceAddress.outStoreFinish = iniHelper.IniReadValue($"{storeCode}_{spaceCode}", "出库完成");
+            return spaceAddress;
+        }
+    }
+
+    public class SpaceAddress
+    {
+        public string onStore { get; set; }
+
+        public string onRoute { get; set; }
+
+        public string isFull { get; set; }
+
+        public string spaceStatus { get; set; }
+
+        public string storeStatus { get; set; }
+
+        public string alarmInfo { get; set; }
+
+        public string outStoreFinish { get; set; }
+    }
+
+}

HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-498314701cc69a2bb9a908cd676c2b8fb46f08d1
+2e5578ef355ebd86a51e35872287d736e1b032e2

HighWayIot.Repository/service/IBaseSpaceInfoService.cs

@@ -40,6 +40,14 @@ namespace HighWayIot.Repository.service
         /// <returns></returns>
         List<BaseSpaceInfo> GetSpaceInfosByStoreCode(string storeCode);
 
+        /// <summary>
+        /// 通过物料类型获取货道信息,如果没有返回空白货道
+        /// </summary>
+        /// <param name="storeCode"></param>
+        /// <param name="materialType"></param>
+        /// <returns></returns>
+        List<BaseSpaceInfo> GetBaseSpaceInfosByMaterialType(string storeCode, string materialType);
+
         /// <summary>
         /// 更新货道信息
         /// </summary>

HighWayIot.Repository/service/Impl/BaseSpaceInfoServiceImpl.cs

@@ -239,5 +239,28 @@ namespace HighWayIot.Repository.service.Impl
             }
             return result;
         }
+
+        public List<BaseSpaceInfo> GetBaseSpaceInfosByMaterialType(string storeCode, string materialType)
+        {
+            List<BaseSpaceInfo> spaceInfos = null;
+            try
+            {
+                Expression<Func<BaseSpaceInfo, bool>> exp = s1 => true;
+                exp = exp.And(x => x.storeCode == storeCode && x.materialType == materialType && x.spaceStatus == 1); //相同型号、启用状态的货道信息
+
+                spaceInfos = _mesRepository.GetList(exp);
+
+                if (spaceInfos.Count == 0) //没有指定该类型物料的货道信息，需获取空白货道信息进行分配
+                {
+                    spaceInfos = GetEmptySpaceInfo(storeCode);
+                }
+                logHelper.Info($"根据仓库{storeCode}；物料：{materialType}；获取到的货道信息：{jsonChange.ModeToJson(spaceInfos)}");
+            }
+            catch (Exception ex)
+            {
+                logHelper.Error("获取货道信息异常", ex);
+            }
+            return spaceInfos;
+        }
     }
 }