fix

业务工程/分拣库/WCS.WorkEngineering/Systems/一楼扫码入库.cs

@@ -99,7 +99,7 @@ namespace WCS.WorkEngineering.Systems
 
                     if (obj.Data4.Length == 2)
                     {
-                        if (!db.Queryable<WCS_TaskInfo>().Any(v => v.BarCode == barcode && v.Type == TaskType.EnterDepot))
+                        if (!db.Queryable<WCS_TaskInfo>().Any(v => v.BarCode == barcode && v.Type == TaskType.EnterDepot && v.Status < Entity.TaskStatus.Finish))
                         {
                             var palletType = PalletType.Pallet09;
                             if (barcode.Contains("TPB")) palletType = PalletType.PalletNo09;
@@ -114,7 +114,7 @@ namespace WCS.WorkEngineering.Systems
                             if (res.ResCode == WebApi.Models.WMS.Response.ResponseStatusCodeEnum.Sucess) return;
                         }
                         //找到对应的任务
-                        var taskInfo = db.Queryable<WCS_TaskInfo>().First(v => v.BarCode == barcode && v.Type == TaskType.EnterDepot);
+                        var taskInfo = db.Queryable<WCS_TaskInfo>().First(v => v.BarCode == barcode && v.Type == TaskType.EnterDepot && v.Status < Entity.TaskStatus.Finish);
                         if (taskInfo.Status != Entity.TaskStatus.WaitingToExecute) return;
                         {
                             var tunnel = obj.Entity.Targets.FirstOrDefault(v => v.HasFlag(DeviceFlags.巷道));

业务工程/分拣库/WCS.WorkEngineering/Systems/桁架码垛/桁架.cs

@@ -206,6 +206,7 @@ namespace WCS.WorkEngineering.Systems
                 obj.Entity.SetFlag(warehouseCode, 0);
                 warehouseCode = warehouseCode == "N" ? "S" : "N"; //如果是北侧切换到南侧  如果是南侧切换到北侧
                 quantity = obj.Entity.GetFlag<int>(warehouseCode); //获取南库的侧执行的次数
+                obj.Entity.SetFlag<string>("warehouseCode", warehouseCode);
             }
 
             List<WCS_PalletizingRow> palletizingRowList = null;