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

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)<psbl)
                 {
                     if (profitstatus == "正常")
                     {
@@ -1574,6 +1574,7 @@ namespace DSWeb.Areas.Account.Controllers
                         auditlist.Add(audit);
                         if (profitstatus != "利润过高")
                             profitstatus = "不成比例且过低";
+                        else profitstatus = "不成比例且利润过高";
                     }
                 }
 

DSWeb/Areas/Account/Controllers/Chfee_invoiceapplicationController.cs

@@ -476,7 +476,7 @@ namespace DSWeb.Areas.Account.Controllers
 
             var exrateList = JsonConvert.Deserialize<List<ChFeeExrate>>(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 };

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 + "'";

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 };

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<ChFeeExrate> 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<ChFeeExrate> 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 + " ))");

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<ChFeeExrate> exratelist, string companyid,string userid, bool custgroup = false)
+        public static DBResult AddBill(string billno,string duino, string billcust, string billcurr, string feesql, List<ChFeeExrate> 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 =

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<ChFeeExrate> exratelist, string companyid,string userid, bool custgroup = false)
+        public static DBResult AddBill(string billno, string billcust, string billcurr, string feesql, List<ChFeeExrate> 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<ChFeeDetail> feelist = new List<ChFeeDetail>();
                     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 =

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();
+                         this.Save('0', '0', true);
-                        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.onSubmitAuditClick();
                     },
                     scope: this

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);
 
 
 

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<Areas.Account.Models.ChfeeDetail.ChFeeDetail>();

DSWeb/Areas/MvcShipping/Views/MsOpAire/FeeAmendEdit.aspx

@@ -43,6 +43,8 @@
     }
     getSessgion6();
 </script>
+<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/DsAudit.js"></script>
+    
     <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/FeeMode.js"></script>
     <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/Comm/MonthField.js"></script>
     <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/FeeComm.js"></script>

DSWeb/Areas/MvcShipping/Views/MsOpAire/FeeEdit.aspx

@@ -43,6 +43,8 @@
     }
     getSessgion6();
 </script>
+<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/DsAudit.js"></script>
+    
     <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/FeeMode.js"></script>
     <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/FeeComm.js"></script>
     <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/FeeAudit.js"></script>

DSWeb/Areas/MvcShipping/Views/MsOpAiri/FeeAmendEdit.aspx

@@ -6,7 +6,8 @@
     <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/FeeComm.js"></script>
     <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/FeeAudit.js"></script>
     <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/FeeDrCrGridView.js"></script> 
-
+<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/DsAudit.js"></script>
+    
     <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/FeeAmendDrCrGrid.js"></script> 
     <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsOpAiri/MsOpAiriModel.js"></script>
     <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsOpAiri/AiriAmendFee.js"></script>

DSWeb/Areas/MvcShipping/Views/MsOpAiri/FeeEdit.aspx

@@ -43,6 +43,8 @@
     }
     getSessgion6();
 </script>
+    <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/DsAudit.js"></script>
+    
     <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/FeeMode.js"></script>
     <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/FeeComm.js"></script>
     <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/FeeAudit.js"></script>

DSWeb/Areas/MvcShipping/Views/MsOpApply/FeeAmendEdit.aspx

@@ -34,7 +34,8 @@
       getSessgion6();
 
 </script>  
-  
+<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/DsAudit.js"></script>
+      
     <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/FeeMode.js"></script>
     <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/Comm/MonthField.js"></script>
     <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/FeeComm.js"></script>

DSWeb/Areas/MvcShipping/Views/MsOpApply/FeeEdit.aspx

@@ -3,7 +3,8 @@
     
 <asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
     
-  
+  <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/DsAudit.js"></script>
+    
     <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/FeeMode.js"></script>
     <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/FeeComm.js"></script>
     <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/FeeAudit.js"></script>

DSWeb/Areas/MvcShipping/Views/MsOpOther/FeeAmendEdit.aspx

@@ -38,6 +38,8 @@
     getSessgion6();
 
 </script>
+    <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/DsAudit.js"></script>
+    
     <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/FeeMode.js"></script>
     <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/Comm/MonthField.js"></script>
     <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/FeeComm.js"></script>

DSWeb/Areas/MvcShipping/Views/MsOpOther/FeeEdit.aspx

@@ -31,6 +31,8 @@
         }
         getSessgion6();
     </script>
+    <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/DsAudit.js"></script>
+    
     <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/FeeMode.js"></script>
     <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/FeeComm.js"></script>
     <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/FeeAudit.js"></script>

DSWeb/Areas/MvcShipping/Views/MsOpSeai/FeeAmendEdit.aspx

@@ -43,7 +43,7 @@
         }
         getSessgion6();
     </script>
-
+    <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/DsAudit.js"></script>
     <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/FeeMode.js"></script>
     <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/Comm/MonthField.js"></script>
     <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/FeeComm.js"></script>

DSWeb/Areas/MvcShipping/Views/MsOpSeai/FeeEdit.aspx

@@ -46,7 +46,7 @@
         }
         getSessgion6();
     </script>
-
+    <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/DsAudit.js"></script>
     <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/FeeMode.js"></script>
     <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/FeeComm.js"></script>
     <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/FeeAudit.js"></script>

DSWeb/Areas/TruckMng/Views/PcHeadEdit_WFSD/Edit.aspx

@@ -52,7 +52,8 @@
     }
     getSessgion6();
 </script>
-
+<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/DsAudit.js"></script>
+    
 <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/FeeMode.js"></script>
 <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/FeeComm.js"></script>
 <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/FeeAudit.js"></script>

DSWeb/Areas/TruckMng/Views/PcHeadEdit_WFSD/FeeAmendEdit.aspx

@@ -44,7 +44,8 @@
     }
     getSessgion6();
 </script>
-
+<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/DsAudit.js"></script>
+    
     <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/FeeMode.js"></script>
     <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/Comm/MonthField.js"></script>
     <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/FeeComm.js"></script>

DSWeb/Areas/TruckMng/Views/PcHeadEdit_WFSD/FeeEdit.aspx

@@ -45,7 +45,8 @@
     }
     getSessgion6();
 </script>
-
+<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/DsAudit.js"></script>
+    
 <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/FeeMode.js"></script>
 <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/FeeComm.js"></script>
 <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/FeeAudit.js"></script>