diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/JisBBACEidSeCompareReport.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/JisBBACEidSeCompareReport.cs index 02e6cbdc..db1370b0 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/JisBBACEidSeCompareReport.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/JisBBACEidSeCompareReport.cs @@ -25,12 +25,6 @@ public class JisBBACEidSeCompareExport [ExporterHeader(DisplayName = "类别")] public string Category { get; set; } /// - /// 交货单号 - /// - [Display(Name = "交货单号")] - [ExporterHeader(DisplayName = "交货单号")] - public string WmsBillNum { get; set; } - /// /// 车型 /// [Display(Name = "车型")] @@ -49,42 +43,12 @@ public class JisBBACEidSeCompareExport [ExporterHeader(DisplayName = "生产码序列号日期")] public string SequenceNumber { get; set; } /// - /// ParType - /// - [Display(Name = "ParType")] - [ExporterHeader(DisplayName = "ParType")] - public string ParType { get; set; } - /// - /// 配置码 - /// - [Display(Name = "配置码")] - [ExporterHeader(DisplayName = "配置码")] - public string MESConfigCode { get; set; } - /// - /// 发货日期 - /// - [Display(Name = "发货日期")] - [ExporterHeader(DisplayName = "发货日期", Format = "yyyy-MM-dd")] - public DateTime? ShippingDate { get; set; } - /// /// 生产码 /// [Display(Name = "生产码")] [ExporterHeader(DisplayName = "生产码")] public string PN { get; set; } /// - /// 序列号 - /// - [Display(Name = "序列号")] - [ExporterHeader(DisplayName = "序列号")] - public string Seq { get; set; } - /// - /// PJIS日顺序号 - /// - [Display(Name = "PJIS日顺序号")] - [ExporterHeader(DisplayName = "PJIS日顺序号")] - public string PjsNum { get; set; } - /// /// 物料号 /// [Display(Name = "物料号")] @@ -115,6 +79,42 @@ public class JisBBACEidSeCompareExport [ExporterHeader(DisplayName = "WMS发货与EDI数量差")] public decimal DiffQty => SEQty - EdiQty; /// + /// 交货单号 + /// + [Display(Name = "交货单号")] + [ExporterHeader(DisplayName = "交货单号")] + public string WmsBillNum { get; set; } + /// + /// ParType + /// + [Display(Name = "ParType")] + [ExporterHeader(DisplayName = "ParType")] + public string ParType { get; set; } + /// + /// 配置码 + /// + [Display(Name = "配置码")] + [ExporterHeader(DisplayName = "配置码")] + public string MESConfigCode { get; set; } + /// + /// 发货日期 + /// + [Display(Name = "发货日期")] + [ExporterHeader(DisplayName = "发货日期", Format = "yyyy-MM-dd")] + public DateTime? ShippingDate { get; set; } + /// + /// 序列号 + /// + [Display(Name = "序列号")] + [ExporterHeader(DisplayName = "序列号")] + public string Seq { get; set; } + /// + /// PJIS日顺序号 + /// + [Display(Name = "PJIS日顺序号")] + [ExporterHeader(DisplayName = "PJIS日顺序号")] + public string PjsNum { get; set; } + /// /// 客户下线时间 /// [Display(Name = "客户下线时间")] diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/JisHBPOEidSeCompareReport.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/JisHBPOEidSeCompareReport.cs index ce9e03bc..a4f6f4b6 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/JisHBPOEidSeCompareReport.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/JisHBPOEidSeCompareReport.cs @@ -25,30 +25,66 @@ public class JisHBPOEidSeCompareExport [ExporterHeader(DisplayName = "类别")] public string Category { get; set; } /// - /// 交货单号 - /// - [Display(Name = "交货单号")] - [ExporterHeader(DisplayName = "交货单号")] - public string WmsBillNum { get; set; } - /// - /// CarModeCode + /// 车型 /// - [Display(Name = "CarModeCode")] - [ExporterHeader(DisplayName = "CarModeCode")] + [Display(Name = "车型")] + [ExporterHeader(DisplayName = "车型")] public string CarModeCode { get; set; } /// - /// LineStationcode + /// 生产线 /// - [Display(Name = "LineStationcode")] - [ExporterHeader(DisplayName = "LineStationcode")] + [Display(Name = "生产线")] + [ExporterHeader(DisplayName = "生产线")] public string LineStationcode { get; set; } /// - /// SequenceNumber + /// 生产码序列号日期 /// - [Display(Name = "SequenceNumber")] - [ExporterHeader(DisplayName = "SequenceNumber")] + [Display(Name = "生产码序列号日期")] + [ExporterHeader(DisplayName = "生产码序列号日期")] public string SequenceNumber { get; set; } /// + /// 生产码 + /// + [Display(Name = "生产码")] + [ExporterHeader(DisplayName = "生产码")] + public string PN { get; set; } + /// + /// 物料号 + /// + [Display(Name = "物料号")] + [ExporterHeader(DisplayName = "物料号")] + public string MaterialNumber { get; set; } + /// + /// 物料描述 + /// + [Display(Name = "物料描述")] + [ExporterHeader(DisplayName = "物料描述")] + public string MaterialDes { get; set; } + /// + /// WMS发货数量 + /// + [Display(Name = "WMS发货数量")] + [ExporterHeader(DisplayName = "WMS发货数量")] + public decimal SEQty { get; set; } + /// + /// EDI数量 + /// + [Display(Name = "EDI数量")] + [ExporterHeader(DisplayName = "EDI数量")] + public decimal EdiQty { get; set; } + /// + /// WMS发货与EDI数量差 + /// + [Display(Name = "WMS发货与EDI数量差")] + [ExporterHeader(DisplayName = "WMS发货与EDI数量差")] + public decimal DiffQty => SEQty - EdiQty; + /// + /// 交货单号 + /// + [Display(Name = "交货单号")] + [ExporterHeader(DisplayName = "交货单号")] + public string WmsBillNum { get; set; } + /// /// ParType /// [Display(Name = "ParType")] @@ -73,12 +109,6 @@ public class JisHBPOEidSeCompareExport [ExporterHeader(DisplayName = "实际发货生产号")] public string RealCode { get; set; } /// - /// 生产码 - /// - [Display(Name = "生产码")] - [ExporterHeader(DisplayName = "生产码")] - public string PN { get; set; } - /// /// 序列号 /// [Display(Name = "序列号")] @@ -103,36 +133,6 @@ public class JisHBPOEidSeCompareExport [ExporterHeader(DisplayName = "ERP目标库位")] public string ErpToLoc { get; set; } /// - /// 物料号 - /// - [Display(Name = "物料号")] - [ExporterHeader(DisplayName = "物料号")] - public string MaterialNumber { get; set; } - /// - /// 物料描述 - /// - [Display(Name = "物料描述")] - [ExporterHeader(DisplayName = "物料描述")] - public string MaterialDes { get; set; } - /// - /// WMS发货数量 - /// - [Display(Name = "WMS发货数量")] - [ExporterHeader(DisplayName = "WMS发货数量")] - public decimal SEQty { get; set; } - /// - /// EDI数量 - /// - [Display(Name = "EDI数量")] - [ExporterHeader(DisplayName = "EDI数量")] - public decimal EdiQty { get; set; } - /// - /// WMS发货与EDI数量差 - /// - [Display(Name = "WMS发货与EDI数量差")] - [ExporterHeader(DisplayName = "WMS发货与EDI数量差")] - public decimal DiffQty => SEQty - EdiQty; - /// /// 客户下线时间 /// [Display(Name = "客户下线时间")]