fix

Projects/永冠/WCS.Service/WCSDB.cs

@@ -1,17 +1,11 @@
 using DBHelper;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
-using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.IO;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using WCS.Entity;
 using WCS.Entity.Protocol;
-using WCS.Service.Extensions;
 
 namespace WCS.Service
 {
@@ -19,7 +13,6 @@ namespace WCS.Service
     {
         public WCSDB()
         {
-
         }
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)
@@ -67,7 +60,6 @@ namespace WCS.Service
             return base.SaveChanges();
         }
 
-
         public DbSet<WCS_PLC> WCS_PLC { get; set; }
         public DbSet<WCS_DATABLOCK> WCS_DATABLOCK { get; set; }
         public DbSet<WCS_DEVICE> WCS_DEVICE { get; set; }
@@ -109,5 +101,9 @@ namespace WCS.Service
         public DbSet<WCS_Users> WCS_Users { get; set; }
 
         public DbSet<WCS_MAPPINGENTRY> WCS_MAPPINGENTRY { get; set; }
+
+        public DbSet<WCS_DRGV520> WCS_DRGV520 { get; set; }
+        public DbSet<WCS_DRGV521> WCS_DRGV521 { get; set; }
+        public DbSet<WCS_DRGV523> WCS_DRGV523 { get; set; }
     }
 }

Projects/永冠/WCS.Service/Works/RGV/RGVWork.cs

@@ -114,7 +114,6 @@ namespace WCS.Service.Works
 
         protected override bool SelectDevice(WCS_DEVICE dev)
         {
-            //TODO:上线时需要填入具体设备号
             return dev.CODE is "RGV1" or "RGV2" or "RGV3" or "RGV5";
         }
     }
@@ -155,7 +154,9 @@ namespace WCS.Service.Works
                     dev.Data2.TaskID_1 = dev.Data.TaskID_1;
                     dev.Data2.TaskType_1 = Convert.ToInt16(DRGVTaskType.放货);
                     dev.Data2.StartPosition_1 = Convert.ToInt16(next);
+                    dev.Data.RES = dev.Data2.StartPosition_1;
                     dev.Data2.Trigger_1 = 1;
+                    
                 }
                 else if (dev.Data.PH_Status_2)//工位二需要放货
                 {
@@ -172,6 +173,7 @@ namespace WCS.Service.Works
                     dev.Data2.TaskID_2 = dev.Data.TaskID_2;
                     dev.Data2.TaskType_2 = Convert.ToInt16(DRGVTaskType.放货);
                     dev.Data2.StartPosition_2 = Convert.ToInt16(next);
+                    dev.Data.RES = dev.Data2.StartPosition_2;
                     dev.Data2.Trigger_2 = 1;
                 }
             }
@@ -224,8 +226,7 @@ namespace WCS.Service.Works
 
         protected override bool SelectDevice(WCS_DEVICE dev)
         {
-            //TODO:上线时需要填入具体设备号
-            return dev.CODE is "RGV4" or "RGV6" ;
+            return dev.CODE is "RGV4" or "RGV6";
         }
     }
 
@@ -276,7 +277,6 @@ namespace WCS.Service.Works
 
         protected override bool SelectDevice(WCS_DEVICE dev)
         {
-            //TODO:上线时需要填入具体设备号
             return dev.CODE is "RGV7" or "RGV8";
         }
     }