diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/PrintTable/Dtos/AlreadyPrintDto.cs b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/PrintTable/Dtos/AlreadyPrintDto.cs new file mode 100644 index 0000000..8843bd8 --- /dev/null +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/PrintTable/Dtos/AlreadyPrintDto.cs @@ -0,0 +1,143 @@ +using Magicodes.ExporterAndImporter.Core; +using Magicodes.ExporterAndImporter.Excel; +using System; +using System.Collections.Generic; +using System.Text; +using Volo.Abp.Application.Dtos; + +namespace WY.NewJit.PrintTable +{ + /// + /// 零件查询结果DTO + /// + [ExcelExporter(Name = "已打印表", AutoFitAllColumn = true, MaxRowNumberOnASheet = 1000)] //一个Sheet最大允许的行数，设置了之后将输出多个Sheet + [Serializable] + public class AlreadyPrintDto + { + /// + /// 对应M100的Id + /// + public Guid M100Id { get; set; } + + /// + /// 业务类型：1 门板 2 其它柱护板 3 柱护板 + /// + [ExporterHeader(DisplayName = "业务类型")] + [ImporterHeader(Name = "业务类型")] + public string BusinessType { get; set; } + + /// + /// 产线 + /// + [ExporterHeader(DisplayName = "产线")] + [ImporterHeader(Name = "产线")] + public string ProductLine { get; set; } + + /// + /// 上线时间 + /// + [ExporterHeader(DisplayName = "上线时间")] + [ImporterHeader(Name = "上线时间")] + public DateTime OnlineTime { get; set; } + + /// + /// 大众排序号 + /// + [ExporterHeader(DisplayName = "大众排序号")] + [ImporterHeader(Name = "大众排序号")] + public int HostSN { get; set; } + + /// + /// 订单号 + /// + [ExporterHeader(DisplayName = "订单号")] + [ImporterHeader(Name = "订单号")] + public string KNR { get; set; } + + /// + /// 底盘号（为空时是补充的断号记录） + /// + [ExporterHeader(DisplayName = "底盘号")] + [ImporterHeader(Name = "底盘号")] + public string VIN { get; set; } + + /// + /// 车型 + /// + [ExporterHeader(DisplayName = "车型")] + [ImporterHeader(Name = "车型")] + public string VehicleModelCode { get; set; } + + /// + /// 总成组ID + /// + [ExporterHeader(DisplayName = "总成组ID")] + [ImporterHeader(Name = "总成组ID")] + public Guid? AssemblyID { get; set; } + + /// + /// 单据状态：1 未解析 2 已解析 4 断号 + /// + [ExporterHeader(DisplayName = "单据状态")] + [ImporterHeader(Name = "单据状态")] + public string BillStatus { get; set; } + + /// + /// 打印类型： 1 顺序打印 2 补账打印 + /// + [ExporterHeader(DisplayName = "打印类型")] + [ImporterHeader(Name = "打印类型")] + public int PrintType { get; set; } + + /// + /// 自定义排序号(910001 910002 等) + /// + [ExporterHeader(DisplayName = "自定义排序号")] + [ImporterHeader(Name = "自定义排序号")] + public int HostSN2 { get; set; } + + /// + /// 描述 + /// + [ExporterHeader(DisplayName = "描述")] + [ImporterHeader(Name = "描述")] + public string Description { get; set; } + + /// + /// 接收时间 + /// + [ExporterHeader(DisplayName = "接收时间")] + [ImporterHeader(Name = "接收时间")] + public DateTime? ReceiveTime { get; set; } + + /// + /// 创建时间 + /// + [ExporterHeader(DisplayName = "创建时间")] + [ImporterHeader(Name = "创建时间")] + public DateTime? CreationTime { get; set; } + + /// + /// 创建人 + /// + [ExporterHeader(DisplayName = "创建人")] + [ImporterHeader(Name = "创建人")] + public Guid? CreatorId { get; set; } + + /// + /// 最后修改时间 + /// + [ExporterHeader(DisplayName = "最后修改时间")] + [ImporterHeader(Name = "最后修改时间")] + public DateTime? LastModificationTime { get; set; } + + /// + /// 最后修改人 + /// + [ExporterHeader(DisplayName = "最后修改人")] + [ImporterHeader(Name = "最后修改人")] + public Guid? LastModifierId { get; set; } + + + } +} diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/PrintTable/Dtos/WaitPrintDto.cs b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/PrintTable/Dtos/WaitPrintDto.cs new file mode 100644 index 0000000..cf264d5 --- /dev/null +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/PrintTable/Dtos/WaitPrintDto.cs @@ -0,0 +1,141 @@ +using Magicodes.ExporterAndImporter.Core; +using Magicodes.ExporterAndImporter.Excel; +using System; +using System.Collections.Generic; +using System.Text; +using Volo.Abp.Application.Dtos; + +namespace WY.NewJit.PrintTable +{ + /// + /// 零件查询结果DTO + /// + [ExcelExporter(Name = "未打印表", AutoFitAllColumn = true, MaxRowNumberOnASheet = 1000)] //一个Sheet最大允许的行数，设置了之后将输出多个Sheet + [Serializable] + public class WaitPrintDto + { + /// + /// 对应M100的Id + /// + public Guid M100Id { get; set; } + + /// + /// 业务类型：1 门板 2 其它柱护板 3 柱护板 + /// + [ExporterHeader(DisplayName = "业务类型")] + [ImporterHeader(Name = "业务类型")] + public string BusinessType { get; set; } + + /// + /// 产线 + /// + [ExporterHeader(DisplayName = "产线")] + [ImporterHeader(Name = "产线")] + public string ProductLine { get; set; } + + /// + /// 上线时间 + /// + [ExporterHeader(DisplayName = "上线时间")] + [ImporterHeader(Name = "上线时间")] + public DateTime OnlineTime { get; set; } + + /// + /// 大众排序号 + /// + [ExporterHeader(DisplayName = "大众排序号")] + [ImporterHeader(Name = "大众排序号")] + public int HostSN { get; set; } + + /// + /// 订单号 + /// + [ExporterHeader(DisplayName = "订单号")] + [ImporterHeader(Name = "订单号")] + public string KNR { get; set; } + + /// + /// 底盘号（为空时是补充的断号记录） + /// + [ExporterHeader(DisplayName = "底盘号")] + [ImporterHeader(Name = "底盘号")] + public string VIN { get; set; } + + /// + /// 车型 + /// + [ExporterHeader(DisplayName = "车型")] + [ImporterHeader(Name = "车型")] + public string VehicleModelCode { get; set; } + + /// + /// 总成组ID + /// + [ExporterHeader(DisplayName = "总成组ID")] + [ImporterHeader(Name = "总成组ID")] + public Guid? AssemblyID { get; set; } + + /// + /// 单据状态：1 未解析 2 已解析 4 断号 + /// + [ExporterHeader(DisplayName = "单据状态")] + [ImporterHeader(Name = "单据状态")] + public string BillStatus { get; set; } + + /// + /// 打印类型： 1 顺序打印 2 补账打印 + /// + [ExporterHeader(DisplayName = "打印类型")] + [ImporterHeader(Name = "打印类型")] + public int PrintType { get; set; } + + /// + /// 自定义排序号(910001 910002 等) + /// + [ExporterHeader(DisplayName = "自定义排序号")] + [ImporterHeader(Name = "自定义排序号")] + public int HostSN2 { get; set; } + + /// + /// 描述 + /// + [ExporterHeader(DisplayName = "描述")] + [ImporterHeader(Name = "描述")] + public string Description { get; set; } + + /// + /// 接收时间 + /// + [ExporterHeader(DisplayName = "接收时间")] + [ImporterHeader(Name = "接收时间")] + public DateTime? ReceiveTime { get; set; } + + /// + /// 创建时间 + /// + [ExporterHeader(DisplayName = "创建时间")] + [ImporterHeader(Name = "创建时间")] + public DateTime? CreationTime { get; set; } + + /// + /// 创建人 + /// + [ExporterHeader(DisplayName = "创建人")] + [ImporterHeader(Name = "创建人")] + public Guid? CreatorId { get; set; } + + /// + /// 最后修改时间 + /// + [ExporterHeader(DisplayName = "最后修改时间")] + [ImporterHeader(Name = "最后修改时间")] + public DateTime? LastModificationTime { get; set; } + + /// + /// 最后修改人 + /// + [ExporterHeader(DisplayName = "最后修改人")] + [ImporterHeader(Name = "最后修改人")] + public Guid? LastModifierId { get; set; } + } +} diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/WY.NewJit.Application.Contracts.csproj b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/WY.NewJit.Application.Contracts.csproj index 1525bc8..96740e1 100644 --- a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/WY.NewJit.Application.Contracts.csproj +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/WY.NewJit.Application.Contracts.csproj @@ -31,4 +31,8 @@ + + + + diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/WY.NewJit.Application.Contracts.xml b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/WY.NewJit.Application.Contracts.xml index 157f24e..e42241c 100644 --- a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/WY.NewJit.Application.Contracts.xml +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/WY.NewJit.Application.Contracts.xml @@ -3427,5 +3427,195 @@ 读取记录数 + + + 零件查询结果DTO + + + + + 对应M100的Id + + + + + 业务类型：1 门板 2 其它柱护板 3 柱护板 + + + + + 产线 + + + + + 上线时间 + + + + + 大众排序号 + + + + + 订单号 + + + + + 底盘号（为空时是补充的断号记录） + + + + + 车型 + + + + + 总成组ID + + + + + 单据状态：1 未解析 2 已解析 4 断号 + + + + + 打印类型： 1 顺序打印 2 补账打印 + + + + + 自定义排序号(910001 910002 等) + + + + + 描述 + + + + + 接收时间 + + + + + 创建时间 + + + + + 创建人 + + + + + 最后修改时间 + + + + + 最后修改人 + + + + + 零件查询结果DTO + + + + + 对应M100的Id + + + + + 业务类型：1 门板 2 其它柱护板 3 柱护板 + + + + + 产线 + + + + + 上线时间 + + + + + 大众排序号 + + + + + 订单号 + + + + + 底盘号（为空时是补充的断号记录） + + + + + 车型 + + + + + 总成组ID + + + + + 单据状态：1 未解析 2 已解析 4 断号 + + + + + 打印类型： 1 顺序打印 2 补账打印 + + + + + 自定义排序号(910001 910002 等) + + + + + 描述 + + + + + 接收时间 + + + + + 创建时间 + + + + + 创建人 + + + + + 最后修改时间 + + + + + 最后修改人 + + diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/NewJitApplicationAutoMapperProfile.cs b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/NewJitApplicationAutoMapperProfile.cs index 786a158..61a01ac 100644 --- a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/NewJitApplicationAutoMapperProfile.cs +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/NewJitApplicationAutoMapperProfile.cs @@ -6,6 +6,7 @@ using WY.NewJit.Extends; using WY.NewJit.MsgBaseData; using WY.NewJit.MsgCheck; using WY.NewJit.MsgCheck.UnknownAssemblys; +using WY.NewJit.PrintTable; namespace WY.NewJit { @@ -100,6 +101,12 @@ namespace WY.NewJit #endregion + #region 打印表 + CreateMap().ReverseMap(); + CreateMap().ReverseMap(); + + #endregion + } } } diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/PrintTable/AlreadyPrintAppService.cs b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/PrintTable/AlreadyPrintAppService.cs new file mode 100644 index 0000000..7b12a54 --- /dev/null +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/PrintTable/AlreadyPrintAppService.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace WY.NewJit.PrintTable +{ + internal class AlreadyPrintAppService + { + } +} diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/PrintTable/WaitPrintAppService.cs b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/PrintTable/WaitPrintAppService.cs new file mode 100644 index 0000000..6f62b0e --- /dev/null +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/PrintTable/WaitPrintAppService.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace WY.NewJit.PrintTable +{ + internal class WaitPrintAppService + { + } +} diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/PrintTable/Entitys/AlreadyPrint.cs b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/PrintTable/Entitys/AlreadyPrint.cs new file mode 100644 index 0000000..ea27f1f --- /dev/null +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/PrintTable/Entitys/AlreadyPrint.cs @@ -0,0 +1,113 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Volo.Abp.Domain.Entities; +using Volo.Abp.Domain.Entities.Auditing; + +namespace WY.NewJit.PrintTable +{ + /// + /// 未打印表 + /// + public class AlreadyPrint : Entity + { + /// + /// + /// + //public Guid Id { get; set; } + + /// + /// 3 柱护板 + /// + public Guid M100Id { get; set; } + + /// + /// 业务类型：1 门板 2 其它柱护板 3 柱护板 + /// + public string BusinessType { get; set; } + + /// + /// 产线 + /// + public string ProductLine { get; set; } + + /// + /// 上线时间 + /// + public DateTime OnlineTime { get; set; } + + /// + /// 大众排序号 + /// + public int HostSN { get; set; } + + /// + /// 订单号 + /// + public string KNR { get; set; } + + /// + /// 底盘号（为空时是补充的断号记录） + /// + public string VIN { get; set; } + + /// + /// 车型 + /// + public string VehicleModelCode { get; set; } + + /// + /// 总成组ID + /// + public Guid? AssemblyID { get; set; } + + /// + /// 单据状态：1 未解析 2 已解析 4 断号 + /// + public string BillStatus { get; set; } + + /// + /// 打印类型： 1 顺序打印 2 补账打印 + /// + public int PrintType { get; set; } + + /// + /// 自定义排序号(910001 910002 等) + /// + public int HostSN2 { get; set; } + + /// + /// 描述 + /// + public string Description { get; set; } + + /// + /// 接收时间 + /// + public DateTime? ReceiveTime { get; set; } + + /// + /// 创建时间 + /// + public DateTime? CreationTime { get; set; } + + /// + /// 创建人 + /// + public Guid? CreatorId { get; set; } + + /// + /// 最后修改时间 + /// + public DateTime? LastModificationTime { get; set; } + + /// + /// 最后修改人 + /// + public Guid? LastModifierId { get; set; } + } +} + diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/PrintTable/Entitys/WaitPrint.cs b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/PrintTable/Entitys/WaitPrint.cs new file mode 100644 index 0000000..9eb2cd3 --- /dev/null +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/PrintTable/Entitys/WaitPrint.cs @@ -0,0 +1,113 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Volo.Abp.Domain.Entities; +using Volo.Abp.Domain.Entities.Auditing; + +namespace WY.NewJit.PrintTable +{ + /// + /// 未打印表 + /// + public class WaitPrint : Entity + { + /// + /// + /// + //public Guid Id { get; set; } + + /// + /// 3 柱护板 + /// + public Guid M100Id { get; set; } + + /// + /// 业务类型：1 门板 2 其它柱护板 3 柱护板 + /// + public string BusinessType { get; set; } + + /// + /// 产线 + /// + public string ProductLine { get; set; } + + /// + /// 上线时间 + /// + public DateTime OnlineTime { get; set; } + + /// + /// 大众排序号 + /// + public int HostSN { get; set; } + + /// + /// 订单号 + /// + public string KNR { get; set; } + + /// + /// 底盘号（为空时是补充的断号记录） + /// + public string VIN { get; set; } + + /// + /// 车型 + /// + public string VehicleModelCode { get; set; } + + /// + /// 总成组ID + /// + public Guid? AssemblyID { get; set; } + + /// + /// 单据状态：1 未解析 2 已解析 4 断号 + /// + public string BillStatus { get; set; } + + /// + /// 打印类型： 1 顺序打印 2 补账打印 + /// + public int PrintType { get; set; } + + /// + /// 自定义排序号(910001 910002 等) + /// + public int HostSN2 { get; set; } + + /// + /// 描述 + /// + public string Description { get; set; } + + /// + /// 接收时间 + /// + public DateTime? ReceiveTime { get; set; } + + /// + /// 创建时间 + /// + public DateTime? CreationTime { get; set; } + + /// + /// 创建人 + /// + public Guid? CreatorId { get; set; } + + /// + /// 最后修改时间 + /// + public DateTime? LastModificationTime { get; set; } + + /// + /// 最后修改人 + /// + public Guid? LastModifierId { get; set; } + } +} + diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/PrintTable/Services/AlreadyPrintDomainService.cs b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/PrintTable/Services/AlreadyPrintDomainService.cs new file mode 100644 index 0000000..bd78957 --- /dev/null +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/PrintTable/Services/AlreadyPrintDomainService.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace WY.NewJit.PrintTable.Services +{ + internal class AlreadyPrintDomainService + { + } +} diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/PrintTable/Services/WaitPrintDomainService.cs b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/PrintTable/Services/WaitPrintDomainService.cs new file mode 100644 index 0000000..2aa3d8e --- /dev/null +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/PrintTable/Services/WaitPrintDomainService.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace WY.NewJit.PrintTable.Services +{ + internal class WaitPrintDomainService + { + } +} diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.EntityFrameworkCore/EntityFrameworkCore/NewJitDbContext.cs b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.EntityFrameworkCore/EntityFrameworkCore/NewJitDbContext.cs index a28ddcc..2b28da7 100644 --- a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.EntityFrameworkCore/EntityFrameworkCore/NewJitDbContext.cs +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.EntityFrameworkCore/EntityFrameworkCore/NewJitDbContext.cs @@ -16,6 +16,7 @@ using WY.NewJit.Extends.PaiGe; using WY.NewJit.Commons; using WY.NewJit.Extends.PaiGe.WMS; using WY.NewJit.MsgBaseData.Entitys; +using WY.NewJit.PrintTable; namespace WY.NewJit.EntityFrameworkCore { @@ -148,6 +149,10 @@ namespace WY.NewJit.EntityFrameworkCore #endregion + #region 打印表 + public DbSet wait_print { get; set; } + public DbSet already_print { get; set; } + #endregion /* Add DbSet properties for your Aggregate Roots / Entities here. * Also map them inside NewJitDbContextModelCreatingExtensions.ConfigureNewJit diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.EntityFrameworkCore/EntityFrameworkCore/NewJitDbContextModelCreatingExtensions.cs b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.EntityFrameworkCore/EntityFrameworkCore/NewJitDbContextModelCreatingExtensions.cs index b229266..bedb7fd 100644 --- a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.EntityFrameworkCore/EntityFrameworkCore/NewJitDbContextModelCreatingExtensions.cs +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.EntityFrameworkCore/EntityFrameworkCore/NewJitDbContextModelCreatingExtensions.cs @@ -11,6 +11,7 @@ using WY.NewJit.MsgBaseData.Entitys; using WY.NewJit.MsgCheck; using WY.NewJit.MsgConversion; using WY.NewJit.MsgTransmission; +using WY.NewJit.PrintTable; using WY.NewJit.TianHe; namespace WY.NewJit.EntityFrameworkCore @@ -588,6 +589,20 @@ namespace WY.NewJit.EntityFrameworkCore #endregion + + #region 打印表 + builder.Entity(b => + { + b.ToTable(NewJitConsts.DbTablePrefix + nameof(WaitPrint)); //将Book实体映射到数据库表XXXBooks + b.ConfigureByConvention();//配置/映射继承的属性,应始终对你所有的实体使用它 + }); + + builder.Entity(b => + { + b.ToTable(NewJitConsts.DbTablePrefix + nameof(AlreadyPrint)); //将Book实体映射到数据库表XXXBooks + b.ConfigureByConvention();//配置/映射继承的属性,应始终对你所有的实体使用它 + }); + #endregion } } } \ No newline at end of file