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

yangle

2024-07-11 39a43039bbb6491f33783fb675a111c61e749891

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

@@ -619,6 +619,8 @@
            public string HBacker;
            public string HBackerDate;
            public string HBackRemark;
            public string HChangeType;
            public string HChangeValue;
        }
        #endregion
        #region å­è¡¨
@@ -756,7 +758,8 @@
                string HBacker = mainList[0].HBacker;
                string HBackerDate = mainList[0].HBackerDate;
                string HBackRemark = mainList[0].HBackRemark;

                string HChangeType = mainList[0].HChangeType;
                string HChangeValue = mainList[0].HChangeValue;
                //保存前控制
                DataSet BeforeDs = oCn.RunProcReturn("Exec h_p_Pay_ProcPriceRequestBill_BeforeSaveCtrl " + HInterID.ToString() + ",'" + HBillNo + "'," + OperationType.ToString(), "h_p_Pay_ProcPriceRequestBill_BeforeSaveCtrl");
                if (BeforeDs == null || BeforeDs.Tables[0].Rows.Count == 0)
@@ -785,7 +788,7 @@
                {
                    string sql = "insert into Pay_ProcPriceRequestBillMain" +
                        "(HYear,HPeriod,HBillType,HBillSubType,HBillStatus,HInterID,HBillNo,HDate,HInnerBillNo,HDeptID" +
                        ",HExplanation,HRemark,HMaker,HMakeDate) " +
                        ",HExplanation,HRemark,HMaker,HMakeDate,HChangeType,HChangeValue) " +
                        "values(" +
                        "" + HYear +
                        "," + HPeriod +
@@ -801,7 +804,9 @@
                        "','" + HRemark +
                        "','" + HMaker +
                        "','" + HMakerDate +
                        "')";
                        "','" + HChangeType +
                        "'," + HChangeValue +
                        ")";

                    //主表
                    oCn.RunProc(sql);
@@ -821,7 +826,9 @@
                        "', HRemark = '" + HRemark +
                        "', HUpdater = '" + HUpdater +
                        "', HUpdateDate = '" + HUpdaterDate +
                        "' where HInterID = " + HInterID;
                        "', HChangeType = '" + HChangeType +
                         "', HChangeValue = " + HChangeValue +
                        "  where HInterID = " + HInterID;

                    oCn.RunProc(sql);