GP12触摸屏，油漆实验室改动提交

ZR.Service/mes/qc/QcGp12Service.cs

@@ -599,17 +599,13 @@ namespace ZR.Service.Business
         public string ScanInnerLabel(QcGp12LabelScanDto data)
         {
             DateTime nowTime = DateTime.Now;
-            // 标签防错
+            // 标签防错 （内标签零件号）
             string partNumber = DoAnalyzePartnumber(data.Label);
-            if (partNumber != data.PartNumber)
+            // 内标签包含外标签
+            if (!partNumber.Contains(data.PartNumber))
             {
                 return "内标签零件号与外箱标签不一致!";
             }
-            /*            int qt = DoAnalyzeQuantity(data.Label);
-                        if (qt >= 6)
-                        {
-                            return "该标签可能为外箱标签!";
-                        }*/
             bool hasAny = Context
                 .Queryable<QcGp12RecordLabelScan>()
                 .Where(it => it.Label == data.Label)