From 6b8b4e4dc8a12695d51ce40f04297f2fcb2bf657 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期二, 09 四月 2024 14:24:31 +0800
Subject: [PATCH] 更新
---
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 62 +++++++++++++++++++-----------
1 files changed, 39 insertions(+), 23 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..518dd87 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
@@ -113,13 +113,13 @@
Out_slice CurrentFrame = outSliceServive.SelectCurrentFrame();
jsonObject.append("CurrentFrame", CurrentFrame);
- //璇诲彇DB105鍖烘枃浠�
- PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
+ // //璇诲彇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());//楂�
+ // 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,34 +127,50 @@
// 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 = 516;
+ // double height = 507;
//鍖归厤
//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);
+ // 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);
- }
+ // }else if(istest){
+ // // 閲嶆柊娴嬮噺
+ // S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 4);
+ // }
- }
+ // }
+ //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);
+ nullQueue.setglassheightmm(0);
+ nullQueue.setglasswidthmm(0);
+ jsonObject.append("LastQueue", nullQueue);
+ }else{
+ if (LastQueue.getstate()<1) {
+ LastQueue.setglasswidth(0);
+ LastQueue.setglassheight(0);
+ }
+ 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