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-12-20 11:59:33 +08:00
parent d1c9cae1cd 687fa22a50
commit 9e8103081c
6 changed files with 43 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,6 +2,7 @@
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
@@ -38,10 +39,13 @@ namespace WMS.Web.Api.Controllers
private readonly IMapper _mapper;
private readonly IErpBasicDataExtendService _erpBasicDataExtendService;
private readonly IOutStockRepositories _outStockRepositories;
private readonly ILogger<SysConfigController> _logger;
public SysConfigController(ILoginService loginService, IBasicsRepositories basicsRepositories,
IBoxRepositories boxRepositories, IErpService erpService, ISingleDataService singleDataService,
ISerialNumbersRepositories serialNumbersRepositories, IBoxInventoryRepositories boxInventoryRepositories,
IMapper mapper, IErpBasicDataExtendService erpBasicDataExtendService, IOutStockRepositories outStockRepositories)
IMapper mapper, IErpBasicDataExtendService erpBasicDataExtendService, IOutStockRepositories outStockRepositories,
ILogger<SysConfigController> logger)
{
_loginService = loginService;
_basicsRepositories = basicsRepositories;
@@ -53,6 +57,7 @@ namespace WMS.Web.Api.Controllers
_mapper = mapper;
_erpBasicDataExtendService = erpBasicDataExtendService;
_outStockRepositories = outStockRepositories;
_logger = logger;
}
/// <summary>
@@ -215,9 +220,9 @@ namespace WMS.Web.Api.Controllers
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();
//var subs = await _erpService.BillQueryForSubStock(null, null);
list = subs.Data.Where(w => w.Name.Contains(name)).Select(s => new UcStockResponse()
list = subs.Data.Where(w => w.Name.Equals(name) && w.OrgCode.Equals(orgCode)).Select(s => new UcStockResponse()
{
Id = s.Id,
Code = s.Code,
@@ -393,6 +398,7 @@ namespace WMS.Web.Api.Controllers
if (loginInfo == null || loginInfo.UserInfo == null)
return Result<MaterialResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
_logger.LogInformation($"请求序列号信息:{serialNumber}");
var res = await _serialNumbersRepositories.GetSerialNumber(serialNumber);
if (res == null) return Result<MaterialResponse>.ReFailure(ResultCodes.MateriaNoData);

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

@@ -57,7 +57,8 @@ namespace WMS.Web.Api.Controllers
public async Task<string> TestHJ()
{
OperateRequest dto = new OperateRequest();
dto.Ids.Add(54);
dto.Ids.Add(71);
//var result = await this._erpService.BillQueryForSubStock();
//await _outStockService.Sync(dto, null);
var b = await _takeStockService.Sync(dto);
// List<ErpCustomerDto> list = null;

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

@@ -3020,7 +3020,7 @@
</summary>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.IService.Public.IErpService.BillQueryForSubStock(System.String,System.String)">
<member name="M:WMS.Web.Domain.IService.Public.IErpService.BillQueryForSubStock">
<summary>
获取仓位信息信息 根据仓库编码
</summary>
@@ -4414,7 +4414,7 @@
</summary>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.Public.ErpService.BillQueryForSubStock(System.String,System.String)">
<member name="M:WMS.Web.Domain.Services.Public.ErpService.BillQueryForSubStock">
<summary>
根据仓库编码获取仓位
</summary>