From 11c7fdc7def83b24057046a1de514c29f6cdf0fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E8=BE=89?= <2830717623@qq.com> Date: Sat, 27 Jun 2026 14:00:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/po/BusinessDocumentOrderPO.java | 4 ++++ .../service/BusinessDocumentOrderDomainService.java | 3 ++- .../executeOrder/repository/po/ExecuteOrderPO.java | 5 +++++ .../executeOrder/repository/todo/ExecuteOrderDO.java | 10 ++++++++++ .../BusinessDocumentOrderDTO.java | 4 ++-- .../interfaces/dto/executeOrder/ExecuteOrderDTO.java | 10 ++++++++++ .../mapper/executeOrder/ExecuteOrderMapper.xml | 6 ++++++ 7 files changed, 39 insertions(+), 3 deletions(-) diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/po/BusinessDocumentOrderPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/po/BusinessDocumentOrderPO.java index b177fea75..01d086726 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/po/BusinessDocumentOrderPO.java +++ b/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("出入库单号") diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/service/BusinessDocumentOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/service/BusinessDocumentOrderDomainService.java index e5de9839e..9274c8d70 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/service/BusinessDocumentOrderDomainService.java +++ b/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(); diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/po/ExecuteOrderPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/po/ExecuteOrderPO.java index a950d614e..2850291a5 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/po/ExecuteOrderPO.java +++ b/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") diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/todo/ExecuteOrderDO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/todo/ExecuteOrderDO.java index 13a5adf17..63c73e9f3 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/todo/ExecuteOrderDO.java +++ b/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; } diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentOrder/BusinessDocumentOrderDTO.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentOrder/BusinessDocumentOrderDTO.java index d77699e21..8a28203e1 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentOrder/BusinessDocumentOrderDTO.java +++ b/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; diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/executeOrder/ExecuteOrderDTO.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/executeOrder/ExecuteOrderDTO.java index 1723e8118..8b330cf53 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/executeOrder/ExecuteOrderDTO.java +++ b/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; + } \ No newline at end of file diff --git a/mhd_oms/src/main/resources/mapper/executeOrder/ExecuteOrderMapper.xml b/mhd_oms/src/main/resources/mapper/executeOrder/ExecuteOrderMapper.xml index 4ab028a8c..82a826d88 100644 --- a/mhd_oms/src/main/resources/mapper/executeOrder/ExecuteOrderMapper.xml +++ b/mhd_oms/src/main/resources/mapper/executeOrder/ExecuteOrderMapper.xml @@ -69,6 +69,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and eo.INVOICE_DATE DATEADD(DAY, 1, #{invoiceEndTime,jdbcType=DATE}) + + and eo.DOCUMENT_DATE >= #{documentStartTime,jdbcType=DATE} + + + and eo.DOCUMENT_DATE DATEADD(DAY, 1, #{documentEndTime,jdbcType=DATE}) +