diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java index b527e33..962dba0 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java @@ -86,7 +86,6 @@ public class OneNDCSocketConnectionAutoRun extends AbstractAutoRunnable { ip = paramService.findByCode(AcsConfig.AGVURL).getValue(); port = Integer.parseInt(paramService.findByCode(AcsConfig.AGVPORT).getValue()); - try { byte[] b = new byte[1024]; s = new Socket(ip, port); diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java index be0e80f..2426a37 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java @@ -999,12 +999,12 @@ public class TaskServiceImpl extends CommonServiceImpl impleme } } - List shortPathsList = - routeLineService.getShortPathLines( - entity.getStart_device_code(), - entity.getNext_device_code(), - entity.getRoute_plan_code()); - String type = shortPathsList.get(0).getType(); +// List shortPathsList = +// routeLineService.getShortPathLines( +// entity.getStart_device_code(), +// entity.getNext_device_code(), +// entity.getRoute_plan_code()); +// String type = shortPathsList.get(0).getType(); // != 0 为agv任务 // if (!StrUtil.equals(type, "0")) { // if (StrUtil.equals(paramService.findByCode(AcsConfig.AGVTYPE).getValue(), "3")) { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/BPSLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/BPSLTask.java index 9738d9d..51f32d4 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/BPSLTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/BPSLTask.java @@ -239,11 +239,11 @@ public class BPSLTask extends AbstractTask { JSONObject jsonObject = JSONObject.parseObject(schBaseTask.getExt_group_data()); SchBasePoint point = this.findNextPoint(jsonObject,schBaseTask); //正极板现在不堆叠 -// if( "1".equals(jsonObject.getString("material_type"))) { -// schBaseTask.setPoint_code1(point.getPoint_code()+"0"+point.getVehicle_qty()); -// }else{ + if( "1".equals(jsonObject.getString("material_type"))) { schBaseTask.setPoint_code1(point.getPoint_code()); -// } + }else{ + schBaseTask.setPoint_code1(point.getPoint_code().replace("HCQ","QHQ")); + } //重算点位时把点位占用 point.setIng_task_code(schBaseTask.getTask_code()); // point.setVehicle_qty(point.getVehicle_qty() - 1); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/KGHJRKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/KGHJRKTask.java index 85297cb..55e4244 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/KGHJRKTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/KGHJRKTask.java @@ -220,7 +220,7 @@ public class KGHJRKTask extends AbstractTask { if("ZJBKGHJDJW".equals(point.getRegion_code())) { schBaseTask.setPoint_code2(point.getPoint_code() + "0" + (point.getVehicle_qty() + 1)); }else{ - schBaseTask.setPoint_code2(point.getPoint_code()); + schBaseTask.setPoint_code2(point.getPoint_code().replace("HCQ","QHQ")); if(ObjectUtil.isNotEmpty(point.getIng_task_code())&&!schBaseTask.getTask_code().equals(point.getIng_task_code())){ throw new BadRequestException("当前空架点位有任务,暂不反馈!"); }