diff --git a/src/WMS.Web.Api/Controllers/TestController.cs b/src/WMS.Web.Api/Controllers/TestController.cs index 6bd1d61c..fa221d85 100644 --- a/src/WMS.Web.Api/Controllers/TestController.cs +++ b/src/WMS.Web.Api/Controllers/TestController.cs @@ -53,7 +53,7 @@ namespace WMS.Web.Api.Controllers [Route("hj")] public async Task TestHJ() { - var entity=await _takeStockRepositories.GetEntityList(new List() {1 }); + var entity=await _takeStockRepositories.GetEntityList(new List() {2 }); var r= await _takeStockService.Loss_Profit(entity.First()); //var list = await GetList(); //var c = await _erpService.BillQueryForSubStock(null,null); diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index 2314ea3a..e1b42902 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -725,6 +725,21 @@ 编码 + + + 盘点子仓库 + + + + + GD仓 + + + + + HD仓 + + erp 提交和审核 @@ -1152,7 +1167,12 @@ - 盘点后数量 + 盘盈数量 + + + + + 盘亏数量 diff --git a/src/WMS.Web.Core/Dto/Erp/ErpNumberDto.cs b/src/WMS.Web.Core/Dto/Erp/ErpNumberDto.cs index 107fe37a..42e84e27 100644 --- a/src/WMS.Web.Core/Dto/Erp/ErpNumberDto.cs +++ b/src/WMS.Web.Core/Dto/Erp/ErpNumberDto.cs @@ -8,10 +8,11 @@ namespace WMS.Web.Core.Dto.Erp /// /// 编码 /// - public class ErpNumberDto + public class ErpNumberDto { public ErpNumberDto() { } - public ErpNumberDto(string number) { + public ErpNumberDto(string number) + { this.Number = number; } /// @@ -27,12 +28,12 @@ namespace WMS.Web.Core.Dto.Erp public class ErpSubStockDto { public ErpSubStockDto() { } - public ErpSubStockDto(string code) + public ErpSubStockDto(string stockCode, string subCode) { - if (code.Equals("GD")) - this.GD = new ErpNumberDto(code); - if (code.Equals("HD")) - this.HD = new ErpNumberDto(code); + if (stockCode != null && stockCode.Equals("GD")) + this.GD = new ErpNumberDto(subCode ?? ""); + if (stockCode != null && stockCode.Equals("HD")) + this.HD = new ErpNumberDto(subCode ?? ""); } /// /// GD仓 diff --git a/src/WMS.Web.Core/Dto/Erp/TakeStock/ErpTakeStockSaveDto.cs b/src/WMS.Web.Core/Dto/Erp/TakeStock/ErpTakeStockSaveDto.cs index 2708f6c5..0019ee79 100644 --- a/src/WMS.Web.Core/Dto/Erp/TakeStock/ErpTakeStockSaveDto.cs +++ b/src/WMS.Web.Core/Dto/Erp/TakeStock/ErpTakeStockSaveDto.cs @@ -120,11 +120,16 @@ namespace WMS.Web.Core.Dto.Erp.TakeStock [JsonProperty("FCountQty")] public decimal AfterQty { get; set; } /// - /// 盘点后数量 + /// 盘盈数量 /// [JsonProperty("FGainQty")] public decimal FinalQty { get; set; } /// + /// 盘亏数量 + /// + [JsonProperty("FLossQty")] + public decimal LossQty { get; set; } + /// /// 备注 /// [JsonProperty("Fnote")] diff --git a/src/WMS.Web.Domain/Services/TakeStockService.cs b/src/WMS.Web.Domain/Services/TakeStockService.cs index b48c1566..7ecf41e2 100644 --- a/src/WMS.Web.Domain/Services/TakeStockService.cs +++ b/src/WMS.Web.Domain/Services/TakeStockService.cs @@ -144,11 +144,12 @@ namespace WMS.Web.Domain.Services MaterialId = new ErpNumberDto(_erpBasicDataExtendService.GetMaterialNumber(materials, entity.MaterialId)), UnitId = new ErpNumberDto(unitNumber), //物料带出来 StockId = new ErpNumberDto(stock.Code), - SubStockId =new ErpSubStockDto(resSub.Data.FirstOrDefault(f => f.Id == entity.Erp_SubStockId).Code), + SubStockId = new ErpSubStockDto(stock.Code, resSub.Data.FirstOrDefault(f => f.Id == entity.Erp_SubStockId)?.Code), BeforeQty = entity.BeforeQty, AfterQty = entity.AfterQty, - FinalQty = entity.FinalQty, - Fnote = "" + FinalQty = entity.ResultType == TakeStockType.Profit ? entity.FinalQty : 0, + LossQty = entity.ResultType == TakeStockType.Loss ? entity.FinalQty : 0, + Fnote = entity.ResultType == TakeStockType.Loss ? "wms盘亏单同步" : "wms盘盈单同步" }); ErpTakeStockSaveDto dto = new ErpTakeStockSaveDto() { @@ -173,7 +174,7 @@ namespace WMS.Web.Domain.Services /// /// /// - private async Task<(Result result, SyncStatus syncStatus,string erpId)> ErpOperate(ErpTakeStockSaveDto dto, FormIdParam type) + private async Task<(Result result, SyncStatus syncStatus, string erpId)> ErpOperate(ErpTakeStockSaveDto dto, FormIdParam type) { string formId = type.ToString(); _logger.LogInformation($"盘点单->开始同步金蝶 单号:{dto.BillNo} 数据: {JsonConvert.SerializeObject(dto)}"); @@ -181,7 +182,7 @@ namespace WMS.Web.Domain.Services if (!res_s.IsSuccess) { _logger.LogInformation($"盘点单->保存失败 单号:{dto.BillNo} 错误:{res_s.Message}"); - return (Result.ReFailure(res_s.Message, res_s.Status), SyncStatus.Fail,""); + return (Result.ReFailure(res_s.Message, res_s.Status), SyncStatus.Fail, ""); } //提交 _logger.LogInformation($"盘点单->保存成功 开始提交 单号:{dto.BillNo}");