From 50915d691df749a428c97c1a31a5649293f033b9 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Wed, 8 Apr 2026 13:56:30 +0800 Subject: [PATCH] =?UTF-8?q?webcad=E6=88=90=E5=80=8D=E5=BA=8F=E5=8F=B7?= =?UTF-8?q?=E6=9C=AA=E8=AE=B0=E5=BD=95=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../orderImport/factory/WebCadOrderImportAsyncFactory.java | 6 ++++-- .../orderImport/factory/WebCadOrderImportFactory.java | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) 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 9be5de19c..3a417fe2b 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 @@ -1514,7 +1514,7 @@ public class WebCadOrderImportAsyncFactory { Long bodyId = (Long) snowFlakeGenerator.nextId(null); orderBodyDO = OrderBodyDO.builder().id(bodyId).orderId(orderId).organId(organId) .roomId(roomId).roomName(roomName).name(bodyName).width(0.0).height(0.0) - .depth(0.0).multiNum(0).plateNum(0).unregularNum(0).filename("无").remark("无").deleted(false).build(); + .depth(0.0).multiNum(1).sort(1).plateNum(0).unregularNum(0).filename("无").remark("无").deleted(false).build(); orderBodyDO.setCreator(operatorName); orderBodyDO.setUpdater(operatorName); orderBodyDO.setCreateTime(now); @@ -2396,7 +2396,7 @@ public class WebCadOrderImportAsyncFactory { */ private void saveBody(List> bodyList) { for (List bodys : bodyList) { - String sql = "INSERT INTO order_body (id, organ_id, order_id, room_id, room_name, name, width, height, depth, multi_num, plate_num, unregular_num, filename, remark, deleted,create_time,update_time,creator,updater) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"; + String sql = "INSERT INTO order_body (id, organ_id, order_id, room_id, room_name, name, width, height, depth, multi_num, plate_num, unregular_num, filename, remark, deleted,create_time,update_time,creator,updater, cad_view_file_id, sort) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"; jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter() { @Override public void setValues(PreparedStatement ps, int index) throws SQLException { @@ -2420,6 +2420,8 @@ public class WebCadOrderImportAsyncFactory { ps.setTimestamp(17, Timestamp.valueOf(orderBodyDO.getUpdateTime())); ps.setString(18, orderBodyDO.getCreator()); ps.setString(19, orderBodyDO.getUpdater()); + ps.setLong(20, cadViewFileId); + ps.setInt(21, orderBodyDO.getSort()); } @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 0ab3ba9bd..4b77cf145 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 @@ -1460,7 +1460,7 @@ public class WebCadOrderImportFactory { Long bodyId = (Long) snowFlakeGenerator.nextId(null); orderBodyDO = OrderBodyDO.builder().id(bodyId).orderId(orderId).organId(organId) .roomId(roomId).roomName(roomName).name(bodyName).width(0.0).height(0.0) - .depth(0.0).multiNum(0).plateNum(0).unregularNum(0).filename("无").remark("无").deleted(false).build(); + .depth(0.0).multiNum(1).sort(1).plateNum(0).unregularNum(0).filename("无").remark("无").deleted(false).build(); orderBodyDO.setCreator(operatorName); orderBodyDO.setUpdater(operatorName); orderBodyDO.setCreateTime(now); @@ -2199,7 +2199,7 @@ public class WebCadOrderImportFactory { */ private void saveBody(List> bodyList) { for (List bodys : bodyList) { - String sql = "INSERT INTO order_body (id, organ_id, order_id, room_id, room_name, name, width, height, depth, multi_num, plate_num, unregular_num, filename, remark, deleted,create_time,update_time,creator,updater, cad_view_file_id) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"; + String sql = "INSERT INTO order_body (id, organ_id, order_id, room_id, room_name, name, width, height, depth, multi_num, plate_num, unregular_num, filename, remark, deleted,create_time,update_time,creator,updater, cad_view_file_id, sort) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"; jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter() { @Override public void setValues(PreparedStatement ps, int index) throws SQLException { @@ -2224,6 +2224,7 @@ public class WebCadOrderImportFactory { ps.setString(18, orderBodyDO.getCreator()); ps.setString(19, orderBodyDO.getUpdater()); ps.setLong(20, cadViewFileId); + ps.setInt(21, orderBodyDO.getSort()); } @Override