From f5bdddaf82c7d0440c939ec43ac9b2b3e37ca2f4 Mon Sep 17 00:00:00 2001 From: loujf Date: Fri, 17 Feb 2023 14:05:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../start/auto/run/NDCSocketConnectionAutoRun.java | 8 ++++---- acs/qd/.env.development | 2 +- acs/qd/.env.production | 8 ++++---- .../nl/wms/sch/manage/buss/SendEmptyVehicleTask.java | 12 ++++++------ wms/qd/.env.development | 4 ++-- .../src/views/wms/st/basedata/inkilncache/index.vue | 8 ++++---- .../src/views/wms/st/basedata/outkilncache/index.vue | 8 ++++---- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java b/acs/hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java index a4718cf..7a7ce0f 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java @@ -200,7 +200,7 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable { logServer.deviceExecuteLog("ndc", "","","未找到指令号对应的指令：" + ikey); break; } - if (device_code.equals("MDJXS201") || device_code.equals("MDJXS601")) { + if (device_code.equals("MDJXS601")) { data = AgvService.sendAgvOneModeInst(phase, index, 0); flag = true; } @@ -300,7 +300,7 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable { logServer.deviceExecuteLog("ndc", "","","未找到指令号对应的指令：" + ikey); break; } - if (device_code.equals("MDJXS201") || device_code.equals("MDJXS601")) { + if (device_code.equals("MDJXS601")) { data = AgvService.sendAgvOneModeInst(phase, index, 0); flag = true; } @@ -422,7 +422,7 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable { logServer.deviceExecuteLog("ndc", "","","未找到指令号对应的指令：" + ikey); break; } - if (device_code.equals("MDJXS201") || device_code.equals("MDJXS601")) { + if (device_code.equals("MDJXS601")) { data = AgvService.sendAgvOneModeInst(phase, index, 0); flag = true; } @@ -503,7 +503,7 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable { logServer.deviceExecuteLog("ndc", "","","未找到指令号对应的指令：" + ikey); break; } - if (device_code.equals("MDJXS201") || device_code.equals("MDJXS601")) { + if (device_code.equals("MDJXS601")) { data = AgvService.sendAgvOneModeInst(phase, index, 0); flag = true; } diff --git a/acs/qd/.env.development b/acs/qd/.env.development index d3d2806..42ce1c5 100644 --- a/acs/qd/.env.development +++ b/acs/qd/.env.development @@ -1,7 +1,7 @@ ENV = 'development' # 接口地址 -VUE_APP_BASE_API = 'http://192.168.81.140:8010' +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插件 diff --git a/acs/qd/.env.production b/acs/qd/.env.production index 0dde216..4d79695 100644 --- a/acs/qd/.env.production +++ b/acs/qd/.env.production @@ -2,8 +2,8 @@ ENV = 'production' # 如果使用 Nginx 代理后端接口，那么此处需要改为 '/'，文件查看 Docker 部署篇，Nginx 配置 # 接口地址，注意协议，如果你没有配置 ssl，需要将 https 改为 http -VUE_APP_BASE_API = 'http://192.168.81.80:8010' -#VUE_APP_BASE_API = 'http://192.168.81.80:8010' +VUE_APP_BASE_API = 'http://127.0.0.1:8010' +#VUE_APP_BASE_API = 'http://127.0.0.1:8010' # 如果接口是 http 形式， wss 需要改为 ws -VUE_APP_WS_API = 'ws://192.168.81.80:8010' -#VUE_APP_WS_API = 'ws://192.168.81.80:8010' +VUE_APP_WS_API = 'ws://127.0.0.1:8010' +#VUE_APP_WS_API = 'ws://127.0.0.1:8010' diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/SendEmptyVehicleTask.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/SendEmptyVehicleTask.java index 4a8f808..64e23ef 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/SendEmptyVehicleTask.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/SendEmptyVehicleTask.java @@ -80,18 +80,18 @@ public class SendEmptyVehicleTask extends AbstractAcsTask { pointTab.update(endpointObj); JSONObject startPointObj = pointTab.query("point_code='" + jsonTask.getString("start_point_code") + "'").uniqueResult(0); + //调用mes接口 + HashMap hashMap = new HashMap(); + hashMap.put("vehicle_code",startPointObj.getString("vehicle_code")); + WmsToJnServiceImpl wmsToJnServiceImpl = new WmsToJnServiceImpl(); + wmsToJnServiceImpl.feedBackTrayBak(hashMap); + startPointObj.put("lock_type", "00"); startPointObj.put("point_status", "00"); startPointObj.put("vehicle_code", ""); pointTab.update(startPointObj); taskTab.update(jsonTask); - //调用mes接口 - HashMap hashMap = new HashMap(); - hashMap.put("vehicle_code",vehicle_code); - WmsToJnServiceImpl wmsToJnServiceImpl = new WmsToJnServiceImpl(); - wmsToJnServiceImpl.feedBackTrayBak(hashMap); - //将组盘表删除 WQLObject group_Table = WQLObject.getWQLObject("st_buss_vehiclegroup"); JSONObject groupObj = group_Table.query("vehicle_code='" + vehicle_code + "' and is_delete='0'").uniqueResult(0); diff --git a/wms/qd/.env.development b/wms/qd/.env.development index 809e77f..412e652 100644 --- a/wms/qd/.env.development +++ b/wms/qd/.env.development @@ -1,8 +1,8 @@ ENV = 'development' # 接口地址 -VUE_APP_BASE_API = 'http://localhost:8010' -VUE_APP_WS_API = 'ws://localhost:8010' +VUE_APP_BASE_API = 'http://localhost:8012' +VUE_APP_WS_API = 'ws://localhost:8012' # 是否启用 babel-plugin-dynamic-import-node插件 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/wms/qd/src/views/wms/st/basedata/inkilncache/index.vue b/wms/qd/src/views/wms/st/basedata/inkilncache/index.vue index 41843da..ae5bc74 100644 --- a/wms/qd/src/views/wms/st/basedata/inkilncache/index.vue +++ b/wms/qd/src/views/wms/st/basedata/inkilncache/index.vue @@ -79,16 +79,16 @@ /> - + - + - + - + diff --git a/wms/qd/src/views/wms/st/basedata/outkilncache/index.vue b/wms/qd/src/views/wms/st/basedata/outkilncache/index.vue index 961de17..5961c36 100644 --- a/wms/qd/src/views/wms/st/basedata/outkilncache/index.vue +++ b/wms/qd/src/views/wms/st/basedata/outkilncache/index.vue @@ -79,16 +79,16 @@ /> - + - + - + - +