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

rev:前端样式

Browse Source
This commit is contained in:
gengby
2024-05-22 19:17:24 +08:00
parent 2d7b4c616b
commit 8ace5baa2c
10 changed files with 69 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/appearance_inspection_scannner_conveyor/AppearanceInspectionScannerConveyorDeviceDriver.java
View File

@@ -258,9 +258,10 @@ public class AppearanceInspectionScannerConveyorDeviceDriver extends AbstractOpc
} else { } else {
this.requireTime = currentTimeMillis; this.requireTime = currentTimeMillis;
JSONObject requestParam = new JSONObject(); JSONObject requestParam = new JSONObject();
requestParam.put("device_code1", this.currentDeviceCode);
requestParam.put("type", RequestTypeEnum.APPLY_IN_TASK.getType()); 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<JSONObject> response = acsToWmsService.applyTaskToWms(requestParam); UnifiedResponse<JSONObject> response = acsToWmsService.applyTaskToWms(requestParam);
if (response.isSuccess()) { if (response.isSuccess()) {
this.requireSuccess = true; this.requireSuccess = true;
@@ -278,9 +279,10 @@ public class AppearanceInspectionScannerConveyorDeviceDriver extends AbstractOpc
} else { } else {
this.requireTime = currentTimeMillis; this.requireTime = currentTimeMillis;
JSONObject requestParam = new JSONObject(); JSONObject requestParam = new JSONObject();
requestParam.put("device_code1", this.currentDeviceCode); requestParam.put("type", RequestTypeEnum.APPLY_AGV_TASK.getType());
requestParam.put("type", RequestTypeEnum.APPLY_IN_TASK.getType()); JSONObject param = new JSONObject();
requestParam.put("barcode1", this.barcode); param.put(this.barcode, this.currentDeviceCode);
requestParam.put("param", param);
UnifiedResponse<JSONObject> response = acsToWmsService.applyTaskToWms(requestParam); UnifiedResponse<JSONObject> response = acsToWmsService.applyTaskToWms(requestParam);
if (response.isSuccess()) { if (response.isSuccess()) {
this.requireSuccess = true; this.requireSuccess = true;
@@ -297,9 +299,9 @@ public class AppearanceInspectionScannerConveyorDeviceDriver extends AbstractOpc
*/ */
private UnifiedResponse<JSONObject> applyAgvTask(String barcode) { private UnifiedResponse<JSONObject> applyAgvTask(String barcode) {
JSONObject requestParam = new JSONObject(); JSONObject requestParam = new JSONObject();
requestParam.put("device_code1", this.currentDeviceCode); JSONObject param = new JSONObject();
requestParam.put("type", RequestTypeEnum.APPLY_IN_TASK.getType()); param.put(barcode, this.currentDeviceCode);
requestParam.put("barcode1", barcode); requestParam.put("param", param);
return acsToWmsService.applyTaskToWms(requestParam); return acsToWmsService.applyTaskToWms(requestParam);
} }
@@ -308,6 +310,7 @@ public class AppearanceInspectionScannerConveyorDeviceDriver extends AbstractOpc
if (!isTimeValid(currentTimeMillis)) { if (!isTimeValid(currentTimeMillis)) {
log.trace("触发时间因为小于{}毫秒，而被无视", this.requireTimeOut); log.trace("触发时间因为小于{}毫秒，而被无视", this.requireTimeOut);
} else { } else {
this.requireTime = currentTimeMillis;
TaskDto taskDto = taskService.findReadyByVehicleCode(this.barcode); TaskDto taskDto = taskService.findReadyByVehicleCode(this.barcode);
Instruction instDto = instructionService.findReadyInstByVehicleCode(this.barcode); Instruction instDto = instructionService.findReadyInstByVehicleCode(this.barcode);
if (ObjectUtil.isNotEmpty(taskDto) && ObjectUtil.isEmpty(instDto)) { if (ObjectUtil.isNotEmpty(taskDto) && ObjectUtil.isEmpty(instDto)) {
@@ -399,6 +402,7 @@ public class AppearanceInspectionScannerConveyorDeviceDriver extends AbstractOpc
if (!isTimeValid(currentTimeMillis)) { if (!isTimeValid(currentTimeMillis)) {
log.trace("触发时间因为小于{}毫秒，而被无视", this.requireTimeOut); log.trace("触发时间因为小于{}毫秒，而被无视", this.requireTimeOut);
} else { } else {
this.requireTime = currentTimeMillis;
LOCK.lock(); LOCK.lock();
try { try {
Device cacheDevice = deviceAppService.findDeviceByCode(deviceCode); Device cacheDevice = deviceAppService.findDeviceByCode(deviceCode);

51
nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/station/with_station/WithStationDeviceDriver.java
View File

@@ -94,14 +94,15 @@ public class WithStationDeviceDriver extends AbstractOpcDeviceDriver implements
requestParam.put("type", RequestTypeEnum.APPLY_IN_TASK.getType()); requestParam.put("type", RequestTypeEnum.APPLY_IN_TASK.getType());
String getLinkDeviceCode = Optional.ofNullable(device.getExtraValue().get("getLinkDeviceCode")).map(Object::toString).orElse(null); String getLinkDeviceCode = Optional.ofNullable(device.getExtraValue().get("getLinkDeviceCode")).map(Object::toString).orElse(null);
if (StrUtil.isEmpty(getLinkDeviceCode)) { if (StrUtil.isEmpty(getLinkDeviceCode)) {
requestParam.put("device_code1", deviceCode); JSONObject param = new JSONObject();
requestParam.put("barcode1", appearanceInspectionScannerConveyorDeviceDriver.getBarcode()); param.put(appearanceInspectionScannerConveyorDeviceDriver.getBarcode(), deviceCode);
requestParam.put("param", param);
logServer.deviceExecuteLog(new LuceneLogDto(this.device_code, "申请任务...." + requestParam.toString())); logServer.deviceExecuteLog(new LuceneLogDto(this.device_code, "申请任务...." + requestParam.toString()));
// UnifiedResponse<JSONObject> response = acsToWmsService.applyTaskToWms(requestParam); UnifiedResponse<JSONObject> response = acsToWmsService.applyTaskToWms(requestParam);
// if (response.isSuccess()) { if (response.isSuccess()) {
appearanceInspectionScannerConveyorDeviceDriver.setRequireSuccess(true); appearanceInspectionScannerConveyorDeviceDriver.setRequireSuccess(true);
this.requireSuccess = true; this.requireSuccess = true;
// } }
} else { } else {
Device linkDevice = deviceAppservice.findDeviceByCode(getLinkDeviceCode); Device linkDevice = deviceAppservice.findDeviceByCode(getLinkDeviceCode);
if (ObjectUtil.isNotEmpty(linkDevice) && linkDevice.getDeviceDriver() instanceof AppearanceInspectionScannerConveyorDeviceDriver) { if (ObjectUtil.isNotEmpty(linkDevice) && linkDevice.getDeviceDriver() instanceof AppearanceInspectionScannerConveyorDeviceDriver) {
@@ -109,29 +110,29 @@ public class WithStationDeviceDriver extends AbstractOpcDeviceDriver implements
if (appearanceInspectionScannerConveyorDeviceDriver2.getMove() == 1 && !appearanceInspectionScannerConveyorDeviceDriver2.isRequireSuccess()) { if (appearanceInspectionScannerConveyorDeviceDriver2.getMove() == 1 && !appearanceInspectionScannerConveyorDeviceDriver2.isRequireSuccess()) {
TaskDto taskDto2 = taskServer.findByContainer(appearanceInspectionScannerConveyorDeviceDriver2.getBarcode()); TaskDto taskDto2 = taskServer.findByContainer(appearanceInspectionScannerConveyorDeviceDriver2.getBarcode());
if (ObjectUtil.isEmpty(taskDto2)) { if (ObjectUtil.isEmpty(taskDto2)) {
requestParam.put("device_code1", deviceCode); JSONObject param = new JSONObject();
requestParam.put("barcode1", appearanceInspectionScannerConveyorDeviceDriver.getBarcode()); param.put(appearanceInspectionScannerConveyorDeviceDriver.getBarcode(), deviceCode);
requestParam.put("device_code2", getLinkDeviceCode); param.put(appearanceInspectionScannerConveyorDeviceDriver2.getBarcode(), getLinkDeviceCode);
requestParam.put("barcode2", appearanceInspectionScannerConveyorDeviceDriver2.getBarcode()); requestParam.put("param", param);
logServer.deviceExecuteLog(new LuceneLogDto(this.device_code, "申请任务...." + requestParam.toString())); logServer.deviceExecuteLog(new LuceneLogDto(this.device_code, "申请任务...." + requestParam.toString()));
//UnifiedResponse<JSONObject> response = acsToWmsService.applyTaskToWms(requestParam); UnifiedResponse<JSONObject> response = acsToWmsService.applyTaskToWms(requestParam);
// if (response.isSuccess()) { if (response.isSuccess()) {
this.requireSuccess = true; this.requireSuccess = true;
appearanceInspectionScannerConveyorDeviceDriver.setRequireSuccess(true); appearanceInspectionScannerConveyorDeviceDriver.setRequireSuccess(true);
appearanceInspectionScannerConveyorDeviceDriver2.setRequireSuccess(true); appearanceInspectionScannerConveyorDeviceDriver2.setRequireSuccess(true);
}
// }
} }
} else { } else {
if (System.currentTimeMillis() - appearanceInspectionScannerConveyorDeviceDriver.getRequireInTaskTime() > waitTime * 1000) { if (System.currentTimeMillis() - appearanceInspectionScannerConveyorDeviceDriver.getRequireInTaskTime() > waitTime * 1000) {
requestParam.put("device_code1", deviceCode); JSONObject param = new JSONObject();
requestParam.put("barcode1", appearanceInspectionScannerConveyorDeviceDriver.getBarcode()); param.put(appearanceInspectionScannerConveyorDeviceDriver.getBarcode(), deviceCode);
requestParam.put("param", param);
logServer.deviceExecuteLog(new LuceneLogDto(this.device_code, "申请任务...." + requestParam.toString())); logServer.deviceExecuteLog(new LuceneLogDto(this.device_code, "申请任务...." + requestParam.toString()));
// UnifiedResponse<JSONObject> response = acsToWmsService.applyTaskToWms(requestParam); UnifiedResponse<JSONObject> response = acsToWmsService.applyTaskToWms(requestParam);
//if (response.isSuccess()) { if (response.isSuccess()) {
appearanceInspectionScannerConveyorDeviceDriver.setRequireSuccess(true); appearanceInspectionScannerConveyorDeviceDriver.setRequireSuccess(true);
this.requireSuccess = true; this.requireSuccess = true;
// } }
} }
} }
} }

3
nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/enums/RequestTypeEnum.java
View File

@@ -11,7 +11,8 @@ import lombok.Getter;
@Getter @Getter
@AllArgsConstructor @AllArgsConstructor
public enum RequestTypeEnum { public enum RequestTypeEnum {
APPLY_IN_TASK("1", "申请任务"); APPLY_IN_TASK("1", "申请任务"),
APPLY_AGV_TASK("2", "申请AGV任务");
private final String type; private final String type;
private final String desc; private final String desc;

1
nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/MesRequestAdapter.java
View File

@@ -4,7 +4,6 @@ import org.nl.acs.AcsConfig;
import org.nl.config.SpringContextHolder; import org.nl.config.SpringContextHolder;
import org.nl.system.service.param.ISysParamService; import org.nl.system.service.param.ISysParamService;
import java.util.Map;
/** /**
* @Description TODO * @Description TODO

2
nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/RequestAdapter.java
View File

@@ -1,7 +1,5 @@
package org.nl.acs.ext; package org.nl.acs.ext;
import java.util.Map;
/** /**
* @Description TODO * @Description TODO
* @Author Gengby * @Author Gengby

1
nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
View File

@@ -10,7 +10,6 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; 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.data.*;
import org.nl.acs.ext.wms.service.AcsToLiKuService; import org.nl.acs.ext.wms.service.AcsToLiKuService;

16
nladmin-ui/src/assets/styles/eladmin.scss
View File

@@ -1,5 +1,8 @@
.head-container { .head-container {
padding-bottom: 10px; padding-top: 4px;
padding-bottom: 6px;
background-color: #ffffff;
border-radius: 4px;
.filter-item { .filter-item {
display: inline-block; display: inline-block;
@@ -188,7 +191,7 @@ input[type="number"]::-webkit-outer-spin-button {
.el-table__fixed-header-wrapper { .el-table__fixed-header-wrapper {
th { th {
word-break: break-word; word-break: break-word;
background-color: #f8f8f9; background-color: #f5f5f5;
color: #515a6e; color: #515a6e;
height: 35px; height: 35px;
font-size: 13px; font-size: 13px;
@@ -215,4 +218,13 @@ input[type="number"]::-webkit-outer-spin-button {
.el-table--scrollable-y .el-table__body-wrapper { .el-table--scrollable-y .el-table__body-wrapper {
overflow-y: overlay !important; 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

5
nladmin-ui/src/assets/styles/index.scss
View File

@@ -21,6 +21,7 @@ label {
html { html {
height: 100%; height: 100%;
box-sizing: border-box; box-sizing: border-box;
background-color: #eeeeee;
} }
#app { #app {
@@ -98,7 +99,7 @@ div:focus {
} }
aside { aside {
background: #eef1f6; background: #d40c70;
padding: 8px 24px; padding: 8px 24px;
margin-bottom: 20px; margin-bottom: 20px;
border-radius: 2px; border-radius: 2px;
@@ -122,7 +123,7 @@ aside {
//main-container全局样式 //main-container全局样式
.app-container { .app-container {
padding: 20px 20px 45px 20px; padding: 10px 20px 45px 10px;
} }
.components-container { .components-container {

14
nladmin-ui/src/assets/styles/variables.scss
View File

@@ -13,17 +13,17 @@ $base-logo-light-title-color: #001529;
$base-menu-light-background:#ffffff; $base-menu-light-background:#ffffff;
// sidebar // sidebar
$menuText:#bfcbd9; $menuText: #ffffff;
$menuActiveText:#409EFF; $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 $menuBg: #001529; //https://cloud.tencent.com/developer/article/1753773
$menuHover:#263445; $menuHover:#4e5465;
$base-menu-light-color:rgba(0,0,0,.70); $base-menu-light-color:rgba(0,0,0,.70);
$subMenuBg:#1f2d3d; $subMenuBg:#000c17;
$subMenuHover:#001528; $subMenuHover:#4e5465;
$sideBarWidth: 205px; $sideBarWidth: 205px;
@@ -45,4 +45,4 @@ $sideBarWidth: 205px;
logoLightTitleColor: $base-logo-light-title-color logoLightTitleColor: $base-logo-light-title-color
} }
$base-sidebar-width: 200px; $base-sidebar-width: 2010px;

10
nladmin-ui/src/views/acs/task/index.vue
View File

@@ -523,7 +523,7 @@
<!-- </el-dropdown-menu>--> <!-- </el-dropdown-menu>-->
<!-- </el-dropdown>--> <!-- </el-dropdown>-->
<!-- </template>--> <!-- </template>-->
<el-dropdown> <el-dropdown trigger="click">
<span class="el-dropdown-link"> <span class="el-dropdown-link">
<i class="el-icon-setting">More</i> <i class="el-icon-setting">More</i>
<el-icon class="el-icon--right"> <el-icon class="el-icon--right">
@@ -531,12 +531,12 @@
</el-icon> </el-icon>
</span> </span>
<template #dropdown> <template #dropdown>
<el-dropdown-menu> <el-dropdown-menu slot="dropdown">
<el-dropdown-item> <el-dropdown-item>
<el-button <el-button
type="text" type="text"
icon="el-icon-finished" icon="el-icon-finished"
@click="handleCommand(scope.$index, scope.row,'a')" @click.native="handleCommand(scope.$index, scope.row,'a')"
> >
{{ $t('task.select.Completed') }} {{ $t('task.select.Completed') }}
</el-button> </el-button>
@@ -545,7 +545,7 @@
<el-button <el-button
type="text" type="text"
icon="el-icon-circle-close" icon="el-icon-circle-close"
@click="handleCommand(scope.$index, scope.row,'b')" @click.native="handleCommand(scope.$index, scope.row,'b')"
> >
{{ $t('task.select.Cancel') }} {{ $t('task.select.Cancel') }}
</el-button> </el-button>
@@ -554,7 +554,7 @@
<el-button <el-button
type="text" type="text"
icon="el-icon-folder-add" icon="el-icon-folder-add"
@click="handleCommand(scope.$index, scope.row,'c')" @click.native="handleCommand(scope.$index, scope.row,'c')"
> >
{{ $t('task.select.Create_command') }} {{ $t('task.select.Create_command') }}
</el-button> </el-button>