root/beianxinsheng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev：任务下发修改

Browse Source
This commit is contained in:
liuxy
2025-09-28 16:33:39 +08:00
parent f10137accc
commit 255758e609
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
View File

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

7
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/impl/PdaEmpVehicleServiceImpl.java
View File

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