iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/BaseCustomerService.cs
@@ -16,7 +16,7 @@ namespace Admin.NET.Application { /// <summary> /// 往来关系服务 /// 往来单位服务 /// </summary> [ApiDescriptionSettings("WmsBase", Name = "BaseCustomer", Order = 100)] [Route("api")] @@ -42,7 +42,7 @@ } /// <summary> /// 分页查询往来关系 /// 分页查询往来单位 /// </summary> /// <param name="input"></param> /// <returns></returns> @@ -74,10 +74,10 @@ } /// <summary> /// 不分页查询往来关系列表 /// 不分页查询往来单位列表 /// </summary> /// <param name="input">往来关系查询参数</param> /// <returns>(往来关系)实例列表</returns> /// <param name="input">往来单位查询参数</param> /// <returns>(往来单位)实例列表</returns> [HttpGet("BaseCustomer/listNonPage")] public async Task<List<BaseCustomerOutput>> ListNonPageAsync([FromQuery] BaseCustomerSearchNonPage input) { @@ -123,7 +123,7 @@ } /// <summary> /// 获取往来关系 /// 获取往来单位 /// </summary> /// <param name="input"></param> /// <returns></returns> @@ -134,7 +134,7 @@ } /// <summary> /// 获取往来关系列表 /// 获取往来单位列表 /// </summary> /// <param name="input"></param> /// <returns></returns> @@ -147,7 +147,7 @@ #region 增、删、改 /// <summary> /// 增加往来关系 /// 增加往来单位 /// </summary> /// <param name="input"></param> /// <returns></returns> @@ -167,7 +167,7 @@ } /// <summary> /// 删除往来关系 /// 删除往来单位 /// </summary> /// <param name="input"></param> /// <returns></returns> @@ -180,7 +180,7 @@ } /// <summary> /// 更新往来关系 /// 更新往来单位 /// </summary> /// <param name="input"></param> /// <returns></returns> @@ -205,7 +205,7 @@ #region 导入 /// <summary> /// Excel模板导入往来关系功能 /// Excel模板导入往来单位功能 /// </summary> /// <param name="file">Excel模板文件</param> /// <returns>导入的记录数</returns> @@ -381,7 +381,7 @@ } /// <summary> /// 根据版本下载往来关系的Excel导入模板 /// 根据版本下载往来单位的Excel导入模板 /// </summary> /// <param name="version">模板版本</param> /// <returns>下载的模板文件</returns> @@ -389,7 +389,7 @@ public IActionResult DownloadExcelTemplate([FromQuery] string version) { string _path = TemplateConst.EXCEL_TEMPLATEFILE_导入模版路径 + $"\\BaseCustomer{TemplateConst.EXCEL_TEMPLATEFILE_导入模版名称后缀}.xlsx"; var fileName = HttpUtility.UrlEncode($"导入模板(往来关系).xlsx", Encoding.GetEncoding("UTF-8")); var fileName = HttpUtility.UrlEncode($"导入模板(往来单位).xlsx", Encoding.GetEncoding("UTF-8")); return new FileStreamResult(new FileStream(_path, FileMode.Open), "application/octet-stream") { FileDownloadName = fileName }; }
@@ -7,7 +7,7 @@ { /// <summary> /// 往来关系查询参数 /// 往来单位查询参数 /// </summary> public class BaseCustomerSearch : PageInputBase { @@ -104,7 +104,7 @@ } /// <summary> /// 往来关系不分页查询参数 /// 往来单位不分页查询参数 /// </summary> public class BaseCustomerSearchNonPage : PageInputNonPageBase { @@ -201,7 +201,7 @@ } /// <summary> /// 往来关系输入参数 /// 往来单位输入参数 /// </summary> public class BaseCustomerInput { @@ -279,21 +279,21 @@ } /// <summary> /// 往来关系新增参数 /// 往来单位新增参数 /// </summary> public class AddBaseCustomerInput : BaseCustomerInput { } /// <summary> /// 往来关系删除参数 /// 往来单位删除参数 /// </summary> public class DeleteBaseCustomerInput : BaseId { } /// <summary> /// 往来关系更新参数 /// 往来单位更新参数 /// </summary> public class UpdateBaseCustomerInput : BaseCustomerInput { @@ -306,7 +306,7 @@ } /// <summary> /// 往来关系获取单个参数 /// 往来单位获取单个参数 /// </summary> public class QueryeBaseCustomerInput : BaseId { iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/Dto/BaseCustomerOutput.cs
@@ -4,7 +4,7 @@ namespace Admin.NET.Application { /// <summary> /// 往来关系输出参数 /// 往来单位输出参数 /// </summary> public class BaseCustomerOutput { @@ -81,7 +81,7 @@ /// <summary> /// Id主键 /// </summary> public long? Id { get; set; } public long Id { get; set; } /// <summary> /// 创建时间 iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialInput.cs
@@ -452,14 +452,14 @@ /// </summary> public List<AddWmsSubstituteGoodInput> SubstituteGoodList { get; set; } /// <summary> /// 往来关系 /// </summary> public List<BaseCustomerInput> BaseCustomerList { get; set; } ///// <summary> ///// 往来单位 ///// </summary> //public List<BaseCustomerInput> BaseCustomerList { get; set; } /// <summary> /// 客户档案ID列表 /// 客户档案（往来单位）ID列表 /// </summary> public List<long> BaseCustomerList { get; set; } } iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialOutput.cs
@@ -163,7 +163,7 @@ public List<WmsSubstituteGoodOutput> SubstituteGoodList { get; set; } /// <summary> /// 往来关系 /// 往来单位 /// </summary> public List<BaseCustomerOutput> BaseCustomerList { get; set; } } iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/WmsMaterialService.cs
@@ -250,11 +250,11 @@ wmsMaterial.MaterialTypeName = wmsMaterialType.MaterialTypeName; //往来关系信息 var baseCustomerList = input.BaseCustomerList.Adapt<List<BaseCustomer>>(); //往来单位 var wmsBaseCustomerList = await _baseCustomerRep.DetachedEntities.Where(u => input.BaseCustomerList.Contains(u.Id) && u.IsDeleted == false && u.IsDisabled == false).ProjectToType<BaseCustomerOutput>().ToListAsync(); //物料客户关联关系 var materialCustomerList=new List<WmsMaterialCustomer>(); foreach (var baseCustomer in baseCustomerList) foreach (var baseCustomer in wmsBaseCustomerList) { materialCustomerList.Add(new WmsMaterialCustomer() { @@ -350,7 +350,7 @@ } //往来关系信息 //往来单位信息 var baseCustomerList = input.BaseCustomerList.Adapt<List<BaseCustomer>>(); //物料客户关联关系 var materialCustomerList = new List<WmsMaterialCustomer>(); iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/BaseCustomer.cs
@@ -5,15 +5,15 @@ /* * @author : 刘文奇 * @date : 2024/4/23下午4:07:57 * @desc : 往来关系 * @desc : 往来单位 */ namespace Admin.NET.Core { /// <summary> /// 往来关系 /// 往来单位 /// </summary> [Table("base_customer")] [Comment("往来关系")] [Comment("往来单位")] public class BaseCustomer : DEntityBase {
@@ -3,7 +3,7 @@ namespace Admin.NET.Core { /// <summary> /// 往来关系类型 /// 往来单位类型 /// </summary> public enum BaseCustomerTypeEnum { iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/SeedData/SysDictTypeSeedData.cs
@@ -82,7 +82,7 @@ new SysDictType{Id=539751788187717, Name="物料ABC分类", Code="abc_class_type", Sort=100, Remark="", Status=0 }, new SysDictType{Id=540028296155205, Name="往来关系类型", Code="base_customer_type", Sort=100, Remark="", Status=0 }, new SysDictType{Id=540028296155205, Name="往来单位类型", Code="base_customer_type", Sort=100, Remark="", Status=0 }, }; } }
