diff --git a/BookingJieFeng/BookingJieFeng.csproj.user b/BookingJieFeng/BookingJieFeng.csproj.user
index 28be9c4c..a48b3371 100644
--- a/BookingJieFeng/BookingJieFeng.csproj.user
+++ b/BookingJieFeng/BookingJieFeng.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
diff --git a/BookingWeb/BookingWeb.csproj.user b/BookingWeb/BookingWeb.csproj.user
index 4edb5e0f..6bc24ada 100644
--- a/BookingWeb/BookingWeb.csproj.user
+++ b/BookingWeb/BookingWeb.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
diff --git a/DSWeb/Areas/Account/Viewsjs/Chfee_recvapplication/ChRecvapplicationBLEdit.js b/DSWeb/Areas/Account/Viewsjs/Chfee_recvapplication/ChRecvapplicationBLEdit.js
index 56bf7157..9d7e3930 100644
--- a/DSWeb/Areas/Account/Viewsjs/Chfee_recvapplication/ChRecvapplicationBLEdit.js
+++ b/DSWeb/Areas/Account/Viewsjs/Chfee_recvapplication/ChRecvapplicationBLEdit.js
@@ -1431,6 +1431,8 @@ Ext.extend(Shipping.MsChRecvapplicationBLEdit, Ext.Panel, {
         });
         this.StoreOpLb.add({ "OPLBNAME": "海运出口" });
         this.StoreOpLb.add({ "OPLBNAME": "海运进口" });
+        this.StoreOpLb.add({ "OPLBNAME": "空运出口" });
+        this.StoreOpLb.add({ "OPLBNAME": "空运进口" });
         this.StoreOpLb.add({ "OPLBNAME": "报关业务" });
         this.StoreOpLb.add({ "OPLBNAME": "进口贸易" });
         this.StoreOpLb.add({ "OPLBNAME": "大宗散货" });
diff --git a/DSWeb/Areas/CommMng/DAL/BasicDataRefDAL.cs b/DSWeb/Areas/CommMng/DAL/BasicDataRefDAL.cs
index 65854fe3..b8edcb12 100644
--- a/DSWeb/Areas/CommMng/DAL/BasicDataRefDAL.cs
+++ b/DSWeb/Areas/CommMng/DAL/BasicDataRefDAL.cs
@@ -3391,9 +3391,9 @@ namespace DSWeb.Areas.CommMng.DAL
                     data.GID = Convert.ToString(reader["GID"]);
                     data.LANEID = Convert.ToString(reader["LANEID"]);
                     if (lan=="en-us")
-                      data.LANE = Convert.ToString(reader["LANE"]);
+                      data.LANE = Convert.ToString(reader["LANEEN"]);
                     else
-                        data.LANE = Convert.ToString(reader["LANEEN"]);
+                        data.LANE = Convert.ToString(reader["LANE"]);
                     data.LANEEN = Convert.ToString(reader["LANEEN"]);
                     data.EDICODE = Convert.ToString(reader["EDICODE"]);
                     data.OP = Convert.ToString(reader["OP"]);
diff --git a/DSWeb/Areas/MvcShipping/DAL/MsCodeDuiTemplate/MsCodeDuiTemplateDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsCodeDuiTemplate/MsCodeDuiTemplateDAL.cs
index 734045cb..702722ae 100644
--- a/DSWeb/Areas/MvcShipping/DAL/MsCodeDuiTemplate/MsCodeDuiTemplateDAL.cs
+++ b/DSWeb/Areas/MvcShipping/DAL/MsCodeDuiTemplate/MsCodeDuiTemplateDAL.cs
@@ -35,7 +35,7 @@ namespace DSWeb.MvcShipping.DAL.MsCodeDuiTemplate
             var strSql = new StringBuilder();
             strSql.Append("SELECT ");
             strSql.Append("DM_ID");
-            strSql.Append(",NAME");
+            strSql.Append(",NAME,ENAME");
             strSql.Append(",REMARKS,INPUTBY,INPUTDATE");
             strSql.Append(" from code_dui_format  ");
 
@@ -83,6 +83,7 @@ namespace DSWeb.MvcShipping.DAL.MsCodeDuiTemplate
                     #region Set DB data to Object
                     data.DM_ID = Convert.ToString(reader["DM_ID"]);
                     data.NAME = Convert.ToString(reader["NAME"]);
+                    data.ENAME = Convert.ToString(reader["ENAME"]);
                     data.REMARKS = Convert.ToString(reader["REMARKS"]);
                     data.INPUTBY = Convert.ToString(reader["INPUTBY"]);
                     if (reader["INPUTDATE"] != DBNull.Value)
diff --git a/DSWeb/Areas/MvcShipping/DAL/MsRptSaleBalProfitShare/MsRptSaleBalProfitShareDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsRptSaleBalProfitShare/MsRptSaleBalProfitShareDAL.cs
index dab36667..da630276 100644
--- a/DSWeb/Areas/MvcShipping/DAL/MsRptSaleBalProfitShare/MsRptSaleBalProfitShareDAL.cs
+++ b/DSWeb/Areas/MvcShipping/DAL/MsRptSaleBalProfitShare/MsRptSaleBalProfitShareDAL.cs
@@ -67,7 +67,7 @@ namespace DSWeb.MvcShipping.DAL.MsRptSaleBalProfitShareDAL
                 }
                 strSql.Append(" GROUP BY BSNO ) T ON (T.BSNO=B.BSNO)  ");
             }
-            strSql.Append("LEFT JOIN op_sale_proftfee f ON (f.BSNO=B.BSNO)  where 1=1 ");
+            strSql.Append("LEFT JOIN op_sale_proftfee f ON (f.BSNO=B.BSNO)  where B.TTLDR<>0 ");
 
             if (!string.IsNullOrEmpty(strCondition))
             {
diff --git a/DSWeb/Areas/MvcShipping/Models/MsCodeDuiTemplate/CodeDuiTemplate.cs b/DSWeb/Areas/MvcShipping/Models/MsCodeDuiTemplate/CodeDuiTemplate.cs
index b19299e7..1b730df4 100644
--- a/DSWeb/Areas/MvcShipping/Models/MsCodeDuiTemplate/CodeDuiTemplate.cs
+++ b/DSWeb/Areas/MvcShipping/Models/MsCodeDuiTemplate/CodeDuiTemplate.cs
@@ -69,8 +69,8 @@ namespace DSWeb.MvcShipping.Models.MsCodeDuiTemplate
             set { _REMARKS = value; }
         }
 
-     
-
+        [ModelDB]
+        public string ENAME { get; set; }
 
         #endregion
     }
diff --git a/DSWeb/Areas/MvcShipping/Views/MsChFeeAgentDc/Index.aspx b/DSWeb/Areas/MvcShipping/Views/MsChFeeAgentDc/Index.aspx
index 6f482a38..d8412a06 100644
--- a/DSWeb/Areas/MvcShipping/Views/MsChFeeAgentDc/Index.aspx
+++ b/DSWeb/Areas/MvcShipping/Views/MsChFeeAgentDc/Index.aspx
@@ -9,7 +9,17 @@
          SHOWNAME = '<%= Session["SHOWNAME"] %>';
      }
      getSessgion3();
-     
+         var strLANGUAGES;
+    function getSessgion6() {
+        strLANGUAGES = '<%= Session["LANGUAGES"] %>'; //zh-cn-中文，en-us－英文
+        if (strLANGUAGES == "en-us") {
+            document.write('<script type=\"text/javascript\" src=\"../../../../Areas/MvcShipping/Viewsjs/MsChFeeAgent/Zi_en-us.js\"></sc' + 'ript>');
+        }
+        else {
+            document.write('<script type=\"text/javascript\" src=\"../../../../Areas/MvcShipping/Viewsjs/MsChFeeAgent/Zi_zh-cn.js\"></sc' + 'ript>');
+        }
+    }
+    getSessgion6();
 </script>       
 <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/Comm/TimePickerField.js"></script>
 <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/Comm/DateTimePicker.js"></script>
diff --git a/DSWeb/Areas/MvcShipping/Views/MsOpApply/Edit.aspx b/DSWeb/Areas/MvcShipping/Views/MsOpApply/Edit.aspx
index 5672cf80..e8535264 100644
--- a/DSWeb/Areas/MvcShipping/Views/MsOpApply/Edit.aspx
+++ b/DSWeb/Areas/MvcShipping/Views/MsOpApply/Edit.aspx
@@ -26,10 +26,12 @@
     function getSessgion6() {
         strLANGUAGES = '<%= Session["LANGUAGES"] %>'; //zh-cn-中文，en-us－英文
         if (strLANGUAGES == "en-us") {
+            document.write('<script type=\"text/javascript\" src=\"../../../../Areas/MvcShipping/Viewsjs/MsOpApply/Zi_en-us.js\"></sc' + 'ript>');
             document.write('<script type=\"text/javascript\" src=\"../../../../Areas/MvcShipping/Viewsjs/MsChFee/Zi_en-us.js\"></sc' + 'ript>');
         }
         else {
             document.write('<script type=\"text/javascript\" src=\"../../../../Areas/MvcShipping/Viewsjs/MsChFee/Zi_zh-cn.js\"></sc' + 'ript>');
+            document.write('<script type=\"text/javascript\" src=\"../../../../Areas/MvcShipping/Viewsjs/MsOpApply/Zi_zh-cn.js\"></sc' + 'ript>');
         }
     }
     getSessgion6();
diff --git a/DSWeb/Areas/MvcShipping/Views/MsOpApply/Index.aspx b/DSWeb/Areas/MvcShipping/Views/MsOpApply/Index.aspx
index ed3c1de1..d6c8ac2e 100644
--- a/DSWeb/Areas/MvcShipping/Views/MsOpApply/Index.aspx
+++ b/DSWeb/Areas/MvcShipping/Views/MsOpApply/Index.aspx
@@ -25,9 +25,11 @@
     function getSessgion6() {
         strLANGUAGES = '<%= Session["LANGUAGES"] %>'; //zh-cn-中文，en-us－英文
         if (strLANGUAGES == "en-us") {
+            document.write('<script type=\"text/javascript\" src=\"../../../../Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_en-us.js\"></sc' + 'ript>');
             document.write('<script type=\"text/javascript\" src=\"../../../../Areas/MvcShipping/Viewsjs/MsChFee/Zi_en-us.js\"></sc' + 'ript>');
         }
         else {
+            document.write('<script type=\"text/javascript\" src=\"../../../../Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_zh-cn.js\"></sc' + 'ript>');
             document.write('<script type=\"text/javascript\" src=\"../../../../Areas/MvcShipping/Viewsjs/MsChFee/Zi_zh-cn.js\"></sc' + 'ript>');
         }
     }
diff --git a/DSWeb/Areas/MvcShipping/Views/MsOpApply/LSEdit.aspx b/DSWeb/Areas/MvcShipping/Views/MsOpApply/LSEdit.aspx
index 3573c363..32f3b0ec 100644
--- a/DSWeb/Areas/MvcShipping/Views/MsOpApply/LSEdit.aspx
+++ b/DSWeb/Areas/MvcShipping/Views/MsOpApply/LSEdit.aspx
@@ -21,7 +21,17 @@
         SHOWNAME = '<%= Session["SHOWNAME"] %>';
     }
     getSessgion3();
-
+    var strLANGUAGES;
+    function getSessgion6() {
+        strLANGUAGES = '<%= Session["LANGUAGES"] %>'; //zh-cn-中文，en-us－英文
+        if (strLANGUAGES == "en-us") {
+            document.write('<script type=\"text/javascript\" src=\"../../../../Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_en-us.js\"></sc' + 'ript>');
+        }
+        else {
+            document.write('<script type=\"text/javascript\" src=\"../../../../Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_zh-cn.js\"></sc' + 'ript>');
+        }
+    }
+    getSessgion6();
 
 
 </script>
diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsChDui/MsChDuiBLEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsChDui/MsChDuiBLEdit.js
index 47134f8e..af40a042 100644
--- a/DSWeb/Areas/MvcShipping/Viewsjs/MsChDui/MsChDuiBLEdit.js
+++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsChDui/MsChDuiBLEdit.js
@@ -100,6 +100,12 @@ Ext.extend(Shipping.MsChDuiEdit, Ext.Panel, {
 
         });
 
+
+        var DuiTemplateFIELDNAME = 'NAME';
+        if (strLANGUAGES == "en-us") {
+            DuiTemplateFIELDNAME = 'ENAME';
+        }
+
         this.storeDuiTemplate = Ext.create('DsExt.ux.RefTableStore', {
             model: 'MsCodeDuiTemplate',
             proxy: { url: '/MvcShipping/MsCodeDuiTemplate/GetDataList' }
@@ -112,16 +118,23 @@ Ext.extend(Shipping.MsChDuiEdit, Ext.Panel, {
             forceSelection: true,
             name: 'DM_ID',
             valueField: 'DM_ID',
-            displayField: 'NAME'
+            displayField: DuiTemplateFIELDNAME
 
         });
 
+        var BLTYPEDFIELDNAME = 'EnumValueName';
+        if (strLANGUAGES == "en-us") {
+            BLTYPEDFIELDNAME = 'EnumValueName_2';
+        }
+
+
         this.storeDCType = Ext.create('DsExt.ux.RefEnumStore', {});
         this.storeDCType.load({ params: { enumTypeId: 96008} });
 
         this.comboxDCType = Ext.create('DsExt.ux.RefEnumCombox', {
             fieldLabel: Zi.LAN.zdantype, //账单类别
             store: this.storeDCType,
+            displayField: BLTYPEDFIELDNAME,
             forceSelection: true,
             name: 'DC'
         });
@@ -132,6 +145,7 @@ Ext.extend(Shipping.MsChDuiEdit, Ext.Panel, {
         this.comboxFeeType = Ext.create('DsExt.ux.RefEnumCombox', {
             fieldLabel: Zi.LAN.fyfanwei, //费用范围
             store: this.storeFeeType,
+            displayField: BLTYPEDFIELDNAME,
             forceSelection: true,
             name: 'ISNOSTL'
         });
@@ -140,8 +154,8 @@ Ext.extend(Shipping.MsChDuiEdit, Ext.Panel, {
         this.storeNOTAX = Ext.create('Ext.data.Store', {
             fields: ['DC', 'NAME']
         });
-        this.storeNOTAX.add({ "DC": "", "NAME": "含税" });
-        this.storeNOTAX.add({ "DC": "1", "NAME": "不含税" });
+        this.storeNOTAX.add({ "DC": "", "NAME": Zi.LAN.NOTAX });
+        this.storeNOTAX.add({ "DC": "1", "NAME": Zi.LAN.NOTAXYES});
 
         this.comboxNOTAX = Ext.create('DsExt.ux.RefTableCombox', {
             fieldLabel: Zi.LAN.ishanshui, //是否含税
@@ -288,16 +302,16 @@ Ext.extend(Shipping.MsChDuiEdit, Ext.Panel, {
                     scope: this
                 }, '-', {
                     id: 'btnSubmitAudit',
-                    text: '锁定', //锁定
-                    tooltip: '锁定',
+                    text: Zi.LAN.SubmitAudit, //锁定
+                    tooltip: Zi.LAN.SubmitAudit,
                     handler: function (button, event) {
                         this.onSubmitAuditClick();
                     },
                     scope: this
                 }, '-', {
                     id: 'btnSubmitAuditBack',
-                    text: '撤销锁定', //撤销锁定
-                    tooltip: '撤销锁定',
+                    text: Zi.LAN.SubmitAuditBack, //撤销锁定
+                    tooltip: Zi.LAN.SubmitAuditBack,
                     handler: function (button, event) {
                         this.onSubmitAuditBackClick();
                     },
@@ -448,23 +462,32 @@ Ext.extend(Shipping.MsChDuiEdit, Ext.Panel, {
             width: 60,
             renderer: function (value, meta) {
 
+
                 if (value == '审核通过') {
                     meta.tdCls = 'feestatus_pass';
+                    value = Zi.LAN.SHENHETONGGUO;
                 } else if (value == '录入状态') {
-
+                    value = Zi.LAN.LURUZHUAGNTAI;
                 } else if (value == '提交审核') {
                     meta.tdCls = 'feestatus_refer';
+                    value = Zi.LAN.TIJIAOSHENHE;
                 } else if (value == '部分结算') {
-                    meta.tdCls = 'feestatus_refer';
+                    meta.tdCls = 'feestatus_settlepart';
+                    value = Zi.LAN.BUFENJIESUAN;
                 } else if (value == '结算完毕') {
                     meta.tdCls = 'feestatus_settle';
+                    value = Zi.LAN.JIESUANWANBI;
                 } else if (value == '未录入') {
-                } else if (value == '部分结算') {
-                    meta.tdCls = 'feestatus_settle';
+                    value = Zi.LAN.WEILURU;
                 } else if (value == '部分审核') {
-                    meta.tdCls = 'feestatus_pass';
+                    meta.tdCls = 'feestatus_refer';
+                    value = Zi.LAN.BUFENSHENHE;
                 } else if (value == '部分提交') {
                     meta.tdCls = 'feestatus_refer';
+                    value = Zi.LAN.BUFENTIJIAO;
+                } else if (value == '驳回提交') {
+                    meta.tdCls = 'feestatus_nopass';
+                    value = Zi.LAN.BOHUITIJIAO;
                 }
                 return value;
             }
@@ -543,7 +566,7 @@ Ext.extend(Shipping.MsChDuiEdit, Ext.Panel, {
         }, {
             sortable: true,
             dataIndex: 'TTLDR',
-            header: '应收合计', //应收合计
+            header: Zi.LAN.countyings, //应收合计
             renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
             align: 'right',
             summaryType: 'sum',
@@ -555,7 +578,7 @@ Ext.extend(Shipping.MsChDuiEdit, Ext.Panel, {
         }, {
             sortable: true,
             dataIndex: 'BALTTLDR',
-            header: '未收合计', //未收合计
+            header: Zi.LAN.countweis, //未收合计
             renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
             align: 'right',
             summaryType: 'sum',
@@ -639,7 +662,7 @@ Ext.extend(Shipping.MsChDuiEdit, Ext.Panel, {
         }, {
             sortable: true,
             dataIndex: 'TTLCR',
-            header: '应付合计', //应付合计
+            header: Zi.LAN.yingfusum , //应付合计
             renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
             align: 'right',
             summaryType: 'sum',
@@ -651,7 +674,7 @@ Ext.extend(Shipping.MsChDuiEdit, Ext.Panel, {
         }, {
             sortable: true,
             dataIndex: 'BALTTLCR',
-            header: '未付合计', //未付合计
+            header: Zi.LAN.weifusum, //未付合计
             renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
             align: 'right',
             summaryType: 'sum',
@@ -663,7 +686,7 @@ Ext.extend(Shipping.MsChDuiEdit, Ext.Panel, {
         }, {
             sortable: true,
             dataIndex: 'RMBORDERINVOICEDR',
-            header: 'RMB发票申请', //未付合计
+            header: Zi.LAN.RMBORDERINVOICEDR, //未付合计
             renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
             align: 'right',
             summaryType: 'sum',
@@ -675,7 +698,7 @@ Ext.extend(Shipping.MsChDuiEdit, Ext.Panel, {
         }, {
             sortable: true,
             dataIndex: 'USDORDERINVOICEDR',
-            header: 'USD发票申请', //未付合计
+            header: Zi.LAN.USDORDERINVOICEDR, //未付合计
             renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
             align: 'right',
             summaryType: 'sum',
@@ -687,7 +710,7 @@ Ext.extend(Shipping.MsChDuiEdit, Ext.Panel, {
         }, {
             sortable: true,
             dataIndex: 'RMBORDERAMOUNTCR',
-            header: 'RMB申请金额', //未付合计
+            header: Zi.LAN.RMBORDERAMOUNTCR, //未付合计
             renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
             align: 'right',
             summaryType: 'sum',
@@ -699,7 +722,7 @@ Ext.extend(Shipping.MsChDuiEdit, Ext.Panel, {
         }, {
             sortable: true,
             dataIndex: 'USDORDERAMOUNTCR',
-            header: 'USD申请金额', //未付合计
+            header: Zi.LAN.USDORDERAMOUNTCR, //未付合计
             renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
             align: 'right',
             summaryType: 'sum',
@@ -784,7 +807,8 @@ Ext.extend(Shipping.MsChDuiEdit, Ext.Panel, {
                                  _this.gridListcolumns = DsTruck.SaveGridPanel(USERID, _this.formname + '_gridList', _this.gridList.columns, _this.gridListcolumns, 0, true);
 
                              }
-                         }, { text: '初始化', //初始化
+                    }, {
+                        text: Zi.LAN.Initialization, //初始化
                              handler: function (menu, event) {
                                  _this.gridList.reconfigure(_this.storeBodyList, _this.initgridListcolumns);
                                  _this.gridListcolumns = DsTruck.SaveGridPanel(USERID, _this.formname + '_gridList', _this.gridList.columns, _this.initgridListcolumns, 0, true);
@@ -792,7 +816,8 @@ Ext.extend(Shipping.MsChDuiEdit, Ext.Panel, {
                          }],
                 scope: this
             },
-                {   fieldLabel: "单号",
+                {
+                    fieldLabel: Zi.LAN.NO,
                     labelWidth:40,
                     xtype: 'textfield',
                     name: 'BSNO',
@@ -1700,25 +1725,25 @@ Ext.extend(Shipping.MsChDuiEdit, Ext.Panel, {
         this.storeFeeRange = Ext.create('Ext.data.Store', {
             fields: ['DC', 'NAME']
         });
-        this.storeFeeRange.add({ "DC": "", "NAME": "全部" });
-        this.storeFeeRange.add({ "DC": "B", "NAME": "未结费用" });
-        this.storeFeeRange.add({ "DC": "S", "NAME": "已结费用" });
-        this.storeFeeRange.add({ "DC": "审核通过", "NAME": "审核通过" });
-        this.storeFeeRange.add({ "DC": "已付未收", "NAME": "已付未收" });
-        this.storeFeeRange.add({ "DC": "已收未付", "NAME": "已收未付" });
-        this.storeFeeRange.add({ "DC": "未申请未结算", "NAME": "未申请未结算" });
-        this.storeFeeRange.add({ "DC": "仅已开发票", "NAME": "仅已开发票" });
-        this.storeFeeRange.add({ "DC": "仅未开发票", "NAME": "仅未开发票" });
-        this.storeFeeRange.add({ "DC": "仅已开发票未收款", "NAME": "仅已开发票未收款" });
-        this.storeFeeRange.add({ "DC": "仅已收款未开发票", "NAME": "仅已收款未开发票" });
-        this.storeFeeRange.add({ "DC": "仅未开票未申请未收款", "NAME": "仅未开票未申请未收款" });
-        this.storeFeeRange.add({ "DC": "仅已收款已开发票", "NAME": "仅已收款已开发票" });
-        this.storeFeeRange.add({ "DC": "仅未开票未收款", "NAME": "仅未开票未收款" });
-        this.storeFeeRange.add({ "DC": "审核通过未结算", "NAME": "审核通过未结算" });
+        this.storeFeeRange.add({ "DC": "", "NAME": Zi.LAN.FEERANGALL});
+        this.storeFeeRange.add({ "DC": "B", "NAME": Zi.LAN.FEERANGNOSTL });
+        this.storeFeeRange.add({ "DC": "S", "NAME": Zi.LAN.FEERANGSTL });
+        this.storeFeeRange.add({ "DC": "审核通过", "NAME": Zi.LAN.FEERANGAUDIT});
+        this.storeFeeRange.add({ "DC": "已付未收", "NAME": Zi.LAN.FEERANGYFWS });
+        this.storeFeeRange.add({ "DC": "已收未付", "NAME": Zi.LAN.FEERANGYSWF});
+        this.storeFeeRange.add({ "DC": "未申请未结算", "NAME": Zi.LAN.FEERANWSQWJS });
+        this.storeFeeRange.add({ "DC": "仅已开发票", "NAME": Zi.LAN.FEERANGJYKFP});
+        this.storeFeeRange.add({ "DC": "仅未开发票", "NAME": Zi.LAN.FEERANGJWKFP });
+        this.storeFeeRange.add({ "DC": "仅已开发票未收款", "NAME": Zi.LAN.FEERANGJYKFPWSK });
+        this.storeFeeRange.add({ "DC": "仅已收款未开发票", "NAME": Zi.LAN.FEERANGJYSKWKFP });
+        this.storeFeeRange.add({ "DC": "仅未开票未申请未收款", "NAME": Zi.LAN.FEERANGJWKPWSQWSK});
+        this.storeFeeRange.add({ "DC": "仅已收款已开发票", "NAME": Zi.LAN.FEERANGJYSKYKFP });
+        this.storeFeeRange.add({ "DC": "仅未开票未收款", "NAME": Zi.LAN.FEERANGJWKPWSK});
+        this.storeFeeRange.add({ "DC": "审核通过未结算", "NAME": Zi.LAN.FEERANGSHTGWJS });
 
 
         this.comboxaddFeeType = Ext.create('DsExt.ux.RefTableCombox', {
-            fieldLabel: '费用范围',
+            fieldLabel: Zi.LAN.fyfanwei,
             store: this.storeFeeRange,
             valueField: 'DC',
             displayField: 'NAME',
@@ -1752,9 +1777,9 @@ Ext.extend(Shipping.MsChDuiEdit, Ext.Panel, {
         this.storeINVSTATUS = Ext.create('Ext.data.Store', {
             fields: ['FSTATUS', 'NAME']
         });
-        this.storeINVSTATUS.add({ "FSTATUS": "", "NAME": "全部" });
-        this.storeINVSTATUS.add({ "FSTATUS": "0", "NAME": "仅开票" });
-        this.storeINVSTATUS.add({ "FSTATUS": "1", "NAME": "仅不开票" });
+        this.storeINVSTATUS.add({ "FSTATUS": "", "NAME": Zi.LAN.FEERANGALL });
+        this.storeINVSTATUS.add({ "FSTATUS": "0", "NAME": Zi.LAN.INVSTATUSYES });
+        this.storeINVSTATUS.add({ "FSTATUS": "1", "NAME": Zi.LAN.INVSTATUSNO  });
 
         this.comboxINVSTATUS = Ext.create('DsExt.ux.RefTableCombox', {
             fieldLabel: Zi.LAN.iskaipiao, //是否开票
@@ -1778,9 +1803,9 @@ Ext.extend(Shipping.MsChDuiEdit, Ext.Panel, {
         this.storeISADVANCEDPAY = Ext.create('Ext.data.Store', {
             fields: ['FSTATUS', 'NAME']
         });
-        this.storeISADVANCEDPAY.add({ "FSTATUS": "", "NAME": "全部" });
-        this.storeISADVANCEDPAY.add({ "FSTATUS": "0", "NAME": "仅未垫付" });
-        this.storeISADVANCEDPAY.add({ "FSTATUS": "1", "NAME": "仅垫付" });
+        this.storeISADVANCEDPAY.add({ "FSTATUS": "", "NAME": Zi.LAN.FEERANGALL});
+        this.storeISADVANCEDPAY.add({ "FSTATUS": "0", "NAME": Zi.LAN.ISADVANCEDPAYNO});
+        this.storeISADVANCEDPAY.add({ "FSTATUS": "1", "NAME": Zi.LAN.ISADVANCEDPAYYES });
 
         this.comboxISADVANCEDPAY = Ext.create('DsExt.ux.RefTableCombox', {
             fieldLabel: Zi.LAN.isdianfu, //是否开垫付
@@ -1904,8 +1929,8 @@ Ext.extend(Shipping.MsChDuiEdit, Ext.Panel, {
         this.storeHYF = Ext.create('Ext.data.Store', {
             fields: ['FSTATUS', 'NAME']
         });
-        this.storeHYF.add({ "FSTATUS": "", "NAME": "是" });
-        this.storeHYF.add({ "FSTATUS": "0", "NAME": "否" });
+        this.storeHYF.add({ "FSTATUS": "", "NAME": Zi.LAN.YES});
+        this.storeHYF.add({ "FSTATUS": "0", "NAME": Zi.LAN.NO});
 
         this.comboxHYF = Ext.create('DsExt.ux.RefTableCombox', {
             fieldLabel: Zi.LAN.hseayw, //含海运费业务
@@ -2166,8 +2191,8 @@ Ext.extend(Shipping.MsChDuiEdit, Ext.Panel, {
         this.storeISOPEN = Ext.create('Ext.data.Store', {
             fields: ['FSTATUS', 'NAME']
         });
-        this.storeISOPEN.add({ "FSTATUS": "1", "NAME": "公开" });
-        this.storeISOPEN.add({ "FSTATUS": "0", "NAME": "不公开" });
+        this.storeISOPEN.add({ "FSTATUS": "1", "NAME": Zi.LAN.GK });
+        this.storeISOPEN.add({ "FSTATUS": "0", "NAME": Zi.LAN.BGK });
 
         this.comboxISOPEN = Ext.create('DsExt.ux.RefTableCombox', {
             //            fieldLabel: '海运费',
@@ -2213,16 +2238,16 @@ Ext.extend(Shipping.MsChDuiEdit, Ext.Panel, {
             selModel: this.DocCM,
             selType: 'cellmodel',
             tbar: [{
-                text: '删除',
-                tooltip: '删除',
+                text: Zi.LAN.delete1,
+                tooltip: Zi.LAN.delete1,
                 iconCls: "btndeletedetail",
                 handler: function (button, event) {
                     this.onDelFileClick(button, event);
                 },
                 scope: this
             }, '-', {
-                text: '上传附件',
-                tooltip: '上传附件',
+                    text: Zi.LAN.UpLoadFile,
+                    tooltip: Zi.LAN.UpLoadFile,
                 iconCls: "btnadddetail",
                 handler: function (button, event) {
                     this.onUpLoadFileClick(button, event);
@@ -2250,7 +2275,7 @@ Ext.extend(Shipping.MsChDuiEdit, Ext.Panel, {
             {
                 sortable: true,
                 dataIndex: 'URL',
-                header: '文件名',
+                header: Zi.LAN.FileName,
                 width: 200,
                 renderer: function (value, p, record) {
                     return '<a href="' + record.data.Driect_URL + '"  target="_blank" style=' + '"text-decoration:none"' + ' >' + value + '</a>';
@@ -2259,7 +2284,7 @@ Ext.extend(Shipping.MsChDuiEdit, Ext.Panel, {
             {
                 sortable: true,
                 dataIndex: 'RECEIPTTYPE',
-                header: '附件类型',
+                header: Zi.LAN.RECEIPTTYPE,
                 width: 135
             },
             {
@@ -2277,36 +2302,36 @@ Ext.extend(Shipping.MsChDuiEdit, Ext.Panel, {
             {
                 sortable: true,
                 dataIndex: 'MODIFIEDUSERRef',
-                header: '上传人',
+                header: Zi.LAN.MODIFIEDUSERRef,
                 width: 80
             },
             {
                 sortable: true,
                 dataIndex: 'MODIFIEDTIME',
-                header: '上传时间',
+                header: Zi.LAN.MODIFIEDTIME ,
                 width: 135
             },
             {
                 sortable: true,
                 dataIndex: 'DOCUMENTATTACHEDCODE',
-                header: '随附单证代码', //需求编号：SR2017081100003
+                header: Zi.LAN.DOCUMENTATTACHEDCODE, //需求编号：SR2017081100003
                 width: 120
             },
             {
                 sortable: true,
                 dataIndex: 'DOCUMENTATTACHEDNO',
-                header: '随附单证编号', //需求编号：SR2017081100003
+                header: Zi.LAN.DOCUMENTATTACHEDNO, //需求编号：SR2017081100003
                 width: 120
             }, {
                 sortable: true,
                 dataIndex: 'ISPUBLIC',
-                header: '是否公开',
+                header: Zi.LAN.GK,
                 editor: this.comboxISOPEN,
                 width: 80,
                 renderer: function (value, cellmeta) {
                     if (value == '1') {
-                        return "公开";
-                    } else return "不公开";
+                        return Zi.LAN.GK;
+                    } else return Zi.LAN.BGK ;
                 }
             }
             ]
@@ -2341,7 +2366,7 @@ Ext.extend(Shipping.MsChDuiEdit, Ext.Panel, {
             id: "panelDoc",
             layout: "border",
             region: "center",
-            title: "附件", //账单明细
+            title: Zi.LAN.panelDoc, //账单明细
             //autoScroll: true,
             frame: false,
 //            split: true,
@@ -4129,7 +4154,7 @@ Ext.extend(Shipping.MsChDuiEdit, Ext.Panel, {
         });
         this.storeFileType.load({ params: { condition: " and EnumTypeID=97048" } });
         var comboxFileType = Ext.create('DsExt.ux.RefTableCombox', {
-            fieldLabel: '附件类型',
+            fieldLabel: Zi.LAN.RECEIPTTYPE,
             store: this.storeFileType,
             forceSelection: true,
             id: 'FILETYPE',
@@ -4151,9 +4176,9 @@ Ext.extend(Shipping.MsChDuiEdit, Ext.Panel, {
                 xtype: 'fileuploadfield',
                 id: 'LoadFile',
                 name: 'LoadFile',
-                emptyText: '请选择文件',
-                fieldLabel: '文件',
-                buttonText: '选择文件',
+                emptyText: Zi.LAN.QingXuanZeWeiJian,
+                fieldLabel: Zi.LAN.WenJiAN ,
+                buttonText: Zi.LAN.XZWenJiAN,
                 allowBlank: false,
                 buttonCfg: { iconCls: 'uploaddialog' },
                 anchor: '98%'
@@ -4161,15 +4186,15 @@ Ext.extend(Shipping.MsChDuiEdit, Ext.Panel, {
                 xtype: 'textfield',
                 id: 'DOCUMENTATTACHEDCODE',
                 name: 'DOCUMENTATTACHEDCODE',
-                fieldLabel: '随附单证代码'//需求编号：SR2017081100003
+                    fieldLabel: Zi.LAN.DOCUMENTATTACHEDCODE//需求编号：SR2017081100003
             }, {
                 xtype: 'textfield',
                 id: 'DOCUMENTATTACHEDNO',
                 name: 'DOCUMENTATTACHEDNO',
-                fieldLabel: '随附单证编号'//需求编号：SR2017081100003
+                    fieldLabel: Zi.LAN.DOCUMENTATTACHEDNO//需求编号：SR2017081100003
             }],
             buttons: [{
-                text: '上传',
+                text: Zi.LAN.ShangChuan,
                 type: 'submit',
                 handler: function () {
                     var UserFilePath = Ext.getCmp('LoadFile').getValue();
@@ -4193,7 +4218,7 @@ Ext.extend(Shipping.MsChDuiEdit, Ext.Panel, {
                         },
                         success: function (form, action) {
                             win.close(this);
-                            Ext.Msg.show({ title: '提示', msg: '上传成功!', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
+                            Ext.Msg.show({ title: Zi.LAN.Prompt, msg: Zi.LAN.CaoZuoChengGong, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
                             var condition = billno;
                             var condition2 = " BSNO='" + condition + "' ";
                             me.Loading = true;
@@ -4215,7 +4240,7 @@ Ext.extend(Shipping.MsChDuiEdit, Ext.Panel, {
                     });
                 }
             }, {
-                text: '关闭',
+                    text: Zi.LAN.close,
                 type: 'submit',
                 handler: function () {
                     win.close(this);
@@ -4224,7 +4249,7 @@ Ext.extend(Shipping.MsChDuiEdit, Ext.Panel, {
         });
 
         var win = new Ext.Window({
-            title: "上传文件",
+            title: Zi.LAN.UpLoadFile,
             width: 360,
             height: 200,
             modal: true,
@@ -4361,7 +4386,7 @@ Ext.extend(Shipping.MsChDuiEdit, Ext.Panel, {
 
                     }
                 } else {
-                    Ext.MessageBox.alert('请求出现错误,请重试', response.responseText);
+                    Ext.MessageBox.alert(Zi.LAN.qqerror, response.responseText);
                 }
             },
             scope: this
diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsChDui/MsChDuiIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsChDui/MsChDuiIndex.js
index c7a23705..072088d2 100644
--- a/DSWeb/Areas/MvcShipping/Viewsjs/MsChDui/MsChDuiIndex.js
+++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsChDui/MsChDuiIndex.js
@@ -685,7 +685,7 @@ Ext.extend(Shipping.MsChDuiIndex, Ext.Panel, {
                     scope: this
                 }, {
                     xtype: 'button',
-                    text: "高级查询",
+                    text: Zi.LAN.AdvancedSearch,
                     iconCls: "btnmore",
                     handler: function (button, event) {
                         var sql = this.getCondition();
@@ -702,17 +702,17 @@ Ext.extend(Shipping.MsChDuiIndex, Ext.Panel, {
                     },
                     scope: this
                 }, '-', {
-                    text: '打印',
-                    tooltip: '打印报表',
+                    text: Zi.LAN.Print,
+                    tooltip: Zi.LAN.Print,
                     menu:
                         [
                             {
-                                text: "打印列表",
+                                text: Zi.LAN.PrintAll,
                                 handler: function (menu, event) {
                                     _this.Print(menu, event);
                                 }
                             }, {
-                                text: "打印选中",
+                                text: Zi.LAN.PrintSelect,
                                 handler: function (menu, event) {
                                     _this.PrintSelect(menu, event);
                                 }
diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsChDui/Zi_en-us.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsChDui/Zi_en-us.js
index e5f3da2b..893da65a 100644
--- a/DSWeb/Areas/MvcShipping/Viewsjs/MsChDui/Zi_en-us.js
+++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsChDui/Zi_en-us.js
@@ -165,6 +165,71 @@ Zi.LAN.btnENext = "下一票";
 Zi.LAN.btnEPrev = "上一票";
 Zi.LAN.YiShiZuiHouYiPiao = "已是最后一票"
 Zi.LAN.YiShiZuiQianYiPiao = "已是最前一票"
+Zi.LAN.AdvancedSearch = "高级查询";
+Zi.LAN.Print = "打印";
+Zi.LAN.PrintAll = "打印列表";
+Zi.LAN.PrintSelect = "打印选中";
+Zi.LAN.SubmitAudit = "锁定";
+Zi.LAN.SubmitAuditBack = "撤销锁定";
+Zi.LAN.WEITIJIAO = "未提交";
+Zi.LAN.ZHENGPIAOTIJIAO = "整票提交";
+Zi.LAN.SHENHETONGGUO = "审核通过";
+Zi.LAN.ZHENGPIAOBOHUI = "整票驳回";
+Zi.LAN.LURUZHUAGNTAI = "录入状态";
+Zi.LAN.TIJIAOSHENHE = "提交审核";
+Zi.LAN.BUFENJIESUAN = "部分结算";
+Zi.LAN.JIESUANWANBI = "结算完毕";
+Zi.LAN.WEILURU = "未录入";
+Zi.LAN.BUFENSHENHE = "部分审核";
+Zi.LAN.BUFENTIJIAO = "部分提交";
+Zi.LAN.BOHUITIJIAO = "驳回提交";
+Zi.LAN.YIKAIPIAO = "已开票";
+Zi.LAN.BOFENKAIPIAO = "部分开票";
+Zi.LAN.YIDUIZHANG = "已对账";
+Zi.LAN.BUFENDUIZHANG = "部分对账";
+Zi.LAN.RMBORDERINVOICEDR = "RMB发票申请";
+Zi.LAN.USDORDERINVOICEDR = "USD发票申请";
+Zi.LAN.RMBORDERAMOUNTCR = "RMB申请金额";
+Zi.LAN.USDORDERAMOUNTCR = "USD申请金额";
+Zi.LAN.NO = "单号";
+Zi.LAN.FEERANGALL = "全部";
+Zi.LAN.FEERANGNOSTL = "未结费用";
+Zi.LAN.FEERANGSTL = "已结费用";
+Zi.LAN.FEERANGAUDIT = "审核通过";
+Zi.LAN.FEERANGYFWS = "已付未收";
+Zi.LAN.FEERANGYSWF = "已收未付";
+Zi.LAN.FEERANWSQWJS = "未申请未结算";
+Zi.LAN.FEERANGJYKFP = "仅已开发票";
+Zi.LAN.FEERANGJWKFP = "仅未开发票";
+Zi.LAN.FEERANGJYKFPWSK = "仅已开发票未收款";
+Zi.LAN.FEERANGJYSKWKFP = "仅已收款未开发票";
+Zi.LAN.FEERANGJWKPWSQWSK = "仅未开票未申请未收款";
+Zi.LAN.FEERANGJYSKYKFP = "仅已收款已开发票";
+Zi.LAN.FEERANGJWKPWSK = "仅未开票未收款";
+Zi.LAN.FEERANGSHTGWJS = "审核通过未结算";
+Zi.LAN.INVSTATUSYES = "仅开票";
+Zi.LAN.INVSTATUSNO = "仅不开票";
+Zi.LAN.ISADVANCEDPAYYES = "仅垫付";
+Zi.LAN.ISADVANCEDPAYNO = "仅未垫付";
+Zi.LAN.YES = "是";
+Zi.LAN.NO = "否";
+Zi.LAN.GK = "公开";
+Zi.LAN.BGK = "不公开";
+Zi.LAN.UpLoadFile = "上传附件";
+Zi.LAN.FileName = "文件名";
+Zi.LAN.RECEIPTTYPE = "附件类型";
+Zi.LAN.MODIFIEDUSERRef = "上传人";
+Zi.LAN.MODIFIEDTIME = "上传时间";
+Zi.LAN.DOCUMENTATTACHEDCODE = "随附单证代码";
+Zi.LAN.DOCUMENTATTACHEDNO = "随附单证编号";
+Zi.LAN.panelDoc = "附件";
+Zi.LAN.ShangChuan = "上传";
+Zi.LAN.WenJiAN = "文件";
+Zi.LAN.XZWenJiAN = "选择文件";
+Zi.LAN.CaoZuoChengGong = "操作成功！";
+Zi.LAN.QingXuanZeWeiJian = "请选择文件";
+Zi.LAN.NOTAX = "含税";
+Zi.LAN.NOTAXYES = "不含税";
 //#endregion	
 	
 
diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsChDui/Zi_zh-cn.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsChDui/Zi_zh-cn.js
index 895da123..a4cc365d 100644
--- a/DSWeb/Areas/MvcShipping/Viewsjs/MsChDui/Zi_zh-cn.js
+++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsChDui/Zi_zh-cn.js
@@ -167,4 +167,69 @@ Zi.LAN.ATD = "ATD";
 Zi.LAN.btnENext = "下一票";
 Zi.LAN.btnEPrev = "上一票";
 Zi.LAN.YiShiZuiHouYiPiao = "已是最后一票"
-Zi.LAN.YiShiZuiQianYiPiao = "已是最前一票"
\ No newline at end of file
+Zi.LAN.YiShiZuiQianYiPiao = "已是最前一票"
+Zi.LAN.AdvancedSearch = "高级查询";
+Zi.LAN.Print = "打印";
+Zi.LAN.PrintAll = "打印列表";
+Zi.LAN.PrintSelect = "打印选中";
+Zi.LAN.SubmitAudit = "锁定";
+Zi.LAN.SubmitAuditBack = "撤销锁定";
+Zi.LAN.WEITIJIAO = "未提交";
+Zi.LAN.ZHENGPIAOTIJIAO = "整票提交";
+Zi.LAN.SHENHETONGGUO = "审核通过";
+Zi.LAN.ZHENGPIAOBOHUI = "整票驳回";
+Zi.LAN.LURUZHUAGNTAI = "录入状态";
+Zi.LAN.TIJIAOSHENHE = "提交审核";
+Zi.LAN.BUFENJIESUAN = "部分结算";
+Zi.LAN.JIESUANWANBI = "结算完毕";
+Zi.LAN.WEILURU = "未录入";
+Zi.LAN.BUFENSHENHE = "部分审核";
+Zi.LAN.BUFENTIJIAO = "部分提交";
+Zi.LAN.BOHUITIJIAO = "驳回提交";
+Zi.LAN.YIKAIPIAO = "已开票";
+Zi.LAN.BOFENKAIPIAO = "部分开票";
+Zi.LAN.YIDUIZHANG = "已对账";
+Zi.LAN.BUFENDUIZHANG = "部分对账";
+Zi.LAN.RMBORDERINVOICEDR = "RMB发票申请";
+Zi.LAN.USDORDERINVOICEDR = "USD发票申请";
+Zi.LAN.RMBORDERAMOUNTCR = "RMB申请金额";
+Zi.LAN.USDORDERAMOUNTCR = "USD申请金额";
+Zi.LAN.NO = "单号";
+Zi.LAN.FEERANGALL = "全部";
+Zi.LAN.FEERANGNOSTL = "未结费用";
+Zi.LAN.FEERANGSTL = "已结费用";
+Zi.LAN.FEERANGAUDIT = "审核通过";
+Zi.LAN.FEERANGYFWS = "已付未收";
+Zi.LAN.FEERANGYSWF = "已收未付";
+Zi.LAN.FEERANWSQWJS = "未申请未结算";
+Zi.LAN.FEERANGJYKFP = "仅已开发票";
+Zi.LAN.FEERANGJWKFP = "仅未开发票";
+Zi.LAN.FEERANGJYKFPWSK = "仅已开发票未收款";
+Zi.LAN.FEERANGJYSKWKFP= "仅已收款未开发票";
+Zi.LAN.FEERANGJWKPWSQWSK = "仅未开票未申请未收款";
+Zi.LAN.FEERANGJYSKYKFP= "仅已收款已开发票";
+Zi.LAN.FEERANGJWKPWSK = "仅未开票未收款";
+Zi.LAN.FEERANGSHTGWJS = "审核通过未结算";
+Zi.LAN.INVSTATUSYES = "仅开票";
+Zi.LAN.INVSTATUSNO = "仅不开票";
+Zi.LAN.ISADVANCEDPAYYES = "仅垫付";
+Zi.LAN.ISADVANCEDPAYNO = "仅未垫付";
+Zi.LAN.YES = "是";
+Zi.LAN.NO = "否";
+Zi.LAN.GK = "公开";
+Zi.LAN.BGK = "不公开";
+Zi.LAN.UpLoadFile = "上传附件";
+Zi.LAN.FileName = "文件名";
+Zi.LAN.RECEIPTTYPE = "附件类型";
+Zi.LAN.MODIFIEDUSERRef = "上传人";
+Zi.LAN.MODIFIEDTIME = "上传时间";
+Zi.LAN.DOCUMENTATTACHEDCODE = "随附单证代码";
+Zi.LAN.DOCUMENTATTACHEDNO = "随附单证编号";
+Zi.LAN.panelDoc = "附件";
+Zi.LAN.ShangChuan = "上传";
+Zi.LAN.WenJiAN = "文件";
+Zi.LAN.XZWenJiAN = "选择文件";
+Zi.LAN.CaoZuoChengGong = "操作成功！";
+Zi.LAN.QingXuanZeWeiJian = "请选择文件";
+Zi.LAN.NOTAX = "含税";
+Zi.LAN.NOTAXYES = "不含税";
\ No newline at end of file
diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsChFeeAgent/MsChFeeAgentDcEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsChFeeAgent/MsChFeeAgentDcEdit.js
index d75dd782..74e1714b 100644
--- a/DSWeb/Areas/MvcShipping/Viewsjs/MsChFeeAgent/MsChFeeAgentDcEdit.js
+++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsChFeeAgent/MsChFeeAgentDcEdit.js
@@ -45,7 +45,7 @@ Ext.extend(Shipping.MsChFeeAgentDcEdit, Ext.Panel, {
         });
         //车队
         this.comboxAGENT = Ext.create('DsExt.ux.RefTableCombox', {
-            fieldLabel: '国外代理',
+            fieldLabel: Zi.LAN.AGENT,
             store: this.storeAgent,
             name: 'AGENT',
             queryMode: 'remote',
@@ -74,7 +74,7 @@ Ext.extend(Shipping.MsChFeeAgentDcEdit, Ext.Panel, {
         });
         //车队
         this.comboxFeeAGENT = Ext.create('DsExt.ux.RefTableCombox', {
-            fieldLabel: '费用代理',
+            fieldLabel: Zi.LAN.FEEAGENT,
             store: this.storeAgent,
             queryMode: 'remote',
             minChars: 0,
@@ -92,7 +92,7 @@ Ext.extend(Shipping.MsChFeeAgentDcEdit, Ext.Panel, {
         this.storeFeeNameRefDC.load({ params: { condition: "" } });
         this.comboxFeeNameRefDC = Ext.create('DsExt.ux.RefTableCombox', {
             store: this.storeFeeNameRefDC,
-            fieldLabel: '费用名称',
+            fieldLabel: Zi.LAN.FEENAME,
             forceSelection: true,
             name: 'FEENAME',
             valueField: 'Name',
@@ -113,7 +113,7 @@ Ext.extend(Shipping.MsChFeeAgentDcEdit, Ext.Panel, {
 
         this.comboxCurrDC = Ext.create('DsExt.ux.RefTableCombox', {
             store: this.StoreCurrDC,
-            fieldLabel: '币别',
+            fieldLabel: Zi.LAN.CURRENCY,
             forceSelection: true,
             name: 'CURRENCY',
             valueField: 'CURR',
@@ -150,17 +150,17 @@ Ext.extend(Shipping.MsChFeeAgentDcEdit, Ext.Panel, {
         }, {
             sortable: true,
             dataIndex: 'DCNO',
-            header: '账单编号',
+                header: Zi.LAN.DCNO,
             width: 120
         }, {
             sortable: true,
             dataIndex: 'CREATEUSERREF',
-            header: '录入人',
+                header: Zi.LAN.CREATEUSERREF,
             width: 80
         }, {
             sortable: true,
             dataIndex: 'CREATETIME',
-            header: '录入日期',
+                header: Zi.LAN.CREATETIME,
             width: 80
         }
         ];
@@ -171,15 +171,15 @@ Ext.extend(Shipping.MsChFeeAgentDcEdit, Ext.Panel, {
             enableHdMenu: false,
             region: 'west',
             width: 300,
-            loadMask: { msg: "数据加载中，请稍等..." },
+            loadMask: { msg: Zi.LAN.ShuJuJiaZaiZhongQingShaoDeng},
             trackMouseOver: true,
             disableSelection: false,
             columns: this.girdcolums,
             bbar: Ext.create('Ext.PagingToolbar', {
                 store: this.storeList,
                 displayInfo: true,
-                displayMsg: '当前显示 {0} - {1}条记录 /共 {2}条记录',
-                emptyMsg: "没有数据"
+                displayMsg: Zi.LAN.displayMsg,
+                emptyMsg: Zi.LAN.emptyMsg
             })
         });
 
@@ -272,12 +272,12 @@ Ext.extend(Shipping.MsChFeeAgentDcEdit, Ext.Panel, {
             width: 0
         }, {
             dataIndex: 'FEENAME',
-            header: '费用名称', //'箱型',
+                header: Zi.LAN.FEENAME , //'箱型',
             width: 125,
             editor: this.comboxFeeNameRef
         }, {
             dataIndex: 'FEEENAME',
-            header: '费用英文名', //'重量',
+                header: Zi.LAN.FeeDescription, //'重量',
             width: 120,
             editor: {
                 xtype: 'textfield',
@@ -286,12 +286,12 @@ Ext.extend(Shipping.MsChFeeAgentDcEdit, Ext.Panel, {
         }, {
             sortable: true,
             dataIndex: 'CURRENCY',
-            header: '币别', //'币别',
+                header: Zi.LAN.CURRENCY, //'币别',
             editor: this.comboxCurr,
             width: 100
         }, {
             dataIndex: 'EXCHANGERATE',
-            header: '汇率', //'箱量',
+                header: Zi.LAN.EXCHANGERATE, //'箱量',
             width: 100,
             editor: {
                 xtype: 'numberfield',
@@ -300,7 +300,7 @@ Ext.extend(Shipping.MsChFeeAgentDcEdit, Ext.Panel, {
             }
         }, {
             dataIndex: 'DRPP',
-            header: '应收PP', //'箱量',
+                header: Zi.LAN.DRPP, //'箱量',
             width: 100,
             editor: {
                 xtype: 'numberfield',
@@ -309,7 +309,7 @@ Ext.extend(Shipping.MsChFeeAgentDcEdit, Ext.Panel, {
             }
         }, {
             dataIndex: 'DRCC',
-            header: '应收CC', //'箱量',
+                header: Zi.LAN.DRCC, //'箱量',
             width: 100,
             editor: {
                 xtype: 'numberfield',
@@ -318,7 +318,7 @@ Ext.extend(Shipping.MsChFeeAgentDcEdit, Ext.Panel, {
             }
         }, {
             dataIndex: 'CRPP',
-            header: '应付PP', //'箱量',
+                header: Zi.LAN.CRPP, //'箱量',
             width: 100,
             editor: {
                 xtype: 'numberfield',
@@ -327,7 +327,7 @@ Ext.extend(Shipping.MsChFeeAgentDcEdit, Ext.Panel, {
             }
         }, {
             dataIndex: 'CRCC',
-            header: '应付CC', //'箱量',
+                header: Zi.LAN.CRCC, //'箱量',
             width: 100,
             editor: {
                 xtype: 'numberfield',
@@ -336,7 +336,7 @@ Ext.extend(Shipping.MsChFeeAgentDcEdit, Ext.Panel, {
             }
         }, {
             dataIndex: 'FZPR',
-            header: '分账比例%', //'重量',
+                header: Zi.LAN.FZPR, //'重量',
             width: 80,
             editor: {
                 xtype: 'numberfield',
@@ -345,7 +345,7 @@ Ext.extend(Shipping.MsChFeeAgentDcEdit, Ext.Panel, {
             }
         }, {
             dataIndex: 'AMOUNTDR',
-            header: '应收金额', //'箱量',
+                header: Zi.LAN.AMOUNTDR, //'箱量',
             width: 100,
             editor: {
                 xtype: 'numberfield',
@@ -354,7 +354,7 @@ Ext.extend(Shipping.MsChFeeAgentDcEdit, Ext.Panel, {
             }
         }, {
             dataIndex: 'AMOUNTCR',
-            header: '应付金额', //'箱量',
+                header: Zi.LAN.AMOUNTCR, //'箱量',
             width: 100,
             editor: {
                 xtype: 'numberfield',
@@ -364,7 +364,7 @@ Ext.extend(Shipping.MsChFeeAgentDcEdit, Ext.Panel, {
         }, {
             sortable: true,
             dataIndex: 'UNITPRICE',
-            header: '单价', //'单价',
+                header: Zi.LAN.UNITPRICE, //'单价',
             editor: {
                 xtype: 'numberfield',
                 keyNavEnabled: false,
@@ -378,12 +378,12 @@ Ext.extend(Shipping.MsChFeeAgentDcEdit, Ext.Panel, {
         }, {
             sortable: true,
             dataIndex: 'UNIT',
-            header: '标准', //'标准',
+                header: Zi.LAN.UNIT, //'标准',
             editor: this.comboxFeeUnit,
             width: 80
         }, {
             dataIndex: 'QUANTITY',
-            header: '数量', //'箱量',
+                header: Zi.LAN.QUANTITY, //'箱量',
             width: 100,
             editor: {
                 xtype: 'numberfield',
@@ -392,7 +392,7 @@ Ext.extend(Shipping.MsChFeeAgentDcEdit, Ext.Panel, {
             }
         }, {
             dataIndex: 'FEEDESCRIPTION',
-            header: '费用说明', //'重量',
+                header: Zi.LAN.FEEDESCRIPTION, //'重量',
             width: 120,
             editor: {
                 xtype: 'textfield',
@@ -407,7 +407,7 @@ Ext.extend(Shipping.MsChFeeAgentDcEdit, Ext.Panel, {
             store: this.storeDetailList,
             enableHdMenu: false,
             region: 'center',
-            loadMask: { msg: "数据加载中，请稍等..." },
+            loadMask: { msg: Zi.LAN.ShuJuJiaZaiZhongQingShaoDeng },
             trackMouseOver: true,
             disableSelection: false,
             plugins: [this.gridListCellEditing],
@@ -415,8 +415,8 @@ Ext.extend(Shipping.MsChFeeAgentDcEdit, Ext.Panel, {
 
             tbar: [
                 {
-                    text: '增加明细', //'增加明细',
-                    tooltip: '增加明细', //'增加明细',
+                    text: Zi.LAN.btnAddDetail, //'增加明细',
+                    tooltip: Zi.LAN.btnAddDetail, //'增加明细',
                     id: "btnadddetail",
                     iconCls: "btnadddetail",
                     handler: function (button, event) {
@@ -424,16 +424,16 @@ Ext.extend(Shipping.MsChFeeAgentDcEdit, Ext.Panel, {
                     },
                     scope: this
                 }, '-', {
-                    text: '模板引入', 
-                    tooltip: '模板引入', 
+                    text: Zi.LAN.templateAdd , 
+                    tooltip: Zi.LAN.templateAdd , 
                     iconCls: "btnadddetail",
                     handler: function (button, event) {
                         this.templateAdd();
                     },
                     scope: this
                 }, '-', {
-                    text: '删除明细', //'删除明细',
-                    tooltip: '删除明细', //'删除明细',
+                    text: Zi.LAN.btnDeleteDetail , //'删除明细',
+                    tooltip: Zi.LAN.btnDeleteDetail , //'删除明细',
                     id: "btndeldetail",
                     iconCls: "btndeletedetail",
                     handler: function (button, event) {
@@ -441,16 +441,16 @@ Ext.extend(Shipping.MsChFeeAgentDcEdit, Ext.Panel, {
                     },
                     scope: this
                 }, {
-                    text: '保存列表样式', //保存列表样式
+                    text: Zi.LAN.SavelistStyle, //保存列表样式
                     id: "btntestbody",
                     menu: [
                         {
-                            text: '保存', //保存
+                            text: Zi.LAN.btnSave, //保存
                             handler: function (button, event) {
                                 _this.girdbillcolums = DsTruck.SaveGridPanel(USERID, _this.formname, _this.gridListDetail.columns, _this.girdbillcolums, 1, true);
                             }
                         }, {
-                            text: '初始化', //初始化
+                            text: Zi.LAN.Initialization, //初始化
                             handler: function (menu, event) {
                                 _this.girdbillcolums = DsTruck.SaveGridPanel(USERID, _this.formname, _this.gridListDetail.columns, _this.initgirdbillcolums, 1, true);
                             }
@@ -521,19 +521,19 @@ Ext.extend(Shipping.MsChFeeAgentDcEdit, Ext.Panel, {
                         name: 'CREATEUSER'
                     }
                     , {
-                        fieldLabel: '账单编号',
+                        fieldLabel: Zi.LAN.DCNO,
                     readOnly: true,
                         name: 'DCNO'
                 }, this.comboxAGENT
 
                     , {
-                    fieldLabel: '录入人',
+                        fieldLabel: Zi.LAN.CREATEUSERREF,
                     name: 'CREATEUSERREF'
                 }, {
-                    fieldLabel: '录入时间',
+                        fieldLabel: Zi.LAN.CREATETIME,
                     name: 'CREATETIME'
                     }, {
-                        fieldLabel: '类型',
+                        fieldLabel: Zi.LAN.FEETYPEREF ,
                         name: 'DCTYPE'
                     }
 
@@ -546,13 +546,13 @@ Ext.extend(Shipping.MsChFeeAgentDcEdit, Ext.Panel, {
                 layout: 'hbox',
                 defaultType: 'textfield',
                 items: [this.comboxFeeAGENT, this.comboxFeeNameRefDC, this.comboxCurrDC, {
-                    fieldLabel: '对美元汇率', //'汇率',
+                    fieldLabel: Zi.LAN.EXCHANGERATE, //'汇率',
                     xtype: 'numberfield',
                     //labelWidth: 40,
                     decimalPrecision: 6,
                     name: 'EXCHANGERATE'
                 }, {
-                        fieldLabel: '生成费用',
+                        fieldLabel: Zi.LAN.ISCREATEFEEREF,
                         name: 'ISCREATEFEEREF'
                     }]
             }, this.panelBodyDetail
@@ -562,15 +562,15 @@ Ext.extend(Shipping.MsChFeeAgentDcEdit, Ext.Panel, {
                 layout: 'hbox',
                 defaultType: 'textfield',
                 items: [{
-                    fieldLabel: '应收金额',
+                    fieldLabel: Zi.LAN.AMOUNTDR ,
                     readOnly: true,
                     name: 'AMOUNTDR'
                 }, {
-                    fieldLabel: '应付金额',
+                        fieldLabel: Zi.LAN.AMOUNTCR,
                     readOnly: true,
                     name: 'AMOUNTCR'
                 }, {
-                    fieldLabel: '结余金额',
+                        fieldLabel: Zi.LAN.AMOUNTBAL,
                     readOnly: true,
                     name: 'AMOUNTBAL'
                 }]
@@ -579,7 +579,7 @@ Ext.extend(Shipping.MsChFeeAgentDcEdit, Ext.Panel, {
                 layout: 'hbox',
                 defaultType: 'textfield',
                 items: [{
-                    fieldLabel: '金额大写',
+                    fieldLabel: Zi.LAN.AMOUNTTOTALSTR,
                     readOnly: true,
                     name: 'AMOUNTTOTALSTR'
                 }]
@@ -591,7 +591,7 @@ Ext.extend(Shipping.MsChFeeAgentDcEdit, Ext.Panel, {
                     xtype: 'textareafield',
                     grow: true,
                     flex: 2,
-                    fieldLabel: '备注',
+                    fieldLabel: Zi.LAN.REMARK ,
                     height: 60,
                     name: 'REMARK',
                     anchor: '100%'
@@ -607,7 +607,7 @@ Ext.extend(Shipping.MsChFeeAgentDcEdit, Ext.Panel, {
             region: "north",
             tbar: [{
                 id: 'btnESave',
-                text: "保存",
+                text: Zi.LAN.btnSave,
                 iconCls: "btnsave",
                 handler: function (button, event) {
                     this.Save('0');
@@ -615,20 +615,20 @@ Ext.extend(Shipping.MsChFeeAgentDcEdit, Ext.Panel, {
                 scope: this
             }, {
                 id: 'btnESaveAndNew',
-                text: "保存并新建",
+                    text: Zi.LAN.btnSaveAndNew,
                 handler: function (button, event) {
                     this.Save('2');
                 },
                 scope: this
             }, {
-                text: "新建",
+                    text: Zi.LAN.btnAdd,
                 handler: function (button, event) {
                     this.LoadData('add', '');
 
                 },
                 scope: this
             }, '-', {
-                text: "删除",
+                    text: Zi.LAN.btnDelete,
                 iconCls: "btndelete",
                 handler: function (button, event) {
                     this.onDeleteClick(button, event);
@@ -636,7 +636,7 @@ Ext.extend(Shipping.MsChFeeAgentDcEdit, Ext.Panel, {
                 scope: this
             }, '-',
             {
-                text: "打印",
+                text: Zi.LAN.Print,
                 iconCls: "btnprint",
                 handler: function (button, event) {
                     this.Print();
@@ -644,7 +644,7 @@ Ext.extend(Shipping.MsChFeeAgentDcEdit, Ext.Panel, {
                 scope: this
                 }, '-',
                 {
-                    text: "生成费用",
+                    text: Zi.LAN.ISCREATEFEEREF ,
                     handler: function (button, event) {
                         this.CreateFee();
                     },
@@ -657,7 +657,7 @@ Ext.extend(Shipping.MsChFeeAgentDcEdit, Ext.Panel, {
 
 
         this.panelpage = new Ext.Panel({
-            title: 'D/C NOTE详细信息',
+            title: Zi.LAN.panelpage,
             layout: "border",
             region: 'center',
             animate: true,
@@ -722,7 +722,7 @@ Ext.extend(Shipping.MsChFeeAgentDcEdit, Ext.Panel, {
         //} else {
 
             Ext.Ajax.request({
-                waitMsg: '正在查询主表数据...',
+                waitMsg: Zi.LAN.ZhengZaiChaXunShuJu,
                 url: '/MvcShipping/MsChFeeAgentDc/GetData',
                 params: {
                     handle: opstatus,
@@ -733,7 +733,7 @@ Ext.extend(Shipping.MsChFeeAgentDcEdit, Ext.Panel, {
                         var result = Ext.JSON.decode(response.responseText);
                         if (!result.Success) {
                             Ext.Msg.show({
-                                title: '提示',
+                                title: Zi.LAN.TiShi,
                                 msg: result.Message,
                                 icon: Ext.MessageBox.ERROR,
                                 buttons: Ext.Msg.OK
@@ -754,7 +754,7 @@ Ext.extend(Shipping.MsChFeeAgentDcEdit, Ext.Panel, {
                         }
                         this.GetEditStatus();
                     } else {
-                        Ext.MessageBox.alert('请求出现错误,请重试', response.responseText);
+                        Ext.MessageBox.alert(Zi.LAN.FuWuQiXiangYingChuCuo, response.responseText);
                     }
                 },
                 scope: this
@@ -782,9 +782,9 @@ Ext.extend(Shipping.MsChFeeAgentDcEdit, Ext.Panel, {
         }
         var jsonBody = ConvertRecordsToJsonAll(bodydatas);
         //
-        Ext.Msg.wait('正在保存数据, 请稍侯..');
+        Ext.Msg.wait(Zi.LAN.ZhengZaiCaoZuoShuJu);
         Ext.Ajax.request({
-            waitMsg: '正在保存数据...',
+            waitMsg: Zi.LAN.ZhengZaiCaoZuoShuJu,
             url: '/MvcShipping/MsChFeeAgentDc/SaveAgentDC',
             scope: this,
             params: {
@@ -835,12 +835,12 @@ Ext.extend(Shipping.MsChFeeAgentDcEdit, Ext.Panel, {
                             this.LoadData('add', '');
                         }
                     } else {
-                        Ext.Msg.show({ title: '错误', msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
+                        Ext.Msg.show({ title: Zi.LAN.CuoWu, msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
                     }
                 } else {
                     Ext.Msg.show({
                         title: '请重试',
-                        msg: '服务器响应出错',
+                        msg: Zi.LAN.FuWuQiXiangYingChuCuo,
                         icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK
                     });
                 }
@@ -858,18 +858,18 @@ Ext.extend(Shipping.MsChFeeAgentDcEdit, Ext.Panel, {
     onDeleteClick: function (button, event) {
         var selections = this.gridList.getSelectionModel().getSelection();
         if (selections.length == 0) {
-            Ext.Msg.show({ title: '提示', msg: '请先选择业务!', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
+            Ext.Msg.show({ title: Zi.LAN.TiShi, msg: Zi.LAN.QingXianXuanZeXinXi, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
             return;
         }
 
         var record = selections[0];
 
 
-        Ext.MessageBox.confirm('提示', '确定删除该记录吗？', function (btn) {
+        Ext.MessageBox.confirm(Zi.LAN.TiShi, Zi.LAN.QueDingShanChuGaiJiLuMa, function (btn) {
             if (btn == 'yes') {
-                Ext.Msg.wait('正在删除数据...');
+                Ext.Msg.wait(Zi.LAN.ZhengZaiCaoZuoShuJu);
                 Ext.Ajax.request({
-                    waitMsg: '正在删除数据...',
+                    waitMsg: Zi.LAN.ZhengZaiCaoZuoShuJu,
                     url: '/MvcShipping/MsChFeeAgentDc/Delete',
                     params: {
                         data: Ext.JSON.encode(record.data)
@@ -886,15 +886,15 @@ Ext.extend(Shipping.MsChFeeAgentDcEdit, Ext.Panel, {
                                 } else {
                                     this.LoadData('add', '');
                                 }
-                                Ext.Msg.show({ title: '提示', msg: jsonresult.Message, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
+                                Ext.Msg.show({ title: Zi.LAN.TiShi, msg: jsonresult.Message, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
                             }
                             else {
-                                Ext.Msg.show({ title: '错误', msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
+                                Ext.Msg.show({ title: Zi.LAN.CuoWu, msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
                             }
                         }
                     },
                     failure: function (response, options) {
-                        Ext.Msg.show({ title: '警告', msg: '服务器响应出错,请重试', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
+                        Ext.Msg.show({ title: Zi.LAN.JingGao, msg: Zi.LAN.FuWuQiXiangYingChuCuo, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
                     },
                     success: function (response, options) { },
                     scope: this
@@ -987,11 +987,11 @@ Ext.extend(Shipping.MsChFeeAgentDcEdit, Ext.Panel, {
             //this.storeBodyList.remove(selectedRecords[i]);
         }
         var jsonbodyAddDatas = ConvertRecordsToJsonAll(bodyAddDatas);
-        Ext.MessageBox.confirm('提示', '确定要删除此记录吗?', function (btn) {
+        Ext.MessageBox.confirm(Zi.LAN.TiShi, Zi.LAN.QueDingShanChuGaiJiLuMa, function (btn) {
             if (btn == 'yes') {
-                Ext.Msg.wait('正在操作数据');
+                Ext.Msg.wait(Zi.LAN.ZhengZaiCaoZuoShuJu);
                 Ext.Ajax.request({
-                    waitMsg: '正在操作数据', //'正在删除数据...',
+                    waitMsg: Zi.LAN.ZhengZaiCaoZuoShuJu, //'正在删除数据...',
                     url: '/MvcShipping/MsChFeeAgentDc/DeleteDetailList',
                     params: {
                         data: jsonbodyAddDatas
@@ -1003,15 +1003,15 @@ Ext.extend(Shipping.MsChFeeAgentDcEdit, Ext.Panel, {
                                 this.storeDetailList.reload();
                                 this.setAllTotal();
 
-                                Ext.Msg.show({ title: '提示', msg: jsonresult.Message, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
+                                Ext.Msg.show({ title: Zi.LAN.TiShi, msg: jsonresult.Message, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
                             }
                             else {
-                                Ext.Msg.show({ title: '错误', msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
+                                Ext.Msg.show({ title: Zi.LAN.CuoWu, msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
                             }
                         }
                     },
                     failure: function (response, options) {
-                        Ext.Msg.show({ title: '警告', msg: '服务器响应出错！', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
+                        Ext.Msg.show({ title: Zi.LAN.JingGao, msg: Zi.LAN.FuWuQiXiangYingChuCuo, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
                     },
                     scope: this
                 }); //end Ext.Ajax.request
@@ -1121,24 +1121,21 @@ Ext.extend(Shipping.MsChFeeAgentDcEdit, Ext.Panel, {
         }
         var data = this.formEdit.getForm().getValues(false, false, false);
 
-        //if (data.ISCREATEFEE == 'true') {
-        //    Ext.Msg.show({ title: '提示', msg: '已生成费用，不能重复生成!', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
-        //    return;
-        //}
+
         if (data.FEEAGENT == '') {
-            Ext.Msg.show({ title: '提示', msg: '费用代理不能为空!', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
+            Ext.Msg.show({ title: Zi.LAN.TiShi, msg: Zi.LAN.feiyongdailibunengweikong, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
             return;
         }
         if (data.FEENAME == '') {
-            Ext.Msg.show({ title: '提示', msg: '费用名称不能为空!', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
+            Ext.Msg.show({ title: Zi.LAN.TiShi, msg: Zi.LAN.feiyongmingchengbunengweikong, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
             return;
         }
         if (data.CURRENCY == '') {
-            Ext.Msg.show({ title: '提示', msg: '币别不能为空!', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
+            Ext.Msg.show({ title: Zi.LAN.TiShi, msg: Zi.LAN.bibiebunengweikong, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
             return;
         }
         if (data.AMOUNTBAL ==0) {
-            Ext.Msg.show({ title: '提示', msg: '结余金额为0,无法生成!', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
+            Ext.Msg.show({ title: Zi.LAN.TiShi, msg: Zi.LAN.jieyujineweiling, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
             return;
         }
 
@@ -1150,9 +1147,9 @@ Ext.extend(Shipping.MsChFeeAgentDcEdit, Ext.Panel, {
         }
         var jsonBody = ConvertRecordsToJsonAll(bodydatas);
         //
-        Ext.Msg.wait('正在保存数据, 请稍侯..');
+        Ext.Msg.wait(Zi.LAN.ZhengZaiCaoZuoShuJu);
         Ext.Ajax.request({
-            waitMsg: '正在保存数据...',
+            waitMsg: Zi.LAN.ZhengZaiCaoZuoShuJu,
             url: '/MvcShipping/MsChFeeAgentDc/CreateFee',
             scope: this,
             params: {
@@ -1197,12 +1194,12 @@ Ext.extend(Shipping.MsChFeeAgentDcEdit, Ext.Panel, {
                        this.opStatus = 'edit';
 
                     } else {
-                        Ext.Msg.show({ title: '错误', msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
+                        Ext.Msg.show({ title: Zi.LAN.CuoWu, msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
                     }
                 } else {
                     Ext.Msg.show({
                         title: '请重试',
-                        msg: '服务器响应出错',
+                        msg: Zi.LAN.FuWuQiXiangYingChuCuo,
                         icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK
                     });
                 }
@@ -1247,7 +1244,7 @@ Ext.extend(Shipping.MsChFeeAgentDcEdit, Ext.Panel, {
         var billNo = basicForm.findField('GID').value;
         var bsNo = basicForm.findField('BSNO').value;
         if (billNo == '*' || billNo == '' || billNo == NaN) {
-            Ext.Msg.show({ title: '错误', msg: 'D/C NOTE还没有保存，请保存后再打印', icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
+            Ext.Msg.show({ title: Zi.LAN.CuoWu, msg: Zi.LAN.BAOCUNHOUZAIDAYIN, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
             return;
         }
 
diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsChFeeAgent/Zi_en-us.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsChFeeAgent/Zi_en-us.js
new file mode 100644
index 00000000..9d1a61ca
--- /dev/null
+++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsChFeeAgent/Zi_en-us.js
@@ -0,0 +1,72 @@
+// 官方推荐的多国语言方法 兼容性不好	
+// 自定义多国语言动态加载方法	
+	
+Ext.ns("Zi.LAN");//
+
+//#region MsCodeFeeTemplate，需求编号：SR2017061200005-3
+
+Zi.LAN.AGENT = "国外代理";
+Zi.LAN.FEEAGENT = "费用代理";
+Zi.LAN.FEENAME = "费用名称";
+Zi.LAN.CURRENCY = "币别";
+Zi.LAN.DCNO = "账单编号";
+Zi.LAN.CREATETIME = "录入日期";
+Zi.LAN.CREATEUSER = "CREATEUSER";
+Zi.LAN.CREATEUSERREF = "录入人";
+Zi.LAN.displayMsg = "当前显示 {0} - {1}条记录 /共 {2}条记录";
+Zi.LAN.ShuJuJiaZaiZhongQingShaoDeng = "数据加载中，请稍等...";
+Zi.LAN.emptyMsg = "没有数据";
+Zi.LAN.FeeDescription = '费用英文名称';
+Zi.LAN.EXCHANGERATE = "汇率";
+
+Zi.LAN.DRPP = "应收PP";
+Zi.LAN.DRCC = "应收CC";
+Zi.LAN.CRPP = "应付PP";
+Zi.LAN.CRCC = "应付CC";
+Zi.LAN.FZPR = "分账比例%";
+Zi.LAN.AMOUNTDR = "应收金额";
+Zi.LAN.AMOUNTCR = "应付金额";
+Zi.LAN.AMOUNTBAL = "结余金额";
+Zi.LAN.AMOUNTTOTALSTR = "金额大写";
+Zi.LAN.UNIT = "标准";
+Zi.LAN.UNITPRICE = "单价";
+Zi.LAN.QUANTITY = "数量";
+Zi.LAN.FEEDESCRIPTION = "费用说明";
+Zi.LAN.btnAddDetail = "增加明细";
+Zi.LAN.templateAdd = "模板引入";
+Zi.LAN.btnCopyAndNew = "复制新建";
+Zi.LAN.btnDelete = "删除";
+Zi.LAN.btnDeleteDetail = "删除明细";
+
+Zi.LAN.FEETYPEREF = "类型";
+Zi.LAN.SavelistStyle = "保存列表样式";
+Zi.LAN.Initialization = "初始化";
+Zi.LAN.btnRefresh = "执行查询";
+Zi.LAN.btnReset = "重置条件";
+Zi.LAN.btnSave = "保存";
+Zi.LAN.btnSaveAndClose = "保存并关闭";
+Zi.LAN.btnSaveAndNew = "保存并新建";
+Zi.LAN.ISCREATEFEEREF = "生成费用";
+Zi.LAN.REMARK = "备注";
+Zi.LAN.FEETYPE = "费用类型";
+Zi.LAN.Print = "打印";
+Zi.LAN.btnAdd = "新建";
+Zi.LAN.panelpage = "D/C NOTE详细信息";
+Zi.LAN.ZhengZaiChaXunShuJu = "正在查询数据请稍侯...";
+Zi.LAN.FuWuQiXiangYingChuCuo = "服务器响应出错，请重试...";
+Zi.LAN.ZhengZaiCaoZuoShuJu = "正在操作数据请稍侯...";
+Zi.LAN.CuoWu = "错误";
+Zi.LAN.JingGao = "警告";
+Zi.LAN.TiShi = "提示";
+Zi.LAN.QingXianXuanZeXinXi = "请先选择要操作的信息!";
+Zi.LAN.QueDingShanChuGaiJiLuMa = "确定删除该记录吗？";
+Zi.LAN.BAOCUNHOUZAIDAYIN = "D/C NOTE还没有保存，请保存后再打印";
+Zi.LAN.feiyongdailibunengweikong = "费用代理不能为空!";
+Zi.LAN.feiyongmingchengbunengweikong = "费用名称不能为空!";
+Zi.LAN.bibiebunengweikong = "币别不能为空!";
+Zi.LAN.jieyujineweiling = "结余金额为0,无法生成!";
+
+//#endregion	
+	
+
+ 	
diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsChFeeAgent/Zi_zh-cn.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsChFeeAgent/Zi_zh-cn.js
new file mode 100644
index 00000000..43116eaf
--- /dev/null
+++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsChFeeAgent/Zi_zh-cn.js
@@ -0,0 +1,77 @@
+
+// 官方推荐的多国语言方法 兼容性不好
+// 自定义多国语言动态加载方法
+
+Ext.ns("Zi.LAN");
+
+//#region MsCodeFeeTemplate
+Zi.LAN.AGENT = "国外代理";
+Zi.LAN.FEEAGENT = "费用代理";
+Zi.LAN.FEENAME = "费用名称";
+Zi.LAN.CURRENCY = "币别";
+Zi.LAN.DCNO = "账单编号";
+Zi.LAN.CREATETIME = "录入日期";
+Zi.LAN.CREATEUSER = "CREATEUSER";
+Zi.LAN.CREATEUSERREF = "录入人";
+Zi.LAN.displayMsg = "当前显示 {0} - {1}条记录 /共 {2}条记录";
+Zi.LAN.ShuJuJiaZaiZhongQingShaoDeng = "数据加载中，请稍等...";
+Zi.LAN.emptyMsg = "没有数据";
+Zi.LAN.FeeDescription = '费用英文名称';
+Zi.LAN.EXCHANGERATE = "汇率";
+
+Zi.LAN.DRPP = "应收PP";
+Zi.LAN.DRCC = "应收CC";
+Zi.LAN.CRPP = "应付PP";
+Zi.LAN.CRCC = "应付CC";
+Zi.LAN.FZPR = "分账比例%";
+Zi.LAN.AMOUNTDR = "应收金额";
+Zi.LAN.AMOUNTCR = "应付金额";
+Zi.LAN.AMOUNTBAL = "结余金额";
+Zi.LAN.AMOUNTTOTALSTR = "金额大写";
+Zi.LAN.UNIT = "标准";
+Zi.LAN.UNITPRICE = "单价";
+Zi.LAN.QUANTITY = "数量";
+Zi.LAN.FEEDESCRIPTION = "费用说明";
+Zi.LAN.btnAddDetail = "增加明细";
+Zi.LAN.templateAdd = "模板引入";
+Zi.LAN.btnCopyAndNew = "复制新建";
+Zi.LAN.btnDelete = "删除";
+Zi.LAN.btnDeleteDetail = "删除明细";
+
+Zi.LAN.FEETYPEREF = "类型";
+Zi.LAN.SavelistStyle = "保存列表样式";
+Zi.LAN.Initialization = "初始化";
+Zi.LAN.btnRefresh = "执行查询";
+Zi.LAN.btnReset = "重置条件";
+Zi.LAN.btnSave = "保存";
+Zi.LAN.btnSaveAndClose = "保存并关闭";
+Zi.LAN.btnSaveAndNew = "保存并新建";
+Zi.LAN.ISCREATEFEEREF = "生成费用";
+Zi.LAN.REMARK = "备注";
+Zi.LAN.FEETYPE = "费用类型";
+Zi.LAN.Print = "打印";
+Zi.LAN.btnAdd = "新建";
+Zi.LAN.panelpage ="D/C NOTE详细信息";
+Zi.LAN.ZhengZaiChaXunShuJu = "正在查询数据请稍侯...";
+Zi.LAN.FuWuQiXiangYingChuCuo = "服务器响应出错，请重试...";
+Zi.LAN.ZhengZaiCaoZuoShuJu = "正在操作数据请稍侯...";
+Zi.LAN.CuoWu = "错误";
+Zi.LAN.JingGao = "警告";
+Zi.LAN.TiShi = "提示";
+Zi.LAN.QingXianXuanZeXinXi = "请先选择要操作的信息!";
+Zi.LAN.QueDingShanChuGaiJiLuMa = "确定删除该记录吗？";
+Zi.LAN.BAOCUNHOUZAIDAYIN = "D/C NOTE还没有保存，请保存后再打印";
+Zi.LAN.feiyongdailibunengweikong = "费用代理不能为空!";
+Zi.LAN.feiyongmingchengbunengweikong = "费用名称不能为空!";
+Zi.LAN.bibiebunengweikong = "币别不能为空!";
+Zi.LAN.jieyujineweiling = "结余金额为0,无法生成!";
+
+
+
+
+//#endregion
+
+//Zi.LAN. = "";
+
+
+
diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsCodeDuiTemplate/MsCodeDuiTemplateEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsCodeDuiTemplate/MsCodeDuiTemplateEdit.js
index eaf92133..fa49ac5a 100644
--- a/DSWeb/Areas/MvcShipping/Viewsjs/MsCodeDuiTemplate/MsCodeDuiTemplateEdit.js
+++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsCodeDuiTemplate/MsCodeDuiTemplateEdit.js
@@ -58,7 +58,11 @@ Ext.extend(Shipping.MsCodeDuiTemplateEdit, Ext.Panel, {
                         fieldLabel: '模板名称',
                         allowBlank: false,
                         name: 'NAME'
-                    }, {
+                        }, {
+                            fieldLabel: '英文名称',
+                            allowBlank: false,
+                            name: 'ENAME'
+                        }, {
                         fieldLabel: '录入人',
                         readOnly: true,
                         name: 'INPUTBY'
diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsCodeDuiTemplate/MsCodeDuiTemplateModel.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsCodeDuiTemplate/MsCodeDuiTemplateModel.js
index 5a729e54..bc91b45f 100644
--- a/DSWeb/Areas/MvcShipping/Viewsjs/MsCodeDuiTemplate/MsCodeDuiTemplateModel.js
+++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsCodeDuiTemplate/MsCodeDuiTemplateModel.js
@@ -4,6 +4,7 @@
     fields: [
                 { name: 'DM_ID', type: 'string' },
                 { name: 'NAME', type: 'string' },
+        { name: 'ENAME', type: 'string' },
                 { name: 'INPUTBY', type: 'string' },
                 { name: 'INPUTDATE', type: 'string' },
                 { name: 'REMARKS', type: 'string' }
diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/MsOpApplyLSEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/MsOpApplyLSEdit.js
index 716a2096..6cd18b35 100644
--- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/MsOpApplyLSEdit.js
+++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/MsOpApplyLSEdit.js
@@ -114,7 +114,7 @@ Ext.extend(Shipping.MsOpApplyLSEdit, Ext.Panel, {
 
         this.comboxWmsNo = Ext.create('DsExt.ux.RefTableCombox', {
             store: this.storeListWmsNo,
-            fieldLabel: '入库单号',
+            fieldLabel: Zi.LAN.WMSNO,
             name: 'WMSNO',
             valueField: 'WMSNO',
             displayField: 'WMSNO',
@@ -149,7 +149,7 @@ Ext.extend(Shipping.MsOpApplyLSEdit, Ext.Panel, {
 
         this.comboxBsCustomNo = Ext.create('DsExt.ux.RefTableCombox', {
             store: this.storeListBsCustomNo,
-            fieldLabel: '关联报关单号',
+            fieldLabel: Zi.LAN.BSCUSTOMNO,
             name: 'BSCUSTOMNO',
             valueField: 'CUSTOMNO',
             displayField: 'CUSTOMNO'
@@ -166,7 +166,7 @@ Ext.extend(Shipping.MsOpApplyLSEdit, Ext.Panel, {
 
         this.storeSalesCode.load();
         this.comboxSalesCode = Ext.create('DsExt.ux.RefTableCombox', {
-            fieldLabel: '揽货人',
+            fieldLabel: Zi.LAN.SALE,
             store: this.storeSalesCode,
             forceSelection: true,
             name: 'SALE',
@@ -197,7 +197,7 @@ Ext.extend(Shipping.MsOpApplyLSEdit, Ext.Panel, {
 
         this.storeOpCode.load();
         this.comboxOp = Ext.create('DsExt.ux.RefTableCombox', {
-            fieldLabel: '操 作',
+            fieldLabel: Zi.LAN.OP ,
             store: this.storeOpCode,
             forceSelection: true,
             name: 'OP',
@@ -213,7 +213,7 @@ Ext.extend(Shipping.MsOpApplyLSEdit, Ext.Panel, {
 
         this.storeCustCode.load();
         this.comboxCustCode = Ext.create('DsExt.ux.RefTableCombox', {
-            fieldLabel: '委托单位',
+            fieldLabel: Zi.LAN.CUSTOMERNAME ,
             store: this.storeCustCode,
             forceSelection: true,
             queryMode: 'remote',
@@ -246,7 +246,7 @@ this.storeInfoClientContact = Ext.create('DsExt.ux.RefTableStore', {
 
 //this.storeInfoClientContact.load();
 this.comboxInfoClientContact = Ext.create('DsExt.ux.RefTableCombox', {
-    fieldLabel: '客户操作',
+    fieldLabel: Zi.LAN.OPERATORCODE,
     store: this.storeInfoClientContact,
     name: 'OPERATORCODE',
     valueField: 'SHOWNAME',
@@ -285,7 +285,7 @@ this.comboxInfoClientContact = Ext.create('DsExt.ux.RefTableCombox', {
         });
         this.storeCustomCode.load({ params: { condition: "ISCUSTOM='1'"} });
         this.comboxCustomCode = Ext.create('DsExt.ux.RefTableCombox', {
-            fieldLabel: '报关行',
+            fieldLabel: Zi.LAN.CUSTOMSER,
             store: this.storeCustomCode,
             forceSelection: true,
             name: 'CUSTOMSER',
@@ -305,7 +305,7 @@ this.comboxInfoClientContact = Ext.create('DsExt.ux.RefTableCombox', {
             proxy: { url: '/CommMng/BasicDataRef/GetSourceDetail' }
         });
         this.comboxSource = Ext.create('DsExt.ux.RefTableCombox', {
-            fieldLabel: '业务来源',
+            fieldLabel: Zi.LAN.BSSOURCE,
             store: this.storeSource,
             forceSelection: true,
             name: 'BSSOURCE',
@@ -341,7 +341,7 @@ this.comboxInfoClientContact = Ext.create('DsExt.ux.RefTableCombox', {
 
 
         this.comboxSourceDetail = Ext.create('DsExt.ux.RefTableCombox', {
-            fieldLabel: '来源明细',
+            fieldLabel: Zi.LAN.BSSOURCEDETAIL,
             store: this.storeSourceDetail,
             //           forceSelection: true,
             name: 'BSSOURCEDETAIL',
@@ -364,7 +364,7 @@ this.comboxInfoClientContact = Ext.create('DsExt.ux.RefTableCombox', {
 
         this.storeDept.load();
         this.comboxDept = Ext.create('DsExt.ux.RefTableCombox', {
-            fieldLabel: '所属部门',
+            fieldLabel: Zi.LAN.SALEDEPT2,
             store: this.storeDept,
             forceSelection: true,
             name: 'SALEDEPT',
@@ -374,11 +374,16 @@ this.comboxInfoClientContact = Ext.create('DsExt.ux.RefTableCombox', {
 
         });
 
+        var BLTYPEDFIELDNAME = 'EnumValueName';
+        if (strLANGUAGES == "en-us") {
+            BLTYPEDFIELDNAME = 'EnumValueName_2';
+        }
+
         this.storeBsType = Ext.create('DsExt.ux.RefEnumStore', {});
         this.storeBsType.load({ params: { enumTypeId: 96004} });
 
         this.comboxBsType = Ext.create('DsExt.ux.RefEnumCombox', {
-            fieldLabel: '运输类型',
+            fieldLabel: Zi.LAN.BSTYPE,
             store: this.storeBsType,
             forceSelection: true,
             name: 'BSTYPE'
@@ -391,7 +396,7 @@ this.comboxInfoClientContact = Ext.create('DsExt.ux.RefTableCombox', {
         });
         this.storeCrmKeyCodeCode.load({ params: { condition: " and KEYTYPE='贸易方式'"} });
         this.comboxTRADETYPE = Ext.create('DsExt.ux.RefTableCombox', {
-            fieldLabel: '贸易方式',
+            fieldLabel: Zi.LAN.TRADETYPE,
             store: this.storeCrmKeyCodeCode,
             forceSelection: true,
             id: 'TRADETYPE',
@@ -425,7 +430,7 @@ this.comboxInfoClientContact = Ext.create('DsExt.ux.RefTableCombox', {
         this.storeEnterpCode.load();
 
         this.comboxEnterp = Ext.create('DsExt.ux.RefTableCombox', {
-            fieldLabel: '经营单位',
+            fieldLabel: Zi.LAN.ENTERP ,
             store: this.storeEnterpCode,
             name: 'ENTERP',
             valueField: 'CUSTOMER',
@@ -453,7 +458,7 @@ this.comboxInfoClientContact = Ext.create('DsExt.ux.RefTableCombox', {
         this.storeINSPECTSERVICE.load({ params: { enumTypeId: 97024} });
 
         this.comboxINSPECTSERVICE = Ext.create('DsExt.ux.RefEnumCombox', {
-            fieldLabel: '报检项目',
+            fieldLabel: Zi.LAN.INSPECTSERVICE,
             store: this.storeINSPECTSERVICE,
             forceSelection: true,
             name: 'INSPECTSERVICE'
@@ -463,7 +468,7 @@ this.comboxInfoClientContact = Ext.create('DsExt.ux.RefTableCombox', {
         this.storeTRADETERM.load({ params: { enumTypeId: 97023} });
 
         this.comboxTRADETERM = Ext.create('DsExt.ux.RefEnumCombox', {
-            fieldLabel: '贸易条款',
+            fieldLabel: Zi.LAN.TRADETERM,
             store: this.storeTRADETERM,
             forceSelection: true,
             name: 'TRADETERM'
@@ -474,7 +479,7 @@ this.comboxInfoClientContact = Ext.create('DsExt.ux.RefTableCombox', {
         this.storeCUSTOMTYPE.load({ params: { enumTypeId: 97046} });
 
         this.comboxCUSTOMTYPE = Ext.create('DsExt.ux.RefEnumCombox', {
-            fieldLabel: '报关类型',
+            fieldLabel: Zi.LAN.CUSTOMTYPE,
             store: this.storeCUSTOMTYPE,
  //           forceSelection: true,
             name: 'CUSTOMTYPE'
@@ -483,12 +488,12 @@ this.comboxInfoClientContact = Ext.create('DsExt.ux.RefTableCombox', {
         this.storeISCLEAR = Ext.create('Ext.data.Store', {
             fields: ['FType', 'NAME']
         });
-        this.storeISCLEAR.add({ "FType": '1', "NAME": "是" });
-        this.storeISCLEAR.add({ "FType": '0', "NAME": "否" });
+        this.storeISCLEAR.add({ "FType": '1', "NAME": Zi.LAN.YES});
+        this.storeISCLEAR.add({ "FType": '0', "NAME": Zi.LAN.NO});
 
         this.comboxISCLEAR = Ext.create('DsExt.ux.RefTableCombox', {
             store: this.storeISCLEAR,
-            fieldLabel: '是否通关',
+            fieldLabel: Zi.LAN.ISCLEAR,
             valueField: 'FType',
             displayField: 'NAME',
             forceSelection: true,
@@ -498,12 +503,12 @@ this.comboxInfoClientContact = Ext.create('DsExt.ux.RefTableCombox', {
         this.storeISCUSTOMEND = Ext.create('Ext.data.Store', {
             fields: ['FType', 'NAME']
         });
-        this.storeISCUSTOMEND.add({ "FType": '1', "NAME": "是" });
-        this.storeISCUSTOMEND.add({ "FType": '0', "NAME": "否" });
+        this.storeISCUSTOMEND.add({ "FType": '1', "NAME": Zi.LAN.YES });
+        this.storeISCUSTOMEND.add({ "FType": '0', "NAME": Zi.LAN.NO});
 
         this.comboxISCUSTOMEND = Ext.create('DsExt.ux.RefTableCombox', {
             store: this.storeISCUSTOMEND,
-            fieldLabel: '报关完结',
+            fieldLabel: Zi.LAN.ISCUSTOMEND,
             valueField: 'FType',
             ReadOnly: true,
             displayField: 'NAME',
@@ -563,29 +568,29 @@ this.comboxInfoClientContact = Ext.create('DsExt.ux.RefTableCombox', {
         }, {
             sortable: true,
             dataIndex: 'CUSTOMNO',
-            header: '报关单号',
+                header: Zi.LAN.CUSTOMNO,
             width: 120
         }, {
             sortable: true,
             dataIndex: 'CUSTNO',
-            header: '委托编号',
+                header: Zi.LAN.CUSTNO ,
             width: 130
         }, {
             sortable: true,
             dataIndex: 'BSDATE',
-            header: '录入日期',
+                header: Zi.LAN.BSDATE,
             width: 90
         }, {
             sortable: true,
             dataIndex: 'BSCUSTNO',
-            header: '自理编号',
+                header: Zi.LAN.BSCUSTNO,
             width: 130
         },
         {
             sortable: true,
             id: '',
             dataIndex: 'BSSTATUSREF',
-            header: '业务锁定',
+            header: Zi.LAN.BSSTATUSREF,
             align: 'center',
             width: 60,
             renderer: function (value, cellmeta) {
@@ -598,7 +603,7 @@ this.comboxInfoClientContact = Ext.create('DsExt.ux.RefTableCombox', {
             sortable: true,
             id: '',
             dataIndex: 'FEESTATUSREF',
-            header: '费用锁定',
+            header: Zi.LAN.FEESTATUSREF,
             align: 'center',
             width: 60,
             renderer: function (value, cellmeta) {
@@ -609,32 +614,32 @@ this.comboxInfoClientContact = Ext.create('DsExt.ux.RefTableCombox', {
         }, {
             sortable: true,
             dataIndex: 'BSTYPEREF',
-            header: '运输类型',
+            header: Zi.LAN.BSTYPE,
             width: 90
         }, {
             sortable: true,
             dataIndex: 'ACCDATE',
-            header: '会计期间',
+            header: Zi.LAN.ACCDATE,
             width: 80
         }, {
             sortable: true,
             dataIndex: 'OPDATE',
-            header: '业务日期',
+            header: Zi.LAN.OPDATE,
             width: 80
         }, {
             sortable: true,
             dataIndex: 'MBLNO',
-            header: '提单号',
+            header: Zi.LAN.MBLNO,
             width: 100
         }, {
             sortable: true,
             dataIndex: 'HBLNO',
-            header: '分提单号',
+            header: Zi.LAN.HBLNO ,
             width: 100
         }, {
             sortable: true,
             dataIndex: 'CUSTOMERNAME',
-            header: '委托单位',
+            header: Zi.LAN.CUSTOMERNAME,
             width: 100
         }, {
             sortable: true,
diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/Zi_en-us.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/Zi_en-us.js
new file mode 100644
index 00000000..ce21acd9
--- /dev/null
+++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/Zi_en-us.js
@@ -0,0 +1,31 @@
+// 官方推荐的多国语言方法 兼容性不好	
+// 自定义多国语言动态加载方法	
+	
+Ext.ns("Zi.LAN");
+	
+
+Zi.LAN.GONGKAI = "公开";
+Zi.LAN.BUGONGKAI = "不公开";
+Zi.LAN.STATUS = "业务状态";
+Zi.LAN.COMPTIME = "完成时间";
+Zi.LAN.COMPOP = "完成人";
+Zi.LAN.ISOPEN = "是否公开";
+Zi.LAN.REMARK = "备注";
+Zi.LAN.OPTIME = "推送时间";
+Zi.LAN.displayMsg = "当前显示 {0} - {1}条记录 /共 {2}条记录";
+Zi.LAN.ShuJuJiaZaiZhongQingShaoDeng = "数据加载中，请稍等...";
+Zi.LAN.emptyMsg = "没有数据";
+Zi.LAN.XinJian = "新建";
+Zi.LAN.ShanChu = "删除";
+Zi.LAN.BaoCun = "保存";
+Zi.LAN.ZhiXingChaXun = "执行查询";
+Zi.LAN.ChongZhi = "重置条件";
+Zi.LAN.WeiXinTongZhi = "微信通知客户";
+Zi.LAN.ZhengZaiCaoZuoShuJu = "正在操作数据, 请稍侯...";
+Zi.LAN.ZhengZaiChaXunShuJu = "正在查询数据...";
+Zi.LAN.QueDingShanChuGaiJiLuMa = "确定删除该记录吗？";
+Zi.LAN.TiShi = "提示";
+Zi.LAN.ChuoWu = "错误";
+Zi.LAN.FuWuQiXiangYingChuCuo = "服务器响应出错,请重试";
+Zi.LAN.ZhuangTaiBuNengWeiKongBuNengBaoCun = "状态不能为空，请修改后再保存";
+Zi.LAN.QueDingYaoFaSongZhuangTaiMa = "确定要选中状态发送给客户吗？";
diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/Zi_zh-cn.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/Zi_zh-cn.js
new file mode 100644
index 00000000..ea85f851
--- /dev/null
+++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/Zi_zh-cn.js
@@ -0,0 +1,79 @@
+
+// 官方推荐的多国语言方法 兼容性不好
+// 自定义多国语言动态加载方法
+
+Ext.ns("Zi.LAN");
+
+
+
+Zi.LAN.GONGKAI = "公开";
+Zi.LAN.BUGONGKAI = "不公开";
+Zi.LAN.STATUS = "业务状态";
+Zi.LAN.COMPTIME = "完成时间";
+Zi.LAN.COMPOP = "完成人";
+Zi.LAN.ISOPEN = "是否公开";
+Zi.LAN.REMARK = "备注";
+Zi.LAN.OPTIME = "推送时间";
+Zi.LAN.displayMsg = "当前显示 {0} - {1}条记录 /共 {2}条记录";
+Zi.LAN.ShuJuJiaZaiZhongQingShaoDeng = "数据加载中，请稍等...";
+Zi.LAN.emptyMsg = "没有数据";
+Zi.LAN.XinJian = "新建";
+Zi.LAN.ShanChu = "删除";
+Zi.LAN.BaoCun = "保存";
+Zi.LAN.ZhiXingChaXun = "执行查询";
+Zi.LAN.ChongZhi = "重置条件";
+Zi.LAN.WeiXinTongZhi = "微信通知客户";
+Zi.LAN.ZhengZaiCaoZuoShuJu = "正在操作数据, 请稍侯...";
+Zi.LAN.ZhengZaiChaXunShuJu = "正在查询数据...";
+Zi.LAN.QueDingShanChuGaiJiLuMa = "确定删除该记录吗？";
+Zi.LAN.TiShi = "提示";
+Zi.LAN.ChuoWu = "错误";
+Zi.LAN.FuWuQiXiangYingChuCuo = "服务器响应出错,请重试";
+Zi.LAN.ZhuangTaiBuNengWeiKongBuNengBaoCun = "状态不能为空，请修改后再保存";
+Zi.LAN.QueDingYaoFaSongZhuangTaiMa ="确定要选中状态发送给客户吗？";
+
+Zi.LAN.WMSNO = "入库单号";
+Zi.LAN.BSCUSTOMNO = "关联报关单号";
+Zi.LAN.SALE = "揽货人";
+Zi.LAN.OP = "操作";
+Zi.LAN.CUSTOMERNAME = "委托单位";
+Zi.LAN.OPERATORCODE = "客户操作";
+Zi.LAN.SALEDEPT2 = "所属部门";
+Zi.LAN.CUSTOMSER = "报关行";
+Zi.LAN.BSSOURCE = "业务来源";
+Zi.LAN.BSSOURCEDETAIL = "报来源明细";
+Zi.LAN.BSTYPE = "运输类型";
+Zi.LAN.TRADETYPE = "贸易方式";
+Zi.LAN.ENTERP = "经营单位";
+Zi.LAN.INSPECTSERVICE = "报检项目";
+Zi.LAN.TRADETERM = "贸易条款";
+Zi.LAN.CUSTOMTYPE = "报关类型";
+Zi.LAN.YES = "是";
+Zi.LAN.NO = "否";
+Zi.LAN.ISCLEAR = "是否通关";
+Zi.LAN.ISCUSTOMEND = "报关完结";
+Zi.LAN.CUSTOMNO = "报关单号";
+Zi.LAN.CUSTNO = "委托编号";
+Zi.LAN.BSDATE = "录入日期";
+Zi.LAN.BSCUSTNO = "自理编号";
+Zi.LAN.BSSTATUSREF = "业务锁定";
+Zi.LAN.FEESTATUSREF = "费用锁定";
+Zi.LAN.ACCDATE = "会计期间";
+Zi.LAN.OPDATE = "业务日期";
+Zi.LAN.MBLNO = "主提单号";
+Zi.LAN.HBLNO = "分提单号";
+Zi.LAN.CUSTOMNO = "报关单号";
+Zi.LAN.CUSTOMNO = "报关单号";
+Zi.LAN.CUSTOMNO = "报关单号";
+Zi.LAN.CUSTOMNO = "报关单号";
+Zi.LAN.CUSTOMNO = "报关单号";
+Zi.LAN.CUSTOMNO = "报关单号";
+Zi.LAN.CUSTOMNO = "报关单号";
+Zi.LAN.CUSTOMNO = "报关单号";
+Zi.LAN.CUSTOMNO = "报关单号";
+
+
+//Zi.LAN. = "";
+
+
+
diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeai/MsOpSeaiEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeai/MsOpSeaiEdit.js
index 029f13f0..0fa92a59 100644
--- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeai/MsOpSeaiEdit.js
+++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeai/MsOpSeaiEdit.js
@@ -25,6 +25,12 @@ Ext.extend(Shipping.MsOpSeaiEdit, Ext.Panel, {
         this.SALEORDERDEPTBYOP = 0;
         this.copyfee = false;
 
+
+        var BLTYPEDFIELDNAME = 'EnumValueName';
+        if (strLANGUAGES == "en-us") {
+            BLTYPEDFIELDNAME = 'EnumValueName_2';
+        }
+
         this.storecodeservice = Ext.create('DsExt.ux.RefTableStore', {
             model: 'MsCodeOpService',
             proxy: { url: '/MvcShipping/MsCodeOpService/GetDataList' }
@@ -477,10 +483,7 @@ Ext.extend(Shipping.MsOpSeaiEdit, Ext.Panel, {
         this.StoreBLTYPE.load({ params: { enumTypeId: 97042 } });
 
 
-        var BLTYPEDFIELDNAME = 'EnumValueName';
-        if (strLANGUAGES == "en-us") {
-            BLTYPEDFIELDNAME = 'EnumValueName_2';
-        }
+
 
 
         this.comboxBLTYPE = Ext.create('DsExt.ux.RefTableCombox', {
@@ -880,10 +883,11 @@ Ext.extend(Shipping.MsOpSeaiEdit, Ext.Panel, {
         Ext.define('UNITOFWEIGHTModel', {
             extend: 'Ext.data.Model',
             fields: [
-              { name: 'Name', type: 'string' }
+              { name: 'Name', type: 'string' },
+              { name: 'Value', type: 'string' }
             ]
         });
-        var dataUNITOFWEIGHT = [{ "Name": "吨" }, { "Name": "CBM" }, { "Name": "千克" }, { "Name": ""}];
+        var dataUNITOFWEIGHT = [{ "Name": "吨", "Value": Zi.LAN.TON }, { "Name": "CBM", "Value": "CBM"}, { "Name": "千克", "Value": Zi.LAN.KG }, { "Name": "", "Value":""}];
         var storeUNITOFWEIGHT = Ext.create('Ext.data.Store', {
             model: 'UNITOFWEIGHTModel',
             data: dataUNITOFWEIGHT
@@ -894,7 +898,7 @@ Ext.extend(Shipping.MsOpSeaiEdit, Ext.Panel, {
             store: storeUNITOFWEIGHT,
             id: 'UNITOFWEIGHT',
             name: 'UNITOFWEIGHT',
-            valueField: 'Name',
+            valueField: 'Value',
             displayField: 'Name'
         });
 
@@ -1169,14 +1173,16 @@ Ext.extend(Shipping.MsOpSeaiEdit, Ext.Panel, {
             fieldLabel: Zi.LAN.TRANSKINDPKGS,// '运输包装',
             store: this.storeTRANSKINDPKGS,
             forceSelection: true,
+            valueField: 'EnumValueId',
+            displayField: BLTYPEDFIELDNAME,
             name: 'TRANSKINDPKGS'
         });
 
         this.storeISBONDED = Ext.create('Ext.data.Store', {
             fields: ['FType', 'NAME']
         });
-        this.storeISBONDED.add({ "FType": '1', "NAME": "是" });
-        this.storeISBONDED.add({ "FType": '0', "NAME": "否" });
+        this.storeISBONDED.add({ "FType": '1', "NAME": Zi.LAN.YES });
+        this.storeISBONDED.add({ "FType": '0', "NAME": Zi.LAN.NO});
 
         this.comboxISBONDED = Ext.create('DsExt.ux.RefTableCombox', {
             store: this.storeISBONDED,
@@ -1751,20 +1757,28 @@ Ext.extend(Shipping.MsOpSeaiEdit, Ext.Panel, {
             }]
         });
 
-        this.StoreCargoid = Ext.create('Ext.data.Store', {
-            fields: ['ID', 'NAME']
+
+        this.StoreCargoid = Ext.create('DsExt.ux.RefTableStore', {
+            model: 'DsExtEnumModel',
+            proxy: { url: '/CommMng/PubSys/GetEnumValueList' }
         });
-        this.StoreCargoid.add({ "ID": "S", "NAME": "S普通货" });
-        this.StoreCargoid.add({ "ID": "R", "NAME": "R冻柜" });
-        this.StoreCargoid.add({ "ID": "D", "NAME": "D危险品" });
-        this.StoreCargoid.add({ "ID": "O", "NAME": "O超限箱" });
+        this.StoreCargoid.load({ params: { enumTypeId: 96012 } });
+
+
+        //this.StoreCargoid = Ext.create('Ext.data.Store', {
+        //    fields: ['ID', 'NAME']
+        //});
+        //this.StoreCargoid.add({ "ID": "S", "NAME": "S普通货" });
+        //this.StoreCargoid.add({ "ID": "R", "NAME": "R冻柜" });
+        //this.StoreCargoid.add({ "ID": "D", "NAME": "D危险品" });
+        //this.StoreCargoid.add({ "ID": "O", "NAME": "O超限箱" });
         this.comboxCargoid = Ext.create('DsExt.ux.RefTableCombox', {
             store: this.StoreCargoid,
             fieldLabel: Zi.LAN.CARGOID, //'货物标示',
             forceSelection: true,
             name: 'CARGOID',
-            valueField: 'ID',
-            displayField: 'NAME',
+            valueField: 'EnumValueId',
+            displayField: BLTYPEDFIELDNAME,
             listeners: {
                 scope: this,
                 'select': function (combo, records, eOpts) {
diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeai/Zi_zh-cn.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeai/Zi_zh-cn.js
index 6122f818..faed9569 100644
--- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeai/Zi_zh-cn.js
+++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeai/Zi_zh-cn.js
@@ -400,6 +400,10 @@ Zi.LAN.QueDing = "确定";
 Zi.LAN.QuXiao = "取消";
 Zi.LAN.TiDanHaoPiLiangChaXun = "主提单号批量查询";
 Zi.LAN.TiDanHaoBuNengWeiKong = "提单号不能为空!";
+Zi.LAN.TON = "吨";
+Zi.LAN.KG = "千克";
+Zi.LAN.YES = "是";
+Zi.LAN.NO = "否";
 //#endregion
 
 //Zi.LAN. = "";
diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsRptSaleBalProfitShare/MsRptSaleBalProfitShareIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsRptSaleBalProfitShare/MsRptSaleBalProfitShareIndex.js
index abd99e02..c5bfcaaf 100644
--- a/DSWeb/Areas/MvcShipping/Viewsjs/MsRptSaleBalProfitShare/MsRptSaleBalProfitShareIndex.js
+++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsRptSaleBalProfitShare/MsRptSaleBalProfitShareIndex.js
@@ -1798,7 +1798,7 @@ Ext.extend(Shipping.MsRptSaleBalProfitShareIndex, Ext.Panel, {
             sql = sql + getAndConSql(sql, PS_FEELOCK, "B.FEESTATUS=0");
 
         if (this.CheckOnlyStl.checked) {
-            sql = sql + getAndConSql(sql, "11", " B.TTLDR=B.STLTTLDR AND B.TTLDR<>0 ");
+            sql = sql + getAndConSql(sql, "11", " B.TTLDR=B.STLTTLDR  ");
         }
 
         var ISFEE = form.findField('ISFEE').getValue();
diff --git a/DSWeb/DSWeb.csproj b/DSWeb/DSWeb.csproj
index d0955faf..f1d98ce3 100644
--- a/DSWeb/DSWeb.csproj
+++ b/DSWeb/DSWeb.csproj
@@ -1594,6 +1594,8 @@
     <Content Include="Areas\MvcShipping\Viewsjs\MsChFeeAgent\Index.js" />
     <Content Include="Areas\MvcShipping\Viewsjs\MsChFeeAgent\MsChFeeAgentDcEdit.js" />
     <Content Include="Areas\MvcShipping\Viewsjs\MsChFeeAgent\MsChFeeAgentDcModel.js" />
+    <Content Include="Areas\MvcShipping\Viewsjs\MsChFeeAgent\Zi_en-us.js" />
+    <Content Include="Areas\MvcShipping\Viewsjs\MsChFeeAgent\Zi_zh-cn.js" />
     <Content Include="Areas\MvcShipping\Viewsjs\MsChFeeAutoDui\Edit.js" />
     <Content Include="Areas\MvcShipping\Viewsjs\MsChFeeAutoDui\FileImport.js" />
     <Content Include="Areas\MvcShipping\Viewsjs\MsChFeeAutoDui\MsChFeeAutoDuiEdit.js" />
@@ -1609,6 +1611,7 @@
     <Content Include="Areas\MvcShipping\Viewsjs\MsChFee\Zi_en-us.js" />
     <Content Include="Areas\MvcShipping\Viewsjs\MsChFee\Zi_zh-cn.js" />
     <Content Include="Areas\MvcShipping\Viewsjs\MsChFee\YJFeeDrCrGrid.js" />
+    <Content Include="Areas\MvcShipping\Viewsjs\MsCodeDuiTemplate\MsCodeDuiTemplateEdit.js" />
     <Content Include="Areas\MvcShipping\Viewsjs\MsCodeGoods\GoodTypeIndex.js" />
     <Content Include="Areas\MvcShipping\Viewsjs\MsCodeGoods\MsCodeGoodTypeIndex.js" />
     <Content Include="Areas\MvcShipping\Viewsjs\MsCodeStlMode\Index.js" />
@@ -1697,6 +1700,8 @@
     <Content Include="Areas\MvcShipping\Viewsjs\MsCwAccitemsGl\MsCwAccitemsGlIndex.js" />
     <Content Include="Areas\MvcShipping\Viewsjs\MsCwAccitemsGl\MsCwAccitemsGlModel.js" />
     <Content Include="Areas\MvcShipping\Viewsjs\MsFeeTemplate\FeeTemplatePLAdd.js" />
+    <Content Include="Areas\MvcShipping\Viewsjs\MsOpApply\Zi_en-us.js" />
+    <Content Include="Areas\MvcShipping\Viewsjs\MsOpApply\Zi_zh-cn.js" />
     <Content Include="Areas\MvcShipping\Viewsjs\MsOpBill\MsOpYardDbView.js" />
     <Content Include="Areas\MvcShipping\Viewsjs\MsOpLetter\HistryTruckIndex.js" />
     <Content Include="Areas\MvcShipping\Viewsjs\MsOpLetter\Zi_en-us.js" />
diff --git a/DSWeb/DSWeb.csproj.user b/DSWeb/DSWeb.csproj.user
index 5d714467..a8615099 100644
--- a/DSWeb/DSWeb.csproj.user
+++ b/DSWeb/DSWeb.csproj.user
@@ -4,7 +4,7 @@
     <ProjectView>ShowAllFiles</ProjectView>
     <NameOfLastUsedPublishProfile>配置文件1</NameOfLastUsedPublishProfile>
     <UseIISExpress>true</UseIISExpress>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />
diff --git a/DSWeb/Login.aspx b/DSWeb/Login.aspx
index a136835e..da24af3c 100644
--- a/DSWeb/Login.aspx
+++ b/DSWeb/Login.aspx
@@ -26,6 +26,16 @@
                 document.getElementById('tbpassword').value = '';
             }
             GetIp();
+            const urlParams = new URLSearchParams(window.location.search);
+            const lan = urlParams.get('lan');
+            if (lan == "en-us") {
+                document.getElementById("mainRightTitle").innerHTML = "Quick Login"
+                document.getElementById("CompanyCodeTxt").innerHTML = "Corp Code"
+                document.getElementById("UserNameTxt").innerHTML = "User Name"
+                document.getElementById("passwordTxt").innerHTML = "PassWord"
+                document.getElementById("UserNameTxt").innerHTML = "User Name"
+                
+            }
             var rnd = Math.floor(Math.random() * 5 + 1);
             switch (rnd) {
                 case 1:
@@ -50,6 +60,7 @@
         function $(id) {
             return document.getElementById(id);
         }
+
         function initComboSubcompany()//分公司
         {
             if ($("list_subcompany").value != "") {
@@ -147,23 +158,23 @@ fetch('https://api.ipify.org?format=json')
     <div class="mainContainer">
     	<div class="mainLeft"><img id="img1" src="images/loginImg/rndImg01.jpg" width="600" height="410" border="0" style="display:none;" /><img id="img2" src="images/loginImg/rndImg02.jpg" width="600" height="410" border="0" style="display:none;" /><img id="img3" src="images/loginImg/rndImg03.jpg" width="600" height="410" border="0" style="display:none;" /><img id="img4" src="images/loginImg/rndImg04.jpg" width="600" height="410" border="0" style="display:none;" /><img id="img5" src="images/loginImg/rndImg05.jpg" width="600" height="410" border="0" style="display:none;" /></div>
         <div class="mainRight">
-        	<div class="mainRightTitle">快速登录</div>
+        	<div id="mainRightTitle" class="mainRightTitle">快速登录</div>
             <ul class="loginUL">
             	<li class="loginTextLI">
                 	<ul class="loginTextUL">
-                    	<li class="loginTextTitleLI">公司代码</li>
+                    	<li id="CompanyCodeTxt" class="loginTextTitleLI">公司代码</li>
                         <li class="loginTextContainerLI" style="position:relative;"><asp:TextBox ID="list_subcompany" runat="server" CssClass="textLogin" MaxLength="10" onblur="initComboSubcompany();"></asp:TextBox><input id="lb_subcompany" type="text" runat=server style="position:absolute;top:50px;left:0;z-index:1000;border-style: none; border-color: #FFFFFF; font-size: 12px; width:200px;" disabled="disabled" readonly="readonly" /></li>
                     </ul>
                 </li>
             	<li class="loginTextLI">
                 	<ul class="loginTextUL">
-                    	<li class="loginTextTitleLI">用&nbsp;&nbsp;&nbsp;&nbsp;户&nbsp;&nbsp;&nbsp;&nbsp;名</li>
+                    	<li id="UserNameTxt" class="loginTextTitleLI">用&nbsp;&nbsp;&nbsp;&nbsp;户&nbsp;&nbsp;&nbsp;&nbsp;名</li>
                         <li class="loginTextContainerLI" style="position:relative;"><asp:TextBox ID="list_CODENAME" runat="server" CssClass="textLogin" MaxLength="10" onblur="initComboSubcompany();"></asp:TextBox><input id="lb_CODENAME" type="text" runat=server style="position:absolute;top:50px;left:0;z-index:1000;border-style: none; border-color: #FFFFFF; font-size: 12px; width:200px;" disabled="disabled" readonly="readonly" /></li>
                     </ul>
                 </li>
             	<li class="loginTextLI">
                 	<ul class="loginTextUL">
-                    	<li class="loginTextTitleLI">密&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;码</li>
+                    	<li id="passwordTxt" class="loginTextTitleLI">密&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;码</li>
                         <li class="loginTextContainerLI" style="position:relative;"><input type="password" id="tbpassword" class="textLogin" runat="server" onkeydown="login();" /><asp:TextBox id="ipaddress" runat="server" CssClass="textLogin" MaxLength="10" style="display:none;"></asp:TextBox></li>
                     </ul>
                 </li>
diff --git a/DSWeb/Login.aspx.cs b/DSWeb/Login.aspx.cs
index 658ad825..e6c5977d 100644
--- a/DSWeb/Login.aspx.cs
+++ b/DSWeb/Login.aspx.cs
@@ -28,7 +28,7 @@ namespace DSWeb
         Cookies cookie = new Cookies();
         UserDA UserDA = new UserDA();
         public string PageMeta = "";
-
+        public string lan = "";
         protected void Page_Load(object sender, EventArgs e)
         {
             /*XmlDocument xmlDoc = new XmlDocument();
@@ -37,7 +37,16 @@ namespace DSWeb
             string xmlName = NodeList[0].ChildNodes[0].InnerText;    //获取第一个Student节点的StuName  
             if (xmlName == "2") { Response.Redirect("Login_new.aspx"); }*/
 
-            this.Page.Title = "用户登录";
+            lan = Request.QueryString["lan"];
+            if (lan == "en-us")
+            {
+                this.Page.Title = "Login In";
+            }
+            else
+            {
+                this.Page.Title = "用户登录";
+            }
+
             PageMeta = this.Page.Title;
 
 
@@ -50,9 +59,18 @@ namespace DSWeb
 
             if (cmodel == null)
             {
-                Page.ClientScript.RegisterStartupScript(this.GetType(), "key0",
+                if (lan == "en-us")
+                {
+                    Page.ClientScript.RegisterStartupScript(this.GetType(), "key0",
+"<script>alert('No module registration information is configured. Unable to log in!');history.back();</script>");
+                    return;
+                }
+                else
+                {
+                    Page.ClientScript.RegisterStartupScript(this.GetType(), "key0",
 "<script>alert('没有配置模块注册信息，无法登录！');history.back();</script>");
-                return;
+                    return;
+                }
 
             }
 
@@ -95,11 +113,22 @@ namespace DSWeb
 
             if (!Page.IsPostBack)
             {
-                if (Request.Cookies["Lan"] != null)
+                if (lan == "en-us")
                 {
-                    string sel = Server.UrlDecode(cookie.getCookie("Lan").ToString().Trim());
-                    sel = sel.Replace("Lan=", "");
-                    this.selLan.SelectedValue = sel;
+                    this.selLan.SelectedValue = "English";
+                    this.CheckBox1.Text = "Remember Corp Code and UserName";
+                    this.CheckBox2.Text = "Remember Password";
+                    this.btLogin.Text = "Login";
+
+                }
+                else
+                {
+                    if (Request.Cookies["Lan"] != null)
+                    {
+                        string sel = Server.UrlDecode(cookie.getCookie("Lan").ToString().Trim());
+                        sel = sel.Replace("Lan=", "");
+                        this.selLan.SelectedValue = sel;
+                    }
                 }
                 this.ipaddress.Text = "";
                 if (Request.Cookies["isCheckBox"] != null)
@@ -204,9 +233,18 @@ namespace DSWeb
             stripAddr = this.ipaddress.Text;
             if (strCompanyCode.Equals("") || strUserCodeName.Equals("") || strUserPassword.Equals(""))
             {
-                Page.ClientScript.RegisterStartupScript(this.GetType(), "key0",
-                    "<script>alert('公司名称、用户名、密码不能为空，请重新登陆！');history.back();</script>");
-                return;
+                if (lan == "en-us")
+                {
+                    Page.ClientScript.RegisterStartupScript(this.GetType(), "key0",
+                        "<script>alert('The company name, username, and password cannot be empty. Please log in again!');history.back();</script>");
+                    return;
+                }
+                else
+                {
+                    Page.ClientScript.RegisterStartupScript(this.GetType(), "key0",
+                        "<script>alert('公司名称、用户名、密码不能为空，请重新登陆！');history.back();</script>");
+                    return;
+                }
             }
 
             if (strCompanyCode.IndexOf("'") >= 0)
diff --git a/DispatchWeb/DispatchWeb.csproj.user b/DispatchWeb/DispatchWeb.csproj.user
index af17a67a..e6a8406a 100644
--- a/DispatchWeb/DispatchWeb.csproj.user
+++ b/DispatchWeb/DispatchWeb.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
diff --git a/JobAutoCreateFee/JobDjyXf.cs b/JobAutoCreateFee/JobDjyXf.cs
index 328907b6..699e4f69 100644
--- a/JobAutoCreateFee/JobDjyXf.cs
+++ b/JobAutoCreateFee/JobDjyXf.cs
@@ -76,20 +76,29 @@ namespace JobCreateFee
                             dbcon.Open();
                             foreach (var returndata in returnlist)
                             {
-                                var bsno = GETD6BSNO(returndata.mblno,dbcon);
-                                
-
-                                if (returndata.price == ""||returndata.price == null) returndata.price = "0";
-                                if (returndata.ctnrCount == "" || returndata.ctnrCount == null) returndata.ctnrCount = "0";
-                                string sql = " if (select GID from t_op_txxp_log where GID='" + returndata.gid + "') is null INSERT INTO t_op_txxp_log([编号],[GID],[beizhu],[mblno],[bsstatus],[bstype],[createtime]";
-                                sql = sql + ",[price],[sendtype],[ctnrCount],[ctnrInfo]) values ('"+bsno+"','" + returndata.gid + "'";
-                                sql = sql + ",'" + returndata.beizhu + "','" + returndata.mblno + "','" + returndata.bsstatus + "','" + returndata.bstype + "','" + returndata.createtime + "'";
-                                sql = sql + "," + returndata.price + ",'" + returndata.sendtype + "'," + returndata.ctnrCount + ",'" + returndata.ctnrInfo + "')";
-                                SqlCommand cmd = new SqlCommand(sql, dbcon);
-                                cmd.ExecuteNonQuery();
-                                if (string.IsNullOrEmpty(bsno)) {
-                                    SaveMail(dbcon, "CMABKG@SDSMARTLOGISTICS.COM", returndata.mblno + "此单号已退仓，但是系统检测到打印过小票"+ returndata.ctnrCount + "次，请知悉，谢谢", returndata.mblno + "此单号已退仓，但是系统检测到打印过小票"+ returndata.ctnrCount + "次，请知悉，谢谢", "1");
-
+                                if (returndata.sendcom.IndexOf("捷丰") > 0)
+                                {
+                                    var bsno = GETD6BSNO(returndata.mblno, dbcon);
+
+                                    if (returndata.price == "" || returndata.price == null) returndata.price = "0";
+                                    if (returndata.ctnrCount == "" || returndata.ctnrCount == null) returndata.ctnrCount = "0";
+                                    string sql = " if (select GID from t_op_txxp_log where GID='" + returndata.gid + "') is null INSERT INTO t_op_txxp_log([编号],[GID],[beizhu],[mblno],[bsstatus],[bstype],[createtime]";
+                                    sql = sql + ",[price],[sendtype],[ctnrCount],[ctnrInfo]) values ('" + bsno + "','" + returndata.gid + "'";
+                                    sql = sql + ",'" + returndata.beizhu + "','" + returndata.mblno + "','" + returndata.bsstatus + "','" + returndata.bstype + "','" + returndata.createtime + "'";
+                                    sql = sql + "," + returndata.price + ",'" + returndata.sendtype + "'," + returndata.ctnrCount + ",'" + returndata.ctnrInfo + "')";
+                                    SqlCommand cmd = new SqlCommand(sql, dbcon);
+                                    cmd.ExecuteNonQuery();
+                                    var headstr = "";
+                                    if (returndata.mblno.Length > 3)
+                                    {
+                                        headstr = returndata.mblno.Substring(0, 3);
+                                    }
+
+                                    if (string.IsNullOrEmpty(bsno) && (headstr == "QGD" || headstr == "AMQ" || headstr == "AMG" || headstr == "AYQ"))
+                                    {
+                                        SaveMail(dbcon, "CMABKG@SDSMARTLOGISTICS.COM", returndata.mblno + "此单号已退仓，但是系统检测到打印过小票" + returndata.ctnrCount + "次，请知悉，谢谢", returndata.mblno + "此单号已退仓，但是系统检测到打印过小票" + returndata.ctnrCount + "次，请知悉，谢谢", "1");
+
+                                    }
                                 }
 
                             }
@@ -192,6 +201,8 @@ namespace JobCreateFee
         public string createtime { get; set; }
         public string price { get; set; }
         public string sendtype { get; set; }
+
+        public string sendcom { get; set; }
         public string ctnrCount { get; set; }
         public string ctnrInfo { get; set; }