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

盘盈盘亏逻辑外移

Browse Source
This commit is contained in:
18942506660
2023-11-02 14:15:59 +08:00
parent 968b2aaa19
commit 752694af92
4 changed files with 159 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -525,6 +525,36 @@
表单所在的子系统内码，字符串类型（非必录）
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.Erp.ErpSave`1">
<summary>
Erp同步数据时单据头
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpSave`1.FormId">
<summary>
业务对象表单Id（必录）
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpSave`1.Model">
<summary>
单据体
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.Erp.ErpSubmitDto">
<summary>
erp 提交和审核
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpSubmitDto.FormId">
<summary>
业务对象表单Id（必录）
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpSubmitDto.Ids">
<summary>
单据Id
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.Erp.Org.ErpOrgDto">
<summary>
金蝶组织-基本信息
@@ -595,31 +625,6 @@
创建时间
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.Erp.ErpStockDto">
<summary>
仓库信息
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpStockDto.Id">
<summary>
id
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpStockDto.Code">
<summary>
编码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpStockDto.Name">
<summary>
名字
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpStockDto.OrgCode">
<summary>
业务组织(使用组织)编码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.Purchase.ErpPurchaseInStockResultDto.FCHUCHANGPRICE">
<summary>
出厂价格
@@ -650,24 +655,9 @@
名字
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpStockDto.OrgCode">
<member name="P:WMS.Web.Core.Dto.Erp.ErpStockDto.OrgId">
<summary>
业务组织(使用组织)编码
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.Erp.ErpSave`1">
<summary>
Erp同步数据时单据头
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpSave`1.ValidateRepeatJson">
<summary>
校验Json数据包是否重复传入，一旦重复传入，接口调用失败，默认false（非必录）
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpSave`1.Model">
<summary>
单据体
业务组织(使用组织)
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.Erp.TakeStock.ErpTakeStockSaveDto">

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

@@ -2025,6 +2025,20 @@
</summary>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.Public.ErpService.TakeStock_Profit(WMS.Web.Domain.Entitys.TakeStock)">
<summary>
盘盈
</summary>
<param name="entity"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.Public.ErpService.TakeStock_Loss(WMS.Web.Domain.Entitys.TakeStock)">
<summary>
盘亏
</summary>
<param name="entity"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.Public.HttpClientService.GetAsync``1(System.String,System.Int32)">
<summary>
Get方法
@@ -2453,6 +2467,16 @@
仓库
</summary>
</member>
<member name="F:WMS.Web.Domain.Values.Erp.FormIdParam.STK_StockCountGain">
<summary>
盘盈单
</summary>
</member>
<member name="F:WMS.Web.Domain.Values.Erp.FormIdParam.STK_StockCountLoss">
<summary>
盘亏单
</summary>
</member>
<member name="T:WMS.Web.Domain.Values.InstockStatus">
<summary>
入库状态

6
src/WMS.Web.Domain/IService/ITakeStockService.cs
View File

@@ -6,6 +6,7 @@ using WMS.Web.Core.Dto;
using WMS.Web.Core.Dto.Login;
using WMS.Web.Core.Dto.TakeStock;
using WMS.Web.Core.Internal.Results;
using WMS.Web.Domain.Entitys;
namespace WMS.Web.Domain.IService
{
@@ -18,5 +19,10 @@ namespace WMS.Web.Domain.IService
Task<Result> Save(List<SaveTakeStockRequest> dto, LoginInDto loginInfo);
// 同步金蝶
Task<Result> Sync(OperateRequest dto);
//
//盘盈
Task<Result> Profit(TakeStock entity);
//盘亏
Task<Result> Loss(TakeStock entity);
}
}

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

@@ -2,9 +2,11 @@
using Microsoft.EntityFrameworkCore.Storage;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using WMS.Web.Core.Dto;
using WMS.Web.Core.Dto.Erp.TakeStock;
using WMS.Web.Core.Dto.Login;
using WMS.Web.Core.Dto.TakeStock;
using WMS.Web.Core.Internal.Results;
@@ -13,6 +15,7 @@ using WMS.Web.Domain.Infrastructure;
using WMS.Web.Domain.IService;
using WMS.Web.Domain.IService.Public;
using WMS.Web.Domain.Values;
using WMS.Web.Domain.Values.Single;
namespace WMS.Web.Domain.Services
{
@@ -25,14 +28,21 @@ namespace WMS.Web.Domain.Services
private readonly ILoginService _loginService;
public readonly ITransactionRepositories _transactionRepositories;
private readonly ITakeStockRepositories _takeStockRepositories;
private readonly ILoginRepositories _loginRepositories;
private readonly ISingleDataService _singleDataService;
private readonly IErpService _erpService;
public TakeStockService(IMapper mapper, ILoginService loginService,
ITransactionRepositories transactionRepositories,
ITakeStockRepositories takeStockRepositories)
ITakeStockRepositories takeStockRepositories, ILoginRepositories loginRepositories,
ISingleDataService singleDataService, IErpService erpService)
{
_mapper = mapper;
_loginService = loginService;
_transactionRepositories = transactionRepositories;
_takeStockRepositories = takeStockRepositories;
_loginRepositories = loginRepositories;
_singleDataService = singleDataService;
_erpService = erpService;
}
/// <summary>
/// 保存
@@ -72,5 +82,91 @@ namespace WMS.Web.Domain.Services
{
return Task.FromResult(Result.ReSuccess());
}
/// <summary>
/// 盘盈
/// </summary>
/// <param name="entity"></param>
/// <returns></returns>
public async Task<Result> Profit(TakeStock entity)
{
//获取金蝶仓库仓位编码
var stockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.StockId);
var subStockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.SubStockId);
var res = await _erpService.BillQueryForStock();
var stock = res.Data.FirstOrDefault(f => f.Code == stockCode);//需要根据单点code搜索
var subStock = res.Data.FirstOrDefault(f => f.Code == subStockCode);//需要根据单点code搜索
if (stock == null || subStock == null) return Result.ReFailure(ResultCodes.ErpStockNoData);
//组装dto
#region 组装dto
List<ErpTakeStockDetailsSaveDto> detils = new List<ErpTakeStockDetailsSaveDto>();
detils.Add(new ErpTakeStockDetailsSaveDto()
{
FOwnerid = stock.OrgId.ToString(),
FKeeperId = stock.OrgId.ToString(),
MaterialId = entity.MaterialId.ToString(),
UnitId = entity.UnitId.ToString(),
StockId = stock.Id.ToString(),
SubStockId = subStock.Id.ToString(),
BeforeQty = entity.BeforeQty,
AfterQty = entity.AfterQty,
FinalQty = entity.FinalQty,
Fnote = ""
});
ErpTakeStockSaveDto dto = new ErpTakeStockSaveDto()
{
BillNo = entity.BillNo,
StockOrgId = stock.OrgId.ToString(),
Type = "PY01_SYS",
Date = entity.Date,
Details = detils
};
#endregion
return Result.ReSuccess();
}
/// <summary>
/// 盘亏
/// </summary>
/// <param name="entity"></param>
/// <returns></returns>
public async Task<Result> Loss(TakeStock entity)
{
//获取金蝶仓库仓位编码
var stockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.StockId);
var subStockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.SubStockId);
var res = await _erpService.BillQueryForStock();
var stock = res.Data.FirstOrDefault(f => f.Code == stockCode);//需要根据单点code搜索
var subStock = res.Data.FirstOrDefault(f => f.Code == subStockCode);//需要根据单点code搜索
if (stock == null || subStock == null) return Result.ReFailure(ResultCodes.ErpStockNoData);
//组装dto
#region 组装dto
List<ErpTakeStockDetailsSaveDto> detils = new List<ErpTakeStockDetailsSaveDto>();
detils.Add(new ErpTakeStockDetailsSaveDto()
{
FOwnerid = stock.OrgId.ToString(),
FKeeperId = stock.OrgId.ToString(),
MaterialId = entity.MaterialId.ToString(),
UnitId = entity.UnitId.ToString(),
StockId = stock.Id.ToString(),
SubStockId = subStock.Id.ToString(),
BeforeQty = entity.BeforeQty,
AfterQty = entity.AfterQty,
FinalQty = entity.FinalQty,
Fnote = ""
});
ErpTakeStockSaveDto dto = new ErpTakeStockSaveDto()
{
BillNo = entity.BillNo,
StockOrgId = stock.OrgId.ToString(),
Type = "PK01_SYS",
Date = entity.Date,
Details = detils
};
#endregion
return Result.ReSuccess();
}
}
}