1.允许手动修改小片磨量2.去除磨量、修改设置时同步设置的操作3.同步修改打标信息修改字段后保存切割文件的内容

孙世强

2025-11-17 421216c5aa7b1dd7b2bfd1edd94ecd7751088ee8

1.允许手动修改小片磨量2.去除磨量、修改设置时同步设置的操作3.同步修改打标信息修改字段后保存切割文件的内容

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

@@ -12,6 +12,7 @@
using MyGlassEdit.ng.optima.model;
using Newtonsoft.Json;
using ng.optima.server;
using ng.optima.model;

namespace directPacking
{
@@ -5661,7 +5662,17 @@
                    else
                    {

                        MarkModel mm = JsonConvert.DeserializeObject<MarkModel>(p.dabiao);
                        MarkNewModel new_mm = JsonConvert.DeserializeObject<MarkNewModel>(p.dabiao);
                        MarkModel mm = new MarkModel();
                        if (new_mm.markIcon == null) {

                            mm = JsonConvert.DeserializeObject<MarkModel>(p.dabiao);
                        }
                        else{

                            mm = new_mm.markIcon;
                        }
                                                
                        if (string.IsNullOrEmpty(mm.trademark))
                        {
                            continue;

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

@@ -14,6 +14,7 @@
using Utility;
using MyGlassEdit.EDIT.功能;
using MyGlassEdit.ng.optima.model;
using ng.optima.model;
using MyGlassEdit.ng.optima.server;
using ng.optima.server;
using MyGlassEdit.EDIT.配置;
@@ -652,7 +653,7 @@
                    {
                        for (int c = 0; c < polyView.Columns.Count; c++)
                        {
                            polyView.Rows[j].Cells[c].ReadOnly = true;
                            //polyView.Rows[j].Cells[c].ReadOnly = true;
                            polyView.Rows[j].Cells[c].Style.ForeColor = Color.Gray;
                        }
                    }
@@ -978,7 +979,7 @@
                }
                else
                {
                    polyView.Columns[j].ReadOnly = true;
                    //polyView.Columns[j].ReadOnly = true;
                    polyView.Columns[j].DefaultCellStyle.ForeColor = Color.Gray;
                }
            }
@@ -1934,10 +1935,10 @@
                {
                    Functions.setCellReadonly(polyView.Rows[e.RowIndex].Cells["宽度"]);
                    Functions.setCellReadonly(polyView.Rows[e.RowIndex].Cells["高度"]);
                    Functions.setCellReadonly(polyView.Rows[e.RowIndex].Cells["长磨1"]);
                    Functions.setCellReadonly(polyView.Rows[e.RowIndex].Cells["短磨1"]);
                    Functions.setCellReadonly(polyView.Rows[e.RowIndex].Cells["长磨2"]);
                    Functions.setCellReadonly(polyView.Rows[e.RowIndex].Cells["短磨2"]);
                    //Functions.setCellReadonly(polyView.Rows[e.RowIndex].Cells["长磨1"]);
                    //Functions.setCellReadonly(polyView.Rows[e.RowIndex].Cells["短磨1"]);
                    //Functions.setCellReadonly(polyView.Rows[e.RowIndex].Cells["长磨2"]);
                    //Functions.setCellReadonly(polyView.Rows[e.RowIndex].Cells["短磨2"]);
                    Functions.setCellReadonly(polyView.Rows[e.RowIndex].Cells["四边一致"]);
                }
            }
@@ -4604,6 +4605,9 @@
                    ShowMaterialData();
                }
                projectnameText.Text += $" {gThick}mm {gType}";

                polyView.ReadOnly = false;
                ProhibitColumnSorting();
            }



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

@@ -30,60 +30,60 @@
        {
            this.components = new System.ComponentModel.Container();
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(任务));
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle151 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle152 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle153 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle154 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle155 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle156 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle157 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle158 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle159 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle103 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle174 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle175 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle176 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle104 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle160 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle161 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle162 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle163 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle164 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle165 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle166 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle167 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle168 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle169 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle170 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle171 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle172 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle173 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle55 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle56 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle57 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle58 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle59 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle60 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle61 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle62 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle63 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle78 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle79 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle80 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle64 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle65 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle66 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle67 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle68 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle69 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle70 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle71 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle72 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle73 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle74 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle75 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle76 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle77 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle81 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle82 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle83 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle84 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle85 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle86 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle87 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle88 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle89 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle90 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle91 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle92 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle93 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle94 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle95 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle96 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle97 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle98 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle99 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle100 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle101 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle102 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle126 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle127 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle128 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle177 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle178 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle179 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle180 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle181 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle182 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle183 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle184 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle185 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle186 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle187 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle188 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle189 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle190 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle191 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle192 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle193 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle194 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle195 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle196 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle197 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle198 = new System.Windows.Forms.DataGridViewCellStyle();
            this.containerMsg = new System.Windows.Forms.SplitContainer();
            this.lblBtnCloseMsg = new System.Windows.Forms.Label();
            this.label2 = new System.Windows.Forms.Label();
@@ -648,21 +648,21 @@
            this.stockView.AllowUserToDeleteRows = false;
            this.stockView.AllowUserToOrderColumns = true;
            this.stockView.AllowUserToResizeRows = false;
            dataGridViewCellStyle55.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(213)))), ((int)(((byte)(234)))), ((int)(((byte)(255)))));
            dataGridViewCellStyle55.ForeColor = System.Drawing.Color.Black;
            dataGridViewCellStyle55.SelectionBackColor = System.Drawing.SystemColors.HotTrack;
            this.stockView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle55;
            dataGridViewCellStyle151.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(213)))), ((int)(((byte)(234)))), ((int)(((byte)(255)))));
            dataGridViewCellStyle151.ForeColor = System.Drawing.Color.Black;
            dataGridViewCellStyle151.SelectionBackColor = System.Drawing.SystemColors.HotTrack;
            this.stockView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle151;
            this.stockView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
            this.stockView.BackgroundColor = System.Drawing.Color.White;
            this.stockView.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
            dataGridViewCellStyle56.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
            dataGridViewCellStyle56.BackColor = System.Drawing.SystemColors.Control;
            dataGridViewCellStyle56.Font = new System.Drawing.Font("微软雅黑", 12F);
            dataGridViewCellStyle56.ForeColor = System.Drawing.SystemColors.WindowText;
            dataGridViewCellStyle56.SelectionBackColor = System.Drawing.SystemColors.Highlight;
            dataGridViewCellStyle56.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
            dataGridViewCellStyle56.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
            this.stockView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle56;
            dataGridViewCellStyle152.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
            dataGridViewCellStyle152.BackColor = System.Drawing.SystemColors.Control;
            dataGridViewCellStyle152.Font = new System.Drawing.Font("微软雅黑", 12F);
            dataGridViewCellStyle152.ForeColor = System.Drawing.SystemColors.WindowText;
            dataGridViewCellStyle152.SelectionBackColor = System.Drawing.SystemColors.Highlight;
            dataGridViewCellStyle152.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
            dataGridViewCellStyle152.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
            this.stockView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle152;
            resources.ApplyResources(this.stockView, "stockView");
            this.stockView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
            this.stockView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -727,8 +727,8 @@
            // å¤§ç‰‡å®½
            // 
            this.大片宽.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
            dataGridViewCellStyle57.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.大片宽.DefaultCellStyle = dataGridViewCellStyle57;
            dataGridViewCellStyle153.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.大片宽.DefaultCellStyle = dataGridViewCellStyle153;
            this.大片宽.FillWeight = 49.71305F;
            resources.ApplyResources(this.大片宽, "大片宽");
            this.大片宽.Name = "大片宽";
@@ -736,8 +736,8 @@
            // å¤§ç‰‡é«˜
            // 
            this.大片高.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
            dataGridViewCellStyle58.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.大片高.DefaultCellStyle = dataGridViewCellStyle58;
            dataGridViewCellStyle154.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.大片高.DefaultCellStyle = dataGridViewCellStyle154;
            this.大片高.FillWeight = 49.71305F;
            resources.ApplyResources(this.大片高, "大片高");
            this.大片高.Name = "大片高";
@@ -758,8 +758,8 @@
            // X1修边
            // 
            this.X1修边.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader;
            dataGridViewCellStyle59.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.X1修边.DefaultCellStyle = dataGridViewCellStyle59;
            dataGridViewCellStyle155.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.X1修边.DefaultCellStyle = dataGridViewCellStyle155;
            this.X1修边.FillWeight = 49.71305F;
            resources.ApplyResources(this.X1修边, "X1修边");
            this.X1修边.Name = "X1修边";
@@ -767,8 +767,8 @@
            // Y1修边
            // 
            this.Y1修边.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader;
            dataGridViewCellStyle60.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.Y1修边.DefaultCellStyle = dataGridViewCellStyle60;
            dataGridViewCellStyle156.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.Y1修边.DefaultCellStyle = dataGridViewCellStyle156;
            this.Y1修边.FillWeight = 49.71305F;
            resources.ApplyResources(this.Y1修边, "Y1修边");
            this.Y1修边.Name = "Y1修边";
@@ -776,8 +776,8 @@
            // X2修边
            // 
            this.X2修边.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader;
            dataGridViewCellStyle61.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.X2修边.DefaultCellStyle = dataGridViewCellStyle61;
            dataGridViewCellStyle157.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.X2修边.DefaultCellStyle = dataGridViewCellStyle157;
            this.X2修边.FillWeight = 49.71305F;
            resources.ApplyResources(this.X2修边, "X2修边");
            this.X2修边.Name = "X2修边";
@@ -785,16 +785,16 @@
            // Y2修边
            // 
            this.Y2修边.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader;
            dataGridViewCellStyle62.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.Y2修边.DefaultCellStyle = dataGridViewCellStyle62;
            dataGridViewCellStyle158.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.Y2修边.DefaultCellStyle = dataGridViewCellStyle158;
            this.Y2修边.FillWeight = 49.71305F;
            resources.ApplyResources(this.Y2修边, "Y2修边");
            this.Y2修边.Name = "Y2修边";
            // 
            // åº“存量
            // 
            dataGridViewCellStyle63.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.库存量.DefaultCellStyle = dataGridViewCellStyle63;
            dataGridViewCellStyle159.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.库存量.DefaultCellStyle = dataGridViewCellStyle159;
            this.库存量.FillWeight = 53.26399F;
            resources.ApplyResources(this.库存量, "库存量");
            this.库存量.Name = "库存量";
@@ -842,10 +842,10 @@
            this.polyView.AllowUserToAddRows = false;
            this.polyView.AllowUserToDeleteRows = false;
            this.polyView.AllowUserToResizeRows = false;
            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(213)))), ((int)(((byte)(234)))), ((int)(((byte)(255)))));
            dataGridViewCellStyle1.ForeColor = System.Drawing.Color.Black;
            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.HotTrack;
            this.polyView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
            dataGridViewCellStyle103.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(213)))), ((int)(((byte)(234)))), ((int)(((byte)(255)))));
            dataGridViewCellStyle103.ForeColor = System.Drawing.Color.Black;
            dataGridViewCellStyle103.SelectionBackColor = System.Drawing.SystemColors.HotTrack;
            this.polyView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle103;
            this.polyView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells;
            this.polyView.BackgroundColor = System.Drawing.Color.White;
            this.polyView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.Raised;
@@ -881,27 +881,27 @@
            this.单片名称,
            this.印标类型});
            this.polyView.ContextMenuStrip = this.PolyViewContext;
            dataGridViewCellStyle78.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
            dataGridViewCellStyle78.BackColor = System.Drawing.Color.White;
            dataGridViewCellStyle78.Font = new System.Drawing.Font("微软雅黑", 12F);
            dataGridViewCellStyle78.ForeColor = System.Drawing.SystemColors.ControlText;
            dataGridViewCellStyle78.SelectionBackColor = System.Drawing.SystemColors.HotTrack;
            dataGridViewCellStyle78.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
            dataGridViewCellStyle78.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
            this.polyView.DefaultCellStyle = dataGridViewCellStyle78;
            dataGridViewCellStyle174.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
            dataGridViewCellStyle174.BackColor = System.Drawing.Color.White;
            dataGridViewCellStyle174.Font = new System.Drawing.Font("微软雅黑", 12F);
            dataGridViewCellStyle174.ForeColor = System.Drawing.SystemColors.ControlText;
            dataGridViewCellStyle174.SelectionBackColor = System.Drawing.SystemColors.HotTrack;
            dataGridViewCellStyle174.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
            dataGridViewCellStyle174.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
            this.polyView.DefaultCellStyle = dataGridViewCellStyle174;
            this.polyView.GridColor = System.Drawing.Color.Silver;
            this.polyView.Name = "polyView";
            dataGridViewCellStyle79.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
            dataGridViewCellStyle79.BackColor = System.Drawing.Color.WhiteSmoke;
            dataGridViewCellStyle79.Font = new System.Drawing.Font("微软雅黑", 12F);
            dataGridViewCellStyle79.ForeColor = System.Drawing.Color.WhiteSmoke;
            dataGridViewCellStyle79.SelectionBackColor = System.Drawing.SystemColors.HotTrack;
            dataGridViewCellStyle79.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
            dataGridViewCellStyle79.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
            this.polyView.RowHeadersDefaultCellStyle = dataGridViewCellStyle79;
            dataGridViewCellStyle80.BackColor = System.Drawing.Color.WhiteSmoke;
            dataGridViewCellStyle80.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
            this.polyView.RowsDefaultCellStyle = dataGridViewCellStyle80;
            dataGridViewCellStyle175.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
            dataGridViewCellStyle175.BackColor = System.Drawing.Color.WhiteSmoke;
            dataGridViewCellStyle175.Font = new System.Drawing.Font("微软雅黑", 12F);
            dataGridViewCellStyle175.ForeColor = System.Drawing.Color.WhiteSmoke;
            dataGridViewCellStyle175.SelectionBackColor = System.Drawing.SystemColors.HotTrack;
            dataGridViewCellStyle175.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
            dataGridViewCellStyle175.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
            this.polyView.RowHeadersDefaultCellStyle = dataGridViewCellStyle175;
            dataGridViewCellStyle176.BackColor = System.Drawing.Color.WhiteSmoke;
            dataGridViewCellStyle176.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
            this.polyView.RowsDefaultCellStyle = dataGridViewCellStyle176;
            this.tlpMainChengPin.SetRowSpan(this.polyView, 2);
            this.polyView.RowTemplate.Height = 23;
            this.polyView.TabStop = false;
@@ -917,17 +917,17 @@
            // 
            // ç¼–号
            // 
            dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            dataGridViewCellStyle2.ForeColor = System.Drawing.Color.Gray;
            this.编号.DefaultCellStyle = dataGridViewCellStyle2;
            dataGridViewCellStyle104.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            dataGridViewCellStyle104.ForeColor = System.Drawing.Color.Gray;
            this.编号.DefaultCellStyle = dataGridViewCellStyle104;
            resources.ApplyResources(this.编号, "编号");
            this.编号.Name = "编号";
            // 
            // å®½åº¦
            // 
            this.宽度.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
            dataGridViewCellStyle64.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.宽度.DefaultCellStyle = dataGridViewCellStyle64;
            dataGridViewCellStyle160.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.宽度.DefaultCellStyle = dataGridViewCellStyle160;
            this.宽度.FillWeight = 110F;
            resources.ApplyResources(this.宽度, "宽度");
            this.宽度.Name = "宽度";
@@ -935,63 +935,63 @@
            // é«˜åº¦
            // 
            this.高度.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
            dataGridViewCellStyle65.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.高度.DefaultCellStyle = dataGridViewCellStyle65;
            dataGridViewCellStyle161.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.高度.DefaultCellStyle = dataGridViewCellStyle161;
            resources.ApplyResources(this.高度, "高度");
            this.高度.Name = "高度";
            // 
            // æ•°é‡
            // 
            this.数量.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
            dataGridViewCellStyle66.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.数量.DefaultCellStyle = dataGridViewCellStyle66;
            dataGridViewCellStyle162.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.数量.DefaultCellStyle = dataGridViewCellStyle162;
            this.数量.FillWeight = 80F;
            resources.ApplyResources(this.数量, "数量");
            this.数量.Name = "数量";
            // 
            // æ¨¡æ¿å·
            // 
            dataGridViewCellStyle67.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.模板号.DefaultCellStyle = dataGridViewCellStyle67;
            dataGridViewCellStyle163.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.模板号.DefaultCellStyle = dataGridViewCellStyle163;
            this.模板号.FillWeight = 80F;
            resources.ApplyResources(this.模板号, "模板号");
            this.模板号.Name = "模板号";
            // 
            // Str
            // 
            dataGridViewCellStyle68.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.Str.DefaultCellStyle = dataGridViewCellStyle68;
            dataGridViewCellStyle164.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.Str.DefaultCellStyle = dataGridViewCellStyle164;
            resources.ApplyResources(this.Str, "Str");
            this.Str.Name = "Str";
            // 
            // é•¿ç£¨1
            // 
            dataGridViewCellStyle69.Font = new System.Drawing.Font("微软雅黑", 12F);
            this.长磨1.DefaultCellStyle = dataGridViewCellStyle69;
            dataGridViewCellStyle165.Font = new System.Drawing.Font("微软雅黑", 12F);
            this.长磨1.DefaultCellStyle = dataGridViewCellStyle165;
            this.长磨1.FillWeight = 80F;
            resources.ApplyResources(this.长磨1, "长磨1");
            this.长磨1.Name = "长磨1";
            // 
            // é•¿ç£¨2
            // 
            dataGridViewCellStyle70.Font = new System.Drawing.Font("微软雅黑", 12F);
            this.长磨2.DefaultCellStyle = dataGridViewCellStyle70;
            dataGridViewCellStyle166.Font = new System.Drawing.Font("微软雅黑", 12F);
            this.长磨2.DefaultCellStyle = dataGridViewCellStyle166;
            this.长磨2.FillWeight = 80F;
            resources.ApplyResources(this.长磨2, "长磨2");
            this.长磨2.Name = "长磨2";
            // 
            // çŸ­ç£¨1
            // 
            dataGridViewCellStyle71.Font = new System.Drawing.Font("微软雅黑", 12F);
            this.短磨1.DefaultCellStyle = dataGridViewCellStyle71;
            dataGridViewCellStyle167.Font = new System.Drawing.Font("微软雅黑", 12F);
            this.短磨1.DefaultCellStyle = dataGridViewCellStyle167;
            this.短磨1.FillWeight = 80F;
            resources.ApplyResources(this.短磨1, "短磨1");
            this.短磨1.Name = "短磨1";
            // 
            // çŸ­ç£¨2
            // 
            dataGridViewCellStyle72.Font = new System.Drawing.Font("微软雅黑", 12F);
            this.短磨2.DefaultCellStyle = dataGridViewCellStyle72;
            dataGridViewCellStyle168.Font = new System.Drawing.Font("微软雅黑", 12F);
            this.短磨2.DefaultCellStyle = dataGridViewCellStyle168;
            this.短磨2.FillWeight = 80F;
            resources.ApplyResources(this.短磨2, "短磨2");
            this.短磨2.Name = "短磨2";
@@ -999,24 +999,24 @@
            // å½¢çŠ¶
            // 
            this.形状.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
            dataGridViewCellStyle73.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
            this.形状.DefaultCellStyle = dataGridViewCellStyle73;
            dataGridViewCellStyle169.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
            this.形状.DefaultCellStyle = dataGridViewCellStyle169;
            resources.ApplyResources(this.形状, "形状");
            this.形状.Image = ((System.Drawing.Image)(resources.GetObject("形状.Image")));
            this.形状.Name = "形状";
            // 
            // åŠ å·¥ä¿¡æ¯
            // 
            dataGridViewCellStyle74.Font = new System.Drawing.Font("微软雅黑", 12F);
            this.加工信息.DefaultCellStyle = dataGridViewCellStyle74;
            dataGridViewCellStyle170.Font = new System.Drawing.Font("微软雅黑", 12F);
            this.加工信息.DefaultCellStyle = dataGridViewCellStyle170;
            this.加工信息.FillWeight = 120F;
            resources.ApplyResources(this.加工信息, "加工信息");
            this.加工信息.Name = "加工信息";
            // 
            // æµç¨‹å¡å·
            // 
            dataGridViewCellStyle75.Font = new System.Drawing.Font("微软雅黑", 12F);
            this.流程卡号.DefaultCellStyle = dataGridViewCellStyle75;
            dataGridViewCellStyle171.Font = new System.Drawing.Font("微软雅黑", 12F);
            this.流程卡号.DefaultCellStyle = dataGridViewCellStyle171;
            this.流程卡号.FillWeight = 150F;
            resources.ApplyResources(this.流程卡号, "流程卡号");
            this.流程卡号.Name = "流程卡号";
@@ -1028,8 +1028,8 @@
            // 
            // äº§å“åç§°
            // 
            dataGridViewCellStyle76.Font = new System.Drawing.Font("微软雅黑", 12F);
            this.产品名称.DefaultCellStyle = dataGridViewCellStyle76;
            dataGridViewCellStyle172.Font = new System.Drawing.Font("微软雅黑", 12F);
            this.产品名称.DefaultCellStyle = dataGridViewCellStyle172;
            this.产品名称.FillWeight = 120F;
            resources.ApplyResources(this.产品名称, "产品名称");
            this.产品名称.Name = "产品名称";
@@ -1061,8 +1061,8 @@
            // 
            // é¢ç§¯
            // 
            dataGridViewCellStyle77.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.面积.DefaultCellStyle = dataGridViewCellStyle77;
            dataGridViewCellStyle173.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.面积.DefaultCellStyle = dataGridViewCellStyle173;
            resources.ApplyResources(this.面积, "面积");
            this.面积.Name = "面积";
            // 
@@ -1111,26 +1111,26 @@
            this.s.AllowUserToDeleteRows = false;
            this.s.AllowUserToResizeColumns = false;
            this.s.AllowUserToResizeRows = false;
            dataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(213)))), ((int)(((byte)(234)))), ((int)(((byte)(255)))));
            this.s.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle10;
            dataGridViewCellStyle55.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(213)))), ((int)(((byte)(234)))), ((int)(((byte)(255)))));
            this.s.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle55;
            this.s.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
            this.s.BackgroundColor = System.Drawing.SystemColors.ButtonHighlight;
            dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
            dataGridViewCellStyle26.BackColor = System.Drawing.SystemColors.Control;
            dataGridViewCellStyle26.Font = new System.Drawing.Font("微软雅黑", 12F);
            dataGridViewCellStyle26.ForeColor = System.Drawing.SystemColors.WindowText;
            dataGridViewCellStyle26.SelectionBackColor = System.Drawing.SystemColors.Highlight;
            dataGridViewCellStyle26.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
            this.s.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle26;
            dataGridViewCellStyle126.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
            dataGridViewCellStyle126.BackColor = System.Drawing.SystemColors.Control;
            dataGridViewCellStyle126.Font = new System.Drawing.Font("微软雅黑", 12F);
            dataGridViewCellStyle126.ForeColor = System.Drawing.SystemColors.WindowText;
            dataGridViewCellStyle126.SelectionBackColor = System.Drawing.SystemColors.Highlight;
            dataGridViewCellStyle126.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
            this.s.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle126;
            this.s.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
            dataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
            dataGridViewCellStyle27.BackColor = System.Drawing.SystemColors.Window;
            dataGridViewCellStyle27.Font = new System.Drawing.Font("微软雅黑", 12F);
            dataGridViewCellStyle27.ForeColor = System.Drawing.SystemColors.ControlText;
            dataGridViewCellStyle27.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(92)))), ((int)(((byte)(173)))), ((int)(((byte)(254)))));
            dataGridViewCellStyle27.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
            dataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
            this.s.DefaultCellStyle = dataGridViewCellStyle27;
            dataGridViewCellStyle127.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
            dataGridViewCellStyle127.BackColor = System.Drawing.SystemColors.Window;
            dataGridViewCellStyle127.Font = new System.Drawing.Font("微软雅黑", 12F);
            dataGridViewCellStyle127.ForeColor = System.Drawing.SystemColors.ControlText;
            dataGridViewCellStyle127.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(92)))), ((int)(((byte)(173)))), ((int)(((byte)(254)))));
            dataGridViewCellStyle127.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
            dataGridViewCellStyle127.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
            this.s.DefaultCellStyle = dataGridViewCellStyle127;
            resources.ApplyResources(this.s, "s");
            this.s.EnableHeadersVisualStyles = false;
            this.s.GridColor = System.Drawing.Color.Silver;
@@ -1151,101 +1151,101 @@
            // 
            // dataGridViewTextBoxColumn1
            // 
            dataGridViewCellStyle28.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            dataGridViewCellStyle28.ForeColor = System.Drawing.Color.Gray;
            this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle28;
            dataGridViewCellStyle128.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            dataGridViewCellStyle128.ForeColor = System.Drawing.Color.Gray;
            this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle128;
            resources.ApplyResources(this.dataGridViewTextBoxColumn1, "dataGridViewTextBoxColumn1");
            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
            this.dataGridViewTextBoxColumn1.ReadOnly = true;
            // 
            // dataGridViewTextBoxColumn2
            // 
            dataGridViewCellStyle81.Font = new System.Drawing.Font("微软雅黑", 9F);
            this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle81;
            dataGridViewCellStyle177.Font = new System.Drawing.Font("微软雅黑", 9F);
            this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle177;
            resources.ApplyResources(this.dataGridViewTextBoxColumn2, "dataGridViewTextBoxColumn2");
            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
            // 
            // dataGridViewTextBoxColumn3
            // 
            dataGridViewCellStyle82.Font = new System.Drawing.Font("微软雅黑", 9F);
            this.dataGridViewTextBoxColumn3.DefaultCellStyle = dataGridViewCellStyle82;
            dataGridViewCellStyle178.Font = new System.Drawing.Font("微软雅黑", 9F);
            this.dataGridViewTextBoxColumn3.DefaultCellStyle = dataGridViewCellStyle178;
            resources.ApplyResources(this.dataGridViewTextBoxColumn3, "dataGridViewTextBoxColumn3");
            this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
            // 
            // dataGridViewTextBoxColumn4
            // 
            dataGridViewCellStyle83.Font = new System.Drawing.Font("微软雅黑", 9F);
            this.dataGridViewTextBoxColumn4.DefaultCellStyle = dataGridViewCellStyle83;
            dataGridViewCellStyle179.Font = new System.Drawing.Font("微软雅黑", 9F);
            this.dataGridViewTextBoxColumn4.DefaultCellStyle = dataGridViewCellStyle179;
            resources.ApplyResources(this.dataGridViewTextBoxColumn4, "dataGridViewTextBoxColumn4");
            this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
            // 
            // dataGridViewTextBoxColumn5
            // 
            dataGridViewCellStyle84.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.dataGridViewTextBoxColumn5.DefaultCellStyle = dataGridViewCellStyle84;
            dataGridViewCellStyle180.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.dataGridViewTextBoxColumn5.DefaultCellStyle = dataGridViewCellStyle180;
            resources.ApplyResources(this.dataGridViewTextBoxColumn5, "dataGridViewTextBoxColumn5");
            this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
            // 
            // dataGridViewTextBoxColumn6
            // 
            dataGridViewCellStyle85.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.dataGridViewTextBoxColumn6.DefaultCellStyle = dataGridViewCellStyle85;
            dataGridViewCellStyle181.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.dataGridViewTextBoxColumn6.DefaultCellStyle = dataGridViewCellStyle181;
            resources.ApplyResources(this.dataGridViewTextBoxColumn6, "dataGridViewTextBoxColumn6");
            this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
            // 
            // dataGridViewTextBoxColumn7
            // 
            dataGridViewCellStyle86.Font = new System.Drawing.Font("微软雅黑", 9F);
            this.dataGridViewTextBoxColumn7.DefaultCellStyle = dataGridViewCellStyle86;
            dataGridViewCellStyle182.Font = new System.Drawing.Font("微软雅黑", 9F);
            this.dataGridViewTextBoxColumn7.DefaultCellStyle = dataGridViewCellStyle182;
            resources.ApplyResources(this.dataGridViewTextBoxColumn7, "dataGridViewTextBoxColumn7");
            this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
            // 
            // dataGridViewTextBoxColumn8
            // 
            dataGridViewCellStyle87.Font = new System.Drawing.Font("微软雅黑", 9F);
            this.dataGridViewTextBoxColumn8.DefaultCellStyle = dataGridViewCellStyle87;
            dataGridViewCellStyle183.Font = new System.Drawing.Font("微软雅黑", 9F);
            this.dataGridViewTextBoxColumn8.DefaultCellStyle = dataGridViewCellStyle183;
            resources.ApplyResources(this.dataGridViewTextBoxColumn8, "dataGridViewTextBoxColumn8");
            this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8";
            // 
            // dataGridViewTextBoxColumn9
            // 
            dataGridViewCellStyle88.Font = new System.Drawing.Font("微软雅黑", 9F);
            this.dataGridViewTextBoxColumn9.DefaultCellStyle = dataGridViewCellStyle88;
            dataGridViewCellStyle184.Font = new System.Drawing.Font("微软雅黑", 9F);
            this.dataGridViewTextBoxColumn9.DefaultCellStyle = dataGridViewCellStyle184;
            resources.ApplyResources(this.dataGridViewTextBoxColumn9, "dataGridViewTextBoxColumn9");
            this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9";
            // 
            // dataGridViewTextBoxColumn10
            // 
            dataGridViewCellStyle89.Font = new System.Drawing.Font("微软雅黑", 9F);
            this.dataGridViewTextBoxColumn10.DefaultCellStyle = dataGridViewCellStyle89;
            dataGridViewCellStyle185.Font = new System.Drawing.Font("微软雅黑", 9F);
            this.dataGridViewTextBoxColumn10.DefaultCellStyle = dataGridViewCellStyle185;
            resources.ApplyResources(this.dataGridViewTextBoxColumn10, "dataGridViewTextBoxColumn10");
            this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10";
            // 
            // dataGridViewTextBoxColumn11
            // 
            dataGridViewCellStyle90.Font = new System.Drawing.Font("微软雅黑", 9F);
            this.dataGridViewTextBoxColumn11.DefaultCellStyle = dataGridViewCellStyle90;
            dataGridViewCellStyle186.Font = new System.Drawing.Font("微软雅黑", 9F);
            this.dataGridViewTextBoxColumn11.DefaultCellStyle = dataGridViewCellStyle186;
            resources.ApplyResources(this.dataGridViewTextBoxColumn11, "dataGridViewTextBoxColumn11");
            this.dataGridViewTextBoxColumn11.Name = "dataGridViewTextBoxColumn11";
            // 
            // dataGridViewTextBoxColumn12
            // 
            dataGridViewCellStyle91.Font = new System.Drawing.Font("微软雅黑", 9F);
            this.dataGridViewTextBoxColumn12.DefaultCellStyle = dataGridViewCellStyle91;
            dataGridViewCellStyle187.Font = new System.Drawing.Font("微软雅黑", 9F);
            this.dataGridViewTextBoxColumn12.DefaultCellStyle = dataGridViewCellStyle187;
            resources.ApplyResources(this.dataGridViewTextBoxColumn12, "dataGridViewTextBoxColumn12");
            this.dataGridViewTextBoxColumn12.Name = "dataGridViewTextBoxColumn12";
            // 
            // dataGridViewTextBoxColumn13
            // 
            dataGridViewCellStyle92.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.dataGridViewTextBoxColumn13.DefaultCellStyle = dataGridViewCellStyle92;
            dataGridViewCellStyle188.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.dataGridViewTextBoxColumn13.DefaultCellStyle = dataGridViewCellStyle188;
            resources.ApplyResources(this.dataGridViewTextBoxColumn13, "dataGridViewTextBoxColumn13");
            this.dataGridViewTextBoxColumn13.Name = "dataGridViewTextBoxColumn13";
            // 
            // dataGridViewTextBoxColumn14
            // 
            dataGridViewCellStyle93.Font = new System.Drawing.Font("微软雅黑", 9F);
            this.dataGridViewTextBoxColumn14.DefaultCellStyle = dataGridViewCellStyle93;
            dataGridViewCellStyle189.Font = new System.Drawing.Font("微软雅黑", 9F);
            this.dataGridViewTextBoxColumn14.DefaultCellStyle = dataGridViewCellStyle189;
            resources.ApplyResources(this.dataGridViewTextBoxColumn14, "dataGridViewTextBoxColumn14");
            this.dataGridViewTextBoxColumn14.Name = "dataGridViewTextBoxColumn14";
            // 
@@ -1266,8 +1266,8 @@
            // 
            // dataGridViewTextBoxColumn18
            // 
            dataGridViewCellStyle94.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.dataGridViewTextBoxColumn18.DefaultCellStyle = dataGridViewCellStyle94;
            dataGridViewCellStyle190.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.dataGridViewTextBoxColumn18.DefaultCellStyle = dataGridViewCellStyle190;
            resources.ApplyResources(this.dataGridViewTextBoxColumn18, "dataGridViewTextBoxColumn18");
            this.dataGridViewTextBoxColumn18.Name = "dataGridViewTextBoxColumn18";
            this.dataGridViewTextBoxColumn18.ReadOnly = true;
@@ -1284,15 +1284,15 @@
            // 
            // dataGridViewTextBoxColumn21
            // 
            dataGridViewCellStyle95.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.dataGridViewTextBoxColumn21.DefaultCellStyle = dataGridViewCellStyle95;
            dataGridViewCellStyle191.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.dataGridViewTextBoxColumn21.DefaultCellStyle = dataGridViewCellStyle191;
            resources.ApplyResources(this.dataGridViewTextBoxColumn21, "dataGridViewTextBoxColumn21");
            this.dataGridViewTextBoxColumn21.Name = "dataGridViewTextBoxColumn21";
            // 
            // dataGridViewTextBoxColumn22
            // 
            dataGridViewCellStyle96.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.dataGridViewTextBoxColumn22.DefaultCellStyle = dataGridViewCellStyle96;
            dataGridViewCellStyle192.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.dataGridViewTextBoxColumn22.DefaultCellStyle = dataGridViewCellStyle192;
            resources.ApplyResources(this.dataGridViewTextBoxColumn22, "dataGridViewTextBoxColumn22");
            this.dataGridViewTextBoxColumn22.Name = "dataGridViewTextBoxColumn22";
            // 
@@ -1303,36 +1303,36 @@
            // 
            // dataGridViewTextBoxColumn24
            // 
            dataGridViewCellStyle97.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.dataGridViewTextBoxColumn24.DefaultCellStyle = dataGridViewCellStyle97;
            dataGridViewCellStyle193.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.dataGridViewTextBoxColumn24.DefaultCellStyle = dataGridViewCellStyle193;
            resources.ApplyResources(this.dataGridViewTextBoxColumn24, "dataGridViewTextBoxColumn24");
            this.dataGridViewTextBoxColumn24.Name = "dataGridViewTextBoxColumn24";
            // 
            // dataGridViewTextBoxColumn25
            // 
            dataGridViewCellStyle98.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.dataGridViewTextBoxColumn25.DefaultCellStyle = dataGridViewCellStyle98;
            dataGridViewCellStyle194.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.dataGridViewTextBoxColumn25.DefaultCellStyle = dataGridViewCellStyle194;
            resources.ApplyResources(this.dataGridViewTextBoxColumn25, "dataGridViewTextBoxColumn25");
            this.dataGridViewTextBoxColumn25.Name = "dataGridViewTextBoxColumn25";
            // 
            // dataGridViewTextBoxColumn26
            // 
            dataGridViewCellStyle99.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.dataGridViewTextBoxColumn26.DefaultCellStyle = dataGridViewCellStyle99;
            dataGridViewCellStyle195.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.dataGridViewTextBoxColumn26.DefaultCellStyle = dataGridViewCellStyle195;
            resources.ApplyResources(this.dataGridViewTextBoxColumn26, "dataGridViewTextBoxColumn26");
            this.dataGridViewTextBoxColumn26.Name = "dataGridViewTextBoxColumn26";
            // 
            // dataGridViewTextBoxColumn27
            // 
            dataGridViewCellStyle100.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.dataGridViewTextBoxColumn27.DefaultCellStyle = dataGridViewCellStyle100;
            dataGridViewCellStyle196.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.dataGridViewTextBoxColumn27.DefaultCellStyle = dataGridViewCellStyle196;
            resources.ApplyResources(this.dataGridViewTextBoxColumn27, "dataGridViewTextBoxColumn27");
            this.dataGridViewTextBoxColumn27.Name = "dataGridViewTextBoxColumn27";
            // 
            // dataGridViewTextBoxColumn28
            // 
            dataGridViewCellStyle101.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.dataGridViewTextBoxColumn28.DefaultCellStyle = dataGridViewCellStyle101;
            dataGridViewCellStyle197.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.dataGridViewTextBoxColumn28.DefaultCellStyle = dataGridViewCellStyle197;
            resources.ApplyResources(this.dataGridViewTextBoxColumn28, "dataGridViewTextBoxColumn28");
            this.dataGridViewTextBoxColumn28.Name = "dataGridViewTextBoxColumn28";
            // 
@@ -2423,8 +2423,8 @@
            // dataGridViewImageColumn1
            // 
            this.dataGridViewImageColumn1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
            dataGridViewCellStyle102.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
            this.dataGridViewImageColumn1.DefaultCellStyle = dataGridViewCellStyle102;
            dataGridViewCellStyle198.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
            this.dataGridViewImageColumn1.DefaultCellStyle = dataGridViewCellStyle198;
            resources.ApplyResources(this.dataGridViewImageColumn1, "dataGridViewImageColumn1");
            this.dataGridViewImageColumn1.Image = ((System.Drawing.Image)(resources.GetObject("dataGridViewImageColumn1.Image")));
            this.dataGridViewImageColumn1.Name = "dataGridViewImageColumn1";

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

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

            dataTable.Rows.Add("25.11.17", "功能完善", "1.修复了一些已知问题\r\n2.允许小片手动修改磨量", "2025.11.17");
            //dataTable.Rows.Add("25.11.17", "功能完善", "1.去除了部分数据库访问问题\r\n2.小片修改磨量的问题", "2025.11.17");
            dataTable.Rows.Add("25.11.14", "功能完善", "1.完善了数据库变更部分内容", "2025.11.14");
            dataTable.Rows.Add("25.11.12", "功能完善", "1.完善了部分内容", "2025.11.12");
            //dataTable.Rows.Add("25.11.12", "功能完善", "新增mes数据访问mes_modular库，更改报告打印预览加载部分，", "2025.11.12");

 optimize_patch/¶©µ¥ÅÅÑù¿Í»§¶Ë/EDIT/ÉèÖÃÄ¥Á¿.Designer.cs

@@ -124,8 +124,8 @@
            // 
            // gBoxShow
            // 
            resources.ApplyResources(this.gBoxShow, "gBoxShow");
            this.gBoxShow.Controls.Add(this.tlpEdging);
            resources.ApplyResources(this.gBoxShow, "gBoxShow");
            this.gBoxShow.Name = "gBoxShow";
            this.gBoxShow.TabStop = false;
            // 
@@ -215,8 +215,8 @@
            // 
            // panSquare
            // 
            resources.ApplyResources(this.panSquare, "panSquare");
            this.panSquare.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(92)))), ((int)(((byte)(173)))), ((int)(((byte)(254)))));
            resources.ApplyResources(this.panSquare, "panSquare");
            this.panSquare.Name = "panSquare";
            this.panSquare.Click += new System.EventHandler(this.panSquare_Click);
            // 
@@ -283,8 +283,8 @@
            // 
            // cmbProcessList
            // 
            resources.ApplyResources(this.cmbProcessList, "cmbProcessList");
            this.tlpEdging.SetColumnSpan(this.cmbProcessList, 2);
            resources.ApplyResources(this.cmbProcessList, "cmbProcessList");
            this.cmbProcessList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
            this.cmbProcessList.FormattingEnabled = true;
            this.cmbProcessList.Name = "cmbProcessList";
@@ -335,32 +335,32 @@
            // 
            // lblBtnUseEdge
            // 
            resources.ApplyResources(this.lblBtnUseEdge, "lblBtnUseEdge");
            this.lblBtnUseEdge.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(92)))), ((int)(((byte)(173)))), ((int)(((byte)(254)))));
            resources.ApplyResources(this.lblBtnUseEdge, "lblBtnUseEdge");
            this.lblBtnUseEdge.ForeColor = System.Drawing.SystemColors.ControlLightLight;
            this.lblBtnUseEdge.Name = "lblBtnUseEdge";
            this.lblBtnUseEdge.Click += new System.EventHandler(this.lblBtnUseEdge_Click);
            // 
            // tcBody
            // 
            resources.ApplyResources(this.tcBody, "tcBody");
            this.tcBody.Controls.Add(this.tpEdge);
            this.tcBody.Controls.Add(this.tpTrim);
            resources.ApplyResources(this.tcBody, "tcBody");
            this.tcBody.Name = "tcBody";
            this.tcBody.SelectedIndex = 0;
            // 
            // tpEdge
            // 
            resources.ApplyResources(this.tpEdge, "tpEdge");
            this.tpEdge.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(213)))), ((int)(((byte)(234)))), ((int)(((byte)(255)))));
            this.tpEdge.Controls.Add(this.tlpBody);
            resources.ApplyResources(this.tpEdge, "tpEdge");
            this.tpEdge.Name = "tpEdge";
            // 
            // tpTrim
            // 
            resources.ApplyResources(this.tpTrim, "tpTrim");
            this.tpTrim.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(213)))), ((int)(((byte)(234)))), ((int)(((byte)(255)))));
            this.tpTrim.Controls.Add(this.tableLayoutPanel2);
            resources.ApplyResources(this.tpTrim, "tpTrim");
            this.tpTrim.Name = "tpTrim";
            // 
            // tableLayoutPanel2
@@ -375,8 +375,8 @@
            // 
            // groupBox1
            // 
            resources.ApplyResources(this.groupBox1, "groupBox1");
            this.groupBox1.Controls.Add(this.tableLayoutPanel3);
            resources.ApplyResources(this.groupBox1, "groupBox1");
            this.groupBox1.Name = "groupBox1";
            this.groupBox1.TabStop = false;
            // 
@@ -466,8 +466,8 @@
            // 
            // panStockTrim
            // 
            resources.ApplyResources(this.panStockTrim, "panStockTrim");
            this.panStockTrim.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(92)))), ((int)(((byte)(173)))), ((int)(((byte)(254)))));
            resources.ApplyResources(this.panStockTrim, "panStockTrim");
            this.panStockTrim.Name = "panStockTrim";
            this.panStockTrim.Click += new System.EventHandler(this.panStockTrim_Click);
            // 
@@ -571,8 +571,8 @@
            // 
            // lblBtnTrimSave
            // 
            resources.ApplyResources(this.lblBtnTrimSave, "lblBtnTrimSave");
            this.lblBtnTrimSave.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(92)))), ((int)(((byte)(173)))), ((int)(((byte)(254)))));
            resources.ApplyResources(this.lblBtnTrimSave, "lblBtnTrimSave");
            this.lblBtnTrimSave.ForeColor = System.Drawing.SystemColors.ControlLightLight;
            this.lblBtnTrimSave.Name = "lblBtnTrimSave";
            this.lblBtnTrimSave.Click += new System.EventHandler(this.lblBtnTrimSave_Click);

 optimize_patch/¶©µ¥ÅÅÑù¿Í»§¶Ë/EDIT/ÉèÖÃÄ¥Á¿.cs

@@ -286,12 +286,16 @@
                this.Close();
            }

            if (ConfigDB.SaveEdgeConfig(em))
            {
                ä»»åŠ¡.currentEdge = em;
                this.DialogResult = DialogResult.OK;
                this.Close();
            }
            ä»»åŠ¡.currentEdge = em;
            this.DialogResult = DialogResult.OK;
            this.Close();

            //if (ConfigDB.SaveEdgeConfig(em))
            //{
            //    ä»»åŠ¡.currentEdge = em;
            //    this.DialogResult = DialogResult.OK;
            //    this.Close();
            //}

        }

@@ -321,12 +325,17 @@
                quick_trim = Convert.ToDouble(txtTrimQuick.Text.Trim()),
                auto_fill_trim = cBoxTrimAutoFill.Checked
            };
            if (ConfigDB.SaveTrimConfig(tm))
            {
                ä»»åŠ¡.currentTrimming = tm;
                this.DialogResult = DialogResult.OK;
                this.Close();
            }

            ä»»åŠ¡.currentTrimming = tm;
            this.DialogResult = DialogResult.OK;
            this.Close();

            //if (ConfigDB.SaveTrimConfig(tm))
            //{
            //    ä»»åŠ¡.currentTrimming = tm;
            //    this.DialogResult = DialogResult.OK;
            //    this.Close();
            //}
            //SaveTrimmingConfig()
        }

@@ -514,12 +523,16 @@
                quick_trim = Convert.ToDouble(txtTrimQuick.Text.Trim()),
                auto_fill_trim = cBoxTrimAutoFill.Checked
            };
            if (ConfigDB.SaveTrimConfig(tm))
            {
                ä»»åŠ¡.currentTrimming = tm;
                this.DialogResult = DialogResult.OK;
                this.Close();
            }
            ä»»åŠ¡.currentTrimming = tm;
            this.DialogResult = DialogResult.OK;
            this.Close();

            //if (ConfigDB.SaveTrimConfig(tm))
            //{
            //    ä»»åŠ¡.currentTrimming = tm;
            //    this.DialogResult = DialogResult.OK;
            //    this.Close();
            //}
            //SaveTrimmingConfig()
        }
    }

 optimize_patch/¶©µ¥ÅÅÑù¿Í»§¶Ë/EDIT/ÉèÖÃÄ¥Á¿.resx

Diff too large

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

@@ -46,8 +46,7 @@
            //#if DEBUG

            Service.ReadServiceConfig();
            SystemConfig.ReadSet();
            OptimaConfig.OptimaConfigRead();



            Application.Run(new ç®¡ç†å‘˜ç™»å½•());

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

@@ -12,7 +12,9 @@
using System.Threading.Tasks;
using Utility;
using ng.optima.config;
using ng.optima.util;
using MyGlassEdit.ng.optima.util;
using ng.optima.model;

namespace MyGlassEdit.ng.optima.helper
{

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

@@ -4,7 +4,7 @@
using System.Text;
using System.Threading.Tasks;

namespace MyGlassEdit.ng.optima.model
namespace ng.optima.model
{
    class MarkModel
    {

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

New file
@@ -0,0 +1,16 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace ng.optima.model
{
    class MarkNewModel
    {
        public MarkModel markIcon { get; set; }

        public int logoNum { get; set; }
        public int qrCodeNum { get; set; }
    }
}

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

@@ -1,6 +1,7 @@
using MyGlassEdit.ng.optima.model;
using MyGlassEdit.ng.optima.util;
using Newtonsoft.Json;
using ng.optima.config;
using ng.optima.server;
using ng.optima.util;
using System;
@@ -45,11 +46,14 @@
            LoginAdminInfo.last_logout_time = admin.last_logout_time;

            //获取用户钢化的配置
            ConfigDB.GetAdminConfig(1,LoginAdminInfo.h_id);
            //ConfigDB.GetAdminConfig(1,LoginAdminInfo.h_id);
            //获取用户打标的配置
            ConfigDB.GetAdminConfig(2,LoginAdminInfo.m_id);
            //ConfigDB.GetAdminConfig(2,LoginAdminInfo.m_id);
            //获取用户系统的配置
            ConfigDB.GetAdminConfig(3,LoginAdminInfo.o_id);
            //ConfigDB.GetAdminConfig(3,LoginAdminInfo.o_id);

            SystemConfig.ReadSet();
            OptimaConfig.OptimaConfigRead();

            return UpdateAdminInfo();
        }

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

@@ -357,6 +357,7 @@
    <Compile Include="ng.optima.model\HeatResultModel.cs" />
    <Compile Include="ng.optima.model\LoginAdminInfo.cs" />
    <Compile Include="ng.optima.model\MarkModel.cs" />
    <Compile Include="ng.optima.model\MarkNewModel.cs" />
    <Compile Include="ng.optima.model\MaterialModel.cs" />
    <Compile Include="ng.optima.model\MessageModel.cs" />
    <Compile Include="ng.optima.model\OffcutStockModel.cs" />