rev:布局

acs/nladmin-system/src/main/java/org/nl/acs/autotask/CleanLog.java

@@ -20,6 +20,9 @@ public class CleanLog {
         WQLObject logTab = WQLObject.getWQLObject("sys_log");
         int days = Integer.parseInt(paramService.findByCode("log_day").getValue());
         logTab.delete("DATE(create_time) <= DATE(DATE_SUB(NOW(),INTERVAL " + days + " day))");
+
+        WQLObject logQuartzTab = WQLObject.getWQLObject("sys_quartz_log");
+        logQuartzTab.delete("DATE(create_time) <= DATE(DATE_SUB(NOW(),INTERVAL " + days + " day))");
         log.info("自动清理日志执行成功...!");
     }
 

acs/nladmin-system/src/main/java/org/nl/acs/device_driver/nl4/station/NL4StationDeviceDriver.java

@@ -38,32 +38,32 @@ public class NL4StationDeviceDriver extends AbstractOpcDeviceDriver implements D
 
     // 心跳
     private int heartbeat = 0;
-    private int lastHeartbeat = this.heartbeat;
+    private int lastHeartbeat = 0;
     // 工作模式
     private int mode = 0;
-    private int lastMode = this.mode;
+    private int lastMode = 0;
     // 光电信号
     private int move = 0;
-    private int lastMove = this.move;
+    private int lastMove = 0;
     // 动作信号
     private int action = 0;
-    private int lastAction = this.action;
+    private int lastAction = 0;
     // error
     private int error = 0;
-    private int lastError = this.error;
+    private int lastError = 0;
     // 任务号
     private int task = 0;
-    private int lastTask = this.task;
+    private int lastTask = 0;
 
     // 下发命令
     private int toCommand = 0;
-    private int lastToCommand = this.toCommand;
+    private int lastToCommand = 0;
     // 下发物料
     private int toMaterial = 0;
-    private int lastToMaterial = this.toMaterial;
+    private int lastToMaterial = 0;
     // 下发数量
     private int toQty = 0;
-    private int lastToQty = this.toQty;
+    private int lastToQty = 0;
 
     private String currentDeviceCode = null;
     private boolean isOnline = false;
@@ -103,37 +103,28 @@ public class NL4StationDeviceDriver extends AbstractOpcDeviceDriver implements D
                 if (mode == 2) {
                     this.writing("to_command", "0");
                 }
-                this.deviceExecuteLogService.deviceExecuteLog(this.currentDeviceCode, "", "", "mode信号发生变化,进行复位标记,此时标记值:" + requireSuccess);
-                this.deviceExecuteLogService.deviceItemValue(this.currentDeviceCode, ItemProtocol.ITEM_MODE, String.valueOf(mode));
                 this.deviceExecuteLogService.deviceExecuteLog(this.currentDeviceCode, "", "", ItemProtocol.ITEM_MODE + " " + this.lastMode + " -> " + this.mode);
             }
             if (this.move != this.lastMove) {
-                this.deviceExecuteLogService.deviceItemValue(this.currentDeviceCode, ItemProtocol.ITEM_MOVE, String.valueOf(this.move));
                 this.deviceExecuteLogService.deviceExecuteLog(this.currentDeviceCode, "", "", ItemProtocol.ITEM_MOVE + " " + this.lastMove + " -> " + this.move);
             }
             if (this.action != this.lastAction) {
-                this.deviceExecuteLogService.deviceItemValue(this.currentDeviceCode, ItemProtocol.ITEM_ACTION, String.valueOf(this.action));
                 this.deviceExecuteLogService.deviceExecuteLog(this.currentDeviceCode, "", "", ItemProtocol.ITEM_ACTION + " " + this.lastAction + " -> " + this.action);
             }
             if (this.error != this.lastError) {
-                this.deviceExecuteLogService.deviceItemValue(this.currentDeviceCode, ItemProtocol.ITEM_ERROR, String.valueOf(this.error));
                 this.deviceExecuteLogService.deviceExecuteLog(this.currentDeviceCode, "", "", ItemProtocol.ITEM_ERROR + " " + this.lastError + " -> " + this.error);
             }
             if (this.task != this.lastTask) {
-                this.deviceExecuteLogService.deviceItemValue(this.currentDeviceCode, ItemProtocol.ITEM_TASK, String.valueOf(this.task));
                 this.deviceExecuteLogService.deviceExecuteLog(this.currentDeviceCode, "", "", ItemProtocol.ITEM_TASK + " " + this.lastTask + " -> " + this.task);
             }
 
             if (this.toCommand != this.lastToCommand) {
-                this.deviceExecuteLogService.deviceItemValue(this.currentDeviceCode, ItemProtocol.ITEM_TO_COMMAND, String.valueOf(this.toCommand));
                 this.deviceExecuteLogService.deviceExecuteLog(this.currentDeviceCode, "", "", ItemProtocol.ITEM_TO_COMMAND + " " + this.lastToCommand + " -> " + this.toCommand);
             }
             if (this.toMaterial != this.lastToMaterial) {
-                this.deviceExecuteLogService.deviceItemValue(this.currentDeviceCode, ItemProtocol.ITEM_TO_MATERIAL, String.valueOf(this.toMaterial));
                 this.deviceExecuteLogService.deviceExecuteLog(this.currentDeviceCode, "", "", ItemProtocol.ITEM_TO_MATERIAL + " " + this.lastToMaterial + " -> " + this.toMaterial);
             }
             if (this.toQty != this.lastToQty) {
-                this.deviceExecuteLogService.deviceItemValue(this.currentDeviceCode, ItemProtocol.ITEM_TO_QTY, String.valueOf(this.toQty));
                 this.deviceExecuteLogService.deviceExecuteLog(this.currentDeviceCode, "", "", ItemProtocol.ITEM_TO_QTY + " " + this.lastToQty + " -> " + this.toQty);
             }
         } catch (Exception e) {
@@ -271,8 +262,12 @@ public class NL4StationDeviceDriver extends AbstractOpcDeviceDriver implements D
     private Device findHasGoodsDevice(JSONArray deviceCodes) {
         for (int i = 0; i < deviceCodes.size(); i++) {
             Device device = this.deviceAppService.findDeviceByCode(deviceCodes.getString(i));
-            if (device != null && "0".equals(device.getIslock()) && 1 == device.getHas_goods()) {
+            if (device != null && ("0".equals(device.getIslock()) || "false".equals(device.getIslock())) && 1 == device.getHas_goods()) {
                 return device;
+            } else {
+                if (device != null) {
+                    deviceExecuteLogService.deviceExecuteLog(this.currentDeviceCode, "", "", "查找设备时,对应的设备:" + device.getDevice_code() + ",锁定状态:" + device.getIslock() + ",有货状态:" + device.getHas_goods());
+                }
             }
         }
         return null;
@@ -281,8 +276,12 @@ public class NL4StationDeviceDriver extends AbstractOpcDeviceDriver implements D
     private Device findNotHasGoodsDevice(JSONArray deviceCodes) {
         for (int i = 0; i < deviceCodes.size(); i++) {
             Device device = this.deviceAppService.findDeviceByCode(deviceCodes.getString(i));
-            if (device != null && "0".equals(device.getIslock()) && 0 == device.getHas_goods()) {
+            if (device != null && ("0".equals(device.getIslock()) || "false".equals(device.getIslock())) && 0 == device.getHas_goods()) {
                 return device;
+            } else {
+                if (device != null) {
+                    deviceExecuteLogService.deviceExecuteLog(this.currentDeviceCode, "", "", "查找设备时,对应的设备:" + device.getDevice_code() + ",锁定状态:" + device.getIslock() + ",有货状态:" + device.getHas_goods());
+                }
             }
         }
         return null;

acs/nladmin-system/src/main/java/org/nl/hand/amb/service/impl/HFHandServiceImpl.java

@@ -582,8 +582,8 @@ public class HFHandServiceImpl implements HFHandService {
             taskService.finish(acsTask.getTask_id());
             Device startDevice = deviceAppService.findDeviceByCode(acsTask.getStart_device_code());
             Device nextDevice = deviceAppService.findDeviceByCode(acsTask.getNext_device_code());
-            startDevice.setIslock("false");
-            nextDevice.setIslock("false");
+            startDevice.setIslock("0");
+            nextDevice.setIslock("0");
         }
 
 

acs/nladmin-system/src/main/java/org/nl/hand/amb/wql/QJN_QUERY001.wql

@@ -53,9 +53,6 @@
             	sys_dict_detail
             WHERE
             	`name` = 'region'
-            OPTION 输入.region_code <> ""
-                 value in ('2','3','5','7','8','11')
-            ENDOPTION
 		ENDSELECT
 	ENDQUERY
  ENDIF

acs/nladmin-system/src/main/java/org/nl/modules/quartz/utils/ExecutionJob.java

@@ -25,6 +25,7 @@ import org.nl.modules.quartz.domain.QuartzLog;
 import org.nl.modules.quartz.repository.QuartzLogRepository;
 import org.nl.modules.quartz.service.QuartzJobService;
 import org.nl.modules.wql.util.SpringContextHolder;
+import org.quartz.DisallowConcurrentExecution;
 import org.quartz.JobExecutionContext;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.quartz.QuartzJobBean;
@@ -41,6 +42,7 @@ import java.util.concurrent.ThreadPoolExecutor;
 @Async
 @SuppressWarnings({"unchecked", "all"})
 @Slf4j
+@DisallowConcurrentExecution
 public class ExecutionJob extends QuartzJobBean {
 
     /**

acs/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;
@@ -167,6 +170,7 @@ input[type="number"]::-webkit-outer-spin-button {
 }
 
 //去除编辑文本框为数字时的上下箭头end
+
 //设置计数器文字居左
 .el-input-number--mini .el-input__inner {
   text-align: left;
@@ -187,15 +191,17 @@ 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;
     }
-    td{
+
+    td {
       color: #f8f8f9;
     }
   }
+
   .el-table__body-wrapper {
     .el-button [class*="el-icon-"] + span {
       margin-left: 1px;
@@ -203,3 +209,22 @@ input[type="number"]::-webkit-outer-spin-button {
   }
 }
 
+//表格固定列最后一行显示不全(https://mp.weixin.qq.com/s/HpoykJNtsynsW4UMHitZbQ)
+.el-table__fixed-right {
+  height: 100% !important;
+}
+
+//表头与内容错位
+.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
+

acs/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 {

acs/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;