49 changed files with 27180 additions and 244 deletions
@ -0,0 +1,39 @@ |
|||
using Magicodes.ExporterAndImporter.Core; |
|||
using Magicodes.ExporterAndImporter.Excel; |
|||
using System; |
|||
using System.Collections.Generic; |
|||
using System.ComponentModel.DataAnnotations; |
|||
using System.Text; |
|||
|
|||
namespace WY.NewJit.MsgBaseData |
|||
{ |
|||
/// <summary>
|
|||
/// 总成组
|
|||
/// </summary>
|
|||
[ExcelExporter(Name = "总成组表", AutoFitAllColumn = true, MaxRowNumberOnASheet = 50000)] //一个Sheet最大允许的行数，设置了之后将输出多个Sheet
|
|||
[Serializable] |
|||
public class ImportErpAssemblyGroupDto |
|||
{ |
|||
/// <summary>
|
|||
/// 规格说明
|
|||
/// </summary>
|
|||
[ExporterHeader(DisplayName = "规格说明")] |
|||
[ImporterHeader(Name = "规格说明")] |
|||
[Required(ErrorMessage = "{0}是必填项")] |
|||
public virtual string SpecExplain { get; set; } |
|||
/// <summary>
|
|||
/// 颜色说明
|
|||
/// </summary>
|
|||
[ExporterHeader(DisplayName = "颜色说明")] |
|||
[ImporterHeader(Name = "颜色说明")] |
|||
[Required(ErrorMessage = "{0}是必填项")] |
|||
public virtual string ColorExplain { get; set; } |
|||
/// <summary>
|
|||
/// 物料号
|
|||
/// </summary>
|
|||
[ExporterHeader(DisplayName = "物料号")] |
|||
[ImporterHeader(Name = "物料号")] |
|||
[Required(ErrorMessage = "{0}是必填项")] |
|||
public virtual string MaterialNum { get; set; } |
|||
} |
|||
} |
|||
@ -0,0 +1,26 @@ |
|||
using System; |
|||
using System.Collections.Generic; |
|||
using System.Text; |
|||
|
|||
namespace WY.NewJit.MsgBaseData |
|||
{ |
|||
public class BaseConfigCreateDto |
|||
{ |
|||
/// <summary>
|
|||
/// 参数名称
|
|||
/// </summary>
|
|||
public virtual string ParamName { get; set; } |
|||
/// <summary>
|
|||
/// 参数值
|
|||
/// </summary>
|
|||
public virtual string ParamValue { get; set; } |
|||
/// <summary>
|
|||
/// 状态
|
|||
/// </summary>
|
|||
public virtual bool State { get; set; } |
|||
/// <summary>
|
|||
/// 备注
|
|||
/// </summary>
|
|||
public virtual string Remark { get; set; } |
|||
} |
|||
} |
|||
@ -0,0 +1,27 @@ |
|||
using System; |
|||
using System.Collections.Generic; |
|||
using System.Text; |
|||
using WY.NewJit.Common; |
|||
|
|||
namespace WY.NewJit.MsgBaseData |
|||
{ |
|||
public class QueryBaseConfigDto : PagedAndSortedBase |
|||
{ |
|||
/// <summary>
|
|||
/// 参数名称
|
|||
/// </summary>
|
|||
public virtual string ParamName { get; set; } |
|||
/// <summary>
|
|||
/// 参数值
|
|||
/// </summary>
|
|||
public virtual string ParamValue { get; set; } |
|||
/// <summary>
|
|||
/// 状态
|
|||
/// </summary>
|
|||
public virtual List<bool> State { get; set; } = new List<bool>(); |
|||
/// <summary>
|
|||
/// 备注
|
|||
/// </summary>
|
|||
public virtual string Remark { get; set; } |
|||
} |
|||
} |
|||
@ -0,0 +1,14 @@ |
|||
using System; |
|||
using System.Threading.Tasks; |
|||
using Volo.Abp.Application.Dtos; |
|||
|
|||
namespace WY.NewJit.MsgBaseData |
|||
{ |
|||
public interface IBaseGonfigService |
|||
{ |
|||
Task<ObjectResultDto<Guid>> CreateAsync(BaseConfigCreateDto input); |
|||
Task<ObjectResultDto> DeleteAsync(string id); |
|||
Task<PagedResultDto<BaseConfigDto>> GetListAsync(QueryBaseConfigDto input); |
|||
Task<ObjectResultDto> UpdateAsync(Guid id, BaseConfigCreateDto input); |
|||
} |
|||
} |
|||
@ -0,0 +1,49 @@ |
|||
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.MsgBaseData |
|||
{ |
|||
[ExcelExporter(Name = "物料信息", AutoFitAllColumn = true, MaxRowNumberOnASheet = 1000)] //一个Sheet最大允许的行数，设置了之后将输出多个Sheet
|
|||
[Serializable] |
|||
public class MaterialExtDto : AuditedEntityDto<Guid> |
|||
{ |
|||
/// <summary>
|
|||
/// SAP物料号
|
|||
/// </summary>
|
|||
[ExporterHeader(DisplayName = "SAP物料号")] |
|||
[ImporterHeader(Name = "SAP物料号")] |
|||
public string MaterialNum { get; set; } |
|||
|
|||
/// <summary>
|
|||
/// 物料描述（大小量纲、物料描述字段值同时存在时，优先显示大小量纲）
|
|||
/// </summary>
|
|||
[ExporterHeader(DisplayName = "物料描述")] |
|||
[ImporterHeader(Name = "物料描述")] |
|||
public string MaterialDescription { get; set; } |
|||
|
|||
/// <summary>
|
|||
/// 大小量纲（大小量纲、物料描述字段值同时存在时，优先显示大小量纲）
|
|||
/// </summary>
|
|||
[ExporterHeader(DisplayName = "大小量纲")] |
|||
[ImporterHeader(Name = "大小量纲")] |
|||
public string MaterialDescription2 { get; set; } |
|||
|
|||
/// <summary>
|
|||
/// 补充备注(车型、门板代码)
|
|||
/// </summary>
|
|||
[ExporterHeader(DisplayName = "补充备注")] |
|||
[ImporterHeader(Name = "补充备注")] |
|||
public string MaterialMemo { get; set; } |
|||
|
|||
/// <summary>
|
|||
/// 物料组：例如 门板成品-C8
|
|||
/// </summary>
|
|||
[ExporterHeader(DisplayName = "物料组")] |
|||
[ImporterHeader(Name = "物料组")] |
|||
public string MaterialGroup { get; set; } |
|||
} |
|||
} |
|||
@ -0,0 +1,30 @@ |
|||
using System; |
|||
using System.Collections.Generic; |
|||
using System.Text; |
|||
using WY.NewJit.Common; |
|||
|
|||
namespace WY.NewJit.MsgBaseData |
|||
{ |
|||
[Serializable] |
|||
public class QueryMaterialExtDto : PagedAndSortedBase |
|||
{ |
|||
/// <summary>
|
|||
/// SAP物料号
|
|||
/// </summary>
|
|||
public string MaterialNum { get; set; } |
|||
|
|||
/// <summary>
|
|||
/// 物料描述（大小量纲、物料描述字段值同时存在时，优先显示大小量纲）
|
|||
/// </summary>
|
|||
public string MaterialDescription { get; set; } |
|||
|
|||
/// <summary>
|
|||
/// 物料组：例如 门板成品-C8
|
|||
/// </summary>
|
|||
public string MaterialGroup { get; set; } |
|||
/// <summary>
|
|||
/// 物料类型 0 空 1 控制件 2 柱护板 3 门板
|
|||
/// </summary>
|
|||
public string MaterialType { get; set; } |
|||
} |
|||
} |
|||
@ -0,0 +1,11 @@ |
|||
using System.Threading.Tasks; |
|||
using Volo.Abp.Application.Dtos; |
|||
|
|||
namespace WY.NewJit.MsgBaseData |
|||
{ |
|||
public interface IMaterialExtAppService |
|||
{ |
|||
Task<ObjectResultDto<string>> ExportAsync(QueryMaterialExtDto input); |
|||
Task<PagedResultDto<MaterialExtDto>> GetListAsync(QueryMaterialExtDto input); |
|||
} |
|||
} |
|||
@ -0,0 +1,11 @@ |
|||
using System.Threading.Tasks; |
|||
using Volo.Abp.Application.Dtos; |
|||
|
|||
namespace WY.NewJit.MsgBaseData |
|||
{ |
|||
public interface IMaterialExtAppService |
|||
{ |
|||
Task<ObjectResultDto<string>> ExportAsync(QueryMaterialExtDto input); |
|||
Task<PagedResultDto<MaterialExtDto>> GetListAsync(QueryMaterialExtDto input); |
|||
} |
|||
} |
|||
@ -0,0 +1,161 @@ |
|||
using Magicodes.ExporterAndImporter.Core; |
|||
using Magicodes.ExporterAndImporter.Excel; |
|||
using Microsoft.AspNetCore.Mvc; |
|||
using Microsoft.EntityFrameworkCore; |
|||
using Microsoft.Extensions.Logging; |
|||
using Shouldly; |
|||
using System; |
|||
using System.Collections.Generic; |
|||
using System.Linq; |
|||
using System.Linq.Dynamic.Core; |
|||
using System.Text; |
|||
using System.Threading.Tasks; |
|||
using Volo.Abp.Application.Dtos; |
|||
using Volo.Abp.Application.Services; |
|||
using Volo.Abp.BlobStoring; |
|||
using Volo.Abp.Domain.Repositories; |
|||
using Volo.Abp.Uow; |
|||
using WY.NewJit.Common; |
|||
using WY.NewJit.Extends.PaiGe; |
|||
|
|||
namespace WY.NewJit.MsgBaseData |
|||
{ |
|||
[Route("api/newjit/material")] |
|||
[ApiExplorerSettings(GroupName = SwaggerGroupConsts.基础数据)] |
|||
public class MaterialExtAppService : ApplicationService, IMaterialExtAppService |
|||
{ |
|||
private readonly IRepository<MaterialExt, Guid> _materialExtRepository; |
|||
private ILogger<MaterialExtAppService> _logger; |
|||
/// <summary>
|
|||
/// BLOB存储
|
|||
/// </summary>
|
|||
private readonly IBlobContainer<OurFileContainer> _blobContainer; |
|||
|
|||
/// <summary>
|
|||
/// 错误信息前缀
|
|||
/// </summary>
|
|||
private string _errorMessagePrefix |
|||
{ |
|||
get |
|||
{ |
|||
return System.Reflection.MethodBase.GetCurrentMethod().DeclaringType.Name + "."; |
|||
} |
|||
} |
|||
public MaterialExtAppService(IRepository<MaterialExt, Guid> materialExtRepository, ILogger<MaterialExtAppService> logger, IBlobContainer<OurFileContainer> blobContainer) |
|||
{ |
|||
_materialExtRepository = materialExtRepository; |
|||
_logger = logger; |
|||
_blobContainer = blobContainer; |
|||
} |
|||
/// <summary>
|
|||
/// 获取数据
|
|||
/// </summary>
|
|||
/// <param name="input"></param>
|
|||
/// <returns></returns>
|
|||
[HttpGet] |
|||
[UnitOfWork(false)] |
|||
[Route("list")] |
|||
public virtual async Task<PagedResultDto<MaterialExtDto>> GetListAsync(QueryMaterialExtDto input) |
|||
{ |
|||
_logger.LogDebug(_errorMessagePrefix + "GetListAsync 进入"); |
|||
try |
|||
{ |
|||
var page = (PagedAndSortedBase)input; |
|||
IQueryable<MaterialExt> qry1 = QueryByCondition(input); |
|||
if (string.IsNullOrEmpty(page.Sorting)) |
|||
{ |
|||
page.Sorting = "MaterialNum"; |
|||
} |
|||
|
|||
int totalCount = await qry1.CountAsync(); //返回总记录数而不是当前页记录数
|
|||
if (totalCount == 0) |
|||
{ |
|||
return new PagedResultDto<MaterialExtDto>(0, new List<MaterialExtDto>()); |
|||
} |
|||
|
|||
var query = qry1 |
|||
.OrderBy(page.Sorting) |
|||
.Skip(page.SkipCount) |
|||
.Take(page.MaxResultCount); |
|||
|
|||
List<MaterialExt> lst = await query.ToListAsync(); |
|||
|
|||
List<MaterialExtDto> items = |
|||
ObjectMapper.Map<List<MaterialExt>, List<MaterialExtDto>>(lst); |
|||
|
|||
return new PagedResultDto<MaterialExtDto>(totalCount, items); |
|||
} |
|||
catch (Exception ex) |
|||
{ |
|||
string errMsg = _errorMessagePrefix + "GetListAsync 执行出错：" + ex.Message; |
|||
_logger.LogError(errMsg); |
|||
return new PagedResultDto<MaterialExtDto>(0, new List<MaterialExtDto>()); |
|||
} |
|||
} |
|||
/// <summary>
|
|||
/// 导出信息
|
|||
/// </summary>
|
|||
/// <param name="input">导出查询条件</param>
|
|||
/// <returns>执行成功返回真</returns>
|
|||
[UnitOfWork(false)] |
|||
[HttpPost] |
|||
[Route("export")] |
|||
public virtual async Task<ObjectResultDto<string>> ExportAsync(QueryMaterialExtDto input) |
|||
{ |
|||
_logger.LogDebug(_errorMessagePrefix + "ExportAsync 进入"); |
|||
ObjectResultDto<string> ret = new ObjectResultDto<string>(); |
|||
try |
|||
{ |
|||
IQueryable<MaterialExt> query = QueryByCondition(input); |
|||
List<MaterialExt> lst = await query.ToListAsync(); |
|||
List<MaterialExtDto> items = |
|||
ObjectMapper.Map<List<MaterialExt>, List<MaterialExtDto>>(lst); |
|||
//将实体列表转换成excel文件流
|
|||
IExporter exporter = new ExcelExporter(); |
|||
byte[] byteArr = await exporter.ExportAsByteArray<MaterialExtDto>(items); |
|||
byteArr.ShouldNotBeNull(); |
|||
//将excel文件流保存到服务器端文件系统
|
|||
string fileName = string.Format("物料信息_{0}.xlsx", Guid.NewGuid().ToString()); |
|||
await _blobContainer.SaveAsync(fileName, byteArr); |
|||
|
|||
ret.Item = fileName; |
|||
return ret; |
|||
} |
|||
catch (Exception ex) |
|||
{ |
|||
ret.Status = false; |
|||
ret.Message = _errorMessagePrefix + "ExportAsync 执行出错：" + ex.Message; |
|||
_logger.LogError(ret.Message); |
|||
return ret; |
|||
} |
|||
} |
|||
#region 私有方法
|
|||
/// <summary>
|
|||
/// 根据筛选条件获取实体列表
|
|||
/// </summary>
|
|||
/// <param name="input"></param>
|
|||
/// <returns></returns>
|
|||
private IQueryable<MaterialExt> QueryByCondition(QueryMaterialExtDto input) |
|||
{ |
|||
IQueryable<MaterialExt> ret = _materialExtRepository.Where(itm => 1 == 1); |
|||
if (!string.IsNullOrEmpty(input.MaterialNum)) |
|||
{ |
|||
ret = ret.Where(itm => itm.MaterialNum.Contains(input.MaterialNum)); |
|||
} |
|||
if (!string.IsNullOrEmpty(input.MaterialDescription)) |
|||
{ |
|||
ret = ret.Where(itm => itm.MaterialDescription.Contains(input.MaterialDescription)); |
|||
} |
|||
if (!string.IsNullOrEmpty(input.MaterialGroup)) |
|||
{ |
|||
ret = ret.Where(itm => itm.MaterialGroup == input.MaterialGroup); |
|||
} |
|||
if (!string.IsNullOrEmpty(input.MaterialType)) |
|||
{ |
|||
ret = ret.Where(itm => itm.MaterialType == input.MaterialType); |
|||
} |
|||
return ret; |
|||
} |
|||
#endregion
|
|||
} |
|||
} |
|||
@ -0,0 +1,460 @@ |
|||
using Microsoft.EntityFrameworkCore; |
|||
using Microsoft.Extensions.Logging; |
|||
using System; |
|||
using System.Collections.Generic; |
|||
using System.Linq; |
|||
using System.Text; |
|||
using System.Threading.Tasks; |
|||
using Volo.Abp; |
|||
using Volo.Abp.Domain.Repositories; |
|||
using Volo.Abp.Domain.Services; |
|||
using WY.NewJit.EdiReceive.Entitys; |
|||
using WY.NewJit.IRepositories; |
|||
using WY.NewJit.MsgBaseData; |
|||
using WY.NewJit.MsgCheck; |
|||
using WY.NewJit.Common; |
|||
using WY.NewJit.MsgBaseData.Entitys; |
|||
|
|||
namespace WY.NewJit.EdiReceive.Services |
|||
{ |
|||
/// <summary>
|
|||
/// 红旗报文接收
|
|||
/// </summary>
|
|||
public class EdiParseDomainService : DomainService |
|||
{ |
|||
#region 成员
|
|||
/// <summary>
|
|||
/// 日志
|
|||
/// </summary>
|
|||
private readonly ILogger<EdiParseDomainService> _logger; |
|||
|
|||
/// <summary>
|
|||
/// Dapper仓储
|
|||
/// </summary>
|
|||
private readonly INewJitDapperRepository _newJitDapperRepository; |
|||
|
|||
/// <summary>
|
|||
/// 字典领域服务
|
|||
/// </summary>
|
|||
private readonly DicDomainService _dicDomainService; |
|||
|
|||
/// <summary>
|
|||
/// 导入记录仓储
|
|||
/// </summary>
|
|||
private readonly IRepository<ImportRecord, Guid> _importRecordRepository; |
|||
|
|||
/// <summary>
|
|||
/// M100单据
|
|||
/// </summary>
|
|||
private readonly IRepository<BillM100, Guid> _billM100Repository; |
|||
|
|||
/// <summary>
|
|||
/// ERP总成分组仓库
|
|||
/// </summary>
|
|||
//private readonly IRepository<AssemblyCfgGroup, Guid> _assemblyCfgGroupRepository;
|
|||
|
|||
/// <summary>
|
|||
/// ERP总成仓储
|
|||
/// </summary>
|
|||
//private readonly IRepository<AssemblyCfgErp, Guid> _assemblyCfgErpRepository;
|
|||
|
|||
/// <summary>
|
|||
/// 整车总成配置仓库
|
|||
/// </summary>
|
|||
private readonly IRepository<AssemblyCfgVehicle, Guid> _assemblyCfgVehicleRepository; |
|||
|
|||
/// <summary>
|
|||
/// 导入最大流水号 领域服务
|
|||
/// </summary>
|
|||
private readonly LastImportHostSNDomainService _lastImportHostSNDomainService; |
|||
|
|||
/// <summary>
|
|||
/// 缓存管理 领域服务
|
|||
/// </summary>
|
|||
private readonly HQ_CacheManagerDomainService _hqCacheManagerDomainService; |
|||
|
|||
/// <summary>
|
|||
/// 插入M100、未打印表 领域服务
|
|||
/// </summary>
|
|||
private readonly HQ_M100DomainService _hqM100DomainServie; |
|||
|
|||
/// <summary>
|
|||
/// 重复报文仓库
|
|||
/// </summary>
|
|||
private readonly IRepository<RepeatM100, Guid> _repeatM100Repository; |
|||
|
|||
/// <summary>
|
|||
/// 未知总成仓库
|
|||
/// </summary>
|
|||
private readonly IRepository<UnknownAssembly, Guid> _unknownAssemblyRepository; |
|||
|
|||
|
|||
/// <summary>
|
|||
/// 报文车型对应零件生产工厂车型
|
|||
/// </summary>
|
|||
//private static List<DicItem> _msgToPaiGeVehicleModelList = new List<DicItem>();
|
|||
|
|||
/// <summary>
|
|||
/// M100零件生产工厂车型对应生产线
|
|||
/// </summary>
|
|||
//private static List<DicItem> _m100VehicleModelProductLineList = new List<DicItem>();
|
|||
|
|||
/// <summary>
|
|||
/// 根据车型代码中的前两位（HS），过滤属于派格的订单；只针对派格的订单进行报文解析
|
|||
/// </summary>
|
|||
private const string _vehicleModelPrefix = "HS"; |
|||
|
|||
/// <summary>
|
|||
/// 错误信息前缀
|
|||
/// </summary>
|
|||
private string _errorMessagePrefix |
|||
{ |
|||
get |
|||
{ |
|||
return System.Reflection.MethodBase.GetCurrentMethod().DeclaringType.Name + "."; |
|||
} |
|||
} |
|||
|
|||
|
|||
#endregion
|
|||
public EdiParseDomainService(ILogger<EdiParseDomainService> logger, INewJitDapperRepository newJitDapperRepository, DicDomainService dicDomainService, IRepository<ImportRecord, Guid> importRecordRepository, IRepository<BillM100, Guid> billM100Repository, LastImportHostSNDomainService lastImportHostSNDomainService, IRepository<AssemblyCfgGroup, Guid> assemblyCfgGroupRepository = null, IRepository<AssemblyCfgErp, Guid> assemblyCfgErpRepository = null, IRepository<AssemblyCfgVehicle, Guid> assemblyCfgVehicleRepository = null, HQ_CacheManagerDomainService hqCacheManagerDomainService = null, HQ_M100DomainService hqM100DomainServie = null, IRepository<RepeatM100, Guid> repeatM100Repository = null, IRepository<UnknownAssembly, Guid> unknownAssemblyRepository = null) |
|||
{ |
|||
_logger = logger; |
|||
_newJitDapperRepository = newJitDapperRepository; |
|||
_dicDomainService = dicDomainService; |
|||
_importRecordRepository = importRecordRepository; |
|||
_billM100Repository = billM100Repository; |
|||
_lastImportHostSNDomainService = lastImportHostSNDomainService; |
|||
|
|||
//_msgToPaiGeVehicleModelList = _dicDomainService.GetDicItems(DicTypeName.报文车型对应派格车型);
|
|||
//_m100VehicleModelProductLineList = _dicDomainService.GetDicItems(DicTypeName.M100派格车型对应生产线);
|
|||
//_assemblyCfgGroupRepository = assemblyCfgGroupRepository;
|
|||
//_assemblyCfgErpRepository = assemblyCfgErpRepository;
|
|||
_assemblyCfgVehicleRepository = assemblyCfgVehicleRepository; |
|||
_hqCacheManagerDomainService = hqCacheManagerDomainService; |
|||
_hqM100DomainServie = hqM100DomainServie; |
|||
_repeatM100Repository = repeatM100Repository; |
|||
_unknownAssemblyRepository = unknownAssemblyRepository; |
|||
} |
|||
|
|||
/// <summary>
|
|||
/// 解析报文
|
|||
/// 一、导入记录表
|
|||
/// 1. 从客户网站导出EXCEL格式的订单列表
|
|||
/// 2. 校验 本次导入的最小HostSN必须<= 上次导入的最大HostSN + 1 （上次是10， 本次可以是 9 10 11，不能是12）
|
|||
/// 3. 根据VIN和HostSN，扣除重复导入的记录
|
|||
/// 4. 断号提醒：导入Excel时，如果系统中的流水号不能顺序连接，需要给出提醒，是否继续导入，如果选择继续导入，仍可以导入到系统中
|
|||
/// 5. 最后导入到本系统中 impRecLst
|
|||
///
|
|||
/// 二、插入M100
|
|||
/// 1. 根据车型代码中的前两位（HS），过滤属于派格的订单；只针对派格的订单进行报文解析
|
|||
/// 2. 根据VIN判断是否重复报文，将重复报文放到“重复报文表”
|
|||
/// 3. 通过车型描述中的颜色（条件一）和规格说明（条件二）两个字段能够定位到该底盘对应哪个总成组（4个总成一组）。如果匹配将订单和总成组进行绑定；如果不匹配将订单放入未知总成
|
|||
/// 4. 插入M100 (更新派格车型、 生产线)
|
|||
/// 5. 插入WaitPrint
|
|||
/// </summary>
|
|||
/// <param name="impRecLst">导入Excel内容</param>
|
|||
/// <param name="forceExecute">校验不通过时，是否强制执行通过</param>
|
|||
public async Task<ObjectResultDto> ParseEdi(List<ImportRecord> input, bool forceExecute = false) |
|||
{ |
|||
ObjectResultDto ret = new ObjectResultDto(); |
|||
|
|||
//扣除重复导入的订单
|
|||
List<ImportRecord> notRepeatOrder = await GetNotRepeatOrder(input); |
|||
if (notRepeatOrder.Count == 0) |
|||
{ |
|||
ret.Status = true; |
|||
ret.Message = "根据Vin和HostSN，排除在数据库中重复的Excel订单后，已经没有不重复的订单！"; |
|||
return ret; |
|||
} |
|||
#region 断号提醒
|
|||
//校验两次导入之间是否断号
|
|||
string betweenBreakNumMsg = await CheckBetweenBreakNum(input); |
|||
//校验本次导入数据是否断号
|
|||
string breakNumMsg = CheckBreakNum(ref notRepeatOrder); |
|||
if (betweenBreakNumMsg.HasValue() || breakNumMsg.HasValue()) |
|||
{ |
|||
if (forceExecute == false) |
|||
{ |
|||
//断号提醒
|
|||
ret.Status = true; |
|||
ret.Message = betweenBreakNumMsg + breakNumMsg; |
|||
return ret; |
|||
} |
|||
} |
|||
#endregion
|
|||
|
|||
//初始化缓存
|
|||
_hqCacheManagerDomainService.InitLoadCache(); |
|||
|
|||
//批量插入 导入记录
|
|||
await _importRecordRepository.InsertManyAsync(notRepeatOrder); |
|||
|
|||
//过滤掉其它厂家的订单，只取派格订单
|
|||
var paigeOrderLst = notRepeatOrder.Where(itm => itm.VehicleModelCode.Substring(0, 2) == _vehicleModelPrefix).OrderBy(itm => itm.HostSN).ToList(); |
|||
foreach (ImportRecord orderItem in paigeOrderLst) |
|||
{ |
|||
//构建M100实体
|
|||
BillM100 m100Obj = BuildM100Entity(orderItem); |
|||
//更新车型、产线
|
|||
UpdateProductLine(m100Obj); |
|||
|
|||
//重复报文
|
|||
bool isRepeat = await _billM100Repository.AnyAsync(itm => itm.HostSN == orderItem.HostSN && itm.VIN == orderItem.Vin); |
|||
if (isRepeat == true) |
|||
{ |
|||
#region 重复报文
|
|||
var succObj = InsertM100RepeatBill(orderItem, m100Obj); |
|||
_logger.LogDebug(_errorMessagePrefix + $"流水号{orderItem.HostSN}是重复报文"); |
|||
ret.Status = (succObj != null); |
|||
return ret; |
|||
#endregion
|
|||
} |
|||
|
|||
//绑定总成分组
|
|||
string colorExplain = orderItem.VehicleModelDesc.Trim().Right(7); |
|||
Group_Assembly groupAssemblyObj = HQ_CacheManagerDomainService._groupAssemblyList.FirstOrDefault(itm => itm.SpecExplain == orderItem.SpecDesc && itm.ColorExplain == colorExplain); |
|||
if (groupAssemblyObj != null) |
|||
{ |
|||
#region 插入整车总成
|
|||
Guid vehicleAssemblyId = GuidGenerator.Create(); |
|||
AssemblyCfgVehicle vehicleAssemblyCfgObj = new AssemblyCfgVehicle(vehicleAssemblyId, null, m100Obj.VehicleModelCode, null, true); |
|||
foreach (OnlyAssemblyInfo assemblyItem in groupAssemblyObj.AssemblyDetails) //插入子表
|
|||
{ |
|||
vehicleAssemblyCfgObj.AddChildObj(GuidGenerator.Create(), assemblyItem.Id); |
|||
} |
|||
var vehicleAssemblyResu = await _assemblyCfgVehicleRepository.InsertAsync(vehicleAssemblyCfgObj, true); |
|||
if (vehicleAssemblyResu == null) |
|||
{ |
|||
throw new Exception("插入整车总成返回结果为空InsertAsync！"); |
|||
} |
|||
#endregion
|
|||
|
|||
//插入M100、未打印表
|
|||
m100Obj.SetAssemblyID(vehicleAssemblyResu.Id); |
|||
m100Obj.SetBillStatus(BillStatusEnum.Match); |
|||
var insM100Ret = await _hqM100DomainServie.InsertM100(m100Obj, true); |
|||
} |
|||
else |
|||
{ |
|||
//未知总成
|
|||
_logger.LogDebug(_errorMessagePrefix + $"未匹配总成，插入未知总成开始：{orderItem.HostSN}"); |
|||
//更新单据表
|
|||
m100Obj.SetAssemblyID(null); |
|||
m100Obj.SetBillStatus(BillStatusEnum.NotMatch); |
|||
var succObj1 = await _hqM100DomainServie.InsertM100(m100Obj, true); |
|||
|
|||
//不匹配时，插入未知总成
|
|||
var succObj2 = await InsertUnknownAssembly(m100Obj); |
|||
_logger.LogDebug(_errorMessagePrefix + $"未匹配总成，插入未知总成完成：{orderItem.HostSN}"); |
|||
ret.Status = (succObj1 != null && succObj2 != null); |
|||
} |
|||
|
|||
} //foreach
|
|||
|
|||
//更新本次导入的最大HostSN
|
|||
int curMaxHostSN = input.Max(itm => itm.HostSN); |
|||
await _lastImportHostSNDomainService.SetCurrentImportMaxHostSN(curMaxHostSN); |
|||
ret.Status = true; |
|||
return ret; |
|||
} |
|||
|
|||
/// <summary>
|
|||
/// 上次导入和本次导入之间的流水号是否连续
|
|||
/// </summary>
|
|||
/// <param name="input"></param>
|
|||
/// <returns></returns>
|
|||
private async Task<string> CheckBetweenBreakNum(List<ImportRecord> input) |
|||
{ |
|||
string ret = ""; |
|||
//取本次导入的最小HostSN
|
|||
int curMinHostSN = input.Min(itm => itm.HostSN); |
|||
//上次导入的最大HostSN
|
|||
int priorMaxHostSN = await _lastImportHostSNDomainService.GetLastImportMaxHostSN(); |
|||
if (priorMaxHostSN > 0) //第一次导入时（priorMaxHostSN = 0），不需要校验两次导入之间的断号
|
|||
{ |
|||
if (curMinHostSN <= priorMaxHostSN + 1) |
|||
{ |
|||
} |
|||
else |
|||
{ |
|||
//两次导入断号提醒
|
|||
ret = $"两次导入断号提醒：本次导入的最小流水号是：{curMinHostSN}，上次导入的最大流水号是：{priorMaxHostSN}，两者不连续\r\n"; |
|||
} |
|||
} |
|||
|
|||
return ret; |
|||
} |
|||
|
|||
private BillM100 BuildM100Entity(ImportRecord orderItem) |
|||
{ |
|||
BillM100 m100Obj = new BillM100(GuidGenerator.Create()); |
|||
m100Obj.MessageFileReceiveID = orderItem.Id; |
|||
m100Obj.SerialNum = ServerHelper.VinToSN(orderItem.Vin); |
|||
m100Obj.SerialNumStr = ServerHelper.ToSerialNumStr(orderItem.OnlineTime, orderItem.HostSN); |
|||
m100Obj.HostSN = orderItem.HostSN; |
|||
m100Obj.HostSN2 = orderItem.HostSN; //流水号
|
|||
m100Obj.KNR = orderItem.VehicleBodyCode; |
|||
m100Obj.VIN = orderItem.Vin; |
|||
m100Obj.AssemblyID = null; |
|||
m100Obj.OnlineTime = orderItem.OnlineTime; |
|||
m100Obj.VehicleModelCode = orderItem.VehicleModelCode.Substring(0, 2); |
|||
m100Obj.ProductLine = null; |
|||
m100Obj.Version = ""; |
|||
m100Obj.ReceiveTime = ServerHelper.CurrentDateTime; |
|||
m100Obj.BillStatus = BillStatusEnum.NotMatch; |
|||
m100Obj.Description = ""; |
|||
//m100Obj.OperationType = operationType;
|
|||
//m100Obj.Operator = @operator;
|
|||
//m100Obj.OperationTime = operationTime;
|
|||
m100Obj.CanNotPrint = false; |
|||
m100Obj.NeedReplenishPrint = 0; |
|||
m100Obj.IsPartSwitch = false; |
|||
return m100Obj; |
|||
} |
|||
|
|||
/// <summary>
|
|||
/// 校验本次导入数据断号
|
|||
/// </summary>
|
|||
/// <param name="notRepeatOrder"></param>
|
|||
/// <returns></returns>
|
|||
private static string CheckBreakNum(ref List<ImportRecord> notRepeatOrder) |
|||
{ |
|||
StringBuilder sb = new StringBuilder(); |
|||
notRepeatOrder = notRepeatOrder.OrderBy(itm => itm.HostSN).ToList(); |
|||
for (int curIdx = 1; curIdx < notRepeatOrder.Count; curIdx++) |
|||
{ |
|||
int curVal = notRepeatOrder[curIdx].HostSN; |
|||
int priorIdx = curIdx - 1; |
|||
int priorVal = notRepeatOrder[priorIdx].HostSN; |
|||
if (curVal - priorVal != 1) |
|||
{ |
|||
sb.AppendLine($"流水号{priorVal}和{curVal}之间存在断号"); |
|||
} |
|||
} |
|||
return sb.ToString(); |
|||
} |
|||
|
|||
/// <summary>
|
|||
/// 根据流水号、VIN 扣除重复导入的订单
|
|||
/// </summary>
|
|||
/// <param name="input"></param>
|
|||
/// <returns></returns>
|
|||
private async Task<List<ImportRecord>> GetNotRepeatOrder(List<ImportRecord> input) |
|||
{ |
|||
List<ImportRecord> notRepeatLst = new List<ImportRecord>(); |
|||
List<ImportRecord> importHistoryLst = await _importRecordRepository.GetPagedListAsync(0, 10000, "HostSN desc"); |
|||
|
|||
foreach (ImportRecord item in input) |
|||
{ |
|||
bool hasData = importHistoryLst.Any(itm => itm.HostSN == item.HostSN && itm.Vin == item.Vin); |
|||
if (hasData) |
|||
{ |
|||
} |
|||
else |
|||
{ |
|||
notRepeatLst.Add(item); |
|||
} |
|||
} |
|||
return notRepeatLst; |
|||
} |
|||
|
|||
/// <summary>
|
|||
/// 更新车型、生产线
|
|||
/// </summary>
|
|||
/// <param name="billResObj"></param>
|
|||
private void UpdateProductLine(BillM100 bill) |
|||
{ |
|||
string ediVehicleModel = bill.VehicleModelCode; //报文车型
|
|||
//车型转换：3H 转 CC
|
|||
var obj1 = HQ_CacheManagerDomainService._msgToPaiGeVehicleModelList.FirstOrDefault(itm => itm.DicItemCode == ediVehicleModel); |
|||
if (obj1 != null) |
|||
{ |
|||
string paigeVehicleModel = obj1.DicItemName; // CC
|
|||
if (paigeVehicleModel.Contains('-')) //去掉B8L-PHEV中的-PHEV
|
|||
{ |
|||
paigeVehicleModel = paigeVehicleModel.Split('-')[0]; |
|||
} |
|||
bill.SetVehicleModelCode(paigeVehicleModel); |
|||
//根据车型取对应生产线
|
|||
var obj2 = HQ_CacheManagerDomainService._m100VehicleModelProductLineList.FirstOrDefault(itm => itm.DicItemCode == paigeVehicleModel); |
|||
if (obj2 != null) |
|||
{ |
|||
string productLine = obj2.DicItemName; |
|||
bill.SetProductLine(productLine); |
|||
} |
|||
else |
|||
{ |
|||
string errorMsg = $"零件生产工厂车型{paigeVehicleModel}没有对应的生产线！"; |
|||
_logger.LogError(errorMsg); |
|||
} |
|||
} |
|||
else //报文车型 没有对应的 派格车型
|
|||
{ |
|||
string errorMsg = $"报文车型{ediVehicleModel}没有对应的零件生产工厂车型！"; |
|||
_logger.LogError(errorMsg); |
|||
} |
|||
} |
|||
|
|||
private async Task<RepeatM100> InsertM100RepeatBill(ImportRecord impordRec, BillM100 m100Bill) |
|||
{ |
|||
RepeatM100 ret = null; |
|||
int newSN = ServerHelper.VinToSN(m100Bill.VIN); |
|||
RepeatM100 repeatBill = new RepeatM100( |
|||
GuidGenerator.Create(), |
|||
impordRec.Id, |
|||
newSN, |
|||
m100Bill.HostSN, |
|||
m100Bill.KNR, |
|||
m100Bill.VIN, |
|||
null, |
|||
m100Bill.OnlineTime, |
|||
ServerHelper.CurrentDateTime, |
|||
m100Bill.VehicleModelCode, |
|||
m100Bill.ProductLine, |
|||
((DateTime)m100Bill.OnlineTime).ToString("yyyyMM"), |
|||
BillStatusEnum.None |
|||
); |
|||
|
|||
//零件子表赋值
|
|||
foreach (BillM100Part m100Part in m100Bill.BillM100Parts) |
|||
{ |
|||
repeatBill.AddChildObj(GuidGenerator.Create(), m100Part.PartCode, m100Part.PartNum, m100Part.Description); |
|||
} |
|||
//插入重复单据
|
|||
ret = await _repeatM100Repository.InsertAsync(repeatBill, true); |
|||
return ret; |
|||
} |
|||
|
|||
/// <summary>
|
|||
/// 不匹配时，插入未知总成，写提醒日志
|
|||
/// </summary>
|
|||
/// <param name="bill"></param>
|
|||
private async Task<UnknownAssembly> InsertUnknownAssembly(BillM100 bill) |
|||
{ |
|||
UnknownAssembly ret = null; |
|||
try |
|||
{ |
|||
//插入未知总成
|
|||
UnknownAssembly unknownAssemblyObj = new UnknownAssembly(GuidGenerator.Create(), bill.Id, "M100"); |
|||
//预批量赋值
|
|||
unknownAssemblyObj.Description = bill.Description; //描述字段保存预批量信息
|
|||
|
|||
//foreach (BillM100Part billPart in bill.BillM100Parts)
|
|||
//{
|
|||
// unknownAssemblyObj.AddChildObj(GuidGenerator.Create(), billPart.PartCode, billPart.PartNum, billPart.Description);
|
|||
//}
|
|||
//var partNumSum = unknownAssemblyObj.UnknownAssemblyParts.Sum(itm => (int)itm.PartNum);
|
|||
//unknownAssemblyObj.SetPartNum(partNumSum);
|
|||
ret = await _unknownAssemblyRepository.InsertAsync(unknownAssemblyObj); |
|||
return ret; |
|||
} |
|||
catch (Exception ex) |
|||
{ |
|||
throw new Exception($"InsertUnknownAssembly方法报错：" + ex.Message); |
|||
} |
|||
} |
|||
|
|||
|
|||
} |
|||
} |
|||
@ -0,0 +1,239 @@ |
|||
using Microsoft.Extensions.Logging; |
|||
using System; |
|||
using System.Collections.Concurrent; |
|||
using System.Collections.Generic; |
|||
using System.Diagnostics; |
|||
using System.IO; |
|||
using System.Linq; |
|||
using System.Text; |
|||
using System.Threading.Tasks; |
|||
using Volo.Abp.DependencyInjection; |
|||
using Volo.Abp.Domain.Repositories; |
|||
using Volo.Abp.Guids; |
|||
using Volo.Abp.Uow; |
|||
using WY.NewJit.Common; |
|||
using WY.NewJit.MsgBaseData; |
|||
using WY.NewJit.MsgCheck; |
|||
using WY.NewJit.IRepositories; |
|||
using WY.NewJit.MsgBaseData.Entitys; |
|||
|
|||
namespace WY.NewJit.EdiReceive.Services |
|||
{ |
|||
public partial class HQ_CacheManagerDomainService : ITransientDependency |
|||
{ |
|||
#region 仓储
|
|||
|
|||
/// <summary>
|
|||
/// 日志
|
|||
/// </summary>
|
|||
private ILogger<HQ_CacheManagerDomainService> _logger; |
|||
|
|||
/// <summary>
|
|||
/// 配置
|
|||
/// </summary>
|
|||
private readonly Microsoft.Extensions.Configuration.IConfiguration _configuration; |
|||
|
|||
/// <summary>
|
|||
/// Dapper仓储
|
|||
/// </summary>
|
|||
private readonly INewJitDapperRepository _newJitDapperRepository; |
|||
|
|||
/// <summary>
|
|||
/// 字典领域服务
|
|||
/// </summary>
|
|||
private readonly DicDomainService _dicDomainService; |
|||
|
|||
/// <summary>
|
|||
/// 跨进程全局配置领域服务
|
|||
/// </summary>
|
|||
private readonly GlobalSettingsDomainService _globalSettingsDomainService; |
|||
#endregion
|
|||
|
|||
#region 缓存
|
|||
|
|||
/// <summary>
|
|||
/// 分组对应多个总成 清单-
|
|||
/// </summary>
|
|||
public static List<Group_Assembly> _groupAssemblyList = new List<Group_Assembly>(); |
|||
|
|||
|
|||
/// <summary>
|
|||
/// 结算件切换列表
|
|||
/// </summary>
|
|||
public static List<PartSwitch> _partSwitchList = new List<PartSwitch>(); |
|||
|
|||
/// <summary>
|
|||
/// 报文车型VS派格车型
|
|||
/// </summary>
|
|||
public static List<DicItem> _msgToPaiGeVehicleModelList = new List<DicItem>(); |
|||
|
|||
/// <summary>
|
|||
/// R100派格车型VS生产线
|
|||
/// </summary>
|
|||
public static List<DicItem> _r100VehicleModelProductLineList = new List<DicItem>(); |
|||
|
|||
/// <summary>
|
|||
/// M100派格车型VS生产线
|
|||
/// </summary>
|
|||
public static List<DicItem> _m100VehicleModelProductLineList = new List<DicItem>(); |
|||
|
|||
/// <summary>
|
|||
/// 结算件信息列表
|
|||
/// </summary>
|
|||
public static List<PartCfg> _partCfgList = new List<PartCfg>(); |
|||
|
|||
#endregion
|
|||
|
|||
#region 变量
|
|||
/// <summary>
|
|||
/// 错误信息前缀
|
|||
/// </summary>
|
|||
private string _errorMessagePrefix |
|||
{ |
|||
get |
|||
{ |
|||
return System.Reflection.MethodBase.GetCurrentMethod().DeclaringType.Name + "."; |
|||
} |
|||
} |
|||
|
|||
/// <summary>
|
|||
/// 上一次缓存刷新时间，和配置文件中RefreshCacheIntervalInMinutes一起使用
|
|||
/// </summary>
|
|||
private DateTime _lastRefreshCacheTime = DateTime.Now; |
|||
|
|||
#endregion
|
|||
|
|||
#region 构造函数
|
|||
/// <summary>
|
|||
/// 构造函数
|
|||
/// </summary>
|
|||
public HQ_CacheManagerDomainService( |
|||
ILogger<HQ_CacheManagerDomainService> logger, |
|||
Microsoft.Extensions.Configuration.IConfiguration configuration, |
|||
INewJitDapperRepository newJitDapperRepository, |
|||
DicDomainService dicDomainService, |
|||
GlobalSettingsDomainService globalSettingsDomainService |
|||
) |
|||
{ |
|||
_logger = logger; |
|||
_configuration = configuration; |
|||
_newJitDapperRepository = newJitDapperRepository; |
|||
_dicDomainService = dicDomainService; |
|||
_globalSettingsDomainService = globalSettingsDomainService; |
|||
} |
|||
#endregion
|
|||
|
|||
|
|||
#region 方法
|
|||
public bool InitLoadCache(bool forceRefresh = false) |
|||
{ |
|||
bool ret = false; |
|||
try |
|||
{ |
|||
if (forceRefresh == true) |
|||
{ |
|||
DoInitLoadCache(); |
|||
//结算件信息列表，库存系统同步过来，无法缓存
|
|||
DoInitPartCfg(); |
|||
ret = true; |
|||
} |
|||
else |
|||
{ |
|||
bool isFirstRun = (_partCfgList.Any() == false); //第一次执行
|
|||
if (isFirstRun) |
|||
{ |
|||
DoInitLoadCache(); |
|||
ret = true; |
|||
} |
|||
else //不是第一次执行
|
|||
{ |
|||
//判断是否需要刷新
|
|||
bool isRefresh = _globalSettingsDomainService.GetSetting(GlobalSettingsNameEnum.刷新报文解析缓存); |
|||
if (isRefresh) |
|||
{ |
|||
DoInitLoadCache(); |
|||
_globalSettingsDomainService.SetSetting(GlobalSettingsNameEnum.刷新报文解析缓存, false); |
|||
} |
|||
else |
|||
{ |
|||
#region 10分钟自动刷新一次缓存
|
|||
int refCacheInterval = _configuration["ConfigDic:RefreshCacheIntervalInMinutes"]?.TryToInt() ?? 10; |
|||
DateTime nowRefreshCacheTime = DateTime.Now; |
|||
TimeSpan ts = nowRefreshCacheTime - _lastRefreshCacheTime; |
|||
if (ts.TotalMinutes >= refCacheInterval) |
|||
{ |
|||
DoInitLoadCache(); |
|||
_lastRefreshCacheTime = DateTime.Now; |
|||
} |
|||
#endregion
|
|||
ret = true; |
|||
} |
|||
} |
|||
//结算件信息列表，库存系统同步过来，无法缓存
|
|||
DoInitPartCfg(); |
|||
} |
|||
return ret; |
|||
} |
|||
catch (Exception ex) |
|||
{ |
|||
string errorMsg = _errorMessagePrefix + "调用InitLoadCache方法时报错：" + ex.Message; |
|||
throw new Exception(errorMsg); |
|||
} |
|||
} |
|||
|
|||
/// <summary>
|
|||
/// 报文解析前加载缓存
|
|||
/// </summary>
|
|||
public void DoInitLoadCache() |
|||
{ |
|||
//取ERP总成的零件
|
|||
string group2assemblySql = @"
|
|||
select g.Id as GroupId, g.GroupCode, g.VehicleModel, e.Id as ErpAssemblyId, e.ErpAssemblyCode, e.ErpAssemblyName, |
|||
g.SpecExplain, g.ColorExplain |
|||
from FisAssemblyCfgGroup g |
|||
join FisAssemblyCfgErp e on g.Id = e.GroupId |
|||
where g.IsDisable = 0 and g.IsDeleted = 0 |
|||
order by g.CreationTime desc |
|||
";
|
|||
var group2assemblyList = _newJitDapperRepository.GetListBySql<Group2Assembly>(group2assemblySql, true); |
|||
//转换成分组、总成 两层结构
|
|||
_groupAssemblyList = group2assemblyList.GroupBy(itm => itm.GroupId).Select(itm => new Group_Assembly |
|||
{ |
|||
Id = itm.Key, |
|||
GroupCode = itm.ElementAt(0).GroupCode, |
|||
SpecExplain = itm.ElementAt(0).SpecExplain, |
|||
ColorExplain = itm.ElementAt(0).ColorExplain, |
|||
|
|||
AssemblyDetails = itm.Select(itm2 => new OnlyAssemblyInfo |
|||
{ |
|||
Id = itm2.ErpAssemblyId, |
|||
ErpAssemblyCode = itm2.ErpAssemblyCode, |
|||
ErpAssemblyName = itm2.ErpAssemblyName |
|||
}).ToList() |
|||
|
|||
}).ToList(); |
|||
|
|||
|
|||
//结算件切换列表
|
|||
string partSwitchSql = "select SourcePartCode, TargetPartCode, ActiveBeginTime, ActiveEndTime from FisPartSwitch"; |
|||
_partSwitchList = _newJitDapperRepository.GetListBySql<PartSwitch>(partSwitchSql, true); |
|||
|
|||
_msgToPaiGeVehicleModelList = _dicDomainService.GetDicItems(DicTypeName.报文车型对应派格车型); |
|||
_r100VehicleModelProductLineList = _dicDomainService.GetDicItems(DicTypeName.R100派格车型对应生产线); |
|||
_m100VehicleModelProductLineList = _dicDomainService.GetDicItems(DicTypeName.M100派格车型对应生产线); |
|||
_logger.LogDebug("重新刷新报文解析缓存！"); |
|||
} |
|||
|
|||
/// <summary>
|
|||
/// 初始化零件基本信息
|
|||
/// </summary>
|
|||
private void DoInitPartCfg() |
|||
{ |
|||
//结算件信息列表，库存系统同步过来，无法缓存
|
|||
string partCfgSql = @"select Id, PartCode, PartName, PartType, Description, PartType2, PartType3, RelationKey from FisPartCfg where 1=1"; //,DaXiaoLiangGang,DoorPlankCode,MaterialDescription,SAPMaterialNum
|
|||
_partCfgList = _newJitDapperRepository.GetListBySql<PartCfg>(partCfgSql, true); |
|||
|
|||
} |
|||
#endregion
|
|||
} |
|||
} |
|||
@ -0,0 +1,209 @@ |
|||
using Microsoft.Extensions.Logging; |
|||
using System; |
|||
using System.Collections.Generic; |
|||
using System.Linq; |
|||
using System.Text; |
|||
using System.Threading.Tasks; |
|||
using Volo.Abp.Domain.Repositories; |
|||
using Volo.Abp.Domain.Services; |
|||
using WY.NewJit.PrintTable; |
|||
using WY.NewJit.Common; |
|||
|
|||
namespace WY.NewJit.MsgCheck |
|||
{ |
|||
public class HQ_M100DomainService : DomainService |
|||
{ |
|||
/// <summary>
|
|||
/// M100单据
|
|||
/// </summary>
|
|||
private readonly IRepository<BillM100, Guid> _billM100Repository; |
|||
|
|||
/// <summary>
|
|||
/// 日志
|
|||
/// </summary>
|
|||
private ILogger<M100CheckDomainService> _logger; |
|||
|
|||
/// <summary>
|
|||
/// 未打印表
|
|||
/// </summary>
|
|||
private readonly IRepository<WaitPrint, Guid> _waitPrintRepository; |
|||
|
|||
public HQ_M100DomainService( |
|||
IRepository<BillM100, Guid> billM100Repository, |
|||
ILogger<M100CheckDomainService> logger, |
|||
IRepository<WaitPrint, Guid> waitPrintRepository |
|||
) |
|||
{ |
|||
_billM100Repository = billM100Repository; |
|||
_logger = logger; |
|||
_waitPrintRepository = waitPrintRepository; |
|||
} |
|||
|
|||
public async Task<BillM100> InsertM100(BillM100 m100Obj, bool autoSave = false, bool isBatchImportBreakNum = false) |
|||
{ |
|||
BillM100 m100Ret = null; |
|||
|
|||
if (isBatchImportBreakNum) //批量导入断号模块调用
|
|||
{ |
|||
//更新M100
|
|||
m100Obj.HostSN2 = 0; |
|||
//M100转换成WaitPrint：一个底盘、08产线插入3条记录，其它产线插入1条记录
|
|||
WaitPrint[] wpArr2 = M100ConvertToWaitPrint(m100Obj); |
|||
|
|||
foreach (var wp in wpArr2) |
|||
{ |
|||
wp.PrintType = PrintTypeEnum.ReplenishPrint; |
|||
//wp.HostSN2 = 0; //WaitPrint的HostSN2从m100的HostSN2取值
|
|||
} |
|||
m100Ret = await _billM100Repository.InsertAsync(m100Obj, autoSave); //插入M100
|
|||
await _waitPrintRepository.InsertManyAsync(wpArr2, autoSave); //插入未打印表
|
|||
return m100Ret; |
|||
} |
|||
|
|||
//M100转换成WaitPrint：一个底盘、08产线插入3条记录，其它产线插入1条记录
|
|||
WaitPrint[] wpArr = M100ConvertToWaitPrint(m100Obj); |
|||
|
|||
m100Ret = await _billM100Repository.InsertAsync(m100Obj, autoSave); //插入M100
|
|||
await _waitPrintRepository.InsertManyAsync(wpArr, autoSave); //插入未打印表
|
|||
return m100Ret; |
|||
} |
|||
|
|||
private WaitPrint[] M100ConvertToWaitPrint(BillM100 m100Obj) |
|||
{ |
|||
WaitPrint[] wpArr; |
|||
WaitPrint mbRec = ConvertWaitPrint(m100Obj, BusinessTypeEnum.MenBan); |
|||
wpArr = new WaitPrint[1] { mbRec }; |
|||
return wpArr; |
|||
} |
|||
|
|||
public async Task<BillM100> UpdateM100(BillM100 m100Obj, bool autoSave = false) |
|||
{ |
|||
var m100Ret = await _billM100Repository.UpdateAsync(m100Obj, autoSave); |
|||
if (m100Ret != null) |
|||
{ |
|||
|
|||
//更新已解析状态时，只涉及门板、不涉及柱护板【柱护板一对一解析成功】
|
|||
List<WaitPrint> wpLst = await _waitPrintRepository.GetListAsync(itm => itm.M100Id == m100Ret.Id && itm.BusinessType == BusinessTypeEnum.MenBan); |
|||
foreach (var wp in wpLst) |
|||
{ |
|||
wp.AssemblyID = m100Ret.AssemblyID; |
|||
wp.BillStatus = m100Ret.BillStatus; |
|||
} |
|||
await _waitPrintRepository.UpdateManyAsync(wpLst, autoSave); |
|||
|
|||
|
|||
return m100Ret; |
|||
} |
|||
return null; |
|||
} |
|||
|
|||
private WaitPrint ConvertWaitPrint(BillM100 m100Ret, BusinessTypeEnum businessType) |
|||
{ |
|||
WaitPrint waitPrint = new WaitPrint(GuidGenerator.Create()); |
|||
ConvertWaitPrint(m100Ret, businessType, waitPrint); |
|||
return waitPrint; |
|||
} |
|||
|
|||
private void ConvertWaitPrint(BillM100 m100Ret, BusinessTypeEnum businessType, WaitPrint waitPrint) |
|||
{ |
|||
waitPrint.M100Id = m100Ret.Id; |
|||
waitPrint.BusinessType = businessType; |
|||
waitPrint.ProductLine = m100Ret.ProductLine; |
|||
waitPrint.OnlineTime = (DateTime)m100Ret.OnlineTime; |
|||
waitPrint.HostSN = (int)m100Ret.HostSN; |
|||
waitPrint.KNR = m100Ret.KNR; |
|||
waitPrint.VIN = m100Ret.VIN; |
|||
waitPrint.VehicleModelCode = m100Ret.VehicleModelCode; |
|||
waitPrint.AssemblyID = m100Ret.AssemblyID; |
|||
if (businessType == BusinessTypeEnum.MenBan) |
|||
{ |
|||
waitPrint.BillStatus = m100Ret.BillStatus; |
|||
} |
|||
else |
|||
{ |
|||
waitPrint.BillStatus = BillStatusEnum.Match; //柱护板默认是匹配状态
|
|||
} |
|||
waitPrint.PrintType = PrintTypeEnum.OrderPrint; |
|||
waitPrint.HostSN2 = (int)m100Ret.HostSN2; |
|||
waitPrint.Description = m100Ret.Description; |
|||
waitPrint.ReceiveTime = m100Ret.ReceiveTime; |
|||
waitPrint.CreationTime = ServerHelper.CurrentDateTime; //m100Ret.CreationTime;
|
|||
waitPrint.CreatorId = m100Ret.CreatorId; |
|||
waitPrint.LastModificationTime = m100Ret.LastModificationTime; |
|||
waitPrint.LastModifierId = m100Ret.LastModifierId; |
|||
} |
|||
|
|||
private void Set_WaitPrint(WaitPrint sourceWaitPrint, WaitPrint targetWaitPrint) |
|||
{ |
|||
targetWaitPrint.M100Id = sourceWaitPrint.M100Id; |
|||
targetWaitPrint.BusinessType = sourceWaitPrint.BusinessType; |
|||
targetWaitPrint.ProductLine = sourceWaitPrint.ProductLine; |
|||
targetWaitPrint.OnlineTime = sourceWaitPrint.OnlineTime; |
|||
targetWaitPrint.HostSN = sourceWaitPrint.HostSN; |
|||
targetWaitPrint.KNR = sourceWaitPrint.KNR; |
|||
targetWaitPrint.VIN = sourceWaitPrint.VIN; |
|||
targetWaitPrint.VehicleModelCode = sourceWaitPrint.VehicleModelCode; |
|||
targetWaitPrint.AssemblyID = sourceWaitPrint.AssemblyID; |
|||
targetWaitPrint.BillStatus = sourceWaitPrint.BillStatus; |
|||
targetWaitPrint.PrintType = sourceWaitPrint.PrintType; |
|||
targetWaitPrint.HostSN2 = sourceWaitPrint.HostSN2; |
|||
targetWaitPrint.Description = sourceWaitPrint.Description; |
|||
targetWaitPrint.ReceiveTime = sourceWaitPrint.ReceiveTime; |
|||
targetWaitPrint.CreationTime = sourceWaitPrint.CreationTime; |
|||
targetWaitPrint.CreatorId = sourceWaitPrint.CreatorId; |
|||
targetWaitPrint.LastModificationTime = sourceWaitPrint.LastModificationTime; |
|||
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; |
|||
} |
|||
|
|||
/// <summary>
|
|||
/// 根据M100插入或更新未打印表，【未知总成重新解析时调用】
|
|||
/// </summary>
|
|||
/// <param name="m100Obj"></param>
|
|||
/// <returns></returns>
|
|||
public async Task<ObjectResultDto> InsertOrUpdateWaitPrintByM100(BillM100 m100Obj, bool autoSave = false) |
|||
{ |
|||
ObjectResultDto ret = new ObjectResultDto(true, ""); |
|||
List<WaitPrint> wpLst = await _waitPrintRepository.GetListAsync(itm => itm.VIN == m100Obj.VIN && itm.BusinessType == BusinessTypeEnum.MenBan); |
|||
bool hasData = wpLst.Count > 0; |
|||
if (hasData) //未打印表有数据
|
|||
{ |
|||
foreach (WaitPrint wp in wpLst) |
|||
{ |
|||
wp.AssemblyID = m100Obj.AssemblyID; |
|||
wp.BillStatus = m100Obj.BillStatus; |
|||
} |
|||
await _waitPrintRepository.UpdateManyAsync(wpLst, autoSave); |
|||
} |
|||
else //未打印表没有数据
|
|||
{ |
|||
WaitPrint[] wpArr; |
|||
if (m100Obj.ProductLine == "08") |
|||
{ |
|||
WaitPrint mbRec = ConvertWaitPrint(m100Obj, BusinessTypeEnum.MenBan); |
|||
//WaitPrint zhbOtherRec = ConvertWaitPrint(m100Obj, BusinessTypeEnum.OtherZhuHuBan);
|
|||
//WaitPrint zhbRec = ConvertWaitPrint(m100Obj, BusinessTypeEnum.AC_ZhuHuBan);
|
|||
//wpArr = new WaitPrint[3] { mbRec, zhbOtherRec, zhbRec };
|
|||
wpArr = new WaitPrint[1] { mbRec }; |
|||
} |
|||
else |
|||
{ |
|||
WaitPrint mbRec = ConvertWaitPrint(m100Obj, BusinessTypeEnum.MenBan); |
|||
wpArr = new WaitPrint[1] { mbRec }; |
|||
} |
|||
foreach (WaitPrint wp in wpArr) |
|||
{ |
|||
wp.PrintType = PrintTypeEnum.ReplenishPrint; |
|||
} |
|||
await _waitPrintRepository.InsertManyAsync(wpArr, autoSave); //插入未打印表
|
|||
} |
|||
return ret; |
|||
} |
|||
} |
|||
} |
|||
@ -0,0 +1,102 @@ |
|||
using Microsoft.EntityFrameworkCore; |
|||
using Microsoft.Extensions.Logging; |
|||
using System; |
|||
using System.Collections.Generic; |
|||
using System.Linq; |
|||
using System.Text; |
|||
using System.Threading.Tasks; |
|||
using Volo.Abp.Domain.Repositories; |
|||
using Volo.Abp.Domain.Services; |
|||
using WY.NewJit.EdiReceive.Entitys; |
|||
using WY.NewJit.IRepositories; |
|||
using WY.NewJit.MsgBaseData; |
|||
using WY.NewJit.MsgCheck; |
|||
|
|||
namespace WY.NewJit.EdiReceive.Services |
|||
{ |
|||
public class LastImportHostSNDomainService : DomainService |
|||
{ |
|||
#region 成员
|
|||
/// <summary>
|
|||
/// 日志
|
|||
/// </summary>
|
|||
private readonly ILogger<LastImportHostSNDomainService> _logger; |
|||
|
|||
/// <summary>
|
|||
/// Dapper仓储
|
|||
/// </summary>
|
|||
private readonly INewJitDapperRepository _newJitDapperRepository; |
|||
|
|||
/// <summary>
|
|||
/// 字典领域服务
|
|||
/// </summary>
|
|||
private readonly DicDomainService _dicDomainService; |
|||
|
|||
/// <summary>
|
|||
/// 零件仓储
|
|||
/// </summary>
|
|||
private readonly IRepository<ImportRecord, Guid> _importRecordRepository; |
|||
|
|||
/// <summary>
|
|||
/// M100单据
|
|||
/// </summary>
|
|||
private readonly IRepository<BillM100, Guid> _billM100Repository; |
|||
|
|||
private readonly IRepository<LastImportHostSN, Guid> _lastImportHostSNRepository; |
|||
|
|||
#endregion
|
|||
public LastImportHostSNDomainService(ILogger<LastImportHostSNDomainService> logger, INewJitDapperRepository newJitDapperRepository, DicDomainService dicDomainService, IRepository<ImportRecord, Guid> importRecordRepository, IRepository<BillM100, Guid> billM100Repository, IRepository<LastImportHostSN, Guid> lastImportHostSNRepository) |
|||
{ |
|||
_logger = logger; |
|||
_newJitDapperRepository = newJitDapperRepository; |
|||
_dicDomainService = dicDomainService; |
|||
_importRecordRepository = importRecordRepository; |
|||
_billM100Repository = billM100Repository; |
|||
_lastImportHostSNRepository = lastImportHostSNRepository; |
|||
} |
|||
|
|||
/// <summary>
|
|||
/// 假设：产线之间的流水号都是唯一的
|
|||
/// </summary>
|
|||
/// <param name="productLine"></param>
|
|||
/// <returns></returns>
|
|||
public async Task<int> GetLastImportMaxHostSN() |
|||
{ |
|||
var lst = await _lastImportHostSNRepository.GetListAsync(); |
|||
if (lst.Count > 0) |
|||
{ |
|||
return lst[0].HostSN; |
|||
} |
|||
else |
|||
{ |
|||
bool hasData = await _importRecordRepository.AnyAsync(); |
|||
if (hasData) |
|||
{ |
|||
int maxSN = await _importRecordRepository.MaxAsync(itm => itm.HostSN); |
|||
return maxSN; |
|||
} |
|||
else |
|||
{ |
|||
return 0; |
|||
} |
|||
} |
|||
} |
|||
|
|||
public async Task SetCurrentImportMaxHostSN(int maxHostSN) |
|||
{ |
|||
var obj = await _lastImportHostSNRepository.FirstOrDefaultAsync(); |
|||
if (obj != null) |
|||
{ |
|||
obj.HostSN = maxHostSN; |
|||
await _lastImportHostSNRepository.UpdateAsync(obj, true); |
|||
} |
|||
else |
|||
{ |
|||
LastImportHostSN newObj = new LastImportHostSN(GuidGenerator.Create()); |
|||
newObj.HostSN = maxHostSN; |
|||
var insRet = await _lastImportHostSNRepository.InsertAsync(newObj); |
|||
} |
|||
} |
|||
|
|||
} |
|||
} |
|||
File diff suppressed because it is too large
@ -0,0 +1,41 @@ |
|||
using System; |
|||
using Microsoft.EntityFrameworkCore.Migrations; |
|||
|
|||
namespace WY.NewJit.Migrations |
|||
{ |
|||
public partial class NewJitPG_HQ_0110 : Migration |
|||
{ |
|||
protected override void Up(MigrationBuilder migrationBuilder) |
|||
{ |
|||
migrationBuilder.CreateTable( |
|||
name: "FisBaseConfig", |
|||
columns: table => new |
|||
{ |
|||
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false), |
|||
ParamName = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true), |
|||
ParamValue = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true), |
|||
State = table.Column<int>(type: "int", precision: 1, nullable: false), |
|||
Remark = table.Column<string>(type: "nvarchar(500)", maxLength: 500, nullable: true), |
|||
ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true), |
|||
ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true) |
|||
}, |
|||
constraints: table => |
|||
{ |
|||
table.PrimaryKey("PK_FisBaseConfig", x => x.Id); |
|||
}); |
|||
|
|||
migrationBuilder.CreateIndex( |
|||
name: "IX_FisBaseConfig_ParamName", |
|||
table: "FisBaseConfig", |
|||
column: "ParamName", |
|||
unique: true, |
|||
filter: "[ParamName] IS NOT NULL"); |
|||
} |
|||
|
|||
protected override void Down(MigrationBuilder migrationBuilder) |
|||
{ |
|||
migrationBuilder.DropTable( |
|||
name: "FisBaseConfig"); |
|||
} |
|||
} |
|||
} |
|||
File diff suppressed because it is too large
@ -0,0 +1,33 @@ |
|||
using Microsoft.EntityFrameworkCore.Migrations; |
|||
|
|||
namespace WY.NewJit.Migrations |
|||
{ |
|||
public partial class NewJitPG_HQ_Init : Migration |
|||
{ |
|||
protected override void Up(MigrationBuilder migrationBuilder) |
|||
{ |
|||
migrationBuilder.AddColumn<string>( |
|||
name: "ColorExplain", |
|||
table: "FisAssemblyCfgErp", |
|||
type: "nvarchar(max)", |
|||
nullable: true); |
|||
|
|||
migrationBuilder.AddColumn<string>( |
|||
name: "SpecExplain", |
|||
table: "FisAssemblyCfgErp", |
|||
type: "nvarchar(max)", |
|||
nullable: true); |
|||
} |
|||
|
|||
protected override void Down(MigrationBuilder migrationBuilder) |
|||
{ |
|||
migrationBuilder.DropColumn( |
|||
name: "ColorExplain", |
|||
table: "FisAssemblyCfgErp"); |
|||
|
|||
migrationBuilder.DropColumn( |
|||
name: "SpecExplain", |
|||
table: "FisAssemblyCfgErp"); |
|||
} |
|||
} |
|||
} |
|||
File diff suppressed because it is too large
@ -0,0 +1,53 @@ |
|||
using Microsoft.EntityFrameworkCore.Migrations; |
|||
|
|||
namespace WY.NewJit.Migrations |
|||
{ |
|||
public partial class NewJitPG_HQ_Init2 : Migration |
|||
{ |
|||
protected override void Up(MigrationBuilder migrationBuilder) |
|||
{ |
|||
migrationBuilder.AlterColumn<string>( |
|||
name: "SpecExplain", |
|||
table: "FisAssemblyCfgErp", |
|||
type: "varchar(50)", |
|||
maxLength: 50, |
|||
nullable: true, |
|||
oldClrType: typeof(string), |
|||
oldType: "nvarchar(max)", |
|||
oldNullable: true); |
|||
|
|||
migrationBuilder.AlterColumn<string>( |
|||
name: "ColorExplain", |
|||
table: "FisAssemblyCfgErp", |
|||
type: "varchar(50)", |
|||
maxLength: 50, |
|||
nullable: true, |
|||
oldClrType: typeof(string), |
|||
oldType: "nvarchar(max)", |
|||
oldNullable: true); |
|||
} |
|||
|
|||
protected override void Down(MigrationBuilder migrationBuilder) |
|||
{ |
|||
migrationBuilder.AlterColumn<string>( |
|||
name: "SpecExplain", |
|||
table: "FisAssemblyCfgErp", |
|||
type: "nvarchar(max)", |
|||
nullable: true, |
|||
oldClrType: typeof(string), |
|||
oldType: "varchar(50)", |
|||
oldMaxLength: 50, |
|||
oldNullable: true); |
|||
|
|||
migrationBuilder.AlterColumn<string>( |
|||
name: "ColorExplain", |
|||
table: "FisAssemblyCfgErp", |
|||
type: "nvarchar(max)", |
|||
nullable: true, |
|||
oldClrType: typeof(string), |
|||
oldType: "varchar(50)", |
|||
oldMaxLength: 50, |
|||
oldNullable: true); |
|||
} |
|||
} |
|||
} |
|||
File diff suppressed because it is too large
@ -0,0 +1,35 @@ |
|||
using Microsoft.EntityFrameworkCore.Migrations; |
|||
|
|||
namespace WY.NewJit.Migrations |
|||
{ |
|||
public partial class NewJitPG_HQ_Init3 : Migration |
|||
{ |
|||
protected override void Up(MigrationBuilder migrationBuilder) |
|||
{ |
|||
migrationBuilder.AddColumn<string>( |
|||
name: "ColorExplain", |
|||
table: "FisAssemblyCfgGroup", |
|||
type: "varchar(50)", |
|||
maxLength: 50, |
|||
nullable: true); |
|||
|
|||
migrationBuilder.AddColumn<string>( |
|||
name: "SpecExplain", |
|||
table: "FisAssemblyCfgGroup", |
|||
type: "varchar(50)", |
|||
maxLength: 50, |
|||
nullable: true); |
|||
} |
|||
|
|||
protected override void Down(MigrationBuilder migrationBuilder) |
|||
{ |
|||
migrationBuilder.DropColumn( |
|||
name: "ColorExplain", |
|||
table: "FisAssemblyCfgGroup"); |
|||
|
|||
migrationBuilder.DropColumn( |
|||
name: "SpecExplain", |
|||
table: "FisAssemblyCfgGroup"); |
|||
} |
|||
} |
|||
} |
|||
Loading…
Reference in new issue