From 123a17c9d50745ea609f91943adca64e5ed12355 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期六, 12 四月 2025 09:08:14 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 4 ++++
src/main/java/com/zy/core/MainProcess.java | 2 +-
src/main/java/com/zy/core/thread/impl/FyDevpThread.java | 4 ++--
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 51ace7f..40b3d40 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -43,7 +43,7 @@
//zhangc
//杈撻�佺嚎
// 鍏ュ簱
- // mainService.generateInboundWrk();
+ mainService.generateInboundWrk();
// 鍑哄簱
// mainService.stnToOutStn();
diff --git a/src/main/java/com/zy/core/model/protocol/StaProtocol.java b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
index 44ec201..0c8bd03 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -37,6 +37,7 @@
//閲嶉噺
private Integer weight = 0;
+
// 鏈夌墿
private boolean loading;
@@ -93,6 +94,9 @@
// 鎵爜澶辫触
private boolean barcodeErr;
+ // 鏁呴殰
+ private boolean error;
+
//鍑哄叆搴撴ā寮�0銆佹湭鐭� 1銆佸叆搴擄紝2銆佸嚭搴�
private Short outInModel;
diff --git a/src/main/java/com/zy/core/thread/impl/FyDevpThread.java b/src/main/java/com/zy/core/thread/impl/FyDevpThread.java
index 251d2f7..6ec89a1 100644
--- a/src/main/java/com/zy/core/thread/impl/FyDevpThread.java
+++ b/src/main/java/com/zy/core/thread/impl/FyDevpThread.java
@@ -193,9 +193,9 @@
BasDevp sqlModel = staProtocol.toSqlModel();
stations.add(sqlModel);
- //鐢ㄤ簬鍐欏叆sql
+ //鏆傛椂鍐欏叆鏁版嵁搴�
BasDevp basDevp = basConveyorStaService.selectById(sta);
- if (basDevp != null) {
+ if (basDevp == null) {
basConveyorStaService.insert(sqlModel);
}
}
--
Gitblit v1.9.1