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

wtt

2024-11-13 175b53e6f0adb40a0d861981f56f120615d55897

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

@@ -101,6 +101,31 @@
            public string HContacts;
            public string HContactNumber;

            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 double HYuSuanMoney;                 //预算造价
            public double HHeTongMoney;                 //合同造价
            public double HJieSuanMoney;                //结算造价
            public double HShenJiMoney;                 //审计造价
            public double HCaiLiaoMoney;                //材料费
            public double HAnZhuangMoney;               //安装费
            public double HBanZuMoney;                  //班组工费
            public double HYuShouKuanMoney;             //预收款
            public double HGongFeiMoney;                //工费结账
            public double HJieZhangMoney;            //结算结账

        }
        #endregion
        #region å·¥ç¨‹é¡¹ç›® é¡¹ç›®é˜¶æ®µè¡¨ä½“数据
@@ -254,6 +279,34 @@
                string HProjectNote = mainList[0].HProjectNote;
                string HContacts = mainList[0].HContacts;
                string HContactNumber = mainList[0].HContactNumber;


                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;               //施工完成情况（富文本）

                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;         //预收款
                double HGongFeiMoney = mainList[0].HGongFeiMoney;               //工费结账
                double HJieZhangMoney = mainList[0].HJieZhangMoney;            //结算结账


                if (OperationType == 2)
                {
                    ds = oCN.RunProcReturn("select * from PM_ProjectBillMain where HBillNo ='" + HBillNo + "'", "PM_ProjectBillMain");
@@ -273,7 +326,8 @@
                {
                    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) " +
                        "values(" +
                        "" + HYear +
                        "," + HPeriod +
@@ -315,7 +369,30 @@
                        "','" + 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 + "'" +
                        ")";

                    //主表
                    oCN.RunProc(sql);
@@ -364,6 +441,32 @@
                        "',HProjectNote ='" + HProjectNote +
                        "',HContacts ='" + HContacts +
                        "',HContactNumber ='" + HContactNumber +

                        "',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 +


                        "' where HInterID = " + HInterID;

                    oCN.RunProc(sql);