Merge branch '分拣二次码垛' of http://120.77.11.229:3000/zuolinhao/WcsFramework into 分拣二次码垛

业务工程/分拣库/WCS.WorkEngineering/Extensions/DeviceExtension.cs

@@ -320,6 +320,7 @@ namespace WCS.WorkEngineering.Extensions
                 //北
                 "SRM3" => "2N",
                 "818" => "2N",
+                "2927" => "2N",
                 "2928" => "2N",
                 "2932" => "2N",
                 "1691" => "2NR",
@@ -327,6 +328,7 @@ namespace WCS.WorkEngineering.Extensions
                 //南
                 "SRM4" => "2S",
                 "1018" => "2S",
+                "3127" => "2S",
                 "3128" => "2S",
                 "3132" => "2S",
                 "1711" => "2SR",

业务工程/分拣库/WCS.WorkEngineering/Systems/码垛区域生成空托盘任务.cs

@@ -75,7 +75,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)
+                        if (endDev.Data.TaskNumber != 0 /*|| endDev.Data.GoodsEnd != 0*/)
                         {
                             World.Log($"{endDev.Entity.Code}有残留任务信息{endDev.Data.TaskNumber}-{endDev.Data.GoodsEnd}，请确认处理!");
                             continue;
@@ -224,7 +224,7 @@ namespace WCS.WorkEngineering.Systems
                         //开始获取当前地址上个设备的上一个设备中的非零九托盘拆机
                         var addrFrom = obj.Entity.Sources.SelectMany(x => x.Sources).Single(x => x.HasFlag(DeviceFlags.拆盘机));
                         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)
+                        if (dev.Data.TaskNumber != 0 /*|| dev.Data.GoodsEnd != 0*/)
                         {
                             World.Log($"{dev.Entity.Code}有残留任务信息 {dev.Data.TaskNumber} - {dev.Data.GoodsEnd} ，请确认处理!");
                             return;