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-17 17:25:16 +08:00
parent 9daa9ab775 bab90b94f8
commit a160fdf90b
9 changed files with 75 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/WMS.Web.Api/Controllers/TestController.cs
View File

@@ -46,7 +46,6 @@ namespace WMS.Web.Api.Controllers
[Route("hj")]
public async Task<string> TestHJ()
{
await _outStockTaskService.Sync(null);
//var t=await _outStockTaskRepositories.Get(1);
// t.Details[0].Remark = "sdf";
// t.Details[0].ErpDetails[0].SaleBillNo = "sdfsfsbbbb";

13
src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
View File

@@ -3983,15 +3983,10 @@
</member>
<member name="P:WMS.Web.Core.Dto.TakeStock.SaveTakeStockRequest.BeforeQty">
<summary>
盘点前数量（wms系统数量）
系统库存
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.TakeStock.SaveTakeStockRequest.AfterQty">
<summary>
盘点实际数量（实际仓库数量）
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.TakeStock.SaveTakeStockRequest.FinalQty">
<summary>
盘点数量
</summary>
@@ -4053,17 +4048,17 @@
</member>
<member name="P:WMS.Web.Core.Dto.TakeStock.TakeStockQueryInfoResponse.BeforeQty">
<summary>
盘点前数量（wms系统数量）
系统库存
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.TakeStock.TakeStockQueryInfoResponse.AfterQty">
<summary>
盘点实际数量（实际仓库数量）
盘点数量
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.TakeStock.TakeStockQueryInfoResponse.FinalQty">
<summary>
盘点后数量
盈亏数量
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.TakeStock.TakeStockQueryInfoResponse.ResultType">

8
src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
View File

@@ -1481,23 +1481,23 @@
</member>
<member name="P:WMS.Web.Domain.Entitys.TakeStock.BeforeQty">
<summary>
盘点前数量（wms系统数量）
系统库存
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.TakeStock.AfterQty">
<summary>
盘点实际数量（实际仓库数量）
盘点数量
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.TakeStock.FinalQty">
<summary>
盘点数量
盈亏数量
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.TakeStock.ResultType">
<summary>
盘点结果类型：1为盘盈，2位盘亏
实际仓库数量-WMS系统数量 大于0为盘盈 小于0为盘亏
盘点数量-系统库存 大于0为盘盈 小于0为盘亏
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.TakeStock.Remark">

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

@@ -35,20 +35,15 @@ namespace WMS.Web.Core.Dto.TakeStock
/// </summary>
public int Erp_SubStockId { get; set; }
/// <summary>
/// 盘点前数量（wms系统数量）
/// 系统库存
/// </summary>
[Required(ErrorMessage = "盘点前数量不能为空")]
[Required(ErrorMessage = "系统库存不能为空")]
public decimal BeforeQty { get; set; }
/// <summary>
/// 盘点实际数量（实际仓库数量）
/// </summary>
[Required(ErrorMessage = "盘点实际数量不能为空")]
public decimal AfterQty { get; set; }
/// <summary>
/// 盘点数量
/// </summary>
[Required(ErrorMessage = "盘点数量不能为空")]
public decimal FinalQty { get; set; }
[Required(ErrorMessage = "盘点数量数量不能为空")]
public decimal AfterQty { get; set; }
/// <summary>
/// 备注
/// </summary>

12
src/WMS.Web.Core/Dto/TakeStock/TakeStockQueryInfoResponse.cs
View File

@@ -55,19 +55,19 @@ namespace WMS.Web.Core.Dto.TakeStock
[Column("子仓库")]
public string Erp_SubStock { get; set; }
/// <summary>
/// 盘点前数量（wms系统数量）
/// 系统库存
/// </summary>
[Column("WMS系统数量")]
[Column("系统库存")]
public decimal BeforeQty { get; set; }
/// <summary>
/// 盘点实际数量（实际仓库数量）
/// 盘点数量
/// </summary>
[Column("实际仓库数量")]
[Column("盘点数量")]
public decimal AfterQty { get; set; }
/// <summary>
/// 盘点后数量
/// 盈亏数量
/// </summary>
[Column("此次盘点数量")]
[Column("盈亏数量")]
public decimal FinalQty { get; set; }
/// <summary>
/// 盘点结果类型：1为盘盈，2位盘亏

12
src/WMS.Web.Domain/Entitys/OutStock.cs
View File

@@ -97,8 +97,16 @@ namespace WMS.Web.Domain.Entitys
this.ReceiptCustomerId = task.ReceiptCustomerId;
this.CreatorId = creatorId;
this.CreateTime = DateTime.Now;
this.SuccessSync = false;
this.SuccessSyncFail = this.Details.SelectMany(s => s.ErpDetails).GroupBy(g => g.SourceBillNo).Select(s=>s.Key).ToList();
if (task.Type == OutStockType.Sal)
{
//只有销售出库才需要同步金蝶
this.SuccessSync = false;
this.SuccessSyncFail = this.Details.SelectMany(s => s.ErpDetails).GroupBy(g => g.SourceBillNo).Select(s => s.Key).ToList();
}else
{
this.SuccessSync = true;
this.SuccessSyncFail = new List<string>();
}
}
/// <summary>
/// 同步金蝶(成功)

8
src/WMS.Web.Domain/Entitys/TakeStock.cs
View File

@@ -66,23 +66,23 @@ namespace WMS.Web.Domain.Entitys
[Column("Erp_SubStockId")]
public int Erp_SubStockId { get; set; }
/// <summary>
/// 盘点前数量（wms系统数量）
/// 系统库存
/// </summary>
[Column("BeforeQty")]
public decimal BeforeQty { get; set; }
/// <summary>
/// 盘点实际数量（实际仓库数量）
/// 盘点数量
/// </summary>
[Column("AfterQty")]
public decimal AfterQty { get; set; }
/// <summary>
/// 盘点数量
/// 盈亏数量
/// </summary>
[Column("FinalQty")]
public decimal FinalQty { get; set; }
/// <summary>
/// 盘点结果类型：1为盘盈，2位盘亏
/// 实际仓库数量-WMS系统数量 大于0为盘盈 小于0为盘亏
/// 盘点数量-系统库存 大于0为盘盈 小于0为盘亏
/// </summary>
[Column("ResultType")]
public TakeStockType ResultType { get; set; } = TakeStockType.Profit;

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

@@ -13,9 +13,11 @@ namespace WMS.Web.Domain.Mappers
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.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)));
}
}
}

46
src/WMS.Web.Domain/Services/TakeStockService.cs
View File

@@ -10,6 +10,7 @@ using System.Threading.Tasks;
using WMS.Web.Core.Dto;
using WMS.Web.Core.Dto.Erp;
using WMS.Web.Core.Dto.Erp.TakeStock;
using WMS.Web.Core.Dto.Inventory;
using WMS.Web.Core.Dto.Login;
using WMS.Web.Core.Dto.TakeStock;
using WMS.Web.Core.Internal.Results;
@@ -36,10 +37,12 @@ namespace WMS.Web.Domain.Services
private readonly ISingleDataService _singleDataService;
private readonly IErpService _erpService;
private readonly ILogger<TakeStockService> _logger;
private readonly IBoxInventoryService _boxInventoryService;
public TakeStockService(IMapper mapper, ILoginService loginService,
IBasicsRepositories transactionRepositories,
ITakeStockRepositories takeStockRepositories, ILoginRepositories loginRepositories,
ISingleDataService singleDataService, IErpService erpService, ILogger<TakeStockService> logger)
ISingleDataService singleDataService, IErpService erpService, ILogger<TakeStockService> logger,
IBoxInventoryService boxInventoryService)
{
_mapper = mapper;
_loginService = loginService;
@@ -49,6 +52,7 @@ namespace WMS.Web.Domain.Services
_singleDataService = singleDataService;
_erpService = erpService;
_logger = logger;
_boxInventoryService = boxInventoryService;
}
/// <summary>
/// 保存
@@ -62,17 +66,45 @@ namespace WMS.Web.Domain.Services
foreach (var entity in list)
entity.Create(loginInfo.UserInfo.StaffId);
//需要填写序列号
//需要修改库存
#region 组装库存dto
List<BoxInventoryGenerateDto> inventoryList = new List<BoxInventoryGenerateDto>();
foreach (var entity in list)
{
var inventoryDetail = new List<BoxInventoryGenerateDetailsDto>()
{
new BoxInventoryGenerateDetailsDto()
{
MaterialId=entity.MaterialId,
Qty=entity.FinalQty
}
};
BoxInventoryGenerateDto inventory = new BoxInventoryGenerateDto()
{
BoxId = entity.BoxId,
InventoryInOutMethod = 2,//盘点单按产品修改库存
InventoryInOutType = entity.ResultType == TakeStockType.Profit ? 1 : 2,
StockCode = entity.StockCode,
SubStockId = entity.SubStockId,
Details = inventoryDetail
};
inventoryList.Add(inventory);
}
#endregion
IDbContextTransaction _transaction = _transactionRepositories.GetTransaction();
bool isRollback = false;
Result res_Rollback = Result.ReSuccess();
bool isSuccess = true;
isSuccess = await _takeStockRepositories.AddRange(list, false);
if (!isSuccess) isRollback = true;
var res_Inventory = await _boxInventoryService.HandlBoxInventory(inventoryList, false);
if (!res_Inventory.IsSuccess) res_Rollback = res_Inventory;
if (res_Rollback.IsSuccess)
{
isSuccess = await _takeStockRepositories.AddRange(list, false);
if (!isSuccess) res_Rollback = Result.ReFailure(ResultCodes.DateWriteError);
}
//提交事务
isSuccess = _transactionRepositories.CommitTransaction(isRollback, _transaction);
isSuccess = _transactionRepositories.CommitTransaction(res_Rollback.IsSuccess ? false : true, _transaction);
if (!res_Rollback.IsSuccess) return res_Rollback;
if (!isSuccess)
return Result.ReFailure(ResultCodes.DateWriteError);