1.增加了部分日志记录2.增加了数据库访问端口设置3.增加了用户设置

孙世强

2025-10-15 9de737fe3be164cfd1b31ed36b2575fde05a0c25

1.增加了部分日志记录2.增加了数据库访问端口设置3.增加了用户设置

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

@@ -149,18 +149,22 @@

                PermissionControlDisplay();

                

            }
            catch (Exception ex)
            {

                MessageBox.Show(step.ToString()+"\r\n"+errMsg);
                MessageBox.Show(step.ToString() + "\r\n" + errMsg);
                errorInfo(ex);

            }
        }

        /*异常信息捕获*/

        private static readonly NLog.Logger Logger = NLog.LogManager.GetCurrentClassLogger();


        void errorInfo(Exception ex)
        {
            StringBuilder sb = new StringBuilder();
@@ -168,6 +172,7 @@
            {
                sb.AppendFormat("捕获到未处理异常：{0}\r\n异常信息：{1}\r\n异常堆栈：{2}\r\n方法{3}", ex.GetType(), ex.Message, ex.StackTrace, ex.TargetSite);
                ex = ex.InnerException;
                Logger.Error(ex, "任务.cs:174");
            }

            globel.ShowMessage("errorInfo: " + sb.ToString());
@@ -431,7 +436,7 @@

                if (globel.UserGroup == "补片")
                {
                    

                    createPatchProject();
                    //txtProjectNo.Text =  PatchProjectDB.getPatchProjectNo();
                    //txtProjectNo.Text = ProjectDB.CreateProject(0);
@@ -945,7 +950,7 @@
                string glass_thickness = cmbGlassThick.Text.Trim();
                string glass_type = cmbGlassType.Text.Trim();


                Logger.Info($"进行了优化：{txtProjectNo.Text}");
                Optimize(glass_thickness, glass_type);//优化

                packisrect = true;
@@ -3153,6 +3158,7 @@
                    isremoving = true;
                    if (pack == null)
                    {
                        Logger.Info($"删除了行{row.Index};玻璃ID:{row.Cells["备注"].Value}");
                        polyView.Rows.Remove(row);
                        Setting.settingchaged = true;
                    }
@@ -4105,14 +4111,21 @@
        {
            try
            {
                if (pack == null) { globel.ShowFromWarningMessage(strNoResult); return; }
                Logger.Info($"进行了保存操作：{txtProjectNo.Text}");
                if (pack == null) { 
                    globel.ShowFromWarningMessage(strNoResult);
                    Logger.Info($"{strNoResult}");
                    return; 
                }
                if (!IsContinue()) { return; }
                if (openProject!=null && openProject.state == 20)
                if (openProject != null && openProject.state == 20)
                {
                    Logger.Info($"工程已保存");
                    globel.SHowNewFromOkMessage("工程已保存！", true);
                    return;
                }
                if (globel.UserGroup == "补片") {
                if (globel.UserGroup == "补片")
                {

                    MyGlasFile myglassfile = new MyGlasFile(pack, simpleorder);
                    //string line = myglassfile.ToBtString();//调整前的结果
@@ -4123,21 +4136,23 @@
                    StringBuilder sql = new StringBuilder();
                    foreach (DataGridViewRow dgvr in stockView.Rows)
                    {
                        if (dgvr.Cells[0].Value != null && (Boolean)dgvr.Cells[0].Value == true) {
                        if (dgvr.Cells[0].Value != null && (Boolean)dgvr.Cells[0].Value == true)
                        {

                            int type = dgvr.Cells["状态"].Value.ToString() == "余料" ? 0 : 1;

                            string wldm = dgvr.Cells["物料代码"].Value.ToString();
                            string w = dgvr.Cells["大片宽"].Value.ToString();
                            string g = dgvr.Cells["大片高"].Value.ToString();
                            string yl = dgvr.Cells["用量"].Value==null?"0": dgvr.Cells["用量"].Value.ToString();
                            string yl = dgvr.Cells["用量"].Value == null ? "0" : dgvr.Cells["用量"].Value.ToString();

                            string left_trim = dgvr.Cells["X1修边"].Value.ToString();
                            string down_trim = dgvr.Cells["Y1修边"].Value.ToString();
                            string right_trim = dgvr.Cells["X2修边"].Value.ToString();
                            string up_trim = dgvr.Cells["Y2修边"].Value.ToString();

                            if (yl != "0") {
                            if (yl != "0")
                            {
                                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}'", openProject.project_no, wldm, type, w, g, yl, yl, LoginAdminInfo.id);
                                sql.AppendFormat(",'{0}','{1}','{2}','{3}');", left_trim, down_trim, right_trim, up_trim);
@@ -4148,14 +4163,14 @@

                    openProject.name = projectnameText.Text;

                    OperationModel om =  PatchProjectDB.SavePatchOptimizeResult(openProject, pack, line, sql.ToString());
                    OperationModel om = PatchProjectDB.SavePatchOptimizeResult(openProject, pack, line, sql.ToString());
                    if (om.state)
                    {
                        openProject.state = 20;

                        containerMsg.Visible = false;


                        Logger.Info($"{openProject.project_no}:保存成功");
                        string savedSuccess = Setting.language != 0 ? "Saved successfully." : "保存成功!";
                        globel.SHowNewFromOkMessage(savedSuccess, true);
                        //globel.SHowNewFromOkMessage("保存成功！", true);
@@ -4168,7 +4183,7 @@
                    }
                    else
                    {

                        Logger.Info($"保存失败！\r\n位置:{om.errCode }\r描述:{ om.info}");
                        globel.SHowNewFromOkMessage("保存失败！\r\n位置:" + om.errCode + "\r\n描述:" + om.info, false);
                    }
                    return;
@@ -4277,9 +4292,10 @@
                        om = ProjectDB.SaveOPTOptimizeResult(p_no, pack, line, dicOpenPrcessLayer_, sType);

                    }
                    else {
                    else
                    {
                        om = ProjectDB.SaveOptimizeResult(p_no, pack, line, dicOpenPrcessLayer_, sType);
                        

                    }

                    //dk.Abort();
@@ -4299,9 +4315,10 @@
                        }

                    }
                    else {
                    else
                    {

                        globel.SHowNewFromOkMessage("保存失败！\r\n位置:"+om.errCode+"\r\n描述:"+om.info, false);
                        globel.SHowNewFromOkMessage("保存失败！\r\n位置:" + om.errCode + "\r\n描述:" + om.info, false);
                    }
                    #endregion

@@ -4556,7 +4573,8 @@
        #region æŸ¥è¯¢åº“å­˜
        private void uBtnSearchKuCun_Click(object sender, EventArgs e)
        {
            if (openProject.state == 20 && pack !=null) {
            if (openProject.state == 20 && pack != null)
            {
                globel.ShowFromWarningMessage("当前结果已经保存，请新建工程后再次查询！");
                return;
            }
@@ -4576,12 +4594,14 @@
                return;
            };

            if (globel.UserGroup == "补片") {
            Logger.Info($"查询了：{gThick}mm厚度{gType} çŽ°è¡¥å°ç‰‡");
            if (globel.UserGroup == "补片")
            {

                string filer = txtFilter.Text.Trim();

                bool filterState = false;
                if (string.IsNullOrWhiteSpace(filer)||filer == filtertext)
                if (string.IsNullOrWhiteSpace(filer) || filer == filtertext)
                {
                    filterState = showPatchPolysData(gThick, gType);
                }
@@ -4589,7 +4609,8 @@
                {
                    filterState = showPatchPolysData(gThick, gType, filer);
                }
                if (filterState) {
                if (filterState)
                {

                    ShowMaterialData();
                }
@@ -4597,7 +4618,7 @@
            }


            

        }
        #endregion

@@ -4679,7 +4700,8 @@

                stockView.Columns["优先"].Visible = true;
            }
            else {
            else
            {

                stockView.Columns["优先"].Visible = false;

@@ -4741,7 +4763,8 @@
        }


        void showOffcutStock() {
        void showOffcutStock()
        {

            string gThick = cmbGlassThick.Text.Trim();
            if (string.IsNullOrWhiteSpace(gThick))
@@ -4828,7 +4851,7 @@
            {
                LoginAdminInfo.last_logout_time = DateTime.Now;//.ToString("yyyy-MM-dd HH:mm:ss");
                AdminDB.UpdateAdminInfo();

                Logger.Info("退出了程序\r\n\r\n\r\n");
                System.Environment.Exit(0);
            }
            else
@@ -5355,7 +5378,8 @@
            OpenProjectInfo(pNo);
            bool autofill = currentEdge.auto_fill_edge;//是否自动填充
            EdgeModel edgeModel = currentEdge;
            if (!string.IsNullOrEmpty(projectEdge)) {
            if (!string.IsNullOrEmpty(projectEdge))
            {
                edgeModel = JsonConvert.DeserializeObject<EdgeModel>(projectEdge);
            }

@@ -5404,7 +5428,8 @@
                            this.polyView.Rows[index].Cells["长磨2"].Value = autofill ? filling ? "0" : currentEdge.up_edge.ToString() : "0";
                            this.polyView.Rows[index].Cells["短磨2"].Value = autofill ? filling ? "0" : currentEdge.right_edge.ToString() : "0";
                        }
                        else {
                        else
                        {
                            this.polyView.Rows[index].Cells["长磨1"].Value = edgeModel.down_edge.ToString();
                            this.polyView.Rows[index].Cells["短磨1"].Value = edgeModel.left_edge.ToString();
                            this.polyView.Rows[index].Cells["长磨2"].Value = edgeModel.up_edge.ToString();
@@ -5427,7 +5452,7 @@
                        polyView.Rows[index].Cells["单价"].Value = dr["price"];
                        polyView.Rows[index].Cells["单片名称"].Value = dr["glass_child"];
                        polyView.Rows[index].Cells["产品名称"].Value = dr["product_name"];
                        polyView.Rows[index].Cells["楼层编号"].Value = dr["building_number"]!=null ? dr["building_number"].ToString().Replace("\r\n", " ").Replace("\r", " ").Replace("\n", " ") : dr["building_number"];
                        polyView.Rows[index].Cells["楼层编号"].Value = dr["building_number"] != null ? dr["building_number"].ToString().Replace("\r\n", " ").Replace("\r", " ").Replace("\n", " ") : dr["building_number"];
                        polyView.Rows[index].Cells["印标类型"].Value = dr["icon"];
                        polyView.Rows[index].Cells["备注"].Value = dr["remarks"];
                        polyView.Rows[index].Cells["玻璃层"].Value = dr["layer"];
@@ -5448,7 +5473,7 @@

                        newRectRow(index, 100);
                    }
                    

                    //恢复布局更新：
                    polyView.ResumeLayout();

@@ -5502,7 +5527,7 @@
                    glass_type = pInfo.Rows[0]["glass_type"].ToString(),
                    state = Convert.ToInt32(pInfo.Rows[0]["state"].ToString()),
                    guidance = pInfo.Rows[0]["guidance"] == DBNull.Value ? 1 : Convert.ToInt32(pInfo.Rows[0]["guidance"].ToString()),
                    

                };
                projectEdge = pInfo.Rows[0]["edge_config"].ToString();
                cmbGlassThick.Text = openProject.glass_thickness.Trim('m');
@@ -5734,7 +5759,7 @@
                return true;
            }

           


            return false;
        }
@@ -5761,7 +5786,7 @@
                    this.stockView.Rows[index].Cells["大片宽"].Value = dt.Rows[i]["width"].ToString();
                    this.stockView.Rows[index].Cells["大片高"].Value = dt.Rows[i]["height"].ToString();

                    this.stockView.Rows[index].Cells["状态"].Value = dt.Rows[i]["type"].ToString()=="1"?"原片":"余料";
                    this.stockView.Rows[index].Cells["状态"].Value = dt.Rows[i]["type"].ToString() == "1" ? "原片" : "余料";
                    this.stockView.Rows[index].Cells["类型"].Value = openProject.glass_type;
                    this.stockView.Rows[index].Cells["厚度"].Value = openProject.glass_thickness;

@@ -5776,7 +5801,7 @@
                    stockView.Rows[i].Cells["Y1修边"].Value = dt.Rows[i]["down_trim"].ToString();
                    stockView.Rows[i].Cells["Y2修边"].Value = dt.Rows[i]["up_trim"].ToString();

                    string keys = Convert.ToSingle( dt.Rows[i]["width"].ToString())+ "x" + Convert.ToSingle(dt.Rows[i]["height"].ToString());
                    string keys = Convert.ToSingle(dt.Rows[i]["width"].ToString()) + "x" + Convert.ToSingle(dt.Rows[i]["height"].ToString());

                    if (!dicReportProjectUseStock.ContainsKey(keys))
                    {
@@ -5784,7 +5809,7 @@
                    }
                }

               


                return true;
            }
@@ -5880,7 +5905,7 @@
                    this.stockView.Rows[index].Cells["优先"].Value = "1";

                    this.stockView.Rows[index].Cells["类型"].Value = cmbGlassType.Text.Trim();
                    this.stockView.Rows[index].Cells["状态"].Value ="余料";
                    this.stockView.Rows[index].Cells["状态"].Value = "余料";
                    this.stockView.Rows[index].Cells["厚度"].Value = cmbGlassThick.Text.Trim();

                    this.stockView.Rows[index].Cells["库存量"].Value = 999;
@@ -6138,7 +6163,8 @@
        /// <summary>
        /// ä¿å­˜æç¤ºæ¡†æ˜¾ç¤ºä½ç½®
        /// </summary>
        void containerShow() {
        void containerShow()
        {
            int x = (this.Width - containerMsg.Width) / 2;
            int y = (this.Height - containerMsg.Height) / 2;

@@ -6202,12 +6228,15 @@

        #region çŽ°è¡¥
        string patchStr = Setting.language == 1 ? "patch" : "现补";
        void createPatchProject() {
        void createPatchProject()
        {



            if (openProject!=null && openProject.state < 20 && pack !=null) {
                if(globel.ShowFromConfirmMessage("当前工程有结果未保存，是否确认重新创建补片工程？")){
            if (openProject != null && openProject.state < 20 && pack != null)
            {
                if (globel.ShowFromConfirmMessage("当前工程有结果未保存，是否确认重新创建补片工程？"))
                {
                    return;
                }
            }
@@ -6277,7 +6306,7 @@

        }

        bool showPatchPolysData(string hd, string mx,string txt)
        bool showPatchPolysData(string hd, string mx, string txt)
        {
            polyView.Rows.Clear();
            DataTable dt = PatchProjectDB.getPatchGlass2(mx, hd, txt);
@@ -6295,7 +6324,8 @@
        }

        string strPatch = Setting.language == 0 ? "补片" : "Patch";
        void loadPatchPolys(DataTable dt) {
        void loadPatchPolys(DataTable dt)
        {


            bool autofill = currentEdge.auto_fill_edge;
@@ -6355,7 +6385,7 @@
            stockView.Rows.Clear();
        }

        

        private void txtFilter_Enter(object sender, EventArgs e)
        {
            if (txtFilter.Text.Trim() == filtertext)
@@ -6374,7 +6404,8 @@
            }
        }

        void showGlassType() {
        void showGlassType()
        {

            DataTable dt = PatchProjectDB.GetAllPachtGlass();
            if (dt != null)
@@ -6388,7 +6419,8 @@
                {
                    string gThick = dr["thickness"].ToString();
                    string gType = dr["filmsid"].ToString();
                    if (!lisGlassThick.Contains(gThick)) {
                    if (!lisGlassThick.Contains(gThick))
                    {

                        lisGlassThick.Add(gThick);
                    }
@@ -6403,7 +6435,7 @@
                cmbGlassThick.DataSource = lisGlassThick;
                cmbGlassType.DataSource = lisGlassType;
            }
            

        }

        #endregion

 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 dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = 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 dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle33 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle35 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle36 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle37 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle38 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle39 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle40 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle41 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle42 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle43 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle44 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle45 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle46 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle47 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle48 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle49 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle50 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle51 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle52 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle53 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle54 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle199 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle200 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle201 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle202 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle203 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle204 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle205 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle206 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle207 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle151 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle222 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle223 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle224 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle152 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle208 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle209 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle210 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle211 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle212 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle213 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle214 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle215 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle216 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle217 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle218 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle219 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle220 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle221 = 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 dataGridViewCellStyle225 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle226 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle227 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle228 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle229 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle230 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle231 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle232 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle233 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle234 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle235 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle236 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle237 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle238 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle239 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle240 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle241 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle242 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle243 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle244 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle245 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle246 = 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;
            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.stockView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
            dataGridViewCellStyle199.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(213)))), ((int)(((byte)(234)))), ((int)(((byte)(255)))));
            dataGridViewCellStyle199.ForeColor = System.Drawing.Color.Black;
            dataGridViewCellStyle199.SelectionBackColor = System.Drawing.SystemColors.HotTrack;
            this.stockView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle199;
            this.stockView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
            this.stockView.BackgroundColor = System.Drawing.Color.White;
            this.stockView.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
            dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 12F);
            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
            this.stockView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
            dataGridViewCellStyle200.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
            dataGridViewCellStyle200.BackColor = System.Drawing.SystemColors.Control;
            dataGridViewCellStyle200.Font = new System.Drawing.Font("微软雅黑", 12F);
            dataGridViewCellStyle200.ForeColor = System.Drawing.SystemColors.WindowText;
            dataGridViewCellStyle200.SelectionBackColor = System.Drawing.SystemColors.Highlight;
            dataGridViewCellStyle200.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
            dataGridViewCellStyle200.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
            this.stockView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle200;
            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;
            dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.大片宽.DefaultCellStyle = dataGridViewCellStyle3;
            dataGridViewCellStyle201.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.大片宽.DefaultCellStyle = dataGridViewCellStyle201;
            this.大片宽.FillWeight = 49.71305F;
            resources.ApplyResources(this.大片宽, "大片宽");
            this.大片宽.Name = "大片宽";
@@ -736,8 +736,8 @@
            // å¤§ç‰‡é«˜
            // 
            this.大片高.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
            dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.大片高.DefaultCellStyle = dataGridViewCellStyle4;
            dataGridViewCellStyle202.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.大片高.DefaultCellStyle = dataGridViewCellStyle202;
            this.大片高.FillWeight = 49.71305F;
            resources.ApplyResources(this.大片高, "大片高");
            this.大片高.Name = "大片高";
@@ -758,8 +758,8 @@
            // X1修边
            // 
            this.X1修边.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader;
            dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.X1修边.DefaultCellStyle = dataGridViewCellStyle5;
            dataGridViewCellStyle203.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.X1修边.DefaultCellStyle = dataGridViewCellStyle203;
            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;
            dataGridViewCellStyle6.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.Y1修边.DefaultCellStyle = dataGridViewCellStyle6;
            dataGridViewCellStyle204.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.Y1修边.DefaultCellStyle = dataGridViewCellStyle204;
            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;
            dataGridViewCellStyle7.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.X2修边.DefaultCellStyle = dataGridViewCellStyle7;
            dataGridViewCellStyle205.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.X2修边.DefaultCellStyle = dataGridViewCellStyle205;
            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;
            dataGridViewCellStyle8.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.Y2修边.DefaultCellStyle = dataGridViewCellStyle8;
            dataGridViewCellStyle206.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.Y2修边.DefaultCellStyle = dataGridViewCellStyle206;
            this.Y2修边.FillWeight = 49.71305F;
            resources.ApplyResources(this.Y2修边, "Y2修边");
            this.Y2修边.Name = "Y2修边";
            // 
            // åº“存量
            // 
            dataGridViewCellStyle9.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.库存量.DefaultCellStyle = dataGridViewCellStyle9;
            dataGridViewCellStyle207.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.库存量.DefaultCellStyle = dataGridViewCellStyle207;
            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;
            dataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(213)))), ((int)(((byte)(234)))), ((int)(((byte)(255)))));
            dataGridViewCellStyle10.ForeColor = System.Drawing.Color.Black;
            dataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.HotTrack;
            this.polyView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle10;
            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.polyView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle151;
            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;
            dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
            dataGridViewCellStyle26.BackColor = System.Drawing.Color.White;
            dataGridViewCellStyle26.Font = new System.Drawing.Font("微软雅黑", 12F);
            dataGridViewCellStyle26.ForeColor = System.Drawing.SystemColors.ControlText;
            dataGridViewCellStyle26.SelectionBackColor = System.Drawing.SystemColors.HotTrack;
            dataGridViewCellStyle26.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
            dataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
            this.polyView.DefaultCellStyle = dataGridViewCellStyle26;
            dataGridViewCellStyle222.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
            dataGridViewCellStyle222.BackColor = System.Drawing.Color.White;
            dataGridViewCellStyle222.Font = new System.Drawing.Font("微软雅黑", 12F);
            dataGridViewCellStyle222.ForeColor = System.Drawing.SystemColors.ControlText;
            dataGridViewCellStyle222.SelectionBackColor = System.Drawing.SystemColors.HotTrack;
            dataGridViewCellStyle222.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
            dataGridViewCellStyle222.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
            this.polyView.DefaultCellStyle = dataGridViewCellStyle222;
            this.polyView.GridColor = System.Drawing.Color.Silver;
            this.polyView.Name = "polyView";
            dataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
            dataGridViewCellStyle27.BackColor = System.Drawing.Color.WhiteSmoke;
            dataGridViewCellStyle27.Font = new System.Drawing.Font("微软雅黑", 12F);
            dataGridViewCellStyle27.ForeColor = System.Drawing.Color.WhiteSmoke;
            dataGridViewCellStyle27.SelectionBackColor = System.Drawing.SystemColors.HotTrack;
            dataGridViewCellStyle27.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
            dataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
            this.polyView.RowHeadersDefaultCellStyle = dataGridViewCellStyle27;
            dataGridViewCellStyle28.BackColor = System.Drawing.Color.WhiteSmoke;
            dataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
            this.polyView.RowsDefaultCellStyle = dataGridViewCellStyle28;
            dataGridViewCellStyle223.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
            dataGridViewCellStyle223.BackColor = System.Drawing.Color.WhiteSmoke;
            dataGridViewCellStyle223.Font = new System.Drawing.Font("微软雅黑", 12F);
            dataGridViewCellStyle223.ForeColor = System.Drawing.Color.WhiteSmoke;
            dataGridViewCellStyle223.SelectionBackColor = System.Drawing.SystemColors.HotTrack;
            dataGridViewCellStyle223.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
            dataGridViewCellStyle223.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
            this.polyView.RowHeadersDefaultCellStyle = dataGridViewCellStyle223;
            dataGridViewCellStyle224.BackColor = System.Drawing.Color.WhiteSmoke;
            dataGridViewCellStyle224.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
            this.polyView.RowsDefaultCellStyle = dataGridViewCellStyle224;
            this.tlpMainChengPin.SetRowSpan(this.polyView, 2);
            this.polyView.RowTemplate.Height = 23;
            this.polyView.TabStop = false;
@@ -917,17 +917,17 @@
            // 
            // ç¼–号
            // 
            dataGridViewCellStyle11.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            dataGridViewCellStyle11.ForeColor = System.Drawing.Color.Gray;
            this.编号.DefaultCellStyle = dataGridViewCellStyle11;
            dataGridViewCellStyle152.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            dataGridViewCellStyle152.ForeColor = System.Drawing.Color.Gray;
            this.编号.DefaultCellStyle = dataGridViewCellStyle152;
            resources.ApplyResources(this.编号, "编号");
            this.编号.Name = "编号";
            // 
            // å®½åº¦
            // 
            this.宽度.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
            dataGridViewCellStyle12.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.宽度.DefaultCellStyle = dataGridViewCellStyle12;
            dataGridViewCellStyle208.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.宽度.DefaultCellStyle = dataGridViewCellStyle208;
            this.宽度.FillWeight = 110F;
            resources.ApplyResources(this.宽度, "宽度");
            this.宽度.Name = "宽度";
@@ -935,63 +935,63 @@
            // é«˜åº¦
            // 
            this.高度.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
            dataGridViewCellStyle13.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.高度.DefaultCellStyle = dataGridViewCellStyle13;
            dataGridViewCellStyle209.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.高度.DefaultCellStyle = dataGridViewCellStyle209;
            resources.ApplyResources(this.高度, "高度");
            this.高度.Name = "高度";
            // 
            // æ•°é‡
            // 
            this.数量.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
            dataGridViewCellStyle14.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.数量.DefaultCellStyle = dataGridViewCellStyle14;
            dataGridViewCellStyle210.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.数量.DefaultCellStyle = dataGridViewCellStyle210;
            this.数量.FillWeight = 80F;
            resources.ApplyResources(this.数量, "数量");
            this.数量.Name = "数量";
            // 
            // æ¨¡æ¿å·
            // 
            dataGridViewCellStyle15.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.模板号.DefaultCellStyle = dataGridViewCellStyle15;
            dataGridViewCellStyle211.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.模板号.DefaultCellStyle = dataGridViewCellStyle211;
            this.模板号.FillWeight = 80F;
            resources.ApplyResources(this.模板号, "模板号");
            this.模板号.Name = "模板号";
            // 
            // Str
            // 
            dataGridViewCellStyle16.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.Str.DefaultCellStyle = dataGridViewCellStyle16;
            dataGridViewCellStyle212.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.Str.DefaultCellStyle = dataGridViewCellStyle212;
            resources.ApplyResources(this.Str, "Str");
            this.Str.Name = "Str";
            // 
            // é•¿ç£¨1
            // 
            dataGridViewCellStyle17.Font = new System.Drawing.Font("微软雅黑", 12F);
            this.长磨1.DefaultCellStyle = dataGridViewCellStyle17;
            dataGridViewCellStyle213.Font = new System.Drawing.Font("微软雅黑", 12F);
            this.长磨1.DefaultCellStyle = dataGridViewCellStyle213;
            this.长磨1.FillWeight = 80F;
            resources.ApplyResources(this.长磨1, "长磨1");
            this.长磨1.Name = "长磨1";
            // 
            // é•¿ç£¨2
            // 
            dataGridViewCellStyle18.Font = new System.Drawing.Font("微软雅黑", 12F);
            this.长磨2.DefaultCellStyle = dataGridViewCellStyle18;
            dataGridViewCellStyle214.Font = new System.Drawing.Font("微软雅黑", 12F);
            this.长磨2.DefaultCellStyle = dataGridViewCellStyle214;
            this.长磨2.FillWeight = 80F;
            resources.ApplyResources(this.长磨2, "长磨2");
            this.长磨2.Name = "长磨2";
            // 
            // çŸ­ç£¨1
            // 
            dataGridViewCellStyle19.Font = new System.Drawing.Font("微软雅黑", 12F);
            this.短磨1.DefaultCellStyle = dataGridViewCellStyle19;
            dataGridViewCellStyle215.Font = new System.Drawing.Font("微软雅黑", 12F);
            this.短磨1.DefaultCellStyle = dataGridViewCellStyle215;
            this.短磨1.FillWeight = 80F;
            resources.ApplyResources(this.短磨1, "短磨1");
            this.短磨1.Name = "短磨1";
            // 
            // çŸ­ç£¨2
            // 
            dataGridViewCellStyle20.Font = new System.Drawing.Font("微软雅黑", 12F);
            this.短磨2.DefaultCellStyle = dataGridViewCellStyle20;
            dataGridViewCellStyle216.Font = new System.Drawing.Font("微软雅黑", 12F);
            this.短磨2.DefaultCellStyle = dataGridViewCellStyle216;
            this.短磨2.FillWeight = 80F;
            resources.ApplyResources(this.短磨2, "短磨2");
            this.短磨2.Name = "短磨2";
@@ -999,24 +999,24 @@
            // å½¢çŠ¶
            // 
            this.形状.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
            dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
            this.形状.DefaultCellStyle = dataGridViewCellStyle21;
            dataGridViewCellStyle217.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
            this.形状.DefaultCellStyle = dataGridViewCellStyle217;
            resources.ApplyResources(this.形状, "形状");
            this.形状.Image = ((System.Drawing.Image)(resources.GetObject("形状.Image")));
            this.形状.Name = "形状";
            // 
            // åŠ å·¥ä¿¡æ¯
            // 
            dataGridViewCellStyle22.Font = new System.Drawing.Font("微软雅黑", 12F);
            this.加工信息.DefaultCellStyle = dataGridViewCellStyle22;
            dataGridViewCellStyle218.Font = new System.Drawing.Font("微软雅黑", 12F);
            this.加工信息.DefaultCellStyle = dataGridViewCellStyle218;
            this.加工信息.FillWeight = 120F;
            resources.ApplyResources(this.加工信息, "加工信息");
            this.加工信息.Name = "加工信息";
            // 
            // æµç¨‹å¡å·
            // 
            dataGridViewCellStyle23.Font = new System.Drawing.Font("微软雅黑", 12F);
            this.流程卡号.DefaultCellStyle = dataGridViewCellStyle23;
            dataGridViewCellStyle219.Font = new System.Drawing.Font("微软雅黑", 12F);
            this.流程卡号.DefaultCellStyle = dataGridViewCellStyle219;
            this.流程卡号.FillWeight = 150F;
            resources.ApplyResources(this.流程卡号, "流程卡号");
            this.流程卡号.Name = "流程卡号";
@@ -1028,8 +1028,8 @@
            // 
            // äº§å“åç§°
            // 
            dataGridViewCellStyle24.Font = new System.Drawing.Font("微软雅黑", 12F);
            this.产品名称.DefaultCellStyle = dataGridViewCellStyle24;
            dataGridViewCellStyle220.Font = new System.Drawing.Font("微软雅黑", 12F);
            this.产品名称.DefaultCellStyle = dataGridViewCellStyle220;
            this.产品名称.FillWeight = 120F;
            resources.ApplyResources(this.产品名称, "产品名称");
            this.产品名称.Name = "产品名称";
@@ -1061,8 +1061,8 @@
            // 
            // é¢ç§¯
            // 
            dataGridViewCellStyle25.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.面积.DefaultCellStyle = dataGridViewCellStyle25;
            dataGridViewCellStyle221.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.面积.DefaultCellStyle = dataGridViewCellStyle221;
            resources.ApplyResources(this.面积, "面积");
            this.面积.Name = "面积";
            // 
@@ -1111,26 +1111,26 @@
            this.s.AllowUserToDeleteRows = false;
            this.s.AllowUserToResizeColumns = false;
            this.s.AllowUserToResizeRows = false;
            dataGridViewCellStyle29.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(213)))), ((int)(((byte)(234)))), ((int)(((byte)(255)))));
            this.s.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle29;
            dataGridViewCellStyle103.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(213)))), ((int)(((byte)(234)))), ((int)(((byte)(255)))));
            this.s.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle103;
            this.s.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
            this.s.BackgroundColor = System.Drawing.SystemColors.ButtonHighlight;
            dataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
            dataGridViewCellStyle30.BackColor = System.Drawing.SystemColors.Control;
            dataGridViewCellStyle30.Font = new System.Drawing.Font("微软雅黑", 12F);
            dataGridViewCellStyle30.ForeColor = System.Drawing.SystemColors.WindowText;
            dataGridViewCellStyle30.SelectionBackColor = System.Drawing.SystemColors.Highlight;
            dataGridViewCellStyle30.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
            this.s.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle30;
            dataGridViewCellStyle174.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
            dataGridViewCellStyle174.BackColor = System.Drawing.SystemColors.Control;
            dataGridViewCellStyle174.Font = new System.Drawing.Font("微软雅黑", 12F);
            dataGridViewCellStyle174.ForeColor = System.Drawing.SystemColors.WindowText;
            dataGridViewCellStyle174.SelectionBackColor = System.Drawing.SystemColors.Highlight;
            dataGridViewCellStyle174.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
            this.s.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle174;
            this.s.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
            dataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
            dataGridViewCellStyle31.BackColor = System.Drawing.SystemColors.Window;
            dataGridViewCellStyle31.Font = new System.Drawing.Font("微软雅黑", 12F);
            dataGridViewCellStyle31.ForeColor = System.Drawing.SystemColors.ControlText;
            dataGridViewCellStyle31.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(92)))), ((int)(((byte)(173)))), ((int)(((byte)(254)))));
            dataGridViewCellStyle31.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
            dataGridViewCellStyle31.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
            this.s.DefaultCellStyle = dataGridViewCellStyle31;
            dataGridViewCellStyle175.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
            dataGridViewCellStyle175.BackColor = System.Drawing.SystemColors.Window;
            dataGridViewCellStyle175.Font = new System.Drawing.Font("微软雅黑", 12F);
            dataGridViewCellStyle175.ForeColor = System.Drawing.SystemColors.ControlText;
            dataGridViewCellStyle175.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(92)))), ((int)(((byte)(173)))), ((int)(((byte)(254)))));
            dataGridViewCellStyle175.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
            dataGridViewCellStyle175.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
            this.s.DefaultCellStyle = dataGridViewCellStyle175;
            resources.ApplyResources(this.s, "s");
            this.s.EnableHeadersVisualStyles = false;
            this.s.GridColor = System.Drawing.Color.Silver;
@@ -1151,101 +1151,101 @@
            // 
            // dataGridViewTextBoxColumn1
            // 
            dataGridViewCellStyle32.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            dataGridViewCellStyle32.ForeColor = System.Drawing.Color.Gray;
            this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle32;
            dataGridViewCellStyle176.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            dataGridViewCellStyle176.ForeColor = System.Drawing.Color.Gray;
            this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle176;
            resources.ApplyResources(this.dataGridViewTextBoxColumn1, "dataGridViewTextBoxColumn1");
            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
            this.dataGridViewTextBoxColumn1.ReadOnly = true;
            // 
            // dataGridViewTextBoxColumn2
            // 
            dataGridViewCellStyle33.Font = new System.Drawing.Font("微软雅黑", 9F);
            this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle33;
            dataGridViewCellStyle225.Font = new System.Drawing.Font("微软雅黑", 9F);
            this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle225;
            resources.ApplyResources(this.dataGridViewTextBoxColumn2, "dataGridViewTextBoxColumn2");
            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
            // 
            // dataGridViewTextBoxColumn3
            // 
            dataGridViewCellStyle34.Font = new System.Drawing.Font("微软雅黑", 9F);
            this.dataGridViewTextBoxColumn3.DefaultCellStyle = dataGridViewCellStyle34;
            dataGridViewCellStyle226.Font = new System.Drawing.Font("微软雅黑", 9F);
            this.dataGridViewTextBoxColumn3.DefaultCellStyle = dataGridViewCellStyle226;
            resources.ApplyResources(this.dataGridViewTextBoxColumn3, "dataGridViewTextBoxColumn3");
            this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
            // 
            // dataGridViewTextBoxColumn4
            // 
            dataGridViewCellStyle35.Font = new System.Drawing.Font("微软雅黑", 9F);
            this.dataGridViewTextBoxColumn4.DefaultCellStyle = dataGridViewCellStyle35;
            dataGridViewCellStyle227.Font = new System.Drawing.Font("微软雅黑", 9F);
            this.dataGridViewTextBoxColumn4.DefaultCellStyle = dataGridViewCellStyle227;
            resources.ApplyResources(this.dataGridViewTextBoxColumn4, "dataGridViewTextBoxColumn4");
            this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
            // 
            // dataGridViewTextBoxColumn5
            // 
            dataGridViewCellStyle36.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.dataGridViewTextBoxColumn5.DefaultCellStyle = dataGridViewCellStyle36;
            dataGridViewCellStyle228.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.dataGridViewTextBoxColumn5.DefaultCellStyle = dataGridViewCellStyle228;
            resources.ApplyResources(this.dataGridViewTextBoxColumn5, "dataGridViewTextBoxColumn5");
            this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
            // 
            // dataGridViewTextBoxColumn6
            // 
            dataGridViewCellStyle37.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.dataGridViewTextBoxColumn6.DefaultCellStyle = dataGridViewCellStyle37;
            dataGridViewCellStyle229.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.dataGridViewTextBoxColumn6.DefaultCellStyle = dataGridViewCellStyle229;
            resources.ApplyResources(this.dataGridViewTextBoxColumn6, "dataGridViewTextBoxColumn6");
            this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
            // 
            // dataGridViewTextBoxColumn7
            // 
            dataGridViewCellStyle38.Font = new System.Drawing.Font("微软雅黑", 9F);
            this.dataGridViewTextBoxColumn7.DefaultCellStyle = dataGridViewCellStyle38;
            dataGridViewCellStyle230.Font = new System.Drawing.Font("微软雅黑", 9F);
            this.dataGridViewTextBoxColumn7.DefaultCellStyle = dataGridViewCellStyle230;
            resources.ApplyResources(this.dataGridViewTextBoxColumn7, "dataGridViewTextBoxColumn7");
            this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
            // 
            // dataGridViewTextBoxColumn8
            // 
            dataGridViewCellStyle39.Font = new System.Drawing.Font("微软雅黑", 9F);
            this.dataGridViewTextBoxColumn8.DefaultCellStyle = dataGridViewCellStyle39;
            dataGridViewCellStyle231.Font = new System.Drawing.Font("微软雅黑", 9F);
            this.dataGridViewTextBoxColumn8.DefaultCellStyle = dataGridViewCellStyle231;
            resources.ApplyResources(this.dataGridViewTextBoxColumn8, "dataGridViewTextBoxColumn8");
            this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8";
            // 
            // dataGridViewTextBoxColumn9
            // 
            dataGridViewCellStyle40.Font = new System.Drawing.Font("微软雅黑", 9F);
            this.dataGridViewTextBoxColumn9.DefaultCellStyle = dataGridViewCellStyle40;
            dataGridViewCellStyle232.Font = new System.Drawing.Font("微软雅黑", 9F);
            this.dataGridViewTextBoxColumn9.DefaultCellStyle = dataGridViewCellStyle232;
            resources.ApplyResources(this.dataGridViewTextBoxColumn9, "dataGridViewTextBoxColumn9");
            this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9";
            // 
            // dataGridViewTextBoxColumn10
            // 
            dataGridViewCellStyle41.Font = new System.Drawing.Font("微软雅黑", 9F);
            this.dataGridViewTextBoxColumn10.DefaultCellStyle = dataGridViewCellStyle41;
            dataGridViewCellStyle233.Font = new System.Drawing.Font("微软雅黑", 9F);
            this.dataGridViewTextBoxColumn10.DefaultCellStyle = dataGridViewCellStyle233;
            resources.ApplyResources(this.dataGridViewTextBoxColumn10, "dataGridViewTextBoxColumn10");
            this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10";
            // 
            // dataGridViewTextBoxColumn11
            // 
            dataGridViewCellStyle42.Font = new System.Drawing.Font("微软雅黑", 9F);
            this.dataGridViewTextBoxColumn11.DefaultCellStyle = dataGridViewCellStyle42;
            dataGridViewCellStyle234.Font = new System.Drawing.Font("微软雅黑", 9F);
            this.dataGridViewTextBoxColumn11.DefaultCellStyle = dataGridViewCellStyle234;
            resources.ApplyResources(this.dataGridViewTextBoxColumn11, "dataGridViewTextBoxColumn11");
            this.dataGridViewTextBoxColumn11.Name = "dataGridViewTextBoxColumn11";
            // 
            // dataGridViewTextBoxColumn12
            // 
            dataGridViewCellStyle43.Font = new System.Drawing.Font("微软雅黑", 9F);
            this.dataGridViewTextBoxColumn12.DefaultCellStyle = dataGridViewCellStyle43;
            dataGridViewCellStyle235.Font = new System.Drawing.Font("微软雅黑", 9F);
            this.dataGridViewTextBoxColumn12.DefaultCellStyle = dataGridViewCellStyle235;
            resources.ApplyResources(this.dataGridViewTextBoxColumn12, "dataGridViewTextBoxColumn12");
            this.dataGridViewTextBoxColumn12.Name = "dataGridViewTextBoxColumn12";
            // 
            // dataGridViewTextBoxColumn13
            // 
            dataGridViewCellStyle44.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.dataGridViewTextBoxColumn13.DefaultCellStyle = dataGridViewCellStyle44;
            dataGridViewCellStyle236.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.dataGridViewTextBoxColumn13.DefaultCellStyle = dataGridViewCellStyle236;
            resources.ApplyResources(this.dataGridViewTextBoxColumn13, "dataGridViewTextBoxColumn13");
            this.dataGridViewTextBoxColumn13.Name = "dataGridViewTextBoxColumn13";
            // 
            // dataGridViewTextBoxColumn14
            // 
            dataGridViewCellStyle45.Font = new System.Drawing.Font("微软雅黑", 9F);
            this.dataGridViewTextBoxColumn14.DefaultCellStyle = dataGridViewCellStyle45;
            dataGridViewCellStyle237.Font = new System.Drawing.Font("微软雅黑", 9F);
            this.dataGridViewTextBoxColumn14.DefaultCellStyle = dataGridViewCellStyle237;
            resources.ApplyResources(this.dataGridViewTextBoxColumn14, "dataGridViewTextBoxColumn14");
            this.dataGridViewTextBoxColumn14.Name = "dataGridViewTextBoxColumn14";
            // 
@@ -1266,8 +1266,8 @@
            // 
            // dataGridViewTextBoxColumn18
            // 
            dataGridViewCellStyle46.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.dataGridViewTextBoxColumn18.DefaultCellStyle = dataGridViewCellStyle46;
            dataGridViewCellStyle238.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.dataGridViewTextBoxColumn18.DefaultCellStyle = dataGridViewCellStyle238;
            resources.ApplyResources(this.dataGridViewTextBoxColumn18, "dataGridViewTextBoxColumn18");
            this.dataGridViewTextBoxColumn18.Name = "dataGridViewTextBoxColumn18";
            this.dataGridViewTextBoxColumn18.ReadOnly = true;
@@ -1284,15 +1284,15 @@
            // 
            // dataGridViewTextBoxColumn21
            // 
            dataGridViewCellStyle47.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.dataGridViewTextBoxColumn21.DefaultCellStyle = dataGridViewCellStyle47;
            dataGridViewCellStyle239.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.dataGridViewTextBoxColumn21.DefaultCellStyle = dataGridViewCellStyle239;
            resources.ApplyResources(this.dataGridViewTextBoxColumn21, "dataGridViewTextBoxColumn21");
            this.dataGridViewTextBoxColumn21.Name = "dataGridViewTextBoxColumn21";
            // 
            // dataGridViewTextBoxColumn22
            // 
            dataGridViewCellStyle48.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.dataGridViewTextBoxColumn22.DefaultCellStyle = dataGridViewCellStyle48;
            dataGridViewCellStyle240.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.dataGridViewTextBoxColumn22.DefaultCellStyle = dataGridViewCellStyle240;
            resources.ApplyResources(this.dataGridViewTextBoxColumn22, "dataGridViewTextBoxColumn22");
            this.dataGridViewTextBoxColumn22.Name = "dataGridViewTextBoxColumn22";
            // 
@@ -1303,36 +1303,36 @@
            // 
            // dataGridViewTextBoxColumn24
            // 
            dataGridViewCellStyle49.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.dataGridViewTextBoxColumn24.DefaultCellStyle = dataGridViewCellStyle49;
            dataGridViewCellStyle241.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.dataGridViewTextBoxColumn24.DefaultCellStyle = dataGridViewCellStyle241;
            resources.ApplyResources(this.dataGridViewTextBoxColumn24, "dataGridViewTextBoxColumn24");
            this.dataGridViewTextBoxColumn24.Name = "dataGridViewTextBoxColumn24";
            // 
            // dataGridViewTextBoxColumn25
            // 
            dataGridViewCellStyle50.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.dataGridViewTextBoxColumn25.DefaultCellStyle = dataGridViewCellStyle50;
            dataGridViewCellStyle242.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.dataGridViewTextBoxColumn25.DefaultCellStyle = dataGridViewCellStyle242;
            resources.ApplyResources(this.dataGridViewTextBoxColumn25, "dataGridViewTextBoxColumn25");
            this.dataGridViewTextBoxColumn25.Name = "dataGridViewTextBoxColumn25";
            // 
            // dataGridViewTextBoxColumn26
            // 
            dataGridViewCellStyle51.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.dataGridViewTextBoxColumn26.DefaultCellStyle = dataGridViewCellStyle51;
            dataGridViewCellStyle243.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.dataGridViewTextBoxColumn26.DefaultCellStyle = dataGridViewCellStyle243;
            resources.ApplyResources(this.dataGridViewTextBoxColumn26, "dataGridViewTextBoxColumn26");
            this.dataGridViewTextBoxColumn26.Name = "dataGridViewTextBoxColumn26";
            // 
            // dataGridViewTextBoxColumn27
            // 
            dataGridViewCellStyle52.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.dataGridViewTextBoxColumn27.DefaultCellStyle = dataGridViewCellStyle52;
            dataGridViewCellStyle244.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.dataGridViewTextBoxColumn27.DefaultCellStyle = dataGridViewCellStyle244;
            resources.ApplyResources(this.dataGridViewTextBoxColumn27, "dataGridViewTextBoxColumn27");
            this.dataGridViewTextBoxColumn27.Name = "dataGridViewTextBoxColumn27";
            // 
            // dataGridViewTextBoxColumn28
            // 
            dataGridViewCellStyle53.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.dataGridViewTextBoxColumn28.DefaultCellStyle = dataGridViewCellStyle53;
            dataGridViewCellStyle245.Font = new System.Drawing.Font("微软雅黑", 10.5F);
            this.dataGridViewTextBoxColumn28.DefaultCellStyle = dataGridViewCellStyle245;
            resources.ApplyResources(this.dataGridViewTextBoxColumn28, "dataGridViewTextBoxColumn28");
            this.dataGridViewTextBoxColumn28.Name = "dataGridViewTextBoxColumn28";
            // 
@@ -2423,8 +2423,8 @@
            // dataGridViewImageColumn1
            // 
            this.dataGridViewImageColumn1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
            dataGridViewCellStyle54.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
            this.dataGridViewImageColumn1.DefaultCellStyle = dataGridViewCellStyle54;
            dataGridViewCellStyle246.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
            this.dataGridViewImageColumn1.DefaultCellStyle = dataGridViewCellStyle246;
            resources.ApplyResources(this.dataGridViewImageColumn1, "dataGridViewImageColumn1");
            this.dataGridViewImageColumn1.Image = ((System.Drawing.Image)(resources.GetObject("dataGridViewImageColumn1.Image")));
            this.dataGridViewImageColumn1.Name = "dataGridViewImageColumn1";

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

@@ -294,6 +294,24 @@
  <data name="PolyViewContext.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 12pt</value>
  </data>
  <data name="PolyViewContext.Size" type="System.Drawing.Size, System.Drawing">
    <value>228, 368</value>
  </data>
  <data name="&gt;&gt;PolyViewContext.Name" xml:space="preserve">
    <value>PolyViewContext</value>
  </data>
  <data name="&gt;&gt;PolyViewContext.Type" xml:space="preserve">
    <value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
  <data name="复制粘贴.Size" type="System.Drawing.Size, System.Drawing">
    <value>227, 26</value>
  </data>
  <data name="复制粘贴.Text" xml:space="preserve">
    <value>复制粘贴</value>
  </data>
  <data name="复制粘贴.Visible" type="System.Boolean, mscorlib">
    <value>False</value>
  </data>
  <data name="复制ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
    <value>112, 26</value>
  </data>
@@ -305,15 +323,6 @@
  </data>
  <data name="粘贴ToolStripMenuItem.Text" xml:space="preserve">
    <value>粘贴</value>
  </data>
  <data name="复制粘贴.Size" type="System.Drawing.Size, System.Drawing">
    <value>227, 26</value>
  </data>
  <data name="复制粘贴.Text" xml:space="preserve">
    <value>复制粘贴</value>
  </data>
  <data name="复制粘贴.Visible" type="System.Boolean, mscorlib">
    <value>False</value>
  </data>
  <data name="复用第一行数据ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
    <value>227, 26</value>
@@ -408,20 +417,20 @@
  <data name="TSMIPolysToSaveDXF.Visible" type="System.Boolean, mscorlib">
    <value>False</value>
  </data>
  <data name="PolyViewContext.Size" type="System.Drawing.Size, System.Drawing">
    <value>228, 368</value>
  </data>
  <data name="&gt;&gt;PolyViewContext.Name" xml:space="preserve">
    <value>PolyViewContext</value>
  </data>
  <data name="&gt;&gt;PolyViewContext.Type" xml:space="preserve">
    <value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
  <metadata name="stockContext.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>285, 14</value>
  </metadata>
  <data name="stockContext.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 12pt</value>
  </data>
  <data name="stockContext.Size" type="System.Drawing.Size, System.Drawing">
    <value>177, 186</value>
  </data>
  <data name="&gt;&gt;stockContext.Name" xml:space="preserve">
    <value>stockContext</value>
  </data>
  <data name="&gt;&gt;stockContext.Type" xml:space="preserve">
    <value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
  <data name="TSMIYPSelected.Size" type="System.Drawing.Size, System.Drawing">
    <value>176, 26</value>
@@ -470,15 +479,6 @@
  </data>
  <data name="tsmiExportStock.Text" xml:space="preserve">
    <value>数据导出</value>
  </data>
  <data name="stockContext.Size" type="System.Drawing.Size, System.Drawing">
    <value>177, 186</value>
  </data>
  <data name="&gt;&gt;stockContext.Name" xml:space="preserve">
    <value>stockContext</value>
  </data>
  <data name="&gt;&gt;stockContext.Type" xml:space="preserve">
    <value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
  <data name="数量ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
    <value>124, 22</value>
@@ -1877,6 +1877,93 @@
  <data name="tlpMainChengPin.ColumnCount" type="System.Int32, mscorlib">
    <value>2</value>
  </data>
  <data name="&gt;&gt;polyView.Name" xml:space="preserve">
    <value>polyView</value>
  </data>
  <data name="&gt;&gt;polyView.Type" xml:space="preserve">
    <value>System.Windows.Forms.DataGridView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
  <data name="&gt;&gt;polyView.Parent" xml:space="preserve">
    <value>tlpMainChengPin</value>
  </data>
  <data name="&gt;&gt;polyView.ZOrder" xml:space="preserve">
    <value>0</value>
  </data>
  <data name="&gt;&gt;s.Name" xml:space="preserve">
    <value>s</value>
  </data>
  <data name="&gt;&gt;s.Type" xml:space="preserve">
    <value>System.Windows.Forms.DataGridView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
  <data name="&gt;&gt;s.Parent" xml:space="preserve">
    <value>tlpMainChengPin</value>
  </data>
  <data name="&gt;&gt;s.ZOrder" xml:space="preserve">
    <value>2</value>
  </data>
  <data name="tlpMainChengPin.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Fill</value>
  </data>
  <data name="tlpMainChengPin.Location" type="System.Drawing.Point, System.Drawing">
    <value>0, 36</value>
  </data>
  <data name="tlpMainChengPin.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
    <value>2, 0, 2, 2</value>
  </data>
  <data name="tlpMainChengPin.RowCount" type="System.Int32, mscorlib">
    <value>3</value>
  </data>
  <data name="tlpMainChengPin.Size" type="System.Drawing.Size, System.Drawing">
    <value>1484, 769</value>
  </data>
  <data name="tlpMainChengPin.TabIndex" type="System.Int32, mscorlib">
    <value>13</value>
  </data>
  <data name="&gt;&gt;tlpMainChengPin.Name" xml:space="preserve">
    <value>tlpMainChengPin</value>
  </data>
  <data name="&gt;&gt;tlpMainChengPin.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;tlpMainChengPin.Parent" xml:space="preserve">
    <value>chengpinTab</value>
  </data>
  <data name="&gt;&gt;tlpMainChengPin.ZOrder" xml:space="preserve">
    <value>0</value>
  </data>
  <data name="tlpMainChengPin.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="polyView" Row="0" RowSpan="2" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="stockView" Row="2" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="s" Row="0" RowSpan="2" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,65,Percent,35" /&gt;&lt;Rows Styles="Percent,4.5,Percent,65.5,Percent,30" /&gt;&lt;/TableLayoutSettings&gt;</value>
  </data>
  <data name="stockView.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Fill</value>
  </data>
  <data name="stockView.Location" type="System.Drawing.Point, System.Drawing">
    <value>1, 538</value>
  </data>
  <data name="stockView.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
    <value>1, 1, 1, 1</value>
  </data>
  <data name="stockView.RowHeadersWidth" type="System.Int32, mscorlib">
    <value>50</value>
  </data>
  <data name="stockView.Size" type="System.Drawing.Size, System.Drawing">
    <value>1482, 230</value>
  </data>
  <data name="stockView.TabIndex" type="System.Int32, mscorlib">
    <value>3</value>
  </data>
  <data name="&gt;&gt;stockView.Name" xml:space="preserve">
    <value>stockView</value>
  </data>
  <data name="&gt;&gt;stockView.Type" xml:space="preserve">
    <value>System.Windows.Forms.DataGridView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
  <data name="&gt;&gt;stockView.Parent" xml:space="preserve">
    <value>tlpMainChengPin</value>
  </data>
  <data name="&gt;&gt;stockView.ZOrder" xml:space="preserve">
    <value>1</value>
  </data>
  <data name="polyView.ColumnHeadersHeight" type="System.Int32, mscorlib">
    <value>40</value>
  </data>
@@ -2300,69 +2387,6 @@
  </data>
  <data name="&gt;&gt;s.ZOrder" xml:space="preserve">
    <value>2</value>
  </data>
  <data name="tlpMainChengPin.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Fill</value>
  </data>
  <data name="tlpMainChengPin.Location" type="System.Drawing.Point, System.Drawing">
    <value>0, 36</value>
  </data>
  <data name="tlpMainChengPin.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
    <value>2, 0, 2, 2</value>
  </data>
  <data name="tlpMainChengPin.RowCount" type="System.Int32, mscorlib">
    <value>3</value>
  </data>
  <data name="tlpMainChengPin.Size" type="System.Drawing.Size, System.Drawing">
    <value>1484, 769</value>
  </data>
  <data name="tlpMainChengPin.TabIndex" type="System.Int32, mscorlib">
    <value>13</value>
  </data>
  <data name="&gt;&gt;tlpMainChengPin.Name" xml:space="preserve">
    <value>tlpMainChengPin</value>
  </data>
  <data name="&gt;&gt;tlpMainChengPin.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;tlpMainChengPin.Parent" xml:space="preserve">
    <value>chengpinTab</value>
  </data>
  <data name="&gt;&gt;tlpMainChengPin.ZOrder" xml:space="preserve">
    <value>0</value>
  </data>
  <data name="tlpMainChengPin.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="polyView" Row="0" RowSpan="2" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="stockView" Row="2" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="s" Row="0" RowSpan="2" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,65,Percent,35" /&gt;&lt;Rows Styles="Percent,4.5,Percent,65.5,Percent,30" /&gt;&lt;/TableLayoutSettings&gt;</value>
  </data>
  <data name="stockView.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Fill</value>
  </data>
  <data name="stockView.Location" type="System.Drawing.Point, System.Drawing">
    <value>1, 538</value>
  </data>
  <data name="stockView.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
    <value>1, 1, 1, 1</value>
  </data>
  <data name="stockView.RowHeadersWidth" type="System.Int32, mscorlib">
    <value>50</value>
  </data>
  <data name="stockView.Size" type="System.Drawing.Size, System.Drawing">
    <value>1482, 230</value>
  </data>
  <data name="stockView.TabIndex" type="System.Int32, mscorlib">
    <value>3</value>
  </data>
  <data name="&gt;&gt;stockView.Name" xml:space="preserve">
    <value>stockView</value>
  </data>
  <data name="&gt;&gt;stockView.Type" xml:space="preserve">
    <value>System.Windows.Forms.DataGridView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
  <data name="&gt;&gt;stockView.Parent" xml:space="preserve">
    <value>tlpMainChengPin</value>
  </data>
  <data name="&gt;&gt;stockView.ZOrder" xml:space="preserve">
    <value>1</value>
  </data>
  <data name="projectnameText.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Fill</value>
@@ -3627,6 +3651,33 @@
  <data name="bottomStrip.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 7.8pt</value>
  </data>
  <data name="bottomStrip.Location" type="System.Drawing.Point, System.Drawing">
    <value>0, 856</value>
  </data>
  <data name="bottomStrip.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
    <value>0, 0, 0, 0</value>
  </data>
  <data name="bottomStrip.Size" type="System.Drawing.Size, System.Drawing">
    <value>1494, 32</value>
  </data>
  <data name="bottomStrip.TabIndex" type="System.Int32, mscorlib">
    <value>18</value>
  </data>
  <data name="bottomStrip.Text" xml:space="preserve">
    <value>toolStrip4</value>
  </data>
  <data name="&gt;&gt;bottomStrip.Name" xml:space="preserve">
    <value>bottomStrip</value>
  </data>
  <data name="&gt;&gt;bottomStrip.Type" xml:space="preserve">
    <value>System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
  <data name="&gt;&gt;bottomStrip.Parent" xml:space="preserve">
    <value>$this</value>
  </data>
  <data name="&gt;&gt;bottomStrip.ZOrder" xml:space="preserve">
    <value>5</value>
  </data>
  <data name="tsbZCDW.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 9pt, style=Bold</value>
  </data>
@@ -3753,32 +3804,20 @@
  <data name="toolStripSeparator6.Size" type="System.Drawing.Size, System.Drawing">
    <value>6, 32</value>
  </data>
  <data name="bottomStrip.Location" type="System.Drawing.Point, System.Drawing">
    <value>0, 856</value>
  <data name="TSMIUserInfo.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 15pt, style=Bold</value>
  </data>
  <data name="bottomStrip.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
    <value>0, 0, 0, 0</value>
  <data name="TSMIUserInfo.RightToLeft" type="System.Windows.Forms.RightToLeft, System.Windows.Forms">
    <value>No</value>
  </data>
  <data name="bottomStrip.Size" type="System.Drawing.Size, System.Drawing">
    <value>1494, 32</value>
  <data name="TSMIUserInfo.Size" type="System.Drawing.Size, System.Drawing">
    <value>150, 36</value>
  </data>
  <data name="bottomStrip.TabIndex" type="System.Int32, mscorlib">
    <value>18</value>
  <data name="TSMIUserInfo.Text" xml:space="preserve">
    <value>登录用户</value>
  </data>
  <data name="bottomStrip.Text" xml:space="preserve">
    <value>toolStrip4</value>
  </data>
  <data name="&gt;&gt;bottomStrip.Name" xml:space="preserve">
    <value>bottomStrip</value>
  </data>
  <data name="&gt;&gt;bottomStrip.Type" xml:space="preserve">
    <value>System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
  <data name="&gt;&gt;bottomStrip.Parent" xml:space="preserve">
    <value>$this</value>
  </data>
  <data name="&gt;&gt;bottomStrip.ZOrder" xml:space="preserve">
    <value>5</value>
  <data name="TSMIUserInfo.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms">
    <value>TextBeforeImage</value>
  </data>
  <data name="tsmiRole.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 12pt</value>
@@ -3813,21 +3852,6 @@
  <data name="tsmiHelp.Visible" type="System.Boolean, mscorlib">
    <value>False</value>
  </data>
  <data name="TSMIUserInfo.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 15pt, style=Bold</value>
  </data>
  <data name="TSMIUserInfo.RightToLeft" type="System.Windows.Forms.RightToLeft, System.Windows.Forms">
    <value>No</value>
  </data>
  <data name="TSMIUserInfo.Size" type="System.Drawing.Size, System.Drawing">
    <value>150, 36</value>
  </data>
  <data name="TSMIUserInfo.Text" xml:space="preserve">
    <value>登录用户</value>
  </data>
  <data name="TSMIUserInfo.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms">
    <value>TextBeforeImage</value>
  </data>
  <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>419, 13</value>
  </metadata>
@@ -3836,6 +3860,60 @@
  </data>
  <data name="menuStrip1.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 14pt</value>
  </data>
  <data name="menuStrip1.Location" type="System.Drawing.Point, System.Drawing">
    <value>0, 0</value>
  </data>
  <data name="menuStrip1.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
    <value>5, 2, 0, 2</value>
  </data>
  <data name="menuStrip1.Size" type="System.Drawing.Size, System.Drawing">
    <value>1494, 40</value>
  </data>
  <data name="menuStrip1.TabIndex" type="System.Int32, mscorlib">
    <value>0</value>
  </data>
  <data name="menuStrip1.Text" xml:space="preserve">
    <value>menuStrip1</value>
  </data>
  <data name="&gt;&gt;menuStrip1.Name" xml:space="preserve">
    <value>menuStrip1</value>
  </data>
  <data name="&gt;&gt;menuStrip1.Type" xml:space="preserve">
    <value>System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
  <data name="&gt;&gt;menuStrip1.Parent" xml:space="preserve">
    <value>$this</value>
  </data>
  <data name="&gt;&gt;menuStrip1.ZOrder" xml:space="preserve">
    <value>4</value>
  </data>
  <data name="录入成品ToolStripMenuItem.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 15pt, style=Bold</value>
  </data>
  <data name="录入成品ToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAS
        dAAAEnQB3mYfeAAAAjJJREFUeF7tmrlOw0AURRMRUKCJ08EHhB+BihJBCw1Lg9gFlHRIgNMDVSgR/AMd
        fwCCGiQ6RBJDxXKfNZai8URJHGYh8650KBw88+6RHadwjsPhcLxOEEYLGlgEM6AotnE3GPJbAz+gCQ7A
        iNjKzYhhdRGBfeCuhJZhdUFXwl656qgEaVhdkITdsotXgjRoAt3HXxlJvgNkGmCnFDaHxdZuRBoy4RbM
        g7kemQVV8AFU65KE7eDUIQnSgAm14OgtL/6lp+DcIjgEn2ItGZKwhdvBDQnScAmZBVBwfjcSNoOwWRCn
        2Is0WEItOK5nFkDBGp0k1MFGKYzsSpCGSuhbAAXrdCNhHdiT0DJMK33dAq3BWp0kvAP6YqyAyUyEUSUr
        2gVQsF4nCfTUeAHPpjEigII1O0mwgjEBFKzrnASjAihY2ykJxgVQsL4zEqwIoGCPUbAGLsCZZs7BI0h1
        bS/gD34HuBL0ycedFF2tXQEmgz4sIO6k6MoCVAcBC2ABLMB3Afw7gG8BFiDO//dBHxYQd1J0ZQGqg4AF
        DJQAPNLjToquLEB1ELAA/g4wICA4aeTBkAEK6HQpdYyxKyCMpsGNAa7BE0h1tS1gWdpXF/TmCr2mk/rM
        toAlaV9dsADgpADvbwF6EevBAPfgFaS6WhbQHAPjBphApyupY4xVAaZCXeJOiq4sQHUQsADfBdyBVbAy
        IFAX6pTq2k6AN7AA1UGfYAH4Q29pegsJmPIZ8aTkcPxMLvcLlHhQl/5v7fMAAAAASUVORK5CYII=
</value>
  </data>
  <data name="录入成品ToolStripMenuItem.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
    <value>MiddleRight</value>
  </data>
  <data name="录入成品ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
    <value>98, 36</value>
  </data>
  <data name="录入成品ToolStripMenuItem.Text" xml:space="preserve">
    <value> æ–‡ ä»¶</value>
  </data>
  <data name="tsmiCratePatchProject.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 12pt</value>
@@ -4174,42 +4252,6 @@
  <data name="toolStripMenuItem14.Visible" type="System.Boolean, mscorlib">
    <value>False</value>
  </data>
  <data name="导入单个DXFToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve">
    <value />
  </data>
  <data name="导入单个DXFToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
    <value>F8</value>
  </data>
  <data name="导入单个DXFToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
    <value>270, 26</value>
  </data>
  <data name="导入单个DXFToolStripMenuItem.Text" xml:space="preserve">
    <value>导入单个DXF（F8)</value>
  </data>
  <data name="批量导入DXFToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve">
    <value />
  </data>
  <data name="批量导入DXFToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
    <value>F9</value>
  </data>
  <data name="批量导入DXFToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
    <value>270, 26</value>
  </data>
  <data name="批量导入DXFToolStripMenuItem.Text" xml:space="preserve">
    <value>批量导入DXF (F9)</value>
  </data>
  <data name="分割后导入DXFToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve">
    <value />
  </data>
  <data name="分割后导入DXFToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
    <value>F10</value>
  </data>
  <data name="分割后导入DXFToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
    <value>270, 26</value>
  </data>
  <data name="分割后导入DXFToolStripMenuItem.Text" xml:space="preserve">
    <value>分割后导入DXF (F10)</value>
  </data>
  <data name="导入DXF图形.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 12pt</value>
  </data>
@@ -4246,6 +4288,42 @@
  </data>
  <data name="导入DXF图形.Visible" type="System.Boolean, mscorlib">
    <value>False</value>
  </data>
  <data name="导入单个DXFToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve">
    <value />
  </data>
  <data name="导入单个DXFToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
    <value>F8</value>
  </data>
  <data name="导入单个DXFToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
    <value>270, 26</value>
  </data>
  <data name="导入单个DXFToolStripMenuItem.Text" xml:space="preserve">
    <value>导入单个DXF（F8)</value>
  </data>
  <data name="批量导入DXFToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve">
    <value />
  </data>
  <data name="批量导入DXFToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
    <value>F9</value>
  </data>
  <data name="批量导入DXFToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
    <value>270, 26</value>
  </data>
  <data name="批量导入DXFToolStripMenuItem.Text" xml:space="preserve">
    <value>批量导入DXF (F9)</value>
  </data>
  <data name="分割后导入DXFToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve">
    <value />
  </data>
  <data name="分割后导入DXFToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
    <value>F10</value>
  </data>
  <data name="分割后导入DXFToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
    <value>270, 26</value>
  </data>
  <data name="分割后导入DXFToolStripMenuItem.Text" xml:space="preserve">
    <value>分割后导入DXF (F10)</value>
  </data>
  <data name="TSMIClearShowInfo.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 12pt</value>
@@ -4386,32 +4464,57 @@
  <data name="tsmiStockManage.Visible" type="System.Boolean, mscorlib">
    <value>False</value>
  </data>
  <data name="录入成品ToolStripMenuItem.Font" type="System.Drawing.Font, System.Drawing">
  <data name="优化版面ToolStripMenuItem.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 15pt, style=Bold</value>
  </data>
  <data name="录入成品ToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
  <data name="优化版面ToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAS
        dAAAEnQB3mYfeAAAAjJJREFUeF7tmrlOw0AURRMRUKCJ08EHhB+BihJBCw1Lg9gFlHRIgNMDVSgR/AMd
        fwCCGiQ6RBJDxXKfNZai8URJHGYh8650KBw88+6RHadwjsPhcLxOEEYLGlgEM6AotnE3GPJbAz+gCQ7A
        iNjKzYhhdRGBfeCuhJZhdUFXwl656qgEaVhdkITdsotXgjRoAt3HXxlJvgNkGmCnFDaHxdZuRBoy4RbM
        g7kemQVV8AFU65KE7eDUIQnSgAm14OgtL/6lp+DcIjgEn2ItGZKwhdvBDQnScAmZBVBwfjcSNoOwWRCn
        2Is0WEItOK5nFkDBGp0k1MFGKYzsSpCGSuhbAAXrdCNhHdiT0DJMK33dAq3BWp0kvAP6YqyAyUyEUSUr
        2gVQsF4nCfTUeAHPpjEigII1O0mwgjEBFKzrnASjAihY2ykJxgVQsL4zEqwIoGCPUbAGLsCZZs7BI0h1
        bS/gD34HuBL0ycedFF2tXQEmgz4sIO6k6MoCVAcBC2ABLMB3Afw7gG8BFiDO//dBHxYQd1J0ZQGqg4AF
        DJQAPNLjToquLEB1ELAA/g4wICA4aeTBkAEK6HQpdYyxKyCMpsGNAa7BE0h1tS1gWdpXF/TmCr2mk/rM
        toAlaV9dsADgpADvbwF6EevBAPfgFaS6WhbQHAPjBphApyupY4xVAaZCXeJOiq4sQHUQsADfBdyBVbAy
        IFAX6pTq2k6AN7AA1UGfYAH4Q29pegsJmPIZ8aTkcPxMLvcLlHhQl/5v7fMAAAAASUVORK5CYII=
        dAAAEnQB3mYfeAAAAmlJREFUeF7tm09LVFEYxkcRhFYiGrZQK2yRH8HWReCuoIX7gj6FSO5E+/MFXInt
        /QBtDN2nbmpXEAgu7M8QCNbvkfcMB+Y6ONPc67lz3gd+zPW+h/M+78OM3rnONFwul8vVpcbWf8/DU3iS
        CPIyb/bKF82W4RzOEkFels1e+aLZCvxNjBWzV77ULGrchC/wuWLUU72vPYCPcBem4FZFqJd6qve1B/Bh
        bKN5w0qVST0vensAHoAHYHgAVipfahY19gA8gEEJgE2G4CbcgduXMA1vITTeg/swC0Xry0C91FO9gw95
        krei9UIzabYhG7ddFEdgE77D1w6cQmj8B75B0boyUU/1Dj7kqWhdQDNpthEbt10qwg6ETQcNzdZVAHqr
        qZTrjGboOYAteASPa4q8a4aeA3hlpdpKM0TzdB3AqpVqK80QzTOYAeBzBl7AS+OelbIJQK93/cKTZ90f
        XLKSB8BxFgE8hBP4CT/gmZWyCWAcFuCBMWmlPALoJM0QzeMBgAdgpXapaIs8AKMVAMdzoIuNOjBntvsa
        wBLob2yopUo51wEcZx/AInyCAziGsOYXHIHOV4l6qnfwIU86L4+LZruPAWw0R2ESdNGxFq3Z5dwMTFi9
        CtRLb4B2Ix9rnBu3+qjZ7k8APOpmaetmIsdJ3xXmuOWXx/8K4BC24X2EftZTLaxJJQB5KvKqGcKargO4
        CqkEcBU8AOgYwDA8h3fw5hJewz6ETVMJQJ7krciz0Eyabdi26F1s4v8bjBp7AB6AB+ABeABWqkwegAfg
        ASQTQPYfls7+4/KpUGkA2X9lJu8vTblcLtdgqNH4Bz+yNy41u7zRAAAAAElFTkSuQmCC
</value>
  </data>
  <data name="录入成品ToolStripMenuItem.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
  <data name="优化版面ToolStripMenuItem.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
    <value>MiddleRight</value>
  </data>
  <data name="录入成品ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
  <data name="优化版面ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
    <value>98, 36</value>
  </data>
  <data name="录入成品ToolStripMenuItem.Text" xml:space="preserve">
    <value> æ–‡ ä»¶</value>
  <data name="优化版面ToolStripMenuItem.Text" xml:space="preserve">
    <value> æ‰“ å°</value>
  </data>
  <data name="打印版图.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 12pt</value>
  </data>
  <data name="打印版图.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAS
        dAAAEnQB3mYfeAAAAiFJREFUeF7tmk9OwkAUxtGtiULVqAtdewNXXsOliSSegANwAFkyVVQkLrmGJ3Bh
        VGZiDCYu3bEU63v9g9AU0dC+Dun3JV9op828N79Oh85kShAEQRAEQRA0n9Zbz/trSp9I2XF1tXJujrbO
        7lfCFPJVmNTQUfpLxK7x6LdfUWY3TCFf+QCixCRABHHeLASgh2VXX5aVOY66a5rmru8oc2cvADIfh8Xp
        y/OWqNHtYgNwzQ0AAAAAAIAsAAo81aREAEn3zuu6tzwBoPWy92ustFR2e4dEu83BE3zt/zeHAPiYy2L3
        pGdlnhgAHQ8oXndKXh261li9enDCJswnok0fINQ4n/yiOMVXZNTFuWJlPrhyW01Pf5AdADIFqG1cPO5w
        5daZxgTKsZspgNEgZ6No4OMxQAQAz8V5Tk6Bqlw2bi7LZb4uCYArp/N+MC4E10YOyuTn6wCAV0AOgJUC
        AAAAAAAAAEkAFNAK173lKB8xADzXpvMGBexw0PysbytNc+pDkATAlXOQIFi+5kZHvSFzABSgttl83Xaa
        vQM6fo8nk/V6AcUM5/vjMXWXp8LZT4f9YNRA/s7nxiv9GUsk2/WCiQb+OIASB5QiAKrsb0tidE/0imSi
        iS4+yykC+M+iqBQA+pVbFI0GmESTxscIuR5AT1hqWXyWcgOQVhefVwAAAAAAAGIArN4iU/hNUkFiBd0m
        V+SNkoXfKgtBEARBEAQtlEqlb14hq9/b9cu2AAAAAElFTkSuQmCC
</value>
  </data>
  <data name="打印版图.Size" type="System.Drawing.Size, System.Drawing">
    <value>225, 26</value>
  </data>
  <data name="打印版图.Text" xml:space="preserve">
    <value>打印优化版图</value>
  </data>
  <data name="一行一列ToolStripMenuItem1.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 10.5pt</value>
@@ -4476,30 +4579,6 @@
  <data name="四行二列ToolStripMenuItem.Text" xml:space="preserve">
    <value>四行二列</value>
  </data>
  <data name="打印版图.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 12pt</value>
  </data>
  <data name="打印版图.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAS
        dAAAEnQB3mYfeAAAAiFJREFUeF7tmk9OwkAUxtGtiULVqAtdewNXXsOliSSegANwAFkyVVQkLrmGJ3Bh
        VGZiDCYu3bEU63v9g9AU0dC+Dun3JV9op828N79Oh85kShAEQRAEQRA0n9Zbz/trSp9I2XF1tXJujrbO
        7lfCFPJVmNTQUfpLxK7x6LdfUWY3TCFf+QCixCRABHHeLASgh2VXX5aVOY66a5rmru8oc2cvADIfh8Xp
        y/OWqNHtYgNwzQ0AAAAAAIAsAAo81aREAEn3zuu6tzwBoPWy92ustFR2e4dEu83BE3zt/zeHAPiYy2L3
        pGdlnhgAHQ8oXndKXh261li9enDCJswnok0fINQ4n/yiOMVXZNTFuWJlPrhyW01Pf5AdADIFqG1cPO5w
        5daZxgTKsZspgNEgZ6No4OMxQAQAz8V5Tk6Bqlw2bi7LZb4uCYArp/N+MC4E10YOyuTn6wCAV0AOgJUC
        AAAAAAAAAEkAFNAK173lKB8xADzXpvMGBexw0PysbytNc+pDkATAlXOQIFi+5kZHvSFzABSgttl83Xaa
        vQM6fo8nk/V6AcUM5/vjMXWXp8LZT4f9YNRA/s7nxiv9GUsk2/WCiQb+OIASB5QiAKrsb0tidE/0imSi
        iS4+yykC+M+iqBQA+pVbFI0GmESTxscIuR5AT1hqWXyWcgOQVhefVwAAAAAAAGIArN4iU/hNUkFiBd0m
        V+SNkoXfKgtBEARBEAQtlEqlb14hq9/b9cu2AAAAAElFTkSuQmCC
</value>
  </data>
  <data name="打印版图.Size" type="System.Drawing.Size, System.Drawing">
    <value>225, 26</value>
  </data>
  <data name="打印版图.Text" xml:space="preserve">
    <value>打印优化版图</value>
  </data>
  <data name="toolStripMenuItem19.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 12pt</value>
  </data>
@@ -4541,6 +4620,44 @@
  </data>
  <data name="toolStripMenuItem19.Text" xml:space="preserve">
    <value>打印优化报告(T)</value>
  </data>
  <data name="TSMIPrintLayoutAndReport.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 12pt</value>
  </data>
  <data name="TSMIPrintLayoutAndReport.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        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
        KPwNxFEv4yUNPa4AAAAASUVORK5CYII=
</value>
  </data>
  <data name="TSMIPrintLayoutAndReport.Size" type="System.Drawing.Size, System.Drawing">
    <value>225, 26</value>
  </data>
  <data name="TSMIPrintLayoutAndReport.Text" xml:space="preserve">
    <value>合并打印</value>
  </data>
  <data name="TSMIPrintRange11.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 9pt</value>
@@ -4598,44 +4715,6 @@
  </data>
  <data name="TSMIPrintRange42.Text" xml:space="preserve">
    <value>四行二列</value>
  </data>
  <data name="TSMIPrintLayoutAndReport.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 12pt</value>
  </data>
  <data name="TSMIPrintLayoutAndReport.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        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
        KPwNxFEv4yUNPa4AAAAASUVORK5CYII=
</value>
  </data>
  <data name="TSMIPrintLayoutAndReport.Size" type="System.Drawing.Size, System.Drawing">
    <value>225, 26</value>
  </data>
  <data name="TSMIPrintLayoutAndReport.Text" xml:space="preserve">
    <value>合并打印</value>
  </data>
  <data name="tsmiLabelPlan.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 12pt</value>
@@ -5058,33 +5137,37 @@
  <data name="toolStripMenuItem17.Visible" type="System.Boolean, mscorlib">
    <value>False</value>
  </data>
  <data name="优化版面ToolStripMenuItem.Font" type="System.Drawing.Font, System.Drawing">
  <data name="手工排版ToolStripMenuItem.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 15pt, style=Bold</value>
  </data>
  <data name="优化版面ToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
  <data name="手工排版ToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        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
        ofAHUYaVHnH2mXMAAAAASUVORK5CYII=
</value>
  </data>
  <data name="优化版面ToolStripMenuItem.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
  <data name="手工排版ToolStripMenuItem.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
    <value>MiddleRight</value>
  </data>
  <data name="优化版面ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
  <data name="手工排版ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
    <value>98, 36</value>
  </data>
  <data name="优化版面ToolStripMenuItem.Text" xml:space="preserve">
    <value> æ‰“ å°</value>
  <data name="手工排版ToolStripMenuItem.Text" xml:space="preserve">
    <value> è°ƒ æ•´</value>
  </data>
  <data name="撤销自动排版结果ToolStripMenuItem.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 12pt</value>
@@ -5236,18 +5319,6 @@
  <data name="删除版面.Text" xml:space="preserve">
    <value>删除版面(D)</value>
  </data>
  <data name="X镜像当前版.Size" type="System.Drawing.Size, System.Drawing">
    <value>129, 26</value>
  </data>
  <data name="X镜像当前版.Text" xml:space="preserve">
    <value>X-镜像</value>
  </data>
  <data name="Y镜像当前版.Size" type="System.Drawing.Size, System.Drawing">
    <value>129, 26</value>
  </data>
  <data name="Y镜像当前版.Text" xml:space="preserve">
    <value>Y-镜像</value>
  </data>
  <data name="toolStripMenuItem22.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 12pt</value>
  </data>
@@ -5276,29 +5347,17 @@
  <data name="toolStripMenuItem22.Text" xml:space="preserve">
    <value>镜像当前版面</value>
  </data>
  <data name="X镜像.ShortcutKeyDisplayString" xml:space="preserve">
    <value> </value>
  <data name="X镜像当前版.Size" type="System.Drawing.Size, System.Drawing">
    <value>129, 26</value>
  </data>
  <data name="X镜像.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
    <value>Ctrl+X</value>
  <data name="X镜像当前版.Text" xml:space="preserve">
    <value>X-镜像</value>
  </data>
  <data name="X镜像.Size" type="System.Drawing.Size, System.Drawing">
    <value>164, 26</value>
  <data name="Y镜像当前版.Size" type="System.Drawing.Size, System.Drawing">
    <value>129, 26</value>
  </data>
  <data name="X镜像.Text" xml:space="preserve">
    <value>X-镜像(X)</value>
  </data>
  <data name="y镜像.ShortcutKeyDisplayString" xml:space="preserve">
    <value> </value>
  </data>
  <data name="y镜像.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
    <value>Ctrl+Y</value>
  </data>
  <data name="y镜像.Size" type="System.Drawing.Size, System.Drawing">
    <value>164, 26</value>
  </data>
  <data name="y镜像.Text" xml:space="preserve">
    <value>Y-镜像(Y)</value>
  <data name="Y镜像当前版.Text" xml:space="preserve">
    <value>Y-镜像</value>
  </data>
  <data name="toolStripMenuItem21.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 12pt</value>
@@ -5357,6 +5416,30 @@
  </data>
  <data name="toolStripMenuItem21.Text" xml:space="preserve">
    <value>镜像所有版面</value>
  </data>
  <data name="X镜像.ShortcutKeyDisplayString" xml:space="preserve">
    <value> </value>
  </data>
  <data name="X镜像.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
    <value>Ctrl+X</value>
  </data>
  <data name="X镜像.Size" type="System.Drawing.Size, System.Drawing">
    <value>164, 26</value>
  </data>
  <data name="X镜像.Text" xml:space="preserve">
    <value>X-镜像(X)</value>
  </data>
  <data name="y镜像.ShortcutKeyDisplayString" xml:space="preserve">
    <value> </value>
  </data>
  <data name="y镜像.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
    <value>Ctrl+Y</value>
  </data>
  <data name="y镜像.Size" type="System.Drawing.Size, System.Drawing">
    <value>164, 26</value>
  </data>
  <data name="y镜像.Text" xml:space="preserve">
    <value>Y-镜像(Y)</value>
  </data>
  <data name="保存修改ToolStripMenuItem.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 12pt</value>
@@ -5471,37 +5554,42 @@
  <data name="操作提示ToolStripMenuItem.Text" xml:space="preserve">
    <value>操作提示</value>
  </data>
  <data name="手工排版ToolStripMenuItem.Font" type="System.Drawing.Font, System.Drawing">
  <data name="设备驱动menu.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 15pt, style=Bold</value>
  </data>
  <data name="手工排版ToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
  <data name="设备驱动menu.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAS
        dAAAEnQB3mYfeAAAAz1JREFUeF7tm7trFEEcx+9CAkrQrDZ6is9TGwujiYWlpUVsgiL4wmch2gQl4KNW
        jIsxARH/AvENgoWloI1gI6iFCKKdj2jMFYJRPz+dwO4wc7d7r+yO84UPCzv7m93v947b2dm5Qh4UhJVV
        8A5+1+BFcGlqkSpzRxgrw/uIURuvCaCkytwRxnwA4AOIGLXhA2goADrYBtfgakaQa9kLayBJAK8IYDnb
        42DzMQ69ynJcNJwHU8ezyQ1YB8kCCCtr4XFkn840Ie1WluOi0QegHZwFfADgA4C2BHAWvsLnjPANrkOa
        AOSO8QBsPj7CoLIcFw2LSWdTUwgrzaAPlkHScYDcBpeyLbPts1zLRuhRlvMhLtiPBMEHEDFqwwfgA3A0
        gAVwDq7AqIUxOAXdqsyrqQouThahsyYjkx2qxC3x1doKt+B2Fe7CflXiljB2FEw/PDrjqsQtYcwHoBm1
        4QNQJW4JY+4HwChKHiN3auyAEsaOaEZtjHH8fLbbI/WC3mey/WFFP6ZRBsE8WuRkw/ALfkaYhn1wEEyG
        dUY5gTx3y8SD1Eb7ygI/YJeyHBcNZ8BkSsynCaCf7YS2PytUnRJrVgAyk/PfBnAZfACQywBOawfPcADS
        BvAlsi9LyA+zNYBeOAHycjGKTDUfBlOHOvLMvhAOgamv2eYYlJXl5KLIjwQ1ozZ8AKrELWHMB6AZteFs
        AAPwrAbPYUiVuCUGD10QJGCOKvGqJb4tRVgNMv7YUIX1MFeVuSO+Ld0YewgybP5kQd7pv+FY88quPAtT
        8zD3FEw/plEmOHazKnNHKQPoV2XuyAeQtQA4STEY+d7ZJjrqCcDQTz0U/xrWxYlkFvYe3Gkxco4QlsAT
        MJmOIgHIHMMeuA+mPpNyE7Yoy3HRcAFMF9AKXoIsfEgTgKwDMLWnoeqMUDsXStYTgMw2mdrTkNMA/k2z
        +QAi++ol1wG0/DfgJHwA+Y9eK5EVX49gBaQJQNYyN3p9b2FAWY6Lhh6QPym2gxKfhJwv2TggrMjrNnnp
        auorDSuDcCobT5YEkHwgRACqzB35AHwAPgAJYOYuIAszTEibvGd0MoAujMkDjqwDljfTJuTWNwQt+Ft8
        ofAHUYaVHnH2mXMAAAAASUVORK5CYII=
        dAAAEnQB3mYfeAAABFRJREFUeF7tmklrFEEcxUc9GBNj2nhRiKgh7qCIfozgFo27n8CD+AkU9zgTDfoF
        QnLzoidX3FAP4l0ExbijICImwbi/1/PKqVT3rApW98yD36GnX1Xev0JVVy+ZhhpqqCoFubEmMC/Iji7w
        itxYB5ipmP9e6Hw62AgugsdgxDOegltgH2hX7H8jdNgK+sBn8MtzvoPzYK7i/73Q2X7wFcT9QV/JYmpM
        Uwm1Cx0tBI+sjpPCc7BUZdQudLIdfFOnNj88w83HqbBDZdQudHLa6tTwARwAO8Gu/wwzMAszuTnPqIza
        hA64+N22OjTcC3LjbbL9dzFLPlMk5x3QKlv1QuMV4K06szknizdiJicjYfaVslQvNN4G3PnP+bZHFm/E
        TMpmZ2X27bJULzTOWZ0Z3oFVsngjZlI2N29OluqEhjPBTasjA+eaN/PfiJmUzc3L3WH1W2Q0WgZeqxOb
        s7J4J2ZzspI3YLkslQuNtoK4+b9XFu/EbMpoZ2YNvbJULjQ6ZXVieI9Ljnfz34jZ8hkjubOyVCY0aAE3
        rA4MXl3/XZXYD3Atq3wdgHkpeKXGNt7OfyNmdDITrmXLZCkvmHuAe/fn5fXfFTMqq52d68AWWcoL5pNW
        YwOusf7OfyOtA3H7gT5ZSgvGZnDdami47/P8N9I6gKyR/FzTWmQrLpiWgJdqZOPd/r+YmNXJTrimlX8+
        ANNmkMj5b8SsymzXwJp6ZCkumI5bjQxe7v+LiVmV2a3jhCzxCvrD+X/NaUS83P8XE7Mqs1vH9aB/vFm2
        qGDoAi+sBobEzH8jZnZqIFzbFssSFU7yuX+i578RMyu7XQtr2yRLVDh51DIbEnH9d1ViP3BMlsnCiRng
        imU0eL3/LybtB+LWgattqFW2gnCC85/P0t0G3u//i4nZnVoI17guWQrCj+vBhEwGPltP3Pw3YnbVYNfE
        GjfIUhB+PGyZDJz/q2VJnJg9X0OkriOy5IUf+Mr7kmUwJHL+G5VYBy6DJtnCAegEfMXsGocj7+GTBmuI
        1sW1rlPlhwPQDb7opM1H8Ay47+KTArOzBrcu1tqt8sMBOGidrBcO5osfmJiCg0HnZD0wyNozwZkvU3Ew
        5JysB4ZYe6kB+Am4l04DrMWtr+wA3AW7Qdw7+STBGliLW1/ZARgOTn6aGi4UCRZrCGuJ1pf8AWjLjnIB
        bwf8RjD2QUdqByDIjjM39/oPAL8R5PeLa3T6j9I7ALkx7vPdt9cXwKRb3TQPQC9w7/SeYP8/X5ZQaR4A
        rvC8xNmZR4L+8YWyhGoMQIoHoO6nQJ0vgvV+GaTqeiNUqcoPwMAEDXHPA9J+M8TnAfl/MA7ivghN++1w
        f1g8hQN+E+i+E0gzrLXw7SAO5oC4z2LSCj8BmKPy88IP6wAvKXEN0sRDsFZlTxZOLAKHAD8y4rU17lFz
        EmEtfEHCp9+F9wFxwl6a19ZZoCP2RUMSye8TZs3OjU5RmQ011BCVyfwGRFdbecvBBo8AAAAASUVORK5C
        YII=
</value>
  </data>
  <data name="手工排版ToolStripMenuItem.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
  <data name="设备驱动menu.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
    <value>MiddleRight</value>
  </data>
  <data name="手工排版ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
  <data name="设备驱动menu.Size" type="System.Drawing.Size, System.Drawing">
    <value>98, 36</value>
  </data>
  <data name="手工排版ToolStripMenuItem.Text" xml:space="preserve">
    <value> è°ƒ æ•´</value>
  <data name="设备驱动menu.Text" xml:space="preserve">
    <value> æ•° æŽ§</value>
  </data>
  <data name="刷新刀路ToolStripMenuItem.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 12pt</value>
@@ -5671,42 +5759,50 @@
  <data name="反向刀路ToolStripMenuItem.Text" xml:space="preserve">
    <value>当前刀路反向</value>
  </data>
  <data name="设备驱动menu.Font" type="System.Drawing.Font, System.Drawing">
  <data name="手工切割ToolStripMenuItem.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 15pt, style=Bold</value>
  </data>
  <data name="设备驱动menu.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
  <data name="手工切割ToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAS
        dAAAEnQB3mYfeAAABFRJREFUeF7tmklrFEEcxUc9GBNj2nhRiKgh7qCIfozgFo27n8CD+AkU9zgTDfoF
        QnLzoidX3FAP4l0ExbijICImwbi/1/PKqVT3rApW98yD36GnX1Xev0JVVy+ZhhpqqCoFubEmMC/Iji7w
        itxYB5ipmP9e6Hw62AgugsdgxDOegltgH2hX7H8jdNgK+sBn8MtzvoPzYK7i/73Q2X7wFcT9QV/JYmpM
        Uwm1Cx0tBI+sjpPCc7BUZdQudLIdfFOnNj88w83HqbBDZdQudHLa6tTwARwAO8Gu/wwzMAszuTnPqIza
        hA64+N22OjTcC3LjbbL9dzFLPlMk5x3QKlv1QuMV4K06szknizdiJicjYfaVslQvNN4G3PnP+bZHFm/E
        TMpmZ2X27bJULzTOWZ0Z3oFVsngjZlI2N29OluqEhjPBTasjA+eaN/PfiJmUzc3L3WH1W2Q0WgZeqxOb
        s7J4J2ZzspI3YLkslQuNtoK4+b9XFu/EbMpoZ2YNvbJULjQ6ZXVieI9Ljnfz34jZ8hkjubOyVCY0aAE3
        rA4MXl3/XZXYD3Atq3wdgHkpeKXGNt7OfyNmdDITrmXLZCkvmHuAe/fn5fXfFTMqq52d68AWWcoL5pNW
        YwOusf7OfyOtA3H7gT5ZSgvGZnDdami47/P8N9I6gKyR/FzTWmQrLpiWgJdqZOPd/r+YmNXJTrimlX8+
        ANNmkMj5b8SsymzXwJp6ZCkumI5bjQxe7v+LiVmV2a3jhCzxCvrD+X/NaUS83P8XE7Mqs1vH9aB/vFm2
        qGDoAi+sBobEzH8jZnZqIFzbFssSFU7yuX+i578RMyu7XQtr2yRLVDh51DIbEnH9d1ViP3BMlsnCiRng
        imU0eL3/LybtB+LWgattqFW2gnCC85/P0t0G3u//i4nZnVoI17guWQrCj+vBhEwGPltP3Pw3YnbVYNfE
        GjfIUhB+PGyZDJz/q2VJnJg9X0OkriOy5IUf+Mr7kmUwJHL+G5VYBy6DJtnCAegEfMXsGocj7+GTBmuI
        1sW1rlPlhwPQDb7opM1H8Ay47+KTArOzBrcu1tqt8sMBOGidrBcO5osfmJiCg0HnZD0wyNozwZkvU3Ew
        5JysB4ZYe6kB+Am4l04DrMWtr+wA3AW7Qdw7+STBGliLW1/ZARgOTn6aGi4UCRZrCGuJ1pf8AWjLjnIB
        bwf8RjD2QUdqByDIjjM39/oPAL8R5PeLa3T6j9I7ALkx7vPdt9cXwKRb3TQPQC9w7/SeYP8/X5ZQaR4A
        rvC8xNmZR4L+8YWyhGoMQIoHoO6nQJ0vgvV+GaTqeiNUqcoPwMAEDXHPA9J+M8TnAfl/MA7ivghN++1w
        f1g8hQN+E+i+E0gzrLXw7SAO5oC4z2LSCj8BmKPy88IP6wAvKXEN0sRDsFZlTxZOLAKHAD8y4rU17lFz
        EmEtfEHCp9+F9wFxwl6a19ZZoCP2RUMSye8TZs3OjU5RmQ011BCVyfwGRFdbecvBBo8AAAAASUVORK5C
        YII=
        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
        RU5ErkJggg==
</value>
  </data>
  <data name="设备驱动menu.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
  <data name="手工切割ToolStripMenuItem.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
    <value>MiddleRight</value>
  </data>
  <data name="设备驱动menu.Size" type="System.Drawing.Size, System.Drawing">
  <data name="手工切割ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
    <value>98, 36</value>
  </data>
  <data name="设备驱动menu.Text" xml:space="preserve">
    <value> æ•° æŽ§</value>
  <data name="手工切割ToolStripMenuItem.Text" xml:space="preserve">
    <value> æ‰‹ å·¥</value>
  </data>
  <data name="新建ToolStripMenuItem1.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 12pt</value>
@@ -5727,24 +5823,6 @@
  </data>
  <data name="新建ToolStripMenuItem1.Text" xml:space="preserve">
    <value>新建</value>
  </data>
  <data name="维宏ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
    <value>144, 26</value>
  </data>
  <data name="维宏ToolStripMenuItem.Text" xml:space="preserve">
    <value>维宏</value>
  </data>
  <data name="宝伦ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
    <value>144, 26</value>
  </data>
  <data name="宝伦ToolStripMenuItem.Text" xml:space="preserve">
    <value>宝伦</value>
  </data>
  <data name="oPTIMAToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
    <value>144, 26</value>
  </data>
  <data name="oPTIMAToolStripMenuItem.Text" xml:space="preserve">
    <value>OPTIMA</value>
  </data>
  <data name="保存ToolStripMenuItem.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 12pt</value>
@@ -5773,6 +5851,24 @@
  </data>
  <data name="保存ToolStripMenuItem.Text" xml:space="preserve">
    <value>保存</value>
  </data>
  <data name="维宏ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
    <value>144, 26</value>
  </data>
  <data name="维宏ToolStripMenuItem.Text" xml:space="preserve">
    <value>维宏</value>
  </data>
  <data name="宝伦ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
    <value>144, 26</value>
  </data>
  <data name="宝伦ToolStripMenuItem.Text" xml:space="preserve">
    <value>宝伦</value>
  </data>
  <data name="oPTIMAToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
    <value>144, 26</value>
  </data>
  <data name="oPTIMAToolStripMenuItem.Text" xml:space="preserve">
    <value>OPTIMA</value>
  </data>
  <data name="新增版图ToolStripMenuItem.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 12pt</value>
@@ -5844,51 +5940,6 @@
  </data>
  <data name="删除版图ToolStripMenuItem.Text" xml:space="preserve">
    <value>删除版图</value>
  </data>
  <data name="手工切割ToolStripMenuItem.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 15pt, style=Bold</value>
  </data>
  <data name="手工切割ToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        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
        RU5ErkJggg==
</value>
  </data>
  <data name="手工切割ToolStripMenuItem.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
    <value>MiddleRight</value>
  </data>
  <data name="手工切割ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
    <value>98, 36</value>
  </data>
  <data name="手工切割ToolStripMenuItem.Text" xml:space="preserve">
    <value> æ‰‹ å·¥</value>
  </data>
  <data name="TSMISystemSet.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 15pt, style=Bold</value>
@@ -6036,33 +6087,6 @@
  </data>
  <data name="TSMIAbout.Text" xml:space="preserve">
    <value> å…³ äºŽ</value>
  </data>
  <data name="menuStrip1.Location" type="System.Drawing.Point, System.Drawing">
    <value>0, 0</value>
  </data>
  <data name="menuStrip1.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
    <value>5, 2, 0, 2</value>
  </data>
  <data name="menuStrip1.Size" type="System.Drawing.Size, System.Drawing">
    <value>1494, 40</value>
  </data>
  <data name="menuStrip1.TabIndex" type="System.Int32, mscorlib">
    <value>0</value>
  </data>
  <data name="menuStrip1.Text" xml:space="preserve">
    <value>menuStrip1</value>
  </data>
  <data name="&gt;&gt;menuStrip1.Name" xml:space="preserve">
    <value>menuStrip1</value>
  </data>
  <data name="&gt;&gt;menuStrip1.Type" xml:space="preserve">
    <value>System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
  <data name="&gt;&gt;menuStrip1.Parent" xml:space="preserve">
    <value>$this</value>
  </data>
  <data name="&gt;&gt;menuStrip1.ZOrder" xml:space="preserve">
    <value>4</value>
  </data>
  <data name="dataGridViewImageColumn1.HeaderText" xml:space="preserve">
    <value>形状</value>

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

@@ -79,6 +79,7 @@
        string strProjectNotLayout = "当前工程还未进行冷加工优化排版";
        #endregion

        private static readonly NLog.Logger Logger = NLog.LogManager.GetCurrentClassLogger();
        public å·¥ç¨‹ç®¡ç†(任务 f)
        {
            LanguageSet();
@@ -574,10 +575,12 @@
                    return;
                }
            }

            Logger.Info($"{strCurrentOperate}：{OPERATION_PROJECT_NO}");
            switch (type)
            {
                case 0://打开

                   

                    if (PORJECT_STATE == "10")
                    {
@@ -643,7 +646,7 @@
                            FilterPorjectData(CURRENT_GLASS_COLOR, CURRENT_GLASS_THICKNESS);
                            return;
                        }

                        Logger.Info($"{strCurrentOperate}：{OPERATION_PROJECT_NO}：{om.info}");
                        globel.ShowFromWarningMessage(strCurrentOperate + "\r\n" + strOperateError+"\r\n"+om.info);



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

@@ -162,7 +162,7 @@
</value>
  </data>
  <data name="TSMIOpen.Size" type="System.Drawing.Size, System.Drawing">
    <value>184, 26</value>
    <value>166, 26</value>
  </data>
  <data name="TSMIOpen.Text" xml:space="preserve">
    <value>打开工程</value>
@@ -187,7 +187,7 @@
</value>
  </data>
  <data name="TSMIHeatCalculate.Size" type="System.Drawing.Size, System.Drawing">
    <value>184, 26</value>
    <value>166, 26</value>
  </data>
  <data name="TSMIHeatCalculate.Text" xml:space="preserve">
    <value>模拟计算</value>
@@ -242,7 +242,7 @@
</value>
  </data>
  <data name="TSMIGoOptimize.Size" type="System.Drawing.Size, System.Drawing">
    <value>184, 26</value>
    <value>166, 26</value>
  </data>
  <data name="TSMIGoOptimize.Text" xml:space="preserve">
    <value>优化排版</value>
@@ -278,7 +278,7 @@
</value>
  </data>
  <data name="TSMIAllowProduct.Size" type="System.Drawing.Size, System.Drawing">
    <value>184, 26</value>
    <value>166, 26</value>
  </data>
  <data name="TSMIAllowProduct.Text" xml:space="preserve">
    <value>允许生产</value>
@@ -311,7 +311,7 @@
</value>
  </data>
  <data name="TSMINoProduct.Size" type="System.Drawing.Size, System.Drawing">
    <value>184, 26</value>
    <value>166, 26</value>
  </data>
  <data name="TSMINoProduct.Text" xml:space="preserve">
    <value>生产不可见</value>
@@ -352,7 +352,7 @@
</value>
  </data>
  <data name="TSMIHideFlowCard.Size" type="System.Drawing.Size, System.Drawing">
    <value>184, 26</value>
    <value>166, 26</value>
  </data>
  <data name="TSMIHideFlowCard.Text" xml:space="preserve">
    <value>隐藏流程卡</value>
@@ -393,7 +393,7 @@
</value>
  </data>
  <data name="TSMIShowFlowCard.Size" type="System.Drawing.Size, System.Drawing">
    <value>184, 26</value>
    <value>166, 26</value>
  </data>
  <data name="TSMIShowFlowCard.Text" xml:space="preserve">
    <value>显示流程卡</value>
@@ -437,7 +437,7 @@
</value>
  </data>
  <data name="TSMILookOnlyColor.Size" type="System.Drawing.Size, System.Drawing">
    <value>184, 26</value>
    <value>166, 26</value>
  </data>
  <data name="TSMILookOnlyColor.Text" xml:space="preserve">
    <value>只看此膜系</value>
@@ -462,7 +462,7 @@
</value>
  </data>
  <data name="TSMICopy.Size" type="System.Drawing.Size, System.Drawing">
    <value>184, 26</value>
    <value>166, 26</value>
  </data>
  <data name="TSMICopy.Text" xml:space="preserve">
    <value>复刻工程</value>
@@ -667,7 +667,7 @@
</value>
  </data>
  <data name="标注ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
    <value>184, 26</value>
    <value>166, 26</value>
  </data>
  <data name="标注ToolStripMenuItem.Text" xml:space="preserve">
    <value>标注</value>
@@ -715,7 +715,7 @@
</value>
  </data>
  <data name="TSMIDelete.Size" type="System.Drawing.Size, System.Drawing">
    <value>184, 26</value>
    <value>166, 26</value>
  </data>
  <data name="TSMIDelete.Text" xml:space="preserve">
    <value>撤销优化</value>
@@ -763,7 +763,7 @@
</value>
  </data>
  <data name="TSMICancelAnalog.Size" type="System.Drawing.Size, System.Drawing">
    <value>184, 26</value>
    <value>166, 26</value>
  </data>
  <data name="TSMICancelAnalog.Text" xml:space="preserve">
    <value>撤销模拟计算</value>
@@ -794,7 +794,7 @@
</value>
  </data>
  <data name="TSMIInitProject.Size" type="System.Drawing.Size, System.Drawing">
    <value>184, 26</value>
    <value>166, 26</value>
  </data>
  <data name="TSMIInitProject.Text" xml:space="preserve">
    <value>初始化工程</value>
@@ -833,7 +833,7 @@
</value>
  </data>
  <data name="TSMIRemove.Size" type="System.Drawing.Size, System.Drawing">
    <value>184, 26</value>
    <value>166, 26</value>
  </data>
  <data name="TSMIRemove.Text" xml:space="preserve">
    <value>删除工程</value>
@@ -869,7 +869,7 @@
</value>
  </data>
  <data name="TSMIHeatLayout.Size" type="System.Drawing.Size, System.Drawing">
    <value>184, 26</value>
    <value>166, 26</value>
  </data>
  <data name="TSMIHeatLayout.Text" xml:space="preserve">
    <value>查看钢化版图</value>
@@ -927,7 +927,7 @@
</value>
  </data>
  <data name="TSMIOptimizeLayout.Size" type="System.Drawing.Size, System.Drawing">
    <value>184, 26</value>
    <value>166, 26</value>
  </data>
  <data name="TSMIOptimizeLayout.Text" xml:space="preserve">
    <value>查看优化版图</value>
@@ -948,7 +948,7 @@
</value>
  </data>
  <data name="TSMIOpenUrl.Size" type="System.Drawing.Size, System.Drawing">
    <value>184, 26</value>
    <value>166, 26</value>
  </data>
  <data name="TSMIOpenUrl.Text" xml:space="preserve">
    <value>打印流程卡</value>
@@ -976,7 +976,7 @@
</value>
  </data>
  <data name="TSMIExport.Size" type="System.Drawing.Size, System.Drawing">
    <value>184, 26</value>
    <value>166, 26</value>
  </data>
  <data name="TSMIExport.Text" xml:space="preserve">
    <value>数据导出</value>
@@ -1018,13 +1018,13 @@
</value>
  </data>
  <data name="TSMIRefresh.Size" type="System.Drawing.Size, System.Drawing">
    <value>184, 26</value>
    <value>166, 26</value>
  </data>
  <data name="TSMIRefresh.Text" xml:space="preserve">
    <value>刷新</value>
  </data>
  <data name="oPTIMA优化ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
    <value>184, 26</value>
    <value>166, 26</value>
  </data>
  <data name="oPTIMA优化ToolStripMenuItem.Text" xml:space="preserve">
    <value>OPTIMA优化</value>
@@ -1033,7 +1033,7 @@
    <value>False</value>
  </data>
  <data name="MenuRightClick.Size" type="System.Drawing.Size, System.Drawing">
    <value>185, 546</value>
    <value>167, 524</value>
  </data>
  <data name="&gt;&gt;MenuRightClick.Name" xml:space="preserve">
    <value>MenuRightClick</value>

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

@@ -41,7 +41,7 @@
        DataTable dt_log;
        private void å¼€å‘商_Load(object sender, EventArgs e)
        {
            this.Text = strAbout + (Service.ERPService.Contains("127.0.0.1") ? "【" + strLocalMode + "】" : "【" + strServerMode + "】");
            this.Text = strAbout+$"【{globel.CustomerName}】{Service.ERPService}:{Service.ERPServicePort}";

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

            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");
            dataTable.Rows.Add("25.03.27", "功能新增", "1.余料管理，可添加删除余料", "2025.03.27");

 optimize_patch/¶©µ¥ÅÅÑù¿Í»§¶Ë/EDIT/É豸Çý¶¯.cs

@@ -47,6 +47,7 @@
        public OnePacking pack;
        public Order simpleorder;
        public List<int> indexs=new List<int> ();
        private static readonly NLog.Logger Logger = NLog.LogManager.GetCurrentClassLogger();
        private void è®¾å¤‡é©±åŠ¨_Load(object sender, EventArgs e)
        {
            tipsLocation();
@@ -238,11 +239,12 @@
                {
                    case "BOTTERO":
                        //SaveFile.getBottero(pack, ä»»åŠ¡.simpleorder);
                        
                        Logger.Info($"保存BOTTERO文件：{pack.packingName}");
                        if (!fileUtil.IsSharedFolderAccessible(directPacking.Setting.btlPath))
                        {

                            palTips.Visible = false;
                            Logger.Warn("文件路径：" + Setting.btlPath + "\r\n访问失败，请检查原因！");
                            globel.ShowFromErrorMessage("文件路径：" + Setting.btlPath + "\r\n访问失败，请检查原因！");
                            return;
                        }
@@ -259,24 +261,24 @@

                        break;
                    case "DXF":
                        Logger.Info($"保存DXF文件：{pack.packingName}");
                        SaveFile.getDXF(pack, ä»»åŠ¡.simpleorder);
                        break;
                    case "INTERMAC":
                        Logger.Info($"保存INTERMAC文件：{pack.packingName}");
                        //  if (Setting.thickcontrol) pack.X_Mirror();
                        SaveFile.getOTD(pack, ä»»åŠ¡.simpleorder, taskform.txtProjectNo.Text);
                        // if (Setting.thickcontrol) pack.X_Mirror();
                        break;
                    case "LISEC":
                        Logger.Info($"保存LISEC文件：{pack.packingName}");
                        SaveFile.getLISEC(pack, ä»»åŠ¡.simpleorder);
                        break;
                    case "OPTIMA":

                        Logger.Info($"保存OPTIMA文件：{pack.packingName}");
                        if (globel.UserGroup == "补片") {

                            SaveFile.getOPT(pack, ä»»åŠ¡.simpleorder, taskform.txtProjectNo.Text);




                            palTips.Visible = false;
                            return;
@@ -350,6 +352,7 @@
            }
            catch (Exception ex)
            {
                Logger.Error(ex, "错误编码：" + err_no + "切割文件保存");
                globel.ShowErrorMessage("错误编码："+err_no +"\r\n切割文件保存：" +ex.Message);
                return;
            }

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

@@ -140,7 +140,13 @@
  <data name="btnLeftMinus.Location" type="System.Drawing.Point, System.Drawing">
    <value>80, 73</value>
  </data>
  <data name="lblBtnTrimSave.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 12pt, style=Bold</value>
  </data>
  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
  <data name="cBoxTrimAutoFill.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Fill</value>
  </data>
  <data name="txtRight.TextAlign" type="System.Windows.Forms.HorizontalAlignment, System.Windows.Forms">
    <value>Center</value>
  </data>
@@ -192,8 +198,8 @@
  <data name="lblMag.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Fill</value>
  </data>
  <data name="&gt;&gt;gBoxShow.Type" xml:space="preserve">
    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  <data name="&gt;&gt;label2.Name" xml:space="preserve">
    <value>label2</value>
  </data>
  <data name="&gt;&gt;btnTrimRightAdd.Type" xml:space="preserve">
    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@@ -209,6 +215,9 @@
  </data>
  <data name="&gt;&gt;btnAddAll.Name" xml:space="preserve">
    <value>btnAddAll</value>
  </data>
  <data name="tableLayoutPanel3.Size" type="System.Drawing.Size, System.Drawing">
    <value>382, 245</value>
  </data>
  <data name="tlpEdging.ColumnCount" type="System.Int32, mscorlib">
    <value>3</value>
@@ -243,8 +252,8 @@
  <data name="txtLeft.Multiline" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
  <data name="&gt;&gt;btnTrimLeftAdd.Parent" xml:space="preserve">
    <value>tableLayoutPanel6</value>
  <data name="&gt;&gt;txtUp.Parent" xml:space="preserve">
    <value>tlpUP</value>
  </data>
  <data name="txtUp.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
    <value>2, 2, 0, 2</value>
@@ -288,8 +297,8 @@
  <data name="&gt;&gt;btnDownAdd.Name" xml:space="preserve">
    <value>btnDownAdd</value>
  </data>
  <data name="tableLayoutPanel8.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Fill</value>
  <data name="&gt;&gt;tableLayoutPanel3.Parent" xml:space="preserve">
    <value>groupBox1</value>
  </data>
  <data name="&gt;&gt;cmbProcessList.Parent" xml:space="preserve">
    <value>tlpEdging</value>
@@ -329,9 +338,6 @@
  </data>
  <data name="txtLeft.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
    <value>2, 2, 0, 2</value>
  </data>
  <data name="txtTrimRight.Size" type="System.Drawing.Size, System.Drawing">
    <value>77, 52</value>
  </data>
  <data name="&gt;&gt;tpTrim.Type" xml:space="preserve">
    <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@@ -384,6 +390,9 @@
  <data name="&gt;&gt;tpEdge.Type" xml:space="preserve">
    <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
  <data name="tableLayoutPanel2.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 12pt</value>
  </data>
  <data name="tlpDown.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="txtDown" Row="0" RowSpan="2" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="btnDownMinus" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="btnDownAdd" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,66.66666,Percent,33.33333" /&gt;&lt;Rows Styles="Percent,50,Percent,50" /&gt;&lt;/TableLayoutSettings&gt;</value>
  </data>
@@ -399,8 +408,8 @@
  <data name="&gt;&gt;tableLayoutPanel7.Parent" xml:space="preserve">
    <value>tableLayoutPanel3</value>
  </data>
  <data name="btnRightMinus.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Fill</value>
  <data name="&gt;&gt;txtRight.Name" xml:space="preserve">
    <value>txtRight</value>
  </data>
  <data name="label1.Text" xml:space="preserve">
    <value>鼠标点击蓝色图形区域快速设置修边量</value>
@@ -422,6 +431,9 @@
  </data>
  <data name="&gt;&gt;$this.Name" xml:space="preserve">
    <value>设置磨量</value>
  </data>
  <data name="&gt;&gt;lblBtnTrimSave.Parent" xml:space="preserve">
    <value>tableLayoutPanel2</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>
@@ -564,14 +576,14 @@
  <data name="btnDownMinus.Location" type="System.Drawing.Point, System.Drawing">
    <value>92, 23</value>
  </data>
  <data name="tableLayoutPanel3.Size" type="System.Drawing.Size, System.Drawing">
    <value>382, 245</value>
  <data name="tableLayoutPanel8.Size" type="System.Drawing.Size, System.Drawing">
    <value>109, 59</value>
  </data>
  <data name="txtTrimUp.Size" type="System.Drawing.Size, System.Drawing">
    <value>88, 44</value>
  </data>
  <data name="txtQuickEdge.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 15.75pt, style=Bold</value>
  </data>
  <data name="lblMag.Text" xml:space="preserve">
    <value>鼠标点击蓝色图形区域可快速设置磨边量</value>
  </data>
  <data name="&gt;&gt;cBoxTrimAutoFill.ZOrder" xml:space="preserve">
    <value>3</value>
@@ -609,11 +621,11 @@
  <data name="btnTrimQuickSub.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 12pt</value>
  </data>
  <data name="btnMinusAll.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
    <value>0, 0, 0, 0</value>
  </data>
  <data name="btnUpAdd.Size" type="System.Drawing.Size, System.Drawing">
    <value>46, 22</value>
  </data>
  <data name="txtDown.Location" type="System.Drawing.Point, System.Drawing">
    <value>2, 2</value>
  </data>
  <data name="btnTrimLeftAdd.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
    <value>0, 0, 0, 0</value>
@@ -645,8 +657,8 @@
  <data name="groupBox1.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
    <value>2, 2, 2, 2</value>
  </data>
  <data name="btnMinusAll.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
    <value>0, 0, 0, 0</value>
  <data name="tableLayoutPanel6.ColumnCount" type="System.Int32, mscorlib">
    <value>2</value>
  </data>
  <data name="&gt;&gt;txtTrimQuick.Name" xml:space="preserve">
    <value>txtTrimQuick</value>
@@ -699,8 +711,8 @@
  <data name="&gt;&gt;tlpBody.Name" xml:space="preserve">
    <value>tlpBody</value>
  </data>
  <data name="txtTrimUp.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Fill</value>
  <data name="tableLayoutPanel6.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
    <value>2, 2, 2, 2</value>
  </data>
  <data name="tlpBody.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Fill</value>
@@ -723,6 +735,9 @@
  <data name="btnTrimUpSub.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 9pt</value>
  </data>
  <data name="txtRight.TabIndex" type="System.Int32, mscorlib">
    <value>0</value>
  </data>
  <data name="&gt;&gt;txtDown.Parent" xml:space="preserve">
    <value>tlpDown</value>
  </data>
@@ -740,9 +755,6 @@
  </data>
  <data name="&gt;&gt;lblBtnTrimSave.ZOrder" xml:space="preserve">
    <value>4</value>
  </data>
  <data name="txtTrimDown.Text" xml:space="preserve">
    <value>0.0</value>
  </data>
  <data name="btnRightMinus.Location" type="System.Drawing.Point, System.Drawing">
    <value>81, 73</value>
@@ -798,9 +810,6 @@
  <data name="&gt;&gt;tableLayoutPanel4.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="btnTrimUpSub.Size" type="System.Drawing.Size, System.Drawing">
    <value>45, 24</value>
  </data>
  <data name="&gt;&gt;tlpUP.ZOrder" xml:space="preserve">
    <value>0</value>
  </data>
@@ -849,12 +858,6 @@
  <data name="&gt;&gt;panSquare.ZOrder" xml:space="preserve">
    <value>2</value>
  </data>
  <data name="txtRight.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
    <value>2, 2, 0, 2</value>
  </data>
  <data name="&gt;&gt;txtTrimUp.ZOrder" xml:space="preserve">
    <value>0</value>
  </data>
  <data name="btnRightAdd.Size" type="System.Drawing.Size, System.Drawing">
    <value>41, 29</value>
  </data>
@@ -872,6 +875,9 @@
  </data>
  <data name="txtTrimLeft.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Fill</value>
  </data>
  <data name="btnTrimQuickSub.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
    <value>0, 0, 0, 0</value>
  </data>
  <data name="&gt;&gt;btnRightMinus.ZOrder" xml:space="preserve">
    <value>1</value>
@@ -996,11 +1002,17 @@
  <data name="btnTrimDownSub.Size" type="System.Drawing.Size, System.Drawing">
    <value>45, 25</value>
  </data>
  <data name="tableLayoutPanel8.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Fill</value>
  </data>
  <data name="lblBtnUseEdge.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 12pt, style=Bold</value>
  </data>
  <data name="btnTrimQuickSub.Size" type="System.Drawing.Size, System.Drawing">
    <value>37, 30</value>
  </data>
  <data name="txtQuickEdge.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Fill</value>
  </data>
  <data name="&gt;&gt;tlpEdging.Name" xml:space="preserve">
    <value>tlpEdging</value>
@@ -1020,14 +1032,14 @@
  <data name="btnLeftAdd.Text" xml:space="preserve">
    <value>+</value>
  </data>
  <data name="txtTrimUp.Size" type="System.Drawing.Size, System.Drawing">
    <value>88, 44</value>
  <data name="btnTrimUpSub.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Fill</value>
  </data>
  <data name="groupBox1.Text" xml:space="preserve">
    <value>修边量（毫米）</value>
  </data>
  <data name="txtTrimQuick.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 15.75pt, style=Bold</value>
  <data name="btnTrimUpSub.Size" type="System.Drawing.Size, System.Drawing">
    <value>45, 24</value>
  </data>
  <data name="panStockTrim.Size" type="System.Drawing.Size, System.Drawing">
    <value>137, 142</value>
@@ -1037,9 +1049,6 @@
  </data>
  <data name="&gt;&gt;cboxAuto.Type" xml:space="preserve">
    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
  <data name="btnTrimUpSub.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Fill</value>
  </data>
  <data name="tableLayoutPanel3.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="tableLayoutPanel4" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="tableLayoutPanel5" Row="1" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;Control Name="panStockTrim" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="tableLayoutPanel6" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="tableLayoutPanel7" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,32,Percent,36,Percent,32" /&gt;&lt;Rows Styles="Percent,20.58824,Percent,58.82352,Percent,20.58824" /&gt;&lt;/TableLayoutSettings&gt;</value>
@@ -1086,9 +1095,6 @@
  <data name="btnDownAdd.Size" type="System.Drawing.Size, System.Drawing">
    <value>46, 23</value>
  </data>
  <data name="btnAddAll.Text" xml:space="preserve">
    <value>+</value>
  </data>
  <data name="panStockTrim.TabIndex" type="System.Int32, mscorlib">
    <value>1</value>
  </data>
@@ -1098,11 +1104,14 @@
  <data name="&gt;&gt;txtRight.Type" xml:space="preserve">
    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
  <data name="txtMinEdgeLength.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 15.75pt</value>
  <data name="&gt;&gt;gBoxShow.Type" xml:space="preserve">
    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
  <data name="btnTrimDownAdd.TabIndex" type="System.Int32, mscorlib">
    <value>1</value>
  </data>
  <data name="btnTrimRightAdd.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Fill</value>
  </data>
  <data name="&gt;&gt;btnDownMinus.ZOrder" xml:space="preserve">
    <value>1</value>
@@ -1113,8 +1122,8 @@
  <data name="btnTrimQuickSub.TabIndex" type="System.Int32, mscorlib">
    <value>2</value>
  </data>
  <data name="txtRight.TabIndex" type="System.Int32, mscorlib">
    <value>0</value>
  <data name="txtTrimDown.Text" xml:space="preserve">
    <value>0.0</value>
  </data>
  <data name="tableLayoutPanel8.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="txtTrimQuick" Row="0" RowSpan="2" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="btnTrimQuickSub" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="btnTrimQuickAdd" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,66.66666,Percent,33.33334" /&gt;&lt;Rows Styles="Percent,50,Percent,50,Absolute,16" /&gt;&lt;/TableLayoutSettings&gt;</value>
@@ -1128,8 +1137,8 @@
  <data name="&gt;&gt;cmbProcessList.ZOrder" xml:space="preserve">
    <value>6</value>
  </data>
  <data name="tableLayoutPanel8.Size" type="System.Drawing.Size, System.Drawing">
    <value>109, 59</value>
  <data name="txtDown.Location" type="System.Drawing.Point, System.Drawing">
    <value>2, 2</value>
  </data>
  <data name="gBoxShow.Text" xml:space="preserve">
    <value>磨边量（毫米）</value>
@@ -1199,9 +1208,6 @@
  </data>
  <data name="txtLeft.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Fill</value>
  </data>
  <data name="&gt;&gt;btnRightAdd.Type" xml:space="preserve">
    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
  <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
    <value>CenterParent</value>
@@ -1278,8 +1284,8 @@
  <data name="btnTrimUpAdd.Size" type="System.Drawing.Size, System.Drawing">
    <value>45, 24</value>
  </data>
  <data name="&gt;&gt;label2.Type" xml:space="preserve">
    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  <data name="txtTrimUp.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Fill</value>
  </data>
  <data name="panStockTrim.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Fill</value>
@@ -1292,9 +1298,6 @@
  </data>
  <data name="gBoxShow.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 13pt</value>
  </data>
  <data name="panSquare.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Fill</value>
  </data>
  <data name="btnRightAdd.TabIndex" type="System.Int32, mscorlib">
    <value>1</value>
@@ -1319,6 +1322,9 @@
  </data>
  <data name="txtTrimDown.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
    <value>2, 2, 0, 2</value>
  </data>
  <data name="btnRightMinus.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Fill</value>
  </data>
  <data name="&gt;&gt;tableLayoutPanel7.ZOrder" xml:space="preserve">
    <value>4</value>
@@ -1377,8 +1383,8 @@
  <data name="tableLayoutPanel5.TabIndex" type="System.Int32, mscorlib">
    <value>2</value>
  </data>
  <data name="tableLayoutPanel6.ColumnCount" type="System.Int32, mscorlib">
    <value>2</value>
  <data name="&gt;&gt;txtUp.Name" xml:space="preserve">
    <value>txtUp</value>
  </data>
  <data name="btnDownAdd.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
    <value>0, 0, 0, 0</value>
@@ -1388,6 +1394,9 @@
  </data>
  <data name="&gt;&gt;btnRightAdd.Parent" xml:space="preserve">
    <value>tlpRight</value>
  </data>
  <data name="txtTrimQuick.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 15.75pt, style=Bold</value>
  </data>
  <data name="&gt;&gt;tableLayoutPanel6.Parent" xml:space="preserve">
    <value>tableLayoutPanel3</value>
@@ -1415,12 +1424,6 @@
  </data>
  <data name="btnTrimDownAdd.Size" type="System.Drawing.Size, System.Drawing">
    <value>45, 24</value>
  </data>
  <data name="tableLayoutPanel6.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
    <value>2, 2, 2, 2</value>
  </data>
  <data name="txtTrimQuick.Multiline" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
  <data name="&gt;&gt;tableLayoutPanel4.Name" xml:space="preserve">
    <value>tableLayoutPanel4</value>
@@ -1484,6 +1487,9 @@
  </data>
  <data name="btnTrimDownSub.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
    <value>0, 0, 0, 0</value>
  </data>
  <data name="&gt;&gt;txtMinEdgeLength.Type" xml:space="preserve">
    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
  <data name="btnTrimQuickAdd.Size" type="System.Drawing.Size, System.Drawing">
    <value>37, 29</value>
@@ -1626,8 +1632,8 @@
  <data name="&gt;&gt;tlpDown.Parent" xml:space="preserve">
    <value>tlpEdging</value>
  </data>
  <data name="lblBtnTrimSave.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 12pt, style=Bold</value>
  <data name="txtQuickEdge.Size" type="System.Drawing.Size, System.Drawing">
    <value>71, 55</value>
  </data>
  <data name="tlpEdging.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 12pt</value>
@@ -1686,8 +1692,8 @@
  <data name="cboxAuto.AutoSize" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
  <data name="&gt;&gt;tableLayoutPanel3.Parent" xml:space="preserve">
    <value>groupBox1</value>
  <data name="&gt;&gt;btnRightAdd.Type" xml:space="preserve">
    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
  <data name="btnRightAdd.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 9pt</value>
@@ -1767,8 +1773,8 @@
  <data name="btnAddAll.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Fill</value>
  </data>
  <data name="&gt;&gt;label2.Name" xml:space="preserve">
    <value>label2</value>
  <data name="tlpBody.ColumnCount" type="System.Int32, mscorlib">
    <value>4</value>
  </data>
  <data name="lblBtnTrimSave.Location" type="System.Drawing.Point, System.Drawing">
    <value>432, 260</value>
@@ -2918,9 +2924,6 @@
  <data name="&gt;&gt;txtMinEdgeLength.Name" xml:space="preserve">
    <value>txtMinEdgeLength</value>
  </data>
  <data name="&gt;&gt;txtRight.Name" xml:space="preserve">
    <value>txtRight</value>
  </data>
  <data name="&gt;&gt;tcBody.Type" xml:space="preserve">
    <value>System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
@@ -2963,9 +2966,6 @@
  <data name="&gt;&gt;tableLayoutPanel3.Name" xml:space="preserve">
    <value>tableLayoutPanel3</value>
  </data>
  <data name="tcBody.Location" type="System.Drawing.Point, System.Drawing">
    <value>0, 0</value>
  </data>
  <data name="&gt;&gt;tableLayoutPanel4.Parent" xml:space="preserve">
    <value>tableLayoutPanel3</value>
  </data>
@@ -2981,9 +2981,6 @@
  <data name="&gt;&gt;tlpRight.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="txtQuickEdge.Size" type="System.Drawing.Size, System.Drawing">
    <value>71, 55</value>
  </data>
  <data name="btnTrimLeftSub.TabIndex" type="System.Int32, mscorlib">
    <value>2</value>
  </data>
@@ -2993,8 +2990,8 @@
  <data name="btnUPMinus.Text" xml:space="preserve">
    <value>-</value>
  </data>
  <data name="txtTrimLeft.Text" xml:space="preserve">
    <value>0.0</value>
  <data name="txtTrimUp.Location" type="System.Drawing.Point, System.Drawing">
    <value>2, 2</value>
  </data>
  <data name="tableLayoutPanel1.TabIndex" type="System.Int32, mscorlib">
    <value>3</value>
@@ -3046,6 +3043,9 @@
  </data>
  <data name="btnUpAdd.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 9pt</value>
  </data>
  <data name="txtMinEdgeLength.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 15.75pt</value>
  </data>
  <data name="tableLayoutPanel3.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Fill</value>
@@ -3100,6 +3100,9 @@
  </data>
  <data name="txtMinEdgeLength.Size" type="System.Drawing.Size, System.Drawing">
    <value>108, 51</value>
  </data>
  <data name="&gt;&gt;label2.Type" xml:space="preserve">
    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
  <data name="btnTrimRightAdd.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 9pt</value>
@@ -3173,8 +3176,8 @@
  <data name="&gt;&gt;btnTrimDownAdd.ZOrder" xml:space="preserve">
    <value>2</value>
  </data>
  <data name="&gt;&gt;txtUp.Parent" xml:space="preserve">
    <value>tlpUP</value>
  <data name="&gt;&gt;btnTrimLeftAdd.Parent" xml:space="preserve">
    <value>tableLayoutPanel6</value>
  </data>
  <data name="btnUPMinus.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
    <value>0, 0, 0, 0</value>
@@ -3185,14 +3188,11 @@
  <data name="btnUPMinus.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 9pt</value>
  </data>
  <data name="&gt;&gt;txtUp.Name" xml:space="preserve">
    <value>txtUp</value>
  <data name="tcBody.Location" type="System.Drawing.Point, System.Drawing">
    <value>0, 0</value>
  </data>
  <data name="tlpLeft.Location" type="System.Drawing.Point, System.Drawing">
    <value>2, 96</value>
  </data>
  <data name="txtTrimUp.Location" type="System.Drawing.Point, System.Drawing">
    <value>2, 2</value>
  </data>
  <data name="&gt;&gt;txtTrimDown.Parent" xml:space="preserve">
    <value>tableLayoutPanel7</value>
@@ -3209,8 +3209,8 @@
  <data name="lblBtnUseEdge.Location" type="System.Drawing.Point, System.Drawing">
    <value>432, 260</value>
  </data>
  <data name="cBoxTrimAutoFill.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Fill</value>
  <data name="btnAddAll.Text" xml:space="preserve">
    <value>+</value>
  </data>
  <data name="cboxAuto.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Fill</value>
@@ -3218,8 +3218,8 @@
  <data name="tlpEdging.Size" type="System.Drawing.Size, System.Drawing">
    <value>391, 296</value>
  </data>
  <data name="tlpBody.ColumnCount" type="System.Int32, mscorlib">
    <value>4</value>
  <data name="txtTrimQuick.Multiline" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
  <data name="lblBtnUseEdge.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
    <value>MiddleCenter</value>
@@ -3242,8 +3242,8 @@
  <data name="tlpLeft.ColumnCount" type="System.Int32, mscorlib">
    <value>2</value>
  </data>
  <data name="btnTrimQuickSub.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
    <value>0, 0, 0, 0</value>
  <data name="&gt;&gt;txtTrimUp.ZOrder" xml:space="preserve">
    <value>0</value>
  </data>
  <data name="lblBtnTrimSave.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
    <value>5, 0, 5, 50</value>
@@ -3254,7 +3254,7 @@
  <data name="txtUp.Multiline" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
  <data name="txtQuickEdge.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
  <data name="panSquare.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Fill</value>
  </data>
  <data name="tableLayoutPanel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
@@ -3263,8 +3263,8 @@
  <data name="lblMag.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
    <value>2, 0, 2, 0</value>
  </data>
  <data name="tableLayoutPanel2.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 12pt</value>
  <data name="txtTrimRight.Size" type="System.Drawing.Size, System.Drawing">
    <value>77, 52</value>
  </data>
  <data name="txtRight.Location" type="System.Drawing.Point, System.Drawing">
    <value>2, 46</value>
@@ -3275,8 +3275,8 @@
  <data name="gBoxShow.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Fill</value>
  </data>
  <data name="&gt;&gt;lblBtnTrimSave.Parent" xml:space="preserve">
    <value>tableLayoutPanel2</value>
  <data name="txtTrimLeft.Text" xml:space="preserve">
    <value>0.0</value>
  </data>
  <data name="panStockTrim.Location" type="System.Drawing.Point, System.Drawing">
    <value>122, 51</value>
@@ -3389,8 +3389,8 @@
  <data name="txtDown.Multiline" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
  <data name="&gt;&gt;txtMinEdgeLength.Type" xml:space="preserve">
    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  <data name="lblMag.Text" xml:space="preserve">
    <value>鼠标点击蓝色图形区域可快速设置磨边量</value>
  </data>
  <data name="btnTrimQuickAdd.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 12pt</value>
@@ -3404,8 +3404,8 @@
  <data name="&gt;&gt;btnTrimLeftSub.Name" xml:space="preserve">
    <value>btnTrimLeftSub</value>
  </data>
  <data name="btnTrimRightAdd.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Fill</value>
  <data name="txtRight.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
    <value>2, 2, 0, 2</value>
  </data>
  <data name="txtQuickEdge.Location" type="System.Drawing.Point, System.Drawing">
    <value>2, 2</value>

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

@@ -59,15 +59,5 @@
                resourceCulture = value;
            }
        }
        
        /// <summary>
        ///   æŸ¥æ‰¾ System.Drawing.Bitmap ç±»åž‹çš„本地化资源。
        /// </summary>
        internal static System.Drawing.Bitmap adsf1 {
            get {
                object obj = ResourceManager.GetObject("adsf1", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
    }
}

 optimize_patch/¶©µ¥ÅÅÑù¿Í»§¶Ë/Properties/Resources.resx

@@ -118,7 +118,4 @@
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
  <data name="adsf1" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\adsf1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
</root>

 optimize_patch/¶©µ¥ÅÅÑù¿Í»§¶Ë/Resources/adsf1.png

Binary files differ

 optimize_patch/¶©µ¥ÅÅÑù¿Í»§¶Ë/Resources/back1.png

Binary files differ

 optimize_patch/¶©µ¥ÅÅÑù¿Í»§¶Ë/Resources/fdsgds1.png

Binary files differ

 optimize_patch/¶©µ¥ÅÅÑù¿Í»§¶Ë/Resources/g.png

Binary files differ

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

@@ -247,6 +247,7 @@
        public static bool withoutbtfile = true;

        public static bool IsWangMei;
        public static string CustomerName;

        public static bool DeleteBtlYL;

@@ -309,6 +310,9 @@
        /// </summary>
        public static bool TemperedMode = false;




        public static void GlobelInit()
        {
            FileConfig f = new FileConfig(@".\config\beibo.cfg");

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

File was deleted

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

@@ -4,6 +4,7 @@
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Net.NetworkInformation;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -27,6 +28,9 @@

        //;MES Service
        public static string MESService { get; set; }

        //;ERP Server Port
        public static int ERPServicePort { get; set; }

        static Dictionary<string, string> dics = new Dictionary<string, string>();

@@ -72,6 +76,15 @@
                ERPService = dics["ERPService"];
                MESService = dics["MESService"];

                if (dics.ContainsKey("ERPServicePort"))
                {
                    ERPServicePort = Convert.ToInt32(dics["ERPServicePort"]);
                }
                else {
                    ERPServicePort = 3309;
                }


            }
            catch (Exception e)
            {
@@ -100,6 +113,7 @@

                    sw.WriteLine(";ERPService=" + ERPService);
                    sw.WriteLine(";MESService=" + MESService);
                    sw.WriteLine(";ERPServicePort=" + ERPServicePort);
                }
                return true;
            }
@@ -115,5 +129,37 @@

            return false;
        }

        public static bool checkIPPing(string ipAddress)
        {
            //string ipAddress = "192.168.1.1"; // æ›¿æ¢ä¸ºä½ è¦æ£€æµ‹çš„IP地址
            int timeout = 1000; // è¶…时时间（毫秒）

            try
            {
                using (Ping pingSender = new Ping())
                {
                    PingReply reply = pingSender.Send(ipAddress, timeout);

                    if (reply.Status == IPStatus.Success)
                    {
                        Console.WriteLine($"IP地址 {ipAddress} æ˜¯å¯è¾¾çš„。");
                        return true;
                    }
                    else
                    {
                        Console.WriteLine($"IP地址 {ipAddress} ä¸å¯è¾¾ã€‚状态: {reply.Status}");

                        return false;
                    }
                }
            }
            catch (Exception ex)
            {
                Console.WriteLine($"发生异常: {ex.Message}");
                return false;
            }
        }

    }
}

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

@@ -145,6 +145,7 @@
                FileConfig f = new FileConfig(@".\config\system.cfg");
                error = "Customer";
                globel.IsWangMei = f.GetValue<string>("Customer") == "望美";
                globel.CustomerName = f.GetValue<string>("Customer");
                error = "UseBT";
                globel.withoutbtfile = f.GetValue<bool>("UseBT");
                error = "AlterBotteroFile";

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

@@ -14,38 +14,6 @@
{
    public static class AdminDB
    {
        public static bool ChekcLogin(string userName, string userPwd)
        {
            string str = string.Format(@"use gglass; Select * from adminbiao where loginname = '{0}' and loginpwd= '{1}';", userName, userPwd);
            DataTable dt = MySqlSqHelper.ExecuteDataTable(str, "mm");
            if (dt.Rows.Count == 1)
            {
                return true;
            }
            return false;
        }

        public static string ChekcLoginName(string userName, string userPwd)
        {
            if(userName == "admin")
            {

                //return loginCheck(userName, userPwd);

            }

            string str = string.Format(@"Use gglass;Select * from adminbiao where loginname = '{0}' and loginpwd= '{1}';", userName, userPwd);
            DataTable dt = MySqlSqHelper.ExecuteDataTable(str, "mm");
            if (dt!=null && dt.Rows.Count == 1)
            {
                return dt.Rows[0]["xingming"].ToString() ;
            }
            return "";
        }




        public static bool AdminLogin(string uName,string uPwd) {
            string str = string.Format(@"Select * from optimize_admin where login_name ='{0}' and password ='{1}'", uName, uPwd);
            DataTable dataTable =  MySqlDbHelper.SelectForTable(str);
@@ -86,22 +54,6 @@
            return UpdateAdminInfo();
        }


        public static bool Login(string uName, string uPwd) {
            string sql = string.Format(@"Select * from ");



            return false;
        }

        public static bool Logout(string uId) {

            StringBuilder sql = new StringBuilder();


            return false;
        }

        /// <summary>
        /// æ›´æ–°ç”¨æˆ·ä¿¡æ¯

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

File was deleted

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

File was deleted

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

@@ -208,33 +208,5 @@
            return MySqlDbHelper.ExecutSqlTranOne(sbsql.ToString()) == 1;
        }




        public static bool SaveOldHeatGlassDetail(List<HeatGlassDetails> gd, string projectNO)
        {

            StringBuilder sbsql = new StringBuilder();
            foreach (HeatGlassDetails hgd in gd)
            {
                sbsql.Append("Insert gmms_tempere_layout ");
                sbsql.AppendFormat("(layout_number,glass_number,x,y,");
                sbsql.AppendFormat(" width,height,rotate,gongchenghao)");
                sbsql.Append("values(");
                sbsql.AppendFormat("{0},{1},{2},{3},", hgd.tempering_layout_id, hgd.tempering_feed_sequence, hgd.x_coordinate, hgd.y_coordinate);
                sbsql.AppendFormat("{0},{1},{2},'{3}');", hgd.width, hgd.height,0, projectNO);
            }

            return MySqlSqHelper.ExecuteSql(sbsql.ToString(), "pp");
        }



        public static DataTable QueryHeatGlassDetails(string projectNO) {


            return null;
        }

    }
}

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

@@ -141,17 +141,5 @@
            }
            return dt;
        }


        /// <summary>
        /// æ›´æ–°è§’色信息
        /// </summary>
        /// <param name="roleName"></param>
        /// <returns></returns>
        public static bool UpdateRole(string roleName) {
            string sql = string.Format(@"update optimize_role set updated_by = {0} where role_name = '{1}';",LoginAdminInfo.id,roleName);
            return MySqlSqHelper.ExecuteSql(sql);
        }

    }
}

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

File was deleted

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

@@ -17,12 +17,7 @@

        public static string ConnetionString(string dbName)
        {

            //return "server=10.153.19.150; port=3306; user=root; password=beibo.123/; database=" + dbName + ";SslMode=none";
            //return "server=127.0.0.1; port=3306; user=root; password=beibo.123/; database=" + dbName + ";SslMode=none";

            //dbName = "cz_" + dbName;
            return "server=" + Service.MESService + "; port=3306; user=root; password=beibo.123/; database=" + dbName + ";SslMode=none;persistsecurityinfo=true";
            return "server=" + Service.MESService + "; port="+ Service.ERPServicePort + "; user=root; password=beibo.123/; database=" + dbName + ";SslMode=none;persistsecurityinfo=true";
        }



 optimize_patch/¶©µ¥ÅÅÑù¿Í»§¶Ë/³õʼÅäÖÃ.Designer.cs

@@ -30,43 +30,42 @@
        private void InitializeComponent()
        {
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(初始配置));
            this.tlpBody = new System.Windows.Forms.TableLayoutPanel();
            this.lblFWQIP = new System.Windows.Forms.Label();
            this.lblMESIP = new System.Windows.Forms.Label();
            this.lblCancel = new System.Windows.Forms.Label();
            this.lblSure = new System.Windows.Forms.Label();
            this.txtServerIP = new System.Windows.Forms.TextBox();
            this.txtMESIP = new System.Windows.Forms.TextBox();
            this.lblSure = new System.Windows.Forms.Label();
            this.lblCancel = new System.Windows.Forms.Label();
            this.txtServerPort = new System.Windows.Forms.TextBox();
            this.label1 = new System.Windows.Forms.Label();
            this.tlpBody.SuspendLayout();
            this.SuspendLayout();
            // 
            // tlpBody
            // 
            this.tlpBody.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(213)))), ((int)(((byte)(234)))), ((int)(((byte)(255)))));
            resources.ApplyResources(this.tlpBody, "tlpBody");
            this.tlpBody.Controls.Add(this.lblFWQIP, 1, 1);
            this.tlpBody.Controls.Add(this.txtServerIP, 2, 1);
            this.tlpBody.Controls.Add(this.lblSure, 2, 5);
            this.tlpBody.Controls.Add(this.lblCancel, 1, 5);
            this.tlpBody.Controls.Add(this.lblMESIP, 1, 3);
            this.tlpBody.Controls.Add(this.txtMESIP, 2, 3);
            this.tlpBody.Controls.Add(this.txtServerPort, 2, 2);
            this.tlpBody.Controls.Add(this.label1, 1, 2);
            this.tlpBody.Name = "tlpBody";
            // 
            // lblFWQIP
            // 
            resources.ApplyResources(this.lblFWQIP, "lblFWQIP");
            this.lblFWQIP.Name = "lblFWQIP";
            this.lblFWQIP.DoubleClick += new System.EventHandler(this.lblFWQIP_DoubleClick);
            // 
            // lblMESIP
            // 
            resources.ApplyResources(this.lblMESIP, "lblMESIP");
            this.lblMESIP.Name = "lblMESIP";
            // 
            // lblCancel
            // 
            this.lblCancel.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(92)))), ((int)(((byte)(173)))), ((int)(((byte)(254)))));
            resources.ApplyResources(this.lblCancel, "lblCancel");
            this.lblCancel.ForeColor = System.Drawing.SystemColors.ControlLightLight;
            this.lblCancel.Name = "lblCancel";
            this.lblCancel.Click += new System.EventHandler(this.lblCancel_Click);
            this.lblCancel.MouseEnter += new System.EventHandler(this.lblBtn_MouseEnter);
            this.lblCancel.MouseLeave += new System.EventHandler(this.lblBtn_MouseLeave);
            // 
            // lblSure
            // 
            this.lblSure.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(92)))), ((int)(((byte)(173)))), ((int)(((byte)(254)))));
            resources.ApplyResources(this.lblSure, "lblSure");
            this.lblSure.ForeColor = System.Drawing.SystemColors.HighlightText;
            this.lblSure.Name = "lblSure";
            this.lblSure.Click += new System.EventHandler(this.lblSure_Click);
            this.lblSure.MouseEnter += new System.EventHandler(this.lblBtn_MouseEnter);
            this.lblSure.MouseLeave += new System.EventHandler(this.lblBtn_MouseLeave);
            // 
            // txtServerIP
            // 
@@ -78,30 +77,60 @@
            resources.ApplyResources(this.txtMESIP, "txtMESIP");
            this.txtMESIP.Name = "txtMESIP";
            // 
            // lblSure
            // 
            this.lblSure.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(92)))), ((int)(((byte)(173)))), ((int)(((byte)(254)))));
            resources.ApplyResources(this.lblSure, "lblSure");
            this.lblSure.ForeColor = System.Drawing.SystemColors.HighlightText;
            this.lblSure.Name = "lblSure";
            this.lblSure.Click += new System.EventHandler(this.lblSure_Click);
            this.lblSure.MouseEnter += new System.EventHandler(this.lblBtn_MouseEnter);
            this.lblSure.MouseLeave += new System.EventHandler(this.lblBtn_MouseLeave);
            // 
            // lblCancel
            // 
            this.lblCancel.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(92)))), ((int)(((byte)(173)))), ((int)(((byte)(254)))));
            resources.ApplyResources(this.lblCancel, "lblCancel");
            this.lblCancel.ForeColor = System.Drawing.SystemColors.ControlLightLight;
            this.lblCancel.Name = "lblCancel";
            this.lblCancel.Click += new System.EventHandler(this.lblCancel_Click);
            this.lblCancel.MouseEnter += new System.EventHandler(this.lblBtn_MouseEnter);
            this.lblCancel.MouseLeave += new System.EventHandler(this.lblBtn_MouseLeave);
            // 
            // txtServerPort
            // 
            resources.ApplyResources(this.txtServerPort, "txtServerPort");
            this.txtServerPort.Name = "txtServerPort";
            // 
            // label1
            // 
            resources.ApplyResources(this.label1, "label1");
            this.label1.Name = "label1";
            // 
            // åˆå§‹é…ç½®
            // 
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
            this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(213)))), ((int)(((byte)(234)))), ((int)(((byte)(255)))));
            resources.ApplyResources(this, "$this");
            this.Controls.Add(this.lblFWQIP);
            this.Controls.Add(this.lblMESIP);
            this.Controls.Add(this.txtMESIP);
            this.Controls.Add(this.lblCancel);
            this.Controls.Add(this.txtServerIP);
            this.Controls.Add(this.lblSure);
            this.Controls.Add(this.tlpBody);
            this.Name = "初始配置";
            this.Load += new System.EventHandler(this.初始配置_Load);
            this.tlpBody.ResumeLayout(false);
            this.tlpBody.PerformLayout();
            this.ResumeLayout(false);
            this.PerformLayout();

        }

        #endregion

        private System.Windows.Forms.TableLayoutPanel tlpBody;
        private System.Windows.Forms.Label lblFWQIP;
        private System.Windows.Forms.Label lblMESIP;
        private System.Windows.Forms.TextBox txtServerIP;
        private System.Windows.Forms.TextBox txtMESIP;
        private System.Windows.Forms.Label lblSure;
        private System.Windows.Forms.Label lblCancel;
        private System.Windows.Forms.TextBox txtServerPort;
        private System.Windows.Forms.Label label1;
    }
}

 optimize_patch/¶©µ¥ÅÅÑù¿Í»§¶Ë/³õʼÅäÖÃ.cs

@@ -14,6 +14,7 @@


        string serverIpCheck = "服务器IP不可为空";//
        string strIPCheck = "服务器IP无法访问";
        public åˆå§‹é…ç½®()
        {
            switch (Setting.language)
@@ -53,9 +54,25 @@
                return;
            }

            if (!Service.checkIPPing(erpIp))
            {

                txtServerIP.Focus();
                globel.ShowFromWarningMessage(strIPCheck);
                return;
            }

            if (!int.TryParse(txtServerPort.Text, out int port) || port < 1 || port > 65535)
            {
                MessageBox.Show("请输入有效的端口号 (1-65535)", "无效端口", MessageBoxButtons.OK, MessageBoxIcon.Warning);
                txtServerPort.Focus();
                return;
            }


            Service.ERPService = erpIp;
            Service.MESService = mesIp;

            Service.ERPServicePort = port;
            if (Service.SaveServiceConfig())
            {
                this.Hide();
@@ -66,6 +83,7 @@
        {
            txtServerIP.Text = Service.ERPService;
            txtMESIP.Text = Service.MESService;
            txtServerPort.Text = Service.ERPServicePort.ToString();
        }


@@ -91,5 +109,11 @@
            lblCancel.Paint += new PaintEventHandler(labelUtil.label_Paint);
            lblSure.Paint += new PaintEventHandler(labelUtil.label_Paint);
        }

        private void lblFWQIP_DoubleClick(object sender, EventArgs e)
        {
            txtServerPort.Visible = !txtServerPort.Visible;
            label1.Visible = !label1.Visible;
        }
    }
}

 optimize_patch/¶©µ¥ÅÅÑù¿Í»§¶Ë/³õʼÅäÖÃ.resx

@@ -118,22 +118,31 @@
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
  <data name="tlpBody.ColumnCount" type="System.Int32, mscorlib">
    <value>4</value>
  </data>
  <data name="lblFWQIP.AutoSize" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
  <data name="lblFWQIP.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Fill</value>
  </data>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <data name="lblFWQIP.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 12pt</value>
  </data>
  <data name="lblFWQIP.Location" type="System.Drawing.Point, System.Drawing">
    <value>127, 68</value>
  <data name="lblFWQIP.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
    <value>NoControl</value>
  </data>
  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
  <data name="lblFWQIP.Location" type="System.Drawing.Point, System.Drawing">
    <value>43, 45</value>
  </data>
  <data name="lblFWQIP.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
    <value>0, 0, 0, 0</value>
  </data>
  <data name="lblFWQIP.Size" type="System.Drawing.Size, System.Drawing">
    <value>78, 21</value>
    <value>157, 44</value>
  </data>
  <data name="lblFWQIP.TabIndex" type="System.Int32, mscorlib">
    <value>0</value>
@@ -142,7 +151,7 @@
    <value>服务器 IP</value>
  </data>
  <data name="lblFWQIP.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
    <value>MiddleLeft</value>
    <value>MiddleCenter</value>
  </data>
  <data name="&gt;&gt;lblFWQIP.Name" xml:space="preserve">
    <value>lblFWQIP</value>
@@ -151,82 +160,40 @@
    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
  <data name="&gt;&gt;lblFWQIP.Parent" xml:space="preserve">
    <value>$this</value>
    <value>tlpBody</value>
  </data>
  <data name="&gt;&gt;lblFWQIP.ZOrder" xml:space="preserve">
    <value>0</value>
  </data>
  <data name="lblMESIP.AutoSize" type="System.Boolean, mscorlib">
    <value>True</value>
  <data name="txtServerIP.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Fill</value>
  </data>
  <data name="lblMESIP.Font" type="System.Drawing.Font, System.Drawing">
  <data name="txtServerIP.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 12pt</value>
  </data>
  <data name="lblMESIP.Location" type="System.Drawing.Point, System.Drawing">
    <value>93, 154</value>
  <data name="txtServerIP.Location" type="System.Drawing.Point, System.Drawing">
    <value>203, 48</value>
  </data>
  <data name="lblMESIP.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
    <value>0, 0, 0, 0</value>
  <data name="txtServerIP.Size" type="System.Drawing.Size, System.Drawing">
    <value>220, 29</value>
  </data>
  <data name="lblMESIP.Size" type="System.Drawing.Size, System.Drawing">
    <value>117, 21</value>
  <data name="txtServerIP.TabIndex" type="System.Int32, mscorlib">
    <value>2</value>
  </data>
  <data name="lblMESIP.TabIndex" type="System.Int32, mscorlib">
  <data name="&gt;&gt;txtServerIP.Name" xml:space="preserve">
    <value>txtServerIP</value>
  </data>
  <data name="&gt;&gt;txtServerIP.Type" xml:space="preserve">
    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
  <data name="&gt;&gt;txtServerIP.Parent" xml:space="preserve">
    <value>tlpBody</value>
  </data>
  <data name="&gt;&gt;txtServerIP.ZOrder" xml:space="preserve">
    <value>1</value>
  </data>
  <data name="lblMESIP.Text" xml:space="preserve">
    <value>MES æœåŠ¡å™¨ IP</value>
  </data>
  <data name="lblMESIP.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
    <value>MiddleLeft</value>
  </data>
  <data name="&gt;&gt;lblMESIP.Name" xml:space="preserve">
    <value>lblMESIP</value>
  </data>
  <data name="&gt;&gt;lblMESIP.Type" xml:space="preserve">
    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
  <data name="&gt;&gt;lblMESIP.Parent" xml:space="preserve">
    <value>$this</value>
  </data>
  <data name="&gt;&gt;lblMESIP.ZOrder" xml:space="preserve">
    <value>1</value>
  </data>
  <data name="lblCancel.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 12pt, style=Bold</value>
  </data>
  <data name="lblCancel.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
    <value>NoControl</value>
  </data>
  <data name="lblCancel.Location" type="System.Drawing.Point, System.Drawing">
    <value>131, 248</value>
  </data>
  <data name="lblCancel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
    <value>0, 0, 0, 0</value>
  </data>
  <data name="lblCancel.Size" type="System.Drawing.Size, System.Drawing">
    <value>113, 42</value>
  </data>
  <data name="lblCancel.TabIndex" type="System.Int32, mscorlib">
    <value>9</value>
  </data>
  <data name="lblCancel.Text" xml:space="preserve">
    <value>取消</value>
  </data>
  <data name="lblCancel.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
    <value>MiddleCenter</value>
  </data>
  <data name="&gt;&gt;lblCancel.Name" xml:space="preserve">
    <value>lblCancel</value>
  </data>
  <data name="&gt;&gt;lblCancel.Type" xml:space="preserve">
    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
  <data name="&gt;&gt;lblCancel.Parent" xml:space="preserve">
    <value>$this</value>
  </data>
  <data name="&gt;&gt;lblCancel.ZOrder" xml:space="preserve">
    <value>3</value>
  <data name="lblSure.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Right</value>
  </data>
  <data name="lblSure.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 12pt, style=Bold</value>
@@ -235,13 +202,13 @@
    <value>NoControl</value>
  </data>
  <data name="lblSure.Location" type="System.Drawing.Point, System.Drawing">
    <value>279, 248</value>
    <value>343, 221</value>
  </data>
  <data name="lblSure.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
    <value>0, 0, 0, 0</value>
  </data>
  <data name="lblSure.Size" type="System.Drawing.Size, System.Drawing">
    <value>113, 42</value>
    <value>83, 44</value>
  </data>
  <data name="lblSure.TabIndex" type="System.Int32, mscorlib">
    <value>8</value>
@@ -259,49 +226,103 @@
    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
  <data name="&gt;&gt;lblSure.Parent" xml:space="preserve">
    <value>$this</value>
    <value>tlpBody</value>
  </data>
  <data name="&gt;&gt;lblSure.ZOrder" xml:space="preserve">
    <value>5</value>
  </data>
  <data name="txtServerIP.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 12pt</value>
  </data>
  <data name="txtServerIP.Location" type="System.Drawing.Point, System.Drawing">
    <value>253, 65</value>
  </data>
  <data name="txtServerIP.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
    <value>48, 24, 48, 24</value>
  </data>
  <data name="txtServerIP.Size" type="System.Drawing.Size, System.Drawing">
    <value>139, 29</value>
  </data>
  <data name="txtServerIP.TabIndex" type="System.Int32, mscorlib">
    <value>2</value>
  </data>
  <data name="&gt;&gt;txtServerIP.Name" xml:space="preserve">
    <value>txtServerIP</value>
  <data name="lblCancel.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Right</value>
  </data>
  <data name="&gt;&gt;txtServerIP.Type" xml:space="preserve">
    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  <data name="lblCancel.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 12pt, style=Bold</value>
  </data>
  <data name="&gt;&gt;txtServerIP.Parent" xml:space="preserve">
    <value>$this</value>
  <data name="lblCancel.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
    <value>NoControl</value>
  </data>
  <data name="&gt;&gt;txtServerIP.ZOrder" xml:space="preserve">
  <data name="lblCancel.Location" type="System.Drawing.Point, System.Drawing">
    <value>117, 221</value>
  </data>
  <data name="lblCancel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
    <value>0, 0, 0, 0</value>
  </data>
  <data name="lblCancel.Size" type="System.Drawing.Size, System.Drawing">
    <value>83, 44</value>
  </data>
  <data name="lblCancel.TabIndex" type="System.Int32, mscorlib">
    <value>9</value>
  </data>
  <data name="lblCancel.Text" xml:space="preserve">
    <value>取消</value>
  </data>
  <data name="lblCancel.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
    <value>MiddleCenter</value>
  </data>
  <data name="&gt;&gt;lblCancel.Name" xml:space="preserve">
    <value>lblCancel</value>
  </data>
  <data name="&gt;&gt;lblCancel.Type" xml:space="preserve">
    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
  <data name="&gt;&gt;lblCancel.Parent" xml:space="preserve">
    <value>tlpBody</value>
  </data>
  <data name="&gt;&gt;lblCancel.ZOrder" xml:space="preserve">
    <value>3</value>
  </data>
  <data name="lblMESIP.AutoSize" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
  <data name="lblMESIP.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Fill</value>
  </data>
  <data name="lblMESIP.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 12pt</value>
  </data>
  <data name="lblMESIP.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
    <value>NoControl</value>
  </data>
  <data name="lblMESIP.Location" type="System.Drawing.Point, System.Drawing">
    <value>43, 133</value>
  </data>
  <data name="lblMESIP.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
    <value>0, 0, 0, 0</value>
  </data>
  <data name="lblMESIP.Size" type="System.Drawing.Size, System.Drawing">
    <value>157, 44</value>
  </data>
  <data name="lblMESIP.TabIndex" type="System.Int32, mscorlib">
    <value>1</value>
  </data>
  <data name="lblMESIP.Text" xml:space="preserve">
    <value>MQ æœåŠ¡å™¨ IP</value>
  </data>
  <data name="lblMESIP.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
    <value>MiddleCenter</value>
  </data>
  <data name="&gt;&gt;lblMESIP.Name" xml:space="preserve">
    <value>lblMESIP</value>
  </data>
  <data name="&gt;&gt;lblMESIP.Type" xml:space="preserve">
    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
  <data name="&gt;&gt;lblMESIP.Parent" xml:space="preserve">
    <value>tlpBody</value>
  </data>
  <data name="&gt;&gt;lblMESIP.ZOrder" xml:space="preserve">
    <value>4</value>
  </data>
  <data name="txtMESIP.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Fill</value>
  </data>
  <data name="txtMESIP.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 12pt</value>
  </data>
  <data name="txtMESIP.Location" type="System.Drawing.Point, System.Drawing">
    <value>253, 151</value>
  </data>
  <data name="txtMESIP.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
    <value>48, 24, 48, 24</value>
    <value>203, 136</value>
  </data>
  <data name="txtMESIP.Size" type="System.Drawing.Size, System.Drawing">
    <value>139, 29</value>
    <value>220, 29</value>
  </data>
  <data name="txtMESIP.TabIndex" type="System.Int32, mscorlib">
    <value>3</value>
@@ -313,10 +334,121 @@
    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
  <data name="&gt;&gt;txtMESIP.Parent" xml:space="preserve">
    <value>$this</value>
    <value>tlpBody</value>
  </data>
  <data name="&gt;&gt;txtMESIP.ZOrder" xml:space="preserve">
    <value>2</value>
    <value>5</value>
  </data>
  <data name="txtServerPort.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Fill</value>
  </data>
  <data name="txtServerPort.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 12pt</value>
  </data>
  <data name="txtServerPort.Location" type="System.Drawing.Point, System.Drawing">
    <value>203, 92</value>
  </data>
  <data name="txtServerPort.Size" type="System.Drawing.Size, System.Drawing">
    <value>220, 29</value>
  </data>
  <data name="txtServerPort.TabIndex" type="System.Int32, mscorlib">
    <value>10</value>
  </data>
  <data name="txtServerPort.Text" xml:space="preserve">
    <value>3306</value>
  </data>
  <data name="txtServerPort.Visible" type="System.Boolean, mscorlib">
    <value>False</value>
  </data>
  <data name="&gt;&gt;txtServerPort.Name" xml:space="preserve">
    <value>txtServerPort</value>
  </data>
  <data name="&gt;&gt;txtServerPort.Type" xml:space="preserve">
    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
  <data name="&gt;&gt;txtServerPort.Parent" xml:space="preserve">
    <value>tlpBody</value>
  </data>
  <data name="&gt;&gt;txtServerPort.ZOrder" xml:space="preserve">
    <value>6</value>
  </data>
  <data name="label1.AutoSize" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
  <data name="label1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Fill</value>
  </data>
  <data name="label1.Font" type="System.Drawing.Font, System.Drawing">
    <value>微软雅黑, 12pt</value>
  </data>
  <data name="label1.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
    <value>NoControl</value>
  </data>
  <data name="label1.Location" type="System.Drawing.Point, System.Drawing">
    <value>43, 89</value>
  </data>
  <data name="label1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
    <value>0, 0, 0, 0</value>
  </data>
  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
    <value>157, 44</value>
  </data>
  <data name="label1.TabIndex" type="System.Int32, mscorlib">
    <value>11</value>
  </data>
  <data name="label1.Text" xml:space="preserve">
    <value>端口号   </value>
  </data>
  <data name="label1.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
    <value>MiddleRight</value>
  </data>
  <data name="label1.Visible" type="System.Boolean, mscorlib">
    <value>False</value>
  </data>
  <data name="&gt;&gt;label1.Name" xml:space="preserve">
    <value>label1</value>
  </data>
  <data name="&gt;&gt;label1.Type" xml:space="preserve">
    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
  <data name="&gt;&gt;label1.Parent" xml:space="preserve">
    <value>tlpBody</value>
  </data>
  <data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
    <value>7</value>
  </data>
  <data name="tlpBody.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Fill</value>
  </data>
  <data name="tlpBody.Location" type="System.Drawing.Point, System.Drawing">
    <value>0, 0</value>
  </data>
  <data name="tlpBody.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
    <value>2, 2, 2, 2</value>
  </data>
  <data name="tlpBody.RowCount" type="System.Int32, mscorlib">
    <value>7</value>
  </data>
  <data name="tlpBody.Size" type="System.Drawing.Size, System.Drawing">
    <value>551, 314</value>
  </data>
  <data name="tlpBody.TabIndex" type="System.Int32, mscorlib">
    <value>171</value>
  </data>
  <data name="&gt;&gt;tlpBody.Name" xml:space="preserve">
    <value>tlpBody</value>
  </data>
  <data name="&gt;&gt;tlpBody.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;tlpBody.Parent" xml:space="preserve">
    <value>$this</value>
  </data>
  <data name="&gt;&gt;tlpBody.ZOrder" xml:space="preserve">
    <value>0</value>
  </data>
  <data name="tlpBody.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="lblFWQIP" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="txtServerIP" Row="1" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;Control Name="lblSure" Row="5" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;Control Name="lblCancel" Row="5" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="lblMESIP" Row="3" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="txtMESIP" Row="3" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;Control Name="txtServerPort" Row="2" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;Control Name="label1" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,8,Percent,28.65497,Percent,41.32553,Percent,22.41715" /&gt;&lt;Rows Styles="Percent,7.07918,Percent,6.93439,Percent,6.93439,Percent,6.93439,Percent,6.93439,Percent,6.93439,Percent,6.93439" /&gt;&lt;/TableLayoutSettings&gt;</value>
  </data>
  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>True</value>

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

@@ -475,7 +475,6 @@
    </EmbeddedResource>
    <Compile Include="EDIT\directPacking\DBclass.cs" />
    <Compile Include="EDIT\directPacking\MD5Helper.cs" />
    <Compile Include="EDIT\directPacking\MySqlSqHelper.cs" />
    <Compile Include="EDIT\directPacking\Rack.cs" />
    <Compile Include="EDIT\opt2btl.cs" />
    <Compile Include="EDIT\UserButton.cs">
@@ -515,16 +514,12 @@
      <DependentUpon>异形设置.cs</DependentUpon>
    </Compile>
    <Compile Include="globel.cs" />
    <Compile Include="ng.optima.config\MarkSet.cs" />
    <Compile Include="ng.optima.config\Service.cs" />
    <Compile Include="ng.optima.config\SystemConfig.cs" />
    <Compile Include="ng.optima.server\AlertDB.cs" />
    <Compile Include="ng.optima.server\ConfigDB.cs" />
    <Compile Include="ng.optima.server\ContentDB.cs" />
    <Compile Include="ng.optima.server\FlowCardDB.cs" />
    <Compile Include="ng.optima.server\HeatDB.cs" />
    <Compile Include="ng.optima.server\LimitDB.cs" />
    <Compile Include="ng.optima.server\MarkDB.cs" />
    <Compile Include="ng.optima.server\MaterialDB.cs" />
    <Compile Include="ng.optima.server\MesMysqlHelper.cs" />
    <Compile Include="ng.optima.server\MessageDB.cs" />
@@ -1253,11 +1248,7 @@
    <Content Include="EDIT\netdxf\obj\Debug\netDxf.csproj.FileListAbsolute.txt" />
    <Content Include="EDIT\netdxf\obj\Debug\netDxf.dll" />
    <Content Include="EDIT\netdxf\obj\Debug\netDxf.pdb" />
    <None Include="Resources\adsf1.png" />
    <None Include="Resources\fdsgds1.png" />
    <None Include="Resources\back1.png" />
    <Content Include="ICO2.ico" />
    <Content Include="Resources\g.png" />
  </ItemGroup>
  <ItemGroup>
    <Folder Include="EDIT\netdxf\obj\Debug\TempPE\" />

 optimize_patch/¶©µ¥ÅÅÑù¿Í»§¶Ë/¹ÜÀíÔ±µÇ¼.cs

@@ -19,6 +19,8 @@
        string userCheckName = "请输入您的账号";
        string userCheckPwd = "请输入您的密码";
        string loginError = "账号或密码不正确,请检查后重新输入！";

        private static readonly NLog.Logger Logger = NLog.LogManager.GetCurrentClassLogger();
        public ç®¡ç†å‘˜ç™»å½•()
        {
            switch (Setting.language)
@@ -78,6 +80,7 @@
            if (!ChenkLoginInfo()) return false;
            if (AdminDB.AdminLogin(txtUserName.Text.Trim(), txtPwd.Text.Trim()))
            {
                Logger.Info($"{txtUserName.Text}:登录成功");
                passwordLogin();
                this.Visible = false;
                ä»»åŠ¡ rw = new ä»»åŠ¡();