From 334af33faa80e2e91d0fd98475e10df7a420c801 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期五, 03 一月 2025 15:35:36 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 52 +++++++++++++-------------
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 16 ++++----
2 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 2d14568..91463f8 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -3096,38 +3096,38 @@
}
Integer turnBigInt = 0;
- if (wrkMast.booleanStaNoSign()){
- RgvOneSign rgvOneSign = rgvOneSignMapper.selectOneSign("LineUp"+wrkMast.getStaNo());
- if (Cools.isEmpty(rgvOneSign)){
- continue;
- }
- RgvOneSign trunBig = rgvOneSignMapper.selectOneSign("TrunBig"+wrkMast.getStaNo());
- if (Cools.isEmpty(trunBig)){
- continue;
- }
- turnBigInt = trunBig.getRgvOneSign();
- int wrkCount = wrkMastMapper.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMast.getStaNo()).eq("wrk_sts",12L));
-
- if (trunBig.getRgvOneSign()+wrkCount+rgvOneSign.getRgvOneSign()>2){
- continue;
- }
- int wrkCountGt = wrkMastMapper.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMast.getStaNo()).gt("wrk_sts",11L));
- if (wrkCountGt > 2){
- continue;
- }
-// RgvOneSign bigTurn = rgvOneSignMapper.selectOneSign("bigTurn");
-// if (Cools.isEmpty(bigTurn)){
+// if (wrkMast.booleanStaNoSign()){
+// RgvOneSign rgvOneSign = rgvOneSignMapper.selectOneSign("LineUp"+wrkMast.getStaNo());
+// if (Cools.isEmpty(rgvOneSign)){
// continue;
// }
-// if (bigTurn.getRgvOneSign()>13){
+// RgvOneSign trunBig = rgvOneSignMapper.selectOneSign("TrunBig"+wrkMast.getStaNo());
+// if (Cools.isEmpty(trunBig)){
// continue;
// }
-// DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 1);
-// StaProtocol staProtocolEnt = devpThread.getStation().get(wrkMast.getStaNoBying());
-// if (staProtocolEnt.isLoading() || staProtocolEnt.getWorkNo()!=0){
+// turnBigInt = trunBig.getRgvOneSign();
+// int wrkCount = wrkMastMapper.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMast.getStaNo()).eq("wrk_sts",12L));
+//
+// if (trunBig.getRgvOneSign()+wrkCount+rgvOneSign.getRgvOneSign()>2){
// continue;
// }
- }
+// int wrkCountGt = wrkMastMapper.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMast.getStaNo()).gt("wrk_sts",11L));
+// if (wrkCountGt > 2){
+// continue;
+// }
+//// RgvOneSign bigTurn = rgvOneSignMapper.selectOneSign("bigTurn");
+//// if (Cools.isEmpty(bigTurn)){
+//// continue;
+//// }
+//// if (bigTurn.getRgvOneSign()>13){
+//// continue;
+//// }
+//// DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 1);
+//// StaProtocol staProtocolEnt = devpThread.getStation().get(wrkMast.getStaNoBying());
+//// if (staProtocolEnt.isLoading() || staProtocolEnt.getWorkNo()!=0){
+//// continue;
+//// }
+// }
// 宸ヤ綔妗ｇ姸鎬佸垽鏂�
if (wrkMast.getIoType() < 100 || wrkMast.getSourceStaNo() == null) {
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index f7690df..cfcab87 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -357,19 +357,19 @@
int bigEmpty = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 2);// 澶ф枡绌烘墭
int smallTurn = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 4);// 灏忔枡缈昏浆
int bigTurn = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 6);// 澶ф枡缈昏浆
- int LineUp131 = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 8);// 131鎺掗槦
- int LineUp126 = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 10);// 126鎺掗槦
- int LineUp312 = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 12);// 312鎺掗槦
- int LineUp310 = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 14);// 310鎺掗槦
+// int LineUp131 = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 8);// 131鎺掗槦
+// int LineUp126 = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 10);// 126鎺掗槦
+// int LineUp312 = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 12);// 312鎺掗槦
+// int LineUp310 = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 14);// 310鎺掗槦
updateRgvOneSign("smallEmpty",smallEmpty);
updateRgvOneSign("bigEmpty",bigEmpty);
updateRgvOneSign("smallTurn",smallTurn);
updateRgvOneSign("bigTurn",bigTurn);
- updateRgvOneSign("LineUp131",LineUp131);
- updateRgvOneSign("LineUp126",LineUp126);
- updateRgvOneSign("LineUp312",LineUp312);
- updateRgvOneSign("LineUp310",LineUp310);
+// updateRgvOneSign("LineUp131",LineUp131);
+// updateRgvOneSign("LineUp126",LineUp126);
+// updateRgvOneSign("LineUp312",LineUp312);
+// updateRgvOneSign("LineUp310",LineUp310);
} catch (Exception e){
log.error("璇诲彇杈撻�佺嚎鏁伴噺鏍囪鍑虹幇寮傚父锛�"+e);
--
Gitblit v1.9.1