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-14 05:42:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

成倍序号字段sort改为multi_sort

Browse Source
This commit is contained in:
gaoqr
2026-04-16 18:10:16 +08:00
parent 8fd4c9b7e4
commit 2ed11039bb
4 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderParts/OrderPartsMapper.xml
+10 -10
View File
@@ -332,12 +332,12 @@
oi.room_id, oi.room_id,
oi.body_id, oi.body_id,
GROUP_CONCAT(og.name SEPARATOR ',') AS group_names, 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.room_name) AS room_name,
MIN(ob.name) AS body_name, MIN(ob.name) AS body_name,
SUM(oi.pack_num) AS pack_num, SUM(oi.pack_num) AS pack_num,
MIN(ob.multi_num) AS multiNum, MIN(ob.multi_num) AS multiNum,
MIN(ob.sort) AS multiSort MIN(ob.multi_sort) AS multiSort
FROM order_item oi FROM order_item oi
LEFT JOIN order_group og LEFT JOIN order_group og
ON oi.organ_id = og.organ_id ON oi.organ_id = og.organ_id
@@ -434,12 +434,12 @@
oi.room_id, oi.room_id,
oi.body_id, oi.body_id,
GROUP_CONCAT(og.name SEPARATOR ',') AS group_names, 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.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, SUM(oi.num - oi.pack_num) AS num,
MIN(ob.multi_num) AS multiNum, MIN(ob.multi_num) AS multiNum,
MIN(ob.sort) AS multiSort MIN(ob.multi_sort) AS multiSort
FROM order_item oi FROM order_item oi
LEFT JOIN order_group og LEFT JOIN order_group og
ON oi.organ_id = og.organ_id ON oi.organ_id = og.organ_id
@@ -513,7 +513,7 @@
SUM(oi.num - oi.heap_num) AS num, SUM(oi.num - oi.heap_num) AS num,
SUM(oi.heap_num) AS heap_num, SUM(oi.heap_num) AS heap_num,
MIN(ob.multi_num) AS multi_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 FROM order_item oi
LEFT JOIN order_group og LEFT JOIN order_group og
ON oi.organ_id = og.organ_id ON oi.organ_id = og.organ_id
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml
+6 -6
View File
@@ -865,9 +865,9 @@
GROUP_CONCAT(og.name SEPARATOR ',') AS group_names,-- 聚合加工组 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.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.multi_num) AS multi_num,
MIN(ob.sort) AS multi_sort MIN(ob.multi_sort) AS multi_sort
FROM order_item oi FROM order_item oi
LEFT JOIN order_group og LEFT JOIN order_group og
ON oi.organ_id = og.organ_id ON oi.organ_id = og.organ_id
@@ -950,9 +950,9 @@
GROUP_CONCAT(og.name SEPARATOR ',') AS group_names,-- 聚合加工组 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.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.multi_num) AS multi_num,
MIN(ob.sort) AS multi_sort MIN(ob.multi_sort) AS multi_sort
FROM order_item oi FROM order_item oi
LEFT JOIN order_group og LEFT JOIN order_group og
ON oi.organ_id = og.organ_id ON oi.organ_id = og.organ_id
@@ -1034,9 +1034,9 @@
GROUP_CONCAT(og.name SEPARATOR ',') AS group_names, 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.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.multi_num) AS multi_num,
MIN(ob.sort) AS multi_sort MIN(ob.multi_sort) AS multi_sort
FROM order_item oi FROM order_item oi
LEFT JOIN order_group og LEFT JOIN order_group og
ON oi.organ_id = og.organ_id ON oi.organ_id = og.organ_id
cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java
+1 -1
View File
@@ -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, 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() { 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 {
cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java
+1 -1
View File
@@ -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, 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() { 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 {