|
@@ -46,7 +46,8 @@ namespace MySystem
|
|
|
merinfo.MerIdcardNo = Mer.LegalIdCard;
|
|
|
merinfo.MerchantName = Mer.MerName;
|
|
|
}
|
|
|
- if(pos.IsFirst == 1)
|
|
|
+ int IsFirst = 1;
|
|
|
+ if(!string.IsNullOrEmpty(Mer.LegalIdCard))
|
|
|
{
|
|
|
string startNo = Mer.LegalIdCard.Substring(0, 6);
|
|
|
string endNo = Mer.LegalIdCard.Substring(Mer.LegalIdCard.Length - 4, 4).ToUpper();
|
|
@@ -79,9 +80,10 @@ namespace MySystem
|
|
|
if(check != null)
|
|
|
{
|
|
|
function.WriteLog("互斥机具---sn:" + check.KqSnNo + ",merno:" + check.KqMerNo + ",name:" + check.MerchantName, "监控机具是否互斥");
|
|
|
- pos.IsFirst = 0;
|
|
|
+ IsFirst = 0;
|
|
|
}
|
|
|
}
|
|
|
+ pos.IsFirst = IsFirst;
|
|
|
|
|
|
|
|
|
MerchantRecord edit = spdb.MerchantRecord.FirstOrDefault(m => m.Id == Mer.Id);
|