1

duhe

2023-07-11 560cbe48b5c63634ff351477e00c885c4e162f92

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

@@ -81,7 +81,7 @@
            public string HStageNote;
            public int HPMGoodsID;
            public string HPMGoodsName;
            public int HIsKey;
            public bool HIsKey;
            public double HRate;
            public int HEmpID;
            public string HEmpName;
@@ -98,7 +98,7 @@
            public int RowID;
            public int HEmployeeID;
            public string HEmployeeName;
            public int HIsPM;
            public bool HIsPM;
            public double HRate;
            public double HPlanAvgMoney;
            public double HPlanCountMoney;
@@ -211,6 +211,8 @@
                int HPayCusID = mainList[0].HPayCusID;
                int HOrgID = mainList[0].HOrgID;
                int HMaterID = mainList[0].HMaterID;
                string HUpdater = mainList[0].HUpdater;
                string HUpdaterDate = mainList[0].HUpdaterDate;

                if (OperationType == 2)
                {
@@ -227,7 +229,6 @@

                ds = oCN.RunProcReturn("select * from PM_ProjectBillMain where HInterID = " + HInterID + " and HBillNo = '" + HBillNo + "'", "PM_ProjectBillMain");

                oCN.BeginTran();
                if ((OperationType == 1 || OperationType == 2) && ds.Tables[0].Rows.Count == 0)//鏂板
                {
                    string sql = "insert into PM_ProjectBillMain" +
@@ -282,8 +283,8 @@
                        "',HBillNo = '" + HBillNo +
                        "',HBillStatus = " + HBillStatus +
                        ",HRemark = '" + HRemark +
                        "',HMaker = '" + HMaker +
                        "',HMakeDate = '" + HMakerDate +
                        "',HUpdater = '" + HUpdater +
                        "',HUpdateDate = '" + HUpdaterDate +
                        "',HProNumber = '" + HProNumber +
                        "',HProName = '" + HProName +
                        "',HCusID = " + HCusID +
@@ -318,7 +319,6 @@
                objJsonResult = AddBillSub1(msg3, HInterID, HBillNo, OperationType);
                objJsonResult = AddBillSub2(msg4, HInterID, HBillNo, OperationType);

                oCN.Commit();

                if (objJsonResult.code == "0")
                {
@@ -361,7 +361,7 @@
                string HStageNote = oSub.HStageNote;
                int HPMGoodsID = oSub.HPMGoodsID;
                string HRelationGoods = oSub.HPMGoodsName;
                int HIsKey = oSub.HIsKey;
                int HIsKey = oSub.HIsKey?1:0;
                double HRate = oSub.HRate;
                int HEmpID = oSub.HEmpID;
                int HCheckEmpID = oSub.HCheckEmpID;
@@ -410,7 +410,7 @@
                int HEntryID = i;
                string HRemark = oSub.HRemarkSub;
                int HEmpID = oSub.HEmployeeID;
                int HIsPM = oSub.HIsPM;
                int HIsPM = oSub.HIsPM?1:0;
                double HRate = oSub.HRate;
                double HPlanAvgMoney = oSub.HPlanAvgMoney;
                double HPlanCountMoney = oSub.HPlanCountMoney;
@@ -469,12 +469,12 @@

                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from PM_ProjectBillMain order by HProNumber ", "PM_ProjectBillMain");
                    ds = oCN.RunProcReturn("select * from PM_ProjectBillMain order by HBillNo ", "PM_ProjectBillMain");
                }
                else
                {
                    string sql1 = "select * from PM_ProjectBillMain where 1 = 1 ";
                    string sql = sql1 + sWhere + " order by HProNumber ";
                    string sql = sql1 + sWhere + " order by HBillNo ";
                    ds = oCN.RunProcReturn(sql, "PM_ProjectBillMain");
                }

@@ -536,7 +536,7 @@
                    return objJsonResult;
                }

                ds = oCN.RunProcReturn("exec h_p_PM_ProjectReportBill_EditInit " + HInterID, "h_p_PM_ProjectReportBill_EditInit");
                ds = oCN.RunProcReturn("exec h_p_PM_ProjectBill_EditInit " + HInterID, "h_p_PM_ProjectBill_EditInit");
                tableList.Add(ds.Tables[0]);
                tableList.Add(ds.Tables[1]);
                tableList.Add(ds.Tables[2]);