@ -52,20 +52,20 @@ public class AppConsumablesScanService {
ret . chNum = ch ;
ret . chNum = ch ;
if ( rawResult = = null ) {
if ( rawResult = = null ) {
ret . report = ConsumablesScanReportErrorType . EMPTY ;
ret . state = ConsumablesScanReportErrorType . EMPTY ;
return ret ;
return ret ;
}
}
if ( ZStringUtils . isNullOrEmpty ( rawResult . larBSScanResult ) & &
if ( ZStringUtils . isNullOrEmpty ( rawResult . larBSScanResult ) & &
ZStringUtils . isNullOrEmpty ( rawResult . littBSScanResult ) & &
ZStringUtils . isNullOrEmpty ( rawResult . littBSScanResult ) & &
ZStringUtils . isNullOrEmpty ( rawResult . PBScanResult ) ) {
ZStringUtils . isNullOrEmpty ( rawResult . PBScanResult ) ) {
ret . report = ConsumablesScanReportErrorType . EMPTY ;
ret . state = ConsumablesScanReportErrorType . EMPTY ;
return ret ;
return ret ;
}
}
if ( ZStringUtils . isNullOrEmpty ( rawResult . PBScanResult ) ) {
if ( ZStringUtils . isNullOrEmpty ( rawResult . PBScanResult ) ) {
ret . report = ConsumablesScanReportErrorType . MISS_REACTION_PLATE ;
ret . state = ConsumablesScanReportErrorType . MISS_REACTION_PLATE ;
return ret ;
return ret ;
}
}
@ -73,19 +73,19 @@ public class AppConsumablesScanService {
/ / 解析板夹二维码
/ / 解析板夹二维码
ReactionPlate2DCode rp2dcode = ReactionPlate2DCodeHelper . parse ( rawResult . PBScanResult ) ;
ReactionPlate2DCode rp2dcode = ReactionPlate2DCodeHelper . parse ( rawResult . PBScanResult ) ;
if ( rp2dcode = = null ) {
if ( rp2dcode = = null ) {
ret . report = ConsumablesScanReportErrorType . REACTION_PLATE_2D_CODE_FORMATE_ERROR ;
ret . state = ConsumablesScanReportErrorType . REACTION_PLATE_2D_CODE_FORMATE_ERROR ;
return ret ;
return ret ;
}
}
var projExtInfoCard = projInfoMgrService . getProjExtInfoCard ( rp2dcode . lotId ) ;
var projExtInfoCard = projInfoMgrService . getProjExtInfoCard ( rp2dcode . lotId ) ;
if ( projExtInfoCard = = null ) {
if ( projExtInfoCard = = null ) {
logger . warn ( "未找到匹配的项目ID卡,LotID:{}" , rp2dcode . lotId ) ;
logger . warn ( "未找到匹配的项目ID卡,LotID:{}" , rp2dcode . lotId ) ;
ret . report = ConsumablesScanReportErrorType . MISS_IDCARD ;
ret . state = ConsumablesScanReportErrorType . MISS_IDCARD ;
return ret ;
return ret ;
}
}
if ( projExtInfoCard . expiryDate . before ( new Date ( ) ) ) {
if ( projExtInfoCard . expiryDate . before ( new Date ( ) ) ) {
logger . warn ( "耗材过期,LotID:{}" , rp2dcode . lotId ) ;
logger . warn ( "耗材过期,LotID:{}" , rp2dcode . lotId ) ;
ret . report = ConsumablesScanReportErrorType . EXPIRED ;
ret . state = ConsumablesScanReportErrorType . EXPIRED ;
return ret ;
return ret ;
}
}
@ -93,7 +93,7 @@ public class AppConsumablesScanService {
try {
try {
projBuildinInfo = projInfoMgrService . getProjBuildInInfo ( projExtInfoCard . projId ) ;
projBuildinInfo = projInfoMgrService . getProjBuildInInfo ( projExtInfoCard . projId ) ;
} catch ( AppException e ) {
} catch ( AppException e ) {
ret . report = ConsumablesScanReportErrorType . UN_SUPPORT_PROJ ;
ret . state = ConsumablesScanReportErrorType . UN_SUPPORT_PROJ ;
return ret ;
return ret ;
}
}
@ -105,24 +105,24 @@ public class AppConsumablesScanService {
if ( reactionType . equals ( A8kReactionFlowType . SampleAndBS ) ) {
if ( reactionType . equals ( A8kReactionFlowType . SampleAndBS ) ) {
/ / 校验小瓶缓冲液 , 小瓶缓冲液 + 样本
/ / 校验小瓶缓冲液 , 小瓶缓冲液 + 样本
if ( ZStringUtils . isNullOrEmpty ( rawResult . littBSScanResult ) ) {
if ( ZStringUtils . isNullOrEmpty ( rawResult . littBSScanResult ) ) {
ret . report = ConsumablesScanReportErrorType . MISS_LITTSB ;
ret . state = ConsumablesScanReportErrorType . MISS_LITTSB ;
return ret ;
return ret ;
}
}
if ( ! rawResult . littBSScanResult . equals ( rp2dcode . lotId ) ) {
if ( ! rawResult . littBSScanResult . equals ( rp2dcode . lotId ) ) {
ret . report = ConsumablesScanReportErrorType . LITTSB_LOTID_MISMATCH ;
ret . state = ConsumablesScanReportErrorType . LITTSB_LOTID_MISMATCH ;
return ret ;
return ret ;
}
}
} else if ( reactionType . equals ( A8kReactionFlowType . SampleAndBSAndProbeSubstance ) ) {
} else if ( reactionType . equals ( A8kReactionFlowType . SampleAndBSAndProbeSubstance ) ) {
/ / 校验大瓶缓冲液 , 大瓶缓冲液 + 小瓶缓冲液 + 样本
/ / 校验大瓶缓冲液 , 大瓶缓冲液 + 小瓶缓冲液 + 样本
if ( ZStringUtils . isNullOrEmpty ( rawResult . larBSScanResult ) ) {
if ( ZStringUtils . isNullOrEmpty ( rawResult . larBSScanResult ) ) {
ret . report = ConsumablesScanReportErrorType . MISS_LARBS ;
ret . state = ConsumablesScanReportErrorType . MISS_LARBS ;
return ret ;
return ret ;
}
}
if ( ! rawResult . larBSScanResult . equals ( rp2dcode . lotId ) ) {
if ( ! rawResult . larBSScanResult . equals ( rp2dcode . lotId ) ) {
ret . report = ConsumablesScanReportErrorType . LARBS_LOTID_MISMATCH ;
ret . state = ConsumablesScanReportErrorType . LARBS_LOTID_MISMATCH ;
return ret ;
return ret ;
}
}
@ -133,12 +133,14 @@ public class AppConsumablesScanService {
ret . lotId = rp2dcode . lotId ;
ret . lotId = rp2dcode . lotId ;
ret . projId = projId ;
ret . projId = projId ;
ret . report = ConsumablesScanReportErrorType . PASS ;
ret . state = ConsumablesScanReportErrorType . PASS ;
ret . projName = projExtInfoCard . projName ;
ret . projShortName = projExtInfoCard . projShortName ;
return ret ;
return ret ;
}
}
void LoadingConsumables ( Integer ch , ConsumablesScanReport result ) {
void LoadingConsumables ( Integer ch , ConsumablesScanReport result ) {
if ( result . report ! = ConsumablesScanReportErrorType . PASS ) {
if ( result . state ! = ConsumablesScanReportErrorType . PASS ) {
return ;
return ;
}
}
@ -202,7 +204,7 @@ public class AppConsumablesScanService {
/ / 加载耗材
/ / 加载耗材
for ( int i = 0 ; i < AppConstant . CONSUMABLE_CHANNEL_NUM ; i + + ) {
for ( int i = 0 ; i < AppConstant . CONSUMABLE_CHANNEL_NUM ; i + + ) {
if ( scanReport . get ( i ) . report = = ConsumablesScanReportErrorType . PASS ) {
if ( scanReport . get ( i ) . state = = ConsumablesScanReportErrorType . PASS ) {
LoadingConsumables ( i , scanReport . get ( i ) ) ;
LoadingConsumables ( i , scanReport . get ( i ) ) ;
}
}
}
}
@ -225,7 +227,7 @@ public class AppConsumablesScanService {
scanResult = scanCtrlService . doScanOneCh ( chNum ) ;
scanResult = scanCtrlService . doScanOneCh ( chNum ) ;
var scanReport = parseScanResult ( chNum , scanResult ) ;
var scanReport = parseScanResult ( chNum , scanResult ) ;
if ( scanReport . report ! = ConsumablesScanReportErrorType . PASS ) {
if ( scanReport . state ! = ConsumablesScanReportErrorType . PASS ) {
LoadingConsumables ( chNum , scanReport ) ;
LoadingConsumables ( chNum , scanReport ) ;
}
}