From 1a93bcc9c4626939b755abcc9b62432f27173398 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 18 三月 2024 13:42:42 +0800
Subject: [PATCH] 更新
---
springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java | 2 +-
springboot-vue3/src/main/java/com/example/springboot/mapper/AlbaniaMapper.java | 3 ++-
springboot-vue3/src/main/java/com/example/springboot/component/PlchomeNew.java | 16 ++++++++--------
springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java | 2 +-
springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java | 23 +++++++----------------
5 files changed, 19 insertions(+), 27 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java
index 17fbf5a..6e88a46 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java
@@ -1,25 +1,17 @@
package com.example.springboot.component;
-
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
-import com.example.springboot.service.JdbcConnections;
import com.example.springboot.service.SpianServiceNew;
-import com.example.springboot.entity.north_glass_buffer1;
+import com.example.springboot.service.StorageCageService;
import com.example.springboot.entity.device.PlcParameterObject;
-import com.example.springboot.mapper.AlarmMapper;
import com.example.springboot.mapper.AlbaniaMapper;
-import com.example.springboot.mapper.SpianMapper;
public class PlcHoldNew extends Thread {
- private AlarmMapper alarmMapper;
@Autowired
- private JdbcConnections jdbcConnections;
private AlbaniaMapper albaniaMapper;
private SpianServiceNew spianService;
+ private StorageCageService storageCageService;
int aaa;
@Override
@@ -37,7 +29,7 @@
// if (S7control.getinstance().CheckConnected() == false) {
spianService = WebSocketServer.applicationContext.getBean(SpianServiceNew.class);
albaniaMapper = WebSocketServer.applicationContext.getBean(AlbaniaMapper.class);
- spianService.selectAll(albaniaMapper.SelectGlass());
+ // spianService.selectAll(albaniaMapper.SelectGlass());
//璇诲彇DB14鍖烘枃浠�
PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
@@ -75,13 +67,12 @@
//瀹屾垚纭瀛�
for(int i=1;i<7;i++){
- String Tastover=plcmes.getPlcParameter("IDStatus"+i).getValue();//渚濇鑾峰彇浠诲姟绫诲瀷
- String Glassid=plcmes.getPlcParameter("MESID"+i).getValue();//渚濇鑾峰彇浠诲姟绫诲瀷
- if(Tastover.equals("1")){
-
+ String Glassid=plcmes.getPlcParameter("MESID"+i).getValue();//渚濇鑾峰彇浠诲姟ID
+ int tastid=albaniaMapper.SelectTaskId(Glassid.substring(0,14));
+ storageCageService.FinishTask(tastid);
//璋冪敤瀹屾垚浠诲姟 Glassid
S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToPLCStatus"+i).getAddress(), (short) 1);//瀹屾垚纭瀛�
- }
+
}
}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlchomeNew.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlchomeNew.java
index 3b03f97..5ad5cd8 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlchomeNew.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlchomeNew.java
@@ -137,14 +137,14 @@
// public static PlcParameterObject PlcReadObject = initUtil.initword(PlcRead);
// public static PlcParameterObject PlcframeObject = initUtil.initword(Plcframe);
- PlcParameterObject PlcParameter = PLCAutoMes.plcParameterObject;// plc鍙傛暟鍦板潃DB100
- PlcBitObject PlcTest = PLCAutoMes.plcPlcTest;// plc鏍囪瘑鍦板潃DB101
- PlcBitObject PlcSign = PLCAutoMes.plcBitObject;// plc璁惧鐘舵�佸湴鍧�DB102
- PlcParameterObject PlcState = PLCAutoMes.plcStateObject;// plc鐘舵�佸湴鍧�DB103
- PlcBitObject PlcAlarm = PLCAutoMes.plcPlcAlarm;// plc鎶ヨ鍦板潃DB104
- PlcParameterObject MesMission = PLCAutoMes.PlcMesObject;// mes浠籑ES鍔″湴鍧�DB105
- PlcParameterObject PLCMission = PLCAutoMes.PlcReadObject;// plc浠诲姟鍦板潃DB106
- PlcParameterObject Plcframe = PLCAutoMes.PlcframeObject;// plc閾濇鍦板潃DB17
+ // PlcParameterObject PlcParameter = PLCAutoMes.plcParameterObject;// plc鍙傛暟鍦板潃DB100
+ // PlcBitObject PlcTest = PLCAutoMes.plcPlcTest;// plc鏍囪瘑鍦板潃DB101
+ // PlcBitObject PlcSign = PLCAutoMes.plcBitObject;// plc璁惧鐘舵�佸湴鍧�DB102
+ // PlcParameterObject PlcState = PLCAutoMes.plcStateObject;// plc鐘舵�佸湴鍧�DB103
+ // PlcBitObject PlcAlarm = PLCAutoMes.plcPlcAlarm;// plc鎶ヨ鍦板潃DB104
+ // PlcParameterObject MesMission = PLCAutoMes.PlcMesObject;// mes浠籑ES鍔″湴鍧�DB105
+ // PlcParameterObject PLCMission = PLCAutoMes.PlcReadObject;// plc浠诲姟鍦板潃DB106
+ // PlcParameterObject Plcframe = PLCAutoMes.PlcframeObject;// plc閾濇鍦板潃DB17
// if (S7control.getinstance().CheckConnected() == true) {
diff --git a/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java b/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
index a95fab6..e5d7767 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
@@ -18,7 +18,7 @@
System.out.println("鍚姩瀹屾垚");
// new PlcHold().start();
- // new PlcHoldNew().start();
+ new PlcHoldNew().start();
// new PLCAutoMes().start();
new Plchome().start();
diff --git a/springboot-vue3/src/main/java/com/example/springboot/mapper/AlbaniaMapper.java b/springboot-vue3/src/main/java/com/example/springboot/mapper/AlbaniaMapper.java
index 84b1c7b..7827fb4 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/mapper/AlbaniaMapper.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/mapper/AlbaniaMapper.java
@@ -46,6 +46,7 @@
//鍙戦�佸嚭鐗囧悗澧炲姞宸插彂鏁伴噺
@Update("update glassinfo set finishnumber=finishnumber+1 where flowcard=#{flowcard} and mateid=#{mateid} and tier=#{tier};")
void AddFinishNumber(String flowcard,int mateid,int tier);
-
+ @Select("select id from storage_task where state=0 glassid=#{glassid} LIMIT 1")
+ int SelectTaskId(String glassid);
}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java b/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java
index c8d5699..b56fdf0 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java
@@ -237,7 +237,7 @@
}
//鎵嬪姩瀹屾垚浠诲姟
- public Result FinishTask(Integer tasktype, Integer id) {
+ public Result FinishTask( Integer id) {
StorageTask storageTask = homeMapper.SelectStorageTaskById(id);//鑾峰彇浠诲姟淇℃伅
homeMapper.FinishTask(storageTask.getId());//瀹屾垚浠诲姟
if(storageTask.getTaskType().equals("0")){
--
Gitblit v1.8.0