From a95a759b77f8177cf9b72d360d30de8813dc988b Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Tue, 19 Dec 2023 09:45:00 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 | Bin 232149 -> 232149 bytes .../Services/SerialNumberService.cs | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index 55fdca1974b8dd9f7aa48cc7be2b2ab93e929e03..a66fa5c0ceb9fd936ff99ff6c8108b4437f4ce4e 100644 GIT binary patch delta 15998 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 delta 14509 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 B65jv- diff --git a/src/WMS.Web.Domain/Services/SerialNumberService.cs b/src/WMS.Web.Domain/Services/SerialNumberService.cs index 42b54e99..f95d99a9 100644 --- a/src/WMS.Web.Domain/Services/SerialNumberService.cs +++ b/src/WMS.Web.Domain/Services/SerialNumberService.cs @@ -370,7 +370,7 @@ namespace WMS.Web.Domain.Services //获取序列号信息 var serialNumbers = backRecord.Details.SelectMany(s => s.SerialNumbers).ToList(); var entityList = await _serialNumbersRepositories.GetEntityList(serialNumbers); - var boxIds = entityList.Select(s => s.BoxId).ToList(); + var boxIds = backRecord.Details.Select(s => s.BoxId).ToList(); var boxList = await _boxRepositories.GetEntityList(boxIds); var userName = _singleDataService.GetSingleData(SingleAction.Staffs, loginInfo.UserInfo.CompanyId, loginInfo.UserInfo.StaffId); From 84be9f33c8f7b86a26ee4f9637b1f2288e26ce08 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Tue, 19 Dec 2023 10:12:46 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WMS.Web.Api/Controllers/SysConfigController.cs | 2 ++ src/WMS.Web.Repositories/OutStockRepositories.cs | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/WMS.Web.Api/Controllers/SysConfigController.cs b/src/WMS.Web.Api/Controllers/SysConfigController.cs index ed575d2e..45cb1100 100644 --- a/src/WMS.Web.Api/Controllers/SysConfigController.cs +++ b/src/WMS.Web.Api/Controllers/SysConfigController.cs @@ -373,6 +373,8 @@ namespace WMS.Web.Api.Controllers return Result.ReFailure("箱号" + boxBillNo + "不存在", 800000); var response = res[0]; var detail = await _outStockRepositories.GetDetailsByBoxId(response.Id); + if (detail.Count() == 0) + return Result.ReFailure("箱号" + boxBillNo + "未出库", 800000); response.Details = detail; response.TotalQty = detail.Sum(s => s.Qty); return Result.ReSuccess(response); diff --git a/src/WMS.Web.Repositories/OutStockRepositories.cs b/src/WMS.Web.Repositories/OutStockRepositories.cs index dfa62f1f..3d052db6 100644 --- a/src/WMS.Web.Repositories/OutStockRepositories.cs +++ b/src/WMS.Web.Repositories/OutStockRepositories.cs @@ -325,15 +325,16 @@ namespace WMS.Web.Repositories .Include(s => s.Details).ThenInclude(s => s.BoxsDetails.Where(w => w.BoxId == boxId)) .Where(f => f.Details.SelectMany(s => s.BoxsDetails).Where(w => w.BoxId == boxId).Any()) .OrderByDescending(o => o.Id) - .FirstAsync(); + .ToListAsync(); List details = new List(); + if (res.Count() == 0) return details; var materials_result = await _erpService.BillQueryForMaterial(); if (!materials_result.IsSuccess) return new List(); var materials = materials_result.Data.ToList(); - foreach (var d in res.Details) + foreach (var d in res.First().Details) { var boxDetail = d.BoxsDetails.FirstOrDefault(f => f.BoxId == boxId); if (boxDetail == null) continue; From 9997398a9f20d683be944dff045126686da595e1 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Tue, 19 Dec 2023 14:33:48 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WMS.Web.Core/Dto/TakeStock/SaveTakeStockRequest.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/WMS.Web.Core/Dto/TakeStock/SaveTakeStockRequest.cs b/src/WMS.Web.Core/Dto/TakeStock/SaveTakeStockRequest.cs index c325ace8..355cc2c0 100644 --- a/src/WMS.Web.Core/Dto/TakeStock/SaveTakeStockRequest.cs +++ b/src/WMS.Web.Core/Dto/TakeStock/SaveTakeStockRequest.cs @@ -46,7 +46,6 @@ namespace WMS.Web.Core.Dto.TakeStock /// /// 备注 /// - [Required(ErrorMessage = "备注不能为空")] public string Remark { get; set; } } } From 9e1252704bf1d4f4f5724a75cc0a7169612844d4 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Tue, 19 Dec 2023 14:48:50 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WMS.Web.Repositories/OutStockRepositories.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/WMS.Web.Repositories/OutStockRepositories.cs b/src/WMS.Web.Repositories/OutStockRepositories.cs index 3d052db6..a53b48d8 100644 --- a/src/WMS.Web.Repositories/OutStockRepositories.cs +++ b/src/WMS.Web.Repositories/OutStockRepositories.cs @@ -342,7 +342,7 @@ namespace WMS.Web.Repositories detail.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, d.MaterialId); detail.MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, d.MaterialId); detail.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, d.MaterialId); - detail.SerialNumbers = d.SerialNumbers; + detail.SerialNumbers = boxDetail.SerialNumbers; detail.MaterialId = d.MaterialId; detail.Qty = boxDetail.Qty; details.Add(detail); From 366e523e49d9ff750a7b568d916d9c986ff9c587 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Tue, 19 Dec 2023 15:32:57 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/TakeStockService.cs | 97 +++++++++++-------- 1 file changed, 54 insertions(+), 43 deletions(-) diff --git a/src/WMS.Web.Domain/Services/TakeStockService.cs b/src/WMS.Web.Domain/Services/TakeStockService.cs index 32f38d77..0344f35f 100644 --- a/src/WMS.Web.Domain/Services/TakeStockService.cs +++ b/src/WMS.Web.Domain/Services/TakeStockService.cs @@ -164,53 +164,64 @@ namespace WMS.Web.Domain.Services //获取金蝶仓库仓位编码 //var stockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.StockId); //var subStockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.SubStockId); - var materials_result = await _erpService.BillQueryForMaterial(); - var materials = materials_result.Data.ToList(); + try + { + var materials_result = await _erpService.BillQueryForMaterial(); + if (!materials_result.IsSuccess) return Result.ReFailure(ResultCodes.ErpMaterialError); + var materials = materials_result.Data.ToList(); - var res = await _erpService.BillQueryForStock(); - var resSub = await _erpService.BillQueryForSubStock(); - var stock = res.Data.FirstOrDefault(f => f.Code == entity.Details[0].StockCode);//需要根据单点code搜索 - if (stock == null) return Result.ReFailure(ResultCodes.ErpStockNoData); - //组装dto - #region 组装dto - //子仓库 ORICO_JD:1000008 GD:1000005 HD:1000007 AD:1000004 - List detils = new List(); - foreach (var d in entity.Details) - { - var subStockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, d.SubStockId); - var subStock = resSub.Data.FirstOrDefault(f => f.Code == subStockCode);//需要根据单点code搜索 - var unitNumber = _erpBasicDataExtendService.GetMaterialUnitNumber(materials, d.MaterialId); - detils.Add(new ErpTakeStockDetailsSaveDto() + var res = await _erpService.BillQueryForStock(); + if (!res.IsSuccess) return Result.ReFailure(ResultCodes.ErpStockError); + var resSub = await _erpService.BillQueryForSubStock(); + if (!resSub.IsSuccess) return Result.ReFailure(ResultCodes.ErpStockError); + var stock = res.Data.FirstOrDefault(f => f.Code == entity.Details[0].StockCode);//需要根据单点code搜索 + if (stock == null) return Result.ReFailure(ResultCodes.ErpStockNoData); + //组装dto + #region 组装dto + //子仓库 ORICO_JD:1000008 GD:1000005 HD:1000007 AD:1000004 + List detils = new List(); + foreach (var d in entity.Details) { - FOwnerid = new ErpNumberDto(stock.OrgCode.ToString()), - FKeeperId = new ErpNumberDto(stock.OrgCode.ToString()), - MaterialId = new ErpNumberDto(_erpBasicDataExtendService.GetMaterialNumber(materials, d.MaterialId)), - UnitId = new ErpNumberDto(unitNumber), //物料带出来 - StockId = new ErpNumberDto(stock.Code), - SubStockId = new ErpSubStockDto(stock.Code, resSub.Data.FirstOrDefault(f => f.Id == d.Erp_SubStockId)?.Code), - BeforeQty = d.BeforeQty, - AfterQty = d.AfterQty, - FinalQty = entity.ResultType == TakeStockType.Profit ? d.FinalQty : 0, - LossQty = entity.ResultType == TakeStockType.Loss ? d.FinalQty : 0, - Fnote = d.Remark - }); + var subStockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, d.SubStockId); + //var subStock = resSub.Data.FirstOrDefault(f => f.Code == subStockCode);//需要根据单点code搜索 + var unitNumber = _erpBasicDataExtendService.GetMaterialUnitNumber(materials, d.MaterialId); + detils.Add(new ErpTakeStockDetailsSaveDto() + { + FOwnerid = new ErpNumberDto(stock.OrgCode.ToString()), + FKeeperId = new ErpNumberDto(stock.OrgCode.ToString()), + MaterialId = new ErpNumberDto(_erpBasicDataExtendService.GetMaterialNumber(materials, d.MaterialId)), + UnitId = new ErpNumberDto(unitNumber), //物料带出来 + StockId = new ErpNumberDto(stock.Code), + SubStockId = new ErpSubStockDto(stock.Code, resSub.Data.FirstOrDefault(f => f.Id == d.Erp_SubStockId)?.Code), + BeforeQty = d.BeforeQty, + AfterQty = d.AfterQty, + FinalQty = entity.ResultType == TakeStockType.Profit ? d.FinalQty : 0, + LossQty = entity.ResultType == TakeStockType.Loss ? d.FinalQty : 0, + Fnote = d.Remark + }); + } + ErpTakeStockSaveDto dto = new ErpTakeStockSaveDto() + { + BillNo = entity.BillNo, + StockOrgId = new ErpNumberDto(stock.OrgCode), + Type = new ErpNumberDto(entity.ResultType == TakeStockType.Loss ? "PK01_SYS" : "PY01_SYS"), + Date = entity.Date, + Details = detils + }; + #endregion + //判断盘盈盘亏 + FormIdParam type = entity.ResultType == TakeStockType.Loss ? FormIdParam.STK_StockCountLoss : FormIdParam.STK_StockCountGain; + //操作金蝶 + var resSync = await ErpOperate(dto, type); + entity.Sync(resSync.result.IsSuccess, resSync.result.Message, resSync.syncStatus, resSync.erpBillNo); + await _takeStockRepositories.Edit(entity, true); + return res; } - ErpTakeStockSaveDto dto = new ErpTakeStockSaveDto() + catch (Exception ex) { - BillNo = entity.BillNo, - StockOrgId = new ErpNumberDto(stock.OrgCode), - Type = new ErpNumberDto(entity.ResultType == TakeStockType.Loss ? "PK01_SYS" : "PY01_SYS"), - Date = entity.Date, - Details = detils - }; - #endregion - //判断盘盈盘亏 - FormIdParam type = entity.ResultType == TakeStockType.Loss ? FormIdParam.STK_StockCountLoss : FormIdParam.STK_StockCountGain; - //操作金蝶 - var resSync = await ErpOperate(dto, type); - entity.Sync(resSync.result.IsSuccess, resSync.result.Message, resSync.syncStatus, resSync.erpBillNo); - await _takeStockRepositories.Edit(entity, true); - return res; + _logger.LogError($"盘点同步金蝶: {ex.ToString()}"); + return Result.ReFailure(ResultCodes.NoDateError); + } } /// /// 同步金蝶操作