1

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>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />

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>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />

DSWeb/Areas/CommMng/DAL/BasicDataRefDAL.cs

@@ -421,6 +421,12 @@ namespace DSWeb.Areas.CommMng.DAL
             {
                 strSql.Append(" and " + strCondition);
             }
+            if (lan == "en-us")
+            {
+                strSql.Append(" and ISNULL(ESHORTNAME,'')<>'' ");
+
+            }
+
             if (IsEnableCustRange == "1")
                 strSql.Append(" and (SHORTNAME in (SELECT SHORTNAME from info_client_range where USERID='" + userid + "' )  or SHORTNAME not in (SELECT SHORTNAME from info_client_range )) ");
 

DSWeb/Areas/MvcShipping/Controllers/MsCompanysController.cs

@@ -57,7 +57,9 @@ namespace DSWeb.MvcShipping.Controllers
         public ContentResult GetNoPicDataList(int start, int limit, string sort, string condition)
         {
             //
-            var dataList = MsCompanysDAL.GetNoPicDataList(condition);
+            string LAN = Convert.ToString(Session["LANGUAGES"]);
+
+            var dataList = MsCompanysDAL.GetNoPicDataList(condition, LAN);
             var list = dataList.ToList();
             var json = JsonConvert.Serialize(new { Success = true, Message = "查询成功", totalCount = dataList.Count, data = list.ToList() });
             return new ContentResult() { Content = json };

DSWeb/Areas/MvcShipping/DAL/MsCompanys/MsCompanysDAL.cs

@@ -96,7 +96,7 @@ namespace DSWeb.MvcShipping.DAL.MsCompanysDAL
             return new MsCompanysEntity();
         }
 
-        static public List<MsCompanysEntity> GetNoPicDataList(string strCondition)
+        static public List<MsCompanysEntity> GetNoPicDataList(string strCondition,string LAN)
         {
             //
             String strSql = "SELECT *,CODENAME + '-' + NAME AS CodeAndName,MODIFIEDUSERNAME=(select top 1 SHOWNAME from [user] where gid=[company].MODIFIEDUSER) FROM [company] ";
@@ -105,8 +105,13 @@ namespace DSWeb.MvcShipping.DAL.MsCompanysDAL
             {
                 strSql += " and " + strCondition;
             }
+            if (LAN == "en-us")
+            {
+                strSql += " and ISNULL(ENNAME,'')<>'' ";
+
+            }
 
-          strSql += " order by [CODENAME],[NAME]";
+            strSql += " order by [CODENAME],[NAME]";
 
             return SetNoPicData(strSql);
         }

DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js

@@ -1237,6 +1237,12 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
             name: 'TRADETERM'
         });
 
+
+        var SaleCompanyFIELDNAME = 'NAME';
+        if (strLANGUAGES == "en-us") {
+            SaleCompanyFIELDNAME = 'ENNAME';
+        }
+
         this.storeSaleCompany = Ext.create('DsExt.ux.RefTableStore', {
             model: 'MsCompanysEntity',
             proxy: { url: '/MvcShipping/MsCompanys/GetNoPicDataList' }
@@ -1249,7 +1255,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
             forceSelection: true,
             name: 'SALECORPID',
             valueField: 'GID',
-            displayField: 'NAME'
+            displayField: SaleCompanyFIELDNAME
         });
 
         this.StoreBSSTATUSREF= Ext.create('Ext.data.Store', {

DSWeb/DSWeb.csproj.user

@@ -4,7 +4,7 @@
     <ProjectView>ShowAllFiles</ProjectView>
     <NameOfLastUsedPublishProfile>配置文件1</NameOfLastUsedPublishProfile>
     <UseIISExpress>true</UseIISExpress>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />

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>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />