From 3ae8f509555d833c08af93767b98eb4795d27bf4 Mon Sep 17 00:00:00 2001
From: dengyu <ddlucky@sina.com>
Date: Fri, 6 Dec 2024 17:37:36 +0800
Subject: [PATCH] 1

---
 .../Controllers/MsCompanysController.cs       |   2 +-
 .../Controllers/MsCrmQuotationController.cs   |   2 +-
 .../Controllers/MsExchangesUnitController.cs  |   2 +-
 .../Controllers/MsOpOtherController.cs        |   2 +-
 .../Controllers/MsOpSeaePreController.cs      |   2 +-
 .../Controllers/MsOpSocCtnController.cs       |   2 +-
 .../SoftMng/Controllers/AuthController.cs     | 182 +++----
 .../MsInfoClientFeedbackController.cs         |   2 +-
 .../Controllers/MsOpTruckBulkController.cs    |   8 +-
 .../Controllers/MsOpTruckBulkPcController.cs  |  16 +-
 DSWeb/DSWeb.csproj                            | 462 ++----------------
 11 files changed, 160 insertions(+), 522 deletions(-)

diff --git a/DSWeb/Areas/MvcShipping/Controllers/MsCompanysController.cs b/DSWeb/Areas/MvcShipping/Controllers/MsCompanysController.cs
index 871e5274..8ac9719c 100644
--- a/DSWeb/Areas/MvcShipping/Controllers/MsCompanysController.cs
+++ b/DSWeb/Areas/MvcShipping/Controllers/MsCompanysController.cs
@@ -11,7 +11,7 @@ using System.Collections.Generic;
 using DSWeb.MvcShipping.DAL.MsBaseInfoDAL;
 using DSWeb.EntityDA;
 using DSWeb.Models;
-using DSWeb.Attributes;
+//using DSWeb.Attributes;
 using DSWeb.SoftMng.DBUtility;
 using DSWeb.SoftMng.BLL;
 using DSWeb.SoftMng.Common;
diff --git a/DSWeb/Areas/MvcShipping/Controllers/MsCrmQuotationController.cs b/DSWeb/Areas/MvcShipping/Controllers/MsCrmQuotationController.cs
index a99712d8..1065c97c 100644
--- a/DSWeb/Areas/MvcShipping/Controllers/MsCrmQuotationController.cs
+++ b/DSWeb/Areas/MvcShipping/Controllers/MsCrmQuotationController.cs
@@ -11,7 +11,7 @@ using System.Collections.Generic;
 using DSWeb.MvcShipping.DAL.MsBaseInfoDAL;
 using DSWeb.EntityDA;
 using DSWeb.Models;
-using DSWeb.Attributes;
+//using DSWeb.Attributes;
 using DSWeb.MvcShipping.Models.MsSysBillNoSet;
 using DSWeb.MvcShipping.DAL.MsSysBillNoSet;
 using DSWeb.MvcShipping.Models.MsCodeServiceFeeTemplate;
diff --git a/DSWeb/Areas/MvcShipping/Controllers/MsExchangesUnitController.cs b/DSWeb/Areas/MvcShipping/Controllers/MsExchangesUnitController.cs
index 7ed8df52..92fdb9eb 100644
--- a/DSWeb/Areas/MvcShipping/Controllers/MsExchangesUnitController.cs
+++ b/DSWeb/Areas/MvcShipping/Controllers/MsExchangesUnitController.cs
@@ -11,7 +11,7 @@ using System.Collections.Generic;
 using DSWeb.MvcShipping.DAL.MsBaseInfoDAL;
 using DSWeb.EntityDA;
 using DSWeb.Models;
-using DSWeb.Attributes;
+//using DSWeb.Attributes;
 using System.IO;
 
 namespace DSWeb.MvcShipping.Controllers
diff --git a/DSWeb/Areas/MvcShipping/Controllers/MsOpOtherController.cs b/DSWeb/Areas/MvcShipping/Controllers/MsOpOtherController.cs
index 04cd8380..048a103a 100644
--- a/DSWeb/Areas/MvcShipping/Controllers/MsOpOtherController.cs
+++ b/DSWeb/Areas/MvcShipping/Controllers/MsOpOtherController.cs
@@ -11,7 +11,7 @@ using System.Collections.Generic;
 using DSWeb.MvcShipping.DAL.MsBaseInfoDAL;
 using DSWeb.EntityDA;
 using DSWeb.Models;
-using DSWeb.Attributes;
+//using DSWeb.Attributes;
 using DSWeb.MvcShipping.Models.MsSysBillNoSet;
 using DSWeb.MvcShipping.DAL.MsSysBillNoSet;
 using DSWeb.MvcShipping.Models.MsCodeServiceFeeTemplate;
diff --git a/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaePreController.cs b/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaePreController.cs
index 2a63431e..dcfe9518 100644
--- a/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaePreController.cs
+++ b/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaePreController.cs
@@ -11,7 +11,7 @@ using System.Collections.Generic;
 using DSWeb.MvcShipping.DAL.MsBaseInfoDAL;
 using DSWeb.EntityDA;
 using DSWeb.Models;
-using DSWeb.Attributes;
+//using DSWeb.Attributes;
 using DSWeb.MvcShipping.Models.MsSysBillNoSet;
 using DSWeb.MvcShipping.DAL.MsSysBillNoSet;
 using DSWeb.MvcShipping.Models.MsCodeServiceFeeTemplate;
diff --git a/DSWeb/Areas/MvcShipping/Controllers/MsOpSocCtnController.cs b/DSWeb/Areas/MvcShipping/Controllers/MsOpSocCtnController.cs
index cb596422..cbdffafc 100644
--- a/DSWeb/Areas/MvcShipping/Controllers/MsOpSocCtnController.cs
+++ b/DSWeb/Areas/MvcShipping/Controllers/MsOpSocCtnController.cs
@@ -11,7 +11,7 @@ using System.Collections.Generic;
 using DSWeb.MvcShipping.DAL.MsBaseInfoDAL;
 using DSWeb.EntityDA;
 using DSWeb.Models;
-using DSWeb.Attributes;
+//using DSWeb.Attributes;
 using DSWeb.MvcShipping.Models.MsSysBillNoSet;
 using DSWeb.MvcShipping.DAL.MsSysBillNoSet;
 using DSWeb.MvcShipping.Models.MsCodeServiceFeeTemplate;
diff --git a/DSWeb/Areas/SoftMng/Controllers/AuthController.cs b/DSWeb/Areas/SoftMng/Controllers/AuthController.cs
index e3377d46..84bd718f 100644
--- a/DSWeb/Areas/SoftMng/Controllers/AuthController.cs
+++ b/DSWeb/Areas/SoftMng/Controllers/AuthController.cs
@@ -717,23 +717,23 @@ namespace DSWeb.SoftMng.Controllers
         /// </summary>
         /// <param name="ids"></param>
         /// <returns></returns>
-        public JsonResult RoleAuthDelete2(string roleid, string ids)
-        {
-            var module = new Modules.ModuleGridSource();
-            user_roleBLL ubll = new user_roleBLL();
-            sys_roleauthBLL mbll = new sys_roleauthBLL();
-
-            bool result = mbll.DeleteListWhere(string.Format("PID ='{0}' AND AuthorityID IN({1})", roleid, ids)) > 0;
-            //所有拥有此角色的人员删除该权限
-            var list = ubll.GetModelList("ROLEID='" + roleid + "'");
-            string[] delItems = ids.Split(',');
-            foreach (var item in delItems)
-            {
-                foreach (var p in list)
-                    module.RemoveUserModule(p.USERID, item.Replace("\'", ""));
-            }
-            return Json(new { success = result, message = result ? "操作成功" : "操作失败" });
-        }
+        //public JsonResult RoleAuthDelete2(string roleid, string ids)
+        //{
+        //    var module = new Modules.ModuleGridSource();
+        //    user_roleBLL ubll = new user_roleBLL();
+        //    sys_roleauthBLL mbll = new sys_roleauthBLL();
+
+        //    bool result = mbll.DeleteListWhere(string.Format("PID ='{0}' AND AuthorityID IN({1})", roleid, ids)) > 0;
+        //    //所有拥有此角色的人员删除该权限
+        //    var list = ubll.GetModelList("ROLEID='" + roleid + "'");
+        //    string[] delItems = ids.Split(',');
+        //    foreach (var item in delItems)
+        //    {
+        //        foreach (var p in list)
+        //            module.RemoveUserModule(p.USERID, item.Replace("\'", ""));
+        //    }
+        //    return Json(new { success = result, message = result ? "操作成功" : "操作失败" });
+        //}
         /// <summary>
         /// 获取人员树型
         /// </summary>
@@ -820,36 +820,36 @@ namespace DSWeb.SoftMng.Controllers
         /// <param name="roleid"></param>
         /// <param name="type"></param>
         /// <returns></returns>
-        public JsonResult SetRole(string userid, string roleid, int type)
-        {
-            sys_roleauthBLL mbll = new sys_roleauthBLL();
-            var authlist = mbll.GetModelList("Type=1 And PID ='" + roleid + "'");
-            var module = new Modules.ModuleGridSource();
-            string msg = "";
-            try
-            {
-                foreach (var item in authlist)
-                {
-                    if (type == 0)
-                    {
-                        var m = module.RemoveUserModule(userid, item.AuthorityID);
-                        if (m != "1") msg += m + "<br/>";
-                    }
-                    else
-                    {
-                        var m = module.AddUserModule(userid, item.AuthorityID);
-                        if (m != "1") msg += m + "<br/>";
-                    }
-                }
-                //绑定用户角色表
-                //dosomething
-                return Json(msg);
-            }
-            catch (Exception se)
-            {
-                return Json(se.Message);
-            }
-        }
+        //public JsonResult SetRole(string userid, string roleid, int type)
+        //{
+        //    sys_roleauthBLL mbll = new sys_roleauthBLL();
+        //    var authlist = mbll.GetModelList("Type=1 And PID ='" + roleid + "'");
+        //    var module = new Modules.ModuleGridSource();
+        //    string msg = "";
+        //    try
+        //    {
+        //        foreach (var item in authlist)
+        //        {
+        //            if (type == 0)
+        //            {
+        //                var m = module.RemoveUserModule(userid, item.AuthorityID);
+        //                if (m != "1") msg += m + "<br/>";
+        //            }
+        //            else
+        //            {
+        //                var m = module.AddUserModule(userid, item.AuthorityID);
+        //                if (m != "1") msg += m + "<br/>";
+        //            }
+        //        }
+        //        //绑定用户角色表
+        //        //dosomething
+        //        return Json(msg);
+        //    }
+        //    catch (Exception se)
+        //    {
+        //        return Json(se.Message);
+        //    }
+        //}
         /// <summary>
         /// 设置权限范围
         /// </summary>
@@ -1059,49 +1059,49 @@ namespace DSWeb.SoftMng.Controllers
         /// <param name="roleid"></param>
         /// <param name="modulelist"></param>
         /// <returns></returns>
-        public JsonResult SaveRoleAuth(string roleid, string modulelist)
-        {
-            var module = new Modules.ModuleGridSource();
-            sys_roleauthBLL mbll = new sys_roleauthBLL();
-            user_roleBLL ubll = new user_roleBLL();
-            try
-            {
-                var data = new JavaScriptSerializer().Deserialize<List<modeuleClass>>(modulelist);
-                var list = ubll.GetModelList("ROLEID='" + roleid + "'");
-
-                //20200225 首先检查拥有该角色的所有人 能否获得该权限范围
-                var useridlist = "";
-                foreach (var user in list) {
-                    if (useridlist != "") useridlist += ",";
-                    useridlist += user.GID;
-                }
-
-                var checkresult = SysUserDAL.CheckOPRange(data, useridlist);
-                if (!checkresult.Success) {
-                    return Json(new { success = false, msg = checkresult.Message });
-                }
-
-                foreach (var item in data)
-                {
-                    sys_roleauth model = new sys_roleauth();
-                    model.GID = Guid.NewGuid().ToString();
-                    model.AuthorityID = item.id;//模块id
-                    model.Name = item.name;
-                    model.PID = roleid;
-                    model.Type = 1;//一般权限
-                    mbll.Add(model);
-                    //所有拥有此角色的人员添加该权限
+        //public JsonResult SaveRoleAuth(string roleid, string modulelist)
+        //{
+        //    var module = new Modules.ModuleGridSource();
+        //    sys_roleauthBLL mbll = new sys_roleauthBLL();
+        //    user_roleBLL ubll = new user_roleBLL();
+        //    try
+        //    {
+        //        var data = new JavaScriptSerializer().Deserialize<List<modeuleClass>>(modulelist);
+        //        var list = ubll.GetModelList("ROLEID='" + roleid + "'");
+
+        //        //20200225 首先检查拥有该角色的所有人 能否获得该权限范围
+        //        var useridlist = "";
+        //        foreach (var user in list) {
+        //            if (useridlist != "") useridlist += ",";
+        //            useridlist += user.GID;
+        //        }
+
+        //        var checkresult = SysUserDAL.CheckOPRange(data, useridlist);
+        //        if (!checkresult.Success) {
+        //            return Json(new { success = false, msg = checkresult.Message });
+        //        }
+
+        //        foreach (var item in data)
+        //        {
+        //            sys_roleauth model = new sys_roleauth();
+        //            model.GID = Guid.NewGuid().ToString();
+        //            model.AuthorityID = item.id;//模块id
+        //            model.Name = item.name;
+        //            model.PID = roleid;
+        //            model.Type = 1;//一般权限
+        //            mbll.Add(model);
+        //            //所有拥有此角色的人员添加该权限
                     
-                    foreach (var p in list)
-                        module.AddUserModule(p.USERID, item.id);
-                }
-                return Json(new { success = true });
-            }
-            catch (Exception se)
-            {
-                return Json(new { success = false, msg = se.Message });
-            }
-        }
+        //            foreach (var p in list)
+        //                module.AddUserModule(p.USERID, item.id);
+        //        }
+        //        return Json(new { success = true });
+        //    }
+        //    catch (Exception se)
+        //    {
+        //        return Json(new { success = false, msg = se.Message });
+        //    }
+        //}
         //获取全部角色
         public JsonResult GetRoleView()
         {
@@ -1159,14 +1159,14 @@ namespace DSWeb.SoftMng.Controllers
                         case 1://添加角色
                             ubll.Add(model);
                             //加权限
-                            SetRole(userid, item.id, 1);
+                            //SetRole(userid, item.id, 1);
                             ////修改权限范围
                             //SetRange(userid, item.id, 1);
                             break;
                         case 0://移除角色
                             ubll.DeleteListWhere(string.Format("USERID='{0}' AND ROLEID='{1}'", userid, item.id));
                             ////移除权限
-                            SetRole(userid, item.id, 0);
+                            //SetRole(userid, item.id, 0);
                             ////恢复默认权限范围
                             //SetRange(userid, item.id, 0);
                             break;
diff --git a/DSWeb/Areas/SoftMng/Controllers/MsInfoClientFeedbackController.cs b/DSWeb/Areas/SoftMng/Controllers/MsInfoClientFeedbackController.cs
index 273e7465..3e090faa 100644
--- a/DSWeb/Areas/SoftMng/Controllers/MsInfoClientFeedbackController.cs
+++ b/DSWeb/Areas/SoftMng/Controllers/MsInfoClientFeedbackController.cs
@@ -7,7 +7,7 @@ using HcUtility.Comm;
 using HcUtility.Core;
 using DSWeb.EntityDA;
 using DSWeb.Models;
-using DSWeb.Attributes;
+//using DSWeb.Attributes;
 using DSWeb.SoftMng.DAL.MsInfoClientFeedbackDAL;
 using DSWeb.SoftMng.Models.MsInfoClientFeedback;
 using DSWeb.MvcShipping.Helper;
diff --git a/DSWeb/Areas/TruckMng/Controllers/MsOpTruckBulkController.cs b/DSWeb/Areas/TruckMng/Controllers/MsOpTruckBulkController.cs
index 8bb8c8ee..152c84f9 100644
--- a/DSWeb/Areas/TruckMng/Controllers/MsOpTruckBulkController.cs
+++ b/DSWeb/Areas/TruckMng/Controllers/MsOpTruckBulkController.cs
@@ -8,7 +8,7 @@ using HcUtility.Comm;
 using HcUtility.Core;
 using System.Collections.Generic;
 using DSWeb.EntityDA;
-using DSWeb.Attributes;
+//using DSWeb.Attributes;
 using DSWeb.MvcShipping.DAL.MsSysBillNoSet;
 using DSWeb.MvcShipping.DAL.MsInfoClient;
 using System.IO;
@@ -179,7 +179,7 @@ namespace DSWeb.Areas.TruckMng.Controllers
             }
             //
             T_ALL_DA T_ALL_DA = new EntityDA.T_ALL_DA();
-            AttributeManage attributeManager = new AttributeManage();
+            ////AttributeManage attributeManager = new AttributeManage();
             var dataall = data.Replace("}", ",") + data2.Replace("{", "");
             var headData = JsonConvert.Deserialize<MsOpTruckBulk>(dataall);
             var bodyList = JsonConvert.Deserialize<List<MsOpTruckBulkDetail>>(body);
@@ -419,7 +419,7 @@ namespace DSWeb.Areas.TruckMng.Controllers
             }
             //
             T_ALL_DA T_ALL_DA = new EntityDA.T_ALL_DA();
-            AttributeManage attributeManager = new AttributeManage();
+            //AttributeManage attributeManager = new AttributeManage();
             var dataall = data.Replace("}", ",") + data2.Replace("{", "");
             var headData = JsonConvert.Deserialize<MsOpTruckBulk>(dataall);
             var bodyList = JsonConvert.Deserialize<List<MsOpTruckBulkDetail>>(body);
@@ -591,7 +591,7 @@ namespace DSWeb.Areas.TruckMng.Controllers
             }
             //
             T_ALL_DA T_ALL_DA = new EntityDA.T_ALL_DA();
-            AttributeManage attributeManager = new AttributeManage();
+            //AttributeManage attributeManager = new AttributeManage();
             var dataall = data.Replace("}", ",") + data2.Replace("{", "");
             var headData = JsonConvert.Deserialize<MsOpTruckBulk>(dataall);
             var bodyList = JsonConvert.Deserialize<List<MsOpTruckBulkDetail>>(body);
diff --git a/DSWeb/Areas/TruckMng/Controllers/MsOpTruckBulkPcController.cs b/DSWeb/Areas/TruckMng/Controllers/MsOpTruckBulkPcController.cs
index 222eb5c8..c676942a 100644
--- a/DSWeb/Areas/TruckMng/Controllers/MsOpTruckBulkPcController.cs
+++ b/DSWeb/Areas/TruckMng/Controllers/MsOpTruckBulkPcController.cs
@@ -10,7 +10,7 @@ using HcUtility.Comm;
 using HcUtility.Core;
 using System.Collections.Generic;
 using DSWeb.EntityDA;
-using DSWeb.Attributes;
+//using DSWeb.Attributes;
 using DSWeb.MvcShipping.DAL.MsSysBillNoSet;
 
 namespace DSWeb.Areas.TruckMng.Controllers
@@ -128,7 +128,7 @@ namespace DSWeb.Areas.TruckMng.Controllers
             }
             //
             T_ALL_DA T_ALL_DA = new EntityDA.T_ALL_DA();
-            AttributeManage attributeManager = new AttributeManage();
+            //AttributeManage attributeManager = new AttributeManage();
             var headData = JsonConvert.Deserialize<MsOpTruckBulkPc>(data);
 
 
@@ -375,7 +375,7 @@ namespace DSWeb.Areas.TruckMng.Controllers
             }
             //
             T_ALL_DA T_ALL_DA = new EntityDA.T_ALL_DA();
-            AttributeManage attributeManager = new AttributeManage();
+            //AttributeManage attributeManager = new AttributeManage();
             var headData = JsonConvert.Deserialize<MsOpTruckBulkPc>(data);
             var bodyList = JsonConvert.Deserialize<List<MsOpTruckBulk>>(body);
 
@@ -536,7 +536,7 @@ namespace DSWeb.Areas.TruckMng.Controllers
             }
             //
             T_ALL_DA T_ALL_DA = new EntityDA.T_ALL_DA();
-            AttributeManage attributeManager = new AttributeManage();
+            //AttributeManage attributeManager = new AttributeManage();
             var OpTruckBulk = JsonConvert.Deserialize<MsOpTruckBulk>(data);
 
             var isPost = true;
@@ -741,7 +741,7 @@ namespace DSWeb.Areas.TruckMng.Controllers
             }
             //
             T_ALL_DA T_ALL_DA = new EntityDA.T_ALL_DA();
-            AttributeManage attributeManager = new AttributeManage();
+            //AttributeManage attributeManager = new AttributeManage();
             var OpTruckBulk = JsonConvert.Deserialize<MsOpTruckBulkPc>(data);
 
      
@@ -772,7 +772,7 @@ namespace DSWeb.Areas.TruckMng.Controllers
             }
             //
             T_ALL_DA T_ALL_DA = new EntityDA.T_ALL_DA();
-            AttributeManage attributeManager = new AttributeManage();
+            //AttributeManage attributeManager = new AttributeManage();
             var bodyList = JsonConvert.Deserialize < List<MsOpTruckBulkPc>>(data);
 
             var result = MsOpTruckBulkPcDAL.UpTransStatus(bodyList, transstatus, statusdate, arriverremark);
@@ -805,7 +805,7 @@ namespace DSWeb.Areas.TruckMng.Controllers
             }
             //
             T_ALL_DA T_ALL_DA = new EntityDA.T_ALL_DA();
-            AttributeManage attributeManager = new AttributeManage();
+            //AttributeManage attributeManager = new AttributeManage();
             var headData = JsonConvert.Deserialize<MsOpTruckBulkPc>(data);
             var bodyList = JsonConvert.Deserialize<List<MsOpTruckBulkDetail>>(body);
 
@@ -987,7 +987,7 @@ namespace DSWeb.Areas.TruckMng.Controllers
             //
 
             T_ALL_DA T_ALL_DA = new EntityDA.T_ALL_DA();
-            AttributeManage attributeManager = new AttributeManage();
+            //AttributeManage attributeManager = new AttributeManage();
             var headData = JsonConvert.Deserialize<MsOpTruckBulkPc>(data);
 
 
diff --git a/DSWeb/DSWeb.csproj b/DSWeb/DSWeb.csproj
index 2995acf6..d987dc0d 100644
--- a/DSWeb/DSWeb.csproj
+++ b/DSWeb/DSWeb.csproj
@@ -4311,13 +4311,6 @@
     <Content Include="Areas\WMS\Viewsjs\WMS\WMSModel.js" />
     <Content Include="Areas\WMS\Views\WMS\Edit.aspx" />
     <Content Include="Areas\WMS\Views\WMS\Index.aspx" />
-    <Content Include="Attributes\AttributeCompanyEdit.aspx" />
-    <Content Include="Attributes\AttributeCompanyList.aspx" />
-    <Content Include="Attributes\AttributeEdit.aspx" />
-    <Content Include="Attributes\AttributeGridSource.aspx" />
-    <Content Include="Attributes\AttributeManageList.aspx" />
-    <Content Include="Attributes\TypeEdit.aspx" />
-    <Content Include="Attributes\TypeList.aspx" />
     <Content Include="bin\AspNetPager.dll" />
     <Content Include="bin\Commons.dll" />
     <Content Include="bin\DotNet.Framework.Common.dll" />
@@ -4341,10 +4334,6 @@
     <Content Include="bin\System.Web.Mvc.dll" />
     <Content Include="bin\Web.PageBase.dll" />
     <Content Include="bin\zh-Hans\System.Web.Mvc.resources.dll" />
-    <Content Include="CRM\CRMClientContactAllList.aspx" />
-    <Content Include="CRM\CRMClientContactAllListGridSource.aspx" />
-    <Content Include="CRM\SaleProfitReport.aspx" />
-    <Content Include="CRM\SaleProfitReportGridSource.aspx" />
     <Content Include="Css\childView0.css" />
     <Content Include="Css\hyperlink.css" />
     <Content Include="Css\login.css" />
@@ -4358,8 +4347,6 @@
     <Content Include="Css\childView1.css" />
     <Content Include="Default.aspx" />
     <Content Include="download\ChromeSetup.exe" />
-    <Content Include="Grids\wucGridView.ascx" />
-    <Content Include="Grids\wucGridView2.ascx" />
     <Content Include="images\hetongewm.png" />
     <Content Include="images\setting\announce.jpg" />
     <Content Include="images\chrom.jpg" />
@@ -5278,10 +5265,6 @@
     <Content Include="js\WorkFlow.js" />
     <Content Include="js\WorkFlowStep.js" />
     <Content Include="MainPortal.aspx" />
-    <Content Include="Modules\Add.aspx" />
-    <Content Include="Modules\Edit.aspx" />
-    <Content Include="Modules\ModuleGridSource.aspx" />
-    <Content Include="Modules\ModuleList.aspx" />
     <Content Include="SignOn\Close.aspx" />
     <Content Include="SignOn\Logout.aspx" />
     <Content Include="styles\jquery.tree.css" />
@@ -6936,13 +6919,6 @@
     <Content Include="Webservice\DsWebService.asmx" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="About.aspx.cs">
-      <DependentUpon>About.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="About.aspx.designer.cs">
-      <DependentUpon>About.aspx</DependentUpon>
-    </Compile>
     <Compile Include="Areas\Account\AccountAreaRegistration.cs" />
     <Compile Include="Areas\Account\Controllers\AccountAuditController.cs" />
     <Compile Include="Areas\Account\Controllers\Account_MonthlockController.cs" />
@@ -7304,71 +7280,7 @@
     <Compile Include="Areas\WMS\Models\Op_WMS_DOModel.cs" />
     <Compile Include="Areas\WMS\Models\Op_WMSModel.cs" />
     <Compile Include="Areas\WMS\WMSAreaRegistration.cs" />
-    <Compile Include="Attributes\AttributeCompanyEdit.aspx.cs">
-      <DependentUpon>AttributeCompanyEdit.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Attributes\AttributeCompanyEdit.aspx.designer.cs">
-      <DependentUpon>AttributeCompanyEdit.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="Attributes\AttributeCompanyList.aspx.cs">
-      <DependentUpon>AttributeCompanyList.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Attributes\AttributeCompanyList.aspx.designer.cs">
-      <DependentUpon>AttributeCompanyList.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="Attributes\AttributeEdit.aspx.cs">
-      <DependentUpon>AttributeEdit.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Attributes\AttributeEdit.aspx.designer.cs">
-      <DependentUpon>AttributeEdit.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="Attributes\AttributeGridSource.aspx.cs">
-      <DependentUpon>AttributeGridSource.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Attributes\AttributeGridSource.aspx.designer.cs">
-      <DependentUpon>AttributeGridSource.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="Attributes\AttributeManage.cs" />
-    <Compile Include="Attributes\AttributeManageList.aspx.cs">
-      <DependentUpon>AttributeManageList.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Attributes\AttributeManageList.aspx.designer.cs">
-      <DependentUpon>AttributeManageList.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="Attributes\TypeEdit.aspx.cs">
-      <DependentUpon>TypeEdit.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Attributes\TypeEdit.aspx.designer.cs">
-      <DependentUpon>TypeEdit.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="Attributes\TypeList.aspx.cs">
-      <DependentUpon>TypeList.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Attributes\TypeList.aspx.designer.cs">
-      <DependentUpon>TypeList.aspx</DependentUpon>
-    </Compile>
     <Compile Include="DynamicJson.cs" />
-    <Compile Include="Grids\wucGridView.ascx.cs">
-      <DependentUpon>wucGridView.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Grids\wucGridView.ascx.designer.cs">
-      <DependentUpon>wucGridView.ascx</DependentUpon>
-    </Compile>
-    <Compile Include="Grids\wucGridView2.ascx.cs">
-      <DependentUpon>wucGridView2.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Grids\wucGridView2.ascx.designer.cs">
-      <DependentUpon>wucGridView2.ascx</DependentUpon>
-    </Compile>
     <Compile Include="JobScheduler.cs" />
     <Compile Include="Areas\Dispatch\Job\RefreshTokenJob.cs" />
     <Compile Include="Areas\Dispatch\Models\DispatchDetailViewModel.cs" />
@@ -9081,216 +8993,6 @@
     <Compile Include="Authority\UserAuthorityManage.cs" />
     <Compile Include="ConfigManager\ConfigManager.cs" />
     <Compile Include="configs\UserGridConfigManager.cs" />
-    <Compile Include="CRM\CRMClientAssignList.aspx.cs">
-      <DependentUpon>CRMClientAssignList.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="CRM\CRMClientAssignList.aspx.designer.cs">
-      <DependentUpon>CRMClientAssignList.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="CRM\CRMClientAssignListGridSource.aspx.cs">
-      <DependentUpon>CRMClientAssignListGridSource.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="CRM\CRMClientAssignListGridSource.aspx.designer.cs">
-      <DependentUpon>CRMClientAssignListGridSource.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="CRM\CRMClientContactAllList.aspx.cs">
-      <DependentUpon>CRMClientContactAllList.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="CRM\CRMClientContactAllList.aspx.designer.cs">
-      <DependentUpon>CRMClientContactAllList.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="CRM\CRMClientContactAllListGridSource.aspx.cs">
-      <DependentUpon>CRMClientContactAllListGridSource.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="CRM\CRMClientContactAllListGridSource.aspx.designer.cs">
-      <DependentUpon>CRMClientContactAllListGridSource.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="CRM\CRMClientContactAnniversaryList.aspx.cs">
-      <DependentUpon>CRMClientContactAnniversaryList.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="CRM\CRMClientContactAnniversaryList.aspx.designer.cs">
-      <DependentUpon>CRMClientContactAnniversaryList.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="CRM\CRMClientContactAnniversaryListGridSource.aspx.cs">
-      <DependentUpon>CRMClientContactAnniversaryListGridSource.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="CRM\CRMClientContactAnniversaryListGridSource.aspx.designer.cs">
-      <DependentUpon>CRMClientContactAnniversaryListGridSource.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="CRM\CRMClientEdit.aspx.cs">
-      <DependentUpon>CRMClientEdit.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="CRM\CRMClientEdit.aspx.designer.cs">
-      <DependentUpon>CRMClientEdit.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="CRM\CRMClientOverview.aspx.cs">
-      <DependentUpon>CRMClientOverview.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="CRM\CRMClientOverview.aspx.designer.cs">
-      <DependentUpon>CRMClientOverview.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="CRM\CRMClientQuotationList.aspx.cs">
-      <DependentUpon>CRMClientQuotationList.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="CRM\CRMClientQuotationList.aspx.designer.cs">
-      <DependentUpon>CRMClientQuotationList.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="CRM\CRMClientVisitInfo.aspx.cs">
-      <DependentUpon>CRMClientVisitInfo.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="CRM\CRMClientVisitInfo.aspx.designer.cs">
-      <DependentUpon>CRMClientVisitInfo.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="CRM\CRMClientVisitList.aspx.cs">
-      <DependentUpon>CRMClientVisitList.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="CRM\CRMClientVisitList.aspx.designer.cs">
-      <DependentUpon>CRMClientVisitList.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="CRM\CRMClientVisitListGridSource.aspx.cs">
-      <DependentUpon>CRMClientVisitListGridSource.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="CRM\CRMClientVisitListGridSource.aspx.designer.cs">
-      <DependentUpon>CRMClientVisitListGridSource.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="CRM\CRMClientVisitNotList.aspx.cs">
-      <DependentUpon>CRMClientVisitNotList.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="CRM\CRMClientVisitNotList.aspx.designer.cs">
-      <DependentUpon>CRMClientVisitNotList.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="CRM\CRMClientVisitNotListGridSource.aspx.cs">
-      <DependentUpon>CRMClientVisitNotListGridSource.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="CRM\CRMClientVisitNotListGridSource.aspx.designer.cs">
-      <DependentUpon>CRMClientVisitNotListGridSource.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="CRM\CRMClientVisitPlanList.aspx.cs">
-      <DependentUpon>CRMClientVisitPlanList.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="CRM\CRMClientVisitPlanList.aspx.designer.cs">
-      <DependentUpon>CRMClientVisitPlanList.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="CRM\CRMClientVisitPlanListGridSource.aspx.cs">
-      <DependentUpon>CRMClientVisitPlanListGridSource.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="CRM\CRMClientVisitPlanListGridSource.aspx.designer.cs">
-      <DependentUpon>CRMClientVisitPlanListGridSource.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="CRM\CRMInfoFaqInfo.aspx.cs">
-      <DependentUpon>CRMInfoFaqInfo.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="CRM\CRMInfoFaqInfo.aspx.designer.cs">
-      <DependentUpon>CRMInfoFaqInfo.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="CRM\CRMClientList.aspx.cs">
-      <DependentUpon>CRMClientList.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="CRM\CRMClientList.aspx.designer.cs">
-      <DependentUpon>CRMClientList.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="CRM\CRMClientListGridSource.aspx.cs">
-      <DependentUpon>CRMClientListGridSource.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="CRM\CRMClientListGridSource.aspx.designer.cs">
-      <DependentUpon>CRMClientListGridSource.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="CRM\CRMClientInfo.aspx.cs">
-      <DependentUpon>CRMClientInfo.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="CRM\CRMClientInfo.aspx.designer.cs">
-      <DependentUpon>CRMClientInfo.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="CRM\CRMClientContactInfo.aspx.cs">
-      <DependentUpon>CRMClientContactInfo.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="CRM\CRMClientContactInfo.aspx.designer.cs">
-      <DependentUpon>CRMClientContactInfo.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="CRM\CRMClientContactList.aspx.cs">
-      <DependentUpon>CRMClientContactList.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="CRM\CRMClientContactList.aspx.designer.cs">
-      <DependentUpon>CRMClientContactList.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="CRM\CRMClientContactListGridSource.aspx.cs">
-      <DependentUpon>CRMClientContactListGridSource.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="CRM\CRMClientContactListGridSource.aspx.designer.cs">
-      <DependentUpon>CRMClientContactListGridSource.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="CRM\CRMInfoFaqList.aspx.cs">
-      <DependentUpon>CRMInfoFaqList.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="CRM\CRMInfoFaqList.aspx.designer.cs">
-      <DependentUpon>CRMInfoFaqList.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="CRM\CRMInfoFaqListGridSource.aspx.cs">
-      <DependentUpon>CRMInfoFaqListGridSource.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="CRM\CRMInfoFaqListGridSource.aspx.designer.cs">
-      <DependentUpon>CRMInfoFaqListGridSource.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="CRM\CRMClientSaleIndex.aspx.cs">
-      <DependentUpon>CRMClientSaleIndex.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="CRM\CRMClientSaleIndex.aspx.designer.cs">
-      <DependentUpon>CRMClientSaleIndex.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="CRM\CRMClientQuotationInfo.aspx.cs">
-      <DependentUpon>CRMClientQuotationInfo.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="CRM\CRMClientQuotationInfo.aspx.designer.cs">
-      <DependentUpon>CRMClientQuotationInfo.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="CRM\CRMClientQuotationListGridSource.aspx.cs">
-      <DependentUpon>CRMClientQuotationListGridSource.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="CRM\CRMClientQuotationListGridSource.aspx.designer.cs">
-      <DependentUpon>CRMClientQuotationListGridSource.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="CRM\SaleProfitReport.aspx.cs">
-      <DependentUpon>SaleProfitReport.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="CRM\SaleProfitReport.aspx.designer.cs">
-      <DependentUpon>SaleProfitReport.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="CRM\SaleProfitReportGridSource.aspx.cs">
-      <DependentUpon>SaleProfitReportGridSource.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="CRM\SaleProfitReportGridSource.aspx.designer.cs">
-      <DependentUpon>SaleProfitReportGridSource.aspx</DependentUpon>
-    </Compile>
     <Compile Include="Default.aspx.cs">
       <DependentUpon>Default.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -9435,10 +9137,14 @@
     <Compile Include="Login.aspx.designer.cs">
       <DependentUpon>Login.aspx</DependentUpon>
     </Compile>
+    <Compile Include="Models\AccountEntity.cs" />
+    <Compile Include="Models\ActionEntity.cs" />
+    <Compile Include="Models\AmendEntity.cs" />
     <Compile Include="Models\ATCwAccitemsSetEntity.cs" />
     <Compile Include="Models\AttributeCompanyEntity.cs" />
     <Compile Include="Models\AttributeEntity.cs" />
     <Compile Include="Models\AttributeTypeEntity.cs" />
+    <Compile Include="Models\BankInfo.cs" />
     <Compile Include="Models\ChequeBooksEntity.cs" />
     <Compile Include="Models\ChequeConfigEntity.cs" />
     <Compile Include="Models\ChequeItemsEntity.cs" />
@@ -9451,25 +9157,41 @@
     <Compile Include="Models\CodeRuleEntity.cs" />
     <Compile Include="Models\CodeSourceEntity.cs" />
     <Compile Include="Models\CodeStlmodeSetEntity.cs" />
+    <Compile Include="Models\ColumnEntity.cs" />
     <Compile Include="Models\CompanyAttributeEntity.cs" />
+    <Compile Include="Models\CompanyEntity.cs" />
+    <Compile Include="Models\CRMClientEntity.cs" />
     <Compile Include="Models\CRMClientQuotationDetailEntity.cs" />
     <Compile Include="Models\CRMClientQuotationEntity.cs" />
     <Compile Include="Models\CRMClientVisitEntity.cs" />
     <Compile Include="Models\CRMInfoClientEntity.cs" />
     <Compile Include="Models\CRMInfoFAQEntity.cs" />
     <Compile Include="Models\CrmKeyCodeSetEntity.cs" />
+    <Compile Include="Models\CrmOrderFeeEntity.cs" />
     <Compile Include="Models\CrmPriceCarrierEntity.cs" />
+    <Compile Include="Models\CrmPriceCarrierTempEntity.cs" />
     <Compile Include="Models\CrmProxyMailEntity.cs" />
     <Compile Include="Models\CrmSeaeorderctnEntity.cs" />
+    <Compile Include="Models\CrmSeaeorderEntity.cs" />
+    <Compile Include="Models\CurrencyEntity.cs" />
     <Compile Include="Models\CwDesignEntity.cs" />
     <Compile Include="Models\CwVouchersEntity.cs" />
     <Compile Include="Models\CwVouitemsEntity.cs" />
     <Compile Include="Models\EBPricequeryEntity.cs" />
     <Compile Include="Models\ExchangeRateEntity.cs" />
+    <Compile Include="Models\FeeCodeEntity.cs" />
+    <Compile Include="Models\FeeDoEntity.cs" />
+    <Compile Include="Models\FeeEntity.cs" />
+    <Compile Include="Models\FeeModifyEntity.cs" />
+    <Compile Include="Models\FeePayApplicationEntity.cs" />
+    <Compile Include="Models\FeeProfitEntity.cs" />
     <Compile Include="Models\FeeSettleLink.cs" />
+    <Compile Include="Models\FeeSettlementEntity.cs" />
     <Compile Include="Models\FeeTemplateDetailEntity.cs" />
     <Compile Include="Models\FeeTemplateEntity.cs" />
     <Compile Include="Models\GoodsTypeEntity.cs" />
+    <Compile Include="Models\GridColumnEntity.cs" />
+    <Compile Include="Models\GridEntity.cs" />
     <Compile Include="Models\ImportReceiptListEntity.cs" />
     <Compile Include="Models\InfoClientContractEntity.cs" />
     <Compile Include="Models\InvoiceApplicationEntity.cs" />
@@ -9478,6 +9200,8 @@
     <Compile Include="Models\InvoiceConfigEntity.cs" />
     <Compile Include="Models\InvoiceEntity.cs" />
     <Compile Include="Models\InvoiceVerificationEntity.cs" />
+    <Compile Include="Models\JsonAccountEntity.cs" />
+    <Compile Include="Models\JsonAccountGroupEntity.cs" />
     <Compile Include="Models\JsonATCwAccitemsSetEntity.cs" />
     <Compile Include="Models\JsonATCwAccitemsSetGroupEntity.cs" />
     <Compile Include="Models\JsonCodeCtnSetEntity.cs" />
@@ -9486,12 +9210,16 @@
     <Compile Include="Models\JsonCodeCurrencySetGroupEntity.cs" />
     <Compile Include="Models\JsonCodeStlmodeSetEntity.cs" />
     <Compile Include="Models\JsonCodeStlmodeSetGroupEntity.cs" />
+    <Compile Include="Models\JsonColumnEntity.cs" />
+    <Compile Include="Models\JsonColumnGroupEntity.cs" />
     <Compile Include="Models\JsonCRMClientEntity.cs" />
     <Compile Include="Models\JsonCRMClientGroupEntity.cs" />
     <Compile Include="Models\JsonCrmSeaeorderctnEntity.cs" />
     <Compile Include="Models\JsonCrmSeaeorderctnGroupEntity.cs" />
     <Compile Include="Models\JsonCwVouchersAddDoEntity.cs" />
     <Compile Include="Models\JsonCwVouchersAddDoGroupEntity.cs" />
+    <Compile Include="Models\JsonFeeEntity.cs" />
+    <Compile Include="Models\JsonFeeGroupEntity.cs" />
     <Compile Include="Models\JsonImportReceiptListEntity.cs" />
     <Compile Include="Models\JsonImportReceiptListGroupEntity.cs" />
     <Compile Include="Models\JsonOpBlissueEntity.cs" />
@@ -9504,9 +9232,10 @@
     <Compile Include="Models\JsonOpStatusListGroupEntity.cs" />
     <Compile Include="Models\JsonSysBankEntity.cs" />
     <Compile Include="Models\JsonSysBankGroupEntity.cs" />
+    <Compile Include="Models\JsonSysDeptEntity.cs" />
+    <Compile Include="Models\JsonSysDeptGroupEntity.cs" />
     <Compile Include="Models\JsonTopCtnEntity.cs" />
     <Compile Include="Models\JsonTopCtnGroupEntity.cs" />
-    <Compile Include="Models\CrmOrderFeeEntity.cs" />
     <Compile Include="Models\JsonUserEntity.cs" />
     <Compile Include="Models\JsonUserGroupEntity.cs" />
     <Compile Include="Models\JsonWmsInEntity.cs" />
@@ -9519,8 +9248,11 @@
     <Compile Include="Models\JsonWmsInGroupEntity4.cs" />
     <Compile Include="Models\JsonWmsZXFeeEntity.cs" />
     <Compile Include="Models\JsonWmsZXFeeGroupEntity.cs" />
+    <Compile Include="Models\JSTreeNodeEntity.cs" />
+    <Compile Include="Models\LogEntity.cs" />
     <Compile Include="Models\MessageEntity.cs" />
     <Compile Include="Models\MessageTotalEntity.cs" />
+    <Compile Include="Models\ModuleEntity.cs" />
     <Compile Include="Models\OpApplyEntity.cs" />
     <Compile Include="Models\OpBlissueEntity.cs" />
     <Compile Include="Models\OpctnEntity.cs" />
@@ -9535,38 +9267,48 @@
     <Compile Include="Models\ReceiveAmountEntity.cs" />
     <Compile Include="Models\ReportDBSourceEntity.cs" />
     <Compile Include="Models\ReportEntity.cs" />
+    <Compile Include="Models\RoleEntity.cs" />
     <Compile Include="Models\RunFeeDoEntity.cs" />
     <Compile Include="Models\RunFeeSettlementEntity.cs" />
+    <Compile Include="Models\SeaContainerEntity.cs" />
     <Compile Include="Models\SysAnnounceEntity.cs" />
     <Compile Include="Models\SysAnnounceSetEntity.cs" />
+    <Compile Include="Models\SysDeptEntity.cs" />
+    <Compile Include="Models\SystemLogEntity.cs" />
     <Compile Include="Models\TemplateGridEntity.cs" />
     <Compile Include="Models\TempOpSeaeEdiEntity.cs" />
+    <Compile Include="Models\TopCtnEntity.cs" />
+    <Compile Include="Models\TopSeaeBillmanageEntity.cs" />
+    <Compile Include="Models\TopSeaeEntity.cs" />
+    <Compile Include="Models\TopSeaeMidwayEntity.cs" />
     <Compile Include="Models\TopSeaiEntity.cs" />
     <Compile Include="Models\UserActionEntity.cs" />
+    <Compile Include="Models\UserAttributeEntity.cs" />
+    <Compile Include="Models\UserAttributeRefEntity.cs" />
     <Compile Include="Models\UserAuthorityEntity.cs" />
     <Compile Include="Models\UserAuthorityRangeEntity.cs" />
+    <Compile Include="Models\UserBaseInfoEntity.cs" />
+    <Compile Include="Models\UserEntity.cs" />
     <Compile Include="Models\UserLoginStatusEntity.cs" />
     <Compile Include="Models\UserMessageSettingEntity.cs" />
+    <Compile Include="Models\UserRefEntity.cs" />
     <Compile Include="Models\UserSessionEntity.cs" />
+    <Compile Include="Models\UserSettingEntity.cs" />
     <Compile Include="Models\VerificationEntity.cs" />
     <Compile Include="Models\WmsEntity.cs" />
+    <Compile Include="Models\WmsFeeCodeEntity.cs" />
     <Compile Include="Models\WmsFeeEntity.cs" />
     <Compile Include="Models\WmsInEntity.cs" />
     <Compile Include="Models\WmsOutDetailEntity.cs" />
     <Compile Include="Models\WmsOutEntity.cs" />
     <Compile Include="Models\WmsRateDetailEntity.cs" />
     <Compile Include="Models\WmsRateEntity.cs" />
-    <Compile Include="Models\WmsFeeCodeEntity.cs" />
     <Compile Include="Models\WmsStorageAreaEntity.cs" />
+    <Compile Include="Models\WorkFlowConditionEntity.cs" />
+    <Compile Include="Models\WorkFlowDoEntity.cs" />
+    <Compile Include="Models\WorkFlowEntity.cs" />
+    <Compile Include="Models\WorkFlowStepEntity.cs" />
     <Compile Include="Models\WorkFlowTypeEntity.cs" />
-    <Compile Include="Models\CrmPriceCarrierTempEntity.cs" />
-    <Compile Include="Modules\ModuleManagement.aspx.cs">
-      <DependentUpon>ModuleManagement.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Modules\ModuleManagement.aspx.designer.cs">
-      <DependentUpon>ModuleManagement.aspx</DependentUpon>
-    </Compile>
     <Compile Include="OpenPageBase.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
@@ -9642,81 +9384,6 @@
     <Compile Include="MainPortal.aspx.designer.cs">
       <DependentUpon>MainPortal.aspx</DependentUpon>
     </Compile>
-    <Compile Include="Models\AccountEntity.cs" />
-    <Compile Include="Models\ActionEntity.cs" />
-    <Compile Include="Models\AmendEntity.cs" />
-    <Compile Include="Models\BankInfo.cs" />
-    <Compile Include="Models\ColumnEntity.cs" />
-    <Compile Include="Models\CRMClientEntity.cs" />
-    <Compile Include="Models\CrmSeaeorderEntity.cs" />
-    <Compile Include="Models\CurrencyEntity.cs" />
-    <Compile Include="Models\FeeCodeEntity.cs" />
-    <Compile Include="Models\FeeDoEntity.cs" />
-    <Compile Include="Models\FeeEntity.cs" />
-    <Compile Include="Models\FeeModifyEntity.cs" />
-    <Compile Include="Models\FeePayApplicationEntity.cs" />
-    <Compile Include="Models\FeeProfitEntity.cs" />
-    <Compile Include="Models\FeeSettlementEntity.cs" />
-    <Compile Include="Models\GridColumnEntity.cs" />
-    <Compile Include="Models\GridEntity.cs" />
-    <Compile Include="Models\JsonAccountEntity.cs" />
-    <Compile Include="Models\JsonAccountGroupEntity.cs" />
-    <Compile Include="Models\JsonColumnEntity.cs" />
-    <Compile Include="Models\JsonColumnGroupEntity.cs" />
-    <Compile Include="Models\JsonFeeEntity.cs" />
-    <Compile Include="Models\JsonFeeGroupEntity.cs" />
-    <Compile Include="Models\JsonSysDeptEntity.cs" />
-    <Compile Include="Models\JsonSysDeptGroupEntity.cs" />
-    <Compile Include="Models\LogEntity.cs" />
-    <Compile Include="Models\RoleEntity.cs" />
-    <Compile Include="Models\SeaContainerEntity.cs" />
-    <Compile Include="Models\SysDeptEntity.cs" />
-    <Compile Include="Models\TopCtnEntity.cs" />
-    <Compile Include="Models\TopSeaeBillmanageEntity.cs" />
-    <Compile Include="Models\TopSeaeEntity.cs" />
-    <Compile Include="Models\TopSeaeMidwayEntity.cs" />
-    <Compile Include="Models\UserAttributeEntity.cs" />
-    <Compile Include="Models\CompanyEntity.cs" />
-    <Compile Include="Models\JSTreeNodeEntity.cs" />
-    <Compile Include="Models\ModuleEntity.cs" />
-    <Compile Include="Models\SystemLogEntity.cs" />
-    <Compile Include="Models\UserAttributeRefEntity.cs" />
-    <Compile Include="Models\UserBaseInfoEntity.cs" />
-    <Compile Include="Models\UserEntity.cs" />
-    <Compile Include="Models\UserRefEntity.cs" />
-    <Compile Include="Models\UserSettingEntity.cs" />
-    <Compile Include="Models\WorkFlowConditionEntity.cs" />
-    <Compile Include="Models\WorkFlowDoEntity.cs" />
-    <Compile Include="Models\WorkFlowEntity.cs" />
-    <Compile Include="Models\WorkFlowStepEntity.cs" />
-    <Compile Include="Modules\Add.aspx.cs">
-      <DependentUpon>Add.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Modules\Add.aspx.designer.cs">
-      <DependentUpon>Add.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="Modules\Edit.aspx.cs">
-      <DependentUpon>Edit.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Modules\Edit.aspx.designer.cs">
-      <DependentUpon>Edit.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="Modules\ModuleGridSource.aspx.cs">
-      <DependentUpon>ModuleGridSource.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Modules\ModuleGridSource.aspx.designer.cs">
-      <DependentUpon>ModuleGridSource.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="Modules\ModuleList.aspx.cs">
-      <DependentUpon>ModuleList.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Modules\ModuleList.aspx.designer.cs">
-      <DependentUpon>ModuleList.aspx</DependentUpon>
-    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ShowFavorite.aspx.cs">
       <DependentUpon>ShowFavorite.aspx</DependentUpon>
@@ -9872,7 +9539,6 @@
     <Content Include="js\ModuleManagement.js" />
     <Content Include="js\stepedit.js" />
     <Content Include="js\UserAuthoritySettingEdit.js" />
-    <Content Include="Modules\ModuleManagement.aspx" />
     <Content Include="tools\DownLoad.aspx" />
   </ItemGroup>
   <ItemGroup>
@@ -10218,40 +9884,12 @@
     <None Include="UserFiles\tempReport\op_letter_yard.frx" />
     <None Include="UserFiles\tempReport\op_seae_billmanage.frx" />
     <None Include="UserFiles\tempReport\op_seae_order.frx" />
-    <Content Include="About.aspx" />
     <Content Include="bin\AjaxPro.2.dll" />
     <Content Include="bin\Colo.Web.dll" />
     <Content Include="bin\HtmlTextBoxControl.dll" />
     <Content Include="bin\System.Json.dll" />
     <Content Include="configs\gridsetting.xml" />
     <Content Include="configs\multiplefeereport.xml" />
-    <Content Include="CRM\CRMClientAssignList.aspx" />
-    <Content Include="CRM\CRMClientAssignListGridSource.aspx" />
-    <Content Include="CRM\CRMClientContactAnniversaryList.aspx" />
-    <Content Include="CRM\CRMClientContactAnniversaryListGridSource.aspx" />
-    <Content Include="CRM\CRMClientEdit.aspx" />
-    <Content Include="CRM\CRMClientOverview.aspx" />
-    <Content Include="CRM\CRMClientQuotationList.aspx" />
-    <Content Include="CRM\CRMClientVisitInfo.aspx" />
-    <Content Include="CRM\CRMClientVisitList.aspx" />
-    <Content Include="CRM\CRMClientVisitListGridSource.aspx" />
-    <Content Include="CRM\CRMClientVisitNotList.aspx" />
-    <Content Include="CRM\CRMClientVisitNotListGridSource.aspx" />
-    <Content Include="CRM\CRMClientVisitPlanList.aspx" />
-    <Content Include="CRM\CRMClientVisitPlanListGridSource.aspx" />
-    <Content Include="CRM\CRMInfoFaqInfo.aspx" />
-    <Content Include="CRM\CRMClientList.aspx" />
-    <Content Include="CRM\CRMClientListGridSource.aspx" />
-    <Content Include="CRM\CRMClientInfo.aspx" />
-    <Content Include="CRM\CRMClientContactInfo.aspx" />
-    <Content Include="CRM\CRMClientContactList.aspx" />
-    <Content Include="CRM\CRMClientContactListGridSource.aspx" />
-    <Content Include="CRM\CRMInfoFaqList.aspx" />
-    <Content Include="CRM\CRMInfoFaqListGridSource.aspx" />
-    <Content Include="CRM\CRMClientSaleIndex.aspx" />
-    <Content Include="CRM\CRMClientQuotationInfo.aspx" />
-    <Content Include="CRM\CRMClientQuotationListGridSource.aspx" />
-    <Content Include="CRM\images\noImage.gif" />
     <Content Include="Css\right.css" />
     <Content Include="Date\calendar.js" />
     <Content Include="EDI\INTTRAEDIExport.aspx" />