Merge branch 'master' of ssh://10.10.100.21/source/mes-client

UAS-出货标签管理/生成条码.cs

@@ -91,11 +91,6 @@ namespace UAS_LabelMachine
             //如果没有则取公共规则
             if (Nr.Rows.Count == 0)
                 Nr = (DataTable)dh.ExecuteSql("select nrd_detno,nrd_name,nrd_type,nrd_sql,nrd_length from NoRuleDetail left join norule on nrd_nrid=nr_id where nr_custcode is null and nr_isdefault <> 0 order by nrd_detno", "select");
-            if (Nr.Rows.Count == 0)
-            {
-                MessageBox.Show("未维护任何条码规则");
-                return;
-            }
             //用于过滤参数的正则表达式
             Regex match = new Regex("{\\w+}");
             //用于存放每一项的明细的数据