Teams/shgx_tz_mes_backend_sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

后道标签打印修改

Browse Source
This commit is contained in:
赵正易
2025-08-23 13:42:03 +08:00
parent 20c7855995
commit 781a519803
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ZR.Service/mes/mm/MmInventoryReportService.cs
View File

@@ -61,6 +61,7 @@ namespace ZR.Service.mes.mm
new new
{ {
gr.Partnumber, gr.Partnumber,
gr.Code,
m.ProductName, m.ProductName,
m.Color, m.Color,
m.Specification, m.Specification,

1
ZR.Service/mes/mm/MmOutboundReportService.cs
View File

@@ -60,6 +60,7 @@ namespace ZR.Service.mes.mm
new new
{ {
gr.Partnumber, gr.Partnumber,
gr.Code,
m.ProductName, m.ProductName,
m.Color, m.Color,
m.Specification, m.Specification,

6
ZR.Service/mes/qc/backend/QcBackEndService.cs
View File

@@ -1152,7 +1152,7 @@ namespace ZR.Service.Business
int isAgain = specialPrintType == 1 ? 1 : 0; int isAgain = specialPrintType == 1 ? 1 : 0;
string newLabelCode = 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"; 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) .Where(it => it.WorkOrder == workOrder && it.LabelType == 1 && it.LabelSort > 0)
.Count(); .Count();
// 重新打印计数（LabelType=1且LabelCode包含IsAgain=1），合并查询条件 // 重新打印计数（LabelType=1且LabelCode包含IsAgain(Ag)=1），合并查询条件
result.RePrintCount = Context result.RePrintCount = Context
.Queryable<QcBackendRecordLabelPrint>() .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(); .Count();
// 零头箱打印计数（LabelType=1且未装满），合并查询条件 // 零头箱打印计数（LabelType=1且未装满），合并查询条件

2
ZR.Service/mes/wms/WMentryWarehousing_productService.cs
View File

@@ -454,7 +454,7 @@ namespace ZR.Service.mes.wms
isStrict = false; isStrict = false;
} }
//20250610 后道标签并且是满箱的可跳过检查 //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; isStrict = false;
}*/ }*/