rev:任务下发修改

This commit is contained in:
2025-09-28 16:33:39 +08:00
parent f10137accc
commit 255758e609
2 changed files with 7 additions and 4 deletions

View File

@@ -430,14 +430,14 @@ public class InstructionServiceImpl extends CommonServiceImpl<InstructionMapper,
ndcAgvService.sendAgvInstToNDC(task.getAgv_system_type(), dto);
}
//判断是否是仙工AGV
if(CommonFinalParam.ONE.equals(route.getType())){
/* if(CommonFinalParam.ONE.equals(route.getType())){
HttpResponse response = xiangGongAgvService.sendOrderSequencesToXZ(dto);
if (ObjectUtils.isEmpty(response) || response.getStatus() != 200) {
dto.setSend_status("2");
} else {
dto.setSend_status("1");
}
}
}*/
} catch (Exception e) {
dto.setSend_status("2");
e.printStackTrace();

View File

@@ -168,7 +168,7 @@ public class PdaEmpVehicleServiceImpl implements PdaEmpVehicleService {
private Structattr queryOutPoint(JSONObject whereJson) {
// 默认库区为主存区
String storagevehicle_type = whereJson.getString("storagevehicle_type");
Structattr attrDao = iStructattrService.getOne(new LambdaQueryWrapper<>(Structattr.class)
List<Structattr> list = iStructattrService.list(new LambdaQueryWrapper<>(Structattr.class)
.eq(Structattr::getSect_code, IOSConstant.SECT_CODE)
.eq(Structattr::getLock_type, IOSEnum.LOCK_TYPE.code("未锁定"))
.eq(Structattr::getIs_emptyvehicle, IOSConstant.IS_DELETE_YES)
@@ -185,6 +185,9 @@ public class PdaEmpVehicleServiceImpl implements PdaEmpVehicleService {
Structattr::getStoragevehicle_type, IOSEnum.VEHICLE_TYPE_PUT.code("大料架(长边)"))
.orderByAsc(Structattr::getStruct_code)
);
return attrDao;
if (ObjectUtil.isEmpty(list)) {
throw new BadRequestException("库内此类型空托盘不足!【" + whereJson.getString("storagevehicle_type") + "");
}
return list.get(0);
}
}