From cf2e4086d44e51bcd7407133d460dda498b45eff Mon Sep 17 00:00:00 2001
From: whycq <you@example.com>
Date: 星期三, 28 六月 2023 21:55:29 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 3 +
src/main/webapp/views/console.html | 1
src/main/java/com/zy/asrs/utils/Monitor.java | 21 ++++++++++
src/main/java/com/zy/asrs/utils/Roles.java | 57 ++++++++++++++++++++++++++++
4 files changed, 81 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index fa2ca02..cdb869d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -12,6 +12,8 @@
import com.zy.asrs.mapper.WrkChargeMapper;
import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.service.*;
+import com.zy.asrs.utils.Monitor;
+import com.zy.asrs.utils.Roles;
import com.zy.asrs.utils.Utils;
import com.zy.common.model.LocTypeDto;
import com.zy.common.model.MatDto;
@@ -115,6 +117,7 @@
}
Short workNo = staProtocol.getWorkNo();
+ Monitor.ledError(100,"娴嬭瘯");
// 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
if (staProtocol.isAutoing() && staProtocol.isLoading()
&& staProtocol.isInEnable()
diff --git a/src/main/java/com/zy/asrs/utils/Monitor.java b/src/main/java/com/zy/asrs/utils/Monitor.java
new file mode 100644
index 0000000..2b47cc3
--- /dev/null
+++ b/src/main/java/com/zy/asrs/utils/Monitor.java
@@ -0,0 +1,21 @@
+package com.zy.asrs.utils;
+
+import com.zy.core.cache.MessageQueue;
+import com.zy.core.cache.SlaveConnection;
+import com.zy.core.enums.SlaveType;
+import com.zy.core.model.Task;
+import com.zy.core.thread.LedThread;
+
+public class Monitor {
+
+ public Monitor() {
+
+ }
+ public static Boolean ledError(Integer ledId,String errorMsg) {
+ LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, ledId);
+ if (ledThread != null) {
+ MessageQueue.offer(SlaveType.Led, ledId, new Task(3, errorMsg));
+ }
+ return true;
+ }
+}
diff --git a/src/main/java/com/zy/asrs/utils/Roles.java b/src/main/java/com/zy/asrs/utils/Roles.java
new file mode 100644
index 0000000..501c003
--- /dev/null
+++ b/src/main/java/com/zy/asrs/utils/Roles.java
@@ -0,0 +1,57 @@
+package com.zy.asrs.utils;
+
+public class Roles {
+
+ public Roles() {}
+
+ // 缁勬墭鍏ュ簱鍒ゆ柇
+ public static Boolean pakinRole(Boolean autoing, Boolean loading, Boolean inEnable,Boolean emptyMk, Boolean pakMk,Short workNo) {
+ if (!autoing) {
+ System.out.println("杈撻�佺嚎鏃犵墿");
+ return false;
+ } else if (!loading) {
+ System.out.println("杈撻�佺嚎鏃犵墿");
+ return false;
+ } else if (!inEnable){
+ System.out.println("杈撻�佺嚎涓嶈兘鍏�");
+ return false;
+ } else if (emptyMk) {
+ System.out.println("鏈夌┖鏉夸俊鍙�");
+ return false;
+ } else if (!pakMk) {
+ System.out.println("閿佸畾鏍囪涓篎alse");
+ return false;
+ } else if (workNo == 0 || (workNo >= 9990 && workNo <= 9999)) {
+ System.out.println("褰撳墠宸ヤ綔鍙峰紓甯�");
+ return false;
+ } else {
+ return true;
+ }
+ }
+
+ // 鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱 宸ヤ綔鍙峰垽鏂� 鍒ゆ柇
+ public static Boolean pickRole(Boolean autoing, Boolean loading, Boolean inEnable, Boolean pakMk,Short staNo, Short siteId, Short workNo) {
+ if (!autoing) {
+ System.out.println("杈撻�佺嚎鏃犵墿");
+ return false;
+ } else if (!loading) {
+ System.out.println("杈撻�佺嚎鏃犵墿");
+ return false;
+ } else if (!inEnable){
+ System.out.println("杈撻�佺嚎涓嶈兘鍏�");
+ return false;
+ } else if (!pakMk) {
+ System.out.println("閿佸畾鏍囪涓篎alse");
+ return false;
+ } else if (workNo <= 0 || (workNo >= 9990 && workNo != 9996)) {
+ System.out.println("褰撳墠宸ヤ綔鍙峰紓甯�");
+ return false;
+ } else if (!staNo.equals(siteId)) {
+ System.out.println("褰撳墠绔欑偣涓庣洰鏍囩珯涓嶅尮閰�");
+ return false;
+ } else {
+ System.out.println("*****");
+ return true;
+ }
+ }
+}
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 64c33b1..e3de3f4 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -1215,7 +1215,6 @@
method: 'POST',
success: function (res) {
if (res.code === 200){
- console.log(res)
var barcodes = res.data;
for (var i = 0; i < barcodes.length; i++){
$("#barcode-"+barcodes[i].barcodeId).html(barcodes[i].codeValue ? barcodes[i].codeValue : "--");
--
Gitblit v1.9.1