18923810322/WMS-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复bug

Browse Source
This commit is contained in:
18942506660
2024-01-02 15:14:55 +08:00
parent b6d7498da7
commit 3abb274fa2
4 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
View File

@@ -1311,6 +1311,11 @@
仓位ID 仓位ID
</summary> </summary>
</member> </member>
<member name="P:WMS.Web.Core.Dto.Erp.TakeStock.ErpTakeStockDetailsSaveDto.BeforeQty">
<summary>
盘点前数量（wms系统数量）
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.TakeStock.ErpTakeStockDetailsSaveDto.AfterQty"> <member name="P:WMS.Web.Core.Dto.Erp.TakeStock.ErpTakeStockDetailsSaveDto.AfterQty">
<summary> <summary>
盘点实际数量（实际仓库数量） 盘点实际数量（实际仓库数量）

10
src/WMS.Web.Core/Dto/Erp/TakeStock/ErpTakeStockSaveDto.cs
View File

@@ -109,11 +109,11 @@ namespace WMS.Web.Core.Dto.Erp.TakeStock
/// </summary> /// </summary>
[JsonProperty("FStockLocId")] [JsonProperty("FStockLocId")]
public ErpSubStockDto SubStockId { get; set; } public ErpSubStockDto SubStockId { get; set; }
///// <summary> /// <summary>
///// 盘点前数量（wms系统数量） /// 盘点前数量（wms系统数量）
///// </summary> /// </summary>
//[JsonProperty("FAcctQty")] [JsonProperty("FAcctQty")]
//public decimal BeforeQty { get; set; } public decimal BeforeQty { get; set; }
/// <summary> /// <summary>
/// 盘点实际数量（实际仓库数量） /// 盘点实际数量（实际仓库数量）
/// </summary> /// </summary>

3
src/WMS.Web.Domain/Services/Public/ErpService.cs
View File

@@ -2148,9 +2148,10 @@ namespace WMS.Web.Domain.Services.Public
var param = new ErpBillQueryParamDto(FormIdParam.STK_Inventory.ToString()); var param = new ErpBillQueryParamDto(FormIdParam.STK_Inventory.ToString());
param.FieldKeys = "FBASEQTY,FMATERIALID,FSTOCKORGID.FNumber,FSTOCKID.FNumber"; param.FieldKeys = "FBASEQTY,FMATERIALID,FSTOCKORGID.FNumber,FSTOCKID.FNumber";
param.Limit = 100; param.Limit = 100;
//param.FilterString = $"FSTOCKORGID.FNumber='{request[0].orgCode}' and FSTOCKID.FNumber='{request[0].stockCode}'";
for (int i = 0; i < request.Count(); i++) for (int i = 0; i < request.Count(); i++)
{ {
if(i==0) if (i == 0)
param.FilterString = $"(FMATERIALID={request[0].materialId} and FSTOCKORGID.FNumber='{request[0].orgCode}' and FSTOCKID.FNumber='{request[0].stockCode}')"; param.FilterString = $"(FMATERIALID={request[0].materialId} and FSTOCKORGID.FNumber='{request[0].orgCode}' and FSTOCKID.FNumber='{request[0].stockCode}')";
else else
param.FilterString += $" or (FMATERIALID={request[i].materialId} and FSTOCKORGID.FNumber='{request[i].orgCode}' and FSTOCKID.FNumber='{request[i].stockCode}')"; param.FilterString += $" or (FMATERIALID={request[i].materialId} and FSTOCKORGID.FNumber='{request[i].orgCode}' and FSTOCKID.FNumber='{request[i].stockCode}')";

7
src/WMS.Web.Domain/Services/TakeStockService.cs
View File

@@ -84,7 +84,7 @@ namespace WMS.Web.Domain.Services
{ {
TakeStock takeStock = new TakeStock(); TakeStock takeStock = new TakeStock();
takeStock.Create(loginInfo.UserInfo.StaffId, TakeStockType.Profit); takeStock.Create(loginInfo.UserInfo.StaffId, TakeStockType.Profit);
takeStock.Details = _mapper.Map<List<TakeStockDetails>>(dto); takeStock.Details = _mapper.Map<List<TakeStockDetails>>(profitList);
var subIds = takeStock.Details.Select(s => s.SubStockId).ToList(); var subIds = takeStock.Details.Select(s => s.SubStockId).ToList();
var subStocks = await _transactionRepositories.GetSubUcStockAsync(subIds, loginInfo.UserInfo.CompanyId); var subStocks = await _transactionRepositories.GetSubUcStockAsync(subIds, loginInfo.UserInfo.CompanyId);
foreach (var d in takeStock.Details) foreach (var d in takeStock.Details)
@@ -104,7 +104,7 @@ namespace WMS.Web.Domain.Services
{ {
TakeStock takeStock = new TakeStock(); TakeStock takeStock = new TakeStock();
takeStock.Create(loginInfo.UserInfo.StaffId, TakeStockType.Loss); takeStock.Create(loginInfo.UserInfo.StaffId, TakeStockType.Loss);
takeStock.Details = _mapper.Map<List<TakeStockDetails>>(dto); takeStock.Details = _mapper.Map<List<TakeStockDetails>>(lossList);
var subIds = takeStock.Details.Select(s => s.SubStockId).ToList(); var subIds = takeStock.Details.Select(s => s.SubStockId).ToList();
var subStocks = await _transactionRepositories.GetSubUcStockAsync(subIds, loginInfo.UserInfo.CompanyId); var subStocks = await _transactionRepositories.GetSubUcStockAsync(subIds, loginInfo.UserInfo.CompanyId);
foreach (var d in takeStock.Details) foreach (var d in takeStock.Details)
@@ -229,11 +229,12 @@ namespace WMS.Web.Domain.Services
UnitId = new ErpNumberDto(unitNumber), //物料带出来 UnitId = new ErpNumberDto(unitNumber), //物料带出来
StockId = new ErpNumberDto(d.StockCode), StockId = new ErpNumberDto(d.StockCode),
SubStockId = new ErpSubStockDto(d.StockCode, d.Erp_SubStockCode), 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), AfterQty = entity.ResultType == TakeStockType.Profit ? (qty + d.FinalQty) : ((qty - d.FinalQty) > 0 ? (qty - d.FinalQty) : 0),
FinalQty = entity.ResultType == TakeStockType.Profit ? d.FinalQty : 0, FinalQty = entity.ResultType == TakeStockType.Profit ? d.FinalQty : 0,
LossQty = entity.ResultType == TakeStockType.Loss ? d.FinalQty : 0, LossQty = entity.ResultType == TakeStockType.Loss ? d.FinalQty : 0,
Fnote = d.Remark Fnote = d.Remark
}); ; });
requestInventory.Add((d.MaterialId, d.OrgCode, d.StockCode)); requestInventory.Add((d.MaterialId, d.OrgCode, d.StockCode));
} }
ErpTakeStockSaveDto dto = new ErpTakeStockSaveDto() ErpTakeStockSaveDto dto = new ErpTakeStockSaveDto()