Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

webcad拆单新增接收预留边信息

Browse Source
This commit is contained in:
gaoqr
2026-06-12 19:51:04 +08:00
parent 08b68d6fd1
commit 500d061289
3 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderimport/webcad/vo/WebCadDataBlockReqVO.java
+4
View File
@@ -77,6 +77,10 @@ public class WebCadDataBlockReqVO {
private Double sealRight; private Double sealRight;
private Double sealUp; private Double sealUp;
private Double sealDown; private Double sealDown;
private Double reservedEdgeUp;
private Double reservedEdgeDown;
private Double reservedEdgeLeft;
private Double reservedEdgeRight;
private Boolean isRect; private Boolean isRect;
private String spliteHeight; private String spliteHeight;
private String spliteThickness; private String spliteThickness;
cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java
+9 -1
View File
@@ -824,6 +824,10 @@ public class WebCadOrderImportAsyncFactory {
.sealRight(getBigDecimalOrNull(block.getSealRight())) .sealRight(getBigDecimalOrNull(block.getSealRight()))
.sealUp(getBigDecimalOrNull(block.getSealUp())) .sealUp(getBigDecimalOrNull(block.getSealUp()))
.sealDown(getBigDecimalOrNull(block.getSealDown())) .sealDown(getBigDecimalOrNull(block.getSealDown()))
.reservedEdgeLeft(getBigDecimalOrNull(block.getReservedEdgeLeft()))
.reservedEdgeRight(getBigDecimalOrNull(block.getReservedEdgeRight()))
.reservedEdgeUp(getBigDecimalOrNull(block.getReservedEdgeUp()))
.reservedEdgeDown(getBigDecimalOrNull(block.getReservedEdgeDown()))
.remark(remark.toString()) .remark(remark.toString())
.deleted(false) .deleted(false)
.organId(organId) .organId(organId)
@@ -2312,7 +2316,7 @@ public class WebCadOrderImportAsyncFactory {
private void orderPlateBatchInsertWithinThreshold(List<PlateDO> list, boolean isLast) { private void orderPlateBatchInsertWithinThreshold(List<PlateDO> list, boolean isLast) {
// 达到批量的阈值就做一次插入 // 达到批量的阈值就做一次插入
if (CollUtil.isNotEmpty(list) && (list.size() >= BATCH_THRESHOLD_NUMBER || 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() { jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter() {
@Override @Override
public void setValues(PreparedStatement ps, int index) throws SQLException { public void setValues(PreparedStatement ps, int index) throws SQLException {
@@ -2375,6 +2379,10 @@ public class WebCadOrderImportAsyncFactory {
} else { } else {
ps.setNull(52, Types.BLOB); 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 @Override
cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java
+9 -1
View File
@@ -1017,6 +1017,10 @@ public class WebCadOrderImportFactory {
.sealRight(getBigDecimalOrNull(block.getSealRight())) .sealRight(getBigDecimalOrNull(block.getSealRight()))
.sealUp(getBigDecimalOrNull(block.getSealUp())) .sealUp(getBigDecimalOrNull(block.getSealUp()))
.sealDown(getBigDecimalOrNull(block.getSealDown())) .sealDown(getBigDecimalOrNull(block.getSealDown()))
.reservedEdgeLeft(getBigDecimalOrNull(block.getReservedEdgeLeft()))
.reservedEdgeRight(getBigDecimalOrNull(block.getReservedEdgeRight()))
.reservedEdgeUp(getBigDecimalOrNull(block.getReservedEdgeUp()))
.reservedEdgeDown(getBigDecimalOrNull(block.getReservedEdgeDown()))
.remark(remark.toString()) .remark(remark.toString())
.deleted(false) .deleted(false)
.organId(organId) .organId(organId)
@@ -2111,7 +2115,7 @@ public class WebCadOrderImportFactory {
private void orderPlateBatchInsertWithinThreshold(List<PlateDO> list, boolean isLast) { private void orderPlateBatchInsertWithinThreshold(List<PlateDO> list, boolean isLast) {
// 达到批量的阈值就做一次插入 // 达到批量的阈值就做一次插入
if (CollUtil.isNotEmpty(list) && (list.size() >= BATCH_THRESHOLD_NUMBER || 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() { jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter() {
@Override @Override
public void setValues(PreparedStatement ps, int index) throws SQLException { public void setValues(PreparedStatement ps, int index) throws SQLException {
@@ -2174,6 +2178,10 @@ public class WebCadOrderImportFactory {
} else { } else {
ps.setNull(52, Types.BLOB); 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 @Override