root/lanzhouhailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 没有管芯的97，98信号问题

Browse Source
This commit is contained in:
liyongde
2025-05-04 14:58:04 +08:00
parent 8cad98fc28
commit 64693677e4
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/constant/SlitterConstant.java
View File

@@ -60,4 +60,7 @@ public interface SlitterConstant {
*/ */
String SLITTER_TYPE_FRP = "2"; String SLITTER_TYPE_FRP = "2";
String TO_SHAFT_INFO_98 = "0";
String TO_SHAFT_INFO_97 = "2";
} }

6
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
View File

@@ -163,7 +163,7 @@ public class SlitterServiceImpl implements SlitterService {
res.put("device_code", deviceCode); res.put("device_code", deviceCode);
res.put("data", con); res.put("data", con);
if ("1".equals(autoSendEmpty.getValue()) && gxQtyList.size() == 0) { if ("1".equals(autoSendEmpty.getValue()) && gxQtyList.size() == 0) {
con.put("is_bushing", "2"); con.put("is_bushing", SlitterConstant.TO_SHAFT_INFO_97);
} else { } else {
// int sum = list.stream() // int sum = list.stream()
// .mapToInt(e -> e.getQty().intValue()) // .mapToInt(e -> e.getQty().intValue())
@@ -183,7 +183,9 @@ public class SlitterServiceImpl implements SlitterService {
.distinct() .distinct()
.collect(Collectors.toList()); .collect(Collectors.toList());
Integer tasks = papervehicleService.checkHaveTaskByPoints(pointCodes); Integer tasks = papervehicleService.checkHaveTaskByPoints(pointCodes);
con.put("is_bushing", tasks > 0 ? SlitterConstant.SLITTER_YES : SlitterConstant.SLITTER_NO); con.put("is_bushing", tasks > 0
? SlitterConstant.SLITTER_YES
: "1".equals(autoSendEmpty.getValue()) ? SlitterConstant.TO_SHAFT_INFO_97 : SlitterConstant.TO_SHAFT_INFO_98);
} }
} }