diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Startup.cs b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Startup.cs index e2c0e470..c501563a 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Startup.cs +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Startup.cs @@ -53,10 +53,10 @@ public class Startup { //scheduler.Schedule().EveryMinute(); //scheduler.Schedule().EveryMinute(); - //scheduler.Schedule().EveryMinute(); - //scheduler.Schedule().EveryMinute(); - //scheduler.Schedule().EveryMinute(); - //scheduler.Schedule().EveryMinute(); + scheduler.Schedule().EveryMinute(); + scheduler.Schedule().EveryMinute(); + scheduler.Schedule().EveryMinute(); + scheduler.Schedule().EveryMinute(); }); var contentTypeProvider = new FileExtensionContentTypeProvider(); contentTypeProvider.Mappings.Add(".mjs", "text/javascript"); diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_SE_DETAIL_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_SE_DETAIL_DTO.cs index ed2f83be..f753449d 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_SE_DETAIL_DTO.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_SE_DETAIL_DTO.cs @@ -1,4 +1,5 @@ using System; +using System.ComponentModel; using System.ComponentModel.DataAnnotations; using Magicodes.ExporterAndImporter.Core; using Volo.Abp.Application.Dtos; @@ -11,70 +12,112 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos; public class PUB_SE_DETAIL_DTO : EntityDto { /// - /// 期间 + /// 发货单号 /// - [Display(Name = "期间")] - public int Version { set; get; } + [Display(Name = "发货单号")] + public string WmsBillNum { get; set; } /// - /// 发货时间 + /// 发货时间 /// - [Display(Name = "发货时间")] - public DateTime ShippingDate { set; get; } + [DisplayName("发货时间")] + public DateTime BillTime { get; set; } /// - /// 发运单号 + /// 零件号 /// - [Display(Name = "发运单号")] - public string WmsBillNum { set; get; } + [DisplayName("零件号")] + public string PartCode { get; set; } /// - /// 零件号 + /// 批次 + /// + [DisplayName("批次")] + public string Batch { get; set; } + + /// + /// 发货人 + /// + [DisplayName("发货人")] + public string Oper { get; set; } + + /// + /// DN单据号 + /// + [DisplayName("DN单据号")] + public string DnBillNum { get; set; } + + /// + /// DN单据时间 + /// + [DisplayName("DN单据时间")] + public DateTime DnBillTime { get; set; } + + /// + /// DN单添加人 + /// + [DisplayName("DN单添加人")] + public string DnOper { get; set; } + + /// + /// 交付索引 + /// + [DisplayName("交付索引")] + public string DeliveryIndex { get; set; } + + /// + /// 客户 + /// + [DisplayName("客户")] + public string CustId { get; set; } + + /// + /// 发货仓库 /// - [Display(Name = "零件号")] - public string LU { get; set; } + [DisplayName("发货仓库")] + public string DeliveryHose { get; set; } /// - /// 生产号 + /// 来源库位 /// - [Display(Name = "生产号")] - public string PN { get; set; } + [DisplayName("来源库位")] + public string FromLocCode { get; set; } /// - /// 组合键值(LU+PN) + /// 来源仓库 /// - [Display(Name = "组合键值(LU+PN)")] - public string KeyCode { get; set; } + [DisplayName("来源仓库")] + public string FromHose { get; set; } /// - /// 数量 + /// 来源ERP库存 /// - [Display(Name = "数量")] - public decimal Qty { get; set; } + [DisplayName("来源ERP库存")] + public string FromErpLocCode { get; set; } /// - /// 日顺序号 + /// 目标库位 /// - [Display(Name = "日顺序号")] - public string SeqNumber { get; set; } + [DisplayName("目标库位")] + public string ToLocCode { get; set; } /// - /// 小总成号 + /// 目标Erp库位 /// - [Display(Name = "小总成号")] - public string AssemblyCode { get; set; } + [DisplayName("目标Erp库位")] + public string ToErpLocCode { get; set; } /// - /// 注塑码 + /// 目标仓库 /// - [Display(Name = "注塑码")] - public string InjectionCode { get; set; } + [DisplayName("目标仓库")] + public string ToHose { get; set; } /// - /// 订单时间 + /// 备注 /// - [Display(Name = "订单时间")] - public DateTime BeginDate { get; set; } + [DisplayName("备注")] + public string Remark { get; set; } } /// @@ -94,72 +137,128 @@ public class PUB_SE_DETAIL_RequestDto : RequestDto public class PUB_SE_DETAIL_EXPORT_DTO { /// - /// 期间 + /// 发货单号 /// - [ExporterHeader(DisplayName = "日顺序号")] - public int Version { set; get; } + [Display(Name = "发货单号")] + [ExporterHeader(DisplayName = "发货单号")] + public string WmsBillNum { get; set; } /// - /// 发货时间 + /// 发货时间 /// - [ExporterHeader(DisplayName = "日顺序号")] - public DateTime ShippingDate { set; get; } + [DisplayName("发货时间")] + [ExporterHeader(DisplayName = "发货时间")] + public DateTime BillTime { get; set; } /// - /// 发运单号 + /// 零件号 /// - [ExporterHeader(DisplayName = "日顺序号")] - public string WmsBillNum { set; get; } + [DisplayName("零件号")] + [ExporterHeader(DisplayName = "零件号")] + public string PartCode { get; set; } /// - /// 零件号 + /// 批次 + /// + [DisplayName("批次")] + [ExporterHeader(DisplayName = "批次")] + public string Batch { get; set; } + + /// + /// 发货人 + /// + [DisplayName("发货人")] + [ExporterHeader(DisplayName = "发货人")] + public string Oper { get; set; } + + /// + /// DN单据号 + /// + [DisplayName("DN单据号")] + [ExporterHeader(DisplayName = "DN单据号")] + public string DnBillNum { get; set; } + + /// + /// DN单据时间 + /// + [DisplayName("DN单据时间")] + [ExporterHeader(DisplayName = "DN单据时间")] + public DateTime DnBillTime { get; set; } + + /// + /// DN单添加人 + /// + [DisplayName("DN单添加人")] + [ExporterHeader(DisplayName = "DN单添加人")] + public string DnOper { get; set; } + + /// + /// 交付索引 + /// + [DisplayName("交付索引")] + [ExporterHeader(DisplayName = "交付索引")] + public string DeliveryIndex { get; set; } + + /// + /// 客户 + /// + [DisplayName("客户")] + [ExporterHeader(DisplayName = "客户")] + public string CustId { get; set; } + + /// + /// 发货仓库 /// - [ExporterHeader(DisplayName = "日顺序号")] - public string LU { get; set; } + [DisplayName("发货仓库")] + [ExporterHeader(DisplayName = "发货仓库")] + public string DeliveryHose { get; set; } /// - /// 生产号 + /// 来源库位 /// - [ExporterHeader(DisplayName = "日顺序号")] - public string PN { get; set; } + [DisplayName("来源库位")] + [ExporterHeader(DisplayName = "来源库位")] + public string FromLocCode { get; set; } /// - /// 组合键值(LU+PN) + /// 来源仓库 /// - [ExporterHeader(DisplayName = "日顺序号")] - public string KeyCode { get; set; } + [DisplayName("来源仓库")] + [ExporterHeader(DisplayName = "来源仓库")] + public string FromHose { get; set; } /// - /// 数量 + /// 来源ERP库存 /// - [ExporterHeader(DisplayName = "日顺序号")] - public decimal Qty { get; set; } + [DisplayName("来源ERP库存")] + [ExporterHeader(DisplayName = "来源ERP库存")] + public string FromErpLocCode { get; set; } /// - /// 日顺序号 + /// 目标库位 /// - [Display(Name = "日顺序号")] - [ExporterHeader(DisplayName = "日顺序号")] - public string SeqNumber { get; set; } + [DisplayName("目标库位")] + [ExporterHeader(DisplayName = "目标库位")] + public string ToLocCode { get; set; } /// - /// 小总成号 + /// 目标Erp库位 /// - [Display(Name = "小总成号")] - [ExporterHeader(DisplayName = "小总成号")] - public string AssemblyCode { get; set; } + [DisplayName("目标Erp库位")] + [ExporterHeader(DisplayName = "目标Erp库位")] + public string ToErpLocCode { get; set; } /// - /// 注塑码 + /// 目标仓库 /// - [Display(Name = "注塑码")] - [ExporterHeader(DisplayName = "注塑码")] - public string InjectionCode { get; set; } + [DisplayName("目标仓库")] + [ExporterHeader(DisplayName = "目标仓库")] + public string ToHose { get; set; } /// - /// 订单时间 + /// 备注 /// - [Display(Name = "订单时间")] - [ExporterHeader(DisplayName = "订单时间")] - public DateTime BeginDate { get; set; } + [DisplayName("备注")] + [ExporterHeader(DisplayName = "备注")] + public string Remark { get; set; } } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JitSeSyncAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JitSeSyncAppService.cs index dfebce46..c7c4d1ee 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JitSeSyncAppService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JitSeSyncAppService.cs @@ -75,7 +75,11 @@ public class JitSeSyncAppService : ApplicationService, IInvocable var pubSeDetails = ObjectMapper.Map, List>(wmsSeRecords); if (pubSeDetails.Any()) { - pubSeDetails.ForEach(t => t.BusinessType = businessType); + pubSeDetails.ForEach(t => + { + t.BusinessType = businessType; + t.KeyCode = t.PN + t.LU; + }); await _pubSeDetailRepository.InsertManyAsync(pubSeDetails); if (syncPositionFlag != null) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_SE_DETAIL.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_SE_DETAIL.cs index 693ff615..5d1716c7 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_SE_DETAIL.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_SE_DETAIL.cs @@ -54,6 +54,9 @@ public class PUB_SE_DETAIL :SE_BASE [DisplayName("发货时间")] public DateTime BillTime { get; set; } + /// + /// PartCode + /// [DisplayName("零件号")] public string PartCode { get; set; } @@ -94,7 +97,7 @@ public class PUB_SE_DETAIL :SE_BASE public string DeliveryIndex { get; set; } /// - /// CustId + /// 客户 /// [DisplayName("客户")] public string CustId { get; set; } @@ -105,6 +108,9 @@ public class PUB_SE_DETAIL :SE_BASE [DisplayName("发货仓库")] public string DeliveryHose { get; set; } + /// + /// 来源库位 + /// [DisplayName("来源库位")] public string FromLocCode { get; set; }