rev：修改

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java

@@ -224,10 +224,10 @@ public class OneNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
 
                             log.info("agv车号为"+carno+",进入自动门:"+device_code+"区域，请求开门中");
                             // 状态不为0且门开到位
-                            if (driver.getMode() != 0) {
+                            if (driver.getMode() != 0 && driver.getAction() == 1) {
                                 flag = true;
                             } else {
-                                String message = "自动门未联机，无法开门。";
+                                String message = "自动门未联机或未开到位，无法开门。";
                                 driver.setMessage(message);
                                 logServer.deviceExecuteLog(device_code, "", "", message);
                                 log.error("agv车号为"+carno+",进入自动门区域:"+"自动门:"+device_code+"未联机，无法开门。");

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/autodoor/standard_autodoor/ItemProtocol.java

@@ -61,18 +61,15 @@ public class ItemProtocol {
 
     public static List<ItemDto> getReadableItemDtos() {
         ArrayList list = new ArrayList();
-        list.add(new ItemDto(item_heartbeat, "心跳", "DB600.B0"));
-        list.add(new ItemDto(item_mode, "工作模式", "DB600.B1", Boolean.valueOf(true)));
-        list.add(new ItemDto(item_state, "工作状态", "DB600.B2"));
-        list.add(new ItemDto(item_action, "动作信号", "DB600.B3"));
-        list.add(new ItemDto(item_error, "报警信号", "DB600.B4"));
+        list.add(new ItemDto(item_heartbeat, "心跳", "VB100"));
+        list.add(new ItemDto(item_mode, "工作模式", "VB101", Boolean.valueOf(true)));
+        list.add(new ItemDto(item_action, "动作信号", "VB102"));
         return list;
     }
 
     public static List<ItemDto> getWriteableItemDtos() {
         ArrayList list = new ArrayList();
-        list.add(new ItemDto(item_to_command, "作业命令", "DB601.W2", Boolean.valueOf(true)));
-        list.add(new ItemDto(item_to_state, "下发状态", "DB601.W3", Boolean.valueOf(true)));
+        list.add(new ItemDto(item_to_command, "作业命令", "VW200", Boolean.valueOf(true)));
         return list;
     }
 

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

@@ -948,7 +948,9 @@ public class InstructionServiceImpl extends CommonServiceImpl<InstructionMapper,
             if (StrUtil.isEmpty(entity.getAgv_jobno())) {
                 throw new BadRequestException(LangProcess.msg("task_insNDC"));
             } else {
-                ndcAgvService.deleteAgvInstToNDC((Instruction) entity);
+                Instruction instruction = JSONObject.parseObject(JSONObject.toJSONString(entity), Instruction.class);
+                ndcAgvService.deleteAgvInstToNDC(instruction);
+                // ndcAgvService.deleteAgvInstToNDC((Instruction) entity);
                 flag = true;
             }
         } else if (StrUtil.equals(paramService.findByCode(AcsConfig.AGVTYPE).getValue(), "3")

acs/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml

@@ -3,7 +3,7 @@ server:
 #配置数据源
 spring:
   messages:
-    basename: language/login/login,language/error/error,language/buss/buss,language/task/task,language/monitor/one_device/one_device,language/monitor/two_device/two_device,language/monitor/universal/universal
+    basename: language/login/login,language/error/error,language/buss/buss,language/task/CallEmpReelTask,language/task/common,language/monitor/one_device/one_device,language/monitor/two_device/two_device,language/monitor/universal/universal
   datasource:
     druid:
       db-type: com.alibaba.druid.pool.DruidDataSource

acs/nladmin-system/nlsso-server/src/main/resources/config/application-prod.yml

@@ -3,7 +3,7 @@ server:
 #配置数据源
 spring:
   messages:
-    basename: language/login/login,language/error/error,language/buss/buss,language/task/task,language/monitor/one_device/one_device,language/monitor/two_device/two_device,language/monitor/universal/universal
+    basename: language/login/login,language/error/error,language/buss/buss,language/task/CallEmpReelTask,language/task/common,language/monitor/one_device/one_device,language/monitor/two_device/two_device,language/monitor/universal/universal
   datasource:
     druid:
       db-type: com.alibaba.druid.pool.DruidDataSource

acs/nladmin-system/nlsso-server/src/main/resources/config/application.yml

@@ -6,7 +6,7 @@ spring:
   freemarker:
     check-template-location: false
   profiles:
-    active: dev
+    active: prod
   #    active: prod
   jackson:
     time-zone: GMT+8