diff --git a/src/WMS.Web.Domain/Services/InStockService.cs b/src/WMS.Web.Domain/Services/InStockService.cs index dd27270d..b3f4574f 100644 --- a/src/WMS.Web.Domain/Services/InStockService.cs +++ b/src/WMS.Web.Domain/Services/InStockService.cs @@ -59,6 +59,7 @@ namespace WMS.Web.Domain.Services _inStockTaskRepositories = inStockTaskRepositories; _erpBasicDataExtendService = erpBasicDataExtendService; _serialNumbersRepositories = serialNumbersRepositories; + _boxInventoryRepositories = boxInventoryRepositories; } /// @@ -529,11 +530,21 @@ namespace WMS.Web.Domain.Services var qtyIsError = boxDetails.All(x => task_details.Any(t => t.MaterialId == x.MaterialId && t.AccruedQty < x.Qty)); if (boxDetails.Count > task_details.Count && qtyIsError) - return Result.ReFailure(ResultCodes.ContrastError); + { + if (task.Type == InstockType.Purchase) + return Result.ReFailure(ResultCodes.Contrast_Purchase_Error); + else + return Result.ReFailure(ResultCodes.ContrastError); + } else if (qtyIsError) return Result.ReFailure(ResultCodes.Contrast_Qty_Error); else - return Result.ReFailure(ResultCodes.Contrast_Count_Error); + { + if (task.Type == InstockType.Purchase) + return Result.ReFailure(ResultCodes.Contrast_Purchase_Count_Error); + else + return Result.ReFailure(ResultCodes.Contrast_Count_Error); + } } diff --git a/src/WMS.Web.Domain/Values/ResultCodes.cs b/src/WMS.Web.Domain/Values/ResultCodes.cs index 8b04a434..37222c96 100644 --- a/src/WMS.Web.Domain/Values/ResultCodes.cs +++ b/src/WMS.Web.Domain/Values/ResultCodes.cs @@ -45,6 +45,8 @@ namespace WMS.Web.Domain.Values public static ValueTuple Box_NoBind_Task_Data = (80001, "该箱号不在收货信息中,请核对再试!"); public static ValueTuple OrderNoData = (80002, "单据信息不存在,请核对后再试!"); public static ValueTuple ContrastError = (80003, "箱内产品和数量与来源单不一致"); + public static ValueTuple Contrast_Purchase_Error = (80003, "箱内产品和数量与来源单不一致"); + public static ValueTuple Contrast_Purchase_Count_Error = (80003, "箱内产品和采购单不一致"); public static ValueTuple Contrast_Count_Error = (80003, "箱内产品和来源单不一致"); public static ValueTuple Contrast_Qty_Error = (80003, "箱内产品数量超过可入库数量"); @@ -52,7 +54,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, "该箱信息已被记录,请重新选择箱号!"); + public static ValueTuple BoxHaveError = (80008, "箱号已收货"); public static ValueTuple AdjustError = (80009, "与金蝶校准发生错误,请稍候再试!"); public static ValueTuple InventoryNoSourceError = (800010, "来源数据不存在,请稍候再试!"); public static ValueTuple BoxInventoryNoDataError = (800011, "箱库存数据不存在,请稍候再试!");