From 91c999195270276eb30ad68d9c43c7e8cdcf0312 Mon Sep 17 00:00:00 2001 From: hanxuntao <641739520@qq.com> Date: Tue, 14 Mar 2023 13:35:05 +0800 Subject: [PATCH] 1 --- .../Account/Controllers/Chfee_AuditController.cs | 3 ++- .../Controllers/Chfee_invoiceapplicationController.cs | 10 +++++----- .../Controllers/Chfee_payapplicationController.cs | 4 ++-- .../Controllers/Chfee_recvapplicationController.cs | 4 ++-- .../Chfee_InvoiceapplicationDAL.cs | 4 ++-- .../Chfee_payapplication/Chfee_PayapplicationDAL.cs | 4 ++-- .../Chfee_recvapplication/Chfee_RecvapplicationDAL.cs | 6 +++--- .../ChInvoiceapplicationNewEdit.js | 11 ++--------- .../MvcShipping/Controllers/MsChDuiController.cs | 2 +- .../Controllers/MsChFeeAutoDuiController.cs | 2 +- .../MvcShipping/Views/MsOpAire/FeeAmendEdit.aspx | 2 ++ DSWeb/Areas/MvcShipping/Views/MsOpAire/FeeEdit.aspx | 2 ++ .../MvcShipping/Views/MsOpAiri/FeeAmendEdit.aspx | 3 ++- DSWeb/Areas/MvcShipping/Views/MsOpAiri/FeeEdit.aspx | 2 ++ .../MvcShipping/Views/MsOpApply/FeeAmendEdit.aspx | 3 ++- DSWeb/Areas/MvcShipping/Views/MsOpApply/FeeEdit.aspx | 3 ++- .../MvcShipping/Views/MsOpOther/FeeAmendEdit.aspx | 2 ++ DSWeb/Areas/MvcShipping/Views/MsOpOther/FeeEdit.aspx | 2 ++ .../MvcShipping/Views/MsOpSeai/FeeAmendEdit.aspx | 2 +- DSWeb/Areas/MvcShipping/Views/MsOpSeai/FeeEdit.aspx | 2 +- DSWeb/Areas/TruckMng/Views/PcHeadEdit_WFSD/Edit.aspx | 3 ++- .../TruckMng/Views/PcHeadEdit_WFSD/FeeAmendEdit.aspx | 3 ++- .../Areas/TruckMng/Views/PcHeadEdit_WFSD/FeeEdit.aspx | 3 ++- 23 files changed, 46 insertions(+), 36 deletions(-) diff --git a/DSWeb/Areas/Account/Controllers/Chfee_AuditController.cs b/DSWeb/Areas/Account/Controllers/Chfee_AuditController.cs index 83abff0d..aadd88a8 100644 --- a/DSWeb/Areas/Account/Controllers/Chfee_AuditController.cs +++ b/DSWeb/Areas/Account/Controllers/Chfee_AuditController.cs @@ -1545,7 +1545,7 @@ namespace DSWeb.Areas.Account.Controllers if (isps) { - if (Math.Round((feettlsum.TTLCR - feettlsum.NOPSTTLCR) / (feettlsum.TTLHYFDR - feettlsum.TTLHYFCR), 2, MidpointRounding.AwayFromZero) != psbl) + if (Math.Round((feettlsum.TTLCR - feettlsum.NOPSTTLCR) / (feettlsum.TTLHYFDR - feettlsum.TTLHYFCR), 2, MidpointRounding.AwayFromZero)>(storeCurrExrate); if (islist) { - var bodylist = ChinvoiceapplicationDAL.GetFeeDetailList(feesql + " and '代理'+FEENAME NOT IN (Select GOODNAME from code_goods_inv) ",duino, Convert.ToString(Session["USERID"]), CookieConfig.GetCookie_UserCode(Request), Convert.ToString(Session["COMPANYID"])); + var bodylist = ChinvoiceapplicationDAL.GetFeeDetailList(feesql + " and '代理'+FEENAME NOT IN (Select GOODNAME from code_goods_inv) ",duino, Convert.ToString(Session["USERID"]), Convert.ToString(Session["SHOWNAME"]), Convert.ToString(Session["COMPANYID"])); if (bodylist.Count != 0) { var feenamelist = ""; if (bodylist != null) @@ -506,7 +506,7 @@ namespace DSWeb.Areas.Account.Controllers if (exrateList.Count == 0) { var modb = new ModelObjectDB(); - DBResult result = ChinvoiceapplicationDAL.AddBill(billno,duino,billcust, billcurr, feesql, exrateList, Convert.ToString(Session["COMPANYID"]), islist, GID,headData, custgroup, Convert.ToString(Session["USERID"])); + DBResult result = ChinvoiceapplicationDAL.AddBill(billno,duino,billcust, billcurr, feesql, exrateList, Convert.ToString(Session["COMPANYID"]), islist, GID,headData, custgroup, Convert.ToString(Session["USERID"]), Convert.ToString(Session["SHOWNAME"])); if (result.Success) { ChinvoiceapplicationDAL.p_update_Amount(billno, GID); } var jsonRespose = new JsonResponse { Success = result.Success, Message = result.Message }; @@ -550,7 +550,7 @@ namespace DSWeb.Areas.Account.Controllers var modb = new ModelObjectDB(); - DBResult result = ChinvoiceapplicationDAL.AddBill(billno,duino,billcust, billcurr, feesql, exrateList, Convert.ToString(Session["COMPANYID"]), islist, GID, headData,false,Convert.ToString(Session["USERID"])); + DBResult result = ChinvoiceapplicationDAL.AddBill(billno,duino,billcust, billcurr, feesql, exrateList, Convert.ToString(Session["COMPANYID"]), islist, GID, headData,false,Convert.ToString(Session["USERID"]), Convert.ToString(Session["SHOWNAME"])); if (result.Success) { ChinvoiceapplicationDAL.p_update_Amount(billno, GID); } var jsonRespose = new JsonResponse { Success = result.Success, Message = result.Message }; @@ -638,7 +638,7 @@ namespace DSWeb.Areas.Account.Controllers if (billcurr==""||exrateList.Count == 0) { var modb = new ModelObjectDB(); - DBResult result = ChinvoiceapplicationDAL.AddBill(billno, duino, billcust, billcurr, feesql, exrateList, Convert.ToString(Session["COMPANYID"]), islist, GID, headData, custgroup, Convert.ToString(Session["USERID"])); + DBResult result = ChinvoiceapplicationDAL.AddBill(billno, duino, billcust, billcurr, feesql, exrateList, Convert.ToString(Session["COMPANYID"]), islist, GID, headData, custgroup, Convert.ToString(Session["USERID"]), Convert.ToString(Session["SHOWNAME"])); if (result.Success) { ChinvoiceapplicationDAL.p_update_AmountNew(billno, GID, Convert.ToString(Session["DEPTNAME"]).ToString().Trim(), Convert.ToString(Session["COMPANYID"])); } var jsonRespose = new JsonResponse { Success = result.Success, Message = result.Message }; @@ -682,7 +682,7 @@ namespace DSWeb.Areas.Account.Controllers var modb = new ModelObjectDB(); - DBResult result = ChinvoiceapplicationDAL.AddBill(billno, duino, billcust, billcurr, feesql, exrateList, Convert.ToString(Session["COMPANYID"]), islist, GID, headData, false, Convert.ToString(Session["USERID"])); + DBResult result = ChinvoiceapplicationDAL.AddBill(billno, duino, billcust, billcurr, feesql, exrateList, Convert.ToString(Session["COMPANYID"]), islist, GID, headData, false, Convert.ToString(Session["USERID"]), Convert.ToString(Session["SHOWNAME"])); if (result.Success) { ChinvoiceapplicationDAL.p_update_AmountNew(billno, GID, Convert.ToString(Session["DEPTNAME"]).ToString().Trim(), Convert.ToString(Session["COMPANYID"])); } var jsonRespose = new JsonResponse { Success = result.Success, Message = result.Message }; diff --git a/DSWeb/Areas/Account/Controllers/Chfee_payapplicationController.cs b/DSWeb/Areas/Account/Controllers/Chfee_payapplicationController.cs index 8f4dae75..499a2460 100644 --- a/DSWeb/Areas/Account/Controllers/Chfee_payapplicationController.cs +++ b/DSWeb/Areas/Account/Controllers/Chfee_payapplicationController.cs @@ -380,7 +380,7 @@ namespace DSWeb.Areas.Account.Controllers } var modb = new ModelObjectDB(); - DBResult result = ChpayapplicationDAL.AddBill(billno, duino, billcust, billcurr, feesql, exrateList, Convert.ToString(Session["COMPANYID"]),Convert.ToString(Session["USERID"]),custgroup); + DBResult result = ChpayapplicationDAL.AddBill(billno, duino, billcust, billcurr, feesql, exrateList, Convert.ToString(Session["COMPANYID"]),Convert.ToString(Session["USERID"]), Convert.ToString(Session["SHOWNAME"]), custgroup); if (result.Success) { ChpayapplicationDAL.p_update_Amount(billno); if (CHPAYMSG == "1") { @@ -424,7 +424,7 @@ namespace DSWeb.Areas.Account.Controllers { var modb = new ModelObjectDB(); - DBResult result = ChpayapplicationDAL.AddBill(billno, duino,billcust, billcurr, feesql, exrateList, Convert.ToString(Session["COMPANYID"]), Convert.ToString(Session["USERID"])); + DBResult result = ChpayapplicationDAL.AddBill(billno, duino,billcust, billcurr, feesql, exrateList, Convert.ToString(Session["COMPANYID"]), Convert.ToString(Session["USERID"]), Convert.ToString(Session["SHOWNAME"])); if (result.Success) { ChpayapplicationDAL.p_update_Amount(billno); if (!custgroup) feesql = feesql + " AND CUSTOMERNAME='" + billcust + "'"; diff --git a/DSWeb/Areas/Account/Controllers/Chfee_recvapplicationController.cs b/DSWeb/Areas/Account/Controllers/Chfee_recvapplicationController.cs index 7e936f1a..845640c2 100644 --- a/DSWeb/Areas/Account/Controllers/Chfee_recvapplicationController.cs +++ b/DSWeb/Areas/Account/Controllers/Chfee_recvapplicationController.cs @@ -255,7 +255,7 @@ namespace DSWeb.Areas.Account.Controllers if ((exrateList == null) || (exrateList.Count == 0)) { var modb = new ModelObjectDB(); - DBResult result = ChrecvapplicationDAL.AddBill(billno, billcust, billcurr, feesql, exrateList, Convert.ToString(Session["COMPANYID"]), Convert.ToString(Session["USERID"]), custgroup); + DBResult result = ChrecvapplicationDAL.AddBill(billno, billcust, billcurr, feesql, exrateList, Convert.ToString(Session["COMPANYID"]), Convert.ToString(Session["USERID"]), Convert.ToString(Session["SHOWNAME"]), custgroup); if (result.Success) { ChrecvapplicationDAL.p_update_Amount(billno); } var jsonRespose = new JsonResponse { Success = result.Success, Message = result.Message }; @@ -276,7 +276,7 @@ namespace DSWeb.Areas.Account.Controllers { var modb = new ModelObjectDB(); - DBResult result = ChrecvapplicationDAL.AddBill(billno, billcust, billcurr, feesql, exrateList, Convert.ToString(Session["COMPANYID"]), Convert.ToString(Session["USERID"])); + DBResult result = ChrecvapplicationDAL.AddBill(billno, billcust, billcurr, feesql, exrateList, Convert.ToString(Session["COMPANYID"]), Convert.ToString(Session["USERID"]), Convert.ToString(Session["SHOWNAME"])); if (result.Success) { ChrecvapplicationDAL.p_update_Amount(billno); } var jsonRespose = new JsonResponse { Success = result.Success, Message = result.Message }; diff --git a/DSWeb/Areas/Account/DAL/Chfee_invoiceapplication/Chfee_InvoiceapplicationDAL.cs b/DSWeb/Areas/Account/DAL/Chfee_invoiceapplication/Chfee_InvoiceapplicationDAL.cs index cd07dcf9..09c252b2 100644 --- a/DSWeb/Areas/Account/DAL/Chfee_invoiceapplication/Chfee_InvoiceapplicationDAL.cs +++ b/DSWeb/Areas/Account/DAL/Chfee_invoiceapplication/Chfee_InvoiceapplicationDAL.cs @@ -3145,7 +3145,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoiceapplication } - public static DBResult AddBill(string billno, string duino, string billcust, string billcurr, string feesql, List exratelist, string companyid, bool isList, string GID,ChInvoiceapplication headdata,bool custgroup = false,string userid="") + public static DBResult AddBill(string billno, string duino, string billcust, string billcurr, string feesql, List exratelist, string companyid, bool isList, string GID,ChInvoiceapplication headdata,bool custgroup = false,string userid="",string username="") { var result = new DBResult(); @@ -3185,7 +3185,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoiceapplication if (!custgroup) feesql = feesql + " AND CUSTOMERNAME='" + billcust + "'"; - var feelist = GetFeeDetailList(feesql,duino,userid,"", companyid); + var feelist = GetFeeDetailList(feesql,duino,userid,username, companyid); if (FEENOAUDITCANTSHENINV.PARAMVALUE == "1") { billnoinvlist = MsOpBillDAL.GetDataList(" BSNO IN (select DISTINCT BSNO from ch_fee (NOLOCK) where FEETYPE=1 and (FEESTATUS=1 OR FEESTATUS=2 ) AND BSNO IN (SELECT DISTINCT BSNO FROM CH_FEE f WHERE f.ISINVOICE<>1 and f.FEESTATUS IN (0,8,9) and (f.AMOUNT<>(ISNULL(f.INVOICE,0)+ISNULL(f.ORDERINVOICE,0)-ISNULL(f.ORDERINVSETTLEMENT,0))) AND " + feesql + " ))"); diff --git a/DSWeb/Areas/Account/DAL/Chfee_payapplication/Chfee_PayapplicationDAL.cs b/DSWeb/Areas/Account/DAL/Chfee_payapplication/Chfee_PayapplicationDAL.cs index 2249a4c8..ab9f8117 100644 --- a/DSWeb/Areas/Account/DAL/Chfee_payapplication/Chfee_PayapplicationDAL.cs +++ b/DSWeb/Areas/Account/DAL/Chfee_payapplication/Chfee_PayapplicationDAL.cs @@ -2193,7 +2193,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Payapplication - public static DBResult AddBill(string billno,string duino, string billcust, string billcurr, string feesql, List exratelist, string companyid,string userid, bool custgroup = false) + public static DBResult AddBill(string billno,string duino, string billcust, string billcurr, string feesql, List exratelist, string companyid,string userid, string username, bool custgroup = false) { var result = new DBResult(); @@ -2208,7 +2208,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Payapplication if (!custgroup) feesql = feesql + " AND CUSTOMERNAME='" + billcust + "'"; - var feelist = GetFeeDataList(feesql, duino, userid,userid,companyid,""); + var feelist = GetFeeDataList(feesql, duino, userid, username, companyid,""); var cmdInsert = diff --git a/DSWeb/Areas/Account/DAL/Chfee_recvapplication/Chfee_RecvapplicationDAL.cs b/DSWeb/Areas/Account/DAL/Chfee_recvapplication/Chfee_RecvapplicationDAL.cs index 87bf3d9d..52123f95 100644 --- a/DSWeb/Areas/Account/DAL/Chfee_recvapplication/Chfee_RecvapplicationDAL.cs +++ b/DSWeb/Areas/Account/DAL/Chfee_recvapplication/Chfee_RecvapplicationDAL.cs @@ -1310,7 +1310,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Recvapplication } - public static DBResult AddBill(string billno, string billcust, string billcurr, string feesql, List exratelist, string companyid,string userid, bool custgroup = false) + public static DBResult AddBill(string billno, string billcust, string billcurr, string feesql, List exratelist, string companyid,string userid,string username, bool custgroup = false) { var result = new DBResult(); var recapp = GetData("BILLNO='"+billno+"'"); @@ -1327,9 +1327,9 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Recvapplication feesql = feesql + " AND CUSTOMERNAME='" + billcust + "'"; List feelist = new List(); if (recapp.SETTLEMODE == 3) { - feelist = GetDdFeeDetailList(feesql, userid, "", companyid); + feelist = GetDdFeeDetailList(feesql, userid, username, companyid); } - feelist = GetFeeDetailList(feesql,userid,"",companyid); + feelist = GetFeeDetailList(feesql,userid, username, companyid); var cmdInsert = diff --git a/DSWeb/Areas/Account/Viewsjs/Chfee_invoiceapplication/ChInvoiceapplicationNewEdit.js b/DSWeb/Areas/Account/Viewsjs/Chfee_invoiceapplication/ChInvoiceapplicationNewEdit.js index fffd5151..5634d888 100644 --- a/DSWeb/Areas/Account/Viewsjs/Chfee_invoiceapplication/ChInvoiceapplicationNewEdit.js +++ b/DSWeb/Areas/Account/Viewsjs/Chfee_invoiceapplication/ChInvoiceapplicationNewEdit.js @@ -1009,15 +1009,8 @@ Ext.extend(Shipping.MsChInvoiceapplicationBLEdit, Ext.Panel, { text: '提交审核', tooltip: '提交审核', handler: function (button, event) { - var RECVCURR = this.formEdit.getForm().findField('RECVCURR').getValue(); - var OTCURRAMOUNT = this.formEdit.getForm().findField('OTCURRAMOUNT').getValue(); - if (RECVCURR == 'RMB' && OTCURRAMOUNT != 0) { - Ext.MessageBox.confirm("提示", "此发票存在外币,确认要申请RMB发票吗?", function (btn) { - if (btn == 'yes') { - _this.Save('0', '0', true); - } - }, this); - } else this.Save('0', '0', true); + + this.Save('0', '0', true); // this.onSubmitAuditClick(); }, scope: this diff --git a/DSWeb/Areas/MvcShipping/Controllers/MsChDuiController.cs b/DSWeb/Areas/MvcShipping/Controllers/MsChDuiController.cs index b08a6575..56d39999 100644 --- a/DSWeb/Areas/MvcShipping/Controllers/MsChDuiController.cs +++ b/DSWeb/Areas/MvcShipping/Controllers/MsChDuiController.cs @@ -408,7 +408,7 @@ namespace DSWeb.MvcShipping.Controllers DBResult result = modb.Save(headShen); var _condition = ""; - result = ChpayapplicationDAL.AddBill(headShen.BILLNO, duino, headShen.CUSTOMERNAME, "", " 1=1 ", null, Convert.ToString(Session["COMPANYID"]), Convert.ToString(Session["USERID"]), true); + result = ChpayapplicationDAL.AddBill(headShen.BILLNO, duino, headShen.CUSTOMERNAME, "", " 1=1 ", null, Convert.ToString(Session["COMPANYID"]), Convert.ToString(Session["USERID"]), Convert.ToString(Session["SHOWNAME"]), true); diff --git a/DSWeb/Areas/MvcShipping/Controllers/MsChFeeAutoDuiController.cs b/DSWeb/Areas/MvcShipping/Controllers/MsChFeeAutoDuiController.cs index 2624be2f..c6e8e843 100644 --- a/DSWeb/Areas/MvcShipping/Controllers/MsChFeeAutoDuiController.cs +++ b/DSWeb/Areas/MvcShipping/Controllers/MsChFeeAutoDuiController.cs @@ -716,7 +716,7 @@ namespace DSWeb.MvcShipping.Controllers } } condition = condition + _condition; - result = ChpayapplicationDAL.AddBill(headShen.BILLNO,"",headShen.CUSTOMERNAME,"", condition, null, Convert.ToString(Session["COMPANYID"]), Convert.ToString(Session["USERID"]),false); + result = ChpayapplicationDAL.AddBill(headShen.BILLNO,"",headShen.CUSTOMERNAME,"", condition, null, Convert.ToString(Session["COMPANYID"]), Convert.ToString(Session["USERID"]), Convert.ToString(Session["SHOWNAME"]), false); var NOkList = DetailList.FindAll(t => !String.IsNullOrEmpty(t.B_BSNO)&& t.ISOK != "1" && ((Convert.ToDecimal(t.L_RMBAMOUNT)>Convert.ToDecimal(t.RMBAMOUNT))||(Convert.ToDecimal(t.L_USDAMOUNT)>Convert.ToDecimal(t.USDAMOUNT)))); if (NOkList != null) { var feedolist = new List(); diff --git a/DSWeb/Areas/MvcShipping/Views/MsOpAire/FeeAmendEdit.aspx b/DSWeb/Areas/MvcShipping/Views/MsOpAire/FeeAmendEdit.aspx index 018ebdbe..0688e465 100644 --- a/DSWeb/Areas/MvcShipping/Views/MsOpAire/FeeAmendEdit.aspx +++ b/DSWeb/Areas/MvcShipping/Views/MsOpAire/FeeAmendEdit.aspx @@ -43,6 +43,8 @@ } getSessgion6(); + + diff --git a/DSWeb/Areas/MvcShipping/Views/MsOpAire/FeeEdit.aspx b/DSWeb/Areas/MvcShipping/Views/MsOpAire/FeeEdit.aspx index cf59dff8..5a7fe10b 100644 --- a/DSWeb/Areas/MvcShipping/Views/MsOpAire/FeeEdit.aspx +++ b/DSWeb/Areas/MvcShipping/Views/MsOpAire/FeeEdit.aspx @@ -43,6 +43,8 @@ } getSessgion6(); + + diff --git a/DSWeb/Areas/MvcShipping/Views/MsOpAiri/FeeAmendEdit.aspx b/DSWeb/Areas/MvcShipping/Views/MsOpAiri/FeeAmendEdit.aspx index 88234410..f0ddf2fb 100644 --- a/DSWeb/Areas/MvcShipping/Views/MsOpAiri/FeeAmendEdit.aspx +++ b/DSWeb/Areas/MvcShipping/Views/MsOpAiri/FeeAmendEdit.aspx @@ -6,7 +6,8 @@ - + + diff --git a/DSWeb/Areas/MvcShipping/Views/MsOpAiri/FeeEdit.aspx b/DSWeb/Areas/MvcShipping/Views/MsOpAiri/FeeEdit.aspx index 383aeaf3..2c9abe77 100644 --- a/DSWeb/Areas/MvcShipping/Views/MsOpAiri/FeeEdit.aspx +++ b/DSWeb/Areas/MvcShipping/Views/MsOpAiri/FeeEdit.aspx @@ -43,6 +43,8 @@ } getSessgion6(); + + diff --git a/DSWeb/Areas/MvcShipping/Views/MsOpApply/FeeAmendEdit.aspx b/DSWeb/Areas/MvcShipping/Views/MsOpApply/FeeAmendEdit.aspx index 4717251d..93b800c4 100644 --- a/DSWeb/Areas/MvcShipping/Views/MsOpApply/FeeAmendEdit.aspx +++ b/DSWeb/Areas/MvcShipping/Views/MsOpApply/FeeAmendEdit.aspx @@ -34,7 +34,8 @@ getSessgion6(); - + + diff --git a/DSWeb/Areas/MvcShipping/Views/MsOpApply/FeeEdit.aspx b/DSWeb/Areas/MvcShipping/Views/MsOpApply/FeeEdit.aspx index f6af725e..46129e4d 100644 --- a/DSWeb/Areas/MvcShipping/Views/MsOpApply/FeeEdit.aspx +++ b/DSWeb/Areas/MvcShipping/Views/MsOpApply/FeeEdit.aspx @@ -3,7 +3,8 @@ - + + diff --git a/DSWeb/Areas/MvcShipping/Views/MsOpOther/FeeAmendEdit.aspx b/DSWeb/Areas/MvcShipping/Views/MsOpOther/FeeAmendEdit.aspx index 6d9c6ea8..4a1aadcc 100644 --- a/DSWeb/Areas/MvcShipping/Views/MsOpOther/FeeAmendEdit.aspx +++ b/DSWeb/Areas/MvcShipping/Views/MsOpOther/FeeAmendEdit.aspx @@ -38,6 +38,8 @@ getSessgion6(); + + diff --git a/DSWeb/Areas/MvcShipping/Views/MsOpOther/FeeEdit.aspx b/DSWeb/Areas/MvcShipping/Views/MsOpOther/FeeEdit.aspx index 7a98bd2a..0e4a5d4b 100644 --- a/DSWeb/Areas/MvcShipping/Views/MsOpOther/FeeEdit.aspx +++ b/DSWeb/Areas/MvcShipping/Views/MsOpOther/FeeEdit.aspx @@ -31,6 +31,8 @@ } getSessgion6(); + + diff --git a/DSWeb/Areas/MvcShipping/Views/MsOpSeai/FeeAmendEdit.aspx b/DSWeb/Areas/MvcShipping/Views/MsOpSeai/FeeAmendEdit.aspx index 1032a933..b04f2133 100644 --- a/DSWeb/Areas/MvcShipping/Views/MsOpSeai/FeeAmendEdit.aspx +++ b/DSWeb/Areas/MvcShipping/Views/MsOpSeai/FeeAmendEdit.aspx @@ -43,7 +43,7 @@ } getSessgion6(); - + diff --git a/DSWeb/Areas/MvcShipping/Views/MsOpSeai/FeeEdit.aspx b/DSWeb/Areas/MvcShipping/Views/MsOpSeai/FeeEdit.aspx index b4370d57..216799d2 100644 --- a/DSWeb/Areas/MvcShipping/Views/MsOpSeai/FeeEdit.aspx +++ b/DSWeb/Areas/MvcShipping/Views/MsOpSeai/FeeEdit.aspx @@ -46,7 +46,7 @@ } getSessgion6(); - + diff --git a/DSWeb/Areas/TruckMng/Views/PcHeadEdit_WFSD/Edit.aspx b/DSWeb/Areas/TruckMng/Views/PcHeadEdit_WFSD/Edit.aspx index 6a104f39..07ebf28b 100644 --- a/DSWeb/Areas/TruckMng/Views/PcHeadEdit_WFSD/Edit.aspx +++ b/DSWeb/Areas/TruckMng/Views/PcHeadEdit_WFSD/Edit.aspx @@ -52,7 +52,8 @@ } getSessgion6(); - + + diff --git a/DSWeb/Areas/TruckMng/Views/PcHeadEdit_WFSD/FeeAmendEdit.aspx b/DSWeb/Areas/TruckMng/Views/PcHeadEdit_WFSD/FeeAmendEdit.aspx index 2097c72d..fcd0a365 100644 --- a/DSWeb/Areas/TruckMng/Views/PcHeadEdit_WFSD/FeeAmendEdit.aspx +++ b/DSWeb/Areas/TruckMng/Views/PcHeadEdit_WFSD/FeeAmendEdit.aspx @@ -44,7 +44,8 @@ } getSessgion6(); - + + diff --git a/DSWeb/Areas/TruckMng/Views/PcHeadEdit_WFSD/FeeEdit.aspx b/DSWeb/Areas/TruckMng/Views/PcHeadEdit_WFSD/FeeEdit.aspx index cb9efe81..f8a9fb6f 100644 --- a/DSWeb/Areas/TruckMng/Views/PcHeadEdit_WFSD/FeeEdit.aspx +++ b/DSWeb/Areas/TruckMng/Views/PcHeadEdit_WFSD/FeeEdit.aspx @@ -45,7 +45,8 @@ } getSessgion6(); - + +