From 00f520fb0225f950419dc8d00681f40ede69fc10 Mon Sep 17 00:00:00 2001 From: liuxy Date: Mon, 5 Dec 2022 13:36:02 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue b/lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue index b3a7d1c1c..9c92aedf4 100644 --- a/lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue +++ b/lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue @@ -112,7 +112,8 @@ - + + From 68623a8ace7b273bf51c4bff406f3d9928c7b6e8 Mon Sep 17 00:00:00 2001 From: liuxy Date: Mon, 5 Dec 2022 14:31:22 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lms/nladmin-ui/src/views/wms/st/inbill/ViewDialog.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lms/nladmin-ui/src/views/wms/st/inbill/ViewDialog.vue b/lms/nladmin-ui/src/views/wms/st/inbill/ViewDialog.vue index 1c53a9cb5..ac9afbc86 100644 --- a/lms/nladmin-ui/src/views/wms/st/inbill/ViewDialog.vue +++ b/lms/nladmin-ui/src/views/wms/st/inbill/ViewDialog.vue @@ -41,10 +41,10 @@ :disabled="true" > @@ -159,7 +159,7 @@ export default { name: 'ViewDialog', components: { }, mixins: [crud()], - dicts: ['io_bill_status', 'work_status', 'task_status', 'SCH_TASK_TYPE_DTL'], + dicts: ['io_bill_status', 'work_status', 'task_status', 'SCH_TASK_TYPE_DTL', 'INANDOUT_BILL_TYPE'], props: { dialogShow: { type: Boolean, From c5a1ef2da4761e9e5b1bd2046a0c34f693b931b9 Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Mon, 5 Dec 2022 15:44:55 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SlitTwoManipulatorDeviceDriver.java | 39 ++++++++++--------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java index 8dbd422c7..aea14f73b 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java @@ -274,11 +274,11 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl } } ; - this.writing("to_command1", "0"); - this.writing("to_onset1", "0"); - this.writing("to_target1", "0"); - this.writing("to_task1", "0"); - this.writing("to_type", "0"); + this.writing("to_command1", "4"); +// this.writing("to_onset1", "0"); +// this.writing("to_target1", "0"); +// this.writing("to_task1", "0"); +// this.writing("to_type", "0"); } } } @@ -302,7 +302,7 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl } } ; - this.writing("to_command2", "0"); + this.writing("to_command2", "4"); this.writing("to_onset2", "0"); this.writing("to_target2", "0"); this.writing("to_task2", "0"); @@ -311,7 +311,12 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl } } - //双工位 任务完成 + //双任务后工位反馈4 + if (mode == 3 && action2 == 4 && move2 == 0 && task1 > 0 && task2 > 0 && type == 3 ){ + this.writing("to_command2", "4"); + } + + //双工位 任务完成 前工位反馈4 if (mode == 3 && action1 == 4 && move1 == 0 && task1 > 0 && task2 > 0 && type == 3) { //inst_message Instruction inst1 = instructionService.findByCodeFromCache(String.valueOf(task1)); @@ -328,17 +333,15 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl array.add(map); acsToWmsService.feedbackTaskStatusToWms(array); } - } - ; - this.writing("to_command1", "0"); - this.writing("to_onset1", "0"); - this.writing("to_target1", "0"); - this.writing("to_task1", "0"); - this.writing("to_command2", "0"); - this.writing("to_onset2", "0"); - this.writing("to_target2", "0"); - this.writing("to_task2", "0"); - this.writing("to_type", "0"); + }; + this.writing("to_command1", "4"); +// this.writing("to_onset1", "0"); +// this.writing("to_target1", "0"); +// this.writing("to_task1", "0"); +// this.writing("to_onset2", "0"); +// this.writing("to_target2", "0"); +// this.writing("to_task2", "0"); +// this.writing("to_type", "0"); } } }