diff --git a/ds-wms-service/DS.WMS.Core/Op/Dtos/Enum/BLIssueStatusEnum.cs b/ds-wms-service/DS.WMS.Core/Op/Dtos/Enum/BLIssueStatusEnum.cs index 0264d815..938a19a2 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Dtos/Enum/BLIssueStatusEnum.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Dtos/Enum/BLIssueStatusEnum.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace DS.WMS.Core.Op.Dtos.Enum +namespace DS.WMS.Core.Op.Dtos { /// /// 提单状态枚举 diff --git a/ds-wms-service/DS.WMS.Core/Op/Dtos/Enum/BLQueryStatusEnum.cs b/ds-wms-service/DS.WMS.Core/Op/Dtos/Enum/BLQueryStatusEnum.cs new file mode 100644 index 00000000..6db42eba --- /dev/null +++ b/ds-wms-service/DS.WMS.Core/Op/Dtos/Enum/BLQueryStatusEnum.cs @@ -0,0 +1,41 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DS.WMS.Core.Op.Dtos +{ + /// + /// 提单管理查询状态枚举 + /// + public enum BLQueryStatusEnum + { + /// + /// 未签入 + /// + [Description("未签入")] + BLQuery, + /// + /// 可签入 + /// + [Description("可签入")] + CheckInQuery, + /// + /// 可签出 + /// + [Description("可签出")] + CheckOutQuery, + /// + /// 改签 + /// + [Description("改签")] + BLModifyQuery, + /// + /// 已扣单 + /// + [Description("已扣单")] + BLSeizeQuery + } +} diff --git a/ds-wms-service/DS.WMS.Core/Op/Method/BLIssueManage/BLIssueManageService.cs b/ds-wms-service/DS.WMS.Core/Op/Method/BLIssueManage/BLIssueManageService.cs index bfdba010..5301621b 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Method/BLIssueManage/BLIssueManageService.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Method/BLIssueManage/BLIssueManageService.cs @@ -116,22 +116,39 @@ namespace DS.WMS.Core.Op.Method var result = await query.ToQueryPageAsync(querySearch.PageCondition); + List resultList = new List(); + if (result.Data.Count > 0) { - //var orgIds = result.Data.Select(x => x.SaleDeptId).Distinct(); - //var orgs = await Db.Queryable().Where(x => orgIds.Contains(x.Id)).Select(x => new { x.Id, x.OrgName }).ToListAsync(); + int start = 1; + + foreach(var data in result.Data) + { + if (data.bl != null && data.bl.Id > 0) + { + var currBl = data.Adapt(); + + resultList.Add(currBl); - //var userIds = result.Data.Select(x => x.CreateBy).Distinct(); - //var users = await Db.Queryable().Where(x => userIds.Contains(x.Id)).Select(x => new { x.Id, x.UserName }).ToListAsync(); + continue; + } - //foreach (var item in result.Data) - //{ - // item.SaleDeptName = orgs.Find(x => x.Id == item.SaleDeptId)?.OrgName; - // item.SaleDeptName = users.Find(x => x.Id == item.CreateBy)?.UserName; - //} + resultList.Add(new BLIssueManageBaseDto + { + Id = start, + BLNo = data.order.MBLNO, + CustomerId = data.order.CustomerId, + CustomerName = data.order.CustomerName, + SaleId = data.order.SaleId, + Sale = data.order.Sale, + + }); + + start++; + } } - return null; + return DataResult>.Success(resultList); } #endregion