唯一性判定优化
This commit is contained in:
@@ -959,11 +959,18 @@ namespace ZR.Service.Business
|
|||||||
int maxPackage
|
int maxPackage
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
|
// 解析产品批次号,如果没有,则生成最新批次号
|
||||||
|
string batchCode = DoAnalyzeBatchCode(newLabelScran.Label);
|
||||||
|
if (string.IsNullOrEmpty(batchCode))
|
||||||
|
{
|
||||||
|
batchCode = DateTime.Now.ToString("yyMMdd") + "000";
|
||||||
|
}
|
||||||
// 提取箱流水号
|
// 提取箱流水号
|
||||||
int packageSort = 0;
|
int packageSort = 0;
|
||||||
QcBackEndRecordLabelScan packagelabelScan = Context
|
QcBackEndRecordLabelScan packagelabelScan = Context
|
||||||
.Queryable<QcBackEndRecordLabelScan>()
|
.Queryable<QcBackEndRecordLabelScan>()
|
||||||
.Where(it => it.WorkOrder == newLabelScran.WorkOrder)
|
.Where(it => it.PartNumber == newLabelScran.PartNumber)
|
||||||
|
.Where(it => it.Label.Contains(batchCode))
|
||||||
.Where(it => it.LabelType == 1)
|
.Where(it => it.LabelType == 1)
|
||||||
.OrderByDescending(it => it.LabelSort)
|
.OrderByDescending(it => it.LabelSort)
|
||||||
.First();
|
.First();
|
||||||
@@ -978,13 +985,6 @@ namespace ZR.Service.Business
|
|||||||
.Where(it => it.Type == 1)
|
.Where(it => it.Type == 1)
|
||||||
.Where(it => it.Status == 1)
|
.Where(it => it.Status == 1)
|
||||||
.First();
|
.First();
|
||||||
|
|
||||||
// 解析产品批次号,如果没有,则生成最新批次号
|
|
||||||
string batchCode = DoAnalyzeBatchCode(newLabelScran.Label);
|
|
||||||
if (string.IsNullOrEmpty(batchCode))
|
|
||||||
{
|
|
||||||
batchCode = DateTime.Now.ToString("yyMMdd") + "000";
|
|
||||||
}
|
|
||||||
// 生成工单号
|
// 生成工单号
|
||||||
string workOrder = $"{batchCode}_{packageSort}";
|
string workOrder = $"{batchCode}_{packageSort}";
|
||||||
string newLabelCode =
|
string newLabelCode =
|
||||||
|
|||||||
Reference in New Issue
Block a user