fix

WCS_Client/Frm/Equipment/WCS_AGVTask.cs

@@ -35,6 +35,11 @@ namespace WCS_Client.Frm
 
         public DateTime? AGVUpdateTime { get; set; }
 
+        /// <summary>
+        /// 货物数量(1.两个位置放1个货物，2.两个位置放2个货物）
+        /// </summary>
+        public int Goodsnum { get; set; }
+
     }
 
     public enum AGVTaskStatus

WCS_Client/Frm/FrmMain.cs

@@ -73,7 +73,7 @@ namespace WCS_Client
 
             if (eqpData.Redis == null)
             {
-                RedisClient Redis = new RedisClient("212.64.66.35,database=11");
+                RedisClient Redis = new RedisClient("192.168.249.150,password=123456,database=10");
                 MessagePackSerializer.DefaultOptions = StandardResolver.Options.WithCompression(MessagePackCompression.Lz4Block);
                 Redis.Serialize = obj =>
                 {
@@ -123,7 +123,7 @@ namespace WCS_Client
                 ////MBtn_Monitor
                 AddMenu("MBtn_Monitor", "MBtn_SCANN", "扫码信息查询", typeof(Frm.MBtn_SCANN), Btn_Click);
 
-                //AddMenu("MBtn_Monitor", "MBtn_Mont", "设备监控查看", typeof(Frm.Frm_YongGuanMontior), Btn_Click);
+                AddMenu("MBtn_Monitor", "MBtn_Mont", "设备监控查看", typeof(Frm.Frm_YongGuanMontior), Btn_Click);
 
                 //MBtn_Sys
                 AddMenu("MBtn_Sys", "MBtn_Interface_OPOrder", "日志管理", typeof(Frm.FrmLog), Btn_Click);

WCS_Client/Workflow/TaskWorkflow.cs

@@ -2,8 +2,9 @@
 using System.Collections.Generic;
 using System.Data;
 using System.Linq;
+using WCS.Entity.Protocol;
 using WCS_Client.Extensions;
-using WCS_Client.Frm;
+using WCS_AGVTask = WCS.Entity.Protocol.WCS_AGVTask;
 
 namespace WCS_Client.Workflow
 {
@@ -31,7 +32,7 @@ namespace WCS_Client.Workflow
                 ids += p;
                 if (p != agvIDs[agvIDs.Count - 1]) ids += ",";
             });
-            var _sql = $"select * from WCS_AGVTask where ID in ({ids})";
+            var _sql = $"select * from WCS_AGVTask where ID in ({(string.IsNullOrEmpty(ids) ? "''" : ids)})";
             List<WCS_AGVTask> _AGVTASKs = db.SqlQueryable<WCS_AGVTask>(_sql).ToList();
             //向新增列写入数据
             for (int i = 0; i < dataTable.Rows.Count; i++)
@@ -40,13 +41,14 @@ namespace WCS_Client.Workflow
                 dataTable.Rows[i][ADDRCURRENT] = eqpData.deviceDataPack.StationDatas.Datas.Where(p => p.D521.Tasknum == (int)dataTable.Rows[i][1]).FirstOrDefault()?.Code;
                 //不在输送线，尝试写入RGV
                 if (string.IsNullOrEmpty(dataTable.Rows[i][ADDRCURRENT].ToString()))
-                {  
-                    dataTable.Rows[i][ADDRCURRENT] = eqpData.deviceDataPack.RGVDatas.Datas.Where(p => p.D521.TaskID_1 == (int)dataTable.Rows[i][1] && p.D521.PH_Status_1).FirstOrDefault()?.Code;
+                {
+                    dataTable.Rows[i][ADDRCURRENT] = eqpData.deviceDataPack.RGVDatas.Datas.Where(p => (p.D521.TaskID_1 == (int)dataTable.Rows[i][1] && p.D521.Status_1.HasFlag(RGVStatus.光电))
+                                                                                                   || (p.D521.TaskID_2 == (int)dataTable.Rows[i][1] && p.D521.Status_2.HasFlag(RGVStatus.光电))).FirstOrDefault()?.Code;
                 }
                 //不在输送线/RGV，尝试写入堆垛机
                 if (string.IsNullOrEmpty(dataTable.Rows[i][ADDRCURRENT].ToString()))
                 {
-                    dataTable.Rows[i][ADDRCURRENT] = eqpData.deviceDataPack.SCDatas.Datas.Where(p => p.D521.TaskID_1 == (int)dataTable.Rows[i][1]).FirstOrDefault()?.Code;
+                    dataTable.Rows[i][ADDRCURRENT] = eqpData.deviceDataPack.SCDatas.Datas.Where(p => p.D521.TaskID_1 == (int)dataTable.Rows[i][1] || p.D521.TaskID_2 == (int)dataTable.Rows[i][1]).FirstOrDefault()?.Code;
                 }
 
                 //开始写入产线

WCS_Client/dll/WCS.Entity.Protocol.deps.json

@@ -0,0 +1,76 @@
+{
+  "runtimeTarget": {
+    "name": ".NETStandard,Version=v2.0/",
+    "signature": ""
+  },
+  "compilationOptions": {},
+  "targets": {
+    ".NETStandard,Version=v2.0": {},
+    ".NETStandard,Version=v2.0/": {
+      "WCS.Entity.Protocol/1.0.0": {
+        "dependencies": {
+          "NETStandard.Library": "2.0.3",
+          "WCS.Entity": "1.0.0"
+        },
+        "runtime": {
+          "WCS.Entity.Protocol.dll": {}
+        }
+      },
+      "Microsoft.NETCore.Platforms/1.1.0": {},
+      "NETStandard.Library/2.0.3": {
+        "dependencies": {
+          "Microsoft.NETCore.Platforms": "1.1.0"
+        }
+      },
+      "System.ComponentModel.Annotations/5.0.0": {
+        "runtime": {
+          "lib/netstandard2.0/System.ComponentModel.Annotations.dll": {
+            "assemblyVersion": "4.2.1.0",
+            "fileVersion": "4.6.26515.6"
+          }
+        }
+      },
+      "WCS.Entity/1.0.0": {
+        "dependencies": {
+          "System.ComponentModel.Annotations": "5.0.0"
+        },
+        "runtime": {
+          "WCS.Entity.dll": {}
+        }
+      }
+    }
+  },
+  "libraries": {
+    "WCS.Entity.Protocol/1.0.0": {
+      "type": "project",
+      "serviceable": false,
+      "sha512": ""
+    },
+    "Microsoft.NETCore.Platforms/1.1.0": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==",
+      "path": "microsoft.netcore.platforms/1.1.0",
+      "hashPath": "microsoft.netcore.platforms.1.1.0.nupkg.sha512"
+    },
+    "NETStandard.Library/2.0.3": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==",
+      "path": "netstandard.library/2.0.3",
+      "hashPath": "netstandard.library.2.0.3.nupkg.sha512"
+    },
+    "System.ComponentModel.Annotations/5.0.0": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-dMkqfy2el8A8/I76n2Hi1oBFEbG1SfxD2l5nhwXV3XjlnOmwxJlQbYpJH4W51odnU9sARCSAgv7S3CyAFMkpYg==",
+      "path": "system.componentmodel.annotations/5.0.0",
+      "hashPath": "system.componentmodel.annotations.5.0.0.nupkg.sha512"
+    },
+    "WCS.Entity/1.0.0": {
+      "type": "project",
+      "serviceable": false,
+      "sha512": ""
+    }
+  }
+}