Merge branch '分拣库' of http://120.77.11.229:3000/zuolinhao/WcsFramework into 分拣库

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

@@ -155,59 +155,100 @@ namespace WCS.WorkEngineering.Systems
                 switch (obj.Entity.Code)
                 {
                     case "418":
-                        if (taskInfo.WarehouseCode != "1N") //throw new KnownException($"当前任务应该当前往{taskInfo.WarehouseCode}库", LogLevelEnum.Mid);
+                        if (taskInfo.WarehouseCode != "1N")
                         {
-                            //EditFlow(taskInfo, "1N", db, obj.Entity.Code);
-                            WriteInfo(obj,taskInfo);
+                            //throw new KnownException($"当前任务应该当前往{taskInfo.WarehouseCode}库", LogLevelEnum.Mid);
+                            if (taskInfo.WarehouseCode.Contains("N"))
+                            {
+                                EditFlow(taskInfo, "1N", db, obj.Entity.Code);
+                                return;
+                            }
+
+                            WriteInfo(obj, taskInfo);
                             return;
                         }
+
                         break;
 
                     case "618":
-                        if (taskInfo.WarehouseCode != "1S") //throw new KnownException($"当前任务应该当前往{taskInfo.WarehouseCode}库", LogLevelEnum.Mid);
+                        if (taskInfo.WarehouseCode != "1S")
                         {
-                            //EditFlow(taskInfo, "1S", db, obj.Entity.Code);
-                            WriteInfo(obj,taskInfo);
+                            //throw new KnownException($"当前任务应该当前往{taskInfo.WarehouseCode}库", LogLevelEnum.Mid);
+                            if (taskInfo.WarehouseCode.Contains("S"))
+                            {
+                                EditFlow(taskInfo, "1S", db, obj.Entity.Code);
+                                return;
+                            }
+                           
+                            WriteInfo(obj, taskInfo);
                             return;
                         }
+
                         break;
 
                     case "818":
-                        if (taskInfo.WarehouseCode != "2N") //throw new KnownException($"当前任务应该当前往{taskInfo.WarehouseCode}库", LogLevelEnum.Mid);
+                        if (taskInfo.WarehouseCode != "2N")
                         {
-                            //EditFlow(taskInfo, "2N", db, obj.Entity.Code);
-                            WriteInfo(obj,taskInfo);
+                            //throw new KnownException($"当前任务应该当前往{taskInfo.WarehouseCode}库", LogLevelEnum.Mid);
+                            if (taskInfo.WarehouseCode.Contains("N"))
+                            {
+                                EditFlow(taskInfo, "2N", db, obj.Entity.Code);
+                                return;
+                            }
+                            WriteInfo(obj, taskInfo);
                             return;
                         }
+
                         break;
 
                     case "1018":
-                        if (taskInfo.WarehouseCode != "2S") //throw new KnownException($"当前任务应该当前往{taskInfo.WarehouseCode}库", LogLevelEnum.Mid);
+                        if (taskInfo.WarehouseCode != "2S")
                         {
-                            //EditFlow(taskInfo, "2S", db, obj.Entity.Code);
-                            WriteInfo(obj,taskInfo);
+                            //throw new KnownException($"当前任务应该当前往{taskInfo.WarehouseCode}库", LogLevelEnum.Mid);
+                            if (taskInfo.WarehouseCode.Contains("S"))
+                            {
+                                EditFlow(taskInfo, "2S", db, obj.Entity.Code);
+                                return;
+                            }
+
+                            WriteInfo(obj, taskInfo);
                             return;
                         }
+
                         break;
 
                     case "1218":
-                        if (taskInfo.WarehouseCode != "3N") //throw new KnownException($"当前任务应该当前往{taskInfo.WarehouseCode}库", LogLevelEnum.Mid);
+                        if (taskInfo.WarehouseCode != "3N")
                         {
-                            //EditFlow(taskInfo, "3N", db, obj.Entity.Code);
-                            WriteInfo(obj,taskInfo);
+                            //throw new KnownException($"当前任务应该当前往{taskInfo.WarehouseCode}库", LogLevelEnum.Mid);
+                            if (taskInfo.WarehouseCode.Contains("N"))
+                            {
+                                EditFlow(taskInfo, "3N", db, obj.Entity.Code);
+                                return;
+                            }
+                            
+                            WriteInfo(obj, taskInfo);
                             return;
                         }
+
                         break;
 
                     case "1418":
-                        if (taskInfo.WarehouseCode != "3S") //throw new KnownException($"当前任务应该当前往{taskInfo.WarehouseCode}库", LogLevelEnum.Mid);
+                        if (taskInfo.WarehouseCode != "3S")
                         {
-                            //EditFlow(taskInfo, "3S", db, obj.Entity.Code);
-                            WriteInfo(obj,taskInfo);
+                            //throw new KnownException($"当前任务应该当前往{taskInfo.WarehouseCode}库", LogLevelEnum.Mid);
+                            if (taskInfo.WarehouseCode.Contains("S"))
+                            {
+                                EditFlow(taskInfo, "3S", db, obj.Entity.Code);
+                                return;
+                            }
+
+                            WriteInfo(obj, taskInfo);
                             return;
                         }
+
                         break;
-                };
+                }
 
                 var isTruss = false; //表示这个工字轮是要去桁架区域码垛的，默认不作处理
                 if (goodsType == 18)