fix

Projects/永冠OPP/WCS.Service/Works/RGV/RGVWorks.cs

@@ -172,22 +172,22 @@ namespace WCS.Service.Works.RGV
 
                         if (rgvDevice.RGVList.Count != 6)//有小车进入维修站时启用该逻辑，避免在正常使用时影响效率
                         {
-                            var stationList = rgvDevice.LocationList.Where(v => v.Entity.Is(DF.涂布RGV取货设备组)).Where(v => v.RGVGetTaskedDevice().Any())
-                                .Where(v =>
-                                {
-                                    if (v.CurrentRGV() == null) return true;
-                                    return false;
-                                });
-                            if (stationList != null)
-                            {
-                                var station11 = stationList.MinBy(rgvDevice.Distance);
-                                //该站台到当前小车的范围中没有车
-                                if (rgvDevice.RGVList.Any(v => station11!.Position <= v.Position && rgvDevice.Position > v.Position))
-                                {
-                                    rgvDevice.Move(station11);
-                                    return;
-                                }
-                            }
+                            //var stationList = rgvDevice.LocationList.Where(v => v.Entity.Is(DF.涂布RGV取货设备组)).Where(v => v.RGVGetTaskedDevice().Any())
+                            //    .Where(v =>
+                            //    {
+                            //        if (v.CurrentRGV() == null) return true;
+                            //        return false;
+                            //    });
+                            //if (stationList != null)
+                            //{
+                            //    var station11 = stationList.MinBy(rgvDevice.Distance);
+                            //    //该站台到当前小车的范围中没有车
+                            //    if (rgvDevice.RGVList.Any(v => station11!.Position <= v.Position && rgvDevice.Position > v.Position))
+                            //    {
+                            //        rgvDevice.Move(station11);
+                            //        return;
+                            //    }
+                            //}
                         }
                         if (pickStation.Entity.CODE == "G9")
                         {

Projects/永冠OPP/WCS.Service/Works/SRM/SRMWork.cs

@@ -65,39 +65,39 @@ namespace WCS.Service.Works.SRM
                 if (srmDevice.Data2.SRMMode != SCMode.远程) return;
                 if (srmDevice.Data2.SRMStatus != SCRunStatus.空闲) return;
 
-                //检查标记好的出库任务，并将出库任务下达至堆垛机
-                DB.Do(db =>
-                {
-                    //找到两个任务
-                    var taksLsit = db.Default.Set<WCS_TASK>().Where(v =>
-                        v.ID == srmDevice.Data.TaskID_1 ||
-                        v.ID == srmDevice.Data.TaskID_2 && v.STATUS == TaskStatus.堆垛机执行).ToList();
-                    var itemList = taksLsit.Select(v => v.Create<Task>()).OrderBy(v => v.Col).ToArray();
-
-                    if (!taksLsit.Any()) return;
-                    for (var i = 0; i < itemList.Length; i++)
-                    {
-                        var item = itemList[i];
-                        item.SRMSTATION = taksLsit.FirstOrDefault(v => v.ID==item.ID)!.SRMSTATION;
-
-                        var fork = srmDevice.GetFork(item, i);
-
-                        switch (fork)
-                        {
-                            // 列数较小的放一工位
-                            case SrmFork.货叉1:
-                                obj.WriteTask1(item, (short)itemList.Length);
-                                break;
-                            //列数较大的放二工位
-                            case SrmFork.货叉2:
-                                obj.WriteTask2(item, (short)itemList.Length);
-                                break;
-
-                            default:
-                                throw new ArgumentOutOfRangeException();
-                        }
-                    }
-                });
+                ////检查标记好的出库任务，并将出库任务下达至堆垛机
+                //DB.Do(db =>
+                //{
+                //    //找到两个任务
+                //    var taksLsit = db.Default.Set<WCS_TASK>().Where(v =>
+                //        v.ID == srmDevice.Data.TaskID_1 ||
+                //        v.ID == srmDevice.Data.TaskID_2 && v.STATUS == TaskStatus.堆垛机执行).ToList();
+                //    var itemList = taksLsit.Select(v => v.Create<Task>()).OrderBy(v => v.Col).ToArray();
+
+                //    if (!taksLsit.Any()) return;
+                //    for (var i = 0; i < itemList.Length; i++)
+                //    {
+                //        var item = itemList[i];
+                //        item.SRMSTATION = taksLsit.FirstOrDefault(v => v.ID==item.ID)!.SRMSTATION;
+
+                //        var fork = srmDevice.GetFork(item, i);
+
+                //        switch (fork)
+                //        {
+                //            // 列数较小的放一工位
+                //            case SrmFork.货叉1:
+                //                obj.WriteTask1(item, (short)itemList.Length);
+                //                break;
+                //            //列数较大的放二工位
+                //            case SrmFork.货叉2:
+                //                obj.WriteTask2(item, (short)itemList.Length);
+                //                break;
+
+                //            default:
+                //                throw new ArgumentOutOfRangeException();
+                //        }
+                //    }
+                //});
 
                 var isTransfer = new List<WCS_TASK>(); //是否有移库任务
                 WCS_TASK enterPriority = new(), outPriority = new(); //出入库优先级任务
@@ -433,16 +433,17 @@ namespace WCS.Service.Works.SRM
                             {
                                 // 列数较小的放一工位
                                 case SrmFork.货叉1:
-                                    srmDevice.Data.TaskID_1 = finish.Station.ID;
+                                    obj.WriteTask1(finish.Station, (short)tasks.Length);
                                     break;
                                 //列数较大的放二工位
                                 case SrmFork.货叉2:
-                                    srmDevice.Data.TaskID_2 = finish.Station.ID;
+                                    obj.WriteTask2(finish.Station, (short)tasks.Length);
                                     break;
 
                                 default:
                                     throw new ArgumentOutOfRangeException();
                             }
+
                         }
                     });
 

Projects/永冠OPP/WCS.Service/log4net.config

@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <log4net>
+    <appender name="Db_ExAppender" type="log4net.Appender.RollingFileAppender">
+      <param name="Encoding" value="utf-8" />
+      <file value="D:\WCSLog\Db" />
+      <appendToFile value="true" />
+      <rollingStyle value="Composite" />
+      <maxSizeRollBackups value="-1" />
+      <maximumFileSize value="40MB" />
+      <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
+      <staticLogFileName value="false" />
+      <DatePattern value="/yyyyMMdd/'Db_Ex.log'" />
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%date || %5level || %logger || %message || %exception || end %newline" />
+      </layout>
+    </appender>
+    <logger name="Db_Ex">
+      <level value="ALL" />
+      <appender-ref ref="Db_ExAppender" />
+    </logger>
+    <appender name="Db_CleanAppender" type="log4net.Appender.RollingFileAppender">
+      <param name="Encoding" value="utf-8" />
+      <file value="D:\WCSLog\Db" />
+      <appendToFile value="true" />
+      <rollingStyle value="Composite" />
+      <maxSizeRollBackups value="-1" />
+      <maximumFileSize value="40MB" />
+      <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
+      <staticLogFileName value="false" />
+      <DatePattern value="/yyyyMMdd/'Db_Clean.log'" />
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%date || %5level || %logger || %message || %exception || end %newline" />
+      </layout>
+    </appender>
+    <logger name="Db_Clean">
+      <level value="ALL" />
+      <appender-ref ref="Db_CleanAppender" />
+    </logger>
+    <appender name="Info_PlcReadLogAppender" type="log4net.Appender.RollingFileAppender">
+      <param name="Encoding" value="utf-8" />
+      <file value="D:\WCSLog\Db" />
+      <appendToFile value="true" />
+      <rollingStyle value="Composite" />
+      <maxSizeRollBackups value="-1" />
+      <maximumFileSize value="40MB" />
+      <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
+      <staticLogFileName value="false" />
+      <DatePattern value="/yyyyMMdd/'Info_PlcReadLog.log'" />
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%date || %5level || %logger || %message || %exception || end %newline" />
+      </layout>
+    </appender>
+    <logger name="Info_PlcReadLog">
+      <level value="ALL" />
+      <appender-ref ref="Info_PlcReadLogAppender" />
+    </logger>
+    <appender name="DbAppender" type="log4net.Appender.RollingFileAppender">
+      <param name="Encoding" value="utf-8" />
+      <file value="D:\WCSLog\Db" />
+      <appendToFile value="true" />
+      <rollingStyle value="Composite" />
+      <maxSizeRollBackups value="-1" />
+      <maximumFileSize value="40MB" />
+      <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
+      <staticLogFileName value="false" />
+      <DatePattern value="/yyyyMMdd/'Db.log'" />
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%date || %5level || %logger || %message || %exception || end %newline" />
+      </layout>
+    </appender>
+    <logger name="Db">
+      <level value="ALL" />
+      <appender-ref ref="DbAppender" />
+    </logger>
+  </log4net>
+</configuration>