From ca1ae93196be366e707647c42e3039512a2cf45f Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 12 十一月 2024 14:00:24 +0800
Subject: [PATCH] 字段显示，结束任务功能更新，界面调整，测量显示
---
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 59 +++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 43 insertions(+), 16 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 3ac31c8..0c83048 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
@@ -3,13 +3,15 @@
import cn.hutool.json.JSONObject;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
+
import com.example.springboot.service.*;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.factory.annotation.Autowired;
-import com.example.springboot.entity.FlowCard;
-import com.example.springboot.entity.FlowCard;
+import com.example.springboot.entity.Flowcard;
+import com.example.springboot.entity.Glass;
import com.example.springboot.entity.GlassInfo;
import com.example.springboot.entity.MeasureSetting;
import com.example.springboot.entity.Out_slice;
@@ -31,6 +33,8 @@
private HomeMapper homeMapper;
@Autowired
private HomeService HomeService;
+ @Autowired
+ private GlassInfoMapper glassInfoMapper;
private QueueMapper QueueMapper;
private OutSliceServive outSliceServive;
@@ -63,19 +67,20 @@
@Override
public void run() {
+
while (this != null) {
JSONObject jsonObject = new JSONObject();
try {
- Thread.sleep(1000);
+ Thread.sleep(500);
// 娉ㄥ叆mapper
HomeService = WebSocketServer.applicationContext.getBean(HomeService.class);
QueueMapper = WebSocketServer.applicationContext.getBean(QueueMapper.class);
homeMapper = WebSocketServer.applicationContext.getBean(HomeMapper.class);
outSliceServive = WebSocketServer.applicationContext.getBean(OutSliceServive.class);
storageCageService = WebSocketServer.applicationContext.getBean(StorageCageService.class);
-
+ glassInfoMapper = WebSocketServer.applicationContext.getBean(GlassInfoMapper.class);
// 鑾峰彇鍏惰溅鐨勪綅缃�
- if (S7control.getinstance().CheckConnected() == true) {
+ if (S7control.getinstance().CheckConnected() == true && false) {
double carposition = 0;
float car = S7control.getinstance().readFloat32("DB10.1992");
carposition = (-40 + (car / (carend - carstart) * 595));
@@ -115,8 +120,8 @@
// 鏄惁闇�瑕佷汉宸ョ‘璁や笂鐗囩幓鐠�
jsonObject.append("isConfirm", isConfirm);
// 鏌ヨ褰撳墠閾濇淇℃伅
- Out_slice CurrentFrame = outSliceServive.SelectCurrentFrame();
- jsonObject.append("CurrentFrame", CurrentFrame);
+ // Out_slice CurrentFrame = outSliceServive.SelectCurrentFrame();
+ // jsonObject.append("CurrentFrame", CurrentFrame);
// 璇诲彇DB105鍖烘枃浠�
PlcParameterObject plcmes = PLCAutoMes.PlcMesObject;
@@ -128,20 +133,24 @@
boolean istest = true;
// String PlcRequest = "1";
// String MesSend = "0";
- // double width = 0;
- // double height = 0;
+ // double width = 727;
+ // double height = 414;
// 鍖归厤
// System.err.println(PlcRequest+","+MesSend+","+width+","+height);
if (plcmes.getPlcParameter("GaToMES").getValue() != null) {
String PlcRequest = plcmes.getPlcParameter("GaToMES").getValue();// 璇锋眰
String MesSend = plcmes.getPlcParameter("MESToGaStatus").getValue();// 鍙戦��
- double width = Double.valueOf(plcmes.getPlcParameter("width").getValue());// 瀹�
+ double width = Double.valueOf(plcmes.getPlcParameter("width").getValue());//
+ // 瀹�
double height = Double.valueOf(plcmes.getPlcParameter("Height").getValue());// 楂�
if ("0".equals(PlcRequest) && istest) {
S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),
(short) 0);
}
+ // System.out.println("PlcRequest:" + PlcRequest+"MesSend:" + MesSend+"width:" +
+ // width+"height:" + height);
+
if ("1".equals(PlcRequest) && "0".equals(MesSend)) {
boolean is = HomeService.Normal(width, height, "1");
if (is && istest) {
@@ -149,28 +158,36 @@
S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),
(short) 1);
- } else if (istest) {
- // 閲嶆柊娴嬮噺
+ }
+ else if (istest) {
+ // 鍖归厤澶辫触
S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),
(short) 4);
+
}
}
}
// S7control.getinstance().WriteWord("DB14.170", (short)0);
- Queue LastQueue = QueueMapper.selectLastQueue();
+
+ // 姝ｅ湪涓婄墖璁㈠崟涓殑鎵�鏈夊皬鐗囦俊鎭�
+ List<GlassInfo> glassInfoFlowCard = glassInfoMapper.selectOrderState(1);
+ jsonObject.append("glassInfoFlowCard", glassInfoFlowCard);
+
+ Queue LastQueue = QueueMapper.selectLastQueue2();
if (LastQueue == null) {
Queue nullQueue = new Queue();
nullQueue.setglassId("");
nullQueue.setglassheight(0);
nullQueue.setglasswidth(0);
nullQueue.setglassheightmm(0);
+ nullQueue.setglasstype(0);
nullQueue.setglasswidthmm(0);
jsonObject.append("LastQueue", nullQueue);
} else {
if (LastQueue.getstate() < 1) {
- LastQueue.setglasswidth(0);
- LastQueue.setglassheight(0);
+ LastQueue.setglasswidth(LastQueue.getglasswidthmm());
+ LastQueue.setglassheight(LastQueue.getglassheightmm());
}
jsonObject.append("LastQueue", LastQueue);
}
@@ -189,8 +206,18 @@
List<StorageTask> StoragTaskeTaskOut = storageCageService.SelectStorageTask(1);
jsonObject.append("StoragTaskeTaskOut", StoragTaskeTaskOut);
+ // 鏌ヨ鎵�鏈夌幓鐠冨帤搴﹀拰鑶滅郴
+ List<GlassInfo> SelectMeasure = storageCageService.SelectMeasure();
+ jsonObject.append("SelectMeasure", SelectMeasure);
+ // 鏌ヨ褰撳墠鑶滅郴鍘氬害
+ MeasureSetting SelectSetting = storageCageService.SelectSetting();
+ jsonObject.append("SelectSetting", SelectSetting);
+ // 鏌ヨ鐜板湪鐨勭幓鐠冨帤搴﹀拰鑶滅郴
+ Map StorageCageForm = storageCageService.StorageCageForm();
+ jsonObject.append("StorageCageForm", StorageCageForm);
+
// //鏌ヨ褰撳墠璁㈠崟浠诲姟
- List<FlowCard> OrderTask = storageCageService.SelectOrderTask();
+ List<Flowcard> OrderTask = storageCageService.SelectOrderTask();
jsonObject.append("OrderTask", OrderTask);
// jsonObject.append("params", new short[] { 30, 40, });
--
Gitblit v1.8.0