baogq
/
JYHB-WCS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20240725

Browse Source
master
范 1 year ago
parent 7554ddc61f
commit ea87f50cda
7 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File

4
src/Khd.Core.Wcs/MainCentralControl.cs
Unescape Escape View File

@ -50,7 +50,7 @@ namespace Khd.Core.Wcs
plc = new Plc.S7.Plc(plcConfig.CpuType, plcConfig.IP, plcConfig.Port, plcConfig.Rack, plcConfig.Slot); plc = new Plc.S7.Plc(plcConfig.CpuType, plcConfig.IP, plcConfig.Port, plcConfig.Rack, plcConfig.Slot);
try try
{ {
plc.Open(); //plc.Open();
Console.WriteLine(DateTime.Now + ":连接PLC：" + plcConfig.IP); Console.WriteLine(DateTime.Now + ":连接PLC：" + plcConfig.IP);
} }
catch catch
@ -111,7 +111,7 @@ namespace Khd.Core.Wcs
fifthFloorAGV.StartPoint(); fifthFloorAGV.StartPoint();
} }
catch (Exception ex) catch (Exception ex)
{ {

38
src/Khd.Core.Wcs/Wcs/CreateTaskByRecord.cs
Unescape Escape View File

@ -621,14 +621,15 @@ namespace Khd.Core.Wcs.Wcs
{ {
var wmsProductInstock = dbContext.WmsProductInstock var wmsProductInstock = dbContext.WmsProductInstock
.Where(t => t.productType == "2") .Where(t => t.productType == "2")
.Where(t => t.auditStatus == "1") .Where(t => t.auditStatus == "1" && t.executeStatus == "0")
.Where(t => t.warehouseId == 521) .Where(t => t.warehouseId == 521)
.FirstOrDefault(); .FirstOrDefault();
if (wmsProductInstock != null && wmsProductInstock.executeStatus == "0") if (wmsProductInstock != null)
{ {
var wmsBaseLocation = dbContext.WmsBaseLocation 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.locationStatus == "1")
.Where(t => t.containerCode == null) .Where(t => t.containerCode == null)
.OrderByDescending(t => t.locColumn) .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.saleOrderId == (wmsRawOutstock.saleOrderId == null ? 0 : wmsRawOutstock.saleOrderId))
.Where(t => t.warehouseId == 311) .Where(t => t.warehouseId == 311)
.ToList(); .ToList();
var AllWmsBaseLocations = dbContext.WmsBaseLocation.Where(t => t.warehouseId == 311).ToList(); var AllWmsBaseLocations = dbContext.WmsBaseLocation
var wmsBaseLocations = AllWmsBaseLocations
.Where(t => t.activeFlag == "1") .Where(t => t.activeFlag == "1")
.Where(t => t.delFlag == "0") .Where(t => t.delFlag == "0")
.Where(t => t.locationScrapType == "1") .Where(t => t.locationScrapType == "1")
.Where(t => t.warehouseId == 311).ToList();
var wmsBaseLocations = AllWmsBaseLocations
.Where(t => t.warehouseId == 311) .Where(t => t.warehouseId == 311)
.ToList(); .ToList();
var bill = from a in wmsBaseLocations var bill = from a in wmsBaseLocations
@ -1053,12 +1055,13 @@ namespace Khd.Core.Wcs.Wcs
.Where(t => t.totalAmount > t.frozenAmount) .Where(t => t.totalAmount > t.frozenAmount)
.Select(t => t.locationCode) .Select(t => t.locationCode)
.ToList(); .ToList();
List<WmsBaseLocation> AllWmsBaseLocations = dbContext.WmsBaseLocation.Where(t => t.warehouseId == item.warehouseId).ToList(); List<WmsBaseLocation> AllWmsBaseLocations = dbContext.WmsBaseLocation
var wmsBaseLocations = AllWmsBaseLocations
.Where(t => t.activeFlag == "1") .Where(t => t.activeFlag == "1")
.Where(t => t.delFlag == "0") .Where(t => t.delFlag == "0")
.Where(t => t.locationScrapType == "1") .Where(t => t.locationScrapType == "1")
.Where(t => t.locationStatus == "1") .Where(t => t.locationStatus == "1")
.Where(t => t.warehouseId == item.warehouseId).ToList();
var wmsBaseLocations = AllWmsBaseLocations
.Where(t => t.warehouseId == item.warehouseId) .Where(t => t.warehouseId == item.warehouseId)
.Where(t => wmsproStocks.Contains(t.locationCode)) .Where(t => wmsproStocks.Contains(t.locationCode))
.ToList(); .ToList();
@ -1112,7 +1115,7 @@ namespace Khd.Core.Wcs.Wcs
.Where(t => t.warehouseId == location.warehouseId).FirstOrDefault(); .Where(t => t.warehouseId == location.warehouseId).FirstOrDefault();
if (wmsBaseLocation != null && !string.IsNullOrEmpty(wmsBaseLocation.containerCode)) 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) if (wmsProductStock != null)
{ {
WmsBaseLocation? toLocation = AllWmsBaseLocations.Where(t => t.warehouseId == location.warehouseId) 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) .Where(t => t.productId == item.productId && t.saleOrderId == (item.saleOrderId == null ? 0 : item.saleOrderId) && t.warehouseId == item.warehouseId)
.Select(t => t.palletInfoCode) .Select(t => t.palletInfoCode)
.ToList(); .ToList();
List<WmsBaseLocation> AllWmsBaseLocations = dbContext.WmsBaseLocation.Where(t => t.warehouseId == item.warehouseId).ToList(); List<WmsBaseLocation> 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 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 => t.warehouseId == item.warehouseId)
.Where(t => wmsproStocks.Contains(t.containerCode)) .Where(t => wmsproStocks.Contains(t.containerCode))
.ToList(); .ToList();
@ -1350,7 +1354,7 @@ namespace Khd.Core.Wcs.Wcs
.Where(t => t.warehouseId == location.warehouseId).FirstOrDefault(); .Where(t => t.warehouseId == location.warehouseId).FirstOrDefault();
if (wmsBaseLocation != null && !string.IsNullOrEmpty(wmsBaseLocation.containerCode)) 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) if (wmsProductStock != null)
{ {
WmsBaseLocation? toLocation = AllWmsBaseLocations.Where(t => t.warehouseId == location.warehouseId) 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(); int taskCount = dbContext.WcsTask.Where(t => t.nextPointId == 11).Count();
//if (taskCount == 0 && wcsOutstockLock.qty == 0 && wcsOutstockLock.boxStatus == 0) //if (taskCount == 0 && wcsOutstockLock.qty == 0 && wcsOutstockLock.boxStatus == 0)
if (taskCount == 0 ) if (taskCount == 0)
{ {
foreach (var wcs in wcsTaskManuals.Take(6)) 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 startStationEquip = StaticData.BaseEquip.First(t => t.objid == 21);
BaseEquip bearAgvEquip = StaticData.BaseEquip.First(t => t.objid == 10); BaseEquip bearAgvEquip = StaticData.BaseEquip.First(t => t.objid == 10);
BaseEquip endStationEquip = StaticData.BaseEquip.First(t => t.equipNo == item.endStationCode); 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) if (!hasTask)
{ {
WcsTask bearAgvTask = new() WcsTask bearAgvTask = new()

2
src/Khd.Core.Wcs/Wcs/FiveFloorAGV.cs
Unescape Escape View File

@ -59,7 +59,7 @@ namespace Khd.Core.Wcs.Wcs
dbContext.ChangeTracker.Entries().ToList().ForEach(e => e.Reload()); dbContext.ChangeTracker.Entries().ToList().ForEach(e => e.Reload());
var taskList = dbContext.WcsTask var taskList = dbContext.WcsTask
.Where(t => t.useFlag == 1) .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(); .Where(t => t.nextPointId == agvID).OrderBy(t => t.createTime).ToList();
foreach (var item in taskList) foreach (var item in taskList)
{ {

2
src/Khd.Core.Wcs/Wcs/FiveFloorBearAgv.cs
Unescape Escape View File

@ -53,7 +53,7 @@ namespace Khd.Core.Wcs.Wcs
{ {
dbContext.ChangeTracker.Entries().ToList().ForEach(e => e.Reload()); dbContext.ChangeTracker.Entries().ToList().ForEach(e => e.Reload());
var taskList = dbContext.WcsTask var taskList = dbContext.WcsTask
.Where(t => t.IsDelete == 0) .Where(t => t.IsDelete == 0 || t.IsDelete == null)
.Where(t => t.nextPointId == agvID) .Where(t => t.nextPointId == agvID)
.OrderBy(t => t.createTime).ToList(); .OrderBy(t => t.createTime).ToList();

2
src/Khd.Core.Wcs/Wcs/FiveFloorCTU.cs
Unescape Escape View File

@ -353,7 +353,7 @@ namespace Khd.Core.Wcs.Wcs
dbContext.ChangeTracker.Entries().ToList().ForEach(e => e.Reload()); dbContext.ChangeTracker.Entries().ToList().ForEach(e => e.Reload());
var taskList = dbContext.WcsTask var taskList = dbContext.WcsTask
.Where(t => t.useFlag == 1) .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(); .Where(t => t.nextPointId == CTUID).OrderByDescending(t => t.ud1).ToList();
foreach (var item in taskList) foreach (var item in taskList)
{ {

2
src/Khd.Core.Wcs/Wcs/SecondFloorAGV.cs
Unescape Escape View File

@ -61,7 +61,7 @@ namespace Khd.Core.Wcs.Wcs
//获取条码号,如果该条码任务存在就继续任务,如果条码不存在,创建入库任务并调度agv //获取条码号,如果该条码任务存在就继续任务,如果条码不存在,创建入库任务并调度agv
var taskList = dbContext.WcsTask var taskList = dbContext.WcsTask
.Where(t => t.useFlag == 1) .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(); .Where(t => t.nextPointId == EquipID).OrderBy(t => t.createTime).ToList();
foreach (var item in taskList) foreach (var item in taskList)
{ {

2
src/Khd.Core.Wcs/Wcs/ThirdFloorAGV.cs
Unescape Escape View File

@ -64,7 +64,7 @@ namespace Khd.Core.Wcs.Wcs
var getTrayValue = StaticData.PlcDic[2].Read(getTrayPoint.plcpointAddress); var getTrayValue = StaticData.PlcDic[2].Read(getTrayPoint.plcpointAddress);
if (getTrayValue != null && Convert.ToBoolean(getTrayValue)) 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) if (task != null)
{ {
BaseEquip endEquip = dbContext.BaseEquip.First(t => t.objid == 35); BaseEquip endEquip = dbContext.BaseEquip.First(t => t.objid == 35);

Write Preview
Loading…
Cancel
Save