diff --git a/src/WMS.Web.Api/Controllers/TestController.cs b/src/WMS.Web.Api/Controllers/TestController.cs index 094b39dc..4d30257f 100644 --- a/src/WMS.Web.Api/Controllers/TestController.cs +++ b/src/WMS.Web.Api/Controllers/TestController.cs @@ -28,9 +28,10 @@ namespace WMS.Web.Api.Controllers private readonly IOpsService _opsService; private readonly IBoxService _boxService; private readonly IOutStockTaskRepositories _outStockTaskRepositories; + private readonly IOutStockTaskService _outStockTaskService; public TestController(IErpService erpService, IInStockTaskService inStockTaskService, IBasicsRepositories transactionRepositories, IOpsService opsService, IBoxService boxService, - IOutStockTaskRepositories outStockTaskRepositories) + IOutStockTaskRepositories outStockTaskRepositories, IOutStockTaskService outStockTaskService) { this._erpService = erpService; this._inStockTaskService = inStockTaskService; @@ -38,18 +39,20 @@ namespace WMS.Web.Api.Controllers _opsService = opsService; _boxService = boxService; _outStockTaskRepositories = outStockTaskRepositories; + _outStockTaskService = outStockTaskService; } [HttpGet] [Route("hj")] public async Task TestHJ() { + await _outStockTaskService.Sync(null); //var t=await _outStockTaskRepositories.Get(1); // t.Details[0].Remark = "sdf"; // t.Details[0].ErpDetails[0].SaleBillNo = "sdfsfsbbbb"; // var s = await _outStockTaskRepositories.Edit(t); // await _boxService.Sync(); - var res = await this._erpService.BillQueryForAssembledAppOutStock_Dassembly(null,DateTime.Now.AddDays(-300)); + //var res = await this._erpService.BillQueryForAssembledAppOutStock_Dassembly(null,DateTime.Now.AddDays(-300)); //var result= await this._erpService.BillQueryForPurchaseInStock(); //var result = await this._erpService.BillQueryForOrg(); //var result = await this._erpService.BillQueryForMaterial(); diff --git a/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs b/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs index c9e7ddf3..eefc326d 100644 --- a/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs +++ b/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs @@ -139,7 +139,7 @@ namespace WMS.Web.Domain.Services bool isSuccess = true; var res_Inventory = await _boxInventoryService.GenerateMoveBox(inventoryList, false); if (!res_Inventory.IsSuccess) isRollback = true; - isSuccess = await _moveBoxRecordRepositories.AddRange(entityList, true); + isSuccess = await _moveBoxRecordRepositories.AddRange(entityList, false); if (!isSuccess) isRollback = true; var res_change = await _serialNumberService.MoveBox(entityList, loginInfo, false); if (!res_change.IsSuccess) isRollback = true; diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs index 246f371b..cbd4067b 100644 --- a/src/WMS.Web.Domain/Services/Public/ErpService.cs +++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs @@ -1701,7 +1701,7 @@ namespace WMS.Web.Domain.Services.Public //4.仓库:wms系统的仓库值---现在这个没有加,因为还单点没有和金蝶同步 param.FilterString = "FDocumentStatus='C' and FBillTypeID='54533291F9A44D38809F70000499BEE9'"; //string srt = JsonConvert.SerializeObject(stocks_codes); - param.FilterString += " and FSrcStockID in (" + stocks_codes + ")"; + param.FilterString += " and FStockId in (" + stocks_codes + ")"; //根据原订单号查询 if (sourceBillNos != null && sourceBillNos.Count() > 0)