后道标签打印修改
This commit is contained in:
parent
20c7855995
commit
781a519803
@ -61,6 +61,7 @@ namespace ZR.Service.mes.mm
|
||||
new
|
||||
{
|
||||
gr.Partnumber,
|
||||
gr.Code,
|
||||
m.ProductName,
|
||||
m.Color,
|
||||
m.Specification,
|
||||
|
||||
@ -60,6 +60,7 @@ namespace ZR.Service.mes.mm
|
||||
new
|
||||
{
|
||||
gr.Partnumber,
|
||||
gr.Code,
|
||||
m.ProductName,
|
||||
m.Color,
|
||||
m.Specification,
|
||||
|
||||
@ -1152,7 +1152,7 @@ namespace ZR.Service.Business
|
||||
int isAgain = specialPrintType == 1 ? 1 : 0;
|
||||
|
||||
string newLabelCode =
|
||||
$"Code=PGW{workOrder}^ItemNumber={newLabelScran.PartNumber}^Order=W{workOrder}^Qty={maxPackage}^LabelType=1^LabelBy=HD^Team={newLabelScran.Team}^IsFull={isFull}^IsAgain={isAgain}";
|
||||
$"Code=PGW{workOrder}^ItemNumber={newLabelScran.PartNumber}^Order=W{workOrder}^Qty={maxPackage}^LabelType=1^LabelBy=HD^Tm={newLabelScran.Team}^Fu={isFull}^Ag={isAgain}";
|
||||
|
||||
string newPackageCode = $"BOX:PGW{workOrder}{newLabelScran.Team}1";
|
||||
|
||||
@ -1589,10 +1589,10 @@ namespace ZR.Service.Business
|
||||
.Where(it => it.WorkOrder == workOrder && it.LabelType == 1 && it.LabelSort > 0)
|
||||
.Count();
|
||||
|
||||
// 重新打印计数(LabelType=1且LabelCode包含IsAgain=1),合并查询条件
|
||||
// 重新打印计数(LabelType=1且LabelCode包含IsAgain(Ag)=1),合并查询条件
|
||||
result.RePrintCount = Context
|
||||
.Queryable<QcBackendRecordLabelPrint>()
|
||||
.Where(it => it.WorkOrder == workOrder && it.LabelType == 1 && it.LabelCode.Contains("IsAgain=1"))
|
||||
.Where(it => it.WorkOrder == workOrder && it.LabelType == 1 && it.LabelCode.Contains("Ag=1"))
|
||||
.Count();
|
||||
|
||||
// 零头箱打印计数(LabelType=1且未装满),合并查询条件
|
||||
|
||||
@ -454,7 +454,7 @@ namespace ZR.Service.mes.wms
|
||||
isStrict = false;
|
||||
}
|
||||
//20250610 后道标签并且是满箱的可跳过检查
|
||||
/*if (resultionPackage.originalCode.Contains("LabelBy=HD") && resultionPackage.originalCode.Contains("IsFull=1"))
|
||||
/*if (resultionPackage.originalCode.Contains("LabelBy=HD") && resultionPackage.originalCode.Contains("Fu=1"))
|
||||
{
|
||||
isStrict = false;
|
||||
}*/
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user