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