From eaa749c5939632dd1aa7aa9440570886e29e6a63 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 26 三月 2024 15:32:42 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/Albania_Mes
---
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 121 ++++++++++++++++++----------------------
1 files changed, 54 insertions(+), 67 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 b6a205b..592c4b3 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,6 +1,5 @@
package com.example.springboot.component;
import cn.hutool.json.JSONObject;
-import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
import com.example.springboot.service.*;
@@ -8,11 +7,14 @@
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.GlassInfo;
import com.example.springboot.entity.MeasureSetting;
import com.example.springboot.entity.Out_slice;
import com.example.springboot.entity.Queue;
import com.example.springboot.entity.StorageCage;
+import com.example.springboot.entity.StorageTask;
import com.example.springboot.entity.alarmmg;
import com.example.springboot.entity.north_glass_buffer1;
import com.example.springboot.entity.device.PlcParameterObject;
@@ -34,8 +36,6 @@
private OutSliceServive outSliceServive;
private SpianMapper spianMapper;
private SpianService spianService;
- private North_Glass_Buffer1Service north_Glass_Buffer1Service;
- private JdbcConnections dbserve;
// 鍑虹墖闃熷垪鏄惁鍏佽鍑虹墖
public static Boolean isAllowQueue = true;
@@ -74,19 +74,16 @@
spianMapper = WebSocketServer.applicationContext.getBean(SpianMapper.class);
spianService = WebSocketServer.applicationContext.getBean(SpianService.class);
outSliceServive = WebSocketServer.applicationContext.getBean(OutSliceServive.class);
- north_Glass_Buffer1Service = WebSocketServer.applicationContext
- .getBean(North_Glass_Buffer1Service.class);
storageCageService = WebSocketServer.applicationContext.getBean(StorageCageService.class);
- dbserve = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
// 绗煎瓙浣跨敤鎯呭喌
- 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);
@@ -100,15 +97,7 @@
List<alarmmg> alarmmg = homeMapper.SelectAlarmmgInfo();
jsonObject.append("alarmmg", alarmmg);
- // 鑾峰彇鎵爜浣嶄笌涓婄墖浣嶇幓鐠冧俊鎭�
- Queue form2 = homeMapper.GetQueueInfo(2);
- Queue form3 = homeMapper.GetQueueInfo(1);
- if (form2.getglassId() != null && form2.getglassId() != "") {
- jsonObject.append("form2", form2);
- }
- if (form3.getglassId() != null && form3.getglassId() != "") {
- jsonObject.append("form3", form3);
- }
+
// 鑾峰彇鍑虹墖闃熷垪淇℃伅
List<Out_slice> listoutslice = outSliceServive.SelectProductionqueue();
jsonObject.append("listoutslice", listoutslice);
@@ -127,66 +116,65 @@
//璇诲彇DB105鍖烘枃浠�
PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
- //String PlcRequest=plcmes.getPlcParameter("GaToMES").getValue();//璇锋眰
- //double width=plcmes.getPlcParameter("Height").getValue();//瀹�
- //double height=plcmes.getPlcParameter("width").getValue();//楂�
+ // String PlcRequest=plcmes.getPlcParameter("GaToMES").getValue();//璇锋眰
+ // String MesSend=plcmes.getPlcParameter("MESToGaStatus").getValue();//鍙戦��
+ // double width=Double.valueOf(plcmes.getPlcParameter("Height").getValue());//瀹�
+ // double height=Double.valueOf(plcmes.getPlcParameter("width").getValue());//楂�
+
+ // String PlcRequest=S7control.getinstance().ReadWord("DB14.26", 1).get(0)+"";
+ // double width=Double.parseDouble(S7control.getinstance().ReadWord("DB14.28", 1).get(0)+"");
+ // double height=Double.parseDouble(S7control.getinstance().ReadWord("DB14.30", 1).get(0)+"");
+ // String MesSend=S7control.getinstance().ReadWord("DB14.170", 1).get(0)+"";
+
//鑾峰彇娴嬮噺鐨勯暱锛屽
- 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){
- // //鐪嬪眰鏁�
- // }
-
- // for(int i=0;i<result.size();i++){
- // System.out.println(result.get(i));
- // }
-
-
- //List result= HomeService.ReadExecl(url);
- // for(int i=0;i<result.size();i++){
- // System.out.println(result.get(i));
- // }
-
-
-
+ boolean istest = false;
String PlcRequest = "1";
+ String MesSend = "0";
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("鍖归厤澶辫触");
- }
- else{
- //鍖归厤澶辫触 鏈壘鍒扮鍚堢殑鏁版嵁 娣诲姞鏁版嵁
- QueueMapper.insert(null,width,height,3);
- System.out.println("鏈壘鍒扮鍚堢殑鏁版嵁");
- }
-
+ //鍖归厤
+ //System.err.println(PlcRequest+","+MesSend+","+width+","+height);
+ if ("0".equals(PlcRequest)&&istest) {
+ S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 0);
}
+ 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);
+ }
+
+ }
+ Queue LastQueue= QueueMapper.selectLastQueue();
// String E01id = new String( S7controlLK.getinstance().ReadByte("DB17.0",16));
// String J01id = new String( S7controlLK.getinstance().ReadByte("DB17.22",14));
-
+ jsonObject.append("LastQueue", LastQueue);
+ //鏌ヨ鐞嗙墖绗间俊鎭�
+ 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();
+ jsonObject.append("OrderTask", OrderTask);
} catch (InterruptedException e) {
e.printStackTrace();
}
-
// jsonObject.append("params", new short[] { 30, 40, });
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("Home");
if (sendwServer != null) {
@@ -201,7 +189,6 @@
// // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
webserver.clearMessages();
}
-
}
}
--
Gitblit v1.8.0