Browse Source

门板、柱护板打印相关内容优化

master
liuyunfeng 1 year ago
parent
commit
7ea0fc2e1c
  1. 6
      src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/Extends/MenBanReports/MenBanPrintInputDto.cs
  2. 5
      src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/Extends/ZhuHuBanReports/ZhuHuBanPrintInputDto.cs
  3. 14
      src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillM100s/Interfaces/IBillM100AppService.cs
  4. 96
      src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/PrintTable/Dtos/QueryWaitPrintDto.cs
  5. 14
      src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/PrintTable/Dtos/WaitPrintDto.cs
  6. 12
      src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/PrintTable/Interfaces/IAlreadyPrintAppService.cs
  7. 19
      src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/PrintTable/Interfaces/IWaitPrintAppService.cs
  8. 4
      src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/WY.NewJit.Application.Contracts.csproj
  9. 145
      src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/WY.NewJit.Application.Contracts.xml
  10. 6229
      src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/MsgCheck/BillM100s/BillM100AppService.cs
  11. 8
      src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/MsgCheck/BillM100s/ZhuHuBanPackingRecService.cs
  12. 3
      src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/PrintTable/AlreadyPrintAppService.cs
  13. 1055
      src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/PrintTable/WaitPrintAppService.cs
  14. 1096
      src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/PrintTable/WaitPrintAppService_ZHB.cs
  15. 1
      src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain.Shared/Common/SwaggerGroupConsts.cs
  16. 4
      src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain.Shared/Extends/PaiGe/PrintTypeEnum.cs
  17. 48
      src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/MsgCheck/Entitys/ZHBPrintStatus.cs
  18. 27
      src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/MsgCheck/Services/M100DomainService.cs
  19. 17
      src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/PrintTable/Entitys/LastPrintHostSN.cs
  20. 2
      src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.EntityFrameworkCore/EntityFrameworkCore/NewJitDbContext.cs
  21. 14
      src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.EntityFrameworkCore/EntityFrameworkCore/NewJitDbContextModelCreatingExtensions.cs

6
src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/Extends/MenBanReports/MenBanPrintInputDto.cs

@ -9,7 +9,7 @@ namespace WY.NewJit.Extends
{ {
/// <summary> /// <summary>
/// 打印类型:提供初次打印、重新打印、针对重新解析后单据的补打功能 /// 打印类型:0 顺序打印 1 补账打印 3 重新打印
/// </summary> /// </summary>
public PrintTypeEnum PrintType { get; set; } public PrintTypeEnum PrintType { get; set; }
@ -30,14 +30,14 @@ namespace WY.NewJit.Extends
#region 重新打印、补打时使用 #region 重新打印、补打时使用
/// <summary> /// <summary>
/// 装箱单主表ID列表,报废时传入一个,重打时可传入多个 /// 重新打印时使用。装箱单主表ID列表,报废时传入一个,重打时可传入多个
/// </summary> /// </summary>
public virtual List<Guid> ReportIdList { get; set; } public virtual List<Guid> ReportIdList { get; set; }
/// <summary> /// <summary>
/// 补打时使用 /// 补打时使用
/// </summary> /// </summary>
public virtual List<Guid> M100IdList { get; set; } public virtual List<Guid> WaitPrintIdList { get; set; }
#endregion #endregion
} }

5
src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/Extends/ZhuHuBanReports/ZhuHuBanPrintInputDto.cs

@ -42,8 +42,11 @@ namespace WY.NewJit.Extends
/// <summary> /// <summary>
/// 补打时使用 /// 补打时使用
/// </summary> /// </summary>
public virtual List<Guid> M100IdList { get; set; } public virtual List<Guid> WaitPrintIdList { get; set; }
/// <summary>
/// 1 门板 2 其它柱护板 3 柱护板
/// </summary>
public virtual string GroupName { get; set; } public virtual string GroupName { get; set; }
} }

14
src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillM100s/Interfaces/IBillM100AppService.cs

@ -62,40 +62,34 @@ namespace WY.NewJit.MsgCheck
/// <returns>执行成功返回真</returns> /// <returns>执行成功返回真</returns>
Task<ObjectResultDto> ImportAsync(Byte[] input); Task<ObjectResultDto> ImportAsync(Byte[] input);
/// <summary>
/// 根据生产线获取正常打印单据的起始大众顺序号
/// </summary>
/// <param name="productLine">生产线</param>
/// <returns>起始大众顺序号</returns>
Task<ObjectResultDto<int?>> GetPrintStartHostSN2(string productLine, string isZhuHuBan,string GroupName = null);
/// <summary> /// <summary>
/// 打印前检查门板大众顺序号是否断号 /// 打印前检查门板大众顺序号是否断号
/// </summary> /// </summary>
/// <param name="input"></param> /// <param name="input"></param>
/// <returns>断号时Item不为空</returns> /// <returns>断号时Item不为空</returns>
Task<ListResultDto<string>> CheckMBHostSNBreakNum(MenBanPrintInputDto input); //Task<ListResultDto<string>> CheckMBHostSNBreakNum(MenBanPrintInputDto input);
/// <summary> /// <summary>
/// 打印前检查柱护板大众顺序号是否断号 /// 打印前检查柱护板大众顺序号是否断号
/// </summary> /// </summary>
/// <param name="input"></param> /// <param name="input"></param>
/// <returns>断号时Item不为空</returns> /// <returns>断号时Item不为空</returns>
Task<ListResultDto<string>> CheckZHBHostSNBreakNum(ZhuHuBanPrintInputDto input); //Task<ListResultDto<string>> CheckZHBHostSNBreakNum(ZhuHuBanPrintInputDto input);
/// <summary> /// <summary>
/// 打印门板装箱单 /// 打印门板装箱单
/// </summary> /// </summary>
/// <param name="input"></param> /// <param name="input"></param>
/// <returns>执行成功返回真</returns> /// <returns>执行成功返回真</returns>
Task<ObjectResultDto<MenBanPrintResultDto>> PrintMenBanPackingList(MenBanPrintInputDto input); //Task<ObjectResultDto<MenBanPrintResultDto>> PrintMenBanPackingList(MenBanPrintInputDto input);
/// <summary> /// <summary>
/// 打印柱护板装箱单 /// 打印柱护板装箱单
/// </summary> /// </summary>
/// <param name="input"></param> /// <param name="input"></param>
/// <returns>执行成功返回真</returns> /// <returns>执行成功返回真</returns>
Task<ObjectResultDto<ZhuHuBanPrintResultDto>> PrintZhuHuBanPackingList(ZhuHuBanPrintInputDto input); //Task<ObjectResultDto<ZhuHuBanPrintResultDto>> PrintZhuHuBanPackingList(ZhuHuBanPrintInputDto input);
#endregion #endregion

96
src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/PrintTable/Dtos/QueryWaitPrintDto.cs

@ -0,0 +1,96 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Text.RegularExpressions;
using Volo.Abp.Application.Dtos;
using WY.NewJit.Common;
using WY.NewJit.MsgCheck;
namespace WY.NewJit.PrintTable.Dtos
{
[Serializable]
public class QueryWaitPrintDto : PagedAndSortedBase
{
/// <summary>
/// 大众顺序号起
/// </summary>
public int? HostSNBegin { get; set; }
/// <summary>
/// 大众顺序号止
/// </summary>
public int? HostSNEnd { get; set; }
/// <summary>
/// KNR起
/// </summary>
public string KNRBegin { get; set; }
/// <summary>
/// KNR止
/// </summary>
public string KNREnd { get; set; }
/// <summary>
/// 底牌号起
/// </summary>
public string VINBegin { get; set; }
/// <summary>
/// 底牌号止
/// </summary>
public string VINEnd { get; set; }
/// <summary>
/// 总成ID
/// </summary>
public Guid? AssemblyID { get; set; }
/// <summary>
/// 上线时间起
/// </summary>
public DateTime? OnlineTimeBegin { get; set; }
/// <summary>
/// 上线时间止
/// </summary>
public DateTime? OnlineTimeEnd { get; set; }
/// <summary>
/// 车型代码(取通用字典)
/// </summary>
public string VehicleModelCode { get; set; }
/// <summary>
/// 生产线(派格按生产线分类)
/// </summary>
public virtual string ProductLine { get; set; }
/// <summary>
/// 接收时间起
/// </summary>
public DateTime? ReceiveTimeBegin { get; set; }
/// <summary>
/// 接收时间止
/// </summary>
public DateTime? ReceiveTimeEnd { get; set; }
/// <summary>
/// 单据状态(0 空;1 未匹配;2 未打印;3 已打印 4 断号)
/// </summary>
public BillStatusEnum? BillStatus { get; set; }
/// <summary>
/// 打印类型: 1 顺序打印 2 补账打印
/// </summary>
public PrintTypeEnum? PrintType { get; set; }
/// <summary>
/// 业务类型:1 门板 2 其它柱护板 3 柱护板
/// </summary>
public BusinessTypeEnum? BusinessType { get; set; }
}
}

14
src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/PrintTable/Dtos/WaitPrintDto.cs

@ -138,5 +138,19 @@ namespace WY.NewJit.PrintTable
[ExporterHeader(DisplayName = "最后修改人")] [ExporterHeader(DisplayName = "最后修改人")]
[ImporterHeader(Name = "最后修改人")] [ImporterHeader(Name = "最后修改人")]
public Guid? LastModifierId { get; set; } public Guid? LastModifierId { get; set; }
/// <summary>
/// R100上线时间
/// </summary>
[ExporterHeader(DisplayName = "R100上线时间")]
[ImporterHeader(Name = "R100上线时间")]
public DateTime R100OnlineTime { get; set; }
/// <summary>
/// R100接收时间
/// </summary>
[ExporterHeader(DisplayName = "R100接收时间")]
[ImporterHeader(Name = "R100接收时间")]
public DateTime? R100ReceiveTime { get; set; }
} }
} }

12
src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/PrintTable/Interfaces/IAlreadyPrintAppService.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
{
public interface IAlreadyPrintAppService
{
}
}

19
src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/PrintTable/Interfaces/IWaitPrintAppService.cs

@ -0,0 +1,19 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace WY.NewJit.PrintTable
{
public interface IWaitPrintAppService
{
/// <summary>
/// 根据生产线获取正常打印单据的起始大众顺序号
/// </summary>
/// <param name="productLine">生产线</param>
/// <returns>起始大众顺序号</returns>
Task<ObjectResultDto<int?>> GetPrintStartHostSN2(string productLine, string isZhuHuBan, string GroupName = null);
}
}

4
src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/WY.NewJit.Application.Contracts.csproj

@ -31,8 +31,4 @@
<PackageReference Include="Volo.Abp.SettingManagement.Application.Contracts" Version="4.3.3" /> <PackageReference Include="Volo.Abp.SettingManagement.Application.Contracts" Version="4.3.3" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Folder Include="PrintTable\Interfaces\" />
</ItemGroup>
</Project> </Project>

145
src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/WY.NewJit.Application.Contracts.xml

@ -186,7 +186,7 @@
</member> </member>
<member name="P:WY.NewJit.Extends.MenBanPrintInputDto.PrintType"> <member name="P:WY.NewJit.Extends.MenBanPrintInputDto.PrintType">
<summary> <summary>
打印类型:提供初次打印、重新打印、针对重新解析后单据的补打功能 打印类型:0 顺序打印 1 补账打印 3 重新打印
</summary> </summary>
</member> </member>
<member name="P:WY.NewJit.Extends.MenBanPrintInputDto.ProductLine"> <member name="P:WY.NewJit.Extends.MenBanPrintInputDto.ProductLine">
@ -206,10 +206,10 @@
</member> </member>
<member name="P:WY.NewJit.Extends.MenBanPrintInputDto.ReportIdList"> <member name="P:WY.NewJit.Extends.MenBanPrintInputDto.ReportIdList">
<summary> <summary>
装箱单主表ID列表,报废时传入一个,重打时可传入多个 重新打印时使用。装箱单主表ID列表,报废时传入一个,重打时可传入多个
</summary> </summary>
</member> </member>
<member name="P:WY.NewJit.Extends.MenBanPrintInputDto.M100IdList"> <member name="P:WY.NewJit.Extends.MenBanPrintInputDto.WaitPrintIdList">
<summary> <summary>
补打时使用 补打时使用
</summary> </summary>
@ -558,11 +558,16 @@
数据结果类型 1 全部数据, 2 选中数据(仅重新打印时使用) 数据结果类型 1 全部数据, 2 选中数据(仅重新打印时使用)
</summary> </summary>
</member> </member>
<member name="P:WY.NewJit.Extends.ZhuHuBanPrintInputDto.M100IdList"> <member name="P:WY.NewJit.Extends.ZhuHuBanPrintInputDto.WaitPrintIdList">
<summary> <summary>
补打时使用 补打时使用
</summary> </summary>
</member> </member>
<member name="P:WY.NewJit.Extends.ZhuHuBanPrintInputDto.GroupName">
<summary>
1 门板 2 其它柱护板 3 柱护板
</summary>
</member>
<member name="P:WY.NewJit.Extends.ZhuHuBanPrintResultDto.MasterList_AC"> <member name="P:WY.NewJit.Extends.ZhuHuBanPrintResultDto.MasterList_AC">
<summary> <summary>
柱护板主实体列表 A上C上 柱护板主实体列表 A上C上
@ -1910,41 +1915,6 @@
<param name="input">导入文件流</param> <param name="input">导入文件流</param>
<returns>执行成功返回真</returns> <returns>执行成功返回真</returns>
</member> </member>
<member name="M:WY.NewJit.MsgCheck.IBillM100AppService.GetPrintStartHostSN2(System.String,System.String,System.String)">
<summary>
根据生产线获取正常打印单据的起始大众顺序号
</summary>
<param name="productLine">生产线</param>
<returns>起始大众顺序号</returns>
</member>
<member name="M:WY.NewJit.MsgCheck.IBillM100AppService.CheckMBHostSNBreakNum(WY.NewJit.Extends.MenBanPrintInputDto)">
<summary>
打印前检查门板大众顺序号是否断号
</summary>
<param name="input"></param>
<returns>断号时Item不为空</returns>
</member>
<member name="M:WY.NewJit.MsgCheck.IBillM100AppService.CheckZHBHostSNBreakNum(WY.NewJit.Extends.ZhuHuBanPrintInputDto)">
<summary>
打印前检查柱护板大众顺序号是否断号
</summary>
<param name="input"></param>
<returns>断号时Item不为空</returns>
</member>
<member name="M:WY.NewJit.MsgCheck.IBillM100AppService.PrintMenBanPackingList(WY.NewJit.Extends.MenBanPrintInputDto)">
<summary>
打印门板装箱单
</summary>
<param name="input"></param>
<returns>执行成功返回真</returns>
</member>
<member name="M:WY.NewJit.MsgCheck.IBillM100AppService.PrintZhuHuBanPackingList(WY.NewJit.Extends.ZhuHuBanPrintInputDto)">
<summary>
打印柱护板装箱单
</summary>
<param name="input"></param>
<returns>执行成功返回真</returns>
</member>
<member name="M:WY.NewJit.MsgCheck.IBillM100AppService.ProductLineTimeoutRemind(WY.NewJit.MsgCheck.TimeOutRemindInputDto)"> <member name="M:WY.NewJit.MsgCheck.IBillM100AppService.ProductLineTimeoutRemind(WY.NewJit.MsgCheck.TimeOutRemindInputDto)">
<summary> <summary>
生产线超时提醒 生产线超时提醒
@ -3522,6 +3492,86 @@
最后修改人 最后修改人
</summary> </summary>
</member> </member>
<member name="P:WY.NewJit.PrintTable.Dtos.QueryWaitPrintDto.HostSNBegin">
<summary>
大众顺序号起
</summary>
</member>
<member name="P:WY.NewJit.PrintTable.Dtos.QueryWaitPrintDto.HostSNEnd">
<summary>
大众顺序号止
</summary>
</member>
<member name="P:WY.NewJit.PrintTable.Dtos.QueryWaitPrintDto.KNRBegin">
<summary>
KNR起
</summary>
</member>
<member name="P:WY.NewJit.PrintTable.Dtos.QueryWaitPrintDto.KNREnd">
<summary>
KNR止
</summary>
</member>
<member name="P:WY.NewJit.PrintTable.Dtos.QueryWaitPrintDto.VINBegin">
<summary>
底牌号起
</summary>
</member>
<member name="P:WY.NewJit.PrintTable.Dtos.QueryWaitPrintDto.VINEnd">
<summary>
底牌号止
</summary>
</member>
<member name="P:WY.NewJit.PrintTable.Dtos.QueryWaitPrintDto.AssemblyID">
<summary>
总成ID
</summary>
</member>
<member name="P:WY.NewJit.PrintTable.Dtos.QueryWaitPrintDto.OnlineTimeBegin">
<summary>
上线时间起
</summary>
</member>
<member name="P:WY.NewJit.PrintTable.Dtos.QueryWaitPrintDto.OnlineTimeEnd">
<summary>
上线时间止
</summary>
</member>
<member name="P:WY.NewJit.PrintTable.Dtos.QueryWaitPrintDto.VehicleModelCode">
<summary>
车型代码(取通用字典)
</summary>
</member>
<member name="P:WY.NewJit.PrintTable.Dtos.QueryWaitPrintDto.ProductLine">
<summary>
生产线(派格按生产线分类)
</summary>
</member>
<member name="P:WY.NewJit.PrintTable.Dtos.QueryWaitPrintDto.ReceiveTimeBegin">
<summary>
接收时间起
</summary>
</member>
<member name="P:WY.NewJit.PrintTable.Dtos.QueryWaitPrintDto.ReceiveTimeEnd">
<summary>
接收时间止
</summary>
</member>
<member name="P:WY.NewJit.PrintTable.Dtos.QueryWaitPrintDto.BillStatus">
<summary>
单据状态(0 空;1 未匹配;2 未打印;3 已打印 4 断号)
</summary>
</member>
<member name="P:WY.NewJit.PrintTable.Dtos.QueryWaitPrintDto.PrintType">
<summary>
打印类型: 1 顺序打印 2 补账打印
</summary>
</member>
<member name="P:WY.NewJit.PrintTable.Dtos.QueryWaitPrintDto.BusinessType">
<summary>
业务类型:1 门板 2 其它柱护板 3 柱护板
</summary>
</member>
<member name="T:WY.NewJit.PrintTable.WaitPrintDto"> <member name="T:WY.NewJit.PrintTable.WaitPrintDto">
<summary> <summary>
零件查询结果DTO 零件查询结果DTO
@ -3617,5 +3667,22 @@
最后修改人 最后修改人
</summary> </summary>
</member> </member>
<member name="P:WY.NewJit.PrintTable.WaitPrintDto.R100OnlineTime">
<summary>
R100上线时间
</summary>
</member>
<member name="P:WY.NewJit.PrintTable.WaitPrintDto.R100ReceiveTime">
<summary>
R100接收时间
</summary>
</member>
<member name="M:WY.NewJit.PrintTable.IWaitPrintAppService.GetPrintStartHostSN2(System.String,System.String,System.String)">
<summary>
根据生产线获取正常打印单据的起始大众顺序号
</summary>
<param name="productLine">生产线</param>
<returns>起始大众顺序号</returns>
</member>
</members> </members>
</doc> </doc>

6229
src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/MsgCheck/BillM100s/BillM100AppService.cs

File diff suppressed because it is too large

8
src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/MsgCheck/BillM100s/ZhuHuBanPackingRecService.cs

@ -55,7 +55,7 @@ namespace Win.Sfs.SettleAccount.FISes
private readonly LineSNDomianService _lineSNDomianServic; private readonly LineSNDomianService _lineSNDomianServic;
private readonly IRepository<FisTB_BILL_SCRAP> _tbBillScrapRepository; private readonly IRepository<FisTB_BILL_SCRAP> _tbBillScrapRepository;
private readonly IRepository<ZHBPrintStatus, Guid> _zHBPrintStatusRepository; //private readonly IRepository<ZHBPrintStatus, Guid> _zHBPrintStatusRepository;
private readonly IRepository<PrintTemplateConfiguration, Guid> _printTemplateConfigurationRepository; private readonly IRepository<PrintTemplateConfiguration, Guid> _printTemplateConfigurationRepository;
/// <summary> /// <summary>
@ -67,7 +67,7 @@ namespace Win.Sfs.SettleAccount.FISes
WMSDapperRepository wmsRepository, WMSDapperRepository wmsRepository,
LineSNDomianService lineSNDomianServic, LineSNDomianService lineSNDomianServic,
IRepository<FisTB_BILL_SCRAP> tbBillScrapRepository, IRepository<FisTB_BILL_SCRAP> tbBillScrapRepository,
IRepository<ZHBPrintStatus, Guid> zHBPrintStatusRepository, //IRepository<ZHBPrintStatus, Guid> zHBPrintStatusRepository,
IRepository<PrintTemplateConfiguration, Guid> printTemplateConfigurationRepository IRepository<PrintTemplateConfiguration, Guid> printTemplateConfigurationRepository
) )
@ -77,7 +77,7 @@ namespace Win.Sfs.SettleAccount.FISes
_billM100Repository = billM100Repository; _billM100Repository = billM100Repository;
_lineSNDomianServic = lineSNDomianServic; _lineSNDomianServic = lineSNDomianServic;
_tbBillScrapRepository = tbBillScrapRepository; _tbBillScrapRepository = tbBillScrapRepository;
_zHBPrintStatusRepository = zHBPrintStatusRepository; //_zHBPrintStatusRepository = zHBPrintStatusRepository;
_printTemplateConfigurationRepository = printTemplateConfigurationRepository; _printTemplateConfigurationRepository = printTemplateConfigurationRepository;
} }
@ -366,7 +366,7 @@ namespace Win.Sfs.SettleAccount.FISes
var types = await _ZhuHuBanPackingListRepository.Where(p => idList.Contains(p.Id)).Select(p => p.PartType).Distinct().ToListAsync(); var types = await _ZhuHuBanPackingListRepository.Where(p => idList.Contains(p.Id)).Select(p => p.PartType).Distinct().ToListAsync();
var groupName = await _printTemplateConfigurationRepository.FirstOrDefaultAsync(r => types.Contains(r.PartType)); var groupName = await _printTemplateConfigurationRepository.FirstOrDefaultAsync(r => types.Contains(r.PartType));
var vins = _childList.Select(p => p.VIN).Distinct().ToList(); var vins = _childList.Select(p => p.VIN).Distinct().ToList();
await _zHBPrintStatusRepository.DeleteAsync(r => vins.Contains(r.VIN) && r.GroupName == groupName.GroupName); //await _zHBPrintStatusRepository.DeleteAsync(r => vins.Contains(r.VIN) && r.GroupName == groupName.GroupName);
} }
else else
{ {

3
src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/PrintTable/AlreadyPrintAppService.cs

@ -3,10 +3,11 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using Volo.Abp.Application.Services;
namespace WY.NewJit.PrintTable namespace WY.NewJit.PrintTable
{ {
internal class AlreadyPrintAppService public class AlreadyPrintAppService : ApplicationService, IAlreadyPrintAppService
{ {
} }
} }

1055
src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/PrintTable/WaitPrintAppService.cs

File diff suppressed because it is too large

1096
src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/PrintTable/WaitPrintAppService_ZHB.cs

File diff suppressed because it is too large

1
src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain.Shared/Common/SwaggerGroupConsts.cs

@ -12,6 +12,7 @@ namespace WY.NewJit.Common
public const string = "报文解析及校验"; public const string = "报文解析及校验";
public const string = "基础数据"; public const string = "基础数据";
public const string = "扩展"; public const string = "扩展";
public const string = "报文打印";
} }
} }

4
src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain.Shared/Extends/PaiGe/PrintTypeEnum.cs

@ -7,8 +7,8 @@ namespace WY.NewJit.Extends.PaiGe
public enum PrintTypeEnum public enum PrintTypeEnum
{ {
, ,
, ,
} }
public enum ReportStatusEnum public enum ReportStatusEnum

48
src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/MsgCheck/Entitys/ZHBPrintStatus.cs

@ -10,31 +10,31 @@ namespace WY.NewJit.MsgCheck
/// <summary> /// <summary>
///打印模板状态表 ///打印模板状态表
/// </summary> /// </summary>
public class ZHBPrintStatus : AuditedAggregateRoot<Guid> //public class ZHBPrintStatus : AuditedAggregateRoot<Guid>
{ //{
public ZHBPrintStatus() // public ZHBPrintStatus()
{ // {
} // }
public ZHBPrintStatus(Guid id, string vIN, string groupName, int billStatus) : base(id) // public ZHBPrintStatus(Guid id, string vIN, string groupName, int billStatus) : base(id)
{ // {
VIN = vIN; // VIN = vIN;
GroupName = groupName; // GroupName = groupName;
BillStatus = billStatus; // BillStatus = billStatus;
} // }
/// <summary> // /// <summary>
/// 地盘号 // /// 地盘号
/// </summary> // /// </summary>
public virtual string VIN { get; set; } // public virtual string VIN { get; set; }
/// <summary> // /// <summary>
/// 组类别 // /// 组类别
/// </summary> // /// </summary>
public virtual string GroupName { get; set; } // public virtual string GroupName { get; set; }
/// <summary> // /// <summary>
/// 状态 // /// 状态
/// </summary> // /// </summary>
public virtual int BillStatus { get; set; } // public virtual int BillStatus { get; set; }
} //}
} }

27
src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/MsgCheck/Services/M100DomainService.cs

@ -49,9 +49,9 @@ namespace WY.NewJit.MsgCheck
BillNumberRecord billNumRec = await _billNumRecDomainSrv.GetBillNumber(m100Obj.HostSN.TryToIntNotNull(), m100Obj.ProductLine); BillNumberRecord billNumRec = await _billNumRecDomainSrv.GetBillNumber(m100Obj.HostSN.TryToIntNotNull(), m100Obj.ProductLine);
var normalObj = billNumRec.Datas.FirstOrDefault(itm => itm.BillNumberType == BillNumberTypeEnum.); var normalObj = billNumRec.Datas.FirstOrDefault(itm => itm.BillNumberType == BillNumberTypeEnum.);
var lateObj = billNumRec.Datas.FirstOrDefault(itm => itm.BillNumberType == BillNumberTypeEnum.); var lateObj = billNumRec.Datas.FirstOrDefault(itm => itm.BillNumberType == BillNumberTypeEnum.);
var breaknumLst = billNumRec.Datas.Where(itm => itm.BillNumberType == BillNumberTypeEnum.).ToList(); var breakNumLst = billNumRec.Datas.Where(itm => itm.BillNumberType == BillNumberTypeEnum.).ToList();
//更新M100 //更新M100
m100Obj.HostSN2 = normalObj.HostSN2.TryToInt(); m100Obj.HostSN2 = normalObj != null ? normalObj.HostSN2 : lateObj.HostSN2;
//M100转换成WaitPrint:一个底盘、08产线插入3条记录,其它产线插入1条记录 //M100转换成WaitPrint:一个底盘、08产线插入3条记录,其它产线插入1条记录
WaitPrint[] wpArr; WaitPrint[] wpArr;
if (m100Obj.ProductLine == "08") if (m100Obj.ProductLine == "08")
@ -68,19 +68,19 @@ namespace WY.NewJit.MsgCheck
} }
//处理断号 //处理断号
if (breaknumLst.Count > 0) if (breakNumLst.Count > 0)
{ {
List<WaitPrint> breakNumLst = new List<WaitPrint>(); List<WaitPrint> waitPrintBreakNumLst = new List<WaitPrint>();
foreach (var sourceWaitPrint in wpArr) foreach (var sourceWaitPrint in wpArr) //遍历门板、柱护板、其它柱护板
{ {
foreach (var breaknum in breaknumLst) foreach (var breaknum in breakNumLst) //遍历断号
{ {
WaitPrint targetWaitPrint = new WaitPrint(GuidGenerator.Create()); WaitPrint targetWaitPrint = new WaitPrint(GuidGenerator.Create());
targetWaitPrint.M100Id = Guid.Parse("00000000-0000-0000-0000-000000000000"); targetWaitPrint.M100Id = Guid.Parse("00000000-0000-0000-0000-000000000000");
targetWaitPrint.BusinessType = sourceWaitPrint.BusinessType; targetWaitPrint.BusinessType = sourceWaitPrint.BusinessType;
targetWaitPrint.ProductLine = sourceWaitPrint.ProductLine; targetWaitPrint.ProductLine = sourceWaitPrint.ProductLine;
targetWaitPrint.OnlineTime = sourceWaitPrint.OnlineTime; targetWaitPrint.OnlineTime = sourceWaitPrint.OnlineTime;
targetWaitPrint.HostSN = breaknum.ToString().Right(5).TryToIntZero(); targetWaitPrint.HostSN = breaknum.HostSN;
targetWaitPrint.KNR = null; targetWaitPrint.KNR = null;
targetWaitPrint.VIN = null; targetWaitPrint.VIN = null;
targetWaitPrint.VehicleModelCode = null; targetWaitPrint.VehicleModelCode = null;
@ -94,10 +94,10 @@ namespace WY.NewJit.MsgCheck
targetWaitPrint.CreatorId = null; targetWaitPrint.CreatorId = null;
targetWaitPrint.LastModificationTime = null; targetWaitPrint.LastModificationTime = null;
targetWaitPrint.LastModifierId = null; targetWaitPrint.LastModifierId = null;
breakNumLst.Add(targetWaitPrint); waitPrintBreakNumLst.Add(targetWaitPrint);
} }
} }
await _waitPrintRepository.InsertManyAsync(breakNumLst, autoSave); //插入断号 await _waitPrintRepository.InsertManyAsync(waitPrintBreakNumLst, autoSave); //插入断号
} }
//处理正常、迟到 //处理正常、迟到
BillM100 m100Ret = null; BillM100 m100Ret = null;
@ -110,7 +110,7 @@ namespace WY.NewJit.MsgCheck
{ {
m100Ret = await _billM100Repository.InsertAsync(m100Obj, autoSave); //插入M100 m100Ret = await _billM100Repository.InsertAsync(m100Obj, autoSave); //插入M100
foreach (var item in wpArr) foreach (var item in wpArr) //遍历门板、柱护板、其它柱护板
{ {
var insObj = await _waitPrintRepository.FirstOrDefaultAsync(itm => var insObj = await _waitPrintRepository.FirstOrDefaultAsync(itm =>
itm.HostSN2 == m100Obj.HostSN2 itm.HostSN2 == m100Obj.HostSN2
@ -125,6 +125,7 @@ namespace WY.NewJit.MsgCheck
else else
{ {
//如果未打印表没有----对应断号记录,则插入 //如果未打印表没有----对应断号记录,则插入
item.PrintType = PrintTypeEnum.ReplenishPrint;
var insertRet = await _waitPrintRepository.InsertAsync(item, autoSave); var insertRet = await _waitPrintRepository.InsertAsync(item, autoSave);
} }
} }
@ -213,5 +214,11 @@ namespace WY.NewJit.MsgCheck
targetWaitPrint.LastModifierId = sourceWaitPrint.LastModifierId; targetWaitPrint.LastModifierId = sourceWaitPrint.LastModifierId;
} }
public async Task<Dictionary<Guid, List<BillM100Part>>> GetM100PartDic(List<Guid> m100IdLst)
{
List<BillM100> m100Lst = await _billM100Repository.GetListAsync(itm => m100IdLst.Contains(itm.Id), true);
Dictionary<Guid, List<BillM100Part>> ret = m100Lst.ToDictionary(itm => itm.Id, itm2 => itm2.BillM100Parts);
return ret;
}
} }
} }

17
src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/PrintTable/Entitys/LastPrintHostSN.cs

@ -0,0 +1,17 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Volo.Abp.Domain.Entities;
namespace WY.NewJit.PrintTable
{
public class LastPrintHostSN : Entity<Guid>
{
public string ProductLineCode { get; set; }
public int HostSN { get; set; }
}
}

2
src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.EntityFrameworkCore/EntityFrameworkCore/NewJitDbContext.cs

@ -62,7 +62,7 @@ namespace WY.NewJit.EntityFrameworkCore
#region 报文解析及校验 #region 报文解析及校验
public DbSet<ZHBPrintStatus> ZHBPrintStatus { get; set; } //public DbSet<ZHBPrintStatus> ZHBPrintStatus { get; set; }
public DbSet<BillM100> BillM100s { get; set; } public DbSet<BillM100> BillM100s { get; set; }
public DbSet<BillM100Part> BillM100Parts { get; set; } public DbSet<BillM100Part> BillM100Parts { get; set; }
public DbSet<BillM110> BillM110s { get; set; } public DbSet<BillM110> BillM110s { get; set; }

14
src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.EntityFrameworkCore/EntityFrameworkCore/NewJitDbContextModelCreatingExtensions.cs

@ -176,13 +176,13 @@ namespace WY.NewJit.EntityFrameworkCore
}); });
builder.Entity<ZHBPrintStatus>(b => { //builder.Entity<ZHBPrintStatus>(b => {
b.ToTable(NewJitConsts.DbTablePrefix + nameof(ZHBPrintStatus)); // b.ToTable(NewJitConsts.DbTablePrefix + nameof(ZHBPrintStatus));
b.ConfigureByConvention(); // b.ConfigureByConvention();
b.Property(itm => itm.GroupName).HasColumnType("varchar").HasMaxLength(50); // b.Property(itm => itm.GroupName).HasColumnType("varchar").HasMaxLength(50);
b.Property(itm => itm.VIN).HasColumnType("varchar").HasMaxLength(50); // b.Property(itm => itm.VIN).HasColumnType("varchar").HasMaxLength(50);
b.HasIndex(x => new { x.GroupName, x.VIN }).IsUnique(); // b.HasIndex(x => new { x.GroupName, x.VIN }).IsUnique();
}); //});
builder.Entity<BillM100>(b => builder.Entity<BillM100>(b =>

Loading…
Cancel
Save