单据修改

mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/po/BusinessDocumentOrderPO.java

@@ -674,6 +674,8 @@ public class BusinessDocumentOrderPO extends BaseVOEntity{
 
     @ApiModelProperty("$column.columnComment")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date documentDate;
 
 
@@ -764,6 +766,8 @@ public class BusinessDocumentOrderPO extends BaseVOEntity{
     private String entryNumber;
 
     @ApiModelProperty("预计出发日期")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date layDate;
 
     @ApiModelProperty("出入库单号")

mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/service/BusinessDocumentOrderDomainService.java

@@ -393,7 +393,7 @@ public class BusinessDocumentOrderDomainService {
             tmsOrder.setSplicingOrderType(0L); // 普通单
         }
         //一天后
-        tmsOrder.setDocumentDate(DateUtils.addHours(new Date(), 24));
+        tmsOrder.setDocumentDate(businessDocumentOrderDO.getDocumentDate());
 
         boolean istrue = businessDocumentOrderMapper.insert(tmsOrder) > 0;
 
@@ -485,6 +485,7 @@ public class BusinessDocumentOrderDomainService {
             throw new ServiceException("运单已被关闭，请确认！");
         }
         //处理费用默认值
+        tmsOrder.setDocumentDate(businessDocumentOrderDO.getDocumentDate());
         handFee(businessDocumentOrderDO);
         //组织赋值
         Long organizationId = businessDocumentOrderDO.getOrganizationId();

mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/po/ExecuteOrderPO.java

@@ -31,6 +31,7 @@ public class ExecuteOrderPO extends BaseVOEntity{
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private Long id;
 
+
     @ApiModelProperty("$column.columnComment")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String realCreateBy;
@@ -123,6 +124,8 @@ public class ExecuteOrderPO extends BaseVOEntity{
     private String  jobStatus;
 
     @ApiModelProperty("预计运输时间")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date  documentDate;
 
     @ApiModelProperty("备注")
@@ -188,6 +191,8 @@ public class ExecuteOrderPO extends BaseVOEntity{
 
     @ApiModelProperty("$column.columnComment")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date layDate;
 
     @ApiModelProperty("$column.columnComment")

mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/todo/ExecuteOrderDO.java

@@ -172,4 +172,14 @@ public class ExecuteOrderDO extends BaseVOEntity{
 
     @ApiModelProperty("车次")
     private Integer trainNo;
+
+    @ApiModelProperty("预计开始日期")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date documentStartTime;
+
+    @ApiModelProperty("预计结束日期")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date documentEndTime;
 }

mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentOrder/BusinessDocumentOrderDTO.java

@@ -673,8 +673,8 @@ public class BusinessDocumentOrderDTO extends BaseVOEntity{
 
     @ApiModelProperty("$column.columnComment")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-//    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-//    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date documentDate;
 
 

mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/executeOrder/ExecuteOrderDTO.java

@@ -162,4 +162,14 @@ public class ExecuteOrderDTO extends BaseVOEntity{
     @ApiModelProperty("车次")
     private Integer trainNo;
 
+    @ApiModelProperty("预计开始日期")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date documentStartTime;
+
+    @ApiModelProperty("预计结束日期")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date documentEndTime;
+
 }

mhd_oms/src/main/resources/mapper/executeOrder/ExecuteOrderMapper.xml

@@ -69,6 +69,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="invoiceEndTime != null">
                 and eo.INVOICE_DATE <![CDATA[ < ]]> DATEADD(DAY, 1, #{invoiceEndTime,jdbcType=DATE})
             </if>
+            <if test="documentStartTime != null">
+                and eo.DOCUMENT_DATE >= #{documentStartTime,jdbcType=DATE}
+            </if>
+            <if test="documentEndTime != null">
+                and eo.DOCUMENT_DATE <![CDATA[ < ]]> DATEADD(DAY, 1, #{documentEndTime,jdbcType=DATE})
+            </if>
 <!--            <if test="invoiceStartTime != null">-->
 <!--            and eo.INVOICE_DATE >= #{invoiceStartTime}-->
 <!--        </if>-->