设备管理
This commit is contained in:
@@ -42,9 +42,9 @@ namespace ZR.Service.Business
|
||||
// 判断内外箱标签
|
||||
|
||||
// 解析零件号
|
||||
labelAnalysisDto.Partnumber = DoAnalyzePartnumber(label);
|
||||
labelAnalysisDto.Partnumber = ZRalyzePartnumber(label);
|
||||
// 解析数量
|
||||
labelAnalysisDto.Number = DoAnalyzeQuantity(label);
|
||||
labelAnalysisDto.Number = ZRalyzeQuantity(label);
|
||||
if (string.IsNullOrEmpty(labelAnalysisDto.Partnumber))
|
||||
{
|
||||
labelAnalysisDto.IsOk = false;
|
||||
@@ -88,7 +88,7 @@ namespace ZR.Service.Business
|
||||
}
|
||||
|
||||
// 标签的零件号解析
|
||||
public string DoAnalyzePartnumber(string label)
|
||||
public string ZRalyzePartnumber(string label)
|
||||
{
|
||||
// 通用规则下的标签零件号抓取
|
||||
var predicate = Expressionable
|
||||
@@ -131,7 +131,7 @@ namespace ZR.Service.Business
|
||||
}
|
||||
|
||||
// 标签的数量解析
|
||||
public int DoAnalyzeQuantity(string label)
|
||||
public int ZRalyzeQuantity(string label)
|
||||
{
|
||||
int result = 0;
|
||||
// 标签零件号抓取
|
||||
@@ -168,7 +168,7 @@ namespace ZR.Service.Business
|
||||
}
|
||||
|
||||
// 标签的批次号解析
|
||||
public string DoAnalyzeBatchCode(string label)
|
||||
public string ZRalyzeBatchCode(string label)
|
||||
{
|
||||
// 标签批次号正则抓取
|
||||
var predicate = Expressionable
|
||||
@@ -682,7 +682,7 @@ namespace ZR.Service.Business
|
||||
return "工单号不存在!";
|
||||
}
|
||||
// 内外标签零件号不一致
|
||||
string partnumber = DoAnalyzePartnumber(data.Label);
|
||||
string partnumber = ZRalyzePartnumber(data.Label);
|
||||
if (!(workorderInfo.PartNumber == partnumber))
|
||||
{
|
||||
Context.Ado.RollbackTran();
|
||||
@@ -771,7 +771,7 @@ namespace ZR.Service.Business
|
||||
return "工单号不存在!";
|
||||
}
|
||||
// 内外标签零件号不一致
|
||||
string partnumber = DoAnalyzePartnumber(data.Label);
|
||||
string partnumber = ZRalyzePartnumber(data.Label);
|
||||
if (!(workorderInfo.PartNumber == partnumber))
|
||||
{
|
||||
Context.Ado.RollbackTran();
|
||||
@@ -1026,7 +1026,7 @@ namespace ZR.Service.Business
|
||||
string batchCode = "";
|
||||
try
|
||||
{
|
||||
batchCode = DoAnalyzeBatchCode(labelCode);
|
||||
batchCode = ZRalyzeBatchCode(labelCode);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@@ -1095,7 +1095,7 @@ namespace ZR.Service.Business
|
||||
)
|
||||
{
|
||||
// 解析产品批次号,如果没有,则生成最新批次号
|
||||
string batchCode = DoAnalyzeBatchCode(newLabelScran.Label);
|
||||
string batchCode = ZRalyzeBatchCode(newLabelScran.Label);
|
||||
if (string.IsNullOrEmpty(batchCode))
|
||||
{
|
||||
batchCode = DateTime.Now.ToString("yyMMdd") + "000";
|
||||
|
||||
Reference in New Issue
Block a user