Merge branch 'master' of http://deiniusoft.com:3000/root/ldj

Merge branch 'master' of http://ldj:3000/root/ldj

DNExamples/.vs/DNExamples.csproj.dtbcache.json

@@ -0,0 +1 @@
+{"RootPath":"D:\\vssrc\\DNExamples","ProjectFileName":"DNExamples.csproj","Configuration":"Release|x86","FrameworkPath":"","Sources":[{"SourceFile":"Form1.cs"},{"SourceFile":"Form1.Designer.cs"},{"SourceFile":"Program.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"Properties\\Resources.Designer.cs"},{"SourceFile":"Properties\\Settings.Designer.cs"},{"SourceFile":"obj\\x86\\Release\\.NETFramework,Version=v4.0,Profile=Client.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\vssrc\\DNLight\\bin\\Release\\DNLight.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"D:\\vssrc\\DNLight\\bin\\Release\\DNLight.dll"},{"Reference":"D:\\vssrc\\packages\\log4net.2.0.16\\lib\\net40-client\\log4net.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\Profile\\Client\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\Profile\\Client\\System.Configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\Profile\\Client\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\Profile\\Client\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\Profile\\Client\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\Profile\\Client\\System.Deployment.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\Profile\\Client\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\Profile\\Client\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\Profile\\Client\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\Profile\\Client\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\Profile\\Client\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\vssrc\\DNExamples\\bin\\Release\\DNExamples.exe","OutputItemRelativePath":"DNExamples.exe"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]}

DNLight/.vs/DNLight.csproj.dtbcache.json

@@ -0,0 +1 @@
+{"RootPath":"D:\\vssrc\\DNLight","ProjectFileName":"DNLight.csproj","Configuration":"Release|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"dnwcs.cs"},{"SourceFile":"dnwms.cs"},{"SourceFile":"ele_base.cs"},{"SourceFile":"model.cs"},{"SourceFile":"pick.cs"},{"SourceFile":"port.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"uartinfo.cs"},{"SourceFile":"unart_manage.cs"},{"SourceFile":"obj\\Release\\.NETFramework,Version=v4.0.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\vssrc\\packages\\log4net.2.0.16\\lib\\net40\\log4net.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\vssrc\\DNLight\\bin\\Release\\DNLight.dll","OutputItemRelativePath":"DNLight.dll"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]}

Data/BaseObject/.vs/DataAccess.csproj.dtbcache.json

@@ -0,0 +1 @@
+{"RootPath":"D:\\vssrc\\vssrc\\Data\\BaseObject","ProjectFileName":"DataAccess.csproj","Configuration":"Release|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"Execution.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"obj\\Release\\.NETFramework,Version=v4.0.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\vssrc\\vssrc\\conn\\bin\\Release\\conn.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"D:\\vssrc\\vssrc\\conn\\bin\\Release\\conn.dll"},{"Reference":"D:\\vssrc\\vssrc\\packages\\log4net.2.0.16\\lib\\net40\\log4net.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vssrc\\vssrc\\myLog\\bin\\Release\\myLog.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"D:\\vssrc\\vssrc\\myLog\\bin\\Release\\myLog.dll"},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vssrc\\vssrc\\Utils\\bin\\Release\\Utils.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"D:\\vssrc\\vssrc\\Utils\\bin\\Release\\Utils.dll"}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\vssrc\\vssrc\\Data\\BaseObject\\bin\\Release\\BaseObject.dll","OutputItemRelativePath":"BaseObject.dll"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]}

DeinuPageControl/.vs/DeinuPageControl.csproj.dtbcache.json

@@ -0,0 +1 @@
+{"RootPath":"D:\\vssrc\\DeinuPageControl","ProjectFileName":"DeinuPageControl.csproj","Configuration":"Release|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"Pager.cs"},{"SourceFile":"Pager.designer.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"obj\\Release\\.NETFramework,Version=v4.0,Profile=Client.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\vssrc\\packages\\log4net.2.0.16\\lib\\net40-client\\log4net.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\Profile\\Client\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\Profile\\Client\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\Profile\\Client\\System.Configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\Profile\\Client\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\Profile\\Client\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\Profile\\Client\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\Profile\\Client\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\Profile\\Client\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\Profile\\Client\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\Profile\\Client\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\Profile\\Client\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\vssrc\\DeinuPageControl\\bin\\Release\\DeinuPageControl.dll","OutputItemRelativePath":"DeinuPageControl.dll"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]}

LightService/.vs/LightService.csproj.dtbcache.json

@@ -0,0 +1 @@
+{"RootPath":"D:\\vssrc\\vssrc\\LightService","ProjectFileName":"LightService.csproj","Configuration":"Release|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"IService1.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"Service1.cs"},{"SourceFile":"obj\\Release\\.NETFramework,Version=v4.0,Profile=Client.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\vssrc\\vssrc\\packages\\log4net.2.0.16\\lib\\net40-client\\log4net.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\Profile\\Client\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\Profile\\Client\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\Profile\\Client\\System.Configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\Profile\\Client\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\Profile\\Client\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\Profile\\Client\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\Profile\\Client\\System.Runtime.Serialization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\Profile\\Client\\System.ServiceModel.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\Profile\\Client\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\Profile\\Client\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\vssrc\\vssrc\\LightService\\bin\\Release\\LightService.dll","OutputItemRelativePath":"LightService.dll"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]}

Model/wms/data/Customer_Imp.cs

@@ -40,8 +40,12 @@ namespace DeiNiu.wms.Data.Model
                 case 200:  //sync customers
                     _strSql = "insert into  [t_Customer] ( [customerId],[custType])"
                          + " select custId ,[custType]  from v_erpCustomer "
-                         + "where not exists(select 1 from [t_Customer] where customerId = v_erpCustomer.custId)"
+                         + "where not exists(select 1 from [t_Customer] where customerId = v_erpCustomer.custId);" +
+                         "  insert into  t_wmsDeskCustomer (partion, deskId,[custId],custName) " +
+                         "  select 11,101, [custId],[custName]  FROM [v_customer] " +
+                         "  where pickgroupname is not null  and not exists(select 1 from t_wmsDeskCustomer where custid =v_customer.[custId])"
                        ; 
+
                     sqlCmd.CommandText = _strSql; 
                     
                     break;

Model/wms/data/WmsDeskCustomer_Imp.cs

@@ -18,9 +18,9 @@ namespace DeiNiu.wms.Data.Model
             switch (_cust_op_flag)
             {
              case 99:  //query with dic
-                    _strSql = "SELECT *,ROW_NUMBER() OVER (ORDER BY ID DESC) as sortNo  FROM [t_wmsDeskCustomer]  WHERE DR = 1 " + mObj.CmdParameters[0].ToString();
-                    _strSql = "SELECT * FROM (" + _strSql + " )AS SORTEDTB WHERE sortNo BETWEEN @START AND @END" + " ORDER BY deskId,custId";
-                    _strSql += ";SELECT COUNT(*) FROM [t_wmsDeskCustomer]  WHERE DR = 1 " + mObj.CmdParameters[0].ToString();
+                    _strSql = "SELECT *,ROW_NUMBER() OVER (ORDER BY ID DESC) as sortNo  FROM [v_wmsDeskCustomerLine]  WHERE DR = 1 " + mObj.CmdParameters[0].ToString();
+                    _strSql = "SELECT * FROM (" + _strSql + " )AS SORTEDTB WHERE sortNo BETWEEN @START AND @END" + " ORDER BY linePriority,lineOrder";
+                    _strSql += ";SELECT COUNT(*) FROM [v_wmsDeskCustomerLine]  WHERE DR = 1 " + mObj.CmdParameters[0].ToString();
                     sqlCmd.CommandText = _strSql;
                     sqlCmd.Parameters.AddWithValue("@START", this._rownumStart);
                     sqlCmd.Parameters.AddWithValue("@END", this._rownumEnd);

Model/wms/data/WmsGoods_Imp.cs

@@ -120,7 +120,14 @@ namespace DeiNiu.wms.Data.Model
                     sqlCmd.CommandText = _strSql;
                  
                     break;
-                    //
+                //
+                case 1100:  // 取没有对应货位类别字典的分类
+                    _strSql = "SELECT * FROM [wmsuzhou2].[dbo].[v_wmsGoods]  where  goodsName like '%'+ @keywords +'%'  " +
+                        " or goodsid like '%' + @keywords +'%' " +
+                        " or barcode like '%'+ @keywords +'%' ;";
+                    sqlCmd.CommandText = _strSql;
+                    sqlCmd.Parameters.AddWithValue("@keywords", mObj.CmdParameters[0]);
+                    break;
             } 
         }
     }

Model/wms/data/WmsInRequest_Imp.cs

@@ -301,7 +301,7 @@ namespace DeiNiu.wms.Data.Model
                     {
                         if (Convert.ToInt32(mObj.CmdParameters[1].ToString()) == 0) //by cust
                         {
-                            orderBy = "  order by linePriority desc,lineOrder";
+                            orderBy = "  order by linePriority ,lineOrder";
                         }
                         else
                         {

Model/wms/data/WmsOutPickPort_Imp.cs

@@ -819,7 +819,7 @@ namespace DeiNiu.wms.Data.Model
                     _strSql = " select * from [v_stockSeedsDeskLight] where 1=1 " +
                         " and flowno =@flowno" +
                         " and deskId= @deskId" +
-                        " and (barcode=@barcode /* or goodsId=@barcode */) ";
+                        " and (barcode=@barcode or goodsId=@barcode) ";
 
                  
                     sqlCmd.Parameters.AddWithValue("@deskId", mObj.CmdParameters[0]);

Model/wms/tables/WmsGoods.cs

@@ -713,6 +713,15 @@ namespace DeiNiu.wms.Data.Model
             return CustQuery(500).Tables[0];
         }
 
+
+        public DataTable queryByKeyWords(string keyWords)
+        {
+            cmdParameters[0] = keyWords;
+
+            return CustQuery(1100).Tables[0];
+        }
+
+
         public DataTable getGoodsBybarcod(string barcode)
         {
             cmdParameters[0] = barcode;

UpgradeLog12.htm

@@ -0,0 +1,285 @@
+<!DOCTYPE html>
+<!-- saved from url=(0014)about:internet -->
+ <html xmlns:msxsl="urn:schemas-microsoft-com:xslt"><head><meta content="en-us" http-equiv="Content-Language" /><meta content="text/html; charset=utf-16" http-equiv="Content-Type" /><title _locID="ConversionReport0">
+          迁移报告
+        </title><style> 
+                    /* Body style, for the entire document */
+                    body
+                    {
+                        background: #F3F3F4;
+                        color: #1E1E1F;
+                        font-family: "Segoe UI", Tahoma, Geneva, Verdana, sans-serif;
+                        padding: 0;
+                        margin: 0;
+                    }
+
+                    /* Header1 style, used for the main title */
+                    h1
+                    {
+                        padding: 10px 0px 10px 10px;
+                        font-size: 21pt;
+                        background-color: #E2E2E2;
+                        border-bottom: 1px #C1C1C2 solid; 
+                        color: #201F20;
+                        margin: 0;
+                        font-weight: normal;
+                    }
+
+                    /* Header2 style, used for "Overview" and other sections */
+                    h2
+                    {
+                        font-size: 18pt;
+                        font-weight: normal;
+                        padding: 15px 0 5px 0;
+                        margin: 0;
+                    }
+
+                    /* Header3 style, used for sub-sections, such as project name */
+                    h3
+                    {
+                        font-weight: normal;
+                        font-size: 15pt;
+                        margin: 0;
+                        padding: 15px 0 5px 0;
+                        background-color: transparent;
+                    }
+
+                    /* Color all hyperlinks one color */
+                    a
+                    {
+                        color: #1382CE;
+                    }
+
+                    /* Table styles */ 
+                    table
+                    {
+                        border-spacing: 0 0;
+                        border-collapse: collapse;
+                        font-size: 10pt;
+                    }
+
+                    table th
+                    {
+                        background: #E7E7E8;
+                        text-align: left;
+                        text-decoration: none;
+                        font-weight: normal;
+                        padding: 3px 6px 3px 6px;
+                    }
+
+                    table td
+                    {
+                        vertical-align: top;
+                        padding: 3px 6px 5px 5px;
+                        margin: 0px;
+                        border: 1px solid #E7E7E8;
+                        background: #F7F7F8;
+                    }
+
+                    /* Local link is a style for hyperlinks that link to file:/// content, there are lots so color them as 'normal' text until the user mouse overs */
+                    .localLink
+                    {
+                        color: #1E1E1F;
+                        background: #EEEEED;
+                        text-decoration: none;
+                    }
+
+                    .localLink:hover
+                    {
+                        color: #1382CE;
+                        background: #FFFF99;
+                        text-decoration: none;
+                    }
+
+                    /* Center text, used in the over views cells that contain message level counts */ 
+                    .textCentered
+                    {
+                        text-align: center;
+                    }
+
+                    /* The message cells in message tables should take up all avaliable space */
+                    .messageCell
+                    {
+                        width: 100%;
+                    }
+
+                    /* Padding around the content after the h1 */ 
+                    #content 
+                    {
+	                    padding: 0px 12px 12px 12px; 
+                    }
+
+                    /* The overview table expands to width, with a max width of 97% */ 
+                    #overview table
+                    {
+                        width: auto;
+                        max-width: 75%; 
+                    }
+
+                    /* The messages tables are always 97% width */
+                    #messages table
+                    {
+                        width: 97%;
+                    }
+
+                    /* All Icons */
+                    .IconSuccessEncoded, .IconInfoEncoded, .IconWarningEncoded, .IconErrorEncoded
+                    {
+                        min-width:18px;
+                        min-height:18px; 
+                        background-repeat:no-repeat;
+                        background-position:center;
+                    }
+
+                    /* Success icon encoded */
+                    .IconSuccessEncoded
+                    {
+                        /* Note: Do not delete the comment below. It is used to verify the correctness of the encoded image resource below before the product is released */
+                        /* [---XsltValidateInternal-Base64EncodedImage:IconSuccess#Begin#background-image: url(data:image/png;base64,#Separator#);#End#] */
+                        background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAA7EAAAOxAGVKw4bAAABcElEQVR4Xq2TsUsCURzHv15g8ZJcBWlyiYYgCIWcb9DFRRwMW5TA2c0/QEFwFkxxUQdxVlBwCYWOi6IhWgQhBLHJUCkhLr/BW8S7gvrAg+N+v8/v+x68Z8MGy+XSCyABQAXgBgHGALoASkIIDWSLeLBetdHryMjd5IxQPWT4rn1c/P7+xxp72Cs9m5SZ0Bq2vPnbPFafK2zDvmNHypdC0BPkLlQhxJsCAhQoZwdZU5mwxh720qGo8MzTxTTKZDPCx2HoVzp6lz0Q9tKhyx0kGs8Ny+TkWRKk8lCROwEduhyg9l/6lunOPSfmH3NUH6uQ0KHLAe7JYvJjevm+DAMGJHToKtigE+vwvIidxLamb8IBY9e+C5LiXREkfho3TSd06HJA13/oh6T51MTsfQbHrsMynQ5dDihFjiK8JJAU9AKIWTp76dCVN7HWHrajmUEGvyF9nkbAE6gLIS7kTUyuf2gscLoJrElZo/Mvj+nPz/kLTmfnEwP3tB0AAAAASUVORK5CYII=);
+                    }
+
+                    /* Information icon encoded */
+                    .IconInfoEncoded
+                    {
+                        /* Note: Do not delete the comment below. It is used to verify the correctness of the encoded image resource below before the product is released */
+                        /* [---XsltValidateInternal-Base64EncodedImage:IconInformation#Begin#background-image: url(data:image/png;base64,#Separator#);#End#] */
+                        background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABHElEQVR4Xs2TsUoDQRRF7wwoziokjZUKadInhdhukR9YP8DMX1hYW+QvdsXa/QHBbcXC7W0CamWTQnclFutceIQJwwaWNLlwm5k5d94M76mmaeCrrmsLYOocY12FcxZFUeozCqKqqgYA8uevv1H6VuPxcwlfk5N92KHBxfFeCSAxxswlYAW/Xr989x/mv9gkhtyMDhcAxgzRsp7flj8B/HF1RsMXq+NZMkopaHe7lbKxQUEIGbKsYNoGn969060hZBkQex/W8oRQwsQaW2o3Ago2SVcJUzAgY3N0lTCZZm+zPS8HB51gMmS1DEYyOz9acKO1D8JWTlafKIMxdhvlfdyT94Vv5h7P8Ky7nQzACmhvKq3zk3PjW9asz9D/1oigecsioooAAAAASUVORK5CYII=);
+                    }
+
+                    /* Warning icon encoded */
+                    .IconWarningEncoded
+                    {
+                        /* Note: Do not delete the comment below. It is used to verify the correctness of the encoded image resource below before the product is released */
+                        /* [---XsltValidateInternal-Base64EncodedImage:IconWarning#Begin#background-image: url(data:image/png;base64,#Separator#);#End#] */
+                        background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAAx0lEQVR4XpWSMQ7CMAxFf4xAyBMLCxMrO8dhaBcuwdCJS3RJBw7SA/QGTCxdWJgiQYWKXJWKIXHIlyw5lqr34tQgEOdcBsCOx5yZK3hCCKdYXneQkh4pEfqzLfu+wVDSyyzFoJjfz9NB+pAF+eizx2Vruts0k15mPgvS6GYvpVtQhB61IB/dk6AF6fS4Ben0uIX5odtFe8Q/eW1KvFeH4e8khT6+gm5B+t3juyDt7n0jpe+CANTd+oTUjN/U3yVaABnSUjFz/gFq44JaVSCXeQAAAABJRU5ErkJggg==);
+                    }
+
+                    /* Error icon encoded */
+                    .IconErrorEncoded
+                    {
+                        /* Note: Do not delete the comment below. It is used to verify the correctness of the encoded image resource below before the product is released */
+                        /* [---XsltValidateInternal-Base64EncodedImage:IconError#Begin#background-image: url(data:image/png;base64,#Separator#);#End#] */
+                        background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABQElEQVR4XqWTvUoEQRCE6wYPZUA80AfwAQz23uCMjA7MDRQEIzPBVEyNTQUFIw00vcQTTMzuAh/AxEQQT8HF/3G/oGGnEUGuoNnd6qoZuqltyKEsyzVJq5I6rnUp6SjGeGhESikzzlc1eL7opfuVbrqbU1Zw9NCgtQMaZpY0eNnaaL2fHusvTK5vKu7sjSS1Y4y3QUA6K3e3Mau5UFDyMP7tYF9o8cAHZv68vipoIJg971PZIZ5HiwdvYGGvFVFHmGmZ2MxwmQYPXubPl9Up0tfoMQGetXd6mRbvhBw+boZ6WF7Mbv1+GsHRk0fQmPAH1GfmZirbCfDJ61tw3Px8/8pZsPAG4jlVhcPgZ7adwNWBB68lkRQWFiTgFlbnLY3DGGM7izIJIyT/jjIvEJw6fdJTc6krDzh6aMwMP9bvDH4ADSsa9uSWVJkAAAAASUVORK5CYII=);
+                    }
+                 </style><script type="text/javascript" language="javascript"> 
+          
+            // Startup 
+            // Hook up the the loaded event for the document/window, to linkify the document content
+            var startupFunction = function() { linkifyElement("messages"); };
+            
+            if(window.attachEvent)
+            {
+              window.attachEvent('onload', startupFunction);
+            }
+            else if (window.addEventListener) 
+            {
+              window.addEventListener('load', startupFunction, false);
+            }
+            else 
+            {
+              document.addEventListener('load', startupFunction, false);
+            } 
+            
+            // Toggles the visibility of table rows with the specified name 
+            function toggleTableRowsByName(name)
+            {
+               var allRows = document.getElementsByTagName('tr');
+               for (i=0; i < allRows.length; i++)
+               {
+                  var currentName = allRows[i].getAttribute('name');
+                  if(!!currentName && currentName.indexOf(name) == 0)
+                  {
+                      var isVisible = allRows[i].style.display == ''; 
+                      isVisible ? allRows[i].style.display = 'none' : allRows[i].style.display = '';
+                  }
+               }
+            }
+            
+            function scrollToFirstVisibleRow(name) 
+            {
+               var allRows = document.getElementsByTagName('tr');
+               for (i=0; i < allRows.length; i++)
+               {
+                  var currentName = allRows[i].getAttribute('name');
+                  var isVisible = allRows[i].style.display == ''; 
+                  if(!!currentName && currentName.indexOf(name) == 0 && isVisible)
+                  {
+                     allRows[i].scrollIntoView(true); 
+                     return true; 
+                  }
+               }
+               
+               return false;
+            }
+            
+            // Linkifies the specified text content, replaces candidate links with html links 
+            function linkify(text)
+            {
+                 if(!text || 0 === text.length)
+                 {
+                     return text; 
+                 }
+
+                 // Find http, https and ftp links and replace them with hyper links 
+                 var urlLink = /(http|https|ftp)\:\/\/[a-zA-Z0-9\-\.]+(:[a-zA-Z0-9]*)?\/?([a-zA-Z0-9\-\._\?\,\/\\\+&%\$#\=~;\{\}])*/gi;
+                 
+                 return text.replace(urlLink, '<a href="$&">$&</a>') ;
+            }
+            
+            // Linkifies the specified element by ID
+            function linkifyElement(id)
+            {
+                var element = document.getElementById(id);
+                if(!!element)
+                {
+                  element.innerHTML = linkify(element.innerHTML); 
+                }
+            }
+            
+            function ToggleMessageVisibility(projectName)
+            {
+              if(!projectName || 0 === projectName.length)
+              {
+                return; 
+              }
+              
+              toggleTableRowsByName("MessageRowClass" + projectName);
+              toggleTableRowsByName('MessageRowHeaderShow' + projectName);
+              toggleTableRowsByName('MessageRowHeaderHide' + projectName); 
+            }
+            
+            function ScrollToFirstVisibleMessage(projectName)
+            {
+              if(!projectName || 0 === projectName.length)
+              {
+                return; 
+              }
+              
+              // First try the 'Show messages' row
+              if(!scrollToFirstVisibleRow('MessageRowHeaderShow' + projectName))
+              {
+                // Failed to find a visible row for 'Show messages', try an actual message row 
+                scrollToFirstVisibleRow('MessageRowClass' + projectName); 
+              }
+            }
+           </script></head><body><h1 _locID="ConversionReport">
+          迁移报告 - </h1><div id="content"><h2 _locID="OverviewTitle">概述</h2><div id="overview"><table><tr><th></th><th _locID="ProjectTableHeader">项目</th><th _locID="PathTableHeader">路径</th><th _locID="ErrorsTableHeader">错误</th><th _locID="WarningsTableHeader">警告</th><th _locID="MessagesTableHeader">消息</th></tr><tr><td class="IconErrorEncoded" /><td><strong><a href="#LightService">LightService</a></strong></td><td>LightService\LightService.csproj</td><td class="textCentered"><a href="#LightServiceError">1</a></td><td class="textCentered"><a>0</a></td><td class="textCentered"><a href="#">0</a></td></tr><tr><td class="IconSuccessEncoded" /><td><strong><a href="#DA">DA</a></strong></td><td>DA</td><td class="textCentered"><a>0</a></td><td class="textCentered"><a>0</a></td><td class="textCentered"><a href="#">0</a></td></tr><tr><td class="IconSuccessEncoded" /><td><strong><a href="#epick">epick</a></strong></td><td>epick</td><td class="textCentered"><a>0</a></td><td class="textCentered"><a>0</a></td><td class="textCentered"><a href="#">0</a></td></tr><tr><td class="IconSuccessEncoded" /><td><strong><a href="#LG">LG</a></strong></td><td>LG</td><td class="textCentered"><a>0</a></td><td class="textCentered"><a>0</a></td><td class="textCentered"><a href="#">0</a></td></tr><tr><td class="IconSuccessEncoded" /><td><strong><a href="#LWCF">LWCF</a></strong></td><td>LWCF</td><td class="textCentered"><a>0</a></td><td class="textCentered"><a>0</a></td><td class="textCentered"><a href="#">0</a></td></tr><tr><td class="IconSuccessEncoded" /><td><strong><a href="#release">release</a></strong></td><td>release</td><td class="textCentered"><a>0</a></td><td class="textCentered"><a>0</a></td><td class="textCentered"><a href="#">0</a></td></tr><tr><td class="IconSuccessEncoded" /><td><strong><a href="#Solution Items">Solution Items</a></strong></td><td>Solution Items</td><td class="textCentered"><a>0</a></td><td class="textCentered"><a>0</a></td><td class="textCentered"><a href="#">0</a></td></tr><tr><td class="IconSuccessEncoded" /><td><strong><a href="#test">test</a></strong></td><td>test</td><td class="textCentered"><a>0</a></td><td class="textCentered"><a>0</a></td><td class="textCentered"><a href="#">0</a></td></tr><tr><td class="IconSuccessEncoded" /><td><strong><a href="#Test">Test</a></strong></td><td>Test</td><td class="textCentered"><a>0</a></td><td class="textCentered"><a>0</a></td><td class="textCentered"><a href="#">0</a></td></tr><tr><td class="IconSuccessEncoded" /><td><strong><a href="#UO">UO</a></strong></td><td>UO</td><td class="textCentered"><a>0</a></td><td class="textCentered"><a>0</a></td><td class="textCentered"><a href="#">0</a></td></tr><tr><td class="IconSuccessEncoded" /><td><strong><a href="#VW">VW</a></strong></td><td>VW</td><td class="textCentered"><a>0</a></td><td class="textCentered"><a>0</a></td><td class="textCentered"><a href="#">0</a></td></tr><tr><td class="IconSuccessEncoded" /><td><strong><a href="#WebRest">WebRest</a></strong></td><td>WebRest\WebRest.csproj</td><td class="textCentered"><a>0</a></td><td class="textCentered"><a>0</a></td><td class="textCentered"><a href="#">0</a></td></tr><tr><td class="IconSuccessEncoded" /><td><strong><a href="#webservice">webservice</a></strong></td><td>webservice</td><td class="textCentered"><a>0</a></td><td class="textCentered"><a>0</a></td><td class="textCentered"><a href="#">0</a></td></tr><tr><td class="IconSuccessEncoded" /><td><strong><a href="#Solution"><span _locID="OverviewSolutionSpan">解决方案</span></a></strong></td><td>deiniuWMS.sln</td><td class="textCentered"><a>0</a></td><td class="textCentered"><a>0</a></td><td class="textCentered"><a href="#" onclick="ScrollToFirstVisibleMessage('Solution'); return false;">1</a></td></tr></table></div><h2 _locID="SolutionAndProjectsTitle">解决方案和项目</h2><div id="messages"><a name="LightService" /><h3>LightService</h3><table><tr id="LightServiceHeaderRow"><th></th><th class="messageCell" _locID="MessageTableHeader">消息</th></tr><tr name="ErrorRowClassLightService"><td class="IconErrorEncoded"><a name="LightServiceError" /></td><td class="messageCell"><strong>LightService\LightService.csproj:
+        </strong><span>找不到此项目类型所基于的应用程序。有关更多信息，请尝试此链接: http://go.microsoft.com/fwlink/?LinkID=299083&amp;projecttype=3D9AD99F-2412-4246-B90B-4EAA41C64699</span></td></tr></table><a name="DA" /><h3>DA</h3><table><tr id="DAHeaderRow"><th></th><th class="messageCell" _locID="MessageTableHeader">消息</th></tr><tr><td class="IconInfoEncoded" /><td class="messageCell" _locID="NoMessagesRow">DA 未记录任何消息。
+                  </td></tr></table><a name="epick" /><h3>epick</h3><table><tr id="epickHeaderRow"><th></th><th class="messageCell" _locID="MessageTableHeader">消息</th></tr><tr><td class="IconInfoEncoded" /><td class="messageCell" _locID="NoMessagesRow">epick 未记录任何消息。
+                  </td></tr></table><a name="LG" /><h3>LG</h3><table><tr id="LGHeaderRow"><th></th><th class="messageCell" _locID="MessageTableHeader">消息</th></tr><tr><td class="IconInfoEncoded" /><td class="messageCell" _locID="NoMessagesRow">LG 未记录任何消息。
+                  </td></tr></table><a name="LWCF" /><h3>LWCF</h3><table><tr id="LWCFHeaderRow"><th></th><th class="messageCell" _locID="MessageTableHeader">消息</th></tr><tr><td class="IconInfoEncoded" /><td class="messageCell" _locID="NoMessagesRow">LWCF 未记录任何消息。
+                  </td></tr></table><a name="release" /><h3>release</h3><table><tr id="releaseHeaderRow"><th></th><th class="messageCell" _locID="MessageTableHeader">消息</th></tr><tr><td class="IconInfoEncoded" /><td class="messageCell" _locID="NoMessagesRow">release 未记录任何消息。
+                  </td></tr></table><a name="Solution Items" /><h3>Solution Items</h3><table><tr id="Solution ItemsHeaderRow"><th></th><th class="messageCell" _locID="MessageTableHeader">消息</th></tr><tr><td class="IconInfoEncoded" /><td class="messageCell" _locID="NoMessagesRow">Solution Items 未记录任何消息。
+                  </td></tr></table><a name="test" /><h3>test</h3><table><tr id="testHeaderRow"><th></th><th class="messageCell" _locID="MessageTableHeader">消息</th></tr><tr><td class="IconInfoEncoded" /><td class="messageCell" _locID="NoMessagesRow">test 未记录任何消息。
+                  </td></tr></table><a name="Test" /><h3>Test</h3><table><tr id="TestHeaderRow"><th></th><th class="messageCell" _locID="MessageTableHeader">消息</th></tr><tr><td class="IconInfoEncoded" /><td class="messageCell" _locID="NoMessagesRow">Test 未记录任何消息。
+                  </td></tr></table><a name="UO" /><h3>UO</h3><table><tr id="UOHeaderRow"><th></th><th class="messageCell" _locID="MessageTableHeader">消息</th></tr><tr><td class="IconInfoEncoded" /><td class="messageCell" _locID="NoMessagesRow">UO 未记录任何消息。
+                  </td></tr></table><a name="VW" /><h3>VW</h3><table><tr id="VWHeaderRow"><th></th><th class="messageCell" _locID="MessageTableHeader">消息</th></tr><tr><td class="IconInfoEncoded" /><td class="messageCell" _locID="NoMessagesRow">VW 未记录任何消息。
+                  </td></tr></table><a name="WebRest" /><h3>WebRest</h3><table><tr id="WebRestHeaderRow"><th></th><th class="messageCell" _locID="MessageTableHeader">消息</th></tr><tr><td class="IconInfoEncoded" /><td class="messageCell" _locID="NoMessagesRow">WebRest 未记录任何消息。
+                  </td></tr></table><a name="webservice" /><h3>webservice</h3><table><tr id="webserviceHeaderRow"><th></th><th class="messageCell" _locID="MessageTableHeader">消息</th></tr><tr><td class="IconInfoEncoded" /><td class="messageCell" _locID="NoMessagesRow">webservice 未记录任何消息。
+                  </td></tr></table><a name="Solution" /><h3 _locID="ProjectDisplayNameHeader">解决方案</h3><table><tr id="SolutionHeaderRow"><th></th><th class="messageCell" _locID="MessageTableHeader">消息</th></tr><tr name="MessageRowHeaderShowSolution"><td class="IconInfoEncoded" /><td class="messageCell"><a _locID="ShowAdditionalMessages" href="#" name="SolutionMessage" onclick="ToggleMessageVisibility('Solution'); return false;">
+          显示 1 其他消息
+        </a></td></tr><tr name="MessageRowClassSolution" style="display: none"><td class="IconInfoEncoded"><a name="SolutionMessage" /></td><td class="messageCell"><strong>deiniuWMS.sln:
+        </strong><span>解决方案文件不需要迁移。</span></td></tr><tr style="display: none" name="MessageRowHeaderHideSolution"><td class="IconInfoEncoded" /><td class="messageCell"><a _locID="HideAdditionalMessages" href="#" name="SolutionMessage" onclick="ToggleMessageVisibility('Solution'); return false;">
+          隐藏 1 其他消息
+        </a></td></tr></table></div></div></body></html>

UpgradeLog13.htm

@@ -0,0 +1,286 @@
+<!DOCTYPE html>
+<!-- saved from url=(0014)about:internet -->
+ <html xmlns:msxsl="urn:schemas-microsoft-com:xslt"><head><meta content="en-us" http-equiv="Content-Language" /><meta content="text/html; charset=utf-16" http-equiv="Content-Type" /><title _locID="ConversionReport0">
+          迁移报告
+        </title><style> 
+                    /* Body style, for the entire document */
+                    body
+                    {
+                        background: #F3F3F4;
+                        color: #1E1E1F;
+                        font-family: "Segoe UI", Tahoma, Geneva, Verdana, sans-serif;
+                        padding: 0;
+                        margin: 0;
+                    }
+
+                    /* Header1 style, used for the main title */
+                    h1
+                    {
+                        padding: 10px 0px 10px 10px;
+                        font-size: 21pt;
+                        background-color: #E2E2E2;
+                        border-bottom: 1px #C1C1C2 solid; 
+                        color: #201F20;
+                        margin: 0;
+                        font-weight: normal;
+                    }
+
+                    /* Header2 style, used for "Overview" and other sections */
+                    h2
+                    {
+                        font-size: 18pt;
+                        font-weight: normal;
+                        padding: 15px 0 5px 0;
+                        margin: 0;
+                    }
+
+                    /* Header3 style, used for sub-sections, such as project name */
+                    h3
+                    {
+                        font-weight: normal;
+                        font-size: 15pt;
+                        margin: 0;
+                        padding: 15px 0 5px 0;
+                        background-color: transparent;
+                    }
+
+                    /* Color all hyperlinks one color */
+                    a
+                    {
+                        color: #1382CE;
+                    }
+
+                    /* Table styles */ 
+                    table
+                    {
+                        border-spacing: 0 0;
+                        border-collapse: collapse;
+                        font-size: 10pt;
+                    }
+
+                    table th
+                    {
+                        background: #E7E7E8;
+                        text-align: left;
+                        text-decoration: none;
+                        font-weight: normal;
+                        padding: 3px 6px 3px 6px;
+                    }
+
+                    table td
+                    {
+                        vertical-align: top;
+                        padding: 3px 6px 5px 5px;
+                        margin: 0px;
+                        border: 1px solid #E7E7E8;
+                        background: #F7F7F8;
+                    }
+
+                    /* Local link is a style for hyperlinks that link to file:/// content, there are lots so color them as 'normal' text until the user mouse overs */
+                    .localLink
+                    {
+                        color: #1E1E1F;
+                        background: #EEEEED;
+                        text-decoration: none;
+                    }
+
+                    .localLink:hover
+                    {
+                        color: #1382CE;
+                        background: #FFFF99;
+                        text-decoration: none;
+                    }
+
+                    /* Center text, used in the over views cells that contain message level counts */ 
+                    .textCentered
+                    {
+                        text-align: center;
+                    }
+
+                    /* The message cells in message tables should take up all avaliable space */
+                    .messageCell
+                    {
+                        width: 100%;
+                    }
+
+                    /* Padding around the content after the h1 */ 
+                    #content 
+                    {
+	                    padding: 0px 12px 12px 12px; 
+                    }
+
+                    /* The overview table expands to width, with a max width of 97% */ 
+                    #overview table
+                    {
+                        width: auto;
+                        max-width: 75%; 
+                    }
+
+                    /* The messages tables are always 97% width */
+                    #messages table
+                    {
+                        width: 97%;
+                    }
+
+                    /* All Icons */
+                    .IconSuccessEncoded, .IconInfoEncoded, .IconWarningEncoded, .IconErrorEncoded
+                    {
+                        min-width:18px;
+                        min-height:18px; 
+                        background-repeat:no-repeat;
+                        background-position:center;
+                    }
+
+                    /* Success icon encoded */
+                    .IconSuccessEncoded
+                    {
+                        /* Note: Do not delete the comment below. It is used to verify the correctness of the encoded image resource below before the product is released */
+                        /* [---XsltValidateInternal-Base64EncodedImage:IconSuccess#Begin#background-image: url(data:image/png;base64,#Separator#);#End#] */
+                        background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAA7EAAAOxAGVKw4bAAABcElEQVR4Xq2TsUsCURzHv15g8ZJcBWlyiYYgCIWcb9DFRRwMW5TA2c0/QEFwFkxxUQdxVlBwCYWOi6IhWgQhBLHJUCkhLr/BW8S7gvrAg+N+v8/v+x68Z8MGy+XSCyABQAXgBgHGALoASkIIDWSLeLBetdHryMjd5IxQPWT4rn1c/P7+xxp72Cs9m5SZ0Bq2vPnbPFafK2zDvmNHypdC0BPkLlQhxJsCAhQoZwdZU5mwxh720qGo8MzTxTTKZDPCx2HoVzp6lz0Q9tKhyx0kGs8Ny+TkWRKk8lCROwEduhyg9l/6lunOPSfmH3NUH6uQ0KHLAe7JYvJjevm+DAMGJHToKtigE+vwvIidxLamb8IBY9e+C5LiXREkfho3TSd06HJA13/oh6T51MTsfQbHrsMynQ5dDihFjiK8JJAU9AKIWTp76dCVN7HWHrajmUEGvyF9nkbAE6gLIS7kTUyuf2gscLoJrElZo/Mvj+nPz/kLTmfnEwP3tB0AAAAASUVORK5CYII=);
+                    }
+
+                    /* Information icon encoded */
+                    .IconInfoEncoded
+                    {
+                        /* Note: Do not delete the comment below. It is used to verify the correctness of the encoded image resource below before the product is released */
+                        /* [---XsltValidateInternal-Base64EncodedImage:IconInformation#Begin#background-image: url(data:image/png;base64,#Separator#);#End#] */
+                        background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABHElEQVR4Xs2TsUoDQRRF7wwoziokjZUKadInhdhukR9YP8DMX1hYW+QvdsXa/QHBbcXC7W0CamWTQnclFutceIQJwwaWNLlwm5k5d94M76mmaeCrrmsLYOocY12FcxZFUeozCqKqqgYA8uevv1H6VuPxcwlfk5N92KHBxfFeCSAxxswlYAW/Xr989x/mv9gkhtyMDhcAxgzRsp7flj8B/HF1RsMXq+NZMkopaHe7lbKxQUEIGbKsYNoGn969060hZBkQex/W8oRQwsQaW2o3Ago2SVcJUzAgY3N0lTCZZm+zPS8HB51gMmS1DEYyOz9acKO1D8JWTlafKIMxdhvlfdyT94Vv5h7P8Ky7nQzACmhvKq3zk3PjW9asz9D/1oigecsioooAAAAASUVORK5CYII=);
+                    }
+
+                    /* Warning icon encoded */
+                    .IconWarningEncoded
+                    {
+                        /* Note: Do not delete the comment below. It is used to verify the correctness of the encoded image resource below before the product is released */
+                        /* [---XsltValidateInternal-Base64EncodedImage:IconWarning#Begin#background-image: url(data:image/png;base64,#Separator#);#End#] */
+                        background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAAx0lEQVR4XpWSMQ7CMAxFf4xAyBMLCxMrO8dhaBcuwdCJS3RJBw7SA/QGTCxdWJgiQYWKXJWKIXHIlyw5lqr34tQgEOdcBsCOx5yZK3hCCKdYXneQkh4pEfqzLfu+wVDSyyzFoJjfz9NB+pAF+eizx2Vruts0k15mPgvS6GYvpVtQhB61IB/dk6AF6fS4Ben0uIX5odtFe8Q/eW1KvFeH4e8khT6+gm5B+t3juyDt7n0jpe+CANTd+oTUjN/U3yVaABnSUjFz/gFq44JaVSCXeQAAAABJRU5ErkJggg==);
+                    }
+
+                    /* Error icon encoded */
+                    .IconErrorEncoded
+                    {
+                        /* Note: Do not delete the comment below. It is used to verify the correctness of the encoded image resource below before the product is released */
+                        /* [---XsltValidateInternal-Base64EncodedImage:IconError#Begin#background-image: url(data:image/png;base64,#Separator#);#End#] */
+                        background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABQElEQVR4XqWTvUoEQRCE6wYPZUA80AfwAQz23uCMjA7MDRQEIzPBVEyNTQUFIw00vcQTTMzuAh/AxEQQT8HF/3G/oGGnEUGuoNnd6qoZuqltyKEsyzVJq5I6rnUp6SjGeGhESikzzlc1eL7opfuVbrqbU1Zw9NCgtQMaZpY0eNnaaL2fHusvTK5vKu7sjSS1Y4y3QUA6K3e3Mau5UFDyMP7tYF9o8cAHZv68vipoIJg971PZIZ5HiwdvYGGvFVFHmGmZ2MxwmQYPXubPl9Up0tfoMQGetXd6mRbvhBw+boZ6WF7Mbv1+GsHRk0fQmPAH1GfmZirbCfDJ61tw3Px8/8pZsPAG4jlVhcPgZ7adwNWBB68lkRQWFiTgFlbnLY3DGGM7izIJIyT/jjIvEJw6fdJTc6krDzh6aMwMP9bvDH4ADSsa9uSWVJkAAAAASUVORK5CYII=);
+                    }
+                 </style><script type="text/javascript" language="javascript"> 
+          
+            // Startup 
+            // Hook up the the loaded event for the document/window, to linkify the document content
+            var startupFunction = function() { linkifyElement("messages"); };
+            
+            if(window.attachEvent)
+            {
+              window.attachEvent('onload', startupFunction);
+            }
+            else if (window.addEventListener) 
+            {
+              window.addEventListener('load', startupFunction, false);
+            }
+            else 
+            {
+              document.addEventListener('load', startupFunction, false);
+            } 
+            
+            // Toggles the visibility of table rows with the specified name 
+            function toggleTableRowsByName(name)
+            {
+               var allRows = document.getElementsByTagName('tr');
+               for (i=0; i < allRows.length; i++)
+               {
+                  var currentName = allRows[i].getAttribute('name');
+                  if(!!currentName && currentName.indexOf(name) == 0)
+                  {
+                      var isVisible = allRows[i].style.display == ''; 
+                      isVisible ? allRows[i].style.display = 'none' : allRows[i].style.display = '';
+                  }
+               }
+            }
+            
+            function scrollToFirstVisibleRow(name) 
+            {
+               var allRows = document.getElementsByTagName('tr');
+               for (i=0; i < allRows.length; i++)
+               {
+                  var currentName = allRows[i].getAttribute('name');
+                  var isVisible = allRows[i].style.display == ''; 
+                  if(!!currentName && currentName.indexOf(name) == 0 && isVisible)
+                  {
+                     allRows[i].scrollIntoView(true); 
+                     return true; 
+                  }
+               }
+               
+               return false;
+            }
+            
+            // Linkifies the specified text content, replaces candidate links with html links 
+            function linkify(text)
+            {
+                 if(!text || 0 === text.length)
+                 {
+                     return text; 
+                 }
+
+                 // Find http, https and ftp links and replace them with hyper links 
+                 var urlLink = /(http|https|ftp)\:\/\/[a-zA-Z0-9\-\.]+(:[a-zA-Z0-9]*)?\/?([a-zA-Z0-9\-\._\?\,\/\\\+&%\$#\=~;\{\}])*/gi;
+                 
+                 return text.replace(urlLink, '<a href="$&">$&</a>') ;
+            }
+            
+            // Linkifies the specified element by ID
+            function linkifyElement(id)
+            {
+                var element = document.getElementById(id);
+                if(!!element)
+                {
+                  element.innerHTML = linkify(element.innerHTML); 
+                }
+            }
+            
+            function ToggleMessageVisibility(projectName)
+            {
+              if(!projectName || 0 === projectName.length)
+              {
+                return; 
+              }
+              
+              toggleTableRowsByName("MessageRowClass" + projectName);
+              toggleTableRowsByName('MessageRowHeaderShow' + projectName);
+              toggleTableRowsByName('MessageRowHeaderHide' + projectName); 
+            }
+            
+            function ScrollToFirstVisibleMessage(projectName)
+            {
+              if(!projectName || 0 === projectName.length)
+              {
+                return; 
+              }
+              
+              // First try the 'Show messages' row
+              if(!scrollToFirstVisibleRow('MessageRowHeaderShow' + projectName))
+              {
+                // Failed to find a visible row for 'Show messages', try an actual message row 
+                scrollToFirstVisibleRow('MessageRowClass' + projectName); 
+              }
+            }
+           </script></head><body><h1 _locID="ConversionReport">
+          迁移报告 - </h1><div id="content"><h2 _locID="OverviewTitle">概述</h2><div id="overview"><table><tr><th></th><th _locID="ProjectTableHeader">项目</th><th _locID="PathTableHeader">路径</th><th _locID="ErrorsTableHeader">错误</th><th _locID="WarningsTableHeader">警告</th><th _locID="MessagesTableHeader">消息</th></tr><tr><td class="IconErrorEncoded" /><td><strong><a href="#LightService">LightService</a></strong></td><td>LightService\LightService.csproj</td><td class="textCentered"><a href="#LightServiceError">1</a></td><td class="textCentered"><a>0</a></td><td class="textCentered"><a href="#">0</a></td></tr><tr><td class="IconSuccessEncoded" /><td><strong><a href="#DA">DA</a></strong></td><td>DA</td><td class="textCentered"><a>0</a></td><td class="textCentered"><a>0</a></td><td class="textCentered"><a href="#">0</a></td></tr><tr><td class="IconSuccessEncoded" /><td><strong><a href="#epick">epick</a></strong></td><td>epick</td><td class="textCentered"><a>0</a></td><td class="textCentered"><a>0</a></td><td class="textCentered"><a href="#">0</a></td></tr><tr><td class="IconSuccessEncoded" /><td><strong><a href="#LG">LG</a></strong></td><td>LG</td><td class="textCentered"><a>0</a></td><td class="textCentered"><a>0</a></td><td class="textCentered"><a href="#">0</a></td></tr><tr><td class="IconSuccessEncoded" /><td><strong><a href="#LWCF">LWCF</a></strong></td><td>LWCF</td><td class="textCentered"><a>0</a></td><td class="textCentered"><a>0</a></td><td class="textCentered"><a href="#">0</a></td></tr><tr><td class="IconSuccessEncoded" /><td><strong><a href="#release">release</a></strong></td><td>release</td><td class="textCentered"><a>0</a></td><td class="textCentered"><a>0</a></td><td class="textCentered"><a href="#">0</a></td></tr><tr><td class="IconSuccessEncoded" /><td><strong><a href="#Solution Items">Solution Items</a></strong></td><td>Solution Items</td><td class="textCentered"><a>0</a></td><td class="textCentered"><a>0</a></td><td class="textCentered"><a href="#">0</a></td></tr><tr><td class="IconSuccessEncoded" /><td><strong><a href="#test">test</a></strong></td><td>test</td><td class="textCentered"><a>0</a></td><td class="textCentered"><a>0</a></td><td class="textCentered"><a href="#">0</a></td></tr><tr><td class="IconSuccessEncoded" /><td><strong><a href="#Test">Test</a></strong></td><td>Test</td><td class="textCentered"><a>0</a></td><td class="textCentered"><a>0</a></td><td class="textCentered"><a href="#">0</a></td></tr><tr><td class="IconSuccessEncoded" /><td><strong><a href="#UO">UO</a></strong></td><td>UO</td><td class="textCentered"><a>0</a></td><td class="textCentered"><a>0</a></td><td class="textCentered"><a href="#">0</a></td></tr><tr><td class="IconSuccessEncoded" /><td><strong><a href="#view">view</a></strong></td><td>view\</td><td class="textCentered"><a>0</a></td><td class="textCentered"><a>0</a></td><td class="textCentered"><a href="#">0</a></td></tr><tr><td class="IconSuccessEncoded" /><td><strong><a href="#VW">VW</a></strong></td><td>VW</td><td class="textCentered"><a>0</a></td><td class="textCentered"><a>0</a></td><td class="textCentered"><a href="#">0</a></td></tr><tr><td class="IconSuccessEncoded" /><td><strong><a href="#WebRest">WebRest</a></strong></td><td>WebRest\WebRest.csproj</td><td class="textCentered"><a>0</a></td><td class="textCentered"><a>0</a></td><td class="textCentered"><a href="#">0</a></td></tr><tr><td class="IconSuccessEncoded" /><td><strong><a href="#webservice">webservice</a></strong></td><td>webservice</td><td class="textCentered"><a>0</a></td><td class="textCentered"><a>0</a></td><td class="textCentered"><a href="#">0</a></td></tr><tr><td class="IconSuccessEncoded" /><td><strong><a href="#Solution"><span _locID="OverviewSolutionSpan">解决方案</span></a></strong></td><td>deiniuWMS.sln</td><td class="textCentered"><a>0</a></td><td class="textCentered"><a>0</a></td><td class="textCentered"><a href="#" onclick="ScrollToFirstVisibleMessage('Solution'); return false;">1</a></td></tr></table></div><h2 _locID="SolutionAndProjectsTitle">解决方案和项目</h2><div id="messages"><a name="LightService" /><h3>LightService</h3><table><tr id="LightServiceHeaderRow"><th></th><th class="messageCell" _locID="MessageTableHeader">消息</th></tr><tr name="ErrorRowClassLightService"><td class="IconErrorEncoded"><a name="LightServiceError" /></td><td class="messageCell"><strong>LightService\LightService.csproj:
+        </strong><span>找不到此项目类型所基于的应用程序。有关更多信息，请尝试此链接: http://go.microsoft.com/fwlink/?LinkID=299083&amp;projecttype=3D9AD99F-2412-4246-B90B-4EAA41C64699</span></td></tr></table><a name="DA" /><h3>DA</h3><table><tr id="DAHeaderRow"><th></th><th class="messageCell" _locID="MessageTableHeader">消息</th></tr><tr><td class="IconInfoEncoded" /><td class="messageCell" _locID="NoMessagesRow">DA 未记录任何消息。
+                  </td></tr></table><a name="epick" /><h3>epick</h3><table><tr id="epickHeaderRow"><th></th><th class="messageCell" _locID="MessageTableHeader">消息</th></tr><tr><td class="IconInfoEncoded" /><td class="messageCell" _locID="NoMessagesRow">epick 未记录任何消息。
+                  </td></tr></table><a name="LG" /><h3>LG</h3><table><tr id="LGHeaderRow"><th></th><th class="messageCell" _locID="MessageTableHeader">消息</th></tr><tr><td class="IconInfoEncoded" /><td class="messageCell" _locID="NoMessagesRow">LG 未记录任何消息。
+                  </td></tr></table><a name="LWCF" /><h3>LWCF</h3><table><tr id="LWCFHeaderRow"><th></th><th class="messageCell" _locID="MessageTableHeader">消息</th></tr><tr><td class="IconInfoEncoded" /><td class="messageCell" _locID="NoMessagesRow">LWCF 未记录任何消息。
+                  </td></tr></table><a name="release" /><h3>release</h3><table><tr id="releaseHeaderRow"><th></th><th class="messageCell" _locID="MessageTableHeader">消息</th></tr><tr><td class="IconInfoEncoded" /><td class="messageCell" _locID="NoMessagesRow">release 未记录任何消息。
+                  </td></tr></table><a name="Solution Items" /><h3>Solution Items</h3><table><tr id="Solution ItemsHeaderRow"><th></th><th class="messageCell" _locID="MessageTableHeader">消息</th></tr><tr><td class="IconInfoEncoded" /><td class="messageCell" _locID="NoMessagesRow">Solution Items 未记录任何消息。
+                  </td></tr></table><a name="test" /><h3>test</h3><table><tr id="testHeaderRow"><th></th><th class="messageCell" _locID="MessageTableHeader">消息</th></tr><tr><td class="IconInfoEncoded" /><td class="messageCell" _locID="NoMessagesRow">test 未记录任何消息。
+                  </td></tr></table><a name="Test" /><h3>Test</h3><table><tr id="TestHeaderRow"><th></th><th class="messageCell" _locID="MessageTableHeader">消息</th></tr><tr><td class="IconInfoEncoded" /><td class="messageCell" _locID="NoMessagesRow">Test 未记录任何消息。
+                  </td></tr></table><a name="UO" /><h3>UO</h3><table><tr id="UOHeaderRow"><th></th><th class="messageCell" _locID="MessageTableHeader">消息</th></tr><tr><td class="IconInfoEncoded" /><td class="messageCell" _locID="NoMessagesRow">UO 未记录任何消息。
+                  </td></tr></table><a name="view" /><h3>view</h3><table><tr id="viewHeaderRow"><th></th><th class="messageCell" _locID="MessageTableHeader">消息</th></tr><tr><td class="IconInfoEncoded" /><td class="messageCell" _locID="NoMessagesRow">view 未记录任何消息。
+                  </td></tr></table><a name="VW" /><h3>VW</h3><table><tr id="VWHeaderRow"><th></th><th class="messageCell" _locID="MessageTableHeader">消息</th></tr><tr><td class="IconInfoEncoded" /><td class="messageCell" _locID="NoMessagesRow">VW 未记录任何消息。
+                  </td></tr></table><a name="WebRest" /><h3>WebRest</h3><table><tr id="WebRestHeaderRow"><th></th><th class="messageCell" _locID="MessageTableHeader">消息</th></tr><tr><td class="IconInfoEncoded" /><td class="messageCell" _locID="NoMessagesRow">WebRest 未记录任何消息。
+                  </td></tr></table><a name="webservice" /><h3>webservice</h3><table><tr id="webserviceHeaderRow"><th></th><th class="messageCell" _locID="MessageTableHeader">消息</th></tr><tr><td class="IconInfoEncoded" /><td class="messageCell" _locID="NoMessagesRow">webservice 未记录任何消息。
+                  </td></tr></table><a name="Solution" /><h3 _locID="ProjectDisplayNameHeader">解决方案</h3><table><tr id="SolutionHeaderRow"><th></th><th class="messageCell" _locID="MessageTableHeader">消息</th></tr><tr name="MessageRowHeaderShowSolution"><td class="IconInfoEncoded" /><td class="messageCell"><a _locID="ShowAdditionalMessages" href="#" name="SolutionMessage" onclick="ToggleMessageVisibility('Solution'); return false;">
+          显示 1 其他消息
+        </a></td></tr><tr name="MessageRowClassSolution" style="display: none"><td class="IconInfoEncoded"><a name="SolutionMessage" /></td><td class="messageCell"><strong>deiniuWMS.sln:
+        </strong><span>解决方案文件不需要迁移。</span></td></tr><tr style="display: none" name="MessageRowHeaderHideSolution"><td class="IconInfoEncoded" /><td class="messageCell"><a _locID="HideAdditionalMessages" href="#" name="SolutionMessage" onclick="ToggleMessageVisibility('Solution'); return false;">
+          隐藏 1 其他消息
+        </a></td></tr></table></div></div></body></html>

Utils/.vs/Utils.csproj.dtbcache.json

@@ -0,0 +1 @@
+{"RootPath":"D:\\vssrc\\Utils","ProjectFileName":"Utils.csproj","Configuration":"Release|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"DeiNiuException.cs"},{"SourceFile":"DESEncrypt.cs"},{"SourceFile":"Enums.cs"},{"SourceFile":"Structs.cs"},{"SourceFile":"LogHelper.cs"},{"SourceFile":"LoginInfo.cs"},{"SourceFile":"MyException.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"Properties\\Settings.Designer.cs"},{"SourceFile":"Utils.cs"},{"SourceFile":"WmsConstants.cs"},{"SourceFile":"obj\\Release\\.NETFramework,Version=v4.0.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\vssrc\\packages\\log4net.2.0.16\\lib\\net40\\log4net.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Microsoft Visual Studio 10.0\\ReportViewer\\Microsoft.ReportViewer.Common.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Microsoft Visual Studio 10.0\\ReportViewer\\Microsoft.ReportViewer.WebForms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Microsoft Visual Studio 10.0\\ReportViewer\\Microsoft.ReportViewer.WinForms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vssrc\\packages\\Newtonsoft.Json.13.0.3\\lib\\net40\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Runtime.Serialization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vssrc\\Utils\\ThoughtWorks.QRCode.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\vssrc\\Utils\\bin\\Release\\Utils.dll","OutputItemRelativePath":"Utils.dll"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]}

Utils/Enums.cs

@@ -216,7 +216,7 @@ namespace DeiNiu.Utils
     /// <summary>
     /// 标签拣选类型
     /// </summary>
-    public enum enumLabelPickType { pick = 0, seed, seedPick,tran }
+    public enum enumLabelPickType { pick = 0, seed, seedPick,tran ,seedsDesk}
     public enum ConfigType
     {
         /// <summary>   

Utils/Utils.csproj

@@ -66,9 +66,8 @@
     <Reference Include="Microsoft.ReportViewer.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
     <Reference Include="Microsoft.ReportViewer.WebForms, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
     <Reference Include="Microsoft.ReportViewer.WinForms, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-    <Reference Include="Newtonsoft.Json, Version=4.0.8.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />

Utils/WmsConstants.cs

@@ -220,6 +220,8 @@ namespace DeiNiu.Utils
         public static int CURRENT_SEEDS_GOOD_SKUID;
         public static int CURRENT_SEEDS_LABLE_ID;
         public static Dictionary<string, bool> SEEDS_CURRENT_PICK_STATUS = new Dictionary<string, bool>();
+
+
         /// <summary>
         /// 播种订单商品类型阀值
         /// 订单商品类型数量小于该值时，适用播种
@@ -468,5 +470,18 @@ namespace DeiNiu.Utils
         public static int SEEDS_TASK_FETCH_END_MINUTES = 35;
         public static string CURRENT_PANDIAN_ORDER="";
         public static bool ERP_NOTICE_STOCK_OUT_DOING;
+
+
+
+        //----light seeds
+        public static Dictionary<int, int> SEEDS_PORT_USERID_ID = new Dictionary<int, int>();
+
+        public static Dictionary<int, Dictionary<string, int>> SEEDS_LABEL_ID = new Dictionary<int, Dictionary<string, int>>(); 
+    
+        public static Dictionary<int, Dictionary<string, bool>> SEEDS_CURRENT_LIGHTS_STATUS = new Dictionary<int, Dictionary<string, bool>>();
+        public static Dictionary<int, Dictionary<string, bool>> EPICK_SEEDS_CURRENT_PICK_STATUS = new Dictionary<int, Dictionary<string, bool>>();
+        public static Dictionary<int, bool> WAVE_CURRENT_LIGHTS_PORT_STATUS = new Dictionary<int, bool>();
+
+        
     }
 }

Utils/packages.config

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="log4net" version="2.0.16" targetFramework="net40" />
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net40" />
   <package id="ThoughtWorks.QRCode" version="1.1.0" targetFramework="net40" />
 </packages>

WcfAuthentication/.vs/WcfClientAuthentication.csproj.dtbcache.json

@@ -0,0 +1 @@
+{"RootPath":"D:\\vssrc\\vssrc\\WcfAuthentication","ProjectFileName":"WcfClientAuthentication.csproj","Configuration":"Release|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"AuthenticationBehavior.cs"},{"SourceFile":"AuthenticationBehaviorExtension.cs"},{"SourceFile":"AuthenticationInspector.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"obj\\Release\\.NETFramework,Version=v4.0.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\vssrc\\vssrc\\packages\\log4net.2.0.16\\lib\\net40\\log4net.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.ServiceModel.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vssrc\\vssrc\\Utils\\bin\\Release\\Utils.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"D:\\vssrc\\vssrc\\Utils\\bin\\Release\\Utils.dll"}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\vssrc\\vssrc\\WcfAuthentication\\bin\\Release\\WcfClientAuthentication.dll","OutputItemRelativePath":"WcfClientAuthentication.dll"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]}

WcfService1/Android.svc.cs

@@ -974,6 +974,19 @@ namespace DeiNiu.Wcf
             }
         }
 
+        FormatedResult IAndroid.getGoodsInfo(string keywords)
+        {
+
+            try
+            {
+                return new FormatedResult(lgood.queryByKeyWords(keywords));
+            }
+            catch (Exception e)
+            {
+                log.Error(e);
+                return new FormatedResult(e);
+            }
+        }
 
 
         FormatedResult IAndroid.getGoodsPackByBarcode(string barcode)

WcfService1/BLL/lWmsGoods.cs

@@ -33,6 +33,10 @@ namespace DeiNiu.wms.Logical
         {
             get
             {
+                if(_obj == null)
+                {
+                    _obj = new WmsGoods();
+                }
                 return _obj;
             }
         }
@@ -283,6 +287,11 @@ namespace DeiNiu.wms.Logical
             }
          
         }
+
+        internal DataTable queryByKeyWords(string keywords)
+        {
+           return getWmsGoods.queryByKeyWords(keywords);
+        }
     }
     
     

WcfService1/BLL/lWmsStock.cs

@@ -1260,7 +1260,8 @@ namespace DeiNiu.wms.Logical
 
             if (isDownOnly)
             {
-                downAll(start);
+                //downAll(start);
+                downAllByGoodsPart(start);
                 return;
             }
           
@@ -1459,6 +1460,7 @@ namespace DeiNiu.wms.Logical
         public void downAll(int start)
         {
             
+
             WmsStock stock = new WmsStock();
             DataTable dt = stock.QueryActived().Tables[0];
             logTest.Debug(" downall stock list cnt" + dt.Rows.Count);
@@ -1556,8 +1558,56 @@ namespace DeiNiu.wms.Logical
 
         }
 
+        public void downAllByGoodsPart(int start)
+        {
+
+            WmsStock stock = new WmsStock();
+            DataTable dt = stock.QueryActived().Tables[0];
+            logTest.Debug(" downall stock list cnt" + dt.Rows.Count);
+            DataView dv = dt.DefaultView;
+            dv.Sort = "locationId";
+
+            foreach (DataRowView dr in dv)
+            {
+                string flow = "1";
+                stock = new WmsStock(dr.Row);
+                WmsGoods gd = new WmsGoods(stock.goodsId);
+                if (gd.part > 0)
+                {
+                    Node nd = new Node(gd.part);
+                    flow = nd.name;
+                    if (gd.ABC > 0)
+                    {
+                        switch (nd.name)
+                        {
+                            case "1":
+                                if (gd.ABC == 6294)
+                                    flow = "13";
+                                else
+                                {
+                                    flow = "15";
+                                }
+                                break;
+                            case "2":
+                                flow = "22";
+                                break;
+                            case "3":
+                                flow = "32";
+                                break;
+                        }
+
+                    }
+
+                }
+               
+                if (start+""==flow|| start == 0)
+                    this.upDownGoodsCountWithLocation(stock.locationId, stock.goodsId, stock.skuId, stock.batch, stock.count, "初始下架", enumStockRecordType.移库下架, 0, flow);
+            }
+
+        }
+
+        }
+
+
     }
-    
-    
-}
  

WcfService1/IAndroid.cs

@@ -318,7 +318,10 @@ namespace DeiNiu.Wcf
 
 
 
-
+        [OperationContract]
+        [WebInvoke(Method = "GET", RequestFormat = WebMessageFormat.Json, ResponseFormat = WebMessageFormat.Json,
+       UriTemplate = "stock/getGoodsInfo?keywords={keywords}")]
+        FormatedResult getGoodsInfo(string keywords);
 
 
 

WcfService1/Properties/PublishProfiles/IISProfile1.pubxml

@@ -13,7 +13,7 @@
     <ExcludeApp_Data>false</ExcludeApp_Data>
     <MSDeployServiceURL>localhost</MSDeployServiceURL>
     <DeployIisAppPath>restService</DeployIisAppPath>
-    <RemoteSitePhysicalPath />
+    <RemoteSitePhysicalPath>C:\inetpub\wwwroot\restService</RemoteSitePhysicalPath>
     <SkipExtraFilesOnServer>true</SkipExtraFilesOnServer>
     <MSDeployPublishMethod>InProc</MSDeployPublishMethod>
     <EnableMSDeployBackup>false</EnableMSDeployBackup>

WcfService1/WmsWcfService.csproj

@@ -37,6 +37,8 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <IncludeIisSettings>true</IncludeIisSettings>
+    <LegacyPublishPropertiesPageEnabled>true</LegacyPublishPropertiesPageEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -332,18 +334,7 @@
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
         <WebProjectProperties>
-          <UseIIS>True</UseIIS>
-          <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>12349</DevelopmentServerPort>
-          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:12349/</IISUrl>
-          <OverrideIISAppRootUrl>True</OverrideIISAppRootUrl>
-          <IISAppRootUrl>http://localhost:12349/</IISAppRootUrl>
-          <NTLMAuthentication>False</NTLMAuthentication>
-          <UseCustomServer>False</UseCustomServer>
-          <CustomServerUrl>
-          </CustomServerUrl>
-          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
+          <SaveServerSettingsInUserFile>True</SaveServerSettingsInUserFile>
         </WebProjectProperties>
       </FlavorProperties>
     </VisualStudio>

WcfService1/WmsWcfService.csproj.user

@@ -9,7 +9,7 @@
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
     <UseGlobalApplicationHostFile />
-    <NameOfLastUsedPublishProfile>E:\ldj\source\vs\WcfService1\Properties\PublishProfiles\IISProfile.pubxml</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>D:\vssrc\vssrc\WcfService1\Properties\PublishProfiles\IISProfile.pubxml</NameOfLastUsedPublishProfile>
     <ProjectView>ShowAllFiles</ProjectView>
   </PropertyGroup>
   <ProjectExtensions>
@@ -33,6 +33,15 @@
           </StartWorkingDirectory>
           <EnableENC>False</EnableENC>
           <AlwaysStartWebServerOnDebug>True</AlwaysStartWebServerOnDebug>
+          <UseIIS>True</UseIIS>
+          <AutoAssignPort>True</AutoAssignPort>
+          <DevelopmentServerPort>12349</DevelopmentServerPort>
+          <DevelopmentServerVPath>/</DevelopmentServerVPath>
+          <IISUrl>http://localhost:12349/</IISUrl>
+          <NTLMAuthentication>False</NTLMAuthentication>
+          <UseCustomServer>False</UseCustomServer>
+          <CustomServerUrl>
+          </CustomServerUrl>
         </WebProjectProperties>
       </FlavorProperties>
     </VisualStudio>

WcfServiceAuthentication/.vs/WcfServiceAuthentication.csproj.dtbcache.json

@@ -0,0 +1 @@
+{"RootPath":"D:\\vssrc\\WcfServiceAuthentication","ProjectFileName":"WcfServiceAuthentication.csproj","Configuration":"Release|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"AuthenticationBehavior.cs"},{"SourceFile":"AuthenticationBehaviorExtension.cs"},{"SourceFile":"AuthenticationInspector.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"obj\\Release\\.NETFramework,Version=v4.0.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\vssrc\\packages\\log4net.2.0.16\\lib\\net40\\log4net.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vssrc\\Model\\bin\\Release\\Model.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"D:\\vssrc\\Model\\bin\\Release\\Model.dll"},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Runtime.Serialization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.ServiceModel.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.ServiceModel.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vssrc\\Utils\\bin\\Release\\Utils.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"D:\\vssrc\\Utils\\bin\\Release\\Utils.dll"}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\vssrc\\WcfServiceAuthentication\\bin\\Release\\WcfServiceAuthentication.dll","OutputItemRelativePath":"WcfServiceAuthentication.dll"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]}

WcfServiceErp/WcfServiceErp.csproj.user

@@ -8,8 +8,8 @@
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
     <UseGlobalApplicationHostFile />
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
-    <NameOfLastUsedPublishProfile>E:\win10e\wms\vsprojectOwen3\vsprojectOwen\WcfServiceErp\Properties\PublishProfiles\IISProfile.pubxml</NameOfLastUsedPublishProfile>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <NameOfLastUsedPublishProfile>IISProfile</NameOfLastUsedPublishProfile>
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>

WcfServicePortal/Properties/PublishProfiles/IISProfile.pubxml.user

@@ -7,66 +7,73 @@
   <PropertyGroup>
     <TimeStampOfAssociatedLegacyPublishXmlFile />
     <EncryptedPassword />
-    <History>False|2022-07-21T05:26:02.2933601Z;True|2022-05-27T16:18:43.3736878+08:00;True|2022-05-27T11:30:36.0850878+08:00;True|2022-05-27T11:21:29.1919870+08:00;True|2022-06-25T18:24:32.2373075+08:00;False|2022-06-25T18:23:40.6047068+08:00;False|2022-06-25T18:23:25.2307975+08:00;False|2022-06-25T18:21:12.8783721+08:00;True|2022-06-19T16:54:44.3773501+08:00;False|2022-06-19T16:48:41.8212645+08:00;False|2022-06-19T16:45:20.5616618+08:00;False|2022-06-18T14:11:52.7229346+08:00;False|2022-06-18T13:52:10.0984396+08:00;True|2022-06-18T13:28:00.8443375+08:00;</History>
+    <History>True|2024-10-09T04:08:11.6612176Z||;False|2022-07-21T13:26:02.2933601+08:00||;True|2022-05-27T16:18:43.3736878+08:00||;True|2022-05-27T11:30:36.0850878+08:00||;True|2022-05-27T11:21:29.1919870+08:00||;True|2022-06-25T18:24:32.2373075+08:00||;False|2022-06-25T18:23:40.6047068+08:00||;False|2022-06-25T18:23:25.2307975+08:00||;False|2022-06-25T18:21:12.8783721+08:00||;True|2022-06-19T16:54:44.3773501+08:00||;False|2022-06-19T16:48:41.8212645+08:00||;False|2022-06-19T16:45:20.5616618+08:00||;False|2022-06-18T14:11:52.7229346+08:00||;False|2022-06-18T13:52:10.0984396+08:00||;True|2022-06-18T13:28:00.8443375+08:00||;</History>
     <_PublishTargetUrl>C:\inetpub\wwwroot\wcfportal</_PublishTargetUrl>
+    <LastFailureDetails />
   </PropertyGroup>
   <ItemGroup>
     <File Include="bin/Log4Net.config">
-      <publishTime>05/27/2022 16:17:10</publishTime>
+      <publishTime>03/22/2024 16:10:53</publishTime>
     </File>
     <File Include="bin/log4net.dll">
-      <publishTime>03/08/2017 19:25:40</publishTime>
+      <publishTime>03/01/2024 20:27:02</publishTime>
     </File>
     <File Include="bin/log4net.pdb">
       <publishTime>03/08/2017 19:25:40</publishTime>
     </File>
     <File Include="bin/Logical.dll">
-      <publishTime>05/27/2022 16:18:42</publishTime>
+      <publishTime>10/09/2024 12:06:36</publishTime>
     </File>
     <File Include="bin/Logical.pdb">
-      <publishTime>05/27/2022 16:18:42</publishTime>
+      <publishTime>10/09/2024 12:06:36</publishTime>
     </File>
     <File Include="bin/Model.dll">
-      <publishTime>05/27/2022 16:18:41</publishTime>
+      <publishTime>10/09/2024 01:53:50</publishTime>
     </File>
     <File Include="bin/Model.dll.config">
-      <publishTime>06/19/2022 16:46:59</publishTime>
+      <publishTime>03/22/2024 16:10:52</publishTime>
     </File>
     <File Include="bin/Model.pdb">
-      <publishTime>05/27/2022 16:18:41</publishTime>
+      <publishTime>10/09/2024 01:53:50</publishTime>
+    </File>
+    <File Include="bin/Newtonsoft.Json.dll">
+      <publishTime>03/08/2023 15:09:56</publishTime>
+    </File>
+    <File Include="bin/ThoughtWorks.QRCode.dll">
+      <publishTime>03/22/2024 16:10:52</publishTime>
     </File>
     <File Include="bin/Utils.dll">
-      <publishTime>05/27/2022 16:18:41</publishTime>
+      <publishTime>10/09/2024 01:53:50</publishTime>
     </File>
     <File Include="bin/Utils.dll.config">
-      <publishTime>05/15/2017 17:35:58</publishTime>
+      <publishTime>03/22/2024 16:10:52</publishTime>
     </File>
     <File Include="bin/Utils.pdb">
-      <publishTime>05/27/2022 16:18:41</publishTime>
+      <publishTime>10/09/2024 01:53:50</publishTime>
     </File>
     <File Include="bin/WcfServiceAuthentication.dll">
-      <publishTime>05/27/2022 16:18:41</publishTime>
+      <publishTime>10/09/2024 12:06:36</publishTime>
     </File>
     <File Include="bin/WcfServiceAuthentication.pdb">
-      <publishTime>05/27/2022 16:18:41</publishTime>
+      <publishTime>10/09/2024 12:06:36</publishTime>
     </File>
     <File Include="bin/WcfServicePortal.dll">
-      <publishTime>05/27/2022 16:18:42</publishTime>
+      <publishTime>10/09/2024 12:08:09</publishTime>
     </File>
     <File Include="bin/WcfServicePortal.pdb">
-      <publishTime>05/27/2022 16:18:42</publishTime>
+      <publishTime>10/09/2024 12:08:09</publishTime>
     </File>
     <File Include="Log4Net.config">
-      <publishTime>05/27/2022 16:17:10</publishTime>
+      <publishTime>03/22/2024 16:10:53</publishTime>
     </File>
     <File Include="PortalService.svc">
-      <publishTime>06/24/2020 15:55:54</publishTime>
+      <publishTime>03/22/2024 16:10:53</publishTime>
     </File>
     <File Include="T_ONLINE.svc">
-      <publishTime>06/18/2022 13:30:52</publishTime>
+      <publishTime>03/22/2024 16:10:53</publishTime>
     </File>
     <File Include="Web.config">
-      <publishTime>05/27/2022 16:18:43</publishTime>
+      <publishTime>10/09/2024 12:08:10</publishTime>
     </File>
   </ItemGroup>
 </Project>

WcfServicePortal/WcfServicePortal.csproj.user

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.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 />
@@ -9,7 +9,7 @@
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
     <UseGlobalApplicationHostFile />
-    <NameOfLastUsedPublishProfile>E:\win10e\wms\vsprojectOwen3\vsprojectOwen\WcfServicePortal\Properties\PublishProfiles\IISProfile.pubxml</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>IISProfile</NameOfLastUsedPublishProfile>
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>

WebApplication1/Charts.aspx

@@ -0,0 +1,751 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeFile="Charts.aspx.cs" Inherits="wms_Charts" %>
+
+<%@ Register assembly="DevExpress.XtraCharts.v16.2.Web, Version=16.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" namespace="DevExpress.XtraCharts.Web" tagprefix="dx" %>
+<%@ Register assembly="DevExpress.XtraCharts.v16.2, Version=16.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" namespace="DevExpress.XtraCharts" tagprefix="dx" %>
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <title></title>
+
+    <style>
+    #warp{width:99%;height:99%;background:#000;}
+    </style>
+</head>
+<body  id="warp">
+    <form id="form1" runat="server">
+     
+
+        <asp:ScriptManager ID="ScriptManager1" runat="server" EnableScriptGlobalization="True"
+            EnableScriptLocalization="True" AsyncPostBackTimeout="180">
+        </asp:ScriptManager>
+
+
+    <div>
+     <asp:UpdatePanel ID="UpdatePanel1" runat="server">
+                                    <ContentTemplate>
+                                        
+                             
+
+   <table width="99%" height="100%"  align="center"   >
+  
+
+
+     <tr><td  align="center"  style="border-style: none; border-color: inherit; border-width: 0;  font-size: 36pt; 
+                          background:inherit;  color: White; width:100%; text-align:center;" > 
+               <br /> 
+                得牛WMS任务看板 
+               
+             <br />
+          </td>
+          </tr>
+    <tr>
+  
+    <td align="left"> <input name="thetime" style="border-style: none; border-color: inherit; border-width: 0;  font-size: 36pt; 
+                          background:inherit;  color: White; width:100%; text-align:center;"     />
+     </td>
+    
+    </tr>
+     <tr><td  >   </td></tr>
+         <tr><td align="center"> <dx:WebChartControl ID="WebChartPartTasks" runat="server" 
+                  AppearanceNameSerializable="Pastel Kit" BackColor="Black" 
+                  CrosshairEnabled="True" Height="260px" PaletteName="Pastel Kit" 
+                  Width="2340px"> <BorderOptions Color="63, 63, 63"   />
+                  <DiagramSerializable>
+                      <dx:XYDiagram>
+                          <axisx Color="White" InterlacedColor="White" Title-Text="" 
+                              Title-Visibility="Default" Visibility="True" 
+                              visibleinpanesserializable="-1">
+                              <InterlacedFillStyle FillMode="Solid">
+                              </InterlacedFillStyle>
+                              <Tickmarks MinorVisible="False" />
+                              <Label BackColor="Black" Font="仿宋, 22pt, style=Bold" TextColor="255, 255, 255">
+                              </Label>
+                          </axisx>
+                          <axisy Visibility="False" visibleinpanesserializable="-1" 
+                              Title-Visibility="Default">
+                              <Tickmarks MinorVisible="False" Visible="False" />
+                              <GridLines Visible="False">
+                              </GridLines>
+                          </axisy>
+                          <DefaultPane BackColor="0, 0, 0" Weight="2" BorderVisible="False">
+                              <FillStyle FillMode="Solid">
+                              </FillStyle>
+                              <Shadow Color="Black" />
+                          </DefaultPane>
+                      </dx:XYDiagram>
+                  </DiagramSerializable>
+                  <Legend Name="Default Legend" Visibility="True" AlignmentHorizontal="Left" 
+                      BackColor="Black" MarkerVisible="False" TextColor="255, 255, 255" 
+                      TextVisible="False" AlignmentVertical="Center" 
+                 Direction="LeftToRight">
+                      <Border Color="255, 255, 255" Visibility="False" />
+                      <Padding Bottom="1" Left="1" Right="1" Top="1" />
+                      <Margins Bottom="1" Left="1" Right="1" Top="1" />
+                      <Title Font="黑体, 20pt, style=Bold" Text="货区任务" TextColor="255, 255, 255" 
+                          Visible="True" Alignment="Near" WordWrap="True">
+                          <Margins Bottom="0" Left="0" Right="0" Top="0" />
+                      </Title></Legend>
+                  <SeriesSerializable>
+                      <dx:Series LabelsVisibility="True" Name="任务数" ShowInLegend="False">
+                          <Points>
+                              <dx:SeriesPoint ArgumentSerializable="验收" Values="60">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="2" Values="50">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="3" Values="100">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="4" Values="60">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="5" Values="100">
+                              </dx:SeriesPoint>
+                          </Points>
+                          <viewserializable>
+                              <dx:SideBySideStackedBarSeriesView BarWidth="0.5" Color="221, 217, 195">
+                                  <FillStyle FillMode="Hatch">
+                                      <OptionsSerializable>
+                                          <dx:HatchFillOptions Color2="0, 0, 0" />
+                                      </OptionsSerializable>
+                                  </FillStyle>
+                              </dx:SideBySideStackedBarSeriesView>
+                          </viewserializable>
+                          <LabelSerializable>
+                              <dx:StackedBarSeriesLabel BackColor="0, 0, 0" Font="Tahoma, 18pt, style=Bold" 
+                                  Indent="1" Position="TopInside" TextColor="255, 255, 255">
+                              </dx:StackedBarSeriesLabel>
+                          </LabelSerializable>
+                      </dx:Series>
+                      <dx:Series Name="完成数">
+                          <Points>
+                              <dx:SeriesPoint ArgumentSerializable="验收" Values="50">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="2" Values="30">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="3" Values="20">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="4" Values="30">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="5" Values="40">
+                              </dx:SeriesPoint>
+                          </Points>
+                          <ViewSerializable>
+                              <dx:StackedBarSeriesView BarWidth="0.5" Color="240, 0, 0" ColorEach="True">
+                                  <Border Color="240, 0, 0" Visibility="False" />
+                                  <FillStyle FillMode="Gradient">
+                                      <OptionsSerializable>
+                                          <dx:RectangleGradientFillOptions GradientMode="BottomToTop" />
+                                      </OptionsSerializable>
+                                  </FillStyle>
+                              </dx:StackedBarSeriesView>
+                          </ViewSerializable>
+                          <LabelSerializable>
+                              <dx:StackedBarSeriesLabel Font="Tahoma, 5pt, style=Bold">
+                              </dx:StackedBarSeriesLabel>
+                          </LabelSerializable>
+                      </dx:Series>
+                  </SeriesSerializable>
+                  <SeriesTemplate>
+                      <ViewSerializable>
+                          <dx:StackedBarSeriesView>
+                          </dx:StackedBarSeriesView>
+                      </ViewSerializable>
+                  </SeriesTemplate>
+                  <Titles>
+                      <dx:ChartTitle Font="黑体, 22pt, style=Bold" Text="任务一览" 
+                          TextColor="255, 255, 255" Visibility="False" />
+                  </Titles>
+              </dx:WebChartControl> </td></tr>
+    <tr> 
+    <td align="center">
+  
+     <table  ><tr>
+     
+        <td valign="top">
+               <dx:WebChartControl ID="WebChartEmpTasks" runat="server" 
+                  AppearanceNameSerializable="Pastel Kit" BackColor="Black" 
+                  CrosshairEnabled="True" Height="640px" PaletteName="Pastel Kit" 
+                  Width="420px" onobjectselected="WebChartEmpTasks_ObjectSelected">
+                   <BorderOptions Color="63, 63, 63" />
+                  <DiagramSerializable>
+                      <dx:XYDiagram Rotated="True">
+                          <axisx Color="White" InterlacedColor="White" Title-Text="" 
+                              Title-Visibility="True" Visibility="True" visibleinpanesserializable="-1">
+                              <InterlacedFillStyle FillMode="Solid">
+                              </InterlacedFillStyle>
+                              <Tickmarks MinorVisible="False" />
+                              <Label BackColor="Black" Font="仿宋, 20pt, style=Bold" TextColor="255, 255, 255">
+                                  <Border Color="Aqua" Visibility="False" />
+                              </Label>
+                          </axisx>
+                          <axisy Visibility="False" visibleinpanesserializable="-1">
+                              <Tickmarks MinorVisible="False" Visible="False" />
+                              <GridLines Visible="False">
+                              </GridLines>
+                          </axisy>
+                          <DefaultPane BackColor="0, 0, 0" Weight="2" BorderVisible="False">
+                              <FillStyle FillMode="Solid">
+                              </FillStyle>
+                              <Shadow Color="Black" />
+                          </DefaultPane>
+                      </dx:XYDiagram>
+                  </DiagramSerializable>
+                  <Legend Name="Default Legend" Visibility="True" AlignmentHorizontal="Center" 
+                      BackColor="0, 0, 0" Font="黑体, 22pt, style=Bold" MarkerVisible="False" 
+                      TextColor="255, 255, 255" TextVisible="False" 
+                       AlignmentVertical="TopOutside">
+                      <Border Visibility="False" />
+                      <Title Font="黑体, 22pt, style=Bold" Text="今日绩效" Visible="True"></Title></Legend>
+                  <SeriesSerializable>
+                      <dx:Series LabelsVisibility="True" Name="完成数">
+                          <Points>
+                              <dx:SeriesPoint ArgumentSerializable="验收" Values="50">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="2" Values="30">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="3" Values="20">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="4" Values="30">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="5" Values="40">
+                              </dx:SeriesPoint>
+                          </Points>
+                          <viewserializable>
+                              <dx:StackedBarSeriesView BarWidth="0.5" Color="240, 0, 0" ColorEach="True">
+                                  <Border Color="240, 0, 0" Visibility="False" />
+                                  <FillStyle FillMode="Gradient">
+                                      <OptionsSerializable>
+                                          <dx:RectangleGradientFillOptions GradientMode="BottomToTop" />
+                                      </OptionsSerializable>
+                                  </FillStyle>
+                              </dx:StackedBarSeriesView>
+                          </viewserializable>
+                          <LabelSerializable>
+                              <dx:StackedBarSeriesLabel Font="Tahoma, 18pt, style=Bold">
+                              </dx:StackedBarSeriesLabel>
+                          </LabelSerializable>
+                      </dx:Series>
+                      <dx:Series LabelsVisibility="True" Name="任务数" ShowInLegend="False" 
+                          Visible="False">
+                          <Points>
+                              <dx:SeriesPoint ArgumentSerializable="验收" Values="60">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="2" Values="50">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="3" Values="100">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="4" Values="60">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="5" Values="100">
+                              </dx:SeriesPoint>
+                          </Points>
+                          <ViewSerializable>
+                              <dx:SideBySideStackedBarSeriesView BarWidth="0.5" Color="221, 217, 195">
+                                  <FillStyle FillMode="Hatch">
+                                      <OptionsSerializable>
+                                          <dx:HatchFillOptions Color2="Black" />
+                                      </OptionsSerializable>
+                                  </FillStyle>
+                              </dx:SideBySideStackedBarSeriesView>
+                          </ViewSerializable>
+                          <LabelSerializable>
+                              <dx:StackedBarSeriesLabel BackColor="Black" Font="Tahoma, 18pt, style=Bold" 
+                                  Indent="1" Position="TopInside" TextColor="White">
+                              </dx:StackedBarSeriesLabel>
+                          </LabelSerializable>
+                      </dx:Series>
+                  </SeriesSerializable>
+                  <SeriesTemplate>
+                      <ViewSerializable>
+                          <dx:StackedBarSeriesView>
+                          </dx:StackedBarSeriesView>
+                      </ViewSerializable>
+                  </SeriesTemplate>
+                  <Titles>
+                      <dx:ChartTitle Font="黑体, 22pt, style=Bold" Text="当日绩效" 
+                          TextColor="255, 255, 255" Visibility="False" />
+                  </Titles>
+              </dx:WebChartControl>
+                  
+               <dx:WebChartControl ID="WebChartLocs" runat="server" 
+                      AppearanceNameSerializable="Pastel Kit" BackColor="Black" 
+                      CrosshairEnabled="True" Height="320px" PaletteName="Pastel Kit" 
+                   Width="420px">
+                       <BorderOptions Color="63, 63, 63" />
+                      <DiagramSerializable>
+                          <dx:XYDiagram Rotated="True">
+                              <axisx Color="White" InterlacedColor="White" Title-Text="" 
+                                  Title-Visibility="True" Visibility="True" visibleinpanesserializable="-1">
+                                  <InterlacedFillStyle FillMode="Solid">
+                                  </InterlacedFillStyle>
+                                  <Tickmarks MinorVisible="False" />
+                                  <Label BackColor="Black"  Font="仿宋, 20pt, style=Bold" TextColor="255, 255, 255">
+                                  </Label>
+                                  <VisualRange Auto="False" MaxValueSerializable="5" MinValueSerializable="验收" />
+                                  <WholeRange Auto="False" MaxValueSerializable="5" MinValueSerializable="验收" />
+                              </axisx>
+                              <axisy Visibility="False" visibleinpanesserializable="-1">
+                                  <Tickmarks MinorVisible="False" Visible="False" />
+                                  <Label Visible="False">
+                                  </Label>
+                                  <GridLines Visible="False">
+                                  </GridLines>
+                              </axisy>
+                              <DefaultPane BackColor="0, 0, 0" Weight="2" BorderVisible="False">
+                                  <FillStyle FillMode="Solid">
+                                  </FillStyle>
+                                  <Shadow Color="Black" />
+                              </DefaultPane>
+                          </dx:XYDiagram>
+                      </DiagramSerializable>
+                      <Legend AlignmentHorizontal="Center" BackColor="Black" MarkerVisible="False" 
+                          Name="Default Legend" TextVisible="False" Visibility="True" Font="黑体, 18pt" 
+                           AlignmentVertical="TopOutside">
+                          <Border Visibility="False" />
+                          <Title Font="黑体, 18pt, style=Bold" Text="库位使用百分比" TextColor="255, 255, 255" 
+                              Visible="True"></Title></Legend>
+                      <SeriesSerializable>
+                          <dx:Series LabelsVisibility="True" Name="完成数">
+                              <Points>
+                                  <dx:SeriesPoint ArgumentSerializable="验收" Values="6.21">
+                                  </dx:SeriesPoint>
+                                  <dx:SeriesPoint ArgumentSerializable="2" Values="0.27">
+                                  </dx:SeriesPoint>
+                                  <dx:SeriesPoint ArgumentSerializable="3" Values="0">
+                                  </dx:SeriesPoint>
+                                  <dx:SeriesPoint ArgumentSerializable="4" Values="0">
+                                  </dx:SeriesPoint>
+                                  <dx:SeriesPoint ArgumentSerializable="5" Values="0">
+                                  </dx:SeriesPoint>
+                              </Points>
+                              <viewserializable>
+                                  <dx:StackedBarSeriesView BarWidth="0.5" Color="240, 0, 0" ColorEach="True">
+                                      <Border Color="240, 0, 0" Visibility="False" />
+                                      <FillStyle FillMode="Gradient">
+                                          <OptionsSerializable>
+                                              <dx:RectangleGradientFillOptions GradientMode="BottomToTop" />
+                                          </OptionsSerializable>
+                                      </FillStyle>
+                                  </dx:StackedBarSeriesView>
+                              </viewserializable>
+                              <LabelSerializable>
+                                  <dx:StackedBarSeriesLabel Font="Tahoma, 18pt, style=Bold">
+                                  </dx:StackedBarSeriesLabel>
+                              </LabelSerializable>
+                          </dx:Series>
+                          <dx:Series LabelsVisibility="True" Name="任务数" ShowInLegend="False" 
+                              Visible="False">
+                              <Points>
+                                  <dx:SeriesPoint ArgumentSerializable="验收" Values="60">
+                                  </dx:SeriesPoint>
+                                  <dx:SeriesPoint ArgumentSerializable="2" Values="50">
+                                  </dx:SeriesPoint>
+                                  <dx:SeriesPoint ArgumentSerializable="3" Values="100">
+                                  </dx:SeriesPoint>
+                                  <dx:SeriesPoint ArgumentSerializable="4" Values="60">
+                                  </dx:SeriesPoint>
+                                  <dx:SeriesPoint ArgumentSerializable="5" Values="100">
+                                  </dx:SeriesPoint>
+                              </Points>
+                              <ViewSerializable>
+                                  <dx:SideBySideStackedBarSeriesView BarWidth="0.5" Color="221, 217, 195">
+                                      <FillStyle FillMode="Hatch">
+                                          <OptionsSerializable>
+                                              <dx:HatchFillOptions Color2="Black" />
+                                          </OptionsSerializable>
+                                      </FillStyle>
+                                  </dx:SideBySideStackedBarSeriesView>
+                              </ViewSerializable>
+                              <LabelSerializable>
+                                  <dx:StackedBarSeriesLabel Font="Tahoma, 18pt, style=Bold" BackColor="Black" 
+                                      Indent="1" Position="TopInside" TextColor="White">
+                                  </dx:StackedBarSeriesLabel>
+                              </LabelSerializable>
+                          </dx:Series>
+                      </SeriesSerializable>
+                      <SeriesTemplate>
+                          <ViewSerializable>
+                              <dx:StackedBarSeriesView>
+                              </dx:StackedBarSeriesView>
+                          </ViewSerializable>
+                      </SeriesTemplate>
+                      <Titles>
+                          <dx:ChartTitle Font="黑体, 22pt, style=Bold" Text="货位使用" 
+                              TextColor="255, 255, 255" Visibility="False" />
+                      </Titles>
+                  </dx:WebChartControl>
+
+        </td>
+     
+   <td   valign="top"> 
+    
+             
+              <dx:WebChartControl ID="WebChartTasks" runat="server" 
+                  AppearanceNameSerializable="Pastel Kit" BackColor="Black" 
+                  CrosshairEnabled="True" Height="640px" PaletteName="Pastel Kit" 
+                  Width="1500px"> <BorderOptions Color="63, 63, 63"   />
+                  <DiagramSerializable>
+                      <dx:XYDiagram>
+                          <axisx Color="White" InterlacedColor="White" Title-Text="" 
+                              Title-Visibility="Default" Visibility="True" 
+                              visibleinpanesserializable="-1">
+                              <InterlacedFillStyle FillMode="Solid">
+                              </InterlacedFillStyle>
+                              <Tickmarks MinorVisible="False" />
+                              <Label BackColor="Black" Font="仿宋, 22pt, style=Bold" TextColor="255, 255, 255">
+                              </Label>
+                          </axisx>
+                          <axisy Visibility="False" visibleinpanesserializable="-1" 
+                              Title-Visibility="Default">
+                              <Tickmarks MinorVisible="False" Visible="False" />
+                              <GridLines Visible="False">
+                              </GridLines>
+                          </axisy>
+                          <DefaultPane BackColor="0, 0, 0" Weight="2" BorderVisible="False">
+                              <FillStyle FillMode="Solid">
+                              </FillStyle>
+                              <Shadow Color="Black" />
+                          </DefaultPane>
+                      </dx:XYDiagram>
+                  </DiagramSerializable>
+                  <Legend Name="Default Legend" Visibility="True" AlignmentHorizontal="Left" 
+                      BackColor="Black" MarkerVisible="False" TextColor="255, 255, 255" 
+                      TextVisible="False" AlignmentVertical="Center" Direction="LeftToRight">
+                      <Border Color="255, 255, 255" Visibility="False" />
+                      <Title Font="黑体, 22pt, style=Bold" Text="出库单据" TextColor="255, 255, 255" 
+                          Visible="True" Alignment="Near" WordWrap="True">
+                          <Margins Bottom="0" Left="0" Right="0" Top="0" />
+                      </Title></Legend>
+                  <SeriesSerializable>
+                      <dx:Series Name="任务数" LabelsVisibility="True">
+                          <Points>
+                              <dx:SeriesPoint ArgumentSerializable="验收" Values="60">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="2" Values="50">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="3" Values="100">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="4" Values="60">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="5" Values="100">
+                              </dx:SeriesPoint>
+                          </Points>
+                          <viewserializable>
+                              <dx:SideBySideStackedBarSeriesView BarWidth="0.5" Color="221, 217, 195">
+                                  <Border Visibility="True" />
+                                  <FillStyle FillMode="Hatch">
+                                      <OptionsSerializable>
+                                          <dx:HatchFillOptions Color2="0, 0, 0" />
+                                      </OptionsSerializable>
+                                  </FillStyle>
+                              </dx:SideBySideStackedBarSeriesView>
+                          </viewserializable>
+                          <LabelSerializable>
+                              <dx:StackedBarSeriesLabel BackColor="0, 0, 0" Font="Tahoma, 18pt, style=Bold" 
+                                  Indent="1" Position="TopInside" TextColor="255, 255, 255">
+                                  <Border Visibility="False" />
+                              </dx:StackedBarSeriesLabel>
+                          </LabelSerializable>
+                      </dx:Series>
+                      <dx:Series Name="完成数">
+                          <Points>
+                              <dx:SeriesPoint ArgumentSerializable="验收" Values="50">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="2" Values="30">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="3" Values="20">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="4" Values="30">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="5" Values="40">
+                              </dx:SeriesPoint>
+                          </Points>
+                          <ViewSerializable>
+                              <dx:StackedBarSeriesView BarWidth="0.5" Color="240, 0, 0" ColorEach="True">
+                                  <Border Color="240, 0, 0" Visibility="False" />
+                                  <FillStyle FillMode="Gradient">
+                                      <OptionsSerializable>
+                                          <dx:RectangleGradientFillOptions GradientMode="BottomToTop" />
+                                      </OptionsSerializable>
+                                  </FillStyle>
+                              </dx:StackedBarSeriesView>
+                          </ViewSerializable>
+                          <LabelSerializable>
+                              <dx:StackedBarSeriesLabel Font="Tahoma, 10pt, style=bold">
+                              </dx:StackedBarSeriesLabel>
+                          </LabelSerializable>
+                      </dx:Series>
+                  </SeriesSerializable>
+                  <SeriesTemplate>
+                      <ViewSerializable>
+                          <dx:StackedBarSeriesView>
+                          </dx:StackedBarSeriesView>
+                      </ViewSerializable>
+                  </SeriesTemplate>
+                  <Titles>
+                      <dx:ChartTitle Font="黑体, 22pt, style=Bold" Text="任务一览" 
+                          TextColor="255, 255, 255" Visibility="False" />
+                  </Titles>
+              </dx:WebChartControl> 
+              
+               <dx:WebChartControl ID="WebChartInOutLines" runat="server" BackColor="Black" 
+              CrosshairEnabled="True" Height="320px" Width="1500px">
+                   <BorderOptions Color="63, 63, 63" />
+              <DiagramSerializable>
+                  <dx:XYDiagram>
+                      <axisx Visibility="True" visibleinpanesserializable="-1" Color="255, 255, 255" 
+                          InterlacedColor="255, 255, 255" Title-Font="黑体, 18pt, style=Bold" 
+                          Title-Text="" Title-TextColor="255, 255, 255" 
+                          Title-Visibility="True">
+                          <Tickmarks MinorVisible="False" />
+                          <Label Font="黑体, 12pt" TextColor="255, 255, 255">
+                          </Label>
+                          <GridLines Visible="True">
+                          </GridLines>
+                      </axisx>
+                      <axisy Visibility="False" visibleinpanesserializable="-1">
+                      </axisy>
+                      <DefaultPane BackColor="0, 0, 0">
+                      </DefaultPane>
+                  </dx:XYDiagram>
+              </DiagramSerializable>
+              <Legend AlignmentHorizontal="Center" BackColor="Black" 
+                  Font="黑体, 18pt, style=Bold" MarkerSize="30, 26" Name="Default Legend" 
+                  TextColor="255, 255, 255" AlignmentVertical="Center">
+                  <Border Visibility="False" />
+                  <Title Font="黑体, 18pt, style=Bold"></Title></Legend>
+              <SeriesSerializable>
+                  <dx:Series LabelsVisibility="True" Name="出库订单行数">
+                      <Points>
+                          <dx:SeriesPoint ArgumentSerializable="2023/11/8 0:00:00" Values="500">
+                          </dx:SeriesPoint>
+                          <dx:SeriesPoint ArgumentSerializable="2023/10/1 0:00:00" Values="200">
+                          </dx:SeriesPoint>
+                      </Points>
+                      <ViewSerializable>
+                          <dx:LineSeriesView Color="255, 255, 0" MarkerVisibility="True">
+                              <LineStyle Thickness="5" />
+                              <LineMarkerOptions Size="18" Color="255, 255, 0" Kind="Diamond">
+                              </LineMarkerOptions>
+                          </dx:LineSeriesView>
+                      </ViewSerializable>
+                      <LabelSerializable>
+                          <dx:PointSeriesLabel Font="黑体, 14pt, style=Bold" BackColor="Black" 
+                              TextColor="White" TextPattern="{V}">
+                              <Border Visibility="False" Color="White" Thickness="4" />
+                          </dx:PointSeriesLabel>
+                      </LabelSerializable>
+                  </dx:Series>
+                  <dx:Series LabelsVisibility="True" Name="入库订单行数">
+                      <Points>
+                          <dx:SeriesPoint ArgumentSerializable="2023-10-1" Values="100">
+                          </dx:SeriesPoint>
+                          <dx:SeriesPoint ArgumentSerializable="2023/11/8 0:00:00" Values="200">
+                          </dx:SeriesPoint>
+                      </Points>
+                      <viewserializable>
+                          <dx:LineSeriesView Color="240, 0, 0" MarkerVisibility="True">
+                              <LineStyle Thickness="5" />
+                              <LineMarkerOptions Color="240, 0, 0" Size="12">
+                              </LineMarkerOptions>
+                          </dx:LineSeriesView>
+                      </viewserializable>
+                      <LabelSerializable>
+                          <dx:PointSeriesLabel Font="Tahoma, 14pt, style=Bold" LineVisibility="True">
+                              <Border Visibility="False" />
+                          </dx:PointSeriesLabel>
+                      </LabelSerializable>
+                  </dx:Series>
+              </SeriesSerializable>
+          </dx:WebChartControl>
+            
+
+        </td>
+        <td valign="top">  
+ 
+           <dx:WebChartControl ID="WebChartOutOrders" runat="server" 
+              AppearanceNameSerializable="Pastel Kit" BackColor="Black" 
+              CrosshairEnabled="True" Height="320px" PaletteName="Pastel Kit" Width="420px">
+               <BorderOptions Color="63, 63, 63" />
+                   <Legend Name="Default Legend" Visibility="True" 
+                      BackColor="Black" MarkerVisible="False" TextColor="255, 255, 255" 
+                      TextVisible="False" Direction="LeftToRight" 
+                   AlignmentHorizontal="Center">
+                      <Border Color="255, 255, 255" Visibility="False" />
+                      <Title Font="黑体, 18pt, style=Bold" Text="出库单据" TextColor="255, 255, 255" 
+                          Visible="True" Alignment="Near">
+                          <Margins Bottom="0" Left="0" Right="0" Top="0" />
+                      </Title></Legend>
+              <SeriesSerializable>
+                  <dx:Series Name="Series 1" LegendTextPattern="{V}">
+                      <Points>
+                          <dx:SeriesPoint ArgumentSerializable="未到货" SeriesPointID="0" Values="20">
+                          </dx:SeriesPoint>
+                          <dx:SeriesPoint ArgumentSerializable="完成验收" SeriesPointID="1" Values="30">
+                          </dx:SeriesPoint>
+                          <dx:SeriesPoint ArgumentSerializable="完成上架" SeriesPointID="2" Values="30">
+                          </dx:SeriesPoint>
+                          <dx:SeriesPoint ArgumentSerializable="正在验收" SeriesPointID="3" Values="1">
+                          </dx:SeriesPoint>
+                      </Points>
+                      <ViewSerializable>
+                          <dx:DoughnutSeriesView>
+                             
+                          </dx:DoughnutSeriesView>
+                      </ViewSerializable>
+                      <LabelSerializable>
+                          <dx:DoughnutSeriesLabel Font="华文中宋, 22pt" LineVisibility="True" 
+                              Position="Inside" TextPattern="{A}{V}">
+                              <Border Visibility="True" />
+                          </dx:DoughnutSeriesLabel>
+                      </LabelSerializable>
+                  </dx:Series>
+              </SeriesSerializable>
+          </dx:WebChartControl>
+
+            <dx:WebChartControl ID="WebChartInOrders" runat="server" 
+              AppearanceNameSerializable="Pastel Kit" BackColor="Black" 
+              CrosshairEnabled="True" Height="320px" PaletteName="Pastel Kit" Width="420px">
+                <BorderOptions Color="63, 63, 63" />
+              <Legend Name="Default Legend" Visibility="True" 
+                      BackColor="Black" MarkerVisible="False" TextColor="255, 255, 255" 
+                      TextVisible="False" Direction="LeftToRight" AlignmentHorizontal="Center">
+                      <Border Color="255, 255, 255" Visibility="False" />
+                      <Title Font="黑体, 18pt, style=Bold" Text="入库单据" TextColor="255, 255, 255" 
+                          Visible="True" Alignment="Near">
+                          <Margins Bottom="0" Left="0" Right="0" Top="0" />
+                      </Title></Legend>
+
+              <SeriesSerializable>
+                  <dx:Series Name="Series 1" LabelsVisibility="True" LegendTextPattern="{V}">
+                      <Points>
+                          <dx:SeriesPoint ArgumentSerializable="未到货" SeriesPointID="0" Values="20">
+                          </dx:SeriesPoint>
+                          <dx:SeriesPoint ArgumentSerializable="完成验收" SeriesPointID="1" Values="30">
+                          </dx:SeriesPoint>
+                          <dx:SeriesPoint ArgumentSerializable="完成上架" SeriesPointID="2" Values="30">
+                          </dx:SeriesPoint>
+                          <dx:SeriesPoint ArgumentSerializable="正在验收" SeriesPointID="3" Values="1">
+                          </dx:SeriesPoint>
+                      </Points>
+                      <ViewSerializable>
+                          <dx:DoughnutSeriesView>
+                              
+                          </dx:DoughnutSeriesView>
+                      </ViewSerializable>
+                      <LabelSerializable>
+                          <dx:DoughnutSeriesLabel Font="华文宋体, 22pt" LineVisibility="False" 
+                              Position="Inside" TextPattern="{A}{V}" TextAlignment="Near">
+                              <Border Visibility="True" />
+                          </dx:DoughnutSeriesLabel>
+                      </LabelSerializable>
+                  </dx:Series>
+              </SeriesSerializable>
+          </dx:WebChartControl>
+
+        
+             
+              <dx:WebChartControl ID="WebChartStatePie" runat="server" 
+                AppearanceNameSerializable="Pastel Kit" BackColor="Black" 
+                CrosshairEnabled="True" Height="320px" PaletteName="Pastel Kit" 
+                Width="420px">
+                  <BorderOptions Color="63, 63, 63" />
+                  <DiagramSerializable>
+                      <dx:SimpleDiagram LabelsResolveOverlappingMinIndent="-5">
+                      </dx:SimpleDiagram>
+                  </DiagramSerializable>
+                <Legend Name="Default Legend" Visibility="True" 
+                      BackColor="Black" MarkerVisible="False" TextColor="255, 255, 255" 
+                      TextVisible="False" Direction="LeftToRight" AlignmentHorizontal="Center">
+                      <Border Color="255, 255, 255" Visibility="False" />
+                      <Title Font="黑体, 18pt, style=Bold" Text="任务汇总" TextColor="255, 255, 255" 
+                          Visible="True" Alignment="Near">
+                          <Margins Bottom="0" Left="0" Right="0" Top="0" />
+                      </Title></Legend>
+                <SeriesSerializable>
+                    <dx:Series Name="Series 1" LegendTextPattern="{V}">
+                        <Points>
+                            <dx:SeriesPoint ArgumentSerializable="a  " SeriesPointID="0" Values="20">
+                            </dx:SeriesPoint>
+                            <dx:SeriesPoint ArgumentSerializable="b  " SeriesPointID="1" Values="30">
+                            </dx:SeriesPoint>
+                            <dx:SeriesPoint ArgumentSerializable="c  " SeriesPointID="2" Values="30">
+                            </dx:SeriesPoint>
+                            <dx:SeriesPoint ArgumentSerializable="d  " SeriesPointID="3" Values="1">
+                            </dx:SeriesPoint>
+                        </Points>
+                        <ViewSerializable>
+                            <dx:PieSeriesView>
+                                
+                            </dx:PieSeriesView>
+                        </ViewSerializable>
+                        <LabelSerializable>
+                            <dx:PieSeriesLabel Font="华文宋体, 22pt, style=Bold" LineVisibility="True" Position="Inside" 
+                                TextPattern="{A}" ResolveOverlappingMode="Default">
+                                <Border Visibility="True" />
+                            </dx:PieSeriesLabel>
+                        </LabelSerializable>
+                    </dx:Series>
+                </SeriesSerializable>
+            </dx:WebChartControl>
+
+        
+             
+         </td>
+         
+         </tr>
+       </table>
+    </td>
+     </tr>
+
+    </table>
+                                      
+                                    </ContentTemplate>
+                                </asp:UpdatePanel>
+ 
+ 
+ 
+    </div>
+    </form>
+     <script language="JavaScript">
+
+
+         function showDate() {
+             now = new Date();  
+             document.form1.thetime.value = now.toLocaleString();
+            
+             setTimeout("showDate()", 1000);
+         }
+         showDate();
+
+         function updateCharts() {
+             var theForm = document.forms['form1'];
+             if (!theForm) {
+                 theForm = document.form1;
+             }
+             theForm.submit();
+             setTimeout("updateCharts()",60000);
+         }
+         // updateCharts();
+
+          setTimeout(" location.reload()", 60000);
+         // ------->
+
+         var prm = Sys.WebForms.PageRequestManager.getInstance();
+
+         prm.add_initializeRequest(InitializeRequest);
+         prm.add_endRequest(EndRequest);
+
+         function InitializeRequest(sender, args) {
+             $get('Container').style.cursor = 'wait';
+         }
+
+         function EndRequest(sender, args) {
+             $get('Container').style.cursor = 'auto';
+         }
+
+       
+       
+       </script>
+</body>
+</html>

WebApplication1/Charts.aspx.cs

@@ -0,0 +1,245 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Web.Security;
+ 
+using System.Web.UI.WebControls.WebParts;
+using System.Web.UI.HtmlControls;
+
+using DeiNiu.Utils;
+using DeiNiu.wms.Logical;
+using DevExpress.XtraCharts;
+using System.Data;
+ 
+
+public partial class wms_Charts : System.Web.UI.Page
+{
+    DataSet dsDaily;
+    DataSet dsErpOrders;
+    lCharts lchart = new lCharts();
+    protected void Page_Load(object sender, EventArgs e)
+    {
+        loadDailyData();
+
+        loadErpData();
+    }
+
+    private void loadErpData()
+    {
+        dsErpOrders = lchart.getErpOderData();
+
+        //set erp in orders pie
+
+        DataTable dt = dsErpOrders.Tables[0];
+
+        Series taskSeries = WebChartInOrders.SeriesSerializable[0];
+
+        //Series taskSeries2 = this.WebChartErpOrders.SeriesSerializable[0];
+        //taskSeries2.Points.Clear();
+       
+
+        taskSeries.Points.Clear();
+
+        foreach (DataRow dr in dt.Rows)
+        {
+           // taskSeries2.Points.Add(new SeriesPoint(dr["state"].ToString(), Convert.ToInt32(dr["orderCnt"].ToString())));
+            taskSeries.Points.Add(new SeriesPoint(dr["state"].ToString(), Convert.ToInt32(dr["orderCnt"].ToString())));
+
+        }
+        //set erp out orders pie
+        dt = dsErpOrders.Tables[1];
+
+        taskSeries = WebChartOutOrders.SeriesSerializable[0];
+       // taskSeries2 = this.WebChartErpOrders.SeriesSerializable[1];
+        taskSeries.Points.Clear();
+        //taskSeries2.Points.Clear();
+        foreach (DataRow dr in dt.Rows)
+        { 
+            taskSeries.Points.Add(new SeriesPoint(dr["state"].ToString(), Convert.ToInt32(dr["orderCnt"].ToString())));
+          //  taskSeries2.Points.Add(new SeriesPoint(dr["state"].ToString(), Convert.ToInt32(dr["orderCnt"].ToString())));
+        }
+
+
+        
+
+        // in out line counts 
+
+        string day = "";
+        dt = dsErpOrders.Tables[2];
+
+        taskSeries = WebChartInOutLines.SeriesSerializable[0];
+
+        taskSeries.Points.Clear();
+
+        foreach (DataRow dr in dt.Rows)
+        {
+            day = string.Format("{0}-{1}-{2}", dr["year"].ToString(), dr["month"].ToString(), dr["day"].ToString());
+            taskSeries.Points.Add(new SeriesPoint(day, Convert.ToInt32(dr["cnt"].ToString())));
+
+        }
+       
+
+
+        dt = dsErpOrders.Tables[3];
+
+        taskSeries = WebChartInOutLines.SeriesSerializable[1];
+
+        taskSeries.Points.Clear();
+
+        foreach (DataRow dr in dt.Rows)
+        {
+            day = string.Format("{0}-{1}-{2}", dr["year"].ToString(), dr["month"].ToString(), dr["day"].ToString());
+            taskSeries.Points.Add(new SeriesPoint(day, Convert.ToInt32(dr["cnt"].ToString())));
+
+        }
+       
+        
+
+    }
+
+    void loadDailyData()
+    {
+        dsDaily = lchart.getDailyKanBanData();
+        setTasks();
+        setLocs();
+        setUserTasks();
+        setTasksSumByStatePie();
+        setPartTasks();
+    }
+
+    private void setTasksSumByStatePie()
+    {
+     
+
+        DataTable dt = dsDaily.Tables[3];
+
+        Series taskSeries = WebChartStatePie.SeriesSerializable[0];
+
+        taskSeries.Points.Clear();
+
+        foreach (DataRow dr in dt.Rows)
+        {
+            taskSeries.Points.Add(new SeriesPoint(dr["state"].ToString(), Convert.ToInt32(dr["taskCnt"].ToString())));
+
+        }
+         
+    }
+  
+
+    void setLocs()
+    {
+        
+
+        DataTable dt = dsDaily.Tables[2];
+
+        Series taskSeries = WebChartLocs.SeriesSerializable[0];
+
+        taskSeries.Points.Clear();
+
+        foreach (DataRow dr in dt.Rows)
+        {
+           // taskSeries.Points.Add(new SeriesPoint(dr["volType"].ToString(), Convert.ToInt32(dr["totalCnt"].ToString())));
+            taskSeries.Points.Add(new SeriesPoint(dr["volType"].ToString(), dr["usedPercent"].ToString()) );
+             
+        }
+        /*
+        Series finishedSeries = this.WebChartLocs.SeriesSerializable[1];
+
+        finishedSeries.Points.Clear();
+        foreach (DataRow dr in dt.Rows)
+        {
+            finishedSeries.Points.Add(new SeriesPoint(dr["volType"].ToString(), Convert.ToInt32(dr["usedCnt"].ToString())));
+
+        }
+        */
+
+
+    }
+    void setUserTasks()
+    {
+  
+        DataTable dt = dsDaily.Tables[1];
+
+        Series taskSeries = WebChartEmpTasks.SeriesSerializable[0];
+
+        taskSeries.Points.Clear();
+
+        foreach (DataRow dr in dt.Rows)
+        {
+            taskSeries.Points.Add(new SeriesPoint(dr["emName"].ToString(), Convert.ToInt32(dr["taskCnt"].ToString())));
+
+        }
+
+
+    }
+    void setTasks()
+    {
+        DataTable dt = dsDaily.Tables[0];
+
+        Series taskSeries = this.WebChartTasks.SeriesSerializable[0];
+
+        taskSeries.Points.Clear();
+
+        foreach (DataRow dr in dt.Rows)
+        {
+            taskSeries.Points.Add(new SeriesPoint(dr["typeName"].ToString(), Convert.ToInt32(dr["taskCnt"].ToString())));
+
+        }
+         
+        Series finishedSeries = WebChartTasks.SeriesSerializable[1];
+
+        finishedSeries.Points.Clear();
+        foreach (DataRow dr in dt.Rows)
+        {
+            finishedSeries.Points.Add(new SeriesPoint(dr["typeName"].ToString(), Convert.ToInt32(dr["finishedCnt"].ToString())));
+
+        }
+
+
+        
+    }
+    void setPartTasks()
+    {
+        DataTable dt = dsDaily.Tables[4];
+
+        Series taskSeries = this.WebChartPartTasks .SeriesSerializable[0];
+
+        taskSeries.Points.Clear();
+
+        foreach (DataRow dr in dt.Rows)
+        {
+            taskSeries.Points.Add(new SeriesPoint(dr["partName"].ToString(), Convert.ToInt32(dr["taskCnt"].ToString())));
+
+        }
+
+        Series finishedSeries = WebChartPartTasks.SeriesSerializable[1];
+
+        finishedSeries.Points.Clear();
+        foreach (DataRow dr in dt.Rows)
+        {
+            finishedSeries.Points.Add(new SeriesPoint(dr["partName"].ToString(), Convert.ToInt32(dr["finishedCnt"].ToString())));
+
+        }
+
+
+
+    }
+    protected void btnSubmit_Click(object sender, EventArgs e)
+    {
+       // loadData();// Page_Load(sender, e);
+    }
+    protected void WebChartEmpTasks_ObjectSelected(object sender, HotTrackEventArgs e)
+    {
+
+    }
+    protected void Button1_Click(object sender, EventArgs e)
+    {
+
+        loadDailyData();
+
+        loadErpData();
+    }
+}

WebApplication1/Default.aspx.cs

@@ -0,0 +1,32 @@
+using System;
+using System.Data;
+using System.Configuration;
+using System.Collections;
+using System.Web;
+using System.Web.Security;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Web.UI.WebControls.WebParts;
+using System.Web.UI.HtmlControls;
+
+public partial class _Default : System.Web.UI.Page
+{
+    protected void Page_Load(object sender, EventArgs e)
+    {
+        Response.Redirect("index.aspx",true);
+    }
+    protected void Button1_Click(object sender, EventArgs e)
+    {
+        if ((Session["CurrentUser"] != null))
+        {
+
+            if (System.Configuration.ConfigurationManager.AppSettings["sessionstate"] != "InProc")
+                if (Session["CurrentUserId"] != null)
+                {
+                    //   ((ArrayList)Application["userlst"]).Remove(Session["CurrentUserAccount"].ToString());abc
+                    DeiNiu.RequestLog logobj = new DeiNiu.RequestLog();
+                    logobj.LogoutLog(int.Parse(Session["CurrentUserId"].ToString()));
+                }
+        }
+    }
+}

WebApplication1/Desktop.aspx.cs

@@ -0,0 +1,298 @@
+using System;
+using System.Data;
+using System.Configuration;
+using System.Collections;
+using System.Web;
+using System.Web.Security;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Web.UI.WebControls.WebParts;
+using System.Web.UI.HtmlControls;
+using ajax;
+using DeiNiu.Utils;
+using DeiNiu.wms.Logical;
+
+public partial class Desktop : PageBase
+{
+  　
+    protected   void Page_Load(object sender, EventArgs e)
+    {
+       　
+        bindWorkplan();
+        //bindProjectInfo();
+        //bindTrainingInfo(); 
+        showOnlineUsers();
+    }
+
+    void bindWorkplan()
+    {
+        LWorkplan wp = new LWorkplan();
+        lbToday.Text = DateTime.Today.ToShortDateString();
+        lbTomorrow.Text = DateTime.Today.AddDays(1).ToShortDateString();
+        lbafterTomorrow.Text = DateTime.Today.AddDays(2).ToShortDateString();
+        gvWorkplan1.DataSource = wp.GetLWorkplan.getWorkplanDetails(lem.GetEmployee.ID, lbToday.Text);
+        gvWorkplan2.DataSource = wp.GetLWorkplan.getWorkplanDetails(lem.GetEmployee.ID, lbTomorrow.Text);
+        gvWorkplan3.DataSource = wp.GetLWorkplan.getWorkplanDetails(lem.GetEmployee.ID, lbafterTomorrow.Text);
+        gvWorkplan3.DataBind();
+        gvWorkplan2.DataBind();
+        gvWorkplan1.DataBind();
+    }
+    /*
+    void bindProjectInfo()
+    {
+        LProject lpj = new LProject();
+     
+        //上个月
+
+
+        DataTable lmDt = lpj.GetProject.GetProjects(lem.GetEmployee.ID,DateTime.Now.AddMonths(-1).Year.ToString(),
+                                                 DateTime.Now.AddMonths(-1).Month.ToString()) ;
+        DataView dv = lmDt.DefaultView;
+       //上个月通过数量 
+        dv.RowFilter = "   pj_status in('" +
+                       ProjectStatus.新增审核通过 + "','" + ProjectStatus.项目完成 + "','" + ProjectStatus.删减审核通过 + "')" +
+                       " or pd_status in('" + ProjectDetailStatus.审核通过 + "','" + ProjectDetailStatus.考核通过 + "') ";  
+        lbLMPassed.Text = dv.Count.ToString();
+
+        //上个月未通过数量
+        dv.RowFilter = " pj_status like '%未通过%'  or pd_status  like '%未通过%'";
+        lblmFailed.Text = dv.Count.ToString();
+        //上个月待提交数量
+        dv.RowFilter = "   pj_status in('" +
+                ProjectStatus.项目已分配 + "','" + ProjectStatus.新增未提交  + "')" +
+                " and pd_status in('" + ProjectDetailStatus.月度未提交 +   "') ";
+        lblm4submit.Text = dv.Count.ToString();
+
+
+       
+        //上个月得分
+        dv.RowFilter = string.Empty;
+        Double lmscore = 0;
+        for(int i =0;i<lmDt.Rows.Count;i++)
+        {
+            lmscore += Convert.ToDouble(lmDt.Rows[i]["pj_score"]);
+        }
+
+        lblmScore.Text = lmscore.ToString();
+
+
+        //上月待审核
+        lb4preapprove.Text = "0";
+        if (lem.CanShenHe || lem.CanYuShen)  
+        {
+            lmDt = lpj.Get4ApproveList(lem.GetCanApproveDeptList(), DateTime.Now.AddMonths(-1).Year.ToString(),
+                                                    DateTime.Now.AddMonths(-1).Month.ToString());
+            dv = lmDt.DefaultView;
+            lb4preapprove.Text = dv.Count.ToString();
+        }
+        if (lem.CanKaoHe)   
+        {
+            dv = lpj.GetProjectsByYearMonth(DateTime.Now.AddMonths(-1).Year.ToString(),DateTime.Now.AddMonths(-1).Month.ToString()).DefaultView;  
+            dv.RowFilter = "pj_status in('" + ProjectStatus.新增审核通过 + "','" + ProjectStatus.项目完成 + "','" + ProjectStatus.删减审核通过 + "') and pd_status <>'"
+                        + ProjectDetailStatus.考核通过 +
+                    "' or pd_status in('" + ProjectDetailStatus.审核通过 + "')";
+             
+            lb4preapprove.Text = (Convert.ToInt32( lb4preapprove.Text)+ dv.Count).ToString();
+        }
+
+
+
+
+        //本月
+
+
+        lmDt = lpj.GetProject.GetProjects(lem.GetEmployee.ID, DateTime.Now.Year.ToString(),
+                                                 DateTime.Now.Month.ToString());
+        dv = lmDt.DefaultView;
+        //本月通过数量 
+        dv.RowFilter = "   pj_status in('" +
+                       ProjectStatus.新增审核通过 + "','" + ProjectStatus.项目完成 + "','" + ProjectStatus.删减审核通过 + "')" +
+                       " or pd_status in('" + ProjectDetailStatus.审核通过 + "','" + ProjectDetailStatus.考核通过 + "') ";
+        lbpassed.Text = dv.Count.ToString();
+
+        //本月未通过数量
+        dv.RowFilter = " pj_status like '%未通过%'  or pd_status  like '%未通过%'";
+        lbfailed.Text = dv.Count.ToString();
+
+
+        //本月得分
+        dv.RowFilter = string.Empty;
+        lmscore = 0;
+        for (int i = 0; i < lmDt.Rows.Count; i++)
+        {
+            lmscore += Convert.ToDouble(lmDt.Rows[i]["pj_score"]);
+        }
+
+        lbscore.Text = lmscore.ToString();
+
+        //本月待提交数量
+        dv.RowFilter = "   pj_status in('" +
+                ProjectStatus.项目已分配 + "','" + ProjectStatus.新增未提交 + "')" +
+                " and pd_status in('" + ProjectDetailStatus.月度未提交 + "') ";
+        lb4submit.Text = dv.Count.ToString();
+
+
+        //本月待审核
+        lb4approve.Text = "0";
+        if (lem.CanShenHe || lem.CanYuShen)
+        {
+            lmDt = lpj.Get4ApproveList(lem.GetCanApproveDeptList(), DateTime.Now .Year.ToString(),
+                                                    DateTime.Now .Month.ToString());
+            dv = lmDt.DefaultView;
+            lb4approve.Text = dv.Count.ToString();
+        }
+        if (lem.CanKaoHe)
+        {
+            dv = lpj.GetProjectsByYearMonth(DateTime.Now .Year.ToString(), DateTime.Now .Month.ToString()).DefaultView;
+            dv.RowFilter = "pj_status in('" + ProjectStatus.新增审核通过 + "','" + ProjectStatus.项目完成 + "','" + ProjectStatus.删减审核通过 + "') and pd_status <>'"
+                        + ProjectDetailStatus.考核通过 +
+                    "' or pd_status in('" + ProjectDetailStatus.审核通过 + "')";
+
+            lb4approve.Text = (Convert.ToInt32(lb4preapprove.Text) + dv.Count).ToString();
+        }
+
+
+
+        //全年项目
+
+
+        lmDt = lpj.GetProject.GetProjects(lem.GetEmployee.ID, DateTime.Now.Year.ToString() );
+        dv = lmDt.DefaultView;
+        //全年通过数量 
+        dv.RowFilter = "   pj_status in('" +
+                       ProjectStatus.新增审核通过 + "','" + ProjectStatus.项目完成 + "','" + ProjectStatus.删减审核通过 + "')" +
+                       " or pd_status in('" + ProjectDetailStatus.审核通过 + "','" + ProjectDetailStatus.考核通过 + "') ";
+        lbYearPassed .Text = dv.Count.ToString();
+
+        //全年未通过数量
+        dv.RowFilter = " pj_status like '%未通过%'  or pd_status  like '%未通过%'";
+        lbYearFailed.Text = dv.Count.ToString();
+
+
+        //全年得分
+        dv.RowFilter = string.Empty;
+        lmscore = 0;
+        for (int i = 0; i < lmDt.Rows.Count; i++)
+        {
+            lmscore += Convert.ToDouble(lmDt.Rows[i]["pj_score"]);
+        }
+
+        lbYearscore1.Text = lmscore.ToString();
+
+        //全年待提交数量
+        dv.RowFilter = "   pj_status in('" +
+                ProjectStatus.项目已分配 + "','" + ProjectStatus.新增未提交 + "')" +
+                " and pd_status in('" + ProjectDetailStatus.月度未提交 + "') ";
+        lbyear4submit.Text = dv.Count.ToString();
+
+
+    }
+    */
+   /*
+    void bindTrainingInfo()
+    {
+
+        DataTable dt = lem.GetLessons(lem.GetEmployee.ID);
+        DataView dv  = dt.DefaultView;
+        dv.RowFilter = "train_passed=1";
+        lbtpassed.Text = dv.Count.ToString();
+        dv.RowFilter = "train_passed=0 and le_enddate< '" + DateTime.Now.ToShortDateString() +"'";
+        lbtfailed.Text = dv.Count.ToString();
+
+        //总学分
+        decimal allScore = 0;
+
+        for(int i=0;i<dt.Rows.Count;i++)
+        {
+            try
+            {
+                if (dt.Rows[i]["le_xuefen"].ToString() != null)
+                    allScore += Convert.ToDecimal(dt.Rows[0]["le_xuefen"].ToString());
+            }
+            catch (Exception er)
+            {
+                continue;
+            }
+        }
+
+        lbtxuefen.Text = allScore.ToString();
+
+        //取得学分
+        dv.RowFilter = "train_passed=1";
+        decimal passedScore = 0;
+        for (int i = 0; i < dv.Count; i++)
+        {
+            try
+            {
+                if (dv.Table.Rows[i]["le_xuefen"].ToString() != null)
+                    passedScore += Convert.ToDecimal(dv.Table.Rows[0]["le_xuefen"].ToString());
+            }
+            catch (Exception er)
+            {
+                continue;
+            }
+        }
+        lbtxuefenPassed.Text = passedScore.ToString();
+
+
+        //在修课程
+
+        dv.RowFilter = "train_passed=0 and le_enddate > '" + DateTime.Now.ToShortDateString() +"'";
+        lbt4learn.Text = dv.Count.ToString();
+    }
+    */
+    void showOnlineUsers()
+    {
+        lbOnLineUserCnt.Text = "";
+        ArrayList al = lem.OnLineUsers;
+        foreach (string s in al)
+        {
+            lbOnLineUserCnt.Text = lbOnLineUserCnt.Text + s + " <br>  ";
+        }
+    }
+
+    protected void btn_save_Click(object sender, EventArgs e)
+    {
+
+        if(lem.GetEmployee.ValidUser(lem.GetEmployee.em_account, txtOldPasswd.Text)>0)
+        {
+            lem.GetEmployee.em_passwd = Util.Encrypt(txtNewPasswd.Text);
+            lem.GetEmployee.Update();
+        }
+      
+        
+        this.divPasswdChg.Visible = false;
+    }
+    protected void btn_cancel_Click(object sender, EventArgs e)
+    {
+
+        this.divPasswdChg.Visible = false;
+    }
+    protected void lkChgPswd_Click(object sender, EventArgs e)
+    {
+
+        this.divPasswdChg.Visible = !divPasswdChg.Visible;
+    }
+    /*
+    protected void LinkButton1_Click(object sender, EventArgs e)
+    {
+        Response.Redirect("~/training/Lessonview.aspx");
+    }
+    protected void LinkButton4_Click(object sender, EventArgs e)
+    {
+        Response.Redirect("~/training/Lessonview.aspx");
+    }
+    protected void LinkButton2_Click(object sender, EventArgs e)
+    {
+        Response.Redirect("~/training/Lessonview.aspx");
+    }
+    protected void LinkButton3_Click(object sender, EventArgs e)
+    {
+        Response.Redirect("~/training/Lessonview.aspx");
+    }
+    */
+    protected void lkbtnusers_Click(object sender, EventArgs e)
+    {
+        divOnlineUsers.Visible = !divOnlineUsers.Visible;
+    }
+}

WebApplication1/FileNotFound.aspx.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Data;
+using System.Configuration;
+using System.Collections;
+using System.Web;
+using System.Web.Security;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Web.UI.WebControls.WebParts;
+using System.Web.UI.HtmlControls;
+using System.Text;
+public partial class FileNotFound : Page
+{
+    protected void Page_Load(object sender, EventArgs e)
+    {
+      
+        lbErrtrace.Text =  "没找到您要访问的文件。";
+
+    }
+}

WebApplication1/Properties/AssemblyInfo.cs

@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的常规信息通过下列特性集
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("WebApplication1")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("WebApplication1")]
+[assembly: AssemblyCopyright("Copyright ©  2024")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+// 对 COM 组件不可见。如果需要
+// 从 COM 访问此程序集中的某个类型，请针对该类型将 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开，则下列 GUID 用于 typelib 的 ID
+[assembly: Guid("de57227e-0e98-4549-b6ec-95574169f022")]
+
+// 程序集的版本信息由下列四个值组成:
+//
+//      主版本
+//      次版本
+//      内部版本号
+//      修订版本
+//
+// 可以指定所有值，也可以使用“修订号”和“内部版本号”的默认值，
+// 方法是按如下所示使用 "*":
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

WebApplication1/ShowError.aspx.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Data;
+using System.Configuration;
+using System.Collections;
+using System.Web;
+using System.Web.Security;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Web.UI.WebControls.WebParts;
+using System.Web.UI.HtmlControls;
+using System.Text;
+public partial class ShowError : Page
+{
+    protected void Page_Load(object sender, EventArgs e)
+    {
+  //      StringBuilder strResponse =(StringBuilder) Session["ERROINFO"];
+    //    String strResponse =  Session["ERROINFO"].ToString();
+      //  Response.Write(strResponse);
+   //     lbErrtrace.Text = Session["ERROINFO"] == null ? "您没有登录，或当前会话已过期，请重新登录。" : Session["ERROINFO"].ToString();
+    
+        lbErrtrace.Text =Application["error"]!=null? Application["error"].ToString() : " 请联系管理员。";
+        Application["error"] = null;
+
+    }
+}

WebApplication1/ShowNews.aspx.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Web.UI;
+using DeiNiu.wms.Logical;
+
+
+public partial class ShowNews : Page
+{
+    protected void Page_Load(object sender, EventArgs e)
+    {
+        string newsID = Request.QueryString["newsID"]; 
+        LPublicNews logic = new LPublicNews();
+        try
+        {
+            logic.GetPublicNews.ID = Convert.ToInt32(newsID) ;
+             logic.GetPublicNews.getModel();
+             lbTitle.Text = logic.GetPublicNews.news_title   ; 
+            txtContent.Text =   logic.GetPublicNews.news_content;
+            this.Title = logic.GetPublicNews.news_title;
+        }
+        catch (Exception)
+        {
+            news.Visible = false;
+            Response.Write("ûÕÒµ½ÄúÒªµÄÐÅÏ¢");
+        }
+       
+      
+    }
+}

WebApplication1/ShowNewsCate.aspx.cs

@@ -0,0 +1,114 @@
+using System;
+using System.Data;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using DeiNiu.Utils;
+using DeiNiu.wms.Logical;
+
+public partial class ShowNewsCate : Page
+{
+    private string cateId;
+    private string upId;
+    protected void Page_Load(object sender, EventArgs e)
+    {
+
+        cateId = Request.QueryString["cateId"];
+        upId = Request.QueryString["upId"];
+        if (!IsPostBack)
+             bindData();
+    }
+
+    private void InitializeComponent()
+    {
+
+    }
+
+
+   void bindData()
+   {
+       LPublicNews logic = new LPublicNews();
+       DataView dv = logic.QueryTopCatagory().DefaultView;
+       dv.RowFilter = "ID='" + upId+"'";
+       RepeaterTop.DataSource = dv;
+       RepeaterTop.DataBind();
+
+       RepeaterMarquee.DataSource = logic.QueryMarqueen().DefaultView;
+       RepeaterMarquee.DataBind();
+        
+   }
+
+    protected void RepeaterTop_ItemDataBound(object sender, System.Web.UI.WebControls.RepeaterItemEventArgs e)
+    {
+        if (e.Item.ItemType == ListItemType.Item || e.Item.ItemType == ListItemType.AlternatingItem)
+        {
+            Repeater rpColumnNews = (Repeater)e.Item.FindControl("RepeaterSecond");
+            //找到分类Repeater关联的数据项
+            DataRowView rowv = (DataRowView)e.Item.DataItem;
+            //提取分类ID
+            string authID = Convert.ToString(rowv["ID"]);
+            //里面的Repeater
+             LPublicNews logic = new LPublicNews();
+            DataView dv = logic.QueryPublicInfomation().DefaultView;
+           // dv.RowFilter = "auth_uplevel='" + authID + "' and auth_marqueen=0 ";
+            dv.RowFilter = "ID='" + cateId + "'";
+            rpColumnNews.DataSource = dv;
+            rpColumnNews.DataBind();
+
+            
+        }
+    }
+
+    protected void RepeaterSecond_ItemDataBound(object sender, System.Web.UI.WebControls.RepeaterItemEventArgs e)
+    {
+        if (e.Item.ItemType == ListItemType.Item || e.Item.ItemType == ListItemType.AlternatingItem)
+        {
+            Repeater rpColumnNews = (Repeater)e.Item.FindControl("RepeaterThird");
+            //找到分类Repeater关联的数据项
+            DataRowView rowv = (DataRowView)e.Item.DataItem;
+            //提取分类ID
+            string authID = Convert.ToString(rowv["ID"]);
+            //里面的Repeater
+            LPublicNews logic = new LPublicNews();
+            DataView dv = logic.QueryNews(Convert.ToInt32(authID)).DefaultView;
+            dv =  GetTopDataViewRows(dv,10);
+            rpColumnNews.DataSource = dv;
+            rpColumnNews.DataBind();
+
+
+        }
+    }
+
+    public string FormatShowContent(string titlecontent, int titlelength)
+    {
+        if (titlecontent.Length > titlelength)
+        {
+            return titlecontent.Substring(0, titlelength);
+        }
+        else
+        {
+            for (int i = 0; i < titlelength - titlecontent.Length;i++ )
+                titlecontent += "&nbsp;";
+
+            return titlecontent;
+            
+        }
+        
+    }
+
+   private  DataView GetTopDataViewRows(DataView dv, int n)
+    {
+        DataTable dt = dv.Table.Clone();
+
+        for (int i = 0; i < n - 1; i++)
+        {
+            if (i >= dv.Count)
+            {
+                break;
+            }
+            dt.ImportRow(dv[i].Row);
+        }
+        return new DataView(dt, dv.RowFilter, dv.Sort, dv.RowStateFilter);
+    }
+   
+   
+}

WebApplication1/Web.Debug.config

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- 有关使用 web.config 转换的详细信息，请访问 https://go.microsoft.com/fwlink/?LinkId=125889 -->
+
+<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
+  <!--
+    在下例中，“SetAttributes”转换将更改 
+    “connectionString”的值，以仅在“Match”定位器 
+    找到值为“MyDB”的特性“name”时使用“ReleaseSQLServer”。
+    
+    <connectionStrings>
+      <add name="MyDB" 
+        connectionString="Data Source=ReleaseSQLServer;Initial Catalog=MyReleaseDB;Integrated Security=True" 
+        xdt:Transform="SetAttributes" xdt:Locator="Match(name)"/>
+    </connectionStrings>
+  -->
+  <system.web>
+    <!--
+      
+      在下例中，“Replace”转换将替换 
+      web.config 文件的整个 <customErrors> 节。
+      请注意，由于 
+      在 <system.web> 节点下仅有一个 customErrors 节，因此不需要使用“xdt:Locator”特性。
+      
+      <customErrors defaultRedirect="GenericError.htm"
+        mode="RemoteOnly" xdt:Transform="Replace">
+        <error statusCode="500" redirect="InternalError.htm"/>
+      </customErrors>
+    -->
+  </system.web>
+</configuration>

WebApplication1/Web.Release.config

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- 有关使用 web.config 转换的详细信息，请访问 https://go.microsoft.com/fwlink/?LinkId=125889 -->
+
+<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
+  <!--
+    在下例中，“SetAttributes”转换将更改 
+    “connectionString”的值，以仅在“Match”定位器 
+    找到值为“MyDB”的特性“name”时使用“ReleaseSQLServer”。
+    
+    <connectionStrings>
+      <add name="MyDB" 
+        connectionString="Data Source=ReleaseSQLServer;Initial Catalog=MyReleaseDB;Integrated Security=True" 
+        xdt:Transform="SetAttributes" xdt:Locator="Match(name)"/>
+    </connectionStrings>
+  -->
+  <system.web>
+    <compilation xdt:Transform="RemoveAttributes(debug)" />
+    <!--
+      
+      在下例中，“Replace”转换将替换 
+      web.config 文件的整个 <customErrors> 节。
+      请注意，由于 
+      在 <system.web> 节点下仅有一个 customErrors 节，因此不需要使用“xdt:Locator”特性。
+      
+      <customErrors defaultRedirect="GenericError.htm"
+        mode="RemoteOnly" xdt:Transform="Replace">
+        <error statusCode="500" redirect="InternalError.htm"/>
+      </customErrors>
+    -->
+  </system.web>
+</configuration>

WebApplication1/Web.config

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  有关如何配置 ASP.NET 应用程序的详细信息，请访问
+  https://go.microsoft.com/fwlink/?LinkId=169433
+-->
+
+<configuration>
+    <system.web>
+      <compilation debug="true" targetFramework="4.0" />
+    </system.web>
+
+</configuration>

WebApplication1/WebApplication1.csproj

@@ -0,0 +1,101 @@
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>
+    </ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{DE57227E-0E98-4549-B6EC-95574169F022}</ProjectGuid>
+    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>WebApplication1</RootNamespace>
+    <AssemblyName>WebApplication1</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <UseIISExpress>false</UseIISExpress>
+    <Use64BitIISExpress />
+    <IISExpressSSLPort />
+    <IISExpressAnonymousAuthentication />
+    <IISExpressWindowsAuthentication />
+    <IISExpressUseClassicPipelineMode />
+    <UseGlobalApplicationHostFile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Web.DynamicData" />
+    <Reference Include="System.Web.Entity" />
+    <Reference Include="System.Web.ApplicationServices" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Web.Extensions" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Web" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Web.Services" />
+    <Reference Include="System.EnterpriseServices" />
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Web.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </PropertyGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
+        <WebProjectProperties>
+          <UseIIS>False</UseIIS>
+          <AutoAssignPort>True</AutoAssignPort>
+          <DevelopmentServerPort>0</DevelopmentServerPort>
+          <DevelopmentServerVPath>/</DevelopmentServerVPath>
+          <IISUrl>
+          </IISUrl>
+          <NTLMAuthentication>False</NTLMAuthentication>
+          <UseCustomServer>False</UseCustomServer>
+          <CustomServerUrl>
+          </CustomServerUrl>
+          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
+        </WebProjectProperties>
+      </FlavorProperties>
+    </VisualStudio>
+  </ProjectExtensions>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

WebApplication1/WebApplication1.csproj.user

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <UseIISExpress>true</UseIISExpress>
+    <Use64BitIISExpress />
+    <IISExpressSSLPort>44303</IISExpressSSLPort>
+    <IISExpressAnonymousAuthentication />
+    <IISExpressWindowsAuthentication />
+    <IISExpressUseClassicPipelineMode />
+    <UseGlobalApplicationHostFile />
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+  </PropertyGroup>
+  <ProjectExtensions>
+    <VisualStudio>
+      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
+        <WebProjectProperties>
+          <StartPageUrl>
+          </StartPageUrl>
+          <StartAction>CurrentPage</StartAction>
+          <AspNetDebugging>True</AspNetDebugging>
+          <SilverlightDebugging>False</SilverlightDebugging>
+          <NativeDebugging>False</NativeDebugging>
+          <SQLDebugging>False</SQLDebugging>
+          <ExternalProgram>
+          </ExternalProgram>
+          <StartExternalURL>
+          </StartExternalURL>
+          <StartCmdLineArguments>
+          </StartCmdLineArguments>
+          <StartWorkingDirectory>
+          </StartWorkingDirectory>
+          <EnableENC>True</EnableENC>
+          <AlwaysStartWebServerOnDebug>False</AlwaysStartWebServerOnDebug>
+        </WebProjectProperties>
+      </FlavorProperties>
+    </VisualStudio>
+  </ProjectExtensions>
+</Project>

WebApplication1/index.aspx.cs

@@ -0,0 +1,114 @@
+using System;
+using System.Data;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using DeiNiu.Utils;
+using DeiNiu.wms.Logical;
+
+public partial class index : Page
+{
+
+    protected void Page_Load(object sender, EventArgs e)
+    {
+      //  if(!IsPostBack)
+      //      Session[appScope.PagelevelObj] = this;
+     
+        //  if (!IsPostBack)
+        //     bindData();
+
+        Response.Redirect("login.aspx");
+
+    }
+
+    private void InitializeComponent()
+    {
+
+    }
+
+
+   void bindData()
+   {
+       LPublicNews logic = new LPublicNews();
+       DataView dv = logic.QueryTopCatagory().DefaultView;
+       RepeaterTop.DataSource = dv;
+       RepeaterTop.DataBind();
+
+       RepeaterMarquee.DataSource = logic.QueryMarqueen().DefaultView;
+       RepeaterMarquee.DataBind();
+        
+   }
+
+    protected void RepeaterTop_ItemDataBound(object sender, System.Web.UI.WebControls.RepeaterItemEventArgs e)
+    {
+        if (e.Item.ItemType == ListItemType.Item || e.Item.ItemType == ListItemType.AlternatingItem)
+        {
+            Repeater rpColumnNews = (Repeater)e.Item.FindControl("RepeaterSecond");
+            //找到分类Repeater关联的数据项
+            DataRowView rowv = (DataRowView)e.Item.DataItem;
+            //提取分类ID
+            string authID = Convert.ToString(rowv["ID"]);
+            //里面的Repeater
+             LPublicNews logic = new LPublicNews();
+            DataView dv = logic.QueryPublicInfomation().DefaultView;
+            dv.RowFilter = "auth_uplevel='" + authID + "' and auth_marqueen=0 ";
+            rpColumnNews.DataSource = dv;
+            rpColumnNews.DataBind();
+
+            
+        }
+    }
+
+    protected void RepeaterSecond_ItemDataBound(object sender, System.Web.UI.WebControls.RepeaterItemEventArgs e)
+    {
+        if (e.Item.ItemType == ListItemType.Item || e.Item.ItemType == ListItemType.AlternatingItem)
+        {
+            Repeater rpColumnNews = (Repeater)e.Item.FindControl("RepeaterThird");
+            //找到分类Repeater关联的数据项
+            DataRowView rowv = (DataRowView)e.Item.DataItem;
+            //提取分类ID
+            string authID = Convert.ToString(rowv["ID"]);
+            //里面的Repeater
+            LPublicNews logic = new LPublicNews();
+            DataView dv = logic.QueryNews(Convert.ToInt32(authID)).DefaultView;
+            dv =  GetTopDataViewRows(dv,3);
+            rpColumnNews.DataSource = dv;
+            rpColumnNews.DataBind();
+
+
+        }
+    }
+
+    public string FormatShowContent(string titlecontent, int titlelength)
+    {
+        if (titlecontent.Length > titlelength)
+        {
+            return titlecontent.Substring(0, titlelength);
+        }
+        else
+        {
+            for (int i = 0; i < titlelength - titlecontent.Length;i++ )
+                titlecontent += "&nbsp;";
+
+            return titlecontent;
+            
+        }
+        
+    }
+
+   private  DataView GetTopDataViewRows(DataView dv, int n)
+    {
+        DataTable dt = dv.Table.Clone();
+
+        for (int i = 0; i < n - 1; i++)
+        {
+            if (i >= dv.Count)
+            {
+                break;
+            }
+            dt.ImportRow(dv[i].Row);
+        }
+        return new DataView(dt, dv.RowFilter, dv.Sort, dv.RowStateFilter);
+    }
+   
+   
+}

WebApplication1/index.aspx.resx

@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+</root>

WebApplication1/login.aspx.cs

@@ -0,0 +1,68 @@
+using System;
+using System.Collections;
+using DeiNiu.wms.Logical;
+
+public partial class login : System.Web.UI.Page
+{
+    protected void Page_Load(object sender, EventArgs e)
+    {
+        txtUserName.Focus();
+    }
+    protected void lklogin_Click(object sender, EventArgs e)
+    {
+
+        if (Session["checkcode"] == null) Session["checkcode"] = new Random().Next(2, 4);
+        LEmployee lem = new LEmployee();
+       
+        DeiNiu.RequestLog logobj = new DeiNiu.RequestLog();
+        logobj.LoginLog(txtUserName.Text , " trying to login  ");
+            string CheckCode = this.txtCheck.Text.ToUpper();
+        bool paswdpassed = lem.Login(txtUserName.Text, txtPasswd.Text);
+        bool loginPassed = paswdpassed
+                               && Session["checkcode"].ToString().Equals(CheckCode);
+
+         if (paswdpassed) logobj.LoginLog(txtUserName.Text," passwd passed"); else logobj.LoginLog(txtUserName.Text ," passwd failed");
+            if (!loginPassed)
+            {
+                txtPasswd.Text = string.Empty;
+                lblResult.Text = "<font color=red><b>用户登录信息错误，请重新输入</b></font>";
+                logobj.LoginLog(txtUserName.Text, " login failed  ");
+              
+            }
+            else
+            {
+                lblResult.Text = "<font color=red><b>Passed</b></font>";
+                 
+                if (((ArrayList) Application["userlst"]).Contains(lem.GetEmployee.em_account))
+                {
+                    lblResult.Text = "<font color=red><b>" + lem.GetEmployee.em_account + "用户已在线，不可重复登录。</b></font>";
+                     //  return;
+                }
+                else //系统在线人数
+                {
+                    
+                    Application["usercnt"] = Convert.ToInt32(Application["usercnt"].ToString()) + 1;
+                    
+                    ((ArrayList) Application["userlst"]).Add(lem.GetEmployee.em_account);
+                     
+                }
+                DeiNiu.Utils. LoginInfo.UserId = lem.GetEmployee.ID;
+                
+                lem.GetEmployee.em_isOnline = true;
+                lem.GetEmployee.Update();
+                
+
+
+                Session["CurrentUserId"] = lem.GetEmployee.ID;
+                Session["CurrentUserAccount"] = lem.GetEmployee.em_account; 
+                Session["CurrentUser"] = lem; 
+                logobj.LoginLog(txtUserName.Text, " login succeed"); 
+                Response.Redirect("desktop.aspx");
+            }
+    }
+
+    protected void btnCancelLogin_Click(object sender, EventArgs e)
+    {
+        Response.Redirect("index.aspx");
+    }
+}

WebApplication1/masterPage.master.cs

@@ -0,0 +1,303 @@
+using System;
+using System.Collections;
+using System.Data;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using DeiNiu.wms.Logical;
+
+namespace ajax
+{
+    public partial class DeiNiuMasterPage : System.Web.UI.MasterPage
+    {
+        public LEmployee lem; 
+        protected void Page_Load(object sender, EventArgs e)
+        { 
+            if (!string.IsNullOrEmpty(Request.QueryString["___command"]))
+            {
+                string cmd = Request.QueryString["___command"];
+                if (cmd == "ClearSession")
+                {
+                    if ((Session["CurrentUser"] != null))
+                    { 
+                     
+                       if( System.Configuration.ConfigurationManager.AppSettings["sessionstate"] != "InProc")
+                           if (Session["CurrentUserId"] != null)
+                        {
+                        //   ((ArrayList)Application["userlst"]).Remove(Session["CurrentUserAccount"].ToString());
+                            DeiNiu.RequestLog logobj = new DeiNiu.RequestLog();
+                            logobj.LogoutLog(int.Parse(Session["CurrentUserId"].ToString()));
+                        }
+                    }  
+                    Session.Abandon(); //清空Session, all sessions will be clear ? no kiding, it will obsolete the current session.
+                }
+            }
+
+
+            //页面不允许返回操作。
+            Response.Buffer = true;
+
+            Response.ExpiresAbsolute = DateTime.Now.AddMinutes(-1);
+
+            Response.Expires = 0;
+
+            Response.CacheControl = "no-cache";
+            try
+            {
+             //   if (Session["CurrentUser"] != null)
+                    InitializeUserUi();
+            }catch(Exception){}
+           
+        }
+
+        /// <summary>
+        /// 当前用户有没有登录
+        /// </summary>
+        void ShowLogin()
+        {
+          //  login.Visible = lem == null;
+            lbWelcome.Text =  lem != null  ? "欢迎您：" + lem.GetEmployee.em_name +",": "";
+            lkbtnLogin.Text = lem != null ? "退出" : "登录";
+           // lkIndex.Visible = lem != null;
+            divAuhtority.Visible = lem != null;
+            lkDesktop.Visible = lem != null;
+            leftMenu.Visible = lem!=null;
+            lkkanban.Visible = lem != null;
+             ImageBtnHelp.Visible = leftMenu.Visible;
+        }
+ 
+        /// <summary>
+        /// 根据用户权限，初始化用户界面，菜单等
+        /// </summary>
+        public void InitializeUserUi()
+        { 
+            lem = (LEmployee)Session["CurrentUser"];
+            if (lem != null) setTree(); else treeMenu.Nodes.Clear();  
+            ShowLogin();
+           
+           
+        }
+        public UpdatePanel UpdatePanelMaster
+        {
+            get
+            {
+                return UpdatePanel1;
+            }
+        }
+
+        /// <summary>
+        /// 构建普通权限列表
+        /// </summary>
+        private void setTree()
+        {
+            treeMenu.Nodes.Clear();
+            BindAuthTree2("0", null, new LAuthority().getAllActiveData().Tables[0].DefaultView);
+            if (lem != null)
+            {
+             // if( lem.GetEmployee.em_account !="Root") 
+                
+                {
+                    ArrayList al = new LRoleAuthority().GetPublicAuthorityList();
+                     
+                   removeUnAuthoritedMenu(lem.AuthList ,al ,treeMenu.Nodes);
+                }
+            }
+            /* else
+        {
+            BindAuthTree2("0", null, new LRoleAuthority().GetPublicAuthorityTable().DefaultView);
+        }*/
+        }
+        void removeUnAuthoritedMenu(ArrayList toKeepAuthority,ArrayList toKeepPublic, TreeNodeCollection nd)
+        {
+           // foreach (TreeNode node in nd)
+            for (int i = 0; i < nd.Count;i++ )
+            {
+                TreeNode node = nd[i];
+          //      foreach (TreeNode cnd in node.ChildNodes)
+                for (int j = 0; j < node.ChildNodes.Count; j++)
+                {
+                    TreeNode cnd = node.ChildNodes[j];
+                    if (cnd.ChildNodes.Count > 0)
+                    {
+                        removeUnAuthoritedMenu(toKeepAuthority, toKeepPublic,cnd.ChildNodes);
+                    }
+                    else
+                        if (string.IsNullOrEmpty(cnd.NavigateUrl) || lem.GetEmployee.em_account !="Root" && !(toKeepAuthority.Contains(cnd.NavigateUrl.ToUpper()) || toKeepPublic.Contains(cnd.NavigateUrl.ToUpper())))
+                        {
+                            node.ChildNodes.Remove(cnd);
+                            j--;
+                        }
+
+                }
+                if (node.ChildNodes.Count == 0)
+                {
+                    nd.Remove(node);
+                    i--;
+                }
+            }
+        }
+   
+
+        public void BindAuthTree2(string id, TreeNode pNode, DataView dv)
+        {
+
+            dv.RowFilter = "auth_uplevel = '" + id + "' and auth_publicinfomation=0";
+            foreach (DataRowView row in dv)
+            {
+                TreeNode node = new TreeNode();
+                string authLink = row["auth_link"].ToString();
+                node.Value = row["ID"].ToString();
+                node.Expanded = true;
+                if (authLink == string.Empty || authLink.Trim().Length < 6) //not *.aspx
+                {
+                    node.Text = "<strong>" + row["auth_name"] + "</strong>";
+                    node.SelectAction = TreeNodeSelectAction.None;
+                    node.ShowCheckBox = false;
+                }
+                else
+                {
+                    node.Text = row["auth_name"].ToString();
+                    node.NavigateUrl = authLink;
+                }
+
+
+                if (pNode == null)
+                    //说明是根节点
+                {
+
+                    treeMenu.Nodes.Add(node);
+
+
+                }
+                else
+                {
+
+                    pNode.ChildNodes.Add(node);
+
+                }
+                BindAuthTree2(node.Value, node, new DataView(dv.Table));
+
+            }
+        }
+
+
+        public void BindAuthTree(string id, TreeNode pNode, DataView dv)
+        {
+
+            dv.RowFilter = "auth_uplevel = '" + id + "'";
+            foreach (DataRowView row in dv)
+            {
+                TreeNode node;
+                string authLink = row["auth_link"].ToString();
+           
+           
+                if (authLink == string.Empty || authLink.Trim().Length < 6) //not *.aspx
+                {
+                    //  node = new TreeNode("<strong>" + row["auth_name"] + "</strong>",  row["ID"].ToString()  ,"","","");
+                    node = new TreeNode();
+                    node.Text = "<strong>" + row["auth_name"] + "</strong>";
+                    node.Value = row["ID"].ToString(); 
+                }
+                else
+                {
+                    node = new TreeNode(row["auth_name"].ToString(), row["ID"].ToString(), "", authLink, "");
+                }
+                node.Expanded = true;
+
+                if (pNode == null)
+                    //说明是根节点
+                {
+
+                    treeMenu.Nodes.Add(node);
+
+
+                }
+                else
+                {
+
+                    pNode.ChildNodes.Add(node);
+
+                }
+                BindAuthTree(node.Value, node, new DataView(dv.Table));
+
+            }
+        }
+     
+   
+    
+        void Login()
+        {
+
+            if (Session["CurrentUser"]==null) //not login
+            { 
+                
+                Response.Redirect("~/login.aspx");
+            }
+            else
+            { 
+                ((ArrayList)Application["userlst"]).Remove(lem.GetEmployee.em_account);
+                DeiNiu.RequestLog logobj = new DeiNiu.RequestLog();
+                logobj.LogoutLog(int.Parse(Session["CurrentUserId"].ToString()));
+              
+                Application["usercnt"] = Convert.ToInt32(Application["usercnt"].ToString()) - 1;
+              
+                Session.RemoveAll();
+                Session.Abandon();
+                Response.Redirect("~/login.aspx");
+            }
+         
+  
+        }
+
+        protected void lkbtnLogin_Click(object sender, EventArgs e)
+        {
+            Login();
+
+         
+        }
+
+        public ScriptManager ScriptMgr 
+        {
+            get
+            {
+                return this.ScriptManager1;
+            }
+        }
+
+        protected void lkIndex_Click(object sender, EventArgs e)
+        {
+            Response.Redirect("~/index.aspx");
+        }
+
+
+        protected void lkDesktop_Click(object sender, EventArgs e)
+        {
+            Response.Redirect("~/desktop.aspx");
+        }
+        protected void lklogin_Click(object sender, EventArgs e)
+        {
+            Login();
+        }
+
+        protected void LinkHelp_Click(object sender, EventArgs e)
+        {
+      　 
+        }
+        protected void ImageButton1_Click(object sender, ImageClickEventArgs e)
+        {
+
+            string requestPage = Request.AppRelativeCurrentExecutionFilePath;
+ 
+             string helpDoc =  Request.ApplicationPath+ "/ug/"+ requestPage.Substring(2, requestPage.IndexOf(".aspx")-2)+".html";
+          //  string helpDoc = siteName + requestPage.Substring(2, requestPage.IndexOf(".aspx") - 2) + ".html";
+        //    if (!System.IO.File.Exists(Server.MapPath(helpDoc)))
+            //        helpDoc = siteName+ "/nohelpdoc.html"; //        helpDoc =  Request.ApplicationPath+ "/ug/nohelpdoc.html";
+            
+            string newWindow = "openwin('" + helpDoc + "');";
+            ScriptManager.RegisterStartupScript(UpdatePanel1, typeof(UpdatePanel), "alert", newWindow, true);
+        }
+        protected void lkkanban_Click(object sender, EventArgs e)
+        {
+            Response.Redirect("~/wms/Charts.aspx");
+        }
+}
+}

WebApplication1/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs

@@ -0,0 +1,4 @@
+// <autogenerated />
+using System;
+using System.Reflection;
+[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]

WebApplication1/showImage.aspx.cs

@@ -0,0 +1,98 @@
+using System;
+using System.Data;
+using System.Configuration;
+using System.Collections;
+using System.Drawing;
+using System.Web;
+using System.Web.Security;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Web.UI.WebControls.WebParts;
+using System.Web.UI.HtmlControls;
+
+public partial class utils_showImage : System.Web.UI.Page
+{
+    protected void Page_Load(object sender, EventArgs e)
+    {
+        // 创建一个包含随机内容的验证码文本
+        System.Random rand = new Random();
+        int len = rand.Next(2,4);
+        char[] chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ".ToCharArray();
+        System.Text.StringBuilder myStr = new System.Text.StringBuilder();
+        for (int iCount = 0; iCount < len; iCount++)
+        {
+            myStr.Append(chars[rand.Next(chars.Length)]);
+        }
+        string text = myStr.ToString();
+        // 保存验证码到 session 中以便其他模块使用
+        this.Session["checkcode"] = text;
+        Size ImageSize = Size.Empty;
+        Font myFont = new Font("MS Sans Serif", 18);
+        // 计算验证码图片大小
+        using (Bitmap bmp = new Bitmap(10, 10))
+        {
+            using (Graphics g = Graphics.FromImage(bmp))
+            {
+                SizeF size = g.MeasureString(text, myFont, 10000);
+                ImageSize.Width = (int)size.Width + 8;
+                ImageSize.Height = (int)size.Height + 8;
+            }
+        }
+        // 创建验证码图片
+        using (Bitmap bmp = new Bitmap(ImageSize.Width, ImageSize.Height))
+        {
+            // 绘制验证码文本
+            using (Graphics g = Graphics.FromImage(bmp))
+            {
+                g.Clear(Color.White);
+                using (StringFormat f = new StringFormat())
+                {
+                    f.Alignment = StringAlignment.Near;
+                    f.LineAlignment = StringAlignment.Center;
+                    f.FormatFlags = StringFormatFlags.NoWrap;
+                    g.DrawString(
+                        text,
+                        myFont,
+                        Brushes.Black,
+                        new RectangleF(
+                        0,
+                        0,
+                        ImageSize.Width,
+                        ImageSize.Height),
+                        f);
+                }//using
+            }//using
+            // 制造噪声 杂点面积占图片面积的 30%
+            int num = ImageSize.Width * ImageSize.Height * 30 / 100;
+            for (int iCount = 0; iCount < num; iCount++)
+            {
+                // 在随机的位置使用随机的颜色设置图片的像素
+                int x = rand.Next(ImageSize.Width);
+                int y = rand.Next(ImageSize.Height);
+                int r = rand.Next(255);
+                int g = rand.Next(255);
+                int b = rand.Next(255);
+                Color c = Color.FromArgb(r, g, b);
+                bmp.SetPixel(x, y, c);
+            }//for
+            // 输出图片
+            System.IO.MemoryStream ms = new System.IO.MemoryStream();
+            bmp.Save(ms, System.Drawing.Imaging.ImageFormat.Png);
+            this.Response.ContentType = "image/png";
+            ms.WriteTo(this.Response.OutputStream);
+            ms.Close();
+        }//using
+        myFont.Dispose();
+    }
+
+    /// <summary>
+    /// 检查指定的文本是否匹配验证码
+    /// </summary>
+    /// <param name="text">要判断的文本</param>
+    /// <returns>是否匹配</returns>
+    public static bool CheckCode(string text)
+    {
+        string txt = System.Web.HttpContext.Current.Session["checkcode"] as string;
+        return text == txt;
+    }
+}

WebApplication1/test.aspx.cs

@@ -0,0 +1,32 @@
+using System;
+using System.Data;
+using System.Configuration;
+using System.Collections;
+using System.Web;
+using System.Web.Security;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Web.UI.WebControls.WebParts;
+using System.Web.UI.HtmlControls;
+
+public partial class test : System.Web.UI.Page
+{
+    protected void Page_Load(object sender, EventArgs e)
+    {
+        Button1.Text="test close ie";
+    }
+    protected void Button1_Click(object sender, EventArgs e)
+    {
+        if ((Session["CurrentUser"] != null))
+        {
+
+            if (System.Configuration.ConfigurationManager.AppSettings["sessionstate"] != "InProc")
+                if (Session["CurrentUserId"] != null)
+                {
+                    //   ((ArrayList)Application["userlst"]).Remove(Session["CurrentUserAccount"].ToString());
+                    DeiNiu.RequestLog logobj = new DeiNiu.RequestLog();
+                    logobj.LogoutLog(int.Parse(Session["CurrentUserId"].ToString()));
+                }
+        }
+    }
+}

commonref/Microsoft.Data.ConnectionUI.xml

@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<doc>
+  <assembly>
+    <name>Microsoft.Data.ConnectionUI</name>
+  </assembly>
+  <members>
+    <member name="T:Microsoft.Data.ConnectionUI.IDataConnectionProperties">
+      <summary>Provides a set of methods and properties that enable the Data Connection dialog box to interact with a specified data provider's connection properties.</summary>
+    </member>
+    <member name="M:Microsoft.Data.ConnectionUI.IDataConnectionProperties.Add(System.String)">
+      <summary>Adds a custom property to the existing set of data connection properties recognized by the data provider.</summary>
+      <param name="propertyName">Name of the custom property added to the existing set of connection properties.</param>
+      <exception cref="T:System.ArgumentNullException">The <paramref name="propertyName" /> parameter is null.</exception>
+      <exception cref="T:System.InvalidOperationException">The specified connection properties are not extensible.</exception>
+    </member>
+    <member name="M:Microsoft.Data.ConnectionUI.IDataConnectionProperties.Contains(System.String)">
+      <summary>Tests whether a given set of connection properties contains a specified property.</summary>
+      <returns>true if the set of connection properties contains the specified property; otherwise, false.</returns>
+      <param name="propertyName">Name of the property whose presence is being tested.</param>
+      <exception cref="T:System.ArgumentNullException">The <paramref name="propertyName" /> parameter is null.</exception>
+    </member>
+    <member name="P:Microsoft.Data.ConnectionUI.IDataConnectionProperties.IsComplete">
+      <summary>Retrieves a Boolean value indicating whether the current set of connection property values provides sufficient information to open a connection to the data source.</summary>
+      <returns>true if the connection properties are complete; otherwise, false.</returns>
+    </member>
+    <member name="P:Microsoft.Data.ConnectionUI.IDataConnectionProperties.IsExtensible">
+      <summary>Retrieves a Boolean value indicating whether the specified set of connection properties is extensible; that is, whether it is possible to add and remove custom properties to the set of connection properties.</summary>
+      <returns>true if the connection properties are extensible; otherwise, false.</returns>
+    </member>
+    <member name="P:Microsoft.Data.ConnectionUI.IDataConnectionProperties.Item(System.String)">
+      <summary>Represents a property instance of specified type and value.</summary>
+      <returns>A property object instance of the specified name.</returns>
+      <param name="propertyName">Name of the property.</param>
+      <exception cref="T:System.ArgumentNullException">The <paramref name="propertyName" /> parameter is null.</exception>
+      <exception cref="T:System.InvalidCastException">When setting a property value, the specified value cannot be converted to the property type.</exception>
+    </member>
+    <member name="M:Microsoft.Data.ConnectionUI.IDataConnectionProperties.Parse(System.String)">
+      <summary>Parses a data connection string that is built from a set of properties into the corresponding set of connection properties.</summary>
+      <param name="s">The connection string that is being parsed.</param>
+      <exception cref="T:System.ArgumentNullException">The <paramref name="s" /> parameter is null.</exception>
+      <exception cref="T:System.FormatException">The format specified for <paramref name="s" /> in not valid.</exception>
+    </member>
+    <member name="E:Microsoft.Data.ConnectionUI.IDataConnectionProperties.PropertyChanged">
+      <summary>Event that is raised when a data provider connection property is changed.</summary>
+    </member>
+    <member name="M:Microsoft.Data.ConnectionUI.IDataConnectionProperties.Remove(System.String)">
+      <summary>Removes a custom property from a specified set of data connection properties.</summary>
+      <param name="propertyName">Name of the custom property to be removed.</param>
+      <exception cref="T:System.ArgumentNullException">The <paramref name="propertyName" /> parameter is null.</exception>
+    </member>
+    <member name="M:Microsoft.Data.ConnectionUI.IDataConnectionProperties.Reset">
+      <summary>Resets all connection properties and restores the object to its initial state.</summary>
+    </member>
+    <member name="M:Microsoft.Data.ConnectionUI.IDataConnectionProperties.Reset(System.String)">
+      <summary>Resets a specified connection property to its initial value.</summary>
+      <param name="propertyName">Name of the connection property being set to its default value.</param>
+      <exception cref="T:System.ArgumentNullException">The <paramref name="propertyName" /> parameter is null.</exception>
+    </member>
+    <member name="M:Microsoft.Data.ConnectionUI.IDataConnectionProperties.Test">
+      <summary>Tests whether the current set of connection properties can successfully open a connection.</summary>
+    </member>
+    <member name="M:Microsoft.Data.ConnectionUI.IDataConnectionProperties.ToDisplayString">
+      <summary>Retrieves a connection string for on-screen display reflecting the current set of connection properties, minus "sensitive" information that should not be displayed.</summary>
+      <returns>The set of connection properties that are suitable for display on-screen.</returns>
+    </member>
+    <member name="M:Microsoft.Data.ConnectionUI.IDataConnectionProperties.ToFullString">
+      <summary>Retrieves the complete connection string representing the current set of connection properties.</summary>
+      <returns>The entire connection string, including secure or sensitive information.</returns>
+    </member>
+    <member name="T:Microsoft.Data.ConnectionUI.IDataConnectionUIControl">
+      <summary>Provides a set of methods and properties through which the Data Connection dialog box interacts with a third-party data connection user interface (UI) control, which is shown as the body of the Data Connection dialog box.</summary>
+    </member>
+    <member name="M:Microsoft.Data.ConnectionUI.IDataConnectionUIControl.Initialize(Microsoft.Data.ConnectionUI.IDataConnectionProperties)">
+      <summary>Initializes the data connection user interface (UI) control with an instance of the <see cref="T:Microsoft.Data.ConnectionUI.IDataConnectionProperties" /> interface, which serves as the store for the data shown on the data connection UI control.</summary>
+      <param name="connectionProperties">The set of connection properties serving as stores for data shown on the data connection UI control.</param>
+      <exception cref="T:System.ArgumentNullException">The <paramref name="connectionProperties" /> parameter is null.</exception>
+      <exception cref="T:System.ArgumentException">The <paramref name="connectionProperties" /> parameter is not a valid implementation of DataConnectionProperties understood by this connection UI control.</exception>
+    </member>
+    <member name="M:Microsoft.Data.ConnectionUI.IDataConnectionUIControl.LoadProperties">
+      <summary>Loads connection property values into the data connection UI controls from an instance of the <see cref="T:Microsoft.Data.ConnectionUI.IDataConnectionProperties" /> interface.</summary>
+    </member>
+  </members>
+</doc>

conn/.vs/conn.csproj.dtbcache.json

@@ -0,0 +1 @@
+{"RootPath":"D:\\vssrc\\vssrc\\conn","ProjectFileName":"conn.csproj","Configuration":"Release|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"Properties\\Settings.Designer.cs"},{"SourceFile":"obj\\Release\\.NETFramework,Version=v4.0.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\vssrc\\vssrc\\packages\\log4net.2.0.16\\lib\\net40\\log4net.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vssrc\\vssrc\\Utils\\bin\\Release\\Utils.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"D:\\vssrc\\vssrc\\Utils\\bin\\Release\\Utils.dll"}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\vssrc\\vssrc\\conn\\bin\\Release\\conn.dll","OutputItemRelativePath":"conn.dll"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]}

deiniuWMS.sln

@@ -88,6 +88,28 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WcfServiceErp", "WcfService
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebRest", "WebRest\WebRest.csproj", "{3F42360F-7468-48A1-9535-2DB50E0BFA4B}"
 EndProject
+Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "view", "view\", "{8288A0EA-E086-4EB8-AD75-D4038F5E5243}"
+	ProjectSection(WebsiteProperties) = preProject
+		TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.0"
+		ProjectReferences = "{3d2895be-0dc7-464e-a7bc-be7980a9e70e}|conn.dll;{151F88A4-82D0-4E30-A9B5-AB0B0ADA1FBD}|Utils.dll;{d756ee47-e7e0-4dbc-8bad-6ac744f00d4f}|BaseObject.dll;{2A0D6C89-2BCE-4EBE-A4E0-7056A10A45CE}|myLog.dll;{d02e3cad-bff0-40d3-964c-18551410683e}|Model.dll;{9cad4cf0-bd54-46d4-b640-13fde3d58dd9}|Logical.dll;{CA44F42F-4376-4BC6-9EA4-821DB704C75D}|WcfServiceAuthentication.dll;"
+		Debug.AspNetCompiler.VirtualPath = "/localhost_52455"
+		Debug.AspNetCompiler.PhysicalPath = "view\"
+		Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_52455\"
+		Debug.AspNetCompiler.Updateable = "true"
+		Debug.AspNetCompiler.ForceOverwrite = "true"
+		Debug.AspNetCompiler.FixedNames = "false"
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.VirtualPath = "/localhost_52455"
+		Release.AspNetCompiler.PhysicalPath = "view\"
+		Release.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_52455\"
+		Release.AspNetCompiler.Updateable = "true"
+		Release.AspNetCompiler.ForceOverwrite = "true"
+		Release.AspNetCompiler.FixedNames = "false"
+		Release.AspNetCompiler.Debug = "False"
+		VWDPort = "52455"
+		SlnRelativePath = "view\"
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|.NET = Debug|.NET
@@ -402,6 +424,22 @@ Global
 		{3F42360F-7468-48A1-9535-2DB50E0BFA4B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3F42360F-7468-48A1-9535-2DB50E0BFA4B}.Release|x86.ActiveCfg = Release|Any CPU
 		{3F42360F-7468-48A1-9535-2DB50E0BFA4B}.Release|x86.Build.0 = Release|Any CPU
+		{8288A0EA-E086-4EB8-AD75-D4038F5E5243}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{8288A0EA-E086-4EB8-AD75-D4038F5E5243}.Debug|.NET.Build.0 = Debug|Any CPU
+		{8288A0EA-E086-4EB8-AD75-D4038F5E5243}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8288A0EA-E086-4EB8-AD75-D4038F5E5243}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8288A0EA-E086-4EB8-AD75-D4038F5E5243}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8288A0EA-E086-4EB8-AD75-D4038F5E5243}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8288A0EA-E086-4EB8-AD75-D4038F5E5243}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8288A0EA-E086-4EB8-AD75-D4038F5E5243}.Debug|x86.Build.0 = Debug|Any CPU
+		{8288A0EA-E086-4EB8-AD75-D4038F5E5243}.Release|.NET.ActiveCfg = Debug|Any CPU
+		{8288A0EA-E086-4EB8-AD75-D4038F5E5243}.Release|.NET.Build.0 = Debug|Any CPU
+		{8288A0EA-E086-4EB8-AD75-D4038F5E5243}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{8288A0EA-E086-4EB8-AD75-D4038F5E5243}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{8288A0EA-E086-4EB8-AD75-D4038F5E5243}.Release|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8288A0EA-E086-4EB8-AD75-D4038F5E5243}.Release|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8288A0EA-E086-4EB8-AD75-D4038F5E5243}.Release|x86.ActiveCfg = Debug|Any CPU
+		{8288A0EA-E086-4EB8-AD75-D4038F5E5243}.Release|x86.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -434,9 +472,10 @@ Global
 		{7D96FE49-C422-44B4-A182-547066320802} = {5415AFB3-A170-4765-AD4F-2B1FD3F47D5F}
 		{A1A890CA-74D8-4D5A-9E76-90185A21343D} = {1A958873-21C7-49B8-89B4-4B59CF99334C}
 		{3F42360F-7468-48A1-9535-2DB50E0BFA4B} = {9346F04D-0F8D-4FEE-817C-E14098A34E2A}
+		{8288A0EA-E086-4EB8-AD75-D4038F5E5243} = {9346F04D-0F8D-4FEE-817C-E14098A34E2A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {6D1DB09A-84E0-4189-BA3A-FA368DA5363A}
 		VisualSVNWorkingCopyRoot = .
+		SolutionGuid = {6D1DB09A-84E0-4189-BA3A-FA368DA5363A}
 	EndGlobalSection
 EndGlobal

dnwcs/.vs/dnwcs.csproj.dtbcache.json

@@ -0,0 +1 @@
+{"RootPath":"D:\\vssrc\\vssrc\\dnwcs","ProjectFileName":"dnwcs.csproj","Configuration":"Release|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"dnwcs.cs"},{"SourceFile":"model.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"uartinfo.cs"},{"SourceFile":"obj\\Release\\.NETFramework,Version=v4.0.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\vssrc\\vssrc\\packages\\log4net.2.0.16\\lib\\net40\\log4net.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\vssrc\\vssrc\\dnwcs\\bin\\Release\\dnwcs.dll","OutputItemRelativePath":"dnwcs.dll"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]}

epick/GoodsOutForm.Designer.cs

@@ -141,11 +141,12 @@
             this.ribbon.ExpandCollapseItem,
             this.bbQuery});
             this.ribbon.Location = new System.Drawing.Point(0, 0);
+            this.ribbon.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.ribbon.MaxItemId = 3;
             this.ribbon.Name = "ribbon";
             this.ribbon.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] {
             this.ribbonPage1});
-            this.ribbon.Size = new System.Drawing.Size(1368, 147);
+            this.ribbon.Size = new System.Drawing.Size(1954, 225);
             // 
             // bbQuery
             // 
@@ -188,20 +189,22 @@
             this.layoutControl1.Controls.Add(this.simpleButton1);
             this.layoutControl1.Controls.Add(this.btnShowId);
             this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.layoutControl1.Location = new System.Drawing.Point(0, 147);
+            this.layoutControl1.Location = new System.Drawing.Point(0, 225);
+            this.layoutControl1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.layoutControl1.Name = "layoutControl1";
             this.layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(2287, 422, 450, 400);
             this.layoutControl1.Root = this.layoutControlGroup1;
-            this.layoutControl1.Size = new System.Drawing.Size(1368, 628);
+            this.layoutControl1.Size = new System.Drawing.Size(1954, 993);
             this.layoutControl1.TabIndex = 2;
             this.layoutControl1.Text = "layoutControl1";
             // 
             // lbAutoWave
             // 
             this.lbAutoWave.Font = new System.Drawing.Font("华文仿宋", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lbAutoWave.Location = new System.Drawing.Point(143, 201);
+            this.lbAutoWave.Location = new System.Drawing.Point(146, 246);
+            this.lbAutoWave.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lbAutoWave.Name = "lbAutoWave";
-            this.lbAutoWave.Size = new System.Drawing.Size(126, 25);
+            this.lbAutoWave.Size = new System.Drawing.Size(124, 110);
             this.lbAutoWave.TabIndex = 73;
             this.lbAutoWave.Text = "无";
             this.lbAutoWave.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -209,20 +212,23 @@
             // lbLightsInfo
             // 
             this.lbLightsInfo.Font = new System.Drawing.Font("华文仿宋", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lbLightsInfo.Location = new System.Drawing.Point(14, 158);
+            this.lbLightsInfo.Location = new System.Drawing.Point(17, 203);
+            this.lbLightsInfo.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lbLightsInfo.Name = "lbLightsInfo";
-            this.lbLightsInfo.Size = new System.Drawing.Size(255, 39);
+            this.lbLightsInfo.Size = new System.Drawing.Size(253, 37);
             this.lbLightsInfo.TabIndex = 72;
             this.lbLightsInfo.Text = "无";
             this.lbLightsInfo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // gridControl1
             // 
-            this.gridControl1.Location = new System.Drawing.Point(301, 37);
+            this.gridControl1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8);
+            this.gridControl1.Location = new System.Drawing.Point(315, 57);
             this.gridControl1.MainView = this.gridView1;
+            this.gridControl1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.gridControl1.MenuManager = this.ribbonControl1;
             this.gridControl1.Name = "gridControl1";
-            this.gridControl1.Size = new System.Drawing.Size(1053, 535);
+            this.gridControl1.Size = new System.Drawing.Size(1616, 871);
             this.gridControl1.TabIndex = 71;
             this.gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView1});
@@ -243,7 +249,7 @@
             this.ribbonControl1.Name = "ribbonControl1";
             this.ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] {
             this.ribbonPage2});
-            this.ribbonControl1.Size = new System.Drawing.Size(1368, 145);
+            this.ribbonControl1.Size = new System.Drawing.Size(1368, 223);
             // 
             // barButtonItem1
             // 
@@ -268,11 +274,13 @@
             // 
             // gridControl2
             // 
-            this.gridControl2.Location = new System.Drawing.Point(301, 37);
+            this.gridControl2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8);
+            this.gridControl2.Location = new System.Drawing.Point(315, 57);
             this.gridControl2.MainView = this.gridView3;
+            this.gridControl2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.gridControl2.MenuManager = this.ribbonControl1;
             this.gridControl2.Name = "gridControl2";
-            this.gridControl2.Size = new System.Drawing.Size(1053, 577);
+            this.gridControl2.Size = new System.Drawing.Size(1616, 913);
             this.gridControl2.TabIndex = 70;
             this.gridControl2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView3});
@@ -285,9 +293,10 @@
             // lbWaveSpan
             // 
             this.lbWaveSpan.Font = new System.Drawing.Font("Tahoma", 15F);
-            this.lbWaveSpan.Location = new System.Drawing.Point(14, 85);
+            this.lbWaveSpan.Location = new System.Drawing.Point(17, 130);
+            this.lbWaveSpan.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lbWaveSpan.Name = "lbWaveSpan";
-            this.lbWaveSpan.Size = new System.Drawing.Size(255, 45);
+            this.lbWaveSpan.Size = new System.Drawing.Size(253, 43);
             this.lbWaveSpan.TabIndex = 57;
             this.lbWaveSpan.Text = "00:00:00";
             this.lbWaveSpan.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -295,18 +304,20 @@
             // lbWaveNo
             // 
             this.lbWaveNo.Font = new System.Drawing.Font("华文仿宋", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lbWaveNo.Location = new System.Drawing.Point(14, 57);
+            this.lbWaveNo.Location = new System.Drawing.Point(17, 85);
+            this.lbWaveNo.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lbWaveNo.Name = "lbWaveNo";
-            this.lbWaveNo.Size = new System.Drawing.Size(255, 24);
+            this.lbWaveNo.Size = new System.Drawing.Size(253, 39);
             this.lbWaveNo.TabIndex = 45;
             this.lbWaveNo.Text = "无";
             this.lbWaveNo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // btnRelight
             // 
-            this.btnRelight.Location = new System.Drawing.Point(90, 259);
+            this.btnRelight.Location = new System.Drawing.Point(93, 391);
+            this.btnRelight.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.btnRelight.Name = "btnRelight";
-            this.btnRelight.Size = new System.Drawing.Size(73, 25);
+            this.btnRelight.Size = new System.Drawing.Size(71, 23);
             this.btnRelight.StyleController = this.layoutControl1;
             this.btnRelight.TabIndex = 43;
             this.btnRelight.Text = "重新点亮";
@@ -314,9 +325,10 @@
             // 
             // btnEndWave
             // 
-            this.btnEndWave.Location = new System.Drawing.Point(14, 259);
+            this.btnEndWave.Location = new System.Drawing.Point(17, 391);
+            this.btnEndWave.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.btnEndWave.Name = "btnEndWave";
-            this.btnEndWave.Size = new System.Drawing.Size(72, 25);
+            this.btnEndWave.Size = new System.Drawing.Size(70, 23);
             this.btnEndWave.StyleController = this.layoutControl1;
             this.btnEndWave.TabIndex = 25;
             this.btnEndWave.Text = "强制结束";
@@ -324,9 +336,10 @@
             // 
             // btnNewWave
             // 
-            this.btnNewWave.Location = new System.Drawing.Point(90, 288);
+            this.btnNewWave.Location = new System.Drawing.Point(93, 420);
+            this.btnNewWave.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.btnNewWave.Name = "btnNewWave";
-            this.btnNewWave.Size = new System.Drawing.Size(75, 25);
+            this.btnNewWave.Size = new System.Drawing.Size(73, 23);
             this.btnNewWave.StyleController = this.layoutControl1;
             this.btnNewWave.TabIndex = 37;
             this.btnNewWave.Text = "新波次";
@@ -335,14 +348,15 @@
             // swAutoWave
             // 
             this.swAutoWave.EditValue = true;
-            this.swAutoWave.Location = new System.Drawing.Point(14, 201);
+            this.swAutoWave.Location = new System.Drawing.Point(17, 246);
+            this.swAutoWave.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.swAutoWave.Name = "swAutoWave";
             this.swAutoWave.Properties.AutoHeight = false;
             this.swAutoWave.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.Default;
             this.swAutoWave.Properties.OffText = "Off";
             this.swAutoWave.Properties.OnText = "On";
             this.swAutoWave.Properties.ShowText = false;
-            this.swAutoWave.Size = new System.Drawing.Size(125, 25);
+            this.swAutoWave.Size = new System.Drawing.Size(123, 110);
             this.swAutoWave.StyleController = this.layoutControl1;
             this.swAutoWave.TabIndex = 40;
             this.swAutoWave.Toggled += new System.EventHandler(this.swAutoWave_Toggled);
@@ -357,7 +371,8 @@
             0,
             0,
             0});
-            this.spinWave.Location = new System.Drawing.Point(65, 230);
+            this.spinWave.Location = new System.Drawing.Point(92, 362);
+            this.spinWave.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.spinWave.Name = "spinWave";
             this.spinWave.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -373,16 +388,17 @@
             0,
             0,
             0});
-            this.spinWave.Size = new System.Drawing.Size(86, 20);
+            this.spinWave.Size = new System.Drawing.Size(60, 28);
             this.spinWave.StyleController = this.layoutControl1;
             this.spinWave.TabIndex = 41;
             this.spinWave.EditValueChanged += new System.EventHandler(this.spinWave_EditValueChanged);
             // 
             // btnRefresh
             // 
-            this.btnRefresh.Location = new System.Drawing.Point(14, 288);
+            this.btnRefresh.Location = new System.Drawing.Point(17, 420);
+            this.btnRefresh.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.btnRefresh.Name = "btnRefresh";
-            this.btnRefresh.Size = new System.Drawing.Size(72, 25);
+            this.btnRefresh.Size = new System.Drawing.Size(70, 23);
             this.btnRefresh.StyleController = this.layoutControl1;
             this.btnRefresh.TabIndex = 44;
             this.btnRefresh.Text = "刷新";
@@ -391,9 +407,10 @@
             // btnExport
             // 
             this.btnExport.ImageUri.Uri = "ExportToXLS";
-            this.btnExport.Location = new System.Drawing.Point(301, 576);
+            this.btnExport.Location = new System.Drawing.Point(315, 934);
+            this.btnExport.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.btnExport.Name = "btnExport";
-            this.btnExport.Size = new System.Drawing.Size(98, 38);
+            this.btnExport.Size = new System.Drawing.Size(96, 36);
             this.btnExport.StyleController = this.layoutControl1;
             this.btnExport.TabIndex = 68;
             this.btnExport.Text = "导出";
@@ -409,7 +426,8 @@
             0,
             0,
             0});
-            this.spinColors.Location = new System.Drawing.Point(65, 317);
+            this.spinColors.Location = new System.Drawing.Point(92, 449);
+            this.spinColors.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.spinColors.Name = "spinColors";
             this.spinColors.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -425,16 +443,17 @@
             0,
             0,
             0});
-            this.spinColors.Size = new System.Drawing.Size(204, 20);
+            this.spinColors.Size = new System.Drawing.Size(178, 28);
             this.spinColors.StyleController = this.layoutControl1;
             this.spinColors.TabIndex = 41;
             this.spinColors.EditValueChanged += new System.EventHandler(this.spinColors_EditValueChanged);
             // 
             // simpleButton1
             // 
-            this.simpleButton1.Location = new System.Drawing.Point(167, 259);
+            this.simpleButton1.Location = new System.Drawing.Point(170, 391);
+            this.simpleButton1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.simpleButton1.Name = "simpleButton1";
-            this.simpleButton1.Size = new System.Drawing.Size(73, 25);
+            this.simpleButton1.Size = new System.Drawing.Size(71, 23);
             this.simpleButton1.StyleController = this.layoutControl1;
             this.simpleButton1.TabIndex = 43;
             this.simpleButton1.Text = "硬件复位";
@@ -442,9 +461,10 @@
             // 
             // btnShowId
             // 
-            this.btnShowId.Location = new System.Drawing.Point(169, 288);
+            this.btnShowId.Location = new System.Drawing.Point(172, 420);
+            this.btnShowId.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.btnShowId.Name = "btnShowId";
-            this.btnShowId.Size = new System.Drawing.Size(73, 25);
+            this.btnShowId.Size = new System.Drawing.Size(71, 23);
             this.btnShowId.StyleController = this.layoutControl1;
             this.btnShowId.TabIndex = 43;
             this.btnShowId.Text = "显示ID";
@@ -457,7 +477,7 @@
             this.layoutControlGroup5});
             this.layoutControlGroup1.Location = new System.Drawing.Point(0, 0);
             this.layoutControlGroup1.Name = "Root";
-            this.layoutControlGroup1.Size = new System.Drawing.Size(1368, 628);
+            this.layoutControlGroup1.Size = new System.Drawing.Size(1954, 993);
             this.layoutControlGroup1.TextVisible = false;
             // 
             // layoutControlGroup5
@@ -472,17 +492,17 @@
             this.simpleSeparator2});
             this.layoutControlGroup5.Location = new System.Drawing.Point(0, 0);
             this.layoutControlGroup5.Name = "layoutControlGroup5";
-            this.layoutControlGroup5.Size = new System.Drawing.Size(1368, 628);
+            this.layoutControlGroup5.Size = new System.Drawing.Size(1954, 993);
             this.layoutControlGroup5.Text = "波次出库";
             this.layoutControlGroup5.TextVisible = false;
             // 
             // tabbedControlGroup1
             // 
-            this.tabbedControlGroup1.Location = new System.Drawing.Point(287, 0);
+            this.tabbedControlGroup1.Location = new System.Drawing.Point(293, 0);
             this.tabbedControlGroup1.Name = "tabbedControlGroup1";
             this.tabbedControlGroup1.SelectedTabPage = this.layoutControlGroup7;
             this.tabbedControlGroup1.SelectedTabPageIndex = 0;
-            this.tabbedControlGroup1.Size = new System.Drawing.Size(1081, 628);
+            this.tabbedControlGroup1.Size = new System.Drawing.Size(1661, 993);
             this.tabbedControlGroup1.TabPages.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.layoutControlGroup7,
             this.layoutControlGroup2});
@@ -493,7 +513,7 @@
             this.layoutControlItem8});
             this.layoutControlGroup7.Location = new System.Drawing.Point(0, 0);
             this.layoutControlGroup7.Name = "layoutControlGroup7";
-            this.layoutControlGroup7.Size = new System.Drawing.Size(1057, 581);
+            this.layoutControlGroup7.Size = new System.Drawing.Size(1622, 919);
             this.layoutControlGroup7.Text = "亮灯数据";
             // 
             // layoutControlItem8
@@ -501,7 +521,7 @@
             this.layoutControlItem8.Control = this.gridControl2;
             this.layoutControlItem8.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem8.Name = "layoutControlItem8";
-            this.layoutControlItem8.Size = new System.Drawing.Size(1057, 581);
+            this.layoutControlItem8.Size = new System.Drawing.Size(1622, 919);
             this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem8.TextVisible = false;
             // 
@@ -513,21 +533,21 @@
             this.layoutControlItem1});
             this.layoutControlGroup2.Location = new System.Drawing.Point(0, 0);
             this.layoutControlGroup2.Name = "layoutControlGroup2";
-            this.layoutControlGroup2.Size = new System.Drawing.Size(1057, 581);
+            this.layoutControlGroup2.Size = new System.Drawing.Size(1622, 919);
             this.layoutControlGroup2.Text = "无效货位";
             // 
             // emptySpaceItem3
             // 
             this.emptySpaceItem3.AllowHotTrack = false;
-            this.emptySpaceItem3.Location = new System.Drawing.Point(102, 539);
+            this.emptySpaceItem3.Location = new System.Drawing.Point(102, 877);
             this.emptySpaceItem3.Name = "emptySpaceItem3";
-            this.emptySpaceItem3.Size = new System.Drawing.Size(955, 42);
+            this.emptySpaceItem3.Size = new System.Drawing.Size(1520, 42);
             this.emptySpaceItem3.TextSize = new System.Drawing.Size(0, 0);
             // 
             // layoutControlItem3
             // 
             this.layoutControlItem3.Control = this.btnExport;
-            this.layoutControlItem3.Location = new System.Drawing.Point(0, 539);
+            this.layoutControlItem3.Location = new System.Drawing.Point(0, 877);
             this.layoutControlItem3.MaxSize = new System.Drawing.Size(102, 42);
             this.layoutControlItem3.MinSize = new System.Drawing.Size(102, 42);
             this.layoutControlItem3.Name = "layoutControlItem3";
@@ -541,7 +561,7 @@
             this.layoutControlItem1.Control = this.gridControl1;
             this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Size = new System.Drawing.Size(1057, 539);
+            this.layoutControlItem1.Size = new System.Drawing.Size(1622, 877);
             this.layoutControlItem1.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem1.TextVisible = false;
             // 
@@ -570,16 +590,16 @@
             this.layoutControlGroup3.Location = new System.Drawing.Point(0, 0);
             this.layoutControlGroup3.Name = "layoutControlGroup3";
             this.layoutControlGroup3.Padding = new DevExpress.XtraLayout.Utils.Padding(9, 9, 9, 0);
-            this.layoutControlGroup3.Size = new System.Drawing.Size(283, 628);
+            this.layoutControlGroup3.Size = new System.Drawing.Size(287, 993);
             this.layoutControlGroup3.Text = "波次控制";
             // 
             // layoutControlItem11
             // 
             this.layoutControlItem11.Control = this.lbWaveNo;
-            this.layoutControlItem11.Location = new System.Drawing.Point(0, 24);
+            this.layoutControlItem11.Location = new System.Drawing.Point(0, 38);
             this.layoutControlItem11.MinSize = new System.Drawing.Size(24, 24);
             this.layoutControlItem11.Name = "layoutControlItem11";
-            this.layoutControlItem11.Size = new System.Drawing.Size(259, 28);
+            this.layoutControlItem11.Size = new System.Drawing.Size(259, 45);
             this.layoutControlItem11.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem11.Text = "当前波次";
             this.layoutControlItem11.TextLocation = DevExpress.Utils.Locations.Top;
@@ -589,7 +609,7 @@
             // layoutControlItem2
             // 
             this.layoutControlItem2.Control = this.btnRelight;
-            this.layoutControlItem2.Location = new System.Drawing.Point(76, 226);
+            this.layoutControlItem2.Location = new System.Drawing.Point(76, 344);
             this.layoutControlItem2.MaxSize = new System.Drawing.Size(77, 29);
             this.layoutControlItem2.MinSize = new System.Drawing.Size(77, 29);
             this.layoutControlItem2.Name = "layoutControlItem2";
@@ -604,14 +624,14 @@
             this.emptySpaceItem5.Location = new System.Drawing.Point(0, 0);
             this.emptySpaceItem5.MinSize = new System.Drawing.Size(104, 24);
             this.emptySpaceItem5.Name = "emptySpaceItem5";
-            this.emptySpaceItem5.Size = new System.Drawing.Size(259, 24);
+            this.emptySpaceItem5.Size = new System.Drawing.Size(259, 38);
             this.emptySpaceItem5.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.emptySpaceItem5.TextSize = new System.Drawing.Size(0, 0);
             // 
             // layoutControlItem12
             // 
             this.layoutControlItem12.Control = this.lbWaveSpan;
-            this.layoutControlItem12.Location = new System.Drawing.Point(0, 52);
+            this.layoutControlItem12.Location = new System.Drawing.Point(0, 83);
             this.layoutControlItem12.MaxSize = new System.Drawing.Size(259, 49);
             this.layoutControlItem12.MinSize = new System.Drawing.Size(259, 49);
             this.layoutControlItem12.Name = "layoutControlItem12";
@@ -624,10 +644,10 @@
             // 
             this.layoutControlItem6.Control = this.swAutoWave;
             this.layoutControlItem6.CustomizationFormText = "自动提取";
-            this.layoutControlItem6.Location = new System.Drawing.Point(0, 168);
+            this.layoutControlItem6.Location = new System.Drawing.Point(0, 199);
             this.layoutControlItem6.MinSize = new System.Drawing.Size(129, 29);
             this.layoutControlItem6.Name = "layoutControlItem6";
-            this.layoutControlItem6.Size = new System.Drawing.Size(129, 29);
+            this.layoutControlItem6.Size = new System.Drawing.Size(129, 116);
             this.layoutControlItem6.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem6.Text = "自动波次";
             this.layoutControlItem6.TextLocation = DevExpress.Utils.Locations.Left;
@@ -637,7 +657,7 @@
             // emptySpaceItem7
             // 
             this.emptySpaceItem7.AllowHotTrack = false;
-            this.emptySpaceItem7.Location = new System.Drawing.Point(0, 101);
+            this.emptySpaceItem7.Location = new System.Drawing.Point(0, 132);
             this.emptySpaceItem7.MaxSize = new System.Drawing.Size(259, 24);
             this.emptySpaceItem7.MinSize = new System.Drawing.Size(259, 24);
             this.emptySpaceItem7.Name = "emptySpaceItem7";
@@ -648,7 +668,7 @@
             // emptySpaceItem8
             // 
             this.emptySpaceItem8.AllowHotTrack = false;
-            this.emptySpaceItem8.Location = new System.Drawing.Point(141, 197);
+            this.emptySpaceItem8.Location = new System.Drawing.Point(141, 315);
             this.emptySpaceItem8.MinSize = new System.Drawing.Size(104, 24);
             this.emptySpaceItem8.Name = "emptySpaceItem8";
             this.emptySpaceItem8.Size = new System.Drawing.Size(104, 29);
@@ -659,7 +679,7 @@
             // 
             this.layoutControlItem7.Control = this.spinWave;
             this.layoutControlItem7.CustomizationFormText = "提取间隔(秒)";
-            this.layoutControlItem7.Location = new System.Drawing.Point(0, 197);
+            this.layoutControlItem7.Location = new System.Drawing.Point(0, 315);
             this.layoutControlItem7.MaxSize = new System.Drawing.Size(141, 29);
             this.layoutControlItem7.MinSize = new System.Drawing.Size(141, 29);
             this.layoutControlItem7.Name = "layoutControlItem7";
@@ -667,12 +687,12 @@
             this.layoutControlItem7.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem7.Text = "间隔(秒)";
             this.layoutControlItem7.TextLocation = DevExpress.Utils.Locations.Left;
-            this.layoutControlItem7.TextSize = new System.Drawing.Size(48, 14);
+            this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 22);
             // 
             // layoutControlItem10
             // 
             this.layoutControlItem10.Control = this.btnRefresh;
-            this.layoutControlItem10.Location = new System.Drawing.Point(0, 255);
+            this.layoutControlItem10.Location = new System.Drawing.Point(0, 373);
             this.layoutControlItem10.MaxSize = new System.Drawing.Size(76, 29);
             this.layoutControlItem10.MinSize = new System.Drawing.Size(76, 29);
             this.layoutControlItem10.Name = "layoutControlItem10";
@@ -684,7 +704,7 @@
             // layoutControlItem14
             // 
             this.layoutControlItem14.Control = this.btnNewWave;
-            this.layoutControlItem14.Location = new System.Drawing.Point(76, 255);
+            this.layoutControlItem14.Location = new System.Drawing.Point(76, 373);
             this.layoutControlItem14.MaxSize = new System.Drawing.Size(79, 29);
             this.layoutControlItem14.MinSize = new System.Drawing.Size(79, 29);
             this.layoutControlItem14.Name = "layoutControlItem14";
@@ -696,7 +716,7 @@
             // layoutControlItem4
             // 
             this.layoutControlItem4.Control = this.lbLightsInfo;
-            this.layoutControlItem4.Location = new System.Drawing.Point(0, 125);
+            this.layoutControlItem4.Location = new System.Drawing.Point(0, 156);
             this.layoutControlItem4.MaxSize = new System.Drawing.Size(259, 43);
             this.layoutControlItem4.MinSize = new System.Drawing.Size(259, 43);
             this.layoutControlItem4.Name = "layoutControlItem4";
@@ -709,20 +729,20 @@
             // 
             this.layoutControlItem5.Control = this.spinColors;
             this.layoutControlItem5.CustomizationFormText = "提取间隔(秒)";
-            this.layoutControlItem5.Location = new System.Drawing.Point(0, 284);
+            this.layoutControlItem5.Location = new System.Drawing.Point(0, 402);
             this.layoutControlItem5.MinSize = new System.Drawing.Size(105, 24);
             this.layoutControlItem5.Name = "layoutControlItem5";
-            this.layoutControlItem5.Size = new System.Drawing.Size(259, 24);
+            this.layoutControlItem5.Size = new System.Drawing.Size(259, 42);
             this.layoutControlItem5.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem5.Text = "订单数量";
             this.layoutControlItem5.TextLocation = DevExpress.Utils.Locations.Left;
-            this.layoutControlItem5.TextSize = new System.Drawing.Size(48, 14);
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 22);
             this.layoutControlItem5.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
             // 
             // emptySpaceItem2
             // 
             this.emptySpaceItem2.AllowHotTrack = false;
-            this.emptySpaceItem2.Location = new System.Drawing.Point(245, 197);
+            this.emptySpaceItem2.Location = new System.Drawing.Point(245, 315);
             this.emptySpaceItem2.Name = "emptySpaceItem2";
             this.emptySpaceItem2.Size = new System.Drawing.Size(14, 87);
             this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0);
@@ -730,15 +750,15 @@
             // emptySpaceItem4
             // 
             this.emptySpaceItem4.AllowHotTrack = false;
-            this.emptySpaceItem4.Location = new System.Drawing.Point(0, 308);
+            this.emptySpaceItem4.Location = new System.Drawing.Point(0, 444);
             this.emptySpaceItem4.Name = "emptySpaceItem4";
-            this.emptySpaceItem4.Size = new System.Drawing.Size(259, 286);
+            this.emptySpaceItem4.Size = new System.Drawing.Size(259, 500);
             this.emptySpaceItem4.TextSize = new System.Drawing.Size(0, 0);
             // 
             // emptySpaceItem1
             // 
             this.emptySpaceItem1.AllowHotTrack = false;
-            this.emptySpaceItem1.Location = new System.Drawing.Point(230, 226);
+            this.emptySpaceItem1.Location = new System.Drawing.Point(230, 344);
             this.emptySpaceItem1.Name = "emptySpaceItem1";
             this.emptySpaceItem1.Size = new System.Drawing.Size(15, 29);
             this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0);
@@ -746,10 +766,10 @@
             // layoutControlItem13
             // 
             this.layoutControlItem13.Control = this.lbAutoWave;
-            this.layoutControlItem13.Location = new System.Drawing.Point(129, 168);
+            this.layoutControlItem13.Location = new System.Drawing.Point(129, 199);
             this.layoutControlItem13.MinSize = new System.Drawing.Size(24, 24);
             this.layoutControlItem13.Name = "layoutControlItem13";
-            this.layoutControlItem13.Size = new System.Drawing.Size(130, 29);
+            this.layoutControlItem13.Size = new System.Drawing.Size(130, 116);
             this.layoutControlItem13.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem13.TextVisible = false;
@@ -757,7 +777,7 @@
             // layoutControlItem9
             // 
             this.layoutControlItem9.Control = this.btnEndWave;
-            this.layoutControlItem9.Location = new System.Drawing.Point(0, 226);
+            this.layoutControlItem9.Location = new System.Drawing.Point(0, 344);
             this.layoutControlItem9.MaxSize = new System.Drawing.Size(76, 29);
             this.layoutControlItem9.MinSize = new System.Drawing.Size(76, 29);
             this.layoutControlItem9.Name = "layoutControlItem9";
@@ -770,7 +790,7 @@
             // 
             this.layoutControlItem15.Control = this.simpleButton1;
             this.layoutControlItem15.CustomizationFormText = "layoutControlItem2";
-            this.layoutControlItem15.Location = new System.Drawing.Point(153, 226);
+            this.layoutControlItem15.Location = new System.Drawing.Point(153, 344);
             this.layoutControlItem15.MaxSize = new System.Drawing.Size(77, 29);
             this.layoutControlItem15.MinSize = new System.Drawing.Size(77, 29);
             this.layoutControlItem15.Name = "layoutControlItem15";
@@ -784,7 +804,7 @@
             // 
             this.layoutControlItem16.Control = this.btnShowId;
             this.layoutControlItem16.CustomizationFormText = "layoutControlItem2";
-            this.layoutControlItem16.Location = new System.Drawing.Point(155, 255);
+            this.layoutControlItem16.Location = new System.Drawing.Point(155, 373);
             this.layoutControlItem16.MaxSize = new System.Drawing.Size(77, 29);
             this.layoutControlItem16.MinSize = new System.Drawing.Size(77, 29);
             this.layoutControlItem16.Name = "layoutControlItem16";
@@ -797,16 +817,16 @@
             // simpleSeparator1
             // 
             this.simpleSeparator1.AllowHotTrack = false;
-            this.simpleSeparator1.Location = new System.Drawing.Point(283, 0);
+            this.simpleSeparator1.Location = new System.Drawing.Point(287, 0);
             this.simpleSeparator1.Name = "simpleSeparator1";
-            this.simpleSeparator1.Size = new System.Drawing.Size(2, 628);
+            this.simpleSeparator1.Size = new System.Drawing.Size(3, 993);
             // 
             // simpleSeparator2
             // 
             this.simpleSeparator2.AllowHotTrack = false;
-            this.simpleSeparator2.Location = new System.Drawing.Point(285, 0);
+            this.simpleSeparator2.Location = new System.Drawing.Point(290, 0);
             this.simpleSeparator2.Name = "simpleSeparator2";
-            this.simpleSeparator2.Size = new System.Drawing.Size(2, 628);
+            this.simpleSeparator2.Size = new System.Drawing.Size(3, 993);
             // 
             // imageList1
             // 
@@ -817,11 +837,12 @@
             // 
             // GoodsOutForm
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1368, 775);
+            this.ClientSize = new System.Drawing.Size(1954, 1218);
             this.Controls.Add(this.layoutControl1);
             this.Controls.Add(this.ribbon);
+            this.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8);
             this.Name = "GoodsOutForm";
             this.Ribbon = this.ribbon;
             this.Text = "GoodsForm";

epick/GoodsOutForm.resx

@@ -121,7 +121,7 @@
     <value>17, 17</value>
   </metadata>
   <metadata name="splashScreenManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>199, 17</value>
+    <value>274, 17</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="bbQuery.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -259,14 +259,14 @@
 </value>
   </data>
   <metadata name="imageList1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>387, 17</value>
+    <value>539, 17</value>
   </metadata>
   <data name="imageList1.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABM
-        CQAAAk1TRnQBSQFMAgEBAgEAAQgBBgEIAQYBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CQAAAk1TRnQBSQFMAgEBAgEAARABBgEQAQYBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -309,6 +309,6 @@
 </value>
   </data>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>81</value>
+    <value>25</value>
   </metadata>
 </root>

epick/SeedsImport.designer.cs

@@ -146,18 +146,6 @@
             this.emptySpaceItem13 = new DevExpress.XtraLayout.EmptySpaceItem();
             this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
             this.tabbedControlGroup3 = new DevExpress.XtraLayout.TabbedControlGroup();
-            this.layoutControlGroup6 = new DevExpress.XtraLayout.LayoutControlGroup();
-            this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.emptySpaceItem11 = new DevExpress.XtraLayout.EmptySpaceItem();
-            this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.emptySpaceItem12 = new DevExpress.XtraLayout.EmptySpaceItem();
-            this.emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem();
-            this.layoutControlItem47 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.emptySpaceItem7 = new DevExpress.XtraLayout.EmptySpaceItem();
-            this.emptySpaceItem22 = new DevExpress.XtraLayout.EmptySpaceItem();
             this.layoutControlGroup12 = new DevExpress.XtraLayout.LayoutControlGroup();
             this.layoutControlItem42 = new DevExpress.XtraLayout.LayoutControlItem();
             this.emptySpaceItem10 = new DevExpress.XtraLayout.EmptySpaceItem();
@@ -176,6 +164,18 @@
             this.layoutControlItem57 = new DevExpress.XtraLayout.LayoutControlItem();
             this.emptySpaceItem24 = new DevExpress.XtraLayout.EmptySpaceItem();
             this.emptySpaceItem25 = new DevExpress.XtraLayout.EmptySpaceItem();
+            this.layoutControlGroup6 = new DevExpress.XtraLayout.LayoutControlGroup();
+            this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.emptySpaceItem11 = new DevExpress.XtraLayout.EmptySpaceItem();
+            this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.emptySpaceItem12 = new DevExpress.XtraLayout.EmptySpaceItem();
+            this.emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem();
+            this.layoutControlItem47 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.emptySpaceItem7 = new DevExpress.XtraLayout.EmptySpaceItem();
+            this.emptySpaceItem22 = new DevExpress.XtraLayout.EmptySpaceItem();
             this.tabbedControlGroup1 = new DevExpress.XtraLayout.TabbedControlGroup();
             this.layoutControlGroup8 = new DevExpress.XtraLayout.LayoutControlGroup();
             this.layoutControlGroup4 = new DevExpress.XtraLayout.LayoutControlGroup();
@@ -290,18 +290,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem13)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup3)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup6)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem11)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem12)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem47)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem7)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem22)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup12)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem42)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem10)).BeginInit();
@@ -320,6 +308,18 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem57)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem24)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem25)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup6)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem11)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem12)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem47)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem7)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem22)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup8)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup4)).BeginInit();
@@ -474,19 +474,19 @@
             // lbTotalOut
             // 
             this.lbTotalOut.Font = new System.Drawing.Font("Tahoma", 15F);
-            this.lbTotalOut.Location = new System.Drawing.Point(131, 316);
+            this.lbTotalOut.Location = new System.Drawing.Point(56, 316);
             this.lbTotalOut.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lbTotalOut.Name = "lbTotalOut";
-            this.lbTotalOut.Size = new System.Drawing.Size(132, 18);
+            this.lbTotalOut.Size = new System.Drawing.Size(207, 18);
             this.lbTotalOut.TabIndex = 94;
             // 
             // lbTotalPlan
             // 
             this.lbTotalPlan.Font = new System.Drawing.Font("Tahoma", 15F);
-            this.lbTotalPlan.Location = new System.Drawing.Point(131, 292);
+            this.lbTotalPlan.Location = new System.Drawing.Point(56, 292);
             this.lbTotalPlan.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lbTotalPlan.Name = "lbTotalPlan";
-            this.lbTotalPlan.Size = new System.Drawing.Size(132, 18);
+            this.lbTotalPlan.Size = new System.Drawing.Size(207, 18);
             this.lbTotalPlan.TabIndex = 93;
             // 
             // btnDelOrder
@@ -528,19 +528,19 @@
             // lbCustname
             // 
             this.lbCustname.Font = new System.Drawing.Font("Tahoma", 15F);
-            this.lbCustname.Location = new System.Drawing.Point(131, 371);
+            this.lbCustname.Location = new System.Drawing.Point(56, 371);
             this.lbCustname.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lbCustname.Name = "lbCustname";
-            this.lbCustname.Size = new System.Drawing.Size(132, 23);
+            this.lbCustname.Size = new System.Drawing.Size(207, 23);
             this.lbCustname.TabIndex = 87;
             // 
             // lbGoodsName
             // 
             this.lbGoodsName.Font = new System.Drawing.Font("Tahoma", 15F);
-            this.lbGoodsName.Location = new System.Drawing.Point(131, 263);
+            this.lbGoodsName.Location = new System.Drawing.Point(56, 263);
             this.lbGoodsName.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lbGoodsName.Name = "lbGoodsName";
-            this.lbGoodsName.Size = new System.Drawing.Size(132, 23);
+            this.lbGoodsName.Size = new System.Drawing.Size(207, 23);
             this.lbGoodsName.TabIndex = 86;
             // 
             // txtActuralCount
@@ -841,7 +841,7 @@
             this.chkDiff.MenuManager = this.ribbon;
             this.chkDiff.Name = "chkDiff";
             this.chkDiff.Properties.Caption = "";
-            this.chkDiff.Size = new System.Drawing.Size(20, 19);
+            this.chkDiff.Size = new System.Drawing.Size(79, 19);
             this.chkDiff.StyleController = this.layoutControl1;
             this.chkDiff.TabIndex = 88;
             // 
@@ -920,10 +920,10 @@
             // lbSeedsGoodsName
             // 
             this.lbSeedsGoodsName.Font = new System.Drawing.Font("Tahoma", 15F);
-            this.lbSeedsGoodsName.Location = new System.Drawing.Point(131, 321);
+            this.lbSeedsGoodsName.Location = new System.Drawing.Point(56, 321);
             this.lbSeedsGoodsName.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lbSeedsGoodsName.Name = "lbSeedsGoodsName";
-            this.lbSeedsGoodsName.Size = new System.Drawing.Size(132, 23);
+            this.lbSeedsGoodsName.Size = new System.Drawing.Size(207, 23);
             this.lbSeedsGoodsName.TabIndex = 86;
             // 
             // txtOutCnt
@@ -953,10 +953,10 @@
             // lbSeedsNo
             // 
             this.lbSeedsNo.Font = new System.Drawing.Font("Tahoma", 15F);
-            this.lbSeedsNo.Location = new System.Drawing.Point(131, 263);
+            this.lbSeedsNo.Location = new System.Drawing.Point(56, 263);
             this.lbSeedsNo.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lbSeedsNo.Name = "lbSeedsNo";
-            this.lbSeedsNo.Size = new System.Drawing.Size(132, 23);
+            this.lbSeedsNo.Size = new System.Drawing.Size(207, 23);
             this.lbSeedsNo.TabIndex = 87;
             // 
             // btnSeedsAdjust
@@ -974,19 +974,19 @@
             // lbSeedsBarcode
             // 
             this.lbSeedsBarcode.Font = new System.Drawing.Font("Tahoma", 15F);
-            this.lbSeedsBarcode.Location = new System.Drawing.Point(131, 292);
+            this.lbSeedsBarcode.Location = new System.Drawing.Point(56, 292);
             this.lbSeedsBarcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lbSeedsBarcode.Name = "lbSeedsBarcode";
-            this.lbSeedsBarcode.Size = new System.Drawing.Size(132, 23);
+            this.lbSeedsBarcode.Size = new System.Drawing.Size(207, 23);
             this.lbSeedsBarcode.TabIndex = 86;
             // 
             // lbTotalPlan2
             // 
             this.lbTotalPlan2.Font = new System.Drawing.Font("Tahoma", 15F);
-            this.lbTotalPlan2.Location = new System.Drawing.Point(131, 350);
+            this.lbTotalPlan2.Location = new System.Drawing.Point(56, 350);
             this.lbTotalPlan2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lbTotalPlan2.Name = "lbTotalPlan2";
-            this.lbTotalPlan2.Size = new System.Drawing.Size(132, 18);
+            this.lbTotalPlan2.Size = new System.Drawing.Size(207, 18);
             this.lbTotalPlan2.TabIndex = 93;
             // 
             // txtCustNm
@@ -1028,7 +1028,7 @@
             this.checkDone.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.checkDone.Name = "checkDone";
             this.checkDone.Properties.Caption = "";
-            this.checkDone.Size = new System.Drawing.Size(20, 19);
+            this.checkDone.Size = new System.Drawing.Size(79, 19);
             this.checkDone.StyleController = this.layoutControl1;
             this.checkDone.TabIndex = 88;
             // 
@@ -1427,7 +1427,8 @@
             this.layoutControlItem38.Size = new System.Drawing.Size(213, 29);
             this.layoutControlItem38.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem38.Text = "商品名称";
-            this.layoutControlItem38.TextSize = new System.Drawing.Size(72, 22);
+            this.layoutControlItem38.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem38.TextVisible = false;
             // 
             // layoutControlItem39
             // 
@@ -1472,7 +1473,8 @@
             this.layoutControlItem45.Size = new System.Drawing.Size(213, 29);
             this.layoutControlItem45.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem45.Text = "分播单号";
-            this.layoutControlItem45.TextSize = new System.Drawing.Size(72, 22);
+            this.layoutControlItem45.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem45.TextVisible = false;
             // 
             // emptySpaceItem17
             // 
@@ -1537,7 +1539,8 @@
             this.layoutControlItem43.Size = new System.Drawing.Size(213, 29);
             this.layoutControlItem43.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem43.Text = "商品条码";
-            this.layoutControlItem43.TextSize = new System.Drawing.Size(72, 22);
+            this.layoutControlItem43.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem43.TextVisible = false;
             // 
             // layoutControlItem44
             // 
@@ -1550,7 +1553,8 @@
             this.layoutControlItem44.Size = new System.Drawing.Size(213, 24);
             this.layoutControlItem44.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem44.Text = "累计计划";
-            this.layoutControlItem44.TextSize = new System.Drawing.Size(72, 22);
+            this.layoutControlItem44.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem44.TextVisible = false;
             // 
             // emptySpaceItem23
             // 
@@ -1591,7 +1595,8 @@
             this.layoutControlItem12.Size = new System.Drawing.Size(213, 29);
             this.layoutControlItem12.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem12.Text = "商品名称";
-            this.layoutControlItem12.TextSize = new System.Drawing.Size(72, 22);
+            this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem12.TextVisible = false;
             // 
             // layoutControlItem11
             // 
@@ -1642,7 +1647,8 @@
             this.layoutControlItem37.Size = new System.Drawing.Size(213, 24);
             this.layoutControlItem37.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem37.Text = "累计实发";
-            this.layoutControlItem37.TextSize = new System.Drawing.Size(72, 22);
+            this.layoutControlItem37.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem37.TextVisible = false;
             // 
             // layoutControlItem28
             // 
@@ -1654,7 +1660,8 @@
             this.layoutControlItem28.Size = new System.Drawing.Size(213, 24);
             this.layoutControlItem28.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem28.Text = "累计计划";
-            this.layoutControlItem28.TextSize = new System.Drawing.Size(72, 22);
+            this.layoutControlItem28.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem28.TextVisible = false;
             // 
             // layoutControlItem17
             // 
@@ -1666,7 +1673,8 @@
             this.layoutControlItem17.Size = new System.Drawing.Size(213, 29);
             this.layoutControlItem17.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem17.Text = "店铺名称";
-            this.layoutControlItem17.TextSize = new System.Drawing.Size(72, 22);
+            this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem17.TextVisible = false;
             // 
             // layoutControlItem20
             // 
@@ -1736,6 +1744,268 @@
             this.layoutControlGroup12,
             this.layoutControlGroup6});
             // 
+            // layoutControlGroup12
+            // 
+            this.layoutControlGroup12.AppearanceGroup.Font = new System.Drawing.Font("Tahoma", 9F, System.Drawing.FontStyle.Bold);
+            this.layoutControlGroup12.AppearanceGroup.Options.UseFont = true;
+            this.layoutControlGroup12.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+            this.layoutControlItem42,
+            this.emptySpaceItem10,
+            this.layoutControlItem26,
+            this.layoutControlItem36,
+            this.layoutControlItem56,
+            this.layoutControlItem9,
+            this.emptySpaceItem20,
+            this.layoutControlItem19,
+            this.layoutControlItem35,
+            this.layoutControlItem52,
+            this.layoutControlItem49,
+            this.layoutControlItem51,
+            this.layoutControlItem50,
+            this.layoutControlItem48,
+            this.layoutControlItem57,
+            this.emptySpaceItem24,
+            this.emptySpaceItem25});
+            this.layoutControlGroup12.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlGroup12.Name = "layoutControlGroup12";
+            this.layoutControlGroup12.Size = new System.Drawing.Size(1897, 68);
+            this.layoutControlGroup12.Text = "查询";
+            // 
+            // layoutControlItem42
+            // 
+            this.layoutControlItem42.Control = this.btnQuery;
+            this.layoutControlItem42.Location = new System.Drawing.Point(1100, 0);
+            this.layoutControlItem42.MaxSize = new System.Drawing.Size(82, 68);
+            this.layoutControlItem42.MinSize = new System.Drawing.Size(82, 68);
+            this.layoutControlItem42.Name = "layoutControlItem42";
+            this.layoutControlItem42.Size = new System.Drawing.Size(82, 68);
+            this.layoutControlItem42.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem42.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem42.TextVisible = false;
+            // 
+            // emptySpaceItem10
+            // 
+            this.emptySpaceItem10.AllowHotTrack = false;
+            this.emptySpaceItem10.Location = new System.Drawing.Point(1090, 0);
+            this.emptySpaceItem10.MaxSize = new System.Drawing.Size(10, 58);
+            this.emptySpaceItem10.MinSize = new System.Drawing.Size(10, 58);
+            this.emptySpaceItem10.Name = "emptySpaceItem10";
+            this.emptySpaceItem10.Size = new System.Drawing.Size(10, 68);
+            this.emptySpaceItem10.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.emptySpaceItem10.TextSize = new System.Drawing.Size(0, 0);
+            // 
+            // layoutControlItem26
+            // 
+            this.layoutControlItem26.Control = this.dateEditFrom;
+            this.layoutControlItem26.CustomizationFormText = "排号起止";
+            this.layoutControlItem26.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem26.MaxSize = new System.Drawing.Size(190, 34);
+            this.layoutControlItem26.MinSize = new System.Drawing.Size(190, 34);
+            this.layoutControlItem26.Name = "layoutControlItem26";
+            this.layoutControlItem26.Size = new System.Drawing.Size(190, 34);
+            this.layoutControlItem26.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem26.Spacing = new DevExpress.XtraLayout.Utils.Padding(10, 0, 0, 0);
+            this.layoutControlItem26.Text = "开始日期";
+            this.layoutControlItem26.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
+            this.layoutControlItem26.TextSize = new System.Drawing.Size(72, 22);
+            this.layoutControlItem26.TextToControlDistance = 5;
+            // 
+            // layoutControlItem36
+            // 
+            this.layoutControlItem36.Control = this.txtOperater;
+            this.layoutControlItem36.CustomizationFormText = "排号起止";
+            this.layoutControlItem36.Location = new System.Drawing.Point(817, 0);
+            this.layoutControlItem36.MaxSize = new System.Drawing.Size(178, 34);
+            this.layoutControlItem36.MinSize = new System.Drawing.Size(178, 34);
+            this.layoutControlItem36.Name = "layoutControlItem36";
+            this.layoutControlItem36.Size = new System.Drawing.Size(178, 34);
+            this.layoutControlItem36.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem36.Spacing = new DevExpress.XtraLayout.Utils.Padding(10, 0, 0, 0);
+            this.layoutControlItem36.Text = "分播员ID";
+            this.layoutControlItem36.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
+            this.layoutControlItem36.TextSize = new System.Drawing.Size(73, 22);
+            this.layoutControlItem36.TextToControlDistance = 5;
+            // 
+            // layoutControlItem56
+            // 
+            this.layoutControlItem56.Control = this.txtBarcode;
+            this.layoutControlItem56.CustomizationFormText = "--";
+            this.layoutControlItem56.Location = new System.Drawing.Point(190, 34);
+            this.layoutControlItem56.MaxSize = new System.Drawing.Size(255, 34);
+            this.layoutControlItem56.MinSize = new System.Drawing.Size(255, 34);
+            this.layoutControlItem56.Name = "layoutControlItem56";
+            this.layoutControlItem56.Size = new System.Drawing.Size(255, 34);
+            this.layoutControlItem56.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem56.Spacing = new DevExpress.XtraLayout.Utils.Padding(10, 0, 0, 0);
+            this.layoutControlItem56.Text = "商品编码";
+            this.layoutControlItem56.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
+            this.layoutControlItem56.TextLocation = DevExpress.Utils.Locations.Left;
+            this.layoutControlItem56.TextSize = new System.Drawing.Size(72, 22);
+            this.layoutControlItem56.TextToControlDistance = 5;
+            // 
+            // layoutControlItem9
+            // 
+            this.layoutControlItem9.Control = this.comStatus;
+            this.layoutControlItem9.Location = new System.Drawing.Point(817, 34);
+            this.layoutControlItem9.MaxSize = new System.Drawing.Size(178, 34);
+            this.layoutControlItem9.MinSize = new System.Drawing.Size(178, 34);
+            this.layoutControlItem9.Name = "layoutControlItem9";
+            this.layoutControlItem9.Size = new System.Drawing.Size(178, 34);
+            this.layoutControlItem9.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem9.Spacing = new DevExpress.XtraLayout.Utils.Padding(10, 0, 0, 0);
+            this.layoutControlItem9.Text = "分播状态";
+            this.layoutControlItem9.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
+            this.layoutControlItem9.TextSize = new System.Drawing.Size(72, 22);
+            this.layoutControlItem9.TextToControlDistance = 5;
+            // 
+            // emptySpaceItem20
+            // 
+            this.emptySpaceItem20.AllowHotTrack = false;
+            this.emptySpaceItem20.Location = new System.Drawing.Point(1182, 0);
+            this.emptySpaceItem20.MinSize = new System.Drawing.Size(104, 24);
+            this.emptySpaceItem20.Name = "emptySpaceItem20";
+            this.emptySpaceItem20.Size = new System.Drawing.Size(715, 68);
+            this.emptySpaceItem20.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.emptySpaceItem20.TextSize = new System.Drawing.Size(0, 0);
+            // 
+            // layoutControlItem19
+            // 
+            this.layoutControlItem19.Control = this.chkDiff;
+            this.layoutControlItem19.Location = new System.Drawing.Point(995, 0);
+            this.layoutControlItem19.MaxSize = new System.Drawing.Size(95, 23);
+            this.layoutControlItem19.MinSize = new System.Drawing.Size(95, 23);
+            this.layoutControlItem19.Name = "layoutControlItem19";
+            this.layoutControlItem19.Size = new System.Drawing.Size(95, 23);
+            this.layoutControlItem19.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem19.Spacing = new DevExpress.XtraLayout.Utils.Padding(10, 0, 0, 0);
+            this.layoutControlItem19.Text = "仅调整";
+            this.layoutControlItem19.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
+            this.layoutControlItem19.TextLocation = DevExpress.Utils.Locations.Right;
+            this.layoutControlItem19.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem19.TextToControlDistance = 0;
+            this.layoutControlItem19.TextVisible = false;
+            // 
+            // layoutControlItem35
+            // 
+            this.layoutControlItem35.Control = this.dateEditTo;
+            this.layoutControlItem35.CustomizationFormText = "排号起止";
+            this.layoutControlItem35.Location = new System.Drawing.Point(0, 34);
+            this.layoutControlItem35.MaxSize = new System.Drawing.Size(190, 34);
+            this.layoutControlItem35.MinSize = new System.Drawing.Size(190, 34);
+            this.layoutControlItem35.Name = "layoutControlItem35";
+            this.layoutControlItem35.Size = new System.Drawing.Size(190, 34);
+            this.layoutControlItem35.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem35.Spacing = new DevExpress.XtraLayout.Utils.Padding(10, 0, 0, 0);
+            this.layoutControlItem35.Text = "截止日期";
+            this.layoutControlItem35.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
+            this.layoutControlItem35.TextSize = new System.Drawing.Size(72, 22);
+            this.layoutControlItem35.TextToControlDistance = 5;
+            // 
+            // layoutControlItem52
+            // 
+            this.layoutControlItem52.Control = this.txtSeedsNo;
+            this.layoutControlItem52.CustomizationFormText = "排号起止";
+            this.layoutControlItem52.Location = new System.Drawing.Point(190, 0);
+            this.layoutControlItem52.MaxSize = new System.Drawing.Size(255, 34);
+            this.layoutControlItem52.MinSize = new System.Drawing.Size(255, 34);
+            this.layoutControlItem52.Name = "layoutControlItem52";
+            this.layoutControlItem52.Size = new System.Drawing.Size(255, 34);
+            this.layoutControlItem52.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem52.Spacing = new DevExpress.XtraLayout.Utils.Padding(10, 0, 0, 0);
+            this.layoutControlItem52.Text = "分播单号";
+            this.layoutControlItem52.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
+            this.layoutControlItem52.TextSize = new System.Drawing.Size(72, 22);
+            this.layoutControlItem52.TextToControlDistance = 5;
+            // 
+            // layoutControlItem49
+            // 
+            this.layoutControlItem49.Control = this.txtCustNm;
+            this.layoutControlItem49.CustomizationFormText = "layoutControlItem48";
+            this.layoutControlItem49.Location = new System.Drawing.Point(587, 0);
+            this.layoutControlItem49.MaxSize = new System.Drawing.Size(230, 34);
+            this.layoutControlItem49.MinSize = new System.Drawing.Size(230, 34);
+            this.layoutControlItem49.Name = "layoutControlItem49";
+            this.layoutControlItem49.Size = new System.Drawing.Size(230, 34);
+            this.layoutControlItem49.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem49.Spacing = new DevExpress.XtraLayout.Utils.Padding(10, 0, 0, 0);
+            this.layoutControlItem49.Text = "门店名称";
+            this.layoutControlItem49.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem51
+            // 
+            this.layoutControlItem51.Control = this.txtItemNmq;
+            this.layoutControlItem51.CustomizationFormText = "分播台";
+            this.layoutControlItem51.Location = new System.Drawing.Point(587, 34);
+            this.layoutControlItem51.MaxSize = new System.Drawing.Size(230, 34);
+            this.layoutControlItem51.MinSize = new System.Drawing.Size(230, 34);
+            this.layoutControlItem51.Name = "layoutControlItem51";
+            this.layoutControlItem51.Size = new System.Drawing.Size(230, 34);
+            this.layoutControlItem51.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem51.Spacing = new DevExpress.XtraLayout.Utils.Padding(10, 0, 0, 0);
+            this.layoutControlItem51.Text = "商品名称";
+            this.layoutControlItem51.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem50
+            // 
+            this.layoutControlItem50.Control = this.txtPartionQ;
+            this.layoutControlItem50.CustomizationFormText = "分播台";
+            this.layoutControlItem50.Location = new System.Drawing.Point(445, 0);
+            this.layoutControlItem50.MaxSize = new System.Drawing.Size(142, 34);
+            this.layoutControlItem50.MinSize = new System.Drawing.Size(142, 34);
+            this.layoutControlItem50.Name = "layoutControlItem50";
+            this.layoutControlItem50.Size = new System.Drawing.Size(142, 34);
+            this.layoutControlItem50.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem50.Spacing = new DevExpress.XtraLayout.Utils.Padding(10, 0, 0, 0);
+            this.layoutControlItem50.Text = "分区";
+            this.layoutControlItem50.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem48
+            // 
+            this.layoutControlItem48.Control = this.txtDeskId;
+            this.layoutControlItem48.Location = new System.Drawing.Point(445, 34);
+            this.layoutControlItem48.MaxSize = new System.Drawing.Size(142, 34);
+            this.layoutControlItem48.MinSize = new System.Drawing.Size(142, 34);
+            this.layoutControlItem48.Name = "layoutControlItem48";
+            this.layoutControlItem48.Size = new System.Drawing.Size(142, 34);
+            this.layoutControlItem48.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem48.Spacing = new DevExpress.XtraLayout.Utils.Padding(10, 0, 0, 0);
+            this.layoutControlItem48.Text = "分播台";
+            this.layoutControlItem48.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem57
+            // 
+            this.layoutControlItem57.Control = this.checkDone;
+            this.layoutControlItem57.CustomizationFormText = "仅调整";
+            this.layoutControlItem57.Location = new System.Drawing.Point(995, 34);
+            this.layoutControlItem57.MaxSize = new System.Drawing.Size(95, 23);
+            this.layoutControlItem57.MinSize = new System.Drawing.Size(95, 23);
+            this.layoutControlItem57.Name = "layoutControlItem57";
+            this.layoutControlItem57.Size = new System.Drawing.Size(95, 23);
+            this.layoutControlItem57.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem57.Spacing = new DevExpress.XtraLayout.Utils.Padding(10, 0, 0, 0);
+            this.layoutControlItem57.Text = "已分拣";
+            this.layoutControlItem57.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
+            this.layoutControlItem57.TextLocation = DevExpress.Utils.Locations.Right;
+            this.layoutControlItem57.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem57.TextToControlDistance = 0;
+            this.layoutControlItem57.TextVisible = false;
+            // 
+            // emptySpaceItem24
+            // 
+            this.emptySpaceItem24.AllowHotTrack = false;
+            this.emptySpaceItem24.Location = new System.Drawing.Point(995, 57);
+            this.emptySpaceItem24.Name = "emptySpaceItem24";
+            this.emptySpaceItem24.Size = new System.Drawing.Size(95, 11);
+            this.emptySpaceItem24.TextSize = new System.Drawing.Size(0, 0);
+            // 
+            // emptySpaceItem25
+            // 
+            this.emptySpaceItem25.AllowHotTrack = false;
+            this.emptySpaceItem25.Location = new System.Drawing.Point(995, 23);
+            this.emptySpaceItem25.Name = "emptySpaceItem25";
+            this.emptySpaceItem25.Size = new System.Drawing.Size(95, 11);
+            this.emptySpaceItem25.TextSize = new System.Drawing.Size(0, 0);
+            // 
             // layoutControlGroup6
             // 
             this.layoutControlGroup6.AppearanceGroup.Font = new System.Drawing.Font("Tahoma", 9F, System.Drawing.FontStyle.Bold);
@@ -1887,266 +2157,6 @@
             this.emptySpaceItem22.Size = new System.Drawing.Size(1280, 68);
             this.emptySpaceItem22.TextSize = new System.Drawing.Size(0, 0);
             // 
-            // layoutControlGroup12
-            // 
-            this.layoutControlGroup12.AppearanceGroup.Font = new System.Drawing.Font("Tahoma", 9F, System.Drawing.FontStyle.Bold);
-            this.layoutControlGroup12.AppearanceGroup.Options.UseFont = true;
-            this.layoutControlGroup12.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.layoutControlItem42,
-            this.emptySpaceItem10,
-            this.layoutControlItem26,
-            this.layoutControlItem36,
-            this.layoutControlItem56,
-            this.layoutControlItem9,
-            this.emptySpaceItem20,
-            this.layoutControlItem19,
-            this.layoutControlItem35,
-            this.layoutControlItem52,
-            this.layoutControlItem49,
-            this.layoutControlItem51,
-            this.layoutControlItem50,
-            this.layoutControlItem48,
-            this.layoutControlItem57,
-            this.emptySpaceItem24,
-            this.emptySpaceItem25});
-            this.layoutControlGroup12.Location = new System.Drawing.Point(0, 0);
-            this.layoutControlGroup12.Name = "layoutControlGroup12";
-            this.layoutControlGroup12.Size = new System.Drawing.Size(1897, 68);
-            this.layoutControlGroup12.Text = "查询";
-            // 
-            // layoutControlItem42
-            // 
-            this.layoutControlItem42.Control = this.btnQuery;
-            this.layoutControlItem42.Location = new System.Drawing.Point(1100, 0);
-            this.layoutControlItem42.MaxSize = new System.Drawing.Size(82, 68);
-            this.layoutControlItem42.MinSize = new System.Drawing.Size(82, 68);
-            this.layoutControlItem42.Name = "layoutControlItem42";
-            this.layoutControlItem42.Size = new System.Drawing.Size(82, 68);
-            this.layoutControlItem42.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem42.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem42.TextVisible = false;
-            // 
-            // emptySpaceItem10
-            // 
-            this.emptySpaceItem10.AllowHotTrack = false;
-            this.emptySpaceItem10.Location = new System.Drawing.Point(1090, 0);
-            this.emptySpaceItem10.MaxSize = new System.Drawing.Size(10, 58);
-            this.emptySpaceItem10.MinSize = new System.Drawing.Size(10, 58);
-            this.emptySpaceItem10.Name = "emptySpaceItem10";
-            this.emptySpaceItem10.Size = new System.Drawing.Size(10, 68);
-            this.emptySpaceItem10.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.emptySpaceItem10.TextSize = new System.Drawing.Size(0, 0);
-            // 
-            // layoutControlItem26
-            // 
-            this.layoutControlItem26.Control = this.dateEditFrom;
-            this.layoutControlItem26.CustomizationFormText = "排号起止";
-            this.layoutControlItem26.Location = new System.Drawing.Point(0, 0);
-            this.layoutControlItem26.MaxSize = new System.Drawing.Size(190, 34);
-            this.layoutControlItem26.MinSize = new System.Drawing.Size(190, 34);
-            this.layoutControlItem26.Name = "layoutControlItem26";
-            this.layoutControlItem26.Size = new System.Drawing.Size(190, 34);
-            this.layoutControlItem26.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem26.Spacing = new DevExpress.XtraLayout.Utils.Padding(10, 0, 0, 0);
-            this.layoutControlItem26.Text = "开始日期";
-            this.layoutControlItem26.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
-            this.layoutControlItem26.TextSize = new System.Drawing.Size(72, 22);
-            this.layoutControlItem26.TextToControlDistance = 5;
-            // 
-            // layoutControlItem36
-            // 
-            this.layoutControlItem36.Control = this.txtOperater;
-            this.layoutControlItem36.CustomizationFormText = "排号起止";
-            this.layoutControlItem36.Location = new System.Drawing.Point(817, 0);
-            this.layoutControlItem36.MaxSize = new System.Drawing.Size(178, 34);
-            this.layoutControlItem36.MinSize = new System.Drawing.Size(178, 34);
-            this.layoutControlItem36.Name = "layoutControlItem36";
-            this.layoutControlItem36.Size = new System.Drawing.Size(178, 34);
-            this.layoutControlItem36.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem36.Spacing = new DevExpress.XtraLayout.Utils.Padding(10, 0, 0, 0);
-            this.layoutControlItem36.Text = "分播员ID";
-            this.layoutControlItem36.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
-            this.layoutControlItem36.TextSize = new System.Drawing.Size(73, 22);
-            this.layoutControlItem36.TextToControlDistance = 5;
-            // 
-            // layoutControlItem56
-            // 
-            this.layoutControlItem56.Control = this.txtBarcode;
-            this.layoutControlItem56.CustomizationFormText = "--";
-            this.layoutControlItem56.Location = new System.Drawing.Point(190, 34);
-            this.layoutControlItem56.MaxSize = new System.Drawing.Size(255, 34);
-            this.layoutControlItem56.MinSize = new System.Drawing.Size(255, 34);
-            this.layoutControlItem56.Name = "layoutControlItem56";
-            this.layoutControlItem56.Size = new System.Drawing.Size(255, 34);
-            this.layoutControlItem56.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem56.Spacing = new DevExpress.XtraLayout.Utils.Padding(10, 0, 0, 0);
-            this.layoutControlItem56.Text = "商品编码";
-            this.layoutControlItem56.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
-            this.layoutControlItem56.TextLocation = DevExpress.Utils.Locations.Left;
-            this.layoutControlItem56.TextSize = new System.Drawing.Size(72, 22);
-            this.layoutControlItem56.TextToControlDistance = 5;
-            // 
-            // layoutControlItem9
-            // 
-            this.layoutControlItem9.Control = this.comStatus;
-            this.layoutControlItem9.Location = new System.Drawing.Point(817, 34);
-            this.layoutControlItem9.MaxSize = new System.Drawing.Size(178, 34);
-            this.layoutControlItem9.MinSize = new System.Drawing.Size(178, 34);
-            this.layoutControlItem9.Name = "layoutControlItem9";
-            this.layoutControlItem9.Size = new System.Drawing.Size(178, 34);
-            this.layoutControlItem9.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem9.Spacing = new DevExpress.XtraLayout.Utils.Padding(10, 0, 0, 0);
-            this.layoutControlItem9.Text = "分播状态";
-            this.layoutControlItem9.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
-            this.layoutControlItem9.TextSize = new System.Drawing.Size(72, 22);
-            this.layoutControlItem9.TextToControlDistance = 5;
-            // 
-            // emptySpaceItem20
-            // 
-            this.emptySpaceItem20.AllowHotTrack = false;
-            this.emptySpaceItem20.Location = new System.Drawing.Point(1182, 0);
-            this.emptySpaceItem20.MinSize = new System.Drawing.Size(104, 24);
-            this.emptySpaceItem20.Name = "emptySpaceItem20";
-            this.emptySpaceItem20.Size = new System.Drawing.Size(715, 68);
-            this.emptySpaceItem20.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.emptySpaceItem20.TextSize = new System.Drawing.Size(0, 0);
-            // 
-            // layoutControlItem19
-            // 
-            this.layoutControlItem19.Control = this.chkDiff;
-            this.layoutControlItem19.Location = new System.Drawing.Point(995, 0);
-            this.layoutControlItem19.MaxSize = new System.Drawing.Size(95, 23);
-            this.layoutControlItem19.MinSize = new System.Drawing.Size(95, 23);
-            this.layoutControlItem19.Name = "layoutControlItem19";
-            this.layoutControlItem19.Size = new System.Drawing.Size(95, 23);
-            this.layoutControlItem19.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem19.Spacing = new DevExpress.XtraLayout.Utils.Padding(10, 0, 0, 0);
-            this.layoutControlItem19.Text = "仅调整";
-            this.layoutControlItem19.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
-            this.layoutControlItem19.TextLocation = DevExpress.Utils.Locations.Right;
-            this.layoutControlItem19.TextSize = new System.Drawing.Size(54, 22);
-            this.layoutControlItem19.TextToControlDistance = 5;
-            // 
-            // layoutControlItem35
-            // 
-            this.layoutControlItem35.Control = this.dateEditTo;
-            this.layoutControlItem35.CustomizationFormText = "排号起止";
-            this.layoutControlItem35.Location = new System.Drawing.Point(0, 34);
-            this.layoutControlItem35.MaxSize = new System.Drawing.Size(190, 34);
-            this.layoutControlItem35.MinSize = new System.Drawing.Size(190, 34);
-            this.layoutControlItem35.Name = "layoutControlItem35";
-            this.layoutControlItem35.Size = new System.Drawing.Size(190, 34);
-            this.layoutControlItem35.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem35.Spacing = new DevExpress.XtraLayout.Utils.Padding(10, 0, 0, 0);
-            this.layoutControlItem35.Text = "截止日期";
-            this.layoutControlItem35.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
-            this.layoutControlItem35.TextSize = new System.Drawing.Size(72, 22);
-            this.layoutControlItem35.TextToControlDistance = 5;
-            // 
-            // layoutControlItem52
-            // 
-            this.layoutControlItem52.Control = this.txtSeedsNo;
-            this.layoutControlItem52.CustomizationFormText = "排号起止";
-            this.layoutControlItem52.Location = new System.Drawing.Point(190, 0);
-            this.layoutControlItem52.MaxSize = new System.Drawing.Size(255, 34);
-            this.layoutControlItem52.MinSize = new System.Drawing.Size(255, 34);
-            this.layoutControlItem52.Name = "layoutControlItem52";
-            this.layoutControlItem52.Size = new System.Drawing.Size(255, 34);
-            this.layoutControlItem52.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem52.Spacing = new DevExpress.XtraLayout.Utils.Padding(10, 0, 0, 0);
-            this.layoutControlItem52.Text = "分播单号";
-            this.layoutControlItem52.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
-            this.layoutControlItem52.TextSize = new System.Drawing.Size(72, 22);
-            this.layoutControlItem52.TextToControlDistance = 5;
-            // 
-            // layoutControlItem49
-            // 
-            this.layoutControlItem49.Control = this.txtCustNm;
-            this.layoutControlItem49.CustomizationFormText = "layoutControlItem48";
-            this.layoutControlItem49.Location = new System.Drawing.Point(587, 0);
-            this.layoutControlItem49.MaxSize = new System.Drawing.Size(230, 34);
-            this.layoutControlItem49.MinSize = new System.Drawing.Size(230, 34);
-            this.layoutControlItem49.Name = "layoutControlItem49";
-            this.layoutControlItem49.Size = new System.Drawing.Size(230, 34);
-            this.layoutControlItem49.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem49.Spacing = new DevExpress.XtraLayout.Utils.Padding(10, 0, 0, 0);
-            this.layoutControlItem49.Text = "门店名称";
-            this.layoutControlItem49.TextSize = new System.Drawing.Size(72, 22);
-            // 
-            // layoutControlItem51
-            // 
-            this.layoutControlItem51.Control = this.txtItemNmq;
-            this.layoutControlItem51.CustomizationFormText = "分播台";
-            this.layoutControlItem51.Location = new System.Drawing.Point(587, 34);
-            this.layoutControlItem51.MaxSize = new System.Drawing.Size(230, 34);
-            this.layoutControlItem51.MinSize = new System.Drawing.Size(230, 34);
-            this.layoutControlItem51.Name = "layoutControlItem51";
-            this.layoutControlItem51.Size = new System.Drawing.Size(230, 34);
-            this.layoutControlItem51.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem51.Spacing = new DevExpress.XtraLayout.Utils.Padding(10, 0, 0, 0);
-            this.layoutControlItem51.Text = "商品名称";
-            this.layoutControlItem51.TextSize = new System.Drawing.Size(72, 22);
-            // 
-            // layoutControlItem50
-            // 
-            this.layoutControlItem50.Control = this.txtPartionQ;
-            this.layoutControlItem50.CustomizationFormText = "分播台";
-            this.layoutControlItem50.Location = new System.Drawing.Point(445, 0);
-            this.layoutControlItem50.MaxSize = new System.Drawing.Size(142, 34);
-            this.layoutControlItem50.MinSize = new System.Drawing.Size(142, 34);
-            this.layoutControlItem50.Name = "layoutControlItem50";
-            this.layoutControlItem50.Size = new System.Drawing.Size(142, 34);
-            this.layoutControlItem50.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem50.Spacing = new DevExpress.XtraLayout.Utils.Padding(10, 0, 0, 0);
-            this.layoutControlItem50.Text = "分区";
-            this.layoutControlItem50.TextSize = new System.Drawing.Size(72, 22);
-            // 
-            // layoutControlItem48
-            // 
-            this.layoutControlItem48.Control = this.txtDeskId;
-            this.layoutControlItem48.Location = new System.Drawing.Point(445, 34);
-            this.layoutControlItem48.MaxSize = new System.Drawing.Size(142, 34);
-            this.layoutControlItem48.MinSize = new System.Drawing.Size(142, 34);
-            this.layoutControlItem48.Name = "layoutControlItem48";
-            this.layoutControlItem48.Size = new System.Drawing.Size(142, 34);
-            this.layoutControlItem48.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem48.Spacing = new DevExpress.XtraLayout.Utils.Padding(10, 0, 0, 0);
-            this.layoutControlItem48.Text = "分播台";
-            this.layoutControlItem48.TextSize = new System.Drawing.Size(72, 22);
-            // 
-            // layoutControlItem57
-            // 
-            this.layoutControlItem57.Control = this.checkDone;
-            this.layoutControlItem57.CustomizationFormText = "仅调整";
-            this.layoutControlItem57.Location = new System.Drawing.Point(995, 34);
-            this.layoutControlItem57.MaxSize = new System.Drawing.Size(95, 23);
-            this.layoutControlItem57.MinSize = new System.Drawing.Size(95, 23);
-            this.layoutControlItem57.Name = "layoutControlItem57";
-            this.layoutControlItem57.Size = new System.Drawing.Size(95, 23);
-            this.layoutControlItem57.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem57.Spacing = new DevExpress.XtraLayout.Utils.Padding(10, 0, 0, 0);
-            this.layoutControlItem57.Text = "已分拣";
-            this.layoutControlItem57.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
-            this.layoutControlItem57.TextLocation = DevExpress.Utils.Locations.Right;
-            this.layoutControlItem57.TextSize = new System.Drawing.Size(54, 22);
-            this.layoutControlItem57.TextToControlDistance = 5;
-            // 
-            // emptySpaceItem24
-            // 
-            this.emptySpaceItem24.AllowHotTrack = false;
-            this.emptySpaceItem24.Location = new System.Drawing.Point(995, 57);
-            this.emptySpaceItem24.Name = "emptySpaceItem24";
-            this.emptySpaceItem24.Size = new System.Drawing.Size(95, 11);
-            this.emptySpaceItem24.TextSize = new System.Drawing.Size(0, 0);
-            // 
-            // emptySpaceItem25
-            // 
-            this.emptySpaceItem25.AllowHotTrack = false;
-            this.emptySpaceItem25.Location = new System.Drawing.Point(995, 23);
-            this.emptySpaceItem25.Name = "emptySpaceItem25";
-            this.emptySpaceItem25.Size = new System.Drawing.Size(95, 11);
-            this.emptySpaceItem25.TextSize = new System.Drawing.Size(0, 0);
-            // 
             // tabbedControlGroup1
             // 
             this.tabbedControlGroup1.Location = new System.Drawing.Point(0, 269);
@@ -2263,7 +2273,7 @@
             // 
             this.txtLocation.Location = new System.Drawing.Point(0, 0);
             this.txtLocation.Name = "txtLocation";
-            this.txtLocation.Size = new System.Drawing.Size(100, 20);
+            this.txtLocation.Size = new System.Drawing.Size(100, 28);
             this.txtLocation.TabIndex = 0;
             // 
             // layoutControlGroup15
@@ -2276,7 +2286,7 @@
             // 
             this.textEdit2.Location = new System.Drawing.Point(196, 102);
             this.textEdit2.Name = "textEdit2";
-            this.textEdit2.Size = new System.Drawing.Size(60, 20);
+            this.textEdit2.Size = new System.Drawing.Size(60, 28);
             this.textEdit2.TabIndex = 11;
             // 
             // SeedsImport
@@ -2391,18 +2401,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem13)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup3)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup6)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem11)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem12)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem47)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem7)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem22)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup12)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem42)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem10)).EndInit();
@@ -2421,6 +2419,18 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem57)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem24)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem25)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup6)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem11)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem12)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem47)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem7)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem22)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup8)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup4)).EndInit();

epick/SeedsOut.designer.cs

@@ -28,6 +28,7 @@
         /// </summary>
         private void InitializeComponent()
         {
+            this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SeedsOut));
             this.ribbon = new DevExpress.XtraBars.Ribbon.RibbonControl();
             this.barButtonGroup1 = new DevExpress.XtraBars.BarButtonGroup();
@@ -100,7 +101,7 @@
             this.txtLocation = new DevExpress.XtraEditors.TextEdit();
             this.layoutControlGroup15 = new DevExpress.XtraLayout.LayoutControlGroup();
             this.textEdit2 = new DevExpress.XtraEditors.TextEdit();
-            this.imageList1 = new System.Windows.Forms.ImageList();
+            this.imageList1 = new System.Windows.Forms.ImageList(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.dxValidationProvider1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.ribbon)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
@@ -954,7 +955,7 @@
             // 
             this.txtLocation.Location = new System.Drawing.Point(0, 0);
             this.txtLocation.Name = "txtLocation";
-            this.txtLocation.Size = new System.Drawing.Size(100, 20);
+            this.txtLocation.Size = new System.Drawing.Size(100, 28);
             this.txtLocation.TabIndex = 0;
             // 
             // layoutControlGroup15
@@ -967,7 +968,7 @@
             // 
             this.textEdit2.Location = new System.Drawing.Point(196, 102);
             this.textEdit2.Name = "textEdit2";
-            this.textEdit2.Size = new System.Drawing.Size(60, 20);
+            this.textEdit2.Size = new System.Drawing.Size(60, 28);
             this.textEdit2.TabIndex = 11;
             // 
             // imageList1

epick/SeedsOut.resx

@@ -121,7 +121,7 @@
     <value>17, 17</value>
   </metadata>
   <metadata name="splashScreenManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>275, 17</value>
+    <value>17, 62</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="bbiExport.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -296,14 +296,14 @@
 </value>
   </data>
   <metadata name="imageList1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>542, 17</value>
+    <value>17, 107</value>
   </metadata>
   <data name="imageList1.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABM
-        CQAAAk1TRnQBSQFMAgEBAgEAAWABBwFgAQcBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CQAAAk1TRnQBSQFMAgEBAgEAAXABBwFwAQcBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

epick/SeedsOutService.designer.cs

@@ -28,7 +28,6 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SeedsOutService));
             this.ribbon = new DevExpress.XtraBars.Ribbon.RibbonControl();
             this.barButtonGroup1 = new DevExpress.XtraBars.BarButtonGroup();
@@ -73,14 +72,6 @@
             this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
             this.tabbedControlGroup2 = new DevExpress.XtraLayout.TabbedControlGroup();
-            this.layoutControlGroup10 = new DevExpress.XtraLayout.LayoutControlGroup();
-            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.emptySpaceItem12 = new DevExpress.XtraLayout.EmptySpaceItem();
-            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlGroup3 = new DevExpress.XtraLayout.LayoutControlGroup();
             this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -92,6 +83,14 @@
             this.layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup();
             this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlGroup10 = new DevExpress.XtraLayout.LayoutControlGroup();
+            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.emptySpaceItem12 = new DevExpress.XtraLayout.EmptySpaceItem();
+            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
             this.tabbedControlGroup1 = new DevExpress.XtraLayout.TabbedControlGroup();
             this.layoutControlGroup8 = new DevExpress.XtraLayout.LayoutControlGroup();
             this.layoutControlGroup4 = new DevExpress.XtraLayout.LayoutControlGroup();
@@ -108,7 +107,7 @@
             this.txtLocation = new DevExpress.XtraEditors.TextEdit();
             this.layoutControlGroup15 = new DevExpress.XtraLayout.LayoutControlGroup();
             this.textEdit2 = new DevExpress.XtraEditors.TextEdit();
-            this.imageList1 = new System.Windows.Forms.ImageList(this.components);
+            this.imageList1 = new System.Windows.Forms.ImageList();
             ((System.ComponentModel.ISupportInitialize)(this.dxValidationProvider1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.ribbon)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
@@ -140,14 +139,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup10)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem12)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
@@ -159,6 +150,14 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup10)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem12)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup8)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup4)).BeginInit();
@@ -718,100 +717,6 @@
             this.layoutControlGroup2,
             this.layoutControlGroup10});
             // 
-            // layoutControlGroup10
-            // 
-            this.layoutControlGroup10.AppearanceGroup.Font = new System.Drawing.Font("Tahoma", 9F, System.Drawing.FontStyle.Bold);
-            this.layoutControlGroup10.AppearanceGroup.Options.UseFont = true;
-            this.layoutControlGroup10.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.layoutControlItem2,
-            this.layoutControlItem5,
-            this.emptySpaceItem12,
-            this.layoutControlItem4,
-            this.layoutControlItem6,
-            this.layoutControlItem10,
-            this.layoutControlItem3});
-            this.layoutControlGroup10.Location = new System.Drawing.Point(0, 0);
-            this.layoutControlGroup10.Name = "layoutControlGroup10";
-            this.layoutControlGroup10.Size = new System.Drawing.Size(2051, 114);
-            this.layoutControlGroup10.Text = "灯光设备信息";
-            // 
-            // layoutControlItem2
-            // 
-            this.layoutControlItem2.Control = this.lbLightsInfo;
-            this.layoutControlItem2.Location = new System.Drawing.Point(0, 0);
-            this.layoutControlItem2.MaxSize = new System.Drawing.Size(224, 35);
-            this.layoutControlItem2.MinSize = new System.Drawing.Size(224, 35);
-            this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.Size = new System.Drawing.Size(224, 35);
-            this.layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem2.TextVisible = false;
-            // 
-            // layoutControlItem5
-            // 
-            this.layoutControlItem5.Control = this.lbComstatus;
-            this.layoutControlItem5.Location = new System.Drawing.Point(0, 35);
-            this.layoutControlItem5.MaxSize = new System.Drawing.Size(224, 31);
-            this.layoutControlItem5.MinSize = new System.Drawing.Size(224, 31);
-            this.layoutControlItem5.Name = "layoutControlItem5";
-            this.layoutControlItem5.Size = new System.Drawing.Size(224, 79);
-            this.layoutControlItem5.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem5.TextVisible = false;
-            // 
-            // emptySpaceItem12
-            // 
-            this.emptySpaceItem12.AllowHotTrack = false;
-            this.emptySpaceItem12.Location = new System.Drawing.Point(573, 0);
-            this.emptySpaceItem12.Name = "emptySpaceItem12";
-            this.emptySpaceItem12.Size = new System.Drawing.Size(1478, 114);
-            this.emptySpaceItem12.TextSize = new System.Drawing.Size(0, 0);
-            // 
-            // layoutControlItem4
-            // 
-            this.layoutControlItem4.Control = this.combComs;
-            this.layoutControlItem4.Location = new System.Drawing.Point(224, 0);
-            this.layoutControlItem4.MaxSize = new System.Drawing.Size(261, 42);
-            this.layoutControlItem4.MinSize = new System.Drawing.Size(261, 42);
-            this.layoutControlItem4.Name = "layoutControlItem4";
-            this.layoutControlItem4.Size = new System.Drawing.Size(261, 42);
-            this.layoutControlItem4.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem4.Text = "端口号";
-            this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 22);
-            // 
-            // layoutControlItem6
-            // 
-            this.layoutControlItem6.Control = this.btnShowId;
-            this.layoutControlItem6.Location = new System.Drawing.Point(485, 0);
-            this.layoutControlItem6.MaxSize = new System.Drawing.Size(88, 53);
-            this.layoutControlItem6.MinSize = new System.Drawing.Size(88, 53);
-            this.layoutControlItem6.Name = "layoutControlItem6";
-            this.layoutControlItem6.Size = new System.Drawing.Size(88, 53);
-            this.layoutControlItem6.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem6.TextVisible = false;
-            // 
-            // layoutControlItem10
-            // 
-            this.layoutControlItem10.Control = this.textEdit1;
-            this.layoutControlItem10.Location = new System.Drawing.Point(224, 42);
-            this.layoutControlItem10.Name = "layoutControlItem10";
-            this.layoutControlItem10.Size = new System.Drawing.Size(261, 72);
-            this.layoutControlItem10.Text = "分播台";
-            this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 22);
-            // 
-            // layoutControlItem3
-            // 
-            this.layoutControlItem3.Control = this.btnInitialCom;
-            this.layoutControlItem3.Location = new System.Drawing.Point(485, 53);
-            this.layoutControlItem3.MaxSize = new System.Drawing.Size(88, 49);
-            this.layoutControlItem3.MinSize = new System.Drawing.Size(88, 49);
-            this.layoutControlItem3.Name = "layoutControlItem3";
-            this.layoutControlItem3.Size = new System.Drawing.Size(88, 61);
-            this.layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem3.TextVisible = false;
-            // 
             // layoutControlGroup3
             // 
             this.layoutControlGroup3.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
@@ -930,6 +835,100 @@
             this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem9.TextVisible = false;
             // 
+            // layoutControlGroup10
+            // 
+            this.layoutControlGroup10.AppearanceGroup.Font = new System.Drawing.Font("Tahoma", 9F, System.Drawing.FontStyle.Bold);
+            this.layoutControlGroup10.AppearanceGroup.Options.UseFont = true;
+            this.layoutControlGroup10.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+            this.layoutControlItem2,
+            this.layoutControlItem5,
+            this.emptySpaceItem12,
+            this.layoutControlItem4,
+            this.layoutControlItem6,
+            this.layoutControlItem10,
+            this.layoutControlItem3});
+            this.layoutControlGroup10.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlGroup10.Name = "layoutControlGroup10";
+            this.layoutControlGroup10.Size = new System.Drawing.Size(2051, 114);
+            this.layoutControlGroup10.Text = "灯光设备信息";
+            // 
+            // layoutControlItem2
+            // 
+            this.layoutControlItem2.Control = this.lbLightsInfo;
+            this.layoutControlItem2.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem2.MaxSize = new System.Drawing.Size(224, 35);
+            this.layoutControlItem2.MinSize = new System.Drawing.Size(224, 35);
+            this.layoutControlItem2.Name = "layoutControlItem2";
+            this.layoutControlItem2.Size = new System.Drawing.Size(224, 35);
+            this.layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem2.TextVisible = false;
+            // 
+            // layoutControlItem5
+            // 
+            this.layoutControlItem5.Control = this.lbComstatus;
+            this.layoutControlItem5.Location = new System.Drawing.Point(0, 35);
+            this.layoutControlItem5.MaxSize = new System.Drawing.Size(224, 31);
+            this.layoutControlItem5.MinSize = new System.Drawing.Size(224, 31);
+            this.layoutControlItem5.Name = "layoutControlItem5";
+            this.layoutControlItem5.Size = new System.Drawing.Size(224, 79);
+            this.layoutControlItem5.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem5.TextVisible = false;
+            // 
+            // emptySpaceItem12
+            // 
+            this.emptySpaceItem12.AllowHotTrack = false;
+            this.emptySpaceItem12.Location = new System.Drawing.Point(573, 0);
+            this.emptySpaceItem12.Name = "emptySpaceItem12";
+            this.emptySpaceItem12.Size = new System.Drawing.Size(1478, 114);
+            this.emptySpaceItem12.TextSize = new System.Drawing.Size(0, 0);
+            // 
+            // layoutControlItem4
+            // 
+            this.layoutControlItem4.Control = this.combComs;
+            this.layoutControlItem4.Location = new System.Drawing.Point(224, 0);
+            this.layoutControlItem4.MaxSize = new System.Drawing.Size(261, 42);
+            this.layoutControlItem4.MinSize = new System.Drawing.Size(261, 42);
+            this.layoutControlItem4.Name = "layoutControlItem4";
+            this.layoutControlItem4.Size = new System.Drawing.Size(261, 42);
+            this.layoutControlItem4.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem4.Text = "端口号";
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 22);
+            // 
+            // layoutControlItem6
+            // 
+            this.layoutControlItem6.Control = this.btnShowId;
+            this.layoutControlItem6.Location = new System.Drawing.Point(485, 0);
+            this.layoutControlItem6.MaxSize = new System.Drawing.Size(88, 53);
+            this.layoutControlItem6.MinSize = new System.Drawing.Size(88, 53);
+            this.layoutControlItem6.Name = "layoutControlItem6";
+            this.layoutControlItem6.Size = new System.Drawing.Size(88, 53);
+            this.layoutControlItem6.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem6.TextVisible = false;
+            // 
+            // layoutControlItem10
+            // 
+            this.layoutControlItem10.Control = this.textEdit1;
+            this.layoutControlItem10.Location = new System.Drawing.Point(224, 42);
+            this.layoutControlItem10.Name = "layoutControlItem10";
+            this.layoutControlItem10.Size = new System.Drawing.Size(261, 72);
+            this.layoutControlItem10.Text = "分播台";
+            this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 22);
+            // 
+            // layoutControlItem3
+            // 
+            this.layoutControlItem3.Control = this.btnInitialCom;
+            this.layoutControlItem3.Location = new System.Drawing.Point(485, 53);
+            this.layoutControlItem3.MaxSize = new System.Drawing.Size(88, 49);
+            this.layoutControlItem3.MinSize = new System.Drawing.Size(88, 49);
+            this.layoutControlItem3.Name = "layoutControlItem3";
+            this.layoutControlItem3.Size = new System.Drawing.Size(88, 61);
+            this.layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem3.TextVisible = false;
+            // 
             // tabbedControlGroup1
             // 
             this.tabbedControlGroup1.Location = new System.Drawing.Point(0, 269);
@@ -1046,7 +1045,7 @@
             // 
             this.txtLocation.Location = new System.Drawing.Point(0, 0);
             this.txtLocation.Name = "txtLocation";
-            this.txtLocation.Size = new System.Drawing.Size(100, 20);
+            this.txtLocation.Size = new System.Drawing.Size(100, 28);
             this.txtLocation.TabIndex = 0;
             // 
             // layoutControlGroup15
@@ -1059,7 +1058,7 @@
             // 
             this.textEdit2.Location = new System.Drawing.Point(196, 102);
             this.textEdit2.Name = "textEdit2";
-            this.textEdit2.Size = new System.Drawing.Size(60, 20);
+            this.textEdit2.Size = new System.Drawing.Size(60, 28);
             this.textEdit2.TabIndex = 11;
             // 
             // imageList1
@@ -1114,14 +1113,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup10)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem12)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
@@ -1133,6 +1124,14 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup10)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem12)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup8)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup4)).EndInit();

epick/SeedsOutService.resx

@@ -303,7 +303,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABM
-        CQAAAk1TRnQBSQFMAgEBAgEAAbgBBwG4AQcBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CQAAAk1TRnQBSQFMAgEBAgEAAdABBwHQAQcBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

epick/epick.csproj

@@ -126,11 +126,14 @@
     <Reference Include="log4net, Version=2.0.16.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
       <HintPath>..\packages\log4net.2.0.16\lib\net40\log4net.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Data.ConnectionUI.Dialog, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>D:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE\Microsoft.Data.ConnectionUI.Dialog.dll</HintPath>
+    <Reference Include="Microsoft.Data.ConnectionUI">
+      <HintPath>..\commonref\Microsoft.Data.ConnectionUI.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Office.Interop.Excel, Version=11.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c">
+    <Reference Include="Microsoft.Data.ConnectionUI.Dialog">
+      <HintPath>..\commonref\Microsoft.Data.ConnectionUI.Dialog.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Office.Interop.Excel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Office.Interop.Excel.15.0.4795.1001\lib\net20\Microsoft.Office.Interop.Excel.dll</HintPath>
       <EmbedInteropTypes>False</EmbedInteropTypes>
     </Reference>
     <Reference Include="Microsoft.ReportViewer.WinForms, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />

epick/packages.config

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="log4net" version="2.0.16" targetFramework="net40" />
+  <package id="Microsoft.Office.Interop.Excel" version="15.0.4795.1001" targetFramework="net40" />
   <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net40" />
 </packages>

epick/基类/BasicRibbonForm.cs

@@ -29,7 +29,7 @@ namespace DeiNiu.wms.win
                 InitializeComponent();
                 readPrinters();
           
-            }
+            }   
          
 
             protected void showWaitForm(string desc=null)
@@ -452,7 +452,7 @@ namespace DeiNiu.wms.win
         /// <returns></returns>
         public static string[] GetExcelSheetNames(string filePath)
         {
-            Microsoft.Office.Interop.Excel.ApplicationClass excelApp = new Microsoft.Office.Interop.Excel.ApplicationClass();
+            Microsoft.Office.Interop.Excel.ApplicationClass   excelApp = new Microsoft.Office.Interop.Excel.ApplicationClass();
             Microsoft.Office.Interop.Excel.Workbooks wbs = excelApp.Workbooks;
             Microsoft.Office.Interop.Excel.Workbook wb = wbs.Open(filePath, Type.Missing, Type.Missing, Type.Missing, Type.Missing,
             Type.Missing, Type.Missing, Type.Missing, Type.Missing, Type.Missing, Type.Missing,

epickHost/epickHost.csproj

@@ -105,12 +105,6 @@
     <Compile Include="Form1.Designer.cs">
       <DependentUpon>Form1.cs</DependentUpon>
     </Compile>
-    <Compile Include="OPC.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="OPC.Designer.cs">
-      <DependentUpon>OPC.cs</DependentUpon>
-    </Compile>
     <Compile Include="utils\ConfigurationOperator.cs" />
     <Compile Include="utils\Enums.cs" />
     <Compile Include="utils\Utils.cs" />
@@ -123,9 +117,6 @@
     <EmbeddedResource Include="Form1.resx">
       <DependentUpon>Form1.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="OPC.resx">
-      <DependentUpon>OPC.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
@@ -183,17 +174,6 @@
       <Install>true</Install>
     </BootstrapperPackage>
   </ItemGroup>
-  <ItemGroup>
-    <COMReference Include="OPCAutomation">
-      <Guid>{28E68F91-8D75-11D1-8DC3-3C302A000000}</Guid>
-      <VersionMajor>1</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>tlbimp</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </COMReference>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

epickService/epickService.csproj.user

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>false</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />

myLog/.vs/myLog.csproj.dtbcache.json

@@ -0,0 +1 @@
+{"RootPath":"D:\\vssrc\\myLog","ProjectFileName":"myLog.csproj","Configuration":"Release|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"BaseModel.cs"},{"SourceFile":"BaseModel_Imp.cs"},{"SourceFile":"Connection.cs"},{"SourceFile":"Execution.cs"},{"SourceFile":"Log.cs"},{"SourceFile":"Log_base.cs"},{"SourceFile":"Log_base_Imp.cs"},{"SourceFile":"Log_Imp.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"RequestLog.cs"},{"SourceFile":"obj\\Release\\.NETFramework,Version=v4.0.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\vssrc\\packages\\log4net.2.0.16\\lib\\net40\\log4net.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vssrc\\Utils\\bin\\Release\\Utils.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"D:\\vssrc\\Utils\\bin\\Release\\Utils.dll"}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\vssrc\\myLog\\bin\\Release\\myLog.dll","OutputItemRelativePath":"myLog.dll"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]}

view/Dict/AuthorityMain.aspx.cs

@@ -214,7 +214,7 @@ namespace ajax.Dict
             _logic.GetAuthority.auth_marqueen =  chkAlert.Checked;             
             _logic.GetAuthority.auth_special = chkSpecial.Checked;
             _logic.GetAuthority.auth_order = Convert.ToInt16( txtOrder.Text.Trim());
-             _logic.GetAuthority.dr = chkEnable.Checked;
+            // _logic.GetAuthority.dr = chkEnable.Checked;
 
 
         }

view/Web.config

@@ -13,7 +13,7 @@
 		<!--add key="SqlconnectionString" value="Data Source=MYTHINKPAD;Initial Catalog=zhangpu;Persist Security Info=True;User ID=sa;Password=a"/ -->
 		<!--add key="SqlconnectionString" value="Data Source=.\SQLEXPRESS;AttachDbFilename=E:\zp\Data100407\zhangpu_Data.MDF;Integrated Security=True;Connect Timeout=30;User Instance=True
 "/-->
-    <add key="SqlconnWms_erp" value="Data Source=ldj;Initial Catalog=custErp_suzou2;User ID=sa;Password=Es@cn09!"/>
+		<add key="SqlconnWms_erp" value="Data Source=ldj;Initial Catalog=custErp_suzou2;User ID=sa;Password=Es@cn09!"/>
 		<add key="SqlconnWMS" value="Data Source=ldj;Initial Catalog=wmsuzhou2;User ID=sa;Password=Es@cn09!"/>
 		<add key="SqlconnPlatform" value="Data Source=ldj;Initial Catalog=deiniuPlatform;User ID=sa;Password=Es@cn09! "/>
 		<add key="SqlLog" value="Off"/>
@@ -37,7 +37,12 @@
 				<add assembly="System.Transactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
 				<add assembly="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
 				<add assembly="System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/>
-			</assemblies>
+				<add assembly="DevExpress.Charts.v16.2.Core, Version=16.2.6.0, Culture=neutral, PublicKeyToken=B88D1754D700E49A"/>
+				<add assembly="DevExpress.Data.v16.2, Version=16.2.6.0, Culture=neutral, PublicKeyToken=B88D1754D700E49A"/>
+				<add assembly="DevExpress.Printing.v16.2.Core, Version=16.2.6.0, Culture=neutral, PublicKeyToken=B88D1754D700E49A"/>
+				<add assembly="DevExpress.Web.v16.2, Version=16.2.6.0, Culture=neutral, PublicKeyToken=B88D1754D700E49A"/>
+				<add assembly="DevExpress.XtraCharts.v16.2, Version=16.2.6.0, Culture=neutral, PublicKeyToken=B88D1754D700E49A"/>
+				<add assembly="DevExpress.XtraCharts.v16.2.Web, Version=16.2.6.0, Culture=neutral, PublicKeyToken=B88D1754D700E49A"/></assemblies>
 		</compilation>
 		<httpHandlers>
 			<add path="WebResource.axd" verb="GET" type="System.Web.Handlers.AssemblyResourceLoader" validate="true"/>