From 6db39c1dfb1dca966983652e4360672cb58a96f6 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期日, 31 三月 2024 12:40:45 +0800
Subject: [PATCH] 代码更新
---
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 65 +++++++++++++++++++++-----------
1 files changed, 42 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 7387e96..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,36 +116,55 @@
//璇诲彇DB105鍖烘枃浠�
PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
- //String PlcRequest=plcmes.getPlcParameter("GaToMES").getValue();//璇锋眰
- //String MesSend=plcmes.getPlcParameter("MESToGaStatus").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("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)+"");
+ // 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";E:\
- //String url="E:\\闃垮皵宸村凹浜氭暟鎹姹�.xlsx";
- // List result= HomeService.ReadExecl(url);
- // for(int i=0;i<result.size();i++){
- // System.out.println(result.get(i));
- // }
-
-
-
- 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;
//鍖归厤
- if ("1".equals(PlcRequest)&&"0".equals(MesSend)) {
- GlassInfo MesureGlassinfo=HomeService.Normal(width, height, "1");
+ //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);
+ }
+
+ }
+ //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);
@@ -158,7 +177,7 @@
List<StorageTask> StoragTaskeTaskOut = storageCageService.SelectStorageTask(1);
jsonObject.append("StoragTaskeTaskOut", StoragTaskeTaskOut);
- //鏌ヨ褰撳墠璁㈠崟浠诲姟
+ // //鏌ヨ褰撳墠璁㈠崟浠诲姟
List<FlowCard> OrderTask = storageCageService.SelectOrderTask();
jsonObject.append("OrderTask", OrderTask);
--
Gitblit v1.8.0