From 7a4da65b270b1eb8dadf1fbf46b09f25274f5422 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 18 三月 2024 10:08:58 +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 | 52 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 49 insertions(+), 3 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 0292e94..5e1f626 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
@@ -4,24 +4,35 @@
import java.util.List;
import com.example.springboot.service.*;
import org.springframework.beans.factory.annotation.Autowired;
-
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;
import com.example.springboot.mapper.HomeMapper;
+import com.example.springboot.mapper.GlassInfoMapper;
+import com.example.springboot.mapper.MeasureSettingMapper;
+import com.example.springboot.mapper.QueueMapper;
import com.example.springboot.mapper.SpianMapper;
public class Plchome extends Thread {
@Autowired
private HomeMapper homeMapper;
+ @Autowired
+ private HomeService HomeService;
+ private QueueMapper QueueMapper;
+ private GlassInfoMapper GlassInfoMapper;
+ private MeasureSettingMapper MeasureSettingMapper;
private OutSliceServive outSliceServive;
private SpianMapper spianMapper;
private SpianService spianService;
+
// 鍑虹墖闃熷垪鏄惁鍏佽鍑虹墖
public static Boolean isAllowQueue = true;
public static Boolean isAllowReordering = true;
@@ -53,6 +64,8 @@
try {
Thread.sleep(1000);
// 娉ㄥ叆mapper
+ HomeService = WebSocketServer.applicationContext.getBean(HomeService.class);
+ QueueMapper = WebSocketServer.applicationContext.getBean(QueueMapper.class);
homeMapper = WebSocketServer.applicationContext.getBean(HomeMapper.class);
spianMapper = WebSocketServer.applicationContext.getBean(SpianMapper.class);
spianService = WebSocketServer.applicationContext.getBean(SpianService.class);
@@ -81,7 +94,6 @@
jsonObject.append("alarmmg", alarmmg);
-
// 鑾峰彇鍑虹墖闃熷垪淇℃伅
List<Out_slice> listoutslice = outSliceServive.SelectProductionqueue();
jsonObject.append("listoutslice", listoutslice);
@@ -96,9 +108,43 @@
// 鏌ヨ褰撳墠閾濇淇℃伅
Out_slice CurrentFrame = outSliceServive.SelectCurrentFrame();
jsonObject.append("CurrentFrame", CurrentFrame);
-
+
+ //璇诲彇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 = "1";
+ 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("鏈壘鍒扮鍚堢殑鏁版嵁");
+ }
+
+ }
// String E01id = new String( S7controlLK.getinstance().ReadByte("DB17.0",16));
// String J01id = new String( S7controlLK.getinstance().ReadByte("DB17.22",14));
+
//鏌ヨ鐞嗙墖绗间俊鎭�
List<StorageCage> StorageCageInfo = storageCageService.SelectStorageCageInfo();
--
Gitblit v1.8.0