root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2022-12-05 17:30:45 +08:00
parent 30f864d37b c5a1ef2da4
commit 9da10682a0
3 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java
View File

@@ -274,11 +274,11 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl
} }
} }
; ;
this.writing("to_command1", "0"); this.writing("to_command1", "4");
this.writing("to_onset1", "0"); // this.writing("to_onset1", "0");
this.writing("to_target1", "0"); // this.writing("to_target1", "0");
this.writing("to_task1", "0"); // this.writing("to_task1", "0");
this.writing("to_type", "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_onset2", "0");
this.writing("to_target2", "0"); this.writing("to_target2", "0");
this.writing("to_task2", "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) { if (mode == 3 && action1 == 4 && move1 == 0 && task1 > 0 && task2 > 0 && type == 3) {
//inst_message //inst_message
Instruction inst1 = instructionService.findByCodeFromCache(String.valueOf(task1)); Instruction inst1 = instructionService.findByCodeFromCache(String.valueOf(task1));
@@ -328,17 +333,15 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl
array.add(map); array.add(map);
acsToWmsService.feedbackTaskStatusToWms(array); acsToWmsService.feedbackTaskStatusToWms(array);
} }
} };
; this.writing("to_command1", "4");
this.writing("to_command1", "0"); // this.writing("to_onset1", "0");
this.writing("to_onset1", "0"); // this.writing("to_target1", "0");
this.writing("to_target1", "0"); // this.writing("to_task1", "0");
this.writing("to_task1", "0"); // this.writing("to_onset2", "0");
this.writing("to_command2", "0"); // this.writing("to_target2", "0");
this.writing("to_onset2", "0"); // this.writing("to_task2", "0");
this.writing("to_target2", "0"); // this.writing("to_type", "0");
this.writing("to_task2", "0");
this.writing("to_type", "0");
} }
} }
} }

10
lms/nladmin-ui/src/views/wms/st/inbill/ViewDialog.vue
View File

@@ -41,10 +41,10 @@
:disabled="true" :disabled="true"
> >
<el-option <el-option
v-for="item in billtypelist" v-for="item in dict.INANDOUT_BILL_TYPE"
:key="item.code" :key="item.value"
:label="item.name" :label="item.label"
:value="item.code" :value="item.value"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
@@ -159,7 +159,7 @@ export default {
name: 'ViewDialog', name: 'ViewDialog',
components: { }, components: { },
mixins: [crud()], 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: { props: {
dialogShow: { dialogShow: {
type: Boolean, type: Boolean,

3
lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue
View File

@@ -112,7 +112,8 @@
<el-table-column show-overflow-tooltip prop="assign_qty" label="已分配重量" :formatter="crud.formatNum3" align="center" /> <el-table-column show-overflow-tooltip prop="assign_qty" label="已分配重量" :formatter="crud.formatNum3" align="center" />
<el-table-column show-overflow-tooltip prop="unassign_qty" label="未分配重量" :formatter="crud.formatNum3" align="center" /> <el-table-column show-overflow-tooltip prop="unassign_qty" label="未分配重量" :formatter="crud.formatNum3" align="center" />
<el-table-column prop="quality_scode" label="品质类型" align="center" width="110px" :formatter="quality_scodeFormat" /> <el-table-column prop="quality_scode" label="品质类型" align="center" width="110px" :formatter="quality_scodeFormat" />
<el-table-column prop="source_bill_type" label="源单类型" align="center" width="130px" :formatter="invtypeFormat" /> <!-- <el-table-column prop="source_bill_type" label="源单类型" align="center" width="130px" :formatter="invtypeFormat" />-->
<el-table-column show-overflow-tooltip prop="vbeln" label="交货单" align="center" />
<el-table-column show-overflow-tooltip prop="source_bill_code" label="源单编号" align="center" /> <el-table-column show-overflow-tooltip prop="source_bill_code" label="源单编号" align="center" />
<el-table-column show-overflow-tooltip prop="qty_unit_name" label="单位" align="center" /> <el-table-column show-overflow-tooltip prop="qty_unit_name" label="单位" align="center" />
</el-table> </el-table>