From 460992d2583b6377989369721b096b924a532d57 Mon Sep 17 00:00:00 2001 From: lishuai <1793460677@qq.com> Date: Fri, 24 Nov 2023 13:11:59 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=8E=92=E5=BA=8F=E3=80=81=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96=E7=AD=96=E7=95=A5=E5=8A=A0=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/impl/CustomPolicyServiceImpl.java | 27 ++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/server/impl/CustomPolicyServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/server/impl/CustomPolicyServiceImpl.java index b7a8dd0..fee24c3 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/server/impl/CustomPolicyServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/server/impl/CustomPolicyServiceImpl.java @@ -2,6 +2,7 @@ package org.nl.acs.custompolicy.server.impl; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollectionUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -44,11 +45,24 @@ public class CustomPolicyServiceImpl extends CommonServiceImpl instructionStrategys; private final CustomPolicyMapper customPolicyMapper; + private final HashMap> customPolicyPlantDTOMap; + /** + * 初始化策略 + * @throws Exception + */ @Override public void autoInitial() throws Exception { - - + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(CustomPolicy::getIs_delete,0) ; + List customPolicyList = customPolicyMapper.selectList(wrapper); + if (CollectionUtil.isNotEmpty(customPolicyList)){ + List customPolicies = customPolicyList.stream().filter(item -> item.getKey_value() != null).collect(Collectors.toList()); + customPolicies.forEach(item -> { + CustomPolicyPlantVO customPolicyPlantVO = JSON.parseObject(item.getKey_value(), CustomPolicyPlantVO.class); + customPolicyPlantDTOMap.put(item.getUnit_code(),customPolicyPlantVO.getPlans()); + }); + } } @@ -100,7 +114,14 @@ public class CustomPolicyServiceImpl extends CommonServiceImpl Date: Fri, 24 Nov 2023 13:27:57 +0800 Subject: [PATCH 2/6] =?UTF-8?q?fix:=20i18n=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lms/nladmin-ui/src/i18n/index.js | 12 ++++-------- lms/nladmin-ui/src/i18n/langs/chinese.js | 7 +++++++ lms/nladmin-ui/src/i18n/langs/en.js | 4 +--- lms/nladmin-ui/src/i18n/langs/english.js | 7 +++++++ lms/nladmin-ui/src/i18n/langs/id.js | 0 lms/nladmin-ui/src/i18n/langs/in.js | 4 +--- lms/nladmin-ui/src/i18n/langs/indonesian.js | 7 +++++++ lms/nladmin-ui/src/i18n/langs/zh-CN.js | 4 +--- 8 files changed, 28 insertions(+), 17 deletions(-) create mode 100644 lms/nladmin-ui/src/i18n/langs/chinese.js create mode 100644 lms/nladmin-ui/src/i18n/langs/english.js delete mode 100644 lms/nladmin-ui/src/i18n/langs/id.js create mode 100644 lms/nladmin-ui/src/i18n/langs/indonesian.js diff --git a/lms/nladmin-ui/src/i18n/index.js b/lms/nladmin-ui/src/i18n/index.js index 1254bf8..22a7fe8 100644 --- a/lms/nladmin-ui/src/i18n/index.js +++ b/lms/nladmin-ui/src/i18n/index.js @@ -1,10 +1,9 @@ import Vue from 'vue' import VueI18n from 'vue-i18n' import locale from 'element-ui/lib/locale' -import zh from './langs/zh-CN' -import en from './langs/en' -import id from './langs/id' -import indonesian from './langs/in' +import zh from './langs/chinese' +import en from './langs/english' +import indonesian from './langs/indonesian' Vue.use(VueI18n) const messages = { en: { @@ -13,9 +12,6 @@ const messages = { zh: { ...zh }, - id: { - ...id - }, in: { ...indonesian } @@ -25,7 +21,7 @@ const i18n = new VueI18n({ messages, silentTranslationWarn: true, // 解决vue-i18n黄色警告"value of key 'xxx' is not a string"和"cannot translate the value of keypath 'xxx'.use the value of keypath as default",可忽略 globalInjection: true, // 全局注入 - fallbackLocale: 'en' + fallbackLocale: 'zh' }) locale.i18n((key, value) => i18n.t(key, value)) export default i18n diff --git a/lms/nladmin-ui/src/i18n/langs/chinese.js b/lms/nladmin-ui/src/i18n/langs/chinese.js new file mode 100644 index 0000000..baa9849 --- /dev/null +++ b/lms/nladmin-ui/src/i18n/langs/chinese.js @@ -0,0 +1,7 @@ +import zhLocale from 'element-ui/lib/locale/lang/zh-CN' +import zh from './zh-CN' + +export default { + ...zhLocale, + ...zh +} diff --git a/lms/nladmin-ui/src/i18n/langs/en.js b/lms/nladmin-ui/src/i18n/langs/en.js index 4cd019d..e72480c 100644 --- a/lms/nladmin-ui/src/i18n/langs/en.js +++ b/lms/nladmin-ui/src/i18n/langs/en.js @@ -1,4 +1,3 @@ -import enLocale from 'element-ui/lib/locale/lang/en' export default { 'lang': 'English', 'common': { @@ -116,6 +115,5 @@ export default { 'disk': 'Disk Utilization', 'cpu_monitoring': 'Cpu Utilization Monitoring', 'memory_monitoring': 'Memory Utilization Monitoring' - }, - ...enLocale + } } diff --git a/lms/nladmin-ui/src/i18n/langs/english.js b/lms/nladmin-ui/src/i18n/langs/english.js new file mode 100644 index 0000000..203b44c --- /dev/null +++ b/lms/nladmin-ui/src/i18n/langs/english.js @@ -0,0 +1,7 @@ +import enLocale from 'element-ui/lib/locale/lang/en' +import en from './en' + +export default { + ...enLocale, + ...en +} diff --git a/lms/nladmin-ui/src/i18n/langs/id.js b/lms/nladmin-ui/src/i18n/langs/id.js deleted file mode 100644 index e69de29..0000000 diff --git a/lms/nladmin-ui/src/i18n/langs/in.js b/lms/nladmin-ui/src/i18n/langs/in.js index da77217..8c8ede7 100644 --- a/lms/nladmin-ui/src/i18n/langs/in.js +++ b/lms/nladmin-ui/src/i18n/langs/in.js @@ -1,4 +1,3 @@ -import idLocale from 'element-ui/lib/locale/lang/id' export default { 'lang': 'in', 'common': { @@ -116,6 +115,5 @@ export default { 'disk': 'Kadar penggunaan disk', 'cpu_monitoring': 'Monitor penggunaan CPU', 'memory_monitoring': 'Monitor penggunaan memori' - }, - ...idLocale + } } diff --git a/lms/nladmin-ui/src/i18n/langs/indonesian.js b/lms/nladmin-ui/src/i18n/langs/indonesian.js new file mode 100644 index 0000000..b5d3e4d --- /dev/null +++ b/lms/nladmin-ui/src/i18n/langs/indonesian.js @@ -0,0 +1,7 @@ +import idLocale from 'element-ui/lib/locale/lang/id' +import id from './in' + +export default { + ...idLocale, + ...id +} diff --git a/lms/nladmin-ui/src/i18n/langs/zh-CN.js b/lms/nladmin-ui/src/i18n/langs/zh-CN.js index 8aca774..64e411c 100644 --- a/lms/nladmin-ui/src/i18n/langs/zh-CN.js +++ b/lms/nladmin-ui/src/i18n/langs/zh-CN.js @@ -1,4 +1,3 @@ -import zhLocale from 'element-ui/lib/locale/lang/zh-CN' export default { 'lang': 'zh', 'common': { @@ -123,6 +122,5 @@ export default { 'disk': '磁盘使用率', 'cpu_monitoring': 'CPU使用率监控', 'memory_monitoring': '内存使用率监控' - }, - ...zhLocale + } } From 929d52ecad83fded41c5f54502ab7129445dc4db Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Fri, 24 Nov 2023 14:21:35 +0800 Subject: [PATCH 3/6] =?UTF-8?q?fix:=20menu=E7=9A=84=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96demo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lms/nladmin-ui/src/i18n/langs/chinese.js | 4 +- lms/nladmin-ui/src/i18n/langs/en.js | 2 + lms/nladmin-ui/src/i18n/langs/english.js | 4 +- lms/nladmin-ui/src/i18n/langs/in.js | 2 + lms/nladmin-ui/src/i18n/langs/indonesian.js | 4 +- lms/nladmin-ui/src/i18n/langs/menu/en.js | 6 +++ lms/nladmin-ui/src/i18n/langs/menu/in.js | 6 +++ lms/nladmin-ui/src/i18n/langs/menu/zh.js | 6 +++ lms/nladmin-ui/src/i18n/langs/zh-CN.js | 2 + .../src/layout/components/Navbar.vue | 8 ++-- lms/nladmin-ui/src/main.js | 1 - .../src/views/system/menu/index.vue | 43 ++++++++++++++++--- 12 files changed, 75 insertions(+), 13 deletions(-) create mode 100644 lms/nladmin-ui/src/i18n/langs/menu/en.js create mode 100644 lms/nladmin-ui/src/i18n/langs/menu/in.js create mode 100644 lms/nladmin-ui/src/i18n/langs/menu/zh.js diff --git a/lms/nladmin-ui/src/i18n/langs/chinese.js b/lms/nladmin-ui/src/i18n/langs/chinese.js index baa9849..f344de3 100644 --- a/lms/nladmin-ui/src/i18n/langs/chinese.js +++ b/lms/nladmin-ui/src/i18n/langs/chinese.js @@ -1,7 +1,9 @@ import zhLocale from 'element-ui/lib/locale/lang/zh-CN' import zh from './zh-CN' +import menu from './menu/zh' export default { ...zhLocale, - ...zh + ...zh, + ...menu } diff --git a/lms/nladmin-ui/src/i18n/langs/en.js b/lms/nladmin-ui/src/i18n/langs/en.js index e72480c..10bf340 100644 --- a/lms/nladmin-ui/src/i18n/langs/en.js +++ b/lms/nladmin-ui/src/i18n/langs/en.js @@ -76,6 +76,8 @@ export default { 'Tip10': 'Please enter your old password', 'Tip11': 'Please enter your new password', 'Tip12': '6 to 20 characters in length', + 'Tip13': 'Are you sure to log out and exit the system?', + 'Tip14': 'WebSocket connection error', 'loading': 'loading...' }, // 菜单 diff --git a/lms/nladmin-ui/src/i18n/langs/english.js b/lms/nladmin-ui/src/i18n/langs/english.js index 203b44c..32fe505 100644 --- a/lms/nladmin-ui/src/i18n/langs/english.js +++ b/lms/nladmin-ui/src/i18n/langs/english.js @@ -1,7 +1,9 @@ import enLocale from 'element-ui/lib/locale/lang/en' import en from './en' +import menu from './menu/en' export default { ...enLocale, - ...en + ...en, + ...menu } diff --git a/lms/nladmin-ui/src/i18n/langs/in.js b/lms/nladmin-ui/src/i18n/langs/in.js index 8c8ede7..798c0f6 100644 --- a/lms/nladmin-ui/src/i18n/langs/in.js +++ b/lms/nladmin-ui/src/i18n/langs/in.js @@ -76,6 +76,8 @@ export default { 'Tip10': 'Silakan masukkan kata sandi lama Anda', 'Tip11': 'Silakan masukkan sandi baru', 'Tip12': 'Antara 6 dan 20 karakter dalam panjang', + 'Tip13': 'Apakah Anda yakin untuk log keluar dan keluar dari sistem?', + 'Tip14': 'Koneksi WebSocket error', 'loading': 'Memuatkan Data...' }, // 菜单 diff --git a/lms/nladmin-ui/src/i18n/langs/indonesian.js b/lms/nladmin-ui/src/i18n/langs/indonesian.js index b5d3e4d..998fe75 100644 --- a/lms/nladmin-ui/src/i18n/langs/indonesian.js +++ b/lms/nladmin-ui/src/i18n/langs/indonesian.js @@ -1,7 +1,9 @@ import idLocale from 'element-ui/lib/locale/lang/id' import id from './in' +import menu from './menu/in' export default { ...idLocale, - ...id + ...id, + ...menu } diff --git a/lms/nladmin-ui/src/i18n/langs/menu/en.js b/lms/nladmin-ui/src/i18n/langs/menu/en.js new file mode 100644 index 0000000..d90ff2a --- /dev/null +++ b/lms/nladmin-ui/src/i18n/langs/menu/en.js @@ -0,0 +1,6 @@ +export default { + 'placeholder': { + 'fuzzy_search': 'fuzzy search', + 'owning_system': 'system' + } +} diff --git a/lms/nladmin-ui/src/i18n/langs/menu/in.js b/lms/nladmin-ui/src/i18n/langs/menu/in.js new file mode 100644 index 0000000..eba10a5 --- /dev/null +++ b/lms/nladmin-ui/src/i18n/langs/menu/in.js @@ -0,0 +1,6 @@ +export default { + 'placeholder': { + 'fuzzy_search': 'pencarian kabur', + 'owning_system': 'sistem terkait' + } +} diff --git a/lms/nladmin-ui/src/i18n/langs/menu/zh.js b/lms/nladmin-ui/src/i18n/langs/menu/zh.js new file mode 100644 index 0000000..a2ce5a3 --- /dev/null +++ b/lms/nladmin-ui/src/i18n/langs/menu/zh.js @@ -0,0 +1,6 @@ +export default { + 'placeholder': { + 'fuzzy_search': '模糊搜索', + 'owning_system': '所属系统' + } +} diff --git a/lms/nladmin-ui/src/i18n/langs/zh-CN.js b/lms/nladmin-ui/src/i18n/langs/zh-CN.js index 64e411c..05c7c5c 100644 --- a/lms/nladmin-ui/src/i18n/langs/zh-CN.js +++ b/lms/nladmin-ui/src/i18n/langs/zh-CN.js @@ -76,6 +76,8 @@ export default { 'Tip10': '请输入旧密码', 'Tip11': '请输入新密码', 'Tip12': '长度在 6 到 20 个字符', + 'Tip13': '确定注销并退出系统吗？', + 'Tip14': 'WebSocket连接发生错误', 'loading': '数据加载中...' }, // 菜单 diff --git a/lms/nladmin-ui/src/layout/components/Navbar.vue b/lms/nladmin-ui/src/layout/components/Navbar.vue index d1ba136..fa087ec 100644 --- a/lms/nladmin-ui/src/layout/components/Navbar.vue +++ b/lms/nladmin-ui/src/layout/components/Navbar.vue @@ -142,9 +142,9 @@ export default { this.$store.dispatch('app/toggleSideBar') }, open() { - this.$confirm('确定注销并退出系统吗？', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', + this.$confirm(this.$t('common.Tip13'), this.$t('common.Tips'), { + confirmButtonText: this.$t('common.Confirm'), + cancelButtonText: this.$t('common.Cancel'), type: 'warning' }).then(() => { this.logout() @@ -164,7 +164,7 @@ export default { }, webSocketOnError(e) { this.$notify({ - title: 'WebSocket连接发生错误', + title: this.$t('common.Tip14'), type: 'error', duration: 0 }) diff --git a/lms/nladmin-ui/src/main.js b/lms/nladmin-ui/src/main.js index 32ba6a6..e4e0e81 100644 --- a/lms/nladmin-ui/src/main.js +++ b/lms/nladmin-ui/src/main.js @@ -81,7 +81,6 @@ Vue.use(Element, { Vue.prototype.$langPre = { computedProp(suffix) { - console.log(suffix) return localStorage.getItem('lang') + '_' + suffix } } diff --git a/lms/nladmin-ui/src/views/system/menu/index.vue b/lms/nladmin-ui/src/views/system/menu/index.vue index c7b5c58..5ac780c 100644 --- a/lms/nladmin-ui/src/views/system/menu/index.vue +++ b/lms/nladmin-ui/src/views/system/menu/index.vue @@ -8,7 +8,7 @@ v-model="query.blurry" clearable size="mini" - placeholder="模糊搜索" + :placeholder="$t('placeholder.fuzzy_search')" style="width: 200px;margin-bottom: 10px" class="filter-item" @keyup.enter.native="queryBlurry" @@ -16,7 +16,7 @@ 否 - + + + + + + + + + + @@ -222,6 +243,9 @@ import Dict from '../../../components/Dict/Dict' const defaultForm = { menu_id: null, title: null, + en_title: null, + in_title: null, + zh_title: null, menu_sort: 999, path: null, system_type: null, @@ -234,7 +258,7 @@ const defaultForm = { icon: null, cache: false, hidden: false, - type: 0, + type: 2, permission: null } export default { @@ -259,6 +283,15 @@ export default { title: [ { required: true, message: '请输入标题', trigger: 'blur' } ], + zh_title: [ + { required: true, message: '请输入标题', trigger: 'blur' } + ], + en_title: [ + { required: true, message: '请输入标题', trigger: 'blur' } + ], + in_title: [ + { required: true, message: '请输入标题', trigger: 'blur' } + ], path: [ { required: true, message: '请输入地址', trigger: 'blur' } ] From 67f522ceae3910d282a66d70f438533b233efe46 Mon Sep 17 00:00:00 2001 From: yanps Date: Fri, 24 Nov 2023 14:47:00 +0800 Subject: [PATCH 4/6] =?UTF-8?q?opt:=20=E6=A0=87=E5=87=86=E7=89=88-?= =?UTF-8?q?=E5=8D=95=E5=B7=A5=E4=BD=8D=E5=A0=86=E5=9E=9B=E6=9C=BA=E9=A9=B1?= =?UTF-8?q?=E5=8A=A8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../XgAgvDeviceDriver/DEVICECODE_IS_UNDEFINED/2023-11-17.0.log | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 acs/nladmin-system/logPath_IS_UNDEFINED/XgAgvDeviceDriver/DEVICECODE_IS_UNDEFINED/2023-11-17.0.log diff --git a/acs/nladmin-system/logPath_IS_UNDEFINED/XgAgvDeviceDriver/DEVICECODE_IS_UNDEFINED/2023-11-17.0.log b/acs/nladmin-system/logPath_IS_UNDEFINED/XgAgvDeviceDriver/DEVICECODE_IS_UNDEFINED/2023-11-17.0.log new file mode 100644 index 0000000..e69de29 From 64f0daffda094d63eab984d9edd18457f0761c4d Mon Sep 17 00:00:00 2001 From: yanps Date: Fri, 24 Nov 2023 14:47:46 +0800 Subject: [PATCH 5/6] =?UTF-8?q?opt:=20=E6=A0=87=E5=87=86=E7=89=88-?= =?UTF-8?q?=E5=8D=95=E5=B7=A5=E4=BD=8D=E5=A0=86=E5=9E=9B=E6=9C=BA=E9=A9=B1?= =?UTF-8?q?=E5=8A=A8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/acs/device/domain/Device.java | 15 +++++ .../BeltConveyorDeviceDriver.java | 2 +- .../StandardStackerDeviceDriver.java | 67 +++++++++++++++---- .../rest/InstructionController.java | 3 - .../service/impl/InstructionServiceImpl.java | 4 ++ .../org/nl/acs/opc/DeviceAppServiceImpl.java | 2 +- .../org/nl/acs/task/rest/TaskController.java | 4 +- 7 files changed, 78 insertions(+), 19 deletions(-) diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/Device.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/Device.java index 92fbae3..7311ae1 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/Device.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/Device.java @@ -58,6 +58,21 @@ public class Device implements Serializable { @TableField(exist = false) private String device_type_name; + /** + * 排 + */ + private String x; + + /** + * 列 + */ + private String y; + + /** + * 层 + */ + private String z; + @TableField(exist = false) private String region_name; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/belt_conveyor/BeltConveyorDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/belt_conveyor/BeltConveyorDeviceDriver.java index 11b87b8..1aecbbf 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/belt_conveyor/BeltConveyorDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/belt_conveyor/BeltConveyorDeviceDriver.java @@ -264,7 +264,7 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements break; case 2: //申请任务 - if (task == 0 && !requireSucess) { + if (move == 1 && !requireSucess) { instruction_require(); } break; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_stacker/StandardStackerDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_stacker/StandardStackerDeviceDriver.java index 32d9323..8577cc2 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_stacker/StandardStackerDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_stacker/StandardStackerDeviceDriver.java @@ -8,6 +8,7 @@ import lombok.Data; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.acs.device.domain.Device; +import org.nl.acs.device.enums.DeviceType; import org.nl.acs.device_driver.DeviceDriver; import org.nl.acs.device_driver.RouteableDeviceDriver; import org.nl.acs.device_driver.basedriver.belt_conveyor.BeltConveyorDeviceDriver; @@ -386,9 +387,30 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme } else if (error != 0) { message = "有报警"; + //指定库位满入 + if(error == 5){ + } + //空出 + if(error == 6){ + + } + //浅货位有货 + if(error == 16){ + //放货 + if(cargoMove==1){ + + }else if(cargoMove==0){ + //取货 + } + + + } } else { HashMap map = new HashMap(); + Instruction instruction = checkInst(); + String next_device_code = instruction.getNext_device_code(); + Device nextDevice = deviceAppService.findDeviceByCode(next_device_code); switch (command) { case 0: if (task == 0) { @@ -400,6 +422,21 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme break; case 2: message = "取货完成"; + if (StrUtil.equals(nextDevice.getDevice_type(), DeviceType.conveyor.name())) { + map.put("to_z", nextDevice.getZ()); + map.put("to_x", nextDevice.getX()); + map.put("to_y", nextDevice.getY()); + } + if (StrUtil.equals(nextDevice.getDevice_type(), DeviceType.storage.name())) { + map.put("to_z", inst.getTo_z()); + if (inst.getTo_x().length() > 1) { + String substring = inst.getTo_x().substring(1); + map.put("to_x", substring); + } else { + map.put("to_x", inst.getTo_x()); + } + map.put("to_y", inst.getTo_y()); + } map.put("to_command", 2); break; case 3: @@ -407,14 +444,11 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme break; case 4: message = "请求卸货(申请卸货)"; - Instruction instruction = checkInst(); if (ObjectUtil.isNotNull(instruction)) { //指令为执行 - String next_device_code = instruction.getNext_device_code(); - Device startDevice = deviceAppService.findDeviceByCode(next_device_code); SiemensConveyorDeviceDriver siemensConveyorDeviceDriver; - if (startDevice.getDeviceDriver() instanceof SiemensConveyorDeviceDriver) { - siemensConveyorDeviceDriver = (SiemensConveyorDeviceDriver) startDevice.getDeviceDriver(); + if (nextDevice.getDeviceDriver() instanceof SiemensConveyorDeviceDriver) { + siemensConveyorDeviceDriver = (SiemensConveyorDeviceDriver) nextDevice.getDeviceDriver(); if (siemensConveyorDeviceDriver.getMode() != 2 || siemensConveyorDeviceDriver.getMove() == 1) { notCreateInstMessage = "未下发电气信号原因->输送线-货架对接位:" + siemensConveyorDeviceDriver.getDevice_code() + "有货或未联机,无法下发指令!指令号:" + inst.getInstruction_code(); @@ -560,14 +594,23 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme map.put("to_command", 1); // map.put("to_type", inst.getMaterial()); map.put("to_task", inst.getInstruction_code()); - map.put("to_z", inst.getTo_z()); - if(inst.getTo_x().length()>1){ - String substring = inst.getTo_x().substring(1); - map.put("to_x", substring); - }else { - map.put("to_x", inst.getTo_x()); + + if (StrUtil.equals(startDevice.getDevice_type(), DeviceType.conveyor.name())) { + map.put("to_z", startDevice.getZ()); + map.put("to_x", startDevice.getX()); + map.put("to_y", startDevice.getY()); } - map.put("to_y", inst.getTo_y()); + if (StrUtil.equals(startDevice.getDevice_type(), DeviceType.storage.name())) { + map.put("to_z", inst.getFrom_z()); + if (inst.getFrom_x().length() > 1) { + String substring = inst.getFrom_x().substring(1); + map.put("to_x", substring); + } else { + map.put("to_x", inst.getFrom_x()); + } + map.put("to_y", inst.getFrom_y()); + } + this.writing(map); } } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/rest/InstructionController.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/rest/InstructionController.java index 398d3e3..37cd079 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/rest/InstructionController.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/rest/InstructionController.java @@ -37,9 +37,6 @@ public class InstructionController { @ApiOperation("查询指令") //@PreAuthorize("@el.check('instruction:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { - if(ObjectUtil.isEmpty(whereJson.get("status"))) { - whereJson.put("status", "1"); - } return new ResponseEntity<>(instructionService.queryAll(whereJson, page), HttpStatus.OK); } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java index 8d64343..ad2b03a 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java @@ -21,6 +21,7 @@ import org.nl.acs.agv.server.NDCAgvService; import org.nl.acs.agv.server.XianGongAgvService; import org.nl.acs.auto.initial.ApplicationAutoInitial; import org.nl.acs.device.domain.Device; +import org.nl.acs.device.enums.DeviceType; import org.nl.acs.device.service.DeviceService; import org.nl.acs.device.service.impl.DeviceServiceImpl; import org.nl.acs.device_driver.DeviceDriver; @@ -914,6 +915,9 @@ public class InstructionServiceImpl extends CommonServiceImpl query(@RequestParam Map whereJson, Pageable page) { // return new ResponseEntity<>(taskService.queryAllByCache(whereJson, page), HttpStatus.OK); - if(ObjectUtil.isEmpty(whereJson.get("status"))) { + /*if(ObjectUtil.isEmpty(whereJson.get("status"))) { whereJson.put("status", "1"); - } + }*/ return new ResponseEntity<>(taskService.queryAll(whereJson, page), HttpStatus.OK); } From a64384159b81ce036c12a1594260b7f8d00ce417 Mon Sep 17 00:00:00 2001 From: yanps Date: Fri, 24 Nov 2023 14:51:55 +0800 Subject: [PATCH 6/6] =?UTF-8?q?opt:=E6=A0=87=E5=87=86=E7=89=88-=E5=8D=95?= =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E5=A0=86=E5=9E=9B=E6=9C=BA=E9=A9=B1=E5=8A=A8?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../XgAgvDeviceDriver/DEVICECODE_IS_UNDEFINED/2023-11-17.0.log | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 acs/nladmin-system/logPath_IS_UNDEFINED/XgAgvDeviceDriver/DEVICECODE_IS_UNDEFINED/2023-11-17.0.log diff --git a/acs/nladmin-system/logPath_IS_UNDEFINED/XgAgvDeviceDriver/DEVICECODE_IS_UNDEFINED/2023-11-17.0.log b/acs/nladmin-system/logPath_IS_UNDEFINED/XgAgvDeviceDriver/DEVICECODE_IS_UNDEFINED/2023-11-17.0.log deleted file mode 100644 index e69de29..0000000