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 f7a7719..524bb48 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 @@ -258,9 +258,10 @@ public class AppearanceInspectionScannerConveyorDeviceDriver extends AbstractOpc } else { this.requireTime = currentTimeMillis; JSONObject requestParam = new JSONObject(); - requestParam.put("device_code1", this.currentDeviceCode); requestParam.put("type", RequestTypeEnum.APPLY_IN_TASK.getType()); - requestParam.put("barcode1", this.barcode); + JSONObject param = new JSONObject(); + param.put(this.barcode, this.currentDeviceCode); + requestParam.put("param", param); UnifiedResponse response = acsToWmsService.applyTaskToWms(requestParam); if (response.isSuccess()) { this.requireSuccess = true; @@ -278,9 +279,10 @@ public class AppearanceInspectionScannerConveyorDeviceDriver extends AbstractOpc } else { this.requireTime = currentTimeMillis; JSONObject requestParam = new JSONObject(); - requestParam.put("device_code1", this.currentDeviceCode); - requestParam.put("type", RequestTypeEnum.APPLY_IN_TASK.getType()); - requestParam.put("barcode1", this.barcode); + requestParam.put("type", RequestTypeEnum.APPLY_AGV_TASK.getType()); + JSONObject param = new JSONObject(); + param.put(this.barcode, this.currentDeviceCode); + requestParam.put("param", param); UnifiedResponse response = acsToWmsService.applyTaskToWms(requestParam); if (response.isSuccess()) { this.requireSuccess = true; @@ -297,9 +299,9 @@ public class AppearanceInspectionScannerConveyorDeviceDriver extends AbstractOpc */ private UnifiedResponse applyAgvTask(String barcode) { JSONObject requestParam = new JSONObject(); - requestParam.put("device_code1", this.currentDeviceCode); - requestParam.put("type", RequestTypeEnum.APPLY_IN_TASK.getType()); - requestParam.put("barcode1", barcode); + JSONObject param = new JSONObject(); + param.put(barcode, this.currentDeviceCode); + requestParam.put("param", param); return acsToWmsService.applyTaskToWms(requestParam); } @@ -308,6 +310,7 @@ public class AppearanceInspectionScannerConveyorDeviceDriver extends AbstractOpc if (!isTimeValid(currentTimeMillis)) { log.trace("触发时间因为小于{}毫秒，而被无视", this.requireTimeOut); } else { + this.requireTime = currentTimeMillis; TaskDto taskDto = taskService.findReadyByVehicleCode(this.barcode); Instruction instDto = instructionService.findReadyInstByVehicleCode(this.barcode); if (ObjectUtil.isNotEmpty(taskDto) && ObjectUtil.isEmpty(instDto)) { @@ -399,6 +402,7 @@ public class AppearanceInspectionScannerConveyorDeviceDriver extends AbstractOpc if (!isTimeValid(currentTimeMillis)) { log.trace("触发时间因为小于{}毫秒，而被无视", this.requireTimeOut); } else { + this.requireTime = currentTimeMillis; LOCK.lock(); try { Device cacheDevice = deviceAppService.findDeviceByCode(deviceCode); diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/station/with_station/WithStationDeviceDriver.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/station/with_station/WithStationDeviceDriver.java index 2393503..c719c4e 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/station/with_station/WithStationDeviceDriver.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/station/with_station/WithStationDeviceDriver.java @@ -94,14 +94,15 @@ public class WithStationDeviceDriver extends AbstractOpcDeviceDriver implements requestParam.put("type", RequestTypeEnum.APPLY_IN_TASK.getType()); String getLinkDeviceCode = Optional.ofNullable(device.getExtraValue().get("getLinkDeviceCode")).map(Object::toString).orElse(null); if (StrUtil.isEmpty(getLinkDeviceCode)) { - requestParam.put("device_code1", deviceCode); - requestParam.put("barcode1", appearanceInspectionScannerConveyorDeviceDriver.getBarcode()); + JSONObject param = new JSONObject(); + param.put(appearanceInspectionScannerConveyorDeviceDriver.getBarcode(), deviceCode); + requestParam.put("param", param); logServer.deviceExecuteLog(new LuceneLogDto(this.device_code, "申请任务...." + requestParam.toString())); - // UnifiedResponse response = acsToWmsService.applyTaskToWms(requestParam); - // if (response.isSuccess()) { - appearanceInspectionScannerConveyorDeviceDriver.setRequireSuccess(true); - this.requireSuccess = true; - // } + UnifiedResponse response = acsToWmsService.applyTaskToWms(requestParam); + if (response.isSuccess()) { + appearanceInspectionScannerConveyorDeviceDriver.setRequireSuccess(true); + this.requireSuccess = true; + } } else { Device linkDevice = deviceAppservice.findDeviceByCode(getLinkDeviceCode); if (ObjectUtil.isNotEmpty(linkDevice) && linkDevice.getDeviceDriver() instanceof AppearanceInspectionScannerConveyorDeviceDriver) { @@ -109,29 +110,29 @@ public class WithStationDeviceDriver extends AbstractOpcDeviceDriver implements if (appearanceInspectionScannerConveyorDeviceDriver2.getMove() == 1 && !appearanceInspectionScannerConveyorDeviceDriver2.isRequireSuccess()) { TaskDto taskDto2 = taskServer.findByContainer(appearanceInspectionScannerConveyorDeviceDriver2.getBarcode()); if (ObjectUtil.isEmpty(taskDto2)) { - requestParam.put("device_code1", deviceCode); - requestParam.put("barcode1", appearanceInspectionScannerConveyorDeviceDriver.getBarcode()); - requestParam.put("device_code2", getLinkDeviceCode); - requestParam.put("barcode2", appearanceInspectionScannerConveyorDeviceDriver2.getBarcode()); + JSONObject param = new JSONObject(); + param.put(appearanceInspectionScannerConveyorDeviceDriver.getBarcode(), deviceCode); + param.put(appearanceInspectionScannerConveyorDeviceDriver2.getBarcode(), getLinkDeviceCode); + requestParam.put("param", param); logServer.deviceExecuteLog(new LuceneLogDto(this.device_code, "申请任务...." + requestParam.toString())); - //UnifiedResponse response = acsToWmsService.applyTaskToWms(requestParam); - // if (response.isSuccess()) { - this.requireSuccess = true; - appearanceInspectionScannerConveyorDeviceDriver.setRequireSuccess(true); - appearanceInspectionScannerConveyorDeviceDriver2.setRequireSuccess(true); - - // } + UnifiedResponse response = acsToWmsService.applyTaskToWms(requestParam); + if (response.isSuccess()) { + this.requireSuccess = true; + appearanceInspectionScannerConveyorDeviceDriver.setRequireSuccess(true); + appearanceInspectionScannerConveyorDeviceDriver2.setRequireSuccess(true); + } } } else { if (System.currentTimeMillis() - appearanceInspectionScannerConveyorDeviceDriver.getRequireInTaskTime() > waitTime * 1000) { - requestParam.put("device_code1", deviceCode); - requestParam.put("barcode1", appearanceInspectionScannerConveyorDeviceDriver.getBarcode()); + JSONObject param = new JSONObject(); + param.put(appearanceInspectionScannerConveyorDeviceDriver.getBarcode(), deviceCode); + requestParam.put("param", param); logServer.deviceExecuteLog(new LuceneLogDto(this.device_code, "申请任务...." + requestParam.toString())); - // UnifiedResponse response = acsToWmsService.applyTaskToWms(requestParam); - //if (response.isSuccess()) { - appearanceInspectionScannerConveyorDeviceDriver.setRequireSuccess(true); - this.requireSuccess = true; - // } + UnifiedResponse response = acsToWmsService.applyTaskToWms(requestParam); + if (response.isSuccess()) { + appearanceInspectionScannerConveyorDeviceDriver.setRequireSuccess(true); + this.requireSuccess = true; + } } } } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/enums/RequestTypeEnum.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/enums/RequestTypeEnum.java index 9d0265e..b5e8030 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/enums/RequestTypeEnum.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/enums/RequestTypeEnum.java @@ -11,7 +11,8 @@ import lombok.Getter; @Getter @AllArgsConstructor public enum RequestTypeEnum { - APPLY_IN_TASK("1", "申请任务"); + APPLY_IN_TASK("1", "申请任务"), + APPLY_AGV_TASK("2", "申请AGV任务"); private final String type; private final String desc; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/MesRequestAdapter.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/MesRequestAdapter.java index 596e98e..7244ed0 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/MesRequestAdapter.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/MesRequestAdapter.java @@ -4,7 +4,6 @@ import org.nl.acs.AcsConfig; import org.nl.config.SpringContextHolder; import org.nl.system.service.param.ISysParamService; -import java.util.Map; /** * @Description TODO diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/RequestAdapter.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/RequestAdapter.java index 9324e1f..a94136b 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/RequestAdapter.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/RequestAdapter.java @@ -1,7 +1,5 @@ package org.nl.acs.ext; -import java.util.Map; - /** * @Description TODO * @Author Gengby 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 9f8e348..e00483b 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 @@ -10,7 +10,6 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.device.domain.Device; import org.nl.acs.ext.wms.data.*; import org.nl.acs.ext.wms.service.AcsToLiKuService; diff --git a/nladmin-ui/src/assets/styles/eladmin.scss b/nladmin-ui/src/assets/styles/eladmin.scss index 57a62e5..9eed7c5 100644 --- a/nladmin-ui/src/assets/styles/eladmin.scss +++ b/nladmin-ui/src/assets/styles/eladmin.scss @@ -1,5 +1,8 @@ .head-container { - padding-bottom: 10px; + padding-top: 4px; + padding-bottom: 6px; + background-color: #ffffff; + border-radius: 4px; .filter-item { display: inline-block; @@ -188,7 +191,7 @@ input[type="number"]::-webkit-outer-spin-button { .el-table__fixed-header-wrapper { th { word-break: break-word; - background-color: #f8f8f9; + background-color: #f5f5f5; color: #515a6e; height: 35px; font-size: 13px; @@ -215,4 +218,13 @@ input[type="number"]::-webkit-outer-spin-button { .el-table--scrollable-y .el-table__body-wrapper { overflow-y: overlay !important; } +//左侧边框不显示start https://blog.csdn.net/m0_37922443/article/details/126487240 +.el-table__row td:not(.is-hidden):last-child { + right: -1px; +} + +thead th:not(.is-hidden):last-child { + right: -1px; +} +//左侧边框不显示end diff --git a/nladmin-ui/src/assets/styles/index.scss b/nladmin-ui/src/assets/styles/index.scss index 21fbda1..35a5c8e 100644 --- a/nladmin-ui/src/assets/styles/index.scss +++ b/nladmin-ui/src/assets/styles/index.scss @@ -21,6 +21,7 @@ label { html { height: 100%; box-sizing: border-box; + background-color: #eeeeee; } #app { @@ -98,7 +99,7 @@ div:focus { } aside { - background: #eef1f6; + background: #d40c70; padding: 8px 24px; margin-bottom: 20px; border-radius: 2px; @@ -122,7 +123,7 @@ aside { //main-container全局样式 .app-container { - padding: 20px 20px 45px 20px; + padding: 10px 20px 45px 10px; } .components-container { diff --git a/nladmin-ui/src/assets/styles/variables.scss b/nladmin-ui/src/assets/styles/variables.scss index 384517b..1d1c7bf 100644 --- a/nladmin-ui/src/assets/styles/variables.scss +++ b/nladmin-ui/src/assets/styles/variables.scss @@ -13,17 +13,17 @@ $base-logo-light-title-color: #001529; $base-menu-light-background:#ffffff; // sidebar -$menuText:#bfcbd9; +$menuText: #ffffff; $menuActiveText:#409EFF; -$subMenuActiveText:#f4f4f5; // https://github.com/ElemeFE/element/issues/12951 +$subMenuActiveText: #ffffff; // https://github.com/ElemeFE/element/issues/12951 -$menuBg:#304156; //https://cloud.tencent.com/developer/article/1753773 -$menuHover:#263445; +$menuBg: #001529; //https://cloud.tencent.com/developer/article/1753773 +$menuHover:#4e5465; $base-menu-light-color:rgba(0,0,0,.70); -$subMenuBg:#1f2d3d; -$subMenuHover:#001528; +$subMenuBg:#000c17; +$subMenuHover:#4e5465; $sideBarWidth: 205px; @@ -45,4 +45,4 @@ $sideBarWidth: 205px; logoLightTitleColor: $base-logo-light-title-color } -$base-sidebar-width: 200px; +$base-sidebar-width: 2010px; diff --git a/nladmin-ui/src/views/acs/task/index.vue b/nladmin-ui/src/views/acs/task/index.vue index d7dc272..be7f906 100644 --- a/nladmin-ui/src/views/acs/task/index.vue +++ b/nladmin-ui/src/views/acs/task/index.vue @@ -523,7 +523,7 @@ - + More @@ -531,12 +531,12 @@