From 0a4b1620f0e156cbabcb265b88c2695f131d039e Mon Sep 17 00:00:00 2001
From: "USER-20220102CG\\noblelift" <546428999@qq.com>
Date: Tue, 7 Jun 2022 10:41:33 +0800
Subject: [PATCH] 1

---
 .../HaiLiangFeedingTrunkDeviceDriver.java          |  2 ++
 qd/src/views/acs/order/AddDialog.vue               |  3 +--
 qd/src/views/acs/order/index.vue                   | 14 ++++++++------
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_feeding_trunk/HaiLiangFeedingTrunkDeviceDriver.java b/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_feeding_trunk/HaiLiangFeedingTrunkDeviceDriver.java
index 43bd874..244b5a9 100644
--- a/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_feeding_trunk/HaiLiangFeedingTrunkDeviceDriver.java
+++ b/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_feeding_trunk/HaiLiangFeedingTrunkDeviceDriver.java
@@ -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;
diff --git a/qd/src/views/acs/order/AddDialog.vue b/qd/src/views/acs/order/AddDialog.vue
index 2351622..ea4e0db 100644
--- a/qd/src/views/acs/order/AddDialog.vue
+++ b/qd/src/views/acs/order/AddDialog.vue
@@ -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]() {
       // 编辑时，给按钮的状态赋值
diff --git a/qd/src/views/acs/order/index.vue b/qd/src/views/acs/order/index.vue
index fd83bbc..97f9645 100644
--- a/qd/src/views/acs/order/index.vue
+++ b/qd/src/views/acs/order/index.vue
@@ -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 />