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:21:51 +08:00
parent 39503f9f3c
commit c7cb8614ef
170 changed files with 690 additions and 692 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/handoverTaskOrder/HandoverTaskOrderDTO.java
+2 -2
View File
@@ -65,12 +65,12 @@ public class HandoverTaskOrderDTO extends BaseVOEntity {
private Long platformUseTimeId;
@ApiModelProperty("月台使用开始时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "月台使用开始时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date platformUseStartTime;
@ApiModelProperty("月台使用结束时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "月台使用结束时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date platformUseEndTime;
mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/inventoryWarningAnalyze/InventoryWarningAnalyzeDTO.java
+2 -2
View File
@@ -141,7 +141,7 @@ public class InventoryWarningAnalyzeDTO extends BaseVOEntity {
private BigDecimal warningStandardQuantity;
@ApiModelProperty("预警时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "预警时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date warningTime;
@@ -159,4 +159,4 @@ public class InventoryWarningAnalyzeDTO extends BaseVOEntity {
@ApiModelProperty("物料条形码")
@Excel(name = "物料条形码")
private String barCode;
}
}
mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/investigationManage/InvestigationManageDTO.java
+3 -3
View File
@@ -107,7 +107,7 @@ public class InvestigationManageDTO extends BaseVOEntity {
private String auditByName;
@ApiModelProperty("盘点审核时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "盘点审核时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date auditTime;
@@ -116,7 +116,7 @@ public class InvestigationManageDTO extends BaseVOEntity {
private Integer taskDistribution;
@ApiModelProperty("任务下发时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "任务下发时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date taskDistributionTime;
@@ -173,4 +173,4 @@ public class InvestigationManageDTO extends BaseVOEntity {
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@TableField(exist = false)
private Date createEndTime;
}
}
mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialCommon/MaterialCommonDTO.java
+3 -3
View File
@@ -81,12 +81,12 @@ public class MaterialCommonDTO extends BaseVOEntity {
private String dangerLevelName;
@ApiModelProperty("生产日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date productionTime;
@ApiModelProperty("失效日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "失效日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date expirationTime;
@@ -100,4 +100,4 @@ public class MaterialCommonDTO extends BaseVOEntity {
@ApiModelProperty(name = "权限菜单ID")
private Long permissionMenuId;
}
}
mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/mobilizeManage/MobilizeManageDTO.java
+2 -2
View File
@@ -89,7 +89,7 @@ public class MobilizeManageDTO extends BaseVOEntity {
private String auditByName;
@ApiModelProperty("调拨审核时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "调拨审核时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date auditTime;
@@ -98,7 +98,7 @@ public class MobilizeManageDTO extends BaseVOEntity {
private Integer taskDistribution;
@ApiModelProperty("任务下发时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "任务下发时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date taskDistributionTime;
mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/qualityInspection/QualityInspectionDTO.java
+3 -3
View File
@@ -73,7 +73,7 @@ public class QualityInspectionDTO extends BaseVOEntity {
private String qualityInspectionName;
@ApiModelProperty("质检时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "质检时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date qualityInspectionTime;
@@ -98,7 +98,7 @@ public class QualityInspectionDTO extends BaseVOEntity {
private String handleByName;
@ApiModelProperty("处理时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "处理时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date handleTime;
@@ -200,4 +200,4 @@ public class QualityInspectionDTO extends BaseVOEntity {
@ApiModelProperty("质检项: 1-包装 2-纯度")
@Excel(name = "质检项: 1-包装 2-纯度")
private Integer qualityInspectionTerm;
}
}
mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/shiftManage/ShiftManageDTO.java
+3 -3
View File
@@ -94,7 +94,7 @@ public class ShiftManageDTO extends BaseVOEntity {
private String auditByName;
@ApiModelProperty("移位单审核时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "移位单审核时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date auditTime;
@@ -103,7 +103,7 @@ public class ShiftManageDTO extends BaseVOEntity {
private Integer taskDistribution;
@ApiModelProperty("任务下发时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "任务下发时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date taskDistributionTime;
@@ -160,4 +160,4 @@ public class ShiftManageDTO extends BaseVOEntity {
private List<ShiftMoveMaterialQuantityPO> shiftMoveMaterialQuantityList;
}
}
mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java
+3 -3
View File
@@ -68,7 +68,7 @@ public class StockOutOrderDTO extends StockOutOrderBaseDTO {
private String auditByName;
@ApiModelProperty("出库单审核时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "出库单审核时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date auditTime;
@@ -195,7 +195,7 @@ public class StockOutOrderDTO extends StockOutOrderBaseDTO {
private String cancelByName;
@ApiModelProperty("取消订单时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "取消订单时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date cancelTime;
@@ -216,7 +216,7 @@ public class StockOutOrderDTO extends StockOutOrderBaseDTO {
private String closeByName;
@ApiModelProperty("关闭订单时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "关闭订单时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date closeTime;
mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/waveOrder/WaveOrderDTO.java
+2 -2
View File
@@ -153,7 +153,7 @@ public class WaveOrderDTO extends BaseVOEntity {
private String cancelByName;
@ApiModelProperty("取消波次时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "取消波次时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date cancelTime;
@@ -173,4 +173,4 @@ public class WaveOrderDTO extends BaseVOEntity {
@ApiModelProperty("物料明细")
private List<OutMaterialDetailDTO> materialDetailList;
}
}