调试修改内容提交【代码从此处产生新分支】

This commit is contained in:
hehaibing-1996
2024-06-26 19:25:12 +08:00
parent b6f6e24f45
commit 5ea25c477c
14 changed files with 49 additions and 42 deletions

View File

@ -85,7 +85,9 @@ namespace 货架标准上位机.ViewModel
{
//TO DO 配置项进行配置正则表达式
//数据处理
string ModuleCodePattern = "^[ABCD][0-9]{2}-R[0-9]{1,2}C[0-9]{1,2}$";
//获取配置文件的正则表达式
var configModuleCodePattern = LocalFile.Config.ModuleCodePattern;
string ModuleCodePattern = string.IsNullOrEmpty(configModuleCodePattern) ? "^[ABCD][0-9]{2}-R[0-9]{1,2}C[0-9]{1,2}$" : configModuleCodePattern;
var isModuleCode = Regex.IsMatch(scanner.TempCode, ModuleCodePattern);
if (isModuleCode)
{