Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
| | |
| | | } |
| | | else |
| | | { |
| | | task.NextAddress = item.TargetAddress; |
| | | task.NextAddress = router.NextPosi; |
| | | if (item.RoadWay.Contains("AGV")) |
| | | { |
| | | task.DeviceCode = item.RoadWay; |
| | |
| | | List<Dt_PalletTypeInfo> palletTypeInfos = _basicRepository.PalletTypeInfoRepository.QueryData(x => x.WarehouseId == warehousId); |
| | | Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseId == warehousId); |
| | | Dt_PalletTypeInfo? palletTypeInfo = palletTypeInfos.FirstOrDefault(x => x.PalletType == palletType && x.WarehouseId == warehousId); |
| | | if (palletTypeInfo == null) |
| | | if (palletTypeInfo == null || warehouse.WarehouseCode == WarehouseEnum.HA60.ToString()) |
| | | { |
| | | if (warehouse.WarehouseCode == WarehouseEnum.HA153.ToString() || warehouse.WarehouseCode == WarehouseEnum.HA71.ToString() || warehouse.WarehouseCode == WarehouseEnum.HA60.ToString()) |
| | | { |