diff --git a/main/java/shjh/jhzj7/fi/fi/plugin/operate/SchedulebillMergeOperation.java b/main/java/shjh/jhzj7/fi/fi/plugin/operate/SchedulebillMergeOperation.java index 764a41c..4f261cb 100644 --- a/main/java/shjh/jhzj7/fi/fi/plugin/operate/SchedulebillMergeOperation.java +++ b/main/java/shjh/jhzj7/fi/fi/plugin/operate/SchedulebillMergeOperation.java @@ -133,7 +133,26 @@ public class SchedulebillMergeOperation extends AbstractOperationServicePlugIn i map.computeIfAbsent(rule, k -> new ArrayList<>()).add(bill); } } - assignBatchNumbersAndSave(map); +// assignBatchNumbersAndSave(map); + List longs = new ArrayList<>(); + map.forEach((k, v) -> { + long l = System.currentTimeMillis(); + longs.add(l); + for (DynamicObject bill : v) { + bill.set("batchnum", "" + l); + bill.set("shjh_ishb", true); + } + SaveServiceHelper.save(v.toArray(new DynamicObject[0])); + }); + int size = map.size();//合并的数 + StringBuilder sb = new StringBuilder(); + for (Long aLong : longs) { + sb.append(aLong).append(","); + } + this.getOperationResult().setSuccess(true); + this.getOperationResult().setMessage("合并数:" + size + " 合并的批次号:" + sb); + this.getOperationResult().setShowMessage(true); + return; } } // 合并解除:若合并批次号不为空,且为二开干预的合并排程单,则将合并批次号置空,并将合并状态置为false