diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index 96b3e965..3f0ac29f 100644 Binary files a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 and b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 differ diff --git a/src/WMS.Web.Api/Controllers/InStockTaskController.cs b/src/WMS.Web.Api/Controllers/InStockTaskController.cs index 774f13aa..9ec7837b 100644 --- a/src/WMS.Web.Api/Controllers/InStockTaskController.cs +++ b/src/WMS.Web.Api/Controllers/InStockTaskController.cs @@ -210,7 +210,9 @@ namespace WMS.Web.Api.Controllers //剔除已入库的箱子 foreach (var boxid in instockBoxList.Distinct().ToList()) { - remobox.Add(receiveBoxList.Where(x => x.BoxId == boxid).First()); + var reBox= receiveBoxList.Where(x => x.BoxId == boxid).FirstOrDefault(); + if (reBox != null) + remobox.Add(reBox); } } if (remobox.Count != 0) diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index c5233d68..eb50a7fb 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -2117,6 +2117,11 @@ 收货客户 + + + 是否出库 + + 操作(绑定箱信息) @@ -2210,6 +2215,11 @@ 收货客户 + + + 是否出库 + + 订阅通知信息 diff --git a/src/WMS.Web.Repositories/InStockTaskRepositories.cs b/src/WMS.Web.Repositories/InStockTaskRepositories.cs index ca4d4451..692d13af 100644 --- a/src/WMS.Web.Repositories/InStockTaskRepositories.cs +++ b/src/WMS.Web.Repositories/InStockTaskRepositories.cs @@ -180,6 +180,7 @@ namespace WMS.Web.Repositories { BoxId = x.box.BoxId, BoxBillNo = x.box.BoxBillNo, + Method = InventoryInOutMethod.Box.GetRemark(), MaterialNumber = x.detail.MaterialNumber, Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, x.detail.MaterialNumber), ReceiveTime = x.box.CreateTime.HasValue ? x.box.CreateTime.Value.ToString("yyyy-MM-dd HH:mm:ss"):"",