fix

WCS.Core/ProtocolProxyBase.cs

@@ -134,8 +134,6 @@ public abstract class ProtocolProxyBase : IProtocolProxy
         var item = Items[propertyName] as PlcItem<T>;
         var res = item.Value;
         var channel = Ltc.GetChannel();
-        //if (channel != null)
-        //    World.OnInternalLog(channel, $"获取{Device.Code}.{ProtocolType.Name}.{propertyName} 值:{res}");
         return res;
     }
 
@@ -144,8 +142,7 @@ public abstract class ProtocolProxyBase : IProtocolProxy
         var item = Items[propertyName] as PlcItem<T>;
         item.Value = value;
         var channel = Ltc.GetChannel();
-        if (channel != null)
-            World.OnInternalLog(channel, $"设置{Device.Code}.{ProtocolType.Name}.{propertyName} 值:{value}");
+        if (channel != null)World.OnInternalLog(channel, $"设置值:设置{Device.Code}.{ProtocolType.Name}.{propertyName} 值:{value}");
         Frame = World.Frame;
         ChangedTime = World.Frame;
         DataChanged();

YWGC/FJK/WCS.WorkEngineering/Systems/AgvSystems.cs

@@ -228,7 +228,8 @@ namespace WCS.WorkEngineering.Systems
                                                 switch (agv.Station)
                                                 {
                                                     case "2501":
-                                                        positionList.AddRange(new List<string>() { "2501", "2505", "2509", "2513" });                                                        
+                                                        positionList.AddRange(new List<string>() { "2501", "2505", "2509", "2513" });
+                                                        
                                                         break;
 
                                                     case "2701":

YWGC/FJK/WCS.WorkEngineering/Systems/分拣支线/环形库分流点.cs

@@ -149,7 +149,8 @@ namespace WCS.WorkEngineering.Systems
                     case "418":
                         if (taskInfo.WarehouseCode != "1N") //throw new KnownException($"当前任务应该当前往{taskInfo.WarehouseCode}库", LogLevelEnum.Mid);
                         {
-                            EditFlow(taskInfo, "1N", db, obj.Entity.Code);
+                            //EditFlow(taskInfo, "1N", db, obj.Entity.Code);
+                            WriteInfo(obj,taskInfo);
                             return;
                         }
                         break;
@@ -157,7 +158,8 @@ namespace WCS.WorkEngineering.Systems
                     case "618":
                         if (taskInfo.WarehouseCode != "1S") //throw new KnownException($"当前任务应该当前往{taskInfo.WarehouseCode}库", LogLevelEnum.Mid);
                         {
-                            EditFlow(taskInfo, "1S", db, obj.Entity.Code);
+                            //EditFlow(taskInfo, "1S", db, obj.Entity.Code);
+                            WriteInfo(obj,taskInfo);
                             return;
                         }
                         break;
@@ -165,7 +167,8 @@ namespace WCS.WorkEngineering.Systems
                     case "818":
                         if (taskInfo.WarehouseCode != "2N") //throw new KnownException($"当前任务应该当前往{taskInfo.WarehouseCode}库", LogLevelEnum.Mid);
                         {
-                            EditFlow(taskInfo, "2N", db, obj.Entity.Code);
+                            //EditFlow(taskInfo, "2N", db, obj.Entity.Code);
+                            WriteInfo(obj,taskInfo);
                             return;
                         }
                         break;
@@ -173,7 +176,8 @@ namespace WCS.WorkEngineering.Systems
                     case "1018":
                         if (taskInfo.WarehouseCode != "2S") //throw new KnownException($"当前任务应该当前往{taskInfo.WarehouseCode}库", LogLevelEnum.Mid);
                         {
-                            EditFlow(taskInfo, "2S", db, obj.Entity.Code);
+                            //EditFlow(taskInfo, "2S", db, obj.Entity.Code);
+                            WriteInfo(obj,taskInfo);
                             return;
                         }
                         break;
@@ -181,7 +185,8 @@ namespace WCS.WorkEngineering.Systems
                     case "1218":
                         if (taskInfo.WarehouseCode != "3N") //throw new KnownException($"当前任务应该当前往{taskInfo.WarehouseCode}库", LogLevelEnum.Mid);
                         {
-                            EditFlow(taskInfo, "3N", db, obj.Entity.Code);
+                            //EditFlow(taskInfo, "3N", db, obj.Entity.Code);
+                            WriteInfo(obj,taskInfo);
                             return;
                         }
                         break;
@@ -189,7 +194,8 @@ namespace WCS.WorkEngineering.Systems
                     case "1418":
                         if (taskInfo.WarehouseCode != "3S") //throw new KnownException($"当前任务应该当前往{taskInfo.WarehouseCode}库", LogLevelEnum.Mid);
                         {
-                            EditFlow(taskInfo, "3S", db, obj.Entity.Code);
+                            //EditFlow(taskInfo, "3S", db, obj.Entity.Code);
+                            WriteInfo(obj,taskInfo);
                             return;
                         }
                         break;

YWGC/FJK/WCS.WorkEngineering/Systems/桁架码垛/桁架.cs

@@ -377,7 +377,7 @@ namespace WCS.WorkEngineering.Systems
 
 
                     // 分拣一强制全部单抓，线体存在干涉
-                    if (obj.Entity.Code == "Truss1") rowList = rowList!.Take(1).ToList();
+                    //if (obj.Entity.Code == "Truss1") rowList = rowList!.Take(1).ToList();
 
                     var palletizingRows = new List<WCS_PalletizingRow>();
 

YWGC/FJK/WCS.WorkEngineering/Systems/码垛区域生成空托盘任务.cs

@@ -38,7 +38,7 @@ namespace WCS.WorkEngineering.Systems
                     var palletizingInfoList = db.Queryable<WCS_Palletizing>().Where(x => x.PalletizingStation == null && !x.Finish && !x.isItHalf).OrderBy(x => x.AddTime).ToList();
                     if (!palletizingInfoList.Any())
                     {
-                        World.Log("没有码垛信息可用!");
+                        World.Log("桁架没有码垛信息可用!");
                         return;
                     }
                     foreach (var palletizingInfo in palletizingInfoList)
@@ -48,7 +48,7 @@ namespace WCS.WorkEngineering.Systems
                         var taskAddNext = Device.All.FirstOrDefault(x => x.Code == palletizingInfo.TaskAddNext)?.Targets.FirstOrDefault()?.Targets.Where(x => x.HasFlag(DeviceFlags.桁架码垛位));
                         if (taskAddNext == null)
                         {
-                            World.Log($"未找到{palletizingInfo.TaskAddNext}可去的码垛工位:{palletizingInfo.Id}");
+                            World.Log($"未找到可去的码垛工位:未找到{palletizingInfo.TaskAddNext}可去的码垛工位:{palletizingInfo.Id}");
                             continue;
                         }
                         var devs = Device.All.Where(x => taskAddNext.Contains(x)).Select(x => new Device<IStation520, IStation521, IStation523>(x, World)).ToList();
@@ -59,7 +59,7 @@ namespace WCS.WorkEngineering.Systems
                         var dev = devs.Where(x => !palletizingStation.Contains(x.Entity.Code)).FirstOrDefault(x => !x.Data3.Status.HasFlag(StationStatus.PH_Status));
                         if (dev == null)
                         {
-                            World.Log("没有可用码垛工");
+                            World.Log($"没有可用码垛工:{palletizingInfo.Id}");
                             continue;
                         }
 
@@ -77,7 +77,7 @@ namespace WCS.WorkEngineering.Systems
                         var endDev = Device.All.Where(x => x.Code == addrFromCode).Select(x => new Device<IStation520>(x, World)).FirstOrDefault();
                         if (endDev.Data.TaskNumber != 0 /*|| endDev.Data.GoodsEnd != 0*/)
                         {
-                            World.Log($"{endDev.Entity.Code}有残留任务信息{endDev.Data.TaskNumber}-{endDev.Data.GoodsEnd}，请确认处理!");
+                            World.Log($"拆盘机残留任务信息:{endDev.Entity.Code}有残留任务信息{endDev.Data.TaskNumber}-{endDev.Data.GoodsEnd}，请确认处理!");
                             continue;
                         }
 
@@ -106,7 +106,7 @@ namespace WCS.WorkEngineering.Systems
                 objDev.Entity.SetFlag("LastIsTruss", 2);
                 SqlSugarHelper.Do(db =>
                 {
-                    var taskInfo = db.Default.Queryable<WCS_TaskInfo>().Where(x => x.Status == TaskStatus.NewBuild && x.BusType == "芯股用空托盘入库").ToList();
+                    var taskInfo = db.Default.Queryable<WCS_TaskInfo>().RowLock().Where(x => x.Status == TaskStatus.NewBuild && x.BusType == "芯股用空托盘入库").ToList();
                     var isEnd = false;
                     foreach (var info in taskInfo)
                     {
@@ -158,7 +158,7 @@ namespace WCS.WorkEngineering.Systems
                             var dev = Device.All.Where(x => x.Code == info.AddrFrom).Select(x => new Device<IStation520>(x, World)).FirstOrDefault();
                             if (dev.Data.TaskNumber != 0 || dev.Data.GoodsEnd != 0)
                             {
-                                World.Log($"{dev.Entity.Code}有残留任务信息 {dev.Data.TaskNumber} - {dev.Data.GoodsEnd} ，请确认处理!");
+                                World.Log($"拆盘机残留任务信息:{dev.Entity.Code}有残留任务信息 {dev.Data.TaskNumber} - {dev.Data.GoodsEnd} ，请确认处理!");
                                 return;
                             }
                             info.AddrTo = "SRM";
@@ -226,7 +226,7 @@ namespace WCS.WorkEngineering.Systems
                         var dev = Device.All.Where(x => x.Code == addrFrom.Code).Select(x => new Device<IStation520>(x, World)).FirstOrDefault();
                         if (dev.Data.TaskNumber != 0 /*|| dev.Data.GoodsEnd != 0*/)
                         {
-                            World.Log($"{dev.Entity.Code}有残留任务信息 {dev.Data.TaskNumber} - {dev.Data.GoodsEnd} ，请确认处理!");
+                            World.Log($"拆盘机残留任务信息: {dev.Entity.Code}有残留任务信息 {dev.Data.TaskNumber} - {dev.Data.GoodsEnd} ，请确认处理!");
                             return;
                         }