From de7f6920f60271aeb4bd22d2d170988f3cef390b Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期日, 31 三月 2024 12:43:14 +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 | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 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 592c4b3..113e5ad 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
@@ -116,10 +116,10 @@
//璇诲彇DB105鍖烘枃浠�
PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
- // 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=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());//楂�
// String PlcRequest=S7control.getinstance().ReadWord("DB14.26", 1).get(0)+"";
// double width=Double.parseDouble(S7control.getinstance().ReadWord("DB14.28", 1).get(0)+"");
@@ -127,11 +127,11 @@
// String MesSend=S7control.getinstance().ReadWord("DB14.170", 1).get(0)+"";
//鑾峰彇娴嬮噺鐨勯暱锛屽
- boolean istest = false;
- String PlcRequest = "1";
- String MesSend = "0";
- double width = 402;
- double height = 402;
+ boolean istest = true;
+ // String PlcRequest = "1";
+ // String MesSend = "0";
+ // double width = 402;
+ // double height = 402;
//鍖归厤
//System.err.println(PlcRequest+","+MesSend+","+width+","+height);
@@ -150,11 +150,21 @@
}
}
+ //S7control.getinstance().WriteWord("DB14.170", (short)0);
Queue LastQueue= QueueMapper.selectLastQueue();
+ if(LastQueue==null){
+ Queue nullQueue=new Queue();
+ nullQueue.setglassId("");
+ nullQueue.setglassheight(0);
+ nullQueue.setglasswidth(0);
+ jsonObject.append("LastQueue", nullQueue);
+ }else{
+ jsonObject.append("LastQueue", LastQueue);
+ }
// 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);
--
Gitblit v1.8.0