weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

日期时区问题修改;

Browse Source
This commit is contained in:
王奎兴
2026-05-28 21:20:07 +08:00
parent ed90334752
commit 39503f9f3c
108 changed files with 338 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/MaterialInventoryPO.java
+5 -5
View File
@@ -174,31 +174,31 @@ public class MaterialInventoryPO extends MaterialBasePO {
private String extAttr2; private String extAttr2;
@ApiModelProperty("生产日期") @ApiModelProperty("生产日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date productionDate; private Date productionDate;
@ApiModelProperty("过期日期") @ApiModelProperty("过期日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date expiryDate; private Date expiryDate;
@ApiModelProperty("存货日期") @ApiModelProperty("存货日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date inventoryDate; private Date inventoryDate;
@ApiModelProperty("ExtAttr3") @ApiModelProperty("ExtAttr3")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "ExtAttr3", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "ExtAttr3", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date extAttr3; private Date extAttr3;
@ApiModelProperty("ExtAttr4") @ApiModelProperty("ExtAttr4")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "ExtAttr4", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "ExtAttr4", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date extAttr4; private Date extAttr4;
mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/StockOutOrder.java
+4 -4
View File
@@ -120,7 +120,7 @@ public class StockOutOrder extends BaseVOEntity {
private String customerName; private String customerName;
@ApiModelProperty("预计出货时间") @ApiModelProperty("预计出货时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "预计出货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "预计出货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date expectTime; private Date expectTime;
@@ -232,7 +232,7 @@ public class StockOutOrder extends BaseVOEntity {
private Integer checkTaskDistribution; private Integer checkTaskDistribution;
@ApiModelProperty("复核任务下发时间") @ApiModelProperty("复核任务下发时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "复核任务下发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "复核任务下发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date checkTaskDistributionTime; private Date checkTaskDistributionTime;
@@ -339,12 +339,12 @@ public class StockOutOrder extends BaseVOEntity {
@Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date outboundDate; private Date outboundDate;
@ApiModelProperty("完成时间") @ApiModelProperty("完成时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date completeTime; private Date completeTime;
@ApiModelProperty("orderDate") @ApiModelProperty("orderDate")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "orderDate", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "orderDate", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date orderDate; private Date orderDate;
mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/StockOutOrderTZPD.java
+4 -4
View File
@@ -120,7 +120,7 @@ public class StockOutOrderTZPD extends BaseVOEntity {
private String customerName; private String customerName;
@ApiModelProperty("预计出货时间") @ApiModelProperty("预计出货时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "预计出货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "预计出货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date expectTime; private Date expectTime;
@@ -232,7 +232,7 @@ public class StockOutOrderTZPD extends BaseVOEntity {
private Integer checkTaskDistribution; private Integer checkTaskDistribution;
@ApiModelProperty("复核任务下发时间") @ApiModelProperty("复核任务下发时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "复核任务下发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "复核任务下发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date checkTaskDistributionTime; private Date checkTaskDistributionTime;
@@ -339,12 +339,12 @@ public class StockOutOrderTZPD extends BaseVOEntity {
@Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date outboundDate; private Date outboundDate;
@ApiModelProperty("完成时间") @ApiModelProperty("完成时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date completeTime; private Date completeTime;
@ApiModelProperty("orderDate") @ApiModelProperty("orderDate")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "orderDate", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "orderDate", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date orderDate; private Date orderDate;
mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/SysLogininfor.java
+2 -2
View File
@@ -96,7 +96,7 @@ public class SysLogininfor {
/** /**
* 访问时间 * 访问时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "访问时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "访问时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date accessTime; private Date accessTime;
@@ -109,4 +109,4 @@ public class SysLogininfor {
* 响应时间ms * 响应时间ms
*/ */
private String responseTime; private String responseTime;
} }
mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/SysOperLog.java
+2 -2
View File
@@ -156,7 +156,7 @@ public class SysOperLog {
/** /**
* 操作时间 * 操作时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date operTime; private Date operTime;
@@ -176,4 +176,4 @@ public class SysOperLog {
* 端口 * 端口
*/ */
private String port; private String port;
} }
mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/UserUpdateDTO.java
+2 -2
View File
@@ -76,7 +76,7 @@ public class UserUpdateDTO extends BaseVOEntity {
private String userWechatSessionKey; private String userWechatSessionKey;
@ApiModelProperty(name = "密码登录错误次数") @ApiModelProperty(name = "密码登录错误次数")
private Integer passwordWrongTimes; private Integer passwordWrongTimes;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(name = "最近一次登录时间") @ApiModelProperty(name = "最近一次登录时间")
private Date lastLoginTime; private Date lastLoginTime;
@ApiModelProperty(name = "最近一次登录IP") @ApiModelProperty(name = "最近一次登录IP")
@@ -122,4 +122,4 @@ public class UserUpdateDTO extends BaseVOEntity {
@ApiModelProperty(name = "请求域名") @ApiModelProperty(name = "请求域名")
private String tenantsDomainName; private String tenantsDomainName;
} }
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/BranchFreightBillDO.java
+4 -4
View File
@@ -98,17 +98,17 @@ public class BranchFreightBillDO extends BaseVOEntity {
private BigDecimal retainedAmount; private BigDecimal retainedAmount;
@ApiModelProperty("开单时间") @ApiModelProperty("开单时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "开单时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "开单时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date billingTime; private Date billingTime;
@ApiModelProperty("签收时间") @ApiModelProperty("签收时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "签收时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "签收时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date signTime; private Date signTime;
@ApiModelProperty("确认时间") @ApiModelProperty("确认时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "确认时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "确认时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date authTime; private Date authTime;
@@ -125,4 +125,4 @@ public class BranchFreightBillDO extends BaseVOEntity {
@ApiModelProperty(name = "权限菜单ID") @ApiModelProperty(name = "权限菜单ID")
private Long permissionMenuId; private Long permissionMenuId;
} }
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/DispatchFeignDto.java
+7 -7
View File
@@ -203,7 +203,7 @@ public class DispatchFeignDto extends BaseVOEntity{
@Excel(name = "是否接单（1-未接单，2-已接单，3-已拒绝）") @Excel(name = "是否接单（1-未接单，2-已接单，3-已拒绝）")
private Long receivingStatus; private Long receivingStatus;
@ApiModelProperty("接单时间") @ApiModelProperty("接单时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "接单时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "接单时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date receivingDate; private Date receivingDate;
@ApiModelProperty("装货照片") @ApiModelProperty("装货照片")
@@ -239,7 +239,7 @@ public class DispatchFeignDto extends BaseVOEntity{
@ApiModelProperty(name = "发货地址纬度") @ApiModelProperty(name = "发货地址纬度")
private String sendLatitude; private String sendLatitude;
@ApiModelProperty("发货时间") @ApiModelProperty("发货时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date sendTime; private Date sendTime;
@ApiModelProperty(name = "收货地址地址") @ApiModelProperty(name = "收货地址地址")
@@ -249,7 +249,7 @@ public class DispatchFeignDto extends BaseVOEntity{
@ApiModelProperty(name = "收货地址纬度") @ApiModelProperty(name = "收货地址纬度")
private String receiveLatitude; private String receiveLatitude;
@ApiModelProperty("收货时间") @ApiModelProperty("收货时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date receiveTime; private Date receiveTime;
@ApiModelProperty(name = "派车运单id集合") @ApiModelProperty(name = "派车运单id集合")
private Long[] waybillIds; private Long[] waybillIds;
@@ -328,17 +328,17 @@ public class DispatchFeignDto extends BaseVOEntity{
private BigDecimal maxBiddingPrice; private BigDecimal maxBiddingPrice;
@ApiModelProperty("议价截止时间") @ApiModelProperty("议价截止时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date biddingTime; private Date biddingTime;
@ApiModelProperty("议价截止时间-开始") @ApiModelProperty("议价截止时间-开始")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date biddingTimeStart; private Date biddingTimeStart;
@ApiModelProperty("议价截止时间-结束") @ApiModelProperty("议价截止时间-结束")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date biddingTimeEnd; private Date biddingTimeEnd;
@@ -397,4 +397,4 @@ public class DispatchFeignDto extends BaseVOEntity{
@ApiModelProperty("支付凭证") @ApiModelProperty("支付凭证")
private String payImages; private String payImages;
} }
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/DispatchWaybillDto.java
+3 -3
View File
@@ -124,7 +124,7 @@ public class DispatchWaybillDto extends BaseVOEntity{
@ApiModelProperty(name = "发货地址纬度") @ApiModelProperty(name = "发货地址纬度")
private String sendLatitude; private String sendLatitude;
@ApiModelProperty("发货时间") @ApiModelProperty("发货时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date sendTime; private Date sendTime;
@ApiModelProperty(name = "收货地址经度") @ApiModelProperty(name = "收货地址经度")
@@ -134,7 +134,7 @@ public class DispatchWaybillDto extends BaseVOEntity{
@ApiModelProperty(name = "收货地址纬度") @ApiModelProperty(name = "收货地址纬度")
private String receiveLatitude; private String receiveLatitude;
@ApiModelProperty("收货时间") @ApiModelProperty("收货时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date receiveTime; private Date receiveTime;
/** /**
@@ -164,4 +164,4 @@ public class DispatchWaybillDto extends BaseVOEntity{
@ApiModelProperty("支付凭证") @ApiModelProperty("支付凭证")
private String payImages; private String payImages;
} }
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/ReconciliationDTO.java
+1 -1
View File
@@ -23,7 +23,7 @@ public class ReconciliationDTO extends BaseVOEntity{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty("创建时间") @ApiModelProperty("创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date createTime; private Date createTime;
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/ServiceBillDO.java
+3 -3
View File
@@ -89,12 +89,12 @@ public class ServiceBillDO extends BaseVOEntity {
private BigDecimal freight; private BigDecimal freight;
@ApiModelProperty("开单时间") @ApiModelProperty("开单时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "开单时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "开单时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date billingTime; private Date billingTime;
@ApiModelProperty("签收时间") @ApiModelProperty("签收时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "签收时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "签收时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date signTime; private Date signTime;
@@ -108,4 +108,4 @@ public class ServiceBillDO extends BaseVOEntity {
@ApiModelProperty(name = "权限菜单ID") @ApiModelProperty(name = "权限菜单ID")
private Long permissionMenuId; private Long permissionMenuId;
} }
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/wlhy/report/CapitalFlowReport.java
+2 -2
View File
@@ -102,7 +102,7 @@ public class CapitalFlowReport extends BaseVOEntity{
private Integer verifyStatus; private Integer verifyStatus;
@ApiModelProperty("信息检验时间") @ApiModelProperty("信息检验时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "信息检验时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "信息检验时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date verifyTime; private Date verifyTime;
@@ -129,4 +129,4 @@ public class CapitalFlowReport extends BaseVOEntity{
@ApiModelProperty("符合全部流水上报条件（1-符合，2-不符合）") @ApiModelProperty("符合全部流水上报条件（1-符合，2-不符合）")
private Integer accordReportFlag; private Integer accordReportFlag;
} }
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/entity/Order.java
+2 -2
View File
@@ -311,7 +311,7 @@ public class Order extends BaseVOEntity{
private String paymentTypeName; private String paymentTypeName;
@ApiModelProperty("寄件日期") @ApiModelProperty("寄件日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "寄件日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "寄件日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date mailDate; private Date mailDate;
@@ -393,4 +393,4 @@ public class Order extends BaseVOEntity{
@ApiModelProperty("是否作废（1-是，2-否）") @ApiModelProperty("是否作废（1-是，2-否）")
private Integer cancelFlag; private Integer cancelFlag;
} }
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/DispatchPo.java
+4 -4
View File
@@ -198,7 +198,7 @@ public class DispatchPo extends BaseVOEntity {
@ApiModelProperty("是否接单（1-未接单，2-已接单，3-已拒绝）") @ApiModelProperty("是否接单（1-未接单，2-已接单，3-已拒绝）")
private Long receivingStatus; private Long receivingStatus;
@ApiModelProperty("接单时间") @ApiModelProperty("接单时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "接单时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "接单时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date receivingDate; private Date receivingDate;
@ApiModelProperty("装货照片") @ApiModelProperty("装货照片")
@@ -221,7 +221,7 @@ public class DispatchPo extends BaseVOEntity {
@ApiModelProperty(name = "发货地址纬度") @ApiModelProperty(name = "发货地址纬度")
private String sendLatitude; private String sendLatitude;
@ApiModelProperty("发货时间") @ApiModelProperty("发货时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date sendTime; private Date sendTime;
@ApiModelProperty(name = "收货地址") @ApiModelProperty(name = "收货地址")
@@ -231,7 +231,7 @@ public class DispatchPo extends BaseVOEntity {
@ApiModelProperty(name = "收货地址纬度") @ApiModelProperty(name = "收货地址纬度")
private String receiveLatitude; private String receiveLatitude;
@ApiModelProperty("收货时间") @ApiModelProperty("收货时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date receiveTime; private Date receiveTime;
@ApiModelProperty(name = "状态1正常2作废") @ApiModelProperty(name = "状态1正常2作废")
@@ -245,4 +245,4 @@ public class DispatchPo extends BaseVOEntity {
@ApiModelProperty("是否是自己的网点1是2否") @ApiModelProperty("是否是自己的网点1是2否")
private Integer isOwn; private Integer isOwn;
} }
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/OrderVerificationPo.java
+5 -5
View File
@@ -189,7 +189,7 @@ public class OrderVerificationPo extends BaseVOEntity{
private BigDecimal commissionCharges; private BigDecimal commissionCharges;
@ApiModelProperty("放款时间") @ApiModelProperty("放款时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "放款时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "放款时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date loanTime; private Date loanTime;
@@ -335,7 +335,7 @@ public class OrderVerificationPo extends BaseVOEntity{
private String paymentTypeName; private String paymentTypeName;
@ApiModelProperty("寄件日期") @ApiModelProperty("寄件日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "寄件日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "寄件日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date mailDate; private Date mailDate;
@@ -376,12 +376,12 @@ public class OrderVerificationPo extends BaseVOEntity{
private Date freightCollectPaymentTime; private Date freightCollectPaymentTime;
@ApiModelProperty("收款时间") @ApiModelProperty("收款时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "收款时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "收款时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date collectionTime; private Date collectionTime;
@ApiModelProperty("收款时间") @ApiModelProperty("收款时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "收款时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "收款时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date cancelAfterVerificationTime; private Date cancelAfterVerificationTime;
@@ -464,4 +464,4 @@ public class OrderVerificationPo extends BaseVOEntity{
private Date withholdPaymentPaidTime; private Date withholdPaymentPaidTime;
} }
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/web/domain/BaseEntity.java
+3 -3
View File
@@ -22,14 +22,14 @@ public class BaseEntity implements Serializable
private String createBy; private String createBy;
/** 创建时间 */ /** 创建时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime; private Date createTime;
/** 更新者 */ /** 更新者 */
private String updateBy; private String updateBy;
/** 更新时间 */ /** 更新时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateTime; private Date updateTime;
/** 备注 */ /** 备注 */
@@ -111,4 +111,4 @@ public class BaseEntity implements Serializable
{ {
this.params = params; this.params = params;
} }
} }
mhd-modules/mhd-job/src/main/java/com/mhd/job/domain/SysJob.java
+1 -1
View File
@@ -110,7 +110,7 @@ public class SysJob extends BaseEntity
this.cronExpression = cronExpression; this.cronExpression = cronExpression;
} }
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
public Date getNextValidTime() public Date getNextValidTime()
{ {
if (StringUtils.isNotEmpty(cronExpression)) if (StringUtils.isNotEmpty(cronExpression))
mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/messageManage/repository/po/NoticeMessageLoggingAppPo.java
+3 -3
View File
@@ -38,7 +38,7 @@ public class NoticeMessageLoggingAppPo extends BaseVOEntity
private String noticeMessageContent = ""; private String noticeMessageContent = "";
/** 接收时间 */ /** 接收时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(name = "接收时间") @ApiModelProperty(name = "接收时间")
private Date messageReceivingTime; private Date messageReceivingTime;
@@ -66,7 +66,7 @@ public class NoticeMessageLoggingAppPo extends BaseVOEntity
private String messageReadName = ""; private String messageReadName = "";
/** 已读时间 */ /** 已读时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(name = "已读时间") @ApiModelProperty(name = "已读时间")
private Date messageReadTime; private Date messageReadTime;
@@ -118,4 +118,4 @@ public class NoticeMessageLoggingAppPo extends BaseVOEntity
@ApiModelProperty("所属业务id") @ApiModelProperty("所属业务id")
private String businessId; private String businessId;
} }
mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/messageManage/repository/po/NoticeMessageLoggingPo.java
+3 -3
View File
@@ -41,7 +41,7 @@ public class NoticeMessageLoggingPo extends BaseVOEntity
private String noticeMessageContent; private String noticeMessageContent;
/** 接收时间 */ /** 接收时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(name = "接收时间") @ApiModelProperty(name = "接收时间")
@JsonSerialize(nullsUsing = DateNullToStringSerializer.class) @JsonSerialize(nullsUsing = DateNullToStringSerializer.class)
private Date messageReceivingTime; private Date messageReceivingTime;
@@ -70,7 +70,7 @@ public class NoticeMessageLoggingPo extends BaseVOEntity
private String messageReadName; private String messageReadName;
/** 已读时间 */ /** 已读时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(name = "已读时间") @ApiModelProperty(name = "已读时间")
@JsonSerialize(nullsUsing = DateNullToStringSerializer.class) @JsonSerialize(nullsUsing = DateNullToStringSerializer.class)
private Date messageReadTime; private Date messageReadTime;
@@ -125,4 +125,4 @@ public class NoticeMessageLoggingPo extends BaseVOEntity
private Integer jumpPage; private Integer jumpPage;
@ApiModelProperty("所属业务id") @ApiModelProperty("所属业务id")
private String businessId; private String businessId;
} }
mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/messageManage/repository/todo/NoticeMessageLoggingDo.java
+3 -3
View File
@@ -43,7 +43,7 @@ public class NoticeMessageLoggingDo extends BaseVOEntity
private String noticeMessageContent; private String noticeMessageContent;
/** 接收时间 */ /** 接收时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(name = "接收时间") @ApiModelProperty(name = "接收时间")
private Date messageReceivingTime; private Date messageReceivingTime;
@@ -68,7 +68,7 @@ public class NoticeMessageLoggingDo extends BaseVOEntity
private Integer messageReadStatus; private Integer messageReadStatus;
/** 已读时间 */ /** 已读时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(name = "已读时间") @ApiModelProperty(name = "已读时间")
private Date messageReadTime; private Date messageReadTime;
@@ -141,4 +141,4 @@ public class NoticeMessageLoggingDo extends BaseVOEntity
private Integer jumpPage; private Integer jumpPage;
@ApiModelProperty("所属业务id") @ApiModelProperty("所属业务id")
private String businessId; private String businessId;
} }
mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/NoticeMessageLoggingDto.java
+3 -3
View File
@@ -43,7 +43,7 @@ public class NoticeMessageLoggingDto extends BaseVOEntity
private String noticeMessageContent; private String noticeMessageContent;
/** 接收时间 */ /** 接收时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(name = "接收时间") @ApiModelProperty(name = "接收时间")
private Date messageReceivingTime; private Date messageReceivingTime;
@@ -68,7 +68,7 @@ public class NoticeMessageLoggingDto extends BaseVOEntity
private Integer messageReadStatus; private Integer messageReadStatus;
/** 已读时间 */ /** 已读时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(name = "已读时间") @ApiModelProperty(name = "已读时间")
private Date messageReadTime; private Date messageReadTime;
@@ -141,4 +141,4 @@ public class NoticeMessageLoggingDto extends BaseVOEntity
private Integer jumpPage; private Integer jumpPage;
@ApiModelProperty("所属业务id") @ApiModelProperty("所属业务id")
private String businessId; private String businessId;
} }
mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserEntity.java
+1 -1
View File
@@ -86,7 +86,7 @@ public class UserEntity extends BaseVOEntity {
@ApiModelProperty(name = "密码登录错误次数") @ApiModelProperty(name = "密码登录错误次数")
private Integer passwordWrongTimes; private Integer passwordWrongTimes;
@ApiModelProperty(name = "最近一次登录时间") @ApiModelProperty(name = "最近一次登录时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date lastLoginTime; private Date lastLoginTime;
@ApiModelProperty(name = "最近一次登录IP") @ApiModelProperty(name = "最近一次登录IP")
private String lastLoginIp; private String lastLoginIp;
mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserDO.java
+1 -1
View File
@@ -96,7 +96,7 @@ public class UserDO extends BaseVOEntity {
@ApiModelProperty(name = "密码登录错误次数") @ApiModelProperty(name = "密码登录错误次数")
private Integer passwordWrongTimes; private Integer passwordWrongTimes;
@ApiModelProperty(name = "最近一次登录时间") @ApiModelProperty(name = "最近一次登录时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date lastLoginTime; private Date lastLoginTime;
@ApiModelProperty(name = "最近一次登录时间起") @ApiModelProperty(name = "最近一次登录时间起")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserUpdateDTO.java
+2 -2
View File
@@ -76,7 +76,7 @@ public class UserUpdateDTO extends BaseVOEntity {
private String userWechatSessionKey; private String userWechatSessionKey;
@ApiModelProperty(name = "密码登录错误次数") @ApiModelProperty(name = "密码登录错误次数")
private Integer passwordWrongTimes; private Integer passwordWrongTimes;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(name = "最近一次登录时间") @ApiModelProperty(name = "最近一次登录时间")
private Date lastLoginTime; private Date lastLoginTime;
@ApiModelProperty(name = "最近一次登录IP") @ApiModelProperty(name = "最近一次登录IP")
@@ -122,4 +122,4 @@ public class UserUpdateDTO extends BaseVOEntity {
@ApiModelProperty(name = "请求域名") @ApiModelProperty(name = "请求域名")
private String tenantsDomainName; private String tenantsDomainName;
} }
mhd_finance/src/main/java/com/linke/finance/domain/accountManage/entity/AccountTransferRecharge.java
+2 -2
View File
@@ -83,7 +83,7 @@ public class AccountTransferRecharge extends BaseVOEntity
private String transferTypeValue; private String transferTypeValue;
/** 交易时间 */ /** 交易时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(name = "交易时间") @ApiModelProperty(name = "交易时间")
private Date accountTransferTime; private Date accountTransferTime;
@@ -122,4 +122,4 @@ public class AccountTransferRecharge extends BaseVOEntity
@ApiModelProperty(name = "组织id") @ApiModelProperty(name = "组织id")
private Long organizationId; private Long organizationId;
} }
mhd_finance/src/main/java/com/linke/finance/domain/accountManage/repository/todo/AccountTransferRechargeDo.java
+3 -3
View File
@@ -83,7 +83,7 @@ public class AccountTransferRechargeDo extends BaseVOEntity
private String transferTypeValue; private String transferTypeValue;
/** 交易时间 */ /** 交易时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(name = "交易时间") @ApiModelProperty(name = "交易时间")
private Date accountTransferTime; private Date accountTransferTime;
@@ -112,7 +112,7 @@ public class AccountTransferRechargeDo extends BaseVOEntity
private String accountTransferReviewer; private String accountTransferReviewer;
/** 审核时间 */ /** 审核时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(name = "审核时间") @ApiModelProperty(name = "审核时间")
private Date transferReviewerTime; private Date transferReviewerTime;
@@ -154,4 +154,4 @@ public class AccountTransferRechargeDo extends BaseVOEntity
@ApiModelProperty(name = "支付方式（1-微信，2-对公转账）") @ApiModelProperty(name = "支付方式（1-微信，2-对公转账）")
private Integer paymentMethod; private Integer paymentMethod;
} }
mhd_finance/src/main/java/com/linke/finance/domain/branchBill/entity/BranchBill.java
+2 -2
View File
@@ -109,7 +109,7 @@ public class BranchBill extends BaseVOEntity {
private Date deadlineTime; private Date deadlineTime;
@ApiModelProperty("审核时间") @ApiModelProperty("审核时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date authTime; private Date authTime;
@@ -132,4 +132,4 @@ public class BranchBill extends BaseVOEntity {
@ApiModelProperty("上交方式（1-线下转账，2-钱包转账）") @ApiModelProperty("上交方式（1-线下转账，2-钱包转账）")
@Excel(name = "上交方式（1-线下转账，2-钱包转账）") @Excel(name = "上交方式（1-线下转账，2-钱包转账）")
private Integer payMethod; private Integer payMethod;
} }
mhd_finance/src/main/java/com/linke/finance/domain/branchBill/repository/po/BranchBillPO.java
+3 -3
View File
@@ -102,13 +102,13 @@ public class BranchBillPO extends BaseVOEntity {
private BigDecimal remainingAmount; private BigDecimal remainingAmount;
@ApiModelProperty(name = "截止时间") @ApiModelProperty(name = "截止时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "截止时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "截止时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date deadlineTime; private Date deadlineTime;
@ApiModelProperty("审核时间") @ApiModelProperty("审核时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date authTime; private Date authTime;
@@ -140,4 +140,4 @@ public class BranchBillPO extends BaseVOEntity {
@Excel(name = "上交方式（1-线下转账，2-钱包转账）") @Excel(name = "上交方式（1-线下转账，2-钱包转账）")
private Integer payMethod; private Integer payMethod;
} }
mhd_finance/src/main/java/com/linke/finance/domain/branchBill/repository/todo/BranchBillDO.java
+2 -2
View File
@@ -111,7 +111,7 @@ public class BranchBillDO extends BaseVOEntity {
private Date deadlineTime; private Date deadlineTime;
@ApiModelProperty("审核时间") @ApiModelProperty("审核时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date authTime; private Date authTime;
@@ -158,4 +158,4 @@ public class BranchBillDO extends BaseVOEntity {
@ApiModelProperty("上交方式（1-线下转账，2-钱包转账）") @ApiModelProperty("上交方式（1-线下转账，2-钱包转账）")
@Excel(name = "上交方式（1-线下转账，2-钱包转账）") @Excel(name = "上交方式（1-线下转账，2-钱包转账）")
private Integer payMethod; private Integer payMethod;
} }
mhd_finance/src/main/java/com/linke/finance/domain/branchFreightBill/entity/BranchFreightBill.java
+4 -4
View File
@@ -100,17 +100,17 @@ public class BranchFreightBill extends BaseVOEntity {
private BigDecimal retainedAmount; private BigDecimal retainedAmount;
@ApiModelProperty("开单时间") @ApiModelProperty("开单时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "开单时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "开单时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date billingTime; private Date billingTime;
@ApiModelProperty("签收时间") @ApiModelProperty("签收时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "签收时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "签收时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date signTime; private Date signTime;
@ApiModelProperty("确认时间") @ApiModelProperty("确认时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "确认时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "确认时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date authTime; private Date authTime;
@@ -123,4 +123,4 @@ public class BranchFreightBill extends BaseVOEntity {
private String authName; private String authName;
} }
mhd_finance/src/main/java/com/linke/finance/domain/branchFreightBill/repository/todo/BranchFreightBillDO.java
+4 -4
View File
@@ -103,17 +103,17 @@ public class BranchFreightBillDO extends BaseVOEntity {
private BigDecimal retainedAmount; private BigDecimal retainedAmount;
@ApiModelProperty("开单时间") @ApiModelProperty("开单时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "开单时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "开单时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date billingTime; private Date billingTime;
@ApiModelProperty("签收时间") @ApiModelProperty("签收时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "签收时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "签收时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date signTime; private Date signTime;
@ApiModelProperty("确认时间") @ApiModelProperty("确认时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "确认时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "确认时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date authTime; private Date authTime;
@@ -160,4 +160,4 @@ public class BranchFreightBillDO extends BaseVOEntity {
@ApiModelProperty(value = "更新时间-结束") @ApiModelProperty(value = "更新时间-结束")
private String updateTimeEnd; private String updateTimeEnd;
} }
mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/todo/ReconciliationDO.java
+1 -1
View File
@@ -32,7 +32,7 @@ public class ReconciliationDO extends BaseVOEntity{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty("创建时间") @ApiModelProperty("创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date createTime; private Date createTime;
mhd_finance/src/main/java/com/linke/finance/domain/serviceBill/entity/ServiceBill.java
+4 -4
View File
@@ -91,19 +91,19 @@ public class ServiceBill extends BaseVOEntity {
private BigDecimal freight; private BigDecimal freight;
@ApiModelProperty("开单时间") @ApiModelProperty("开单时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "开单时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "开单时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date billingTime; private Date billingTime;
@ApiModelProperty("签收时间") @ApiModelProperty("签收时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "签收时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "签收时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date signTime; private Date signTime;
@ApiModelProperty("交账时间") @ApiModelProperty("交账时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "交账时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "交账时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date reportTime; private Date reportTime;
} }
mhd_finance/src/main/java/com/linke/finance/domain/serviceBill/repository/po/ServiceBillPO.java
+4 -4
View File
@@ -90,17 +90,17 @@ public class ServiceBillPO extends BaseVOEntity {
private BigDecimal freight; private BigDecimal freight;
@ApiModelProperty("开单时间") @ApiModelProperty("开单时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "开单时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "开单时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date billingTime; private Date billingTime;
@ApiModelProperty("签收时间") @ApiModelProperty("签收时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "签收时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "签收时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date signTime; private Date signTime;
@ApiModelProperty("交账时间") @ApiModelProperty("交账时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "交账时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "交账时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date reportTime; private Date reportTime;
@@ -114,4 +114,4 @@ public class ServiceBillPO extends BaseVOEntity {
} }
mhd_finance/src/main/java/com/linke/finance/domain/serviceBill/repository/todo/ServiceBillDO.java
+4 -4
View File
@@ -93,17 +93,17 @@ public class ServiceBillDO extends BaseVOEntity {
private BigDecimal freight; private BigDecimal freight;
@ApiModelProperty("开单时间") @ApiModelProperty("开单时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "开单时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "开单时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date billingTime; private Date billingTime;
@ApiModelProperty("签收时间") @ApiModelProperty("签收时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "签收时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "签收时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date signTime; private Date signTime;
@ApiModelProperty("交账时间") @ApiModelProperty("交账时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "交账时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "交账时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date reportTime; private Date reportTime;
@@ -133,4 +133,4 @@ public class ServiceBillDO extends BaseVOEntity {
@ApiModelProperty("交账时间-结束") @ApiModelProperty("交账时间-结束")
private String reportTimeEnd; private String reportTimeEnd;
} }
mhd_finance/src/main/java/com/linke/finance/interfaces/dto/AccountTransferRechargeDto.java
+3 -3
View File
@@ -83,7 +83,7 @@ public class AccountTransferRechargeDto extends BaseVOEntity
private String transferTypeValue; private String transferTypeValue;
/** 交易时间 */ /** 交易时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(name = "交易时间") @ApiModelProperty(name = "交易时间")
private Date accountTransferTime; private Date accountTransferTime;
@@ -112,7 +112,7 @@ public class AccountTransferRechargeDto extends BaseVOEntity
private String accountTransferReviewer; private String accountTransferReviewer;
/** 审核时间 */ /** 审核时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(name = "审核时间") @ApiModelProperty(name = "审核时间")
private Date transferReviewerTime; private Date transferReviewerTime;
@@ -151,4 +151,4 @@ public class AccountTransferRechargeDto extends BaseVOEntity
private Integer paymentMethod; private Integer paymentMethod;
@ApiModelProperty(name = "银行卡管理表id") @ApiModelProperty(name = "银行卡管理表id")
private Long accountBankCardId; private Long accountBankCardId;
} }
mhd_finance/src/main/java/com/linke/finance/interfaces/dto/BranchBillDTO.java
+2 -2
View File
@@ -110,7 +110,7 @@ public class BranchBillDTO extends BaseVOEntity {
private Date deadlineTime; private Date deadlineTime;
@ApiModelProperty("审核时间") @ApiModelProperty("审核时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date authTime; private Date authTime;
@@ -158,4 +158,4 @@ public class BranchBillDTO extends BaseVOEntity {
@ApiModelProperty("上交方式（1-线下转账，2-钱包转账）") @ApiModelProperty("上交方式（1-线下转账，2-钱包转账）")
@Excel(name = "上交方式（1-线下转账，2-钱包转账）") @Excel(name = "上交方式（1-线下转账，2-钱包转账）")
private Integer payMethod; private Integer payMethod;
} }
mhd_finance/src/main/java/com/linke/finance/interfaces/dto/BranchFreightBillDTO.java
+4 -4
View File
@@ -103,17 +103,17 @@ public class BranchFreightBillDTO extends BaseVOEntity {
private BigDecimal retainedAmount; private BigDecimal retainedAmount;
@ApiModelProperty("开单时间") @ApiModelProperty("开单时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "开单时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "开单时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date billingTime; private Date billingTime;
@ApiModelProperty("签收时间") @ApiModelProperty("签收时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "签收时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "签收时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date signTime; private Date signTime;
@ApiModelProperty("确认时间") @ApiModelProperty("确认时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "确认时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "确认时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date authTime; private Date authTime;
@@ -161,4 +161,4 @@ public class BranchFreightBillDTO extends BaseVOEntity {
@ApiModelProperty(value = "更新时间-结束") @ApiModelProperty(value = "更新时间-结束")
private String updateTimeEnd; private String updateTimeEnd;
} }
mhd_finance/src/main/java/com/linke/finance/interfaces/dto/ServiceBillDTO.java
+4 -4
View File
@@ -88,17 +88,17 @@ public class ServiceBillDTO extends BaseVOEntity {
private BigDecimal freight; private BigDecimal freight;
@ApiModelProperty("开单时间") @ApiModelProperty("开单时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "开单时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "开单时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date billingTime; private Date billingTime;
@ApiModelProperty("签收时间") @ApiModelProperty("签收时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "签收时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "签收时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date signTime; private Date signTime;
@ApiModelProperty("交账时间") @ApiModelProperty("交账时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "交账时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "交账时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date reportTime; private Date reportTime;
@@ -130,4 +130,4 @@ public class ServiceBillDTO extends BaseVOEntity {
@ApiModelProperty("交账时间-结束") @ApiModelProperty("交账时间-结束")
private String reportTimeEnd; private String reportTimeEnd;
} }
mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/todo/InventoryAdjustmentRecordPO.java
+5 -5
View File
@@ -173,31 +173,31 @@ public class InventoryAdjustmentRecordPO extends BaseVOEntity {
private String extAttr2; private String extAttr2;
@ApiModelProperty("生产日期") @ApiModelProperty("生产日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date productionDate; private Date productionDate;
@ApiModelProperty("过期日期") @ApiModelProperty("过期日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date expiryDate; private Date expiryDate;
@ApiModelProperty("存货日期") @ApiModelProperty("存货日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date inventoryDate; private Date inventoryDate;
@ApiModelProperty("ExtAttr3") @ApiModelProperty("ExtAttr3")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "ExtAttr3", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "ExtAttr3", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date extAttr3; private Date extAttr3;
@ApiModelProperty("ExtAttr4") @ApiModelProperty("ExtAttr4")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "ExtAttr4", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "ExtAttr4", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date extAttr4; private Date extAttr4;
mhd_oms/src/main/java/com/mhd/oms/domain/reservationInventoryAdjustmentRecord/repository/po/ReservationInventoryAdjustmentRecordPO.java
+5 -5
View File
@@ -173,31 +173,31 @@ public class ReservationInventoryAdjustmentRecordPO extends BaseVOEntity {
private String extAttr2; private String extAttr2;
@ApiModelProperty("生产日期") @ApiModelProperty("生产日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date productionDate; private Date productionDate;
@ApiModelProperty("过期日期") @ApiModelProperty("过期日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date expiryDate; private Date expiryDate;
@ApiModelProperty("存货日期") @ApiModelProperty("存货日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date inventoryDate; private Date inventoryDate;
@ApiModelProperty("ExtAttr3") @ApiModelProperty("ExtAttr3")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "ExtAttr3", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "ExtAttr3", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date extAttr3; private Date extAttr3;
@ApiModelProperty("ExtAttr4") @ApiModelProperty("ExtAttr4")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "ExtAttr4", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "ExtAttr4", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date extAttr4; private Date extAttr4;
mhd_oms/src/main/java/com/mhd/oms/domain/reservationMaterialInventory/entity/ReservationMaterialInventory.java
+5 -5
View File
@@ -193,32 +193,32 @@ public class ReservationMaterialInventory extends BaseVOEntity {
private String extAttr2; private String extAttr2;
@ApiModelProperty("生产日期") @ApiModelProperty("生产日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date productionDate; private Date productionDate;
@ApiModelProperty("过期日期") @ApiModelProperty("过期日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date expiryDate; private Date expiryDate;
@ApiModelProperty("存货日期") @ApiModelProperty("存货日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date inventoryDate; private Date inventoryDate;
@ApiModelProperty("ExtAttr3") @ApiModelProperty("ExtAttr3")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "ExtAttr3", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "ExtAttr3", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@TableField("ext_attr_3") @TableField("ext_attr_3")
private Date extAttr3; private Date extAttr3;
@ApiModelProperty("ExtAttr4") @ApiModelProperty("ExtAttr4")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "ExtAttr4", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "ExtAttr4", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@TableField("ext_attr_4") @TableField("ext_attr_4")
mhd_oms/src/main/java/com/mhd/oms/domain/reservationMaterialInventory/repository/po/ReservationMaterialInventoryPO.java
+5 -5
View File
@@ -175,31 +175,31 @@ public class ReservationMaterialInventoryPO extends MaterialBasePO {
private String extAttr2; private String extAttr2;
@ApiModelProperty("生产日期") @ApiModelProperty("生产日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date productionDate; private Date productionDate;
@ApiModelProperty("过期日期") @ApiModelProperty("过期日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date expiryDate; private Date expiryDate;
@ApiModelProperty("存货日期") @ApiModelProperty("存货日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date inventoryDate; private Date inventoryDate;
@ApiModelProperty("ExtAttr3") @ApiModelProperty("ExtAttr3")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "ExtAttr3", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "ExtAttr3", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date extAttr3; private Date extAttr3;
@ApiModelProperty("ExtAttr4") @ApiModelProperty("ExtAttr4")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "ExtAttr4", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "ExtAttr4", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date extAttr4; private Date extAttr4;
mhd_oms/src/main/java/com/mhd/oms/domain/reservationMaterialInventory/repository/po/ReservationMaterialInventoryQueryListPO.java
+5 -5
View File
@@ -233,31 +233,31 @@ public class ReservationMaterialInventoryQueryListPO extends MaterialBasePO {
private String extAttr2; private String extAttr2;
@ApiModelProperty("生产日期") @ApiModelProperty("生产日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date productionDate; private Date productionDate;
@ApiModelProperty("过期日期") @ApiModelProperty("过期日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date expiryDate; private Date expiryDate;
@ApiModelProperty("存货日期") @ApiModelProperty("存货日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date inventoryDate; private Date inventoryDate;
@ApiModelProperty("ExtAttr3") @ApiModelProperty("ExtAttr3")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "ExtAttr3", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "ExtAttr3", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date extAttr3; private Date extAttr3;
@ApiModelProperty("ExtAttr4") @ApiModelProperty("ExtAttr4")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "ExtAttr4", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "ExtAttr4", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date extAttr4; private Date extAttr4;
mhd_oms/src/main/java/com/mhd/oms/domain/reservationMaterialInventory/repository/todo/MaterialInventoryQueryListDO.java
+5 -5
View File
@@ -220,31 +220,31 @@ public class MaterialInventoryQueryListDO extends MaterialBaseDO {
private String extAttr2; private String extAttr2;
@ApiModelProperty("生产日期") @ApiModelProperty("生产日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date productionDate; private Date productionDate;
@ApiModelProperty("过期日期") @ApiModelProperty("过期日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date expiryDate; private Date expiryDate;
@ApiModelProperty("存货日期") @ApiModelProperty("存货日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date inventoryDate; private Date inventoryDate;
@ApiModelProperty("ExtAttr3") @ApiModelProperty("ExtAttr3")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "ExtAttr3", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "ExtAttr3", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date extAttr3; private Date extAttr3;
@ApiModelProperty("ExtAttr4") @ApiModelProperty("ExtAttr4")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "ExtAttr4", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "ExtAttr4", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date extAttr4; private Date extAttr4;
mhd_oms/src/main/java/com/mhd/oms/domain/reservationMaterialInventory/repository/todo/ReservationMaterialInventoryDO.java
+5 -5
View File
@@ -200,31 +200,31 @@ public class ReservationMaterialInventoryDO extends MaterialBaseDO {
private String extAttr2; private String extAttr2;
@ApiModelProperty("生产日期") @ApiModelProperty("生产日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date productionDate; private Date productionDate;
@ApiModelProperty("过期日期") @ApiModelProperty("过期日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date expiryDate; private Date expiryDate;
@ApiModelProperty("存货日期") @ApiModelProperty("存货日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date inventoryDate; private Date inventoryDate;
@ApiModelProperty("ExtAttr3") @ApiModelProperty("ExtAttr3")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "ExtAttr3", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "ExtAttr3", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date extAttr3; private Date extAttr3;
@ApiModelProperty("ExtAttr4") @ApiModelProperty("ExtAttr4")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "ExtAttr4", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "ExtAttr4", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date extAttr4; private Date extAttr4;
mhd_oms/src/main/java/com/mhd/oms/domain/reservationOutMaterialDetail/repository/po/ReservationOutMaterialDetailPO.java
+5 -5
View File
@@ -419,31 +419,31 @@ public class ReservationOutMaterialDetailPO extends ReservationStockOutOrderBase
private String extAttr2; private String extAttr2;
@ApiModelProperty("生产日期") @ApiModelProperty("生产日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date productionDate; private Date productionDate;
@ApiModelProperty("过期日期") @ApiModelProperty("过期日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date expiryDate; private Date expiryDate;
@ApiModelProperty("存货日期") @ApiModelProperty("存货日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date inventoryDate; private Date inventoryDate;
@ApiModelProperty("ExtAttr3") @ApiModelProperty("ExtAttr3")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "ExtAttr3", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "ExtAttr3", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date extAttr3; private Date extAttr3;
@ApiModelProperty("ExtAttr4") @ApiModelProperty("ExtAttr4")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "ExtAttr4", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "ExtAttr4", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date extAttr4; private Date extAttr4;
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/entity/ReservationStockOutOrder.java
+4 -4
View File
@@ -120,7 +120,7 @@ public class ReservationStockOutOrder extends BaseVOEntity {
private String customerName; private String customerName;
@ApiModelProperty("预计出货时间") @ApiModelProperty("预计出货时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "预计出货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "预计出货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date expectTime; private Date expectTime;
@@ -232,7 +232,7 @@ public class ReservationStockOutOrder extends BaseVOEntity {
private Integer checkTaskDistribution; private Integer checkTaskDistribution;
@ApiModelProperty("复核任务下发时间") @ApiModelProperty("复核任务下发时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "复核任务下发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "复核任务下发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date checkTaskDistributionTime; private Date checkTaskDistributionTime;
@@ -339,12 +339,12 @@ public class ReservationStockOutOrder extends BaseVOEntity {
@Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date outboundDate; private Date outboundDate;
@ApiModelProperty("完成时间") @ApiModelProperty("完成时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date completeTime; private Date completeTime;
@ApiModelProperty("orderDate") @ApiModelProperty("orderDate")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "orderDate", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "orderDate", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date orderDate; private Date orderDate;
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/po/ReservationStockOutOrderPO.java
+4 -4
View File
@@ -124,7 +124,7 @@ public class ReservationStockOutOrderPO extends BaseVOEntity {
private String customerName; private String customerName;
@ApiModelProperty("预计出货时间") @ApiModelProperty("预计出货时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "预计出货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "预计出货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date expectTime; private Date expectTime;
@@ -236,7 +236,7 @@ public class ReservationStockOutOrderPO extends BaseVOEntity {
private Integer checkTaskDistribution; private Integer checkTaskDistribution;
@ApiModelProperty("复核任务下发时间") @ApiModelProperty("复核任务下发时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "复核任务下发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "复核任务下发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date checkTaskDistributionTime; private Date checkTaskDistributionTime;
@@ -345,12 +345,12 @@ public class ReservationStockOutOrderPO extends BaseVOEntity {
@Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date outboundDate; private Date outboundDate;
@ApiModelProperty("完成时间") @ApiModelProperty("完成时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date completeTime; private Date completeTime;
@ApiModelProperty("orderDate") @ApiModelProperty("orderDate")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "orderDate", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "orderDate", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date orderDate; private Date orderDate;
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDO.java
+4 -4
View File
@@ -120,7 +120,7 @@ public class ReservationStockOutOrderDO extends BaseVOEntity {
private String customerName; private String customerName;
@ApiModelProperty("预计出货时间") @ApiModelProperty("预计出货时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "预计出货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "预计出货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date expectTime; private Date expectTime;
@@ -232,7 +232,7 @@ public class ReservationStockOutOrderDO extends BaseVOEntity {
private Integer checkTaskDistribution; private Integer checkTaskDistribution;
@ApiModelProperty("复核任务下发时间") @ApiModelProperty("复核任务下发时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "复核任务下发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "复核任务下发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date checkTaskDistributionTime; private Date checkTaskDistributionTime;
@@ -364,12 +364,12 @@ public class ReservationStockOutOrderDO extends BaseVOEntity {
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date outboundDate; private Date outboundDate;
@ApiModelProperty("完成时间") @ApiModelProperty("完成时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date completeTime; private Date completeTime;
@ApiModelProperty("orderDate") @ApiModelProperty("orderDate")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "orderDate", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "orderDate", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date orderDate; private Date orderDate;
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDTO.java
+4 -4
View File
@@ -118,7 +118,7 @@ public class ReservationStockOutOrderDTO extends ReservationStockOutOrderBaseDTO
private String customerName; private String customerName;
@ApiModelProperty("预计出货时间") @ApiModelProperty("预计出货时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "预计出货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "预计出货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date expectTime; private Date expectTime;
@@ -230,7 +230,7 @@ public class ReservationStockOutOrderDTO extends ReservationStockOutOrderBaseDTO
private Integer checkTaskDistribution; private Integer checkTaskDistribution;
@ApiModelProperty("复核任务下发时间") @ApiModelProperty("复核任务下发时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "复核任务下发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "复核任务下发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date checkTaskDistributionTime; private Date checkTaskDistributionTime;
@@ -355,12 +355,12 @@ public class ReservationStockOutOrderDTO extends ReservationStockOutOrderBaseDTO
@Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date outboundDate; private Date outboundDate;
@ApiModelProperty("完成时间") @ApiModelProperty("完成时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date completeTime; private Date completeTime;
@ApiModelProperty("orderDate") @ApiModelProperty("orderDate")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "orderDate", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "orderDate", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date orderDate; private Date orderDate;
mhd_oms/src/main/java/com/mhd/oms/domain/reserveOutMaterialDetail/repository/po/ReserveOutMaterialDetailPO.java
+5 -5
View File
@@ -420,31 +420,31 @@ public class ReserveOutMaterialDetailPO extends ReserveStockOutOrderBaseDO {
private String extAttr2; private String extAttr2;
@ApiModelProperty("生产日期") @ApiModelProperty("生产日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date productionDate; private Date productionDate;
@ApiModelProperty("过期日期") @ApiModelProperty("过期日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date expiryDate; private Date expiryDate;
@ApiModelProperty("存货日期") @ApiModelProperty("存货日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date inventoryDate; private Date inventoryDate;
@ApiModelProperty("ExtAttr3") @ApiModelProperty("ExtAttr3")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "ExtAttr3", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "ExtAttr3", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date extAttr3; private Date extAttr3;
@ApiModelProperty("ExtAttr4") @ApiModelProperty("ExtAttr4")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "ExtAttr4", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "ExtAttr4", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date extAttr4; private Date extAttr4;
mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/entity/ReserveStockOutOrder.java
+4 -4
View File
@@ -120,7 +120,7 @@ public class ReserveStockOutOrder extends BaseVOEntity {
private String customerName; private String customerName;
@ApiModelProperty("预计出货时间") @ApiModelProperty("预计出货时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "预计出货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "预计出货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date expectTime; private Date expectTime;
@@ -232,7 +232,7 @@ public class ReserveStockOutOrder extends BaseVOEntity {
private Integer checkTaskDistribution; private Integer checkTaskDistribution;
@ApiModelProperty("复核任务下发时间") @ApiModelProperty("复核任务下发时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "复核任务下发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "复核任务下发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date checkTaskDistributionTime; private Date checkTaskDistributionTime;
@@ -339,12 +339,12 @@ public class ReserveStockOutOrder extends BaseVOEntity {
@Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date outboundDate; private Date outboundDate;
@ApiModelProperty("完成时间") @ApiModelProperty("完成时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date completeTime; private Date completeTime;
@ApiModelProperty("orderDate") @ApiModelProperty("orderDate")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "orderDate", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "orderDate", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date orderDate; private Date orderDate;
mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/repository/po/ReserveStockOutOrderPO.java
+4 -4
View File
@@ -120,7 +120,7 @@ public class ReserveStockOutOrderPO extends BaseVOEntity {
private String customerName; private String customerName;
@ApiModelProperty("预计出货时间") @ApiModelProperty("预计出货时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "预计出货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "预计出货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date expectTime; private Date expectTime;
@@ -232,7 +232,7 @@ public class ReserveStockOutOrderPO extends BaseVOEntity {
private Integer checkTaskDistribution; private Integer checkTaskDistribution;
@ApiModelProperty("复核任务下发时间") @ApiModelProperty("复核任务下发时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "复核任务下发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "复核任务下发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date checkTaskDistributionTime; private Date checkTaskDistributionTime;
@@ -341,12 +341,12 @@ public class ReserveStockOutOrderPO extends BaseVOEntity {
@Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date outboundDate; private Date outboundDate;
@ApiModelProperty("完成时间") @ApiModelProperty("完成时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date completeTime; private Date completeTime;
@ApiModelProperty("orderDate") @ApiModelProperty("orderDate")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "orderDate", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "orderDate", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date orderDate; private Date orderDate;
mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/repository/todo/ReserveStockOutOrderDO.java
+4 -4
View File
@@ -119,7 +119,7 @@ public class ReserveStockOutOrderDO extends BaseVOEntity {
private String customerName; private String customerName;
@ApiModelProperty("预计出货时间") @ApiModelProperty("预计出货时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "预计出货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "预计出货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date expectTime; private Date expectTime;
@@ -231,7 +231,7 @@ public class ReserveStockOutOrderDO extends BaseVOEntity {
private Integer checkTaskDistribution; private Integer checkTaskDistribution;
@ApiModelProperty("复核任务下发时间") @ApiModelProperty("复核任务下发时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "复核任务下发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "复核任务下发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date checkTaskDistributionTime; private Date checkTaskDistributionTime;
@@ -364,12 +364,12 @@ public class ReserveStockOutOrderDO extends BaseVOEntity {
@Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date outboundDate; private Date outboundDate;
@ApiModelProperty("完成时间") @ApiModelProperty("完成时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date completeTime; private Date completeTime;
@ApiModelProperty("orderDate") @ApiModelProperty("orderDate")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "orderDate", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "orderDate", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date orderDate; private Date orderDate;
mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/repository/todo/ReserveStockOutOrderDTO.java
+4 -4
View File
@@ -117,7 +117,7 @@ public class ReserveStockOutOrderDTO extends ReserveStockOutOrderBaseDTO {
private String customerName; private String customerName;
@ApiModelProperty("预计出货时间") @ApiModelProperty("预计出货时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "预计出货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "预计出货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date expectTime; private Date expectTime;
@@ -229,7 +229,7 @@ public class ReserveStockOutOrderDTO extends ReserveStockOutOrderBaseDTO {
private Integer checkTaskDistribution; private Integer checkTaskDistribution;
@ApiModelProperty("复核任务下发时间") @ApiModelProperty("复核任务下发时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "复核任务下发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "复核任务下发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date checkTaskDistributionTime; private Date checkTaskDistributionTime;
@@ -354,12 +354,12 @@ public class ReserveStockOutOrderDTO extends ReserveStockOutOrderBaseDTO {
@Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date outboundDate; private Date outboundDate;
@ApiModelProperty("完成时间") @ApiModelProperty("完成时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date completeTime; private Date completeTime;
@ApiModelProperty("orderDate") @ApiModelProperty("orderDate")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "orderDate", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "orderDate", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date orderDate; private Date orderDate;
mhd_oms/src/main/java/com/mhd/oms/infrastructure/feign/dto/NoticeMessageLoggingDto.java
+3 -3
View File
@@ -43,7 +43,7 @@ public class NoticeMessageLoggingDto extends BaseVOEntity
private String noticeMessageContent; private String noticeMessageContent;
/** 接收时间 */ /** 接收时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(name = "接收时间") @ApiModelProperty(name = "接收时间")
private Date messageReceivingTime; private Date messageReceivingTime;
@@ -68,7 +68,7 @@ public class NoticeMessageLoggingDto extends BaseVOEntity
private Integer messageReadStatus; private Integer messageReadStatus;
/** 已读时间 */ /** 已读时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(name = "已读时间") @ApiModelProperty(name = "已读时间")
private Date messageReadTime; private Date messageReadTime;
@@ -141,4 +141,4 @@ public class NoticeMessageLoggingDto extends BaseVOEntity
private Integer jumpPage; private Integer jumpPage;
@ApiModelProperty("所属业务id") @ApiModelProperty("所属业务id")
private String businessId; private String businessId;
} }
mhd_oms/src/main/java/com/mhd/oms/infrastructure/feign/po/NoticeMessageLoggingPo.java
+3 -3
View File
@@ -41,7 +41,7 @@ public class NoticeMessageLoggingPo extends BaseVOEntity
private String noticeMessageContent; private String noticeMessageContent;
/** 接收时间 */ /** 接收时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(name = "接收时间") @ApiModelProperty(name = "接收时间")
@JsonSerialize(nullsUsing = DateNullToStringSerializer.class) @JsonSerialize(nullsUsing = DateNullToStringSerializer.class)
private Date messageReceivingTime; private Date messageReceivingTime;
@@ -70,7 +70,7 @@ public class NoticeMessageLoggingPo extends BaseVOEntity
private String messageReadName; private String messageReadName;
/** 已读时间 */ /** 已读时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(name = "已读时间") @ApiModelProperty(name = "已读时间")
@JsonSerialize(nullsUsing = DateNullToStringSerializer.class) @JsonSerialize(nullsUsing = DateNullToStringSerializer.class)
private Date messageReadTime; private Date messageReadTime;
@@ -126,4 +126,4 @@ public class NoticeMessageLoggingPo extends BaseVOEntity
@ApiModelProperty("所属业务id") @ApiModelProperty("所属业务id")
private String businessId; private String businessId;
} }
mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/purchaseOrder/PurchaseOrderExcelDTO.java
+2 -2
View File
@@ -141,7 +141,7 @@ public class PurchaseOrderExcelDTO extends BaseVOEntity {
private String consignerAddress; private String consignerAddress;
@ExcelProperty(index = 27) @ExcelProperty(index = 27)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("预计发货时间") @ApiModelProperty("预计发货时间")
private Date estimatedDeliveryTime; private Date estimatedDeliveryTime;
@@ -240,4 +240,4 @@ public class PurchaseOrderExcelDTO extends BaseVOEntity {
private String goodsRemark; private String goodsRemark;
} }
mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/salesOrder/SalesOrderExcelDTO.java
+2 -2
View File
@@ -177,7 +177,7 @@ public class SalesOrderExcelDTO extends BaseVOEntity {
private String consignerAddress; private String consignerAddress;
@ExcelProperty(index = 28) @ExcelProperty(index = 28)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("预计发货时间") @ApiModelProperty("预计发货时间")
private Date estimatedDeliveryTime; private Date estimatedDeliveryTime;
@@ -304,4 +304,4 @@ public class SalesOrderExcelDTO extends BaseVOEntity {
private String goodsRemark; private String goodsRemark;
} }
mhd_product/src/main/java/com/linke/product/interfaces/facadeApp/home/vo/HomeAppMessageVo.java
+2 -2
View File
@@ -29,11 +29,11 @@ public class HomeAppMessageVo implements Serializable {
@ApiModelProperty(name = "消息内容") @ApiModelProperty(name = "消息内容")
private String noticeMessageContent; private String noticeMessageContent;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(name = "接收时间") @ApiModelProperty(name = "接收时间")
private Date messageReceivingTime; private Date messageReceivingTime;
@ApiModelProperty(name = "距现在时间") @ApiModelProperty(name = "距现在时间")
private String nowString; private String nowString;
} }
mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/entity/HandoverTaskOrder.java
+1 -1
View File
@@ -89,7 +89,7 @@ public class HandoverTaskOrder extends BaseVOEntity {
private String orderTypeName; private String orderTypeName;
@ApiModelProperty("预计出货时间") @ApiModelProperty("预计出货时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "预计出货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "预计出货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date expectTime; private Date expectTime;
mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/repository/po/HandoverTaskOrderPO.java
+2 -2
View File
@@ -91,7 +91,7 @@ public class HandoverTaskOrderPO extends BaseVOEntity {
private String orderTypeName; private String orderTypeName;
@ApiModelProperty("预计出货时间") @ApiModelProperty("预计出货时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "预计出货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "预计出货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date expectTime; private Date expectTime;
@@ -132,7 +132,7 @@ public class HandoverTaskOrderPO extends BaseVOEntity {
private Integer taskDistribution; private Integer taskDistribution;
@ApiModelProperty("任务下发时间") @ApiModelProperty("任务下发时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "任务下发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "任务下发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date taskDistributionTime; private Date taskDistributionTime;
mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/repository/todo/HandoverTaskOrderDO.java
+1 -1
View File
@@ -87,7 +87,7 @@ public class HandoverTaskOrderDO extends BaseVOEntity {
private String orderTypeName; private String orderTypeName;
@ApiModelProperty("预计出货时间") @ApiModelProperty("预计出货时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "预计出货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "预计出货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date expectTime; private Date expectTime;
mhd_wms/src/main/java/com/mhd/wms/domain/inventoryAdjustmentRecord/repository/po/InventoryAdjustmentRecordPO.java
+5 -5
View File
@@ -173,31 +173,31 @@ public class InventoryAdjustmentRecordPO extends BaseVOEntity {
private String extAttr2; private String extAttr2;
@ApiModelProperty("生产日期") @ApiModelProperty("生产日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date productionDate; private Date productionDate;
@ApiModelProperty("过期日期") @ApiModelProperty("过期日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date expiryDate; private Date expiryDate;
@ApiModelProperty("存货日期") @ApiModelProperty("存货日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date inventoryDate; private Date inventoryDate;
@ApiModelProperty("ExtAttr3") @ApiModelProperty("ExtAttr3")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "ExtAttr3", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "ExtAttr3", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date extAttr3; private Date extAttr3;
@ApiModelProperty("ExtAttr4") @ApiModelProperty("ExtAttr4")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "ExtAttr4", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "ExtAttr4", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date extAttr4; private Date extAttr4;
mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/entity/MaterialInventory.java
+5 -5
View File
@@ -193,32 +193,32 @@ public class MaterialInventory extends BaseVOEntity {
private String extAttr2; private String extAttr2;
@ApiModelProperty("生产日期") @ApiModelProperty("生产日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date productionDate; private Date productionDate;
@ApiModelProperty("过期日期") @ApiModelProperty("过期日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date expiryDate; private Date expiryDate;
@ApiModelProperty("存货日期") @ApiModelProperty("存货日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date inventoryDate; private Date inventoryDate;
@ApiModelProperty("ExtAttr3") @ApiModelProperty("ExtAttr3")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "ExtAttr3", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "ExtAttr3", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@TableField("ext_attr_3") @TableField("ext_attr_3")
private Date extAttr3; private Date extAttr3;
@ApiModelProperty("ExtAttr4") @ApiModelProperty("ExtAttr4")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "ExtAttr4", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "ExtAttr4", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@TableField("ext_attr_4") @TableField("ext_attr_4")
mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/po/MaterialInventoryPO.java
+5 -5
View File
@@ -177,31 +177,31 @@ public class MaterialInventoryPO extends MaterialBasePO {
private String extAttr2; private String extAttr2;
@ApiModelProperty("生产日期") @ApiModelProperty("生产日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date productionDate; private Date productionDate;
@ApiModelProperty("过期日期") @ApiModelProperty("过期日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date expiryDate; private Date expiryDate;
@ApiModelProperty("存货日期") @ApiModelProperty("存货日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date inventoryDate; private Date inventoryDate;
@ApiModelProperty("ExtAttr3") @ApiModelProperty("ExtAttr3")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "ExtAttr3", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "ExtAttr3", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date extAttr3; private Date extAttr3;
@ApiModelProperty("ExtAttr4") @ApiModelProperty("ExtAttr4")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "ExtAttr4", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "ExtAttr4", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date extAttr4; private Date extAttr4;
mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/po/MaterialInventoryQueryListPO.java
+5 -5
View File
@@ -233,31 +233,31 @@ public class MaterialInventoryQueryListPO extends MaterialBasePO {
private String extAttr2; private String extAttr2;
@ApiModelProperty("生产日期") @ApiModelProperty("生产日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date productionDate; private Date productionDate;
@ApiModelProperty("过期日期") @ApiModelProperty("过期日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date expiryDate; private Date expiryDate;
@ApiModelProperty("存货日期") @ApiModelProperty("存货日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date inventoryDate; private Date inventoryDate;
@ApiModelProperty("ExtAttr3") @ApiModelProperty("ExtAttr3")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "ExtAttr3", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "ExtAttr3", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date extAttr3; private Date extAttr3;
@ApiModelProperty("ExtAttr4") @ApiModelProperty("ExtAttr4")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "ExtAttr4", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "ExtAttr4", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date extAttr4; private Date extAttr4;
mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/todo/MaterialInventoryDO.java
+5 -5
View File
@@ -201,31 +201,31 @@ public class MaterialInventoryDO extends MaterialBaseDO {
private String extAttr2; private String extAttr2;
@ApiModelProperty("生产日期") @ApiModelProperty("生产日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date productionDate; private Date productionDate;
@ApiModelProperty("过期日期") @ApiModelProperty("过期日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date expiryDate; private Date expiryDate;
@ApiModelProperty("存货日期") @ApiModelProperty("存货日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date inventoryDate; private Date inventoryDate;
@ApiModelProperty("ExtAttr3") @ApiModelProperty("ExtAttr3")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "ExtAttr3", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "ExtAttr3", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date extAttr3; private Date extAttr3;
@ApiModelProperty("ExtAttr4") @ApiModelProperty("ExtAttr4")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "ExtAttr4", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "ExtAttr4", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date extAttr4; private Date extAttr4;
mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/todo/MaterialInventoryQueryListDO.java
+5 -5
View File
@@ -221,31 +221,31 @@ public class MaterialInventoryQueryListDO extends MaterialBaseDO {
private String extAttr2; private String extAttr2;
@ApiModelProperty("生产日期") @ApiModelProperty("生产日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date productionDate; private Date productionDate;
@ApiModelProperty("过期日期") @ApiModelProperty("过期日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date expiryDate; private Date expiryDate;
@ApiModelProperty("存货日期") @ApiModelProperty("存货日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date inventoryDate; private Date inventoryDate;
@ApiModelProperty("ExtAttr3") @ApiModelProperty("ExtAttr3")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "ExtAttr3", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "ExtAttr3", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date extAttr3; private Date extAttr3;
@ApiModelProperty("ExtAttr4") @ApiModelProperty("ExtAttr4")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "ExtAttr4", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "ExtAttr4", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date extAttr4; private Date extAttr4;
mhd_wms/src/main/java/com/mhd/wms/domain/mobilizeManage/entity/MobilizeManage.java
+2 -2
View File
@@ -136,7 +136,7 @@ public class MobilizeManage extends BaseVOEntity {
private String mobilizeTypeCode; private String mobilizeTypeCode;
@ApiModelProperty("调拨申请日期") @ApiModelProperty("调拨申请日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "调拨申请日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "调拨申请日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date mobilizeApplicationDate; private Date mobilizeApplicationDate;
} }
mhd_wms/src/main/java/com/mhd/wms/domain/mobilizeManage/repository/po/MobilizeManagePO.java
+2 -2
View File
@@ -140,9 +140,9 @@ public class MobilizeManagePO extends BaseVOEntity {
private String mobilizeTypeCode; private String mobilizeTypeCode;
@ApiModelProperty("调拨申请日期") @ApiModelProperty("调拨申请日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "调拨申请日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "调拨申请日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date mobilizeApplicationDate; private Date mobilizeApplicationDate;
} }
mhd_wms/src/main/java/com/mhd/wms/domain/mobilizeManage/repository/todo/MobilizeManageDO.java
+2 -2
View File
@@ -149,7 +149,7 @@ public class MobilizeManageDO extends BaseVOEntity {
private String mobilizeTypeCode; private String mobilizeTypeCode;
@ApiModelProperty("调拨申请日期") @ApiModelProperty("调拨申请日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "调拨申请日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "调拨申请日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date mobilizeApplicationDate; private Date mobilizeApplicationDate;
} }
mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/po/OutMaterialDetailPO.java
+5 -5
View File
@@ -424,31 +424,31 @@ public class OutMaterialDetailPO extends StockOutOrderBaseDO {
private String extAttr2; private String extAttr2;
@ApiModelProperty("生产日期") @ApiModelProperty("生产日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date productionDate; private Date productionDate;
@ApiModelProperty("过期日期") @ApiModelProperty("过期日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date expiryDate; private Date expiryDate;
@ApiModelProperty("存货日期") @ApiModelProperty("存货日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date inventoryDate; private Date inventoryDate;
@ApiModelProperty("ExtAttr3") @ApiModelProperty("ExtAttr3")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "ExtAttr3", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "ExtAttr3", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date extAttr3; private Date extAttr3;
@ApiModelProperty("ExtAttr4") @ApiModelProperty("ExtAttr4")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "ExtAttr4", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "ExtAttr4", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date extAttr4; private Date extAttr4;
mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/todo/OutMaterialDetailDO.java
+1 -1
View File
@@ -494,7 +494,7 @@ public class OutMaterialDetailDO extends BaseVOEntity {
private List<Integer> copyCodeReferenceIdsCancel; private List<Integer> copyCodeReferenceIdsCancel;
@ApiModelProperty("生产日期") @ApiModelProperty("生产日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date productionDate; private Date productionDate;
mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/entity/PickingMaterialDetail.java
+5 -5
View File
@@ -223,32 +223,32 @@ public class PickingMaterialDetail extends BaseVOEntity {
private String extAttr2; private String extAttr2;
@ApiModelProperty("生产日期") @ApiModelProperty("生产日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date productionDate; private Date productionDate;
@ApiModelProperty("过期日期") @ApiModelProperty("过期日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date expiryDate; private Date expiryDate;
@ApiModelProperty("存货日期") @ApiModelProperty("存货日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date inventoryDate; private Date inventoryDate;
@ApiModelProperty("ExtAttr3") @ApiModelProperty("ExtAttr3")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "ExtAttr3", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "ExtAttr3", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@TableField("ext_attr_3") @TableField("ext_attr_3")
private Date extAttr3; private Date extAttr3;
@ApiModelProperty("ExtAttr4") @ApiModelProperty("ExtAttr4")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "ExtAttr4", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "ExtAttr4", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@TableField("ext_attr_4") @TableField("ext_attr_4")
mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/po/PickingMaterialDetailPO.java
+5 -5
View File
@@ -244,31 +244,31 @@ public class PickingMaterialDetailPO extends BaseVOEntity {
private String extAttr2; private String extAttr2;
@ApiModelProperty("生产日期") @ApiModelProperty("生产日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date productionDate; private Date productionDate;
@ApiModelProperty("过期日期") @ApiModelProperty("过期日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date expiryDate; private Date expiryDate;
@ApiModelProperty("存货日期") @ApiModelProperty("存货日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date inventoryDate; private Date inventoryDate;
@ApiModelProperty("ExtAttr3") @ApiModelProperty("ExtAttr3")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "ExtAttr3", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "ExtAttr3", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date extAttr3; private Date extAttr3;
@ApiModelProperty("ExtAttr4") @ApiModelProperty("ExtAttr4")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "ExtAttr4", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "ExtAttr4", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date extAttr4; private Date extAttr4;
mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/todo/PickingMaterialDetailDO.java
+5 -5
View File
@@ -238,31 +238,31 @@ public class PickingMaterialDetailDO extends BaseVOEntity {
private String extAttr2; private String extAttr2;
@ApiModelProperty("生产日期") @ApiModelProperty("生产日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date productionDate; private Date productionDate;
@ApiModelProperty("过期日期") @ApiModelProperty("过期日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date expiryDate; private Date expiryDate;
@ApiModelProperty("存货日期") @ApiModelProperty("存货日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date inventoryDate; private Date inventoryDate;
@ApiModelProperty("ExtAttr3") @ApiModelProperty("ExtAttr3")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "ExtAttr3", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "ExtAttr3", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date extAttr3; private Date extAttr3;
@ApiModelProperty("ExtAttr4") @ApiModelProperty("ExtAttr4")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "ExtAttr4", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "ExtAttr4", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date extAttr4; private Date extAttr4;
mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/entity/PickingOrder.java
+1 -1
View File
@@ -109,7 +109,7 @@ public class PickingOrder extends BaseVOEntity {
private Integer taskDistribution; private Integer taskDistribution;
@ApiModelProperty("任务下发时间") @ApiModelProperty("任务下发时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "任务下发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "任务下发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date taskDistributionTime; private Date taskDistributionTime;
mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/repository/po/PickingOrderPO.java
+1 -1
View File
@@ -110,7 +110,7 @@ public class PickingOrderPO extends StockOutOrderBasePO {
private Integer taskDistribution; private Integer taskDistribution;
@ApiModelProperty("任务下发时间") @ApiModelProperty("任务下发时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "任务下发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "任务下发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date taskDistributionTime; private Date taskDistributionTime;
mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/repository/todo/PickingOrderDO.java
+1 -1
View File
@@ -108,7 +108,7 @@ public class PickingOrderDO extends BaseVOEntity {
private Integer taskDistribution; private Integer taskDistribution;
@ApiModelProperty("任务下发时间") @ApiModelProperty("任务下发时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "任务下发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "任务下发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date taskDistributionTime; private Date taskDistributionTime;
mhd_wms/src/main/java/com/mhd/wms/domain/reviewOrder/entity/ReviewMaterialDetail.java
+2 -2
View File
@@ -66,7 +66,7 @@ public class ReviewMaterialDetail extends BaseVOEntity {
private String batchNumber; private String batchNumber;
@ApiModelProperty("生产日期") @ApiModelProperty("生产日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date productionDate; private Date productionDate;
@@ -120,4 +120,4 @@ public class ReviewMaterialDetail extends BaseVOEntity {
@ApiModelProperty("包装详情id") @ApiModelProperty("包装详情id")
@Excel(name = "包装详情id") @Excel(name = "包装详情id")
private String packDetailId; private String packDetailId;
} }
mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/entity/ShelfMaterialDetail.java
+5 -5
View File
@@ -281,35 +281,35 @@ public class ShelfMaterialDetail extends BaseVOEntity {
private String extAttr2; private String extAttr2;
@ApiModelProperty("生产日期") @ApiModelProperty("生产日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@TableField("production_date") @TableField("production_date")
private Date productionDate; private Date productionDate;
@ApiModelProperty("过期日期") @ApiModelProperty("过期日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@TableField("expiry_date") @TableField("expiry_date")
private Date expiryDate; private Date expiryDate;
@ApiModelProperty("存货日期") @ApiModelProperty("存货日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@TableField("inventory_date") @TableField("inventory_date")
private Date inventoryDate; private Date inventoryDate;
@ApiModelProperty("ExtAttr3") @ApiModelProperty("ExtAttr3")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "ExtAttr3", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "ExtAttr3", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@TableField("ext_attr_3") @TableField("ext_attr_3")
private Date extAttr3; private Date extAttr3;
@ApiModelProperty("ExtAttr4") @ApiModelProperty("ExtAttr4")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "ExtAttr4", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "ExtAttr4", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@TableField("ext_attr_4") @TableField("ext_attr_4")
mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/po/ShelfMaterialDetailPO.java
+5 -5
View File
@@ -292,31 +292,31 @@ public class ShelfMaterialDetailPO extends BaseVOEntity {
private String extAttr2; private String extAttr2;
@ApiModelProperty("生产日期") @ApiModelProperty("生产日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date productionDate; private Date productionDate;
@ApiModelProperty("过期日期") @ApiModelProperty("过期日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date expiryDate; private Date expiryDate;
@ApiModelProperty("存货日期") @ApiModelProperty("存货日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date inventoryDate; private Date inventoryDate;
@ApiModelProperty("ExtAttr3") @ApiModelProperty("ExtAttr3")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "ExtAttr3", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "ExtAttr3", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date extAttr3; private Date extAttr3;
@ApiModelProperty("ExtAttr4") @ApiModelProperty("ExtAttr4")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "ExtAttr4", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "ExtAttr4", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date extAttr4; private Date extAttr4;
mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/todo/ShelfMaterialDetailDO.java
+5 -5
View File
@@ -296,31 +296,31 @@ public class ShelfMaterialDetailDO extends BaseVOEntity {
private String extAttr2; private String extAttr2;
@ApiModelProperty("生产日期") @ApiModelProperty("生产日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date productionDate; private Date productionDate;
@ApiModelProperty("过期日期") @ApiModelProperty("过期日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date expiryDate; private Date expiryDate;
@ApiModelProperty("存货日期") @ApiModelProperty("存货日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date inventoryDate; private Date inventoryDate;
@ApiModelProperty("ExtAttr3") @ApiModelProperty("ExtAttr3")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "ExtAttr3", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "ExtAttr3", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date extAttr3; private Date extAttr3;
@ApiModelProperty("ExtAttr4") @ApiModelProperty("ExtAttr4")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "ExtAttr4", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "ExtAttr4", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date extAttr4; private Date extAttr4;
mhd_wms/src/main/java/com/mhd/wms/domain/statementStatistics/po/ImmediateInventoryPO.java
+9 -9
View File
@@ -88,27 +88,27 @@ public class ImmediateInventoryPO {
private String extAttr2; private String extAttr2;
@ApiModelProperty("生产日期") @ApiModelProperty("生产日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date productionDate; private Date productionDate;
@ApiModelProperty("过期日期") @ApiModelProperty("过期日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date expiryDate; private Date expiryDate;
@ApiModelProperty("存货日期") @ApiModelProperty("存货日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date inventoryDate; private Date inventoryDate;
@ApiModelProperty("ExtAttr3") @ApiModelProperty("ExtAttr3")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date extAttr3; private Date extAttr3;
@ApiModelProperty("ExtAttr4") @ApiModelProperty("ExtAttr4")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date extAttr4; private Date extAttr4;
@@ -136,22 +136,22 @@ public class ImmediateInventoryPO {
private String lotNumber; private String lotNumber;
@ApiModelProperty("库存更新时间") @ApiModelProperty("库存更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date inventoryUpdateTime; private Date inventoryUpdateTime;
@ApiModelProperty("拣货明细最近更新时间（本库存相关已拣货明细）") @ApiModelProperty("拣货明细最近更新时间（本库存相关已拣货明细）")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date pickLastUpdateTime; private Date pickLastUpdateTime;
@ApiModelProperty("复核明细最近更新时间（本库存相关复核条件内明细）") @ApiModelProperty("复核明细最近更新时间（本库存相关复核条件内明细）")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date checkLastUpdateTime; private Date checkLastUpdateTime;
@ApiModelProperty("列表排序用时间（库存/拣货/复核三者最晚）") @ApiModelProperty("列表排序用时间（库存/拣货/复核三者最晚）")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date latestChangeTime; private Date latestChangeTime;
} }
mhd_wms/src/main/java/com/mhd/wms/domain/stockInTaskOrder/entity/StockInTaskOrder.java
+2 -2
View File
@@ -96,7 +96,7 @@ public class StockInTaskOrder extends BaseVOEntity {
private String operatorsName; private String operatorsName;
@ApiModelProperty("作业完成时间") @ApiModelProperty("作业完成时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "作业完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "作业完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date operatorsEndTime; private Date operatorsEndTime;
@@ -105,4 +105,4 @@ public class StockInTaskOrder extends BaseVOEntity {
private String remark; private String remark;
} }
mhd_wms/src/main/java/com/mhd/wms/domain/stockInTaskOrder/repository/todo/StockInTaskOrderDO.java
+2 -2
View File
@@ -97,7 +97,7 @@ public class StockInTaskOrderDO extends BaseVOEntity {
private String operatorsName; private String operatorsName;
@ApiModelProperty("作业完成时间") @ApiModelProperty("作业完成时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "作业完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "作业完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date operatorsEndTime; private Date operatorsEndTime;
@@ -116,4 +116,4 @@ public class StockInTaskOrderDO extends BaseVOEntity {
@ApiModelProperty("上架作业物料详情") @ApiModelProperty("上架作业物料详情")
private List<TaskShelfMaterialDetailDO> taskShelfMaterialDetailList; private List<TaskShelfMaterialDetailDO> taskShelfMaterialDetailList;
} }
mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/entity/StockOutOrder.java
+4 -4
View File
@@ -120,7 +120,7 @@ public class StockOutOrder extends BaseVOEntity {
private String customerName; private String customerName;
@ApiModelProperty("预计出货时间") @ApiModelProperty("预计出货时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "预计出货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "预计出货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date expectTime; private Date expectTime;
@@ -232,7 +232,7 @@ public class StockOutOrder extends BaseVOEntity {
private Integer checkTaskDistribution; private Integer checkTaskDistribution;
@ApiModelProperty("复核任务下发时间") @ApiModelProperty("复核任务下发时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "复核任务下发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "复核任务下发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date checkTaskDistributionTime; private Date checkTaskDistributionTime;
@@ -339,12 +339,12 @@ public class StockOutOrder extends BaseVOEntity {
@Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date outboundDate; private Date outboundDate;
@ApiModelProperty("完成时间") @ApiModelProperty("完成时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date completeTime; private Date completeTime;
@ApiModelProperty("orderDate") @ApiModelProperty("orderDate")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "orderDate", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "orderDate", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date orderDate; private Date orderDate;
mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/po/StockOutOrderPO.java
+4 -4
View File
@@ -122,7 +122,7 @@ public class StockOutOrderPO extends BaseVOEntity {
private String customerName; private String customerName;
@ApiModelProperty("预计出货时间") @ApiModelProperty("预计出货时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "预计出货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "预计出货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date expectTime; private Date expectTime;
@@ -234,7 +234,7 @@ public class StockOutOrderPO extends BaseVOEntity {
private Integer checkTaskDistribution; private Integer checkTaskDistribution;
@ApiModelProperty("复核任务下发时间") @ApiModelProperty("复核任务下发时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "复核任务下发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "复核任务下发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date checkTaskDistributionTime; private Date checkTaskDistributionTime;
@@ -343,12 +343,12 @@ public class StockOutOrderPO extends BaseVOEntity {
@Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date outboundDate; private Date outboundDate;
@ApiModelProperty("完成时间") @ApiModelProperty("完成时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date completeTime; private Date completeTime;
@ApiModelProperty("orderDate") @ApiModelProperty("orderDate")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "orderDate", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "orderDate", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date orderDate; private Date orderDate;
mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/todo/StockOutOrderDO.java
+4 -4
View File
@@ -119,7 +119,7 @@ public class StockOutOrderDO extends BaseVOEntity {
private String customerName; private String customerName;
@ApiModelProperty("预计出货时间") @ApiModelProperty("预计出货时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "预计出货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "预计出货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date expectTime; private Date expectTime;
@@ -231,7 +231,7 @@ public class StockOutOrderDO extends BaseVOEntity {
private Integer checkTaskDistribution; private Integer checkTaskDistribution;
@ApiModelProperty("复核任务下发时间") @ApiModelProperty("复核任务下发时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "复核任务下发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "复核任务下发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date checkTaskDistributionTime; private Date checkTaskDistributionTime;
@@ -364,12 +364,12 @@ public class StockOutOrderDO extends BaseVOEntity {
@Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date outboundDate; private Date outboundDate;
@ApiModelProperty("完成时间") @ApiModelProperty("完成时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date completeTime; private Date completeTime;
@ApiModelProperty("orderDate") @ApiModelProperty("orderDate")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "orderDate", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "orderDate", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date orderDate; private Date orderDate;
mhd_wms/src/main/java/com/mhd/wms/domain/stockOutTaskOrder/entity/StockOutTaskOrder.java
+2 -2
View File
@@ -136,7 +136,7 @@ public class StockOutTaskOrder extends BaseVOEntity {
private String operatorsName; private String operatorsName;
@ApiModelProperty("作业完成时间") @ApiModelProperty("作业完成时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "作业完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "作业完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date operatorsEndTime; private Date operatorsEndTime;
@@ -145,4 +145,4 @@ public class StockOutTaskOrder extends BaseVOEntity {
private String remark; private String remark;
} }
mhd_wms/src/main/java/com/mhd/wms/domain/stockOutTaskOrder/repository/todo/StockOutTaskOrderDO.java
+2 -2
View File
@@ -138,7 +138,7 @@ public class StockOutTaskOrderDO extends BaseVOEntity {
private String operatorsName; private String operatorsName;
@ApiModelProperty("作业完成时间") @ApiModelProperty("作业完成时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "作业完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "作业完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date operatorsEndTime; private Date operatorsEndTime;
@@ -183,4 +183,4 @@ public class StockOutTaskOrderDO extends BaseVOEntity {
@ApiModelProperty(name = "作业完成时间查询条件结束日期") @ApiModelProperty(name = "作业完成时间查询条件结束日期")
private String operatorsEndTimeEnd; private String operatorsEndTimeEnd;
} }
mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/entity/StockReceiptOrder.java
+1 -1
View File
@@ -133,7 +133,7 @@ public class StockReceiptOrder extends BaseVOEntity {
private Integer taskDistributionMerge; private Integer taskDistributionMerge;
@ApiModelProperty("任务下发时间") @ApiModelProperty("任务下发时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "任务下发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "任务下发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date taskDistributionTime; private Date taskDistributionTime;
mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/repository/po/StockReceiptOrderPO.java
+1 -1
View File
@@ -111,7 +111,7 @@ public class StockReceiptOrderPO extends StockInOrderBasePO {
private Integer taskDistributionMerge; private Integer taskDistributionMerge;
@ApiModelProperty("任务下发时间") @ApiModelProperty("任务下发时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "任务下发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "任务下发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date taskDistributionTime; private Date taskDistributionTime;
mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/repository/todo/StockReceiptOrderDO.java
+1 -1
View File
@@ -113,7 +113,7 @@ public class StockReceiptOrderDO extends StockInOrderBaseDO {
private Integer taskDistributionMerge; private Integer taskDistributionMerge;
@ApiModelProperty("任务下发时间") @ApiModelProperty("任务下发时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "任务下发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "任务下发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date taskDistributionTime; private Date taskDistributionTime;
mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/entity/StockShelfOrder.java
+1 -1
View File
@@ -84,7 +84,7 @@ public class StockShelfOrder extends BaseVOEntity {
private Integer taskDistribution; private Integer taskDistribution;
@ApiModelProperty("任务下发时间") @ApiModelProperty("任务下发时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "任务下发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "任务下发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date taskDistributionTime; private Date taskDistributionTime;
mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/po/StockShelfOrderPO.java
+1 -1
View File
@@ -85,7 +85,7 @@ public class StockShelfOrderPO extends StockInOrderBasePO {
private Integer taskDistribution; private Integer taskDistribution;
@ApiModelProperty("任务下发时间") @ApiModelProperty("任务下发时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "任务下发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "任务下发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date taskDistributionTime; private Date taskDistributionTime;
mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/todo/StockShelfOrderDO.java
+1 -1
View File
@@ -83,7 +83,7 @@ public class StockShelfOrderDO extends StockInOrderBaseDO {
private Integer taskDistribution; private Integer taskDistribution;
@ApiModelProperty("任务下发时间") @ApiModelProperty("任务下发时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "任务下发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "任务下发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date taskDistributionTime; private Date taskDistributionTime;
mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/handoverTaskOrder/HandoverTaskOrderDTO.java
+1 -1
View File
@@ -87,7 +87,7 @@ public class HandoverTaskOrderDTO extends BaseVOEntity {
private String orderTypeName; private String orderTypeName;
@ApiModelProperty("预计出货时间") @ApiModelProperty("预计出货时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "预计出货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "预计出货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date expectTime; private Date expectTime;

Some files were not shown because too many files have changed in this diff Show More