出库单查询计划nullbug修改,后道标签内工单号逻辑修改
This commit is contained in:
@@ -1156,7 +1156,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^Fu={isFull}^Ag={isAgain}";
|
$"Code=PGW{workOrder}^ItemNumber={newLabelScran.PartNumber}^Order=W{batchCode}^Qty={maxPackage}^LabelType=1^LabelBy=HD^Fu={isFull}^Ag={isAgain}";
|
||||||
|
|
||||||
string newPackageCode = $"BOX:PGW{workOrder}{newLabelScran.Team}1";
|
string newPackageCode = $"BOX:PGW{workOrder}{newLabelScran.Team}1";
|
||||||
|
|
||||||
|
|||||||
@@ -1164,12 +1164,18 @@ namespace ZR.Service.mes.wms
|
|||||||
item.MaterialCode,
|
item.MaterialCode,
|
||||||
item.BatchCode
|
item.BatchCode
|
||||||
);
|
);
|
||||||
item.Description = Context
|
var material = Context
|
||||||
.Queryable<WmMaterial>()
|
.Queryable<WmMaterial>()
|
||||||
.Where(m => m.Partnumber == item.MaterialCode && m.Status == 1 && m.Type == 1)
|
.Where(m => m.Partnumber == item.MaterialCode && m.Status == 1 && m.Type == 1)
|
||||||
.Select(m => m.Description)
|
.First();
|
||||||
.First()
|
if(material == null)
|
||||||
.ToString();
|
{
|
||||||
|
item.Description = "无描述";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
item.Description = material.Description;
|
||||||
|
}
|
||||||
item.InventoryNumber = actualData.InventoryNumber;
|
item.InventoryNumber = actualData.InventoryNumber;
|
||||||
item.ActualOutNumber = actualData.ActualOutNumber;
|
item.ActualOutNumber = actualData.ActualOutNumber;
|
||||||
item.InventoryPackage = actualData.InventoryPackage;
|
item.InventoryPackage = actualData.InventoryPackage;
|
||||||
|
|||||||
Reference in New Issue
Block a user