From ea87f50cda6d03644b13a524f2c99e54846f1fc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83?= <15095123350@163.com> Date: Thu, 25 Jul 2024 14:54:19 +0800 Subject: [PATCH] 20240725 --- src/Khd.Core.Wcs/MainCentralControl.cs | 4 +-- src/Khd.Core.Wcs/Wcs/CreateTaskByRecord.cs | 38 ++++++++++++---------- src/Khd.Core.Wcs/Wcs/FiveFloorAGV.cs | 2 +- src/Khd.Core.Wcs/Wcs/FiveFloorBearAgv.cs | 2 +- src/Khd.Core.Wcs/Wcs/FiveFloorCTU.cs | 2 +- src/Khd.Core.Wcs/Wcs/SecondFloorAGV.cs | 2 +- src/Khd.Core.Wcs/Wcs/ThirdFloorAGV.cs | 2 +- 7 files changed, 28 insertions(+), 24 deletions(-) diff --git a/src/Khd.Core.Wcs/MainCentralControl.cs b/src/Khd.Core.Wcs/MainCentralControl.cs index 4b89e70..ab6ea1d 100644 --- a/src/Khd.Core.Wcs/MainCentralControl.cs +++ b/src/Khd.Core.Wcs/MainCentralControl.cs @@ -50,7 +50,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 @@ -111,7 +111,7 @@ namespace Khd.Core.Wcs fifthFloorAGV.StartPoint(); - + } catch (Exception ex) { diff --git a/src/Khd.Core.Wcs/Wcs/CreateTaskByRecord.cs b/src/Khd.Core.Wcs/Wcs/CreateTaskByRecord.cs index 84b62a4..913f768 100644 --- a/src/Khd.Core.Wcs/Wcs/CreateTaskByRecord.cs +++ b/src/Khd.Core.Wcs/Wcs/CreateTaskByRecord.cs @@ -621,14 +621,15 @@ namespace Khd.Core.Wcs.Wcs { var wmsProductInstock = dbContext.WmsProductInstock .Where(t => t.productType == "2") - .Where(t => t.auditStatus == "1") + .Where(t => t.auditStatus == "1" && t.executeStatus == "0") .Where(t => t.warehouseId == 521) .FirstOrDefault(); - if (wmsProductInstock != null && wmsProductInstock.executeStatus == "0") + if (wmsProductInstock != null) { var wmsBaseLocation = dbContext.WmsBaseLocation - .Where(t => t.warehouseId == 521) - .Where(t => t.activeFlag == "1") + .Where(t => t.activeFlag == "1") + .Where(t => t.delFlag == "0") + .Where(t => t.locationScrapType == "1") .Where(t => t.locationStatus == "1") .Where(t => t.containerCode == null) .OrderByDescending(t => t.locColumn) @@ -737,11 +738,12 @@ namespace Khd.Core.Wcs.Wcs .Where(t => t.saleOrderId == (wmsRawOutstock.saleOrderId == null ? 0 : wmsRawOutstock.saleOrderId)) .Where(t => t.warehouseId == 311) .ToList(); - var AllWmsBaseLocations = dbContext.WmsBaseLocation.Where(t => t.warehouseId == 311).ToList(); - var wmsBaseLocations = AllWmsBaseLocations + var AllWmsBaseLocations = dbContext.WmsBaseLocation .Where(t => t.activeFlag == "1") .Where(t => t.delFlag == "0") .Where(t => t.locationScrapType == "1") + .Where(t => t.warehouseId == 311).ToList(); + var wmsBaseLocations = AllWmsBaseLocations .Where(t => t.warehouseId == 311) .ToList(); var bill = from a in wmsBaseLocations @@ -1053,12 +1055,13 @@ namespace Khd.Core.Wcs.Wcs .Where(t => t.totalAmount > t.frozenAmount) .Select(t => t.locationCode) .ToList(); - List AllWmsBaseLocations = dbContext.WmsBaseLocation.Where(t => t.warehouseId == item.warehouseId).ToList(); - var wmsBaseLocations = AllWmsBaseLocations + List AllWmsBaseLocations = dbContext.WmsBaseLocation .Where(t => t.activeFlag == "1") .Where(t => t.delFlag == "0") .Where(t => t.locationScrapType == "1") .Where(t => t.locationStatus == "1") + .Where(t => t.warehouseId == item.warehouseId).ToList(); + var wmsBaseLocations = AllWmsBaseLocations .Where(t => t.warehouseId == item.warehouseId) .Where(t => wmsproStocks.Contains(t.locationCode)) .ToList(); @@ -1112,7 +1115,7 @@ namespace Khd.Core.Wcs.Wcs .Where(t => t.warehouseId == location.warehouseId).FirstOrDefault(); if (wmsBaseLocation != null && !string.IsNullOrEmpty(wmsBaseLocation.containerCode)) { - WmsProductStock? wmsProductStock = dbContext.WmsProductStock.FirstOrDefault(t => t.locationCode == wmsBaseLocation.containerCode); + WmsProductStock? wmsProductStock = dbContext.WmsProductStock.FirstOrDefault(t => t.locationCode == wmsBaseLocation.locationCode); if (wmsProductStock != null) { WmsBaseLocation? toLocation = AllWmsBaseLocations.Where(t => t.warehouseId == location.warehouseId) @@ -1273,12 +1276,13 @@ namespace Khd.Core.Wcs.Wcs .Where(t => t.productId == item.productId && t.saleOrderId == (item.saleOrderId == null ? 0 : item.saleOrderId) && t.warehouseId == item.warehouseId) .Select(t => t.palletInfoCode) .ToList(); - List AllWmsBaseLocations = dbContext.WmsBaseLocation.Where(t => t.warehouseId == item.warehouseId).ToList(); + List AllWmsBaseLocations = dbContext.WmsBaseLocation + .Where(t => t.activeFlag == "1") + .Where(t => t.delFlag == "0") + .Where(t => t.locationScrapType == "1") + .Where(t => t.locationStatus == "1") + .Where(t => t.warehouseId == item.warehouseId).ToList(); var wmsBaseLocations = AllWmsBaseLocations - .Where(t => t.activeFlag == "1") - .Where(t => t.delFlag == "0") - .Where(t => t.locationScrapType == "1") - .Where(t => t.locationStatus == "1") .Where(t => t.warehouseId == item.warehouseId) .Where(t => wmsproStocks.Contains(t.containerCode)) .ToList(); @@ -1350,7 +1354,7 @@ namespace Khd.Core.Wcs.Wcs .Where(t => t.warehouseId == location.warehouseId).FirstOrDefault(); if (wmsBaseLocation != null && !string.IsNullOrEmpty(wmsBaseLocation.containerCode)) { - WmsProductStock? wmsProductStock = dbContext.WmsProductStock.FirstOrDefault(t => t.locationCode == wmsBaseLocation.containerCode); + WmsProductStock? wmsProductStock = dbContext.WmsProductStock.FirstOrDefault(t => t.locationCode == wmsBaseLocation.locationCode); if (wmsProductStock != null) { WmsBaseLocation? toLocation = AllWmsBaseLocations.Where(t => t.warehouseId == location.warehouseId) @@ -1490,7 +1494,7 @@ namespace Khd.Core.Wcs.Wcs { int taskCount = dbContext.WcsTask.Where(t => t.nextPointId == 11).Count(); //if (taskCount == 0 && wcsOutstockLock.qty == 0 && wcsOutstockLock.boxStatus == 0) - if (taskCount == 0 ) + if (taskCount == 0) { foreach (var wcs in wcsTaskManuals.Take(6)) { @@ -1816,7 +1820,7 @@ namespace Khd.Core.Wcs.Wcs BaseEquip startStationEquip = StaticData.BaseEquip.First(t => t.objid == 21); BaseEquip bearAgvEquip = StaticData.BaseEquip.First(t => t.objid == 10); BaseEquip endStationEquip = StaticData.BaseEquip.First(t => t.equipNo == item.endStationCode); - hasTask = dbContext.WcsTask.Where(t => t.taskType == 32).Any(); + hasTask = dbContext.WcsTask.Where(t => t.taskType == 32).Any(); if (!hasTask) { WcsTask bearAgvTask = new() diff --git a/src/Khd.Core.Wcs/Wcs/FiveFloorAGV.cs b/src/Khd.Core.Wcs/Wcs/FiveFloorAGV.cs index 5d86837..be655fd 100644 --- a/src/Khd.Core.Wcs/Wcs/FiveFloorAGV.cs +++ b/src/Khd.Core.Wcs/Wcs/FiveFloorAGV.cs @@ -59,7 +59,7 @@ namespace Khd.Core.Wcs.Wcs dbContext.ChangeTracker.Entries().ToList().ForEach(e => e.Reload()); var taskList = dbContext.WcsTask .Where(t => t.useFlag == 1) - .Where(t=>t.IsDelete==0) + .Where(t=>t.IsDelete==0||t.IsDelete==null) .Where(t => t.nextPointId == agvID).OrderBy(t => t.createTime).ToList(); foreach (var item in taskList) { diff --git a/src/Khd.Core.Wcs/Wcs/FiveFloorBearAgv.cs b/src/Khd.Core.Wcs/Wcs/FiveFloorBearAgv.cs index 01e0139..e41fc95 100644 --- a/src/Khd.Core.Wcs/Wcs/FiveFloorBearAgv.cs +++ b/src/Khd.Core.Wcs/Wcs/FiveFloorBearAgv.cs @@ -53,7 +53,7 @@ namespace Khd.Core.Wcs.Wcs { dbContext.ChangeTracker.Entries().ToList().ForEach(e => e.Reload()); var taskList = dbContext.WcsTask - .Where(t => t.IsDelete == 0) + .Where(t => t.IsDelete == 0 || t.IsDelete == null) .Where(t => t.nextPointId == agvID) .OrderBy(t => t.createTime).ToList(); diff --git a/src/Khd.Core.Wcs/Wcs/FiveFloorCTU.cs b/src/Khd.Core.Wcs/Wcs/FiveFloorCTU.cs index 1cfface..41689f0 100644 --- a/src/Khd.Core.Wcs/Wcs/FiveFloorCTU.cs +++ b/src/Khd.Core.Wcs/Wcs/FiveFloorCTU.cs @@ -353,7 +353,7 @@ namespace Khd.Core.Wcs.Wcs dbContext.ChangeTracker.Entries().ToList().ForEach(e => e.Reload()); var taskList = dbContext.WcsTask .Where(t => t.useFlag == 1) - .Where(t => t.IsDelete == 0) + .Where(t => t.IsDelete == 0 || t.IsDelete == null) .Where(t => t.nextPointId == CTUID).OrderByDescending(t => t.ud1).ToList(); foreach (var item in taskList) { diff --git a/src/Khd.Core.Wcs/Wcs/SecondFloorAGV.cs b/src/Khd.Core.Wcs/Wcs/SecondFloorAGV.cs index e03f9a0..1aef183 100644 --- a/src/Khd.Core.Wcs/Wcs/SecondFloorAGV.cs +++ b/src/Khd.Core.Wcs/Wcs/SecondFloorAGV.cs @@ -61,7 +61,7 @@ namespace Khd.Core.Wcs.Wcs //获取条码号,如果该条码任务存在就继续任务,如果条码不存在,创建入库任务并调度agv var taskList = dbContext.WcsTask .Where(t => t.useFlag == 1) - .Where(t => t.IsDelete == 0) + .Where(t => t.IsDelete == 0 || t.IsDelete == null) .Where(t => t.nextPointId == EquipID).OrderBy(t => t.createTime).ToList(); foreach (var item in taskList) { diff --git a/src/Khd.Core.Wcs/Wcs/ThirdFloorAGV.cs b/src/Khd.Core.Wcs/Wcs/ThirdFloorAGV.cs index b6a10ed..a64f6ed 100644 --- a/src/Khd.Core.Wcs/Wcs/ThirdFloorAGV.cs +++ b/src/Khd.Core.Wcs/Wcs/ThirdFloorAGV.cs @@ -64,7 +64,7 @@ namespace Khd.Core.Wcs.Wcs var getTrayValue = StaticData.PlcDic[2].Read(getTrayPoint.plcpointAddress); if (getTrayValue != null && Convert.ToBoolean(getTrayValue)) { - var task = dbContext.WcsTask.Where(t => t.IsDelete == 0).Where(t => t.taskType == 42 && t.useFlag == 0).FirstOrDefault(); + var task = dbContext.WcsTask.Where(t => t.IsDelete == 0 || t.IsDelete == null).Where(t => t.taskType == 42 && t.useFlag == 0).FirstOrDefault(); if (task != null) { BaseEquip endEquip = dbContext.BaseEquip.First(t => t.objid == 35);