diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index 97e3ba50..1a1a9a59 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -1311,6 +1311,11 @@ 仓位ID + + + 盘点前数量(wms系统数量) + + 盘点实际数量(实际仓库数量) diff --git a/src/WMS.Web.Core/Dto/Erp/TakeStock/ErpTakeStockSaveDto.cs b/src/WMS.Web.Core/Dto/Erp/TakeStock/ErpTakeStockSaveDto.cs index 506c4768..0019ee79 100644 --- a/src/WMS.Web.Core/Dto/Erp/TakeStock/ErpTakeStockSaveDto.cs +++ b/src/WMS.Web.Core/Dto/Erp/TakeStock/ErpTakeStockSaveDto.cs @@ -109,11 +109,11 @@ namespace WMS.Web.Core.Dto.Erp.TakeStock /// [JsonProperty("FStockLocId")] public ErpSubStockDto SubStockId { get; set; } - ///// - ///// 盘点前数量(wms系统数量) - ///// - //[JsonProperty("FAcctQty")] - //public decimal BeforeQty { get; set; } + /// + /// 盘点前数量(wms系统数量) + /// + [JsonProperty("FAcctQty")] + public decimal BeforeQty { get; set; } /// /// 盘点实际数量(实际仓库数量) /// diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs index 936965b6..aa1c1bca 100644 --- a/src/WMS.Web.Domain/Services/Public/ErpService.cs +++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs @@ -2148,10 +2148,11 @@ namespace WMS.Web.Domain.Services.Public var param = new ErpBillQueryParamDto(FormIdParam.STK_Inventory.ToString()); param.FieldKeys = "FBASEQTY,FMATERIALID,FSTOCKORGID.FNumber,FSTOCKID.FNumber"; param.Limit = 100; + //param.FilterString = $"FSTOCKORGID.FNumber='{request[0].orgCode}' and FSTOCKID.FNumber='{request[0].stockCode}'"; for (int i = 0; i < request.Count(); i++) { - if(i==0) - param.FilterString = $"(FMATERIALID={request[0].materialId} and FSTOCKORGID.FNumber='{request[0].orgCode}' and FSTOCKID.FNumber='{request[0].stockCode}')"; + if (i == 0) + param.FilterString = $"(FMATERIALID={request[0].materialId} and FSTOCKORGID.FNumber='{request[0].orgCode}' and FSTOCKID.FNumber='{request[0].stockCode}')"; else param.FilterString += $" or (FMATERIALID={request[i].materialId} and FSTOCKORGID.FNumber='{request[i].orgCode}' and FSTOCKID.FNumber='{request[i].stockCode}')"; } diff --git a/src/WMS.Web.Domain/Services/TakeStockService.cs b/src/WMS.Web.Domain/Services/TakeStockService.cs index f3726ca8..6722b054 100644 --- a/src/WMS.Web.Domain/Services/TakeStockService.cs +++ b/src/WMS.Web.Domain/Services/TakeStockService.cs @@ -84,7 +84,7 @@ namespace WMS.Web.Domain.Services { TakeStock takeStock = new TakeStock(); takeStock.Create(loginInfo.UserInfo.StaffId, TakeStockType.Profit); - takeStock.Details = _mapper.Map>(dto); + takeStock.Details = _mapper.Map>(profitList); var subIds = takeStock.Details.Select(s => s.SubStockId).ToList(); var subStocks = await _transactionRepositories.GetSubUcStockAsync(subIds, loginInfo.UserInfo.CompanyId); foreach (var d in takeStock.Details) @@ -104,7 +104,7 @@ namespace WMS.Web.Domain.Services { TakeStock takeStock = new TakeStock(); takeStock.Create(loginInfo.UserInfo.StaffId, TakeStockType.Loss); - takeStock.Details = _mapper.Map>(dto); + takeStock.Details = _mapper.Map>(lossList); var subIds = takeStock.Details.Select(s => s.SubStockId).ToList(); var subStocks = await _transactionRepositories.GetSubUcStockAsync(subIds, loginInfo.UserInfo.CompanyId); foreach (var d in takeStock.Details) @@ -229,11 +229,12 @@ namespace WMS.Web.Domain.Services UnitId = new ErpNumberDto(unitNumber), //物料带出来 StockId = new ErpNumberDto(d.StockCode), SubStockId = new ErpSubStockDto(d.StockCode, d.Erp_SubStockCode), + BeforeQty = qty, AfterQty = entity.ResultType == TakeStockType.Profit ? (qty + d.FinalQty) : ((qty - d.FinalQty) > 0 ? (qty - d.FinalQty) : 0), FinalQty = entity.ResultType == TakeStockType.Profit ? d.FinalQty : 0, LossQty = entity.ResultType == TakeStockType.Loss ? d.FinalQty : 0, Fnote = d.Remark - }); ; + }); requestInventory.Add((d.MaterialId, d.OrgCode, d.StockCode)); } ErpTakeStockSaveDto dto = new ErpTakeStockSaveDto()