|
|
@@ -3465,8 +3465,13 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
|
|
|
IDBConnection oracleConn = ClsDbFactory.CreateDBConnection(DataBaseType.ORACLE, DataManager.ConnectionString);
|
|
|
try
|
|
|
{
|
|
|
- string sqlString = "Select *"
|
|
|
- + "from TP_MST_DefectFineRelation left join TP_MST_DefectFine on TP_MST_DefectFineRelation.DefectFineID=TP_MST_DefectFine.DefectFineID";
|
|
|
+ //2020-03-03 xuwei 修改SQL按displayno排序
|
|
|
+ string sqlString = @"
|
|
|
+ SELECT *
|
|
|
+ FROM TP_MST_DEFECTFINERELATION
|
|
|
+ LEFT JOIN TP_MST_DEFECTFINE ON TP_MST_DEFECTFINERELATION.DEFECTFINEID=TP_MST_DEFECTFINE.DEFECTFINEID
|
|
|
+ ORDER BY TP_MST_DEFECTFINE.DISPLAYNO
|
|
|
+ ";
|
|
|
oracleConn.Open();
|
|
|
DataSet result = oracleConn.GetSqlResultToDs(sqlString);
|
|
|
oracleConn.Close();
|
|
|
@@ -3495,8 +3500,13 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
|
|
|
IDBConnection oracleConn = ClsDbFactory.CreateDBConnection(DataBaseType.ORACLE, DataManager.ConnectionString);
|
|
|
try
|
|
|
{
|
|
|
- string sqlString = "Select *"
|
|
|
- + "from TP_MST_DefectDeductionRelation left join TP_MST_DefectDeduction on TP_MST_DefectDeductionRelation.DefectDeductionID=TP_MST_DefectDeduction.DefectDeductionID";
|
|
|
+ //2020-03-03 xuwei 增加排序
|
|
|
+ string sqlString = @"
|
|
|
+ SELECT *
|
|
|
+ FROM TP_MST_DEFECTDEDUCTIONRELATION
|
|
|
+ LEFT JOIN TP_MST_DEFECTDEDUCTION ON TP_MST_DEFECTDEDUCTIONRELATION.DEFECTDEDUCTIONID=TP_MST_DEFECTDEDUCTION.DEFECTDEDUCTIONID
|
|
|
+ ORDER BY TP_MST_DEFECTDEDUCTION.DISPLAYNO
|
|
|
+ ";
|
|
|
oracleConn.Open();
|
|
|
DataSet result = oracleConn.GetSqlResultToDs(sqlString);
|
|
|
oracleConn.Close();
|