mirror of
http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git
synced 2026-08-12 21:02:08 +08:00
webcad成倍序号未记录修正
This commit is contained in:
+4
-2
@@ -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<List<OrderBodyDO>> 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() {
|
||||
@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
|
||||
|
||||
+3
-2
@@ -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<List<OrderBodyDO>> 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() {
|
||||
@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
|
||||
|
||||
Reference in New Issue
Block a user