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

add: 烘箱行架增加日志和套轴等待

Browse Source
This commit is contained in:
yanps
2024-01-04 09:36:49 +08:00
parent 8e5c76a0a1
commit f69d754c9c
8 changed files with 83 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/casing_station/CasingStationConveyorDeviceDriver.java
View File

@@ -250,13 +250,13 @@ public class CasingStationConveyorDeviceDriver extends AbstractOpcDeviceDriver i
// apply_for_casing_inspection(material1, material2);
bushingSucess();
} else if (move != 1) {
remark += "套管工位没有货";
remark = "套管工位没有货";
} else if (task < 1) {
remark += "纸管库的任务号为空";
remark = "纸管库的任务号为空";
} else if (task1 < 1) {
remark += "行架任务为空";
remark = "行架任务为空";
} else if (requireSucess) {
remark += "requrieSucess为" + requireSucess;
remark = "requrieSucess为" + requireSucess;
}
break;
default:

27
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/indoor_manipulator/IndoorManipulatorDeviceDriver.java
View File

@@ -577,6 +577,33 @@ public class IndoorManipulatorDeviceDriver extends AbstractOpcDeviceDriver imple
}
}
//异常气胀轴反馈
/*if (action == 9) {
String task_code = inst1.getTask_code();
applyManipulatorActionRequest.setType("9");
applyManipulatorActionRequest.setTask_code1(task_code);
logServer.deviceExecuteLog(this.device_code, "", "", "异常反馈");
applyManipulatorActionResponse = acsToWmsService.applyManipulatorActionRequest(applyManipulatorActionRequest);
if (ObjectUtil.isNotEmpty(applyManipulatorActionResponse) && applyManipulatorActionResponse.getstatus() == 200) {
logServer.deviceExecuteLog(this.device_code, "", "", "异常反馈完成,响应参数:" + JSON.toJSONString(applyManipulatorActionResponse));
Map<String, Object> map = new LinkedHashMap<>();
map.put("to_command", 9);
this.writing(map);
feedbackSucess = true;
message = "缓存库放货成功";
try {
instructionService.cancel(inst1.getInstruction_id());
logServer.deviceExecuteLog(this.device_code, "", "", "取消指令完成");
TaskDto byTaskCode = taskserver.findByTaskCode(inst1.getTask_code());
taskserver.cancel(byTaskCode.getTask_id());
logServer.deviceExecuteLog(this.device_code, "", "", "取消任务完成");
} catch (Exception e) {
message = "取消任务或指令失败,失败原因"+ e.getMessage();
logServer.deviceExecuteLog(this.device_code, "", "", "取消任务或指令失败,失败原因"+e.getMessage());
}
}
}*/
//放货完成
if (mode == 3 && action == 8 && move == 0) {

15
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java
View File

@@ -797,6 +797,20 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
} else if (this.getAction() == 4) {
action = "放货完成";
}
String steps_type = "";
if (now_steps_type == 0) {
steps_type += "无任务执行";
} else if (now_steps_type == 1) {
steps_type = "更新指令状态";
} else if (now_steps_type == 2) {
steps_type = "下发电气信号";
}else if(now_steps_type == 3){
steps_type = "允许取货";
}else if (now_steps_type ==4 ){
steps_type += "允许放货";
}else if (now_steps_type == 5){
steps_type += "放货完成";
}
jo.put("device_name", this.getDevice().getDevice_name());
jo.put("mode", mode);
@@ -815,6 +829,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
jo.put("is_click", true);
jo.put("x", x_position);
jo.put("y", y_position);
jo.put("now_steps_type", steps_type);
return jo;
}

12
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/plugging_unplugging_machine/PluggingUnpluggingMachineDeviceDriver.java
View File

@@ -248,14 +248,22 @@ public class PluggingUnpluggingMachineDeviceDriver extends AbstractOpcDeviceDriv
requireSucess = true;
logServer.deviceExecuteLog(this.device_code, "", "", "申请套轴成功,返回参数:" + applyManipulatorActionResponse);
message = "套轴申请成功";
}else if (ObjectUtils.isNotEmpty(applyManipulatorActionResponse) && "2".equals(applyManipulatorActionResponse.getIs_bushing())){
message = applyManipulatorActionResponse.getMessage();
Map<String, Object> map = new LinkedHashMap<>();
map.put("to_command", 98);
this.writing(map);
requireSucess = true;
message = "等待套轴";
logServer.deviceExecuteLog(this.device_code, "", "", "等待套轴,返回参数:" + applyManipulatorActionResponse);
}else {
message = applyManipulatorActionResponse.getMessage();
Map<String, Object> map = new LinkedHashMap<>();
map.put("to_command", 99);
this.writing(map);
requireSucess = true;
message = "申请失败";
logServer.deviceExecuteLog(this.device_code, "", "", "申请套轴失败,返回参数:" + applyManipulatorActionResponse);
message = "套轴申请失败";
logServer.deviceExecuteLog(this.device_code, "", "", "套轴申请失败,返回参数:" + applyManipulatorActionResponse);
}
}

2
acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/WmsToAcsController.java
View File

@@ -33,7 +33,6 @@ public class WmsToAcsController {
@PostMapping("/task")
@Log(value = "ACS接收WMS任务",isInterfaceLog = true,interfaceLogType= InterfaceLogType.LMS_TO_ACS)
@SaIgnore
public ResponseEntity<Object> createFromWms(@RequestBody String whereJson) {
return new ResponseEntity<>(wmstoacsService.crateTask(whereJson), HttpStatus.OK);
@@ -73,7 +72,6 @@ public class WmsToAcsController {
@PostMapping("/action")
@Log(value = "WMS下发点位信号",isInterfaceLog = true,interfaceLogType= InterfaceLogType.LMS_TO_ACS)
@SaIgnore
public ResponseEntity<Object> putAction(@RequestBody String whereJson) throws Exception {
return new ResponseEntity<>(wmstoacsService.putAction(whereJson), HttpStatus.OK);

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

@@ -207,6 +207,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
HongXiangStationDeviceDriver hongXiangStationDeviceDriver;
LampThreecolorDeviceDriver lampThreecolorDeviceDriver;
SiemensConveyorDeviceDriver siemensConveyorDeviceDriver;
PluggingUnpluggingMachineDeviceDriver pluggingUnpluggingMachineDeviceDriver;
if (device.getDeviceDriver() instanceof HongXiangStationDeviceDriver) {
hongXiangStationDeviceDriver = (HongXiangStationDeviceDriver) device.getDeviceDriver();
hongXiangStationDeviceDriver.writing(code, value);
@@ -219,6 +220,10 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
siemensConveyorDeviceDriver = (SiemensConveyorDeviceDriver) device.getDeviceDriver();
siemensConveyorDeviceDriver.writing(code, value);
}
if (device.getDeviceDriver() instanceof PluggingUnpluggingMachineDeviceDriver) {
pluggingUnpluggingMachineDeviceDriver = (PluggingUnpluggingMachineDeviceDriver) device.getDeviceDriver();
pluggingUnpluggingMachineDeviceDriver.writing(code, value);
}
}

BIN
acs/nladmin-ui/dist.rar Normal file
View File

Binary file not shown.

3
acs/nladmin-ui/src/views/system/monitor/device/index.vue
View File

@@ -749,6 +749,9 @@ export default {
} else if (val === 'out_qty_arr') {
const obj = { name: '出库数量', value: data[val] }
this.arr.push(obj)
} else if (val === 'now_steps_type') {
const obj = { name: '烘箱执行信号', value: data[val] }
this.arr.push(obj)
}
}
}