Merge branch 'lzhl_tow_acs_ls'

# Conflicts:
#	acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/double_station_stacker/DoubleStationStackerDeviceDriver.java
#	acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/double_station_stacker/ItemProtocol.java

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/double_station_stacker/ItemProtocol.java

@@ -201,12 +201,10 @@ public class ItemProtocol {
     public Integer getItem_heartbeat() {
         return this.getOpcIntegerValue(item_heartbeat);
     }
-
+    public Integer getItem_device_Code(){
-    public Integer getItem_deviceCode() {
         return this.getOpcIntegerValue(item_deviceCode);
     }
-
+    public Integer getItem_mode(){
-    public Integer getItem_mode() {
         return this.getOpcIntegerValue(item_mode);
     }
 
@@ -217,103 +215,96 @@ public class ItemProtocol {
     }
 
 
-    public Integer getItem_front_command() {
+    public Integer getItem_front_command(){
         return this.getOpcIntegerValue(item_front_command);
     }
 
-    public Integer getItem_back_command() {
+    public Integer getItem_back_command(){
         return this.getOpcIntegerValue(item_back_command);
     }
 
-    public Integer getItem_front_task() {
+    public Integer getItem_front_task(){
         return this.getOpcIntegerValue(item_front_task);
     }
 
-    public Integer getItem_front_ZError() {
+    public Integer getItem_front_ZError(){
         return this.getOpcIntegerValue(item_front_ZError);
     }
 
 
-    public Integer getItem_back_ZError() {
+    public Integer getItem_back_ZError(){
         return this.getOpcIntegerValue(item_back_ZError);
     }
 
 
-    public Integer getItem_front_z() {
+
+    public Integer getItem_front_z(){
         return this.getOpcIntegerValue(item_front_z);
     }
 
 
-    public Integer getItem_front_x() {
+    public Integer getItem_front_x(){
         return this.getOpcIntegerValue(item_front_x);
     }
 
-    public Integer getItem_front_y() {
+    public Integer getItem_front_y(){
         return this.getOpcIntegerValue(item_front_y);
     }
 
-    public Integer getItem_back_z() {
+    public Integer getItem_back_z(){
         return this.getOpcIntegerValue(item_front_z);
     }
 
 
-    public Integer getItem_back_x() {
+    public Integer getItem_back_x(){
         return this.getOpcIntegerValue(item_front_x);
     }
 
-    public Integer getItem_back_y() {
+    public Integer getItem_back_y(){
         return this.getOpcIntegerValue(item_front_y);
     }
-
+    public float getItem_special1(){
-    public float getItem_special1() {
         return this.getOpcFloatValue(item_special1);
     }
 
-    public float getItem_front_forkCargo() {
+    public float getItem_front_forkCargo(){
         return this.getOpcFloatValue(item_front_forkCargo);
     }
-
+    public float getItem_back_forkCargo(){
-    public float getItem_back_forkCargo() {
         return this.getOpcFloatValue(item_back_forkCargo);
     }
 
-    public float getItem_front_forkLocation() {
+    public float getItem_front_forkLocation(){
         return this.getOpcFloatValue(item_front_forkLocation);
     }
 
-    public float getItem_back_forkLocation() {
+    public float getItem_back_forkLocation(){
         return this.getOpcFloatValue(item_back_forkLocation);
     }
-
+    public float getItem_front_forkAction(){
-    public float getItem_front_forkAction() {
         return this.getOpcFloatValue(item_front_forkAction);
     }
 
-    public float getItem_back_forkAction() {
+    public float getItem_back_forkAction(){
         return this.getOpcFloatValue(item_back_forkAction);
     }
 
-    public float getItem_special2() {
+    public float getItem_special2(){
         return this.getOpcFloatValue(item_special2);
     }
-
+    public float getItem_storage_cache(){
-    public float getItem_storage_cache() {
         return this.getOpcFloatValue(item_storage_cache);
     }
-
+    public Integer getItem_stacker_rpm(){
-    public Integer getItem_stacker_rpm() {
+        return  this.getOpcIntegerValue(item_stacker_rpm);
-        return this.getOpcIntegerValue(item_stacker_rpm);
     }
-
+    public Integer getItem_stacker_electricCurrent(){
-    public Integer getItem_stacker_electricCurrent() {
         return this.getOpcIntegerValue(item_stacker_electricCurrent);
     }
-
+    public Integer getItem_stacker_workingHours(){
-    public Integer getItem_stacker_workingHours() {
         return this.getOpcIntegerValue(item_stacker_workingHours);
     }
-
+    public Integer getItem_stacker_runingTime(){
-    public Integer getItem_stacker_runingTime() {
         return this.getOpcIntegerValue(item_stacker_runingTime);
     }
 

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/double_station_stacker/enums/CommandEnum.java

@@ -0,0 +1,37 @@
+/**
+ * @author ls
+ * @date 2023/12/4 13:42
+ */
+package org.nl.acs.device_driver.basedriver.double_station_stacker.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.nl.acs.task.enums.TaskStatusEnum;
+
+@Getter
+@AllArgsConstructor
+public enum CommandEnum {
+    STANDY(0,"待机"),
+    PICKUP(1,"取货中"),
+    PICKUP_COMPLETE(2,"取货完成"),
+    RELEASE(3,"放货中"),
+    UNLOAD(4,"请求卸货"),
+    UNLOAD_COMPLETE(5,"卸货完成"),
+    PICKUP_PREPARATION(6,"取货准备"),
+    RECALL(7,"召回"),
+    STOP(8,"急停");
+
+    private  Integer status;
+    private  String desc;
+
+    public static String getDesc(Integer status) {
+        for (CommandEnum c : CommandEnum.values()) {
+            if (c.getStatus().equals(status)) {
+                return c.getDesc();
+            }
+        }
+        return null;
+    }
+
+
+}

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/double_station_stacker/enums/SortEnum.java

@@ -0,0 +1,18 @@
+/**
+ * @author ls
+ * @date 2023/12/4 17:43
+ */
+package org.nl.acs.device_driver.basedriver.double_station_stacker.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum SortEnum {
+    PRONT("1","正序"),
+    BACK("2","倒序");
+
+    private  String code;
+    private  String desc;
+}

acs/nladmin-ui/src/views/acs/device/driver/double_station_stacker.vue

@@ -78,8 +78,8 @@
         label-width="78px"
       >
         <el-row>
-          <el-col :span="8">
+          <el-col :span="5">
-            <el-form-item label="策略" prop="device_code" label-width="110px">
+            <el-form-item label="策略：" prop="device_code" label-width="100px">
               <el-select
                 v-model="form.put_device_code"
                 filterable
@@ -96,11 +96,49 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="5">
+            <el-form-item label="货位排序：" prop="sort" label-width="100px">
+              <el-select
+                v-model="form.sort"
+                filterable
+                reserve-keyword
+                clearable
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for=" item in sortX"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
             <el-form-item label="指令上限：" label-width="150px" prop="count">
               <el-input v-model.number="form.count" />
             </el-form-item>
           </el-col>
+          <el-col :span="5">
+            <el-form-item label="禁止前叉列：" label-width="150px" prop="no_front_y">
+              <el-input v-model="form.no_front_y" placeholder="以逗号分隔" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="禁止前叉库位：" label-width="150px" prop="no_front_x">
+              <el-input v-model="form.no_front_x" placeholder="以逗号分隔" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="禁止后叉列：" label-width="150px" prop="no_back_y">
+              <el-input v-model="form.no_back_y" placeholder="以逗号分隔" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="禁止后叉库位：" label-width="150px" prop="no_back_x">
+              <el-input v-model="form.no_back_x" placeholder="以逗号分隔" />
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
     </el-card>
@@ -280,6 +318,7 @@ export default {
       options: [],
       data1: [],
       data2: [],
+      sortX: [{ code: '1', name: '正序' }, { code: '2', name: '倒序' }],
       form: {
         inspect_in_stocck: true,
         ignore_pickup_check: true,
@@ -291,7 +330,12 @@ export default {
         is_release: true,
         link_device_code: [],
         get_device_code: [],
-        put_device_code: []
+        put_device_code: [],
+        no_front_y: '',
+        no_front_x: '',
+        no_back_y: '',
+        no_back_x: '',
+        sort: ''
       },
       rules: {}
     }