From 6e0edaa242436c8402e43608b39fbcc406ba786d Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 07 三月 2024 09:36:07 +0800
Subject: [PATCH] 更新代码
---
springboot-vue3/src/main/java/com/example/springboot/entity/alarmmg.java | 1 +
springboot-vue3/src/main/java/com/example/springboot/service/SpianServiceNew.java | 2 +-
springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java | 3 +--
springboot-vue3/src/main/java/com/example/springboot/entity/StorageCage.java | 10 +++++-----
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java
index 5c979bf..3da8352 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java
@@ -36,7 +36,6 @@
// if (S7control.getinstance().CheckConnected() == false) {
spianService = WebSocketServer.applicationContext.getBean(SpianService.class);
spianMapper = WebSocketServer.applicationContext.getBean(SpianMapper.class);
- jdbcConnections = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
//璇诲彇DB105鍖烘枃浠�
PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
@@ -49,7 +48,7 @@
- S7control.getinstance().WriteWord( plcmes.getPlcParameter("1231").getAddress(plcmes.getPlcParameter("1231").getAddressIndex()), (short) 0);
+ //S7control.getinstance().WriteWord( plcmes.getPlcParameter("1231").getAddress(plcmes.getPlcParameter("1231").getAddressIndex()), (short) 0);
// 鍑虹墖浠诲姟
if (OutActivate.equals("1") == false&&OutRequest.equals("1")==true) {
diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/StorageCage.java b/springboot-vue3/src/main/java/com/example/springboot/entity/StorageCage.java
index 61a0b59..7e637be 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/entity/StorageCage.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/StorageCage.java
@@ -17,7 +17,7 @@
private Integer disabled;//鍋滅敤
private String listId;//闆嗗悎id
private String boxId;//绠卞瓙id
- private String FrameBarcode;//閾濇id;
+ private String glasstype;//绫诲瀷id;
private north_glass_buffer1 north_glass_buffer1s;
@@ -171,12 +171,12 @@
this.boxId = boxId;
}
- public String getFrameBarcode() {
- return FrameBarcode;
+ public String getGlasstype() {
+ return glasstype;
}
- public void setFrameBarcode(String FrameBarcode) {
- this.FrameBarcode = FrameBarcode;
+ public void setGlasstype(String glasstype) {
+ this.glasstype = glasstype;
}
}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/alarmmg.java b/springboot-vue3/src/main/java/com/example/springboot/entity/alarmmg.java
index cde8841..f679e0a 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/entity/alarmmg.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/alarmmg.java
@@ -1,6 +1,7 @@
package com.example.springboot.entity;
import java.util.Date;
+
//鎶ヨ淇℃伅琛�
public class alarmmg {
private Integer id;//鑷id
diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/SpianServiceNew.java b/springboot-vue3/src/main/java/com/example/springboot/service/SpianServiceNew.java
index a584239..1da7bc8 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/service/SpianServiceNew.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/SpianServiceNew.java
@@ -22,7 +22,7 @@
private SpianMapper spianMapper;
// @GetMapping("/all")
- public Short selectAll(String glassid) {
+public Short selectAll(String glassid) {
//璇诲彇DB105鍖烘枃浠�
PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
//璇�106
--
Gitblit v1.8.0