zhibinlv
/
WZC2
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

提交更新

Agv分支2024-11-19
赵新宇 5 months ago
parent
4981312d61
commit
531a04f2ea
3 changed files with 156 additions and 110 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/PostionLocations/PostionLocationAppService.cs
  2. 126
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobAppService.cs
  3. 129
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs

11
be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/PostionLocations/PostionLocationAppService.cs
View File

@ -187,9 +187,18 @@ public class PostionLocationAppService
return ObjectMapper.Map<List<PostionLocation>, List<PostionLocationDTO>>(result); return ObjectMapper.Map<List<PostionLocation>, List<PostionLocationDTO>>(result);
} }
[HttpPost("get-all-list")]
public async Task<List<PostionLocationDTO>> GetAllListAsync()
{
var result =await base.GetAllListByFilterAsync(new SfsBaseDataRequestInputBase() ).ConfigureAwait(false);
return result;
}
//private async Task CheckLocationCode(string p_location) //private async Task CheckLocationCode(string p_location)
//{ //{
// var list = await _locationAppService.GetByCodeAsync(p_location).ConfigureAwait(false); // var list = await _locationAppService.GetByCodeAsync(p_location).ConfigureAwait(false);
// if (list == null) // if (list == null)
// { // {

126
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobAppService.cs
View File

@ -948,63 +948,70 @@ public class CoatingIssueJobAppService
{ {
return ReturnMessage("-1", $"{entity.Number}任务单据已结束!"); return ReturnMessage("-1", $"{entity.Number}任务单据已结束!");
} }
try
foreach (var detail in entity.Details)
{ {
var detailDto = new CoatingIssueJobDetailDTO();
if (!string.IsNullOrEmpty(detail.TransferLibFromLocationCode)) foreach (var detail in entity.Details)
{
//库移的最终目标 挪到 推荐的目标
var fromloc = await _locationAppService.GetByCodeAsync(detail.TransferLibFromLocationCode).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 CoatingIssueJobDetailDTO();
var toloc = await _locationAppService.GetByCodeAsync(detail.RecommendToLocationCode).ConfigureAwait(false); if (!string.IsNullOrEmpty(detail.TransferLibFromLocationCode))
{
detailDto.InjectFrom(detail); //库移的最终目标 挪到 推荐的目标
var fromloc = await _locationAppService.GetByCodeAsync(detail.TransferLibFromLocationCode).ConfigureAwait(false);
detailDto.HandledToLocationCode = toloc.Code; var toloc = await _locationAppService.GetByCodeAsync(detail.RecommendToLocationCode).ConfigureAwait(false);
detailDto.HandledToLocationGroup = toloc.LocationGroupCode;
detailDto.HandledToLocationArea = toloc.AreaCode; detailDto.InjectFrom(detail);
detailDto.HandledToLocationErpCode = toloc.ErpLocationCode;
detailDto.HandledToWarehouseCode = toloc.WarehouseCode; detailDto.HandledToLocationCode = toloc.Code;
detailDto.HandledToQty = request.Data.First().MatQty; detailDto.HandledToLocationGroup = toloc.LocationGroupCode;
detailDto.HandledToLot = detail.RecommendToLot; detailDto.HandledToLocationArea = toloc.AreaCode;
detailDto.HandledToPackingCode = detail.RecommendToPackingCode; detailDto.HandledToLocationErpCode = toloc.ErpLocationCode;
detailDto.HandledToWarehouseCode = toloc.WarehouseCode;
detailDto.HandledFromLocationCode = fromloc.Code; detailDto.HandledToQty = request.Data.First().MatQty;
detailDto.HandledFromLocationGroup = fromloc.LocationGroupCode; detailDto.HandledToLot = detail.TransferLibToLot;
detailDto.HandledFromLocationArea = fromloc.AreaCode; detailDto.HandledToPackingCode = detail.TransferLibToPackingCode;
detailDto.HandledFromLocationErpCode = fromloc.ErpLocationCode;
detailDto.HandledFromWarehouseCode = fromloc.WarehouseCode; detailDto.HandledFromLocationCode = fromloc.Code;
detailDto.HandledFromQty = request.Data.First().MatQty;//2024-12-16 和励 张旭确认的 因为没有人工干预 也没校验 一托就直接顶走了 detailDto.HandledFromLocationGroup = fromloc.LocationGroupCode;
detailDto.HandledFromLot = detail.RecommendToLot; detailDto.HandledFromLocationArea = fromloc.AreaCode;
detailDto.HandledFromPackingCode = detail.RecommendToPackingCode; 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); 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");
@ -1017,12 +1024,21 @@ public class CoatingIssueJobAppService
/// <returns></returns> /// <returns></returns>
private AgvResultObject ReturnMessage(string code, string message) private AgvResultObject ReturnMessage(string code, string message)
{ {
return new AgvResultObject() var result = new AgvResultObject()
{ {
Code = code, Code = code,
Message = message, Message = message,
ReqCode = "" ReqCode = ""
}; };
if (code == "0")
{
_logger.LogInformation("成功:" + JsonSerializer.Serialize(result));
}
else
{
_logger.LogInformation("失败：" + JsonSerializer.Serialize(result));
}
return result;
} }
/// <summary> /// <summary>

129
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs
View File

@ -87,6 +87,7 @@ public class KittingIssueJobAppService
_agvOptions = agvOptions; _agvOptions = agvOptions;
_itemBasicAppService = itemBasicAppService; _itemBasicAppService = itemBasicAppService;
_locationDeliveryAppService = locationDeliveryAppService; _locationDeliveryAppService = locationDeliveryAppService;
_logger = logger;
} }
[HttpPost("get-by-number-2")] [HttpPost("get-by-number-2")]
@ -909,61 +910,68 @@ public class KittingIssueJobAppService
return ReturnMessage("-1", $"{entity.Number}任务单据已结束!"); return ReturnMessage("-1", $"{entity.Number}任务单据已结束!");
} }
foreach (var detail in entity.Details) try
{ {
var detailDto = new KittingIssueJobDetailDTO(); foreach (var detail in entity.Details)
if (!string.IsNullOrEmpty(detail.TransferLibFromLocationCode))
{ {
//库移的最终目标 挪到 推荐的目标 var detailDto = new KittingIssueJobDetailDTO();
var fromloc = await _locationAppService.GetByCodeAsync(detail.TransferLibFromLocationCode).ConfigureAwait(false); if (!string.IsNullOrEmpty(detail.TransferLibFromLocationCode))
var toloc = await _locationAppService.GetByCodeAsync(detail.RecommendToLocationCode).ConfigureAwait(false); {
//库移的最终目标 挪到 推荐的目标
detailDto.InjectFrom(detail); var fromloc = await _locationAppService.GetByCodeAsync(detail.TransferLibFromLocationCode).ConfigureAwait(false);
var toloc = await _locationAppService.GetByCodeAsync(detail.RecommendToLocationCode).ConfigureAwait(false);
detailDto.HandledToLocationCode = toloc.Code;
detailDto.HandledToLocationGroup = toloc.LocationGroupCode; detailDto.InjectFrom(detail);
detailDto.HandledToLocationArea = toloc.AreaCode;
detailDto.HandledToLocationErpCode = toloc.ErpLocationCode; detailDto.HandledToLocationCode = toloc.Code;
detailDto.HandledToWarehouseCode = toloc.WarehouseCode; detailDto.HandledToLocationGroup = toloc.LocationGroupCode;
detailDto.HandledToQty = request.Data.First().MatQty; detailDto.HandledToLocationArea = toloc.AreaCode;
detailDto.HandledToLot = detail.TransferLibToLot; detailDto.HandledToLocationErpCode = toloc.ErpLocationCode;
detailDto.HandledToPackingCode = detail.TransferLibToPackingCode; detailDto.HandledToWarehouseCode = toloc.WarehouseCode;
detailDto.HandledToQty = request.Data.First().MatQty;
detailDto.HandledFromLocationCode = fromloc.Code; detailDto.HandledToLot = detail.TransferLibToLot;
detailDto.HandledFromLocationGroup = fromloc.LocationGroupCode; detailDto.HandledToPackingCode = detail.TransferLibToPackingCode;
detailDto.HandledFromLocationArea = fromloc.AreaCode;
detailDto.HandledFromLocationErpCode = fromloc.ErpLocationCode; detailDto.HandledFromLocationCode = fromloc.Code;
detailDto.HandledFromWarehouseCode = fromloc.WarehouseCode; detailDto.HandledFromLocationGroup = fromloc.LocationGroupCode;
detailDto.HandledFromQty = request.Data.First().MatQty;//2024-12-16 和励 张旭确认的 因为没有人工干预 也没校验 一托就直接顶走了 detailDto.HandledFromLocationArea = fromloc.AreaCode;
detailDto.HandledFromLot = detail.TransferLibToLot; detailDto.HandledFromLocationErpCode = fromloc.ErpLocationCode;
detailDto.HandledFromPackingCode = detail.TransferLibToPackingCode; detailDto.HandledFromWarehouseCode = fromloc.WarehouseCode;
} detailDto.HandledFromQty = request.Data.First().MatQty;//2024-12-16 和励 张旭确认的 因为没有人工干预 也没校验 一托就直接顶走了
else detailDto.HandledFromLot = detail.TransferLibToLot;
{ detailDto.HandledFromPackingCode = detail.TransferLibToPackingCode;
var fromloc = await _locationAppService.GetByCodeAsync(detail.RecommendFromLocationCode).ConfigureAwait(false); }
var toloc = await _locationAppService.GetByCodeAsync(detail.RecommendToLocationCode).ConfigureAwait(false); else
{
detailDto.InjectFrom(detail); var fromloc = await _locationAppService.GetByCodeAsync(detail.RecommendFromLocationCode).ConfigureAwait(false);
var toloc = await _locationAppService.GetByCodeAsync(detail.RecommendToLocationCode).ConfigureAwait(false);
detailDto.HandledToLocationCode = toloc.Code;
detailDto.HandledToLocationGroup = toloc.LocationGroupCode; detailDto.InjectFrom(detail);
detailDto.HandledToLocationArea = toloc.AreaCode;
detailDto.HandledToLocationErpCode = toloc.ErpLocationCode; detailDto.HandledToLocationCode = toloc.Code;
detailDto.HandledToWarehouseCode = toloc.WarehouseCode; detailDto.HandledToLocationGroup = toloc.LocationGroupCode;
detailDto.HandledToQty = request.Data.First().MatQty; detailDto.HandledToLocationArea = toloc.AreaCode;
detailDto.HandledToLot = detail.RecommendToLot; detailDto.HandledToLocationErpCode = toloc.ErpLocationCode;
detailDto.HandledToPackingCode = detail.RecommendToPackingCode; detailDto.HandledToWarehouseCode = toloc.WarehouseCode;
detailDto.HandledToQty = request.Data.First().MatQty;
detailDto.HandledFromLocationCode = fromloc.Code; detailDto.HandledToLot = detail.RecommendToLot;
detailDto.HandledFromLocationGroup = fromloc.LocationGroupCode; detailDto.HandledToPackingCode = detail.RecommendToPackingCode;
detailDto.HandledFromLocationArea = fromloc.AreaCode;
detailDto.HandledFromLocationErpCode = fromloc.ErpLocationCode; detailDto.HandledFromLocationCode = fromloc.Code;
detailDto.HandledFromWarehouseCode = fromloc.WarehouseCode; detailDto.HandledFromLocationGroup = fromloc.LocationGroupCode;
detailDto.HandledFromQty = request.Data.First().MatQty;//2024-12-16 和励 张旭确认的 因为没有人工干预 也没校验 一托就直接顶走了 detailDto.HandledFromLocationArea = fromloc.AreaCode;
detailDto.HandledFromLot = detail.RecommendToLot; detailDto.HandledFromLocationErpCode = fromloc.ErpLocationCode;
detailDto.HandledFromPackingCode = detail.RecommendToPackingCode; 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);
} }
await ExecuteDetailExtAsync(entity.Id, entity.Details.First().Id, detailDto).ConfigureAwait(false); }
catch (Exception ex)
{
return ReturnMessage("-1", ex.Message);
} }
return ReturnMessage("0", "OK"); return ReturnMessage("0", "OK");
} }
@ -975,12 +983,22 @@ public class KittingIssueJobAppService
/// <returns></returns> /// <returns></returns>
private AgvResultObject ReturnMessage(string code, string message) private AgvResultObject ReturnMessage(string code, string message)
{ {
return new AgvResultObject() var result = new AgvResultObject()
{ {
Code = code, Code = code,
Message = message, Message = message,
ReqCode = "" ReqCode = ""
}; };
if(code == "0")
{
_logger.LogInformation("成功:"+JsonSerializer.Serialize(result));
}
else
{
_logger.LogInformation("失败："+JsonSerializer.Serialize(result));
}
return result;
} }
/// <summary> /// <summary>
@ -1184,8 +1202,11 @@ public class KittingIssueJobAppService
httpclient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", httpclient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic",
Convert.ToBase64String(Encoding.ASCII.GetBytes($"{username}:{password}"))); Convert.ToBase64String(Encoding.ASCII.GetBytes($"{username}:{password}")));
} }
var json = JsonSerializer.Serialize(request);
var client = new AgvJobClient(_agvOptions.Value.Address, httpclient, _agvOptions.Value.Path); var client = new AgvJobClient(_agvOptions.Value.Address, httpclient, _agvOptions.Value.Path);
_logger.LogInformation($"{flag}发送AGV任务请求:{json }");
ret = await client.PushOutTaskKittingAsync(request).ConfigureAwait(false); ret = await client.PushOutTaskKittingAsync(request).ConfigureAwait(false);
} }

Write Preview
Loading…
Cancel
Save