1

duhe

2024-01-25 8df2ba3888e02e82448c464791b5354b0a087920

1

 DAL/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/ClsGy_WorkPayType_Ctl.cs

@@ -20,9 +20,12 @@
                oCn.BeginTran();
                oCn.RunProc("Insert into " + MvarItemKey + " " +
                    " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
                    ",HLevel,HEndFlag,HStopflag,HRemark) " +
                    ",HLevel,HEndFlag,HStopflag,HRemark" +
                    ",HMakeEmp,HMakeTime,HUSEORGID,HCREATEORGID) " +
                    " Values('" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HHelpCode + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() +
                    "," + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark + "')", ref DBUtility.ClsPub.sExeReturnInfo);
                    "," + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark + "'" +
                    ",'" + oModel.HMakeEmp + "',getdate()" + "," + oModel.HUSEORGID.ToString() + "," + oModel.HCREATEORGID.ToString() +
                    ") ", ref DBUtility.ClsPub.sExeReturnInfo);
                //修改上级为非末级代码
                oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                oCn.Commit();
@@ -45,12 +48,17 @@
                    " HNumber='" + oModel.HNumber + "'" +
                    ",HName='" + oModel.HName + "'" +
                    ",HShortNumber='" + oModel.HShortNumber + "'" +
                    ",HParentID=" + oModel.HParentID.ToString() +
                    ",HHelpCode='" + oModel.HHelpCode + "'" +
                    ",HLevel=" + oModel.HLevel.ToString() +
                    ",HParentID=" + oModel.HParentID.ToString() +
                    ",HEndflag=" + Convert.ToString(oModel.HEndFlag ? 1 : 0) +
                    ",HStopflag=" + Convert.ToString(oModel.HStopflag ? 1 : 0) +
                    ",HRemark= '" + oModel.HRemark + "' Where HItemID=" + sItemID, ref DBUtility.ClsPub.sExeReturnInfo);
                    ",HRemark= '" + oModel.HRemark + "'" +
                    ",HModifyEmp= '" + oModel.HModifyEmp + "'" +
                    ",HModifyTime=getdate()" +
                    ",HUSEORGID=" + oModel.HUSEORGID.ToString() +
                    ",HCREATEORGID=" + oModel.HCREATEORGID.ToString() +
                    " where HItemID=" + sItemID, ref DBUtility.ClsPub.sExeReturnInfo);
                //修改子项目代码
                oCn.RunProc("exec h_p_Gy_UpdateNumber '" + MvarItemKey + "','" + oModel.HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
                //将上级 ä¸ºéžæœ«çº§
@@ -89,7 +97,7 @@
        public ClsGy_WorkPayType_Ctl()
        {
            MvarItemKey = "Gy_WorkPayType";
            MvarReportTitle = "工资类型设置";
            MvarReportTitle = "工资类型";
            oModel = new Model.ClsGy_WorkPayType_Model();
        } 
    }

 DAL/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/ClsGy_WorkType_Ctl.cs

@@ -14,15 +14,19 @@
        //新增
        public override bool AddNew()
        {
            
            try
            {
                oCn.BeginTran();
                oCn.RunProc("Insert into " + MvarItemKey + " " +
                    " (HNumber,HName,HHelpCode,HShortNumber,HParentID,HForEmp" +
                    ",HLevel,HEndFlag,HStopflag,HRemark,HPayMoney,HDayMoney) " +
                    " Values('" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HHelpCode + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() + ",'" + oModel.HForEmp + "'" + 
                    "," + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark + "'," + oModel.HPayMoney.ToString() + "," + oModel.HDayMoney.ToString() + ")", ref DBUtility.ClsPub.sExeReturnInfo);
                    " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
                    ",HLevel,HEndFlag,HStopflag,HRemark" +
                    ",HMakeEmp,HMakeTime,HUSEORGID,HCREATEORGID" +
                    ",HPayMoney,HDayMoney,HForEmp) " +
                    " Values('" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HHelpCode + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() +
                    "," + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark + "'" +
                    ",'" + oModel.HMakeEmp + "',getdate()" + "," + oModel.HUSEORGID.ToString() + "," + oModel.HCREATEORGID.ToString() +
                    "," + oModel.HPayMoney.ToString() + "," + oModel.HDayMoney.ToString() + ",'" + oModel.HForEmp + "'" +
                    ")", ref DBUtility.ClsPub.sExeReturnInfo);
                //修改上级为非末级代码
                oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                oCn.Commit();
@@ -45,15 +49,20 @@
                    " HNumber='" + oModel.HNumber + "'" +
                    ",HName='" + oModel.HName + "'" +
                    ",HShortNumber='" + oModel.HShortNumber + "'" +
                    ",HForEmp='" + oModel.HForEmp + "'" +
                    ",HHelpCode='" + oModel.HHelpCode + "'" +
                    ",HLevel=" + oModel.HLevel.ToString() +
                    ",HParentID=" + oModel.HParentID.ToString() +
                    ",HLevel=" + oModel.HLevel.ToString() +
                    ",HEndflag=" + Convert.ToString(oModel.HEndFlag ? 1 : 0) +
                    ",HStopflag=" + Convert.ToString(oModel.HStopflag ? 1 : 0) +
                    ",HRemark= '" + oModel.HRemark + "'" +
                    ",HModifyEmp= '" + oModel.HModifyEmp + "'" +
                    ",HModifyTime=getdate()" +
                    ",HUSEORGID=" + oModel.HUSEORGID.ToString() +
                    ",HCREATEORGID=" + oModel.HCREATEORGID.ToString() +
                    //===========================================================
                    ",HPayMoney=" + oModel.HPayMoney.ToString() +
                    ",HDayMoney=" + oModel.HDayMoney.ToString() +
                    ",HRemark= '" + oModel.HRemark + "' Where HItemID=" + sItemID, ref DBUtility.ClsPub.sExeReturnInfo);
                    ",HForEmp='" + oModel.HForEmp + "'" +
                    " where HItemID=" + sItemID, ref DBUtility.ClsPub.sExeReturnInfo);
                //修改子项目代码
                oCn.RunProc("exec h_p_Gy_UpdateNumber '" + MvarItemKey + "','" + oModel.HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
                //将上级 ä¸ºéžæœ«çº§
@@ -92,7 +101,7 @@
        public ClsGy_WorkType_Ctl()
        {
            MvarItemKey = "Gy_WorkType";
            MvarReportTitle = "工种设置";
            MvarReportTitle = "工种";
            oModel = new Model.ClsGy_WorkType_Model();
        } 
    }

 DBUtility/»ù´¡×ÊÁÏ/ClsGy_Base_Ctl.cs

@@ -362,6 +362,14 @@
                        sReturn = "单据已禁用，不允许重复禁用！";
                        return false;
                    }

                    DataSet DsHavChildCodes = oCn.RunProcReturn("select HItemID from " + MvarItemKey + " where HStopflag=0 and HParentID='" + HItemID + "'", MvarItemKey, ref Pub_Class.ClsPub.sExeReturnInfo);
                    if (DsHavChildCodes.Tables[0].Rows.Count > 0)
                    {
                        sReturn = "所选单据存在未禁用的子项目,不允许禁用！";
                        return false;
                    }

                    //禁用
                    oCn.BeginTran();
                    oCn.RunProc("Update " + MvarItemKey + " set HStopflag=1,HStopEmp = '" + HMaker + "',HStopTime=getdate() where HItemID=" + HItemID, ref Pub_Class.ClsPub.sExeReturnInfo);
@@ -403,6 +411,14 @@
                        sReturn = "单据未禁用，不允许反禁用！";
                        return false;
                    }

                    DataSet DsHavChildCodes = oCn.RunProcReturn("select HItemID from " + MvarItemKey + " where HStopflag=1 and HItemID='" + DS.Tables[0].Rows[0]["HParentID"].ToString() + "'", MvarItemKey, ref Pub_Class.ClsPub.sExeReturnInfo);
                    if (DsHavChildCodes.Tables[0].Rows.Count > 0)
                    {
                        sReturn = "所选单据上级项目已禁用,不允许反禁用！";
                        return false;
                    }

                    //禁用
                    oCn.BeginTran();
                    oCn.RunProc("Update " + MvarItemKey + " set HStopflag=0,HStopEmp = '',HStopTime=null where HItemID=" + HItemID, ref Pub_Class.ClsPub.sExeReturnInfo);

 WebAPI/Controllers/BaseSet/Gy_WorkPayTypeController.cs

File was deleted

 WebAPI/Controllers/BaseSet/Gy_WorkTypeController.cs

File was deleted

 WebAPI/Controllers/GZGL/Gy_WorkPayTypeBillController.cs

File was deleted

 WebAPI/Controllers/GZGL/Gy_WorkTypeBillController.cs

File was deleted

 WebAPI/Controllers/»ù´¡×ÊÁÏ/¹¤×Ê»ù´¡×ÊÁÏ/Gy_ClassTimePrjController.cs

File was renamed from WebAPI/Controllers/¹¤×ʹÜÀí/Gy_ClassTimePrjController.cs
@@ -25,8 +25,8 @@
        public DataSet ds = new DataSet();
        private json objJsonResult = new json();
        SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
        DAL.ClsGy_ClassTimePrj_Ctl oClassTimePrj = new DAL.ClsGy_ClassTimePrj_Ctl();
        DAL.ClsGy_ClassTimePrj_View oClassTimePrjHlp = new DAL.ClsGy_ClassTimePrj_View();
        DAL.ClsGy_ClassTimePrj_Ctl oBill = new DAL.ClsGy_ClassTimePrj_Ctl();
        DAL.ClsGy_ClassTimePrj_View oBillHlp = new DAL.ClsGy_ClassTimePrj_View();


        #region æ ¸ç®—方式列表
@@ -100,10 +100,10 @@
                }

                //判断存在性
                if (oClassTimePrjHlp.GetInfoByID(HItemID))
                if (oBillHlp.GetInfoByID(HItemID))
                {
                    //判断是否存在子项
                    if (oClassTimePrj.HavChildCodes(HItemID))
                    if (oBill.HavChildCodes(HItemID))
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
@@ -112,10 +112,10 @@
                        return objJsonResult;
                    }
                    //删除数据
                    if (oClassTimePrj.DeleteByID(HItemID))
                    if (oBill.DeleteByID(HItemID))
                    {
                        //写入日志
                        DBUtility.ClsPub.Add_Log("", "删除核算方式，代码：" + oClassTimePrjHlp.omodel.HNumber + ",名称：" + oClassTimePrjHlp.omodel.HName, HMaker);
                        DBUtility.ClsPub.Add_Log("", "删除核算方式，代码：" + oBillHlp.omodel.HNumber + ",名称：" + oBillHlp.omodel.HName, HMaker);
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "删除核算方式成功！";
@@ -178,7 +178,7 @@

                if (IsAudit == 0)   //审核判断
                {
                    if (oClassTimePrj.CheckByHItemID(HItemID, HMaker, ref sErrMsg))
                    if (oBill.CheckByHItemID(HItemID, HMaker, ref sErrMsg))
                    {
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
@@ -197,7 +197,7 @@
                }
                else if (IsAudit == 1)  //反审核判断
                {
                    if (oClassTimePrj.AbandonCheckByHItemID(HItemID, HMaker, ref sErrMsg))
                    if (oBill.AbandonCheckByHItemID(HItemID, HMaker, ref sErrMsg))
                    {
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
@@ -261,7 +261,7 @@

                if (IsStop == 0)   //禁用判断
                {
                    if (oClassTimePrj.StopByHItemID(HItemID, HMaker, ref sErrMsg))
                    if (oBill.StopByHItemID(HItemID, HMaker, ref sErrMsg))
                    {
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
@@ -280,7 +280,7 @@
                }
                else if (IsStop == 1)  //反禁用判断
                {
                    if (oClassTimePrj.AbandonStopByHItemID(HItemID, HMaker, ref sErrMsg))
                    if (oBill.AbandonStopByHItemID(HItemID, HMaker, ref sErrMsg))
                    {
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
@@ -365,25 +365,25 @@
                msg2 = msg2.Replace("\n", "");
                msg2 = "[" + msg2.ToString() + "]";
                List<Model.ClsGy_ClassTimePrj_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_ClassTimePrj_Model>>(msg2);
                oClassTimePrj.oModel.HItemID = list[0].HItemID;
                oClassTimePrj.oModel.HNumber = list[0].HNumber;
                oClassTimePrj.oModel.HName = list[0].HName;
                oClassTimePrj.oModel.HParentID = list[0].HParentID;
                oClassTimePrj.oModel.HStopflag = list[0].HStopflag;
                oClassTimePrj.oModel.HUseFlag = list[0].HUseFlag;
                oClassTimePrj.oModel.HRemark = list[0].HRemark;
                oClassTimePrj.oModel.HMakeEmp = HMaker;
                oClassTimePrj.oModel.HModifyEmp = HMaker;
                oClassTimePrj.oModel.HCheckEmp = list[0].HCheckEmp;
                oClassTimePrj.oModel.HUSEORGID = list[0].HUSEORGID;
                oClassTimePrj.oModel.HCREATEORGID = list[0].HUSEORGID;
                oBill.oModel.HItemID = list[0].HItemID;
                oBill.oModel.HNumber = list[0].HNumber;
                oBill.oModel.HName = list[0].HName;
                oBill.oModel.HParentID = list[0].HParentID;
                oBill.oModel.HStopflag = list[0].HStopflag;
                oBill.oModel.HUseFlag = list[0].HUseFlag;
                oBill.oModel.HRemark = list[0].HRemark;
                oBill.oModel.HMakeEmp = HMaker;
                oBill.oModel.HModifyEmp = HMaker;
                oBill.oModel.HCheckEmp = list[0].HCheckEmp;
                oBill.oModel.HUSEORGID = list[0].HUSEORGID;
                oBill.oModel.HCREATEORGID = list[0].HUSEORGID;
                //
                oClassTimePrj.oModel.HDeptID = list[0].HDeptID;
                oClassTimePrj.oModel.HGroupID = list[0].HGroupID;
                oBill.oModel.HDeptID = list[0].HDeptID;
                oBill.oModel.HGroupID = list[0].HGroupID;

                //保存前判断
                //审核代码是否合理
                if (!DBUtility.ClsPub.AllowNumber(oClassTimePrj.oModel.HNumber))
                if (!DBUtility.ClsPub.AllowNumber(oBill.oModel.HNumber))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -392,7 +392,7 @@
                    return objJsonResult;
                }
                //是否重复代码
                if (oClassTimePrj.HavSameNumber(oClassTimePrj.oModel.HItemID, oClassTimePrj.oModel.HNumber))
                if (oBill.HavSameNumber(oBill.oModel.HItemID, oBill.oModel.HNumber))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -405,7 +405,7 @@
                if (OperationType == "1")
                {
                    //新增
                    if (oClassTimePrj.AddNew())
                    if (oBill.AddNew())
                    {
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
@@ -424,7 +424,7 @@
                }
                else
                {
                    if(oClassTimePrj.oModel.HCheckEmp!="")
                    if(oBill.oModel.HCheckEmp!="")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
@@ -433,7 +433,7 @@
                        return objJsonResult;
                    }
                    //修改
                    if (oClassTimePrj.ModifyByID(oClassTimePrj.oModel.HItemID))
                    if (oBill.ModifyByID(oBill.oModel.HItemID))
                    {
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;

 WebAPI/Controllers/»ù´¡×ÊÁÏ/¹¤×Ê»ù´¡×ÊÁÏ/Gy_ClassTimePrjGroupController.cs

File was renamed from WebAPI/Controllers/¹¤×ʹÜÀí/Gy_ClassTimePrjGroupController.cs
@@ -25,8 +25,8 @@
        public DataSet ds = new DataSet();
        private json objJsonResult = new json();
        SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
        DAL.ClsGy_ClassTimePrjGroup_Ctl oClassTimePrj = new DAL.ClsGy_ClassTimePrjGroup_Ctl();
        DAL.ClsGy_ClassTimePrjGroup_View oClassTimePrjHlp = new DAL.ClsGy_ClassTimePrjGroup_View();
        DAL.ClsGy_ClassTimePrjGroup_Ctl oBill = new DAL.ClsGy_ClassTimePrjGroup_Ctl();
        DAL.ClsGy_ClassTimePrjGroup_View oBillHlp = new DAL.ClsGy_ClassTimePrjGroup_View();


        #region æ ¸ç®—方式组列表
@@ -100,10 +100,10 @@
                }

                //判断存在性
                if (oClassTimePrjHlp.GetInfoByID(HItemID))
                if (oBillHlp.GetInfoByID(HItemID))
                {
                    //判断是否存在子项
                    if (oClassTimePrj.HavChildCodes(HItemID))
                    if (oBill.HavChildCodes(HItemID))
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
@@ -112,10 +112,10 @@
                        return objJsonResult;
                    }
                    //删除数据
                    if (oClassTimePrj.DeleteByID(HItemID))
                    if (oBill.DeleteByID(HItemID))
                    {
                        //写入日志
                        DBUtility.ClsPub.Add_Log("", "删除核算方式组，代码：" + oClassTimePrjHlp.omodel.HNumber + ",名称：" + oClassTimePrjHlp.omodel.HName, HMaker);
                        DBUtility.ClsPub.Add_Log("", "删除核算方式组，代码：" + oBillHlp.omodel.HNumber + ",名称：" + oBillHlp.omodel.HName, HMaker);
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "删除核算方式组成功！";
@@ -178,7 +178,7 @@

                if (IsAudit == 0)   //审核判断
                {
                    if (oClassTimePrj.CheckByHItemID(HItemID, HMaker, ref sErrMsg))
                    if (oBill.CheckByHItemID(HItemID, HMaker, ref sErrMsg))
                    {
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
@@ -197,7 +197,7 @@
                }
                else if (IsAudit == 1)  //反审核判断
                {
                    if (oClassTimePrj.AbandonCheckByHItemID(HItemID, HMaker, ref sErrMsg))
                    if (oBill.AbandonCheckByHItemID(HItemID, HMaker, ref sErrMsg))
                    {
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
@@ -261,7 +261,7 @@

                if (IsStop == 0)   //禁用判断
                {
                    if (oClassTimePrj.StopByHItemID(HItemID, HMaker, ref sErrMsg))
                    if (oBill.StopByHItemID(HItemID, HMaker, ref sErrMsg))
                    {
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
@@ -280,7 +280,7 @@
                }
                else if (IsStop == 1)  //反禁用判断
                {
                    if (oClassTimePrj.AbandonStopByHItemID(HItemID, HMaker, ref sErrMsg))
                    if (oBill.AbandonStopByHItemID(HItemID, HMaker, ref sErrMsg))
                    {
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
@@ -365,36 +365,36 @@
                msg2 = msg2.Replace("\n", "");
                msg2 = "[" + msg2.ToString() + "]";
                List<Model.ClsGy_ClassTimePrjGroup_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_ClassTimePrjGroup_Model>>(msg2);
                oClassTimePrj.oModel.HItemID = list[0].HItemID;
                oClassTimePrj.oModel.HNumber = list[0].HNumber;
                oClassTimePrj.oModel.HName = list[0].HName;
                oClassTimePrj.oModel.HShortNumber = DBUtility.ClsPub.GetShortNumber(list[0].HNumber);
                oClassTimePrj.oModel.HLevel = DBUtility.ClsPub.GetLevel(list[0].HNumber);
                oClassTimePrj.oModel.HEndFlag = true;
                oClassTimePrj.oModel.HStopflag = list[0].HStopflag;
                oClassTimePrj.oModel.HUseFlag = list[0].HUseFlag;
                oClassTimePrj.oModel.HRemark = list[0].HRemark;
                oClassTimePrj.oModel.HMakeEmp = HMaker;
                oClassTimePrj.oModel.HModifyEmp = HMaker;
                oClassTimePrj.oModel.HCheckEmp = list[0].HCheckEmp;
                oClassTimePrj.oModel.HUSEORGID = list[0].HUSEORGID;
                oClassTimePrj.oModel.HCREATEORGID = list[0].HUSEORGID;
                oBill.oModel.HItemID = list[0].HItemID;
                oBill.oModel.HNumber = list[0].HNumber;
                oBill.oModel.HName = list[0].HName;
                oBill.oModel.HShortNumber = DBUtility.ClsPub.GetShortNumber(list[0].HNumber);
                oBill.oModel.HLevel = DBUtility.ClsPub.GetLevel(list[0].HNumber);
                oBill.oModel.HEndFlag = true;
                oBill.oModel.HStopflag = list[0].HStopflag;
                oBill.oModel.HUseFlag = list[0].HUseFlag;
                oBill.oModel.HRemark = list[0].HRemark;
                oBill.oModel.HMakeEmp = HMaker;
                oBill.oModel.HModifyEmp = HMaker;
                oBill.oModel.HCheckEmp = list[0].HCheckEmp;
                oBill.oModel.HUSEORGID = list[0].HUSEORGID;
                oBill.oModel.HCREATEORGID = list[0].HUSEORGID;
                //
                oClassTimePrj.oModel.HDeptID = list[0].HDeptID;
                oClassTimePrj.oModel.HGroupID = list[0].HGroupID;
                oBill.oModel.HDeptID = list[0].HDeptID;
                oBill.oModel.HGroupID = list[0].HGroupID;

                //检查父级是否存在
                string sParent = DBUtility.ClsPub.GetParentCode(list[0].HNumber);
                if (sParent.Trim() == "")
                {
                    oClassTimePrj.oModel.HParentID = 0;
                    oBill.oModel.HParentID = 0;
                }
                else
                {
                    ds = oCn.RunProcReturn("select * from " + ModRightName + " where HStopflag=0 and HNumber='" + sParent + "' and HItemID<>" + oClassTimePrj.oModel.HItemID, ModRightName);
                    ds = oCn.RunProcReturn("select * from " + ModRightName + " where HStopflag=0 and HNumber='" + sParent + "' and HItemID<>" + oBill.oModel.HItemID, ModRightName);
                    if (ds.Tables[0].Rows.Count > 0)
                    {
                        oClassTimePrj.oModel.HParentID = long.Parse(ds.Tables[0].Rows[0]["HItemID"].ToString());
                        oBill.oModel.HParentID = long.Parse(ds.Tables[0].Rows[0]["HItemID"].ToString());
                    }
                    else
                    {
@@ -407,14 +407,14 @@
                }
                //保存原代码

                DataSet dsOldNumber = oCn.RunProcReturn("select * from " + ModRightName + " where HItemID='" + oClassTimePrj.oModel.HItemID + "'", ModRightName);
                DataSet dsOldNumber = oCn.RunProcReturn("select * from " + ModRightName + " where HItemID='" + oBill.oModel.HItemID + "'", ModRightName);
                if (dsOldNumber.Tables[0].Rows.Count > 0)
                {
                    oClassTimePrj.HOldNumber = DBUtility.ClsPub.isStrNull(dsOldNumber.Tables[0].Rows[0]["HNumber"]);
                    oBill.HOldNumber = DBUtility.ClsPub.isStrNull(dsOldNumber.Tables[0].Rows[0]["HNumber"]);
                    //是否新代码是自己子项目的　子项目
                    if (sParent.Length >= oClassTimePrj.HOldNumber.Length)
                    if (sParent.Length >= oBill.HOldNumber.Length)
                    {
                        if (sParent.Substring(0, oClassTimePrj.HOldNumber.ToString().Length) == oClassTimePrj.HOldNumber.Trim())
                        if (sParent.Substring(0, oBill.HOldNumber.ToString().Length) == oBill.HOldNumber.Trim())
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
@@ -426,12 +426,12 @@
                }
                else
                {
                    oClassTimePrj.HOldNumber = "";
                    oBill.HOldNumber = "";
                }

                //保存前判断
                //审核代码是否合理
                if (!DBUtility.ClsPub.AllowNumber(oClassTimePrj.oModel.HNumber))
                if (!DBUtility.ClsPub.AllowNumber(oBill.oModel.HNumber))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -440,7 +440,7 @@
                    return objJsonResult;
                }
                //是否重复代码
                if (oClassTimePrj.HavSameNumber(oClassTimePrj.oModel.HItemID, oClassTimePrj.oModel.HNumber))
                if (oBill.HavSameNumber(oBill.oModel.HItemID, oBill.oModel.HNumber))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -453,7 +453,7 @@
                if (OperationType == "1")
                {
                    //新增
                    if (oClassTimePrj.AddNew())
                    if (oBill.AddNew())
                    {
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
@@ -472,7 +472,7 @@
                }
                else
                {
                    if(oClassTimePrj.oModel.HCheckEmp!="")
                    if(oBill.oModel.HCheckEmp!="")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
@@ -481,7 +481,7 @@
                        return objJsonResult;
                    }
                    //修改
                    if (oClassTimePrj.ModifyByID(oClassTimePrj.oModel.HItemID))
                    if (oBill.ModifyByID(oBill.oModel.HItemID))
                    {
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;

 WebAPI/Controllers/»ù´¡×ÊÁÏ/¹¤×Ê»ù´¡×ÊÁÏ/Gy_WorkPayTypeController.cs

copy from "WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_ClassTimePrjGroupController.cs"
copy to "WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkPayTypeController.cs"
File was copied from WebAPI/Controllers/¹¤×ʹÜÀí/Gy_ClassTimePrjGroupController.cs
@@ -12,11 +12,11 @@

namespace WebAPI.Controllers
{
    public class Gy_ClassTimePrjGroupController : ApiController
    public class Gy_WorkPayTypeController : ApiController
    {
        public DBUtility.ClsPub.Enum_BillStatus BillStatus;
        const string ModCaption = "核算方式组";
        public const string ModRightName = "Gy_ClassTimePrjGroup";
        const string ModCaption = "工资类型";
        public const string ModRightName = "Gy_WorkPayType";
        public const string ModRightNameAdd = ModRightName + "_Add";        //新增
        public const string ModRightNameEdit = ModRightName + "_Edit";      //编辑
        public const string ModRightNameCheck = ModRightName + "_Check";    //审核
@@ -25,18 +25,18 @@
        public DataSet ds = new DataSet();
        private json objJsonResult = new json();
        SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
        DAL.ClsGy_ClassTimePrjGroup_Ctl oClassTimePrj = new DAL.ClsGy_ClassTimePrjGroup_Ctl();
        DAL.ClsGy_ClassTimePrjGroup_View oClassTimePrjHlp = new DAL.ClsGy_ClassTimePrjGroup_View();
        DAL.ClsGy_WorkPayType_Ctl oBill = new DAL.ClsGy_WorkPayType_Ctl();
        DAL.ClsGy_WorkPayType_View oBillHlp = new DAL.ClsGy_WorkPayType_View();


        #region æ ¸ç®—方式组列表
        #region å·¥èµ„类型列表
        /// <summary>
        /// èŽ·å–核算方式组列表信息
        /// èŽ·å–工资类型列表信息
        /// </summary>
        /// <returns></returns>
        [Route("Gy_ClassTimePrjGroupController/GetGy_ClassTimePrjGroupList_Json")]
        [Route("Gy_WorkPayTypeController/GetGy_WorkPayTypeList_Json")]
        [HttpGet]
        public object GetGy_ClassTimePrjGroupList_Json(string sWhere, string HMaker)
        public object GetGy_WorkPayTypeList_Json(string sWhere, string HMaker)
        {
            try
            {
@@ -51,7 +51,7 @@
                }

                //返回列表信息
                ds = oCn.RunProcReturn("select * from h_v_Gy_ClassTimePrjGroupList where " + sWhere + " order by " + ModCaption + "代码" , "h_v_Gy_ClassTimePrjGroupList");
                ds = oCn.RunProcReturn("select * from h_v_Gy_WorkPayTypeList where " + sWhere + " order by " + ModCaption + "代码" , "h_v_Gy_WorkPayTypeList");
                List<object> columnNameList = new List<object>();
                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
@@ -78,14 +78,14 @@
        }
        #endregion

        #region æ ¸ç®—方式组删除
        #region å·¥èµ„类型删除
        /// <summary>
        /// åˆ é™¤æ ¸ç®—方式组
        /// åˆ é™¤å·¥èµ„类型
        /// </summary>
        /// <returns></returns>
        [Route("Gy_ClassTimePrjGroupController/GetGy_ClassTimePrjGroup_Delete_Json")]
        [Route("Gy_WorkPayTypeController/GetGy_WorkPayType_Delete_Json")]
        [HttpGet]
        public object GetGy_ClassTimePrjGroup_Delete_Json(Int64 HItemID, string HMaker)
        public object GetGy_WorkPayType_Delete_Json(Int64 HItemID, string HMaker)
        {
            try
            {
@@ -100,25 +100,25 @@
                }

                //判断存在性
                if (oClassTimePrjHlp.GetInfoByID(HItemID))
                if (oBillHlp.GetInfoByID(HItemID))
                {
                    //判断是否存在子项
                    if (oClassTimePrj.HavChildCodes(HItemID))
                    if (oBill.HavChildCodes(HItemID))
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "此核算方式组存在子项目,不能删除！";
                        objJsonResult.Message = "此工资类型存在子项目,不能删除！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    //删除数据
                    if (oClassTimePrj.DeleteByID(HItemID))
                    if (oBill.DeleteByID(HItemID))
                    {
                        //写入日志
                        DBUtility.ClsPub.Add_Log("", "删除核算方式组，代码：" + oClassTimePrjHlp.omodel.HNumber + ",名称：" + oClassTimePrjHlp.omodel.HName, HMaker);
                        DBUtility.ClsPub.Add_Log("", "删除工资类型，代码：" + oBillHlp.omodel.HNumber + ",名称：" + oBillHlp.omodel.HName, HMaker);
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "删除核算方式组成功！";
                        objJsonResult.Message = "删除工资类型成功！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
@@ -126,7 +126,7 @@
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "删除核算方式组失败！";
                        objJsonResult.Message = "删除工资类型失败！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
@@ -135,7 +135,7 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "未查询到该核算方式组，请刷新数据后重新选择！";
                    objJsonResult.Message = "未查询到该工资类型，请刷新数据后重新选择！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -144,24 +144,24 @@
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "删除核算方式组失败！" + e.ToString();
                objJsonResult.Message = "删除工资类型失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region æ ¸ç®—方式组审核、反审核
        #region å·¥èµ„类型审核、反审核
        /// <summary>
        /// å®¡æ ¸ã€åå®¡æ ¸æ ¸ç®—方式组
        /// å®¡æ ¸ã€åå®¡æ ¸å·¥èµ„类型
        /// </summary>
        /// <param name="HItemID">内码</param>
        /// <param name="IsAudit">审核(0),反审核(1)</param>
        /// <param name="HMaker">操作人</param>
        /// <returns></returns>
        [Route("Gy_ClassTimePrjGroupController/GetGy_ClassTimePrjGroup_Check_Json")]
        [Route("Gy_WorkPayTypeController/GetGy_WorkPayType_Check_Json")]
        [HttpGet]
        public object GetGy_ClassTimePrjGroup_Check_Json(Int64 HItemID, int IsAudit, string HMaker)
        public object GetGy_WorkPayType_Check_Json(Int64 HItemID, int IsAudit, string HMaker)
        {
            string sErrMsg = "";
            try
@@ -178,11 +178,11 @@

                if (IsAudit == 0)   //审核判断
                {
                    if (oClassTimePrj.CheckByHItemID(HItemID, HMaker, ref sErrMsg))
                    if (oBill.CheckByHItemID(HItemID, HMaker, ref sErrMsg))
                    {
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "审核核算方式组成功！";
                        objJsonResult.Message = "审核工资类型成功！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
@@ -190,18 +190,18 @@
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "审核核算方式组失败！" + sErrMsg;
                        objJsonResult.Message = "审核工资类型失败！" + sErrMsg;
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }
                else if (IsAudit == 1)  //反审核判断
                {
                    if (oClassTimePrj.AbandonCheckByHItemID(HItemID, HMaker, ref sErrMsg))
                    if (oBill.AbandonCheckByHItemID(HItemID, HMaker, ref sErrMsg))
                    {
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "反审核核算方式组成功！";
                        objJsonResult.Message = "反审核工资类型成功！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
@@ -209,7 +209,7 @@
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "反审核核算方式组失败！" + sErrMsg;
                        objJsonResult.Message = "反审核工资类型失败！" + sErrMsg;
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
@@ -227,24 +227,24 @@
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "审核或反审核核算方式组失败！" + e.ToString();
                objJsonResult.Message = "审核或反审核工资类型失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region æ ¸ç®—方式组禁用、反禁用
        #region å·¥èµ„类型禁用、反禁用
        /// <summary>
        /// ç¦ç”¨ã€åç¦ç”¨æ ¸ç®—方式组
        /// ç¦ç”¨ã€åç¦ç”¨å·¥èµ„类型
        /// </summary>
        /// <param name="HItemID">内码</param>
        /// <param name="IsStop">禁用(0),反禁用(1)</param>
        /// <param name="HMaker">操作人</param>
        /// <returns></returns>
        [Route("Gy_ClassTimePrjGroupController/GetGy_ClassTimePrjGroup_Stop_Json")]
        [Route("Gy_WorkPayTypeController/GetGy_WorkPayType_Stop_Json")]
        [HttpGet]
        public object GetGy_ClassTimePrjGroup_Stop_Json(Int64 HItemID, int IsStop, string HMaker)
        public object GetGy_WorkPayType_Stop_Json(Int64 HItemID, int IsStop, string HMaker)
        {
            string sErrMsg = "";
            try
@@ -261,11 +261,11 @@

                if (IsStop == 0)   //禁用判断
                {
                    if (oClassTimePrj.StopByHItemID(HItemID, HMaker, ref sErrMsg))
                    if (oBill.StopByHItemID(HItemID, HMaker, ref sErrMsg))
                    {
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "禁用核算方式组成功！";
                        objJsonResult.Message = "禁用工资类型成功！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
@@ -273,18 +273,18 @@
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "禁用核算方式组失败！" + sErrMsg;
                        objJsonResult.Message = "禁用工资类型失败！" + sErrMsg;
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }
                else if (IsStop == 1)  //反禁用判断
                {
                    if (oClassTimePrj.AbandonStopByHItemID(HItemID, HMaker, ref sErrMsg))
                    if (oBill.AbandonStopByHItemID(HItemID, HMaker, ref sErrMsg))
                    {
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "反禁用核算方式组成功！";
                        objJsonResult.Message = "反禁用工资类型成功！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
@@ -292,7 +292,7 @@
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "反禁用核算方式组失败！" + sErrMsg;
                        objJsonResult.Message = "反禁用工资类型失败！" + sErrMsg;
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
@@ -310,20 +310,20 @@
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "禁用或反禁用核算方式组失败！" + e.ToString();
                objJsonResult.Message = "禁用或反禁用工资类型失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region æ ¸ç®—方式组保存
        #region å·¥èµ„类型保存
        /// <summary>
        /// æ ¸ç®—方式组保存
        /// å·¥èµ„类型保存
        /// </summary>
        [Route("Gy_ClassTimePrjGroupController/GetGy_ClassTimePrjGroup_Save_Json")]
        [Route("Gy_WorkPayTypeController/GetGy_WorkPayType_Save_Json")]
        [HttpPost]
        public object GetGy_ClassTimePrjGroup_Save_Json([FromBody] JObject oMain)
        public object GetGy_WorkPayType_Save_Json([FromBody] JObject oMain)
        {
            try
            {
@@ -364,37 +364,34 @@
                msg2 = msg2.Replace("\\", "");
                msg2 = msg2.Replace("\n", "");
                msg2 = "[" + msg2.ToString() + "]";
                List<Model.ClsGy_ClassTimePrjGroup_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_ClassTimePrjGroup_Model>>(msg2);
                oClassTimePrj.oModel.HItemID = list[0].HItemID;
                oClassTimePrj.oModel.HNumber = list[0].HNumber;
                oClassTimePrj.oModel.HName = list[0].HName;
                oClassTimePrj.oModel.HShortNumber = DBUtility.ClsPub.GetShortNumber(list[0].HNumber);
                oClassTimePrj.oModel.HLevel = DBUtility.ClsPub.GetLevel(list[0].HNumber);
                oClassTimePrj.oModel.HEndFlag = true;
                oClassTimePrj.oModel.HStopflag = list[0].HStopflag;
                oClassTimePrj.oModel.HUseFlag = list[0].HUseFlag;
                oClassTimePrj.oModel.HRemark = list[0].HRemark;
                oClassTimePrj.oModel.HMakeEmp = HMaker;
                oClassTimePrj.oModel.HModifyEmp = HMaker;
                oClassTimePrj.oModel.HCheckEmp = list[0].HCheckEmp;
                oClassTimePrj.oModel.HUSEORGID = list[0].HUSEORGID;
                oClassTimePrj.oModel.HCREATEORGID = list[0].HUSEORGID;
                //
                oClassTimePrj.oModel.HDeptID = list[0].HDeptID;
                oClassTimePrj.oModel.HGroupID = list[0].HGroupID;
                List<Model.ClsGy_WorkPayType_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_WorkPayType_Model>>(msg2);
                oBill.oModel.HItemID = list[0].HItemID;
                oBill.oModel.HNumber = list[0].HNumber;
                oBill.oModel.HName = list[0].HName;
                oBill.oModel.HShortNumber = DBUtility.ClsPub.GetShortNumber(list[0].HNumber);
                oBill.oModel.HLevel = DBUtility.ClsPub.GetLevel(list[0].HNumber);
                oBill.oModel.HEndFlag = true;
                oBill.oModel.HStopflag = list[0].HStopflag;
                oBill.oModel.HUseFlag = list[0].HUseFlag;
                oBill.oModel.HRemark = list[0].HRemark;
                oBill.oModel.HMakeEmp = HMaker;
                oBill.oModel.HModifyEmp = HMaker;
                oBill.oModel.HCheckEmp = list[0].HCheckEmp;
                oBill.oModel.HUSEORGID = list[0].HUSEORGID;
                oBill.oModel.HCREATEORGID = list[0].HUSEORGID;

                //检查父级是否存在
                string sParent = DBUtility.ClsPub.GetParentCode(list[0].HNumber);
                if (sParent.Trim() == "")
                {
                    oClassTimePrj.oModel.HParentID = 0;
                    oBill.oModel.HParentID = 0;
                }
                else
                {
                    ds = oCn.RunProcReturn("select * from " + ModRightName + " where HStopflag=0 and HNumber='" + sParent + "' and HItemID<>" + oClassTimePrj.oModel.HItemID, ModRightName);
                    ds = oCn.RunProcReturn("select * from " + ModRightName + " where HStopflag=0 and HNumber='" + sParent + "' and HItemID<>" + oBill.oModel.HItemID, ModRightName);
                    if (ds.Tables[0].Rows.Count > 0)
                    {
                        oClassTimePrj.oModel.HParentID = long.Parse(ds.Tables[0].Rows[0]["HItemID"].ToString());
                        oBill.oModel.HParentID = long.Parse(ds.Tables[0].Rows[0]["HItemID"].ToString());
                    }
                    else
                    {
@@ -407,14 +404,14 @@
                }
                //保存原代码

                DataSet dsOldNumber = oCn.RunProcReturn("select * from " + ModRightName + " where HItemID='" + oClassTimePrj.oModel.HItemID + "'", ModRightName);
                DataSet dsOldNumber = oCn.RunProcReturn("select * from " + ModRightName + " where HItemID='" + oBill.oModel.HItemID + "'", ModRightName);
                if (dsOldNumber.Tables[0].Rows.Count > 0)
                {
                    oClassTimePrj.HOldNumber = DBUtility.ClsPub.isStrNull(dsOldNumber.Tables[0].Rows[0]["HNumber"]);
                    oBill.HOldNumber = DBUtility.ClsPub.isStrNull(dsOldNumber.Tables[0].Rows[0]["HNumber"]);
                    //是否新代码是自己子项目的　子项目
                    if (sParent.Length >= oClassTimePrj.HOldNumber.Length)
                    if (sParent.Length >= oBill.HOldNumber.Length)
                    {
                        if (sParent.Substring(0, oClassTimePrj.HOldNumber.ToString().Length) == oClassTimePrj.HOldNumber.Trim())
                        if (sParent.Substring(0, oBill.HOldNumber.ToString().Length) == oBill.HOldNumber.Trim())
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
@@ -426,12 +423,12 @@
                }
                else
                {
                    oClassTimePrj.HOldNumber = "";
                    oBill.HOldNumber = "";
                }

                //保存前判断
                //审核代码是否合理
                if (!DBUtility.ClsPub.AllowNumber(oClassTimePrj.oModel.HNumber))
                if (!DBUtility.ClsPub.AllowNumber(oBill.oModel.HNumber))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -440,7 +437,7 @@
                    return objJsonResult;
                }
                //是否重复代码
                if (oClassTimePrj.HavSameNumber(oClassTimePrj.oModel.HItemID, oClassTimePrj.oModel.HNumber))
                if (oBill.HavSameNumber(oBill.oModel.HItemID, oBill.oModel.HNumber))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -453,7 +450,7 @@
                if (OperationType == "1")
                {
                    //新增
                    if (oClassTimePrj.AddNew())
                    if (oBill.AddNew())
                    {
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
@@ -472,7 +469,7 @@
                }
                else
                {
                    if(oClassTimePrj.oModel.HCheckEmp!="")
                    if(oBill.oModel.HCheckEmp!="")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
@@ -481,7 +478,7 @@
                        return objJsonResult;
                    }
                    //修改
                    if (oClassTimePrj.ModifyByID(oClassTimePrj.oModel.HItemID))
                    if (oBill.ModifyByID(oBill.oModel.HItemID))
                    {
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
@@ -511,22 +508,22 @@

        #endregion

        #region æ˜¾ç¤ºæ ¸ç®—方式组信息
        #region æ˜¾ç¤ºå·¥èµ„类型信息
        /// <summary>
        /// æ ¹æ®åŸºç¡€èµ„æ–™ID æŸ¥æ‰¾è®°å½•
        /// </summary>
        [Route("Gy_ClassTimePrjGroupController/GetGy_ClassTimePrjGroup_Json")]
        [Route("Gy_WorkPayTypeController/GetGy_WorkPayType_Json")]
        [HttpGet]
        public object GetGy_ClassTimePrjGroup_Json(Int64 HItemID)
        public object GetGy_WorkPayType_Json(Int64 HItemID)
        {
            try
            {
                ds = oCn.RunProcReturn("select * from h_v_Gy_ClassTimePrjGroupListDetail where HItemID=" + HItemID, "h_v_Gy_ClassTimePrjGroupListDetail");
                ds = oCn.RunProcReturn("select * from h_v_Gy_WorkPayTypeListDetail where HItemID=" + HItemID, "h_v_Gy_WorkPayTypeListDetail");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "未查询到该核算方式组，请刷新数据后重新选择！";
                    objJsonResult.Message = "未查询到该工资类型，请刷新数据后重新选择！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -543,7 +540,7 @@
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "返回核算方式组信息失败！" + e.ToString();
                objJsonResult.Message = "返回工资类型信息失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }

 WebAPI/Controllers/»ù´¡×ÊÁÏ/¹¤×Ê»ù´¡×ÊÁÏ/Gy_WorkTypeController.cs

copy from "WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_ClassTimePrjGroupController.cs"
copy to "WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkTypeController.cs"
File was copied from WebAPI/Controllers/¹¤×ʹÜÀí/Gy_ClassTimePrjGroupController.cs
@@ -12,11 +12,11 @@

namespace WebAPI.Controllers
{
    public class Gy_ClassTimePrjGroupController : ApiController
    public class Gy_WorkTypeController : ApiController
    {
        public DBUtility.ClsPub.Enum_BillStatus BillStatus;
        const string ModCaption = "核算方式组";
        public const string ModRightName = "Gy_ClassTimePrjGroup";
        const string ModCaption = "工种";
        public const string ModRightName = "Gy_WorkType";
        public const string ModRightNameAdd = ModRightName + "_Add";        //新增
        public const string ModRightNameEdit = ModRightName + "_Edit";      //编辑
        public const string ModRightNameCheck = ModRightName + "_Check";    //审核
@@ -25,18 +25,18 @@
        public DataSet ds = new DataSet();
        private json objJsonResult = new json();
        SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
        DAL.ClsGy_ClassTimePrjGroup_Ctl oClassTimePrj = new DAL.ClsGy_ClassTimePrjGroup_Ctl();
        DAL.ClsGy_ClassTimePrjGroup_View oClassTimePrjHlp = new DAL.ClsGy_ClassTimePrjGroup_View();
        DAL.ClsGy_WorkType_Ctl oBill = new DAL.ClsGy_WorkType_Ctl();
        DAL.ClsGy_WorkType_View oBillHlp = new DAL.ClsGy_WorkType_View();


        #region æ ¸ç®—方式组列表
        #region å·¥ç§åˆ—表
        /// <summary>
        /// èŽ·å–核算方式组列表信息
        /// èŽ·å–工种列表信息
        /// </summary>
        /// <returns></returns>
        [Route("Gy_ClassTimePrjGroupController/GetGy_ClassTimePrjGroupList_Json")]
        [Route("Gy_WorkTypeController/GetGy_WorkTypeList_Json")]
        [HttpGet]
        public object GetGy_ClassTimePrjGroupList_Json(string sWhere, string HMaker)
        public object GetGy_WorkTypeList_Json(string sWhere, string HMaker)
        {
            try
            {
@@ -51,7 +51,7 @@
                }

                //返回列表信息
                ds = oCn.RunProcReturn("select * from h_v_Gy_ClassTimePrjGroupList where " + sWhere + " order by " + ModCaption + "代码" , "h_v_Gy_ClassTimePrjGroupList");
                ds = oCn.RunProcReturn("select * from h_v_Gy_WorkTypeList where " + sWhere + " order by " + ModCaption + "代码" , "h_v_Gy_WorkTypeList");
                List<object> columnNameList = new List<object>();
                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
@@ -78,14 +78,14 @@
        }
        #endregion

        #region æ ¸ç®—方式组删除
        #region å·¥ç§åˆ é™¤
        /// <summary>
        /// åˆ é™¤æ ¸ç®—方式组
        /// åˆ é™¤å·¥ç§
        /// </summary>
        /// <returns></returns>
        [Route("Gy_ClassTimePrjGroupController/GetGy_ClassTimePrjGroup_Delete_Json")]
        [Route("Gy_WorkTypeController/GetGy_WorkType_Delete_Json")]
        [HttpGet]
        public object GetGy_ClassTimePrjGroup_Delete_Json(Int64 HItemID, string HMaker)
        public object GetGy_WorkType_Delete_Json(Int64 HItemID, string HMaker)
        {
            try
            {
@@ -100,25 +100,25 @@
                }

                //判断存在性
                if (oClassTimePrjHlp.GetInfoByID(HItemID))
                if (oBillHlp.GetInfoByID(HItemID))
                {
                    //判断是否存在子项
                    if (oClassTimePrj.HavChildCodes(HItemID))
                    if (oBill.HavChildCodes(HItemID))
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "此核算方式组存在子项目,不能删除！";
                        objJsonResult.Message = "此工种存在子项目,不能删除！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    //删除数据
                    if (oClassTimePrj.DeleteByID(HItemID))
                    if (oBill.DeleteByID(HItemID))
                    {
                        //写入日志
                        DBUtility.ClsPub.Add_Log("", "删除核算方式组，代码：" + oClassTimePrjHlp.omodel.HNumber + ",名称：" + oClassTimePrjHlp.omodel.HName, HMaker);
                        DBUtility.ClsPub.Add_Log("", "删除工种，代码：" + oBillHlp.omodel.HNumber + ",名称：" + oBillHlp.omodel.HName, HMaker);
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "删除核算方式组成功！";
                        objJsonResult.Message = "删除工种成功！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
@@ -126,7 +126,7 @@
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "删除核算方式组失败！";
                        objJsonResult.Message = "删除工种失败！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
@@ -135,7 +135,7 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "未查询到该核算方式组，请刷新数据后重新选择！";
                    objJsonResult.Message = "未查询到该工种，请刷新数据后重新选择！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -144,24 +144,24 @@
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "删除核算方式组失败！" + e.ToString();
                objJsonResult.Message = "删除工种失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region æ ¸ç®—方式组审核、反审核
        #region å·¥ç§å®¡æ ¸ã€åå®¡æ ¸
        /// <summary>
        /// å®¡æ ¸ã€åå®¡æ ¸æ ¸ç®—方式组
        /// å®¡æ ¸ã€åå®¡æ ¸å·¥ç§
        /// </summary>
        /// <param name="HItemID">内码</param>
        /// <param name="IsAudit">审核(0),反审核(1)</param>
        /// <param name="HMaker">操作人</param>
        /// <returns></returns>
        [Route("Gy_ClassTimePrjGroupController/GetGy_ClassTimePrjGroup_Check_Json")]
        [Route("Gy_WorkTypeController/GetGy_WorkType_Check_Json")]
        [HttpGet]
        public object GetGy_ClassTimePrjGroup_Check_Json(Int64 HItemID, int IsAudit, string HMaker)
        public object GetGy_WorkType_Check_Json(Int64 HItemID, int IsAudit, string HMaker)
        {
            string sErrMsg = "";
            try
@@ -178,11 +178,11 @@

                if (IsAudit == 0)   //审核判断
                {
                    if (oClassTimePrj.CheckByHItemID(HItemID, HMaker, ref sErrMsg))
                    if (oBill.CheckByHItemID(HItemID, HMaker, ref sErrMsg))
                    {
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "审核核算方式组成功！";
                        objJsonResult.Message = "审核工种成功！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
@@ -190,18 +190,18 @@
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "审核核算方式组失败！" + sErrMsg;
                        objJsonResult.Message = "审核工种失败！" + sErrMsg;
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }
                else if (IsAudit == 1)  //反审核判断
                {
                    if (oClassTimePrj.AbandonCheckByHItemID(HItemID, HMaker, ref sErrMsg))
                    if (oBill.AbandonCheckByHItemID(HItemID, HMaker, ref sErrMsg))
                    {
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "反审核核算方式组成功！";
                        objJsonResult.Message = "反审核工种成功！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
@@ -209,7 +209,7 @@
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "反审核核算方式组失败！" + sErrMsg;
                        objJsonResult.Message = "反审核工种失败！" + sErrMsg;
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
@@ -227,24 +227,24 @@
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "审核或反审核核算方式组失败！" + e.ToString();
                objJsonResult.Message = "审核或反审核工种失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region æ ¸ç®—方式组禁用、反禁用
        #region å·¥ç§ç¦ç”¨ã€åç¦ç”¨
        /// <summary>
        /// ç¦ç”¨ã€åç¦ç”¨æ ¸ç®—方式组
        /// ç¦ç”¨ã€åç¦ç”¨å·¥ç§
        /// </summary>
        /// <param name="HItemID">内码</param>
        /// <param name="IsStop">禁用(0),反禁用(1)</param>
        /// <param name="HMaker">操作人</param>
        /// <returns></returns>
        [Route("Gy_ClassTimePrjGroupController/GetGy_ClassTimePrjGroup_Stop_Json")]
        [Route("Gy_WorkTypeController/GetGy_WorkType_Stop_Json")]
        [HttpGet]
        public object GetGy_ClassTimePrjGroup_Stop_Json(Int64 HItemID, int IsStop, string HMaker)
        public object GetGy_WorkType_Stop_Json(Int64 HItemID, int IsStop, string HMaker)
        {
            string sErrMsg = "";
            try
@@ -261,11 +261,11 @@

                if (IsStop == 0)   //禁用判断
                {
                    if (oClassTimePrj.StopByHItemID(HItemID, HMaker, ref sErrMsg))
                    if (oBill.StopByHItemID(HItemID, HMaker, ref sErrMsg))
                    {
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "禁用核算方式组成功！";
                        objJsonResult.Message = "禁用工种成功！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
@@ -273,18 +273,18 @@
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "禁用核算方式组失败！" + sErrMsg;
                        objJsonResult.Message = "禁用工种失败！" + sErrMsg;
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }
                else if (IsStop == 1)  //反禁用判断
                {
                    if (oClassTimePrj.AbandonStopByHItemID(HItemID, HMaker, ref sErrMsg))
                    if (oBill.AbandonStopByHItemID(HItemID, HMaker, ref sErrMsg))
                    {
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "反禁用核算方式组成功！";
                        objJsonResult.Message = "反禁用工种成功！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
@@ -292,7 +292,7 @@
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "反禁用核算方式组失败！" + sErrMsg;
                        objJsonResult.Message = "反禁用工种失败！" + sErrMsg;
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
@@ -310,20 +310,20 @@
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "禁用或反禁用核算方式组失败！" + e.ToString();
                objJsonResult.Message = "禁用或反禁用工种失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region æ ¸ç®—方式组保存
        #region å·¥ç§ä¿å­˜
        /// <summary>
        /// æ ¸ç®—方式组保存
        /// å·¥ç§ä¿å­˜
        /// </summary>
        [Route("Gy_ClassTimePrjGroupController/GetGy_ClassTimePrjGroup_Save_Json")]
        [Route("Gy_WorkTypeController/GetGy_WorkType_Save_Json")]
        [HttpPost]
        public object GetGy_ClassTimePrjGroup_Save_Json([FromBody] JObject oMain)
        public object GetGy_WorkType_Save_Json([FromBody] JObject oMain)
        {
            try
            {
@@ -364,37 +364,38 @@
                msg2 = msg2.Replace("\\", "");
                msg2 = msg2.Replace("\n", "");
                msg2 = "[" + msg2.ToString() + "]";
                List<Model.ClsGy_ClassTimePrjGroup_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_ClassTimePrjGroup_Model>>(msg2);
                oClassTimePrj.oModel.HItemID = list[0].HItemID;
                oClassTimePrj.oModel.HNumber = list[0].HNumber;
                oClassTimePrj.oModel.HName = list[0].HName;
                oClassTimePrj.oModel.HShortNumber = DBUtility.ClsPub.GetShortNumber(list[0].HNumber);
                oClassTimePrj.oModel.HLevel = DBUtility.ClsPub.GetLevel(list[0].HNumber);
                oClassTimePrj.oModel.HEndFlag = true;
                oClassTimePrj.oModel.HStopflag = list[0].HStopflag;
                oClassTimePrj.oModel.HUseFlag = list[0].HUseFlag;
                oClassTimePrj.oModel.HRemark = list[0].HRemark;
                oClassTimePrj.oModel.HMakeEmp = HMaker;
                oClassTimePrj.oModel.HModifyEmp = HMaker;
                oClassTimePrj.oModel.HCheckEmp = list[0].HCheckEmp;
                oClassTimePrj.oModel.HUSEORGID = list[0].HUSEORGID;
                oClassTimePrj.oModel.HCREATEORGID = list[0].HUSEORGID;
                List<Model.ClsGy_WorkType_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_WorkType_Model>>(msg2);
                oBill.oModel.HItemID = list[0].HItemID;
                oBill.oModel.HNumber = list[0].HNumber;
                oBill.oModel.HName = list[0].HName;
                oBill.oModel.HShortNumber = DBUtility.ClsPub.GetShortNumber(list[0].HNumber);
                oBill.oModel.HLevel = DBUtility.ClsPub.GetLevel(list[0].HNumber);
                oBill.oModel.HEndFlag = true;
                oBill.oModel.HStopflag = list[0].HStopflag;
                oBill.oModel.HUseFlag = list[0].HUseFlag;
                oBill.oModel.HRemark = list[0].HRemark;
                oBill.oModel.HMakeEmp = HMaker;
                oBill.oModel.HModifyEmp = HMaker;
                oBill.oModel.HCheckEmp = list[0].HCheckEmp;
                oBill.oModel.HUSEORGID = list[0].HUSEORGID;
                oBill.oModel.HCREATEORGID = list[0].HUSEORGID;
                //
                oClassTimePrj.oModel.HDeptID = list[0].HDeptID;
                oClassTimePrj.oModel.HGroupID = list[0].HGroupID;
                oBill.oModel.HPayMoney = list[0].HPayMoney;
                oBill.oModel.HDayMoney = list[0].HDayMoney;
                oBill.oModel.HForEmp = list[0].HForEmp;

                //检查父级是否存在
                string sParent = DBUtility.ClsPub.GetParentCode(list[0].HNumber);
                if (sParent.Trim() == "")
                {
                    oClassTimePrj.oModel.HParentID = 0;
                    oBill.oModel.HParentID = 0;
                }
                else
                {
                    ds = oCn.RunProcReturn("select * from " + ModRightName + " where HStopflag=0 and HNumber='" + sParent + "' and HItemID<>" + oClassTimePrj.oModel.HItemID, ModRightName);
                    ds = oCn.RunProcReturn("select * from " + ModRightName + " where HStopflag=0 and HNumber='" + sParent + "' and HItemID<>" + oBill.oModel.HItemID, ModRightName);
                    if (ds.Tables[0].Rows.Count > 0)
                    {
                        oClassTimePrj.oModel.HParentID = long.Parse(ds.Tables[0].Rows[0]["HItemID"].ToString());
                        oBill.oModel.HParentID = long.Parse(ds.Tables[0].Rows[0]["HItemID"].ToString());
                    }
                    else
                    {
@@ -407,14 +408,14 @@
                }
                //保存原代码

                DataSet dsOldNumber = oCn.RunProcReturn("select * from " + ModRightName + " where HItemID='" + oClassTimePrj.oModel.HItemID + "'", ModRightName);
                DataSet dsOldNumber = oCn.RunProcReturn("select * from " + ModRightName + " where HItemID='" + oBill.oModel.HItemID + "'", ModRightName);
                if (dsOldNumber.Tables[0].Rows.Count > 0)
                {
                    oClassTimePrj.HOldNumber = DBUtility.ClsPub.isStrNull(dsOldNumber.Tables[0].Rows[0]["HNumber"]);
                    oBill.HOldNumber = DBUtility.ClsPub.isStrNull(dsOldNumber.Tables[0].Rows[0]["HNumber"]);
                    //是否新代码是自己子项目的　子项目
                    if (sParent.Length >= oClassTimePrj.HOldNumber.Length)
                    if (sParent.Length >= oBill.HOldNumber.Length)
                    {
                        if (sParent.Substring(0, oClassTimePrj.HOldNumber.ToString().Length) == oClassTimePrj.HOldNumber.Trim())
                        if (sParent.Substring(0, oBill.HOldNumber.ToString().Length) == oBill.HOldNumber.Trim())
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
@@ -426,12 +427,12 @@
                }
                else
                {
                    oClassTimePrj.HOldNumber = "";
                    oBill.HOldNumber = "";
                }

                //保存前判断
                //审核代码是否合理
                if (!DBUtility.ClsPub.AllowNumber(oClassTimePrj.oModel.HNumber))
                if (!DBUtility.ClsPub.AllowNumber(oBill.oModel.HNumber))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -440,7 +441,7 @@
                    return objJsonResult;
                }
                //是否重复代码
                if (oClassTimePrj.HavSameNumber(oClassTimePrj.oModel.HItemID, oClassTimePrj.oModel.HNumber))
                if (oBill.HavSameNumber(oBill.oModel.HItemID, oBill.oModel.HNumber))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -453,7 +454,7 @@
                if (OperationType == "1")
                {
                    //新增
                    if (oClassTimePrj.AddNew())
                    if (oBill.AddNew())
                    {
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
@@ -472,7 +473,7 @@
                }
                else
                {
                    if(oClassTimePrj.oModel.HCheckEmp!="")
                    if(oBill.oModel.HCheckEmp!="")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
@@ -481,7 +482,7 @@
                        return objJsonResult;
                    }
                    //修改
                    if (oClassTimePrj.ModifyByID(oClassTimePrj.oModel.HItemID))
                    if (oBill.ModifyByID(oBill.oModel.HItemID))
                    {
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
@@ -511,22 +512,22 @@

        #endregion

        #region æ˜¾ç¤ºæ ¸ç®—方式组信息
        #region æ˜¾ç¤ºå·¥ç§ä¿¡æ¯
        /// <summary>
        /// æ ¹æ®åŸºç¡€èµ„æ–™ID æŸ¥æ‰¾è®°å½•
        /// </summary>
        [Route("Gy_ClassTimePrjGroupController/GetGy_ClassTimePrjGroup_Json")]
        [Route("Gy_WorkTypeController/GetGy_WorkType_Json")]
        [HttpGet]
        public object GetGy_ClassTimePrjGroup_Json(Int64 HItemID)
        public object GetGy_WorkType_Json(Int64 HItemID)
        {
            try
            {
                ds = oCn.RunProcReturn("select * from h_v_Gy_ClassTimePrjGroupListDetail where HItemID=" + HItemID, "h_v_Gy_ClassTimePrjGroupListDetail");
                ds = oCn.RunProcReturn("select * from h_v_Gy_WorkTypeListDetail where HItemID=" + HItemID, "h_v_Gy_WorkTypeListDetail");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "未查询到该核算方式组，请刷新数据后重新选择！";
                    objJsonResult.Message = "未查询到该工种，请刷新数据后重新选择！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -543,7 +544,7 @@
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "返回核算方式组信息失败！" + e.ToString();
                objJsonResult.Message = "返回工种信息失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }

 WebAPI/Controllers/¹¤×ʹÜÀí/Gy_ClassTimePrjBillController.cs

File was deleted

 WebAPI/Controllers/ÏîÄ¿¹ÜÀí/±¨±í·ÖÎö/PM_ReportController.cs

@@ -203,17 +203,8 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCn.RunProcReturn("select * from h_v_PM_ProjectBillMYList order by å•æ®å· desc", "h_v_PM_ProjectBillMYList");
                }
                else
                {
                    string sql1 = "select * from h_v_PM_ProjectBillMYList where 1 = 1 ";
                    string sql = sql1 + sWhere + " order by å•æ®å· desc";
                    ds = oCn.RunProcReturn(sql, "h_v_PM_ProjectBillMYList");
                }
                string sql = "exec h_p_My_PM_ProjectReportBill " + user+",0,''";
                ds=oCn.RunProcReturn(sql, "h_p_My_PM_ProjectReportBill");

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
@@ -226,7 +217,7 @@
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "成功！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.data = ds;
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }

 WebAPI/WebAPI.csproj

@@ -342,8 +342,6 @@
    <Compile Include="Controllers\BaseSet\Pay_PeriodInfoSetController.cs" />
    <Compile Include="Controllers\BaseSet\Gy_OrderBackInfoController.cs" />
    <Compile Include="Controllers\BaseSet\Gy_OrderLevController.cs" />
    <Compile Include="Controllers\BaseSet\Gy_WorkTypeController.cs" />
    <Compile Include="Controllers\BaseSet\Gy_WorkPayTypeController.cs" />
    <Compile Include="Controllers\BaseSet\Xt_DataDictionary_ProcController.cs" />
    <Compile Include="Controllers\BaseSet\Xt_DataDictionary_TableController.cs" />
    <Compile Include="Controllers\BaseSet\Gy_ModelTypeController.cs" />
@@ -443,8 +441,6 @@
    <Compile Include="Controllers\SCGL\日计划管理\Sc_WorkDemandPlanBillController.cs" />
    <Compile Include="Controllers\Sc_PckSplitBillController.cs" />
    <Compile Include="Controllers\GZGL\Gy_DuSubsidyItemBillController.cs" />
    <Compile Include="Controllers\GZGL\Gy_WorkPayTypeBillController.cs" />
    <Compile Include="Controllers\GZGL\Gy_WorkTypeBillController.cs" />
    <Compile Include="Controllers\JHGL\Gy_RoutingBillController.cs" />
    <Compile Include="Controllers\Kf_ICStockBillMainController.cs" />
    <Compile Include="Controllers\MateOutController.cs" />
@@ -532,7 +528,9 @@
    <Compile Include="Controllers\基础资料\基础资料\Xt_CheckItemBillController.cs" />
    <Compile Include="Controllers\基础资料\基础资料\Xt_FastICSchemeController.cs" />
    <Compile Include="Controllers\基础资料\工资基础资料\Gy_ProcCommPriceController.cs" />
    <Compile Include="Controllers\工资管理\Gy_ClassTimePrjGroupController.cs" />
    <Compile Include="Controllers\基础资料\工资基础资料\Gy_WorkTypeController.cs" />
    <Compile Include="Controllers\基础资料\工资基础资料\Gy_WorkPayTypeController.cs" />
    <Compile Include="Controllers\基础资料\工资基础资料\Gy_ClassTimePrjGroupController.cs" />
    <Compile Include="Controllers\工资管理\Pay_OutApplyBillController.cs" />
    <Compile Include="Controllers\工资管理\Pay_OverApplyBillController.cs" />
    <Compile Include="Controllers\工资管理\Pay_PayMentBillController.cs" />
@@ -542,7 +540,7 @@
    <Compile Include="Controllers\工资管理\Pay_ProcPriceRequestBillController.cs" />
    <Compile Include="Controllers\工资管理\Pay_MonthlySalaryReportController.cs" />
    <Compile Include="Controllers\工资管理\Pay_PieceRateWageReportController.cs" />
    <Compile Include="Controllers\工资管理\Gy_ClassTimePrjController.cs" />
    <Compile Include="Controllers\基础资料\工资基础资料\Gy_ClassTimePrjController.cs" />
    <Compile Include="Controllers\工资管理\Gy_ClassTimePrjSubController.cs" />
    <Compile Include="Controllers\工资管理\Pay_OtherBalBillController.cs" />
    <Compile Include="Controllers\工资管理\Pay_GroupBalBillController.cs" />