修改excel导出

UAS_MES_JH/DataOperate/ExcelHandler.cs

@@ -33,6 +33,23 @@ namespace UAS_MES_NEW.DataOperate
             return filePath;
         }
 
+        public string ExportExcel1(DataTable dt, string FolderPath)
+        {
+            //创建一个内存流，用来接收转换成Excel的内容
+            MemoryStream ms;
+            ms = DataTableToExcel(dt);
+            //以系统当前时间命名文件，FileMode.Create表示创建文件，FileAccess.Write表示拥有写的权限
+            string filePath = FolderPath;
+            FileStream fs = new FileStream(filePath, FileMode.Create, FileAccess.Write);
+            byte[] data = ms.ToArray();
+            fs.Write(data, 0, data.Length);
+            fs.Flush();
+            //释放当前Excel文件，否则打开文件的时候会显示文件被占用
+            ms.Dispose();
+            fs.Dispose();
+            return filePath;
+        }
+
 
         /// <summary>
         /// 导出Excel,返回文件在客户端的路径

UAS_MES_JH/FunctionCode/Query/Query_OnlineTraceBack.Designer.cs

@@ -46,6 +46,7 @@
             this.ms_status = new UAS_MES_NEW.CustomControl.ComBoxWithFocus.ComBoxWithFocus();
             this.SnInf = new UAS_MES_NEW.CustomControl.DataGrid_View.DataGridViewWithSerialNum();
             this.SN = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ms_outboxcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.状态 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.线别 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.当前工序 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -58,9 +59,10 @@
             // 
             this.ms_makecode_label.AutoSize = true;
             this.ms_makecode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_makecode_label.Location = new System.Drawing.Point(-3, 19);
+            this.ms_makecode_label.Location = new System.Drawing.Point(-6, 38);
+            this.ms_makecode_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ms_makecode_label.Name = "ms_makecode_label";
-            this.ms_makecode_label.Size = new System.Drawing.Size(58, 21);
+            this.ms_makecode_label.Size = new System.Drawing.Size(114, 41);
             this.ms_makecode_label.TabIndex = 198;
             this.ms_makecode_label.Text = "工单号";
             // 
@@ -68,9 +70,10 @@
             // 
             this.ms_status_label.AutoSize = true;
             this.ms_status_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_status_label.Location = new System.Drawing.Point(178, 20);
+            this.ms_status_label.Location = new System.Drawing.Point(356, 40);
+            this.ms_status_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ms_status_label.Name = "ms_status_label";
-            this.ms_status_label.Size = new System.Drawing.Size(64, 21);
+            this.ms_status_label.Size = new System.Drawing.Size(126, 41);
             this.ms_status_label.TabIndex = 197;
             this.ms_status_label.Text = "SN状态";
             // 
@@ -78,9 +81,10 @@
             // 
             this.ms_stepcode_label.AutoSize = true;
             this.ms_stepcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_stepcode_label.Location = new System.Drawing.Point(375, 21);
+            this.ms_stepcode_label.Location = new System.Drawing.Point(750, 42);
+            this.ms_stepcode_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ms_stepcode_label.Name = "ms_stepcode_label";
-            this.ms_stepcode_label.Size = new System.Drawing.Size(74, 21);
+            this.ms_stepcode_label.Size = new System.Drawing.Size(146, 41);
             this.ms_stepcode_label.TabIndex = 207;
             this.ms_stepcode_label.Text = "当前工序";
             // 
@@ -88,9 +92,10 @@
             // 
             this.ms_nextstepcode_label.AutoSize = true;
             this.ms_nextstepcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_nextstepcode_label.Location = new System.Drawing.Point(596, 21);
+            this.ms_nextstepcode_label.Location = new System.Drawing.Point(1192, 42);
+            this.ms_nextstepcode_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ms_nextstepcode_label.Name = "ms_nextstepcode_label";
-            this.ms_nextstepcode_label.Size = new System.Drawing.Size(74, 21);
+            this.ms_nextstepcode_label.Size = new System.Drawing.Size(146, 41);
             this.ms_nextstepcode_label.TabIndex = 209;
             this.ms_nextstepcode_label.Text = "下一工序";
             // 
@@ -98,9 +103,10 @@
             // 
             this.Count_label.AutoSize = true;
             this.Count_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Count_label.Location = new System.Drawing.Point(206, 531);
+            this.Count_label.Location = new System.Drawing.Point(412, 1062);
+            this.Count_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.Count_label.Name = "Count_label";
-            this.Count_label.Size = new System.Drawing.Size(106, 21);
+            this.Count_label.Size = new System.Drawing.Size(210, 41);
             this.Count_label.TabIndex = 212;
             this.Count_label.Text = "当前状态总计";
             // 
@@ -108,18 +114,20 @@
             // 
             this.Count.AutoSize = true;
             this.Count.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Count.Location = new System.Drawing.Point(311, 531);
+            this.Count.Location = new System.Drawing.Point(622, 1062);
+            this.Count.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.Count.Name = "Count";
-            this.Count.Size = new System.Drawing.Size(0, 21);
+            this.Count.Size = new System.Drawing.Size(0, 41);
             this.Count.TabIndex = 213;
             // 
             // ma_qty_label
             // 
             this.ma_qty_label.AutoSize = true;
             this.ma_qty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_qty_label.Location = new System.Drawing.Point(3, 531);
+            this.ma_qty_label.Location = new System.Drawing.Point(6, 1062);
+            this.ma_qty_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ma_qty_label.Name = "ma_qty_label";
-            this.ma_qty_label.Size = new System.Drawing.Size(74, 21);
+            this.ma_qty_label.Size = new System.Drawing.Size(146, 41);
             this.ma_qty_label.TabIndex = 214;
             this.ma_qty_label.Text = "工单数量";
             // 
@@ -127,9 +135,10 @@
             // 
             this.ma_qty.AutoSize = true;
             this.ma_qty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_qty.Location = new System.Drawing.Point(78, 531);
+            this.ma_qty.Location = new System.Drawing.Point(156, 1062);
+            this.ma_qty.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ma_qty.Name = "ma_qty";
-            this.ma_qty.Size = new System.Drawing.Size(0, 21);
+            this.ma_qty.Size = new System.Drawing.Size(0, 41);
             this.ma_qty.TabIndex = 215;
             // 
             // normalButton1
@@ -139,12 +148,13 @@
             this.normalButton1.DownImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.DownImage")));
             this.normalButton1.Image = null;
             this.normalButton1.IsShowBorder = true;
-            this.normalButton1.Location = new System.Drawing.Point(873, 20);
+            this.normalButton1.Location = new System.Drawing.Point(1746, 40);
+            this.normalButton1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.normalButton1.MoveImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.MoveImage")));
             this.normalButton1.Name = "normalButton1";
             this.normalButton1.NormalImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.NormalImage")));
             this.normalButton1.Power = null;
-            this.normalButton1.Size = new System.Drawing.Size(61, 24);
+            this.normalButton1.Size = new System.Drawing.Size(122, 48);
             this.normalButton1.TabIndex = 216;
             this.normalButton1.Text = "导出";
             this.normalButton1.UseVisualStyleBackColor = false;
@@ -158,13 +168,14 @@
             this.ma_code.DBTitle = "";
             this.ma_code.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.ma_code.FormName = null;
-            this.ma_code.Location = new System.Drawing.Point(53, 19);
+            this.ma_code.Location = new System.Drawing.Point(106, 38);
+            this.ma_code.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.ma_code.Name = "ma_code";
             this.ma_code.Power = "";
             this.ma_code.ReturnData = null;
             this.ma_code.SelectField = null;
             this.ma_code.SetValueField = null;
-            this.ma_code.Size = new System.Drawing.Size(119, 23);
+            this.ma_code.Size = new System.Drawing.Size(238, 46);
             this.ma_code.TabIndex = 211;
             this.ma_code.TableName = null;
             this.ma_code.Tag = "makecode";
@@ -175,11 +186,11 @@
             this.ms_nextstepcode.AllPower = null;
             this.ms_nextstepcode.BackColor = System.Drawing.Color.White;
             this.ms_nextstepcode.ID = null;
-            this.ms_nextstepcode.Location = new System.Drawing.Point(671, 21);
-            this.ms_nextstepcode.Margin = new System.Windows.Forms.Padding(2);
+            this.ms_nextstepcode.Location = new System.Drawing.Point(1342, 42);
+            this.ms_nextstepcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ms_nextstepcode.Name = "ms_nextstepcode";
             this.ms_nextstepcode.Power = null;
-            this.ms_nextstepcode.Size = new System.Drawing.Size(126, 21);
+            this.ms_nextstepcode.Size = new System.Drawing.Size(248, 35);
             this.ms_nextstepcode.Str = null;
             this.ms_nextstepcode.Str1 = null;
             this.ms_nextstepcode.Str2 = null;
@@ -191,11 +202,11 @@
             this.ms_stepcode.AllPower = null;
             this.ms_stepcode.BackColor = System.Drawing.Color.White;
             this.ms_stepcode.ID = null;
-            this.ms_stepcode.Location = new System.Drawing.Point(450, 21);
-            this.ms_stepcode.Margin = new System.Windows.Forms.Padding(2);
+            this.ms_stepcode.Location = new System.Drawing.Point(900, 42);
+            this.ms_stepcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ms_stepcode.Name = "ms_stepcode";
             this.ms_stepcode.Power = null;
-            this.ms_stepcode.Size = new System.Drawing.Size(126, 21);
+            this.ms_stepcode.Size = new System.Drawing.Size(248, 35);
             this.ms_stepcode.Str = null;
             this.ms_stepcode.Str1 = null;
             this.ms_stepcode.Str2 = null;
@@ -209,13 +220,13 @@
             this.Query.DownImage = ((System.Drawing.Image)(resources.GetObject("Query.DownImage")));
             this.Query.Image = null;
             this.Query.IsShowBorder = true;
-            this.Query.Location = new System.Drawing.Point(801, 22);
-            this.Query.Margin = new System.Windows.Forms.Padding(2);
+            this.Query.Location = new System.Drawing.Point(1602, 44);
+            this.Query.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Query.MoveImage = ((System.Drawing.Image)(resources.GetObject("Query.MoveImage")));
             this.Query.Name = "Query";
             this.Query.NormalImage = ((System.Drawing.Image)(resources.GetObject("Query.NormalImage")));
             this.Query.Power = null;
-            this.Query.Size = new System.Drawing.Size(56, 22);
+            this.Query.Size = new System.Drawing.Size(112, 44);
             this.Query.TabIndex = 206;
             this.Query.Text = "查询";
             this.Query.UseVisualStyleBackColor = false;
@@ -225,10 +236,10 @@
             // 
             this.ms_status.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.ms_status.FormattingEnabled = true;
-            this.ms_status.Location = new System.Drawing.Point(244, 21);
-            this.ms_status.Margin = new System.Windows.Forms.Padding(2);
+            this.ms_status.Location = new System.Drawing.Point(488, 42);
+            this.ms_status.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ms_status.Name = "ms_status";
-            this.ms_status.Size = new System.Drawing.Size(126, 20);
+            this.ms_status.Size = new System.Drawing.Size(248, 32);
             this.ms_status.TabIndex = 205;
             this.ms_status.Tag = "ms_status";
             this.ms_status.SelectedIndexChanged += new System.EventHandler(this.ms_status_SelectedIndexChanged);
@@ -241,63 +252,86 @@
             this.SnInf.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.SnInf.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.SN,
+            this.ms_outboxcode,
             this.状态,
             this.线别,
             this.当前工序,
             this.下一工序,
             this.当前途程});
             this.SnInf.EnableContentClick = true;
-            this.SnInf.Location = new System.Drawing.Point(0, 56);
+            this.SnInf.Location = new System.Drawing.Point(0, 112);
+            this.SnInf.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.SnInf.Name = "SnInf";
+            this.SnInf.RowHeadersWidth = 82;
             this.SnInf.RowTemplate.Height = 23;
-            this.SnInf.Size = new System.Drawing.Size(946, 472);
+            this.SnInf.Size = new System.Drawing.Size(1892, 944);
             this.SnInf.TabIndex = 203;
             // 
             // SN
             // 
             this.SN.DataPropertyName = "SN";
             this.SN.HeaderText = "SN";
+            this.SN.MinimumWidth = 10;
             this.SN.Name = "SN";
+            this.SN.Width = 200;
+            // 
+            // ms_outboxcode
+            // 
+            this.ms_outboxcode.DataPropertyName = "ms_outboxcode";
+            this.ms_outboxcode.HeaderText = "箱号";
+            this.ms_outboxcode.MinimumWidth = 10;
+            this.ms_outboxcode.Name = "ms_outboxcode";
+            this.ms_outboxcode.Width = 200;
             // 
             // 状态
             // 
             this.状态.DataPropertyName = "状态";
             this.状态.HeaderText = "状态";
+            this.状态.MinimumWidth = 10;
             this.状态.Name = "状态";
             this.状态.ReadOnly = true;
+            this.状态.Width = 200;
             // 
             // 线别
             // 
             this.线别.DataPropertyName = "线别";
             this.线别.HeaderText = "线别";
+            this.线别.MinimumWidth = 10;
             this.线别.Name = "线别";
+            this.线别.Width = 200;
             // 
             // 当前工序
             // 
             this.当前工序.DataPropertyName = "当前工序";
             this.当前工序.HeaderText = "当前工序";
+            this.当前工序.MinimumWidth = 10;
             this.当前工序.Name = "当前工序";
             this.当前工序.ReadOnly = true;
+            this.当前工序.Width = 200;
             // 
             // 下一工序
             // 
             this.下一工序.DataPropertyName = "下一工序";
             this.下一工序.HeaderText = "下一工序";
+            this.下一工序.MinimumWidth = 10;
             this.下一工序.Name = "下一工序";
             this.下一工序.ReadOnly = true;
+            this.下一工序.Width = 200;
             // 
             // 当前途程
             // 
             this.当前途程.DataPropertyName = "当前途程";
             this.当前途程.HeaderText = "当前途程";
+            this.当前途程.MinimumWidth = 10;
             this.当前途程.Name = "当前途程";
             this.当前途程.ReadOnly = true;
+            this.当前途程.Width = 200;
             // 
             // Query_OnlineTraceBack
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(946, 555);
+            this.ClientSize = new System.Drawing.Size(1892, 1110);
             this.Controls.Add(this.normalButton1);
             this.Controls.Add(this.ma_qty);
             this.Controls.Add(this.ma_qty_label);
@@ -314,6 +348,7 @@
             this.Controls.Add(this.ms_makecode_label);
             this.Controls.Add(this.ms_status_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.Name = "Query_OnlineTraceBack";
             this.Tag = "Query!OnlineTraceBack";
             this.Text = " ";
@@ -343,6 +378,7 @@
         private CustomControl.ButtonUtil.NormalButton normalButton1;
         private System.Windows.Forms.FolderBrowserDialog folderBrowserDialog1;
         private System.Windows.Forms.DataGridViewTextBoxColumn SN;
+        private System.Windows.Forms.DataGridViewTextBoxColumn ms_outboxcode;
         private System.Windows.Forms.DataGridViewTextBoxColumn 状态;
         private System.Windows.Forms.DataGridViewTextBoxColumn 线别;
         private System.Windows.Forms.DataGridViewTextBoxColumn 当前工序;

UAS_MES_JH/FunctionCode/Query/Query_OnlineTraceBack.cs

@@ -77,7 +77,7 @@ namespace UAS_MES_NEW.Query
                 string condition = BaseUtil.GetScreenSqlCondition(ma_code, ms_stepcode, ms_nextstepcode);
                 string statuscode = ms_status.SelectedValue.ToString();
                 sql.Clear();
-                sql.Append("select distinct sncode SN,ms_linecode 线别,ms_stepcode 当前工序,ms_nextstepcode 下一工序,ms_craftcode 当前途程,makecode ms_makecode,  ");
+                sql.Append("select distinct sncode SN,ms_outboxcode,ms_linecode 线别,ms_stepcode 当前工序,ms_nextstepcode 下一工序,ms_craftcode 当前途程,makecode ms_makecode,  ");
                 sql.Append("case when ms_status is null then '未生产' when ms_status=0 then '已归属' when ms_status=1 then '在线' when ms_status=2 ");
                 sql.Append(" then '已完工' when ms_status=3 then '不良待维修' when ms_status=4 then '已报废' ");
                 sql.Append("else 'null' end 状态  from((select msd_sncode sncode,msd_makecode makecode,msd_type type ");

UAS_MES_JH/FunctionCode/Query/Query_OnlineTraceBack.resx

@@ -124,82 +124,85 @@
   <data name="normalButton1.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
-        GcRORxHklpAIBHLfbILV8XxeNsMznJ35F5vu+82kWYuILD4N7oq75roCw27sb/x5WBdc27btntY64o/i
-        DnZjPxy4S6A0R6PHO1WUNHc9ep4uxIXd2D8eP/XZowWUThBG+n3p0stsKbbJ0qFDFFfscQuUbpzm9Pqx
-        Eh8c4PGLkuX0Nl+LDw4GJckUTRaO+OBQo+SKpitXfHAwKClfZuuN+OBgUDJV0NzxxAeHM5TFxhffGUpe
-        aFp5n+KDg0FRfHH8nfjgUKPoktztXnxwMCgFX7xdID441ChlRf7+ID44GBTNl21wFB8capSqot0xFB8c
-        /lE6Wa70IU5oH0Ziw/5cFebpoPUwHPbL04nCJKUgisWF3dgPB3gABc9v7fvBoBcnaVKdvkha2I39cPjx
-        oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFfSURBVFhH5dhNTsJgFIXhM2WiCxL2oAEHrJKhQSYM
+        JIgzjSLIX0sRKPSPtl+Lo2uOgVbWcJu8CzhP8nVwISIAUAFwA+AWQFNh3M39lZMHrgDUu91uyxjji8KP
+        u7mfDgCuiVLt958fkjSTie3I62iqLu7m/sHgpQ2gRpSG6/nmc2bL23imtuHMkp0f5ADuidIMoljev+bq
+        o8PpH4NmcIjlY7JQHx0KlPCQyHBqqY8OJUqcyGhuq48OBUoUJzJeLNVHhwLlkKQysRz10eECZbpcqe8C
+        JU6NzJ1v9dGhQElSI9Zqoz46lCgmE3u9VR8dCpTUZOJsXPXRoUTJclltd+qjQ4FislzW7l59dChR8lw2
+        e099dDijNA5xYnZBKFvPVxv3x0lanA5qT71eOzsexQsjcf1AXdzN/XQ4H5l4fqs/djqtIIzC/Pgj2uJu
+        7i/Okf8O11UAd6c3pS3u5v6/w/UvTaFspAxAMh4AAAAASUVORK5CYII=
 </value>
   </data>
   <data name="normalButton1.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
-        CEIQBEIgVFiS9qXWoDmp4/fHzDmjM2a+vU/QqUVX0DvwXxxn9fwYXJwYEcXWNzIWt83dcq7AsBv7LXgA
-        ZI0r71/aaqjCJf8o7sFu7IcDFwdK4vimrv1oSZXRnArdQFzYjf3pQkOzRxIoVWc6X5X6M7ruBGIr9mbU
-        9MIVe9hAcXvBO125WnxwgMcXSpcPF20tPjgYlI5eUK6lxAcHg9Lmw3nTFx8cDEpLLSjr+OKDg0FpqojO
-        Gp744GBQ3vyITutT8cHBoDheRCe1ifjgYFBe+ZCxJ+KDg0GpT0NKv4zFBweDUpuEdFQdiQ8OBsXmw2Fl
-        JD44/KCM53TwNBQfHAzKMx/2Hgfig8M3SrXYUasUfz67DwOxYf9dV5urg+RWzta4aEnxn83OfV9c2I39
-        cIAHUOJceTNbUfmW94GX0sJu7IcDPH5fXCe4EvfXxe5/D7ux3yKi2CfkPhTy27lqkwAAAABJRU5ErkJg
-        gg==
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAF3SURBVFhH5djbSgJRFMbxHsP7wBfYT7jvu46QDIoI
+        C4QNQRAIgVBRSdpxpgZN83wYx5nZOjNqrvgEd73DGvhfzdX3g32ztohoS0iVElLtCakehVQdhmE39qfg
+        AZBtIdX70Y0TjsJ4SQw/7MZ+OAip0kDJnD3UdJAsyXIjKvWm7MJu7M+X6lpIlQWK3ZhEq8pgRvfdKdvK
+        /Rk1/XglpHKA0ulPF3Tb0eyDAzzWKL3pgq7bmn1wMChdPadiK2QfHAxKW8/pqhmwDw4GpRXOqdAI2AcH
+        g9IME7qs++yDg0H5DhK6qE3YBweD0vATOq967IODQfnyE1KOxz44GJTaJKb855h9cDAoVS+mU9tlHxwM
+        iuPFdGK57IPDH8o4ouO3EfvgYFA+xhEdvg7ZB4cNil3uhquc5dLBy5Bt2P/U0+Z0kN0tOhqHlpzt0v7z
+        gF3Yjf1w2ByZ0jjD7RSs8K7l/+Ant7Ab+8058t/hOiOkquBNMQy7sX99uP4F5D4U8hdr4uMAAAAASUVO
+        RK5CYII=
 </value>
   </data>
   <data name="normalButton1.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
-        4uUVEtTiPKVlom2wttM6IfF+15njXHRnL19jD/zFmanWV8zAEDNTp9OJS6/Sm2QUht3YH4cHtdvtF6k7
-        mUwG1tqd3FR3YTf2w0FKUVOu6XT68Xgw3+8PtWH/bDYbCkeLGo1Gz/d9JwzvrL0gCKx49KlerxtIBUGo
-        PjjAg2q1mqDc2fN99cEBHlStVk0oB+t56oMDPKhSqZggDNm1N/XBAR5ULpeNvGD46rrqgwM8qFQqGV8O
-        56ujPjjAg4rFosFL5ni5qA8O8KBCoWBuns/701l9cIAH5fN5QfF4dzipDw7woFwuZ+zN483+oD44wIOy
-        2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
-        zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
-        ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGpSURBVFhH5dg/ayJBGMfxB4YFXTARBAvBQhAsBEEQ
+        ZLnNzFu4I6aYV5kyF9tgbad1jrsYY9T4Z3fcnV2f45e38Sx8q6l+n2IWhpiZjDFVY8wPY8xPY4wVGHZj
+        fxUepLW+0Vrfz+fzR+fclgV+2I39cNBa31Icx/FisXi6XpnL8io27F8ul89xHN9RFEWTPM+ToihZet57
+        F0XRA43HYwsp7wvxwQEeNBqNbFmWnOW5+OAADxoOh7YoS3ZZJj44wIMGg4H1RcGpu4gPDvCgfr9vvfd8
+        TlPxwQEe1Ov1bO49H8+J+OAAD+p2uxaXzNfpJD44wIM6nY69ZDnvDkfxwQEe1G637SXLeLs/iA8O8KBW
+        q2XdJePNbi8+OMCDms2mxe9o/bkTHxzgQY1GwybO8WrzKT44wIPq9bpNUsdv64344AAPqtVq9pw6/vv+
+        IT44wIPCMJzsvg7Jv/UH/1m9iw3794ejC8PwgSqVyt3LbPZ8SpLvg9e3lbiwG/vhAA8KguA2CIL739Pp
+        42a73eNQWtiN/XCAB+GhVilVVUrFSqlfSikrMOzG/u+H6/+yQ4jdXN8e9AAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="Query.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
-        GcRORxHklpAIBHLfbILV8XxeNsMznJ35F5vu+82kWYuILD4N7oq75roCw27sb/x5WBdc27btntY64o/i
-        DnZjPxy4S6A0R6PHO1WUNHc9ep4uxIXd2D8eP/XZowWUThBG+n3p0stsKbbJ0qFDFFfscQuUbpzm9Pqx
-        Eh8c4PGLkuX0Nl+LDw4GJckUTRaO+OBQo+SKpitXfHAwKClfZuuN+OBgUDJV0NzxxAeHM5TFxhffGUpe
-        aFp5n+KDg0FRfHH8nfjgUKPoktztXnxwMCgFX7xdID441ChlRf7+ID44GBTNl21wFB8capSqot0xFB8c
-        /lE6Wa70IU5oH0Ziw/5cFebpoPUwHPbL04nCJKUgisWF3dgPB3gABc9v7fvBoBcnaVKdvkha2I39cPjx
-        oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFfSURBVFhH5dhNTsJgFIXhM2WiCxL2oAEHrJKhQSYM
+        JIgzjSLIX0sRKPSPtl+Lo2uOgVbWcJu8CzhP8nVwISIAUAFwA+AWQFNh3M39lZMHrgDUu91uyxjji8KP
+        u7mfDgCuiVLt958fkjSTie3I62iqLu7m/sHgpQ2gRpSG6/nmc2bL23imtuHMkp0f5ADuidIMoljev+bq
+        o8PpH4NmcIjlY7JQHx0KlPCQyHBqqY8OJUqcyGhuq48OBUoUJzJeLNVHhwLlkKQysRz10eECZbpcqe8C
+        JU6NzJ1v9dGhQElSI9Zqoz46lCgmE3u9VR8dCpTUZOJsXPXRoUTJclltd+qjQ4FislzW7l59dChR8lw2
+        e099dDijNA5xYnZBKFvPVxv3x0lanA5qT71eOzsexQsjcf1AXdzN/XQ4H5l4fqs/djqtIIzC/Pgj2uJu
+        7i/Okf8O11UAd6c3pS3u5v6/w/UvTaFspAxAMh4AAAAASUVORK5CYII=
 </value>
   </data>
   <data name="Query.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
-        CEIQBEIgVFiS9qXWoDmp4/fHzDmjM2a+vU/QqUVX0DvwXxxn9fwYXJwYEcXWNzIWt83dcq7AsBv7LXgA
-        ZI0r71/aaqjCJf8o7sFu7IcDFwdK4vimrv1oSZXRnArdQFzYjf3pQkOzRxIoVWc6X5X6M7ruBGIr9mbU
-        9MIVe9hAcXvBO125WnxwgMcXSpcPF20tPjgYlI5eUK6lxAcHg9Lmw3nTFx8cDEpLLSjr+OKDg0FpqojO
-        Gp744GBQ3vyITutT8cHBoDheRCe1ifjgYFBe+ZCxJ+KDg0GpT0NKv4zFBweDUpuEdFQdiQ8OBsXmw2Fl
-        JD44/KCM53TwNBQfHAzKMx/2Hgfig8M3SrXYUasUfz67DwOxYf9dV5urg+RWzta4aEnxn83OfV9c2I39
-        cIAHUOJceTNbUfmW94GX0sJu7IcDPH5fXCe4EvfXxe5/D7ux3yKi2CfkPhTy27lqkwAAAABJRU5ErkJg
-        gg==
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAF3SURBVFhH5djbSgJRFMbxHsP7wBfYT7jvu46QDIoI
+        C4QNQRAIgVBRSdpxpgZN83wYx5nZOjNqrvgEd73DGvhfzdX3g32ztohoS0iVElLtCakehVQdhmE39qfg
+        AZBtIdX70Y0TjsJ4SQw/7MZ+OAip0kDJnD3UdJAsyXIjKvWm7MJu7M+X6lpIlQWK3ZhEq8pgRvfdKdvK
+        /Rk1/XglpHKA0ulPF3Tb0eyDAzzWKL3pgq7bmn1wMChdPadiK2QfHAxKW8/pqhmwDw4GpRXOqdAI2AcH
+        g9IME7qs++yDg0H5DhK6qE3YBweD0vATOq967IODQfnyE1KOxz44GJTaJKb855h9cDAoVS+mU9tlHxwM
+        iuPFdGK57IPDH8o4ouO3EfvgYFA+xhEdvg7ZB4cNil3uhquc5dLBy5Bt2P/U0+Z0kN0tOhqHlpzt0v7z
+        gF3Yjf1w2ByZ0jjD7RSs8K7l/+Ant7Ab+8058t/hOiOkquBNMQy7sX99uP4F5D4U8hdr4uMAAAAASUVO
+        RK5CYII=
 </value>
   </data>
   <data name="Query.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
-        4uUVEtTiPKVlom2wttM6IfF+15njXHRnL19jD/zFmanWV8zAEDNTp9OJS6/Sm2QUht3YH4cHtdvtF6k7
-        mUwG1tqd3FR3YTf2w0FKUVOu6XT68Xgw3+8PtWH/bDYbCkeLGo1Gz/d9JwzvrL0gCKx49KlerxtIBUGo
-        PjjAg2q1mqDc2fN99cEBHlStVk0oB+t56oMDPKhSqZggDNm1N/XBAR5ULpeNvGD46rrqgwM8qFQqGV8O
-        56ujPjjAg4rFosFL5ni5qA8O8KBCoWBuns/701l9cIAH5fN5QfF4dzipDw7woFwuZ+zN483+oD44wIOy
-        2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
-        zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
-        ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGpSURBVFhH5dg/ayJBGMfxB4YFXTARBAvBQhAsBEEQ
+        ZLnNzFu4I6aYV5kyF9tgbad1jrsYY9T4Z3fcnV2f45e38Sx8q6l+n2IWhpiZjDFVY8wPY8xPY4wVGHZj
+        fxUepLW+0Vrfz+fzR+fclgV+2I39cNBa31Icx/FisXi6XpnL8io27F8ul89xHN9RFEWTPM+ToihZet57
+        F0XRA43HYwsp7wvxwQEeNBqNbFmWnOW5+OAADxoOh7YoS3ZZJj44wIMGg4H1RcGpu4gPDvCgfr9vvfd8
+        TlPxwQEe1Ov1bO49H8+J+OAAD+p2uxaXzNfpJD44wIM6nY69ZDnvDkfxwQEe1G637SXLeLs/iA8O8KBW
+        q2XdJePNbi8+OMCDms2mxe9o/bkTHxzgQY1GwybO8WrzKT44wIPq9bpNUsdv64344AAPqtVq9pw6/vv+
+        IT44wIPCMJzsvg7Jv/UH/1m9iw3794ejC8PwgSqVyt3LbPZ8SpLvg9e3lbiwG/vhAA8KguA2CIL739Pp
+        42a73eNQWtiN/XCAB+GhVilVVUrFSqlfSikrMOzG/u+H6/+yQ4jdXN8e9AAAAABJRU5ErkJggg==
 </value>
   </data>
   <metadata name="SN.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="ms_outboxcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="状态.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

UAS_MES_JH/FunctionCode/Special/Special_Reset.cs

@@ -256,7 +256,7 @@ namespace UAS_MES_NEW.Special
                 sql.Clear();
                 sql.Append("select ''箱号,'' SN from dual ");
                 dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-                eh.ExportExcel(dt, ExportFileDialog.SelectedPath + "\\导出模板.xls");
+                eh.ExportExcel1(dt, ExportFileDialog.SelectedPath + "\\导出模板.xls");
                 //string close = MessageBox.Show(this.ParentForm, "导出成功，是否打开文件", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
             }
         }