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

add : 测试入库

Browse Source
This commit is contained in:
lishuai
2024-01-23 09:54:20 +08:00
parent f4f822d073
commit 54bcba8ef4
1 changed files with 42 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java
View File

@@ -378,29 +378,27 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv
String taskcode = taskdto.getTask_code(); String taskcode = taskdto.getTask_code();
String vehiclecode = taskdto.getVehicle_code(); String vehiclecode = taskdto.getVehicle_code();
String priority = taskdto.getPriority(); String priority = taskdto.getPriority();
if (TaskTypeEnum.AGV_Task.equals(taskdto.getTask_type())){
}
Instruction instdto = new Instruction(); Instruction instdto = new Instruction();
instdto.setInstruction_id(IdUtil.simpleUUID()); if (TaskTypeEnum.AGV_Task.equals(taskdto.getTask_type())){
instdto.setRoute_plan_code(taskdto.getRoute_plan_code()); String route_plan_code = taskdto.getRoute_plan_code();
instdto.setRemark(taskdto.getRemark());
instdto.setMaterial(taskdto.getMaterial()); List<RouteLineDto> shortPathsList = routeLineService.getShortPathLines(taskdto.getStart_device_code(), taskdto.getNext_device_code(), route_plan_code);
instdto.setQuantity(taskdto.getQuantity()); if (CollectionUtil.isEmpty(shortPathsList)){
instdto.setTask_id(taskid); return false;
instdto.setTask_code(taskcode); }
instdto.setVehicle_code(vehiclecode); RouteLineDto routeLineDto = shortPathsList.get(0);
String now = DateUtil.now(); String path = routeLineDto.getPath();
instdto.setCreate_time(now); String[] str = path.split("->");
instdto.setCreate_by("auto"); List<String> pathlist = Arrays.asList(str);
instdto.setStart_device_code(taskdto.getStart_device_code()); Integer start = 1;
instdto.setNext_device_code(taskdto.getNext_device_code()); String start_device_code = pathlist.get(start);
instdto.setStart_point_code(taskdto.getStart_device_code()); String next_device_code = pathlist.get(start+1);
instdto.setNext_point_code(taskdto.getNext_device_code()); packageInstrcutData(instdto, taskdto, taskid, taskcode, vehiclecode, priority,start_device_code,next_device_code);
instdto.setPriority(priority); }else {
instdto.setInstruction_status("0");
instdto.setExecute_device_code(device_code);
instdto.setInstruction_type(taskdto.getTask_type()); packageInstrcutData(instdto, taskdto, taskid, taskcode, vehiclecode, priority,taskdto.getStart_device_code(),taskdto.getNext_device_code());
}
try { try {
instructionService.create(instdto); instructionService.create(instdto);
} catch (Exception e) { } catch (Exception e) {
@@ -449,6 +447,28 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv
} }
} }
private void packageInstrcutData(Instruction instdto, TaskDto taskdto, String taskid, String taskcode, String vehiclecode, String priority,String startCode, String endCode) {
instdto.setInstruction_id(IdUtil.simpleUUID());
instdto.setRoute_plan_code(taskdto.getRoute_plan_code());
instdto.setRemark(taskdto.getRemark());
instdto.setMaterial(taskdto.getMaterial());
instdto.setQuantity(taskdto.getQuantity());
instdto.setTask_id(taskid);
instdto.setTask_code(taskcode);
instdto.setVehicle_code(vehiclecode);
String now = DateUtil.now();
instdto.setCreate_time(now);
instdto.setCreate_by("auto");
instdto.setStart_device_code(startCode);
instdto.setNext_device_code(endCode);
instdto.setStart_point_code(startCode);
instdto.setNext_point_code(endCode);
instdto.setPriority(priority);
instdto.setInstruction_status("0");
instdto.setExecute_device_code(device_code);
instdto.setInstruction_type(taskdto.getTask_type());
}
public void writing(List list) { public void writing(List list) {