From 756a2daf34a92f2b51e4939358d0e8e5fc542597 Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Thu, 8 Jun 2023 18:32:55 +0800 Subject: [PATCH] =?UTF-8?q?REV=20=E4=B8=93=E6=9C=BA=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E3=80=81=E7=BC=93=E5=AD=98=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HailiangAutoCacheLineDeviceDriver.java | 21 ++++++++++++++----- .../HailiangOldSpecialDeviceDriver.java | 2 +- ...iangOldSpecialFullStationDeviceDriver.java | 3 +++ .../HailiangSpecialDeviceDriver.java | 2 +- ...ailiangSpecialFullStationDeviceDriver.java | 3 +++ .../impl/ProduceshiftorderServiceImpl.java | 2 +- 6 files changed, 25 insertions(+), 8 deletions(-) diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_auto_cache_line/HailiangAutoCacheLineDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_auto_cache_line/HailiangAutoCacheLineDeviceDriver.java index 9131d938..5c0063ae 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_auto_cache_line/HailiangAutoCacheLineDeviceDriver.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_auto_cache_line/HailiangAutoCacheLineDeviceDriver.java @@ -482,6 +482,7 @@ public class HailiangAutoCacheLineDeviceDriver extends AbstractOpcDeviceDriver i TaskDto taskDto = taskserver.findByCodeFromCache(inst.getTask_code()); if (taskDto != null) { taskDto.setExt_param(new HashMap<>()); + taskDto.setTask_status(StatusEnum.TASK_RUNNING.getCode()); taskDto.getExt_param().put("inbox", "" + docking_barcode); taskDto.setVehicle_code(String.valueOf(docking_barcode)); taskserver.update(taskDto); @@ -535,12 +536,12 @@ public class HailiangAutoCacheLineDeviceDriver extends AbstractOpcDeviceDriver i this.noFeedAgvMessage = this.replace(noFeedMessage); } } else if (agvphase == 0x10 || agvphase == 0x27) { + Map map = new LinkedHashMap<>(); + map.put("to_agv_get_finish", "1"); + map.put("to_agv_put_finish", "0"); + this.writing(map); //agv取空框1完毕或取空框2完毕 - if (mode == 1 && move == 0 && ObjectUtil.isNotEmpty(inst)) { - Map map = new LinkedHashMap<>(); - map.put("to_agv_get_finish", "1"); - map.put("to_agv_put_finish", "0"); - this.writing(map); + if (mode == 1 && move == 0 && task_finish == 1 && ObjectUtil.isNotEmpty(inst)) { inst.setExecute_status(InstActionEnum.EXECUTE_GET_EMPTY_FINISH.getCode()); instructionService.update(inst); byte[] data = agvService.sendAgvTwoModeInst(agvphase, index, 0); @@ -558,6 +559,11 @@ public class HailiangAutoCacheLineDeviceDriver extends AbstractOpcDeviceDriver i .findFirst() .orElse(null); if (instruction != null) { + try { + Thread.sleep(100); + } catch (InterruptedException e) { + e.printStackTrace(); + } instructionService.issuedCacheInfo(instruction); logServer.deviceExecuteLog(device_code, "", "", "第一条指令完成,指令号:'" + inst.getInstruction_code() + "',下发第二条指令,指令号:'" + instruction.getInstruction_code() + "'"); } @@ -632,6 +638,11 @@ public class HailiangAutoCacheLineDeviceDriver extends AbstractOpcDeviceDriver i Map map = new LinkedHashMap<>(); map.put("to_agv_get_finish", "1"); if (task == 0 || Integer.parseInt(inst.getTask_code()) == task) { + try { + Thread.sleep(100); + } catch (InterruptedException e) { + e.printStackTrace(); + } map.put("to_task_finish", "1"); } this.writing(map); diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_device/HailiangOldSpecialDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_device/HailiangOldSpecialDeviceDriver.java index 57db38ab..d1fc1214 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_device/HailiangOldSpecialDeviceDriver.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_device/HailiangOldSpecialDeviceDriver.java @@ -330,7 +330,7 @@ public class HailiangOldSpecialDeviceDriver extends AbstractOpcDeviceDriver impl map.put("to_confirm_finished", "1"); } //map.put("to_order", "0"); - map.put("to_clear", "1"); + //map.put("to_clear", "1"); this.writing(map); } diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_full_station/HailiangOldSpecialFullStationDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_full_station/HailiangOldSpecialFullStationDeviceDriver.java index 7b68c90b..16ad9df6 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_full_station/HailiangOldSpecialFullStationDeviceDriver.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_full_station/HailiangOldSpecialFullStationDeviceDriver.java @@ -287,6 +287,9 @@ public class HailiangOldSpecialFullStationDeviceDriver extends AbstractOpcDevice redisUtils.setExpire(this.device_code, null, ApplyTaskTime.APPLY_TIME, TimeUnit.SECONDS); //判断是否需要AGV搬运 需要就申请任务 不需要不申请 ProduceshiftorderDto produceshiftorderDto = produceshiftorderService.findByCodeFromCache(String.valueOf(this.getOrder())); + if (produceshiftorderDto == null) { + produceshiftorderDto = produceshiftorderService.findByCode(String.valueOf(this.getOrder())); + } if (produceshiftorderDto != null && StrUtil.equals(produceshiftorderDto.getIs_needmove(), StatusEnum.NEED_MOVE.getCode())) { JSONObject reqParam = new JSONObject(); reqParam.put("device_code", this.getDevice_code()); diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_device/HailiangSpecialDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_device/HailiangSpecialDeviceDriver.java index 2a2a8962..549b3936 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_device/HailiangSpecialDeviceDriver.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_device/HailiangSpecialDeviceDriver.java @@ -304,7 +304,7 @@ public class HailiangSpecialDeviceDriver extends AbstractOpcDeviceDriver impleme map.put("to_confirm_finished", "1"); } //map.put("to_order", "0"); - map.put("to_clear", "1"); + //map.put("to_clear", "1"); this.writing(map); } diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_full_station/HailiangSpecialFullStationDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_full_station/HailiangSpecialFullStationDeviceDriver.java index 5702b9f1..44d89a71 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_full_station/HailiangSpecialFullStationDeviceDriver.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_full_station/HailiangSpecialFullStationDeviceDriver.java @@ -291,6 +291,9 @@ public class HailiangSpecialFullStationDeviceDriver extends AbstractOpcDeviceDri //判断是否需要AGV搬运 需要就申请任务 不需要不申请 JSONObject reqParam = new JSONObject(); ProduceshiftorderDto produceshiftorderDto = produceshiftorderService.findByCodeFromCache(String.valueOf(this.getOrder())); + if (produceshiftorderDto == null) { + produceshiftorderDto = produceshiftorderService.findByCode(String.valueOf(this.getOrder())); + } if (produceshiftorderDto != null && StrUtil.equals(produceshiftorderDto.getIs_needmove(), StatusEnum.NEED_MOVE.getCode())) { reqParam.put("type", StatusEnum.FULL_REQ.getCode()); reqParam.put("device_code", this.getDevice_code()); diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java b/wcs/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java index c21b1461..75d234b0 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java @@ -147,7 +147,7 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A @Override public ProduceshiftorderDto findByCode(String code) { WQLObject wo = WQLObject.getWQLObject("acs_produceshiftorder"); - JSONObject json = wo.query("order_code ='" + code + "' and is_deleted = '0'").uniqueResult(0); + JSONObject json = wo.query("order_code ='" + code + "' and is_deleted = '0'","create_time").uniqueResult(0); if (ObjectUtil.isEmpty(json)) { return null; }