Browse Source

Merge branch 'dev_DY_CC' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2 into dev_DY_CC

dev_DY_CC
lvzb 12 months ago
parent
commit
6ee27e3ccc
  1. 24
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/GaoTongs/DTOs/LocationCodeInfoDTO.cs
  2. 8
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/GaoTongs/IGaoTongAppService.cs
  3. 48
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/GaoTongs/Inputs/LocationCodeInfoEditInput.cs
  4. 26
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/GaoTongs/GaoTongAppService.cs
  5. 10
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs

24
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/GaoTongs/DTOs/LocationCodeInfoDTO.cs

@ -0,0 +1,24 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Volo.Abp.Application.Dtos;
namespace Win_in.Sfs.Wms.Store.Application.Contracts;
public class LocationCodeInfoDTO : EntityDto
{
/// <summary>
/// 位置码
/// </summary>
[Display(Name = "位置码")]
public string PositionCode { get; set; }
/// <summary>
/// 库位码
/// </summary>
[Display(Name = "库位码")]
public string LocationCode { get; set; }
}

8
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/GaoTongs/IGaoTongAppService.cs

@ -18,4 +18,12 @@ public interface IGaoTongAppService : IApplicationService
/// <param name="input">组盘接口输入参数</param>
/// <returns>立库接口通用输出参数</returns>
Task<GaoTongResultDTO> FeedbackZuPanAsync(ZuPanEditInput input);
/// <summary>
/// 【立库接口】 回库器具或空器具AGV搬运
/// 提供一个用位置码查询库位的接口给立体库使用
/// </summary>
/// <param name="input">位置码列表</param>
/// <returns>库位信息列表</returns>
Task<List<LocationCodeInfoDTO>> GetLocationInfoByPositionCode(LocationCodeInfoEditInput input);
}

48
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/GaoTongs/Inputs/LocationCodeInfoEditInput.cs

@ -0,0 +1,48 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Volo.Abp.Application.Dtos;
namespace Win_in.Sfs.Wms.Store.Application.Contracts;
public class LocationCodeInfoEditInput : EntityDto
{
[Display(Name = "每次生成一个不会重复值,用于防重")]
public string Uuid { get; set; }
[Display(Name = "接口动作的标识:ReceiveBackStockAction")]
public string OperatorName { get; set; }
[Display(Name = "位置码列表")]
public List<SiteData> DataList { get; set; }
public LocationCodeInfoEditInput()
{
DataList = new List<SiteData>();
}
}
public class SiteData : EntityDto
{
/// <summary>
/// 位置码
/// </summary>
public string Site { get; set; }
}
/*
{
"uuid": "每次生成一个不会重复值,用于防重",
"operatorName": "ReceiveTractorAction",
"datalist": [
{
"site": "A001"
}
]
}
*/

26
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/GaoTongs/GaoTongAppService.cs

@ -9,6 +9,7 @@ using Volo.Abp;
using Volo.Abp.Application.Services;
using Volo.Abp.Users;
using Win_in.Sfs.Basedata.Application.Contracts;
using Win_in.Sfs.Basedata.Domain;
using Win_in.Sfs.Basedata.Domain.Shared;
using Win_in.Sfs.Shared.Domain.Shared;
using Win_in.Sfs.Wms.Inventory.Application.Contracts;
@ -30,19 +31,22 @@ public class GaoTongAppService : ApplicationService, IGaoTongAppService
private readonly CurrentUser _currentUser;
private readonly IItemBasicAppService _itemBasicAppService;
private readonly ILocationAppService _locationAppService;
private readonly IPositionCodeAppService _positionCodeAppService;
public GaoTongAppService(
IBalanceAppService balanceAppService
, ITransferNoteAppService transferNoteAppService
, CurrentUser currentUser
, IItemBasicAppService itemBasicAppService
,ILocationAppService locationAppService)
, ILocationAppService locationAppService
, IPositionCodeAppService positionCodeAppService)
{
_balanceAppService = balanceAppService;
_transferNoteAppService = transferNoteAppService;
_currentUser = currentUser;
_itemBasicAppService = itemBasicAppService;
_locationAppService = locationAppService;
_positionCodeAppService = positionCodeAppService;
}
/// <summary>
/// 组盘信息反馈到东阳WMS
@ -138,5 +142,25 @@ public class GaoTongAppService : ApplicationService, IGaoTongAppService
return ret;
}
}
/// <summary>
/// 【立库接口】 回库器具或空器具AGV搬运
/// 提供一个用位置码查询库位的接口给立体库使用
/// </summary>
/// <param name="input">位置码列表</param>
/// <returns>库位信息列表</returns>
[HttpPost("get-location-info-by-position-code")]
public async Task<List<LocationCodeInfoDTO>> GetLocationInfoByPositionCode(LocationCodeInfoEditInput input)
{
List<string> strLst = input.DataList.Select(itm => itm.Site).ToList();
var lst = await _positionCodeAppService.GetByCodesAsync(strLst).ConfigureAwait(false);
var ret = lst.Select(itm => new LocationCodeInfoDTO()
{
PositionCode = itm.Code,
LocationCode = itm.LocationCode
}).ToList();
return ret;
}
}

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

@ -201,14 +201,14 @@ public class KittingIssueJobAppService
if (kittingIssueJob.EnumIssueSendType == EnumIssueSendType.BoxQtyType) //按箱叫料 因为任务只有1箱 所以可以直接完成
{
await UpdateRequestAndjobStatusDoneAsync(kittingIssueJob, issueJobDetailDto).ConfigureAwait(false);
await UpdateRequestAndjobStatusDoneAsync(kittingIssueJob, issueJobDetailDto, issueJobDetailDto.HandledToQty).ConfigureAwait(false);
}
else
{
var detail = kittingIssueJob.Details.First(p => p.Id == issueJobDetailDto.Id);
if (issueJobDetail.HandledToQty >= detail.RequestQty)
{
await UpdateRequestAndjobStatusDoneAsync(kittingIssueJob, issueJobDetailDto).ConfigureAwait(false);
await UpdateRequestAndjobStatusDoneAsync(kittingIssueJob, issueJobDetailDto, issueJobDetailDto.HandledToQty).ConfigureAwait(false);
}
}
@ -350,7 +350,7 @@ public class KittingIssueJobAppService
/// <returns></returns>
/// <exception cref="UserFriendlyException"></exception>
private async Task UpdateRequestAndjobStatusDoneAsync(KittingIssueJob kittingIssueJob,
KittingIssueJobDetailDTO kittingIssueJobDetailDto)
KittingIssueJobDetailDTO kittingIssueJobDetailDto,decimal handledToQty)
{
if (kittingIssueJob.JobStatus is EnumJobStatus.Closed or EnumJobStatus.Cancelled or EnumJobStatus.None
or EnumJobStatus.Done) //需要考虑下 多次提交的问题 所以不判断 进行中
@ -365,9 +365,9 @@ public class KittingIssueJobAppService
kittingIssueJobDetailDto.ItemCode,
kittingIssueJobDetailDto.HandledToLocationCode, kittingIssueJobDetailDto.HandledToPackingCode,
kittingIssueJobDetailDto.Status, kittingIssueJobDetailDto.HandledToLot,
kittingIssueJobDetailDto.HandledToQty).ConfigureAwait(false);
handledToQty).ConfigureAwait(false);
await _expectOutAppService.RemoveByNumberAsync(kittingIssueJob.Number).ConfigureAwait(false);
//await _expectOutAppService.RemoveByNumberAsync(kittingIssueJob.Number).ConfigureAwait(false);
await KittingIssueRequestAppService.UpdateStatusCompletedAsync(kittingIssueJob.KittingRequestNumber)
.ConfigureAwait(false);

Loading…
Cancel
Save