楚江erp: 发货明细表相关逻辑调整

@@ -101,7 +101,7 @@ public class ShipmentDetailStatisticsController extends DefaultBaseController {
     @ApiOperation("发货明细导出")
     @ApiOperation("发货明细导出")
     @HasPermission({"statistics:shipmentDetail:export"})
     @HasPermission({"statistics:shipmentDetail:export"})
     @GetMapping("/export")
     @GetMapping("/export")
-    public InvokeResult<Void> export(@Valid ReceiptLedgerReportVo vo) {
+    public InvokeResult<Void> export(@Valid QueryShipmentDetailStatisticsVo vo) {
         vo.setExportType(ExportType.SHIPMENT_DETAIL_REPORT.getCode());
         vo.setExportType(ExportType.SHIPMENT_DETAIL_REPORT.getCode());
         ExportTaskUtil.exportTask("发货明细报表", ShipmentDetailReportExportTaskWorker.class, vo);
         ExportTaskUtil.exportTask("发货明细报表", ShipmentDetailReportExportTaskWorker.class, vo);
         return InvokeResultBuilder.success();
         return InvokeResultBuilder.success();

 package com.lframework.xingyun.sc.excel.statistics;
 package com.lframework.xingyun.sc.excel.statistics;
 
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.lframework.starter.common.constants.StringPool;
 import com.lframework.starter.web.core.components.excel.ExcelModel;
 import com.lframework.starter.web.core.components.excel.ExcelModel;
 import lombok.Data;
 import lombok.Data;
 
 
@@ -182,6 +184,7 @@ public class ShipmentDetailStatisticsModel implements ExcelModel {
      * 订货日期
      * 订货日期
      */
      */
     @ExcelProperty("订货日期")
     @ExcelProperty("订货日期")
+    @JsonFormat(pattern = StringPool.DATE_PATTERN)
     private LocalDate orderDate;
     private LocalDate orderDate;
 
 
     /**
     /**
@@ -242,6 +245,7 @@ public class ShipmentDetailStatisticsModel implements ExcelModel {
      * 发货日期
      * 发货日期
      */
      */
     @ExcelProperty("发货日期")
     @ExcelProperty("发货日期")
+    @JsonFormat(pattern = StringPool.DATE_PATTERN)
     private LocalDate shipmentDate;
     private LocalDate shipmentDate;
 
 
     /**
     /**

@@ -47,4 +47,10 @@ public class QueryShipmentDetailStatisticsVo extends PageVo implements BaseVo, S
      */
      */
     @ApiModelProperty("发货单编号")
     @ApiModelProperty("发货单编号")
     private String shipmentOrderNo;
     private String shipmentOrderNo;
+
+    /**
+     * 导出类型
+     */
+    @ApiModelProperty("导出类型")
+    private String exportType;
 }
 }

@@ -148,6 +148,7 @@
             o.settlement_terms,
             o.settlement_terms,
             o.supply_unit as supplier,
             o.supply_unit as supplier,
             o.workshop_id,
             o.workshop_id,
+            o.delivery_method,
             so.code as shipment_order_no,
             so.code as shipment_order_no,
             so.create_time as shipment_date,
             so.create_time as shipment_date,
             sc.id as contract_id,
             sc.id as contract_id,
@@ -162,6 +163,7 @@
         left join tbl_contract_distributor_standard sc on o.contract_id = sc.id
         left join tbl_contract_distributor_standard sc on o.contract_id = sc.id
         left join tbl_contract_std_processing_line cl on sc.id = cl.contract_id
         left join tbl_contract_std_processing_line cl on sc.id = cl.contract_id
         <where>
         <where>
+            and sd.del_flag = false
             <if test="vo.ids != null and vo.ids.size() > 0">
             <if test="vo.ids != null and vo.ids.size() > 0">
                 and sd.id in
                 and sd.id in
                 <foreach collection="vo.ids" open="(" separator="," close=")" item="item">
                 <foreach collection="vo.ids" open="(" separator="," close=")" item="item">