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 | 223 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 129 insertions(+), 94 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 425009b..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
@@ -1,14 +1,17 @@
package com.example.springboot.component;
+
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;
@@ -30,13 +33,11 @@
private HomeMapper homeMapper;
@Autowired
private HomeService HomeService;
+ @Autowired
+ private GlassInfoMapper glassInfoMapper;
private QueueMapper QueueMapper;
- private GlassInfoMapper GlassInfoMapper;
- private MeasureSettingMapper MeasureSettingMapper;
private OutSliceServive outSliceServive;
- private SpianMapper spianMapper;
- private SpianService spianService;
-
+
// 鍑虹墖闃熷垪鏄惁鍏佽鍑虹墖
public static Boolean isAllowQueue = true;
public static Boolean isAllowReordering = true;
@@ -61,29 +62,39 @@
// public static Map b=new HashMap<>();
// b.put()
+ public double carstart = 200;
+ public double carend = 20000;
+
@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);
+ HomeService = WebSocketServer.applicationContext.getBean(HomeService.class);
+ QueueMapper = WebSocketServer.applicationContext.getBean(QueueMapper.class);
homeMapper = WebSocketServer.applicationContext.getBean(HomeMapper.class);
- spianMapper = WebSocketServer.applicationContext.getBean(SpianMapper.class);
- spianService = WebSocketServer.applicationContext.getBean(SpianService.class);
outSliceServive = WebSocketServer.applicationContext.getBean(OutSliceServive.class);
storageCageService = WebSocketServer.applicationContext.getBean(StorageCageService.class);
-
+ glassInfoMapper = WebSocketServer.applicationContext.getBean(GlassInfoMapper.class);
+ // 鑾峰彇鍏惰溅鐨勪綅缃�
+ if (S7control.getinstance().CheckConnected() == true && false) {
+ double carposition = 0;
+ float car = S7control.getinstance().readFloat32("DB10.1992");
+ carposition = (-40 + (car / (carend - carstart) * 595));
+ jsonObject.append("carposition", carposition);
+ }
// 绗煎瓙浣跨敤鎯呭喌
- List<StorageCage> tableData = homeMapper.selectAll();
+ List<StorageCage> tableData = homeMapper.selectAlls();
jsonObject.append("tableData", tableData);
+
// 鏍肩悊鐗囩鏍煎瓙鐘舵��
- List<StorageCage> cagelist1 = homeMapper.selectRack1();
- List<StorageCage> cagelist2 = homeMapper.selectRack2();
- List<StorageCage> cagelist3 = homeMapper.selectRack3();
- List<StorageCage> cagelist4 = homeMapper.selectRack4();
+ List<StorageCage> cagelist1 = storageCageService.SelectStorageCageByCage(1);
+ List<StorageCage> cagelist2 = storageCageService.SelectStorageCageByCage(2);
+ List<StorageCage> cagelist3 = storageCageService.SelectStorageCageByCage(3);
+ List<StorageCage> cagelist4 = storageCageService.SelectStorageCageByCage(4);
jsonObject.append("cagelist1", cagelist1);
jsonObject.append("cagelist2", cagelist2);
jsonObject.append("cagelist3", cagelist3);
@@ -97,7 +108,6 @@
List<alarmmg> alarmmg = homeMapper.SelectAlarmmgInfo();
jsonObject.append("alarmmg", alarmmg);
-
// 鑾峰彇鍑虹墖闃熷垪淇℃伅
List<Out_slice> listoutslice = outSliceServive.SelectProductionqueue();
jsonObject.append("listoutslice", listoutslice);
@@ -110,103 +120,128 @@
// 鏄惁闇�瑕佷汉宸ョ‘璁や笂鐗囩幓鐠�
jsonObject.append("isConfirm", isConfirm);
// 鏌ヨ褰撳墠閾濇淇℃伅
- Out_slice CurrentFrame = outSliceServive.SelectCurrentFrame();
- jsonObject.append("CurrentFrame", CurrentFrame);
-
- //璇诲彇DB105鍖烘枃浠�
- PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
-
- //String PlcRequest=plcmes.getPlcParameter("GaToMES").getValue();//璇锋眰
- //double width=plcmes.getPlcParameter("Height").getValue();//瀹�
- //double height=plcmes.getPlcParameter("width").getValue();//楂�
- //鑾峰彇娴嬮噺鐨勯暱锛屽
- String url="C:\\Users\\SNG-ZDH-012\\Desktop\\闃垮皵宸村凹浜氭暟鎹姹�.xlsx";
- //List typecount= HomeService.ReadExecl2(s);
- // List xiaopian=HomeService.ReadExecl2(s);
- // //xiaopian NG1{A:10,B20} NG2{A:5,B5}
- // for(Object C:xiaopian){
- // //鐪嬪眰鏁�
+ // Out_slice CurrentFrame = outSliceServive.SelectCurrentFrame();
+ // jsonObject.append("CurrentFrame", CurrentFrame);
+
+ // 璇诲彇DB105鍖烘枃浠�
+ PlcParameterObject plcmes = PLCAutoMes.PlcMesObject;
+ // if(plcmes.==null){
+
// }
- // for(int i=0;i<result.size();i++){
- // System.out.println(result.get(i));
- // }
+ // 鑾峰彇娴嬮噺鐨勯暱锛屽
+ boolean istest = true;
+ // String PlcRequest = "1";
+ // String MesSend = "0";
+ // double width = 727;
+ // double height = 414;
-
- //List result= HomeService.ReadExecl(url);
- // for(int i=0;i<result.size();i++){
- // System.out.println(result.get(i));
- // }
-
-
-
- String PlcRequest = "1";
- double width = 402;
- double height = 402;
-
- //鑾峰彇鍖归厤璁剧疆
- if ("1".equals(PlcRequest)) {
- List<GlassInfo> Result=HomeService.NormalGlassInfo(width, height, "1");
- if(Result.size()==1){
- //鍖归厤鎴愬姛 灏变竴绉嶇被鍨� 娣诲姞鏁版嵁
- GlassInfo GlassInfo=Result.get(0);
- QueueMapper.insert(GlassInfo.getGlassid(),width,height,1);
- System.out.println("鍖归厤鎴愬姛");
- //S7control.getinstance().WriteWord(plcmes.getPlcParameter("GaToMES").getAddress(), (short) 1);
- System.out.println(GlassInfo.getGlassid());
- }else if(Result.size()>1){
- //鍖归厤澶辫触 鍖归厤鍒板鏉＄鍚堢殑鏁版嵁 娣诲姞鏁版嵁
- QueueMapper.insert(null,width,height,2);
- System.out.println("鍖归厤澶辫触");
+ // 鍖归厤
+ // 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 height = Double.valueOf(plcmes.getPlcParameter("Height").getValue());// 楂�
+ if ("0".equals(PlcRequest) && istest) {
+ S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),
+ (short) 0);
}
- else{
- //鍖归厤澶辫触 鏈壘鍒扮鍚堢殑鏁版嵁 娣诲姞鏁版嵁
- QueueMapper.insert(null,width,height,3);
- System.out.println("鏈壘鍒扮鍚堢殑鏁版嵁");
+ // 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) {
+ // 娴嬮噺鎴愬姛
+ S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),
+ (short) 1);
+
+ }
+ else if (istest) {
+ // 鍖归厤澶辫触
+ S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),
+ (short) 4);
+
+ }
}
-
+ }
+
+ // S7control.getinstance().WriteWord("DB14.170", (short)0);
+
+ // 姝ｅ湪涓婄墖璁㈠崟涓殑鎵�鏈夊皬鐗囦俊鎭�
+ 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(LastQueue.getglasswidthmm());
+ LastQueue.setglassheight(LastQueue.getglassheightmm());
+ }
+ jsonObject.append("LastQueue", LastQueue);
}
// String E01id = new String( S7controlLK.getinstance().ReadByte("DB17.0",16));
// String J01id = new String( S7controlLK.getinstance().ReadByte("DB17.22",14));
-
- //鏌ヨ鐞嗙墖绗间俊鎭�
+ // 鏌ヨ鐞嗙墖绗间俊鎭�
List<StorageCage> StorageCageInfo = storageCageService.SelectStorageCageInfo();
jsonObject.append("StorageCageInfo", StorageCageInfo);
- //鏌ヨ褰撳墠杩涚墖浠诲姟
+ // 鏌ヨ褰撳墠杩涚墖浠诲姟
List<StorageTask> StoragTaskeTaskFeed = storageCageService.SelectStorageTask(0);
jsonObject.append("StoragTaskeTaskFeed", StoragTaskeTaskFeed);
- //鏌ヨ褰撳墠鍑虹墖浠诲姟
+ // 鏌ヨ褰撳墠鍑虹墖浠诲姟
List<StorageTask> StoragTaskeTaskOut = storageCageService.SelectStorageTask(1);
jsonObject.append("StoragTaskeTaskOut", StoragTaskeTaskOut);
- //鏌ヨ褰撳墠璁㈠崟浠诲姟
- List<FlowCard> OrderTask = storageCageService.SelectOrderTask();
+ // 鏌ヨ鎵�鏈夌幓鐠冨帤搴﹀拰鑶滅郴
+ 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();
jsonObject.append("OrderTask", OrderTask);
+
+ // jsonObject.append("params", new short[] { 30, 40, });
+ // System.out.println("jsonObject:" + jsonObject);
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("Home");
+ if (sendwServer != null) {
+ for (WebSocketServer webserver : sendwServer) {
+ webserver.sendMessage(jsonObject.toString());
+
+ if (webserver != null) {
+
+ List<String> messages = webserver.getMessages();
+
+ if (!messages.isEmpty()) {
+ // // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
+ webserver.clearMessages();
+ }
+ }
+
+ }
+ }
} catch (InterruptedException e) {
e.printStackTrace();
- }
-
- // jsonObject.append("params", new short[] { 30, 40, });
- ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("Home");
- if (sendwServer != null) {
- for (WebSocketServer webserver : sendwServer) {
- webserver.sendMessage(jsonObject.toString());
-
- if (webserver != null) {
-
- List<String> messages = webserver.getMessages();
-
- if (!messages.isEmpty()) {
- // // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
- webserver.clearMessages();
- }
- }
-
- }
}
}
}
--
Gitblit v1.8.0