From e7d2324bd6cc03d1b86c66b1ff67fa14efaa99bf Mon Sep 17 00:00:00 2001
From: tuqiang <437016993@qq.com>
Date: Tue, 19 Aug 2025 16:03:26 +0800
Subject: [PATCH] =?UTF-8?q?add=EF=BC=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../agv/server/impl/NDCAgvServiceImpl.java    |   2 +-
 .../service/impl/InstructionServiceImpl.java  | 143 +++++++++++++++---
 .../main/resources/config/application-dev.yml |   6 +-
 .../resources/config/application-prod.yml     |   6 +-
 acs2/nladmin-ui/.env.development              |   4 +-
 acs2/nladmin-ui/.env.production               |   4 +-
 acs2/nladmin-ui/public/config.js              |   5 +-
 7 files changed, 132 insertions(+), 38 deletions(-)

diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java
index 941d33b..f4340ac 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java
@@ -84,7 +84,7 @@ public class NDCAgvServiceImpl implements NDCAgvService {
                 ",priority:" + inst.getPriority() + ",startAddress:" + inst.getStart_point_code() +
                 ",nextAddress:" + inst.getNext_point_code());
         if (StrUtil.equals(paramService.findByCode(AcsConfig.FORKAGV).getValue(), "1")) {
-            if (!StrUtil.equals(agv_system_type, "1")) {
+            if (StrUtil.equals(agv_system_type, "2")) {
                 String instcode = inst.getInstruction_code();
                 int type = Integer.parseInt(inst.getAgv_inst_type());
                 int priority = Integer.parseInt(inst.getPriority()) + 128;
diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
index 1b26824..75d97d2 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
@@ -533,6 +533,7 @@ public class InstructionServiceImpl extends CommonServiceImpl<InstructionMapper,
 //                        s.connect(socketAddress, 2 * 1000);
 //                        if (ObjectUtil.isNotEmpty(s)&&s.isConnected()==true) {
                         ndcAgvService.sendAgvInstToNDC(task.getAgv_system_type(), dto);
+                        dto.setSend_status("1");
 //                        } else {
 //                            log.error("agv连接出现异常:服务端被关闭");
 //                        }
@@ -563,17 +564,89 @@ public class InstructionServiceImpl extends CommonServiceImpl<InstructionMapper,
                 Device deviceByCode = deviceAppService.findDeviceByCode(dto.getStart_device_code());
 
                 if (dto.getAgv_system_type().equals(AgvSystemTypeEnum.XG_System_Type.getIndex())) {
-                    String interactionJson = task.getInteraction_json();
-                    if (StrUtil.isEmpty(interactionJson)) {
-                        throw new BadRequestException("agv叉车调整长宽参数为空");
-                    }
-                    InteractionJsonDTO interactionJsonDTO = JSON.parseObject(interactionJson, InteractionJsonDTO.class);
-                    //仙工叉车
-                    HttpResponse response = xiangGongAgvService.sendOrderSequencesToForklift(dto, interactionJsonDTO);
-                    if (ObjectUtils.isEmpty(response) || response.getStatus() != 200) {
-                        dto.setSend_status("2");
+//                    String interactionJson = task.getInteraction_json();
+//                    if (StrUtil.isEmpty(interactionJson)) {
+//                        throw new BadRequestException("agv叉车调整长宽参数为空");
+//                    }
+//                    InteractionJsonDTO interactionJsonDTO = JSON.parseObject(interactionJson, InteractionJsonDTO.class);
+//                    //仙工叉车
+//                    HttpResponse response = xiangGongAgvService.sendOrderSequencesToForklift(dto, interactionJsonDTO);
+//                    if (ObjectUtils.isEmpty(response) || response.getStatus() != 200) {
+//                        dto.setSend_status("2");
+//                    } else {
+//                        dto.setSend_status("1");
+//                    }
+                    // 0为输送、立库任务  1 1楼叉车系统  2 2楼1区域AGV系统 3 2楼2区域AGV系统
+                    if (!StrUtil.equals(task.getAgv_system_type(), "0")
+                            && ObjectUtil.isNotEmpty(task.getAgv_system_type())) {
+                        if (StrUtil.isBlank(dto.getAgv_inst_type())) {
+                            String agv_system_type = task.getAgv_system_type();
+                            String task_type = task.getTask_type();
+                            if (!StrUtil.equals(agv_system_type, "1")) {
+                                // task_type
+                                //1、生箔； Itype=1:取空，取满，放空，放满；
+                                //2、分切  Itype=3取满、取空、放满、放空；
+                                //3、普通任务 Itype=2:取货、放货；
+                                //4、叉车任务
+                                //5、输送任务
+                                //6、行架
+                                //7、立库
+                                if (StrUtil.equals(task_type, "1")) {
+                                    dto.setAgv_inst_type("1");
+                                } else if (StrUtil.equals(task_type, "3")) {
+                                    dto.setAgv_inst_type("2");
+                                } else if (StrUtil.equals(task_type, "2")) {
+                                    dto.setAgv_inst_type("3");
+                                } else if (StrUtil.equals(task_type, "8")) {
+                                    dto.setAgv_inst_type("2");
+                                } else {
+                                    log.info("未找到对应的AGV指令类型，任务号:" + task.getTask_code() + ",task_type:" + task.getTask_type());
+                                }
+                            } else {
+                                dto.setAgv_inst_type("4");
+                            }
+                            dto.setAgv_system_type(task.getAgv_system_type());
+                        }
+                        NDCAgvService ndcAgvService = SpringContextHolder.getBean(NDCAgvService.class);
+                        log.warn("下发AGV指令数据," + "指令号:" + dto.getInstruction_code() + ",AGV系统类型:" + dto.getAgv_system_type()
+                                + ",AGV指令类型:" + dto.getInstruction_type());
+                        try {
+                            if (StrUtil.isEmpty(dto.getAgv_inst_type()) || StrUtil.isEmpty(dto.getAgv_system_type())) {
+                                log.info("sendAgvInstToNDC 指令校验:" + dto.getInstruction_code() + ",inst_type:" + dto.getInstruction_type()
+                                        + ",inst_system_type:" + dto.getAgv_system_type());
+                            }
+//                        log.info("2楼1区域AGV系统链接开始");
+//                        String ip = paramService.findByCode(AcsConfig.AGVURL).getValue();
+//                        int port = Integer.parseInt(paramService.findByCode(AcsConfig.AGVPORT).getValue());
+//                        InetSocketAddress socketAddress = new InetSocketAddress(ip, port);
+//                        Socket s = new Socket();
+//                        s.connect(socketAddress, 2 * 1000);
+//                        if (ObjectUtil.isNotEmpty(s)&&s.isConnected()==true) {
+                            ndcAgvService.sendAgvInstToNDC(task.getAgv_system_type(), dto);
+                            dto.setSend_status("1");
+//                        } else {
+//                            log.error("agv连接出现异常:服务端被关闭");
+//                        }
+                        } catch (Exception e) {
+                            dto.setSend_status("2");
+                            dto.setRemark(e.getMessage());
+                            e.printStackTrace();
+                            log.warn("下发AGV指令异常:" + e);
+                            LuceneLogDto logDto1 = LuceneLogDto.builder()
+                                    .device_code(start_device_code)
+                                    .content("下发AGV指令异常")
+                                    .build();
+                            logDto1.setLog_level(4);
+                            luceneExecuteLogService.deviceExecuteLog(logDto1);
+                        }
                     } else {
-                        dto.setSend_status("1");
+                        // Boolean result =  createLkInst(task.getStorage_task_type(),dto);
+                        Resp resp = acsToLiKuService.sendInst(task.getStorage_task_type(), dto);
+                        if (StrUtil.equals(resp.result, "true")) {
+                            dto.setSend_status("1");
+                        } else {
+                            dto.setSend_status("2");
+                        }
                     }
                 } else if (dto.getAgv_system_type().equals(AgvSystemTypeEnum.One_NDC_System_Type.getIndex())) {
                     //一楼agv任务创建运单序列
@@ -726,18 +799,34 @@ public class InstructionServiceImpl extends CommonServiceImpl<InstructionMapper,
             if (shortPathsList.size() > 0 && StrUtil.equals(shortPathsList.get(0).getType(), CommonFinalParam.ONE)) {
                 Device deviceByCode = deviceAppService.findDeviceByCode(dto.getStart_device_code());
                 if (dto.getAgv_system_type().equals(AgvSystemTypeEnum.XG_System_Type.getIndex())) {
-                    String interactionJson = task.getInteraction_json();
-                    if (StrUtil.isEmpty(interactionJson)) {
-                        throw new BadRequestException("agv叉车调整长宽参数为空");
-                    }
-                    InteractionJsonDTO interactionJsonDTO = JSON.parseObject(interactionJson, InteractionJsonDTO.class);
-                    //仙工叉车
-                    HttpResponse response = xiangGongAgvService.sendOrderSequencesToForklift(dto, interactionJsonDTO);
-                    if (ObjectUtils.isEmpty(response) || response.getStatus() != 200) {
-                        dto.setSend_status("2");
-                    } else {
-                        dto.setSend_status("1");
+//                    String interactionJson = task.getInteraction_json();
+//                    if (StrUtil.isEmpty(interactionJson)) {
+//                        throw new BadRequestException("agv叉车调整长宽参数为空");
+//                    }
+//                    InteractionJsonDTO interactionJsonDTO = JSON.parseObject(interactionJson, InteractionJsonDTO.class);
+//                    //仙工叉车
+//                    HttpResponse response = xiangGongAgvService.sendOrderSequencesToForklift(dto, interactionJsonDTO);
+//                    if (ObjectUtils.isEmpty(response) || response.getStatus() != 200) {
+//                        dto.setSend_status("2");
+//                    } else {
+//                        dto.setSend_status("1");
+//                    }
+                    if (StrUtil.equals(shortPathsList.get(0).getType(), "1")) {
+                        // 0为输送、立库任务  1 1楼叉车系统  2 2楼1区域AGV系统 3 2楼2区域AGV系统
+                        if (!StrUtil.equals(task.getAgv_system_type(), "0")
+                                && ObjectUtil.isNotEmpty(task.getAgv_system_type())) {
+                            NDCAgvService ndcAgvService = SpringContextHolder.getBean(NDCAgvService.class);
+                            ndcAgvService.sendAgvInstToNDC(task.getAgv_system_type(), dto);
+                        } else {
+                            Resp resp = acsToLiKuService.sendInst(task.getStorage_task_type(), dto);
+                            if (StrUtil.equals(resp.result, "true")) {
+                                dto.setSend_status("1");
+                            } else {
+                                dto.setSend_status("2");
+                            }
+                        }
                     }
+
                 } else if (dto.getAgv_system_type().equals(AgvSystemTypeEnum.One_NDC_System_Type.getIndex())) {
                     //一楼agv任务创建运单序列
                     HttpResponse response = xiangGongAgvService.sendOrderSequencesToXZ(dto);
@@ -1313,9 +1402,15 @@ public class InstructionServiceImpl extends CommonServiceImpl<InstructionMapper,
             flag = true;
         } else if (ObjectUtil.isNotEmpty(entity.getAgv_system_type()) && entity.getAgv_system_type().equals(AgvSystemTypeEnum.XG_System_Type)
                 && !StrUtil.equals(entity.getSend_status(), "2")) {
-            XianGongAgvService xianGongAgvService = SpringContextHolder.getBean(XianGongAgvService.class);
-            xianGongAgvService.deleteXZAgvInst(entity.getInstruction_code());
-            flag = true;
+//            XianGongAgvService xianGongAgvService = SpringContextHolder.getBean(XianGongAgvService.class);
+//            xianGongAgvService.deleteXZAgvInst(entity.getInstruction_code());
+//            flag = true;
+            // NDC agv指令不当场取消指令,需要等agv上报
+            if (!StrUtil.isEmpty(entity.getAgv_jobno())) {
+                ndcAgvService.deleteAgvInstToNDC(BeanUtil.copyProperties(entity, Instruction.class));
+            } else {
+                flag = true;
+            }
         } else {
             flag = true;
         }
diff --git a/acs2/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml b/acs2/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml
index 9decaa7..bba0298 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml
+++ b/acs2/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml
@@ -1,5 +1,5 @@
 server:
-  port: 8011
+  port: 8010
 #配置数据源
 spring:
   messages:
@@ -10,7 +10,7 @@ spring:
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
 #      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:stand_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
 #      url: jdbc:log4jdbc:mysql://${DB_HOST:47.111.78.178}:${DB_PORT:3306}/${DB_NAME:lzhl_two_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
-      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:lzhl_acs_97}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true
+      url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:lzhl_acs_96}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true
 
       username: ${DB_USER:root}
 #      password: ${DB_PWD:Root.123456}
@@ -76,7 +76,7 @@ spring:
   redis:
     #数据库索引
     database: ${REDIS_DB:2}
-    host: ${REDIS_HOST:127.0.0.1}
+    host: ${REDIS_HOST:localhost}
     port: ${REDIS_PORT:6379}
 #    password: ${REDIS_PWD:}
 
diff --git a/acs2/nladmin-system/nlsso-server/src/main/resources/config/application-prod.yml b/acs2/nladmin-system/nlsso-server/src/main/resources/config/application-prod.yml
index 872ff56..c3270ea 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/resources/config/application-prod.yml
+++ b/acs2/nladmin-system/nlsso-server/src/main/resources/config/application-prod.yml
@@ -1,5 +1,5 @@
 server:
-  port: 8011
+  port: 8010
 #配置数据源
 spring:
   messages:
@@ -10,7 +10,7 @@ spring:
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
 #      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:stand_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
 #      url: jdbc:log4jdbc:mysql://${DB_HOST:47.111.78.178}:${DB_PORT:3306}/${DB_NAME:lzhl_two_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
-      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:lzhl_acs_97}?serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
+      url: jdbc:log4jdbc:mysql://${DB_HOST:10.10.143.114}:${DB_PORT:3306}/${DB_NAME:acs}?serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
       username: ${DB_USER:root}
       password: ${DB_PWD:123456}
 #      password: ${DB_PWD:p@ssw0rd}
@@ -75,7 +75,7 @@ spring:
   redis:
     #数据库索引
     database: ${REDIS_DB:2}
-    host: ${REDIS_HOST:127.0.0.1}
+    host: ${REDIS_HOST:10.10.143.114}
     port: ${REDIS_PORT:6379}
 #    password: ${REDIS_PWD:}
 
diff --git a/acs2/nladmin-ui/.env.development b/acs2/nladmin-ui/.env.development
index e37a9a4..42ce1c5 100644
--- a/acs2/nladmin-ui/.env.development
+++ b/acs2/nladmin-ui/.env.development
@@ -1,8 +1,8 @@
 ENV = 'development'
 
 # 接口地址
-VUE_APP_BASE_API  = 'http://localhost:8011'
-VUE_APP_WS_API = 'ws://localhost:8011'
+VUE_APP_BASE_API  = 'http://127.0.0.1:8010'
+VUE_APP_WS_API = 'ws://127.0.0.1:8010'
 
 # 是否启用 babel-plugin-dynamic-import-node插件
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/acs2/nladmin-ui/.env.production b/acs2/nladmin-ui/.env.production
index d34affa..762ac12 100644
--- a/acs2/nladmin-ui/.env.production
+++ b/acs2/nladmin-ui/.env.production
@@ -2,6 +2,6 @@ ENV = 'production'
 
 # 如果使用 Nginx 代理后端接口，那么此处需要改为 '/'，文件查看 Docker 部署篇，Nginx 配置
 # 接口地址，注意协议，如果你没有配置 ssl，需要将 https 改为 http
-VUE_APP_BASE_API  = 'http://10.1.3.97:8011'
+VUE_APP_BASE_API  = 'http://127.0.0.1:8010'
 # 如果接口是 http 形式， wss 需要改为 ws
-VUE_APP_WS_API = 'ws://10.1.3.97:8011'
+VUE_APP_WS_API = 'ws://127.0.0.1:8010'
diff --git a/acs2/nladmin-ui/public/config.js b/acs2/nladmin-ui/public/config.js
index f3b247c..02cc471 100644
--- a/acs2/nladmin-ui/public/config.js
+++ b/acs2/nladmin-ui/public/config.js
@@ -1,9 +1,8 @@
 window.g = {
   dev: {
-    VUE_APP_BASE_API: 'http://127.0.0.1:8011'
+    VUE_APP_BASE_API: 'http://127.0.0.1:8010'
   },
   prod: {
-    VUE_APP_BASE_API: 'http://10.1.3.97:8011'
+    VUE_APP_BASE_API: 'http://127.0.0.1:8010'
   }
-
 }