From ed8d295c1a55eb9c0c3e91211e339e51aaea349f Mon Sep 17 00:00:00 2001
From: psh <psh>
Date: Tue, 26 Dec 2023 16:33:44 +0800
Subject: [PATCH] fix

---
 .../fold_disc_site/FoldDiscSiteDeviceDriver.java             | 5 +++++
 .../src/views/acs/device/driver/fold_disc_site.vue           | 5 +++++
 .../src/views/acs/device/driver/standard_inspect_site.vue    | 5 +++++
 .../src/views/acs/device/driver/standard_storage.vue         | 5 +++++
 4 files changed, 20 insertions(+)

diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/fold_disc_site/FoldDiscSiteDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/fold_disc_site/FoldDiscSiteDeviceDriver.java
index 85b3bbb..edda0e0 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/fold_disc_site/FoldDiscSiteDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/fold_disc_site/FoldDiscSiteDeviceDriver.java
@@ -158,6 +158,11 @@ public class FoldDiscSiteDeviceDriver extends AbstractOpcDeviceDriver implements
                             param.put("device_code", this.device_code);
                             param.put("is_have", this.number == 0 ? 0 : 1);
                             this.shipDeviceUpdate(param);
+                        } else if (move==1) {
+                            JSONObject param = new JSONObject();
+                            param.put("device_code", this.device_code);
+                            param.put("is_have",move);
+                            this.shipDeviceUpdate(param);
                         } else {
                             this.requireSucess = true;
                         }
diff --git a/acs/nladmin-ui/src/views/acs/device/driver/fold_disc_site.vue b/acs/nladmin-ui/src/views/acs/device/driver/fold_disc_site.vue
index d641b30..bb54bb8 100644
--- a/acs/nladmin-ui/src/views/acs/device/driver/fold_disc_site.vue
+++ b/acs/nladmin-ui/src/views/acs/device/driver/fold_disc_site.vue
@@ -100,6 +100,11 @@
               <el-switch v-model="form.manual_create_task" />
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否开启等待" label-width="150px">
+              <el-switch v-model="form.wait" />
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item label="是否请求wms" label-width="150px">
               <el-switch v-model="form.reqWms" />
diff --git a/acs/nladmin-ui/src/views/acs/device/driver/standard_inspect_site.vue b/acs/nladmin-ui/src/views/acs/device/driver/standard_inspect_site.vue
index 3a35744..8671e20 100644
--- a/acs/nladmin-ui/src/views/acs/device/driver/standard_inspect_site.vue
+++ b/acs/nladmin-ui/src/views/acs/device/driver/standard_inspect_site.vue
@@ -93,6 +93,11 @@
               <el-switch v-model="form.manual_create_task" />
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否开启等待" label-width="150px">
+              <el-switch v-model="form.wait" />
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item label="是否请求wms" label-width="150px">
               <el-switch v-model="form.reqWms" />
diff --git a/acs/nladmin-ui/src/views/acs/device/driver/standard_storage.vue b/acs/nladmin-ui/src/views/acs/device/driver/standard_storage.vue
index 3b3cd05..a5f95fd 100644
--- a/acs/nladmin-ui/src/views/acs/device/driver/standard_storage.vue
+++ b/acs/nladmin-ui/src/views/acs/device/driver/standard_storage.vue
@@ -7,6 +7,11 @@
       </div>
       <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
         <el-row>
+          <el-col :span="8">
+            <el-form-item label="是否开启等待" label-width="150px">
+              <el-switch v-model="form.wait" />
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item label="是否请求wms" label-width="150px">
               <el-switch v-model="form.reqWms" />