diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/constant/SlitterConstant.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/constant/SlitterConstant.java index c89e46167..cbe8a6c6d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/constant/SlitterConstant.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/constant/SlitterConstant.java @@ -60,4 +60,7 @@ public interface SlitterConstant { */ String SLITTER_TYPE_FRP = "2"; + String TO_SHAFT_INFO_98 = "0"; + String TO_SHAFT_INFO_97 = "2"; + } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java index d9b5b0fa4..d59962a08 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java @@ -163,7 +163,7 @@ public class SlitterServiceImpl implements SlitterService { res.put("device_code", deviceCode); res.put("data", con); if ("1".equals(autoSendEmpty.getValue()) && gxQtyList.size() == 0) { - con.put("is_bushing", "2"); + con.put("is_bushing", SlitterConstant.TO_SHAFT_INFO_97); } else { // int sum = list.stream() // .mapToInt(e -> e.getQty().intValue()) @@ -183,7 +183,9 @@ public class SlitterServiceImpl implements SlitterService { .distinct() .collect(Collectors.toList()); 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); } }