王 垚
2021-12-07 1d6cff884285c996289e790aff5db2a3e4ab29bd
工资 集体
1个文件已修改
18 ■■■■■ 已修改文件
WebAPI/Controllers/工资管理/Pay_GroupBalBillController.cs 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/¹¤×ʹÜÀí/Pay_GroupBalBillController.cs
@@ -89,19 +89,25 @@
        public object Pay_GroupBalBillListProjectDetai(string sqlWhere)
        {
            DataSet ds;
            DataSet ds1;
            List<object> list = new List<object>();
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                string sql1 = "SELECT HMaterID,HMaterCode,HMaterName, HDeptID,部门代码,部门" +
                    ",HGroupID,班组代码,班组,摘要,内部单据号,表头备注,制单人,制单日期" +
                    ",审核人,审核日期,修改人,修改日期,关闭人, å…³é—­æ—¥æœŸ,HProcID,HProcNumber,HProcName" +
                    ",数量,金额 FROM h_v_Pay_GroupBalBillList where 1 = 1 ";
                string sql = sql1 + sqlWhere;
                string sql = @"SELECT HMaterID,HMaterCode,HMaterName,规格型号 HMaterSpec,HUnitID,HUnitNumber,HUnitName
                    HProcID,HProcNumber,HProcName,HSourceID,HSourceNumber,HSourceName,工时 HTimes,数量 HQty,工价 HPrice,金额 HMoney, HSumMoney,HOtherSubsidy,HOtherDeduct,HPayMoney FROM h_v_Pay_GroupBalBillList where 1 = 1 " + sqlWhere;
                ds = oCN.RunProcReturn(sql, "h_v_Pay_GroupBalBillList");
                string sql1 = @"select
 HEmpID ,b.HNumber HEmpNumber, b.HName HEmpName, b.HEmpRate HEmpRate, HBaseTimes, HMoney, HOtherSubsidy, HOtherSubsidy, HYF,'' HISZF ,'' HISFT , a.HRemark
from Pay_GroupBalBillEmp a
 left join Gy_Employee b on a.HEmpID = b.HItemID " + sqlWhere.Replace("hmainid", "HInterID");
                ds1 = oCN.RunProcReturn(sql1, "Pay_GroupBalBillEmp");
                list.Add(ds.Tables[0]);
                list.Add(ds1.Tables[0]);
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "获取信息成功!";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = list;
            }
            catch (Exception e)
            {