嘉耐更新

acs/hd/nladmin-system/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java

@@ -103,7 +103,7 @@ public enum DriverTypeEnum {
 
     LNSH_SPLIT_MANIPULATOR(47, "lnsh_split_manipulator", "晟华-拆垛机械手", "station"),
 
-    LNSH_RGV(48, "lnsh_rgv", "晟华-RGV", "station"),
+    LNSH_RGV(48, "lnsh_rgv", "晟华-RGV", "rgv"),
 
     LNSH_PACKAGE_LINE(49, "lnsh_package_line", "晟华-包装机", "station"),
 

acs/hd/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java

@@ -1190,7 +1190,19 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial
                 extraObj.put(json.getString("extra_code"), json.get("extra_value"));
             }
         }
-
+        extraObj.put("address", dto.getAddress());
+        JSONArray get_device_code = extraObj.getJSONArray("get_device_code");
+        JSONArray load_device_code = extraObj.getJSONArray("load_device_code");
+        JSONArray put_device_code = extraObj.getJSONArray("put_device_code");
+        if (ObjectUtil.isNotEmpty(get_device_code)) {
+            extraObj.put("get_device_code",get_device_code);
+        }
+        if (ObjectUtil.isNotEmpty(load_device_code)) {
+            extraObj.put("load_device_code",load_device_code);
+        }
+        if (ObjectUtil.isNotEmpty(put_device_code)) {
+            extraObj.put("put_device_code",put_device_code);
+        }
         extraObj.put("address", dto.getAddress());
         result.put("form", extraObj);
 

acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_mixing_mill/LnshMixingMillDeviceDriver.java

@@ -2,8 +2,10 @@ package org.nl.acs.device_driver.lnsh.lnsh_mixing_mill;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpResponse;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
@@ -275,17 +277,20 @@ public class LnshMixingMillDeviceDriver extends AbstractOpcDeviceDriver implemen
         } else {
             this.instruction_require_time = date;
             HttpResponse result = acsToWmsService.enterOrder(json);
-            if (result.getStatus() == 200) {
+            if (ObjectUtil.isNotEmpty(result)) {
-                this.writing(this.mode);
+                JSONObject jsonObject = JSON.parseObject(result.body());
-                ProduceshiftorderDto dto = produceshiftorderService.findByCode(String.valueOf(order_No));
+                if (result.getStatus() == 200 && jsonObject.get("status").equals("200")) {
-                if (this.mode == 4) {
+                    this.writing(this.mode);
-                    dto.setOrder_status("2");
+                    ProduceshiftorderDto dto = produceshiftorderService.findByCode(String.valueOf(order_No));
-                } else if (this.mode == 3){
+                    if (this.mode == 4) {
-                    dto.setOrder_status("0");
+                        dto.setOrder_status("2");
+                    } else if (this.mode == 3) {
+                        dto.setOrder_status("0");
+                    }
+                    produceshiftorderService.update(dto);
                 }
-                produceshiftorderService.update(dto);
             }
-            requireSucess = true;
+            this.setRequireSucess(true);
             return true;
         }
     }

acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java

@@ -2,6 +2,7 @@ package org.nl.acs.device_driver.lnsh.lnsh_package_pallet_manipulator;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpResponse;
 import com.alibaba.fastjson.JSONObject;
@@ -775,13 +776,17 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD
         } else {
             this.instruction_require_time = date;
             HttpResponse result = acsToWmsService.enterOrder(json);
-            if (result.getStatus() == 200) {
+            if (ObjectUtil.isNotEmpty(result)) {
-                this.writing(this.mode);
+                JSONObject jsonObject = JSONObject.parseObject(result.body());
-                ProduceshiftorderDto dto = produceshiftorderService.findByCode(String.valueOf(order_No));
+                if (result.getStatus() == 200 && jsonObject.get("status").equals("200")) {
-                dto.setOrder_status("0");
+                    this.writing(this.mode);
-                produceshiftorderService.update(dto);
+                    ProduceshiftorderDto dto = produceshiftorderService.findByCode(String.valueOf(order_No));
+                    dto.setOrder_status("0");
+                    produceshiftorderService.update(dto);
+                }
             }
-            requireSucess = true;
+
+            this.setRequireSucess(true);
             return true;
         }
     }
@@ -1011,10 +1016,13 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD
             json.put("tool_coordinate",tool_coordinate);
 
             HttpResponse result = acsToWmsService.applyTaskManipulatorToWms(json);
-            if (result.getStatus() == 200) {
+            if (ObjectUtil.isNotEmpty(result)) {
-                this.writing(this.mode);
+                JSONObject jsonObject = JSONObject.parseObject(result.body());
+                if (result.getStatus() == 200 && jsonObject.get("status").equals("200")) {
+                    this.writing(this.mode);
+                }
             }
-            requireSucess = true;
+            this.setRequireSucess(true);
             return true;
         }
     }
@@ -1096,10 +1104,13 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD
             json.put("tool_coordinate",tool_coordinate);
 
             HttpResponse result = acsToWmsService.applyTaskManipulatorToWms(json);
-            if (result.getStatus() == 200) {
+            if (ObjectUtil.isNotEmpty(result)) {
-                this.writing(this.mode);
+                JSONObject jsonObject = JSONObject.parseObject(result.body());
+                if (result.getStatus() == 200 && jsonObject.get("status").equals("200")) {
+                    this.writing(this.mode);
+                }
             }
-            requireSucess = true;
+            this.setRequireSucess(true);
             return true;
         }
     }
@@ -1122,11 +1133,13 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD
             json.put("qty",qty);
             json.put("vehicle_code",barcode);
             HttpResponse result = acsToWmsService.lnshApplyTaskToWms(json);
-            if (result.getStatus() == 200) {
+            if (ObjectUtil.isNotEmpty(result)) {
-                this.writing(this.mode);
+                JSONObject jsonObject = JSONObject.parseObject(result.body());
+                if (result.getStatus() == 200 && jsonObject.get("status").equals("200")) {
+                    this.writing(this.mode);
+                }
             }
-
+            this.setRequireSucess(true);
-            requireSucess = true;
             return true;
         }
     }

acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/LnshPalletizingManipulatorDeviceDriver.java

@@ -2,6 +2,7 @@ package org.nl.acs.device_driver.lnsh.lnsh_palletizing_manipulator;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpResponse;
 import com.alibaba.fastjson.JSONObject;
@@ -292,10 +293,13 @@ public class LnshPalletizingManipulatorDeviceDriver extends AbstractOpcDeviceDri
             json.put("qty",encoder_qty);
             json.put("is_full","1");
             HttpResponse result = acsToWmsService.applyTaskManipulatorToWms(json);
-            if (result.getStatus() == 200) {
+            if (ObjectUtil.isNotEmpty(result)) {
-                this.writing(this.mode);
+                JSONObject jsonObject = JSONObject.parseObject(result.body());
+                if (result.getStatus() == 200 && jsonObject.get("status").equals("200")) {
+                    this.writing(this.mode);
+                }
             }
-            requireSucess = true;
+            this.setRequireSucess(true);
             return true;
         }
     }
@@ -343,11 +347,13 @@ public class LnshPalletizingManipulatorDeviceDriver extends AbstractOpcDeviceDri
             json.put("type","4");
             json.put("qty",encoder_qty);
             HttpResponse result = acsToWmsService.lnshApplyTaskToWms(json);
-            if (result.getStatus() == 200) {
+            if (ObjectUtil.isNotEmpty(result)) {
-                this.writing(this.mode);
+                JSONObject jsonObject = JSONObject.parseObject(result.body());
+                if (result.getStatus() == 200 && jsonObject.get("status").equals("200")) {
+                    this.writing(this.mode);
+                }
             }
-
+            this.setRequireSucess(true);
-            requireSucess = true;
             return true;
         }
     }

acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDeviceDriver.java

@@ -2,6 +2,7 @@ package org.nl.acs.device_driver.lnsh.lnsh_split_manipulator;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpResponse;
 import com.alibaba.fastjson.JSONObject;
@@ -336,10 +337,13 @@ public class LnshSplitManipulatorDeviceDriver extends AbstractOpcDeviceDriver im
             json.put("is_full","1");
 
             HttpResponse result = acsToWmsService.applyTaskManipulatorToWms(json);
-            if (result.getStatus() == 200) {
+            if (ObjectUtil.isNotEmpty(result)) {
-                this.writing(this.mode);
+                JSONObject jsonObject = JSONObject.parseObject(result.body());
+                if (result.getStatus() == 200 && jsonObject.get("status").equals("200")) {
+                    this.writing(this.mode);
+                }
             }
-            requireSucess = true;
+            this.setRequireSucess(true);
             return true;
         }
     }

acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/ItemProtocol.java

@@ -26,6 +26,7 @@ public class ItemProtocol {
     public static String item_barcode = "barcode";
     public static String item_specifications = "specifications";
     public static String item_batch = "batch";
+    public static String item_container_type = "container_type";
 
     public static String item_to_command = "to_command";
     public static String item_to_target = "to_target";
@@ -89,6 +90,10 @@ public class ItemProtocol {
         return this.getOpcIntegerValue(item_batch);
     }
 
+    public int getContainer_type() {
+        return this.getOpcIntegerValue(item_container_type);
+    }
+
     public int getToCommand() {
         return this.getOpcIntegerValue(item_to_command);
     }
@@ -143,9 +148,10 @@ public class ItemProtocol {
         list.add(new ItemDto(item_task, "任务号", "DB4.D6"));
         list.add(new ItemDto(item_weight, "重量", "DB4.D10"));
         list.add(new ItemDto(item_batch, "批次", "DB4.D14"));
-        list.add(new ItemDto(item_material, "物料", "DB4.S18"));
+        list.add(new ItemDto(item_specifications, "规格", "DB4.S18"));
-        list.add(new ItemDto(item_barcode, "条码", "DB4.S274"));
+        list.add(new ItemDto(item_material, "物料", "DB4.S274"));
-        list.add(new ItemDto(item_specifications, "规格", "DB4.S530"));
+        list.add(new ItemDto(item_barcode, "条码", "DB4.S530"));
+        list.add(new ItemDto(item_container_type, "托盘类型", "DB4.B786"));
         return list;
     }
 

acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDefination.java

@@ -66,9 +66,10 @@ public class LnshStationDefination implements OpcDeviceDriverDefination {
         list.add(new ItemDto(ItemProtocol.item_task, "任务号", "DB4.D6"));
         list.add(new ItemDto(ItemProtocol.item_weight, "重量", "DB4.D10"));
         list.add(new ItemDto(ItemProtocol.item_batch, "批次", "DB4.D14"));
-        list.add(new ItemDto(ItemProtocol.item_material, "物料", "DB4.S18"));
+        list.add(new ItemDto(ItemProtocol.item_specifications, "规格", "DB4.S18"));
-        list.add(new ItemDto(ItemProtocol.item_barcode, "条码", "DB4.S274"));
+        list.add(new ItemDto(ItemProtocol.item_material, "物料", "DB4.S274"));
-        list.add(new ItemDto(ItemProtocol.item_specifications, "规格", "DB4.S530"));
+        list.add(new ItemDto(ItemProtocol.item_barcode, "条码", "DB4.S530"));
+        list.add(new ItemDto(ItemProtocol.item_container_type, "托盘类型", "DB4.S786"));
         return list;
     }
 

acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java

@@ -2,6 +2,7 @@ package org.nl.acs.device_driver.lnsh.lnsh_station;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpResponse;
 import com.alibaba.fastjson.JSONArray;
@@ -276,11 +277,13 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
             json.put("vehicle_code",barcode);
             json.put("is_full","0");
             HttpResponse result = acsToWmsService.lnshApplyTaskToWms(json);
-            if (result.getStatus() == 200) {
+            if (ObjectUtil.isNotEmpty(result)) {
-                this.writing(this.mode);
+                JSONObject jsonObject = JSONObject.parseObject(result.body());
+                if (result.getStatus() == 200 && jsonObject.get("status").equals("200")) {
+                    this.writing(this.mode);
+                }
             }
-
+            this.setRequireSucess(true);
-            requireSucess = true;
             return true;
         }
     }
@@ -304,11 +307,13 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
             json.put("vehicle_code",barcode);
             json.put("is_full","0");
             HttpResponse result = acsToWmsService.lnshApplyTaskToWms(json);
-            if (result.getStatus() == 200) {
+            if (ObjectUtil.isNotEmpty(result)) {
-                this.writing(this.mode);
+                JSONObject jsonObject = JSONObject.parseObject(result.body());
+                if (result.getStatus() == 200 && jsonObject.get("status").equals("200")) {
+                    this.writing(this.mode);
+                }
             }
-
+            this.setRequireSucess(true);
-            requireSucess = true;
             return true;
         }
     }
@@ -328,15 +333,17 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
             JSONObject json = new JSONObject();
             json.put("device_code",this.device_code);
             json.put("type","1");
-            json.put("qty",weight);
+            json.put("material",material);
             json.put("vehicle_code",barcode);
             json.put("is_full","1");
             HttpResponse result = acsToWmsService.lnshApplyTaskToWms(json);
-            if (result.getStatus() == 200) {
+            if (ObjectUtil.isNotEmpty(result)) {
-                this.writing(this.mode);
+                JSONObject jsonObject = JSONObject.parseObject(result.body());
+                if (result.getStatus() == 200 && jsonObject.get("status").equals("200")) {
+                    this.writing(this.mode);
+                }
             }
-
+            this.setRequireSucess(true);
-            requireSucess = true;
             return true;
         }
     }

acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/RljnPackagePalletSplitManipulatorDeviceDriver.java

@@ -1,5 +1,6 @@
 package org.nl.acs.device_driver.lnsh.rljn_package_palletSplit_manipulator;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpResponse;
 import com.alibaba.fastjson.JSONObject;
@@ -813,13 +814,17 @@ public class RljnPackagePalletSplitManipulatorDeviceDriver extends AbstractOpcDe
         } else {
             this.instruction_require_time = date;
             HttpResponse result = acsToWmsService.enterOrder(json);
-            if (result.getStatus() == 200) {
+            if (ObjectUtil.isNotEmpty(result)) {
-                this.writing(this.mode);
+                JSONObject jsonObject = JSONObject.parseObject(result.body());
-                ProduceshiftorderDto dto = produceshiftorderService.findByCode(String.valueOf(order_No));
+                if (result.getStatus() == 200 && jsonObject.get("status").equals("200")) {
-                dto.setOrder_status("0");
+                    this.writing(this.mode);
-                produceshiftorderService.update(dto);
+                    ProduceshiftorderDto dto = produceshiftorderService.findByCode(String.valueOf(order_No));
+                    dto.setOrder_status("0");
+                    produceshiftorderService.update(dto);
+                }
             }
-            requireSucess = true;
+
+            this.setRequireSucess(true);
             return true;
         }
     }
@@ -967,7 +972,7 @@ public class RljnPackagePalletSplitManipulatorDeviceDriver extends AbstractOpcDe
                 this.writing("to_tool_coordinate",tool_coordinate);
 
             }
-            requireSucess = true;
+            this.setRequireSucess(true);
             return true;
         }
     }
@@ -1049,10 +1054,13 @@ public class RljnPackagePalletSplitManipulatorDeviceDriver extends AbstractOpcDe
             json.put("tool_coordinate",tool_coordinate);
 
             HttpResponse result = acsToWmsService.applyTaskManipulatorToWms(json);
-            if (result.getStatus() == 200) {
+            if (ObjectUtil.isNotEmpty(result)) {
-                this.writing(this.mode);
+                JSONObject jsonObject = JSONObject.parseObject(result.body());
+                if (result.getStatus() == 200 && jsonObject.get("status").equals("200")) {
+                    this.writing(this.mode);
+                }
             }
-            requireSucess = true;
+            this.setRequireSucess(true);
             return true;
         }
     }
@@ -1134,10 +1142,13 @@ public class RljnPackagePalletSplitManipulatorDeviceDriver extends AbstractOpcDe
             json.put("tool_coordinate",tool_coordinate);
 
             HttpResponse result = acsToWmsService.applyTaskManipulatorToWms(json);
-            if (result.getStatus() == 200) {
+            if (ObjectUtil.isNotEmpty(result)) {
-                this.writing(this.mode);
+                JSONObject jsonObject = JSONObject.parseObject(result.body());
+                if (result.getStatus() == 200 && jsonObject.get("status").equals("200")) {
+                    this.writing(this.mode);
+                }
             }
-            requireSucess = true;
+            this.setRequireSucess(true);
             return true;
         }
     }
@@ -1160,11 +1171,13 @@ public class RljnPackagePalletSplitManipulatorDeviceDriver extends AbstractOpcDe
             json.put("qty",qty);
             json.put("vehicle_code",barcode);
             HttpResponse result = acsToWmsService.lnshApplyTaskToWms(json);
-            if (result.getStatus() == 200) {
+            if (ObjectUtil.isNotEmpty(result)) {
-                this.writing(this.mode);
+                JSONObject jsonObject = JSONObject.parseObject(result.body());
+                if (result.getStatus() == 200 && jsonObject.get("status").equals("200")) {
+                    this.writing(this.mode);
+                }
             }
-
+            this.setRequireSucess(true);
-            requireSucess = true;
             return true;
         }
     }

acs/qd/src/views/acs/device/config.vue

@@ -119,6 +119,7 @@ import lnsh_station from '@/views/acs/device/driver/lnsh/lnsh_station'
 import lnsh_Laminating_machine from '@/views/acs/device/driver/lnsh/lnsh_Laminating_machine'
 import lnsh_package_site from '@/views/acs/device/driver/lnsh/lnsh_package_site'
 import rljn_package_palletSplit_manipulator from '@/views/acs/device/driver/lnsh/rljn_package_palletSplit_manipulator'
+import standard_rgv from '@/views/acs/device/driver/standard_rgv'
 
 export default {
   name: 'DeviceConfig',
@@ -130,7 +131,7 @@ export default {
     standard_photoelectric_inspect_site, ndxy_special, hailiang_labeling, ndxy_special_two, whxr_storage_conveyor, whxr_ball_mill, whxr_spary_tower, whxr_weight,
     electric_fence, lnsh_mixing_mill, lnsh_press, lnsh_palletizing_manipulator, lnsh_fold_disc_site, lnsh_kiln_lane, lnsh_kiln_truss,
     lnsh_package_line, lnsh_out_kiln_truss, lnsh_package_pallet_manipulator, lnsh_pallet_storage, lnsh_labeling_machine, lnsh_split_manipulator, lnsh_rgv,
-    lnsh_station, lnsh_Laminating_machine, lnsh_package_site, rljn_package_palletSplit_manipulator },
+    lnsh_station, lnsh_Laminating_machine, lnsh_package_site, rljn_package_palletSplit_manipulator, standard_rgv },
   dicts: ['device_type'],
   mixins: [crud],
   data() {

acs/qd/src/views/acs/device/driver/lnsh/lnsh_Laminating_machine.vue

@@ -372,7 +372,7 @@ export default {
             this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 4)
           }
           if (this.data1[val].code.indexOf('barcode') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 8)
+            this.data1[val].db = beforeStr + '.' + 'S' + (parseInt(endNumber) + 5)
           }
         }
       }
@@ -399,7 +399,7 @@ export default {
             this.data2[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 4)
           }
           if (this.data2[val].code.indexOf('to_barcode') !== -1) {
-            this.data2[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 8)
+            this.data2[val].db = beforeStr + '.' + 'S' + (parseInt(endNumber) + 8)
           }
         }
       }

acs/qd/src/views/acs/device/driver/lnsh/lnsh_rgv.vue

@@ -55,6 +55,51 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-col>
+          <el-form-item label="取货点" prop="device_code">
+            <el-select
+              v-model="form.get_device_code"
+              multiple
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in deviceList"
+                :label="item.device_name"
+                :value="item.device_code"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="装货点" prop="device_code">
+            <el-select
+              v-model="form.load_device_code"
+              filterable
+              multiple
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in deviceList"
+                :key="item.device_code"
+                :label="item.device_name"
+                :value="item.device_code"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="放货点" prop="device_code">
+            <el-select
+              v-model="form.put_device_code"
+              filterable
+              multiple
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in deviceList"
+                :key="item.device_code"
+                :label="item.device_name"
+                :value="item.device_code"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
       </el-form>
     </el-card>
 
@@ -281,6 +326,9 @@ export default {
       plc_code: '',
       opc_id: '',
       opc_code: '',
+      get_device_code: '',
+      load_device_code: '',
+      put_device_code: '',
       configLoading: false,
       dataOpcservers: [],
       dataOpcPlcs: [],

acs/qd/src/views/acs/device/driver/lnsh/lnsh_station.vue

@@ -342,11 +342,20 @@ export default {
           if (this.data1[val].code.indexOf('weight') !== -1) {
             this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 9)
           }
+          if (this.data1[val].code.indexOf('batch') !== -1) {
+            this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 13)
+          }
+          if (this.data1[val].code.indexOf('specifications') !== -1) {
+            this.data1[val].db = beforeStr + '.' + 'S' + (parseInt(endNumber) + 17)
+          }
           if (this.data1[val].code.indexOf('material') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'S' + (parseInt(endNumber) + 13)
+            this.data1[val].db = beforeStr + '.' + 'S' + (parseInt(endNumber) + 273)
           }
           if (this.data1[val].code.indexOf('barcode') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'S' + (parseInt(endNumber) + 269)
+            this.data1[val].db = beforeStr + '.' + 'S' + (parseInt(endNumber) + 529)
+          }
+          if (this.data1[val].code.indexOf('container_type') !== -1) {
+            this.data1[val].db = beforeStr + '.' + 'B' + (parseInt(endNumber) + 785)
           }
         }
       }
@@ -372,6 +381,9 @@ export default {
           if (this.data2[val].code.indexOf('to_task') !== -1) {
             this.data2[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 4)
           }
+          if (this.data2[val].code.indexOf('to_barcode') !== -1) {
+            this.data2[val].db = beforeStr + '.' + 'S' + (parseInt(endNumber) + 8)
+          }
         }
       }
     },

acs/qd/src/views/acs/device/driver/standard_rgv.vue

@@ -0,0 +1,538 @@
+<template>
+  <!--RGV-->
+  <div>
+    <el-card class="box-card" shadow="never">
+      <div slot="header" class="clearfix">
+        <span class="role-span">设备协议：</span>
+      </div>
+
+      <el-row>
+        <el-col :span="12">
+          OpcServer:
+          <el-select
+            v-model="opc_id"
+            placeholder="无"
+            clearable
+            @change="changeOpc"
+          >
+            <el-option
+              v-for="item in dataOpcservers"
+              :key="item.opc_id"
+              :label="item.opc_name"
+              :value="item.opc_id"
+            />
+          </el-select>
+        </el-col>
+        <el-col :span="12">
+          PLC:
+          <el-select
+            v-model="plc_id"
+            placeholder="无"
+            clearable
+            @change="changePlc"
+          >
+            <el-option
+              v-for="item in dataOpcPlcs"
+              :key="item.plc_id"
+              :label="item.plc_name"
+              :value="item.plc_id"
+            />
+          </el-select>
+        </el-col>
+      </el-row>
+
+    </el-card>
+
+    <el-card class="box-card" shadow="never">
+      <div slot="header" class="clearfix">
+        <span class="role-span">输送系统：</span>
+      </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-input v-model="form.OPCServer" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="取货点" prop="device_code">
+              <el-select
+                v-model="form.get_device_code"
+                filterable
+                multiple
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in deviceList"
+                  :key="item.device_code"
+                  :label="item.device_name"
+                  :value="item.device_code"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-form-item label="放货点" prop="device_code">
+            <el-select
+              v-model="form.put_device_code"
+              filterable
+              multiple
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in deviceList"
+                :key="item.device_code"
+                :label="item.device_name"
+                :value="item.device_code"
+              />
+            </el-select>
+          </el-form-item>
+        </el-row>
+      </el-form>
+    </el-card>
+
+    <el-card class="box-card" shadow="never">
+      <div slot="header" class="clearfix">
+        <span class="role-span">指令相关：</span>
+      </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="检验有货">
+              <el-switch v-model="form.inspect_in_stocck" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="忽视取货校验" label-width="150px">
+              <el-switch v-model="form.ignore_pickup_check" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="忽视放货校验" label-width="150px">
+              <el-switch v-model="form.ignore_release_check" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="呼叫">
+              <el-switch v-model="form.apply_task" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="响应" label-width="150px">
+              <el-switch v-model="form.manual_create_task" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="关联设备" prop="device_code">
+              <el-select
+                v-model="form.link_device_code"
+                filterable
+                multiple
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in deviceList"
+                  :key="item.device_code"
+                  :label="item.device_name"
+                  :value="item.device_code"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="关联三色灯" prop="device_code" label-width="100px">
+              <el-select
+                v-model="form.link_three_lamp"
+                filterable
+                clearable
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in deviceList"
+                  :key="item.device_code"
+                  :label="item.device_name"
+                  :value="item.device_code"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否输入物料" label-width="150px">
+              <el-switch v-model="form.input_material" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-card>
+
+    <el-card class="box-card" shadow="never">
+      <div slot="header" class="clearfix">
+        <span class="role-span">AGV相关：</span>
+      </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="取货">
+              <el-switch v-model="form.is_pickup" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="放货">
+              <el-switch v-model="form.is_release" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-card>
+
+    <el-card class="box-card" shadow="never">
+      <div slot="header" class="clearfix">
+        <span class="role-span">PLC读取字段：</span>
+      </div>
+      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
+        <el-table
+          v-loading="false"
+          :data="data1"
+          :max-height="550"
+          size="small"
+          style="width: 100%;margin-bottom: 15px"
+        >
+
+          <el-table-column prop="name" label="用途" />
+          <el-table-column prop="code" label="别名要求" />
+          <el-table-column prop="db" label="DB块">
+            <template slot-scope="scope">
+              <el-input
+                v-model="data1[scope.$index].db"
+                size="mini"
+                class="edit-input"
+                @input="finishReadEdit(data1[scope.$index])"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column prop="dbr_value">
+            <template slot="header">
+              <el-link type="primary" :underline="false" @click.native="test_read1()">测试读</el-link>
+            </template>
+            <template slot-scope="scope">
+              <el-input v-model="data1[scope.$index].dbr_value" size="mini" class="edit-input" />
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form>
+    </el-card>
+
+    <el-card class="box-card" shadow="never">
+      <div slot="header" class="clearfix">
+        <span class="role-span">PLC写入字段：</span>
+      </div>
+      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
+        <el-table
+          v-loading="false"
+          :data="data2"
+          :max-height="550"
+          size="small"
+          style="width: 100%;margin-bottom: 15px"
+        >
+
+          <el-table-column prop="name" label="用途" />
+          <el-table-column prop="code" label="别名要求" />
+          <el-table-column prop="db" label="DB块">
+            <template slot-scope="scope">
+              <el-input
+                v-model="data2[scope.$index].db"
+                size="mini"
+                class="edit-input"
+                @input="finishWriteEdit(data2[scope.$index])"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column prop="dbw_value">
+            <template slot="header">
+              <el-link type="primary" :underline="false" @click.native="test_write1()">测试写</el-link>
+            </template>
+            <template slot-scope="scope">
+              <el-input v-model="data2[scope.$index].dbw_value" size="mini" class="edit-input" />
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form>
+    </el-card>
+
+    <el-card class="box-card" shadow="never">
+      <div slot="header" class="clearfix">
+        <span class="role-span" />
+        <el-button
+          :loading="false"
+          icon="el-icon-check"
+          size="mini"
+          style="float: right; padding: 6px 9px"
+          type="primary"
+          @click="doSubmit"
+        >保存
+        </el-button>
+      </div>
+    </el-card>
+
+  </div>
+</template>
+
+<script>
+import {
+  queryDriverConfig,
+  updateConfig,
+  testRead,
+  testwrite
+} from '@/api/acs/device/driverConfig'
+import { selectOpcList } from '@/api/acs/device/opc'
+import { selectPlcList } from '@/api/acs/device/opcPlc'
+import { selectListByOpcID } from '@/api/acs/device/opcPlc'
+
+import crud from '@/mixins/crud'
+import deviceCrud from '@/api/acs/device/device'
+
+export default {
+  name: 'StandardInspectSite',
+  mixins: [crud],
+  props: {
+    parentForm: {
+      type: Object,
+      require: true
+    }
+  },
+  data() {
+    return {
+      device_code: '',
+      device_id: '',
+      plc_id: '',
+      plc_code: '',
+      opc_id: '',
+      opc_code: '',
+      get_device_code: '',
+      put_device_code: '',
+      configLoading: false,
+      dataOpcservers: [],
+      dataOpcPlcs: [],
+      deviceList: [],
+      data1: [],
+      data2: [],
+      form: {
+        inspect_in_stocck: true,
+        ignore_pickup_check: true,
+        ignore_release_check: true,
+        apply_task: true,
+        link_three_lamp: '',
+        manual_create_task: true,
+        is_pickup: true,
+        is_release: true,
+        link_device_code: []
+      },
+      rules: {}
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      // 从父表单获取设备编码
+      this.device_id = this.$props.parentForm.device_id
+      this.device_code = this.$props.parentForm.device_code
+      queryDriverConfig(this.device_id, this.$props.parentForm.driver_code).then(data => {
+        // 给表单赋值，并且属性不能为空
+        if (data.form) {
+          const arr = Object.keys(data.form)
+          // 不为空
+          if (arr.length > 0) {
+            this.form = data.form
+          }
+        }
+
+        // 给表单赋值，并且属性不能为空
+        if (data.parentForm) {
+          const arr = Object.keys(data.parentForm)
+          // 不为空
+          if (arr.length > 0) {
+            this.opc_code = data.parentForm.opc_code
+            this.plc_code = data.parentForm.plc_code
+          }
+        }
+        this.data1 = data.rs
+        this.data2 = data.ws
+        this.sliceItem()
+      })
+      selectPlcList().then(data => {
+        this.dataOpcPlcs = data
+        this.plc_id = this.$props.parentForm.opc_plc_id
+      })
+      selectOpcList().then(data => {
+        this.dataOpcservers = data
+        this.opc_id = this.$props.parentForm.opc_server_id
+      })
+      deviceCrud.selectDeviceList().then(data => {
+        this.deviceList = data
+      })
+    })
+  },
+  methods: {
+    finishReadEdit(data) {
+      // 编辑的是code列,并且值包含mode
+      if (data.code.indexOf('mode') !== -1) {
+        debugger
+        const dbValue = data.db
+        // .之前的字符串
+        const beforeStr = dbValue.match(/(\S*)\./)[1]
+        // .之后的字符串
+        const afterStr = dbValue.match(/\.(\S*)/)[1]
+        // 取最后数字
+        const endNumber = afterStr.substring(1)
+        // 最后为非数字
+        if (isNaN(parseInt(endNumber))) {
+          return
+        }
+        for (const val in this.data1) {
+          if (this.data1[val].code.indexOf('move') !== -1) {
+            this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 1)
+          }
+          if (this.data1[val].code.indexOf('action') !== -1) {
+            this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 2)
+          }
+          if (this.data1[val].code.indexOf('walk_y') !== -1) {
+            this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 3)
+          }
+          if (this.data1[val].code.indexOf('container_type') !== -1) {
+            this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 4)
+          }
+          if (this.data1[val].code.indexOf('error') !== -1) {
+            this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 5)
+          }
+          if (this.data1[val].code.indexOf('task') !== -1) {
+            this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 8)
+          }
+        }
+      }
+    },
+    finishWriteEdit(data) {
+      // 编辑的是code列,并且值包含mode
+      if (data.code.indexOf('to_command') !== -1) {
+        const dbValue = data.db
+        // .之前的字符串
+        const beforeStr = dbValue.match(/(\S*)\./)[1]
+        // .之后的字符串
+        const afterStr = dbValue.match(/\.(\S*)/)[1]
+        // 取最后数字
+        const endNumber = afterStr.substring(1)
+        // 最后为非数字
+        if (isNaN(parseInt(endNumber))) {
+          return
+        }
+        for (const val in this.data2) {
+          if (this.data2[val].code.indexOf('to_onset') !== -1) {
+            this.data2[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 2)
+          }
+          if (this.data2[val].code.indexOf('to_target') !== -1) {
+            this.data2[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 4)
+          }
+          if (this.data2[val].code.indexOf('to_container_type') !== -1) {
+            this.data2[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 6)
+          }
+          if (this.data2[val].code.indexOf('to_task') !== -1) {
+            this.data2[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 8)
+          }
+        }
+      }
+    },
+    changeOpc(val) {
+      this.dataOpcservers.forEach(item => {
+        if (item.opc_id === val) {
+          this.opc_code = item.opc_code
+        }
+      })
+
+      selectListByOpcID(val).then(data => {
+        this.dataOpcPlcs = data
+        this.plc_id = ''
+        this.plc_code = ''
+        if (this.dataOpcPlcs && this.dataOpcPlcs.length > 0) {
+          this.plc_id = this.dataOpcPlcs[0].plc_id
+          this.plc_code = this.dataOpcPlcs[0].plc_code
+        }
+        this.sliceItem()
+      })
+    },
+    changePlc(val) {
+      this.dataOpcPlcs.forEach(item => {
+        if (item.plc_id === val) {
+          this.plc_code = item.plc_code
+          this.sliceItem()
+          return
+        }
+      })
+    },
+    test_read1() {
+      testRead(this.data1, this.opc_id).then(data => {
+        this.data1 = data
+        this.notify('操作成功!', 'success')
+      }).catch(err => {
+        console.log(err.response.data.message)
+      })
+    },
+    test_write1() {
+      testwrite(this.data2, this.opc_id).then(data => {
+        this.notify('操作成功!', 'success')
+      }).catch(err => {
+        console.log(err.response.data.message)
+      })
+    },
+    doSubmit() {
+      this.$refs['form'].validate((valid) => {
+        if (valid) {
+          this.configLoading = true
+          // 根据驱动类型判断是否为路由设备
+          const parentForm = this.parentForm
+          parentForm.is_route = true
+          parentForm.plc_id = this.plc_id
+          parentForm.opc_id = this.opc_id
+          updateConfig(parentForm, this.form, this.data1, this.data2).then(res => {
+            this.notify('保存成功', 'success')
+            this.configLoading = false
+          }).catch(err => {
+            this.configLoading = false
+            console.log(err.response.data.message)
+          })
+        }
+      })
+    },
+    sliceItem() { // 拼接DB的Item值
+      this.data1.forEach(item => {
+        const str = item.code
+        // 是否包含.
+        if (str.search('.') !== -1) {
+          // 截取最后一位
+          item.code = this.opc_code + '.' + this.plc_code + '.' + this.device_code + '.' + str.slice(str.lastIndexOf('.') + 1)
+        } else {
+          item.code = this.opc_code + '.' + this.plc_code + '.' + this.device_code + '.' + item.code
+        }
+      })
+      this.data2.forEach(item => {
+        const str = item.code
+        // 是否包含.
+        if (str.search('.') !== -1) {
+          // 截取最后一位
+          item.code = this.opc_code + '.' + this.plc_code + '.' + this.device_code + '.' + str.slice(str.lastIndexOf('.') + 1)
+        } else {
+          item.code = this.opc_code + '.' + this.plc_code + '.' + this.device_code + '.' + item.code
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>