diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/SlitterService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/SlitterService.java index 8626759dc..a662e75e1 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/SlitterService.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/SlitterService.java @@ -147,4 +147,11 @@ public interface SlitterService { * @return / */ JSONObject toCleanCutCacheInventory(JSONObject param); + + /** + * 分切拼接操作 + * @param param / + * @return / + */ + JSONObject slitterSpliceOperation(JSONObject param); } 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 f77c8121b..517d34fa2 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 @@ -139,7 +139,7 @@ public class SlitterServiceImpl implements SlitterService { // point.getTube_code1() 编码 , getTube_name1() : 纸制筒管|纸管|6英寸|1300 or 纸制筒管|纸管|3英寸|12|650 res.put("device_code", deviceCode); res.put("data", con); - if ("1".equals(autoSendEmpty.getValue())) { + if ("1".equals(autoSendEmpty.getValue()) && list.size() == 0) { con.put("is_bushing", "2"); } else { con.put("is_bushing", list.size() > 0 ? SlitterConstant.SLITTER_YES : SlitterConstant.SLITTER_NO); @@ -973,4 +973,10 @@ public class SlitterServiceImpl implements SlitterService { res.put("message", "库存清除成功!"); return res; } + + @Override + public JSONObject slitterSpliceOperation(JSONObject param) { + // todo: + return null; + } }