1

src/Khd.Core.Wcs/Wcs/CreateTaskByRecord.cs

@@ -7,6 +7,7 @@ using Khd.Core.Library.Mapper;
 using Khd.Core.Wcs.Global;
 using Masuit.Tools;
 using Microsoft.CodeAnalysis;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Newtonsoft.Json;
@@ -110,7 +111,7 @@ namespace Khd.Core.Wcs.Wcs
                     bool create = false;
                     dbContext.ChangeTracker.Entries().ToList().ForEach(e => e.Reload());
                     var ids = dbContext.BaseEquip.Where(t => t.equipType == 20).Select(t => t.objid).ToList();
-                    bool hasTask = dbContext.WcsTask.Where(t => t.endPointId == 2 || ids.Contains(t.endPointId.Value)).Any();
+                    bool hasTask = dbContext.WcsTask.Where(t => t.endPointId == 2 || t.endPointId == 36 || ids.Contains(t.currPointId.Value)).Any();
                     if (!hasTask)
                     {
                         int thirdTray = dbContext.BaseEquip
@@ -447,7 +448,7 @@ namespace Khd.Core.Wcs.Wcs
                     lock (SystemData.FiveTaskLock)
                     {
                         dbContext.ChangeTracker.Entries().ToList().ForEach(e => e.Reload());
-                        BaseEquip baseEquip = dbContext.BaseEquip.First(t => t.objid == 29);
+                        BaseEquip baseEquip = dbContext.BaseEquip.AsNoTracking().First(t => t.objid == 29);
                         if (baseEquip.emptyCount == 1)
                         {
                             WcsTask? wcsTask = dbContext.WcsTask.Where(t => t.nextPointId == 28).FirstOrDefault();

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

@@ -573,7 +573,6 @@ namespace Khd.Core.Wcs.Wcs
                                                 _logger.Info("提升机线程：" + wcsTask.floorNo + "楼接驳位有AGV任务，跳过当前任务");
                                                 continue;
                                             }
-
                                             BasePlcpoint floorPoint = StaticData.BasePlcpointList.First(t => t.plcpointNo == "RFID00" + wcsTask.fromFloorNo);
                                             string? rfid = StaticData.PlcDic[0].ReadRFID(floorPoint.plcpointAddress);
                                             _logger.Info($"{wcsTask.fromFloorNo}楼RFID?{rfid}，任务RFID{wcsTask.containerNo}");

src/Khd.Core.Wpf/appsettings.json

@@ -61,8 +61,8 @@
     "扫描退库",
     "扫描出库",
     "辅料移库",
-    //"废料区管理",
+    "废料区管理",
-    //"一楼接驳位",
+    "一楼接驳位",
     "PLC信息",
     "Agv信息",
     //"权限控制"