diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderParts/OrderPartsMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderParts/OrderPartsMapper.xml index b0ef02097..743ef86d9 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderParts/OrderPartsMapper.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderParts/OrderPartsMapper.xml @@ -332,12 +332,12 @@ oi.room_id, oi.body_id, GROUP_CONCAT(og.name SEPARATOR ',') AS group_names, - MIN(oc.name) AS component_names, - MIN(ob.room_name) AS room_name, - MIN(ob.name) AS body_name, - SUM(oi.pack_num) AS pack_num, - MIN(ob.multi_num) AS multiNum, - MIN(ob.sort) AS multiSort + MIN(oc.name) AS component_names, + MIN(ob.room_name) AS room_name, + MIN(ob.name) AS body_name, + SUM(oi.pack_num) AS pack_num, + MIN(ob.multi_num) AS multiNum, + MIN(ob.multi_sort) AS multiSort FROM order_item oi LEFT JOIN order_group og ON oi.organ_id = og.organ_id @@ -434,12 +434,12 @@ oi.room_id, oi.body_id, GROUP_CONCAT(og.name SEPARATOR ',') AS group_names, - MIN(oc.name) AS component_names, + MIN(oc.name) AS component_names, MIN(ob.room_name) AS room_name, - MIN(ob.name) AS body_name, + MIN(ob.name) AS body_name, SUM(oi.num - oi.pack_num) AS num, MIN(ob.multi_num) AS multiNum, - MIN(ob.sort) AS multiSort + MIN(ob.multi_sort) AS multiSort FROM order_item oi LEFT JOIN order_group og ON oi.organ_id = og.organ_id @@ -513,7 +513,7 @@ SUM(oi.num - oi.heap_num) AS num, SUM(oi.heap_num) AS heap_num, MIN(ob.multi_num) AS multi_num, - MIN(ob.sort) AS multi_sort + MIN(ob.multi_sort) AS multi_sort FROM order_item oi LEFT JOIN order_group og ON oi.organ_id = og.organ_id diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml index 0a4925a6a..3e58c2ba8 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml @@ -865,9 +865,9 @@ GROUP_CONCAT(og.name SEPARATOR ',') AS group_names,-- 聚合加工组 MIN(oc.name) AS component_names, MIN(ob.room_name) AS room_name, - MIN(ob.name) AS body_name, + MIN(ob.name) AS body_name, MIN(ob.multi_num) AS multi_num, - MIN(ob.sort) AS multi_sort + MIN(ob.multi_sort) AS multi_sort FROM order_item oi LEFT JOIN order_group og ON oi.organ_id = og.organ_id @@ -950,9 +950,9 @@ GROUP_CONCAT(og.name SEPARATOR ',') AS group_names,-- 聚合加工组 MIN(oc.name) AS component_names, MIN(ob.room_name) AS room_name, - MIN(ob.name) AS body_name, + MIN(ob.name) AS body_name, MIN(ob.multi_num) AS multi_num, - MIN(ob.sort) AS multi_sort + MIN(ob.multi_sort) AS multi_sort FROM order_item oi LEFT JOIN order_group og ON oi.organ_id = og.organ_id @@ -1034,9 +1034,9 @@ GROUP_CONCAT(og.name SEPARATOR ',') AS group_names, MIN(oc.name) AS component_names, MIN(ob.room_name) AS room_name, - MIN(ob.name) AS body_name, + MIN(ob.name) AS body_name, MIN(ob.multi_num) AS multi_num, - MIN(ob.sort) AS multi_sort + MIN(ob.multi_sort) AS multi_sort FROM order_item oi LEFT JOIN order_group og ON oi.organ_id = og.organ_id 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 3a417fe2b..32bc747c2 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 @@ -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, cad_view_file_id, sort) 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, multi_sort) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"; jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter() { @Override public void setValues(PreparedStatement ps, int index) throws SQLException { 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 4b77cf145..b37af639a 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 @@ -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, sort) 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, multi_sort) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"; jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter() { @Override public void setValues(PreparedStatement ps, int index) throws SQLException {