diff --git a/halftoneproject-master/BanBoShi/SysCtrl/SysEnum.cs b/halftoneproject-master/BanBoShi/SysCtrl/SysEnum.cs
index cca34843..fc0c8eb8 100644
--- a/halftoneproject-master/BanBoShi/SysCtrl/SysEnum.cs
+++ b/halftoneproject-master/BanBoShi/SysCtrl/SysEnum.cs
@@ -131,6 +131,8 @@ namespace MaiMuAOI.SysCtrl
         xb,
         [Description("格栅")]
         gs,
+        [Description("断栅")]
+        ds,
         [Description("钢丝断裂")]
         gsdl,
         [Description("残胶堵孔")]
@@ -151,6 +153,7 @@ namespace MaiMuAOI.SysCtrl
         压线,
         斜边,
         格栅,
+        断栅,
         钢丝断裂,
         残胶堵孔,
         正常
diff --git a/halftoneproject-master/BanBoShi/SysCtrl/SysMgr.cs b/halftoneproject-master/BanBoShi/SysCtrl/SysMgr.cs
index e07f80cd..f60d5538 100644
--- a/halftoneproject-master/BanBoShi/SysCtrl/SysMgr.cs
+++ b/halftoneproject-master/BanBoShi/SysCtrl/SysMgr.cs
@@ -2941,7 +2941,7 @@ namespace MaiMuAOI.SysCtrl
                         order.SXCount++;
                         break;
                     case "ds":
-                    //    order.DSCount++;
+                        order.DSCount++;
                         break;
                     case "gsdl":
                         order.GSDLCount++;
@@ -2949,6 +2949,9 @@ namespace MaiMuAOI.SysCtrl
                     case "cjdk":
                         order.CJDKCount++;
                         break;
+                    default:
+                        Log($"数据统计", $"错误参数:{className}", WarningEnum.Low);
+                        break;
                 }
             }
         }
@@ -6291,18 +6294,22 @@ namespace MaiMuAOI.SysCtrl
                                 {
                                     foreach (var item in model.QualifiedCriterionList)
                                     {
-                                        defectCode = EnumExtension.Convert2Enum<DefectCodeEnum>(item.DefectCode);
-                                        //是过滤
-                                        if (defectCode == (DefectCodeEnum)enumcnt)
+                                        try
                                         {
-                                            isGetQua = true;
-                                            itemDefectCount = getDefectCountFromCode(order, defectCode);
-                                            if (item.MaxDefectCount > -1 && itemDefectCount > item.MaxDefectCount)
+                                            defectCode = EnumExtension.Convert2Enum<DefectCodeEnum>(item.DefectCode);
+                                            //是过滤
+                                            if (defectCode == (DefectCodeEnum)enumcnt)
                                             {
-                                                order.Qualified = false;
-                                                defectNames += $"{EnumExtension.GetEnumDescription(defectCode)}({itemDefectCount}),";
+                                                isGetQua = true;
+                                                itemDefectCount = getDefectCountFromCode(order, defectCode);
+                                                if (item.MaxDefectCount > -1 && itemDefectCount > item.MaxDefectCount)
+                                                {
+                                                    order.Qualified = false;
+                                                    defectNames += $"{EnumExtension.GetEnumDescription(defectCode)}({itemDefectCount}),";
+                                                }
                                             }
                                         }
+                                        catch { }
                                     }
                                 }
                                 if (!isGetQua)
@@ -6483,13 +6490,18 @@ namespace MaiMuAOI.SysCtrl
                             int itemDefectCount;
                             foreach (var item in model.QualifiedCriterionList)
                             {
-                                defectCode = EnumExtension.Convert2Enum<DefectCodeEnum>(item.DefectCode);
-                                itemDefectCount = getDefectCountFromCode(order, defectCode);
-                                if (item.MaxDefectCount > -1 && itemDefectCount > item.MaxDefectCount)
+                                try
                                 {
-                                    order.Qualified = false;
-                                    defectNames += $"{EnumExtension.GetEnumDescription(defectCode)}({itemDefectCount}),";
+                                    defectCode = EnumExtension.Convert2Enum<DefectCodeEnum>(item.DefectCode);
+                                    itemDefectCount = getDefectCountFromCode(order, defectCode);
+                                    if (item.MaxDefectCount > -1 && itemDefectCount > item.MaxDefectCount)
+                                    {
+                                        order.Qualified = false;
+                                        defectNames += $"{EnumExtension.GetEnumDescription(defectCode)}({itemDefectCount}),";
+                                    }
                                 }
+                                catch
+                                { }
                             }
                         }
                         else
@@ -6498,12 +6510,17 @@ namespace MaiMuAOI.SysCtrl
                             int itemDefectCount;
                             for (int enumcnt = 0; enumcnt < 14; enumcnt++)
                             {
-                                itemDefectCount = getDefectCountFromCode(order, (DefectCodeEnum)enumcnt);
-                                if (itemDefectCount > 0)
+                                try
                                 {
-                                    order.Qualified = false;
-                                    defectNames += $"{EnumExtension.GetEnumDescription((DefectCodeEnum)enumcnt)}({itemDefectCount}),";
+                                    itemDefectCount = getDefectCountFromCode(order, (DefectCodeEnum)enumcnt);
+                                    if (itemDefectCount > 0)
+                                    {
+                                        order.Qualified = false;
+                                        defectNames += $"{EnumExtension.GetEnumDescription((DefectCodeEnum)enumcnt)}({itemDefectCount}),";
+                                    }
                                 }
+                                catch
+                                { }
                             }
                         }
                         //移除最后的，
@@ -6695,8 +6712,8 @@ namespace MaiMuAOI.SysCtrl
                     return order.XBCount;
                 case DefectCodeEnum.gs:
                     return order.SXCount;
-                //case DefectCodeEnum.ds:
-                //    return order.DSCount;
+                case DefectCodeEnum.ds:
+                    return order.DSCount;
                 case DefectCodeEnum.gsdl:
                     return order.GSDLCount;
                 case DefectCodeEnum.cjdk:
@@ -9463,7 +9480,7 @@ namespace MaiMuAOI.SysCtrl
                                             value = order.SXCount.ToString();
                                             break;
                                         case PrintDataEnum.DSCount:
-                                         //   value = order.DSCount.ToString();
+                                            value = order.DSCount.ToString();
                                             break;
                                         case PrintDataEnum.GSDLCount:
                                             value = order.GSDLCount.ToString();
@@ -9632,7 +9649,7 @@ namespace MaiMuAOI.SysCtrl
                                         value = order.SXCount.ToString();
                                         break;
                                     case "LabelDSCount":
-                                        //value = order.DSCount.ToString();
+                                        value = order.DSCount.ToString();
                                         break;
                                     case "LabelGSDLCount":
                                         value = order.GSDLCount.ToString();
@@ -9716,7 +9733,7 @@ namespace MaiMuAOI.SysCtrl
                                         value = order.SXCount.ToString();
                                         break;
                                     case "ExcelDSCount":
-                                        //value = order.DSCount.ToString();
+                                        value = order.DSCount.ToString();
                                         break;
                                     case "ExcelGSDLCount":
                                         value = order.GSDLCount.ToString();
diff --git a/halftoneproject-master/BanBoShi/SysUI/DefectPicShow/DataQueryFrm.cs b/halftoneproject-master/BanBoShi/SysUI/DefectPicShow/DataQueryFrm.cs
index 09107866..d91b24ef 100644
--- a/halftoneproject-master/BanBoShi/SysUI/DefectPicShow/DataQueryFrm.cs
+++ b/halftoneproject-master/BanBoShi/SysUI/DefectPicShow/DataQueryFrm.cs
@@ -582,7 +582,7 @@ namespace MaiMuAOI.SysUI.DefectPicShow
             dt.Columns.Add(new DataColumn("压线数量", typeof(int)));//在表中添加int类型的列
             dt.Columns.Add(new DataColumn("斜边数量", typeof(int)));//在表中添加int类型的列
             dt.Columns.Add(new DataColumn("格栅数量", typeof(int)));//在表中添加int类型的列
-            //dt.Columns.Add(new DataColumn("断栅数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("断栅数量", typeof(int)));//在表中添加int类型的列
             dt.Columns.Add(new DataColumn("钢丝断裂数量", typeof(int)));//在表中添加int类型的列
             dt.Columns.Add(new DataColumn("残胶堵孔数量", typeof(int)));//在表中添加int类型的列 
 
@@ -798,7 +798,7 @@ namespace MaiMuAOI.SysUI.DefectPicShow
                 dr["压线数量"] = item.YXCount;
                 dr["斜边数量"] = item.XBCount;
                 dr["格栅数量"] = item.SXCount;
-                //dr["断栅数量"] = item.DSCount;
+                dr["断栅数量"] = item.DSCount;
                 dr["钢丝断裂数量"] = item.GSDLCount;
                 dr["残胶堵孔数量"] = item.CJDKCount;
 
@@ -1273,7 +1273,7 @@ namespace MaiMuAOI.SysUI.DefectPicShow
             dt.Columns.Add(new DataColumn("压线数量", typeof(int)));//在表中添加int类型的列
             dt.Columns.Add(new DataColumn("斜边数量", typeof(int)));//在表中添加int类型的列
             dt.Columns.Add(new DataColumn("格栅数量", typeof(int)));//在表中添加int类型的列
-            //dt.Columns.Add(new DataColumn("断栅数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("断栅数量", typeof(int)));//在表中添加int类型的列
             dt.Columns.Add(new DataColumn("钢丝断裂数量", typeof(int)));//在表中添加int类型的列
             dt.Columns.Add(new DataColumn("残胶堵孔数量", typeof(int)));//在表中添加int类型的列 
 
@@ -1326,7 +1326,7 @@ namespace MaiMuAOI.SysUI.DefectPicShow
                 dr["压线数量"] = item.YXCount;
                 dr["斜边数量"] = item.XBCount;
                 dr["格栅数量"] = item.SXCount;
-                //dr["断栅数量"] = item.DSCount;
+                dr["断栅数量"] = item.DSCount;
                 dr["钢丝断裂数量"] = item.GSDLCount;
                 dr["残胶堵孔数量"] = item.CJDKCount;
 
diff --git a/halftoneproject-master/BanBoShi/SysUI/DefectPicShow/DistributionFrm.cs b/halftoneproject-master/BanBoShi/SysUI/DefectPicShow/DistributionFrm.cs
index fc7049df..c8506a56 100644
--- a/halftoneproject-master/BanBoShi/SysUI/DefectPicShow/DistributionFrm.cs
+++ b/halftoneproject-master/BanBoShi/SysUI/DefectPicShow/DistributionFrm.cs
@@ -34,7 +34,7 @@ namespace MaiMuAOI.SysUI.DefectPicShow
         private Color[] colorList = { Color.Red, Color.Green, Color.DarkViolet , Color.Magenta, Color.Orange, Color.Brown,
                                     Color.Olive, Color.PaleGreen, Color.CadetBlue,Color.Aqua,Color.YellowGreen,Color.Blue,
                                     Color.SpringGreen,Color.Fuchsia,Color.Wheat,Color.AliceBlue,Color.Azure };
-        private string[] DefectCodes = {  "dk", "zw","xws","gsyc","qk", "zk","pp","hs","yx", "xb", "sx","ds","gsdl" ,"cjdk"};
+        private string[] DefectCodes = {  "dk", "zw","xws","gsyc","qk", "zk","pp","hs","yx", "xb", "gs","ds","gsdl" ,"cjdk", "normal" };
         #region 表格数据类型
         private class DefectStruct
         {
diff --git a/halftoneproject-master/BanBoShi/SysUI/ProcessStep/Prop/SizeDefectProp.cs b/halftoneproject-master/BanBoShi/SysUI/ProcessStep/Prop/SizeDefectProp.cs
index b3f5a5b2..ffde217d 100644
--- a/halftoneproject-master/BanBoShi/SysUI/ProcessStep/Prop/SizeDefectProp.cs
+++ b/halftoneproject-master/BanBoShi/SysUI/ProcessStep/Prop/SizeDefectProp.cs
@@ -89,7 +89,7 @@ namespace MaiMuAOI.SysUI.ProcessStep.Prop
         public string ExcelXBCount { get; set; }
         [PropertyOrder(63), Browsable(true), Category("6 打印"), DisplayName("6.13 打印格栅数量"), Description("打印数据的位置")]
         public string ExcelSXCount { get; set; }
-        //[PropertyOrder(63), Browsable(true), Category("6 打印"), DisplayName("6.14 打印断栅数量"), Description("打印数据的位置")]
+        [PropertyOrder(63), Browsable(true), Category("6 打印"), DisplayName("6.14 打印断栅数量"), Description("打印数据的位置")]
         public string ExcelDSCount { get; set; }
         [PropertyOrder(64), Browsable(true), Category("6 打印"), DisplayName("6.15 打印钢丝断裂数量"), Description("打印数据的位置")]
         public string ExcelGSDLCount { get; set; }
@@ -122,7 +122,7 @@ namespace MaiMuAOI.SysUI.ProcessStep.Prop
         public string LabelXBCount { get; set; }
         [PropertyOrder(83), Browsable(true), Category("7 标签打印"), DisplayName("7.13 标签打印格栅数量"), Description("打印数据的位置")]
         public string LabelSXCount { get; set; }
-        //[PropertyOrder(83), Browsable(true), Category("7 标签打印"), DisplayName("7.14 标签打印断栅数量"), Description("打印数据的位置")]
+        [PropertyOrder(83), Browsable(true), Category("7 标签打印"), DisplayName("7.14 标签打印断栅数量"), Description("打印数据的位置")]
         public string LabelDSCount { get; set; }
         [PropertyOrder(84), Browsable(true), Category("7 标签打印"), DisplayName("7.15 标签打印钢丝断裂数量"), Description("打印数据的位置")]
         public string LabelGSDLCount { get; set; }
diff --git a/halftoneproject-master/BanBoShi/SysUI/ProductAndStep/ProductInfoFrm.cs b/halftoneproject-master/BanBoShi/SysUI/ProductAndStep/ProductInfoFrm.cs
index 707aa621..938b88c6 100644
--- a/halftoneproject-master/BanBoShi/SysUI/ProductAndStep/ProductInfoFrm.cs
+++ b/halftoneproject-master/BanBoShi/SysUI/ProductAndStep/ProductInfoFrm.cs
@@ -293,11 +293,11 @@ namespace MaiMuAOI.SysUI.ProductAndStep
                     Classes tClasses = svcClasses.GetById(model.ClassesId);
                     if(tClasses.Name == "乳剂")
                     {
-                        lstDefect.RemoveAt(11);
-                        lstDefect.RemoveAt(11);
+                        lstDefect.RemoveAt(12);
+                        lstDefect.RemoveAt(12);
                     }
                     else
-                        lstDefect.RemoveAt(13);
+                        lstDefect.RemoveAt(14);
                 }
                 
                 foreach (DictionaryEntry item in lstDefect)
diff --git a/halftoneproject-master/Models/Order.cs b/halftoneproject-master/Models/Order.cs
index 8058f810..0e5375be 100644
--- a/halftoneproject-master/Models/Order.cs
+++ b/halftoneproject-master/Models/Order.cs
@@ -158,7 +158,7 @@ namespace Models
         public int YXCount { get; set; }//压线数量 
         public int XBCount { get; set; }//斜边数量 new
         public int SXCount { get; set; }//原先断栅 换为 栅线数量 new
-        //public int DSCount { get; set; }//原先断栅 换为 格栅数量 new
+        public int DSCount { get; set; }//原先断栅 换为 格栅数量 new
         public int GSDLCount { get; set; }//钢丝断裂 new
         public int CJDKCount { get; set; }//残胶堵孔 new
         #endregion
diff --git a/halftoneproject-master/Service/OrderService.cs b/halftoneproject-master/Service/OrderService.cs
index 384ae278..3a7db46e 100644
--- a/halftoneproject-master/Service/OrderService.cs
+++ b/halftoneproject-master/Service/OrderService.cs
@@ -326,7 +326,7 @@ namespace Service
                     压线 = SqlFunc.AggregateSum(a.YXCount),
                     斜边 = SqlFunc.AggregateSum(a.XBCount),
                     格栅 = SqlFunc.AggregateSum(a.SXCount),
-                    //断栅 = SqlFunc.AggregateSum(a.DSCount),
+                    断栅 = SqlFunc.AggregateSum(a.DSCount),
                     钢丝断裂 = SqlFunc.AggregateSum(a.GSDLCount),
                     残胶堵孔 = SqlFunc.AggregateSum(a.CJDKCount),
                 });
@@ -361,7 +361,7 @@ namespace Service
                 压线 = SqlFunc.AggregateSum(a.YXCount),
                 斜边 = SqlFunc.AggregateSum(a.XBCount),
                 格栅 = SqlFunc.AggregateSum(a.SXCount),
-                //断栅 = SqlFunc.AggregateSum(a.DSCount),
+                断栅 = SqlFunc.AggregateSum(a.DSCount),
                 钢丝断裂 = SqlFunc.AggregateSum(a.GSDLCount),
                 残胶堵孔 = SqlFunc.AggregateSum(a.CJDKCount),
             }).ToJson();