diff --git a/src/WMS.Web.Api/Controllers/SysConfigController.cs b/src/WMS.Web.Api/Controllers/SysConfigController.cs index 47b1e9d1..ea665c6a 100644 --- a/src/WMS.Web.Api/Controllers/SysConfigController.cs +++ b/src/WMS.Web.Api/Controllers/SysConfigController.cs @@ -7,6 +7,7 @@ using System.Linq; using System.Threading.Tasks; using WMS.Web.Core; using WMS.Web.Core.Dto; +using WMS.Web.Core.Dto.Erp; using WMS.Web.Core.Dto.SingleData; using WMS.Web.Core.Internal.Results; using WMS.Web.Domain.Infrastructure; @@ -148,6 +149,42 @@ namespace WMS.Web.Api.Controllers return Result>.ReSuccess(list); } + /// + /// 获取出库单客户下拉列表 + /// + /// + [HttpGet] + [Route("GetCustomers")] + public async Task>> GetCustomers() + { + var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]); + if (loginInfo == null || loginInfo.UserInfo == null) + return Result>.ReFailure(ResultCodes.Token_Invalid_Error); + var customers = await _erpService.BillQueryForCustomer(); + var orgs = await _erpService.BillQueryForOrg(); + List pullList = new List(); + foreach (var c in customers.Data) + { + pullList.Add(new PullDownStrResponse() + { + Id = "c_" + c.Id, + Name = c.Name, + Code = c.Number + }); + } + foreach (var o in orgs.Data) + { + pullList.Add(new PullDownStrResponse() + { + Id = "o_" + o.Id, + Name = o.Name, + Code = o.Number + }); + } + + return Result>.ReSuccess(pullList); + } + /// /// 获取仓位：模糊名称 /// diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml index 7756dacf..cb12ba2a 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml @@ -290,6 +290,12 @@ 仓库id + + + 获取出库单客户下拉列表 + + + 获取仓位：模糊名称 diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index c7466844..1ed35a82 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -465,6 +465,26 @@ 单据类型 + + + 客户 + + + + + ID + + + + + 编码 + + + + + 名称 + + ERP：单据查询-dto @@ -775,6 +795,26 @@ 含税单价 取对应发货通知单对应物料编码行的 含税单价 + + + key为string 下拉列表对象 + + + + + id + + + + + 编码 + + + + + 名字 + + erp-采购入库-返回数据源 @@ -1572,7 +1612,7 @@ - 仓库ID + 仓库编码 @@ -2350,12 +2390,7 @@ 完成装箱时间 - - - 箱子的创建时间 - - - + 箱子创建用户 @@ -2365,7 +2400,7 @@ 创建时间（对应老OPS的创建时间） - + 明细 @@ -2375,14 +2410,14 @@ 序列号 - + - 条码生成时间 + 序列号生成时间 - + - 条码生成用户 + 序列号生成用户 diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index 30a6bd65..8de1a8a6 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -110,6 +110,16 @@ 组织Id + + + 完成装箱时间 + + + + + 箱子创建用户 + + 创建时间（对应老OPS的创建时间） @@ -741,7 +751,7 @@ 明细 - + 创建 @@ -938,6 +948,56 @@ 出库结束时间 + + + 序列号操作记录表 + + + + + ID + + + + + 序列号 + + + + + 序列号操作类型 + + + + + 供应商Id + + + + + 组织Id + + + + + 仓库Id + + + + + 操作时间 + + + + + 操作人 + + + + + 备注 + + wms盘点单 @@ -1393,6 +1453,14 @@ 删除实体集合 + + + 批量添加 + + + + + 批量添加 @@ -1570,6 +1638,14 @@ + + + 获取客户名称 + + + + + 获取仓库名称 @@ -1654,6 +1730,12 @@ + + + 客户 + + + 获取仓库信息 @@ -2199,6 +2281,14 @@ 箱服务信息 + + + 序列号操作记录日志 + + + + + 改箱 移箱服务 @@ -2440,6 +2530,14 @@ + + + 获取客户名称 + + + + + 获取仓库名称 @@ -2499,6 +2597,12 @@ + + + 客户 + + + erp:仓库 @@ -3039,6 +3143,11 @@ 分布式调出单 + + + 客户 + + 入库状态 @@ -3259,6 +3368,11 @@ 数据操作失败 + + + 序列号操作类型 + + 对接单点的接口方法-枚举 diff --git a/src/WMS.Web.Core/Dto/Erp/PullDownStrResponse.cs b/src/WMS.Web.Core/Dto/Erp/PullDownStrResponse.cs new file mode 100644 index 00000000..2965f375 --- /dev/null +++ b/src/WMS.Web.Core/Dto/Erp/PullDownStrResponse.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace WMS.Web.Core.Dto.Erp +{ + /// + /// key为string 下拉列表对象 + /// + public class PullDownStrResponse + { + /// + /// id + /// + public string Id { get; set; } + /// + /// 编码 + /// + public string Code { get; set; } + /// + /// 名字 + /// + public string Name { get; set; } + } +} diff --git a/src/WMS.Web.Domain/Entitys/OutStock.cs b/src/WMS.Web.Domain/Entitys/OutStock.cs index 20e5cde5..e9a7d6ef 100644 --- a/src/WMS.Web.Domain/Entitys/OutStock.cs +++ b/src/WMS.Web.Domain/Entitys/OutStock.cs @@ -73,10 +73,12 @@ namespace WMS.Web.Domain.Entitys /// 创建 /// /// - public void Create(int creatorId,int taskId, OutStockType type) + public void Create(int creatorId, OutStockTask task) { - this.TaskId = taskId; - this.Type = type; + this.TaskId = task.Id; + this.Type = task.Type; + this.DeliveryOrgId = task.DeliveryOrgId; + this.ReceiptCustomerId = task.ReceiptCustomerId; this.CreatorId = creatorId; this.CreateTime = DateTime.Now; } diff --git a/src/WMS.Web.Domain/Services/OutStockService.cs b/src/WMS.Web.Domain/Services/OutStockService.cs index 3962eccc..2a23e59b 100644 --- a/src/WMS.Web.Domain/Services/OutStockService.cs +++ b/src/WMS.Web.Domain/Services/OutStockService.cs @@ -50,7 +50,7 @@ namespace WMS.Web.Domain.Services //OutStock entity = await _outStockRepositories.GetByTaskId(dto.TaskId); OutStock entity = new OutStock(); - entity.Create(loginInfo.UserInfo.StaffId, outStockTask.Id, outStockTask.Type); + entity.Create(loginInfo.UserInfo.StaffId, outStockTask); foreach (var d in dto.Details) { //任务单明细 diff --git a/src/WMS.Web.Repositories/OutStockRepositories.cs b/src/WMS.Web.Repositories/OutStockRepositories.cs index 4b422fae..a31fa873 100644 --- a/src/WMS.Web.Repositories/OutStockRepositories.cs +++ b/src/WMS.Web.Repositories/OutStockRepositories.cs @@ -114,7 +114,12 @@ namespace WMS.Web.Repositories //物料集合；模糊查询后的物料集合 if (!string.IsNullOrEmpty(dto.ReceiptCustomer)) { - cIds = customers.Where(w => EF.Functions.Like(w.Name, "%" + dto.ReceiptCustomer + "%")).Select(s => s.MaterialId).ToList(); + var q = dto.ReceiptCustomer.Substring(0, 1); + var h = dto.ReceiptCustomer.Substring(2, dto.ReceiptCustomer.Length - 1); + if (q.Equals("c")) + cIds = customers.Where(w => EF.Functions.Like(w.Name, "%" + dto.ReceiptCustomer + "%")).Select(s => s.Id).ToList(); + else + cIds = orgs.Where(w => EF.Functions.Like(w.Name, "%" + dto.ReceiptCustomer + "%")).Select(s => s.Id).ToList(); } #endregion @@ -124,7 +129,14 @@ namespace WMS.Web.Repositories .OrderByDescending(o => o.order.Id) .Where(adv => 1 == 1); - //if (!string.IsNullOrEmpty(dto.ReceiptCustomer)) + if (cIds.Count() != 0) + { + var q = dto.ReceiptCustomer.Substring(0, 1); + if (q.Equals("c"))//差销售出库单(客户) + query = query.Where(w => cIds.Contains(w.order.ReceiptCustomerId) && w.order.Type == OutStockType.Sal); + else//查其他单据(组织) + query = query.Where(w => cIds.Contains(w.order.ReceiptCustomerId) && w.order.Type != OutStockType.Sal); + } if (mIds.Count() != 0) query = query.Where(w => mIds.Contains(w.detail.MaterialId)); if (ids.Count() > 0) diff --git a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs index 2d2dae1f..aaec8a5f 100644 --- a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs +++ b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs @@ -240,7 +240,12 @@ namespace WMS.Web.Repositories //物料集合；模糊查询后的物料集合 if (!string.IsNullOrEmpty(dto.ReceiptCustomer)) { - cIds = customers.Where(w => EF.Functions.Like(w.Name, "%" + dto.ReceiptCustomer + "%")).Select(s => s.MaterialId).ToList(); + var q = dto.ReceiptCustomer.Substring(0, 1); + var h = dto.ReceiptCustomer.Substring(2, dto.ReceiptCustomer.Length - 1); + if (q.Equals("c")) + cIds = customers.Where(w => EF.Functions.Like(w.Name, "%" + dto.ReceiptCustomer + "%")).Select(s => s.Id).ToList(); + else + cIds = orgs.Where(w => EF.Functions.Like(w.Name, "%" + dto.ReceiptCustomer + "%")).Select(s => s.Id).ToList(); } #endregion @@ -251,7 +256,13 @@ namespace WMS.Web.Repositories .Where(adv => 1 == 1); if (cIds.Count() != 0) - query = query.Where(w => cIds.Contains(w.order.ReceiptCustomerId)); + { + var q = dto.ReceiptCustomer.Substring(0, 1); + if (q.Equals("c"))//差销售出库单(客户) + query = query.Where(w => cIds.Contains(w.order.ReceiptCustomerId) && w.order.Type == OutStockType.Sal); + else//查其他单据(组织) + query = query.Where(w => cIds.Contains(w.order.ReceiptCustomerId) && w.order.Type != OutStockType.Sal); + } if (mIds.Count() != 0) query = query.Where(w => mIds.Contains(w.detail.MaterialId)); if (dto.Ids.Count() > 0)