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

洁美更新

Browse Source
This commit is contained in:
loujf
2022-07-04 09:43:04 +08:00
parent 77e6873082
commit 8f877a3192
3 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
acs/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
View File

@@ -453,9 +453,23 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
dto.setCompound_inst_data(task.getCompound_task_data());
}
}
//如果为true，则不是前三条指令，非前三条指令情况下的输送入库指令agv类型都为 1
Boolean createLock = false;
Device deviceByCode = deviceAppService.findDeviceByCode(task.getStart_device_code());
StandardCoveyorControlWithScannerDeviceDriver standardCoveyorControlWithScannerDeviceDriver;
if (deviceByCode.getDeviceDriver() instanceof StandardCoveyorControlWithScannerDeviceDriver) {
standardCoveyorControlWithScannerDeviceDriver = (StandardCoveyorControlWithScannerDeviceDriver) deviceByCode.getDeviceDriver();
createLock = standardCoveyorControlWithScannerDeviceDriver.getCreateLock();
}
String agvType = "";
if (task.getTask_type().equals("2")) {
agvType = "3";
if (createLock) {
agvType = "1";
} else {
agvType = "3";
}
} else if (task.getTask_type().equals("12")) {
agvType = "2";
} else {
@@ -474,7 +488,6 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
StandardInspectSiteDeviceDriver standardInspectSiteDeviceDriver;
LampThreecolorDeviceDriver lampThreecolorDeviceDriver;
StandardCoveyorControlWithScannerDeviceDriver standardCoveyorControlWithScannerDeviceDriver;
StandardCoveyorControlWithPlcScannerDeviceDriver standardCoveyorControlWithPlcScannerDeviceDriver;
StandardCoveyorControlDeviceDriver standardCoveyorControlDeviceDriver;
StandardStorageDeviceDriver standardStorageDeviceDriver;

2
acs/hd/nladmin-system/src/main/java/org/nl/acs/stage/service/impl/StageActorServiceImpl.java
View File

@@ -924,6 +924,8 @@ public class StageActorServiceImpl implements StageActorService {
agvTaskTypeNmae = "入库";
} else if (jmAgvDeviceDriver.getAgvTaskType().equals("11")) {
agvTaskTypeNmae = "出库";
} else if (jmAgvDeviceDriver.getAgvTaskType().equals("20")) {
agvTaskTypeNmae = "禁用";
}
obj.put("devicede_name", jmAgvDeviceDriver.getDevice().getDevice_name());
jo.put("mode",mode);

2
acs/hd/nladmin-system/src/main/java/org/nl/hand/ajm/service/impl/JMHandServiceImpl.java
View File

@@ -766,7 +766,7 @@ public class JMHandServiceImpl implements JMHandService {
instdto.setInstruction_id(IdUtil.simpleUUID());
instdto.setInstruction_code(CodeUtil.getNewCode("INSTRUCT_NO"));
instdto.setRemark(taskjo.optString("remark"));
instdto.setMaterial(taskjo.optString("taskjo"));
instdto.setMaterial(taskjo.optString("material"));
instdto.setTask_id(taskjo.optString("task_id"));
instdto.setTask_code(taskjo.optString("task_code"));
instdto.setVehicle_code(taskjo.optString("vehicle_code"));