root/rl_mg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add日志检索单选框.分拣机械手对接位入库

Browse Source
This commit is contained in:
周俊杰
2023-08-15 13:47:24 +08:00
parent fcf87527fc
commit 621d8d80b5
5 changed files with 139 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -256,80 +256,78 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic
String message = null; String message = null;
try { try {
device_code = this.getDeviceCode(); device_code = this.getDeviceCode();
mode = this.itemProtocol.getMode();
error = this.itemProtocol.getError();
move = this.itemProtocol.getMove();
task = this.itemProtocol.getTask();
hasGoods = this.itemProtocol.getMove();
io_action = this.itemProtocol.getIoAction();
action = this.itemProtocol.getAction();
weight = this.itemProtocol.getWeight();
material = this.itemProtocol.getMaterial();
barcode = this.itemProtocol.getBarcode();
AlongSide = this.itemProtocol.getAlongSide();
BshortSide = this.itemProtocol.getBshortSide();
Htrapezoidal = this.itemProtocol.getHtrapezoidal();
Wthickness = this.itemProtocol.getWthickness();
encoder_qty = this.itemProtocol.getEncoder_qty();
unqualified_qty = this.itemProtocol.getUnqualified_qty();
mode = this.itemProtocol.getMode(); product_code = this.itemProtocol.getProduct_code();
error = this.itemProtocol.getError(); AlongSide = this.itemProtocol.getAlongSide();
move = this.itemProtocol.getMove(); BshortSide = this.itemProtocol.getBshortSide();
task = this.itemProtocol.getTask(); Htrapezoidal = this.itemProtocol.getHtrapezoidal();
hasGoods = this.itemProtocol.getMove(); Wthickness = this.itemProtocol.getWthickness();
io_action = this.itemProtocol.getIoAction(); tray_qty = this.itemProtocol.getTray_qty();
action = this.itemProtocol.getAction(); tray_high = this.itemProtocol.getTray_high();
weight = this.itemProtocol.getWeight(); crib_category = this.itemProtocol.getCrib_category();
material = this.itemProtocol.getMaterial(); palletX1_line = this.itemProtocol.getPalletX1_line();
barcode = this.itemProtocol.getBarcode(); palletY1_row = this.itemProtocol.getPalletY1_row();
AlongSide = this.itemProtocol.getAlongSide(); palletA1_angle = this.itemProtocol.getPalletA1_angle();
BshortSide = this.itemProtocol.getBshortSide(); palletX2_line = this.itemProtocol.getPalletX2_line();
Htrapezoidal = this.itemProtocol.getHtrapezoidal(); palletY2_row = this.itemProtocol.getPalletY2_row();
Wthickness = this.itemProtocol.getWthickness(); palletA2_angle = this.itemProtocol.getPalletA2_angle();
encoder_qty = this.itemProtocol.getEncoder_qty(); palletX3_line = this.itemProtocol.getPalletX3_line();
unqualified_qty = this.itemProtocol.getUnqualified_qty(); palletY3_row = this.itemProtocol.getPalletY3_row();
palletA3_angle = this.itemProtocol.getPalletA3_angle();
product_code = this.itemProtocol.getProduct_code(); pressCribX1_line = this.itemProtocol.getPressCribX1_line();
AlongSide = this.itemProtocol.getAlongSide(); pressCribY1_row = this.itemProtocol.getPressCribY1_row();
BshortSide = this.itemProtocol.getBshortSide(); pressCribA1_angle = this.itemProtocol.getPressCribA1_angle();
Htrapezoidal = this.itemProtocol.getHtrapezoidal(); pressCribX2_line = this.itemProtocol.getPressCribX2_line();
Wthickness = this.itemProtocol.getWthickness(); pressCribY2_row = this.itemProtocol.getPressCribY2_row();
tray_qty = this.itemProtocol.getTray_qty(); pressCribA2_angle = this.itemProtocol.getPressCribA2_angle();
tray_high = this.itemProtocol.getTray_high(); pressCribX3_line = this.itemProtocol.getPressCribX3_line();
crib_category = this.itemProtocol.getCrib_category(); pressCribY3_row = this.itemProtocol.getPressCribY3_row();
palletX1_line = this.itemProtocol.getPalletX1_line(); pressCribA3_angle = this.itemProtocol.getPressCribA3_angle();
palletY1_row = this.itemProtocol.getPalletY1_row(); Zoffset = this.itemProtocol.getZoffset();
palletA1_angle = this.itemProtocol.getPalletA1_angle(); pallet_layerQty = this.itemProtocol.getPallet_layerQty();
palletX2_line = this.itemProtocol.getPalletX2_line(); pressCrib_layerQty = this.itemProtocol.getPressCrib_layerQty();
palletY2_row = this.itemProtocol.getPalletY2_row(); codeLayerX1_interval = this.itemProtocol.getCodeLayerX1_interval();
palletA2_angle = this.itemProtocol.getPalletA2_angle(); codeLayerY1_interval = this.itemProtocol.getCodeLayerY1_interval();
palletX3_line = this.itemProtocol.getPalletX3_line(); codeLayerX2_interval = this.itemProtocol.getCodeLayerX2_interval();
palletY3_row = this.itemProtocol.getPalletY3_row(); codeLayerY2_interval = this.itemProtocol.getCodeLayerY2_interval();
palletA3_angle = this.itemProtocol.getPalletA3_angle(); codeLayerX3_interval = this.itemProtocol.getCodeLayerX3_interval();
pressCribX1_line = this.itemProtocol.getPressCribX1_line(); codeLayerY3_interval = this.itemProtocol.getcodeLayerY3_interval();
pressCribY1_row = this.itemProtocol.getPressCribY1_row(); codeLayerX1_offset = this.itemProtocol.getCodeLayerX1_offset();
pressCribA1_angle = this.itemProtocol.getPressCribA1_angle(); codeLayerY1_offset = this.itemProtocol.getCodeLayerY1_offset();
pressCribX2_line = this.itemProtocol.getPressCribX2_line(); codeLayerX2_offset = this.itemProtocol.getCodeLayerX2_offset();
pressCribY2_row = this.itemProtocol.getPressCribY2_row(); codeLayerY2_offset = this.itemProtocol.getCodeLayerY2_offset();
pressCribA2_angle = this.itemProtocol.getPressCribA2_angle(); codeLayerX3_offset = this.itemProtocol.getCodeLayerX3_offset();
pressCribX3_line = this.itemProtocol.getPressCribX3_line(); codeLayerY3_offset = this.itemProtocol.getCodeLayerY3_offset();
pressCribY3_row = this.itemProtocol.getPressCribY3_row(); pressLayerX1_interval = this.itemProtocol.getPressLayerX1_interval();
pressCribA3_angle = this.itemProtocol.getPressCribA3_angle(); pressLayerY1_interval = this.itemProtocol.getPressLayerY1_interval();
Zoffset = this.itemProtocol.getZoffset(); pressLayerX2_interval = this.itemProtocol.getPressLayerX2_interval();
pallet_layerQty = this.itemProtocol.getPallet_layerQty(); pressLayerY2_interval = this.itemProtocol.getPressLayerY2_interval();
pressCrib_layerQty = this.itemProtocol.getPressCrib_layerQty(); pressLayerX3_interval = this.itemProtocol.getPressLayerX3_interval();
codeLayerX1_interval = this.itemProtocol.getCodeLayerX1_interval(); pressLayerY3_interval = this.itemProtocol.getPressLayerY3_interval();
codeLayerY1_interval = this.itemProtocol.getCodeLayerY1_interval(); pressLayerX1_offset = this.itemProtocol.getPressLayerX1_offset();
codeLayerX2_interval = this.itemProtocol.getCodeLayerX2_interval(); pressLayerY1_offset = this.itemProtocol.getPressLayerY1_offset();
codeLayerY2_interval = this.itemProtocol.getCodeLayerY2_interval(); pressLayerX2_offset = this.itemProtocol.getPressLayerX2_offset();
codeLayerX3_interval = this.itemProtocol.getCodeLayerX3_interval(); pressLayerY2_offset = this.itemProtocol.getPressLayerY2_offset();
codeLayerY3_interval = this.itemProtocol.getcodeLayerY3_interval(); pressLayerX3_offset = this.itemProtocol.getPressLayerX3_offset();
codeLayerX1_offset = this.itemProtocol.getCodeLayerX1_offset(); pressLayerY3_offset = this.itemProtocol.getPressLayerY3_offset();
codeLayerY1_offset = this.itemProtocol.getCodeLayerY1_offset(); tool_coordinate = this.itemProtocol.getTool_coordinate();
codeLayerX2_offset = this.itemProtocol.getCodeLayerX2_offset(); tool_coordinate = this.itemProtocol.getTool_coordinate();
codeLayerY2_offset = this.itemProtocol.getCodeLayerY2_offset();
codeLayerX3_offset = this.itemProtocol.getCodeLayerX3_offset();
codeLayerY3_offset = this.itemProtocol.getCodeLayerY3_offset();
pressLayerX1_interval = this.itemProtocol.getPressLayerX1_interval();
pressLayerY1_interval = this.itemProtocol.getPressLayerY1_interval();
pressLayerX2_interval = this.itemProtocol.getPressLayerX2_interval();
pressLayerY2_interval = this.itemProtocol.getPressLayerY2_interval();
pressLayerX3_interval = this.itemProtocol.getPressLayerX3_interval();
pressLayerY3_interval = this.itemProtocol.getPressLayerY3_interval();
pressLayerX1_offset = this.itemProtocol.getPressLayerX1_offset();
pressLayerY1_offset = this.itemProtocol.getPressLayerY1_offset();
pressLayerX2_offset = this.itemProtocol.getPressLayerX2_offset();
pressLayerY2_offset = this.itemProtocol.getPressLayerY2_offset();
pressLayerX3_offset = this.itemProtocol.getPressLayerX3_offset();
pressLayerY3_offset = this.itemProtocol.getPressLayerY3_offset();
tool_coordinate = this.itemProtocol.getTool_coordinate();
tool_coordinate = this.itemProtocol.getTool_coordinate();
if (mode != last_mode) { if (mode != last_mode) {
this.setRequireSucess(false); this.setRequireSucess(false);
logServer.deviceItemValue(this.device_code, "mode", String.valueOf(mode)); 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() { public synchronized boolean apply_take_full_vehicle() {
if(move > 0) { if(move > 0) {
ApplyTaskRequest request = new ApplyTaskRequest(); ApplyTaskRequest request = new ApplyTaskRequest();
ApplyDeviceDto applyDeviceDto=new ApplyDeviceDto();
request.setDevice_code(this.getDevice_code()); request.setDevice_code(this.getDevice_code());
request.setRequest_medthod_code(Thread.currentThread().getStackTrace()[1].getMethodName()); request.setRequest_medthod_code(Thread.currentThread().getStackTrace()[1].getMethodName());
request.setRequest_medthod_name(RequestMethodEnum.getName(Thread.currentThread().getStackTrace()[1].getMethodName())); request.setRequest_medthod_name(RequestMethodEnum.getName(Thread.currentThread().getStackTrace()[1].getMethodName()));
@@ -850,14 +847,17 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic
List<String> getDeviceCodeList = this.getExtraDeviceCodes("link_device_code"); List<String> getDeviceCodeList = this.getExtraDeviceCodes("link_device_code");
LnshPalletizingManipulatorSiteDeviceDriver lnshPalletizingManipulatorSiteDeviceDriver; LnshPalletizingManipulatorSiteDeviceDriver lnshPalletizingManipulatorSiteDeviceDriver;
for (int i = 0; i < getDeviceCodeList.size(); i++) { for (int i = 0; i < getDeviceCodeList.size(); i++) {
if(device.getDeviceDriver() instanceof LnshPalletizingManipulatorSiteDeviceDriver){ ApplyDeviceDto applyDeviceDto=new ApplyDeviceDto();
lnshPalletizingManipulatorSiteDeviceDriver=(LnshPalletizingManipulatorSiteDeviceDriver) getDevice().getDeviceDriver(); 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.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);
} }
listDto.add(applyDeviceDto);
request.setList(listDto);
} }
ApplyTaskResponse resp = JSON.toJavaObject(JSONObject.parseObject(acsToWmsService.applyTask(request)),ApplyTaskResponse.class); ApplyTaskResponse resp = JSON.toJavaObject(JSONObject.parseObject(acsToWmsService.applyTask(request)),ApplyTaskResponse.class);
message = RequestMethodEnum.getName("apply_take_full_vehicle") + "apply_take_full_vehicle 接口请求LMS..."; message = RequestMethodEnum.getName("apply_take_full_vehicle") + "apply_take_full_vehicle 接口请求LMS...";

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

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

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

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

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

@@ -594,31 +594,31 @@ export default {
this.data2[val].db = beforeStr + '.W224' this.data2[val].db = beforeStr + '.W224'
} }
if (this.data2[val].code.indexOf('to_size_error') !== -1) { 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) { 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) { 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) { 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) { 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) { 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) { 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) { 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) { if (this.data2[val].code.indexOf('to_standard_size_height4') !== -1) {
this.data2[val].db = beforeStr + '.W260' this.data2[val].db = beforeStr + '.REAL260'
} }
} }
} }

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

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