From e47dd0ffcd285ac75a499e262b7b1337f99bf72d Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Fri, 3 Jul 2026 14:48:37 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/nl/AppRun.java | 2 +- ...InspectionScannerConveyorDeviceDriver.java | 42 +++++++++++++----- .../led_screen/LedScreenDeviceDriver.java | 20 +++++---- .../StandardStackerDeviceDriver.java | 7 +++ .../wms/service/impl/WmsToAcsServiceImpl.java | 10 ++--- .../hand/service/impl/HandServicelmpl.java | 5 +++ .../assets/images/{logo2.png => logo3.png} | Bin .../images/{newloge.png => newloge1.png} | Bin .../assets/images/{logo1.png => newlogo.png} | Bin .../src/layout/components/Sidebar/Logo.vue | 2 +- .../src/views/acs/route/routeLine/index.vue | 12 ++--- 11 files changed, 67 insertions(+), 33 deletions(-) rename nladmin-ui/src/assets/images/{logo2.png => logo3.png} (100%) rename nladmin-ui/src/assets/images/{newloge.png => newloge1.png} (100%) rename nladmin-ui/src/assets/images/{logo1.png => newlogo.png} (100%) diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java b/nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java index 0ba72c3..904f94d 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java @@ -68,7 +68,6 @@ public class AppRun { return "Backend service started successfully"; } - @GetMapping("/{device_code}") @SaIgnore public String withStationRequireSuccess(@PathVariable String device_code) { @@ -80,6 +79,7 @@ public class AppRun { } return device_code + "关联站点请求标记复位成功!"; } + @GetMapping("/get/{device_code}") @SaIgnore diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/appearance_inspection_scannner_conveyor/AppearanceInspectionScannerConveyorDeviceDriver.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/appearance_inspection_scannner_conveyor/AppearanceInspectionScannerConveyorDeviceDriver.java index 0896c23..ddb1961 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/appearance_inspection_scannner_conveyor/AppearanceInspectionScannerConveyorDeviceDriver.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/appearance_inspection_scannner_conveyor/AppearanceInspectionScannerConveyorDeviceDriver.java @@ -234,6 +234,13 @@ public class AppearanceInspectionScannerConveyorDeviceDriver extends AbstractOpc private volatile String reqPutInstCode = null; private volatile Boolean reqPutRequireSuccess = false; + /** + * 称重是否异常标记，如果异常,则显示在点阵屏上 + * 光电无货时,清除标记和消息 + */ + private boolean isWeightError = false; + private String weightErrorMsg = null; + @Override public Device getDevice() { @@ -268,6 +275,10 @@ public class AppearanceInspectionScannerConveyorDeviceDriver extends AbstractOpc if (this.move != this.lastMove) { this.requireSuccess = false; this.withStationRequireSuccess = false; + if (this.move == 0) { + this.isWeightError = false; + this.weightErrorMsg = null; + } } if (this.error != this.lastError && this.error != 0) { if (this.status == 1) { @@ -504,6 +515,7 @@ public class AppearanceInspectionScannerConveyorDeviceDriver extends AbstractOpc JSONObject param = new JSONObject(); param.put("vehicle_code", this.barcode); param.put("start_point", this.currentDeviceCode); + param.put("weight", this.weight); param.put("height", this.height); CommonRequest request = CommonRequest.builder() @@ -518,18 +530,24 @@ public class AppearanceInspectionScannerConveyorDeviceDriver extends AbstractOpc } else { if (isErrorTimeValid(currentTimeMillis)) { this.errorRequireTime = currentTimeMillis; - String notifyValue = Optional.ofNullable(sysParamService.findByCode("is_notify")) - .map(notify -> notify.getValue()) - .orElse("0"); - if (notifyValue.equals("1")) { - JSONObject dataParam = new JSONObject(); - dataParam.put("msg", "申请任务失败! 请求参数: " + request + "响应信息: " + response.getMessage()); - CommonRequest requestParam = CommonRequest.builder() - .service("ErrorInfo") - .type("1") - .data(dataParam) - .build(); - acsToWmsService.apply(requestParam); + String message = response.getMessage(); + if (message != null && message.contains("weightError")) { + this.isWeightError = true; + this.weightErrorMsg = message; + } else { + String notifyValue = Optional.ofNullable(sysParamService.findByCode("is_notify")) + .map(notify -> notify.getValue()) + .orElse("0"); + if (notifyValue.equals("1")) { + JSONObject dataParam = new JSONObject(); + dataParam.put("msg", "申请任务失败! 请求参数: " + request + "响应信息: " + response.getMessage()); + CommonRequest requestParam = CommonRequest.builder() + .service("ErrorInfo") + .type("1") + .data(dataParam) + .build(); + acsToWmsService.apply(requestParam); + } } } } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/screen/led_screen/LedScreenDeviceDriver.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/screen/led_screen/LedScreenDeviceDriver.java index 1362d6f..6cd9669 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/screen/led_screen/LedScreenDeviceDriver.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/screen/led_screen/LedScreenDeviceDriver.java @@ -331,9 +331,13 @@ public class LedScreenDeviceDriver extends AbstractDeviceDriver implements Devic Device device = deviceAppService.findDeviceByCode(deviceCode); if (device != null && device.getDeviceDriver() instanceof AppearanceInspectionScannerConveyorDeviceDriver) { AppearanceInspectionScannerConveyorDeviceDriver appearanceInspectionScannerConveyorDeviceDriver = (AppearanceInspectionScannerConveyorDeviceDriver) device.getDeviceDriver(); - if (appearanceInspectionScannerConveyorDeviceDriver.getError() > 0) { - String label = ErrorEnum.getLabel(appearanceInspectionScannerConveyorDeviceDriver.getError()); - errorMsg = "设备" + deviceCode + " " + label + ","; + if (appearanceInspectionScannerConveyorDeviceDriver.getError() > 0 || appearanceInspectionScannerConveyorDeviceDriver.isWeightError()) { + if (appearanceInspectionScannerConveyorDeviceDriver.getError() > 0) { + String label = ErrorEnum.getLabel(appearanceInspectionScannerConveyorDeviceDriver.getError()); + errorMsg = "设备" + deviceCode + " " + label + ","; + } else if (appearanceInspectionScannerConveyorDeviceDriver.isWeightError()) { + errorMsg = "设备" + deviceCode + "称重异常: " + appearanceInspectionScannerConveyorDeviceDriver.getWeightErrorMsg() + ","; + } } } else if (device != null && device.getDeviceDriver() instanceof StandardStackerDeviceDriver) { StandardStackerDeviceDriver standardStackerDeviceDriver = (StandardStackerDeviceDriver) device.getDeviceDriver(); @@ -413,9 +417,9 @@ public class LedScreenDeviceDriver extends AbstractDeviceDriver implements Devic private void sendInformation(String modeMsg, String errorMsg, String taskMsg) throws Bx6GException { DisplayStyle[] styles = DisplayStyleFactory.getStyles().toArray(new DisplayStyle[0]); - writeModeMsg(modeMsg,styles); - writeErrorMsg(errorMsg,styles); - writeTaskMsg(taskMsg,styles); + writeModeMsg(modeMsg, styles); + writeErrorMsg(errorMsg, styles); + writeTaskMsg(taskMsg, styles); } private void writeModeMsg(String modeMsg, DisplayStyle[] styles) throws Bx6GException { @@ -429,7 +433,7 @@ public class LedScreenDeviceDriver extends AbstractDeviceDriver implements Devic this.screen.writeProgram(pf); } - private void writeErrorMsg(String errorMsg, DisplayStyle[] styles){ + private void writeErrorMsg(String errorMsg, DisplayStyle[] styles) { DynamicBxAreaRule rule_2 = new DynamicBxAreaRule(); rule_2.setId(0); rule_2.setRunMode((byte) 0); @@ -450,7 +454,7 @@ public class LedScreenDeviceDriver extends AbstractDeviceDriver implements Devic this.screen.writeDynamic(rule_2, area_2); } - private void writeTaskMsg(String taskMsg, DisplayStyle[] styles){ + private void writeTaskMsg(String taskMsg, DisplayStyle[] styles) { DynamicBxAreaRule rule = new DynamicBxAreaRule(); rule.setId(1); rule.setRunMode((byte) 0); diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/stacker/double_stacker/StandardStackerDeviceDriver.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/stacker/double_stacker/StandardStackerDeviceDriver.java index 9c83b87..f7c9a68 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/stacker/double_stacker/StandardStackerDeviceDriver.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/stacker/double_stacker/StandardStackerDeviceDriver.java @@ -1489,6 +1489,13 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme //查询对应的浅库位是否存在就绪的指令信息 Instruction shallInst = instructionService.findReadyInstByStartPointCode(shallStartPointCode); if (shallInst != null) { + //判断该任务终点是否前叉可达,如果不可达结束 + if(!getFrontDeviceCodeList.contains(shallInst.getNext_device_code()) && getBackDeviceCodeList.contains(shallInst.getNext_device_code())){ + this.backWrite(shallInst); + this.unExecutedMessage = null; + this.requireSuccess = true; + return; + } frontInst = shallInst; break; } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java index f8e3f73..7aa2a83 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java @@ -183,11 +183,11 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { TaskDto taskDto = taskService.findByCodeFromCache(task_code); if (taskDto != null) { - JSONObject json = new JSONObject(); - json.put("task_code", task_code); - json.put("ext_task_id", ext_task_id); - json.put("msg", "存在相同的任务号:" + task_code); - errArr.add(json); +// JSONObject json = new JSONObject(); +// json.put("task_code", task_code); +// json.put("ext_task_id", ext_task_id); +// json.put("msg", "存在相同的任务号:" + task_code); +// errArr.add(json); continue; } // if (!StrUtil.isEmpty(vehicle_code)) { diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/hand/service/impl/HandServicelmpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/hand/service/impl/HandServicelmpl.java index 741e264..1bc56a9 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/hand/service/impl/HandServicelmpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/hand/service/impl/HandServicelmpl.java @@ -333,6 +333,11 @@ public class HandServicelmpl implements HandService { region.put("region_code", "27"); region.put("region_name", "一号楼一楼产线"); regions.add(region); + region = new HashMap<>(); + region.put("region_id", "28"); + region.put("region_code", "28"); + region.put("region_name", "五号楼二楼产线"); + regions.add(region); jo.put("code", "1"); jo.put("desc", "查询成功"); jo.put("result", regions); diff --git a/nladmin-ui/src/assets/images/logo2.png b/nladmin-ui/src/assets/images/logo3.png similarity index 100% rename from nladmin-ui/src/assets/images/logo2.png rename to nladmin-ui/src/assets/images/logo3.png diff --git a/nladmin-ui/src/assets/images/newloge.png b/nladmin-ui/src/assets/images/newloge1.png similarity index 100% rename from nladmin-ui/src/assets/images/newloge.png rename to nladmin-ui/src/assets/images/newloge1.png diff --git a/nladmin-ui/src/assets/images/logo1.png b/nladmin-ui/src/assets/images/newlogo.png similarity index 100% rename from nladmin-ui/src/assets/images/logo1.png rename to nladmin-ui/src/assets/images/newlogo.png diff --git a/nladmin-ui/src/layout/components/Sidebar/Logo.vue b/nladmin-ui/src/layout/components/Sidebar/Logo.vue index 34f9ee5..2bd07e3 100644 --- a/nladmin-ui/src/layout/components/Sidebar/Logo.vue +++ b/nladmin-ui/src/layout/components/Sidebar/Logo.vue @@ -14,7 +14,7 @@