Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

wtt

2025-08-14 9b6cd6ba2508314b3a4967b3764153170d40e66c

 WebAPI/Controllers/ÏîÄ¿¹ÜÀí/¹¤³ÌÏîÄ¿/PM_ProjectBillController.cs

@@ -10,7 +10,7 @@
using System.Web.Http;
using System.Windows.Forms;
using WebAPI.Models;

using SyntacticSugar.constant;
namespace WebAPI.Controllers.项目管理.工程项目
{
    public class PM_ProjectBillController : ApiController
@@ -43,11 +43,14 @@
        public DAL.ClsGy_ProjectMoneyBOMBill BillNew7 = new DAL.ClsGy_ProjectMoneyBOMBill();   //项目费用清单对应单据类
        public DAL.ClsGy_ProjectMoneyBOMBill BillOld7 = new DAL.ClsGy_ProjectMoneyBOMBill();



        #region å·¥ç¨‹é¡¹ç›® æ–°å¢ž/编辑
        #region å·¥ç¨‹é¡¹ç›® è¡¨å¤´æ•°æ®
        public class PM_ProjectBill_Main
        {
            public int HInterID;
            public string HBillSubType;
            public string HBillNo;
            public string HProNumber;
            public string HProName;
@@ -100,6 +103,73 @@
            public string HProjectNote;
            public string HContacts;
            public string HContactNumber;
            public int HDeptID;

            public int HSupplierID;                  //分包单位（gy_supllier）
            public int HMangerEmpID;                 //管理员（gy_Employee）
            public string HMaterPlanDate;               //材料计划 
            public int HWorkerID;                    //施工员（gy_Employee）
            public double HPlanWorkTimes;               //计划工期
            public double HRelWorkTimes;                //实际工期
            public string HTestDate;                    //试压日期
            public int HTestCheckerID;               //试压验收人（gy_Employee）
            public string HTestNote;                    //试压记录（富文本）
            public string HSewageDate;                  //排污日期
            public string HWaterSupplyDate;             //通水日期
            public string HWorkNote;                    //竣工资料（富文本）
            public string HWorkProcNote;                //施工完成情况（富文本）
            public string HProBeginDate;                  //工程开工日期
            public string HProEndDate;             //工程完工日期
            public int HProPMEmpID;                    //工程项目经理
            public string HWorkPicNumber;                //竣工图编号

            public double HYuSuanMoney;                 //预算造价
            public double HHeTongMoney;                 //合同造价
            public double HJieSuanMoney;                //结算造价
            public double HShenJiMoney;                 //审计造价
            public double HCaiLiaoMoney;                //材料费
            public double HAnZhuangMoney;               //安装费
            public double HBanZuMoney;                  //班组工费
            public double HYuShouKuanMoney;             //预收款
            public string HGongFeiMoney;                //工费结账
            public string HJieZhangMoney;            //结算结账

            public int HTaskClassID; //任务大类(Gy_TaskClass)
            public int HTaskClassEntryID; //任务项目分类(Gy_TaskClass)
            public string  HTaskAddress; //任务地点 
            public string  HBreakStatus; //损坏情况 
            public string  HWaterLeakage; //漏水量 
            public string  HPipeDiameter; //管径 
            public string  HPipeMaterial; //管道材质 
            public string  HAlarmEmp; //报漏人 
            public string  HAlarmLink; //报漏人联系电话 
            public string  HReceEmp; //受理人 
            public string  HReceTime; //受理时间（年月日时分秒） 
            public double HTaskMaterMoney; //任务材料费 
            public double HTaskSetupMoney; //任务安装费 
            public double HTaskOtherMoney; //任务附属费 
            public double HTaskExamMoney; //任务考核费 
            public double HTaskWorkMoney; //任务工费 
            public bool  HIsAccount; //是否结账(复选框)
            public string  HAccountDate; //结算结账日期 
            public string  HAccountWorkMoneyDate; //工费结账日期 
            public bool HIsCheckExam; //是否审核考核费(复选框)
            public bool HIsCheckWorkMoney; //是否审核工费(复选框)
            public string  HInfoBackTime; //回复时间（年月日时分秒） 
            public string HInfoBackMan; //回复人 
            public string HInfoNote; //回复内容(富文本） 
            public string  HTaskBTime; //任务开始时间（年月日时分秒） 
            public string  HTaskETime; //任务完工时间（年月日时分秒） 
            public string  HTaskNote; //任务详细内容（富文本） 
            public string  HTaskWorkEmp; //工作人员（富文本） 
            public string  HBeginCloseValveTime; //开始关阀时间（年月日时分秒） 
            public string  HEndCloseValveTime; //结束关阀时间（年月日时分秒）
            public long  HCloseValveQty; //关阀只数
            public string  HBeginOpenValveTime; //开始开阀时间（年月日时分秒） 
            public string  HEndOpenValveTime; //结束开阀时间（年月日时分秒） 
            public long HOpenValveQty; //开阀只数
            public string  HValveWorkEmp; //操作人员
            public string  HTaskRemark; //任务备注（富文本）

        }
        #endregion
@@ -215,7 +285,7 @@
                int HYear = int.Parse(mainList[0].HDate.Split('-')[0]);
                int HPeriod = int.Parse(mainList[0].HDate.Split('-')[1]);
                string HBillType = "4750";
                string HBillSubType = "";
                string HBillSubType = mainList[0].HBillSubType;
                int HInterID = mainList[0].HInterID;
                string HDate = mainList[0].HDate;
                string HBillNo = mainList[0].HBillNo;
@@ -254,6 +324,74 @@
                string HProjectNote = mainList[0].HProjectNote;
                string HContacts = mainList[0].HContacts;
                string HContactNumber = mainList[0].HContactNumber;
                int HDeptID = mainList[0].HDeptID;  //部门

                int HSupplierID = mainList[0].HSupplierID;                      //分包单位（gy_supllier）
                int HMangerEmpID = mainList[0].HMangerEmpID;                    //管理员（gy_Employee）
                string HMaterPlanDate = mainList[0].HMaterPlanDate;             //材料计划 
                int HWorkerID = mainList[0].HWorkerID;                          //施工员（gy_Employee）
                double HPlanWorkTimes = mainList[0].HPlanWorkTimes;             //计划工期
                double HRelWorkTimes = mainList[0].HRelWorkTimes;               //实际工期
                string HTestDate = mainList[0].HTestDate;                       //试压日期
                int HTestCheckerID = mainList[0].HTestCheckerID;                //试压验收人（gy_Employee）
                string HTestNote = mainList[0].HTestNote;                       //试压记录（富文本）
                string HSewageDate = mainList[0].HSewageDate;                   //排污日期
                string HWaterSupplyDate = mainList[0].HWaterSupplyDate;         //通水日期
                string HWorkNote = mainList[0].HWorkNote;                       //竣工资料（富文本）
                string HWorkProcNote = mainList[0].HWorkProcNote;               //施工完成情况（富文本）
                int HProPMEmpID = mainList[0].HProPMEmpID;                      //项目经理
                string HWorkPicNumber = mainList[0].HWorkPicNumber;             //竣工图编号
                string HProBeginDate = mainList[0].HProBeginDate;               //项目开工日期
                string HProEndDate = mainList[0].HProEndDate;                   //项目完工日期        
                double HYuSuanMoney = mainList[0].HYuSuanMoney;                 //预算造价
                double HHeTongMoney = mainList[0].HHeTongMoney;                 //合同造价
                double HJieSuanMoney = mainList[0].HJieSuanMoney;               //结算造价
                double HShenJiMoney = mainList[0].HShenJiMoney;                 //审计造价
                double HCaiLiaoMoney = mainList[0].HCaiLiaoMoney;               //材料费
                double HAnZhuangMoney = mainList[0].HAnZhuangMoney;             //安装费
                double HBanZuMoney = mainList[0].HBanZuMoney;                   //班组工费
                double HYuShouKuanMoney = mainList[0].HYuShouKuanMoney;         //预收款
                string HGongFeiMoney = mainList[0].HGongFeiMoney;               //工费结账
                string HJieZhangMoney = mainList[0].HJieZhangMoney;            //结算结账

                int HTaskClassID = mainList[0].HTaskClassID; //任务大类(Gy_TaskClass)
                int HTaskClassEntryID = mainList[0].HTaskClassEntryID; //任务项目分类(Gy_TaskClass)
                string HTaskAddress = mainList[0].HTaskAddress; //任务地点 
                string HBreakStatus = mainList[0].HBreakStatus; //损坏情况 
                string HWaterLeakage = mainList[0].HWaterLeakage; //漏水量 
                string HPipeDiameter = mainList[0].HPipeDiameter; //管径 
                string HPipeMaterial = mainList[0].HPipeMaterial; //管道材质 
                string HAlarmEmp = mainList[0].HAlarmEmp; //报漏人 
                string HAlarmLink = mainList[0].HAlarmLink; //报漏人联系电话 
                string HReceEmp = mainList[0].HReceEmp; //受理人 
                string HReceTime = mainList[0].HReceTime; //受理时间（年月日时分秒） 
                double HTaskMaterMoney = mainList[0].HTaskMaterMoney; //任务材料费 
                double HTaskSetupMoney = mainList[0].HTaskSetupMoney; //任务安装费 
                double HTaskOtherMoney = mainList[0].HTaskOtherMoney; //任务附属费 
                double HTaskExamMoney = mainList[0].HTaskExamMoney; //任务考核费 
                double HTaskWorkMoney = mainList[0].HTaskWorkMoney; //任务工费 
                bool HIsAccount = mainList[0].HIsAccount; //是否结账(复选框)
                string HAccountDate = mainList[0].HAccountDate; //结算结账日期 
                string HAccountWorkMoneyDate = mainList[0].HAccountWorkMoneyDate; //工费结账日期 
                bool HIsCheckExam = mainList[0].HIsCheckExam; //是否审核考核费(复选框)
                bool HIsCheckWorkMoney = mainList[0].HIsCheckWorkMoney; //是否审核工费(复选框)
                string HInfoBackTime = mainList[0].HInfoBackTime; //回复时间（年月日时分秒） 
                string HInfoBackMan = mainList[0].HInfoBackMan; //回复人 
                string HInfoNote = mainList[0].HInfoNote; //回复内容(富文本） 
                string HTaskBTime = mainList[0].HTaskBTime; //任务开始时间（年月日时分秒） 
                string HTaskETime = mainList[0].HTaskETime; //任务完工时间（年月日时分秒） 
                string HTaskNote = mainList[0].HTaskNote; //任务详细内容（富文本） 
                string HTaskWorkEmp = mainList[0].HTaskWorkEmp; //工作人员（富文本） 
                string HBeginCloseValveTime = mainList[0].HBeginCloseValveTime; //开始关阀时间（年月日时分秒） 
                string HEndCloseValveTime = mainList[0].HEndCloseValveTime; //结束关阀时间（年月日时分秒）
                long HCloseValveQty = mainList[0].HCloseValveQty; //关阀只数
                string HBeginOpenValveTime = mainList[0].HBeginOpenValveTime; //开始开阀时间（年月日时分秒） 
                string HEndOpenValveTime = mainList[0].HEndOpenValveTime; //结束开阀时间（年月日时分秒） 
                long HOpenValveQty = mainList[0].HOpenValveQty; //开阀只数
                string HValveWorkEmp = mainList[0].HValveWorkEmp; //操作人员
                string HTaskRemark = mainList[0].HTaskRemark; //任务备注（富文本）


                if (OperationType == 2)
                {
                    ds = oCN.RunProcReturn("select * from PM_ProjectBillMain where HBillNo ='" + HBillNo + "'", "PM_ProjectBillMain");
@@ -273,7 +411,9 @@
                {
                    string sql = "insert into PM_ProjectBillMain" +
                        "(HYear,HPeriod,HBillType,HBillSubType,HInterID,HDate,HBillNo,HBillStatus,HRemark,HMaker,HMakeDate,HProNumber,HProName,HCusID,HBeginDate,HEndDate,HSumMoney," +
                        "HProMoney,HWorkMoney,HOtherMoney,HProType,HPMEmpID,HWorkEmpID,HDepEmpID,HConWorkDays,HDepDays,HLastMoney,HPayCusID,HOrgID,HMaterID,HProjectClassID,HBuildComp,HBuildAddress,HWorkNo,HReDate,HPicNo,HWorkTask,HProjectNote,HContacts,HContactNumber) " +
                        "HProMoney,HWorkMoney,HOtherMoney,HProType,HPMEmpID,HWorkEmpID,HDepEmpID,HConWorkDays,HDepDays,HLastMoney,HPayCusID,HOrgID,HMaterID,HProjectClassID,HBuildComp,HBuildAddress,HWorkNo,HReDate,HPicNo,HWorkTask,HProjectNote,HContacts,HContactNumber" +
                        ",HSupplierID,HMangerEmpID,HMaterPlanDate,HWorkerID,HPlanWorkTimes,HRelWorkTimes,HTestDate,HTestCheckerID,HTestNote,HSewageDate,HWaterSupplyDate,HWorkNote,HWorkProcNote,HYuSuanMoney,HHeTongMoney,HJieSuanMoney,HShenJiMoney,HCaiLiaoMoney,HAnZhuangMoney,HBanZuMoney,HYuShouKuanMoney,HGongFeiMoney,HJieZhangMoney," +
                        "HTaskClassID,HTaskClassEntryID,HTaskAddress,HBreakStatus,HWaterLeakage,HPipeDiameter,HPipeMaterial,HAlarmEmp,HAlarmLink,HReceEmp,HReceTime,HTaskMaterMoney,HTaskSetupMoney,HTaskOtherMoney,HTaskExamMoney,HTaskWorkMoney,HIsAccount,HAccountDate,HAccountWorkMoneyDate,HIsCheckExam,HIsCheckWorkMoney,HInfoBackTime,HInfoBackMan,HInfoNote,HTaskBTime,HTaskETime,HTaskNote,HTaskWorkEmp,HBeginCloseValveTime,HEndCloseValveTime,HCloseValveQty,HBeginOpenValveTime,HEndOpenValveTime,HOpenValveQty,HValveWorkEmp,HTaskRemark,HDeptID,HProPMEmpID,HWorkPicNumber,HProBeginDate,HProEndDate)" +
                        "values(" +
                        "" + HYear +
                        "," + HPeriod +
@@ -315,7 +455,36 @@
                        "','" + HProjectNote +
                        "','" + HContacts +
                        "','" + HContactNumber +
                        "')";
                        "','" + HSupplierID + "'" + 
                        ",'" + HMangerEmpID + "'" + 
                        ",'" + HMaterPlanDate + "'" + 
                        ",'" + HWorkerID + "'" + 
                        ",'" + HPlanWorkTimes + "'" + 
                        ",'" + HRelWorkTimes + "'" + 
                        ",'" + HTestDate + "'" + 
                        ",'" + HTestCheckerID + "'" + 
                        ",'" + HTestNote + "'" + 
                        ",'" + HSewageDate + "'" + 
                        ",'" + HWaterSupplyDate + "'" + 
                        ",'" + HWorkNote + "'" + 
                        ",'" + HWorkProcNote + "'" + 
                        ",'" + HYuSuanMoney + "'" + 
                        ",'" + HHeTongMoney + "'" + 
                        ",'" + HJieSuanMoney + "'" + 
                        ",'" + HShenJiMoney + "'" + 
                        ",'" + HCaiLiaoMoney + "'" + 
                        ",'" + HAnZhuangMoney + "'" + 
                        ",'" + HBanZuMoney + "'" + 
                        ",'" + HYuShouKuanMoney + "'" + 
                        ",'" + HGongFeiMoney + "'" + 
                        ",'" + HJieZhangMoney + "'" +
                        ",'" + HTaskClassID + "'" + ",'" + HTaskClassEntryID + "'" + ",'" + HTaskAddress + "'" + ",'" + HBreakStatus + "'" + ",'" + HWaterLeakage + "'" + ",'" + HPipeDiameter + "'" + ",'" + HPipeMaterial + "'" + 
                        ",'" + HAlarmEmp + "'" +",'" + HAlarmLink + "'" + ",'" + HReceEmp + "'" + ",'" + HReceTime + "'" + ",'" + HTaskMaterMoney + "'" + ",'" + HTaskSetupMoney + "'" + ",'" + HTaskOtherMoney + "'" +
                        ",'" + HTaskExamMoney + "'" + ",'" + HTaskWorkMoney + "'" + ",'" + (HIsAccount?1:0) + "'" + ",'" + HAccountDate + "'" + ",'" + HAccountWorkMoneyDate + "'" + ",'" + (HIsCheckExam ? 1 : 0) + "'" +
                        ",'" + (HIsCheckWorkMoney ? 1 : 0) + "'" + ",'" + HInfoBackTime + "'" + ",'" + HInfoBackMan + "'" + ",'" + HInfoNote + "'" + ",'" + HTaskBTime + "'" +
                        ",'" + HTaskETime + "'" + ",'" + HTaskNote + "'" + ",'" + HTaskWorkEmp + "'" + ",'" + HBeginCloseValveTime + "'" + ",'" + HEndCloseValveTime + "'" +
                        ",'" + HCloseValveQty + "'" + ",'" + HBeginOpenValveTime + "'" + ",'" + HEndOpenValveTime + "'" + ",'" + HOpenValveQty + "'" + ",'" + HValveWorkEmp + "'" + ",'" + HTaskRemark + "','" + HDeptID + "','" + HProPMEmpID + "','" + HWorkPicNumber + "','" + HProBeginDate + "','" + HProEndDate + "'"+
                        ")";

                    //主表
                    oCN.RunProc(sql);
@@ -325,14 +494,14 @@
                else if (OperationType == 3 || ds.Tables[0].Rows.Count != 0)                    //编辑
                {
                    string sql = "update PM_ProjectBillMain set " +
                        "HYear = " + HYear +
                        ",HPeriod = " + HPeriod +
                        ",HBillType = '" + HBillType +
                        "',HBillSubType = '" + HBillSubType +
                        "',HDate = '" + HDate +
                        "',HBillNo = '" + HBillNo +
                        "',HBillStatus = " + HBillStatus +
                        ",HRemark = '" + HRemark +
                        //"HYear = " + HYear +
                        //",HPeriod = " + HPeriod +
                        //",HBillType = '" + HBillType +
                        //"',HBillSubType = '" + HBillSubType +
                        //"',HDate = '" + HDate +
                        "HBillNo = '" + HBillNo +
                        //"',HBillStatus = " + HBillStatus +
                        "',HRemark = '" + HRemark +
                        "',HUpdater = '" + HUpdater +
                        "',HUpdateDate = '" + HUpdaterDate +
                        "',HProNumber = '" + HProNumber +
@@ -364,8 +533,38 @@
                        "',HProjectNote ='" + HProjectNote +
                        "',HContacts ='" + HContacts +
                        "',HContactNumber ='" + HContactNumber +
                        "' where HInterID = " + HInterID;

                        "',HSupplierID = '" + HSupplierID +
                        "',HMangerEmpID = '" + HMangerEmpID +
                        "',HMaterPlanDate = '" + HMaterPlanDate +
                        "',HWorkerID = '" + HWorkerID +
                        "',HPlanWorkTimes = '" + HPlanWorkTimes +
                        "',HRelWorkTimes = '" + HRelWorkTimes +
                        "',HTestDate = '" + HTestDate +
                        "',HTestCheckerID = '" + HTestCheckerID +
                        "',HTestNote = '" + HTestNote +
                        "',HSewageDate = '" + HSewageDate +
                        "',HWaterSupplyDate = '" + HWaterSupplyDate +
                        "',HWorkNote = '" + HWorkNote +
                        "',HWorkProcNote = '" + HWorkProcNote +
                        "',HYuSuanMoney = '" + HYuSuanMoney +
                        "',HHeTongMoney = '" + HHeTongMoney +
                        "',HJieSuanMoney = '" + HJieSuanMoney +
                        "',HShenJiMoney = '" + HShenJiMoney +
                        "',HCaiLiaoMoney = '" + HCaiLiaoMoney +
                        "',HAnZhuangMoney = '" + HAnZhuangMoney +
                        "',HBanZuMoney = '" + HBanZuMoney +
                        "',HYuShouKuanMoney = '" + HYuShouKuanMoney +
                        "',HGongFeiMoney = '" + HGongFeiMoney +
                        "',HJieZhangMoney = '" + HJieZhangMoney +
                        "',HTaskClassID = '" + HTaskClassID + "',HTaskClassEntryID = '" + HTaskClassEntryID + "',HTaskAddress = '" + HTaskAddress + "',HBreakStatus = '" + HBreakStatus + "',HWaterLeakage = '" + HWaterLeakage + "',HPipeDiameter = '" + HPipeDiameter +
                        "',HPipeMaterial = '" + HPipeMaterial + "',HAlarmEmp = '" + HAlarmEmp + "',HAlarmLink = '" + HAlarmLink + "',HReceEmp = '" + HReceEmp + "',HReceTime = '" + HReceTime + "',HTaskMaterMoney = '" + HTaskMaterMoney +
                        "',HTaskSetupMoney = '" + HTaskSetupMoney + "',HTaskOtherMoney = '" + HTaskOtherMoney + "',HTaskExamMoney = '" + HTaskExamMoney + "',HTaskWorkMoney = '" + HTaskWorkMoney + "',HIsAccount = '" + (HIsAccount?1:0) + "',HAccountDate = '" + HAccountDate +
                        "',HAccountWorkMoneyDate = '" + HAccountWorkMoneyDate + "',HIsCheckExam = '" + (HIsCheckExam?1:0) + "',HIsCheckWorkMoney = '" + (HIsCheckWorkMoney?1:0) + "',HInfoBackTime = '" + HInfoBackTime + "',HInfoBackMan = '" + HInfoBackMan + "',HInfoNote = '" + HInfoNote +
                        "',HTaskBTime = '" + HTaskBTime + "',HTaskETime = '" + HTaskETime + "',HTaskNote = '" + HTaskNote + "',HTaskWorkEmp = '" + HTaskWorkEmp + "',HBeginCloseValveTime = '" + HBeginCloseValveTime + "',HEndCloseValveTime = '" + HEndCloseValveTime +
                        "',HCloseValveQty = '" + HCloseValveQty + "',HBeginOpenValveTime = '" + HBeginOpenValveTime + "',HEndOpenValveTime = '" + HEndOpenValveTime + "',HOpenValveQty = '" + HOpenValveQty + "',HValveWorkEmp = '" + HValveWorkEmp + "',HTaskRemark = '" + HTaskRemark + "',HDeptID = '" + HDeptID + "'" +
                         ",HProBeginDate = '" + HProBeginDate + "',HProEndDate = '" + HProEndDate + "',HProPMEmpID = '" + HProPMEmpID + "',HWorkPicNumber = '" + HWorkPicNumber +
                        "' where HInterID = " + HInterID;
                    oCN.RunProc(sql);

                    //删除子表
@@ -537,6 +736,100 @@
                    string sql = sql1 + sWhere + " order by å•æ®å· desc";
                    ds = oCN.RunProcReturn(sql, "h_v_PM_ProjectBillList");
                }

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region å·¥ç¨‹é¡¹ç›®åˆ†é¡µåˆ—表
        [Route("PM_ProjectBill/page")]
        [HttpGet]
        public object PM_ProjectBillPage(string sWhere, string user, int page, int size)
        {
            DataSet ds;
            try
            {
                List<object> columnNameList = new List<object>();
                //判断权限
                //if (!DBUtility.ClsPub.Security_Log("Cg_POInStockBillQuery", 1, false, user))
                //{
                //    objJsonResult.code = CodeConstant.FAIL;
                //    objJsonResult.count = CountConstant.FAIL;
                //    objJsonResult.Message = "您没有该模块权限,请与管理员联系！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}

                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("exec h_p_PM_ProjectBillList " + page + "," + size + ",''", "h_p_PM_ProjectBillList");
                }
                else
                {
                    sWhere = sWhere.Replace("'", "''");
                    ds = oCN.RunProcReturn("exec h_p_PM_ProjectBillList " + page + "," + size + ",'" + sWhere + "'", "h_p_PM_ProjectBillList");
                }

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                objJsonResult.code = CodeConstant.SUCCEED;
                objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
                objJsonResult.Message = "Sucess！";
                objJsonResult.list = columnNameList;
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = CodeConstant.FAIL;
                objJsonResult.count = CountConstant.FAIL;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region (任务类）的工程项目新增 æ ¹æ®ä»»åŠ¡å¤§ç±» ä»»åŠ¡é¡¹ç›®åˆ†ç±» æ—¥æœŸ æ›´æ–° é¡¹ç›®ä»£ç 
        [Route("PM_ProjectBill/GetHProjectHNumber")]
        [HttpGet]
        public object GetHProjectHNumber( int HDeptID, DateTime HDate,int HTaskClassID,int HTaskClassEntryID,int HType)
        {
            DataSet ds;
            try
            {
                List<object> columnNameList = new List<object>();


                ds = oCN.RunProcReturn("exec h_p_Xt_GetMaxBillNo_SubType '4750','" + HDate + "','" + HTaskClassID + "','" + HTaskClassEntryID + "','" + HDeptID + "',"+HType, "h_p_Xt_GetMaxBillNo_SubType");

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
@@ -1256,6 +1549,44 @@
                return objJsonResult;
            }
        }
        #endregion

        #region å·¥ç¨‹é¡¹ç›®  ä»»åŠ¡å®‰è£…è´¹ ã€ä»»åŠ¡è€ƒæ ¸è´¹ã€ä»»åŠ¡é™„属费、任务工费  é€‰æ‹©é¡¹ç›®è´¹ç”¨åˆ†ç±»è¿”回 å¯¹åº”分类的项目费用
        [Route("PM_ProjectBill/getGy_Project")]
        [HttpGet]
        public object getGy_Project(string HItemID)
        {
            try
            {
    
                ds = oCN.RunProcReturn("select top 1 * from Gy_ProjectMoney where HProjectMoneyClassID='"+HItemID+ "' and isnull(HCheckEmp,'') !='' and HStopflag=0 order by HItemID desc", "Gy_ProjectMoney");

                if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "该项目费用分类下的项目费用无数据";
                    objJsonResult.data = null;                 
                    return objJsonResult;
                }


                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        #endregion

        #region æœˆåº¦é˜¶æ®µè®¡åˆ’保存/编辑
@@ -5424,5 +5755,386 @@
        }
        #endregion
        #endregion


        #region é¡¹ç›®è´¹ç”¨å¾…审核列表
        #region å·¥ç¨‹é¡¹ç›®è´¹ç”¨å¾…审核列表
        [Route("PM_ProjectBill/NeedCheckQuery")]
        [HttpGet]
        public object PM_ProjectBillNeedCheckQuery(string user,string sWhere)
        {
            DataSet ds;
            try
            {
                List<object> columnNameList = new List<object>();
                //判断权限
                //if (!DBUtility.ClsPub.Security_Log("Cg_POInStockBillQuery", 1, false, user))
                //{
                //    objJsonResult.code = CodeConstant.FAIL;
                //    objJsonResult.count = CountConstant.FAIL;
                //    objJsonResult.Message = "您没有该模块权限,请与管理员联系！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                //sWhere = sWhere.Replace("'", "''");
                ds = oCN.RunProcReturn("exec h_p_PM_ProjectBillNeedCheckQuery " + sWhere, "h_p_PM_ProjectBillNeedCheckQuery");

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                objJsonResult.code = CodeConstant.SUCCEED;
                objJsonResult.count = CountConstant.SUCCEED;
                objJsonResult.Message = "Sucess！";
                objJsonResult.list = columnNameList;
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = CodeConstant.FAIL;
                objJsonResult.count = CountConstant.FAIL;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region å·¥ç¨‹é¡¹ç›®è´¹ç”¨ å®¡æ ¸/反审核
        
        [Route("PM_ProjectBill/AuditTaskMoney")]
        [HttpGet]
        public object AuditTaskMoney(string HInterID, string Type, string user)
        {
            try
            {
                //判断是否有审核权限
                if (!DBUtility.ClsPub.Security_Log("Pm_ProjectBill_Check", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无权限审核!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (string.IsNullOrWhiteSpace(HInterID))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "HInterID为空！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                ClsPub.CurUserName = user;
                BillOld.MvarItemKey = "PM_ProjectBillMain";
                oCN.BeginTran();//开始事务
                DataSet ds;
                string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
                ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "单据不存在！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //Type ä»»åŠ¡å®‰è£…费审核标记
                if (Type == "SetupMoneyCheck")
                {
                    if (ds.Tables[0].Rows[0]["HTaskSetupMoneyCheckFlag"].ToString() == "False")
                    {
                        oCN.RunProcReturn("update PM_ProjectBillMain set HTaskSetupMoneyCheckFlag = 1 where HInterID = " + HInterID, "PM_ProjectBillMain");
                    }
                    else
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "费用已审核！";
                        objJsonResult.data = null;
                        return objJsonResult; ;
                    }
                }
                //任务附属审核
                else if (Type == "OtherMoneyCheck")
                {
                    if (ds.Tables[0].Rows[0]["HTaskOtherMoneyCheckFlag"].ToString() == "False")
                    {
                        oCN.RunProcReturn("update PM_ProjectBillMain set HTaskOtherMoneyCheckFlag = 1 where HInterID = " + HInterID, "PM_ProjectBillMain");
                    }
                    else
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "费用已审核！";
                        objJsonResult.data = null;
                        return objJsonResult; ;
                    }
                }
                //任务考核费审核
                else if (Type == "ExamMoneyCheck")
                {
                    if (ds.Tables[0].Rows[0]["HTaskExamMoneyCheckFlag"].ToString() == "False")
                    {
                        oCN.RunProcReturn("update PM_ProjectBillMain set HTaskExamMoneyCheckFlag = 1 where HInterID = " + HInterID, "PM_ProjectBillMain");
                    }
                    else
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "费用已审核！";
                        objJsonResult.data = null;
                        return objJsonResult; ;
                    }
                }
                //任务工费审核标记
                else if (Type == "WorkMoneyCheck")
                {
                    if (ds.Tables[0].Rows[0]["HTaskWorkMoneyCheckFlag"].ToString() == "False")
                    {
                        oCN.RunProcReturn("update PM_ProjectBillMain set HTaskWorkMoneyCheckFlag = 1 where HInterID = " + HInterID, "PM_ProjectBillMain");
                    }
                    else
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "费用已审核！";
                        objJsonResult.data = null;
                        return objJsonResult; ;
                    }
                }
                //反审核费用
                else if (Type == "UnCheck")
                {
                    
                    oCN.RunProcReturn("update PM_ProjectBillMain set HTaskWorkMoneyCheckFlag = 0,HTaskExamMoneyCheckFlag = 0,HTaskOtherMoneyCheckFlag = 0,HTaskSetupMoneyCheckFlag = 0 where HInterID = " + HInterID, "PM_ProjectBillMain");
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "审核类型不存在！";
                    objJsonResult.data = null;
                    return objJsonResult; ;
                }

                oCN.Commit();//提交事务

                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "执行成功！";
                objJsonResult.data = null;
                return objJsonResult; ;

            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "执行失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #endregion

        #region é¡¹ç›®è´¹ç”¨å¾…保存列表
        #region å·¥ç¨‹é¡¹ç›®è´¹ç”¨å¾…保存列表
        [Route("PM_ProjectBill/NeedSaveQuery")]
        [HttpGet]
        public object PM_ProjectBillNeedSaveQuery(string user,string sWhere)
        {
            DataSet ds;
            try
            {
                List<object> columnNameList = new List<object>();
                //判断权限
                //if (!DBUtility.ClsPub.Security_Log("Cg_POInStockBillQuery", 1, false, user))
                //{
                //    objJsonResult.code = CodeConstant.FAIL;
                //    objJsonResult.count = CountConstant.FAIL;
                //    objJsonResult.Message = "您没有该模块权限,请与管理员联系！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                //sWhere = sWhere.Replace("'", "''");
                ds = oCN.RunProcReturn("exec h_p_PM_ProjectBillNeedSaveQuery "+sWhere, "h_p_PM_ProjectBillNeedSaveQuery");

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                objJsonResult.code = CodeConstant.SUCCEED;
                objJsonResult.count = CountConstant.SUCCEED;
                objJsonResult.Message = "Sucess！";
                objJsonResult.list = columnNameList;
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = CodeConstant.FAIL;
                objJsonResult.count = CountConstant.FAIL;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region å·¥ç¨‹é¡¹ç›®è´¹ç”¨ ä¿å­˜åä¿å­˜

        [Route("PM_ProjectBill/SaveTaskMoney")]
        [HttpGet]
        public object SaveTaskMoney(string HInterID, string Type, string user,int HMoney)
        {
            try
            {
                //判断是否有审核权限
                if (!DBUtility.ClsPub.Security_Log("Pm_ProjectBill_edit", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无权限审核!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (string.IsNullOrWhiteSpace(HInterID))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "HInterID为空！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                ClsPub.CurUserName = user;
                BillOld.MvarItemKey = "PM_ProjectBillMain";
                oCN.BeginTran();//开始事务
                DataSet ds;
                string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
                ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "单据不存在！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //Type ä»»åŠ¡å®‰è£…费保存标记
                if (Type == "SetupMoneySave")
                {
                    if (ds.Tables[0].Rows[0]["HTaskSetupMoneySaveFlag"].ToString() == "False")
                    {
                        oCN.RunProcReturn("update PM_ProjectBillMain set HTaskSetupMoneySaveFlag = 1,HTaskSetupMoney="+HMoney+" where HInterID = " + HInterID, "PM_ProjectBillMain");
                    }
                    else
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "费用已保存！";
                        objJsonResult.data = null;
                        return objJsonResult; ;
                    }
                }
                //任务附属保存
                else if (Type == "OtherMoneySave")
                {
                    if (ds.Tables[0].Rows[0]["HTaskOtherMoneySaveFlag"].ToString() == "False")
                    {
                        oCN.RunProcReturn("update PM_ProjectBillMain set HTaskOtherMoneySaveFlag = 1,HTaskOtherMoney=" + HMoney + " where HInterID = " + HInterID, "PM_ProjectBillMain");
                    }
                    else
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "费用已保存！";
                        objJsonResult.data = null;
                        return objJsonResult; ;
                    }
                }
                //任务考核费保存
                else if (Type == "ExamMoneySave")
                {
                    if (ds.Tables[0].Rows[0]["HTaskExamMoneySaveFlag"].ToString() == "False")
                    {
                        oCN.RunProcReturn("update PM_ProjectBillMain set HTaskExamMoneySaveFlag = 1,HTaskExamMoney=" + HMoney + "  where HInterID = " + HInterID, "PM_ProjectBillMain");
                    }
                    else
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "费用已保存！";
                        objJsonResult.data = null;
                        return objJsonResult; ;
                    }
                }
                //任务工费保存标记
                else if (Type == "WorkMoneySave")
                {
                    if (ds.Tables[0].Rows[0]["HTaskWorkMoneySaveFlag"].ToString() == "False")
                    {
                        oCN.RunProcReturn("update PM_ProjectBillMain set HTaskWorkMoneySaveFlag = 1,HTaskWorkMoney=" + HMoney + " where HInterID = " + HInterID, "PM_ProjectBillMain");
                    }
                    else
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "费用已保存！";
                        objJsonResult.data = null;
                        return objJsonResult; ;
                    }
                }
                //反保存费用
                else if (Type == "UnSave")
                {

                    oCN.RunProcReturn("update PM_ProjectBillMain set HTaskWorkMoneySaveFlag = 0,HTaskExamMoneySaveFlag = 0,HTaskOtherMoneySaveFlag = 0,HTaskSetupMoneySaveFlag = 0 where HInterID = " + HInterID, "PM_ProjectBillMain");
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "审核类型不存在！";
                    objJsonResult.data = null;
                    return objJsonResult; ;
                }

                oCN.Commit();//提交事务

                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "执行成功！";
                objJsonResult.data = null;
                return objJsonResult; ;

            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "执行失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #endregion
    }
}