From 500d06128957ec0316efb3b70b36da70ae4597b3 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Fri, 12 Jun 2026 19:51:04 +0800 Subject: [PATCH] =?UTF-8?q?webcad=E6=8B=86=E5=8D=95=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=8E=A5=E6=94=B6=E9=A2=84=E7=95=99=E8=BE=B9=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../orderimport/webcad/vo/WebCadDataBlockReqVO.java | 4 ++++ .../factory/WebCadOrderImportAsyncFactory.java | 10 +++++++++- .../orderImport/factory/WebCadOrderImportFactory.java | 10 +++++++++- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderimport/webcad/vo/WebCadDataBlockReqVO.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderimport/webcad/vo/WebCadDataBlockReqVO.java index 4d946901b..9b5665f3f 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderimport/webcad/vo/WebCadDataBlockReqVO.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderimport/webcad/vo/WebCadDataBlockReqVO.java @@ -77,6 +77,10 @@ public class WebCadDataBlockReqVO { private Double sealRight; private Double sealUp; private Double sealDown; + private Double reservedEdgeUp; + private Double reservedEdgeDown; + private Double reservedEdgeLeft; + private Double reservedEdgeRight; private Boolean isRect; private String spliteHeight; private String spliteThickness; diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java index f8930c854..f6e973aed 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java @@ -824,6 +824,10 @@ public class WebCadOrderImportAsyncFactory { .sealRight(getBigDecimalOrNull(block.getSealRight())) .sealUp(getBigDecimalOrNull(block.getSealUp())) .sealDown(getBigDecimalOrNull(block.getSealDown())) + .reservedEdgeLeft(getBigDecimalOrNull(block.getReservedEdgeLeft())) + .reservedEdgeRight(getBigDecimalOrNull(block.getReservedEdgeRight())) + .reservedEdgeUp(getBigDecimalOrNull(block.getReservedEdgeUp())) + .reservedEdgeDown(getBigDecimalOrNull(block.getReservedEdgeDown())) .remark(remark.toString()) .deleted(false) .organId(organId) @@ -2312,7 +2316,7 @@ public class WebCadOrderImportAsyncFactory { private void orderPlateBatchInsertWithinThreshold(List list, boolean isLast) { // 达到批量的阈值就做一次插入 if (CollUtil.isNotEmpty(list) && (list.size() >= BATCH_THRESHOLD_NUMBER || isLast)) { - String sql = "INSERT INTO order_plate (id,organ_id,order_id,name,plate_no,type,goods_id,width,height,thickness,split_width,split_height,split_thickness,seal_left,seal_right,seal_up,seal_down,area,texture,hole_face,hole_arrange,unregular_point_count,front_hole_count,back_hole_count,side_hole_count,front_model_count,back_model_count,is_door,open_door_type,offset_x,offset_y,is_arc_across,module_type_id,is_special_shaped,is_sculpt,is_side_sculpt,is_2v,is_side_2v,is_row_hole,is_optimized,is_cutted,filter_type,remark,is_cancel,deleted,custom_plate_no,create_time,update_time,creator,updater, cad_plate_no, model_data) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; + String sql = "INSERT INTO order_plate (id,organ_id,order_id,name,plate_no,type,goods_id,width,height,thickness,split_width,split_height,split_thickness,seal_left,seal_right,seal_up,seal_down,area,texture,hole_face,hole_arrange,unregular_point_count,front_hole_count,back_hole_count,side_hole_count,front_model_count,back_model_count,is_door,open_door_type,offset_x,offset_y,is_arc_across,module_type_id,is_special_shaped,is_sculpt,is_side_sculpt,is_2v,is_side_2v,is_row_hole,is_optimized,is_cutted,filter_type,remark,is_cancel,deleted,custom_plate_no,create_time,update_time,creator,updater, cad_plate_no, model_data, reserved_edge_left, reserved_edge_right, reserved_edge_up, reserved_edge_down) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter() { @Override public void setValues(PreparedStatement ps, int index) throws SQLException { @@ -2375,6 +2379,10 @@ public class WebCadOrderImportAsyncFactory { } else { ps.setNull(52, Types.BLOB); } + setSqlDefaultBigDecimal(ps, 53, item.getReservedEdgeLeft()); + setSqlDefaultBigDecimal(ps, 54, item.getReservedEdgeRight()); + setSqlDefaultBigDecimal(ps, 55, item.getReservedEdgeUp()); + setSqlDefaultBigDecimal(ps, 56, item.getReservedEdgeDown()); } @Override diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java index 85a5be197..82dae3095 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java @@ -1017,6 +1017,10 @@ public class WebCadOrderImportFactory { .sealRight(getBigDecimalOrNull(block.getSealRight())) .sealUp(getBigDecimalOrNull(block.getSealUp())) .sealDown(getBigDecimalOrNull(block.getSealDown())) + .reservedEdgeLeft(getBigDecimalOrNull(block.getReservedEdgeLeft())) + .reservedEdgeRight(getBigDecimalOrNull(block.getReservedEdgeRight())) + .reservedEdgeUp(getBigDecimalOrNull(block.getReservedEdgeUp())) + .reservedEdgeDown(getBigDecimalOrNull(block.getReservedEdgeDown())) .remark(remark.toString()) .deleted(false) .organId(organId) @@ -2111,7 +2115,7 @@ public class WebCadOrderImportFactory { private void orderPlateBatchInsertWithinThreshold(List list, boolean isLast) { // 达到批量的阈值就做一次插入 if (CollUtil.isNotEmpty(list) && (list.size() >= BATCH_THRESHOLD_NUMBER || isLast)) { - String sql = "INSERT INTO order_plate (id,organ_id,order_id,name,plate_no,type,goods_id,width,height,thickness,split_width,split_height,split_thickness,seal_left,seal_right,seal_up,seal_down,area,texture,hole_face,hole_arrange,unregular_point_count,front_hole_count,back_hole_count,side_hole_count,front_model_count,back_model_count,is_door,open_door_type,offset_x,offset_y,is_arc_across,module_type_id,is_special_shaped,is_sculpt,is_side_sculpt,is_2v,is_side_2v,is_row_hole,is_optimized,is_cutted,filter_type,remark,is_cancel,deleted,custom_plate_no,create_time,update_time,creator,updater, cad_plate_no, model_data) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; + String sql = "INSERT INTO order_plate (id,organ_id,order_id,name,plate_no,type,goods_id,width,height,thickness,split_width,split_height,split_thickness,seal_left,seal_right,seal_up,seal_down,area,texture,hole_face,hole_arrange,unregular_point_count,front_hole_count,back_hole_count,side_hole_count,front_model_count,back_model_count,is_door,open_door_type,offset_x,offset_y,is_arc_across,module_type_id,is_special_shaped,is_sculpt,is_side_sculpt,is_2v,is_side_2v,is_row_hole,is_optimized,is_cutted,filter_type,remark,is_cancel,deleted,custom_plate_no,create_time,update_time,creator,updater, cad_plate_no, model_data, reserved_edge_left, reserved_edge_right, reserved_edge_up, reserved_edge_down) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter() { @Override public void setValues(PreparedStatement ps, int index) throws SQLException { @@ -2174,6 +2178,10 @@ public class WebCadOrderImportFactory { } else { ps.setNull(52, Types.BLOB); } + setSqlDefaultBigDecimal(ps, 53, item.getReservedEdgeLeft()); + setSqlDefaultBigDecimal(ps, 54, item.getReservedEdgeRight()); + setSqlDefaultBigDecimal(ps, 55, item.getReservedEdgeUp()); + setSqlDefaultBigDecimal(ps, 56, item.getReservedEdgeDown()); } @Override