zy-asrs-flow/src/config/setting.ts
@@ -1,6 +1,6 @@ // 接口地址 export const IP: string = 'localhost'; export const PORT: number = 9090; export const IP: string = '10.0.100.140'; export const PORT: number = 8088; export const API_BASE_URL: string = 'http://' + IP + ':' + PORT + '/wcs'; export const WEBSOCKET_BASE_URL: string = 'ws://' + IP + ':' + PORT + '/wcs'; zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java
@@ -536,18 +536,20 @@ MotionCtgType.SHUTTLE_PALLET_LIFT )); // 穿梭车载货出库至最后一段路径等待 motionList.addAll(kernelService.shuttleMove( MotionDto.build((dto -> { dto.setShuttleNo(shuttleDevice.getId().intValue()); dto.setLocNo(originLoc); })), MotionDto.build((dto -> { dto.setShuttleNo(shuttleDevice.getId().intValue()); dto.setLocNo(lastPathStartLoc); })), MotionCtgType.SHUTTLE_TRANSPORT )); if (!originLoc.equals(lastPathStartLoc)) { // 穿梭车载货出库至最后一段路径等待 motionList.addAll(kernelService.shuttleMove( MotionDto.build((dto -> { dto.setShuttleNo(shuttleDevice.getId().intValue()); dto.setLocNo(originLoc); })), MotionDto.build((dto -> { dto.setShuttleNo(shuttleDevice.getId().intValue()); dto.setLocNo(lastPathStartLoc); })), MotionCtgType.SHUTTLE_TRANSPORT )); } // 穿梭车载货至提升机待机位 motionList.addAll(kernelService.shuttleMove( @@ -768,18 +770,20 @@ MotionCtgType.SHUTTLE_PALLET_LIFT )); // 穿梭车载货出库至最后一段路径等待 motionList.addAll(kernelService.shuttleMove( MotionDto.build((dto -> { dto.setShuttleNo(shuttleDevice.getId().intValue()); dto.setLocNo(originLoc); })), MotionDto.build((dto -> { dto.setShuttleNo(shuttleDevice.getId().intValue()); dto.setLocNo(lastPathStartLoc); })), MotionCtgType.SHUTTLE_TRANSPORT )); if (!originLoc.equals(lastPathStartLoc)) { // 穿梭车载货出库至最后一段路径等待 motionList.addAll(kernelService.shuttleMove( MotionDto.build((dto -> { dto.setShuttleNo(shuttleDevice.getId().intValue()); dto.setLocNo(originLoc); })), MotionDto.build((dto -> { dto.setShuttleNo(shuttleDevice.getId().intValue()); dto.setLocNo(lastPathStartLoc); })), MotionCtgType.SHUTTLE_TRANSPORT )); } // 穿梭车载货至提升机待机位 motionList.addAll(kernelService.shuttleMove( zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java
@@ -165,6 +165,7 @@ if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable() && !staProtocol.isEmptyMk() && (workNo == 0 || (workNo >= 9990 && workNo <= 9999)) && staProtocol.isPakMk() ) { // 获取条码扫描仪信息 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/TaskTimer.java
@@ -38,13 +38,40 @@ @Scheduled(cron = "0/1 * * * * ? ") @Transactional public synchronized void clearCompletedTask2() { ArrayList<Long> taskSts = new ArrayList<>(); // taskSts.add(TaskStsType.COMPLETE_INBOUND.sts); // taskSts.add(TaskStsType.COMPLETE_OUTBOUND.sts); taskSts.add(TaskStsType.COMPLETE_CHARGE.sts); taskSts.add(TaskStsType.COMPLETE_MOVE.sts); taskSts.add(TaskStsType.COMPLETE_MANUAL.sts); List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>() .eq(Task::getStatus, 1) .in(Task::getTaskSts, taskSts)); for (Task task : tasks) { // boolean httpRequest = doHttpRequest(task, "127.0.0.1:8080", "/wms/open/asrs//wrkMast/finish/v1"); // if (!httpRequest) { // return; // } //记录库存信息 updateRecordLoc(task); //任务转历史档 saveTaskLog(task); } } @Scheduled(cron = "0/1 * * * * ? ") @Transactional public synchronized void clearCompletedTask() { ArrayList<Long> taskSts = new ArrayList<>(); taskSts.add(TaskStsType.COMPLETE_INBOUND.sts); taskSts.add(TaskStsType.COMPLETE_OUTBOUND.sts); taskSts.add(TaskStsType.COMPLETE_CHARGE.sts); taskSts.add(TaskStsType.COMPLETE_MOVE.sts); taskSts.add(TaskStsType.COMPLETE_MANUAL.sts); // taskSts.add(TaskStsType.COMPLETE_CHARGE.sts); // taskSts.add(TaskStsType.COMPLETE_MOVE.sts); // taskSts.add(TaskStsType.COMPLETE_MANUAL.sts); Dict reportWms = dictService.getOne(new LambdaQueryWrapper<Dict>().eq(Dict::getFlag, "reportWms"));
@@ -529,7 +529,7 @@ //获取分段路径 ArrayList<ArrayList<NavigateNode>> data = NavigateUtils.getSectionPath(nodeList); if (data.size() <= 1) { return null;//两点之间只有一段路径 return startLoc;//两点之间只有一段路径，在起点位置等待 } //取出倒数第二段路径 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/JxgtDevpThread.java
@@ -139,10 +139,10 @@ } } OperateResultExOne<byte[]> resultBarcode = siemensS7Net.Read("DB100.166", (short) 8); OperateResultExOne<byte[]> resultBarcode = siemensS7Net.Read("DB100.166", (short) 9); if (resultBarcode.IsSuccess) { //条码数据 String barcode = siemensS7Net.getByteTransform().TransString(resultBarcode.Content,0,8, "UTF-8");// 条码 String barcode = siemensS7Net.getByteTransform().TransString(resultBarcode.Content,0,9, "UTF-8");// 条码 BasConveyorStaService basConveyorStaService = SpringUtils.getBean(BasConveyorStaService.class); DeviceBarcodeService deviceBarcodeService = SpringUtils.getBean(DeviceBarcodeService.class); BasConveyorSta basConveyorSta = basConveyorStaService.getOne(new LambdaQueryWrapper<BasConveyorSta>().eq(BasConveyorSta::getSiteNo, 31002)); zy-asrs-wcs/src/main/resources/application.yml
@@ -1,5 +1,5 @@ server: port: 9090 port: 8088 servlet: context-path: /@pom.build.finalName@ tomcat:
