|
@@ -207,7 +207,7 @@ namespace WCS.WorkEngineering.Systems
|
|
|
//找到当前桁架所属所有还有层没结束的码垛记录信息,有对应托盘
|
|
|
var palletizingLsit = db.Queryable<WCS_Palletizing>().Includes(x => x.Layers, r => r.Rows, l => l.Locs)
|
|
|
.Where(x => !x.Finish && x.DeviceCode == obj.Entity.Code /*&& x.WarehouseCode.Contains(warehouseCode)*/)
|
|
|
- .Where(x => x.Layers.Any(l => !l.Finish) && x.PalletizingStation != null).ToList();
|
|
|
+ .Where(x => x.Layers.Any(l => !l.Finish) && x.PalletizingStation != null && x.PalleCode != null).ToList();
|
|
|
//筛选出目标位置有光电的码垛记录信息
|
|
|
var devCode = palletizingLsit.Select(x => x.PalletizingStation);
|
|
|
var taskCode = palletizingLsit.Select(x => x.Id);
|