修正工资计算bug

DK.Service/PAMModuleService/PAMModuleDAL.cs

@@ -5036,18 +5036,18 @@ namespace Dongke.IBOSS.PRD.Service.PAMModuleService
                                      decode(StaffFlag,'1','试用','正式') as StaffFlag,
                                      YYYYMM,
                                     decode(GoodsFlag,'1','新品','2','变产','正常') as GoodsFlag ,
-                                    PieceworkNum,
-                                    PieceCoefficient,
-                                    DamageNum,
-                                    DamageCoefficient,
-                                    UnqualifiedNum,
-                                    UnqualifiedCoefficient,
-                                    QualifiedNum,
-                                    QualifiedCoefficient,
-                                    QualityBaseNum,
-                                    QualityRate*100 as QualityRate,
-                                    QualityWages,
-                                    Amount,
+                                    TP_PAR_Piecework.PieceworkNum,
+                                    TP_PAR_Piecework.PieceCoefficient,
+                                    TP_PAR_Piecework.DamageNum,
+                                    TP_PAR_Piecework.DamageCoefficient,
+                                    TP_PAR_Piecework.UnqualifiedNum,
+                                    TP_PAR_Piecework.UnqualifiedCoefficient,
+                                    TP_PAR_Piecework.QualifiedNum,
+                                    TP_PAR_Piecework.QualifiedCoefficient,
+                                    TP_PAR_Piecework.QualityBaseNum,
+                                    TP_PAR_Piecework.QualityRate*100 as QualityRate,
+                                    TP_PAR_Piecework.QualityWages,
+                                    TP_PAR_Piecework.Amount,
                                     TP_PAS_PayPlan.PayPlanName,
                                     TP_PAT_Piecework.PieceTacticsName,
                                     TP_PAM_WagesType.WagesTypeName
@@ -5068,12 +5068,12 @@ namespace Dongke.IBOSS.PRD.Service.PAMModuleService
                 string sqlString2 = @"select 
                                      TP_HR_Staff.StaffName,
                                       TP_HR_Staff.StaffCode,
-                                     DamageNum,
-                                    YYYYMM,
-                                    StandardWages,
-                                    DamageSubsidyRate,
-                                    DamageSubsidy,
-                                    Amount,
+                                     TP_PAR_DamageSubsidy.DamageNum,
+                                    TP_PAR_DamageSubsidy.YYYYMM,
+                                    TP_PAR_DamageSubsidy.StandardWages,
+                                    TP_PAR_DamageSubsidy.DamageSubsidyRate,
+                                    TP_PAR_DamageSubsidy.DamageSubsidy,
+                                    TP_PAR_DamageSubsidy.Amount,
                                      TP_PAS_PayPlan.PayPlanName,
                                     TP_PAT_Piecework.PieceTacticsName,
                                     TP_PAM_WagesType.WagesTypeName
@@ -5092,15 +5092,15 @@ namespace Dongke.IBOSS.PRD.Service.PAMModuleService
                 string sqlString3 = @"select 
                                      TP_HR_Staff.StaffName,
                                       TP_HR_Staff.StaffCode,
-                                      RSuperioNum,
-                                    YYYYMM,
-                                     RSuperiorCoefficient,
-                                    RQualifiedNum,
-                                    RQualifiedCoefficient,
-                                    StandardWages,
-                                    RepairSubsidyRate,
-                                    RepairSubsidy,
-                                    Amount,
+                                      TP_PAR_RepairSubsidy.RSuperioNum,
+                                    TP_PAR_RepairSubsidy.YYYYMM,
+                                     TP_PAR_RepairSubsidy.RSuperiorCoefficient,
+                                    TP_PAR_RepairSubsidy.RQualifiedNum,
+                                    TP_PAR_RepairSubsidy.RQualifiedCoefficient,
+                                    TP_PAR_RepairSubsidy.StandardWages,
+                                    TP_PAR_RepairSubsidy.RepairSubsidyRate,
+                                    TP_PAR_RepairSubsidy.RepairSubsidy,
+                                    TP_PAR_RepairSubsidy.Amount,
                                     TP_PAS_PayPlan.PayPlanName,
                                     TP_PAT_Piecework.PieceTacticsName,
                                     TP_PAM_WagesType.WagesTypeName
@@ -5120,11 +5120,11 @@ namespace Dongke.IBOSS.PRD.Service.PAMModuleService
                                      TP_HR_Staff.StaffCode,
                                     
                                     TP_MST_DataDictionary.DictionaryValue as DefectFine,
-                                    DefectNum,
-                                    YYYYMM,
-                                    QualityBaseNum,
-                                    QualityRate*100 as QualityRate,
-                                    Amount,
+                                    TP_PAR_QualityASS.DefectNum,
+                                    TP_PAR_QualityASS.YYYYMM,
+                                    TP_PAR_QualityASS.QualityBaseNum,
+                                    TP_PAR_QualityASS.QualityRate*100 as QualityRate,
+                                    TP_PAR_QualityASS.Amount,
                                     TP_PAS_PayPlan.PayPlanName,
                                     TP_PAT_QualityASS.QualityTacticsName,
                                     TP_PAM_WagesType.WagesTypeName