From 0263267cd527f57f991b565bc3015fd9345f3f01 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期一, 04 十二月 2023 14:20:01 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 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 2598f0f..9929559 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1422,7 +1422,7 @@
if(!("NG".endsWith(barcode) || "NoRead".equals(barcode) || "empty".equals(barcode))) {
//瀛樺湪鏉＄爜鍊硷紝鍒ゆ柇鏄惁鍜屽綋鍓嶅伐浣滄。涓�鑷�
if (!barcode.equals(wrkMast.getBarcode())) {
- News.info("{}浠诲姟锛屾潯鐮佸櫒{}鍊納}涓庡伐浣滄。鏉＄爜鍊间笉涓�鑷达紝绯荤粺璺宠繃鎵ц", wrkMast.getWrkNo(), sourceBasDevp.getDevNo(), barcodeId, barcode);
+ News.info("{}浠诲姟,{}绔欑偣锛屾潯鐮佸櫒{}鍊納}涓庡伐浣滄。鏉＄爜鍊納}涓嶄竴鑷达紝绯荤粺璺宠繃鎵ц", wrkMast.getWrkNo(), sourceBasDevp.getDevNo(), barcodeId, barcode,wrkMast.getBarcode());
return false;//绔欑偣涓嶅彲鍏�
}
}
@@ -3024,12 +3024,10 @@
wrapper.eq("code", "shuttleMaxPowerVerify");
Config config1 = configService.selectOne(wrapper1);
if (config1 != null) {
- if (!Boolean.parseBoolean(config1.getValue())) {
- continue;//娌℃湁寮�鍚弧鍏呮牎鍑�
- }
-
- if (shuttleProtocol.getVoltage() < 5630) {
- continue;//鐢靛帇涓嶅缁х画鍏呯數
+ if (config1.getValue().equals("true")) {
+ if (shuttleProtocol.getVoltage() < 5630) {
+ continue;//鐢靛帇涓嶅缁х画鍏呯數
+ }
}
}
//***************鍒ゆ柇鏄惁婊″厖鏍″噯***************
--
Gitblit v1.9.1