From 9cb2015a78de000c9771bd8c34ffc77dce807e88 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 25 十二月 2023 14:27:13 +0800
Subject: [PATCH] 添加手动添加铝框功能，报警修改为全局报警弹出
---
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
index f66d279..09721f4 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
@@ -30,8 +30,9 @@
private JdbcConnections dbserve;
// 鍑虹墖闃熷垪鏄惁鍏佽鍑虹墖
public static Boolean isAllowQueue = true;
+ public static Boolean isAllowReordering = true;
// 閾濇id
- public static String FrameNo;
+ public static String FrameNo="";
// 鏄惁闇�瑕佹墜鍔ㄧ‘璁ょ幓鐠�
public static Boolean isConfirm = false;
@@ -92,8 +93,10 @@
// 鑾峰彇鍑虹墖闃熷垪淇℃伅
List<Out_slice> listoutslice = outSliceServive.SelectProductionqueue();
jsonObject.append("listoutslice", listoutslice);
- // 鑾峰彇褰撳墠鍑虹墖闃熷垪鐘舵��
+ // 鑾峰彇褰撳墠鍑虹墖闃熷垪鍑虹墖鐘舵��
jsonObject.append("isAllowQueue", Plchome.isAllowQueue);
+ // 鑾峰彇褰撳墠鍑虹墖闃熷垪璋冨簭鐘舵��
+ jsonObject.append("isAllowReordering", Plchome.isAllowReordering);
// 鏄惁闇�瑕佷汉宸ョ‘璁や笂鐗囩幓鐠�
jsonObject.append("isConfirm", isConfirm);
@@ -116,20 +119,19 @@
// if (inglassInfo.size() > 0)
// jsonObject.append("loadglassheight", inglassInfo.get(0) * 70);
// }
-
// // 鑾峰彇閾濇idDB106.DBW64
- // String frameno=spianService.queGlassid("DB103.270",14).toString();
- // if(frameno!=Plchome.FrameNo&&frameno!=""){
- // Plchome.FrameNo=frameno;
+ // String frameno = spianService.queGlassid("DB103.270", 14).toString();
+ // // String frameno="X12345611002GV";
+ // if (!frameno.equals(Plchome.FrameNo)) {
+ // Plchome.FrameNo = frameno;
+ // try {
+ // north_Glass_Buffer1Service.AddOutSliceS(Plchome.FrameNo);
+ // } catch (SQLException e) {
+ // // TODO Auto-generated catch block
+ // e.printStackTrace();
+ // }
// }
- // try {
- // north_Glass_Buffer1Service.AddOutSliceS(Plchome.FrameNo);
- // } catch (SQLException e) {
- // // TODO Auto-generated catch block
- // e.printStackTrace();
- // }
-
// // 鑾峰彇杩涚墖璇锋眰鐘舵��
// List<Short> D01Request = S7control.getinstance().ReadWord("DB106.24", 1);
--
Gitblit v1.8.0