|
@ -908,62 +908,81 @@ public class InjectionIssueJobAppService |
|
|
return ReturnMessage("-1", $"{entity.Number}任务单据已结束!"); |
|
|
return ReturnMessage("-1", $"{entity.Number}任务单据已结束!"); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
foreach (var detail in entity.Details) |
|
|
try |
|
|
{ |
|
|
{ |
|
|
var detailDto = new InjectionIssueJobDetailDTO(); |
|
|
foreach (var detail in entity.Details) |
|
|
if (!string.IsNullOrEmpty(detail.TransferLibFromLocationCode)) |
|
|
|
|
|
{ |
|
|
|
|
|
//库移的最终目标 挪到 推荐的目标
|
|
|
|
|
|
var fromloc = await _locationAppService.GetByCodeAsync(detail.TransferLibToLocationCode).ConfigureAwait(false); |
|
|
|
|
|
var toloc = await _locationAppService.GetByCodeAsync(detail.RecommendToLocationCode).ConfigureAwait(false); |
|
|
|
|
|
|
|
|
|
|
|
detailDto.InjectFrom(detail); |
|
|
|
|
|
|
|
|
|
|
|
detailDto.HandledToLocationCode = toloc.Code; |
|
|
|
|
|
detailDto.HandledToLocationGroup = toloc.LocationGroupCode; |
|
|
|
|
|
detailDto.HandledToLocationArea = toloc.AreaCode; |
|
|
|
|
|
detailDto.HandledToLocationErpCode = toloc.ErpLocationCode; |
|
|
|
|
|
detailDto.HandledToWarehouseCode = toloc.WarehouseCode; |
|
|
|
|
|
detailDto.HandledToQty = request.Data.First().MatQty; |
|
|
|
|
|
detailDto.HandledToLot = detail.TransferLibToLot; |
|
|
|
|
|
detailDto.HandledToPackingCode = detail.TransferLibToPackingCode; |
|
|
|
|
|
|
|
|
|
|
|
detailDto.HandledFromLocationCode = fromloc.Code; |
|
|
|
|
|
detailDto.HandledFromLocationGroup = fromloc.LocationGroupCode; |
|
|
|
|
|
detailDto.HandledFromLocationArea = fromloc.AreaCode; |
|
|
|
|
|
detailDto.HandledFromLocationErpCode = fromloc.ErpLocationCode; |
|
|
|
|
|
detailDto.HandledFromWarehouseCode = fromloc.WarehouseCode; |
|
|
|
|
|
detailDto.HandledFromQty = request.Data.First().MatQty;//2024-12-16 和励 张旭确认的 因为没有人工干预 也没校验 一托就直接顶走了
|
|
|
|
|
|
detailDto.HandledFromLot = detail.TransferLibToLot; |
|
|
|
|
|
detailDto.HandledFromPackingCode = detail.TransferLibToPackingCode; |
|
|
|
|
|
} |
|
|
|
|
|
else |
|
|
|
|
|
{ |
|
|
{ |
|
|
var fromloc = await _locationAppService.GetByCodeAsync(detail.RecommendFromLocationCode).ConfigureAwait(false); |
|
|
var detailDto = new InjectionIssueJobDetailDTO(); |
|
|
var toloc = await _locationAppService.GetByCodeAsync(detail.RecommendToLocationCode).ConfigureAwait(false); |
|
|
if (!string.IsNullOrEmpty(detail.TransferLibFromLocationCode)) |
|
|
|
|
|
{ |
|
|
detailDto.InjectFrom(detail); |
|
|
var fromloc = new LocationDTO(); |
|
|
|
|
|
if (detail.TransferLibFromLocationCode == detail.RecommendFromLocationCode && |
|
|
detailDto.HandledToLocationCode = toloc.Code; |
|
|
detail.TransferLibToLocationCode == detail.RecommendToLocationCode) |
|
|
detailDto.HandledToLocationGroup = toloc.LocationGroupCode; |
|
|
{ |
|
|
detailDto.HandledToLocationArea = toloc.AreaCode; |
|
|
//库移的最终目标 挪到 推荐的目标
|
|
|
detailDto.HandledToLocationErpCode = toloc.ErpLocationCode; |
|
|
fromloc = await _locationAppService.GetByCodeAsync(detail.RecommendFromLocationCode).ConfigureAwait(false); |
|
|
detailDto.HandledToWarehouseCode = toloc.WarehouseCode; |
|
|
} |
|
|
detailDto.HandledToQty = request.Data.First().MatQty; |
|
|
else |
|
|
detailDto.HandledToLot = detail.RecommendToLot; |
|
|
{ |
|
|
detailDto.HandledToPackingCode = detail.RecommendToPackingCode; |
|
|
//库移的最终目标 挪到 推荐的目标
|
|
|
|
|
|
fromloc = await _locationAppService.GetByCodeAsync(detail.TransferLibToLocationCode).ConfigureAwait(false); |
|
|
detailDto.HandledFromLocationCode = fromloc.Code; |
|
|
} |
|
|
detailDto.HandledFromLocationGroup = fromloc.LocationGroupCode; |
|
|
|
|
|
detailDto.HandledFromLocationArea = fromloc.AreaCode; |
|
|
|
|
|
detailDto.HandledFromLocationErpCode = fromloc.ErpLocationCode; |
|
|
|
|
|
detailDto.HandledFromWarehouseCode = fromloc.WarehouseCode; |
|
|
|
|
|
detailDto.HandledFromQty = request.Data.First().MatQty;//2024-12-16 和励 张旭确认的 因为没有人工干预 也没校验 一托就直接顶走了
|
|
|
|
|
|
detailDto.HandledFromLot = detail.RecommendToLot; |
|
|
|
|
|
detailDto.HandledFromPackingCode = detail.RecommendToPackingCode; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
await ExecuteDetailExtAsync(entity.Id, entity.Details.First().Id, detailDto).ConfigureAwait(false); |
|
|
var toloc = await _locationAppService.GetByCodeAsync(detail.RecommendToLocationCode).ConfigureAwait(false); |
|
|
|
|
|
|
|
|
|
|
|
detailDto.InjectFrom(detail); |
|
|
|
|
|
|
|
|
|
|
|
detailDto.HandledToLocationCode = toloc.Code; |
|
|
|
|
|
detailDto.HandledToLocationGroup = toloc.LocationGroupCode; |
|
|
|
|
|
detailDto.HandledToLocationArea = toloc.AreaCode; |
|
|
|
|
|
detailDto.HandledToLocationErpCode = toloc.ErpLocationCode; |
|
|
|
|
|
detailDto.HandledToWarehouseCode = toloc.WarehouseCode; |
|
|
|
|
|
detailDto.HandledToQty = request.Data.First().MatQty; |
|
|
|
|
|
detailDto.HandledToLot = detail.TransferLibToLot; |
|
|
|
|
|
detailDto.HandledToPackingCode = detail.TransferLibToPackingCode; |
|
|
|
|
|
|
|
|
|
|
|
detailDto.HandledFromLocationCode = fromloc.Code; |
|
|
|
|
|
detailDto.HandledFromLocationGroup = fromloc.LocationGroupCode; |
|
|
|
|
|
detailDto.HandledFromLocationArea = fromloc.AreaCode; |
|
|
|
|
|
detailDto.HandledFromLocationErpCode = fromloc.ErpLocationCode; |
|
|
|
|
|
detailDto.HandledFromWarehouseCode = fromloc.WarehouseCode; |
|
|
|
|
|
detailDto.HandledFromQty = request.Data.First().MatQty;//2024-12-16 和励 张旭确认的 因为没有人工干预 也没校验 一托就直接顶走了
|
|
|
|
|
|
detailDto.HandledFromLot = detail.TransferLibToLot; |
|
|
|
|
|
detailDto.HandledFromPackingCode = detail.TransferLibToPackingCode; |
|
|
|
|
|
} |
|
|
|
|
|
else |
|
|
|
|
|
{ |
|
|
|
|
|
var fromloc = await _locationAppService.GetByCodeAsync(detail.RecommendFromLocationCode).ConfigureAwait(false); |
|
|
|
|
|
var toloc = await _locationAppService.GetByCodeAsync(detail.RecommendToLocationCode).ConfigureAwait(false); |
|
|
|
|
|
|
|
|
|
|
|
detailDto.InjectFrom(detail); |
|
|
|
|
|
|
|
|
|
|
|
detailDto.HandledToLocationCode = toloc.Code; |
|
|
|
|
|
detailDto.HandledToLocationGroup = toloc.LocationGroupCode; |
|
|
|
|
|
detailDto.HandledToLocationArea = toloc.AreaCode; |
|
|
|
|
|
detailDto.HandledToLocationErpCode = toloc.ErpLocationCode; |
|
|
|
|
|
detailDto.HandledToWarehouseCode = toloc.WarehouseCode; |
|
|
|
|
|
detailDto.HandledToQty = request.Data.First().MatQty; |
|
|
|
|
|
detailDto.HandledToLot = detail.RecommendToLot; |
|
|
|
|
|
detailDto.HandledToPackingCode = detail.RecommendToPackingCode; |
|
|
|
|
|
|
|
|
|
|
|
detailDto.HandledFromLocationCode = fromloc.Code; |
|
|
|
|
|
detailDto.HandledFromLocationGroup = fromloc.LocationGroupCode; |
|
|
|
|
|
detailDto.HandledFromLocationArea = fromloc.AreaCode; |
|
|
|
|
|
detailDto.HandledFromLocationErpCode = fromloc.ErpLocationCode; |
|
|
|
|
|
detailDto.HandledFromWarehouseCode = fromloc.WarehouseCode; |
|
|
|
|
|
detailDto.HandledFromQty = request.Data.First().MatQty;//2024-12-16 和励 张旭确认的 因为没有人工干预 也没校验 一托就直接顶走了
|
|
|
|
|
|
detailDto.HandledFromLot = detail.RecommendToLot; |
|
|
|
|
|
detailDto.HandledFromPackingCode = detail.RecommendToPackingCode; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
await ExecuteDetailExtAsync(entity.Id, entity.Details.First().Id, detailDto).ConfigureAwait(false); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
catch (Exception e) |
|
|
|
|
|
{ |
|
|
|
|
|
return ReturnMessage("-1", e.Message); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
return ReturnMessage("0", "OK"); |
|
|
return ReturnMessage("0", "OK"); |
|
|