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

yangle

2024-03-15 dedc3a694bfbd700132104605baa36391059f253

 DAL/Ó¦ÊÕ¹ÜÀí/ClsYS_ReceiveOtherBill.cs

@@ -71,24 +71,27 @@
                foreach (Model.ClsYS_ReceiveOtherBillSub oSub in DetailColl)
                {
                    string subSql = "insert into YS_ReceiveOtherBillSub" +
                         "" +
                         "" +
                         "" +
                         "(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
                         ",HProjectMoneyID,HTypeSub,HMoney,HTaxRate,HSumMoney) " +
                         " values(" +
                         "" + omodel.HInterID.ToString() +
                         "," + oSub.HEntryID.ToString() +
                         "," + oSub.HSourceInterID +
                         "," + oSub.HSourceEntryID +
                         ",'" + oSub.HSourceBillNo +
                         "','" + oSub.HSourceBillType +
                         "','" + oSub.HProjectMoneyID +
                         "','" + oSub.HTypeSub +
                         "','" + oSub.HMoney +
                         "','" + oSub.HTaxRate +
                         "','" + oSub.HSumMoney +
                         "')";
                        "" +
                        "" +
                        "" +
                        "(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
                        ",HProjectMoneyID,HTypeSub,HMoney,HTaxRate,HSumMoney,HQty,HPrice,HRemark) " +
                        " values(" +
                        "" + omodel.HInterID.ToString() +
                        "," + oSub.HEntryID.ToString() +
                        "," + oSub.HSourceInterID +
                        "," + oSub.HSourceEntryID +
                        ",'" + oSub.HSourceBillNo +
                        "','" + oSub.HSourceBillType +
                        "','" + oSub.HProjectMoneyID +
                        "','" + oSub.HTypeSub +
                        "','" + oSub.HMoney +
                        "','" + oSub.HTaxRate +
                        "','" + oSub.HSumMoney +
                        "','" + oSub.HQty +
                        "','" + oSub.HPrice +
                        "','" + oSub.HRemark +
                        "')";
                    oCn.RunProc(subSql);
                }
                sReturn = "修改单据成功！";
@@ -108,7 +111,7 @@
            try
            {
                //得到mainid
                omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
                //omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
                //若MAINDI重复则重新获取
                oCn.BeginTran();
                //主表
@@ -131,7 +134,7 @@
                         "" +
                         "" +
                         "(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
                         ",HProjectMoneyID,HTypeSub,HMoney,HTaxRate,HSumMoney) " +
                         ",HProjectMoneyID,HTypeSub,HMoney,HTaxRate,HSumMoney,HQty,HPrice,HRemark) " +
                         " values(" +
                         "" + omodel.HInterID.ToString() +
                         "," + oSub.HEntryID.ToString() +
@@ -144,6 +147,9 @@
                         "','" + oSub.HMoney +
                         "','" + oSub.HTaxRate +
                         "','" + oSub.HSumMoney +
                         "','" + oSub.HQty +
                         "','" + oSub.HPrice +
                         "','" + oSub.HRemark +
                         "')";
                    oCn.RunProc(subSql);
                }