diff --git a/src/WMS.Web.Domain/Services/TakeStockService.cs b/src/WMS.Web.Domain/Services/TakeStockService.cs index b0dac7aa..ca8a7ce0 100644 --- a/src/WMS.Web.Domain/Services/TakeStockService.cs +++ b/src/WMS.Web.Domain/Services/TakeStockService.cs @@ -90,6 +90,8 @@ namespace WMS.Web.Domain.Services var subStock = await _transactionRepositories.GetSubUcStockAsync(d.SubStockId, loginInfo.UserInfo.CompanyId); d.OrgCode = subStock?.ErpOrgCode; d.StockCode = subStock?.StockCode; + if ((d.StockCode.Equals("HD") || d.StockCode.Equals("GD")) && string.IsNullOrEmpty(d.Erp_SubStockCode)) + return Result.ReFailure(ResultCodes.TakeStockErpSubStockError); } if (takeStock.Details.GroupBy(g => g.StockCode).Count() > 1) return Result.ReFailure(ResultCodes.TakeStockStockError); @@ -106,6 +108,8 @@ namespace WMS.Web.Domain.Services var subStock = await _transactionRepositories.GetSubUcStockAsync(d.SubStockId, loginInfo.UserInfo.CompanyId); d.OrgCode = subStock?.ErpOrgCode; d.StockCode = subStock?.StockCode; + if ((d.StockCode.Equals("HD") || d.StockCode.Equals("GD")) && string.IsNullOrEmpty(d.Erp_SubStockCode)) + return Result.ReFailure(ResultCodes.TakeStockErpSubStockError); } if (takeStock.Details.GroupBy(g => g.StockCode).Count() > 1) return Result.ReFailure(ResultCodes.TakeStockStockError); @@ -141,7 +145,7 @@ namespace WMS.Web.Domain.Services //同步金蝶 OperateRequest oRequest = new OperateRequest(); oRequest.Ids = list.Select(s => s.Id).ToList(); - await Sync(oRequest,false); + await Sync(oRequest, false); return Result.ReSuccess(); } diff --git a/src/WMS.Web.Domain/Values/ResultCodes.cs b/src/WMS.Web.Domain/Values/ResultCodes.cs index 25dd3c09..be0ec111 100644 --- a/src/WMS.Web.Domain/Values/ResultCodes.cs +++ b/src/WMS.Web.Domain/Values/ResultCodes.cs @@ -71,6 +71,7 @@ namespace WMS.Web.Domain.Values public static ValueTuple SerialNumbersBoxError = (610002, "序列号已经绑定箱"); public static ValueTuple SerialNumbersSrcBoxError = (610003, "序列号不在原有箱号内"); public static ValueTuple TakeStockStockError = (610001, "一次不能盘多个仓库"); + public static ValueTuple TakeStockErpSubStockError = (610005, "HD或GD仓时子仓库必填"); public static ValueTuple TakeStockBoxError = (610004, "一次只能盘一个箱"); } }