调整发运、EDI对比报表顺序

1 year ago · 436baa4eaf
2 changed files with 87 additions and 87 deletions
--- 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; }
    /// <summary>
-    /// 交货单号
-    /// </summary>
-    [Display(Name = "交货单号")]
-    [ExporterHeader(DisplayName = "交货单号")]
-    public string WmsBillNum { get; set; }
-    /// <summary>
    /// 车型
    /// </summary>
    [Display(Name = "车型")]
@ -49,42 +43,12 @@ public class JisBBACEidSeCompareExport
    [ExporterHeader(DisplayName = "生产码序列号日期")]
    public string SequenceNumber { get; set; }
    /// <summary>
-    /// ParType
-    /// </summary>
-    [Display(Name = "ParType")]
-    [ExporterHeader(DisplayName = "ParType")]
-    public string ParType { get; set; }
-    /// <summary>
-    /// 配置码
-    /// </summary>
-    [Display(Name = "配置码")]
-    [ExporterHeader(DisplayName = "配置码")]
-    public string MESConfigCode { get; set; }
-    /// <summary>
-    /// 发货日期
-    /// </summary>
-    [Display(Name = "发货日期")]
-    [ExporterHeader(DisplayName = "发货日期", Format = "yyyy-MM-dd")]
-    public DateTime? ShippingDate { get; set; }
-    /// <summary>
    /// 生产码
    /// </summary>
    [Display(Name = "生产码")]
    [ExporterHeader(DisplayName = "生产码")]
    public string PN { get; set; }
    /// <summary>
-    /// 序列号
-    /// </summary>
-    [Display(Name = "序列号")]
-    [ExporterHeader(DisplayName = "序列号")]
-    public string Seq { get; set; }
-    /// <summary>
-    /// PJIS日顺序号
-    /// </summary>
-    [Display(Name = "PJIS日顺序号")]
-    [ExporterHeader(DisplayName = "PJIS日顺序号")]
-    public string PjsNum { get; set; }
-    /// <summary>
    /// 物料号
    /// </summary>
    [Display(Name = "物料号")]
@ -115,6 +79,42 @@ public class JisBBACEidSeCompareExport
    [ExporterHeader(DisplayName = "WMS发货与EDI数量差")]
    public decimal DiffQty => SEQty - EdiQty;
    /// <summary>
+    /// 交货单号
+    /// </summary>
+    [Display(Name = "交货单号")]
+    [ExporterHeader(DisplayName = "交货单号")]
+    public string WmsBillNum { get; set; }
+    /// <summary>
+    /// ParType
+    /// </summary>
+    [Display(Name = "ParType")]
+    [ExporterHeader(DisplayName = "ParType")]
+    public string ParType { get; set; }
+    /// <summary>
+    /// 配置码
+    /// </summary>
+    [Display(Name = "配置码")]
+    [ExporterHeader(DisplayName = "配置码")]
+    public string MESConfigCode { get; set; }
+    /// <summary>
+    /// 发货日期
+    /// </summary>
+    [Display(Name = "发货日期")]
+    [ExporterHeader(DisplayName = "发货日期", Format = "yyyy-MM-dd")]
+    public DateTime? ShippingDate { get; set; }   
+    /// <summary>
+    /// 序列号
+    /// </summary>
+    [Display(Name = "序列号")]
+    [ExporterHeader(DisplayName = "序列号")]
+    public string Seq { get; set; }
+    /// <summary>
+    /// PJIS日顺序号
+    /// </summary>
+    [Display(Name = "PJIS日顺序号")]
+    [ExporterHeader(DisplayName = "PJIS日顺序号")]
+    public string PjsNum { get; set; }  
+    /// <summary>
    /// 客户下线时间
    /// </summary>
    [Display(Name = "客户下线时间")]
--- 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; }
    /// <summary>
-    /// 交货单号
-    /// </summary>
-    [Display(Name = "交货单号")]
-    [ExporterHeader(DisplayName = "交货单号")]
-    public string WmsBillNum { get; set; }
-    /// <summary>
-    /// CarModeCode
+    /// 车型
    /// </summary>
-    [Display(Name = "CarModeCode")]
-    [ExporterHeader(DisplayName = "CarModeCode")]
+    [Display(Name = "车型")]
+    [ExporterHeader(DisplayName = "车型")]
    public string CarModeCode { get; set; }
    /// <summary>
-    /// LineStationcode
+    /// 生产线
    /// </summary>
-    [Display(Name = "LineStationcode")]
-    [ExporterHeader(DisplayName = "LineStationcode")]
+    [Display(Name = "生产线")]
+    [ExporterHeader(DisplayName = "生产线")]
    public string LineStationcode { get; set; }
    /// <summary>
-    /// SequenceNumber
+    /// 生产码序列号日期
    /// </summary>
-    [Display(Name = "SequenceNumber")]
-    [ExporterHeader(DisplayName = "SequenceNumber")]
+    [Display(Name = "生产码序列号日期")]
+    [ExporterHeader(DisplayName = "生产码序列号日期")]
    public string SequenceNumber { get; set; }
    /// <summary>
+    /// 生产码
+    /// </summary>
+    [Display(Name = "生产码")]
+    [ExporterHeader(DisplayName = "生产码")]
+    public string PN { get; set; }
+    /// <summary>
+    /// 物料号
+    /// </summary>
+    [Display(Name = "物料号")]
+    [ExporterHeader(DisplayName = "物料号")]
+    public string MaterialNumber { get; set; }
+    /// <summary>
+    /// 物料描述
+    /// </summary>
+    [Display(Name = "物料描述")]
+    [ExporterHeader(DisplayName = "物料描述")]
+    public string MaterialDes { get; set; }
+    /// <summary>
+    /// WMS发货数量
+    /// </summary>
+    [Display(Name = "WMS发货数量")]
+    [ExporterHeader(DisplayName = "WMS发货数量")]
+    public decimal SEQty { get; set; }
+    /// <summary>
+    /// EDI数量
+    /// </summary>
+    [Display(Name = "EDI数量")]
+    [ExporterHeader(DisplayName = "EDI数量")]
+    public decimal EdiQty { get; set; }
+    /// <summary>
+    /// WMS发货与EDI数量差
+    /// </summary>
+    [Display(Name = "WMS发货与EDI数量差")]
+    [ExporterHeader(DisplayName = "WMS发货与EDI数量差")]
+    public decimal DiffQty => SEQty - EdiQty;
+    /// <summary>
+    /// 交货单号
+    /// </summary>
+    [Display(Name = "交货单号")]
+    [ExporterHeader(DisplayName = "交货单号")]
+    public string WmsBillNum { get; set; }
+    /// <summary>
    /// ParType
    /// </summary>
    [Display(Name = "ParType")]
@ -73,12 +109,6 @@ public class JisHBPOEidSeCompareExport
    [ExporterHeader(DisplayName = "实际发货生产号")]
    public string RealCode { get; set; }
    /// <summary>
-    /// 生产码
-    /// </summary>
-    [Display(Name = "生产码")]
-    [ExporterHeader(DisplayName = "生产码")]
-    public string PN { get; set; }
-    /// <summary>
    /// 序列号
    /// </summary>
    [Display(Name = "序列号")]
@ -103,36 +133,6 @@ public class JisHBPOEidSeCompareExport
    [ExporterHeader(DisplayName = "ERP目标库位")]
    public string ErpToLoc { get; set; }
    /// <summary>
-    /// 物料号
-    /// </summary>
-    [Display(Name = "物料号")]
-    [ExporterHeader(DisplayName = "物料号")]
-    public string MaterialNumber { get; set; }
-    /// <summary>
-    /// 物料描述
-    /// </summary>
-    [Display(Name = "物料描述")]
-    [ExporterHeader(DisplayName = "物料描述")]
-    public string MaterialDes { get; set; }
-    /// <summary>
-    /// WMS发货数量
-    /// </summary>
-    [Display(Name = "WMS发货数量")]
-    [ExporterHeader(DisplayName = "WMS发货数量")]
-    public decimal SEQty { get; set; }
-    /// <summary>
-    /// EDI数量
-    /// </summary>
-    [Display(Name = "EDI数量")]
-    [ExporterHeader(DisplayName = "EDI数量")]
-    public decimal EdiQty { get; set; }
-    /// <summary>
-    /// WMS发货与EDI数量差
-    /// </summary>
-    [Display(Name = "WMS发货与EDI数量差")]
-    [ExporterHeader(DisplayName = "WMS发货与EDI数量差")]
-    public decimal DiffQty => SEQty - EdiQty;
-    /// <summary>
    /// 客户下线时间
    /// </summary>
    [Display(Name = "客户下线时间")]