diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index 16c6b4cc..5c024a8c 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/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index 21ef1559..eded53bb 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -994,6 +994,11 @@ 收货客户 + + + 仓库 + + 创建人 @@ -1082,16 +1087,6 @@ 序列号 - - - 仓库 - - - - - 仓位 - - 出库数量 @@ -1162,6 +1157,11 @@ 收货客户 + + + 仓库ID + + 单据状态 @@ -1238,16 +1238,6 @@ 物料Id - - - 仓库ID - - - - - 仓位ID - - 应出库数量 diff --git a/src/WMS.Web.Domain/Entitys/OutStock.cs b/src/WMS.Web.Domain/Entitys/OutStock.cs index 71bab547..b57cfd79 100644 --- a/src/WMS.Web.Domain/Entitys/OutStock.cs +++ b/src/WMS.Web.Domain/Entitys/OutStock.cs @@ -47,6 +47,11 @@ namespace WMS.Web.Domain.Entitys [Column("ReceiptCustomerId")] public int ReceiptCustomerId { get; set; } /// + /// 仓库 + /// + [Column("StockCode")] + public string StockCode { get; set; } + /// /// 创建人 /// [Column("CreatorId")] diff --git a/src/WMS.Web.Domain/Entitys/OutStockDetails.cs b/src/WMS.Web.Domain/Entitys/OutStockDetails.cs index fb14fb41..1122367d 100644 --- a/src/WMS.Web.Domain/Entitys/OutStockDetails.cs +++ b/src/WMS.Web.Domain/Entitys/OutStockDetails.cs @@ -35,16 +35,12 @@ namespace WMS.Web.Domain.Entitys /// [Column("SerialNumbers")] public List SerialNumbers { get; set; } = new List(); - /// - /// 仓库 - /// - [Column("StockCode")] - public string StockCode { get; set; } - /// - /// 仓位 - /// - [Column("SubStockId")] - public string SubStockId { get; set; } + + ///// + ///// 仓位 + ///// + //[Column("SubStockId")] + //public string SubStockId { get; set; } /// /// 出库数量 /// diff --git a/src/WMS.Web.Domain/Entitys/OutStockTask.cs b/src/WMS.Web.Domain/Entitys/OutStockTask.cs index 7a22ac07..c9f21283 100644 --- a/src/WMS.Web.Domain/Entitys/OutStockTask.cs +++ b/src/WMS.Web.Domain/Entitys/OutStockTask.cs @@ -39,6 +39,11 @@ namespace WMS.Web.Domain.Entitys [Column("ReceiptCustomerId")] public int ReceiptCustomerId { get; set; } /// + /// 仓库ID + /// + [Column("StockCode")] + public string StockCode { get; set; } + /// /// 单据状态 /// [Column("Status")] @@ -175,7 +180,7 @@ namespace WMS.Web.Domain.Entitys if (list.GroupBy(g => g.DeliveryOrgId).Count() > 1) return Result.ReFailure(ResultCodes.MergeStatusError); if (list.GroupBy(g => g.ReceiptCustomerId).Count() > 1) return Result.ReFailure(ResultCodes.MergeStatusError); var details = list.SelectMany(s => s.Details).ToList(); - if (details.GroupBy(g => g.StockCode).Count() > 1) return Result.ReFailure(ResultCodes.MergeStatusError); + if (list.GroupBy(g => g.StockCode).Count() > 1) return Result.ReFailure(ResultCodes.MergeStatusError); List details_new = new List(); //清空数据绑定 diff --git a/src/WMS.Web.Domain/Entitys/OutStockTaskDetails.cs b/src/WMS.Web.Domain/Entitys/OutStockTaskDetails.cs index c03c628b..6ae297f9 100644 --- a/src/WMS.Web.Domain/Entitys/OutStockTaskDetails.cs +++ b/src/WMS.Web.Domain/Entitys/OutStockTaskDetails.cs @@ -32,16 +32,12 @@ namespace WMS.Web.Domain.Entitys /// [Column("MaterialId")] public int MaterialId { get; set; } - /// - /// 仓库ID - /// - [Column("StockCode")] - public string StockCode { get; set; } - /// - /// 仓位ID - /// - [Column("SubStockId")] - public int SubStockId { get; set; } + + ///// + ///// 仓位ID + ///// + //[Column("SubStockId")] + //public int SubStockId { get; set; } /// /// 应出库数量 /// diff --git a/src/WMS.Web.Domain/Services/OutStockService.cs b/src/WMS.Web.Domain/Services/OutStockService.cs index 93e61416..d47bbed5 100644 --- a/src/WMS.Web.Domain/Services/OutStockService.cs +++ b/src/WMS.Web.Domain/Services/OutStockService.cs @@ -114,8 +114,8 @@ namespace WMS.Web.Domain.Services { BoxId = boxId, InventoryInOutMethod = dto.Method, - StockCode = outStockTask.Details.First().StockCode, - SubStockId = outStockTask.Details.First().SubStockId, + StockCode = outStockTask.StockCode, + SubStockId = 0,// outStockTask.Details.First().SubStockId, Details = inventoryDetail }; inventoryList.Add(inventory); diff --git a/src/WMS.Web.Domain/Services/OutStockTaskService.cs b/src/WMS.Web.Domain/Services/OutStockTaskService.cs index 08abcd2c..1552dd9b 100644 --- a/src/WMS.Web.Domain/Services/OutStockTaskService.cs +++ b/src/WMS.Web.Domain/Services/OutStockTaskService.cs @@ -106,9 +106,11 @@ namespace WMS.Web.Domain.Services foreach (var outStockTask in data_list) { var sourcNos = outStockTask.Details.SelectMany(s => s.ErpDetails).Select(s => s.SourceBillNo).ToList(); + //仓库不同 拆分成不同的任务单 var erps = erp_list.Where(w => sourcNos.Contains(w.SourceBillNo)).ToList(); foreach (var erp in erps) { + //仓库不同 拆分成不同的 var detail = outStockTask.Details.FirstOrDefault(w => w.MaterialId == erp.MaterialId); if (detail == null) { diff --git a/src/WMS.Web.Repositories/OutStockRepositories.cs b/src/WMS.Web.Repositories/OutStockRepositories.cs index fb34e55b..86de18be 100644 --- a/src/WMS.Web.Repositories/OutStockRepositories.cs +++ b/src/WMS.Web.Repositories/OutStockRepositories.cs @@ -143,7 +143,7 @@ namespace WMS.Web.Repositories if (dto.DeliveryOrgId != null) query = query.Where(w => w.order.DeliveryOrgId == dto.DeliveryOrgId); if (!string.IsNullOrEmpty(dto.StockCode)) - query = query.Where(w => w.detail.StockCode == dto.StockCode); + query = query.Where(w => w.order.StockCode == dto.StockCode); if (dto.CreateBeginDate != null) query = query.Where(w => w.order.CreateTime >= dto.CreateBeginDate); if (dto.CreateEndDate != null) @@ -159,7 +159,7 @@ namespace WMS.Web.Repositories Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.CreatorId), CreateTime = s.order.CreateTime.DateToStringSeconds(), SuccessSync = s.order.SuccessSync == true ? "成功" : "失败", - Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.detail.StockCode), + Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.order.StockCode), SourceBillNo = string.Join(",", s.detail.ErpDetails.Select(s => s.SourceBillNo)), SaleBillNo = string.Join(",", s.detail.ErpDetails.Select(s => s.SaleBillNo)), DeliveryOrg = _erpBasicDataExtendService.GetOrgName(orgs, s.order.DeliveryOrgId), diff --git a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs index c63ee134..aece09df 100644 --- a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs +++ b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs @@ -273,7 +273,7 @@ namespace WMS.Web.Repositories if (dto.DeliveryOrgId != null) query = query.Where(w => w.order.DeliveryOrgId == dto.DeliveryOrgId); if (!string.IsNullOrEmpty(dto.StockCode)) - query = query.Where(w => w.detail.StockCode == dto.StockCode); + query = query.Where(w => w.order.StockCode == dto.StockCode); if (dto.CreateBeginDate != null) query = query.Where(w => w.order.OperateTime >= dto.CreateBeginDate); if (dto.CreateEndDate != null) @@ -291,7 +291,7 @@ namespace WMS.Web.Repositories CreateTime = s.order.OperateTime.DateToStringSeconds(), OutStockBeginTime = s.detail.OutStockBeginTime.DateToStringSeconds(), OutStockEndTime = s.detail.OutStockEndTime.DateToStringSeconds(), - Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.detail.StockCode), + Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.order.StockCode), SourceBillNo = string.Join(",", s.detail.ErpDetails.Select(s => s.SourceBillNo)), SaleBillNo = string.Join(",", s.detail.ErpDetails.Select(s => s.SaleBillNo)), DeliveryOrg = _erpBasicDataExtendService.GetOrgName(orgs, s.order.DeliveryOrgId), @@ -331,7 +331,7 @@ namespace WMS.Web.Repositories foreach (var r in response) { var entity = list.FirstOrDefault(f => f.Id == r.Id); - r.StockCode = entity.Details.First().StockCode; + r.StockCode = entity.StockCode; r.StockName = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, r.StockCode); } //获取物料信息 显示物料三件套 @@ -363,7 +363,7 @@ namespace WMS.Web.Repositories if (entity == null) return new GetOutStockTaskByNoResponse(); var response = _mapper.Map(entity); - response.StockCode = entity.Details.First().StockCode; + response.StockCode = entity.StockCode; response.StockName = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, response.StockCode); //获取物料信息 显示物料三件套 foreach (var r in response.details)