楚江erp-发货明细报表：开票情况改为开票要求

@@ -204,9 +204,9 @@ public class ShipmentDetailStatistics extends BaseEntity implements BaseDto, Exc
     private String yieldBatchNo;
     private String yieldBatchNo;
 
 
     /**
     /**
-     * 开票情况
+     * 开票要求
      */
      */
-    private String invoicingStatus;
+    private String invoiceRequirements;
 
 
     /**
     /**
      * 订货日期
      * 订货日期

@@ -123,7 +123,7 @@ public class ShipmentDetailStatisticsServiceImpl extends BaseMpServiceImpl<Shipm
         data.setStockUpCompanyName(vo.getStockUpCompanyName());
         data.setStockUpCompanyName(vo.getStockUpCompanyName());
         data.setOrderNo(vo.getOrderNo());
         data.setOrderNo(vo.getOrderNo());
         data.setYieldBatchNo(vo.getYieldBatchNo());
         data.setYieldBatchNo(vo.getYieldBatchNo());
-        data.setInvoicingStatus(vo.getInvoicingStatus());
+        data.setInvoiceRequirements(vo.getInvoiceRequirements());
         data.setOrderDate(vo.getOrderDate());
         data.setOrderDate(vo.getOrderDate());
         data.setPackagingFee(vo.getPackagingFee());
         data.setPackagingFee(vo.getPackagingFee());
         data.setQuality(vo.getQuality());
         data.setQuality(vo.getQuality());

@@ -221,11 +221,11 @@ public class CreateShipmentDetailStatisticsVo implements BaseVo, Serializable {
     private String yieldBatchNo;
     private String yieldBatchNo;
 
 
     /**
     /**
-     * 开票情况
+     * 开票要求
      */
      */
-    @ApiModelProperty(value = "开票情况", required = true)
-    @Length(message = "开票情况最多允许50个字符！")
-    private String invoicingStatus;
+    @ApiModelProperty(value = "开票要求", required = true)
+    @Length(message = "开票要求最多允许50个字符！")
+    private String invoiceRequirements;
 
 
     /**
     /**
      * 订货日期
      * 订货日期

@@ -30,7 +30,7 @@
         <result column="stock_up_company_name" property="stockUpCompanyName"/>
         <result column="stock_up_company_name" property="stockUpCompanyName"/>
         <result column="order_no" property="orderNo"/>
         <result column="order_no" property="orderNo"/>
         <result column="yield_batch_no" property="yieldBatchNo"/>
         <result column="yield_batch_no" property="yieldBatchNo"/>
-        <result column="invoicing_status" property="invoicingStatus"/>
+        <result column="invoice_requirements" property="invoiceRequirements"/>
         <result column="order_date" property="orderDate"/>
         <result column="order_date" property="orderDate"/>
         <result column="packaging_fee" property="packagingFee"/>
         <result column="packaging_fee" property="packagingFee"/>
         <result column="quality" property="quality"/>
         <result column="quality" property="quality"/>
@@ -78,7 +78,7 @@
             tb.stock_up_company_name,
             tb.stock_up_company_name,
             tb.order_no,
             tb.order_no,
             tb.yield_batch_no,
             tb.yield_batch_no,
-            tb.invoicing_status,
+            tb.invoice_requirements,
             tb.order_date,
             tb.order_date,
             tb.packaging_fee,
             tb.packaging_fee,
             tb.quality,
             tb.quality,
@@ -143,7 +143,7 @@
             o.delivery_method,
             o.delivery_method,
             o.stock_up_company_id,
             o.stock_up_company_id,
             o.order_no,
             o.order_no,
-            o.invoicing_status,
+            o.invoicing_status as invoice_requirements,
             o.order_date,
             o.order_date,
             o.settlement_terms,
             o.settlement_terms,
             o.supply_unit as supplier,
             o.supply_unit as supplier,
@@ -209,7 +209,7 @@
             stock_up_company_name,
             stock_up_company_name,
             order_no,
             order_no,
             yield_batch_no,
             yield_batch_no,
-            invoicing_status,
+            invoice_requirements,
             order_date,
             order_date,
             packaging_fee,
             packaging_fee,
             quality,
             quality,
@@ -256,7 +256,7 @@
                 #{item.stockUpCompanyName},
                 #{item.stockUpCompanyName},
                 #{item.orderNo},
                 #{item.orderNo},
                 #{item.yieldBatchNo},
                 #{item.yieldBatchNo},
-                #{item.invoicingStatus},
+                #{item.invoiceRequirements},
                 #{item.orderDate},
                 #{item.orderDate},
                 #{item.packagingFee},
                 #{item.packagingFee},
                 #{item.quality},
                 #{item.quality},