v1.2.13 优化计米器数据读取防止卡死

LeatherProject/LeatherApp/Config.cs

@@ -82,7 +82,8 @@ namespace LeatherApp
         public static int cm2px_x = 1;
         public static int cm2px_y = 1;
         //边缘孔洞宽(门幅计算包含，识别库去除)
-        public static int MarginHoleWidth = 120, MiddleSuperposition;
+        public static int MarginHoleWidth = 120;
+        public static int MiddleSuperposition;
         public static int expand_pixel=50;
         public static string ImagePath;
         public static bool IsSaveAllImage, IsSaveDefectSourceImage, IsSaveDefectCutImage;
@@ -139,6 +140,12 @@ namespace LeatherApp
         public static int ClearDays;
         //远程服务地址
         public static string ServerIP;
+        //计米器显示补偿
+        public static double JMOffset;
+        //降等原因
+        public static Dictionary<string, string> DownGradeReason;
+        //开启超速报警
+        public static bool OpenOverSpeed;
         //
         public static void LoadCloudConfig()
         {
@@ -159,6 +166,7 @@ namespace LeatherApp
             if (string.IsNullOrWhiteSpace(appBasePath))
                 appBasePath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
 
+            DownGradeReason = LoadDownGradeReasonInfo();
             LoadDefectItemList();
             LoadColorNameList(); 
             LoadMaterialNameList();
@@ -314,12 +322,49 @@ namespace LeatherApp
             StopLookDis = ini.ReadDouble("Fun", "StopLookDis");
             OpenClearPic = ini.ReadBool("Fun", "OpenClearPic");
             ClearDays = ini.ReadInt("Fun", "ClearDays");
+            OpenOverSpeed = ini.ReadBool("Fun", "OpenOverSpeed");
 
             DataOffset1 = ini.ReadDouble("HouDuOffset", "DataOffset1", 0);
             DataOffset2 = ini.ReadDouble("HouDuOffset", "DataOffset2", 0);
             DataOffset3 = ini.ReadDouble("HouDuOffset", "DataOffset3", 0);
 
             ServerIP = ini.ReadString("ServerVD", "ServerIP", "172.16.21.210");
+
+            JMOffset = ini.ReadDouble("Fun", "JMOffset", 0);
+        }
+
+        public static Dictionary<string, string> LoadDownGradeReasonInfo()
+        {
+            Dictionary<string, string> data = new Dictionary<string, string>();
+            if (string.IsNullOrWhiteSpace(appBasePath))
+                appBasePath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+
+            string configPath = appBasePath + "\\降等原因.csv";
+            if (!File.Exists(configPath))
+                return data;
+            try
+            {
+                string lsTmp = File.ReadAllText(configPath, Encoding.Default);
+                var line = lsTmp.Split("\r\n");
+                int index = 0;
+                foreach (var item in line)
+                {
+                    if (index++ == 0)   //忽略第一行标题
+                        continue;
+                    try
+                    {
+                        if(item.IndexOf("\t") >=0)
+                            data.Add(item.Split("\t")[0], item.Split("\t")[1]);
+                        else if (item.IndexOf(",") >= 0)
+                            data.Add(item.Split(",")[0], item.Split(",")[1]);
+                    }
+                    catch {
+                        ;
+                    }
+                }
+            }
+            catch { }
+            return data;
         }
 
         #region defectItemList <=> DefectItemList.json

LeatherProject/LeatherApp/DevContainer.cs

@@ -187,18 +187,18 @@ namespace LeatherApp
             {
                 if (lengthCounter.IsOpen)
                 {
-                    for (int t = 0; t < 3; t++)
+                    for (int t = 0; t < 1; t++)
                     {
                         byte[] clearData = new byte[] { 0x01, 0x06, 0x00, 0x00, 0x00, 0x01, 0x48, 0x0a };
                         lengthCounter.Write(clearData, 0, 8);
-                        //Thread.Sleep(100);
-                        Thread.Sleep(20);
-                        byte[] recv = new byte[64];
-                        //string recvdata = serialPort.ReadLine();
-                        //recv = recvdata.ToBytes();
-                        int readCnt = lengthCounter.BytesToRead;
-                        lengthCounter.Read(recv, 0, readCnt);
                         Thread.Sleep(100);
+                        int readCnt = lengthCounter.BytesToRead;
+                        if (readCnt > 0)
+                        {
+                            byte[] recv = new byte[readCnt + 1];
+                            lengthCounter.Read(recv, 0, readCnt);
+                        }
+                        Thread.Sleep(300); 
                     }
                 }
             }

LeatherProject/LeatherApp/Device/DefectLib.cs

@@ -542,6 +542,17 @@ namespace LeatherApp.Device
             List<int> yPos4 = new List<int>();
             List<double> ZXD4 = new List<double>();
 
+            List<DefectLabelInfo> HeBingList5 = new List<DefectLabelInfo>();
+            List<DefectLabelInfo> XcHeBingList5 = new List<DefectLabelInfo>();
+            List<int> xPos5 = new List<int>();
+            List<int> yPos5 = new List<int>();
+            List<double> ZXD5 = new List<double>();
+
+            List<DefectLabelInfo> HeBingList6 = new List<DefectLabelInfo>();
+            List<DefectLabelInfo> XcHeBingList6 = new List<DefectLabelInfo>();
+            List<int> xPos6 = new List<int>();
+            List<int> yPos6 = new List<int>();
+            List<double> ZXD6 = new List<double>();
 
             DefectLabelInfo stpoint = DefectLabelInfoList[0];
 
@@ -605,6 +616,34 @@ namespace LeatherApp.Device
                     else
                         XcHeBingList4.Add(DefectLabelInfoList[q]);
                 }
+                else if (Config.getDefectCode(modelName, DefectLabelInfoList[q].classId) == "zj")
+                {
+                    int max = stpoint.y + 2000;
+                    int min = stpoint.y - 2000 > 0 ? stpoint.y - 2000 : 0;
+                    if (DefectLabelInfoList[q].y >= min && DefectLabelInfoList[q].y <= max)
+                    {
+                        HeBingList5.Add(DefectLabelInfoList[q]);
+                        xPos5.Add((DefectLabelInfoList[q].i % colNum) * image_width + DefectLabelInfoList[q].x);
+                        yPos5.Add((DefectLabelInfoList[q].i / colNum) * image_hight + DefectLabelInfoList[q].y);
+                        ZXD5.Add(DefectLabelInfoList[q].confidence);
+                    }
+                    else
+                        XcHeBingList5.Add(DefectLabelInfoList[q]);
+                }
+                else if (Config.getDefectCode(modelName, DefectLabelInfoList[q].classId) == "bj")
+                {
+                    int max = stpoint.y + 2000;
+                    int min = stpoint.y - 2000 > 0 ? stpoint.y - 2000 : 0;
+                    if (DefectLabelInfoList[q].y >= min && DefectLabelInfoList[q].y <= max)
+                    {
+                        HeBingList6.Add(DefectLabelInfoList[q]);
+                        xPos6.Add((DefectLabelInfoList[q].i % colNum) * image_width + DefectLabelInfoList[q].x);
+                        yPos6.Add((DefectLabelInfoList[q].i / colNum) * image_hight + DefectLabelInfoList[q].y);
+                        ZXD6.Add(DefectLabelInfoList[q].confidence);
+                    }
+                    else
+                        XcHeBingList6.Add(DefectLabelInfoList[q]);
+                }
                 else
                     outList.Add(DefectLabelInfoList[q]);
             }
@@ -613,6 +652,8 @@ namespace LeatherApp.Device
             List<DefectLabelInfo> dg2 = new List<DefectLabelInfo>();
             List<DefectLabelInfo> dg3 = new List<DefectLabelInfo>();
             List<DefectLabelInfo> dg4 = new List<DefectLabelInfo>();
+            List<DefectLabelInfo> dg5 = new List<DefectLabelInfo>();
+            List<DefectLabelInfo> dg6 = new List<DefectLabelInfo>();
             if (XcHeBingList.Count >0)
                 dg1 = HeBingDefect(modelName, Width, XcHeBingList);
             if (XcHeBingList2.Count > 0)
@@ -621,6 +662,10 @@ namespace LeatherApp.Device
                 dg3 = HeBingDefect(modelName, Width, XcHeBingList3);
             if (XcHeBingList4.Count > 0)
                 dg4 = HeBingDefect(modelName, Width, XcHeBingList4);
+            if (XcHeBingList5.Count > 0)
+                dg5 = HeBingDefect(modelName, Width, XcHeBingList5);
+            if (XcHeBingList6.Count > 0)
+                dg6 = HeBingDefect(modelName, Width, XcHeBingList6);
 
             //多个jietou合并
             if (HeBingList.Count>0)
@@ -721,10 +766,62 @@ namespace LeatherApp.Device
                     j = stIt.j,
                 });
             }
+            //多个zj合并
+            if (HeBingList5.Count > 0)
+            {
+                var stIt = HeBingList5.Find(x => (x.i % colNum) * image_width + x.x == xPos5.Min());
+                var edIt = HeBingList5.Find(x => (x.i % colNum) * image_width + x.x == xPos5.Max());
+                var stIty = HeBingList5.Find(x => ((x.i / colNum) * image_hight + x.y) == yPos5.Min());
+                var edIty = HeBingList5.Find(x => ((x.i / colNum) * image_hight + x.y) == yPos5.Max());
+                var eZXD = HeBingList5.Find(x => x.confidence == ZXD5.Max());
+                int newW = Math.Abs(((edIt.i % colNum) * image_width + edIt.x) - ((stIt.i % colNum) * image_width + stIt.x)) + edIt.w;
+                int newh = Math.Abs(((edIt.i / colNum) * image_hight + edIt.y) - ((stIt.i / colNum) * image_hight + stIt.y)) + edIt.h;
+                outList.Add(new DefectLabelInfo()
+                {
+                    x = stIt.x,
+                    y = edIty.y,
+                    w = newW, //多图叠加
+                    h = newh,
+                    classId = eZXD.classId,
+                    confidence = eZXD.confidence,
+                    contrast = eZXD.contrast,
+                    cmH = Math.Round(edIt.h * 1.0 / Config.cm2px_y, 2),
+                    cmW = Math.Round(newW * 1.0 / Config.cm2px_x, 2),
+                    i = stIt.i,
+                    j = stIt.j,
+                });
+            }
+            //多个bj合并
+            if (HeBingList6.Count > 0)
+            {
+                var stIt = HeBingList6.Find(x => (x.i % colNum) * image_width + x.x == xPos6.Min());
+                var edIt = HeBingList6.Find(x => (x.i % colNum) * image_width + x.x == xPos6.Max());
+                var stIty = HeBingList6.Find(x => ((x.i / colNum) * image_hight + x.y) == yPos6.Min());
+                var edIty = HeBingList6.Find(x => ((x.i / colNum) * image_hight + x.y) == yPos6.Max());
+                var eZXD = HeBingList6.Find(x => x.confidence == ZXD6.Max());
+                int newW = Math.Abs(((edIt.i % colNum) * image_width + edIt.x) - ((stIt.i % colNum) * image_width + stIt.x)) + edIt.w;
+                int newh = Math.Abs(((edIt.i / colNum) * image_hight + edIt.y) - ((stIt.i / colNum) * image_hight + stIt.y)) + edIt.h;
+                outList.Add(new DefectLabelInfo()
+                {
+                    x = stIt.x,
+                    y = edIty.y,
+                    w = newW, //多图叠加
+                    h = newh,
+                    classId = eZXD.classId,
+                    confidence = eZXD.confidence,
+                    contrast = eZXD.contrast,
+                    cmH = Math.Round(edIt.h * 1.0 / Config.cm2px_y, 2),
+                    cmW = Math.Round(newW * 1.0 / Config.cm2px_x, 2),
+                    i = stIt.i,
+                    j = stIt.j,
+                });
+            }
             outList = outList.Concat(dg1).ToList<DefectLabelInfo>();//保留重复项
             outList = outList.Concat(dg2).ToList<DefectLabelInfo>();//保留重复项
             outList = outList.Concat(dg3).ToList<DefectLabelInfo>();//保留重复项
             outList = outList.Concat(dg4).ToList<DefectLabelInfo>();//保留重复项
+            outList = outList.Concat(dg5).ToList<DefectLabelInfo>();//保留重复项
+            outList = outList.Concat(dg6).ToList<DefectLabelInfo>();//保留重复项
             return outList;
         }
         //打标

LeatherProject/LeatherApp/FrmMain.Designer.cs

@@ -38,11 +38,12 @@
             this.uiLine1 = new Sunny.UI.UILine();
             this.btnExit = new Sunny.UI.UISymbolLabel();
             this.btnHide = new Sunny.UI.UISymbolLabel();
-            this.btnLockUI = new Sunny.UI.UISymbolLabel();
             this.btnHead3 = new Sunny.UI.UISymbolLabel();
             this.btnHead2 = new Sunny.UI.UISymbolLabel();
             this.btnHead1 = new Sunny.UI.UISymbolLabel();
             this.btnHead0 = new Sunny.UI.UISymbolLabel();
+            this.btnLockUI = new Sunny.UI.UISymbolLabel();
+            this.label1 = new System.Windows.Forms.Label();
             ((System.ComponentModel.ISupportInitialize)(this.picLogo)).BeginInit();
             this.uiNavBar1.SuspendLayout();
             this.SuspendLayout();
@@ -83,6 +84,7 @@
             // uiNavBar1
             // 
             this.uiNavBar1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(29)))), ((int)(((byte)(138)))));
+            this.uiNavBar1.Controls.Add(this.label1);
             this.uiNavBar1.Controls.Add(this.lblVer);
             this.uiNavBar1.Controls.Add(this.uiLine3);
             this.uiNavBar1.Controls.Add(this.uiLine2);
@@ -225,27 +227,6 @@
             this.btnHide.Text = "最小化";
             this.btnHide.Click += new System.EventHandler(this.btnLockUI_Click);
             // 
-            // btnLockUI
-            // 
-            this.btnLockUI.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnLockUI.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.btnLockUI.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnLockUI.ForeColor = System.Drawing.Color.White;
-            this.btnLockUI.Location = new System.Drawing.Point(738, 22);
-            this.btnLockUI.MinimumSize = new System.Drawing.Size(1, 1);
-            this.btnLockUI.Name = "btnLockUI";
-            this.btnLockUI.Size = new System.Drawing.Size(82, 34);
-            this.btnLockUI.Style = Sunny.UI.UIStyle.Custom;
-            this.btnLockUI.StyleCustomMode = true;
-            this.btnLockUI.Symbol = 61475;
-            this.btnLockUI.SymbolColor = System.Drawing.Color.White;
-            this.btnLockUI.SymbolOffset = new System.Drawing.Point(0, 2);
-            this.btnLockUI.SymbolSize = 28;
-            this.btnLockUI.TabIndex = 8;
-            this.btnLockUI.Text = "锁定";
-            this.btnLockUI.Visible = false;
-            this.btnLockUI.Click += new System.EventHandler(this.btnLockUI_Click);
-            // 
             // btnHead3
             // 
             this.btnHead3.Anchor = System.Windows.Forms.AnchorStyles.Top;
@@ -330,6 +311,38 @@
             this.btnHead0.Text = "实时监控";
             this.btnHead0.Click += new System.EventHandler(this.btnHead0_Click);
             // 
+            // btnLockUI
+            // 
+            this.btnLockUI.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnLockUI.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.btnLockUI.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnLockUI.ForeColor = System.Drawing.Color.White;
+            this.btnLockUI.Location = new System.Drawing.Point(738, 22);
+            this.btnLockUI.MinimumSize = new System.Drawing.Size(1, 1);
+            this.btnLockUI.Name = "btnLockUI";
+            this.btnLockUI.Size = new System.Drawing.Size(82, 34);
+            this.btnLockUI.Style = Sunny.UI.UIStyle.Custom;
+            this.btnLockUI.StyleCustomMode = true;
+            this.btnLockUI.Symbol = 61475;
+            this.btnLockUI.SymbolColor = System.Drawing.Color.White;
+            this.btnLockUI.SymbolOffset = new System.Drawing.Point(0, 2);
+            this.btnLockUI.SymbolSize = 28;
+            this.btnLockUI.TabIndex = 8;
+            this.btnLockUI.Text = "锁定";
+            this.btnLockUI.Visible = false;
+            this.btnLockUI.Click += new System.EventHandler(this.btnLockUI_Click);
+            // 
+            // label1
+            // 
+            this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.label1.AutoSize = true;
+            this.label1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label1.Location = new System.Drawing.Point(828, 50);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(80, 20);
+            this.label1.TabIndex = 11;
+            this.label1.Text = "admin A组";
+            // 
             // FrmMain
             // 
             this.AllowShowTitle = false;
@@ -381,6 +394,7 @@
         private Sunny.UI.UISymbolLabel btnLockUI;
         private Sunny.UI.UISymbolLabel btnHide;
         private System.Windows.Forms.LinkLabel lblVer;
+        private System.Windows.Forms.Label label1;
     }
 }
 

LeatherProject/LeatherApp/FrmMain.cs

@@ -29,6 +29,10 @@ namespace LeatherApp
             //窗体上如果只有一个UITabControl，也会自动关联，超过一个需要手动关联
             MainTabControl = uiTabControl1;
 
+            //显示用户
+            string name = (string.IsNullOrEmpty(Config.loginUser.Name) ? "Nan" : Config.loginUser.Name);
+            string team = (string.IsNullOrEmpty(Config.loginUser.WorkTeam) ? "Nan" : Config.loginUser.WorkTeam);
+            label1.Text = $"{name} {team}";
             //
             //int pageIndex = 1000;
             ////uiNavBar1设置节点，也可以在Nodes属性里配置 

LeatherProject/LeatherApp/FrmVerList.resx

@@ -126,6 +126,8 @@
 5、数据库更新
 6、针对新材料二次判断更新
 7、加入临时快速调整检测
+8、针对禾欣新材料等级显示修改
+9、加入超速报警5s功能
 置信度
 v1.2.0.10(2024-11-27)
 1、修复bug

LeatherProject/LeatherApp/Page/CuttingFrm.cs

@@ -23,18 +23,28 @@ namespace LeatherApp.Page
             //加载分卷信息
             List<JDefectTotal> DefectTotal = null;
             List<string> liststr = new List<string>();
-            liststr.Add("无瑕疵人工裁切");
+            if (Config.DownGradeReason != null && Config.DownGradeReason.Count > 0)
             {
-                if (DefectInfoList != null && DefectInfoList.Count > 0)
+                foreach (var item in Config.DownGradeReason)
                 {
-                    var deflist = DefectInfoList;
+                    liststr.Add($"{item.Key}{item.Value}");
-                    DefectTotal = deflist.GroupBy(x => x.Name).Select(g => new JDefectTotal { Name = g.Key, Count = g.Count() }).ToList();
                 }
-                if (DefectTotal != null && DefectTotal.Count > 0)
+            }
-                    foreach (var item in DefectTotal)
+            else
+            {
+                liststr.Add("无瑕疵人工裁切");
+                {
+                    if (DefectInfoList != null && DefectInfoList.Count > 0)
                     {
-                        liststr.Add($"{item.Name}{item.Count}个");
+                        var deflist = DefectInfoList;
+                        DefectTotal = deflist.GroupBy(x => x.Name).Select(g => new JDefectTotal { Name = g.Key, Count = g.Count() }).ToList();
                     }
+                    if (DefectTotal != null && DefectTotal.Count > 0)
+                        foreach (var item in DefectTotal)
+                        {
+                            liststr.Add($"{item.Name}{item.Count}个");
+                        }
+                }
             }
             comboBox1.DataSource = liststr;
         }

LeatherProject/LeatherApp/Page/FHome.Designer.cs

@@ -41,7 +41,11 @@
             this.lblLen = new Sunny.UI.UILabel();
             this.lblSpeed = new Sunny.UI.UISymbolLabel();
             this.uiTitlePanel1 = new Sunny.UI.UITitlePanel();
+            this.numBzLen = new Sunny.UI.UINumPadTextBox();
+            this.uiLabel12 = new Sunny.UI.UILabel();
+            this.radioButton2 = new System.Windows.Forms.RadioButton();
             this.button4 = new System.Windows.Forms.Button();
+            this.radioButton1 = new System.Windows.Forms.RadioButton();
             this.txtDefectName = new Sunny.UI.UITextBox();
             this.uiLabel10 = new Sunny.UI.UILabel();
             this.button3 = new System.Windows.Forms.Button();
@@ -52,13 +56,14 @@
             this.txtReelId = new Sunny.UI.UITextBox();
             this.uiLabel4 = new Sunny.UI.UILabel();
             this.txtBarCodeName = new Sunny.UI.UITextBox();
-            this.txtBatchId = new Sunny.UI.UITextBox();
             this.uiLabel3 = new Sunny.UI.UILabel();
             this.uiLabel2 = new Sunny.UI.UILabel();
             this.txtBarCode = new Sunny.UI.UITextBox();
             this.uiLabel1 = new Sunny.UI.UILabel();
+            this.txtBatchId = new Sunny.UI.UITextBox();
             this.uiPanel2 = new Sunny.UI.UIPanel();
             this.btnFenJuan = new Sunny.UI.UISymbolButton();
+            this.btnCut = new Sunny.UI.UISymbolButton();
             this.btnHeight = new Sunny.UI.UISymbolButton();
             this.btnClearAlm = new Sunny.UI.UISymbolButton();
             this.btnPause = new Sunny.UI.UISymbolButton();
@@ -111,8 +116,6 @@
             this.uiLabel6 = new Sunny.UI.UILabel();
             this.uiTitlePanel8 = new Sunny.UI.UITitlePanel();
             this.lineChartHouDu = new Sunny.UI.UILineChart();
-            this.numBzLen = new Sunny.UI.UINumPadTextBox();
-            this.uiLabel12 = new Sunny.UI.UILabel();
             this.picDefectImage = new LeatherApp.UIExtend.UCImageView();
             this.ucColorListDefect = new LeatherApp.UIExtend.UCColorList();
             this.uiPanel1.SuspendLayout();
@@ -188,7 +191,9 @@
             this.uiTitlePanel1.BackColor = System.Drawing.Color.White;
             this.uiTitlePanel1.Controls.Add(this.numBzLen);
             this.uiTitlePanel1.Controls.Add(this.uiLabel12);
+            this.uiTitlePanel1.Controls.Add(this.radioButton2);
             this.uiTitlePanel1.Controls.Add(this.button4);
+            this.uiTitlePanel1.Controls.Add(this.radioButton1);
             this.uiTitlePanel1.Controls.Add(this.txtDefectName);
             this.uiTitlePanel1.Controls.Add(this.uiLabel10);
             this.uiTitlePanel1.Controls.Add(this.button3);
@@ -199,11 +204,11 @@
             this.uiTitlePanel1.Controls.Add(this.txtReelId);
             this.uiTitlePanel1.Controls.Add(this.uiLabel4);
             this.uiTitlePanel1.Controls.Add(this.txtBarCodeName);
-            this.uiTitlePanel1.Controls.Add(this.txtBatchId);
             this.uiTitlePanel1.Controls.Add(this.uiLabel3);
             this.uiTitlePanel1.Controls.Add(this.uiLabel2);
             this.uiTitlePanel1.Controls.Add(this.txtBarCode);
             this.uiTitlePanel1.Controls.Add(this.uiLabel1);
+            this.uiTitlePanel1.Controls.Add(this.txtBatchId);
             this.uiTitlePanel1.FillColor = System.Drawing.Color.White;
             this.uiTitlePanel1.FillColor2 = System.Drawing.Color.White;
             this.uiTitlePanel1.FillDisableColor = System.Drawing.Color.White;
@@ -226,10 +231,56 @@
             this.uiTitlePanel1.TitleColor = System.Drawing.Color.White;
             this.uiTitlePanel1.TitleForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(29)))), ((int)(((byte)(138)))));
             // 
+            // numBzLen
+            // 
+            this.numBzLen.DecimalPlaces = 0;
+            this.numBzLen.FillColor = System.Drawing.Color.White;
+            this.numBzLen.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.numBzLen.Location = new System.Drawing.Point(124, 240);
+            this.numBzLen.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.numBzLen.Minimum = 0D;
+            this.numBzLen.MinimumSize = new System.Drawing.Size(63, 0);
+            this.numBzLen.Name = "numBzLen";
+            this.numBzLen.NumPadType = Sunny.UI.NumPadType.Integer;
+            this.numBzLen.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2);
+            this.numBzLen.Size = new System.Drawing.Size(219, 29);
+            this.numBzLen.Style = Sunny.UI.UIStyle.Custom;
+            this.numBzLen.TabIndex = 17;
+            this.numBzLen.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
+            this.numBzLen.Watermark = "";
+            this.numBzLen.ValueChanged += new Sunny.UI.UINumPadTextBox.OnValueChanged(this.numBzLen_ValueChanged);
+            this.numBzLen.KeyUp += new System.Windows.Forms.KeyEventHandler(this.numBzLen_KeyUp);
+            // 
+            // uiLabel12
+            // 
+            this.uiLabel12.AutoSize = true;
+            this.uiLabel12.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.uiLabel12.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(29)))), ((int)(((byte)(138)))));
+            this.uiLabel12.Location = new System.Drawing.Point(8, 238);
+            this.uiLabel12.Name = "uiLabel12";
+            this.uiLabel12.Size = new System.Drawing.Size(74, 21);
+            this.uiLabel12.Style = Sunny.UI.UIStyle.Custom;
+            this.uiLabel12.StyleCustomMode = true;
+            this.uiLabel12.TabIndex = 16;
+            this.uiLabel12.Text = "包装米数";
+            this.uiLabel12.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // radioButton2
+            // 
+            this.radioButton2.AutoSize = true;
+            this.radioButton2.ForeColor = System.Drawing.Color.Black;
+            this.radioButton2.Location = new System.Drawing.Point(229, 121);
+            this.radioButton2.Name = "radioButton2";
+            this.radioButton2.Size = new System.Drawing.Size(60, 25);
+            this.radioButton2.TabIndex = 4;
+            this.radioButton2.Text = "半检";
+            this.radioButton2.UseVisualStyleBackColor = true;
+            this.radioButton2.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged);
+            // 
             // button4
             // 
             this.button4.ForeColor = System.Drawing.Color.Black;
-            this.button4.Location = new System.Drawing.Point(282, 30);
+            this.button4.Location = new System.Drawing.Point(282, 36);
             this.button4.Name = "button4";
             this.button4.Size = new System.Drawing.Size(50, 36);
             this.button4.TabIndex = 15;
@@ -238,6 +289,18 @@
             this.button4.Visible = false;
             this.button4.Click += new System.EventHandler(this.button4_Click);
             // 
+            // radioButton1
+            // 
+            this.radioButton1.AutoSize = true;
+            this.radioButton1.ForeColor = System.Drawing.Color.Black;
+            this.radioButton1.Location = new System.Drawing.Point(132, 121);
+            this.radioButton1.Name = "radioButton1";
+            this.radioButton1.Size = new System.Drawing.Size(60, 25);
+            this.radioButton1.TabIndex = 3;
+            this.radioButton1.Text = "成检";
+            this.radioButton1.UseVisualStyleBackColor = true;
+            this.radioButton1.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged);
+            // 
             // txtDefectName
             // 
             this.txtDefectName.ButtonFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(29)))), ((int)(((byte)(138)))));
@@ -285,7 +348,7 @@
             // button3
             // 
             this.button3.ForeColor = System.Drawing.Color.Black;
-            this.button3.Location = new System.Drawing.Point(226, 30);
+            this.button3.Location = new System.Drawing.Point(226, 36);
             this.button3.Name = "button3";
             this.button3.Size = new System.Drawing.Size(50, 36);
             this.button3.TabIndex = 3;
@@ -298,7 +361,7 @@
             // 
             this.numErpLen.FillColor = System.Drawing.Color.White;
             this.numErpLen.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.numErpLen.Location = new System.Drawing.Point(124, 201);
+            this.numErpLen.Location = new System.Drawing.Point(123, 201);
             this.numErpLen.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.numErpLen.Minimum = 0D;
             this.numErpLen.MinimumSize = new System.Drawing.Size(63, 0);
@@ -316,7 +379,7 @@
             // button2
             // 
             this.button2.ForeColor = System.Drawing.Color.Black;
-            this.button2.Location = new System.Drawing.Point(170, 30);
+            this.button2.Location = new System.Drawing.Point(170, 36);
             this.button2.Name = "button2";
             this.button2.Size = new System.Drawing.Size(50, 36);
             this.button2.TabIndex = 2;
@@ -342,7 +405,7 @@
             // button1
             // 
             this.button1.ForeColor = System.Drawing.Color.Black;
-            this.button1.Location = new System.Drawing.Point(116, 30);
+            this.button1.Location = new System.Drawing.Point(116, 36);
             this.button1.Name = "button1";
             this.button1.Size = new System.Drawing.Size(50, 36);
             this.button1.TabIndex = 1;
@@ -424,35 +487,6 @@
             this.txtBarCodeName.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
             this.txtBarCodeName.Watermark = "";
             // 
-            // txtBatchId
-            // 
-            this.txtBatchId.ButtonFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(29)))), ((int)(((byte)(138)))));
-            this.txtBatchId.ButtonFillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(29)))), ((int)(((byte)(138)))));
-            this.txtBatchId.ButtonFillPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(29)))), ((int)(((byte)(138)))));
-            this.txtBatchId.ButtonRectColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(29)))), ((int)(((byte)(138)))));
-            this.txtBatchId.ButtonRectHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(29)))), ((int)(((byte)(138)))));
-            this.txtBatchId.ButtonRectPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(29)))), ((int)(((byte)(138)))));
-            this.txtBatchId.ButtonStyleInherited = false;
-            this.txtBatchId.ButtonSymbolOffset = new System.Drawing.Point(0, 0);
-            this.txtBatchId.Cursor = System.Windows.Forms.Cursors.IBeam;
-            this.txtBatchId.FillColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(238)))), ((int)(((byte)(251)))), ((int)(((byte)(250)))));
-            this.txtBatchId.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.txtBatchId.Location = new System.Drawing.Point(124, 122);
-            this.txtBatchId.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.txtBatchId.MinimumSize = new System.Drawing.Size(1, 16);
-            this.txtBatchId.Name = "txtBatchId";
-            this.txtBatchId.Padding = new System.Windows.Forms.Padding(5);
-            this.txtBatchId.RectColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(29)))), ((int)(((byte)(138)))));
-            this.txtBatchId.ScrollBarColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(29)))), ((int)(((byte)(138)))));
-            this.txtBatchId.ScrollBarStyleInherited = false;
-            this.txtBatchId.ShowText = false;
-            this.txtBatchId.Size = new System.Drawing.Size(220, 29);
-            this.txtBatchId.Style = Sunny.UI.UIStyle.Custom;
-            this.txtBatchId.StyleCustomMode = true;
-            this.txtBatchId.TabIndex = 1;
-            this.txtBatchId.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
-            this.txtBatchId.Watermark = "";
-            // 
             // uiLabel3
             // 
             this.uiLabel3.AutoSize = true;
@@ -528,12 +562,42 @@
             this.uiLabel1.Text = "产品条码";
             this.uiLabel1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
+            // txtBatchId
+            // 
+            this.txtBatchId.ButtonFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(29)))), ((int)(((byte)(138)))));
+            this.txtBatchId.ButtonFillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(29)))), ((int)(((byte)(138)))));
+            this.txtBatchId.ButtonFillPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(29)))), ((int)(((byte)(138)))));
+            this.txtBatchId.ButtonRectColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(29)))), ((int)(((byte)(138)))));
+            this.txtBatchId.ButtonRectHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(29)))), ((int)(((byte)(138)))));
+            this.txtBatchId.ButtonRectPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(29)))), ((int)(((byte)(138)))));
+            this.txtBatchId.ButtonStyleInherited = false;
+            this.txtBatchId.ButtonSymbolOffset = new System.Drawing.Point(0, 0);
+            this.txtBatchId.Cursor = System.Windows.Forms.Cursors.IBeam;
+            this.txtBatchId.FillColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(238)))), ((int)(((byte)(251)))), ((int)(((byte)(250)))));
+            this.txtBatchId.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtBatchId.Location = new System.Drawing.Point(124, 123);
+            this.txtBatchId.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.txtBatchId.MinimumSize = new System.Drawing.Size(1, 16);
+            this.txtBatchId.Name = "txtBatchId";
+            this.txtBatchId.Padding = new System.Windows.Forms.Padding(5);
+            this.txtBatchId.RectColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(29)))), ((int)(((byte)(138)))));
+            this.txtBatchId.ScrollBarColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(29)))), ((int)(((byte)(138)))));
+            this.txtBatchId.ScrollBarStyleInherited = false;
+            this.txtBatchId.ShowText = false;
+            this.txtBatchId.Size = new System.Drawing.Size(220, 29);
+            this.txtBatchId.Style = Sunny.UI.UIStyle.Custom;
+            this.txtBatchId.StyleCustomMode = true;
+            this.txtBatchId.TabIndex = 1;
+            this.txtBatchId.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
+            this.txtBatchId.Watermark = "";
+            // 
             // uiPanel2
             // 
             this.uiPanel2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.uiPanel2.BackColor = System.Drawing.Color.White;
             this.uiPanel2.Controls.Add(this.btnFenJuan);
+            this.uiPanel2.Controls.Add(this.btnCut);
             this.uiPanel2.Controls.Add(this.btnHeight);
             this.uiPanel2.Controls.Add(this.btnClearAlm);
             this.uiPanel2.Controls.Add(this.btnPause);
@@ -561,7 +625,6 @@
             // btnFenJuan
             // 
             this.btnFenJuan.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.btnFenJuan.Enabled = false;
             this.btnFenJuan.FillColor = System.Drawing.Color.Blue;
             this.btnFenJuan.FillColor2 = System.Drawing.Color.Blue;
             this.btnFenJuan.FillHoverColor = System.Drawing.Color.Blue;
@@ -569,7 +632,7 @@
             this.btnFenJuan.FillSelectedColor = System.Drawing.Color.Blue;
             this.btnFenJuan.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnFenJuan.Image = ((System.Drawing.Image)(resources.GetObject("btnFenJuan.Image")));
-            this.btnFenJuan.Location = new System.Drawing.Point(555, 9);
+            this.btnFenJuan.Location = new System.Drawing.Point(615, 9);
             this.btnFenJuan.MinimumSize = new System.Drawing.Size(1, 1);
             this.btnFenJuan.Name = "btnFenJuan";
             this.btnFenJuan.Radius = 50;
@@ -590,17 +653,46 @@
             this.btnFenJuan.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnFenJuan.Click += new System.EventHandler(this.btnFenJuan_Click);
             // 
+            // btnCut
+            // 
+            this.btnCut.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.btnCut.FillColor = System.Drawing.Color.Blue;
+            this.btnCut.FillColor2 = System.Drawing.Color.Blue;
+            this.btnCut.FillHoverColor = System.Drawing.Color.Blue;
+            this.btnCut.FillPressColor = System.Drawing.Color.Blue;
+            this.btnCut.FillSelectedColor = System.Drawing.Color.Blue;
+            this.btnCut.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnCut.Location = new System.Drawing.Point(555, 9);
+            this.btnCut.MinimumSize = new System.Drawing.Size(1, 1);
+            this.btnCut.Name = "btnCut";
+            this.btnCut.Radius = 50;
+            this.btnCut.RectColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(29)))), ((int)(((byte)(138)))));
+            this.btnCut.RectDisableColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(29)))), ((int)(((byte)(138)))));
+            this.btnCut.RectHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(29)))), ((int)(((byte)(138)))));
+            this.btnCut.RectPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(29)))), ((int)(((byte)(138)))));
+            this.btnCut.RectSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(29)))), ((int)(((byte)(138)))));
+            this.btnCut.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None;
+            this.btnCut.Size = new System.Drawing.Size(154, 50);
+            this.btnCut.Style = Sunny.UI.UIStyle.Custom;
+            this.btnCut.StyleCustomMode = true;
+            this.btnCut.Symbol = 557678;
+            this.btnCut.SymbolOffset = new System.Drawing.Point(0, 3);
+            this.btnCut.TabIndex = 4;
+            this.btnCut.Text = "裁切";
+            this.btnCut.TipsColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(29)))), ((int)(((byte)(138)))));
+            this.btnCut.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnCut.Click += new System.EventHandler(this.btnCut_Click);
+            // 
             // btnHeight
             // 
             this.btnHeight.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.btnHeight.Enabled = false;
             this.btnHeight.FillColor = System.Drawing.Color.Blue;
             this.btnHeight.FillColor2 = System.Drawing.Color.Blue;
             this.btnHeight.FillHoverColor = System.Drawing.Color.Blue;
             this.btnHeight.FillPressColor = System.Drawing.Color.Blue;
             this.btnHeight.FillSelectedColor = System.Drawing.Color.Blue;
             this.btnHeight.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnHeight.Location = new System.Drawing.Point(531, 9);
+            this.btnHeight.Location = new System.Drawing.Point(525, 9);
             this.btnHeight.MinimumSize = new System.Drawing.Size(1, 1);
             this.btnHeight.Name = "btnHeight";
             this.btnHeight.Radius = 50;
@@ -1609,40 +1701,6 @@
             this.lineChartHouDu.TabIndex = 1;
             this.lineChartHouDu.TouchPressClick = true;
             // 
-            // numBzLen
-            // 
-            this.numBzLen.DecimalPlaces = 0;
-            this.numBzLen.FillColor = System.Drawing.Color.White;
-            this.numBzLen.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.numBzLen.Location = new System.Drawing.Point(124, 240);
-            this.numBzLen.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.numBzLen.Minimum = 0D;
-            this.numBzLen.MinimumSize = new System.Drawing.Size(63, 0);
-            this.numBzLen.Name = "numBzLen";
-            this.numBzLen.NumPadType = Sunny.UI.NumPadType.Integer;
-            this.numBzLen.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2);
-            this.numBzLen.Size = new System.Drawing.Size(219, 29);
-            this.numBzLen.Style = Sunny.UI.UIStyle.Custom;
-            this.numBzLen.TabIndex = 17;
-            this.numBzLen.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
-            this.numBzLen.Watermark = "";
-            this.numBzLen.ValueChanged += new Sunny.UI.UINumPadTextBox.OnValueChanged(this.numBzLen_ValueChanged);
-            this.numBzLen.KeyUp += new System.Windows.Forms.KeyEventHandler(this.numBzLen_KeyUp);
-            // 
-            // uiLabel12
-            // 
-            this.uiLabel12.AutoSize = true;
-            this.uiLabel12.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiLabel12.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(29)))), ((int)(((byte)(138)))));
-            this.uiLabel12.Location = new System.Drawing.Point(8, 238);
-            this.uiLabel12.Name = "uiLabel12";
-            this.uiLabel12.Size = new System.Drawing.Size(74, 21);
-            this.uiLabel12.Style = Sunny.UI.UIStyle.Custom;
-            this.uiLabel12.StyleCustomMode = true;
-            this.uiLabel12.TabIndex = 16;
-            this.uiLabel12.Text = "包装米数";
-            this.uiLabel12.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
             // picDefectImage
             // 
             this.picDefectImage.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -1804,5 +1862,8 @@
         private Sunny.UI.UISymbolButton btnEditQualifications;
         private Sunny.UI.UINumPadTextBox numBzLen;
         private Sunny.UI.UILabel uiLabel12;
+        private Sunny.UI.UISymbolButton btnCut;
+        private System.Windows.Forms.RadioButton radioButton2;
+        private System.Windows.Forms.RadioButton radioButton1;
     }
 }

LeatherProject/LeatherApp/Page/FHome.cs

@@ -4,7 +4,9 @@
 #define NT     //新流程
 //#define UPDATA
 
+using Automation.BDaq;
 using DocumentFormat.OpenXml.EMMA;
+using DocumentFormat.OpenXml.Office2010.ExcelAc;
 using HalconDotNet;
 using HZH_Controls;
 using IKapC.NET;
@@ -12,6 +14,7 @@ using Irony.Parsing;
 using LeatherApp.Device;
 using LeatherApp.Device.CamerUtil;
 using LeatherApp.Interface;
+using LeatherApp.UIExtend;
 using LeatherApp.Utils;
 using Models;
 using Newtonsoft.Json;
@@ -198,7 +201,17 @@ namespace LeatherApp.Page
             if (Config.CustomerName != "XCL")
             {
                 btnHeight.Visible = false;
+                btnCut.Visible = false;
                 btnFenJuan.Visible = false;
+                radioButton1.Visible = false;
+                radioButton2.Visible = false;
+            }
+            if(Config.CustomerName == "XCL")
+            {
+                uiLabel3.Visible = false;
+                txtBatchId.Visible = false;
+                radioButton1.Visible = true;
+                radioButton2.Visible = true;
             }
         }
          
@@ -297,6 +310,9 @@ namespace LeatherApp.Page
                 this.picScanner1.Image = this.picScanner2.Image = null;
                 picScanner1.Refresh();
                 picScanner2.Refresh();
+
+                radioButton1.Checked = false;
+                radioButton2.Checked = false;
             }));
         }
         /// <summary>
@@ -411,103 +427,116 @@ namespace LeatherApp.Page
         {
             lock (_lockDrawPoints)
             {
-                UILineOption option;
+                try
-                //AddTextEvent(DateTime.Now,$"绘图", $"缺陷分布， W={string.Join(", ", XSizeRange)},H={string.Join(", ", YSizeRange)}, LastData={JsonConvert.SerializeObject(lstDefectInfo[lstDefectInfo.Count - 1])}");
-                var lstData = lstDefectInfo.OrderBy(m => m.Code).ThenBy(m => m.Code).ToList();
-
-                if (XSizeRange == null || YSizeRange == null)
-                    option = this.lineChartDefect.Option;
-                else
                 {
-                    if (YSizeRange[0] == YSizeRange[1])
+                    UILineOption option;
+                    //AddTextEvent(DateTime.Now,$"绘图", $"缺陷分布， W={string.Join(", ", XSizeRange)},H={string.Join(", ", YSizeRange)}, LastData={JsonConvert.SerializeObject(lstDefectInfo[lstDefectInfo.Count - 1])}");
+                    var lstData = lstDefectInfo.OrderBy(m => m.Code).ThenBy(m => m.Code).ToList();
+                    if (lstData == null)
+                        return;
+
+                    if (XSizeRange == null || YSizeRange == null)
+                        option = this.lineChartDefect.Option;
+                    else
                     {
-                        YSizeRange[0] -= YSizeRange[0] / 10f;
+                        if (YSizeRange[0] == YSizeRange[1])
-                        YSizeRange[1] += YSizeRange[1] / 10f;
-                    }
-                    YSizeRange[0] /= 100;
-                    YSizeRange[1] /= 100;
-
-                    option = new UILineOption();
-                    option.XAxis.Name = "面宽(cm)";
-                    option.YAxis.Name = "长度(米)";
-                    //option.Grid.Top = 20;//边距
-                    option.Grid.Right = 20;//边距
-
-                    //X轴数据类型
-                    option.XAxisType = UIAxisType.Value;
-                    //设置X/Y轴显示范围
-                    option.XAxis.SetRange(XSizeRange[0], XSizeRange[1]);
-                    option.YAxis.SetRange(YSizeRange[0], YSizeRange[1]);
-                    //坐标轴显示小数位数
-                    option.XAxis.AxisLabel.DecimalPlaces = option.YAxis.AxisLabel.DecimalPlaces = 1;
-                    //X/Y轴画参考线
-                    //option.YAxisScaleLines.Add(new UIScaleLine("上限", 3.5, Color.Red));
-                    //option.YAxisScaleLines.Add(new UIScaleLine("下限", 2.2, Color.Gold)); 
-                    //option.XAxisScaleLines.Add(new UIScaleLine(dt.AddHours(3).DateTimeString(), dt.AddHours(3), Color.Red));
-                    //option.XAxisScaleLines.Add(new UIScaleLine(dt.AddHours(6).DateTimeString(), dt.AddHours(6), Color.Red));
-
-                    option.ToolTip.Visible = true;
-                    //option.ToolTip.Formatter = "怎么自定义X,Y显示名称？？{X}";
-                    option.Title = new UITitle();
-                    option.Title.Text = "";
-                    option.Title.SubText = "";
-                }
-                option.Series.Clear();
-
-                string preCode = "";
-                UILineSeries series = null;
-                foreach (var item in lstData)
-                {
-                    if (preCode != item.Code)//加一组新类型及样式
-                    {
-                        preCode = item.Code;
-                        var one = Config.getDefectItem(modelName, item.Code);
-                        if (one == null)
                         {
-                            AddTextEvent(DateTime.Now, $"绘图", $"getDefectItem({item.Code}) is null!");
+                            YSizeRange[0] -= YSizeRange[0] / 10f;
-                            continue;
+                            YSizeRange[1] += YSizeRange[1] / 10f;
                         }
+                        YSizeRange[0] /= 100;
+                        YSizeRange[1] /= 100;
 
-                        JObject objItem = one as JObject;
+                        option = new UILineOption();
-                        Color color = ColorTranslator.FromHtml(objItem.Value<string>("color"));
+                        option.XAxis.Name = "面宽(cm)";
-                        series = option.AddSeries(new UILineSeries(objItem.Value<string>("name"), color));//加一组
+                        option.YAxis.Name = "长度(米)";
-                        series.Symbol = UILinePointSymbol.Star;
+                        //option.Grid.Top = 20;//边距
-                        series.SymbolSize = 4;
+                        option.Grid.Right = 20;//边距
-                        series.SymbolLineWidth = 2;
+
+                        //X轴数据类型
+                        option.XAxisType = UIAxisType.Value;
+                        //设置X/Y轴显示范围
+                        option.XAxis.SetRange(XSizeRange[0], XSizeRange[1]);
+                        option.YAxis.SetRange(YSizeRange[0], YSizeRange[1]);
+                        //坐标轴显示小数位数
+                        option.XAxis.AxisLabel.DecimalPlaces = option.YAxis.AxisLabel.DecimalPlaces = 1;
+                        //X/Y轴画参考线
+                        //option.YAxisScaleLines.Add(new UIScaleLine("上限", 3.5, Color.Red));
+                        //option.YAxisScaleLines.Add(new UIScaleLine("下限", 2.2, Color.Gold)); 
+                        //option.XAxisScaleLines.Add(new UIScaleLine(dt.AddHours(3).DateTimeString(), dt.AddHours(3), Color.Red));
+                        //option.XAxisScaleLines.Add(new UIScaleLine(dt.AddHours(6).DateTimeString(), dt.AddHours(6), Color.Red));
+
+                        option.ToolTip.Visible = true;
+                        //option.ToolTip.Formatter = "怎么自定义X,Y显示名称？？{X}";
+                        option.Title = new UITitle();
+                        option.Title.Text = "";
+                        option.Title.SubText = "";
+                    }
+                    option.Series.Clear();
+
+                    string preCode = "";
+                    UILineSeries series = null;
+                    foreach (var item in lstData)
+                    {
+                        try
+                        {
+                            if (preCode != item.Code)//加一组新类型及样式
+                            {
+                                preCode = item.Code;
+                                var one = Config.getDefectItem(modelName, item.Code);
+                                if (one == null)
+                                {
+                                    AddTextEvent(DateTime.Now, $"绘图", $"getDefectItem({item.Code}) is null!");
+                                    continue;
+                                }
+
+                                JObject objItem = one as JObject;
+                                Color color = ColorTranslator.FromHtml(objItem.Value<string>("color"));
+                                series = option.AddSeries(new UILineSeries(objItem.Value<string>("name"), color));//加一组
+                                series.Symbol = UILinePointSymbol.Star;
+                                series.SymbolSize = 4;
+                                series.SymbolLineWidth = 2;
+                                series.ShowLine = false;
+                                series.SymbolColor = color;
+                                //数据点显示小数位数（针对当前UILineSeries）
+                                series.XAxisDecimalPlaces = 1;
+                                series.YAxisDecimalPlaces = 2;
+
+                                //series.Smooth = false;  
+                            }
+                            series.Add(item.CentreX, item.CentreY / 100); //cm -> m
+                        }
+                        catch (Exception ex)
+                        {
+                            AddTextEvent(DateTime.Now, $"绘图", $"getDefectItem({item.Code}) is {ex.Message}!");
+                        }
+                    }
+
+                    ////加一组框选
+                    if (addSelRect && !option.Series.ContainsKey("SELECT"))
+                    {
+                        series = option.AddSeries(new UILineSeries("SELECT", Color.Red));
+                        series.Symbol = UILinePointSymbol.Circle;
+                        series.SymbolSize = 6;
+                        series.SymbolLineWidth = 3;
                         series.ShowLine = false;
-                        series.SymbolColor = color;
+                        series.SymbolColor = Color.Red;
                         //数据点显示小数位数（针对当前UILineSeries）
                         series.XAxisDecimalPlaces = 1;
                         series.YAxisDecimalPlaces = 2;
-
+                        //series.Add(1, 1);
-                        //series.Smooth = false;  
                     }
-                    series.Add(item.CentreX, item.CentreY / 100); //cm -> m
-                }
 
-                ////加一组框选
+                    //====
-                if (addSelRect && !option.Series.ContainsKey("SELECT"))
+                    //option.GreaterWarningArea = new UILineWarningArea(3.5);
-                {
+                    //option.LessWarningArea = new UILineWarningArea(2.2, Color.Gold);  
-                    series = option.AddSeries(new UILineSeries("SELECT", Color.Red));
+                    this.BeginInvoke(new System.Action(() =>
-                    series.Symbol = UILinePointSymbol.Circle;
+                    {
-                    series.SymbolSize = 6;
+                        this.lineChartDefect.SetOption(option);
-                    series.SymbolLineWidth = 3;
+                        //series.UpdateYData();//按序号更新Y轴值(可设置值超出范围用于闪烁) 
-                    series.ShowLine = false;
+                    }));
-                    series.SymbolColor = Color.Red;
-                    //数据点显示小数位数（针对当前UILineSeries）
-                    series.XAxisDecimalPlaces = 1;
-                    series.YAxisDecimalPlaces = 2;
-                    //series.Add(1, 1);
                 }
-
+                catch { }
-                //====
-                //option.GreaterWarningArea = new UILineWarningArea(3.5);
-                //option.LessWarningArea = new UILineWarningArea(2.2, Color.Gold);  
-                this.BeginInvoke(new System.Action(() =>
-                {
-                    this.lineChartDefect.SetOption(option);
-                    //series.UpdateYData();//按序号更新Y轴值(可设置值超出范围用于闪烁) 
-                }));
             }
         }
 
@@ -704,7 +733,7 @@ namespace LeatherApp.Page
                     DateTime dt = DateTime.Now;
                     foreach (var item in HDpoints)
                     {
-                        x = item.Y_Dis / 100.0; //cm -> m
+                        x = item.Y_Dis / 100.0 >= 0 ? item.Y_Dis / 100.0 : 1; //cm -> m
                         series1.Add(x, item.Value1);
                         series2.Add(x, item.Value2);
                         series3.Add(x, item.Value3);
@@ -862,7 +891,8 @@ namespace LeatherApp.Page
             uilbKF.Top = 8;
             uilbHD.Top = 8;
             this.btnHeight.Left = this.btnClearAlm.Left + (this.btnClearAlm.Left - this.btnPause.Left);
-            this.btnFenJuan.Left = this.btnHeight.Left + (this.btnHeight.Left - this.btnClearAlm.Left);
+            this.btnCut.Left = this.btnHeight.Left + (this.btnHeight.Left - this.btnClearAlm.Left);
+            this.btnFenJuan.Left = this.btnCut.Left + (this.btnCut.Left - this.btnHeight.Left);
 
             if (Config.OpenHouDuJiLu)
             {
@@ -887,6 +917,8 @@ namespace LeatherApp.Page
         private Thread t_test3;
         private string _prebathid = "";
         private int _reelno = 0;
+        //当前产品需裁孔位
+        //private int MarginHoleWidth = 0;
         private void btnOpen_Click(object sender, EventArgs e)
         {
             this.Activate();
@@ -1002,7 +1034,7 @@ namespace LeatherApp.Page
                                     return;
                                 }
                             }
-                            string barCodeName="",len = "0", batchId = "", reelId = "", erpID = "";
+                            string barCodeName="",len = "0", batchId = "", reelId = "", erpID = "", sDefectType = "";
                             string PJXTBH = "";
                             string mXCL = "", ysXCL = "";
                             string showModelname;
@@ -1245,10 +1277,15 @@ namespace LeatherApp.Page
                                 if (currKey > 0)
                                 {
                                     string szBatchId, szReelId;
-                                    double ldErpLen;
+                                    double ldErpLen ;
                                     szBatchId = txtBatchId.Text.Trim();
                                     szReelId = txtReelId.Text.Trim();
                                     ldErpLen = Convert.ToDouble(numErpLen.Text.Trim());
+
+                                    if (radioButton1.Checked)
+                                        sDefectType = "成检";
+                                    else
+                                        sDefectType = "半检";
                                     //BatchId = code,//code[2]
                                     //ReelId = "1",//code[3]
                                     int mykey = currKey;
@@ -1288,6 +1325,8 @@ namespace LeatherApp.Page
                                     _reelno++;
                                 else
                                     _reelno = 0;
+
+                                //MarginHoleWidth = productInfo.MarginHoleWidth;
                                 record = new Records()
                                 {
                                     currKey = currKey,
@@ -1308,6 +1347,7 @@ namespace LeatherApp.Page
                                     UserName = Config.loginUser.Name,
                                     WorkTeam = Config.loginUser.WorkTeam,
                                     PJXTBH = PJXTBH,
+                                    DefectType = sDefectType,
                                 };
                                 //加入上传数据
                                 CurrUploadDataRecords = new UploadDataRecords()
@@ -1395,7 +1435,11 @@ namespace LeatherApp.Page
                             //注意，这里和修改页共享操作(UI操作)，注意冲突
                             this.Invoke(new System.Action(() =>
                             {
-                                this.txtBarCode.Text = "";
+                                if (Config.CustomerName != "XCL")
+                                    this.txtBarCode.Text = "";
+                                else
+                                    this.txtBarCode.Text = batchId;
+
                                 this.txtBarCodeName.Text= barCodeName;
                                 //txtBatchId.Text = record.BatchId;
                                 //txtReelId.Text = record.ReelId; 
@@ -1786,6 +1830,7 @@ namespace LeatherApp.Page
             while (true)
             {
                 int spdcnt = 0;
+                int overspd = 0;
                 try
                 {
                     if (_cts.IsCancellationRequested)
@@ -1868,16 +1913,32 @@ namespace LeatherApp.Page
                                     lock (lockCurrKey)
                                     {
                                         errStep = 5;
-                                        curRecord.Len = yqjimi;
+                                        curRecord.Len = yqjimi + Config.JMOffset;
                                         curRecord.TimeLen = pStopWatch.ElapsedMilliseconds / 1000.0d / 60.0d;//总时间 分
                                     }
                                     double tRunSpd = GetSpd();//1s计算的实时速度
                                     this.BeginInvoke(new System.Action(() =>
                                     {
                                         AddTextEvent(DateTime.Now, $"记录", $"(计米{yqjimi}米)， 速度：{tRunSpd}米/分", WarningEnum.Normal, false);
-                                        this.lblLen.Text = $"{yqjimi}米";//$"{lenMi}米";
+                                        this.lblLen.Text = $"{yqjimi + Config.JMOffset}米";//$"{lenMi}米";
                                         this.lblSpeed.Text = $"速度：{tRunSpd}米/分";//$"速度：{Math.Round(lenMi / curRecord.TimeLen, 2)}米/分";
                                     }));
+
+                                    //速度超速 65m/min 切多次 进行报警
+                                    if(Config.OpenOverSpeed)
+                                    {
+                                        if(overspd > 5 && tRunSpd >(65))
+                                        {
+                                            overspd = 0;
+                                            //报警
+                                            Task.Run(async () =>
+                                            {
+                                                devContainer.io_output(CMDName.蜂鸣器输出, true, true, 5000);
+                                                await Task.Delay(5);
+                                            });
+                                        }
+                                        overspd++;
+                                    }
                                     #region 二次判定
                                     errStep = 6;
                                     //处理2次判定
@@ -2044,6 +2105,7 @@ namespace LeatherApp.Page
                                                                         }
                                                                     }
                                                                     lineChartDefect.Focus();
+                                                                    frmDefect.Dispose();
                                                                 }));
 
                                                                 #endregion
@@ -2663,6 +2725,7 @@ namespace LeatherApp.Page
                                                             }
                                                         }
                                                         lineChartDefect.Focus();
+                                                        frmDefect.Dispose();
                                                     }));
                                                     break;
                                                 }
@@ -3457,13 +3520,16 @@ namespace LeatherApp.Page
                             this.BeginInvoke(new System.Action(() =>
                             {
                                 //这里显示了第1张图的最后一个缺陷
-                                if (this.uiDataGridView1.Rows.Count == 0 && defectInfo!=null)
+                                //if (this.uiDataGridView1.Rows.Count == 0 && defectInfo!=null)
-                                    this.picDefectImage.loadImage(LastImg);
+                                //    this.picDefectImage.loadImage(LastImg);
 
                                 foreach (var rowItem in dataRowlist) 
                                     this.uiDataGridView1.Rows.Insert(0, rowItem); 
                                 this.uiMiniPagination1.TotalCount = res.record.DefectInfoList.Count;
 
+                                //显示最新缺陷
+                                if (this.uiDataGridView1.Rows.Count != 0 && defectInfo != null)
+                                    this.picDefectImage.loadImage(LastImg);
                                 //
                                 double len = Math.Round((res.photoIndex + 1) * bmpHeight * 1.0d / Config.cm2px_y+0.005f, 2);
                                 this.reDrawDefectPoints(res.modelName, res.record.DefectInfoList,  new double[] { 0, Math.Round(res.record.FaceWidthMax+ 0.005f, 2) }, new double[] { 0, len }); 
@@ -3806,18 +3872,23 @@ namespace LeatherApp.Page
                 //新材料上传ERP
                 if (!string.IsNullOrWhiteSpace(Config.ErpDBConStr) && Config.CustomerName == "XCL")
                 {
-                    AddTextEvent(DateTime.Now, "ERP上传", $"PJXTBH:{model.BarCodeName},批号:{model.BatchId},卷号:{model.ReelId}.开始上传。");
+                    AddTextEvent(DateTime.Now, "ERP上传", $"PJXTBH:{model.PJXTBH},批号:{model.BatchId},卷号:{model.ReelId}.开始上传。");
-                    try
+                    for (int i = 0; i < 3; i++)
                     {
-                        if(DBUtils.DataUploadErp(model))
+                        try
-                            AddTextEvent(DateTime.Now, "ERP上传", $"PJXTBH:{model.BarCodeName},批号:{model.BatchId},卷号:{model.ReelId}.上传成功。");
+                        {
-                        else
+                            if (DBUtils.DataUploadErp(model))
-                            AddTextEvent(DateTime.Now, "ERP上传", $"PJXTBH:{model.BarCodeName},批号:{model.BatchId},卷号:{model.ReelId}.已有数据。");
+                                AddTextEvent(DateTime.Now, "ERP上传", $"PJXTBH:{model.PJXTBH},批号:{model.BatchId},卷号:{model.ReelId}.上传成功。");
-                    }
+                            else
-                    catch (Exception es)
+                                AddTextEvent(DateTime.Now, "ERP上传", $"PJXTBH:{model.PJXTBH},批号:{model.BatchId},卷号:{model.ReelId}.已有数据。");
-                    {
+                            break;
-                        AddTextEvent(DateTime.Now, "ERP上传", $"PJXTBH:{model.BarCodeName},批号:{model.BatchId},卷号:{model.ReelId}.上传失败{es.Message}", WarningEnum.Low, true);
+                        }
+                        catch (Exception es)
+                        {
+                            AddTextEvent(DateTime.Now, "ERP上传", $"PJXTBH:{model.PJXTBH},批号:{model.BatchId},卷号:{model.ReelId}.上传失败{es.Message}", WarningEnum.Low, true);
+                        }
                     }
+                    
                 }
                 //上传服务器
                 if (!string.IsNullOrEmpty(Config.ServerDBConStr))
@@ -3900,7 +3971,7 @@ namespace LeatherApp.Page
                 return;
             }
             AddTextEvent(DateTime.Now,"停机", "停机中...");
-            this.btnStart.Enabled =  this.btnEnd.Enabled = this.btnPause.Enabled = this.btnHeight.Enabled = this.btnFenJuan.Enabled = false;
+            this.btnStart.Enabled =  this.btnEnd.Enabled = this.btnPause.Enabled = this.btnHeight.Enabled = this.btnCut.Enabled = this.btnFenJuan.Enabled = false;
             this.btnClose.Enabled = false;
             this.btnOpen.Enabled = true; 
             tcbarLightValue.Enabled = false;
@@ -3960,9 +4031,18 @@ namespace LeatherApp.Page
                 AddTextEvent(DateTime.Now, "启动", "还未扫码获取检测信息！", WarningEnum.Low);
                 return;
             }
+            if (Config.CustomerName == "XCL")
+            {
+                if (!radioButton1.Checked && !radioButton2.Checked)
+                {
+                    AddTextEvent(DateTime.Now, "启动", "未选择[成检]或[半检]！", WarningEnum.Low);
+                    return;
+                }
+            }
             AddTextEvent(DateTime.Now,"启动", "下发启动指令...");
             this.btnPause.Enabled = true;
             btnHeight.Enabled = true;
+            btnCut.Enabled = true;
             btnFenJuan.Enabled = true;
             btnStart.Enabled = false;//用于防止回车触发
             btnStart.Enabled = true;//用于防止回车触发
@@ -3974,9 +4054,9 @@ namespace LeatherApp.Page
             {
                 if (!compareIOInput(CMDName.暂停按钮))//硬件急停
                 {
+                    this.startCommand();
                     AddTextEvent(DateTime.Now, "启动", "下发IO指令...");
                     this.devContainer.devIOCard.writeBitState(0, 0, true); 
-                    this.startCommand();
                     //Task.Run(async () =>
                     //{
                         //await Task.Delay(500);
@@ -4210,6 +4290,10 @@ namespace LeatherApp.Page
                     Records curRecord = Hashtable.Synchronized(htTask)[currKey] as Records;
                     curRecord.BatchId = txtBatchId.Text;
                     curRecord.ReelId = txtReelId.Text;
+                    if (radioButton1.Checked)
+                        curRecord.DefectType = "成检";
+                    else
+                        curRecord.DefectType = "半检";
                     curRecord.ErpLen = numErpLen.IsEmpty ? curRecord.ErpLen : Convert.ToDouble(numErpLen.Text.Trim());
                 }
                 currentState = CurrentStateEnum.运行中;
@@ -4220,6 +4304,7 @@ namespace LeatherApp.Page
                 this.btnStart.Enabled = false;
                 this.btnEnd.Enabled = this.btnPause.Enabled = true;
                 btnHeight.Enabled = true;
+                this.btnCut.Enabled = true;
                 btnFenJuan.Enabled = true;
             }));
         }
@@ -4277,7 +4362,7 @@ namespace LeatherApp.Page
         private void btnEnd_Click(object sender, EventArgs e)
         {
             this.Activate();
-            if (!ShowAskDialog("提示", "是否保存当前检测结果？", UIStyle.Blue, false, UIMessageDialogButtons.Cancel))
+            if (!ShowAskDialog("提示", "是否结束当前检测结果？", UIStyle.Blue, false, UIMessageDialogButtons.Cancel))
                 return;
 
             btnEnd.Enabled = false;//用于防止回车触发
@@ -4372,8 +4457,11 @@ namespace LeatherApp.Page
                 this.btnStart.Enabled = true;
                 this.btnEnd.Enabled = this.btnPause.Enabled = false;//这里有问题，应该是devPlc回调设置
                 btnHeight.Enabled = false;
+                btnCut.Enabled = false;
                 btnFenJuan.Enabled = false;
                 _IsGetErpCode = false;
+                radioButton1.Checked = false;
+                radioButton2.Checked = false;
             }
             else
             {
@@ -4769,7 +4857,8 @@ namespace LeatherApp.Page
             uilbHD.Top = 8;
 
             this.btnHeight.Left = this.btnClearAlm.Left + (this.btnClearAlm.Left - this.btnPause.Left);
-            this.btnFenJuan.Left = this.btnHeight.Left + (this.btnHeight.Left - this.btnClearAlm.Left);
+            this.btnCut.Left = this.btnHeight.Left + (this.btnHeight.Left - this.btnClearAlm.Left);
+            this.btnFenJuan.Left = this.btnCut.Left + (this.btnCut.Left - this.btnHeight.Left);
 
             if (Config.OpenHouDuJiLu)
             {
@@ -4792,7 +4881,8 @@ namespace LeatherApp.Page
             uilbHD.Top = 8;
 
             this.btnHeight.Left = this.btnClearAlm.Left + (this.btnClearAlm.Left - this.btnPause.Left);
-            this.btnFenJuan.Left = this.btnHeight.Left + (this.btnHeight.Left - this.btnClearAlm.Left);
+            this.btnCut.Left = this.btnHeight.Left + (this.btnHeight.Left - this.btnClearAlm.Left);
+            this.btnFenJuan.Left = this.btnCut.Left + (this.btnCut.Left - this.btnHeight.Left);
             if (Config.OpenHouDuJiLu)
             {
                 uiTitlePanel4.Left = uiTitlePanel3.Left;
@@ -5089,6 +5179,7 @@ namespace LeatherApp.Page
                     };
                     ThicknessInfo.ModifyUserCode = ThicknessInfo.CreateUserCode = curRecord.CreateUserCode;
                     curRecord.ThicknessList.Add(ThicknessInfo);
+                    btnStart_Click(null, null);
                 }
 
                 frm.Dispose();
@@ -5139,6 +5230,7 @@ namespace LeatherApp.Page
                         btnStart_Click(null, null);
                     }
                 }
+                partitionFrm.Dispose();
             }
             else
             {
@@ -5334,18 +5426,23 @@ namespace LeatherApp.Page
                 //新材料上传ERP
                 if (!string.IsNullOrWhiteSpace(Config.ErpDBConStr) && Config.CustomerName == "XCL")
                 {
-                    AddTextEvent(DateTime.Now, "ERP上传", $"PJXTBH:{model.BarCodeName},批号:{model.BatchId},卷号:{model.ReelId}.开始上传。");
+                    AddTextEvent(DateTime.Now, "ERP上传", $"PJXTBH:{model.PJXTBH},批号:{model.BatchId},卷号:{model.ReelId}.开始上传。");
-                    try
+                    for (int i = 0; i < 3; i++)
                     {
-                        if (DBUtils.DataUploadErp(model))
+                        try
-                            AddTextEvent(DateTime.Now, "ERP上传", $"PJXTBH:{model.BarCodeName},批号:{model.BatchId},卷号:{model.ReelId}.上传成功。");
+                        {
-                        else
+                            if (DBUtils.DataUploadErp(model))
-                            AddTextEvent(DateTime.Now, "ERP上传", $"PJXTBH:{model.BarCodeName},批号:{model.BatchId},卷号:{model.ReelId}.已有数据。");
+                                AddTextEvent(DateTime.Now, "ERP上传", $"PJXTBH:{model.PJXTBH},批号:{model.BatchId},卷号:{model.ReelId}.上传成功。");
-                    }
+                            else
-                    catch (Exception es)
+                                AddTextEvent(DateTime.Now, "ERP上传", $"PJXTBH:{model.PJXTBH},批号:{model.BatchId},卷号:{model.ReelId}.已有数据。");
-                    {
+                            break;
-                        AddTextEvent(DateTime.Now, "ERP上传", $"PJXTBH:{model.BarCodeName},批号:{model.BatchId},卷号:{model.ReelId}.上传失败{es.Message}", WarningEnum.Low, true);
+                        }
+                        catch (Exception es)
+                        {
+                            AddTextEvent(DateTime.Now, "ERP上传", $"PJXTBH:{model.PJXTBH},批号:{model.BatchId},卷号:{model.ReelId}.上传失败{es.Message}", WarningEnum.Low, true);
+                        }
                     }
+                    
                 }
                 //数据上传
                 if (!string.IsNullOrEmpty(Config.ServerDBConStr))
@@ -5427,6 +5524,44 @@ namespace LeatherApp.Page
                 };
                 htTask.Add(currKey, record);
 
+                CurrUploadDataRecords = new UploadDataRecords()
+                {
+                    Color = model.Color,
+                    Material = model.ProductInfo.Material,//codes[0] + "-" + codes[1],// (materialItem == null ? "未知" : materialItem["name"].ToString()), 
+                    BarCode = model.BarCode,
+                    BarCodeName = model.BarCodeName,
+                    ErpLen = model.ErpLen,
+                    BatchId = model.BatchId,
+                    ReelId = model.ReelId,
+
+                    Name = model.ProductInfo.Name,
+                    Spec = model.ProductInfo.Spec,
+                    LightValue = model.ProductInfo.LightValue,
+                    ExposureTime = model.ProductInfo.ExposureTime,
+                    Gain = model.ProductInfo.Gain,
+                    QualifiedLimitList = model.ProductInfo.QualifiedLimitList,
+                    GradeLimitList = model.ProductInfo.GradeLimitList,
+                    ModelName = model.ProductInfo.ModelName,
+                    DefectAreaLimit = model.ProductInfo.DefectAreaLimit,
+                    DefectCountLimit = model.ProductInfo.DefectCountLimit,
+                    DefectPauseForUser = model.ProductInfo.DefectPauseForUser,
+                    DefectPauseOption = model.ProductInfo.DefectPauseOption,
+                    DefectCntLength = model.ProductInfo.DefectCntLength,
+                    WarnDefect = model.ProductInfo.WarnDefect,
+                    ClassType = model.ProductInfo.ClassType,
+                    HalconAreaThr = model.ProductInfo.HalconAreaThr,
+
+                    ModifyUserCode = Config.loginUser.Code,
+                    CreateUserCode = Config.loginUser.Code,
+                    DefectInfoList = new List<DefectInfo>(),
+
+                    cm2px_x = Config.cm2px_x,
+                    cm2px_y = Config.cm2px_y,
+
+                    UserName = Config.loginUser.Name,
+                    WorkTeam = Config.loginUser.WorkTeam
+                };
+
                 AddTextEvent(DateTime.Now, "新分卷", $"({key}) 条码({model.BarCode})批号({batch})分卷号({nreel})。");
                 _isDefect = false;
             }
@@ -5618,5 +5753,95 @@ namespace LeatherApp.Page
 
         }
         #endregion
+
+        #region 裁切
+        private void btnCut_Click(object sender, EventArgs e)
+        {
+            //暂停
+            btnPause_Click(null, null);
+            if (currKey > 0)
+            {
+                Records curRecord = Hashtable.Synchronized(htTask)[currKey] as Records;
+                CuttingFrm frm = new CuttingFrm(null);
+                frm.ShowDialog(this);
+                if (frm.DialogResult == DialogResult.Cancel)
+                    return;
+                else
+                {
+                    AddTextEvent(DateTime.Now, "降级裁切", $"裁切信息:米数({frm.Cut_info[0]}),原因({frm.Cut_info[1]}),降级({frm.Cut_info[2]})");
+                    if (SaveCutingInfo(frm.Cut_info))
+                    {
+                        bool haveJT = false;
+                        //foreach (var item in list)
+                        //{
+                        //    if (item.Name == "接头" || item.Name == "纸接")
+                        //        haveJT = true;
+                        //}
+                        //if (!haveJT)
+                        //{
+                        //    //不存在接头时进行裁切 记录裁切数据
+                        //    //记录分段信息
+                        //    double fdLen = Math.Round(list[0].CentreY / 100.0 - SectioningLen, 2);
+                        //    if (fdLen > 0)
+                        //    {
+                        //        SectioningLen = list[0].CentreY / 100.0;
+                        //        //添加分段信息
+                        //        curRecord.FDInfor.Add(new double[2] { fdLen, Math.Round(list[0].CentreY / 100.0, 2) });
+                        //    }
+                        //}
+                        //添加分段信息
+                        //记录分段信息
+                        double ydis = GetDis();
+                        double fdLen = Math.Round(ydis - SectioningLen, 2);
+                        if (fdLen > 0)
+                        {
+                            SectioningLen = ydis;
+                            //添加分段信息
+                            curRecord.FDInfor.Add(new double[2] { fdLen, Math.Round(ydis, 2) });
+                        }
+                    }
+                    else
+                    {
+                        UIMessageTip.ShowWarning("无记录数据！", 2000);
+                    }
+                }
+            }
+            else
+                UIMessageTip.ShowWarning("无记录数据！", 2000);
+        }
+
+        #region 降级裁切
+        public bool SaveCutingInfo(string[] info)
+        {
+            Records curRecord = Hashtable.Synchronized(htTask)[currKey] as Records;
+            if (curRecord != null)
+            {
+                Records model = curRecord;
+                if (model.DowngradeInformation == null)
+                    model.DowngradeInformation = new List<string[]>();
+                model.DowngradeInformation.Add(info);
+            }
+            else
+            {
+                return false;
+            }
+            return true;
+        }
+        #endregion
+
+        #endregion
+
+        private void radioButton1_CheckedChanged(object sender, EventArgs e)
+        {
+            if (currKey == 0) return;
+            Records record = Hashtable.Synchronized(htTask)[currKey] as Records;
+            if (record != null)
+            {
+                if (radioButton1.Checked)
+                    record.DefectType = "成检";
+                else
+                    record.DefectType = "半检";
+            }
+        }
     }
 }

LeatherProject/LeatherApp/Page/FProductInfo.Designer.cs

@@ -33,12 +33,12 @@
             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 dataGridViewCellStyle3 = 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 dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
             this.uiTitlePanel2 = new Sunny.UI.UITitlePanel();
             this.tcbarTensionValue = new Sunny.UI.UITrackBar();
             this.tcbarGain = new Sunny.UI.UITrackBar();
@@ -74,6 +74,14 @@
             this.uiLabel7 = new Sunny.UI.UILabel();
             this.uiTitlePanel5 = new Sunny.UI.UITitlePanel();
             this.uiDataGridView1 = new Sunny.UI.UIDataGridView();
+            this.col_code = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.col_zxd = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.col_area = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.col_contrast_lower = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.col_contrast_top = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.col_IsOR = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.col_Len = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.col_Cnt = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.uiTitlePanel6 = new Sunny.UI.UITitlePanel();
             this.uiDataGridView2 = new Sunny.UI.UIDataGridView();
             this.col2_code = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -97,14 +105,6 @@
             this.cmbColor = new Sunny.UI.UIComboBox();
             this.uiLabel3 = new Sunny.UI.UILabel();
             this.uiLabel2 = new Sunny.UI.UILabel();
-            this.col_code = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.col_zxd = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.col_area = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.col_contrast_lower = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.col_contrast_top = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.col_IsOR = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.col_Len = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.col_Cnt = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.uiTitlePanel2.SuspendLayout();
             this.uiTitlePanel3.SuspendLayout();
             this.uiTitlePanel4.SuspendLayout();
@@ -385,7 +385,7 @@
             this.tbClass.ButtonSymbolOffset = new System.Drawing.Point(0, 0);
             this.tbClass.Cursor = System.Windows.Forms.Cursors.IBeam;
             this.tbClass.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.tbClass.Location = new System.Drawing.Point(4, 176);
+            this.tbClass.Location = new System.Drawing.Point(4, 189);
             this.tbClass.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.tbClass.MinimumSize = new System.Drawing.Size(1, 16);
             this.tbClass.Name = "tbClass";
@@ -402,7 +402,7 @@
             this.uiLabel13.AutoSize = true;
             this.uiLabel13.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.uiLabel13.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            this.uiLabel13.Location = new System.Drawing.Point(3, 210);
+            this.uiLabel13.Location = new System.Drawing.Point(3, 223);
             this.uiLabel13.Name = "uiLabel13";
             this.uiLabel13.Size = new System.Drawing.Size(215, 21);
             this.uiLabel13.Style = Sunny.UI.UIStyle.Custom;
@@ -414,7 +414,7 @@
             // 
             this.tbAera.FillColor = System.Drawing.Color.White;
             this.tbAera.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.tbAera.Location = new System.Drawing.Point(4, 236);
+            this.tbAera.Location = new System.Drawing.Point(4, 249);
             this.tbAera.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.tbAera.MinimumSize = new System.Drawing.Size(63, 0);
             this.tbAera.Name = "tbAera";
@@ -431,7 +431,7 @@
             this.uiLabel12.AutoSize = true;
             this.uiLabel12.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.uiLabel12.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            this.uiLabel12.Location = new System.Drawing.Point(5, 150);
+            this.uiLabel12.Location = new System.Drawing.Point(5, 163);
             this.uiLabel12.Name = "uiLabel12";
             this.uiLabel12.Size = new System.Drawing.Size(138, 21);
             this.uiLabel12.Style = Sunny.UI.UIStyle.Custom;
@@ -447,7 +447,7 @@
             this.cmbModelName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.cmbModelName.ItemHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(200)))), ((int)(((byte)(255)))));
             this.cmbModelName.ItemSelectForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
-            this.cmbModelName.Location = new System.Drawing.Point(4, 85);
+            this.cmbModelName.Location = new System.Drawing.Point(4, 70);
             this.cmbModelName.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.cmbModelName.MinimumSize = new System.Drawing.Size(63, 0);
             this.cmbModelName.Name = "cmbModelName";
@@ -724,6 +724,67 @@
             this.uiDataGridView1.Style = Sunny.UI.UIStyle.Custom;
             this.uiDataGridView1.TabIndex = 21;
             // 
+            // col_code
+            // 
+            this.col_code.DataPropertyName = "Code";
+            this.col_code.HeaderText = "code";
+            this.col_code.MinimumWidth = 8;
+            this.col_code.Name = "col_code";
+            this.col_code.ReadOnly = true;
+            this.col_code.Visible = false;
+            this.col_code.Width = 150;
+            // 
+            // col_zxd
+            // 
+            this.col_zxd.DataPropertyName = "ZXD";
+            dataGridViewCellStyle3.NullValue = null;
+            this.col_zxd.DefaultCellStyle = dataGridViewCellStyle3;
+            this.col_zxd.HeaderText = "置信度";
+            this.col_zxd.MinimumWidth = 20;
+            this.col_zxd.Name = "col_zxd";
+            this.col_zxd.Width = 150;
+            // 
+            // col_area
+            // 
+            this.col_area.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.col_area.DataPropertyName = "Area";
+            this.col_area.HeaderText = "面积(mm^2)";
+            this.col_area.MinimumWidth = 20;
+            this.col_area.Name = "col_area";
+            // 
+            // col_contrast_lower
+            // 
+            this.col_contrast_lower.DataPropertyName = "Contrast";
+            this.col_contrast_lower.HeaderText = "对比度(下限)";
+            this.col_contrast_lower.MinimumWidth = 80;
+            this.col_contrast_lower.Name = "col_contrast_lower";
+            this.col_contrast_lower.Width = 120;
+            // 
+            // col_contrast_top
+            // 
+            this.col_contrast_top.HeaderText = "对比度(上限)";
+            this.col_contrast_top.MinimumWidth = 80;
+            this.col_contrast_top.Name = "col_contrast_top";
+            this.col_contrast_top.Width = 120;
+            // 
+            // col_IsOR
+            // 
+            this.col_IsOR.HeaderText = "或向选择";
+            this.col_IsOR.MinimumWidth = 8;
+            this.col_IsOR.Name = "col_IsOR";
+            this.col_IsOR.Width = 150;
+            // 
+            // col_Len
+            // 
+            this.col_Len.HeaderText = "报警长度(m)";
+            this.col_Len.Name = "col_Len";
+            this.col_Len.Width = 130;
+            // 
+            // col_Cnt
+            // 
+            this.col_Cnt.HeaderText = "报警数量";
+            this.col_Cnt.Name = "col_Cnt";
+            // 
             // uiTitlePanel6
             // 
             this.uiTitlePanel6.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
@@ -1102,67 +1163,6 @@
             this.uiLabel2.Text = "产品颜色";
             this.uiLabel2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
-            // col_code
-            // 
-            this.col_code.DataPropertyName = "Code";
-            this.col_code.HeaderText = "code";
-            this.col_code.MinimumWidth = 8;
-            this.col_code.Name = "col_code";
-            this.col_code.ReadOnly = true;
-            this.col_code.Visible = false;
-            this.col_code.Width = 150;
-            // 
-            // col_zxd
-            // 
-            this.col_zxd.DataPropertyName = "ZXD";
-            dataGridViewCellStyle3.NullValue = null;
-            this.col_zxd.DefaultCellStyle = dataGridViewCellStyle3;
-            this.col_zxd.HeaderText = "置信度";
-            this.col_zxd.MinimumWidth = 20;
-            this.col_zxd.Name = "col_zxd";
-            this.col_zxd.Width = 150;
-            // 
-            // col_area
-            // 
-            this.col_area.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
-            this.col_area.DataPropertyName = "Area";
-            this.col_area.HeaderText = "面积(mm^2)";
-            this.col_area.MinimumWidth = 20;
-            this.col_area.Name = "col_area";
-            // 
-            // col_contrast_lower
-            // 
-            this.col_contrast_lower.DataPropertyName = "Contrast";
-            this.col_contrast_lower.HeaderText = "对比度(下限)";
-            this.col_contrast_lower.MinimumWidth = 80;
-            this.col_contrast_lower.Name = "col_contrast_lower";
-            this.col_contrast_lower.Width = 120;
-            // 
-            // col_contrast_top
-            // 
-            this.col_contrast_top.HeaderText = "对比度(上限)";
-            this.col_contrast_top.MinimumWidth = 80;
-            this.col_contrast_top.Name = "col_contrast_top";
-            this.col_contrast_top.Width = 120;
-            // 
-            // col_IsOR
-            // 
-            this.col_IsOR.HeaderText = "或向选择";
-            this.col_IsOR.MinimumWidth = 8;
-            this.col_IsOR.Name = "col_IsOR";
-            this.col_IsOR.Width = 150;
-            // 
-            // col_Len
-            // 
-            this.col_Len.HeaderText = "报警长度(m)";
-            this.col_Len.Name = "col_Len";
-            this.col_Len.Width = 130;
-            // 
-            // col_Cnt
-            // 
-            this.col_Cnt.HeaderText = "报警数量";
-            this.col_Cnt.Name = "col_Cnt";
-            // 
             // FProductInfo
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;

LeatherProject/LeatherApp/Page/FProductInfo.cs

@@ -16,6 +16,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using System.Windows.Forms.VisualStyles;
 
 namespace LeatherApp.Page
 {
@@ -108,6 +109,15 @@ namespace LeatherApp.Page
                 this.tcbarGain.Minimum = (int)value[0];
                 this.tcbarGain.Maximum = (int)value[1];
             }
+
+            if(Config.CustomerName == "XCL")
+            {
+                uiDataGridView2.Columns["col2_1"].HeaderText = "一等品";
+                uiDataGridView2.Columns["col2_2"].Visible = false;
+                uiDataGridView2.Columns["col2_3"].Visible = false;
+                uiDataGridView2.Columns["col2_4"].HeaderText = "二等品";
+                uiDataGridView2.Columns["col2_5"].HeaderText = "废品";
+            }
             //
             clear(true); 
         }

LeatherProject/LeatherApp/Page/FReport.cs

@@ -153,9 +153,25 @@ namespace LeatherApp.Page
             var list = uiDataGridView1.DataSource as List<Records>;
             for (int i = 0; i < uiDataGridView1.Rows.Count; i++)
             {
-                if (list[i].Grade < 1) uiDataGridView1.Rows[i].Cells["colGrade"].Value = "";
+                if (Config.CustomerName == "XCL")
-                else if (list[i].Grade <= 5) uiDataGridView1.Rows[i].Cells["colGrade"].Value =  (char)(list[i].Grade+64);
+                {
-                else uiDataGridView1.Rows[i].Cells["colGrade"].Value = "不合格";
+                    if (list[i].Grade < 1) uiDataGridView1.Rows[i].Cells["colGrade"].Value = "一等品";
+                    else if (list[i].Grade <= 5)
+                    { 
+                        if(list[i].Grade == 1)
+                            uiDataGridView1.Rows[i].Cells["colGrade"].Value = "一等品";
+                        else if (list[i].Grade == 5)
+                            uiDataGridView1.Rows[i].Cells["colGrade"].Value = "废品";
+                        else uiDataGridView1.Rows[i].Cells["colGrade"].Value = "二等品";
+                    }
+                    else uiDataGridView1.Rows[i].Cells["colGrade"].Value = "二等品";
+                }
+                else
+                {
+                    if (list[i].Grade < 1) uiDataGridView1.Rows[i].Cells["colGrade"].Value = "";
+                    else if (list[i].Grade <= 5) uiDataGridView1.Rows[i].Cells["colGrade"].Value = (char)(list[i].Grade + 64);
+                    else uiDataGridView1.Rows[i].Cells["colGrade"].Value = "不合格";
+                }
                 //if (list[i].RoleInfo != null)
                 //    uiDataGridView1.Rows[i].Cells["colRoleName"].Value = list[i].RoleInfo.Name;
             }
@@ -237,9 +253,26 @@ namespace LeatherApp.Page
                 err = 4;
                 //
                 string Grade = "";
-                if (record.Grade < 1) Grade = "";
+                if (Config.CustomerName != "XCL")
-                else if (record.Grade <= 5) Grade = (char)(record.Grade + 64)+"";
+                {
-                else Grade = "不合格";
+                    if (record.Grade < 1) Grade = "";
+                    else if (record.Grade <= 5) Grade = (char)(record.Grade + 64) + "";
+                    else Grade = "不合格";
+                }
+                else
+                {
+                    if (record.Grade < 1) Grade = "一等品";
+                    else if (record.Grade <= 5)
+                    {
+                        if(record.Grade == 1)
+                            Grade = "一等品";
+                        else if (record.Grade == 5)
+                            Grade = "废品";
+                        else 
+                            Grade = "二等品";
+                    }
+                    else Grade = "二等品";
+                }
                 JsonProductDefects data = new JsonProductDefects()
                 {
                     ProName = record.BarCodeName,

LeatherProject/LeatherApp/Page/FSysSetting.Designer.cs

@@ -69,6 +69,8 @@
             this.colState = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.colCreateTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.uiTitlePanel1 = new Sunny.UI.UITitlePanel();
+            this.tbCHLabeel = new Sunny.UI.UITextBox();
+            this.uiLabel31 = new Sunny.UI.UILabel();
             this.chIP = new Sunny.UI.UITextBox();
             this.uiLabel23 = new Sunny.UI.UILabel();
             this.uiSymbolButton2 = new Sunny.UI.UISymbolButton();
@@ -97,13 +99,10 @@
             this.numMiddleSuperposition = new Sunny.UI.UINumPadTextBox();
             this.uiLabel18 = new Sunny.UI.UILabel();
             this.btnMinReload2 = new Sunny.UI.UISymbolButton();
-            this.numMarginHoleWidth = new Sunny.UI.UINumPadTextBox();
             this.numcm2px_y = new Sunny.UI.UINumPadTextBox();
             this.btnMinSave2 = new Sunny.UI.UISymbolButton();
             this.numcm2px_x = new Sunny.UI.UINumPadTextBox();
-            this.uiLabel17 = new Sunny.UI.UILabel();
             this.uiLabel19 = new Sunny.UI.UILabel();
-            this.uiLabel16 = new Sunny.UI.UILabel();
             this.uiLabel4 = new Sunny.UI.UILabel();
             this.uiLabel7 = new Sunny.UI.UILabel();
             this.uiLabel5 = new Sunny.UI.UILabel();
@@ -125,8 +124,10 @@
             this.uiLabel9 = new Sunny.UI.UILabel();
             this.uiLabel10 = new Sunny.UI.UILabel();
             this.uiToolTip1 = new Sunny.UI.UIToolTip(this.components);
-            this.tbCHLabeel = new Sunny.UI.UITextBox();
+            this.uiCheckBox1 = new Sunny.UI.UICheckBox();
-            this.uiLabel31 = new Sunny.UI.UILabel();
+            this.uiLabel16 = new Sunny.UI.UILabel();
+            this.uiLabel17 = new Sunny.UI.UILabel();
+            this.numMarginHoleWidth = new Sunny.UI.UINumPadTextBox();
             this.uiTitlePanel3.SuspendLayout();
             this.uiPanel1.SuspendLayout();
             this.fpnUserOpBtns.SuspendLayout();
@@ -733,6 +734,36 @@
             this.uiTitlePanel1.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
             this.uiTitlePanel1.TitleColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
             // 
+            // tbCHLabeel
+            // 
+            this.tbCHLabeel.ButtonSymbolOffset = new System.Drawing.Point(0, 0);
+            this.tbCHLabeel.Cursor = System.Windows.Forms.Cursors.IBeam;
+            this.tbCHLabeel.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tbCHLabeel.Location = new System.Drawing.Point(125, 224);
+            this.tbCHLabeel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.tbCHLabeel.MinimumSize = new System.Drawing.Size(1, 16);
+            this.tbCHLabeel.Name = "tbCHLabeel";
+            this.tbCHLabeel.Padding = new System.Windows.Forms.Padding(5);
+            this.tbCHLabeel.ShowText = false;
+            this.tbCHLabeel.Size = new System.Drawing.Size(219, 29);
+            this.tbCHLabeel.Style = Sunny.UI.UIStyle.Custom;
+            this.tbCHLabeel.TabIndex = 113;
+            this.tbCHLabeel.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
+            this.tbCHLabeel.Watermark = "";
+            // 
+            // uiLabel31
+            // 
+            this.uiLabel31.AutoSize = true;
+            this.uiLabel31.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.uiLabel31.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
+            this.uiLabel31.Location = new System.Drawing.Point(8, 223);
+            this.uiLabel31.Name = "uiLabel31";
+            this.uiLabel31.Size = new System.Drawing.Size(74, 21);
+            this.uiLabel31.Style = Sunny.UI.UIStyle.Custom;
+            this.uiLabel31.TabIndex = 112;
+            this.uiLabel31.Text = "测厚标签";
+            this.uiLabel31.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
             // chIP
             // 
             this.chIP.ButtonSymbolOffset = new System.Drawing.Point(0, 0);
@@ -1191,23 +1222,6 @@
             this.uiToolTip1.SetToolTip(this.btnMinReload2, "重新加载设置");
             this.btnMinReload2.Click += new System.EventHandler(this.btnMinReload_Click);
             // 
-            // numMarginHoleWidth
-            // 
-            this.numMarginHoleWidth.FillColor = System.Drawing.Color.White;
-            this.numMarginHoleWidth.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.numMarginHoleWidth.Location = new System.Drawing.Point(125, 119);
-            this.numMarginHoleWidth.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.numMarginHoleWidth.MinimumSize = new System.Drawing.Size(63, 0);
-            this.numMarginHoleWidth.Name = "numMarginHoleWidth";
-            this.numMarginHoleWidth.NumPadType = Sunny.UI.NumPadType.Integer;
-            this.numMarginHoleWidth.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2);
-            this.numMarginHoleWidth.Size = new System.Drawing.Size(137, 29);
-            this.numMarginHoleWidth.Style = Sunny.UI.UIStyle.Custom;
-            this.numMarginHoleWidth.TabIndex = 32;
-            this.numMarginHoleWidth.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
-            this.numMarginHoleWidth.UseWaitCursor = true;
-            this.numMarginHoleWidth.Watermark = "";
-            // 
             // numcm2px_y
             // 
             this.numcm2px_y.FillColor = System.Drawing.Color.White;
@@ -1257,19 +1271,6 @@
             this.numcm2px_x.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
             this.numcm2px_x.Watermark = "";
             // 
-            // uiLabel17
-            // 
-            this.uiLabel17.AutoSize = true;
-            this.uiLabel17.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiLabel17.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            this.uiLabel17.Location = new System.Drawing.Point(8, 125);
-            this.uiLabel17.Name = "uiLabel17";
-            this.uiLabel17.Size = new System.Drawing.Size(74, 21);
-            this.uiLabel17.Style = Sunny.UI.UIStyle.Custom;
-            this.uiLabel17.TabIndex = 0;
-            this.uiLabel17.Text = "孔位宽度";
-            this.uiLabel17.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
             // uiLabel19
             // 
             this.uiLabel19.AutoSize = true;
@@ -1283,19 +1284,6 @@
             this.uiLabel19.Text = "像素";
             this.uiLabel19.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
-            // uiLabel16
-            // 
-            this.uiLabel16.AutoSize = true;
-            this.uiLabel16.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiLabel16.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            this.uiLabel16.Location = new System.Drawing.Point(263, 125);
-            this.uiLabel16.Name = "uiLabel16";
-            this.uiLabel16.Size = new System.Drawing.Size(32, 17);
-            this.uiLabel16.Style = Sunny.UI.UIStyle.Custom;
-            this.uiLabel16.TabIndex = 0;
-            this.uiLabel16.Text = "像素";
-            this.uiLabel16.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
             // uiLabel4
             // 
             this.uiLabel4.AutoSize = true;
@@ -1352,6 +1340,7 @@
             // 
             this.uiTitlePanel4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
+            this.uiTitlePanel4.Controls.Add(this.uiCheckBox1);
             this.uiTitlePanel4.Controls.Add(this.uiLabel28);
             this.uiTitlePanel4.Controls.Add(this.clearDays);
             this.uiTitlePanel4.Controls.Add(this.cbClear);
@@ -1617,35 +1606,61 @@
             this.uiToolTip1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(239)))), ((int)(((byte)(239)))), ((int)(((byte)(239)))));
             this.uiToolTip1.OwnerDraw = true;
             // 
-            // tbCHLabeel
+            // uiCheckBox1
             // 
-            this.tbCHLabeel.ButtonSymbolOffset = new System.Drawing.Point(0, 0);
+            this.uiCheckBox1.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.tbCHLabeel.Cursor = System.Windows.Forms.Cursors.IBeam;
+            this.uiCheckBox1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.tbCHLabeel.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.uiCheckBox1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            this.tbCHLabeel.Location = new System.Drawing.Point(125, 224);
+            this.uiCheckBox1.Location = new System.Drawing.Point(229, 267);
-            this.tbCHLabeel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.uiCheckBox1.MinimumSize = new System.Drawing.Size(1, 1);
-            this.tbCHLabeel.MinimumSize = new System.Drawing.Size(1, 16);
+            this.uiCheckBox1.Name = "uiCheckBox1";
-            this.tbCHLabeel.Name = "tbCHLabeel";
+            this.uiCheckBox1.Size = new System.Drawing.Size(177, 33);
-            this.tbCHLabeel.Padding = new System.Windows.Forms.Padding(5);
+            this.uiCheckBox1.Style = Sunny.UI.UIStyle.Custom;
-            this.tbCHLabeel.ShowText = false;
+            this.uiCheckBox1.TabIndex = 119;
-            this.tbCHLabeel.Size = new System.Drawing.Size(219, 29);
+            this.uiCheckBox1.Text = "启用超速报警";
-            this.tbCHLabeel.Style = Sunny.UI.UIStyle.Custom;
-            this.tbCHLabeel.TabIndex = 113;
-            this.tbCHLabeel.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
-            this.tbCHLabeel.Watermark = "";
             // 
-            // uiLabel31
+            // uiLabel16
             // 
-            this.uiLabel31.AutoSize = true;
+            this.uiLabel16.AutoSize = true;
-            this.uiLabel31.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.uiLabel16.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiLabel31.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
+            this.uiLabel16.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            this.uiLabel31.Location = new System.Drawing.Point(8, 223);
+            this.uiLabel16.Location = new System.Drawing.Point(263, 125);
-            this.uiLabel31.Name = "uiLabel31";
+            this.uiLabel16.Name = "uiLabel16";
-            this.uiLabel31.Size = new System.Drawing.Size(74, 21);
+            this.uiLabel16.Size = new System.Drawing.Size(32, 17);
-            this.uiLabel31.Style = Sunny.UI.UIStyle.Custom;
+            this.uiLabel16.Style = Sunny.UI.UIStyle.Custom;
-            this.uiLabel31.TabIndex = 112;
+            this.uiLabel16.TabIndex = 0;
-            this.uiLabel31.Text = "测厚标签";
+            this.uiLabel16.Text = "像素";
-            this.uiLabel31.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            this.uiLabel16.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // uiLabel17
+            // 
+            this.uiLabel17.AutoSize = true;
+            this.uiLabel17.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.uiLabel17.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
+            this.uiLabel17.Location = new System.Drawing.Point(8, 125);
+            this.uiLabel17.Name = "uiLabel17";
+            this.uiLabel17.Size = new System.Drawing.Size(74, 21);
+            this.uiLabel17.Style = Sunny.UI.UIStyle.Custom;
+            this.uiLabel17.TabIndex = 0;
+            this.uiLabel17.Text = "孔位宽度";
+            this.uiLabel17.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // numMarginHoleWidth
+            // 
+            this.numMarginHoleWidth.FillColor = System.Drawing.Color.White;
+            this.numMarginHoleWidth.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.numMarginHoleWidth.Location = new System.Drawing.Point(125, 119);
+            this.numMarginHoleWidth.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.numMarginHoleWidth.MinimumSize = new System.Drawing.Size(63, 0);
+            this.numMarginHoleWidth.Name = "numMarginHoleWidth";
+            this.numMarginHoleWidth.NumPadType = Sunny.UI.NumPadType.Integer;
+            this.numMarginHoleWidth.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2);
+            this.numMarginHoleWidth.Size = new System.Drawing.Size(137, 29);
+            this.numMarginHoleWidth.Style = Sunny.UI.UIStyle.Custom;
+            this.numMarginHoleWidth.TabIndex = 32;
+            this.numMarginHoleWidth.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
+            this.numMarginHoleWidth.UseWaitCursor = true;
+            this.numMarginHoleWidth.Watermark = "";
             // 
             // FSysSetting
             // 
@@ -1731,9 +1746,6 @@
         private Sunny.UI.UISymbolButton btnMinReload2;
         private Sunny.UI.UISymbolButton btnMinSave2;
         private Sunny.UI.UIToolTip uiToolTip1;
-        private Sunny.UI.UINumPadTextBox numMarginHoleWidth;
-        private Sunny.UI.UILabel uiLabel17;
-        private Sunny.UI.UILabel uiLabel16;
         private Sunny.UI.UINumPadTextBox numMiddleSuperposition;
         private Sunny.UI.UILabel uiLabel18;
         private Sunny.UI.UILabel uiLabel19;
@@ -1772,5 +1784,9 @@
         private Sunny.UI.UILabel uiLabel30;
         private Sunny.UI.UITextBox tbCHLabeel;
         private Sunny.UI.UILabel uiLabel31;
+        private Sunny.UI.UICheckBox uiCheckBox1;
+        private Sunny.UI.UINumPadTextBox numMarginHoleWidth;
+        private Sunny.UI.UILabel uiLabel17;
+        private Sunny.UI.UILabel uiLabel16;
     }
 }

LeatherProject/LeatherApp/Page/FSysSetting.cs

@@ -108,6 +108,8 @@ namespace LeatherApp.Page
 
             cbClear.Checked = Config.OpenClearPic;
             clearDays.Text = Config.ClearDays.ToString();
+
+            uiCheckBox1.Checked = Config.OpenOverSpeed;
         }
         private void saveConfig()
         {
@@ -146,6 +148,7 @@ namespace LeatherApp.Page
 
             ini.Write("Fun", "OpenClearPic", this.cbClear.Checked);
             ini.Write("Fun", "ClearDays", this.clearDays.Text);
+            ini.Write("Fun", "OpenOverSpeed", this.uiCheckBox1.Checked);
             //
             ini.UpdateFile();
         }

LeatherProject/LeatherApp/Page/GetHeightFrm.Designer.cs

@@ -47,11 +47,13 @@
             // btnCancel
             // 
             this.btnCancel.Location = new System.Drawing.Point(401, 12);
+            this.btnCancel.TabIndex = 18;
             this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
             // 
             // btnOK
             // 
             this.btnOK.Location = new System.Drawing.Point(286, 12);
+            this.btnOK.TabIndex = 17;
             this.btnOK.Click += new System.EventHandler(this.btnOK_Click);
             // 
             // uiLabel1
@@ -110,6 +112,7 @@
             this.numHeight1.TabIndex = 14;
             this.numHeight1.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
             this.numHeight1.Watermark = "";
+            this.numHeight1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.numHeight1_KeyDown);
             // 
             // numHeight2
             // 
@@ -124,9 +127,10 @@
             this.numHeight2.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2);
             this.numHeight2.Size = new System.Drawing.Size(219, 29);
             this.numHeight2.Style = Sunny.UI.UIStyle.Custom;
-            this.numHeight2.TabIndex = 16;
+            this.numHeight2.TabIndex = 15;
             this.numHeight2.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
             this.numHeight2.Watermark = "";
+            this.numHeight2.KeyDown += new System.Windows.Forms.KeyEventHandler(this.numHeight2_KeyDown);
             // 
             // uiLabel3
             // 
@@ -135,7 +139,7 @@
             this.uiLabel3.Location = new System.Drawing.Point(61, 173);
             this.uiLabel3.Name = "uiLabel3";
             this.uiLabel3.Size = new System.Drawing.Size(128, 23);
-            this.uiLabel3.TabIndex = 15;
+            this.uiLabel3.TabIndex = 19;
             this.uiLabel3.Text = "测厚2(mm):";
             this.uiLabel3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
@@ -152,9 +156,10 @@
             this.numHeight3.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2);
             this.numHeight3.Size = new System.Drawing.Size(219, 29);
             this.numHeight3.Style = Sunny.UI.UIStyle.Custom;
-            this.numHeight3.TabIndex = 18;
+            this.numHeight3.TabIndex = 16;
             this.numHeight3.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
             this.numHeight3.Watermark = "";
+            this.numHeight3.KeyDown += new System.Windows.Forms.KeyEventHandler(this.numHeight3_KeyDown);
             // 
             // uiLabel4
             // 
@@ -163,7 +168,7 @@
             this.uiLabel4.Location = new System.Drawing.Point(61, 229);
             this.uiLabel4.Name = "uiLabel4";
             this.uiLabel4.Size = new System.Drawing.Size(128, 23);
-            this.uiLabel4.TabIndex = 17;
+            this.uiLabel4.TabIndex = 20;
             this.uiLabel4.Text = "测厚3(mm):";
             this.uiLabel4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
@@ -179,6 +184,7 @@
             this.Controls.Add(this.numYDis);
             this.Controls.Add(this.uiLabel2);
             this.Controls.Add(this.uiLabel1);
+            this.KeyPreview = true;
             this.Name = "GetHeightFrm";
             this.Text = "厚度测量";
             this.ZoomScaleRect = new System.Drawing.Rectangle(15, 15, 800, 450);

LeatherProject/LeatherApp/Page/GetHeightFrm.cs

@@ -19,6 +19,8 @@ namespace LeatherApp.Page
         {
             InitializeComponent();
             numYDis.Text = yDis.ToString();
+            numHeight1.Select();
+            numHeight1.Focus();
         }
 
         private void btnCancel_Click(object sender, EventArgs e)
@@ -35,5 +37,32 @@ namespace LeatherApp.Page
             Thickness.Value3 = double.Parse(numHeight3.Text);
             this.Close();
         }
+
+        private void numHeight1_KeyDown(object sender, KeyEventArgs e)
+        {
+            if(e.KeyCode == Keys.Enter) 
+            {
+                numHeight2.Select();
+                numHeight2.Focus();
+            }
+        }
+
+        private void numHeight2_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter)
+            {
+                numHeight3.Select();
+                numHeight3.Focus();
+            }
+        }
+
+        private void numHeight3_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter)
+            {
+                btnOK.Select();
+                btnOK.Focus();
+            }
+        }
     }
 }

LeatherProject/LeatherApp/Page/PartitionFrm.Designer.cs

@@ -60,17 +60,17 @@
             this.txtR2 = new System.Windows.Forms.TextBox();
             this.label14 = new System.Windows.Forms.Label();
             this.dataGridView2 = new System.Windows.Forms.DataGridView();
+            this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Val1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Val2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Val3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.AveCol = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.numericUpDown1 = new System.Windows.Forms.NumericUpDown();
             this.label15 = new System.Windows.Forms.Label();
             this.numericUpDown2 = new System.Windows.Forms.NumericUpDown();
             this.label16 = new System.Windows.Forms.Label();
             this.numericUpDown3 = new System.Windows.Forms.NumericUpDown();
             this.label17 = new System.Windows.Forms.Label();
-            this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Val1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Val2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Val3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.AveCol = new System.Windows.Forms.DataGridViewTextBoxColumn();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.RMCnt)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView2)).BeginInit();
@@ -98,7 +98,7 @@
             this.skinButton1.NormlBack = null;
             this.skinButton1.RoundStyle = CCWin.SkinClass.RoundStyle.All;
             this.skinButton1.Size = new System.Drawing.Size(142, 44);
-            this.skinButton1.TabIndex = 103;
+            this.skinButton1.TabIndex = 7;
             this.skinButton1.Text = "确定";
             this.skinButton1.UseVisualStyleBackColor = false;
             this.skinButton1.Click += new System.EventHandler(this.skinButton1_Click);
@@ -122,7 +122,7 @@
             this.skinButton2.NormlBack = null;
             this.skinButton2.RoundStyle = CCWin.SkinClass.RoundStyle.All;
             this.skinButton2.Size = new System.Drawing.Size(142, 44);
-            this.skinButton2.TabIndex = 102;
+            this.skinButton2.TabIndex = 8;
             this.skinButton2.Text = "取消";
             this.skinButton2.UseVisualStyleBackColor = false;
             this.skinButton2.Click += new System.EventHandler(this.skinButton2_Click);
@@ -134,7 +134,7 @@
             this.label1.Location = new System.Drawing.Point(463, 48);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(79, 20);
-            this.label1.TabIndex = 105;
+            this.label1.TabIndex = 103;
             this.label1.Text = "分卷号:";
             // 
             // textBox1
@@ -143,7 +143,7 @@
             this.textBox1.Location = new System.Drawing.Point(548, 45);
             this.textBox1.Name = "textBox1";
             this.textBox1.Size = new System.Drawing.Size(184, 30);
-            this.textBox1.TabIndex = 106;
+            this.textBox1.TabIndex = 1;
             // 
             // label2
             // 
@@ -153,7 +153,7 @@
             this.label2.Location = new System.Drawing.Point(429, 14);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(159, 20);
-            this.label2.TabIndex = 107;
+            this.label2.TabIndex = 101;
             this.label2.Text = "请输入分卷卷号!";
             // 
             // label3
@@ -163,7 +163,7 @@
             this.label3.Location = new System.Drawing.Point(21, 14);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(249, 20);
-            this.label3.TabIndex = 108;
+            this.label3.TabIndex = 100;
             this.label3.Text = "已检卷号信息(批号@卷号):";
             // 
             // label4
@@ -173,7 +173,7 @@
             this.label4.Location = new System.Drawing.Point(49, 48);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(79, 20);
-            this.label4.TabIndex = 109;
+            this.label4.TabIndex = 102;
             this.label4.Text = "批卷号:";
             // 
             // textBox2
@@ -182,7 +182,7 @@
             this.textBox2.Location = new System.Drawing.Point(134, 45);
             this.textBox2.Name = "textBox2";
             this.textBox2.Size = new System.Drawing.Size(310, 30);
-            this.textBox2.TabIndex = 110;
+            this.textBox2.TabIndex = 0;
             // 
             // label5
             // 
@@ -191,7 +191,7 @@
             this.label5.Location = new System.Drawing.Point(21, 86);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(99, 20);
-            this.label5.TabIndex = 111;
+            this.label5.TabIndex = 104;
             this.label5.Text = "检测情况:";
             // 
             // dataGridView1
@@ -223,7 +223,7 @@
             this.dataGridView1.RowHeadersVisible = false;
             this.dataGridView1.RowTemplate.Height = 23;
             this.dataGridView1.Size = new System.Drawing.Size(679, 93);
-            this.dataGridView1.TabIndex = 112;
+            this.dataGridView1.TabIndex = 105;
             // 
             // LabelCol
             // 
@@ -238,7 +238,7 @@
             this.label6.Location = new System.Drawing.Point(50, 214);
             this.label6.Name = "label6";
             this.label6.Size = new System.Drawing.Size(139, 20);
-            this.label6.TabIndex = 113;
+            this.label6.TabIndex = 106;
             this.label6.Text = "缺陷检测总数:";
             // 
             // defectCnt
@@ -248,17 +248,17 @@
             this.defectCnt.Location = new System.Drawing.Point(211, 214);
             this.defectCnt.Name = "defectCnt";
             this.defectCnt.Size = new System.Drawing.Size(19, 20);
-            this.defectCnt.TabIndex = 114;
+            this.defectCnt.TabIndex = 107;
             this.defectCnt.Text = "0";
             // 
             // label8
             // 
             this.label8.AutoSize = true;
             this.label8.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label8.Location = new System.Drawing.Point(509, 214);
+            this.label8.Location = new System.Drawing.Point(290, 250);
             this.label8.Name = "label8";
             this.label8.Size = new System.Drawing.Size(79, 20);
-            this.label8.TabIndex = 115;
+            this.label8.TabIndex = 111;
             this.label8.Text = "让码数:";
             // 
             // label7
@@ -268,7 +268,7 @@
             this.label7.Location = new System.Drawing.Point(22, 439);
             this.label7.Name = "label7";
             this.label7.Size = new System.Drawing.Size(99, 20);
-            this.label7.TabIndex = 117;
+            this.label7.TabIndex = 116;
             this.label7.Text = "检测结论:";
             // 
             // textBox3
@@ -280,7 +280,7 @@
             this.textBox3.ReadOnly = true;
             this.textBox3.ScrollBars = System.Windows.Forms.ScrollBars.Both;
             this.textBox3.Size = new System.Drawing.Size(679, 84);
-            this.textBox3.TabIndex = 118;
+            this.textBox3.TabIndex = 117;
             // 
             // label9
             // 
@@ -289,7 +289,7 @@
             this.label9.Location = new System.Drawing.Point(23, 549);
             this.label9.Name = "label9";
             this.label9.Size = new System.Drawing.Size(751, 14);
-            this.label9.TabIndex = 119;
+            this.label9.TabIndex = 118;
             this.label9.Text = "................................................................................." +
     "............";
             // 
@@ -300,7 +300,7 @@
             this.textBox4.Name = "textBox4";
             this.textBox4.ReadOnly = true;
             this.textBox4.Size = new System.Drawing.Size(310, 30);
-            this.textBox4.TabIndex = 124;
+            this.textBox4.TabIndex = 121;
             // 
             // label10
             // 
@@ -309,7 +309,7 @@
             this.label10.Location = new System.Drawing.Point(49, 616);
             this.label10.Name = "label10";
             this.label10.Size = new System.Drawing.Size(79, 20);
-            this.label10.TabIndex = 123;
+            this.label10.TabIndex = 120;
             this.label10.Text = "批卷号:";
             // 
             // label11
@@ -319,7 +319,7 @@
             this.label11.Location = new System.Drawing.Point(21, 573);
             this.label11.Name = "label11";
             this.label11.Size = new System.Drawing.Size(139, 20);
-            this.label11.TabIndex = 122;
+            this.label11.TabIndex = 119;
             this.label11.Text = "下一卷号信息:";
             // 
             // textBox5
@@ -328,7 +328,7 @@
             this.textBox5.Location = new System.Drawing.Point(548, 613);
             this.textBox5.Name = "textBox5";
             this.textBox5.Size = new System.Drawing.Size(184, 30);
-            this.textBox5.TabIndex = 121;
+            this.textBox5.TabIndex = 6;
             // 
             // label12
             // 
@@ -337,14 +337,14 @@
             this.label12.Location = new System.Drawing.Point(463, 616);
             this.label12.Name = "label12";
             this.label12.Size = new System.Drawing.Size(79, 20);
-            this.label12.TabIndex = 120;
+            this.label12.TabIndex = 125;
             this.label12.Text = "分卷号:";
             // 
             // RMCnt
             // 
             this.RMCnt.DecimalPlaces = 2;
             this.RMCnt.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.RMCnt.Location = new System.Drawing.Point(612, 212);
+            this.RMCnt.Location = new System.Drawing.Point(371, 248);
             this.RMCnt.Maximum = new decimal(new int[] {
             10000,
             0,
@@ -352,7 +352,7 @@
             0});
             this.RMCnt.Name = "RMCnt";
             this.RMCnt.Size = new System.Drawing.Size(120, 30);
-            this.RMCnt.TabIndex = 125;
+            this.RMCnt.TabIndex = 3;
             this.RMCnt.ValueChanged += new System.EventHandler(this.RMCnt_ValueChanged);
             // 
             // label13
@@ -362,7 +362,7 @@
             this.label13.Location = new System.Drawing.Point(22, 280);
             this.label13.Name = "label13";
             this.label13.Size = new System.Drawing.Size(59, 20);
-            this.label13.TabIndex = 126;
+            this.label13.TabIndex = 113;
             this.label13.Text = "厚度:";
             // 
             // txtR2
@@ -372,7 +372,7 @@
             this.txtR2.Multiline = true;
             this.txtR2.Name = "txtR2";
             this.txtR2.Size = new System.Drawing.Size(245, 69);
-            this.txtR2.TabIndex = 129;
+            this.txtR2.TabIndex = 5;
             this.txtR2.Text = "4级";
             // 
             // label14
@@ -382,7 +382,7 @@
             this.label14.Location = new System.Drawing.Point(463, 307);
             this.label14.Name = "label14";
             this.label14.Size = new System.Drawing.Size(59, 20);
-            this.label14.TabIndex = 128;
+            this.label14.TabIndex = 115;
             this.label14.Text = "色差:";
             // 
             // dataGridView2
@@ -414,11 +414,40 @@
             this.dataGridView2.DefaultCellStyle = dataGridViewCellStyle4;
             this.dataGridView2.Location = new System.Drawing.Point(53, 307);
             this.dataGridView2.Name = "dataGridView2";
-            this.dataGridView2.ReadOnly = true;
             this.dataGridView2.RowHeadersVisible = false;
             this.dataGridView2.RowTemplate.Height = 23;
             this.dataGridView2.Size = new System.Drawing.Size(391, 122);
-            this.dataGridView2.TabIndex = 130;
+            this.dataGridView2.TabIndex = 114;
+            // 
+            // dataGridViewTextBoxColumn1
+            // 
+            this.dataGridViewTextBoxColumn1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.dataGridViewTextBoxColumn1.HeaderText = "位置";
+            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
+            // 
+            // Val1
+            // 
+            this.Val1.HeaderText = "厚度1";
+            this.Val1.Name = "Val1";
+            this.Val1.Width = 80;
+            // 
+            // Val2
+            // 
+            this.Val2.HeaderText = "厚度2";
+            this.Val2.Name = "Val2";
+            this.Val2.Width = 80;
+            // 
+            // Val3
+            // 
+            this.Val3.HeaderText = "厚度3";
+            this.Val3.Name = "Val3";
+            this.Val3.Width = 80;
+            // 
+            // AveCol
+            // 
+            this.AveCol.HeaderText = "均值";
+            this.AveCol.Name = "AveCol";
+            this.AveCol.Width = 80;
             // 
             // numericUpDown1
             // 
@@ -432,7 +461,7 @@
             0});
             this.numericUpDown1.Name = "numericUpDown1";
             this.numericUpDown1.Size = new System.Drawing.Size(120, 30);
-            this.numericUpDown1.TabIndex = 132;
+            this.numericUpDown1.TabIndex = 2;
             this.numericUpDown1.ValueChanged += new System.EventHandler(this.numericUpDown1_ValueChanged);
             // 
             // label15
@@ -442,14 +471,14 @@
             this.label15.Location = new System.Drawing.Point(47, 250);
             this.label15.Name = "label15";
             this.label15.Size = new System.Drawing.Size(89, 20);
-            this.label15.TabIndex = 131;
+            this.label15.TabIndex = 110;
             this.label15.Text = "卷长(m):";
             // 
             // numericUpDown2
             // 
             this.numericUpDown2.DecimalPlaces = 2;
             this.numericUpDown2.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.numericUpDown2.Location = new System.Drawing.Point(373, 248);
+            this.numericUpDown2.Location = new System.Drawing.Point(612, 212);
             this.numericUpDown2.Maximum = new decimal(new int[] {
             10000,
             0,
@@ -458,16 +487,16 @@
             this.numericUpDown2.Name = "numericUpDown2";
             this.numericUpDown2.ReadOnly = true;
             this.numericUpDown2.Size = new System.Drawing.Size(120, 30);
-            this.numericUpDown2.TabIndex = 134;
+            this.numericUpDown2.TabIndex = 109;
             // 
             // label16
             // 
             this.label16.AutoSize = true;
             this.label16.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label16.Location = new System.Drawing.Point(278, 250);
+            this.label16.Location = new System.Drawing.Point(509, 214);
             this.label16.Name = "label16";
             this.label16.Size = new System.Drawing.Size(89, 20);
-            this.label16.TabIndex = 133;
+            this.label16.TabIndex = 108;
             this.label16.Text = "净长(m):";
             // 
             // numericUpDown3
@@ -482,7 +511,7 @@
             0});
             this.numericUpDown3.Name = "numericUpDown3";
             this.numericUpDown3.Size = new System.Drawing.Size(120, 30);
-            this.numericUpDown3.TabIndex = 136;
+            this.numericUpDown3.TabIndex = 4;
             this.numericUpDown3.ValueChanged += new System.EventHandler(this.numericUpDown3_ValueChanged);
             // 
             // label17
@@ -492,44 +521,9 @@
             this.label17.Location = new System.Drawing.Point(509, 250);
             this.label17.Name = "label17";
             this.label17.Size = new System.Drawing.Size(99, 20);
-            this.label17.TabIndex = 135;
+            this.label17.TabIndex = 112;
             this.label17.Text = "重量(kg):";
             // 
-            // dataGridViewTextBoxColumn1
-            // 
-            this.dataGridViewTextBoxColumn1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
-            this.dataGridViewTextBoxColumn1.HeaderText = "位置";
-            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
-            this.dataGridViewTextBoxColumn1.ReadOnly = true;
-            // 
-            // Val1
-            // 
-            this.Val1.HeaderText = "厚度1";
-            this.Val1.Name = "Val1";
-            this.Val1.ReadOnly = true;
-            this.Val1.Width = 80;
-            // 
-            // Val2
-            // 
-            this.Val2.HeaderText = "厚度2";
-            this.Val2.Name = "Val2";
-            this.Val2.ReadOnly = true;
-            this.Val2.Width = 80;
-            // 
-            // Val3
-            // 
-            this.Val3.HeaderText = "厚度3";
-            this.Val3.Name = "Val3";
-            this.Val3.ReadOnly = true;
-            this.Val3.Width = 80;
-            // 
-            // AveCol
-            // 
-            this.AveCol.HeaderText = "均值";
-            this.AveCol.Name = "AveCol";
-            this.AveCol.ReadOnly = true;
-            this.AveCol.Width = 80;
-            // 
             // PartitionFrm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);

LeatherProject/LeatherApp/Page/PartitionFrm.cs

@@ -52,10 +52,7 @@ namespace LeatherApp.Page
                     textBox1.ReadOnly = false;
                     textBox2.ReadOnly = false;
                 }
-                textBox1.Text = string.IsNullOrWhiteSpace(model.PartReelId) ? (model.ReelNo + 1).ToString() : model.PartReelId;
+                
-                textBox2.Text = $"{model.BatchId}@{model.ReelId}";
-                textBox5.Text = (model.ReelNo + 2).ToString();
-                textBox4.Text = $"{model.BatchId}@{model.ReelId}";
                 if (model.Len == 0 && (model.DefectInfoList == null || model.DefectInfoList.Count == 0))
                 {
                     label2.Visible = true;
@@ -68,11 +65,15 @@ namespace LeatherApp.Page
 
                 //分卷长度
                 double len = 0;
-                len = model.Len - LastSplitLength - Config.CutDis;//分卷，补差距
+                len = model.Len - LastSplitLength - Config.CutDis + Config.JMOffset;//分卷，补差距
 
                 
                 if (isLoad)
                 {
+                    textBox1.Text = string.IsNullOrWhiteSpace(model.PartReelId) ? (model.ReelNo + 1).ToString() : model.PartReelId;
+                    textBox2.Text = $"{model.BatchId}@{model.ReelId}";
+                    textBox5.Text = (model.ReelNo + 2).ToString();
+                    textBox4.Text = $"{model.BatchId}@{model.ReelId}";
                     //卷长显示
                     numericUpDown1.Value = (decimal)len;
                     //显示重量

LeatherProject/LeatherApp/Utils/DBUtils.cs

@@ -159,11 +159,15 @@ namespace LeatherApp.Utils
             public string PJXTBH { get; set; }
             public string PH { get; set; }
             public string JH { get; set; }
+            [SugarColumn(IsNullable = true)]
+            public string FJH { get; set; }
             public string Grade { get; set; }
             public double Len { get; set; }
             public double NetLen { get; set; }
             public int SegmentCnt { get; set; }
             public string SegmentLen { get; set; }
+            [SugarColumn(IsNullable = true)]
+            public string DefectType { get; set; }
 
             [SugarColumn(IsNullable = true)]
             public double MF1 { get; set; }
@@ -190,6 +194,12 @@ namespace LeatherApp.Utils
             public System.DateTime CreateTime { get; set; }
             [SugarColumn(IsNullable = true)]
             public int Status { get; set; }
+            [SugarColumn(IsNullable = true)]
+            public string UserName { get; set; }
+            [SugarColumn(IsNullable = true)]
+            public string DUETIME { get; set; }
+            [SugarColumn(IsNullable = true)]
+            public string REMARK { get; set; }
         }
 
         /// <summary>
@@ -218,7 +228,7 @@ namespace LeatherApp.Utils
                 //建表更新
                 //db.CodeFirst.InitTables<XCLErpUploadData>();
                 //查询是否已有数据
-                var haveData = db.Queryable<XCLErpUploadData>().First(m => m.PH == records.BatchId && m.JH == records.ReelId);
+                var haveData = db.Queryable<XCLErpUploadData>().First(m => m.PH == records.BatchId && m.JH == records.ReelId && m.FJH == records.PartReelId);
                 if (haveData != null) {
                     return false;
                 }
@@ -308,11 +318,13 @@ namespace LeatherApp.Utils
                     PJXTBH = records.PJXTBH,
                     PH = records.BatchId,
                     JH = records.ReelId,
+                    FJH = string.IsNullOrEmpty(records.PartReelId) ? "0" : records.PartReelId,
                     Grade = string.IsNullOrEmpty(grade) ? "一等品" : grade,
                     Len = slen,
                     NetLen = jlen,
                     SegmentCnt = fd,
                     SegmentLen = string.IsNullOrEmpty(fdinfo) ? "无" : fdinfo,
+                    DefectType = string.IsNullOrEmpty(records.DefectType) ? "错误" : records.DefectType,
 
                     MF1 = mf1,
                     MF2 = mf2,
@@ -328,7 +340,8 @@ namespace LeatherApp.Utils
                     Class = string.IsNullOrEmpty(records.WorkTeam)?"无": records.WorkTeam,
                     DownGradeInfo = string.IsNullOrEmpty(gradeinfo)? "无" : gradeinfo,
                     CreateTime = System.DateTime.Now,
-                    Status = 0
+                    Status = 0,
+                    UserName = string.IsNullOrEmpty(records.UserName) ? "admin" : records.UserName,
                 }).ExecuteCommand();
             }
             return true;

LeatherProject/LeatherApp/bin/Debug/SysConfig.ini

@@ -76,6 +76,8 @@ StopLookDis=5.5
 CutDis=8
 OpenClearPic=False
 ClearDays=3
+JMOffset=6.8
+OpenOverSpeed=False
 [BOffset]
 L_offset=0
 R_offset=0

LeatherProject/LeatherApp/bin/Debug/降等原因.csv

@@ -0,0 +1,210 @@
+代码,降等/废品原因
+360,雾面
+361,表面风格不符
+363,耐折不合格
+368,耐黄变不合格
+372,花纹深
+375,发泡不匀
+376,背面无含浸
+377,铅含量超标
+381,接缝滑移不到
+382,耐磨不合格
+384,耐丙酮不合格
+388,头尾
+389,纸接
+393,虹吸不合格
+398,光雾度暗
+404,背印字粘面
+406,沟底垃圾
+407,花纹错误
+414,植绒皱印
+417,植绒擦伤
+418,植绒垃圾
+420,云雾深浅不一
+421,静电击伤
+425,压辊斑点
+427,背面绒毛粘面
+428,烂点子
+454,底布烘焦
+456,抛光皱
+459,底布皱印
+473,接头皱
+478,铲破
+485,碱剥离不到
+489,蓝点
+498,未抛光
+513,挡浆板印
+515,花纹深浅不一
+522,植绒背粘
+526,胶带粘面
+528,耐刮性差
+531,辊涂色差
+537,未磨毛
+538,脱泡印
+539,抛光垃圾
+435,揉纹擦伤
+439,背印条子
+549,面缺浆
+554,剥离缺口
+556,未背印字
+561,耐汗不合格
+572,磨毛横档
+574,轧皱
+576,抛光印
+577,倒毛
+578,未打孔
+579,疵点多
+580,珠光效果差
+581,麻点
+582,背面PP膜难分离
+585,引布
+586,发泡不匀
+588,卷心皱
+589,垃圾印
+084,边皱
+083,叠边
+082,花面
+081,擦伤
+080,水泡
+078,脱膜
+076,脱针
+074,气孔
+073,仃车档
+072,黑点
+069,松面
+066,瘪子
+064,手感硬
+062,粘连
+060,荷叶边
+059,厚度不匀
+058,预剥离
+053,破洞
+052,渗浆
+051,白点
+050,胶带印
+047,段长不到
+046,老人纹
+045,潮湿
+044,毛糙
+043,水印
+042,拖浆
+039,拖线
+038,皱折
+037,烘焦
+036,表面不平整
+035,门幅不到
+034,皱印
+033,复合皱折
+032,粉刺
+031,滑爽度差异
+028,接头废品
+027,色差
+023,爆针不合格
+021,气味重
+020,油污
+019,磨毛不匀
+018,针孔
+017,凹点
+016,底皱
+015,色条
+014,高温纸
+013,脱壳
+012,气泡
+011,斑点
+010,苍蝇脚
+009,烂面
+008,线条
+007,色档
+006,脏污
+005,脱浆
+004,头尾脏污
+003,布纹
+002,收卷皱
+086,缺口
+085,横档
+001,切边不良
+278,背面花斑
+279,背面浆斑
+281,背面垃圾
+282,背面皮膜
+283,背面缺浆
+284,背面色差
+285,背面色条
+286,背面无背涂
+287,背面阴阳面
+289,背磨不匀
+291,背印不匀
+292,边缺浆
+293,边脱膜
+296,布接皱
+298,底布用错
+304,花纹浅
+306,换浆印
+310,搅棒印
+215,色迁移
+211,纸伤
+208,厚度偏厚
+201,钢针印
+195,浆料用错
+193,背涂不匀
+188,凹坑
+185,上浆印
+182,底布收缩
+180,停车档
+178,物性不合格
+177,底布正反面用错
+165,底布抽丝
+164,手感软
+163,表面效果不一
+160,背面风格不符合要求
+151,褪色
+148,面发白
+147,撕裂不到
+141,虫斑
+136,背粘
+133,粘纸
+122,绒毛斑点
+118,露底
+114,剥离不到
+111,浆斑
+109,亮点
+108,凹条
+103,条子
+101,布筋
+100,低温耐质不到
+095,烫伤
+092,纸皱
+091,磨毛过深
+090,污条
+088,磨毛条子
+315,亮条
+321,耐水解不合格
+323,气条
+324,缺浆
+328,伸长率不合格
+330,水滴印
+331,水伤印
+334,跳针
+336,拖泡印
+337,网格印
+338,未发泡
+344,压纹效果不好
+346,隐形凹点
+218,底坯用错
+267,植绒斑点
+263,背面真皮粉不合格
+254,缩孔
+246,背面渗浆
+242,未复合
+238,厚度不到
+237,卷边
+233,鱼眼
+231,未背涂
+226,复合脱壳
+225,撕边
+224,助剂印
+223,沟发亮
+222,光雾度不一
+583,剥离撕破
+584,复合粘连
+568,耐溶剂不合格

LeatherProject/Models/Product.cs

@@ -118,6 +118,12 @@ namespace Models
         /// </summary>
         [SugarColumn(IsNullable = true)]
         public double HalconAreaThr { get; set; }
+
+        /// <summary>
+        /// 孔位宽度
+        /// </summary>
+        //[SugarColumn(IsNullable = true)]
+        //public int MarginHoleWidth { get; set; } = 120;
     }
 
     /// <summary>

LeatherProject/Models/Records.cs

@@ -195,6 +195,10 @@ namespace Models
         //品名
         [SugarColumn(IsNullable = true)]
         public string PJXTBH { get; set; }
+
+        //成检半检
+        [SugarColumn(IsNullable = true)]
+        public string DefectType { get; set; }
     }
 
     /// <summary>

LeatherProject/Models/obj/Debug/Models.csproj.FileListAbsolute.txt

@@ -28,14 +28,6 @@ E:\CPL\迈沐智能项目\2023\革博士\交付资料\革博士项目交付资
 E:\CPL\迈沐智能项目\2023\革博士\交付资料\革博士项目交付资料\LeatherProject\Models\obj\Debug\Models.csproj.CopyComplete
 E:\CPL\迈沐智能项目\2023\革博士\交付资料\革博士项目交付资料\LeatherProject\Models\obj\Debug\Models.dll
 E:\CPL\迈沐智能项目\2023\革博士\交付资料\革博士项目交付资料\LeatherProject\Models\obj\Debug\Models.pdb
-E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Models\bin\Debug\Models.dll
-E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Models\bin\Debug\Models.pdb
-E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Models\bin\Debug\SqlSugar.dll
-E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Models\obj\Debug\Models.csproj.AssemblyReference.cache
-E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Models\obj\Debug\Models.csproj.CoreCompileInputs.cache
-E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Models\obj\Debug\Models.csproj.CopyComplete
-E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Models\obj\Debug\Models.dll
-E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Models\obj\Debug\Models.pdb
 E:\CPL\GeBoshi\禾欣版本修改\LeatherProject\Models\bin\Debug\Models.dll
 E:\CPL\GeBoshi\禾欣版本修改\LeatherProject\Models\bin\Debug\Models.pdb
 E:\CPL\GeBoshi\禾欣版本修改\LeatherProject\Models\bin\Debug\SqlSugar.dll
@@ -68,3 +60,11 @@ H:\CPL\GeBoshi\hy1127\V1.0\LeatherProject\Models\obj\Debug\Models.csproj.CoreCom
 H:\CPL\GeBoshi\hy1127\V1.0\LeatherProject\Models\obj\Debug\Models.csproj.CopyComplete
 H:\CPL\GeBoshi\hy1127\V1.0\LeatherProject\Models\obj\Debug\Models.dll
 H:\CPL\GeBoshi\hy1127\V1.0\LeatherProject\Models\obj\Debug\Models.pdb
+E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Models\bin\Debug\Models.dll
+E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Models\bin\Debug\Models.pdb
+E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Models\bin\Debug\SqlSugar.dll
+E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Models\obj\Debug\Models.csproj.AssemblyReference.cache
+E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Models\obj\Debug\Models.csproj.CoreCompileInputs.cache
+E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Models\obj\Debug\Models.csproj.CopyComplete
+E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Models\obj\Debug\Models.dll
+E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Models\obj\Debug\Models.pdb

LeatherProject/ServerApp/ServerFrm.cs

@@ -206,7 +206,9 @@ namespace ServerApp
             path = $"D:\\RecordsData\\{data.BatchId}_{data.ReelId}";
             if(!Directory.Exists(path))
                 Directory.CreateDirectory(path);
-            var filePath = $"{path}\\缺陷列表_{data.BatchId}_{data.ReelId}.xlsx";
+            string filePath = $"{path}\\缺陷列表_{data.BatchId}_{data.ReelId}.xlsx";
+            if(!string.IsNullOrEmpty(data.PartReelId))
+                filePath = $"{path}\\缺陷列表_{data.BatchId}_{data.ReelId}_{data.PartReelId}.xlsx";
             err = 8;
             //filePath = $"{Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)}\\temp.xlsx";
             exportTabel(jdata, image1, image2, image3, filePath);

LeatherProject/Service/obj/Debug/Service.csproj.FileListAbsolute.txt

@@ -95,44 +95,6 @@ E:\CPL\迈沐智能项目\2023\革博士\交付资料\革博士项目交付资
 E:\CPL\迈沐智能项目\2023\革博士\交付资料\革博士项目交付资料\LeatherProject\Service\obj\Debug\Service.csproj.CopyComplete
 E:\CPL\迈沐智能项目\2023\革博士\交付资料\革博士项目交付资料\LeatherProject\Service\obj\Debug\Service.dll
 E:\CPL\迈沐智能项目\2023\革博士\交付资料\革博士项目交付资料\LeatherProject\Service\obj\Debug\Service.pdb
-E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\Service.dll.config
-E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\Service.pdb
-E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\Models.dll
-E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\Newtonsoft.Json.dll
-E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\SqlSugar.dll
-E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\System.Buffers.dll
-E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\System.Memory.dll
-E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\System.Numerics.Vectors.dll
-E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll
-E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\System.Threading.Tasks.Extensions.dll
-E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\Models.pdb
-E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\obj\Debug\Service.csproj.AssemblyReference.cache
-E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\obj\Debug\Service.csproj.CoreCompileInputs.cache
-E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\obj\Debug\Service.csproj.CopyComplete
-E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\obj\Debug\Service.dll
-E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\obj\Debug\Service.pdb
-E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\BouncyCastle.Cryptography.dll
-E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\Google.Protobuf.dll
-E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\K4os.Compression.LZ4.dll
-E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\K4os.Compression.LZ4.Streams.dll
-E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\K4os.Hash.xxHash.dll
-E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\Microsoft.Bcl.AsyncInterfaces.dll
-E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\MySql.Data.dll
-E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\MySqlBackup.dll
-E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\System.Configuration.ConfigurationManager.dll
-E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\System.Diagnostics.DiagnosticSource.dll
-E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\System.IO.Pipelines.dll
-E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\ZstdSharp.dll
-E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\BouncyCastle.Cryptography.xml
-E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\Google.Protobuf.pdb
-E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\Google.Protobuf.xml
-E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\K4os.Compression.LZ4.xml
-E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\K4os.Compression.LZ4.Streams.xml
-E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\K4os.Hash.xxHash.xml
-E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\Microsoft.Bcl.AsyncInterfaces.xml
-E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\MySql.Data.xml
-E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\System.Diagnostics.DiagnosticSource.xml
-E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\System.IO.Pipelines.xml
 E:\CPL\GeBoshi\禾欣版本修改\LeatherProject\Service\bin\Debug\Service.dll.config
 E:\CPL\GeBoshi\禾欣版本修改\LeatherProject\Service\bin\Debug\Service.dll
 E:\CPL\GeBoshi\禾欣版本修改\LeatherProject\Service\bin\Debug\Service.pdb
@@ -284,3 +246,41 @@ H:\CPL\GeBoshi\hy1127\V1.0\LeatherProject\Service\obj\Debug\Service.csproj.CoreC
 H:\CPL\GeBoshi\hy1127\V1.0\LeatherProject\Service\obj\Debug\Service.csproj.CopyComplete
 H:\CPL\GeBoshi\hy1127\V1.0\LeatherProject\Service\obj\Debug\Service.dll
 H:\CPL\GeBoshi\hy1127\V1.0\LeatherProject\Service\obj\Debug\Service.pdb
+E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\Service.dll.config
+E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\Service.pdb
+E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\BouncyCastle.Cryptography.dll
+E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\Google.Protobuf.dll
+E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\K4os.Compression.LZ4.dll
+E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\K4os.Compression.LZ4.Streams.dll
+E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\K4os.Hash.xxHash.dll
+E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\Microsoft.Bcl.AsyncInterfaces.dll
+E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\Models.dll
+E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\MySql.Data.dll
+E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\MySqlBackup.dll
+E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\Newtonsoft.Json.dll
+E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\SqlSugar.dll
+E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\System.Buffers.dll
+E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\System.Configuration.ConfigurationManager.dll
+E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\System.Diagnostics.DiagnosticSource.dll
+E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\System.IO.Pipelines.dll
+E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\System.Memory.dll
+E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\System.Numerics.Vectors.dll
+E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll
+E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\System.Threading.Tasks.Extensions.dll
+E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\ZstdSharp.dll
+E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\Models.pdb
+E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\BouncyCastle.Cryptography.xml
+E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\Google.Protobuf.pdb
+E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\Google.Protobuf.xml
+E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\K4os.Compression.LZ4.xml
+E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\K4os.Compression.LZ4.Streams.xml
+E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\K4os.Hash.xxHash.xml
+E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\Microsoft.Bcl.AsyncInterfaces.xml
+E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\MySql.Data.xml
+E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\System.Diagnostics.DiagnosticSource.xml
+E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\bin\Debug\System.IO.Pipelines.xml
+E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\obj\Debug\Service.csproj.AssemblyReference.cache
+E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\obj\Debug\Service.csproj.CoreCompileInputs.cache
+E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\obj\Debug\Service.csproj.CopyComplete
+E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\obj\Debug\Service.dll
+E:\CPL\迈沐智能项目\2023\革博士\源码\V1.0\LeatherProject\Service\obj\Debug\Service.pdb