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

1

Browse Source
This commit is contained in:
USER-20220102CG\noblelift
2022-06-07 10:41:33 +08:00
parent 9fb1f7472c
commit 0a4b1620f0
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_feeding_trunk/HaiLiangFeedingTrunkDeviceDriver.java
View File

@@ -392,12 +392,14 @@ public class HaiLiangFeedingTrunkDeviceDriver extends AbstractOpcDeviceDriver im
case 3:
//申请工单
if(!requireSucess && ready == 1 && order ==0 && order_detail ==0 ){
logServer.deviceLogToacs(this.device_code,"","","开始申请工单");
apply_order();
}
break;
case 4:
//申请工单明细
if(!requireSucess && ready == 1 && order != 0 ) {
logServer.deviceLogToacs(this.device_code,"","","开始申请工单明细");
apply_orderDetail(order);
}
break;

3
qd/src/views/acs/order/AddDialog.vue
View File

@@ -326,8 +326,7 @@ export default {
this.nowrow.cust_code = row.cust_code
this.nowrow.cust_id = row.cust_id
this.nowrow.cust_name = row.cust_name
this.form.tableData.splice(this.nowindex, 1, this.nowrow) // 通过splice 替换数据 触发视图更新
this.$forceUpdate()
this.form.tableData.splice(this.nowindex, 1, row) // 通过splice 替换数据 触发视图更新
},
[CRUD.HOOK.afterToEdit]() {
// 编辑时，给按钮的状态赋值

14
qd/src/views/acs/order/index.vue
View File

@@ -82,6 +82,7 @@
<span v-if="scope.row.order_status==='06' && scope.row.is_flag ==='1' ">下发强制完成</span>
<span v-if="scope.row.order_status==='07' && scope.row.is_flag ==='1' ">强制完成</span>
<span v-if="scope.row.order_status==='08' && scope.row.is_flag ==='1' ">自动完成</span>
<span v-if="scope.row.order_status==='09' && scope.row.is_flag ==='1' ">取消</span>
<span v-if="scope.row.order_status==='00' && scope.row.is_flag ==='0' ">就绪</span>
<span v-if="scope.row.order_status==='01' && scope.row.is_flag ==='0' ">分拣中</span>
<span v-if="scope.row.order_status==='02' && scope.row.is_flag ==='0' ">下发暂停</span>
@@ -89,6 +90,7 @@
<span v-if="scope.row.order_status==='04' && scope.row.is_flag ==='0' ">下发强制完成</span>
<span v-if="scope.row.order_status==='05' && scope.row.is_flag ==='0' ">强制完成</span>
<span v-if="scope.row.order_status==='06' && scope.row.is_flag ==='0' ">自动完成</span>
<span v-if="scope.row.order_status==='07' && scope.row.is_flag ==='0' ">取消</span>
</template>
</el-table-column>
<el-table-column prop="material_code" label="物料编码" />
@@ -101,12 +103,12 @@
<el-table-column prop="cust_name" label="客户名称" />
<el-table-column prop="create_by" label="创建者" />
<el-table-column prop="create_time" label="创建时间" />
<!-- <el-table-column label="操作" width="200px" align="center" fixed="right">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button v-if="scope.row.is_flag =='1'" type="text" size="small" @click="handleClick(scope.row,'1')">修改</el-button>-->
<!-- <el-button v-if="scope.row.is_flag =='1'" type="text" size="small" @click="handleClick(scope.row,'2')">删除</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="操作" width="200px" align="center" fixed="right">
<template slot-scope="scope">
<el-button v-if="scope.row.is_flag ==='0'" type="text" size="small" @click="handleClick(scope.row,'1')">修改</el-button>
<el-button v-if="scope.row.is_flag ==='0'" type="text" size="small" @click="handleClick(scope.row,'2')">删除</el-button>
</template>
</el-table-column>
</el-table>
<!--分页组件-->
<pagination />