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

yusijie

2024-04-24 85d25ecc7b0c82879da899106f203be503e80210

 WebAPI/Controllers/项目管理/工程项目/PM_ProjectBillController.cs

@@ -81,6 +81,14 @@
            public int HConWorkDays;
            public int HDepDays;
            public double HLastMoney;
            public int HProjectClassID;
            public string HBuildComp;
            public string HBuildAddress;
            public string HWorkNo;
            public string HReDate;
            public string HPicNo;
            public string HWorkTask;
            public string HProjectNote;

        }
        #endregion
@@ -225,7 +233,14 @@
                int HMaterID = mainList[0].HMaterID;
                string HUpdater = mainList[0].HUpdater;
                string HUpdaterDate = mainList[0].HUpdaterDate;

                int HProjectClassID = mainList[0].HProjectClassID;
                string HBuildComp = mainList[0].HBuildComp;
                string HBuildAddress = mainList[0].HBuildAddress;
                string HWorkNo = mainList[0].HWorkNo;
                string HReDate = mainList[0].HReDate;
                string HPicNo = mainList[0].HPicNo;
                string HWorkTask = mainList[0].HWorkTask;
                string HProjectNote = mainList[0].HProjectNote;
                if (OperationType == 2)
                {
                    ds = oCN.RunProcReturn("select * from PM_ProjectBillMain where HBillNo ='" + HBillNo + "'", "PM_ProjectBillMain");
@@ -245,7 +260,7 @@
                {
                    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) " +
                        "HProMoney,HWorkMoney,HOtherMoney,HProType,HPMEmpID,HWorkEmpID,HDepEmpID,HConWorkDays,HDepDays,HLastMoney,HPayCusID,HOrgID,HMaterID,HProjectClassID,HBuildComp,HBuildAddress,HWorkNo,HReDate,HPicNo,HWorkTask,HProjectNote) " +
                        "values(" +
                        "" + HYear +
                        "," + HPeriod +
@@ -277,7 +292,15 @@
                        "," + HPayCusID +
                        "," + HOrgID +
                        "," + HMaterID +
                        ")";
                        "," + HProjectClassID +
                        ",'" + HBuildComp +
                        "','" + HBuildAddress +
                        "','" + HWorkNo +
                        "','" + HReDate +
                        "','" + HPicNo +
                        "','" + HWorkTask +
                        "','" + HProjectNote +
                        "')";

                    //涓昏〃
                    oCN.RunProc(sql);
@@ -316,7 +339,15 @@
                        ",HPayCusID = " + HPayCusID +
                        ",HOrgID = " + HOrgID +
                        ",HMaterID = " + HMaterID +
                        " where HInterID = " + HInterID;
                        ",HProjectClassID = " + HProjectClassID +
                        ",HBuildComp = '" + HBuildComp +
                        "',HBuildAddress = '" + HBuildAddress +
                        "',HWorkNo = '" + HWorkNo +
                        "',HReDate = '" + HReDate +
                        "',HPicNo = '" + HPicNo +
                        "',HWorkTask = '" + HWorkTask +
                        "',HProjectNote ='" + HProjectNote +
                        "' where HInterID = " + HInterID;

                    oCN.RunProc(sql);