From 935007d58af860026522223ee929487886daa92e Mon Sep 17 00:00:00 2001 From: hengsin Date: Thu, 2 Dec 2021 21:50:39 +0800 Subject: [PATCH] IDEMPIERE-5061 Inconsistency in getLines Order By code (#1013) --- org.adempiere.base/src/org/compiere/model/MBankStatement.java | 2 +- org.adempiere.base/src/org/compiere/model/MCash.java | 2 +- org.adempiere.base/src/org/compiere/model/MCashPlan.java | 2 +- org.adempiere.base/src/org/compiere/model/MCommission.java | 2 +- org.adempiere.base/src/org/compiere/model/MDepositBatch.java | 2 +- org.adempiere.base/src/org/compiere/model/MDiscountSchema.java | 2 +- org.adempiere.base/src/org/compiere/model/MDistribution.java | 2 +- .../src/org/compiere/model/MDistributionRun.java | 2 +- org.adempiere.base/src/org/compiere/model/MInOut.java | 2 +- org.adempiere.base/src/org/compiere/model/MInventory.java | 2 +- org.adempiere.base/src/org/compiere/model/MJournal.java | 2 +- org.adempiere.base/src/org/compiere/model/MMovement.java | 2 +- org.adempiere.base/src/org/compiere/model/MOrder.java | 2 +- org.adempiere.base/src/org/compiere/model/MProduction.java | 3 ++- org.adempiere.base/src/org/compiere/model/MProductionPlan.java | 3 ++- org.adempiere.base/src/org/compiere/model/MProject.java | 2 +- org.adempiere.base/src/org/compiere/model/MProjectPhase.java | 2 +- org.adempiere.base/src/org/compiere/model/MProjectTask.java | 2 +- org.adempiere.base/src/org/compiere/model/MRMA.java | 2 +- org.adempiere.base/src/org/compiere/model/MRequisition.java | 2 +- org.adempiere.base/src/org/compiere/model/MRfQ.java | 2 +- org.adempiere.base/src/org/compiere/model/MTimeExpense.java | 2 +- 22 files changed, 24 insertions(+), 22 deletions(-) diff --git a/org.adempiere.base/src/org/compiere/model/MBankStatement.java b/org.adempiere.base/src/org/compiere/model/MBankStatement.java index 995be5b05e..1fbf41a14b 100644 --- a/org.adempiere.base/src/org/compiere/model/MBankStatement.java +++ b/org.adempiere.base/src/org/compiere/model/MBankStatement.java @@ -133,7 +133,7 @@ public class MBankStatement extends X_C_BankStatement implements DocAction final String whereClause = I_C_BankStatementLine.COLUMNNAME_C_BankStatement_ID+"=?"; List list = new Query(getCtx(),I_C_BankStatementLine.Table_Name,whereClause,get_TrxName()) .setParameters(getC_BankStatement_ID()) - .setOrderBy("Line") + .setOrderBy("Line,C_BankStatementLine_ID") .list(); MBankStatementLine[] retValue = new MBankStatementLine[list.size()]; list.toArray(retValue); diff --git a/org.adempiere.base/src/org/compiere/model/MCash.java b/org.adempiere.base/src/org/compiere/model/MCash.java index d7739bf0c3..e3c35be6a3 100644 --- a/org.adempiere.base/src/org/compiere/model/MCash.java +++ b/org.adempiere.base/src/org/compiere/model/MCash.java @@ -221,7 +221,7 @@ public class MCash extends X_C_Cash implements DocAction final String whereClause =MCashLine.COLUMNNAME_C_Cash_ID+"=?"; List list = new Query(getCtx(),I_C_CashLine.Table_Name, whereClause, get_TrxName()) .setParameters(getC_Cash_ID()) - .setOrderBy(I_C_CashLine.COLUMNNAME_Line) + .setOrderBy(I_C_CashLine.COLUMNNAME_Line+","+I_C_CashLine.COLUMNNAME_C_CashLine_ID) .setOnlyActiveRecords(true) .list(); diff --git a/org.adempiere.base/src/org/compiere/model/MCashPlan.java b/org.adempiere.base/src/org/compiere/model/MCashPlan.java index d455abc57b..0020c503bf 100644 --- a/org.adempiere.base/src/org/compiere/model/MCashPlan.java +++ b/org.adempiere.base/src/org/compiere/model/MCashPlan.java @@ -81,7 +81,7 @@ public class MCashPlan extends X_C_CashPlan public MCashPlanLine[] getLines () { ArrayList list = new ArrayList(); - String sql = "SELECT * FROM C_CashPlanLine WHERE C_CashPlan_ID=? ORDER BY Line"; + String sql = "SELECT * FROM C_CashPlanLine WHERE C_CashPlan_ID=? ORDER BY Line,C_CashPlanLine_ID"; PreparedStatement pstmt = null; ResultSet rs = null; try diff --git a/org.adempiere.base/src/org/compiere/model/MCommission.java b/org.adempiere.base/src/org/compiere/model/MCommission.java index d07a97053f..d4e9718072 100644 --- a/org.adempiere.base/src/org/compiere/model/MCommission.java +++ b/org.adempiere.base/src/org/compiere/model/MCommission.java @@ -79,7 +79,7 @@ public class MCommission extends X_C_Commission final String whereClause = "IsActive='Y' AND C_Commission_ID=?"; List list = new Query(getCtx(), I_C_CommissionLine.Table_Name, whereClause, get_TrxName()) .setParameters(getC_Commission_ID()) - .setOrderBy("Line") + .setOrderBy("Line,C_CommissionLine_ID") .list(); // Convert MCommissionLine[] retValue = new MCommissionLine[list.size()]; diff --git a/org.adempiere.base/src/org/compiere/model/MDepositBatch.java b/org.adempiere.base/src/org/compiere/model/MDepositBatch.java index 3cac8fee58..b56fc0097f 100644 --- a/org.adempiere.base/src/org/compiere/model/MDepositBatch.java +++ b/org.adempiere.base/src/org/compiere/model/MDepositBatch.java @@ -279,7 +279,7 @@ public class MDepositBatch extends X_C_DepositBatch public MDepositBatchLine[] getLines() { ArrayList list = new ArrayList(); - String sql = "SELECT * FROM C_DepositBatchLine WHERE C_DepositBatch_ID=? ORDER BY Line"; + String sql = "SELECT * FROM C_DepositBatchLine WHERE C_DepositBatch_ID=? ORDER BY Line,C_DepositBatchLine_ID"; PreparedStatement pstmt = null; ResultSet rs = null; try diff --git a/org.adempiere.base/src/org/compiere/model/MDiscountSchema.java b/org.adempiere.base/src/org/compiere/model/MDiscountSchema.java index 0a88fee632..05e4fcb4b5 100644 --- a/org.adempiere.base/src/org/compiere/model/MDiscountSchema.java +++ b/org.adempiere.base/src/org/compiere/model/MDiscountSchema.java @@ -202,7 +202,7 @@ public class MDiscountSchema extends X_M_DiscountSchema implements ImmutablePOSu return m_lines; } - String sql = "SELECT * FROM M_DiscountSchemaLine WHERE M_DiscountSchema_ID=? ORDER BY SeqNo"; + String sql = "SELECT * FROM M_DiscountSchemaLine WHERE M_DiscountSchema_ID=? ORDER BY SeqNo,M_DiscountSchemaLine_ID"; ArrayList list = new ArrayList(); PreparedStatement pstmt = null; ResultSet rs = null; diff --git a/org.adempiere.base/src/org/compiere/model/MDistribution.java b/org.adempiere.base/src/org/compiere/model/MDistribution.java index c672a85b57..869c5efc27 100644 --- a/org.adempiere.base/src/org/compiere/model/MDistribution.java +++ b/org.adempiere.base/src/org/compiere/model/MDistribution.java @@ -348,7 +348,7 @@ public class MDistribution extends X_GL_Distribution final String whereClause = I_GL_DistributionLine.COLUMNNAME_GL_Distribution_ID+"=?"; List list = new Query(getCtx(),I_GL_DistributionLine.Table_Name,whereClause,get_TrxName()) .setParameters(getGL_Distribution_ID()) - .setOrderBy("Line") + .setOrderBy("Line,GL_DistributionLine_ID") .list(); //red1 Query -end- boolean hasNullRemainder = false; diff --git a/org.adempiere.base/src/org/compiere/model/MDistributionRun.java b/org.adempiere.base/src/org/compiere/model/MDistributionRun.java index 7ab8adafda..76f0a7c752 100644 --- a/org.adempiere.base/src/org/compiere/model/MDistributionRun.java +++ b/org.adempiere.base/src/org/compiere/model/MDistributionRun.java @@ -76,7 +76,7 @@ public class MDistributionRun extends X_M_DistributionRun } // String sql = "SELECT * FROM M_DistributionRunLine " - + "WHERE M_DistributionRun_ID=? AND IsActive='Y' AND TotalQty IS NOT NULL AND TotalQty<> 0 ORDER BY Line"; + + "WHERE M_DistributionRun_ID=? AND IsActive='Y' AND TotalQty IS NOT NULL AND TotalQty<> 0 ORDER BY Line,M_DistributionRunLine_ID"; ArrayList list = new ArrayList(); PreparedStatement pstmt = null; ResultSet rs = null; diff --git a/org.adempiere.base/src/org/compiere/model/MInOut.java b/org.adempiere.base/src/org/compiere/model/MInOut.java index d01c4d948f..ccf81dcc53 100644 --- a/org.adempiere.base/src/org/compiere/model/MInOut.java +++ b/org.adempiere.base/src/org/compiere/model/MInOut.java @@ -658,7 +658,7 @@ public class MInOut extends X_M_InOut implements DocAction } List list = new Query(getCtx(), I_M_InOutLine.Table_Name, "M_InOut_ID=?", get_TrxName()) .setParameters(getM_InOut_ID()) - .setOrderBy(MInOutLine.COLUMNNAME_Line) + .setOrderBy(MInOutLine.COLUMNNAME_Line+","+MInOutLine.COLUMNNAME_M_InOutLine_ID) .list(); // m_lines = new MInOutLine[list.size()]; diff --git a/org.adempiere.base/src/org/compiere/model/MInventory.java b/org.adempiere.base/src/org/compiere/model/MInventory.java index 4ad6678e4c..34e84b4a0b 100644 --- a/org.adempiere.base/src/org/compiere/model/MInventory.java +++ b/org.adempiere.base/src/org/compiere/model/MInventory.java @@ -187,7 +187,7 @@ public class MInventory extends X_M_Inventory implements DocAction // List list = new Query(getCtx(), I_M_InventoryLine.Table_Name, "M_Inventory_ID=?", get_TrxName()) .setParameters(get_ID()) - .setOrderBy(MInventoryLine.COLUMNNAME_Line) + .setOrderBy(MInventoryLine.COLUMNNAME_Line+","+MInventoryLine.COLUMNNAME_M_InventoryLine_ID) .list(); m_lines = list.toArray(new MInventoryLine[list.size()]); return m_lines; diff --git a/org.adempiere.base/src/org/compiere/model/MJournal.java b/org.adempiere.base/src/org/compiere/model/MJournal.java index 316fcef58d..15785e69e7 100644 --- a/org.adempiere.base/src/org/compiere/model/MJournal.java +++ b/org.adempiere.base/src/org/compiere/model/MJournal.java @@ -207,7 +207,7 @@ public class MJournal extends X_GL_Journal implements DocAction final String whereClause = "GL_Journal_ID=?"; List list = new Query(getCtx(), I_GL_JournalLine.Table_Name, whereClause, get_TrxName()) .setParameters(getGL_Journal_ID()) - .setOrderBy("Line") + .setOrderBy("Line,GL_JournalLine_ID") .list(); // MJournalLine[] retValue = new MJournalLine[list.size()]; diff --git a/org.adempiere.base/src/org/compiere/model/MMovement.java b/org.adempiere.base/src/org/compiere/model/MMovement.java index 2c2f7bc9a9..146252f871 100644 --- a/org.adempiere.base/src/org/compiere/model/MMovement.java +++ b/org.adempiere.base/src/org/compiere/model/MMovement.java @@ -110,7 +110,7 @@ public class MMovement extends X_M_Movement implements DocAction final String whereClause = "M_Movement_ID=?"; List list = new Query(getCtx(), I_M_MovementLine.Table_Name, whereClause, get_TrxName()) .setParameters(getM_Movement_ID()) - .setOrderBy(MMovementLine.COLUMNNAME_Line) + .setOrderBy(MMovementLine.COLUMNNAME_Line+","+MMovementLine.COLUMNNAME_M_MovementLine_ID) .list(); m_lines = new MMovementLine[list.size ()]; list.toArray (m_lines); diff --git a/org.adempiere.base/src/org/compiere/model/MOrder.java b/org.adempiere.base/src/org/compiere/model/MOrder.java index b8e7de0b2b..c972e27080 100644 --- a/org.adempiere.base/src/org/compiere/model/MOrder.java +++ b/org.adempiere.base/src/org/compiere/model/MOrder.java @@ -713,7 +713,7 @@ public class MOrder extends X_C_Order implements DocAction if (orderBy != null && orderBy.length() > 0) orderClause += orderBy; else - orderClause += "Line"; + orderClause += "Line,C_OrderLine_ID"; m_lines = getLines(null, orderClause); return m_lines; } // getLines diff --git a/org.adempiere.base/src/org/compiere/model/MProduction.java b/org.adempiere.base/src/org/compiere/model/MProduction.java index fd231967ac..e9eb94130c 100644 --- a/org.adempiere.base/src/org/compiere/model/MProduction.java +++ b/org.adempiere.base/src/org/compiere/model/MProduction.java @@ -184,7 +184,8 @@ public class MProduction extends X_M_Production implements DocAction { String sql = "SELECT pl.M_ProductionLine_ID " + "FROM M_ProductionLine pl " - + "WHERE pl.M_Production_ID = ?"; + + "WHERE pl.M_Production_ID = ? " + + "ORDER BY pl.Line, pl.M_ProductionLine_ID "; PreparedStatement pstmt = null; ResultSet rs = null; diff --git a/org.adempiere.base/src/org/compiere/model/MProductionPlan.java b/org.adempiere.base/src/org/compiere/model/MProductionPlan.java index 818ef1afff..bd4a2d8569 100644 --- a/org.adempiere.base/src/org/compiere/model/MProductionPlan.java +++ b/org.adempiere.base/src/org/compiere/model/MProductionPlan.java @@ -50,7 +50,8 @@ public class MProductionPlan extends X_M_ProductionPlan { String sql = "SELECT pl.M_ProductionLine_ID " + "FROM M_ProductionLine pl " - + "WHERE pl.M_ProductionPlan_ID = ?"; + + "WHERE pl.M_ProductionPlan_ID = ? " + + "ORDER BY pl.Line, pl.M_ProductionLine_ID "; PreparedStatement pstmt = null; ResultSet rs = null; diff --git a/org.adempiere.base/src/org/compiere/model/MProject.java b/org.adempiere.base/src/org/compiere/model/MProject.java index 6b3065211a..e7ba41f2d2 100644 --- a/org.adempiere.base/src/org/compiere/model/MProject.java +++ b/org.adempiere.base/src/org/compiere/model/MProject.java @@ -179,7 +179,7 @@ public class MProject extends X_C_Project final String whereClause = "C_Project_ID=?"; List list = new Query(getCtx(), I_C_ProjectLine.Table_Name, whereClause, get_TrxName()) .setParameters(getC_Project_ID()) - .setOrderBy("Line") + .setOrderBy("Line,C_ProjectLine_ID") .list(); // MProjectLine[] retValue = new MProjectLine[list.size()]; diff --git a/org.adempiere.base/src/org/compiere/model/MProjectPhase.java b/org.adempiere.base/src/org/compiere/model/MProjectPhase.java index 6c7d25edfe..d798b41d50 100644 --- a/org.adempiere.base/src/org/compiere/model/MProjectPhase.java +++ b/org.adempiere.base/src/org/compiere/model/MProjectPhase.java @@ -251,7 +251,7 @@ public class MProjectPhase extends X_C_ProjectPhase final String whereClause = "C_Project_ID=? and C_ProjectPhase_ID=?"; List list = new Query(getCtx(), I_C_ProjectLine.Table_Name, whereClause, get_TrxName()) .setParameters(getC_Project_ID(), getC_ProjectPhase_ID()) - .setOrderBy("Line") + .setOrderBy("Line,C_ProjectLine_ID") .list(); // MProjectLine[] retValue = new MProjectLine[list.size()]; diff --git a/org.adempiere.base/src/org/compiere/model/MProjectTask.java b/org.adempiere.base/src/org/compiere/model/MProjectTask.java index 5f586bff5f..961ca4d562 100644 --- a/org.adempiere.base/src/org/compiere/model/MProjectTask.java +++ b/org.adempiere.base/src/org/compiere/model/MProjectTask.java @@ -101,7 +101,7 @@ public class MProjectTask extends X_C_ProjectTask final String whereClause = "C_ProjectPhase_ID=? and C_ProjectTask_ID=? "; List list = new Query(getCtx(), I_C_ProjectLine.Table_Name, whereClause, get_TrxName()) .setParameters(getC_ProjectPhase_ID(), getC_ProjectTask_ID()) - .setOrderBy("Line") + .setOrderBy("Line,C_ProjectLine_ID") .list(); // MProjectLine[] retValue = new MProjectLine[list.size()]; diff --git a/org.adempiere.base/src/org/compiere/model/MRMA.java b/org.adempiere.base/src/org/compiere/model/MRMA.java index 14c0ed503f..73da682b0e 100644 --- a/org.adempiere.base/src/org/compiere/model/MRMA.java +++ b/org.adempiere.base/src/org/compiere/model/MRMA.java @@ -99,7 +99,7 @@ public class MRMA extends X_M_RMA implements DocAction } List list = new Query(getCtx(), I_M_RMALine.Table_Name, "M_RMA_ID=?", get_TrxName()) .setParameters(getM_RMA_ID()) - .setOrderBy(MRMALine.COLUMNNAME_Line) + .setOrderBy(MRMALine.COLUMNNAME_Line+","+MRMALine.COLUMNNAME_M_RMALine_ID) .list(); m_lines = new MRMALine[list.size ()]; diff --git a/org.adempiere.base/src/org/compiere/model/MRequisition.java b/org.adempiere.base/src/org/compiere/model/MRequisition.java index 5ceaff11aa..d0b5b75ba7 100644 --- a/org.adempiere.base/src/org/compiere/model/MRequisition.java +++ b/org.adempiere.base/src/org/compiere/model/MRequisition.java @@ -104,7 +104,7 @@ public class MRequisition extends X_M_Requisition implements DocAction final String whereClause = I_M_RequisitionLine.COLUMNNAME_M_Requisition_ID+"=?"; List list = new Query(getCtx(), I_M_RequisitionLine.Table_Name, whereClause, get_TrxName()) .setParameters(get_ID()) - .setOrderBy(I_M_RequisitionLine.COLUMNNAME_Line) + .setOrderBy(I_M_RequisitionLine.COLUMNNAME_Line+","+I_M_RequisitionLine.COLUMNNAME_M_RequisitionLine_ID) .list(); // red1 - end - diff --git a/org.adempiere.base/src/org/compiere/model/MRfQ.java b/org.adempiere.base/src/org/compiere/model/MRfQ.java index 1a810c0ad9..ed761b7032 100644 --- a/org.adempiere.base/src/org/compiere/model/MRfQ.java +++ b/org.adempiere.base/src/org/compiere/model/MRfQ.java @@ -152,7 +152,7 @@ public class MRfQ extends X_C_RfQ ArrayList list = new ArrayList(); String sql = "SELECT * FROM C_RfQLine " + "WHERE C_RfQ_ID=? AND IsActive='Y' " - + "ORDER BY Line"; + + "ORDER BY Line,C_RfQLine_ID "; PreparedStatement pstmt = null; ResultSet rs = null; try diff --git a/org.adempiere.base/src/org/compiere/model/MTimeExpense.java b/org.adempiere.base/src/org/compiere/model/MTimeExpense.java index f87e5d78d7..6c925538ff 100644 --- a/org.adempiere.base/src/org/compiere/model/MTimeExpense.java +++ b/org.adempiere.base/src/org/compiere/model/MTimeExpense.java @@ -111,7 +111,7 @@ public class MTimeExpense extends X_S_TimeExpense implements DocAction int C_Currency_ID = getC_Currency_ID(); ArrayList list = new ArrayList(); // - String sql = "SELECT * FROM S_TimeExpenseLine WHERE S_TimeExpense_ID=? ORDER BY Line"; + String sql = "SELECT * FROM S_TimeExpenseLine WHERE S_TimeExpense_ID=? ORDER BY Line,S_TimeExpenseLine_ID"; PreparedStatement pstmt = null; ResultSet rs = null; try