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");
}
}
}
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,
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 @@
-
+
+