18923810322/WMS-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://codeup.aliyun.com/62ce7bca487c500c27f70a79/OPS/WMS-Api

Browse Source
This commit is contained in:
tongfei
2023-11-25 17:22:45 +08:00
parent 837ac8266c 0b21e0b035
commit c3121c31e0
3 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/WMS.Web.Api/Controllers/SysConfigController.cs
View File

@@ -199,28 +199,26 @@ namespace WMS.Web.Api.Controllers
/// <returns></returns>
[HttpGet]
[Route("GetErp_SubUcStock/{number}/{orgCode}")]
public async Task<Result<List<UcStockResponse>>> GetErp_SubUcStock([FromRoute] string number,[FromRoute] string orgCode, [FromQuery] string name)
public async Task<Result<List<UcStockResponse>>> GetErp_SubUcStock([FromRoute] string number, [FromRoute] string orgCode, [FromQuery] string name)
{
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
if (loginInfo == null || loginInfo.UserInfo == null)
return Result<List<UcStockResponse>>.ReFailure(ResultCodes.Token_Invalid_Error);
List<UcStockResponse> list = new List<UcStockResponse>();
//if (number.Substring(0, 2).Equals("HD") || number.Substring(0, 2).Equals("GD"))
//{
//var subs = await _erpService.BillQueryForSubStock(number,orgCode);
var subs = await _erpService.BillQueryForSubStock(null, null);
foreach (var s in subs.Data.Skip(0).Take(10))//.Where(w => w.Name.Contains(name)
if (number.Substring(0, 2).Equals("HD") || number.Substring(0, 2).Equals("GD"))
return Result<List<UcStockResponse>>.ReSuccess(list);
var subs = await _erpService.BillQueryForSubStock(number, orgCode);
//var subs = await _erpService.BillQueryForSubStock(null, null);
list = subs.Data.Where(w => w.Name.Contains(name)).Select(s => new UcStockResponse()
{
list.Add(new UcStockResponse()
{
Id = s.Id,
Code = s.Code,
Name = s.Name,
Disable = false
});
}
//}
Id = s.Id,
Code = s.Code,
Name = s.Name,
Disable = false
}).ToList();//.Skip(0).Take(10)
return Result<List<UcStockResponse>>.ReSuccess(list);
}
@@ -330,7 +328,7 @@ namespace WMS.Web.Api.Controllers
return Result<BoxResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
var result = await _boxInventoryRepositories.GetInfoBy(boxBillNo);
BoxResponse boxResponse= _mapper.Map<BoxResponse>(result);
BoxResponse boxResponse = _mapper.Map<BoxResponse>(result);
if (boxResponse != null)
{
var materials_result = await _erpService.BillQueryForMaterial();

2
src/WMS.Web.Core/Dto/TakeStock/SaveTakeStockRequest.cs
View File

@@ -28,7 +28,7 @@ namespace WMS.Web.Core.Dto.TakeStock
/// <summary>
/// 子仓库(跟金蝶交互字段)
/// </summary>
public int Erp_SubStockId { get; set; }
public int? Erp_SubStockId { get; set; } = 0;
/// <summary>
/// 系统库存
/// </summary>

7
src/WMS.Web.Domain/Mappers/TakeStockMapper.cs
View File

@@ -8,16 +8,17 @@ using WMS.Web.Domain.Values;
namespace WMS.Web.Domain.Mappers
{
public class TakeStockMapper:Profile
public class TakeStockMapper : Profile
{
public TakeStockMapper()
{
CreateMap<SaveTakeStockRequest, TakeStockDetails>()
.ForMember(x => x.ResultType, ops => ops.MapFrom(x => (x.AfterQty - x.BeforeQty) >0? TakeStockType.Profit: TakeStockType.Loss))
.ForMember(x => x.ResultType, ops => ops.MapFrom(x => (x.AfterQty - x.BeforeQty) > 0 ? TakeStockType.Profit : TakeStockType.Loss))
.ForMember(x => x.FinalQty, ops => ops.MapFrom(x => Math.Abs(x.AfterQty - x.BeforeQty)));
CreateMap<SaveTakeStockRequest, TakeStock>()
.ForMember(x => x.ResultType, ops => ops.MapFrom(x => (x.AfterQty - x.BeforeQty) > 0 ? TakeStockType.Profit : TakeStockType.Loss))
.ForMember(x => x.FinalQty, ops => ops.MapFrom(x => Math.Abs(x.AfterQty - x.BeforeQty)));
.ForMember(x => x.FinalQty, ops => ops.MapFrom(x => Math.Abs(x.AfterQty - x.BeforeQty)))
.ForMember(x => x.Erp_SubStockId, ops => ops.MapFrom(x => x.Erp_SubStockId ?? 0));
}
}
}