rev 设备导入

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

@@ -250,7 +250,7 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial
 //            allDevice.remove(deviceByCode);
 
             log.info("设备删除成功!");
-            if (deviceByCode != null) {
+            if (deviceByCode != null && ObjectUtil.isNotEmpty(deviceByCode.getDeviceDriverDefination())) {
                 if (StrUtil.equals("storage", deviceByCode.getDeviceDriverDefination().getFitDeviceTypes().get(0).name())) {
                     storageTab.delete("substring_index( storage_code,'-',1)= '" + device_code + "'");
 

acs/nladmin-ui/src/api/acs/device/device.js

@@ -149,6 +149,14 @@ export function reload() {
   })
 }
 
+
+export function selectRequestMethodList() {
+  return request({
+    url: 'api/device/selectRequestMethodList',
+    method: 'get'
+  })
+}
+
 export function excelImport(data) {
   return request({
     url: 'api/device/excelImport',
@@ -159,4 +167,4 @@ export function excelImport(data) {
 
 export default { add, edit, del, selectDeviceList, selectDeviceListByRegion, callAgv, responseAgv, selectDeviceDevicerInfo, autoCreateTask,
   changeDeviceStatus, cleanTask, queryStorageExtra, selectConDeviceList, saveBarcode, selectDeviceListOne, selectDeviceListTwo, selectDeviceListThree,
-  addMaterial, cleanMaterial, reload, excelImport }
+  addMaterial, cleanMaterial, reload, selectRequestMethodList, excelImport }

acs/nladmin-ui/src/views/acs/device/driver/lnsh/lnsh_mixing_mill.vue

@@ -501,31 +501,31 @@ export default {
             this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 1)
           }
           if (this.data1[val].code.indexOf('error') !== -1) {
-            this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 1)
+            this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 2)
           }
           if (this.data1[val].code.indexOf('open_time') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 3)
+            this.data1[val].db = beforeStr + '.' + 'String' + (parseInt(endNumber) + 3) + '.50'
           }
           if (this.data1[val].code.indexOf('standby_time') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 7)
+            this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 55)
           }
           if (this.data1[val].code.indexOf('production_time') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 11)
+            this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 59)
           }
           if (this.data1[val].code.indexOf('error_time') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 15)
+            this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 63)
           }
           if (this.data1[val].code.indexOf('weight') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 19)
+            this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 67)
           }
           if (this.data1[val].code.indexOf('order_No') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'STRING' + (parseInt(endNumber) + 23) + '.50'
+            this.data1[val].db = beforeStr + '.' + 'STRING' + (parseInt(endNumber) + 71) + '.50'
           }
           if (this.data1[val].code.indexOf('mix_num') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 73)
+            this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 123)
           }
           if (this.data1[val].code.indexOf('material') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'STRING' + (parseInt(endNumber) + 77) + '.50'
+            this.data1[val].db = beforeStr + '.' + 'STRING' + (parseInt(endNumber) + 127) + '.50'
           }
         }
       }