1.取消任务fix

2.包片机任务取QHQ点位

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);

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<TaskMapper, Task> impleme
 
             }
         }
-        List<RouteLineDto> shortPathsList =
+//        List<RouteLineDto> shortPathsList =
-                routeLineService.getShortPathLines(
+//                routeLineService.getShortPathLines(
-                        entity.getStart_device_code(),
+//                        entity.getStart_device_code(),
-                        entity.getNext_device_code(),
+//                        entity.getNext_device_code(),
-                        entity.getRoute_plan_code());
+//                        entity.getRoute_plan_code());
-        String type = shortPathsList.get(0).getType();
+//        String type = shortPathsList.get(0).getType();
         // != 0 为agv任务
 //        if (!StrUtil.equals(type, "0")) {
 //            if (StrUtil.equals(paramService.findByCode(AcsConfig.AGVTYPE).getValue(), "3")) {

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"))) {
+        if( "1".equals(jsonObject.getString("material_type"))) {
-//            schBaseTask.setPoint_code1(point.getPoint_code()+"0"+point.getVehicle_qty());
-//        }else{
             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);

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("当前空架点位有任务，暂不反馈！");
         }