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

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

@@ -85,6 +85,11 @@ namespace WCS.WorkEngineering.Systems
                     World.Log("扫码失败，内容为空", LogLevelEnum.Mid);
                     return;
                 }
+                else if(! barcode.Contains("TPB"))
+                {
+                    World.Log($"扫码异常{barcode}，请检查扫码器", LogLevelEnum.Mid);
+                    return;
+                }
                 SqlSugarHelper.Do(_db =>
                 {
                     var db = _db.Default;

业务工程/分拣库/WCS.WorkEngineering/Systems/二楼拆盘机自动补空托盘组.cs

@@ -41,7 +41,7 @@ namespace WCS.WorkEngineering.Systems
                 var db = _db.Default;
 
                 //验证是否有对应的任务
-                if (db.Queryable<WCS_TaskInfo>().NoLock().Any(v => v.AddrTo == obj.Entity.Code)) return;
+                if (db.Queryable<WCS_TaskInfo>().NoLock().Any(v => v.AddrTo == obj.Entity.Code && v.Status < Entity.TaskStatus.Finish)) return;
                 var res = WmsApi.ApplyEmptyPalletGroupOutStorage(obj.Entity.Code, tunnel.Code.GetLastDigit(), obj.Entity.HasFlag(DeviceFlags.拆盘机) ? PalletType.Pallet09 : PalletType.PalletNo09);
                 if (res.ResCode == ResponseStatusCodeEnum.Sucess) return;
                 World.Log(res.ResMsg);