[feat]修改：修改销售订单信息，销售物料子表信息，@excel注解补全信息。

ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrder.java

@@ -52,7 +52,7 @@ public class SysSalesOrder extends BaseEntity {
     /* 客户代码*/
     @Excel(name = "客户代码")
     private String enterpriseCode;
-    @Excel(name="币种")
+    @Excel(name="币种",dictType = "sys_common_currency")
     private String commonCurrency;
     /*美元汇率*/
     @Excel(name = "美元汇率")
@@ -109,15 +109,10 @@ public class SysSalesOrder extends BaseEntity {
     @Excel(name = "客户收货人")
     private String customerDelivery;
 
-    /*客户收货人(Bill to)*/
-    private String customerDeliveryBillto;
-
-
     /*客户收货人电话*/
+    @Excel(name = "客户收货人电话")
     private String deliveryPhone;
 
-    /*客户收货人电话(Bill to)*/
-    private String deliveryPhoneBillto;
 
     /* 交货条件*/
     @Excel(name = "交货条件")
@@ -129,9 +124,6 @@ public class SysSalesOrder extends BaseEntity {
     @Excel(name = "交货地点")
     private String deliveryAddress;
 
-    /*交货地点(Bill to)*/
-    private String deliveryAddressBillto;
-
 
     /*付款条件*/
     @Excel(name = "付款条件")
@@ -169,7 +161,7 @@ public class SysSalesOrder extends BaseEntity {
     @Excel(name = "合计金额")
     private String totalAmount;
     /* 文件存储 */
-    @Excel(name = "文件存储")
+//    @Excel(name = "文件存储")
     private String fileUpload;
     /*备用一*/
     @Excel(name = "实收金额(RMB)")
@@ -216,6 +208,12 @@ public class SysSalesOrder extends BaseEntity {
 
 
 
+    /*交货地点(Bill to)*/
+    private String deliveryAddressBillto;
+    /*客户收货人(Bill to)*/
+    private String customerDeliveryBillto;
+    /*客户收货人电话(Bill to)*/
+    private String deliveryPhoneBillto;
     public Long getSalesOrderId() {
         return salesOrderId;
     }

ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrderChild.java

@@ -16,8 +16,10 @@ public class SysSalesOrderChild extends BaseEntity {
     /* 订单id*/
     private Long id;
     /*使用状态*/
+    @Excel(name = "使用状态",dictType = "useStatus")
     private String useStatus;
     /*审核状态*/
+    @Excel(name = "审核状态",dictType = "auditStatus")
     private String auditStatus;
 
     /* 客户代码*/
@@ -77,8 +79,10 @@ public class SysSalesOrderChild extends BaseEntity {
     @Excel(name = "美元汇率")
     private Double usdTax;
     /*物料合计*/
+    @Excel(name = "物料合计")
     private Integer materialSum;
     /*数量合计*/
+    @Excel(name = "数量合计")
     private Double enterpriseSum;
     @Excel(name = "物料的数量")
     private Integer materialNum;
@@ -138,14 +142,17 @@ public class SysSalesOrderChild extends BaseEntity {
     private Integer unBoundQuantity;
 
     //已完成数
+    @Excel(name = "已完成数")
     private Integer finishNum;
 
     //申请出货数
+    @Excel(name = "申请出货数")
     private Integer applyShippingNum;
 
+    @Excel(name = "已申请出货数")
     //已申请出货数
     private Integer hasApplyShippingNum;
-
+    @Excel(name = "已验收数")
     //已验收数
     private Integer hasCheckNum;