fix

Projects/永冠OPP/WCS.Service/Works/SRM/SRMWork.cs

@@ -99,8 +99,7 @@ namespace WCS.Service.Works.SRM
                 });
 
                 //最后一个是否是出库任务
-                var lastIsOut = srmDevice.Entity.Get<bool>("LastIsOut");
-                srmDevice.Entity.Set("LastIsOut", !lastIsOut);
+                
 
                 #region 倒库任务
 
@@ -433,7 +432,8 @@ namespace WCS.Service.Works.SRM
                     });
                 }
 
-                #endregion 移库
+                #endregion 移库var lastIsOut = srmDevice.Entity.Get<bool>("LastIsOut");
+                srmDevice.Entity.Set("LastIsOut", !lastIsOut);
 
                 else if (lastIsOut)
                 {

Projects/永冠OPP/WCS.Service/Works/Station/涂布出库.cs

@@ -272,7 +272,9 @@ namespace WCS.Service.Works.Station
                               && !v.Data3.Status.HasFlag(StationStatus.运行状态位)
                               && !v.Data3.Status.HasFlag(StationStatus.有货状态位)
                               && !v.Data2.Status.HasFlag(IstationStatus.光电状态)
+                              
                               && v.Data2.Tasknum < 10000))
+
                     {
                         station.AddRange(G1340);
                     }
@@ -280,12 +282,12 @@ namespace WCS.Service.Works.Station
                               && !v.Data3.Status.HasFlag(StationStatus.运行状态位)
                               && !v.Data3.Status.HasFlag(StationStatus.有货状态位)
                               && !v.Data2.Status.HasFlag(IstationStatus.光电状态)
+                              && !v.Data3.Status.HasFlag(StationStatus.高位)
                               && v.Data2.Tasknum < 10000))
                     {
                         station.AddRange(G1343);
                     }
 
-                    //先判断1340是否可以放货
                     foreach (var dev in devise)
                     {
                         var task = db.Default.Set<WCS_TASK>().FirstOrDefault(v => v.ID == dev.Station.Data2.Tasknum) ?? throw new WarnException($"WCS无[{dev.Station.Data2.Tasknum}]任务信息");
@@ -294,14 +296,12 @@ namespace WCS.Service.Works.Station
                         {
                             case "1337":
                                 {
-                                    var station1343 = Device.Find("1343").Create<StationDevice>();
                                     addNext = station.OrderBy(v => v.Entity.CODE).FirstOrDefault().Entity.CODE;
 
                                     break;
                                 }
                             case "1338":
                                 {
-                                    var station1344 = Device.Find("1344").Create<StationDevice>();
                                     addNext = station.OrderByDescending(v => v.Entity.CODE).FirstOrDefault().Entity.CODE;
                                     break;
                                 }
@@ -331,7 +331,7 @@ namespace WCS.Service.Works.Station
                             default:
                                 {
                                     var devise1 = stationList.Select(v => v.Station);
-                                    foreach (var dev in devise1)                                                    
+                                    foreach (var dev in devise1)
                                     {
                                         if (!dev.Data3.Status.HasFlag(StationStatus.自动)) throw new WarnException($"{dev.Entity.CODE}--不是自动");
                                         if (dev.Data2.Tasknum > 10000) throw new WarnException($"{dev.Entity.CODE}--已有任务");