调整测试接口

This commit is contained in:
18942506660
2023-12-27 10:30:16 +08:00
parent 1a8b67a70e
commit e5ed7c1732
2 changed files with 20 additions and 2 deletions

View File

@@ -1,5 +1,6 @@
 
using ERP; using ERP;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore.Storage; using Microsoft.EntityFrameworkCore.Storage;
@@ -17,6 +18,7 @@ using WMS.Web.Domain.Entitys;
using WMS.Web.Domain.Infrastructure; using WMS.Web.Domain.Infrastructure;
using WMS.Web.Domain.IService; using WMS.Web.Domain.IService;
using WMS.Web.Domain.IService.Public; using WMS.Web.Domain.IService.Public;
using Microsoft.Extensions.Hosting;
namespace WMS.Web.Api.Controllers namespace WMS.Web.Api.Controllers
{ {
@@ -35,10 +37,12 @@ namespace WMS.Web.Api.Controllers
private readonly ITakeStockService _takeStockService; private readonly ITakeStockService _takeStockService;
private readonly ITakeStockRepositories _takeStockRepositories; private readonly ITakeStockRepositories _takeStockRepositories;
private readonly IOutStockService _outStockService; private readonly IOutStockService _outStockService;
private readonly IWebHostEnvironment _env;
public TestController(IErpService erpService, IInStockTaskService inStockTaskService, IBoxInventoryRepositories boxInventoryRepositories, public TestController(IErpService erpService, IInStockTaskService inStockTaskService, IBoxInventoryRepositories boxInventoryRepositories,
IBasicsRepositories transactionRepositories, IOpsService opsService, IBoxService boxService, IBasicsRepositories transactionRepositories, IOpsService opsService, IBoxService boxService,
IOutStockTaskRepositories outStockTaskRepositories, IOutStockTaskService outStockTaskService, IOutStockTaskRepositories outStockTaskRepositories, IOutStockTaskService outStockTaskService,
ITakeStockService takeStockService, ITakeStockRepositories takeStockRepositories, IOutStockService outStockService) ITakeStockService takeStockService, ITakeStockRepositories takeStockRepositories, IOutStockService outStockService,
IWebHostEnvironment env)
{ {
_boxInventoryRepositories = boxInventoryRepositories; _boxInventoryRepositories = boxInventoryRepositories;
this._erpService = erpService; this._erpService = erpService;
@@ -51,6 +55,7 @@ namespace WMS.Web.Api.Controllers
_takeStockService = takeStockService; _takeStockService = takeStockService;
_takeStockRepositories = takeStockRepositories; _takeStockRepositories = takeStockRepositories;
_outStockService = outStockService; _outStockService = outStockService;
_env = env;
} }
[HttpGet] [HttpGet]
@@ -91,11 +96,15 @@ namespace WMS.Web.Api.Controllers
return ""; return "";
} }
/// <summary>
/// 出库任务单手动同步金蝶数据
/// </summary>
/// <returns></returns>
[HttpGet] [HttpGet]
[Route("Refresh")] [Route("Refresh")]
public async Task<string> Refresh() public async Task<string> Refresh()
{ {
if (!_env.IsDevelopment()) return "";
var result = await this._outStockTaskService.Sync(null); var result = await this._outStockTaskService.Sync(null);
return ""; return "";
} }
@@ -170,6 +179,7 @@ namespace WMS.Web.Api.Controllers
public async Task<List<(int Id, string Number, string name)>> GetMaterial([FromQuery] List<int> materialIds) public async Task<List<(int Id, string Number, string name)>> GetMaterial([FromQuery] List<int> materialIds)
{ {
List<(int Id, string Number, string name)> mList = new List<(int Id, string Number, string name)>(); List<(int Id, string Number, string name)> mList = new List<(int Id, string Number, string name)>();
if (!_env.IsDevelopment()) return mList;
var materials_result = await _erpService.BillQueryForMaterial(); var materials_result = await _erpService.BillQueryForMaterial();
var materials = materials_result.Data.ToList(); var materials = materials_result.Data.ToList();
foreach (var mid in materialIds) foreach (var mid in materialIds)
@@ -189,6 +199,7 @@ namespace WMS.Web.Api.Controllers
public async Task<List<(int Id, string Number, string name)>> GetMaterialId([FromRoute] string number) public async Task<List<(int Id, string Number, string name)>> GetMaterialId([FromRoute] string number)
{ {
List<(int Id, string Number, string name)> mList = new List<(int Id, string Number, string name)>(); List<(int Id, string Number, string name)> mList = new List<(int Id, string Number, string name)>();
if (!_env.IsDevelopment()) return mList;
var materials_result = await _erpService.BillQueryForMaterial(); var materials_result = await _erpService.BillQueryForMaterial();
var materials = materials_result.Data.ToList(); var materials = materials_result.Data.ToList();
@@ -214,6 +225,7 @@ namespace WMS.Web.Api.Controllers
[Route("SCBox/{str}/{number}")] [Route("SCBox/{str}/{number}")]
public async Task<Result> SCBox([FromRoute] string str, [FromRoute] int number, [FromQuery] List<string> materialNumbers) public async Task<Result> SCBox([FromRoute] string str, [FromRoute] int number, [FromQuery] List<string> materialNumbers)
{ {
if (!_env.IsDevelopment()) return Result.ReSuccess();
if (materialNumbers == null) if (materialNumbers == null)
materialNumbers = new List<string>(); materialNumbers = new List<string>();
var list = await GetList(str, number, materialNumbers); var list = await GetList(str, number, materialNumbers);

View File

@@ -571,6 +571,12 @@
<param name="dto"></param> <param name="dto"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:WMS.Web.Api.Controllers.TestController.Refresh">
<summary>
出库任务单手动同步金蝶数据
</summary>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.TestController.GetMaterial(System.Collections.Generic.List{System.Int32})"> <member name="M:WMS.Web.Api.Controllers.TestController.GetMaterial(System.Collections.Generic.List{System.Int32})">
<summary> <summary>
根据物料Id获取物料编码 根据物料Id获取物料编码