瀏覽代碼

添加SOP上传功能

callm 6 月之前
父節點
當前提交
d9cb0e6769

+ 310 - 147
UAS_MES_PNE/FunctionCode/Query/Query_SOP.Designer.cs

@@ -1,4 +1,6 @@
-namespace UAS_MES_NEW.Query
+using UAS_MES_NEW.CustomControl.TextBoxWithIcon;
+
+namespace UAS_MES_NEW.Query
 {
     partial class Query_SOP
     {
@@ -28,196 +30,357 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.components = new System.ComponentModel.Container();
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Query_SOP));
-            this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog();
+            this.richTextBox1 = new System.Windows.Forms.RichTextBox();
+            this.ChoosePath = new System.Windows.Forms.OpenFileDialog();
             this.label1 = new System.Windows.Forms.Label();
+            this.FilePath = new System.Windows.Forms.TextBox();
+            this.ChooseFile = new System.Windows.Forms.Button();
+            this.UploadSOP = new System.Windows.Forms.Button();
             this.label2 = new System.Windows.Forms.Label();
+            this.OperatResult = new System.Windows.Forms.RichTextBox();
+            this.SendSop = new System.Windows.Forms.Button();
             this.label3 = new System.Windows.Forms.Label();
-            this.label5 = new System.Windows.Forms.Label();
-            this.OperateResult = new UAS_MES_NEW.CustomControl.RichText.RichTextAutoBottom();
-            this.PrintLabel = new UAS_MES_NEW.CustomControl.ComBoxWithFocus.ComboxWithTip(this.components);
-            this.PrintList = new UAS_MES_NEW.CustomControl.ComBoxWithFocus.PrinterCombox();
-            this.PrintBarcode = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
-            this.pa_outboxcode = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SNCodeEnterTextBox();
-            this.ma_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SNCodeEnterTextBox();
-            this.comboBox1 = new System.Windows.Forms.ComboBox();
             this.label4 = new System.Windows.Forms.Label();
+            this.pr_detail = new System.Windows.Forms.Label();
+            this.JPG = new System.Windows.Forms.RadioButton();
+            this.pr_spec = new System.Windows.Forms.RichTextBox();
+            this.label5 = new System.Windows.Forms.Label();
+            this.SendDGV = new System.Windows.Forms.DataGridView();
+            this.ChooseALL = new System.Windows.Forms.Button();
+            this.ps_prodcode = new SearchTextBox();
+            this.li_code = new SearchTextBox();
+            this.GetSOP = new System.Windows.Forms.Button();
+            this.CheckColumn = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.fp_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.fp_path = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.psd_iskey = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.issend = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            ((System.ComponentModel.ISupportInitialize)(this.SendDGV)).BeginInit();
             this.SuspendLayout();
             // 
+            // richTextBox1
+            // 
+            this.richTextBox1.Location = new System.Drawing.Point(-43, -88);
+            this.richTextBox1.Name = "richTextBox1";
+            this.richTextBox1.Size = new System.Drawing.Size(100, 96);
+            this.richTextBox1.TabIndex = 5;
+            this.richTextBox1.Text = "";
+            // 
+            // ChoosePath
+            // 
+            this.ChoosePath.FileName = "ChoosePath";
+            // 
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.Location = new System.Drawing.Point(285, 421);
+            this.label1.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.label1.Location = new System.Drawing.Point(19, 448);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(101, 37);
-            this.label1.TabIndex = 1;
-            this.label1.Text = "工单号";
+            this.label1.Size = new System.Drawing.Size(146, 41);
+            this.label1.TabIndex = 6;
+            this.label1.Text = "SOP文件";
+            // 
+            // FilePath
+            // 
+            this.FilePath.Enabled = false;
+            this.FilePath.Location = new System.Drawing.Point(218, 453);
+            this.FilePath.Name = "FilePath";
+            this.FilePath.Size = new System.Drawing.Size(582, 35);
+            this.FilePath.TabIndex = 7;
+            // 
+            // ChooseFile
+            // 
+            this.ChooseFile.Location = new System.Drawing.Point(218, 666);
+            this.ChooseFile.Name = "ChooseFile";
+            this.ChooseFile.Size = new System.Drawing.Size(160, 42);
+            this.ChooseFile.TabIndex = 8;
+            this.ChooseFile.Text = "选择文件";
+            this.ChooseFile.UseVisualStyleBackColor = true;
+            this.ChooseFile.Click += new System.EventHandler(this.ChooseFile_Click);
+            // 
+            // UploadSOP
+            // 
+            this.UploadSOP.Location = new System.Drawing.Point(424, 666);
+            this.UploadSOP.Name = "UploadSOP";
+            this.UploadSOP.Size = new System.Drawing.Size(160, 42);
+            this.UploadSOP.TabIndex = 9;
+            this.UploadSOP.Text = "上传文件";
+            this.UploadSOP.UseVisualStyleBackColor = true;
+            this.UploadSOP.Click += new System.EventHandler(this.UploadSOP_Click);
             // 
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label2.Location = new System.Drawing.Point(270, 313);
+            this.label2.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.label2.Location = new System.Drawing.Point(19, 311);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(129, 37);
-            this.label2.TabIndex = 2;
-            this.label2.Text = "设备名称";
+            this.label2.Size = new System.Drawing.Size(82, 41);
+            this.label2.TabIndex = 10;
+            this.label2.Text = "机型";
+            // 
+            // OperatResult
+            // 
+            this.OperatResult.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.OperatResult.Location = new System.Drawing.Point(865, 841);
+            this.OperatResult.Name = "OperatResult";
+            this.OperatResult.Size = new System.Drawing.Size(1068, 381);
+            this.OperatResult.TabIndex = 12;
+            this.OperatResult.Text = "";
+            this.OperatResult.TextChanged += new System.EventHandler(this.OperatResult_TextChanged);
+            // 
+            // SendSop
+            // 
+            this.SendSop.Location = new System.Drawing.Point(640, 666);
+            this.SendSop.Name = "SendSop";
+            this.SendSop.Size = new System.Drawing.Size(160, 42);
+            this.SendSop.TabIndex = 13;
+            this.SendSop.Text = "广播SOP";
+            this.SendSop.UseVisualStyleBackColor = true;
+            this.SendSop.Click += new System.EventHandler(this.SendSop_Click);
             // 
             // label3
             // 
             this.label3.AutoSize = true;
-            this.label3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label3.Location = new System.Drawing.Point(229, 491);
+            this.label3.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.label3.Location = new System.Drawing.Point(19, 22);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(157, 37);
-            this.label3.TabIndex = 6;
-            this.label3.Text = "打印机列表";
+            this.label3.Size = new System.Drawing.Size(146, 41);
+            this.label3.TabIndex = 14;
+            this.label3.Text = "产品名称";
+            this.label3.Visible = false;
+            // 
+            // label4
+            // 
+            this.label4.AutoSize = true;
+            this.label4.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.label4.Location = new System.Drawing.Point(19, 115);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(146, 41);
+            this.label4.TabIndex = 15;
+            this.label4.Text = "产品规格";
+            this.label4.Visible = false;
+            // 
+            // pr_detail
+            // 
+            this.pr_detail.AutoSize = true;
+            this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.pr_detail.Location = new System.Drawing.Point(211, 22);
+            this.pr_detail.Name = "pr_detail";
+            this.pr_detail.Size = new System.Drawing.Size(0, 41);
+            this.pr_detail.TabIndex = 16;
+            this.pr_detail.Visible = false;
+            // 
+            // JPG
+            // 
+            this.JPG.AutoSize = true;
+            this.JPG.Checked = true;
+            this.JPG.Location = new System.Drawing.Point(251, 534);
+            this.JPG.Name = "JPG";
+            this.JPG.Size = new System.Drawing.Size(89, 28);
+            this.JPG.TabIndex = 18;
+            this.JPG.TabStop = true;
+            this.JPG.Text = "图片";
+            this.JPG.UseVisualStyleBackColor = true;
+            // 
+            // pr_spec
+            // 
+            this.pr_spec.Enabled = false;
+            this.pr_spec.Location = new System.Drawing.Point(218, 123);
+            this.pr_spec.Name = "pr_spec";
+            this.pr_spec.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.None;
+            this.pr_spec.Size = new System.Drawing.Size(580, 94);
+            this.pr_spec.TabIndex = 19;
+            this.pr_spec.Text = "";
+            this.pr_spec.Visible = false;
             // 
             // label5
             // 
             this.label5.AutoSize = true;
-            this.label5.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label5.Location = new System.Drawing.Point(257, 569);
+            this.label5.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.label5.Location = new System.Drawing.Point(19, 580);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(129, 37);
-            this.label5.TabIndex = 163;
-            this.label5.Text = "打印标签";
-            // 
-            // OperateResult
-            // 
-            this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperateResult.Location = new System.Drawing.Point(890, 254);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(6);
-            this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(504, 570);
-            this.OperateResult.TabIndex = 164;
-            this.OperateResult.Text = "";
-            // 
-            // PrintLabel
-            // 
-            this.PrintLabel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.PrintLabel.Font = new System.Drawing.Font("微软雅黑", 9F);
-            this.PrintLabel.FormattingEnabled = true;
-            this.PrintLabel.Location = new System.Drawing.Point(416, 571);
-            this.PrintLabel.Margin = new System.Windows.Forms.Padding(4);
-            this.PrintLabel.Name = "PrintLabel";
-            this.PrintLabel.Size = new System.Drawing.Size(378, 39);
-            this.PrintLabel.TabIndex = 161;
-            // 
-            // PrintList
-            // 
-            this.PrintList.Location = new System.Drawing.Point(416, 491);
-            this.PrintList.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
-            this.PrintList.Name = "PrintList";
-            this.PrintList.Size = new System.Drawing.Size(378, 45);
-            this.PrintList.TabIndex = 5;
-            // 
-            // PrintBarcode
-            // 
-            this.PrintBarcode.AllPower = null;
-            this.PrintBarcode.BackColor = System.Drawing.Color.Transparent;
-            this.PrintBarcode.DownImage = ((System.Drawing.Image)(resources.GetObject("PrintBarcode.DownImage")));
-            this.PrintBarcode.Image = null;
-            this.PrintBarcode.IsShowBorder = true;
-            this.PrintBarcode.Location = new System.Drawing.Point(464, 652);
-            this.PrintBarcode.MoveImage = ((System.Drawing.Image)(resources.GetObject("PrintBarcode.MoveImage")));
-            this.PrintBarcode.Name = "PrintBarcode";
-            this.PrintBarcode.NormalImage = ((System.Drawing.Image)(resources.GetObject("PrintBarcode.NormalImage")));
-            this.PrintBarcode.Power = null;
-            this.PrintBarcode.Size = new System.Drawing.Size(150, 50);
-            this.PrintBarcode.TabIndex = 4;
-            this.PrintBarcode.Text = "打印";
-            this.PrintBarcode.UseVisualStyleBackColor = false;
-            this.PrintBarcode.Click += new System.EventHandler(this.Print_Click);
-            // 
-            // pa_outboxcode
-            // 
-            this.pa_outboxcode.AllPower = null;
-            this.pa_outboxcode.ID = null;
-            this.pa_outboxcode.Location = new System.Drawing.Point(416, 315);
-            this.pa_outboxcode.Name = "pa_outboxcode";
-            this.pa_outboxcode.Power = null;
-            this.pa_outboxcode.Size = new System.Drawing.Size(283, 35);
-            this.pa_outboxcode.Str = null;
-            this.pa_outboxcode.Str1 = null;
-            this.pa_outboxcode.Str2 = null;
-            this.pa_outboxcode.TabIndex = 3;
-            // 
-            // ma_code
-            // 
-            this.ma_code.AllPower = null;
-            this.ma_code.ID = null;
-            this.ma_code.Location = new System.Drawing.Point(416, 423);
-            this.ma_code.Name = "ma_code";
-            this.ma_code.Power = null;
-            this.ma_code.Size = new System.Drawing.Size(283, 35);
-            this.ma_code.Str = null;
-            this.ma_code.Str1 = null;
-            this.ma_code.Str2 = null;
-            this.ma_code.TabIndex = 0;
-            this.ma_code.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Sn_KeyDown);
-            // 
-            // comboBox1
-            // 
-            this.comboBox1.FormattingEnabled = true;
-            this.comboBox1.Location = new System.Drawing.Point(416, 244);
-            this.comboBox1.Name = "comboBox1";
-            this.comboBox1.Size = new System.Drawing.Size(283, 32);
-            this.comboBox1.TabIndex = 165;
+            this.label5.Size = new System.Drawing.Size(82, 41);
+            this.label5.TabIndex = 20;
+            this.label5.Text = "线别";
             // 
-            // label4
+            // SendDGV
             // 
-            this.label4.AutoSize = true;
-            this.label4.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label4.Location = new System.Drawing.Point(257, 238);
-            this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(142, 37);
-            this.label4.TabIndex = 166;
-            this.label4.Text = "MAC地址";
+            this.SendDGV.AllowUserToAddRows = false;
+            this.SendDGV.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.SendDGV.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.SendDGV.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.CheckColumn,
+            this.fp_name,
+            this.fp_path,
+            this.psd_iskey,
+            this.issend});
+            this.SendDGV.Location = new System.Drawing.Point(865, 61);
+            this.SendDGV.Name = "SendDGV";
+            this.SendDGV.RowHeadersWidth = 82;
+            this.SendDGV.RowTemplate.Height = 37;
+            this.SendDGV.Size = new System.Drawing.Size(1068, 759);
+            this.SendDGV.TabIndex = 22;
+            // 
+            // ChooseALL
+            // 
+            this.ChooseALL.Location = new System.Drawing.Point(865, 61);
+            this.ChooseALL.Name = "ChooseALL";
+            this.ChooseALL.Size = new System.Drawing.Size(80, 42);
+            this.ChooseALL.TabIndex = 23;
+            this.ChooseALL.Text = "全选";
+            this.ChooseALL.UseVisualStyleBackColor = true;
+            this.ChooseALL.Click += new System.EventHandler(this.ChooseALL_Click);
+            // 
+            // ps_prodcode
+            // 
+            this.ps_prodcode.AllPower = null;
+            this.ps_prodcode.Caller = null;
+            this.ps_prodcode.Condition = null;
+            this.ps_prodcode.DBTitle = null;
+            this.ps_prodcode.FormName = null;
+            this.ps_prodcode.Location = new System.Drawing.Point(216, 311);
+            this.ps_prodcode.Name = "ps_prodcode";
+            this.ps_prodcode.Power = null;
+            this.ps_prodcode.ReturnData = null;
+            this.ps_prodcode.SelectField = null;
+            this.ps_prodcode.SetValueField = null;
+            this.ps_prodcode.Size = new System.Drawing.Size(582, 41);
+            this.ps_prodcode.TabIndex = 24;
+            this.ps_prodcode.TableName = null;
+            this.ps_prodcode.TextBoxEnable = false;
+            this.ps_prodcode.UserControlTextChanged += new SearchTextBox.OnTextChange(this.ps_prodcode_UserControlTextChanged);
+            // 
+            // li_code
+            // 
+            this.li_code.AllPower = null;
+            this.li_code.Caller = null;
+            this.li_code.Condition = null;
+            this.li_code.DBTitle = null;
+            this.li_code.FormName = null;
+            this.li_code.Location = new System.Drawing.Point(218, 580);
+            this.li_code.Name = "li_code";
+            this.li_code.Power = null;
+            this.li_code.ReturnData = null;
+            this.li_code.SelectField = null;
+            this.li_code.SetValueField = null;
+            this.li_code.Size = new System.Drawing.Size(582, 41);
+            this.li_code.TabIndex = 25;
+            this.li_code.TableName = null;
+            this.li_code.TextBoxEnable = false;
+            // 
+            // GetSOP
+            // 
+            this.GetSOP.Location = new System.Drawing.Point(638, 379);
+            this.GetSOP.Name = "GetSOP";
+            this.GetSOP.Size = new System.Drawing.Size(160, 42);
+            this.GetSOP.TabIndex = 26;
+            this.GetSOP.Text = "获取SOP";
+            this.GetSOP.UseVisualStyleBackColor = true;
+            this.GetSOP.Click += new System.EventHandler(this.GetSOP_Click);
+            // 
+            // CheckColumn
             // 
-            // Query_SOP
+            this.CheckColumn.DataPropertyName = "CheckColumn";
+            this.CheckColumn.HeaderText = "勾选";
+            this.CheckColumn.MinimumWidth = 100;
+            this.CheckColumn.Name = "CheckColumn";
+            this.CheckColumn.Width = 200;
+            // 
+            // fp_name
+            // 
+            this.fp_name.DataPropertyName = "fp_name";
+            this.fp_name.HeaderText = "文件名";
+            this.fp_name.MinimumWidth = 10;
+            this.fp_name.Name = "fp_name";
+            this.fp_name.Width = 200;
+            // 
+            // fp_path
+            // 
+            this.fp_path.DataPropertyName = "fp_path";
+            this.fp_path.HeaderText = "路径";
+            this.fp_path.MinimumWidth = 10;
+            this.fp_path.Name = "fp_path";
+            this.fp_path.Width = 200;
+            // 
+            // psd_iskey
+            // 
+            this.psd_iskey.DataPropertyName = "psd_iskey";
+            this.psd_iskey.HeaderText = "是否关键工序";
+            this.psd_iskey.MinimumWidth = 10;
+            this.psd_iskey.Name = "psd_iskey";
+            this.psd_iskey.Width = 200;
+            // 
+            // issend
+            // 
+            this.issend.DataPropertyName = "issend";
+            this.issend.HeaderText = "是否成功发送";
+            this.issend.MinimumWidth = 10;
+            this.issend.Name = "issend";
+            this.issend.Visible = false;
+            this.issend.Width = 200;
+            // 
+            // SOP
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1494, 1075);
-            this.Controls.Add(this.label4);
-            this.Controls.Add(this.comboBox1);
-            this.Controls.Add(this.OperateResult);
+            this.ClientSize = new System.Drawing.Size(1945, 1234);
+            this.Controls.Add(this.GetSOP);
+            this.Controls.Add(this.li_code);
+            this.Controls.Add(this.ps_prodcode);
+            this.Controls.Add(this.ChooseALL);
+            this.Controls.Add(this.SendDGV);
             this.Controls.Add(this.label5);
-            this.Controls.Add(this.PrintLabel);
+            this.Controls.Add(this.pr_spec);
+            this.Controls.Add(this.JPG);
+            this.Controls.Add(this.pr_detail);
+            this.Controls.Add(this.label4);
             this.Controls.Add(this.label3);
-            this.Controls.Add(this.PrintList);
-            this.Controls.Add(this.PrintBarcode);
-            this.Controls.Add(this.pa_outboxcode);
+            this.Controls.Add(this.SendSop);
+            this.Controls.Add(this.OperatResult);
             this.Controls.Add(this.label2);
+            this.Controls.Add(this.UploadSOP);
+            this.Controls.Add(this.ChooseFile);
+            this.Controls.Add(this.FilePath);
             this.Controls.Add(this.label1);
-            this.Controls.Add(this.ma_code);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(6);
-            this.Name = "Query_SOP";
-            this.Tag = "Query!SOP";
-            this.Text = "Query_SpecialReport";
-            this.Load += new System.EventHandler(this.Query_SpecialReport_Load);
+            this.Controls.Add(this.richTextBox1);
+            this.Name = "SOP";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            this.Text = "SOP管理";
+            this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
+            this.Load += new System.EventHandler(this.Form3_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.SendDGV)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
         }
 
         #endregion
-        private System.Windows.Forms.FolderBrowserDialog folderBrowserDialog1;
-        private CustomControl.TextBoxWithIcon.SNCodeEnterTextBox ma_code;
+        private System.Windows.Forms.RichTextBox richTextBox1;
+        private System.Windows.Forms.OpenFileDialog ChoosePath;
         private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.TextBox FilePath;
+        private System.Windows.Forms.Button ChooseFile;
+        private System.Windows.Forms.Button UploadSOP;
         private System.Windows.Forms.Label label2;
-        private CustomControl.TextBoxWithIcon.SNCodeEnterTextBox pa_outboxcode;
-        private CustomControl.ButtonUtil.NormalButton PrintBarcode;
-        private CustomControl.ComBoxWithFocus.PrinterCombox PrintList;
+        private System.Windows.Forms.RichTextBox OperatResult;
+        private System.Windows.Forms.Button SendSop;
         private System.Windows.Forms.Label label3;
-        private CustomControl.ComBoxWithFocus.ComboxWithTip PrintLabel;
-        private System.Windows.Forms.Label label5;
-        private CustomControl.RichText.RichTextAutoBottom OperateResult;
-        private System.Windows.Forms.ComboBox comboBox1;
         private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.Label pr_detail;
+        private System.Windows.Forms.RadioButton JPG;
+        private System.Windows.Forms.RichTextBox pr_spec;
+        private System.Windows.Forms.Label label5;
+        private System.Windows.Forms.DataGridView SendDGV;
+        private System.Windows.Forms.Button ChooseALL;
+        private SearchTextBox ps_prodcode;
+        private SearchTextBox li_code;
+        private System.Windows.Forms.Button GetSOP;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn CheckColumn;
+        private System.Windows.Forms.DataGridViewTextBoxColumn fp_name;
+        private System.Windows.Forms.DataGridViewTextBoxColumn fp_path;
+        private System.Windows.Forms.DataGridViewTextBoxColumn psd_iskey;
+        private System.Windows.Forms.DataGridViewTextBoxColumn issend;
     }
 }

+ 406 - 44
UAS_MES_PNE/FunctionCode/Query/Query_SOP.cs

@@ -1,98 +1,460 @@
-using Seagull.BarTender.Print;
-using System;
+using System;
+using System.IO;
+using System.Text;
+using System.Windows.Forms;
+using System.Net;
 using System.Collections.Generic;
-using System.ComponentModel;
+using System.Threading;
 using System.Data;
+using System.Drawing.Imaging;
 using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
-using UAS_MES_NEW.DataOperate;
 using UAS_MES_NEW.Entity;
 using UAS_MES_NEW.PublicMethod;
+using Aspose.Cells;
+using UAS_MES_NEW.DataOperate;
+using UAS_MES_NEW.PublicForm;
+using Aspose.Cells.Drawing;
+using Aspose.Cells.Rendering;
+using System.Web.Script.Serialization;
 
 namespace UAS_MES_NEW.Query
 {
     public partial class Query_SOP : Form
     {
+        DataHelper dh;
 
-        DataHelper dh = SystemInf.dh;
-
-        Engine engine;
+        string usercode;
+        string sourcecode;
+        DataTable Dbfind;
 
         public Query_SOP()
         {
+            usercode = "";
+            sourcecode = "";
             InitializeComponent();
         }
 
-        private void Export_Click(object sender, EventArgs e)
+        private void Form3_Load(object sender, EventArgs e)
         {
+            CheckForIllegalCrossThreadCalls = false;
 
+            ps_prodcode.TableName = "productsop";
+            ps_prodcode.SelectField = "ps_prodcode # SOP编号";
+            ps_prodcode.FormName = Name;
+            ps_prodcode.DBTitle = "SOP查询";
+            ps_prodcode.SetValueField = new string[] { "ps_prodcode" };
+            ps_prodcode.Condition = "";
+            ps_prodcode.DbChange += nr_rule_DBChange;
+
+            li_code.TableName = "line";
+            li_code.SelectField = "li_code # 线别编号,li_name # 线别名称";
+            li_code.FormName = Name;
+            li_code.DBTitle = "线别查询";
+            li_code.SetValueField = new string[] { "li_code" };
+            li_code.Condition = "";
+            li_code.DbChange += nr_rule_DBChange;
+            dh = SystemInf.dh;
         }
 
-        //选择导出Excel时是选择导出数据的还是模板
-        private void ExcelExport(string DataOrTemplet)
+        private void nr_rule_DBChange(object sender, EventArgs e)
         {
+            Dbfind = ps_prodcode.ReturnData;
+            BaseUtil.SetFormValue(this.Controls, Dbfind);
+        }
+
+
+        void uploadfile()
+        {
+            if (FilePath.Text == "")
+            {
+                MessageBox.Show("文件不能为空!");
+                return;
+            }
+            ps_prodcode.Text = FilePath.Text.Substring(FilePath.Text.LastIndexOf(@"\") + 1).Replace(".xls", "").Replace(".xlsx", "");
+            pr_code_Leave(new object(), new EventArgs());
+            DataTable dt = (DataTable)dh.ExecuteSql("select * from productsop where ps_prodcode='" + ps_prodcode.Text + "' ", "select");
+            if (dt.Rows.Count == 0)
+            {
+                string code = LogicHandler.GetPiInoutCode("ProductSOP", "1");
+                dh.ExecuteSql("insert into productsop(ps_id,ps_code,ps_prodcode,ps_indate,ps_inman,ps_status,ps_statuscode)values(productsop_seq.nextval,'" + code + "','" + ps_prodcode.Text + "',sysdate,'" + usercode + "','在录入','ENTERING')", "insert");
+            }
+            else
+            {
+                string ps_id = dt.Rows[0]["ps_id"].ToString();
+                dh.ExecuteSql("delete from ProductSOPdetail where psd_psid='" + ps_id + "'", "delete");
+                ps_prodcode.Text = dt.Rows[0]["ps_prodcode"].ToString();
+            }
 
+            Workbook workbook = new Workbook(FilePath.Text);
+            List<Worksheet> list = new List<Worksheet>();
+            List<string> filename = new List<string>();
+            dh.ExecuteSql("update ProductSOP set ps_attachsop='' where ps_prodcode='" + ps_prodcode.Text + "'", "update");
+            OperatResult.AppendText("一共Sheet: " + workbook.Worksheets.Count + "\n");
+            //try
+            //{
+            for (int i = 0; i < workbook.Worksheets.Count; i++)
+            {
+                if (workbook.Worksheets[i].Name != "物料清单")
+                {
+                    OperatResult.AppendText("正在解析Sheet" + workbook.Worksheets[i].Name + "\n");
+                    Worksheet she = workbook.Worksheets[i];
+                    if (JPG.Checked)
+                    {
+                        var myThread = new Thread(() => SaveFileToJPG(she));
+                        myThread.Start();
+                        filename.Add(she.Name + ".jpg");
+                    }
+                }
+            }
+            //}
+            //catch (Exception ex)
+            //{
+            //    OperatResult.AppendText(ex.Message + "\n");
+            //}
         }
-        DataTable _dt;
-        private void Query_SpecialReport_Load(object sender, EventArgs e)
+
+        private void SaveFileToJPG(Worksheet sheet)
         {
             try
             {
-                engine = new Engine(true);
+                //OperatResult.AppendText("解析图片【" + sheet.Name + ".jpg】添加水印" + "\n");
+                if (!Directory.Exists(Application.StartupPath + @"\" + ps_prodcode.Text))
+                {
+                    Directory.CreateDirectory(Application.StartupPath + @"\" + ps_prodcode.Text);
+                }
+                string sheetname = sheet.Name;
+                ProcessWorksheet(sheet, Application.StartupPath + @"\" + ps_prodcode.Text + @"\");
             }
-            catch (Exception)
+            catch (Exception ex)
             {
-                MessageBox.Show("未正确安装Bartender软件");
+                OperatResult.AppendText(ex.Message + ex.StackTrace);
             }
-            _dt = (DataTable)dh.ExecuteSql("select la_id,la_url,la_isdefault from label where la_prodcode='BQDY' and la_templatetype='卡通箱标' and la_statuscode='AUDITED' order by la_isdefault", "select");
-            PrintLabel.DataSource = _dt;
-            PrintLabel.DisplayMember = "la_url";
-            PrintLabel.ValueMember = "la_id";
         }
 
-        private void Sn_KeyDown(object sender, KeyEventArgs e)
+        /// <summary>
+        /// 请求上传图片到阿里云
+        /// </summary>
+        /// <param name="url">上传地址</param>
+        /// <param name="filepath">本地文件路径</param>
+        /// <param name="dic">上传的数据信息</param>
+        /// <returns></returns>
+        public string UploadFilesToRemoteUrl(string url1, string filepath, Dictionary<string, object> dic)
         {
-            if (e.KeyData == Keys.Enter)
+            try
             {
+                ServicePointManager.DefaultConnectionLimit = 50;
+
+                string boundary = DateTime.Now.Ticks.ToString("x");
+
+                byte[] boundarybytes = System.Text.Encoding.UTF8.GetBytes("--" + boundary + "\r\n");
 
+                HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url1);
+                request.Method = "POST";
+                request.Timeout = 10 * 10000;
+                request.ContentType = "multipart/form-data; boundary=" + boundary;
+
+                Stream rs = request.GetRequestStream();
+
+                var endBoundaryBytes = Encoding.UTF8.GetBytes("--" + boundary + "--\r\n");
+
+                string formdataTemplate = "Content-Disposition: form-data; name=\"{0}\"\r\n" + "\r\n" + "{1}" + "\r\n";
+                if (dic != null)
+                {
+                    foreach (string key in dic.Keys)
+                    {
+                        rs.Write(boundarybytes, 0, boundarybytes.Length);
+
+                        string formitem = string.Format(formdataTemplate, key, dic[key]);
+
+                        byte[] formitembytes = System.Text.Encoding.UTF8.GetBytes(formitem);
+
+                        rs.Write(formitembytes, 0, formitembytes.Length);
+                    }
+
+                }
+
+                string headerTemplate = "Content-Disposition: form-data; name=\"{0}\"; filename=\"{1}\"\r\n\r\n";
+                {
+                    rs.Write(boundarybytes, 0, boundarybytes.Length);
+
+                    var header = string.Format(headerTemplate, "file", Path.GetFileName(filepath));
+
+                    var headerbytes = System.Text.Encoding.UTF8.GetBytes(header);
+
+                    rs.Write(headerbytes, 0, headerbytes.Length);
+
+                    using (var fileStream = new FileStream(filepath, FileMode.Open, FileAccess.Read))
+                    {
+                        var buffer = new byte[1024];
+
+                        var bytesRead = 0;
+
+                        while ((bytesRead = fileStream.Read(buffer, 0, buffer.Length)) != 0)
+                        {
+                            rs.Write(buffer, 0, bytesRead);
+                        }
+                    }
+                    var cr = Encoding.UTF8.GetBytes("\r\n");
+
+                    rs.Write(cr, 0, cr.Length);
+                }
+
+                rs.Write(endBoundaryBytes, 0, endBoundaryBytes.Length);
+
+                var response = request.GetResponse() as HttpWebResponse;
+
+                StreamReader newReader = new StreamReader(response.GetResponseStream(), Encoding.UTF8);
+                string Content = newReader.ReadToEnd();
+                Dictionary<string, object> dic1 = new Dictionary<string, object>();
+                List<Dictionary<string, object>> dic2 = null;
+                dic1 = BaseUtil.ToDictionary(Content);
+                dic2 = dic1["data"] as List<Dictionary<string, object>>;
+                string fp_id = "";
+                if (dic2[0]["filepath"] != null)
+                {
+                    fp_id = dic2[0]["filepath"].ToString();
+                }
+                if (response.StatusCode == HttpStatusCode.OK)
+                {
+                    return fp_id;
+                }
+            }
+            catch (Exception e)
+            {
+                LogicHandler.DoCommandLog("SOP", usercode, "", "", sourcecode, "上传SOP", "上传失败", ps_prodcode.Text, "");
+                Console.WriteLine(e.Message + e.StackTrace);
             }
+            return "";
         }
 
-        private void Print_Click(object sender, EventArgs e)
+        private void ChooseFile_Click(object sender, EventArgs e)
         {
-            string makecode = dh.getFieldDataByCondition("package_view", "pa_makecode", "pa_outboxcode='" + pa_outboxcode.Text + "'").ToString();
-            if (makecode != "")
+            ChoosePath.Filter = "(*.xls)|*.xls|(*.xlsx)|*.xlsx";
+            DialogResult result = ChoosePath.ShowDialog();
+            if (result == DialogResult.OK)
             {
-                ma_code.Text = makecode;
+                FilePath.Text = ChoosePath.FileName;
             }
-            DataTable dt = (DataTable)dh.ExecuteSql("select * from package_view where pa_makecode='" + ma_code.Text + "'", "select");
-            string ErrorMessage = "";
-            string outboxcode = "";
-            if (dt.Rows.Count == 0)
+        }
+
+        private void UploadSOP_Click(object sender, EventArgs e)
+        {
+            Thread thread = new Thread(uploadfile);
+            SetLoadingWindow stw = new SetLoadingWindow(thread, "上传文件");
+            stw.StartPosition = FormStartPosition.CenterScreen;
+            stw.ShowDialog();
+            if (JPG.Checked)
             {
-                OperateResult.AppendText(">>工单" + ma_code.Text + "不存在装箱记录\n", Color.Black);
-                return;
+                LogicHandler.DoCommandLog("SOP", usercode, "", "", sourcecode, "上传SOP【图片格式】", "上传成功", ps_prodcode.Text, "");
             }
-            if (pa_outboxcode.Text != "")
+            else
             {
-                dt = (DataTable)dh.ExecuteSql("select * from package_view where pa_makecode='" + ma_code.Text + "' and pa_outboxcode='" + pa_outboxcode.Text + "'", "select");
-                if (dt.Rows.Count == 0)
+                LogicHandler.DoCommandLog("SOP", usercode, "", "", sourcecode, "上传SOP【PDF格式】", "上传成功", ps_prodcode.Text, "");
+            }
+        }
+
+        private void OperatResult_TextChanged(object sender, EventArgs e)
+        {
+            //OperatResult.SelectionStart = Text.Length;
+            OperatResult.ScrollToCaret();
+        }
+
+
+
+        private void SendSop_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                if (li_code.Text == "" || ps_prodcode.Text == "")
                 {
-                    OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "不存在装箱记录\n", Color.Black);
+                    MessageBox.Show("线别和SOP文档不能为空");
                     return;
                 }
+                if (SendDGV.Rows.Count > 0)
+                {
+                    List<Dictionary<string, string>> listr = new List<Dictionary<string, string>>();
+                    JavaScriptSerializer jss = new JavaScriptSerializer();
+                    Dictionary<string, object> map1 = new Dictionary<string, object>();
+                    Dictionary<string, object> map = new Dictionary<string, object>();
+                    string path;
+                    string pathroot = dh.GetConfig("filePathUrl", "sys").ToString();
+                    for (int i = 0; i < SendDGV.Rows.Count; i++)
+                    {
+                        if (SendDGV.Rows[i].Cells["CheckColumn"].FormattedValue.ToString().ToUpper() == "TRUE")
+                        {
+                            Dictionary<string, string> dic1 = new Dictionary<string, string>();
+                            path = SendDGV.Rows[i].Cells["fp_path"].Value.ToString();
+                            path = encryptBASE64(path.Replace("/app/uas/webapps/postattach", pathroot)).Replace("\\s*|\r|\n|\t", "");
+                            dic1.Add("path", path);
+                            dic1.Add("filename", SendDGV.Rows[i].Cells["fp_name"].Value.ToString().Replace(" ", "").Replace("(", "").Replace(")", ""));
+                            dic1.Add("ps_prodcode", ps_prodcode.Text);
+                            listr.Add(dic1);
+                            dh.ExecuteSql("insert into soprelease(SR_ID, SR_LINECODE, SR_PATH, SR_STATUS, SR_MACHINETYPE, SR_FILENAME,sr_ifkeyset)" +
+                          "values(soprelease_seq.nextval,'" + li_code.Text + "','" + path + "',0,'" + ps_prodcode.Text + "','" + SendDGV.Rows[i].Cells["fp_name"].Value.ToString().Replace(" ", "").Replace("(", "").Replace(")", "") + "','" + SendDGV.Rows[i].Cells["psd_iskey"].Value + "') ", "insert");
+                        }
+                    }
+                    LogicHandler.DoCommandLog("SOP", usercode, "", "", sourcecode, "广播SOP", "广播成功", ps_prodcode.Text, "");
+                    MessageBox.Show("文档[" + ps_prodcode.Text + "]下放成功");
+                }
+                else
+                {
+                    MessageBox.Show("产品编号" + ps_prodcode.Text + "未维护SOP文档");
+                    LogicHandler.DoCommandLog("SOP", usercode, "", "", sourcecode, "广播SOP", "广播失败,未维护SOP文档", ps_prodcode.Text, "");
+                }
+            }
+            catch (Exception ex)
+            {
+                LogicHandler.DoCommandLog("SOP", usercode, "", "", sourcecode, "广播SOP", "广播失败", ps_prodcode.Text, "");
+                Console.WriteLine(ex.Message + ex.StackTrace);
+            }
+        }
+
+        public string encryptBASE64(string key)
+        {
+            Console.WriteLine(key);
+            byte[] bytes = Encoding.Default.GetBytes(key);
+            return Convert.ToBase64String(bytes);
+        }
+
+        public static string EncodeBase64(string code_type, string code)
+        {
+            string encode = "";
+            byte[] bytes = Encoding.GetEncoding(code_type).GetBytes(code);
+            try
+            {
+                encode = Convert.ToBase64String(bytes);
+            }
+            catch
+            {
+                encode = code;
+            }
+            return encode;
+        }
+
+        private void pr_code_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter)
+            {
+                LoadPrCode();
+            }
+        }
+
+        private void LoadPrCode()
+        {
+            DataTable dt = (DataTable)dh.ExecuteSql("select * from productsop where ps_prodcode='" + ps_prodcode.Text + "'", "select");
+            if (dt.Rows.Count > 0)
+            {
+                string ps_id = dt.Rows[0]["ps_id"].ToString();
+                dt = (DataTable)dh.ExecuteSql("select fp_name,fp_path,'' issend,psd_iskey from ProductSOPdetail left join " +
+                    "filepath on FP_ID=substr(PSD_ATTACH,instr(PSD_ATTACH,';')+1)  where psd_psid=" + ps_id, "select");
+                if (dt.Rows.Count > 0)
+                {
+                    SendDGV.DataSource = dt;
+                }
             }
-            for (int i = 0; i < dt.Rows.Count; i++)
+        }
+
+        private void pr_code_Leave(object sender, EventArgs e)
+        {
+            //LoadPrCode();
+        }
+
+        bool AllChecked = false;
+        private void ChooseALL_Click(object sender, EventArgs e)
+        {
+            if (AllChecked)
             {
-                outboxcode = dt.Rows[i]["pa_outboxcode"].ToString();
-                if (Print.BarTender(Tag.ToString(), ref engine, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), PrintList.Text, outboxcode, 1, "", "", "卡通箱标", "0", out ErrorMessage))
+                foreach (DataGridViewRow dr in SendDGV.Rows)
+                    dr.Cells[0].Value = false;
+                AllChecked = false;
+            }
+            else
+            {
+                foreach (DataGridViewRow dr in SendDGV.Rows)
+                    dr.Cells[0].Value = true;
+                AllChecked = true;
+            }
+        }
+
+        private void ProcessWorksheet(Worksheet worksheet, string outputFolder)
+        {
+            // 获取工作表中的所有图片
+            List<Picture> pictures = new List<Picture>();
+            foreach (Aspose.Cells.Drawing.Picture picture in worksheet.Pictures)
+            {
+                pictures.Add(picture);
+            }
+
+            // 获取使用的行数
+            int totalRows = worksheet.Cells.MaxDataRow + 1;
+            int imageIndex = 1;
+
+            // 每30行生成一张图片
+            for (int startRow = 0; startRow < totalRows; startRow += 30)
+            {
+                int endRow = Math.Min(startRow + 29, totalRows - 1);
+
+                // 创建图片选项
+                ImageOrPrintOptions options = new ImageOrPrintOptions();
+                options.ImageFormat = ImageFormat.Png;
+                options.OnePagePerSheet = false;
+                options.PrintingPage = PrintingPageType.IgnoreBlank;
+
+                worksheet.PageSetup.PrintArea = $"A{startRow + 1}:AC{endRow + 1}";
+                // 设置只渲染指定的行范围
+
+                // 创建SheetRender对象
+                SheetRender sr = new SheetRender(worksheet, options);
+
+                string imagename = $"{worksheet.Name}_{imageIndex}.png";
+                // 获取渲染后的图像
+                Bitmap bitmap = sr.ToImage(0);
+                string imagePath = "";
+                // 如果有图片在当前行范围内,将它们添加到最终图像中
+                if (pictures.Count > 0)
+                {
+                    using (Bitmap finalImage = new Bitmap(bitmap.Width + 100, bitmap.Height))
+                    using (Graphics g = Graphics.FromImage(finalImage))
+                    {
+                        // 绘制Excel内容
+                        g.DrawImage(bitmap, 0, 0);
+
+                        // 绘制原始Excel中的图片
+                        int yOffset = bitmap.Height;
+                        // 保存图像
+                        imagePath = Path.Combine(outputFolder, $"{worksheet.Name}_{imageIndex}.png");
+                        finalImage.Save(imagePath, ImageFormat.Png);
+                        Console.WriteLine($"Saved: {imagePath}");
+                    }
+                }
+                else
                 {
-                    OperateResult.AppendText(">>开始打印箱号" + outboxcode + "\n", Color.Black);
-                    LogicHandler.DoCommandLog("LabelPrint", User.UserCode, makecode, User.UserLineCode, User.UserSourceCode, "包装标签打印", "打印成功", outboxcode, "");
+                    // 如果没有图片,直接保存渲染的图像
+                    imagePath = Path.Combine(outputFolder, $"{worksheet.Name}_{imageIndex}.png");
+                    bitmap.Save(imagePath, ImageFormat.Png);
+                    Console.WriteLine($"Saved: {imagePath}");
                 }
+                imageIndex++;
+                OperatResult.AppendText("解析图片【" + imagePath + ".jpg】" + "\n");
+                Dictionary<string, object> dic = new Dictionary<string, object>();
+                dic.Add("em_name", "管理员");
+                dic.Add("em_code", "ADMIN");
+                dic.Add("caller", "ProductSOP");
+                OperatResult.AppendText("上传文件【" + imagePath + ".jpg" + "】\n");
+                string fp_id = UploadFilesToRemoteUrl("http://120.24.241.233:8099/mes/MEScommon/uploadFiles.action?_noc=1", Application.StartupPath + @"\" + ps_prodcode.Text + @"\" + imagename, dic);
+                string ps_id = dh.getFieldDataByCondition("ProductSOP", "ps_id", "ps_prodcode='" + ps_prodcode.Text + "'").ToString();
+                dh.ExecuteSql("insert into ProductSOPdetail(psd_id,psd_psid,psd_attach) select ProductSOPdetail_seq.nextval,ps_id,'" + imagename + ";" + fp_id + "' from ProductSOP where ps_prodcode='" + ps_prodcode.Text + "'", "insert");
             }
         }
+
+        private void ps_prodcode_UserControlTextChanged(object sender, EventArgs e)
+        {
+            LoadPrCode();
+        }
+
+        private void GetSOP_Click(object sender, EventArgs e)
+        {
+            LoadPrCode();
+        }
     }
-}
+}

+ 16 - 40
UAS_MES_PNE/FunctionCode/Query/Query_SOP.resx

@@ -117,46 +117,22 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="folderBrowserDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="ChoosePath.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="PrintBarcode.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=
-</value>
-  </data>
-  <data name="PrintBarcode.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==
-</value>
-  </data>
-  <data name="PrintBarcode.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=
-</value>
-  </data>
+  <metadata name="CheckColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="fp_name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="fp_path.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="psd_iskey.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="issend.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
 </root>

二進制
UAS_MES_PNE/Tool/Aspose.Cells.dll


+ 13 - 9
UAS_MES_PNE/UAS_MES_PNE.csproj

@@ -76,6 +76,9 @@
     <StartupObject>UAS_MES_NEW.Program</StartupObject>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Aspose.Cells">
+      <HintPath>Tool\Aspose.Cells.dll</HintPath>
+    </Reference>
     <Reference Include="DevComponents.DotNetBar2, Version=6.7.2.0, Culture=neutral, PublicKeyToken=bd7258ab2241255c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>Tool\DevComponents.DotNetBar2.dll</HintPath>
@@ -164,6 +167,7 @@
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.Web" />
+    <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Web.Services" />
     <Reference Include="System.Windows.Forms.DataVisualization" />
     <Reference Include="System.Xml.Linq" />
@@ -1104,12 +1108,6 @@
     <Compile Include="FunctionCode\Query\Query_MacAddress.Designer.cs">
       <DependentUpon>Query_MacAddress.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\Query\Query_SOP.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="FunctionCode\Query\Query_SOP.Designer.cs">
-      <DependentUpon>Query_SOP.cs</DependentUpon>
-    </Compile>
     <Compile Include="FunctionCode\Query\Query_SpecialReport.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1122,6 +1120,12 @@
     <Compile Include="FunctionCode\Query\BarCodePrint.Designer.cs">
       <DependentUpon>BarCodePrint.cs</DependentUpon>
     </Compile>
+    <Compile Include="FunctionCode\Query\Query_SOP.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FunctionCode\Query\Query_SOP.Designer.cs">
+      <DependentUpon>Query_SOP.cs</DependentUpon>
+    </Compile>
     <Compile Include="FunctionCode\SMT\SMT_ChangeLine.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1869,15 +1873,15 @@
     <EmbeddedResource Include="FunctionCode\Query\Query_MacAddress.resx">
       <DependentUpon>Query_MacAddress.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="FunctionCode\Query\Query_SOP.resx">
-      <DependentUpon>Query_SOP.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Query\Query_SpecialReport.resx">
       <DependentUpon>Query_SpecialReport.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Query\BarCodePrint.resx">
       <DependentUpon>BarCodePrint.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Query\Query_SOP.resx">
+      <DependentUpon>Query_SOP.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\SMT\SMT_ChangeLine.resx">
       <DependentUpon>SMT_ChangeLine.cs</DependentUpon>
     </EmbeddedResource>