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

add: 生箔下料到分切上料试运行

Browse Source
This commit is contained in:
ls
2024-12-09 14:16:33 +08:00
parent fa05b5a784
commit 712b63fb71
4 changed files with 44 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java
View File

@@ -36,6 +36,8 @@ import org.nl.acs.device_driver.one_manipulator.trapped_manipulator.TrappedManip
import org.nl.acs.device_driver.one_manipulator.volume_two_manipulator.VolumeTwoManipulatorManipulatorDeviceDriver;
import org.nl.acs.device_driver.stacker.standard_stacker.StandardStackerDeviceDriver;
import org.nl.acs.device_driver.two_conveyor.oven_manipulator.OvenGantryManipulatorDeviceDriver;
import org.nl.acs.device_driver.two_conveyor.pipe_core_rack_manipulator.PipeCoreRackManipulatorDeviceDriver;
import org.nl.acs.device_driver.two_conveyor.roll_up_roller_manipulator.RollUpRollerManipulatorDeviceDriver;
import org.nl.acs.device_driver.two_conveyor.slit_two_manipulator.SlitTwoManipulatorDeviceDriver;
import org.nl.acs.monitor.DeviceStageMonitor;
import org.nl.acs.route.domain.RouteLine;
@@ -1059,6 +1061,15 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
TrappedManipulatorManipulatorDeviceDriver trappedManipulatorManipulatorDeviceDriver = (TrappedManipulatorManipulatorDeviceDriver) device.getDeviceDriver();
trappedManipulatorManipulatorDeviceDriver.setDeviceStatus(form);
}
else if (device.getDeviceDriver() instanceof RollUpRollerManipulatorDeviceDriver) {
RollUpRollerManipulatorDeviceDriver rollUpRollerManipulatorDeviceDriver = (RollUpRollerManipulatorDeviceDriver) device.getDeviceDriver();
rollUpRollerManipulatorDeviceDriver.setDeviceStatus(form);
}
else if (device.getDeviceDriver() instanceof PipeCoreRackManipulatorDeviceDriver) {
PipeCoreRackManipulatorDeviceDriver pipeCoreRackManipulatorDeviceDriver = (PipeCoreRackManipulatorDeviceDriver) device.getDeviceDriver();
pipeCoreRackManipulatorDeviceDriver.setDeviceStatus(form);
}
}
public String formatNum(int x) {

27
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/roll_up_roller_manipulator/RollUpRollerManipulatorDeviceDriver.java
View File

@@ -181,6 +181,7 @@ public class RollUpRollerManipulatorDeviceDriver extends AbstractOpcDeviceDriver
move = this.itemProtocol.getMove();
action = this.itemProtocol.getAction();
error = this.itemProtocol.getError();
error2 = this.itemProtocol.getError2();
task = this.itemProtocol.getTask();
heartbeat = this.itemProtocol.getHeartbeat();
x = this.itemProtocol.getX();
@@ -212,18 +213,18 @@ public class RollUpRollerManipulatorDeviceDriver extends AbstractOpcDeviceDriver
message = "universal_off-line";
//有报警
} else if (error != 0 || error2 != 0) {
} else if (error2 != 0 || error != 0) {
this.setIserror(true);
message = "universal_message3";
//满入空出分配新点位
if (error2 == 2 || error2 == 3) {
if ((error2 == 2 || error2 == 3) && !actionRequireSucess) {
if (task == 0 || target == null) {
notCreateInstMessage = "管芯规格或库位为空";
} else {
if (error2 == 2) {
errorDispose(PointErrorTypeEnum.IN.getCode());
} else {
errorDispose(PointErrorTypeEnum.OUT.getCode());
// errorDispose(PointErrorTypeEnum.OUT.getCode());
}
}
@@ -347,7 +348,12 @@ public class RollUpRollerManipulatorDeviceDriver extends AbstractOpcDeviceDriver
} else {
Instruction instruction = checkInst();
JSONObject param = new JSONObject();
param.put("target", target);
if (error2 == 3){
param.put("target", instruction.getStart_device_code());
}
if (error2 == 2){
param.put("target", instruction.getNext_device_code());
}
param.put("type", code);
param.put("task_code", instruction.getTask_code());
LuceneLogDto logDto = LuceneLogDto.builder()
@@ -365,7 +371,8 @@ public class RollUpRollerManipulatorDeviceDriver extends AbstractOpcDeviceDriver
logDto2.setLog_level(4);
luceneExecuteLogService.deviceExecuteLog(logDto2);
if (jo.getInteger("status") == 200) {
Device gxDevice = deviceAppService.findDeviceByCode(jo.getString("device_code"));
String targetAddress = gxDevice.getExtraValue().get("address").toString();
List list = new ArrayList();
if (error2 == 2) {
Map<String, Object> map1 = new HashMap<>();
@@ -374,8 +381,8 @@ public class RollUpRollerManipulatorDeviceDriver extends AbstractOpcDeviceDriver
list.add(map1);
Map<String, Object> map2 = new HashMap<>();
map2.put("code", "to_new_target");
map2.put("value", jo.getInteger("target"));
list.add(map1);
map2.put("value", targetAddress);
list.add(map2);
this.writing(list);
}
if (error2 == 3) {
@@ -384,9 +391,9 @@ public class RollUpRollerManipulatorDeviceDriver extends AbstractOpcDeviceDriver
map1.put("value", 8);
list.add(map1);
Map<String, Object> map2 = new HashMap<>();
map2.put("code", "to_new_target");
map2.put("value", jo.getInteger("target"));
list.add(map1);
map2.put("code", "to_new_onset");
map2.put("value", targetAddress);
list.add(map2);
this.writing(list);
}
this.actionRequireSucess = true;