From 8603212f565621710b9782d2d798e66334e7733b Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期二, 12 三月 2024 15:41:53 +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/PlcHoldNew.java | 202 ++++++++++++++++++++++---------------------------
1 files changed, 91 insertions(+), 111 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 5c979bf..3c74bd3 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
@@ -5,10 +5,11 @@
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import com.example.springboot.service.JdbcConnections;
-import com.example.springboot.service.SpianService;
+import com.example.springboot.service.SpianServiceNew;
import com.example.springboot.entity.north_glass_buffer1;
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 {
@@ -17,8 +18,8 @@
@Autowired
private JdbcConnections jdbcConnections;
- private SpianMapper spianMapper;
- private SpianService spianService;
+ private AlbaniaMapper albaniaMapper;
+ private SpianServiceNew spianService;
int aaa;
@Override
@@ -34,137 +35,116 @@
}
// if (S7control.getinstance().CheckConnected() == false) {
- spianService = WebSocketServer.applicationContext.getBean(SpianService.class);
- spianMapper = WebSocketServer.applicationContext.getBean(SpianMapper.class);
- jdbcConnections = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
+ spianService = WebSocketServer.applicationContext.getBean(SpianServiceNew.class);
+ albaniaMapper = WebSocketServer.applicationContext.getBean(AlbaniaMapper.class);
//璇诲彇DB105鍖烘枃浠�
PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
//璇�106
- PlcParameterObject plcread=PLCAutoMes.PlcReadObject;
+ //PlcParameterObject plcread=PLCAutoMes.PlcReadObject;
//璇�103
- PlcParameterObject plcstate=PLCAutoMes.plcStateObject;
- String OutRequest=plcread.getPlcParameter("OutRequest").getValue();//鍑虹墖璇锋眰
- String OutActivate=plcmes.getPlcParameter("OutActivate").getValue();//鍑虹墖鍚姩
-
-
- S7control.getinstance().WriteWord( plcmes.getPlcParameter("1231").getAddress(plcmes.getPlcParameter("1231").getAddressIndex()), (short) 0);
- // 鍑虹墖浠诲姟
+ String OutRequest=plcmes.getPlcParameter("OutRequest").getValue();//鍑虹墖璇锋眰涓�绾�
+ String OutActivate=plcmes.getPlcParameter("OutActivate").getValue();//鍑虹墖璇锋眰浜岀嚎
+ String AddRequest=plcmes.getPlcParameter("AddRequest").getValue();//杩涚墖璇锋眰
+ String CarRequest=plcmes.getPlcParameter("CatReque").getValue();//杩愰�佽溅璇锋眰
+ String Tastoverid=plcmes.getPlcParameter("Tastoverid").getValue();//浠诲姟瀹屾垚
+ String glassid=plcmes.getPlcParameter("glassid").getValue();//鐜荤拑id
- if (OutActivate.equals("1") == false&&OutRequest.equals("1")==true) {
- S7control.getinstance().WriteWord("DB105.18", (short) 0);// 鍑虹墖浠诲姟鍚姩鏀逛负0
+ //璋冪敤鍑虹墖浠诲姟
+ if (OutActivate.equals("1") == false&&CarRequest.equals("0")==true) {
+ //灏嗚繍杈撹溅鐘舵�佹敼涓哄繖纰�
+ S7control.getinstance().WriteWord(plcmes.getPlcParameter("B01report").getAddress(plcmes.getPlcParameter("B01report").getAddressIndex()), (short) 1);
+ spianService.selectout(glassid);
}
- String FeedRequest=plcread.getPlcParameter("FeedRequest").getValue();// 杩涚墖璇锋眰瀛�
- String AddActivate=plcmes.getPlcParameter("AddActivate").getValue();// 杩涚墖鍚姩
- if (FeedRequest.equals("1") == false&&AddActivate.equals("1")==true) {
- S7control.getinstance().WriteWord("DB105.16", (short) 0);//杩涚墖浠诲姟鍚姩鏀逛负0
- }
-
- if (OutActivate.equals("1") == true) {
- // 鍒ゆ柇褰撳墠鏄惁鏈夋湭鎵ц鐨勪换鍔�
- int outnum = spianMapper.SelectOutSliceshu();//鏄惁鏈夋鍦ㄥ嚭鐗囩殑浠诲姟
- int cageoutsum = spianMapper.Selectcageout(3);//绗煎瓙鍐呮槸鍚﹁繕鏈夊湪鍑虹墖鐨勭幓鐠�
- // 褰撴病鏈変换鍔℃墽琛屽苟涓斿嚭鐗囪溅绌洪棽鏃�
- if (outnum == 0 && Plchome.isAllowQueue == true && cageoutsum == 0) {
- // 鍒ゆ柇閾濇鍑虹墖闃熷垪琛ㄦ槸鍚︽湁寰呭嚭鐗囩殑鐜荤拑
- String outglassid = spianMapper.SelectOutSlice();
- // 褰撴湁寰呭嚭鐗囩殑鐜荤拑鏃�
- if (outglassid != null) {
- // 鑾峰彇璇ョ幓鐠冩槸鍚﹁绂佺敤
- int glassdisabled = spianMapper.SelectCageGlassState(outglassid);
- // 鏈鐢ㄤ笅鍙戜换鍔�
- if (glassdisabled == 0) {
- spianService.selectout2(outglassid);
- Plchome.isQueueWarning = false;
- } else { // 绂佺敤鏇存敼鐘舵�佸脊鍑烘彁绀�
- Plchome.isQueueWarning = true;
- }
-
- }
- }
-
+ //璋冪敤杩涚墖浠诲姟
+ if(AddRequest.equals("1")==true&&CarRequest.equals("0")==true){
+ //灏嗚繍杈撹溅鐘舵�佹敼涓哄繖纰�
+ S7control.getinstance().WriteWord(plcmes.getPlcParameter("B01report").getAddress(plcmes.getPlcParameter("B01report").getAddressIndex()), (short) 1);
+
+ spianService.selectAll(albaniaMapper.SelectGlass());
}
+
///////////// 杩涚墖浠诲姟
- String B01backs = plcread.getPlcParameter("B01CompleteTheReport").getValue();// b01姹囨姤
- String B02backs = plcread.getPlcParameter("B02CompleteTheReport").getValue();// b02姹囨姤
+ // String B01backs = plcread.getPlcParameter("B01CompleteTheReport").getValue();// b01姹囨姤
+ // String B02backs = plcread.getPlcParameter("B02CompleteTheReport").getValue();// b02姹囨姤
- String B01glassid = plcstate.getPlcParameter("B01ID1").getValue();// BO1鐨勭幓鐠僫d
- String B02glassid = plcstate.getPlcParameter("B02ID1").getValue();// B02鐨勭幓鐠僫d
+ // String B01glassid = plcstate.getPlcParameter("B01ID1").getValue();// BO1鐨勭幓鐠僫d
+ // String B02glassid = plcstate.getPlcParameter("B02ID1").getValue();// B02鐨勭幓鐠僫d
- // 褰撹繘鐗囧皬杞﹀畬鎴愪换鍔℃椂
- if (B01backs.equals("1") == true) {
- // 鍒ゆ柇鏄惁姹囨姤姝ｇ‘鐨刬d
- int HB = spianMapper.SelectHB(B01glassid.toString());
- if (HB > 0) {
- // 鎭㈠B01灏忚溅搴旂瓟鏀逛负1
- S7control.getinstance().WriteWord(plcmes.getPlcParameter("B01report").getAddress(plcmes.getPlcParameter("B01report").getAddressIndex()), (short) 1);
- String yingda =plcmes.getPlcParameter("B01report").getValue();// b01姹囨姤
- if (yingda.equals("1")) {
- spianService.overtask(B01glassid.toString());// 瀹屾垚浠诲姟
- }
- }
+ // // 褰撹繘鐗囧皬杞﹀畬鎴愪换鍔℃椂
+ // if (B01backs.equals("1") == true) {
+ // // 鍒ゆ柇鏄惁姹囨姤姝ｇ‘鐨刬d
+ // int HB = spianMapper.SelectHB(B01glassid.toString());
+ // if (HB > 0) {
+ // // 鎭㈠B01灏忚溅搴旂瓟鏀逛负1
+ // S7control.getinstance().WriteWord(plcmes.getPlcParameter("B01report").getAddress(plcmes.getPlcParameter("B01report").getAddressIndex()), (short) 1);
+ // String yingda =plcmes.getPlcParameter("B01report").getValue();// b01姹囨姤
+ // if (yingda.equals("1")) {
+ // spianService.overtask(B01glassid.toString());// 瀹屾垚浠诲姟
+ // }
+ // }
- }else{
- // 鎭㈠B01灏忚溅搴旂瓟鏀逛负0
- S7control.getinstance().WriteWord(plcmes.getPlcParameter("B01report").getAddress(plcmes.getPlcParameter("B01report").getAddressIndex()), (short) 0);
- }
+ // }else{
+ // // 鎭㈠B01灏忚溅搴旂瓟鏀逛负0
+ // S7control.getinstance().WriteWord(plcmes.getPlcParameter("B01report").getAddress(plcmes.getPlcParameter("B01report").getAddressIndex()), (short) 0);
+ // }
- // 褰撳嚭鐗囧皬杞﹀畬鎴愪换鍔℃椂
- if (B02backs.equals("1") == true) {
- // 鍒ゆ柇鏄惁姹囨姤姝ｇ‘鐨刬d
- int HB = spianMapper.SelectHB(B02glassid);
- if (HB > 0) {
- // 鎭㈠B02灏忚溅搴旂瓟鏀逛负1
- S7control.getinstance().WriteWord(plcmes.getPlcParameter("B02report").getAddress(plcmes.getPlcParameter("B02report").getAddressIndex()), (short) 1);
- String yingda =plcmes.getPlcParameter("B01report").getValue();// b02搴旂瓟
- if (yingda.equals("1") == true) {
- spianService.overtask(B02glassid);// 瀹屾垚浠诲姟
- }
- }
- }else{
- S7control.getinstance().WriteWord(plcmes.getPlcParameter("B02report").getAddress(plcmes.getPlcParameter("B02report").getAddressIndex()), (short) 0);
- }
+ // // 褰撳嚭鐗囧皬杞﹀畬鎴愪换鍔℃椂
+ // if (B02backs.equals("1") == true) {
+ // // 鍒ゆ柇鏄惁姹囨姤姝ｇ‘鐨刬d
+ // int HB = spianMapper.SelectHB(B02glassid);
+ // if (HB > 0) {
+ // // 鎭㈠B02灏忚溅搴旂瓟鏀逛负1
+ // S7control.getinstance().WriteWord(plcmes.getPlcParameter("B02report").getAddress(plcmes.getPlcParameter("B02report").getAddressIndex()), (short) 1);
+ // String yingda =plcmes.getPlcParameter("B01report").getValue();// b02搴旂瓟
+ // if (yingda.equals("1") == true) {
+ // spianService.overtask(B02glassid);// 瀹屾垚浠诲姟
+ // }
+ // }
+ // }else{
+ // S7control.getinstance().WriteWord(plcmes.getPlcParameter("B02report").getAddress(plcmes.getPlcParameter("B02report").getAddressIndex()), (short) 0);
+ // }
- // 鑾峰彇DO1鏁版嵁
- String Do1ID=plcread.getPlcParameter("FeedID").getValue();// 鑾峰彇璇锋眰鐨刬d璺烡O1鍚屾椂娓�
- // 鑾峰彇DO2鏁版嵁
- String Do2ID=plcread.getPlcParameter("FeedID").getValue();// 鑾峰彇璇锋眰鐨刬d璺烡O1鍚屾椂娓�
+ // // 鑾峰彇DO1鏁版嵁
+ // String Do1ID=plcread.getPlcParameter("FeedID").getValue();// 鑾峰彇璇锋眰鐨刬d璺烡O1鍚屾椂娓�
+ // // 鑾峰彇DO2鏁版嵁
+ // String Do2ID=plcread.getPlcParameter("FeedID").getValue();// 鑾峰彇璇锋眰鐨刬d璺烡O1鍚屾椂娓�
- int questate = spianMapper.Selectquecount(Do1ID.toString());// 鍒ゆ柇鎵爜浣嶆槸鍚︽湁鐜荤拑宸茬‘璁�
- // queueid1.toString().isEmpty()
- north_glass_buffer1 glass1 = spianMapper.selectGlass(Do1ID);// D01鐨勭幓鐠冧俊鎭�
- north_glass_buffer1 glass2 = spianMapper.selectGlass(Do2ID);// D02鐜荤拑淇℃伅
- // 褰撴壂鐮佷綅鐜荤拑id涓虹┖鏃� 瀹藉害涓�0
- if (Do1ID != null && questate == 0) {
- // 鍐欏叆D01鐨勬暟鎹埌涓婄墖闃熷垪琛�
- if (glass1 == null) { // 褰撴病鏈夊�兼椂浼犵┖
- spianMapper.Updatequeue(null, null, null, null, 0, null, null, null, null, 1);
- } else {
- spianMapper.Updatequeue(Do1ID.toString(), glass1.getordernumber(), glass1.getlistnumber(),
- glass1.getboxnumber(), 0, glass1.getglasslengthmm().toString(), glass1.getglassheightmm().toString(),
- glass1.getglasslength().toString(), glass1.getglassheight().toString(), 1);
- }
+ // int questate = spianMapper.Selectquecount(Do1ID.toString());// 鍒ゆ柇鎵爜浣嶆槸鍚︽湁鐜荤拑宸茬‘璁�
+ // // queueid1.toString().isEmpty()
+ // north_glass_buffer1 glass1 = spianMapper.selectGlass(Do1ID);// D01鐨勭幓鐠冧俊鎭�
+ // north_glass_buffer1 glass2 = spianMapper.selectGlass(Do2ID);// D02鐜荤拑淇℃伅
+ // // 褰撴壂鐮佷綅鐜荤拑id涓虹┖鏃� 瀹藉害涓�0
+ // if (Do1ID != null && questate == 0) {
+ // // 鍐欏叆D01鐨勬暟鎹埌涓婄墖闃熷垪琛�
+ // if (glass1 == null) { // 褰撴病鏈夊�兼椂浼犵┖
+ // spianMapper.Updatequeue(null, null, null, null, 0, null, null, null, null, 1);
+ // } else {
+ // spianMapper.Updatequeue(Do1ID.toString(), glass1.getordernumber(), glass1.getlistnumber(),
+ // glass1.getboxnumber(), 0, glass1.getglasslengthmm().toString(), glass1.getglassheightmm().toString(),
+ // glass1.getglasslength().toString(), glass1.getglassheight().toString(), 1);
+ // }
- }
+ // }
- if (Do2ID != null) {
- // 鍐欏叆D02鐨勬暟鎹埌涓婄墖闃熷垪琛�
- if (glass2 == null) {
- spianMapper.Updatequeue(null, null, null, null, 0, null, null, null, null, 2);
- } else {
- spianMapper.Updatequeue(Do2ID.toString(), glass2.getordernumber(), glass2.getlistnumber(),
- glass2.getboxnumber(), 0, glass2.getglasslengthmm().toString(), glass2.getglassheightmm().toString(),
- glass2.getglasslength().toString(), glass2.getglassheight().toString(), 2);
- spianMapper.overqueue2(Do2ID.toString(), 0, 1);// 鏇存敼鎵爜浣嶄换鍔¤〃鐨勭姸鎬佷负0
- S7control.getinstance().WriteWord("DB105.16", (short) 0);// 鍏抽棴浠诲姟鍚姩
- }
+ // if (Do2ID != null) {
+ // // 鍐欏叆D02鐨勬暟鎹埌涓婄墖闃熷垪琛�
+ // if (glass2 == null) {
+ // spianMapper.Updatequeue(null, null, null, null, 0, null, null, null, null, 2);
+ // } else {
+ // spianMapper.Updatequeue(Do2ID.toString(), glass2.getordernumber(), glass2.getlistnumber(),
+ // glass2.getboxnumber(), 0, glass2.getglasslengthmm().toString(), glass2.getglassheightmm().toString(),
+ // glass2.getglasslength().toString(), glass2.getglassheight().toString(), 2);
+ // spianMapper.overqueue2(Do2ID.toString(), 0, 1);// 鏇存敼鎵爜浣嶄换鍔¤〃鐨勭姸鎬佷负0
+ // S7control.getinstance().WriteWord("DB105.16", (short) 0);// 鍏抽棴浠诲姟鍚姩
+ // }
- }
+ // }
// 鏌ヨ鏁版嵁搴�
// 鎺ㄩ�佸埌鍓嶇
--
Gitblit v1.8.0