提升机

src/Khd.Core.Wcs/MainCentralControl.cs

@@ -37,8 +37,6 @@ namespace Khd.Core.Wcs
             using var dbContext = scope.ServiceProvider.GetRequiredService<DefaultDbContext>();
             try
             {
-                dbContext.WmsBaseLocation.Update(t => new Dictionary<string, WmsBaseLocation>() { { "1", new WmsBaseLocation { locationStatus="1" } } });
-
                 StaticData.BasePlcpointList = dbContext.BasePlcpoint.Where(t => t.isDelete == 0).ToList();//设备交互用
                 StaticData.basePlcs = dbContext.BasePlc.ToList();//陈工Agv和设备信息推送
                 StaticData.BaseEquip = dbContext.BaseEquip.ToList();//设备信息
@@ -51,7 +49,7 @@ namespace Khd.Core.Wcs
                         plc = new Plc.S7.Plc(plcConfig.CpuType, plcConfig.IP, plcConfig.Port, plcConfig.Rack, plcConfig.Slot);
                         try
                         {
-                            plc.Open();
+                            //plc.Open();
                             Console.WriteLine(DateTime.Now + ":连接PLC：" + plcConfig.IP);
                         }
                         catch

src/Khd.Core.Wcs/Wcs/FirstFloor.cs

@@ -524,11 +524,11 @@ namespace Khd.Core.Wcs.Wcs
                             if (Convert.ToInt32(equipstate06Value) == 0)
                             {
                                 dbContext.ChangeTracker.Entries().ToList().ForEach(e => e.Reload());
-                                var wcsTasks = dbContext.WcsTask.Where(t => t.nextPointId == T01).OrderBy(t => t.createTime).ToList();
+                                var wcsTasks = dbContext.WcsTask.Where(t => t.nextPointId == T01 && t.taskStatus < 5).OrderBy(t => t.createTime).ToList();
                                 foreach (var wcsTask in wcsTasks)
                                 {
                                     _logger.Info($"当前任务?{wcsTask.ToJsonString()}");
-                                    bool hasTask = dbContext.WcsTask.Where(t => t.endPointId == wcsTask.endPointId && t.objid != wcsTask.objid).Any();
+                                    bool hasTask = dbContext.WcsTask.Where(t => t.endPointId == wcsTask.endPointId && t.nextPointId != 6 && t.objid != wcsTask.objid).Any();
                                     if (!hasTask)
                                     {
                                         wcsTask.serialNo ??= SystemData.GetSerialNo(dbContext);

src/Khd.Core.Wcs/appsettings.json

@@ -1,9 +1,9 @@
 {
   "ConnectionStrings": {
-    "DefaultConnection": "server=106.12.13.113;port=3336;database=khd_jyhb;uid=khd;pwd=khd@123;charset='utf8';persistsecurityinfo=True;SslMode=none;Allow User Variables=True",
+    //"DefaultConnection": "server=106.12.13.113;port=3336;database=khd_jyhb;uid=khd;pwd=khd@123;charset='utf8';persistsecurityinfo=True;SslMode=none;Allow User Variables=True",
     //"DefaultConnection": "server=172.16.12.100;port=3306;database=hwjy-cloud;uid=kehaida;pwd=khdrkjy2024...;charset='utf8';persistsecurityinfo=True;SslMode=None;Allow User Variables=True"
     //"DefaultConnection": "server=localhost;port=3306;database=jyhb;uid=root;pwd=root;charset='utf8';persistsecurityinfo=True;SslMode=None;Allow User Variables=True"
-   // "DefaultConnection": "server=175.27.215.92;port=3306;database=hwjy-cloud;uid=kehaida;pwd=khd2024;charset='utf8';persistsecurityinfo=True;SslMode=None;Allow User Variables=True"
+    "DefaultConnection": "server=175.27.215.92;port=3306;database=hwjy-cloud;uid=kehaida;pwd=khd2024;charset='utf8';persistsecurityinfo=True;SslMode=None;Allow User Variables=True"
   },
   "DeleteLogDays": 10,//删除日志的时间间隔，单位：天
   "PlcConfigs": [
@@ -43,7 +43,7 @@
   "Logging": {
     "LogLevel": {
       "Default": "Information",
-      "Microsoft": "Information",
+      "Microsoft": "Error",
       "Microsoft.Hosting.Lifetime": "Information"
     } 
   }

src/Khd.Core.Wpf/myConverter/AgvTaskStatusConverter.cs

@@ -96,8 +96,7 @@ namespace Khd.Core.Wpf.myConverter
         }
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            taskModel? wcsTask = value as taskModel;
+            if (value is taskModel wcsTask)
-            if (wcsTask != null)
             {
                 BaseEquip baseEquip = SystemData.BaseEquip.First(t => t.objid == wcsTask.nextPointId);
                 if (dic.TryGetValue(baseEquip.equipType, out var taskStatusDic))

src/Khd.Core.Wpf/myConverter/TypeDataConverter.cs

@@ -1,4 +1,5 @@
-using System;
+using Khd.Core.Domain.Dto.TaskType;
+using System;
 using System.Globalization;
 using System.Linq;
 using System.Windows.Data;
@@ -12,15 +13,7 @@ namespace Khd.Core.Wpf.myConverter
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
             int val = System.Convert.ToInt32(value);
-            var baseDictionary = SystemData.BaseDictionary.FirstOrDefault(t => t.objid == val);
+            return StaticTaskType.GetTaskName(val);
-            if (baseDictionary == null)
-            {
-                return "未知";
-            }
-            else
-            {
-                return baseDictionary.dicName;
-            }
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)