diff --git a/src/main/java/com/ai/da/python/PythonService.java b/src/main/java/com/ai/da/python/PythonService.java index 0ed115a0..3f7060bf 100644 --- a/src/main/java/com/ai/da/python/PythonService.java +++ b/src/main/java/com/ai/da/python/PythonService.java @@ -1397,22 +1397,13 @@ public class PythonService { // 设置印花的位置、大小、旋转角度 List prints = printObject.getPrints(); prints.forEach(p -> { - if (printObject.getIfSingle().equals(Boolean.FALSE)){ - p.getLocation().set(0,p.getLocation().get(0)); - p.getLocation().set(1,p.getLocation().get(1)); - scale.add(p.getScale()); - paths.add(p.getMinIOPath()); - location.add(p.getLocation()); - angle.add(p.getAngle()); - }else { - p.getLocation().set(0,p.getLocation().get(0)); - p.getLocation().set(1,p.getLocation().get(1)); - Integer priority = p.getPriority(); - location.add(priority - 1, p.getLocation()); - scale.add(priority - 1,p.getScale()); - angle.add(priority - 1,p.getAngle()); - paths.add(priority - 1,p.getMinIOPath()); - } + p.getLocation().set(0,p.getLocation().get(0)); + p.getLocation().set(1,p.getLocation().get(1)); + Integer priority = p.getPriority(); + location.add(priority - 1, p.getLocation()); + scale.add(priority - 1,p.getScale()); + angle.add(priority - 1,p.getAngle()); + paths.add(priority - 1,p.getMinIOPath()); // log.info("本次print打点locations###{}###fileVO{}", p.getLocation(), JSON.toJSONString(fileVO)); }); print.setLocation(location); diff --git a/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java b/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java index 388c0c50..43cbc151 100644 --- a/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java @@ -569,16 +569,14 @@ public class DesignItemServiceImpl extends ServiceImpl