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

chenhaozhe

2026-03-07 291fdb29daf239a13fcfb3f5e08a2f5bf9167534

 DAL/Ó¦¸¶¹ÜÀí/ClsYF_PayMentOtherBill.cs

@@ -19,7 +19,7 @@
            base.MvarItemKey="YF_PayMentOtherBillMain";
            base.MvarReportTitle="其他应付单";
            base.BillType="2102";
            base.HBillSubType = "2102";
            //base.HBillSubType = "2102";

        }

@@ -36,6 +36,7 @@
        {
            try
            {
                string HBillSubType = omodel.HBillSubType.ToString() == "" ? "2102" : omodel.HBillSubType;
                //
                oCn.BeginTran();
                //更新主表
@@ -61,6 +62,7 @@
                ",HSumMoney='" + omodel.HSumMoney + "'" +
                ",HExplanation='" + omodel.HExplanation + "'" +
                ",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
                ",HBillSubType='" + omodel.HBillSubType + "'" +
                " where HInterID=" + lngBillKey.ToString());
                //删除关联
                DeleteRelation(ref sReturn, lngBillKey);
@@ -74,7 +76,7 @@
                         "" +
                         "" +
                         "(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
                         ",HProjectMoneyID,HTypeSub,HMoney,HTaxRate,HSumMoney,HRemark) " +
                         ",HProjectMoneyID,HTypeSub,HMoney,HTaxRate,HSumMoney,HEvidencePhoto,HRemark) " +
                         " values(" +
                         "" + omodel.HInterID.ToString() +
                         "," + oSub.HEntryID.ToString() +
@@ -87,6 +89,7 @@
                         "','" + oSub.HMoney +
                         "','" + oSub.HTaxRate +
                         "','" + oSub.HSumMoney +
                         "','" + oSub.HEvidencePhoto +
                         "','" + oSub.HRemark +
                         "')";
                    oCn.RunProc(subSql);
@@ -109,6 +112,7 @@
            {
                //得到mainid
                omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
                string HBillSubType= omodel.HBillSubType.ToString() == "" ? "2102" : omodel.HBillSubType;
                //若MAINDI重复则重新获取
                oCn.BeginTran();
                //主表
@@ -118,7 +122,7 @@
               ",HAccDate,HSupID,HCurID,HExRate" +
               ",HDeptID,HEmpID,HProjectMoneyID,HType,HMoney,HTaxRate,HSumMoney,HExplanation,HInnerBillNo,HOrgID" +
               ") " +
               " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
               " values('" + this.BillType + "','" + HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
               ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
               ",'" + omodel.HAccDate.ToShortDateString() + "'," + omodel.HSupID.ToString() + "," + omodel.HCurID.ToString() + "," + omodel.HExRate.ToString() +
               ", '" + omodel.HDeptID.ToString() + "','" + omodel.HEmpID.ToString() + "','" + omodel.HProjectMoneyID.ToString() + "','" + omodel.HType + "','" + omodel.HMoney + "','" + omodel.HTaxRate + "','" + omodel.HSumMoney + "','" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "','" + omodel.HOrgID + "'" +
@@ -131,7 +135,7 @@
                         "" +
                         "" +
                         "(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
                         ",HProjectMoneyID,HTypeSub,HMoney,HTaxRate,HSumMoney,HRemark) " +
                         ",HProjectMoneyID,HTypeSub,HMoney,HTaxRate,HSumMoney,HEvidencePhoto,HRemark) " +
                         " values(" +
                         "" + omodel.HInterID.ToString() +
                         "," + oSub.HEntryID.ToString() +
@@ -144,6 +148,7 @@
                         "','" + oSub.HMoney +
                         "','" + oSub.HTaxRate +
                         "','" + oSub.HSumMoney +
                         "','" + oSub.HEvidencePhoto +
                         "','" + oSub.HRemark +
                         "')";
                    oCn.RunProc(subSql);