Browse Source

提交

Agv分支2024-11-19
赵新宇 4 months ago
parent
commit
ae517af430
  1. 3
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobAppService.cs
  2. 6
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobAppService.cs
  3. 6
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs
  4. 1
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedIssueJobs/UnplannedIssueJobAppService.cs

3
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobAppService.cs

@ -182,8 +182,7 @@ public class CoatingIssueJobAppService
coatingJob.JobStatus == EnumJobStatus.Partial || coatingJob.JobStatus == EnumJobStatus.Partial ||
coatingJob.JobStatus == EnumJobStatus.Wait || coatingJob.JobStatus == EnumJobStatus.Wait ||
coatingJob.JobStatus == EnumJobStatus.Doing|| coatingJob.JobStatus == EnumJobStatus.Doing||
coatingJob.JobStatus == EnumJobStatus.WaitAgv
coatingJob.JobStatus == EnumJobStatus.WaitAgv
) )
{ {
await _expectOutAppService.RemoveByNumberAsync(coatingJob.Number).ConfigureAwait(false); await _expectOutAppService.RemoveByNumberAsync(coatingJob.Number).ConfigureAwait(false);

6
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobAppService.cs

@ -813,13 +813,9 @@ public class InjectionIssueJobAppService
//TODO AGV //TODO AGV
//来源永远是库位 目标永远是工位 //来源永远是库位 目标永远是工位
var ret = await CallAgvAsync(InjectionIssueJobDto, fromLocationCode, jobDetailInputdetail.Remark).ConfigureAwait(false); var ret = await CallAgvAsync(InjectionIssueJobDto, fromLocationCode, jobDetailInputdetail.Remark).ConfigureAwait(false);
#if DEBUG #if DEBUG
return true; return true;
#endif #endif
if (ret.Code != 0) if (ret.Code != 0)
{ {
throw new UserFriendlyException($"调用AGV不成功!原因:{ret.Message}"); throw new UserFriendlyException($"调用AGV不成功!原因:{ret.Message}");
@ -1074,6 +1070,7 @@ public class InjectionIssueJobAppService
detailInput.ToStatus = EnumInventoryStatus.OK; detailInput.ToStatus = EnumInventoryStatus.OK;
detailInput.Remark = "AGV反库"; detailInput.Remark = "AGV反库";
transfer.Details.Add(detailInput); transfer.Details.Add(detailInput);
@ -1205,7 +1202,6 @@ public class InjectionIssueJobAppService
} }
#endregion #endregion
#region 私有 #region 私有
/// <summary> /// <summary>

6
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs

@ -197,11 +197,7 @@ public class KittingIssueJobAppService
$"{EnumJobStatus.Partial.GetDisplayName()}、" + $"{EnumJobStatus.Partial.GetDisplayName()}、" +
$"{EnumJobStatus.Doing.GetDisplayName()}、" + $"{EnumJobStatus.Doing.GetDisplayName()}、" +
$"{EnumJobStatus.Wait.GetDisplayName()}"+ $"{EnumJobStatus.Wait.GetDisplayName()}"+
$"{EnumJobStatus.WaitAgv.GetDisplayName()}" $"{EnumJobStatus.WaitAgv.GetDisplayName()}");
);
} }
} }

1
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedIssueJobs/UnplannedIssueJobAppService.cs

@ -832,6 +832,7 @@ public class UnplannedIssueJobAppService
request.Batch = detail.HandledPackingCode; request.Batch = detail.HandledPackingCode;
request.ErpLocationCode = job.FromErpLocationCode; request.ErpLocationCode = job.FromErpLocationCode;
request.PakingCode = detail.HandledPackingCode; request.PakingCode = detail.HandledPackingCode;
request.BeginPosition = detail.HandledFromLocationCode;
request.EndPosition = detail.HandledFromLocationCode; request.EndPosition = detail.HandledFromLocationCode;
request.OrderType = request.OrderType = job.UnplannedIssueType == EnumUnplannedIssueType.Raw ? EnumJobType.UnplannedIssueJobHasPacking.ToString() : EnumJobType.UnplannedIssueJobNoPacking.ToString(); ; request.OrderType = request.OrderType = job.UnplannedIssueType == EnumUnplannedIssueType.Raw ? EnumJobType.UnplannedIssueJobHasPacking.ToString() : EnumJobType.UnplannedIssueJobNoPacking.ToString(); ;

Loading…
Cancel
Save