From c44d637fe31127ee948350e437f100f0b799866f Mon Sep 17 00:00:00 2001 From: tongfei <244188119@qq.com> Date: Thu, 9 Nov 2023 14:39:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=AF=94=E6=8E=A5=E5=8F=A3=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WMS.Web.Domain/Services/InStockService.cs | 9 +++++++-- src/WMS.Web.Domain/Values/ResultCodes.cs | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/WMS.Web.Domain/Services/InStockService.cs b/src/WMS.Web.Domain/Services/InStockService.cs index 3669bb08..3ff3f8a7 100644 --- a/src/WMS.Web.Domain/Services/InStockService.cs +++ b/src/WMS.Web.Domain/Services/InStockService.cs @@ -343,12 +343,17 @@ namespace WMS.Web.Domain.Services if (box == null) return Result.ReFailure(ResultCodes.BoxNoData); - //3.比对 + //3.比对：false为比对失败; bool isRight = box.Details.All(x => task.Details.Any(t => t.MaterialId == x.MaterialId && t.AccruedQty == x.Qty)) && box.Details.Count == task.Details.Count; if(!isRight) return Result.ReFailure(ResultCodes.ContrastError); - //4.返回对比结果：true为比对成功，false为比对失败;并把箱ID和箱号返回 + //4.是否存在箱号判断:存在的话，就不能收货或者非采购上架 + bool isHave = task.Boxs.Where(x => x.BoxBillNo == box.BoxBillNo).Any(); + if(isHave) + return Result.ReFailure(ResultCodes.BoxHaveError); + + //4.返回对比结果：true为比对成功，并把箱ID和箱号返回 var response = new ContrastMaterialsResponse(); response.BoxBillNo = box.BoxBillNo; response.BoxId = box.Id; diff --git a/src/WMS.Web.Domain/Values/ResultCodes.cs b/src/WMS.Web.Domain/Values/ResultCodes.cs index 1faa7d9c..9314d10c 100644 --- a/src/WMS.Web.Domain/Values/ResultCodes.cs +++ b/src/WMS.Web.Domain/Values/ResultCodes.cs @@ -39,6 +39,7 @@ namespace WMS.Web.Domain.Values public static ValueTuple ErpSupplierError = (80005, "获取Erp相关供应商数据失败，请稍候再试！"); public static ValueTuple ErpStockError = (80006, "获取Erp相关仓库数据失败，请稍候再试！"); public static ValueTuple ErpMaterialError = (80007, "获取Erp相关物料数据失败，请稍候再试！"); + public static ValueTuple BoxHaveError = (80008, "该箱信息已被记录，请重新选择箱号！"); } }