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-04-08 13:56:30 +08:00
parent 72740312c9
commit 50915d691d
2 changed files with 7 additions and 4 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/service/orderImport/factory/WebCadOrderImportAsyncFactory.java
+4 -2
View File
@@ -1514,7 +1514,7 @@ public class WebCadOrderImportAsyncFactory {
Long bodyId = (Long) snowFlakeGenerator.nextId(null); Long bodyId = (Long) snowFlakeGenerator.nextId(null);
orderBodyDO = OrderBodyDO.builder().id(bodyId).orderId(orderId).organId(organId) orderBodyDO = OrderBodyDO.builder().id(bodyId).orderId(orderId).organId(organId)
.roomId(roomId).roomName(roomName).name(bodyName).width(0.0).height(0.0) .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.setCreator(operatorName);
orderBodyDO.setUpdater(operatorName); orderBodyDO.setUpdater(operatorName);
orderBodyDO.setCreateTime(now); orderBodyDO.setCreateTime(now);
@@ -2396,7 +2396,7 @@ public class WebCadOrderImportAsyncFactory {
*/ */
private void saveBody(List<List<OrderBodyDO>> bodyList) { private void saveBody(List<List<OrderBodyDO>> bodyList) {
for (List<OrderBodyDO> bodys : bodyList) { for (List<OrderBodyDO> 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() { 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 {
@@ -2420,6 +2420,8 @@ public class WebCadOrderImportAsyncFactory {
ps.setTimestamp(17, Timestamp.valueOf(orderBodyDO.getUpdateTime())); ps.setTimestamp(17, Timestamp.valueOf(orderBodyDO.getUpdateTime()));
ps.setString(18, orderBodyDO.getCreator()); ps.setString(18, orderBodyDO.getCreator());
ps.setString(19, orderBodyDO.getUpdater()); ps.setString(19, orderBodyDO.getUpdater());
ps.setLong(20, cadViewFileId);
ps.setInt(21, orderBodyDO.getSort());
} }
@Override @Override
cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java
+3 -2
View File
@@ -1460,7 +1460,7 @@ public class WebCadOrderImportFactory {
Long bodyId = (Long) snowFlakeGenerator.nextId(null); Long bodyId = (Long) snowFlakeGenerator.nextId(null);
orderBodyDO = OrderBodyDO.builder().id(bodyId).orderId(orderId).organId(organId) orderBodyDO = OrderBodyDO.builder().id(bodyId).orderId(orderId).organId(organId)
.roomId(roomId).roomName(roomName).name(bodyName).width(0.0).height(0.0) .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.setCreator(operatorName);
orderBodyDO.setUpdater(operatorName); orderBodyDO.setUpdater(operatorName);
orderBodyDO.setCreateTime(now); orderBodyDO.setCreateTime(now);
@@ -2199,7 +2199,7 @@ public class WebCadOrderImportFactory {
*/ */
private void saveBody(List<List<OrderBodyDO>> bodyList) { private void saveBody(List<List<OrderBodyDO>> bodyList) {
for (List<OrderBodyDO> bodys : bodyList) { for (List<OrderBodyDO> 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() { 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 {
@@ -2224,6 +2224,7 @@ public class WebCadOrderImportFactory {
ps.setString(18, orderBodyDO.getCreator()); ps.setString(18, orderBodyDO.getCreator());
ps.setString(19, orderBodyDO.getUpdater()); ps.setString(19, orderBodyDO.getUpdater());
ps.setLong(20, cadViewFileId); ps.setLong(20, cadViewFileId);
ps.setInt(21, orderBodyDO.getSort());
} }
@Override @Override