1.mes库更换为mes_modular库2.增加不同公司时的调用方式3,修改报告打开部分减少外部插件依赖4.mes库变更后的查询、优化、删除工程等现...

孙世强

2025-11-12 145be67a1a52c146c46f0b49ee4851e171782103

1.mes库更换为mes_modular库2.增加不同公司时的调用方式3,修改报告打开部分减少外部插件依赖4.mes库变更后的查询、优化、删除工程等现补工程相关操作时的小片状态问题

 optimize_patch/¶©µ¥ÅÅÑù¿Í»§¶Ë/EDIT/Packing/OnePacking.cs

@@ -1695,9 +1695,9 @@
                        rectpoly = new iTextSharp.text.Phrase(Sentences.juxingchengpin + (Setting.language == 0 ? "(无)" : "(None)"), smallsmallfont);
                        iTextSharp.text.pdf.ColumnText.ShowTextAligned(ConByte_Up, iTextSharp.text.Element.ALIGN_LEFT, rectpoly, 50, startheight - table.TotalHeight - 30 - tablelo.TotalHeight - 30 + 5 - optreport.TotalHeight - 30, 0);
                        //页脚
                        iTextSharp.text.Font grayfont = new iTextSharp.text.Font(baseFont, 10, iTextSharp.text.Font.NORMAL, iTextSharp.text.Color.GRAY);
                        iTextSharp.text.Phrase text = new iTextSharp.text.Phrase("技术支持：上海北玻自动化科技有限公司 www.northglass.com", grayfont);
                        iTextSharp.text.pdf.ColumnText.ShowTextAligned(ConByte_Up, iTextSharp.text.Element.ALIGN_LEFT, text, 390, 16, 0);
                        //iTextSharp.text.Font grayfont = new iTextSharp.text.Font(baseFont, 10, iTextSharp.text.Font.NORMAL, iTextSharp.text.Color.GRAY);
                        //iTextSharp.text.Phrase text = new iTextSharp.text.Phrase("技术支持：上海北玻自动化科技有限公司 www.northglass.com", grayfont);
                        //iTextSharp.text.pdf.ColumnText.ShowTextAligned(ConByte_Up, iTextSharp.text.Element.ALIGN_LEFT, text, 190, 16, 0);

                        document.NewPage();
                    }

 optimize_patch/¶©µ¥ÅÅÑù¿Í»§¶Ë/EDIT/ÈÎÎñ.cs

@@ -192,17 +192,6 @@

        }

        /// <summary>
        /// æ ¹æ®ç‰ˆæœ¬æ”¹å˜ç•Œé¢
        /// </summary>
        public void displayByVersion()
        {
            if (File.Exists(Application.StartupPath + "\\data\\ICO2.ico"))
            {
                this.Icon = new System.Drawing.Icon(Application.StartupPath + "\\data\\ICO2.ico");
                this.notifyIcon1.Icon = new System.Drawing.Icon(Application.StartupPath + "\\data\\ICO2.ico");
            }
        }

        #region ä¿å­˜å·¥ç¨‹æ–‡ä»¶
        public void SaveClick()

 optimize_patch/¶©µ¥ÅÅÑù¿Í»§¶Ë/EDIT/¹¦ÄÜ/¹¤³Ì¹ÜÀí.cs

@@ -561,7 +561,7 @@
                //PORJECT_STATE = dgvProject.CurrentRow.Cells["状态"].Value.ToString();

                OPERATION_PROJECT_NO = dgvProject.CurrentRow.Cells[1].Value.ToString();//"工程号"
                PORJECT_STATE = dgvProject.CurrentRow.Cells[6].Value.ToString();//"状态"
                PORJECT_STATE = dgvProject.CurrentRow.Cells[27].Value.ToString();//"状态"
            }



 optimize_patch/¶©µ¥ÅÅÑù¿Í»§¶Ë/EDIT/±¨¸æ.cs

@@ -1,22 +1,12 @@
using System;
using directPacking;
using PdfiumViewer;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Windows.Forms;
using System.IO;
using System.Threading;
using System.Text.RegularExpressions;
using directPacking;
using iTextSharp;
using iTextSharp.text.pdf;
using System.Diagnostics;
using System.Xml;
using System.Data.OleDb;
using System.Drawing.Drawing2D;
using System.IO;
using System.Windows.Forms;
using Utility;

namespace MyGlassEdit
@@ -34,6 +24,8 @@
        public event ShowProgress onChange;
        public int showIndex = 0;
        #endregion

        private PdfViewer pdfViewer;
        public void changed(int i)
        {
            onChange(i);
@@ -46,12 +38,7 @@
            onChange = showPro;
            parent = taskparent;
            pack = ä»»åŠ¡.pack;
            try
            {
                if (!Directory.Exists(directPacking.Setting.btdir))
                    Directory.CreateDirectory(directPacking.Setting.btdir);
            }
            catch { }

            if (Setting.language == 0)
            {
                originpoint.Items.Clear();
@@ -273,8 +260,6 @@
            }
            if (pack == null) return;
            Setting.printlabel = false;


        }


@@ -409,10 +394,24 @@
            }
            else
            {
                ReportPDF.LoadFile(filename);
                ReportPDF.setShowToolbar(true);
                ReportPDF.setZoom(100);
                ReportPDF.setShowScrollbars(true);
                try
                {
                    pdfViewer = new PdfViewer
                    {
                        Dock = DockStyle.Fill
                    };
                    this.palReport.Controls.Add(pdfViewer);
                    pdfViewer.Document = PdfiumViewer.PdfDocument.Load(filename);
                    //pdfViewer.ZoomMode = 1; // 120%缩放
                }
                catch (DllNotFoundException ex)
                {
                    globel.ShowErrorMessage($"缺失的模块: {ex.Message}");
                }
                //ReportPDF.LoadFile(filename);
                //ReportPDF.setShowToolbar(true);
                //ReportPDF.setZoom(100);
                //ReportPDF.setShowScrollbars(true);
            }
        }
        private void ä¸­é—´50页_Click(object sender, EventArgs e)
@@ -638,10 +637,11 @@
            }
            else
            {
                BiaoqianPDF.LoadFile(filename);
                BiaoqianPDF.setShowToolbar(true);
                BiaoqianPDF.setZoom(100);
                BiaoqianPDF.setShowScrollbars(true);
                BiaoqianPDF.Document = PdfiumViewer.PdfDocument.Load(filename);
                //BiaoqianPDF.LoadFile(filename);
                //BiaoqianPDF.setShowToolbar(true);
                //BiaoqianPDF.setZoom(100);
                //BiaoqianPDF.setShowScrollbars(true);
            }
        }
        private void å•ä¸ªæˆå“æ‰“印标签_Click(object sender, EventArgs e)
@@ -676,10 +676,12 @@
            Polygon poly = DB.getPolygonByRow(parent.polytable, row - 1, parent.cmbGlassType.Text.ToString(), Convert.ToInt32(parent.txtProjectNo.Text), pack);
            if (任务.pack.单个成品打印标签(Application.StartupPath + "\\data\\单成品.pdf", poly))
            {
                BiaoqianPDF.LoadFile(Application.StartupPath + "\\data\\单成品.pdf");
                BiaoqianPDF.setShowToolbar(true);
                BiaoqianPDF.setZoom(100);
                BiaoqianPDF.setShowScrollbars(true);
                BiaoqianPDF.Document = PdfiumViewer.PdfDocument.Load(Application.StartupPath + "\\data\\单成品.pdf");

                //BiaoqianPDF.LoadFile(Application.StartupPath + "\\data\\单成品.pdf");
                //BiaoqianPDF.setShowToolbar(true);
                //BiaoqianPDF.setZoom(100);
                //BiaoqianPDF.setShowScrollbars(true);
            }
        }

@@ -699,10 +701,25 @@
            string result = é¢†æ–™å•(filepath, Functions.mergeSameSize(nowpack.mergedstocks));
            if (result == "")
            {
                ReportPDF.LoadFile(filepath);
                ReportPDF.setShowToolbar(true);
                ReportPDF.setZoom(100);
                ReportPDF.setShowScrollbars(true);
                try
                {
                    pdfViewer = new PdfViewer
                    {
                        Dock = DockStyle.Fill
                    };
                    this.palReport.Controls.Add(pdfViewer);
                    pdfViewer.Document = PdfiumViewer.PdfDocument.Load(filepath);
                    //pdfViewer.ZoomMode = 1; // 120%缩放
                }
                catch (DllNotFoundException ex)
                {
                    globel.ShowErrorMessage($"缺失的模块: {ex.Message}");
                }

                //ReportPDF.LoadFile(filepath);
                //ReportPDF.setShowToolbar(true);
                //ReportPDF.setZoom(100);
                //ReportPDF.setShowScrollbars(true);
            }
        }
        public string é¢†æ–™å•(string filename, List<Stock> info)
@@ -1224,7 +1241,8 @@

            Setting.UpdateSetting();
            pack.onChange += new OnePacking.ShowProgress(changed);
            string PDFPath = Setting.btdir + "\\版图报告\\" + pack.packingName + ".pdf";
            string fileName = pack.packingName + "-" + DateTime.Now.ToString("HHmmss");
            string PDFPath = Setting.btdir + "\\版图报告\\" + fileName + ".pdf";
            if (fileUtil.FileIsUsed(PDFPath))
            {
                globel.ShowFromWarningMessage("文件已打开，如需更换格式，请关闭已打开文件后，再次尝试报告/版图的打印！");
@@ -1253,12 +1271,27 @@
            }
            else
            {
                ReportPDF.LoadFile(filePath);
                //ReportPDF.LoadFile(filePath);

                ReportPDF.setShowToolbar(true);
                ReportPDF.setZoom(100);
                ReportPDF.setShowScrollbars(true);
                ReportPDF.Print();
                //ReportPDF.setShowToolbar(true);
                //ReportPDF.setZoom(100);
                //ReportPDF.setShowScrollbars(true);
                //ReportPDF.Print();

                try
                {
                    pdfViewer = new PdfViewer
                    {
                        Dock = DockStyle.Fill
                    };
                    this.palReport.Controls.Add(pdfViewer);
                    pdfViewer.Document = PdfiumViewer.PdfDocument.Load(filePath);
                    //pdfViewer.ZoomMode = 1; // 120%缩放
                }
                catch (DllNotFoundException ex)
                {
                    globel.ShowErrorMessage($"缺失的模块: {ex.Message}");
                }
            }
        }
        #endregion

 optimize_patch/¶©µ¥ÅÅÑù¿Í»§¶Ë/EDIT/±¨¸æ.designer.cs

@@ -34,7 +34,6 @@
            this.saveFileDialog1 = new System.Windows.Forms.SaveFileDialog();
            this.timer1 = new System.Windows.Forms.Timer(this.components);
            this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
            this.ReportPDF = new AxAcroPDFLib.AxAcroPDF();
            this.panel1 = new System.Windows.Forms.Panel();
            this.fifth = new System.Windows.Forms.Button();
            this.forth = new System.Windows.Forms.Button();
@@ -55,7 +54,6 @@
            this.label6 = new System.Windows.Forms.Label();
            this.label4 = new System.Windows.Forms.Label();
            this.label7 = new System.Windows.Forms.Label();
            this.BiaoqianPDF = new AxAcroPDFLib.AxAcroPDF();
            this.panel3 = new System.Windows.Forms.Panel();
            this.panel9 = new System.Windows.Forms.Panel();
            this.fivefiles = new System.Windows.Forms.Panel();
@@ -81,7 +79,6 @@
            this.label12 = new System.Windows.Forms.Label();
            this.panel6 = new System.Windows.Forms.Panel();
            this.printmode = new System.Windows.Forms.ComboBox();
            this.liuchengkapdf = new AxAcroPDFLib.AxAcroPDF();
            this.totalpanel = new System.Windows.Forms.Panel();
            this.ResultTabControl = new System.Windows.Forms.TabControl();
            this.tabPrintLayout = new System.Windows.Forms.TabPage();
@@ -118,24 +115,25 @@
            this.下一页 = new System.Windows.Forms.ToolStripButton();
            this.最后一页 = new System.Windows.Forms.ToolStripButton();
            this.CutCode = new System.Windows.Forms.ToolStripDropDownButton();
            ((System.ComponentModel.ISupportInitialize)(this.ReportPDF)).BeginInit();
            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
            this.palReport = new System.Windows.Forms.Panel();
            this.BiaoqianPDF = new PdfiumViewer.PdfViewer();
            this.panel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.ColUpDown)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.RowUpDown)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.banmianend)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.banmianstart)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.BiaoqianPDF)).BeginInit();
            this.panel3.SuspendLayout();
            this.panel9.SuspendLayout();
            this.singlepolyprint.SuspendLayout();
            this.rownumprint.SuspendLayout();
            this.layoutprint.SuspendLayout();
            this.panel6.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.liuchengkapdf)).BeginInit();
            this.totalpanel.SuspendLayout();
            this.ResultTabControl.SuspendLayout();
            this.tabPrintLayout.SuspendLayout();
            this.tabPage1.SuspendLayout();
            this.tableLayoutPanel1.SuspendLayout();
            this.SuspendLayout();
            // 
            // openFileDialog1
@@ -145,12 +143,6 @@
            // timer1
            // 
            this.timer1.Interval = 1000;
            // 
            // ReportPDF
            // 
            resources.ApplyResources(this.ReportPDF, "ReportPDF");
            this.ReportPDF.Name = "ReportPDF";
            this.ReportPDF.OcxState = ((System.Windows.Forms.AxHost.State)(resources.GetObject("ReportPDF.OcxState")));
            // 
            // panel1
            // 
@@ -312,12 +304,6 @@
            this.label7.BackColor = System.Drawing.Color.Transparent;
            this.label7.ForeColor = System.Drawing.Color.Black;
            this.label7.Name = "label7";
            // 
            // BiaoqianPDF
            // 
            resources.ApplyResources(this.BiaoqianPDF, "BiaoqianPDF");
            this.BiaoqianPDF.Name = "BiaoqianPDF";
            this.BiaoqianPDF.OcxState = ((System.Windows.Forms.AxHost.State)(resources.GetObject("BiaoqianPDF.OcxState")));
            // 
            // panel3
            // 
@@ -496,12 +482,6 @@
            this.printmode.Name = "printmode";
            this.printmode.SelectedIndexChanged += new System.EventHandler(this.printmode_SelectedIndexChanged);
            // 
            // liuchengkapdf
            // 
            resources.ApplyResources(this.liuchengkapdf, "liuchengkapdf");
            this.liuchengkapdf.Name = "liuchengkapdf";
            this.liuchengkapdf.OcxState = ((System.Windows.Forms.AxHost.State)(resources.GetObject("liuchengkapdf.OcxState")));
            // 
            // totalpanel
            // 
            this.totalpanel.Controls.Add(this.ResultTabControl);
@@ -519,9 +499,7 @@
            // tabPrintLayout
            // 
            this.tabPrintLayout.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(213)))), ((int)(((byte)(234)))), ((int)(((byte)(255)))));
            this.tabPrintLayout.Controls.Add(this.ReportPDF);
            this.tabPrintLayout.Controls.Add(this.liuchengkapdf);
            this.tabPrintLayout.Controls.Add(this.panel1);
            this.tabPrintLayout.Controls.Add(this.tableLayoutPanel1);
            resources.ApplyResources(this.tabPrintLayout, "tabPrintLayout");
            this.tabPrintLayout.Name = "tabPrintLayout";
            // 
@@ -692,6 +670,23 @@
            this.CutCode.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
            this.CutCode.Name = "CutCode";
            // 
            // tableLayoutPanel1
            // 
            resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1");
            this.tableLayoutPanel1.Controls.Add(this.panel1, 1, 0);
            this.tableLayoutPanel1.Controls.Add(this.palReport, 0, 0);
            this.tableLayoutPanel1.Name = "tableLayoutPanel1";
            // 
            // palReport
            // 
            resources.ApplyResources(this.palReport, "palReport");
            this.palReport.Name = "palReport";
            // 
            // BiaoqianPDF
            // 
            resources.ApplyResources(this.BiaoqianPDF, "BiaoqianPDF");
            this.BiaoqianPDF.Name = "BiaoqianPDF";
            // 
            // æŠ¥å‘Š
            // 
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -700,14 +695,12 @@
            this.Controls.Add(this.totalpanel);
            this.Name = "报告";
            this.Load += new System.EventHandler(this.Form1_Load);
            ((System.ComponentModel.ISupportInitialize)(this.ReportPDF)).EndInit();
            this.panel1.ResumeLayout(false);
            this.panel1.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)(this.ColUpDown)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.RowUpDown)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.banmianend)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.banmianstart)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.BiaoqianPDF)).EndInit();
            this.panel3.ResumeLayout(false);
            this.panel9.ResumeLayout(false);
            this.singlepolyprint.ResumeLayout(false);
@@ -717,11 +710,11 @@
            this.layoutprint.ResumeLayout(false);
            this.layoutprint.PerformLayout();
            this.panel6.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.liuchengkapdf)).EndInit();
            this.totalpanel.ResumeLayout(false);
            this.ResultTabControl.ResumeLayout(false);
            this.tabPrintLayout.ResumeLayout(false);
            this.tabPage1.ResumeLayout(false);
            this.tableLayoutPanel1.ResumeLayout(false);
            this.ResumeLayout(false);

        }
@@ -787,8 +780,6 @@
        public System.Windows.Forms.Label label22;
        private System.Windows.Forms.ComboBox printmode;
        private System.Windows.Forms.Panel totalpanel;
        private AxAcroPDFLib.AxAcroPDF BiaoqianPDF;
        private AxAcroPDFLib.AxAcroPDF liuchengkapdf;
        private System.Windows.Forms.Panel panel9;
        private System.Windows.Forms.Panel rownumprint;
        private System.Windows.Forms.Panel singlepolyprint;
@@ -804,7 +795,6 @@
        private System.Windows.Forms.FolderBrowserDialog folderBrowserDialog1;
        public System.Windows.Forms.CheckBox bantucheck;
        public System.Windows.Forms.CheckBox printreport;
        private AxAcroPDFLib.AxAcroPDF ReportPDF;
        private System.Windows.Forms.Button æŒ‰ç…§ç‰ˆå›¾æ‰“印标签;
        public System.Windows.Forms.Panel panel1;
        public System.Windows.Forms.Button third;
@@ -816,6 +806,9 @@
        private System.Windows.Forms.TabPage tabPrintLayout;
        public System.Windows.Forms.TabControl ResultTabControl;
        public System.Windows.Forms.TextBox start1;
        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
        private System.Windows.Forms.Panel palReport;
        private PdfiumViewer.PdfViewer BiaoqianPDF;
    }
}


 optimize_patch/¶©µ¥ÅÅÑù¿Í»§¶Ë/EDIT/±¨¸æ.resx

@@ -130,55 +130,20 @@
    <value>530, 17</value>
  </metadata>
  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
  <data name="ReportPDF.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Fill</value>
  </data>
  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
  <data name="ReportPDF.Enabled" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <data name="ReportPDF.Location" type="System.Drawing.Point, System.Drawing">
    <value>0, 0</value>
  </data>
  <data name="ReportPDF.OcxState" mimetype="application/x-microsoft.net.object.binary.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACFTeXN0
        ZW0uV2luZG93cy5Gb3Jtcy5BeEhvc3QrU3RhdGUBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAAIQAAAAIB
        AAAAAQAAAAAAAAAAAAAAAAwAAAAACgAA2BMAANgTAAAL
</value>
  </data>
  <data name="ReportPDF.Size" type="System.Drawing.Size, System.Drawing">
    <value>1390, 1019</value>
  </data>
  <data name="ReportPDF.TabIndex" type="System.Int32, mscorlib">
    <value>2</value>
  </data>
  <data name="&gt;&gt;ReportPDF.Name" xml:space="preserve">
    <value>ReportPDF</value>
  </data>
  <data name="&gt;&gt;ReportPDF.Type" xml:space="preserve">
    <value>AxAcroPDFLib.AxAcroPDF, AxInterop.AcroPDFLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
  </data>
  <data name="&gt;&gt;ReportPDF.Parent" xml:space="preserve">
    <value>tabPrintLayout</value>
  </data>
  <data name="&gt;&gt;ReportPDF.ZOrder" xml:space="preserve">
    <value>0</value>
  </data>
  <data name="fifth.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Top</value>
  </data>
  <data name="fifth.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
    <value>NoControl</value>
  </data>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <data name="fifth.Location" type="System.Drawing.Point, System.Drawing">
    <value>0, 93</value>
  </data>
  <data name="fifth.Size" type="System.Drawing.Size, System.Drawing">
    <value>244, 31</value>
    <value>320, 31</value>
  </data>
  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
  <data name="fifth.TabIndex" type="System.Int32, mscorlib">
    <value>63</value>
  </data>
@@ -207,7 +172,7 @@
    <value>0, 62</value>
  </data>
  <data name="forth.Size" type="System.Drawing.Size, System.Drawing">
    <value>244, 31</value>
    <value>320, 31</value>
  </data>
  <data name="forth.TabIndex" type="System.Int32, mscorlib">
    <value>62</value>
@@ -237,7 +202,7 @@
    <value>0, 31</value>
  </data>
  <data name="third.Size" type="System.Drawing.Size, System.Drawing">
    <value>244, 31</value>
    <value>320, 31</value>
  </data>
  <data name="third.TabIndex" type="System.Int32, mscorlib">
    <value>61</value>
@@ -267,7 +232,7 @@
    <value>0, 0</value>
  </data>
  <data name="second.Size" type="System.Drawing.Size, System.Drawing">
    <value>244, 31</value>
    <value>320, 31</value>
  </data>
  <data name="second.TabIndex" type="System.Int32, mscorlib">
    <value>60</value>
@@ -345,7 +310,7 @@
    <value>149, 491</value>
  </data>
  <data name="ColUpDown.Size" type="System.Drawing.Size, System.Drawing">
    <value>80, 30</value>
    <value>80, 26</value>
  </data>
  <data name="ColUpDown.TabIndex" type="System.Int32, mscorlib">
    <value>55</value>
@@ -369,7 +334,7 @@
    <value>149, 459</value>
  </data>
  <data name="RowUpDown.Size" type="System.Drawing.Size, System.Drawing">
    <value>80, 30</value>
    <value>80, 26</value>
  </data>
  <data name="RowUpDown.TabIndex" type="System.Int32, mscorlib">
    <value>54</value>
@@ -393,7 +358,7 @@
    <value>149, 426</value>
  </data>
  <data name="banmianend.Size" type="System.Drawing.Size, System.Drawing">
    <value>80, 30</value>
    <value>80, 26</value>
  </data>
  <data name="banmianend.TabIndex" type="System.Int32, mscorlib">
    <value>53</value>
@@ -417,7 +382,7 @@
    <value>149, 392</value>
  </data>
  <data name="banmianstart.Size" type="System.Drawing.Size, System.Drawing">
    <value>80, 30</value>
    <value>80, 26</value>
  </data>
  <data name="banmianstart.TabIndex" type="System.Int32, mscorlib">
    <value>52</value>
@@ -453,7 +418,7 @@
    <value>No</value>
  </data>
  <data name="label5.Size" type="System.Drawing.Size, System.Drawing">
    <value>99, 20</value>
    <value>80, 16</value>
  </data>
  <data name="label5.TabIndex" type="System.Int32, mscorlib">
    <value>45</value>
@@ -498,7 +463,7 @@
    <value>No</value>
  </data>
  <data name="originpoint.Size" type="System.Drawing.Size, System.Drawing">
    <value>207, 28</value>
    <value>207, 25</value>
  </data>
  <data name="originpoint.TabIndex" type="System.Int32, mscorlib">
    <value>40</value>
@@ -537,7 +502,7 @@
    <value>No</value>
  </data>
  <data name="label22.Size" type="System.Drawing.Size, System.Drawing">
    <value>100, 24</value>
    <value>79, 20</value>
  </data>
  <data name="label22.TabIndex" type="System.Int32, mscorlib">
    <value>41</value>
@@ -597,7 +562,7 @@
    <value>9, 738</value>
  </data>
  <data name="label21.Size" type="System.Drawing.Size, System.Drawing">
    <value>157, 24</value>
    <value>125, 20</value>
  </data>
  <data name="label21.TabIndex" type="System.Int32, mscorlib">
    <value>38</value>
@@ -633,7 +598,7 @@
    <value>9, 769</value>
  </data>
  <data name="bantulabel.Size" type="System.Drawing.Size, System.Drawing">
    <value>152, 24</value>
    <value>121, 20</value>
  </data>
  <data name="bantulabel.TabIndex" type="System.Int32, mscorlib">
    <value>36</value>
@@ -672,7 +637,7 @@
    <value>No</value>
  </data>
  <data name="label6.Size" type="System.Drawing.Size, System.Drawing">
    <value>99, 20</value>
    <value>80, 16</value>
  </data>
  <data name="label6.TabIndex" type="System.Int32, mscorlib">
    <value>16</value>
@@ -711,7 +676,7 @@
    <value>No</value>
  </data>
  <data name="label4.Size" type="System.Drawing.Size, System.Drawing">
    <value>99, 20</value>
    <value>80, 16</value>
  </data>
  <data name="label4.TabIndex" type="System.Int32, mscorlib">
    <value>9</value>
@@ -750,7 +715,7 @@
    <value>No</value>
  </data>
  <data name="label7.Size" type="System.Drawing.Size, System.Drawing">
    <value>99, 20</value>
    <value>80, 16</value>
  </data>
  <data name="label7.TabIndex" type="System.Int32, mscorlib">
    <value>23</value>
@@ -774,16 +739,16 @@
    <value>18</value>
  </data>
  <data name="panel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Right</value>
    <value>Fill</value>
  </data>
  <data name="panel1.Font" type="System.Drawing.Font, System.Drawing">
    <value>宋体, 12pt</value>
  </data>
  <data name="panel1.Location" type="System.Drawing.Point, System.Drawing">
    <value>1390, 0</value>
    <value>1311, 3</value>
  </data>
  <data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
    <value>246, 1019</value>
    <value>322, 1016</value>
  </data>
  <data name="panel1.TabIndex" type="System.Int32, mscorlib">
    <value>1</value>
@@ -798,44 +763,9 @@
    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
  <data name="&gt;&gt;panel1.Parent" xml:space="preserve">
    <value>tabPrintLayout</value>
    <value>tableLayoutPanel1</value>
  </data>
  <data name="&gt;&gt;panel1.ZOrder" xml:space="preserve">
    <value>2</value>
  </data>
  <data name="BiaoqianPDF.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Fill</value>
  </data>
  <data name="BiaoqianPDF.Enabled" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
  <data name="BiaoqianPDF.Location" type="System.Drawing.Point, System.Drawing">
    <value>3, 3</value>
  </data>
  <data name="BiaoqianPDF.OcxState" mimetype="application/x-microsoft.net.object.binary.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACFTeXN0
        ZW0uV2luZG93cy5Gb3Jtcy5BeEhvc3QrU3RhdGUBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAAIQAAAAIB
        AAAAAQAAAAAAAAAAAAAAAAwAAAAACgAA2BMAANgTAAAL
</value>
  </data>
  <data name="BiaoqianPDF.Size" type="System.Drawing.Size, System.Drawing">
    <value>1286, 1013</value>
  </data>
  <data name="BiaoqianPDF.TabIndex" type="System.Int32, mscorlib">
    <value>4</value>
  </data>
  <data name="&gt;&gt;BiaoqianPDF.Name" xml:space="preserve">
    <value>BiaoqianPDF</value>
  </data>
  <data name="&gt;&gt;BiaoqianPDF.Type" xml:space="preserve">
    <value>AxAcroPDFLib.AxAcroPDF, AxInterop.AcroPDFLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
  </data>
  <data name="&gt;&gt;BiaoqianPDF.Parent" xml:space="preserve">
    <value>tabPage1</value>
  </data>
  <data name="&gt;&gt;BiaoqianPDF.ZOrder" xml:space="preserve">
    <value>0</value>
  </data>
  <data name="fivefiles.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
@@ -845,7 +775,7 @@
    <value>0, 426</value>
  </data>
  <data name="fivefiles.Size" type="System.Drawing.Size, System.Drawing">
    <value>340, 554</value>
    <value>340, 557</value>
  </data>
  <data name="fivefiles.TabIndex" type="System.Int32, mscorlib">
    <value>42</value>
@@ -872,7 +802,7 @@
    <value>4, 5, 4, 5</value>
  </data>
  <data name="rownum.Size" type="System.Drawing.Size, System.Drawing">
    <value>187, 30</value>
    <value>187, 26</value>
  </data>
  <data name="rownum.TabIndex" type="System.Int32, mscorlib">
    <value>27</value>
@@ -941,7 +871,7 @@
    <value>22, 41</value>
  </data>
  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
    <value>99, 20</value>
    <value>80, 16</value>
  </data>
  <data name="label1.TabIndex" type="System.Int32, mscorlib">
    <value>29</value>
@@ -995,7 +925,7 @@
    <value>4, 5, 4, 5</value>
  </data>
  <data name="startrow.Size" type="System.Drawing.Size, System.Drawing">
    <value>187, 30</value>
    <value>187, 26</value>
  </data>
  <data name="startrow.TabIndex" type="System.Int32, mscorlib">
    <value>39</value>
@@ -1022,7 +952,7 @@
    <value>4, 5, 4, 5</value>
  </data>
  <data name="endrow.Size" type="System.Drawing.Size, System.Drawing">
    <value>187, 30</value>
    <value>187, 26</value>
  </data>
  <data name="endrow.TabIndex" type="System.Int32, mscorlib">
    <value>40</value>
@@ -1058,7 +988,7 @@
    <value>4, 5, 4, 5</value>
  </data>
  <data name="hanghaocheck.Size" type="System.Drawing.Size, System.Drawing">
    <value>18, 17</value>
    <value>15, 14</value>
  </data>
  <data name="hanghaocheck.TabIndex" type="System.Int32, mscorlib">
    <value>44</value>
@@ -1091,7 +1021,7 @@
    <value>4, 0, 4, 0</value>
  </data>
  <data name="label16.Size" type="System.Drawing.Size, System.Drawing">
    <value>99, 20</value>
    <value>80, 16</value>
  </data>
  <data name="label16.TabIndex" type="System.Int32, mscorlib">
    <value>41</value>
@@ -1124,7 +1054,7 @@
    <value>7, 88</value>
  </data>
  <data name="dishanghao.Size" type="System.Drawing.Size, System.Drawing">
    <value>149, 20</value>
    <value>120, 16</value>
  </data>
  <data name="dishanghao.TabIndex" type="System.Int32, mscorlib">
    <value>43</value>
@@ -1157,7 +1087,7 @@
    <value>7, 116</value>
  </data>
  <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
    <value>129, 20</value>
    <value>104, 16</value>
  </data>
  <data name="label2.TabIndex" type="System.Int32, mscorlib">
    <value>36</value>
@@ -1196,7 +1126,7 @@
    <value>4, 0, 4, 0</value>
  </data>
  <data name="label15.Size" type="System.Drawing.Size, System.Drawing">
    <value>99, 20</value>
    <value>80, 16</value>
  </data>
  <data name="label15.TabIndex" type="System.Int32, mscorlib">
    <value>42</value>
@@ -1328,7 +1258,7 @@
    <value>4, 5, 4, 5</value>
  </data>
  <data name="start1.Size" type="System.Drawing.Size, System.Drawing">
    <value>175, 30</value>
    <value>175, 26</value>
  </data>
  <data name="start1.TabIndex" type="System.Int32, mscorlib">
    <value>1</value>
@@ -1355,7 +1285,7 @@
    <value>4, 5, 4, 5</value>
  </data>
  <data name="end.Size" type="System.Drawing.Size, System.Drawing">
    <value>175, 30</value>
    <value>175, 26</value>
  </data>
  <data name="end.TabIndex" type="System.Int32, mscorlib">
    <value>2</value>
@@ -1415,7 +1345,7 @@
    <value>4, 0, 4, 0</value>
  </data>
  <data name="label11.Size" type="System.Drawing.Size, System.Drawing">
    <value>99, 20</value>
    <value>80, 16</value>
  </data>
  <data name="label11.TabIndex" type="System.Int32, mscorlib">
    <value>9</value>
@@ -1451,7 +1381,7 @@
    <value>4, 0, 4, 0</value>
  </data>
  <data name="label12.Size" type="System.Drawing.Size, System.Drawing">
    <value>99, 20</value>
    <value>80, 16</value>
  </data>
  <data name="label12.TabIndex" type="System.Int32, mscorlib">
    <value>23</value>
@@ -1502,7 +1432,7 @@
    <value>0, 29</value>
  </data>
  <data name="panel9.Size" type="System.Drawing.Size, System.Drawing">
    <value>340, 980</value>
    <value>340, 983</value>
  </data>
  <data name="panel9.TabIndex" type="System.Int32, mscorlib">
    <value>43</value>
@@ -1541,7 +1471,7 @@
    <value>0, 0</value>
  </data>
  <data name="printmode.Size" type="System.Drawing.Size, System.Drawing">
    <value>340, 35</value>
    <value>340, 29</value>
  </data>
  <data name="printmode.TabIndex" type="System.Int32, mscorlib">
    <value>40</value>
@@ -1595,7 +1525,7 @@
    <value>No</value>
  </data>
  <data name="panel3.Size" type="System.Drawing.Size, System.Drawing">
    <value>344, 1013</value>
    <value>344, 1016</value>
  </data>
  <data name="panel3.TabIndex" type="System.Int32, mscorlib">
    <value>3</value>
@@ -1612,46 +1542,68 @@
  <data name="&gt;&gt;panel3.ZOrder" xml:space="preserve">
    <value>1</value>
  </data>
  <data name="liuchengkapdf.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
  <data name="tableLayoutPanel1.ColumnCount" type="System.Int32, mscorlib">
    <value>2</value>
  </data>
  <data name="palReport.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Fill</value>
  </data>
  <data name="liuchengkapdf.Enabled" type="System.Boolean, mscorlib">
    <value>True</value>
  <data name="palReport.Location" type="System.Drawing.Point, System.Drawing">
    <value>3, 3</value>
  </data>
  <data name="liuchengkapdf.Location" type="System.Drawing.Point, System.Drawing">
    <value>0, 0</value>
  <data name="palReport.Size" type="System.Drawing.Size, System.Drawing">
    <value>1302, 1016</value>
  </data>
  <data name="liuchengkapdf.OcxState" mimetype="application/x-microsoft.net.object.binary.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACFTeXN0
        ZW0uV2luZG93cy5Gb3Jtcy5BeEhvc3QrU3RhdGUBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAAIQAAAAIB
        AAAAAQAAAAAAAAAAAAAAAAwAAAAACgAA2BMAANgTAAAL
</value>
  <data name="palReport.TabIndex" type="System.Int32, mscorlib">
    <value>2</value>
  </data>
  <data name="liuchengkapdf.Size" type="System.Drawing.Size, System.Drawing">
    <value>1390, 1019</value>
  <data name="&gt;&gt;palReport.Name" xml:space="preserve">
    <value>palReport</value>
  </data>
  <data name="liuchengkapdf.TabIndex" type="System.Int32, mscorlib">
    <value>6</value>
  <data name="&gt;&gt;palReport.Type" xml:space="preserve">
    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
  <data name="&gt;&gt;liuchengkapdf.Name" xml:space="preserve">
    <value>liuchengkapdf</value>
  <data name="&gt;&gt;palReport.Parent" xml:space="preserve">
    <value>tableLayoutPanel1</value>
  </data>
  <data name="&gt;&gt;liuchengkapdf.Type" xml:space="preserve">
    <value>AxAcroPDFLib.AxAcroPDF, AxInterop.AcroPDFLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
  </data>
  <data name="&gt;&gt;liuchengkapdf.Parent" xml:space="preserve">
    <value>tabPrintLayout</value>
  </data>
  <data name="&gt;&gt;liuchengkapdf.ZOrder" xml:space="preserve">
  <data name="&gt;&gt;palReport.ZOrder" xml:space="preserve">
    <value>1</value>
  </data>
  <data name="tableLayoutPanel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Fill</value>
  </data>
  <data name="tableLayoutPanel1.Location" type="System.Drawing.Point, System.Drawing">
    <value>0, 0</value>
  </data>
  <data name="tableLayoutPanel1.RowCount" type="System.Int32, mscorlib">
    <value>1</value>
  </data>
  <data name="tableLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
    <value>1636, 1022</value>
  </data>
  <data name="tableLayoutPanel1.TabIndex" type="System.Int32, mscorlib">
    <value>2</value>
  </data>
  <data name="&gt;&gt;tableLayoutPanel1.Name" xml:space="preserve">
    <value>tableLayoutPanel1</value>
  </data>
  <data name="&gt;&gt;tableLayoutPanel1.Type" xml:space="preserve">
    <value>System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
  <data name="&gt;&gt;tableLayoutPanel1.Parent" xml:space="preserve">
    <value>tabPrintLayout</value>
  </data>
  <data name="&gt;&gt;tableLayoutPanel1.ZOrder" xml:space="preserve">
    <value>0</value>
  </data>
  <data name="tableLayoutPanel1.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
    <value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="panel1" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="palReport" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,80,Percent,20" /&gt;&lt;Rows Styles="Percent,100" /&gt;&lt;/TableLayoutSettings&gt;</value>
  </data>
  <data name="tabPrintLayout.Location" type="System.Drawing.Point, System.Drawing">
    <value>4, 32</value>
    <value>4, 29</value>
  </data>
  <data name="tabPrintLayout.Size" type="System.Drawing.Size, System.Drawing">
    <value>1636, 1019</value>
    <value>1636, 1022</value>
  </data>
  <data name="tabPrintLayout.TabIndex" type="System.Int32, mscorlib">
    <value>2</value>
@@ -1671,14 +1623,41 @@
  <data name="&gt;&gt;tabPrintLayout.ZOrder" xml:space="preserve">
    <value>0</value>
  </data>
  <data name="BiaoqianPDF.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Fill</value>
  </data>
  <data name="BiaoqianPDF.Location" type="System.Drawing.Point, System.Drawing">
    <value>3, 3</value>
  </data>
  <data name="BiaoqianPDF.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
    <value>4, 5, 4, 5</value>
  </data>
  <data name="BiaoqianPDF.Size" type="System.Drawing.Size, System.Drawing">
    <value>1286, 1016</value>
  </data>
  <data name="BiaoqianPDF.TabIndex" type="System.Int32, mscorlib">
    <value>4</value>
  </data>
  <data name="&gt;&gt;BiaoqianPDF.Name" xml:space="preserve">
    <value>BiaoqianPDF</value>
  </data>
  <data name="&gt;&gt;BiaoqianPDF.Type" xml:space="preserve">
    <value>PdfiumViewer.PdfViewer, PdfiumViewer, Version=2.13.0.0, Culture=neutral, PublicKeyToken=91e4789cfb0609e0</value>
  </data>
  <data name="&gt;&gt;BiaoqianPDF.Parent" xml:space="preserve">
    <value>tabPage1</value>
  </data>
  <data name="&gt;&gt;BiaoqianPDF.ZOrder" xml:space="preserve">
    <value>0</value>
  </data>
  <data name="tabPage1.Location" type="System.Drawing.Point, System.Drawing">
    <value>4, 32</value>
    <value>4, 29</value>
  </data>
  <data name="tabPage1.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
    <value>3, 3, 3, 3</value>
  </data>
  <data name="tabPage1.Size" type="System.Drawing.Size, System.Drawing">
    <value>1636, 1019</value>
    <value>1636, 1022</value>
  </data>
  <data name="tabPage1.TabIndex" type="System.Int32, mscorlib">
    <value>0</value>
@@ -1747,10 +1726,10 @@
    <value>0</value>
  </data>
  <data name="oPTToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
    <value>83, 26</value>
    <value>69, 22</value>
  </data>
  <data name="gToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
    <value>83, 26</value>
    <value>69, 22</value>
  </data>
  <data name="银锐ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
    <value>152, 22</value>
@@ -1848,7 +1827,7 @@
  <data name="CutCode.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABoAAAAZCAYAAAAv3j5gAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAekSURBVEhLNZbZk1x1Fcfnj9Eq33zxySqs0kKUSdCMMAWJ
        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAekSURBVEhLNZbZk1x1Fcfnj9Eq33zxySqs0kKUSdCMMAWJ
        iYREkkmGmcwkk2SSYMxCKDQBjCwqVqFUQSnCg5alBIMQQswMJLP1Or337bvvfXu5vczy8XSLD6fuvX1v
        n+855/s953dGmm4VV0kTWwViO0egrNLwc5hOFsPJEdllQqOEb1fRzTxWWEHzsnhuliBIYbn38fwlAmsZ
        31zBtVM4XgbPHtg6gVmC7ZgRR0vR8kuEappIz9Jyi8MP7CA/NN/MUZcAXE9A6jnUegYlSGB5a6jWF9iN

 optimize_patch/¶©µ¥ÅÅÑù¿Í»§¶Ë/EDIT/´ÎÒª/¹ØÓÚ.cs

@@ -74,6 +74,10 @@
            dataTable.Columns.Add("内容", typeof(string));
            dataTable.Columns.Add("时间", typeof(string));

            dataTable.Rows.Add("25.11.12", "功能完善", "1.完善了部分内容", "2025.11.12");
            //dataTable.Rows.Add("25.11.12", "功能完善", "新增mes数据访问mes_modular库，更改报告打印预览加载部分，", "2025.11.12");

            dataTable.Rows.Add("25.11.10", "功能新增", "1.增加了对ERP和MES的访问设置", "2025.11.10");
            dataTable.Rows.Add("25.10.15", "版本更新", "1.增加了一些设置\r\n2.修复了一些已知问题\r\n3.增加了一些日志", "2025.10.15");
            dataTable.Rows.Add("25.09.16", "版本更新", "1.修复了一些调整的问题\r\n2.修复了一些刀路缺失的问题\r\n3.修复了一些已知问题", "2025.09.16");
            dataTable.Rows.Add("25.04.14", "功能新增", "1.增加补片条件筛选（可进行流程卡或工程号模糊筛选）", "2025.04.14");

 optimize_patch/¶©µ¥ÅÅÑù¿Í»§¶Ë/EDIT/´ÎÒª/¹ØÓÚ.resx

@@ -325,9 +325,6 @@
  <data name="dgvUpdateLog.Location" type="System.Drawing.Point, System.Drawing">
    <value>3, 172</value>
  </data>
  <data name="dgvUpdateLog.ScrollBars" type="System.Windows.Forms.ScrollBars, System.Windows.Forms">
    <value>Horizontal</value>
  </data>
  <data name="dgvUpdateLog.Size" type="System.Drawing.Size, System.Drawing">
    <value>815, 238</value>
  </data>

 optimize_patch/¶©µ¥ÅÅÑù¿Í»§¶Ë/app.config

@@ -1,61 +1,61 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
  <appSettings>
    <!--<add key="connectionstring" value="server=10.2.10.68;user id=root;password=beibo.123/;persistsecurityinfo=true;sslmode=none;" />-->
    <!--<add key="connectionstring" value="server=10.12.0.104;user id=root;password=beibo.123/;persistsecurityinfo=true;sslmode=none;" />-->
    <!--<add key="ConnectionString" value="server=127.0.0.1;user id=root;password=beibo.123/ ;persistsecurityinfo=True;SslMode=none;" />-->
    <add key="connectionstring" value="server=127.0.0.1;user id=root;password= ;persistsecurityinfo=true;sslmode=none;"/>
    <add key="ConStringEncrypt" value="true"/>
    <add key="name" value=""/>
    <add key="password" value=""/>
    <add key="autologin" value="false"/>
    <add key="rememberme" value="false"/>
    <add key="ClientSettingsProvider.ServiceUri" value=""/>
    <add key="connectionstring" value="server=127.0.0.1;user id=root;password= ;persistsecurityinfo=true;sslmode=none;" />
    <add key="ConStringEncrypt" value="true" />
    <add key="name" value="" />
    <add key="password" value="" />
    <add key="autologin" value="false" />
    <add key="rememberme" value="false" />
    <add key="ClientSettingsProvider.ServiceUri" value="" />
  </appSettings>
  <startup useLegacyV2RuntimeActivationPolicy="true">
    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
  </startup>

    
  <system.data>
    <DbProviderFactories>
      <remove invariant="MySql.Data.MySqlClient"/>
      <add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.7.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
      <remove invariant="MySql.Data.MySqlClient" />
      <add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.7.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
    </DbProviderFactories>
  </system.data>
  <runtime>
    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
      <dependentAssembly>
        <assemblyIdentity name="BouncyCastle.Crypto" publicKeyToken="0e99375e54769942" culture="neutral"/>
        <bindingRedirect oldVersion="0.0.0.0-1.8.3.0" newVersion="1.8.3.0"/>
        <assemblyIdentity name="BouncyCastle.Crypto" publicKeyToken="0e99375e54769942" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-1.8.3.0" newVersion="1.8.3.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0"/>
        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0"/>
        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
        <bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2"/>
        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
  <system.web>
    <membership defaultProvider="ClientAuthenticationMembershipProvider">
      <providers>
        <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri=""/>
        <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
      </providers>
    </membership>
    <roleManager defaultProvider="ClientRoleProvider" enabled="true">
      <providers>
        <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400"/>
        <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
      </providers>
    </roleManager>
  </system.web>

 optimize_patch/¶©µ¥ÅÅÑù¿Í»§¶Ë/ng.optima.server/MesMysqlHelper.cs

@@ -14,7 +14,8 @@
    {


        public static string DatabaseName = "north_glass_mes";
        //public static string DatabaseName = "north_glass_mes";
        public static string DatabaseName = globel.CustomerName != "义乌" ? "mes_modular" : "north_glass_mes";

        public static string ConnetionString(string dbName)
        {
@@ -27,7 +28,6 @@
        {
            get
            {

                var con = new MySqlConnection(ConnetionString(DatabaseName));
                try
                {
@@ -68,7 +68,7 @@
            try
            {
                //DatabaseName = dbName;

                fileUtil.testLog(sql.ToString(), "SQL执行记录");
                var cmd = Cmd;
                cmd.CommandText = sql;
                if (cmd.Connection == null)

 optimize_patch/¶©µ¥ÅÅÑù¿Í»§¶Ë/ng.optima.server/PatchProjectDB.cs

@@ -50,7 +50,15 @@
            //string sql = "select gi.* from glass_info gi inner join damage d on gi.glass_id=d.glass_id and d.status=1 and d.type=8";
            StringBuilder sql = new StringBuilder();
            sql.Append("select gi.*,d.remark from glass_info gi ");
            sql.Append(" inner join damage d on gi.glass_id=d.glass_id and d.status=1 and d.type=8 ");
            if (globel.CustomerName == "义乌")
            {
                sql.Append(" inner join damage d on gi.glass_id=d.glass_id and d.status=1 and d.type=8 ");
            }
            else
            {
                sql.Append(" inner join damage d on gi.glass_id=d.glass_id and d.report_state=1");
            }

            sql.AppendFormat(" where gi.thickness = {0} and gi.filmsid = '{1}';", hd, mx);
            //sql.AppendFormat(" where gi.thickness = {0} and gi.filmsid = '{1}' and (gi.flow_card_id REGEXP '{2}' or d.engineer_id REGEXP '{2}');", hd, mx);
            DataTable dt = MesMysqlHelper.QueryResultToTable(sql.ToString()) ;
@@ -69,7 +77,14 @@
            //string sql = "select gi.* from glass_info gi inner join damage d on gi.glass_id=d.glass_id and d.status=1 and d.type=8";
            StringBuilder sql = new StringBuilder();
            sql.Append("select gi.*,d.remark from glass_info gi ");
            sql.Append(" inner join damage d on gi.glass_id=d.glass_id and d.status=1 and d.type=8 ");
            if (globel.CustomerName == "义乌")
            {
                sql.Append(" inner join damage d on gi.glass_id=d.glass_id and d.status=1 and d.type=8 ");
            }
            else
            {
                sql.Append(" inner join damage d on gi.glass_id=d.glass_id and d.report_state=1 ");
            }
            sql.AppendFormat(" where gi.thickness = {0} and gi.filmsid = '{1}' and (gi.flow_card_id REGEXP '{2}' or d.engineer_id REGEXP '{2}');", hd, mx, value);
            //DataTable dt = MesMysqlHelper.QueryResultToTable(sql.ToString(), dbName);
            DataTable dt = MesMysqlHelper.QueryResultToTable(sql.ToString());
@@ -83,27 +98,22 @@

        public static DataTable dtPatchGalss = new DataTable();

        public static void getPachtGlassTable() {

            StringBuilder sql = new StringBuilder();
            sql.Append("select gi.* from glass_info gi ");
            sql.Append(" inner join damage d on gi.glass_id=d.glass_id and d.status=1 and d.type=8 ");
            DataTable dt = MesMysqlHelper.QueryResultToTable(sql.ToString());

            if (dt == null || dt.Rows.Count == 0)
            {
                dtPatchGalss = null;
            }
            dtPatchGalss = dt;
        }


        public static DataTable GetAllPachtGlass()
        {

            StringBuilder sql = new StringBuilder();


            sql.Append("select gi.* from glass_info gi ");
            sql.Append(" inner join damage d on gi.glass_id=d.glass_id and d.status=1 and d.type=8 ");
            if (globel.CustomerName == "义乌")
            {
                sql.Append(" inner join damage d on gi.glass_id=d.glass_id and d.status=1 and d.type=8 ");
            }
            else {

                sql.Append(" inner join damage d on gi.glass_id=d.glass_id and d.report_state=1  ");
            }
            DataTable dt = MesMysqlHelper.QueryResultToTable(sql.ToString());

            if (dt == null || dt.Rows.Count == 0)
@@ -279,8 +289,17 @@
                        sql.AppendFormat("'{0}','{1}','{2}','{3}','{4}','{5}','{6}',{7});", p.remarks, p.originjiahao, p.dabiao, p.FenpianShunxu, p.xuhao, p.g, p.h, patch_state);

                        //update damage set patch_status = 2 where glass_id = "P24122506|42|8" and type = 8 and status = 1
                        if (globel.CustomerName == "义乌")
                        {
                            patch_sql.AppendFormat("update damage set status = 7 where glass_id = '{0}' and type = 8 and status = 1;", p.remarks);

                        patch_sql.AppendFormat("update damage set status = 7 where glass_id = '{0}' and type = 8 and status = 1;", p.remarks);
                        }
                        else {

                            patch_sql.AppendFormat("update damage set report_state = 7 where glass_id = '{0}' and report_state = 1;", p.remarks);

                        }

                    }

                    //是否保存余料
@@ -311,15 +330,6 @@
                }

                om.errCode = 5;

                //StringBuilder offcutsql = new StringBuilder();
                ////记录优化使用的原片数据
                //foreach (string code in dicStock.Keys)
                //{
                //    sql.AppendFormat("Insert into optimize_use (project_no,raw_stock_code,type,width,height,use_count,not_use_count,creater,left_trim,down_trim,right_trim,up_trim)");
                //    sql.AppendFormat("values('{0}','{1}','{2}','{3}','{4}','{5}','{6}','{7}'", pNo, code, stockType, dicStock[code].width, dicStock[code].height, dicStock[code].use_count, dicStock[code].use_count, LoginAdminInfo.id);
                //    sql.AppendFormat(",'{0}','{1}','{2}','{3}');", dicStock[code].left_trim, dicStock[code].down_trim, dicStock[code].right_trim, dicStock[code].up_trim);
                //}

                //记录优化使用的原片数据
                sql.Append(stockSql);
@@ -379,7 +389,14 @@
                {
                    string gId = dr["glass_id"].ToString();

                    sbSql.AppendFormat("update damage set status = 1 where glass_id='{0}' and type=8 and status=7;", gId);
                    if (globel.CustomerName == "义乌")
                    {
                        sbSql.AppendFormat("update damage set status = 1 where glass_id='{0}' and type=8 and status=7;", gId);
                    }
                    else {
                        sbSql.AppendFormat("update damage set report_state = 1 where glass_id='{0}' and  report_state=7;", gId);

                    }
                }
                //om.state = MesMysqlHelper.ExecutSqlTranOne(sbSql.ToString()) > 0;
                om.state = MySqlDbHelper.ExecutSqlTranOne(sbSql.ToString()) > 0;

 optimize_patch/¶©µ¥ÅÅÑù¿Í»§¶Ë/packages.config

@@ -11,6 +11,9 @@
  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net461" />
  <package id="Newtonsoft.Json.Bson" version="1.0.2" targetFramework="net461" />
  <package id="NLog" version="5.3.3" targetFramework="net48" />
  <package id="PdfiumViewer" version="2.13.0.0" targetFramework="net48" />
  <package id="PdfiumViewer.Native.x86.v8-xfa" version="2018.4.8.256" targetFramework="net48" />
  <package id="PdfiumViewer.Native.x86_64.v8-xfa" version="2018.4.8.256" targetFramework="net48" />
  <package id="RabbitMQ.Client" version="6.8.1" targetFramework="net48" />
  <package id="System.Buffers" version="4.5.1" targetFramework="net461" />
  <package id="System.Configuration.ConfigurationManager" version="4.4.1" targetFramework="net48" />

 optimize_patch/¶©µ¥ÅÅÑù¿Í»§¶Ë/²£Á§ÓÅ»¯Èí¼þ.csproj

@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="..\packages\PdfiumViewer.Native.x86.v8-xfa.2018.4.8.256\build\PdfiumViewer.Native.x86.v8-xfa.props" Condition="Exists('..\packages\PdfiumViewer.Native.x86.v8-xfa.2018.4.8.256\build\PdfiumViewer.Native.x86.v8-xfa.props')" />
  <Import Project="..\packages\PdfiumViewer.Native.x86_64.v8-xfa.2018.4.8.256\build\PdfiumViewer.Native.x86_64.v8-xfa.props" Condition="Exists('..\packages\PdfiumViewer.Native.x86_64.v8-xfa.2018.4.8.256\build\PdfiumViewer.Native.x86_64.v8-xfa.props')" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -38,6 +40,8 @@
    <UseApplicationTrust>false</UseApplicationTrust>
    <PublishWizardCompleted>true</PublishWizardCompleted>
    <BootstrapperEnabled>true</BootstrapperEnabled>
    <NuGetPackageImportStamp>
    </NuGetPackageImportStamp>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    <PlatformTarget>x86</PlatformTarget>
@@ -217,6 +221,9 @@
    </Reference>
    <Reference Include="org.in2bits.MyXls">
      <HintPath>C:\Users\justin\Desktop\新建文件夹\订单排样\订单排样\订单排样\bin\Debug\org.in2bits.MyXls.dll</HintPath>
    </Reference>
    <Reference Include="PdfiumViewer, Version=2.13.0.0, Culture=neutral, PublicKeyToken=91e4789cfb0609e0, processorArchitecture=MSIL">
      <HintPath>..\packages\PdfiumViewer.2.13.0.0\lib\net20\PdfiumViewer.dll</HintPath>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" />
@@ -1276,6 +1283,13 @@
    <Service Include="{C0C07587-41A7-46C8-8FBD-3F9C8EBE2DDC}" />
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
    <PropertyGroup>
      <ErrorText>这台计算机上缺少此项目引用的 NuGet ç¨‹åºåŒ…。使用“NuGet ç¨‹åºåŒ…还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
    </PropertyGroup>
    <Error Condition="!Exists('..\packages\PdfiumViewer.Native.x86_64.v8-xfa.2018.4.8.256\build\PdfiumViewer.Native.x86_64.v8-xfa.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\PdfiumViewer.Native.x86_64.v8-xfa.2018.4.8.256\build\PdfiumViewer.Native.x86_64.v8-xfa.props'))" />
    <Error Condition="!Exists('..\packages\PdfiumViewer.Native.x86.v8-xfa.2018.4.8.256\build\PdfiumViewer.Native.x86.v8-xfa.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\PdfiumViewer.Native.x86.v8-xfa.2018.4.8.256\build\PdfiumViewer.Native.x86.v8-xfa.props'))" />
  </Target>
  <!-- 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">