堆垛机、1车间交管

Projects/永冠/WCS.Service/WCS.Service.csproj

@@ -78,4 +78,6 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
+
+  <ProjectExtensions><VisualStudio><UserProperties appsettings_1json__JsonSchema="" /></VisualStudio></ProjectExtensions>
 </Project>

Projects/永冠/WCS.Service/WebApi/WCSApi.cs

@@ -33,7 +33,7 @@ namespace WCS.Service.WebApi
                                 throw new Exception("任务号" + wmstaskid + "重复下发");
 
                             var scid = int.Parse(obj.SRMNo.Last().ToString());
-                            var tunnel = (scid > 3 ? "TM" : "TY") + obj.StartTunnel;
+                            var tunnel = ((scid > 3 && scid < 6) ? "TM" : "TY") + obj.StartTunnel;
                             var task = new WCS_TASK
                             {
                                 TYPE = TaskType.移库,
@@ -58,7 +58,7 @@ namespace WCS.Service.WebApi
                                 throw new Exception("任务号" + wmstaskid + "重复下发");
 
                             var scid = int.Parse(obj.SRMNo.Last().ToString());
-                            var tunnel = (scid > 3 ? "TM" : "TY") + obj.StartTunnel;
+                            var tunnel = ((scid > 3 && scid < 6) ? "TM" : "TY") + obj.StartTunnel;
 
                             var task = new WCS_TASK
                             {

Projects/永冠/WCS.Service/Works/SC/SCWork.cs

@@ -361,7 +361,7 @@ namespace WCS.Service.Works
         protected override bool SelectDevice(WCS_DEVICE dev)
         {
             //return true;
-            return new string[] { "SC1", "SC2", "SC3" }.Contains(dev.CODE);
+            return new string[] { "SC1", "SC2", "SC3" , "SC6" }.Contains(dev.CODE);
         }
 
         protected override void Do(Device<ISC521, ISC520, ISC537> dev)

Projects/永冠/WCS.Service/Works/Stations/成品车间.cs

@@ -61,7 +61,7 @@ namespace WCS.Service.Works.Stations
 
 
                 var rgv = Device.Find("RGV4").Device<IDRGV521, IDRGV520>();
-                if (rgv.Data2.Trigger_1 != 0 && rgv.Data2.Trigger_2 != 0)
+                if (rgv.Data2.Trigger_1 != 0 || rgv.Data2.Trigger_2 != 0)
                     throw new Exception("RGV4任务触发中");
                 if ((rgv.Data.DestPosition_1 == 2114 || rgv.Data.StartPosition_1 == 2114) && rgv.Data.SystemStatus != RGVRunStatus.空闲)
                 {