From 2d92826d942cd4c06e1f415d4a3896b99ec65e2b Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 07 十一月 2024 19:32:00 +0800
Subject: [PATCH] 更改配片逻辑
---
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 78 +++++++++++++++++++++++----------------
1 files changed, 46 insertions(+), 32 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 5cdb6fa..20a2049 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
@@ -3,12 +3,15 @@
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.Glass;
import com.example.springboot.entity.GlassInfo;
import com.example.springboot.entity.MeasureSetting;
import com.example.springboot.entity.Out_slice;
@@ -77,7 +80,7 @@
storageCageService = WebSocketServer.applicationContext.getBean(StorageCageService.class);
glassInfoMapper = WebSocketServer.applicationContext.getBean(GlassInfoMapper.class);
// 鑾峰彇鍏惰溅鐨勪綅缃�
- if (S7control.getinstance().CheckConnected() == true&&false) {
+ if (S7control.getinstance().CheckConnected() == true && false) {
double carposition = 0;
float car = S7control.getinstance().readFloat32("DB10.1992");
carposition = (-40 + (car / (carend - carstart) * 595));
@@ -117,8 +120,8 @@
// 鏄惁闇�瑕佷汉宸ョ‘璁や笂鐗囩幓鐠�
jsonObject.append("isConfirm", isConfirm);
// 鏌ヨ褰撳墠閾濇淇℃伅
- Out_slice CurrentFrame = outSliceServive.SelectCurrentFrame();
- jsonObject.append("CurrentFrame", CurrentFrame);
+ // Out_slice CurrentFrame = outSliceServive.SelectCurrentFrame();
+ // jsonObject.append("CurrentFrame", CurrentFrame);
// 璇诲彇DB105鍖烘枃浠�
PlcParameterObject plcmes = PLCAutoMes.PlcMesObject;
@@ -132,40 +135,41 @@
// String MesSend = "0";
// double width = 727;
// double height = 414;
-
- //鍖归厤
- // 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);
- }
- // 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);
- }
- }
+ // 鍖归厤
+ // 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);
+ }
+ // 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);
@@ -201,6 +205,16 @@
List<StorageTask> StoragTaskeTaskOut = storageCageService.SelectStorageTask(1);
jsonObject.append("StoragTaskeTaskOut", StoragTaskeTaskOut);
+ // 鏌ヨ鎵�鏈夌幓鐠冨帤搴﹀拰鑶滅郴
+ 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);
--
Gitblit v1.8.0