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

rev 抓取站点修改

Browse Source
This commit is contained in:
周俊杰
2023-08-11 17:47:17 +08:00
parent 8edd6d0f69
commit 1670f15446
3 changed files with 89 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

149
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java
View File

@@ -243,85 +243,94 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD
logServer.deviceExecuteLog(this.device_code,"","","信号Wthickness：" + last_Wthickness + " -> " + Wthickness); logServer.deviceExecuteLog(this.device_code,"","","信号Wthickness：" + last_Wthickness + " -> " + Wthickness);
} }
if(grab_station != last_grab_station){ if(grab_station != last_grab_station){
GrabPlaceStationRequest request = new GrabPlaceStationRequest(); if(grab_station>0) {
request.setDevice_code(this.getDevice_code()); GrabPlaceStationRequest request = new GrabPlaceStationRequest();
request.setRequest_medthod_code(RequestMethodEnum.apply_get_put_station.getCode()); request.setDevice_code(this.getDevice_code());
request.setRequest_medthod_name(RequestMethodEnum.apply_get_put_station.getName()); request.setRequest_medthod_code(RequestMethodEnum.apply_get_put_station.getCode());
List<String> getDeviceCodeList = this.getExtraDeviceCodes("link_get_station"); request.setRequest_medthod_name(RequestMethodEnum.apply_get_put_station.getName());
List<String> putDeviceCodeList = this.getExtraDeviceCodes("link_put_station"); List<String> getDeviceCodeList = this.getExtraDeviceCodes("link_get_station");
request.setGet_station(getDeviceCodeList.get(grab_station)); List<String> putDeviceCodeList = this.getExtraDeviceCodes("link_put_station");
request.setPut_station(putDeviceCodeList.get(place_station)); request.setGet_station(getDeviceCodeList.get((grab_station)-1));
Device getDevice = deviceAppService.findDeviceByCode(getDeviceCodeList.get(grab_station).toString()); request.setPut_station(putDeviceCodeList.get((place_station)-1));
Device putDevice = deviceAppService.findDeviceByCode(putDeviceCodeList.get(place_station).toString()); Device getDevice = deviceAppService.findDeviceByCode(getDeviceCodeList.get(grab_station).toString());
Device putDevice = deviceAppService.findDeviceByCode(putDeviceCodeList.get(place_station).toString());
if (ObjectUtil.isEmpty(getDevice)) { if (ObjectUtil.isEmpty(getDevice)) {
throw new Exception("抓取位未找到对应设备：" + getDeviceCodeList.get(grab_station)); throw new Exception("抓取位未找到对应设备：" + getDeviceCodeList.get(grab_station));
} }
if (ObjectUtil.isEmpty(putDevice)) { if (ObjectUtil.isEmpty(putDevice)) {
throw new Exception("放置位找到对应设备：" + putDeviceCodeList.get(grab_station)); throw new Exception("放置位找到对应设备：" + putDeviceCodeList.get(grab_station));
}
LnshPalletizingManipulatorSiteDeviceDriver lnshPalletizingManipulatorSiteDeviceDriver;
if (getDevice.getDeviceDriver() instanceof LnshPalletizingManipulatorSiteDeviceDriver) {
lnshPalletizingManipulatorSiteDeviceDriver = (LnshPalletizingManipulatorSiteDeviceDriver) getDevice.getDeviceDriver();
request.setGet_station_vehicle_code(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getBarcode()));
request.setGet_station_qty(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getEncoder_qty()));
}
if (putDevice.getDeviceDriver() instanceof LnshPalletizingManipulatorSiteDeviceDriver) {
lnshPalletizingManipulatorSiteDeviceDriver = (LnshPalletizingManipulatorSiteDeviceDriver) putDevice.getDeviceDriver();
request.setPut_station_vehicle_code(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getBarcode()));
request.setPut_station_qty(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getEncoder_qty()));
}
GrabPlaceStationResponse resp = JSON.toJavaObject(JSONObject.parseObject(acsToWmsService.applyTask(request)), GrabPlaceStationResponse.class);
message = RequestMethodEnum.getName("apply_get_put_station") + "apply_get_put_station 接口请求LMS...";
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request)));
if (resp.getCode() == 200) {
message = RequestMethodEnum.getName("apply_get_put_station") + "apply_get_put_station 接口请求成功" + resp.getMessage();
;
} else {
message = RequestMethodEnum.getName("apply_get_put_station") + "apply_get_put_station 接口请求失败" + resp.getMessage();
;
}
} }
LnshPalletizingManipulatorSiteDeviceDriver lnshPalletizingManipulatorSiteDeviceDriver;
if(getDevice.getDeviceDriver() instanceof LnshPalletizingManipulatorSiteDeviceDriver){
lnshPalletizingManipulatorSiteDeviceDriver = (LnshPalletizingManipulatorSiteDeviceDriver) getDevice.getDeviceDriver();
request.setGet_station_vehicle_code(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getBarcode()));
request.setGet_station_qty(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getEncoder_qty()));
}
if(putDevice.getDeviceDriver() instanceof LnshPalletizingManipulatorSiteDeviceDriver){
lnshPalletizingManipulatorSiteDeviceDriver = (LnshPalletizingManipulatorSiteDeviceDriver) putDevice.getDeviceDriver();
request.setPut_station_vehicle_code(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getBarcode()));
request.setPut_station_qty(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getEncoder_qty()));
}
GrabPlaceStationResponse resp = JSON.toJavaObject(JSONObject.parseObject(acsToWmsService.applyTask(request)), GrabPlaceStationResponse.class);
message = RequestMethodEnum.getName("apply_get_put_station") + "apply_get_put_station 接口请求LMS...";
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request)));
if (resp.getCode() == 200) {
message = RequestMethodEnum.getName("apply_get_put_station") + "apply_get_put_station 接口请求成功" + resp.getMessage();;
} else {
message = RequestMethodEnum.getName("apply_get_put_station") + "apply_get_put_station 接口请求失败" + resp.getMessage();;
}
} }
if(place_station != last_place_station){ if(place_station != last_place_station){
GrabPlaceStationRequest request = new GrabPlaceStationRequest(); if(place_station>0) {
request.setDevice_code(this.getDevice_code()); GrabPlaceStationRequest request = new GrabPlaceStationRequest();
request.setRequest_medthod_code(RequestMethodEnum.apply_get_put_station.getCode()); request.setDevice_code(this.getDevice_code());
request.setRequest_medthod_name(RequestMethodEnum.apply_get_put_station.getName()); request.setRequest_medthod_code(RequestMethodEnum.apply_get_put_station.getCode());
List<String> getDeviceCodeList = this.getExtraDeviceCodes("link_get_station"); request.setRequest_medthod_name(RequestMethodEnum.apply_get_put_station.getName());
List<String> putDeviceCodeList = this.getExtraDeviceCodes("link_put_station"); List<String> getDeviceCodeList = this.getExtraDeviceCodes("link_get_station");
request.setGet_station(getDeviceCodeList.get(grab_station)); List<String> putDeviceCodeList = this.getExtraDeviceCodes("link_put_station");
request.setPut_station(putDeviceCodeList.get(place_station)); request.setGet_station(getDeviceCodeList.get((grab_station)-1));
Device getDevice = deviceAppService.findDeviceByCode(getDeviceCodeList.get(grab_station).toString()); request.setPut_station(putDeviceCodeList.get((place_station)-1));
Device putDevice = deviceAppService.findDeviceByCode(putDeviceCodeList.get(place_station).toString()); Device getDevice = deviceAppService.findDeviceByCode(getDeviceCodeList.get(grab_station).toString());
Device putDevice = deviceAppService.findDeviceByCode(putDeviceCodeList.get(place_station).toString());
if (ObjectUtil.isEmpty(getDevice)) { if (ObjectUtil.isEmpty(getDevice)) {
throw new Exception("抓取位未找到对应设备：" + getDeviceCodeList.get(grab_station)); throw new Exception("抓取位未找到对应设备：" + getDeviceCodeList.get(grab_station));
} }
if (ObjectUtil.isEmpty(putDevice)) { if (ObjectUtil.isEmpty(putDevice)) {
throw new Exception("放置位找到对应设备：" + putDeviceCodeList.get(grab_station)); throw new Exception("放置位找到对应设备：" + putDeviceCodeList.get(grab_station));
} }
LnshPalletizingManipulatorSiteDeviceDriver lnshPalletizingManipulatorSiteDeviceDriver; LnshPalletizingManipulatorSiteDeviceDriver lnshPalletizingManipulatorSiteDeviceDriver;
if(getDevice.getDeviceDriver() instanceof LnshPalletizingManipulatorSiteDeviceDriver){ if (getDevice.getDeviceDriver() instanceof LnshPalletizingManipulatorSiteDeviceDriver) {
lnshPalletizingManipulatorSiteDeviceDriver = (LnshPalletizingManipulatorSiteDeviceDriver) getDevice.getDeviceDriver(); lnshPalletizingManipulatorSiteDeviceDriver = (LnshPalletizingManipulatorSiteDeviceDriver) getDevice.getDeviceDriver();
request.setGet_station_vehicle_code(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getBarcode())); request.setGet_station_vehicle_code(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getBarcode()));
request.setGet_station_qty(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getEncoder_qty())); request.setGet_station_qty(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getEncoder_qty()));
} }
if(putDevice.getDeviceDriver() instanceof LnshPalletizingManipulatorSiteDeviceDriver){ if (putDevice.getDeviceDriver() instanceof LnshPalletizingManipulatorSiteDeviceDriver) {
lnshPalletizingManipulatorSiteDeviceDriver = (LnshPalletizingManipulatorSiteDeviceDriver) putDevice.getDeviceDriver(); lnshPalletizingManipulatorSiteDeviceDriver = (LnshPalletizingManipulatorSiteDeviceDriver) putDevice.getDeviceDriver();
request.setPut_station_vehicle_code(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getBarcode())); request.setPut_station_vehicle_code(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getBarcode()));
request.setPut_station_qty(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getEncoder_qty())); request.setPut_station_qty(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getEncoder_qty()));
} }
GrabPlaceStationResponse resp = JSON.toJavaObject(JSONObject.parseObject(acsToWmsService.applyTask(request)), GrabPlaceStationResponse.class); GrabPlaceStationResponse resp = JSON.toJavaObject(JSONObject.parseObject(acsToWmsService.applyTask(request)), GrabPlaceStationResponse.class);
message = RequestMethodEnum.getName("apply_get_put_station") + "apply_get_put_station 接口请求LMS..."; message = RequestMethodEnum.getName("apply_get_put_station") + "apply_get_put_station 接口请求LMS...";
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request)));
if (resp.getCode() == 200) { if (resp.getCode() == 200) {
message = RequestMethodEnum.getName("apply_get_put_station") + "apply_get_put_station 接口请求成功" + resp.getMessage();; message = RequestMethodEnum.getName("apply_get_put_station") + "apply_get_put_station 接口请求成功" + resp.getMessage();
} else { ;
message = RequestMethodEnum.getName("apply_get_put_station") + "apply_get_put_station 接口请求失败" + resp.getMessage();; } else {
message = RequestMethodEnum.getName("apply_get_put_station") + "apply_get_put_station 接口请求失败" + resp.getMessage();
;
}
} }
} }

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

@@ -309,7 +309,10 @@ public class LnshPressDeviceDriver extends AbstractOpcDeviceDriver implements De
message = RequestMethodEnum.getName("order_verify") + "order_verify 接口请求失败" + resp.getMessage(); message = RequestMethodEnum.getName("order_verify") + "order_verify 接口请求失败" + resp.getMessage();
} }
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message)); lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message));
}else{
log.info("排产单不正确：{}",order_No);
} }
return true; return true;
} }

7
acs/nladmin-ui/src/views/acs/device/driver/lnsh/lnsh_package_pallet_manipulator.vue
View File

@@ -483,6 +483,13 @@ export default {
} }
this.data1 = data.rs this.data1 = data.rs
this.data2 = data.ws this.data2 = data.ws
if (data.modeform) {
const arr = Object.keys(data.modeform)
// 不为空
if (arr.length > 0) {
this.modeform.tableData = data.modeform
}
}
this.sliceItem() this.sliceItem()
}) })
selectPlcList().then(data => { selectPlcList().then(data => {