Merge branch 'master' of http://121.40.234.130:8899/root/rl_mg

acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDeviceDriver.java

@@ -256,7 +256,6 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic
         String message = null;
         try {
             device_code = this.getDeviceCode();
-
                 mode = this.itemProtocol.getMode();
                 error = this.itemProtocol.getError();
                 move = this.itemProtocol.getMove();
@@ -329,7 +328,6 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic
                 pressLayerY3_offset = this.itemProtocol.getPressLayerY3_offset();
                 tool_coordinate = this.itemProtocol.getTool_coordinate();
                 tool_coordinate = this.itemProtocol.getTool_coordinate();
-
             if (mode != last_mode) {
                 this.setRequireSucess(false);
                 logServer.deviceItemValue(this.device_code, "mode", String.valueOf(mode));
@@ -830,7 +828,6 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic
     public synchronized boolean apply_take_full_vehicle() {
         if(move > 0) {
             ApplyTaskRequest request = new ApplyTaskRequest();
-            ApplyDeviceDto applyDeviceDto=new ApplyDeviceDto();
             request.setDevice_code(this.getDevice_code());
             request.setRequest_medthod_code(Thread.currentThread().getStackTrace()[1].getMethodName());
             request.setRequest_medthod_name(RequestMethodEnum.getName(Thread.currentThread().getStackTrace()[1].getMethodName()));
@@ -850,15 +847,18 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic
                 List<String> getDeviceCodeList = this.getExtraDeviceCodes("link_device_code");
                 LnshPalletizingManipulatorSiteDeviceDriver lnshPalletizingManipulatorSiteDeviceDriver;
                 for (int i = 0; i < getDeviceCodeList.size(); i++) {
-                    if(device.getDeviceDriver() instanceof LnshPalletizingManipulatorSiteDeviceDriver){
-                        lnshPalletizingManipulatorSiteDeviceDriver=(LnshPalletizingManipulatorSiteDeviceDriver) getDevice().getDeviceDriver();
+                    ApplyDeviceDto applyDeviceDto=new ApplyDeviceDto();
+                    Device getDevice = deviceAppService.findDeviceByCode(getDeviceCodeList.get(i).toString());
+                    if(getDevice.getDeviceDriver() instanceof LnshPalletizingManipulatorSiteDeviceDriver){
+                        lnshPalletizingManipulatorSiteDeviceDriver=(LnshPalletizingManipulatorSiteDeviceDriver) getDevice.getDeviceDriver();
                         applyDeviceDto.setQty(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getEncoder_qty()));
-                        applyDeviceDto.setDevice_code(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getBarcode()));
-                    }
+                        applyDeviceDto.setDevice_code(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getDevice_code()));
+                        applyDeviceDto.setVehicle_code(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getBarcode()));
                     }
                     listDto.add(applyDeviceDto);
                     request.setList(listDto);
                 }
+                }
             ApplyTaskResponse resp =  JSON.toJavaObject(JSONObject.parseObject(acsToWmsService.applyTask(request)),ApplyTaskResponse.class);
             message = RequestMethodEnum.getName("apply_take_full_vehicle") + "apply_take_full_vehicle 接口请求LMS...";
             lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request)));

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

@@ -238,15 +238,15 @@ public class ItemProtocol {
         list.add(new ItemDto(item_to_BshortSide, "B短边", "DB101.W220"));
         list.add(new ItemDto(item_to_Htrapezoidal, "H梯形高", "DB101.W222"));
         list.add(new ItemDto(item_to_Wthickness, "W厚度", "DB101.W224"));
-        list.add(new ItemDto(item_to_size_error, "尺寸允许误差", "DB101.W228"));
-        list.add(new ItemDto(item_to_single_weight, "单重允许误差", "DB101.W232"));
-        list.add(new ItemDto(item_to_drawing_address, "图纸地址", "DB101.W236"));
-        list.add(new ItemDto(item_to_standard_weight, "标准重量", "DB101.W240"));
-        list.add(new ItemDto(item_to_detection_error, "检测误差值", "DB101.W244"));
-        list.add(new ItemDto(item_to_standard_size_height1, "标准尺寸高度1", "DB101.W248"));
-        list.add(new ItemDto(item_to_standard_size_height2, "标准尺寸高度2", "DB101.W252"));
-        list.add(new ItemDto(item_to_standard_size_height3, "标准尺寸高度3", "DB101.W256"));
-        list.add(new ItemDto(item_to_standard_size_height4, "标准尺寸高度4", "DB101.W260"));
+        list.add(new ItemDto(item_to_size_error, "尺寸允许误差", "DB101.REAL228"));
+        list.add(new ItemDto(item_to_single_weight, "单重允许误差", "DB101.REAL232"));
+        list.add(new ItemDto(item_to_drawing_address, "图纸地址", "DB101.REAL236"));
+        list.add(new ItemDto(item_to_standard_weight, "标准重量", "DB101.REAL240"));
+        list.add(new ItemDto(item_to_detection_error, "检测误差值", "DB101.REAL244"));
+        list.add(new ItemDto(item_to_standard_size_height1, "标准尺寸高度1", "DB101.REAL248"));
+        list.add(new ItemDto(item_to_standard_size_height2, "标准尺寸高度2", "DB101.REAL252"));
+        list.add(new ItemDto(item_to_standard_size_height3, "标准尺寸高度3", "DB101.REAL256"));
+        list.add(new ItemDto(item_to_standard_size_height4, "标准尺寸高度4", "DB101.REAL260"));
         return list;
     }
 

acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java

@@ -7,6 +7,7 @@ import cn.hutool.http.HttpResponse;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.acs.config.AcsConfig;
@@ -281,7 +282,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         try {
             MDC.put(log_file_type, log_type);
             String api = addressService.findByCode("lnshApplyTaskToWms").getMethods_url();
-            log.info("lnshApplyTaskToWms-----输入参数{}", JSON.toJSONString(requestParam));
+            log.info("lnshApplyTaskToWms-----输入参数{}", JSON.toJSONString(requestParam, SerializerFeature.DisableCircularReferenceDetect));
             String result = LmsUtil.notifyAcs(api, requestParam);
             log.info("lnshApplyTaskToWms-----输出参数{}", result);
             return result;

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

@@ -594,31 +594,31 @@ export default {
             this.data2[val].db = beforeStr + '.W224'
           }
           if (this.data2[val].code.indexOf('to_size_error') !== -1) {
-            this.data2[val].db = beforeStr + '.W228'
+            this.data2[val].db = beforeStr + '.REAL228'
           }
           if (this.data2[val].code.indexOf('to_single_weight') !== -1) {
-            this.data2[val].db = beforeStr + '.W232'
+            this.data2[val].db = beforeStr + '.REAL232'
           }
           if (this.data2[val].code.indexOf('to_drawing_address') !== -1) {
-            this.data2[val].db = beforeStr + '.W236'
+            this.data2[val].db = beforeStr + '.REAL236'
           }
           if (this.data2[val].code.indexOf('to_standard_weight') !== -1) {
-            this.data2[val].db = beforeStr + '.W240'
+            this.data2[val].db = beforeStr + '.REAL240'
           }
           if (this.data2[val].code.indexOf('to_detection_error') !== -1) {
-            this.data2[val].db = beforeStr + '.W244'
+            this.data2[val].db = beforeStr + '.REAL244'
           }
           if (this.data2[val].code.indexOf('to_standard_size_height1') !== -1) {
-            this.data2[val].db = beforeStr + '.W248'
+            this.data2[val].db = beforeStr + '.REAL248'
           }
           if (this.data2[val].code.indexOf('to_standard_size_height2') !== -1) {
-            this.data2[val].db = beforeStr + '.W252'
+            this.data2[val].db = beforeStr + '.REAL252'
           }
           if (this.data2[val].code.indexOf('to_standard_size_height3') !== -1) {
-            this.data2[val].db = beforeStr + '.W256'
+            this.data2[val].db = beforeStr + '.REAL256'
           }
           if (this.data2[val].code.indexOf('to_standard_size_height4') !== -1) {
-            this.data2[val].db = beforeStr + '.W260'
+            this.data2[val].db = beforeStr + '.REAL260'
           }
         }
       }

acs/nladmin-ui/src/views/monitor/lucene/search.vue

@@ -1,13 +1,44 @@
 <template>
   <div v-if="crud.props.searchToggle">
-    <el-input
+
+    <!-- <el-input
       v-model="query.device_code"
       clearable
       size="small"
       placeholder="请输入你要搜索的设备号"
       style="width: 200px;"
       class="filter-item"
+    /> -->
+        <!-- <el-select
+          v-model="query.device_code"
+          clearable
+          filterable
+          size="small"
+          placeholder="请输入你要搜索的设备号"
+          class="filter-item"
+          style="width: 190px"
+          @change="crud.toQuery"
+        >
+        <el-option v-for="item in device_codes" :key="item.id" :label="item.label" :value="item.value" />
+        </el-select> -->
+    <el-select
+      v-model="query.device_code"
+      filterable
+      ref="test"
+      clearable
+      reserveKeyword
+      @change="crud.toQuery"
+      placeholder="设备号"
+      style="width: 190px;"
+    >
+      <el-option
+        v-for="item in deviceList"
+        :key="item.device_code"
+        :label="item.device_code"
+        :value="item.device_code"
       />
+    </el-select>
+
     <el-input
       v-model="query.method"
       clearable
@@ -69,6 +100,7 @@
 <script>
 import { header } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
+import deviceCrud from '@/api/acs/device/device'
 
 export default {
   components: { rrOperation },
@@ -104,10 +136,15 @@ export default {
         }]
       },
       value1: [new Date(2000, 10, 10, 10, 10), new Date(2000, 10, 11, 10, 10)],
-      value2: ''
+      value2: '',
+      deviceList: [],
+      device_code: '',
     }
   },
   created() {
+    deviceCrud.selectDeviceList().then(data => {
+        this.deviceList = data
+      })
   }
 }
 </script>