From 0be3799d6d6d0b41685f78a2110b8263b3b1bfc7 Mon Sep 17 00:00:00 2001 From: yanps Date: Fri, 21 Jun 2024 09:45:04 +0800 Subject: [PATCH 1/5] =?UTF-8?q?opt:=20=E5=9B=BD=E9=99=85=E5=8C=96,?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SiemensWeightConveyorDeviceDriver.java | 1 + .../OvenGantryManipulatorDeviceDriver.java | 12 ++++++--- .../PullHeadManipulatorDeviceDriver.java | 2 +- .../PullTailManipulatorDeviceDriver.java | 2 +- .../wms/service/impl/WmsToAcsServiceImpl.java | 2 ++ .../java/org/nl/acs/history/ErrorUtil.java | 7 ++++-- .../config/language/InitLocaleResolver.java | 1 - .../service/dict/impl/SysDictServiceImpl.java | 3 +++ .../monitor/universal/universal.properties | 1 + .../universal/universal_en_US.properties | 1 + .../universal/universal_in_ID.properties | 1 + .../universal/universal_zh_CN.properties | 2 +- acs2/nladmin-ui/src/i18n/langs/monitor/en.js | 3 +++ acs2/nladmin-ui/src/i18n/langs/monitor/in.js | 3 +++ acs2/nladmin-ui/src/i18n/langs/monitor/zh.js | 3 +++ .../nladmin-ui/src/views/acs/device/index.vue | 19 ++++++++++++++ acs2/nladmin-ui/src/views/acs/task/index.vue | 6 ++++- .../src/views/system/dict/dictDetail.vue | 20 ++++++++++++--- .../src/views/system/monitor/device/index.vue | 25 +++++++++++++------ 19 files changed, 92 insertions(+), 22 deletions(-) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_weigh_conveyor/SiemensWeightConveyorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_weigh_conveyor/SiemensWeightConveyorDeviceDriver.java index 39d8b67dd..293be5d91 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_weigh_conveyor/SiemensWeightConveyorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_weigh_conveyor/SiemensWeightConveyorDeviceDriver.java @@ -839,6 +839,7 @@ public class SiemensWeightConveyorDeviceDriver extends AbstractOpcDeviceDriver i } //创建指令后修改任务状态 taskdto.setTask_status("1"); + taskdto.setWeight(String.valueOf(this.weight)); taskserver.update(taskdto); requireSucess = true; String next_addr = nextdevice.getExtraValue().get("address").toString(); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/oven_manipulator/OvenGantryManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/oven_manipulator/OvenGantryManipulatorDeviceDriver.java index 27f73ba57..2a64e05da 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/oven_manipulator/OvenGantryManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/oven_manipulator/OvenGantryManipulatorDeviceDriver.java @@ -1125,11 +1125,11 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i action = LangProcess.msg("universal_releasing_completed"); } if (error == 0 && iserror) { - this.setMessage("universal_message11"); + this.setMessage("信号连接异常!"); } - String requireActionSucess = "指令" + LangProcess.msg("universal_actionMessage4"); + String requireActionSucess = LangProcess.msg("universal_directives") + ":" + LangProcess.msg("universal_actionMessage4"); if(this.requireActionSucess){ - requireActionSucess = "指令" + LangProcess.msg("universal_actionMessage5"); + requireActionSucess = LangProcess.msg("universal_directives") + ":" + LangProcess.msg("universal_actionMessage5"); } map.put("device_name", this.getDevice().getDevice_name()); map.put("mode", mode); @@ -1156,11 +1156,17 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i @Override public void setDeviceStatus(JSONObject data) { String requestSucess = data.getString("requireSucess"); + String requireActionSucess = data.getString("requireActionSucess"); if (StrUtil.equals(requestSucess, "0")) { this.requireSucess = false; } else if (StrUtil.equals(requestSucess, "1")) { this.requireSucess = true; } + if (StrUtil.equals(requireActionSucess, "0")) { + this.requireActionSucess = false; + } else if (StrUtil.equals(requireActionSucess, "1")) { + this.requireActionSucess = true; + } } public void writing(String param, String value) { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_head_manipulator/PullHeadManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_head_manipulator/PullHeadManipulatorDeviceDriver.java index 290b18f41..4ef5de975 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_head_manipulator/PullHeadManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_head_manipulator/PullHeadManipulatorDeviceDriver.java @@ -701,9 +701,9 @@ public class PullHeadManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp map.put("driver_type", "siemens_conveyor"); map.put("is_click", true); map.put("message", message); - map.put("error", ErrorUtil.getDictDetail("error_type", String.valueOf(this.getError()))); map.put("notCreateTaskMessage", LangProcess.msg(notCreateTaskMessage)); map.put("notCreateInstMessage", LangProcess.msg(notCreateInstMessage)); + map.put("error", ErrorUtil.getDictDetail("bqhj_error_type", String.valueOf(this.getError()))); /*jo.put("x", xPosition); jo.put("y", yPosition);*/ JSONObject jo = new JSONObject(map); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_tail_manipulator/PullTailManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_tail_manipulator/PullTailManipulatorDeviceDriver.java index d68e74c0b..9b61c7145 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_tail_manipulator/PullTailManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_tail_manipulator/PullTailManipulatorDeviceDriver.java @@ -627,7 +627,7 @@ public class PullTailManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp map.put("move", move); map.put("action", action); map.put("isOnline", this.getIsonline()); - map.put("error", ErrorUtil.getDictDetail("error_type", String.valueOf(this.getError()))); + map.put("error", ErrorUtil.getDictDetail("bhhj_error_type", String.valueOf(this.getError()))); map.put("isError", this.getIserror()); map.put("message", message); map.put("feedMessage", feedMessage); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java index 5eb066aff..b2f5de694 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java @@ -95,6 +95,8 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { try { MDC.put(log_file_type, log_type); log.info("crateTask-----输入参数{}", param); + LuceneLogDto luceneLogDto = new LuceneLogDto(4, param, "acs接收lms任务"); + luceneLogService.interfaceExecuteLog(luceneLogDto); JSONArray datas = JSONArray.parseArray(param); CreateTaskResponse response = new CreateTaskResponse(); // ParamService paramService = SpringContextHolder.getBean(ParamService.class); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/ErrorUtil.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/ErrorUtil.java index 07a323bd0..cb87e0412 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/ErrorUtil.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/ErrorUtil.java @@ -41,7 +41,7 @@ public class ErrorUtil { String en_label = dictDetailDto.getEn_label(); String in_label = dictDetailDto.getIn_label(); String zh_label = dictDetailDto.getZh_label(); - if (StrUtil.equals(value, error_code)) { + if (StrUtil.equals(value, error_code) && ObjectUtil.isNotEmpty(language)) { if (language.contains("zh")){ detail = zh_label; break; @@ -54,7 +54,10 @@ public class ErrorUtil { detail = en_label; break; } - + if(StrUtil.isEmpty(language)){ + detail = en_label; + break; + } } } } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/config/language/InitLocaleResolver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/config/language/InitLocaleResolver.java index 5d16d842e..2ed33f922 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/config/language/InitLocaleResolver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/config/language/InitLocaleResolver.java @@ -19,7 +19,6 @@ public class InitLocaleResolver implements LocaleResolver { if (StringUtils.isNotEmpty(header)){ String lang = Language_Country.get(header); language = lang; - System.out.println("lang的值为："+lang); if (StringUtils.isNotEmpty(lang)){ String[] l = lang.split("-"); //印尼的ISO标准国家代码为id-ID diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java index c8e41b2d3..e389ed070 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java @@ -153,6 +153,9 @@ public class SysDictServiceImpl extends ServiceImpl impleme dic.setPara1(dict.getPara1()); dic.setPara2(dict.getPara2()); dic.setPara3(dict.getPara3()); + dic.setZh_label(dict.getZh_label()); + dic.setEn_label(dict.getEn_label()); + dic.setIn_label(dict.getIn_label()); sysDictMapper.updateById(dic); return; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal.properties b/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal.properties index 0967f97cc..6b680c23b 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal.properties +++ b/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal.properties @@ -63,6 +63,7 @@ universal_actionMessage2=\u5141\u8BB8\u53D6\u653E universal_actionMessage3=\u5141\u8BB8\u79BB\u5F00 universal_actionMessage4=\u8BF7\u6C42\u52A8\u4F5C\u5DF2\u590D\u4F4D universal_actionMessage5=\u8BF7\u6C42\u52A8\u4F5C\u672A\u590D\u4F4D +universal_directives=\u6307\u4EE4 diff --git a/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_en_US.properties b/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_en_US.properties index ef534524d..61adfec8e 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_en_US.properties +++ b/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_en_US.properties @@ -62,5 +62,6 @@ universal_actionMessage4=The request action has been reset universal_actionMessage5=The request action is not reset universal_notCreateInstMessage7=ray type is empty! universal_notCreateInstMessage8=The barcode is blank\uFF01 +universal_directives=Directives diff --git a/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_in_ID.properties b/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_in_ID.properties index 6315bcb35..506419cd1 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_in_ID.properties +++ b/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_in_ID.properties @@ -62,3 +62,4 @@ universal_actionMessage4=Tindakan permintaan telah disetel ulang universal_actionMessage5=Tindakan permintaan tidak disetel ulang universal_notCreateInstMessage7=ponypianmereka yang kosong! universal_notCreateInstMessage8=Kode batang kosong! +universal_directives=Arahan diff --git a/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_zh_CN.properties b/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_zh_CN.properties index 17dc4ec86..c6ad11329 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_zh_CN.properties +++ b/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_zh_CN.properties @@ -62,6 +62,6 @@ universal_notCreateInstMessage6=\u4E0B\u4E00\u4E2A\u8BBE\u5907\u4E0D\u662F\u8F93 universal_notCreateInstMessage9=\u63D2\u62D4\u8F74\u5DE5\u4F4D\u6761\u4EF6\u4E0D\u6EE1\u8DB3\uFF0C\u65E0\u6CD5\u751F\u6210\u6307\u4EE4! universal_notCreateInstMessage7=\u6258\u76D8\u7C7B\u578B\u4E3A\u7A7A! universal_notCreateInstMessage8=\u6761\u7801\u4E3A\u7A7A! - +universal_directives=\u6307\u4EE4 diff --git a/acs2/nladmin-ui/src/i18n/langs/monitor/en.js b/acs2/nladmin-ui/src/i18n/langs/monitor/en.js index c597c9250..394d5e9c8 100644 --- a/acs2/nladmin-ui/src/i18n/langs/monitor/en.js +++ b/acs2/nladmin-ui/src/i18n/langs/monitor/en.js @@ -66,6 +66,9 @@ export default { 'photoelectric_signal': 'photoelectric signal', 'mode': 'mode', 'alarm': 'alarm', + 'last_mission_number': 'Last Mission Number', + 'the_subvolume_number': 'The Subvolume Number', + 'pallet_type': 'Pallet Type', 'ip_address': 'IP', 'pallet_quantity': 'Pallet quantity', 'instruction_information': 'instruction information', diff --git a/acs2/nladmin-ui/src/i18n/langs/monitor/in.js b/acs2/nladmin-ui/src/i18n/langs/monitor/in.js index be5f9fc1e..42388c80d 100644 --- a/acs2/nladmin-ui/src/i18n/langs/monitor/in.js +++ b/acs2/nladmin-ui/src/i18n/langs/monitor/in.js @@ -64,6 +64,9 @@ export default { 'device_name': 'nama divais', 'exception_message': 'pesan yang tidak biasa', 'photoelectric_signal': 'Sinyal fotolistrik', + 'last_mission_number': 'Nomor misi terakhir', + 'the_subvolume_number': 'Nomor Subvolume', + 'pallet_type': 'Jenis Palet', 'mode': 'pola', 'alarm': 'polisi', 'ip_address': 'IP', diff --git a/acs2/nladmin-ui/src/i18n/langs/monitor/zh.js b/acs2/nladmin-ui/src/i18n/langs/monitor/zh.js index d7f237bcb..3885b4a3b 100644 --- a/acs2/nladmin-ui/src/i18n/langs/monitor/zh.js +++ b/acs2/nladmin-ui/src/i18n/langs/monitor/zh.js @@ -98,6 +98,9 @@ export default { 'task_number': '任务号', 'command': '动作', 'disable': '是否禁用', + 'last_mission_number': '上次任务号', + 'the_subvolume_number': '子卷编号', + 'pallet_type': '托盘类型', 'current_temperature': '当前温度', 'oven_finish': '烘箱完成', 'house': '恒温倒计时-时', diff --git a/acs2/nladmin-ui/src/views/acs/device/index.vue b/acs2/nladmin-ui/src/views/acs/device/index.vue index 56548d747..ccab7fe9a 100644 --- a/acs2/nladmin-ui/src/views/acs/device/index.vue +++ b/acs2/nladmin-ui/src/views/acs/device/index.vue @@ -50,6 +50,20 @@ + + + + + @@ -259,6 +273,7 @@ export default { device_types: [], uploadShow: false, regions: [], + is_configs: [], rules: { device_code: [ { required: true, message: '设备编码不能为空', trigger: 'blur' } @@ -282,6 +297,10 @@ export default { get('region_type').then(data => { this.regions = data.content }) + // 是否 + get('TrueOrFalse').then(data => { + this.is_configs = data.content + }) }) }, methods: { diff --git a/acs2/nladmin-ui/src/views/acs/task/index.vue b/acs2/nladmin-ui/src/views/acs/task/index.vue index 90b23f6b8..638cf53c5 100644 --- a/acs2/nladmin-ui/src/views/acs/task/index.vue +++ b/acs2/nladmin-ui/src/views/acs/task/index.vue @@ -209,6 +209,7 @@ v-model="form.start_point_code" style="width: 370px;" filterable + clearable :placeholder="$t('task.select.Placeholder')" @change="showStartStorage" > @@ -257,6 +258,7 @@ v-model="form.next_point_code" style="width: 370px;" filterable + clearable :placeholder="$t('task.select.Placeholder')" @change="showEndStorage" > @@ -312,6 +314,7 @@ v-model="form.start_point_code2" style="width: 370px;" filterable + clearable :placeholder="$t('task.select.Placeholder')" > - + diff --git a/acs2/nladmin-ui/src/views/system/dict/dictDetail.vue b/acs2/nladmin-ui/src/views/system/dict/dictDetail.vue index 6f35aa83d..7424d3c81 100644 --- a/acs2/nladmin-ui/src/views/system/dict/dictDetail.vue +++ b/acs2/nladmin-ui/src/views/system/dict/dictDetail.vue @@ -21,6 +21,16 @@ + - + - + - + @@ -116,7 +126,9 @@ import rrOperation from '@crud/RR.operation' import udOperation from '@crud/UD.operation' import i18n from '@/i18n' -const defaultForm = { dict_id: null, name: null, label: null, value: null, dict_sort: null, dictType: null, para1: null, para2: null, para3: null, createId: null, createName: null, createTime: null, updateId: null, updateName: null, updateTime: null } +const defaultForm = { dict_id: null, name: null, label: null, value: null, dict_sort: null, dictType: null, para1: null, + para2: null, para3: null, createId: null, createName: null, createTime: null, updateId: null, updateName: null, + updateTime: null, zh_label: null, in_label: null, en_label: null } export default { components: { pagination, rrOperation, udOperation }, diff --git a/acs2/nladmin-ui/src/views/system/monitor/device/index.vue b/acs2/nladmin-ui/src/views/system/monitor/device/index.vue index 4aa475fbb..a8780fd56 100644 --- a/acs2/nladmin-ui/src/views/system/monitor/device/index.vue +++ b/acs2/nladmin-ui/src/views/system/monitor/device/index.vue @@ -138,6 +138,12 @@ {{ $t('auto.common.true') }} + + + {{ $t('auto.common.false') }} + {{ $t('auto.common.true') }} + +
{{ $t('auto.common.Cancel') }} @@ -406,13 +412,18 @@ export default { } this.Stages.push(tempObject) } - if (this.language === 'in') { + if (i18n.locale === 'in') { const tempObject = { 'stage_name': data[i].in_stage_name, 'stage_code': data[i].stage_code } this.Stages.push(tempObject) } + /* const tempObject = { + 'stage_name': data[i].in_stage_name, + 'stage_code': data[i].stage_code + } + this.Stages.push(tempObject) */ } console.log(this.Stages) }) @@ -459,11 +470,6 @@ export default { } else if (clickObj.data.driver_type === 'slit_two_manipulator') { this.dialogFormVisible4 = true } else if (clickObj.data.driver_type === 'siemens_conveyor') { - // if (clickObj.data.device_name.includes('1016')) { - // this.dialogFormVisible7 = true - // } else { - // this.dialogFormVisible5 = true - // } this.dialogFormVisible7 = true } else if (clickObj.data.driver_type === 'siemens_conveyor_ckk') { this.dialogFormVisible7 = true @@ -563,7 +569,7 @@ export default { const obj = { name: i18n.t('monitor.click.last_instruction_message'), value: data[val] } this.arr.push(obj) } else if (val === 'container_type') { - const obj = { name: '托盘类型', value: data[val] } + const obj = { name: i18n.t('monitor.click.pallet_type'), value: data[val] } this.arr.push(obj) } else if (val === 'barcode') { const obj = { name: i18n.t('monitor.click.barcode'), value: data[val] } @@ -656,7 +662,7 @@ export default { const obj = { name: i18n.t('monitor.click.task_number'), value: data[val] } this.arr.push(obj) } else if (val === 'last_task') { - const obj = { name: '上次任务号', value: data[val] } + const obj = { name: i18n.t('monitor.click.last_mission_number'), value: data[val] } this.arr.push(obj) } else if (val === 'is_disable') { const obj = { name: i18n.t('monitor.click.disable'), value: data[val] } @@ -706,6 +712,9 @@ export default { } else if (val === 'hand_barcode') { const obj = { name: '补码信息', value: data[val] } this.arr.push(obj) + } else if (val === 'hand_barcode1') { + const obj = { name: i18n.t('monitor.click.the_subvolume_number'), value: data[val] } + this.arr.push(obj) } else if (val === 'x') { const obj = { name: 'X', value: data[val] } this.arr.push(obj) From be809d413268ef75661cbb6e48ef7961bcdfb392 Mon Sep 17 00:00:00 2001 From: yanps Date: Fri, 21 Jun 2024 09:48:28 +0800 Subject: [PATCH 2/5] =?UTF-8?q?opt:=E7=83=98=E7=AE=B1=E7=9B=91=E6=8E=A7?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=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/service/impl/DeviceServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java index dea3e883d..a9adea9fa 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java @@ -230,6 +230,7 @@ public class DeviceServiceImpl extends CommonServiceImpl i LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank((String) whereJson.get("device_type")), Device::getDevice_type, whereJson.get("device_type")); wrapper.eq(StringUtils.isNotBlank((String) whereJson.get("region")), Device::getRegion, whereJson.get("region")); + wrapper.eq(StringUtils.isNotBlank((String) whereJson.get("is_config")), Device::getIs_config, whereJson.get("is_config")); wrapper.nested(StringUtils.isNotBlank((String) whereJson.get("blurry")), i -> i.like(Device::getDevice_code, whereJson.get("blurry")).or().like(Device::getDevice_name, whereJson.get("blurry"))); wrapper.orderByAsc(Device::getIs_config).orderByDesc(Device::getSeq_num).orderByDesc(Device::getUpdate_time); wrapper.orderByDesc(Device::getCreate_time); @@ -926,6 +927,7 @@ public class DeviceServiceImpl extends CommonServiceImpl i String vehicle_code = form.getString("vehicle_code"); String islock = form.getString("islock"); String requireSucess = form.getString("requireSucess"); + String requireActionSucess = form.getString("requireActionSucess"); String fullrequireSucess = form.getString("fullrequireSucess"); if (device_code.indexOf(".") != -1) { device_code = device_code.substring(0, device_code.indexOf(".")); From 43baf68a465f3457b77629782dc2d1628ab75ed0 Mon Sep 17 00:00:00 2001 From: liuxy Date: Fri, 21 Jun 2024 10:04:42 +0800 Subject: [PATCH 3/5] =?UTF-8?q?rev=EF=BC=9A=20=E6=94=B9=E5=88=87=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/st/outbill/service/impl/CheckOutBillServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java index cabbfb7e6..c5cd996e0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java @@ -5683,9 +5683,9 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { //如果为返检出库或者改切出库删除对应的包装关系 JSONArray dis_rows = new JSONArray(); if (jo_mst.getString("is_overdue").equals("1")) { - dis_rows = WQLObject.getWQLObject("ST_IVT_IOStorInvDis").query("iostorinv_id = '" + iostorinv_id + "' and is_overdue = '0'").getResultJSONArray(0); + dis_rows = WQLObject.getWQLObject("ST_IVT_IOStorInvDis").query("iostorinv_id = '" + iostorinv_id + "' and is_overdue = '0' and box_no = '"+jsonSub.getString("package_box_sn")+"'").getResultJSONArray(0); } else { - dis_rows = WQLObject.getWQLObject("ST_IVT_IOStorInvDis").query("iostorinv_id = '" + iostorinv_id + "'").getResultJSONArray(0); + dis_rows = WQLObject.getWQLObject("ST_IVT_IOStorInvDis").query("iostorinv_id = '" + iostorinv_id + "' and box_no = '"+jsonSub.getString("package_box_sn")+"'").getResultJSONArray(0); } for (int j = 0; j < dis_rows.size(); j++) { From a46c59ac48408c85848d66012108a60aad4eef94 Mon Sep 17 00:00:00 2001 From: wangsong <546428999@qq.com> Date: Fri, 21 Jun 2024 10:26:32 +0800 Subject: [PATCH 4/5] =?UTF-8?q?rev=20=20=E6=8B=94=E5=89=8D=E8=A1=8C?= =?UTF-8?q?=E6=9E=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pull_head_manipulator/PullHeadManipulatorDeviceDriver.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_head_manipulator/PullHeadManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_head_manipulator/PullHeadManipulatorDeviceDriver.java index 4ef5de975..f51d46475 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_head_manipulator/PullHeadManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_head_manipulator/PullHeadManipulatorDeviceDriver.java @@ -408,7 +408,7 @@ public class PullHeadManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp Device next_device = deviceAppService.findDeviceByCode(nextDeviceCode); if (next_device.getDeviceDriver() instanceof PlugPullDeviceSiteDeviceDriver) { plugPullDeviceSiteDeviceDriver = (PlugPullDeviceSiteDeviceDriver) next_device.getDeviceDriver(); - if (plugPullDeviceSiteDeviceDriver.getMode() != 2 || plugPullDeviceSiteDeviceDriver.getMove() != 0 || plugPullDeviceSiteDeviceDriver.getAction() != 2&&plugPullDeviceSiteDeviceDriver.getAction() != 3) + if (plugPullDeviceSiteDeviceDriver.getMode() != 2 || plugPullDeviceSiteDeviceDriver.getMove() != 0 || plugPullDeviceSiteDeviceDriver.getAction() != 2 || plugPullDeviceSiteDeviceDriver.getAction() != 3) notCreateInstMessage = "universal_notCreateInstMessage9"; return false; } From 1ae38d6d86d1d482f6592f84ef5ad24facc7a006 Mon Sep 17 00:00:00 2001 From: liuxy Date: Fri, 21 Jun 2024 14:07:27 +0800 Subject: [PATCH 5/5] =?UTF-8?q?rev=EF=BC=9A=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/config/lucene/AsyncLuceneAppender.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/config/lucene/AsyncLuceneAppender.java b/lms/nladmin-system/src/main/java/org/nl/config/lucene/AsyncLuceneAppender.java index 4ab09d6f4..c30fb74fa 100644 --- a/lms/nladmin-system/src/main/java/org/nl/config/lucene/AsyncLuceneAppender.java +++ b/lms/nladmin-system/src/main/java/org/nl/config/lucene/AsyncLuceneAppender.java @@ -26,7 +26,12 @@ public class AsyncLuceneAppender extends AspectLogbackAsyncAppender { mdcPropertyMap.put("traceId", traceId); } } - super.append(event); + try { + super.append(event); + } catch (Exception e) { + System.out.println(e.getMessage()); + return; + } } }