dengyu
/
DS7
1
0
Fork 0
Code Issues Pull Requests Projects 1 Releases Wiki Activity

Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev

Browse Source
DS7_JinGang
hanxuntao 1 year ago
parent f9df8a838a 5120927697
commit 1e42243021
3 changed files with 42 additions and 18 deletions
Show Stats Download Patch File Download Diff File

33
DSWeb/Areas/Account/Controllers/Chfee_invoice_HangXinController.cs
Unescape Escape View File

@ -1570,18 +1570,21 @@ namespace DSWeb.Areas.Account.Controllers
/// <returns></returns> /// <returns></returns>
public DBResult SetInvoiceFee(ChInvoice_HangXin BlueInvoice) public DBResult SetInvoiceFee(ChInvoice_HangXin BlueInvoice)
{ {
var result = new DBResult(); //var result = new DBResult();
if (BlueInvoice.INVOICETYPE == 2) //if (BlueInvoice.INVOICETYPE == 2)
{ //{
//申请开票 // //申请开票
var dataList = ChinvoiceapplicationDAL.GetDataListAll("INVBILLNO='" + BlueInvoice.BILLNO + "'", Convert.ToString(Session["USERID"]), CookieConfig.GetCookie_UserCode(Request), Convert.ToString(Session["COMPANYID"])); // var dataList = ChinvoiceapplicationDAL.GetDataListAll("INVBILLNO='" + BlueInvoice.BILLNO + "'", Convert.ToString(Session["USERID"]), CookieConfig.GetCookie_UserCode(Request), Convert.ToString(Session["COMPANYID"]));
result = ChinvoiceDAL.DelAppList(dataList, BlueInvoice.BILLNO); // result = ChinvoiceDAL.DelAppList(dataList, BlueInvoice.BILLNO);
} //}
else //else
{ //{
var dataList = ChinvoiceDAL.GetBodyList("BILLNO='" + BlueInvoice.BILLNO + "'"); // var dataList = ChinvoiceDAL.GetBodyList("BILLNO='" + BlueInvoice.BILLNO + "'");
result = ChinvoiceDAL.DelFeeDo(dataList, BlueInvoice.GID); // result = ChinvoiceDAL.DelFeeDo(dataList, BlueInvoice.GID);
} //}
//return result;
var result = ChinvoiceDAL.SetInvoiceFee(BlueInvoice,Session);
return result; return result;
} }
@ -2031,8 +2034,8 @@ namespace DSWeb.Areas.Account.Controllers
ChinvoiceDAL.SetRed(redhead); ChinvoiceDAL.SetRed(redhead);
//将原票内的申请和费用恢复原状 //将原票内的申请和费用恢复原状
//var BlueInvoice = ChinvoiceDAL.GetData(" cm.INVOICECODE='" + head.REDCODE + "' and cm.INVOICENO='" + head.REDNUM + "'"); BlueInvoice = ChinvoiceDAL.GetData(" cm.INVOICECODE='" + redhead.REDCODE + "' and cm.INVOICENO='" + redhead.REDNUM + "'");
//result = SetInvoiceFee(BlueInvoice); result = SetInvoiceFee(BlueInvoice);
} }
//如果状态为开出成功 则执行锁定 //如果状态为开出成功 则执行锁定
@ -2066,7 +2069,7 @@ namespace DSWeb.Areas.Account.Controllers
head.billUuid = redhead.BILLNO; head.billUuid = redhead.BILLNO;
result = hx.PostRedConfirm(redhead, ref head, detailList); result = hx.PostRedConfirm(redhead, ref head, detailList,Session);
if (result.Success == false) if (result.Success == false)
{ {

20
DSWeb/Areas/Account/DAL/Chfee_invoice_HangXin/Chfee_InvoiceDAL.cs
Unescape Escape View File

@ -5016,6 +5016,24 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoice_HangXin
#endregion #endregion
public static DBResult SetInvoiceFee(ChInvoice_HangXin BlueInvoice, System.Web.HttpSessionStateBase Session)
{
var result = new DBResult();
if (BlueInvoice.INVOICETYPE == 2)
{
//申请开票
var dataList = ChinvoiceapplicationDAL.GetDataListAll("INVBILLNO='" + BlueInvoice.BILLNO + "'", Convert.ToString(Session["USERID"]), Convert.ToString(Session["USERCODE"]), Convert.ToString(Session["COMPANYID"]));
result = ChinvoiceDAL.DelAppList(dataList, BlueInvoice.BILLNO);
}
else
{
var dataList = ChinvoiceDAL.GetBodyList("BILLNO='" + BlueInvoice.BILLNO + "'");
result = ChinvoiceDAL.DelFeeDo(dataList, BlueInvoice.GID);
}
return result;
}
} }
public static class AES public static class AES
@ -5077,6 +5095,8 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoice_HangXin
#endregion #endregion
} }
} }

7
DSWeb/Areas/Account/Models/Chfee_invoice_HangXin/Chfee_Invoice.cs
Unescape Escape View File

@ -25,6 +25,7 @@ using static System.Net.WebRequestMethods;
using sun.security.krb5.@internal.crypto; using sun.security.krb5.@internal.crypto;
using DSWeb.Areas.CommMng.Controllers; using DSWeb.Areas.CommMng.Controllers;
using DSWeb.MvcShipping.DAL.MsSysParamSet; using DSWeb.MvcShipping.DAL.MsSysParamSet;
using System.Web;
namespace DSWeb.Areas.Account.Models.Chfee_Invoice_HangXin namespace DSWeb.Areas.Account.Models.Chfee_Invoice_HangXin
{ {
@ -2391,7 +2392,7 @@ namespace DSWeb.Areas.Account.Models.Chfee_Invoice_HangXin
/// <param name="head"></param> /// <param name="head"></param>
/// <param name="detailList"></param> /// <param name="detailList"></param>
/// <returns></returns> /// <returns></returns>
public DBResult PostRedConfirm(ChInvoice_HangXin head, ref ChInvoice_HangXin bluehead, List<ChInvoiceDetail> detailList) public DBResult PostRedConfirm(ChInvoice_HangXin head, ref ChInvoice_HangXin bluehead, List<ChInvoiceDetail> detailList,HttpSessionStateBase Session)
{ {
//var billno = head.BILLNO; //var billno = head.BILLNO;
@ -2466,8 +2467,8 @@ namespace DSWeb.Areas.Account.Models.Chfee_Invoice_HangXin
ChinvoiceDAL.SetRed(head); ChinvoiceDAL.SetRed(head);
//将原票内的申请和费用恢复原状 //将原票内的申请和费用恢复原状
//var BlueInvoice = ChinvoiceDAL.GetData(" cm.INVOICECODE='" + head.REDCODE + "' and cm.INVOICENO='" + head.REDNUM + "'"); var BlueInvoice = ChinvoiceDAL.GetData(" cm.INVOICECODE='" + head.REDCODE + "' and cm.INVOICENO='" + head.REDNUM + "'");
//result = SetInvoiceFee(BlueInvoice); result = ChinvoiceDAL.SetInvoiceFee(BlueInvoice,Session);
} }
//如果状态为开出成功 则执行锁定 //如果状态为开出成功 则执行锁定

Write Preview
Loading…
Cancel
Save