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

cad拆单order_plate二维刀路字段名修改

Browse Source
This commit is contained in:
gaoqr
2025-05-16 10:09:55 +08:00
parent 680ceeba29
commit ed49597be1
6 changed files with 35 additions and 32 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/dal/dataobject/plate/PlateDO.java
+2 -2
View File
@@ -233,12 +233,12 @@ public class PlateDO extends BaseDO {
/**
* 是否二维刀路
*/
private Boolean has2DModel;
private Boolean is2v;
/**
* 是否侧面二维刀路
*/
private Boolean hasSide2DModel;
private Boolean isSide2v;
/**
* 是否造型
*/
cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java
+18 -15
View File
@@ -721,8 +721,8 @@ public class WebCadOrderImportAsyncFactory {
.isSpecialShaped(isSpecialShape)
.isSculpt(isModel)
.isSideSculpt(sideModel)
.has2DModel(has2DModel)
.hasSide2DModel(hasSide2DModel)
.is2v(has2DModel)
.isSide2v(hasSide2DModel)
.isRowHole(isRawHole)
.customPlateNoBuilder(new StringBuilder())
.holeArrange(block.getHoleArrange())
@@ -1716,7 +1716,7 @@ public class WebCadOrderImportAsyncFactory {
private void orderPlateBatchInsertWithinThreshold(List<PlateDO> 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_row_hole,is_optimized,is_cutted,filter_type,remark,is_cancel,deleted,custom_plate_no,create_time,update_time,creator,updater) 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) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter() {
@Override
public void setValues(PreparedStatement ps, int index) throws SQLException {
@@ -1756,18 +1756,21 @@ public class WebCadOrderImportAsyncFactory {
ps.setLong(33, item.getModuleTypeId());
ps.setBoolean(34, item.getIsSpecialShaped());
ps.setBoolean(35, item.getIsSculpt());
ps.setBoolean(36, item.getIsRowHole());
ps.setBoolean(37, item.getIsOptimized());
ps.setInt(38, item.getIsCutted());
ps.setString(39, item.getFilterType());
ps.setString(40, item.getRemark());
ps.setBoolean(41, item.getIsCancel());
ps.setBoolean(42, item.getDeleted());
ps.setString(43, item.getCustomPlateNo());
ps.setTimestamp(44, Timestamp.valueOf(item.getCreateTime()));
ps.setTimestamp(45, Timestamp.valueOf(item.getUpdateTime()));
ps.setString(46, item.getCreator());
ps.setString(47, item.getUpdater());
ps.setBoolean(36, item.getIsSideSculpt());
ps.setBoolean(37, item.getIs2v());
ps.setBoolean(38, item.getIsSide2v());
ps.setBoolean(39, item.getIsRowHole());
ps.setBoolean(40, item.getIsOptimized());
ps.setInt(41, item.getIsCutted());
ps.setString(42, item.getFilterType());
ps.setString(43, item.getRemark());
ps.setBoolean(44, item.getIsCancel());
ps.setBoolean(45, item.getDeleted());
ps.setString(46, item.getCustomPlateNo());
ps.setTimestamp(47, Timestamp.valueOf(item.getCreateTime()));
ps.setTimestamp(48, Timestamp.valueOf(item.getUpdateTime()));
ps.setString(49, item.getCreator());
ps.setString(50, item.getUpdater());
}
@Override
cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java
+5 -5
View File
@@ -625,8 +625,8 @@ public class WebCadOrderImportFactory {
.isSpecialShaped(isSpecialShape)
.isSculpt(isModel)
.isSideSculpt(sideModel)
.has2DModel(has2DModel)
.hasSide2DModel(hasSide2DModel)
.is2v(has2DModel)
.isSide2v(hasSide2DModel)
.isRowHole(isRawHole)
.customPlateNoBuilder(new StringBuilder())
.holeArrange(block.getHoleArrange())
@@ -1617,7 +1617,7 @@ public class WebCadOrderImportFactory {
private void orderPlateBatchInsertWithinThreshold(List<PlateDO> 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,has_2d_model,has_side_2d_model,is_row_hole,is_optimized,is_cutted,filter_type,remark,is_cancel,deleted,custom_plate_no,create_time,update_time,creator,updater) 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) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter() {
@Override
public void setValues(PreparedStatement ps, int index) throws SQLException {
@@ -1658,8 +1658,8 @@ public class WebCadOrderImportFactory {
ps.setBoolean(34, item.getIsSpecialShaped());
ps.setBoolean(35, item.getIsSculpt());
ps.setBoolean(36, item.getIsSideSculpt());
ps.setBoolean(37, item.getHas2DModel());
ps.setBoolean(38, item.getHasSide2DModel());
ps.setBoolean(37, item.getIs2v());
ps.setBoolean(38, item.getIsSide2v());
ps.setBoolean(39, item.getIsRowHole());
ps.setBoolean(40, item.getIsOptimized());
ps.setInt(41, item.getIsCutted());