楚江erp: 发货单列表、详情增加字段

@@ -126,6 +126,18 @@ public class GetShipmentsOrderInfoBo extends BaseBo<ShipmentsOrderInfo> {
     private String fileName;
     private String fileName;
 
 
     /**
     /**
+     * 是否当日发货
+     */
+    @ApiModelProperty("是否当日发货")
+    private Boolean onTimeShipment;
+
+    /**
+     * 新发货日期
+     */
+    @ApiModelProperty("新发货日期")
+    private LocalDate newShipmentDate;
+
+    /**
      * 发货明细数据
      * 发货明细数据
      */
      */
     @ApiModelProperty("发货明细数据")
     @ApiModelProperty("发货明细数据")

@@ -105,6 +105,18 @@ public class QueryShipmentsOrderInfoBo extends BaseBo<ShipmentsOrderInfo> {
     private String status;
     private String status;
 
 
     /**
     /**
+     * 是否当日发货
+     */
+    @ApiModelProperty("是否当日发货")
+    private Boolean onTimeShipment;
+
+    /**
+     * 新发货日期
+     */
+    @ApiModelProperty("新发货日期")
+    private LocalDate newShipmentDate;
+
+    /**
      * 创建人ID
      * 创建人ID
      */
      */
     @ApiModelProperty("创建人ID")
     @ApiModelProperty("创建人ID")

@@ -50,12 +50,8 @@ import java.math.RoundingMode;
 import java.nio.file.Files;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.Paths;
-import java.time.Duration;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.*;
-import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 import java.util.zip.ZipOutputStream;

@@ -874,6 +874,10 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
                 mqProducerService.createSysSiteMessage(messageDto);
                 mqProducerService.createSysSiteMessage(messageDto);
                 // 更新发货单状态为草稿
                 // 更新发货单状态为草稿
                 updateStatus(shipmentsOrderId, "DRAFT");
                 updateStatus(shipmentsOrderId, "DRAFT");
+                continue;
+            }
+            if (!"PASS".equals(draftTicket.getStatus())) {
+                throw new DefaultClientException("请先补充草稿要车单数据！");
             }
             }
         }
         }
     }
     }

@@ -36,6 +36,8 @@
             tb.delivery_type,
             tb.delivery_type,
             tb.destination,
             tb.destination,
             tb.status,
             tb.status,
+            tb.on_time_shipment,
+            tb.new_shipment_date,
             u.name as create_by,
             u.name as create_by,
             tb.create_by_id,
             tb.create_by_id,
             tb.update_by_id,
             tb.update_by_id,