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

接口优化

Browse Source
This commit is contained in:
tongfei
2023-11-09 16:16:53 +08:00
parent d386e4aa41 430a192e3c
commit 9e0635f20d
18 changed files with 290 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/WMS.Web.Api/Controllers/OutStockController.cs
View File

@@ -52,6 +52,24 @@ namespace WMS.Web.Api.Controllers
return result;
}
/// <summary>
/// 获取详情
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
[HttpGet]
[Route("GetInfo/{id}")]
public async Task<Result<OutStockInfoResponse>> GetInfo([FromRoute] int id)
{
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
if (loginInfo == null || loginInfo.UserInfo == null)
return Result<OutStockInfoResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
var response = await _repositories.GetInfo(id);
return Result<OutStockInfoResponse>.ReSuccess(response);
}
/// <summary>
/// 出库保存(出库)-PDA
/// </summary>
@@ -80,7 +98,7 @@ namespace WMS.Web.Api.Controllers
if (loginInfo == null || loginInfo.UserInfo == null)
return Result.ReFailure(ResultCodes.Token_Invalid_Error);
return await _outStockService.Sync(dto);
return await _outStockService.Sync(dto, loginInfo);
}
}
}

19
src/WMS.Web.Api/Controllers/OutStockTaskController.cs
View File

@@ -67,7 +67,7 @@ namespace WMS.Web.Api.Controllers
if (loginInfo == null || loginInfo.UserInfo == null)
return Result.ReFailure(ResultCodes.Token_Invalid_Error);
return await _outStockTaskService.Repeal(dto,loginInfo);
return await _outStockTaskService.Repeal(dto, loginInfo);
}
/// <summary>
@@ -99,10 +99,25 @@ namespace WMS.Web.Api.Controllers
if (loginInfo == null || loginInfo.UserInfo == null)
return ResultList<GetOutStockTaskByNoResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
var res= await _repositories.GetOutStockTaskByNo(billNo);
var res = await _repositories.GetOutStockTaskByNo(billNo);
if (res == null) return ResultList<GetOutStockTaskByNoResponse>.ReFailure(ResultCodes.OutStockTaskNoData);
return ResultList<GetOutStockTaskByNoResponse>.ReSuccess(res);
}
/// <summary>
/// 刷新金蝶数据
/// </summary>
/// <param name="dto"></param>
/// <returns></returns>
[HttpPost]
[Route("Refresh")]
public async Task<Result> Refresh(OperateStrRequest dto)
{
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
if (loginInfo == null || loginInfo.UserInfo == null)
return Result.ReFailure(ResultCodes.Token_Invalid_Error);
return await _outStockTaskService.Ssyn(dto.Ids);
}
}
}

14
src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
View File

@@ -218,6 +218,13 @@
<param name="dto"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.OutStockController.GetInfo(System.Int32)">
<summary>
获取详情
</summary>
<param name="id"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.OutStockController.Save(WMS.Web.Core.Dto.OutStock.SaveOutStockRequest)">
<summary>
出库保存(出库)-PDA
@@ -265,6 +272,13 @@
<param name="billNo"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.OutStockTaskController.Refresh(WMS.Web.Core.Dto.OperateStrRequest)">
<summary>
刷新金蝶数据
</summary>
<param name="dto"></param>
<returns></returns>
</member>
<member name="T:WMS.Web.Api.Controllers.SysConfigController">
<summary>
系统配置

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

@@ -2395,6 +2395,11 @@
操作 Id集合
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.OperateStrRequest">
<summary>
操作 string集合
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.OpsBoxRequest">
<summary>
老ops箱信息请求
@@ -2695,6 +2700,31 @@
仓库编码
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.OutStock.OutStockInfoResponse">
<summary>
出库单详情
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.OutStock.OutStockInfoResponse.Creator">
<summary>
创建人
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.OutStock.OutStockInfoResponse.Operate">
<summary>
操作人
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.OutStock.OutStockInfoResponse.CreateTime">
<summary>
创建时间（出库时间）
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.OutStock.OutStockInfoResponse.SyncTime">
<summary>
同步时间
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.OutStock.OutStockQueryInfoResponse">
<summary>
出库列表详情
@@ -2775,6 +2805,11 @@
出库数量
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.OutStock.OutStockQueryInfoResponse.Remark">
<summary>
备注
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.OutStock.OutStockQueryRequest">
<summary>
出库单列表请求
@@ -3045,16 +3080,21 @@
物料ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.TakeStock.SaveTakeStockRequest.StockId">
<member name="P:WMS.Web.Core.Dto.TakeStock.SaveTakeStockRequest.StockCode">
<summary>
仓库ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.TakeStock.SaveTakeStockRequest.SubStockId">
<member name="P:WMS.Web.Core.Dto.TakeStock.SaveTakeStockRequest.SubStockCode">
<summary>
仓位ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.TakeStock.SaveTakeStockRequest.Erp_SubStockCode">
<summary>
子仓库(跟金蝶交互字段)
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.TakeStock.SaveTakeStockRequest.BeforeQty">
<summary>
盘点前数量（wms系统数量）
@@ -3120,6 +3160,11 @@
仓位
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.TakeStock.TakeStockQueryInfoResponse.Erp_SubStockCode">
<summary>
子仓库
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.TakeStock.TakeStockQueryInfoResponse.BeforeQty">
<summary>
盘点前数量（wms系统数量）

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

@@ -742,6 +742,11 @@
创建人
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.OutStock.OperateId">
<summary>
操作人
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.OutStock.CreateTime">
<summary>
创建时间（出库时间）
@@ -752,6 +757,16 @@
同步成功或者失败 null 就是未同步
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.OutStock.SyncTime">
<summary>
同步时间
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.OutStock.Remark">
<summary>
备注
</summary>
</member>
<member name="F:WMS.Web.Domain.Entitys.OutStock.Details">
<summary>
明细
@@ -763,6 +778,12 @@
</summary>
<param name="creatorId"></param>
</member>
<member name="M:WMS.Web.Domain.Entitys.OutStock.Sync(System.Boolean,System.Int32,System.String)">
<summary>
同步金蝶
</summary>
<param name="operateId"></param>
</member>
<member name="M:WMS.Web.Domain.Entitys.OutStock.GenerateNo">
<summary>
生成单据号
@@ -2442,7 +2463,7 @@
<param name="loginInfo"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.OutStockService.Sync(WMS.Web.Core.Dto.OperateRequest)">
<member name="M:WMS.Web.Domain.Services.OutStockService.Sync(WMS.Web.Core.Dto.OperateRequest,WMS.Web.Core.Dto.Login.LoginInDto)">
<summary>
同步金蝶
</summary>

7
src/WMS.Web.Core/Dto/OperateRequest.cs
View File

@@ -19,4 +19,11 @@ namespace WMS.Web.Core.Dto
{
public List<int> Ids { get; set; } = new List<int>();
}
/// <summary>
/// 操作 string集合
/// </summary>
public class OperateStrRequest
{
public List<string> Ids { get; set; } = new List<string>();
}
}

29
src/WMS.Web.Core/Dto/OutStock/OutStockInfoResponse.cs Normal file
View File

@@ -0,0 +1,29 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace WMS.Web.Core.Dto.OutStock
{
/// <summary>
/// 出库单详情
/// </summary>
public class OutStockInfoResponse
{
/// <summary>
/// 创建人
/// </summary>
public string Creator { get; set; }
/// <summary>
/// 操作人
/// </summary>
public string Operate { get; set; }
/// <summary>
/// 创建时间（出库时间）
/// </summary>
public string CreateTime { get; set; }
/// <summary>
/// 同步时间
/// </summary>
public string SyncTime { get; set; }
}
}

4
src/WMS.Web.Core/Dto/OutStock/OutStockQueryInfoResponse.cs
View File

@@ -70,5 +70,9 @@ namespace WMS.Web.Core.Dto.OutStock
/// 出库数量
///</summary>
public decimal Qty { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
}
}

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

@@ -24,12 +24,16 @@ namespace WMS.Web.Core.Dto.TakeStock
/// 仓库ID
/// </summary>
[Required(ErrorMessage = "仓库不能为空")]
public int StockId { get; set; }
public string StockCode { get; set; }
/// <summary>
/// 仓位ID
/// </summary>
[Required(ErrorMessage = "仓位不能为空")]
public int SubStockId { get; set; }
public string SubStockCode { get; set; }
/// <summary>
/// 子仓库(跟金蝶交互字段)
/// </summary>
public string Erp_SubStockCode { get; set; }
/// <summary>
/// 盘点前数量（wms系统数量）
/// </summary>

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

@@ -42,6 +42,10 @@ namespace WMS.Web.Core.Dto.TakeStock
/// </summary>
public string SubStock { get; set; }
/// <summary>
/// 子仓库
/// </summary>
public string Erp_SubStockCode { get; set; }
/// <summary>
/// 盘点前数量（wms系统数量）
/// </summary>
public decimal BeforeQty { get; set; }

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

@@ -56,6 +56,11 @@ namespace WMS.Web.Domain.Entitys
[Column("CreatorId")]
public int CreatorId { get; set; }
/// <summary>
/// 操作人
/// </summary>
[Column("OperateId")]
public int OperateId { get; set; }
/// <summary>
/// 创建时间（出库时间）
/// </summary>
[Column("CreateTime")]
@@ -66,6 +71,16 @@ namespace WMS.Web.Domain.Entitys
[Column("SuccessSync")]
public bool? SuccessSync { get; set; }
/// <summary>
/// 同步时间
/// </summary>
[Column("SyncTime")]
public DateTime? SyncTime { get; set; }
/// <summary>
/// 备注
/// </summary>
[Column("Remark")]
public string Remark { get; set; }
/// <summary>
/// 明细
/// </summary>
public List<OutStockDetails> Details = new List<OutStockDetails>();
@@ -82,7 +97,17 @@ namespace WMS.Web.Domain.Entitys
this.CreatorId = creatorId;
this.CreateTime = DateTime.Now;
}
/// <summary>
/// 同步金蝶
/// </summary>
/// <param name="operateId"></param>
public void Sync(bool isSuccess, int operateId,string remark)
{
this.SuccessSync = isSuccess;
this.Remark = remark;
this.OperateId = operateId;
this.SyncTime = DateTime.Now;
}
/// <summary>
/// 生成单据号

2
src/WMS.Web.Domain/IService/IOutStockService.cs
View File

@@ -18,7 +18,7 @@ namespace WMS.Web.Domain.IService
//出库单保存
Task<Result> Save(SaveOutStockRequest dto, LoginInDto loginInfo);
// 同步金蝶
Task<Result> Sync(OperateRequest dto);
Task<Result> Sync(OperateRequest dto, LoginInDto loginInfo);
}
}

2
src/WMS.Web.Domain/Infrastructure/IOutStockRepositories.cs
View File

@@ -21,5 +21,7 @@ namespace WMS.Web.Domain.Infrastructure
Task<List<OutStock>> GetEntityList(List<int> ids);
/// 修改实体集合
Task<bool> EditEntityList(List<OutStock> entitys, bool isTransaction = true);
//获取详情
Task<OutStockInfoResponse> GetInfo(int id);
}
}

19
src/WMS.Web.Domain/Services/OutStockService.cs
View File

@@ -29,9 +29,11 @@ namespace WMS.Web.Domain.Services
private readonly IOutStockRepositories _outStockRepositories;
private readonly IOutStockTaskRepositories _outStockTaskRepositories;
private readonly IOutStockTaskService _outStockTaskService;
private readonly IErpService _erpService;
public OutStockService(IMapper mapper, ILoginService loginService,
IBasicsRepositories transactionRepositories,
IOutStockRepositories outStockRepositories, IOutStockTaskRepositories outStockTaskRepositories, IOutStockTaskService outStockTaskService)
IOutStockRepositories outStockRepositories, IOutStockTaskRepositories outStockTaskRepositories,
IOutStockTaskService outStockTaskService, IErpService erpService)
{
_mapper = mapper;
_loginService = loginService;
@@ -39,6 +41,7 @@ namespace WMS.Web.Domain.Services
_outStockRepositories = outStockRepositories;
_outStockTaskRepositories = outStockTaskRepositories;
_outStockTaskService = outStockTaskService;
_erpService = erpService;
}
/// <summary>
/// 出库单
@@ -95,9 +98,19 @@ namespace WMS.Web.Domain.Services
/// </summary>
/// <param name="dto"></param>
/// <returns></returns>
public Task<Result> Sync(OperateRequest dto)
public async Task<Result> Sync(OperateRequest dto, LoginInDto loginInfo)
{
return Task.FromResult(Result.ReSuccess());
var list = await _outStockRepositories.GetEntityList(dto.Ids);
foreach (var entity in list)
{
//下推金蝶
var res = await _erpService.Push(new Core.Dto.Erp.ErpPushDto() { });
entity.Sync(res.IsSuccess, loginInfo.UserInfo.StaffId, res.Message);
}
var isSuccess = await _outStockRepositories.EditEntityList(list, true);
if (!isSuccess) return Result.ReFailure(ResultCodes.DateWriteError);
return Result.ReSuccess();
}
}
}

77
src/WMS.Web.Domain/Services/Public/ErpService.cs
View File

@@ -89,9 +89,10 @@ namespace WMS.Web.Domain.Services.Public
/// <summary>
/// erp:单据查询-采购入库单
/// </summary>
/// <param name="billNo">模糊搜索</param>
/// <param name="sourceBillNos">单据编号集合精确查找</param>
/// <returns></returns>
public async Task<ResultList<ErpPurchaseInStockResultDto>> BillQueryForPurchaseInStock(List<string> sourceBillNos = null)
public async Task<ResultList<ErpPurchaseInStockResultDto>> BillQueryForPurchaseInStock(string billNo = "", List<string> sourceBillNos = null)
{
try
{
@@ -121,7 +122,7 @@ namespace WMS.Web.Domain.Services.Public
//3.单据类型：标准采购订单和标准委外订单
//4.明细关闭状态：正常
//5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步
param.FilterString = "FCreateDate>='" + beginTime + "' and FCreateDate<='" + endTime + "' and FDocumentStatus='C' and (FBillTypeID='83d822ca3e374b4ab01e5dd46a0062bd' or FBillTypeID='6d01d059713d42a28bb976c90a121142') and FMRPCloseStatus='A'";
param.FilterString = "FCreateDate>='" + beginTime + "' and FCreateDate<='" + endTime + "' and FDocumentStatus='C' and (FBillTypeID='83d822ca3e374b4ab01e5dd46a0062bd' or FBillTypeID='6d01d059713d42a28bb976c90a121142') and FMRPCloseStatus='A'";
param.FilterString = param.FilterString + " and FSOSTOCKID.FNumber in (";
var str = "";
@@ -136,6 +137,12 @@ namespace WMS.Web.Domain.Services.Public
}
param.FilterString = param.FilterString + str + ")";
//单据编号模糊查询
if (!string.IsNullOrEmpty(billNo))
{
param.FilterString = param.FilterString + " and FBillNo like '%" + billNo + "%'";
}
//根据原订单号查询
if (sourceBillNos != null && sourceBillNos.Count() > 0)
{
@@ -265,7 +272,7 @@ namespace WMS.Web.Domain.Services.Public
return ResultList<ErpMaterialDto>.ReFailure(ResultCodes.ErpMaterialError);
}
}
@@ -544,34 +551,46 @@ namespace WMS.Web.Domain.Services.Public
{
try
{
var token_result = await this.Init();
if (!token_result.IsSuccess)
return ResultList<ErpStockDto>.ReFailure(token_result);
var query = new ErpBillQueryDto(token_result.Data);
var param = new ErpBillQueryParamDto(FormIdParam.BD_STOCK.ToString());
param.FieldKeys = "FStockFlexDetail_FDetailID,FFlexEntryName,FFlexEntryId,'0'";
param.Limit = 100000;
if (!string.IsNullOrEmpty(code))
param.FilterString = "FNumber='" + code + "'";//FNumber='C'
query.Data = JsonConvert.SerializeObject(param);
var json = JsonConvert.SerializeObject(query);
var result_json = await _client.ExecuteBillQueryAsync(json);
var result = JsonConvert.DeserializeObject<List<List<string>>>(result_json);
var list = new List<ErpStockDto>();
foreach (var item in result)
//1.获取缓存中的仓库数据；
var cache_key = "erp_substock_list";
var stocks = _memoryCache.Get<List<ErpStockDto>>(cache_key);
if (stocks == null || stocks.Count == 0)
{
var lis = new ErpStockDto();
lis.Id = int.Parse(item[0]);
lis.Name = item[1];
lis.Code = item[2];
lis.OrgId = Convert.ToInt32(item[3]);
list.Add(lis);
var token_result = await this.Init();
if (!token_result.IsSuccess)
return ResultList<ErpStockDto>.ReFailure(token_result);
var query = new ErpBillQueryDto(token_result.Data);
var param = new ErpBillQueryParamDto(FormIdParam.BD_STOCK.ToString());
param.FieldKeys = "FStockFlexDetail_FDetailID,FFlexEntryName,FFlexEntryId,'0'";
param.Limit = 100000;
if (!string.IsNullOrEmpty(code))
param.FilterString = "FNumber='" + code + "'";//FNumber='C'
query.Data = JsonConvert.SerializeObject(param);
var json = JsonConvert.SerializeObject(query);
var result_json = await _client.ExecuteBillQueryAsync(json);
var result = JsonConvert.DeserializeObject<List<List<string>>>(result_json);
var list = new List<ErpStockDto>();
foreach (var item in result)
{
var lis = new ErpStockDto();
lis.Id = int.Parse(item[0]);
lis.Name = item[1];
lis.Code = item[2];
lis.OrgId = Convert.ToInt32(item[3]);
list.Add(lis);
}
//5.供应商集合进行缓存
_memoryCache.Set(cache_key, list, new MemoryCacheEntryOptions().SetAbsoluteExpiration(TimeSpan.FromHours(12)));
_logger.LogInformation($"子仓库拉取-总条数：{list.Count}");
return ResultList<ErpStockDto>.ReSuccess(list);
}
else
{
return ResultList<ErpStockDto>.ReSuccess(stocks);
}
return ResultList<ErpStockDto>.ReSuccess(list);
}
catch (Exception)
{
@@ -1082,7 +1101,7 @@ namespace WMS.Web.Domain.Services.Public
}
}
#endregion
}

22
src/WMS.Web.Repositories/OutStockRepositories.cs
View File

@@ -169,7 +169,8 @@ namespace WMS.Web.Repositories
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialId),
MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId),
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId),
Qty = s.detail.Qty
Qty = s.detail.Qty,
Remark = s.order.Remark
#endregion
}).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
@@ -272,5 +273,24 @@ namespace WMS.Web.Repositories
return res.Clone();
}
/// <summary>
/// 获取详情
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
public async Task<OutStockInfoResponse> GetInfo(int id)
{
var res = await _context.OutStock
.FirstOrDefaultAsync(f => id == f.Id);
if (res == null) return null;
OutStockInfoResponse response = new OutStockInfoResponse()
{
CreateTime = res.CreateTime.DateToStringSeconds(),
SyncTime = res.SyncTime.DateToStringSeconds(),
Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, res.CreatorId),
Operate = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, res.OperateId)
};
return response;
}
}
}

2
src/WMS.Web.Repositories/SerialNumberOperateRepositories.cs
View File

@@ -39,7 +39,7 @@ namespace WMS.Web.Repositories
_transaction.Commit();
return true;
}
catch
catch (Exception ex)
{
if (_transaction != null)
_transaction.Rollback();

6
src/WMS.Web.Repositories/TakeStockRepositories.cs
View File

@@ -166,6 +166,11 @@ namespace WMS.Web.Repositories
if (!materials_result.IsSuccess)
return (new List<TakeStockQueryInfoResponse>(), 0);
var materials = materials_result.Data.ToList();
//金蝶子仓库
var subStock_result = await _erpService.BillQueryForSubStock();
if (!subStock_result.IsSuccess)
return (new List<TakeStockQueryInfoResponse>(), 0);
var subStocks = subStock_result.Data.ToList();
var query = _context.TakeStock
//.GroupJoin(_context.TakeStock, detail => detail.Fid, order => order.Id, (detail, orders) => new { detail, orders })
@@ -193,6 +198,7 @@ namespace WMS.Web.Repositories
Unit = _erpBasicDataExtendService.GetMaterialUnitName(materials, s.MaterialId),
Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.StockCode),
SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.SubStockCode),
Erp_SubStockCode= _erpBasicDataExtendService.GetStockName(subStocks, s.Erp_SubStockCode),
BeforeQty = s.BeforeQty,
AfterQty = s.AfterQty,
FinalQty = s.FinalQty,