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

Merge remote-tracking branch 'origin/dev_WMS20260401' into dev_WMS20260401

Browse Source
This commit is contained in:
秦鸿展
2026-05-28 21:24:45 +08:00
parent b7c17be566 c7cb8614ef
commit 3b13d4222d
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/domain/handoverTaskOrder/entity/HandoverTaskOrder.java
+3 -3
View File
@@ -67,12 +67,12 @@ public class HandoverTaskOrder 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;
@@ -130,7 +130,7 @@ public class HandoverTaskOrder 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/domain/handoverTaskOrder/repository/po/HandoverTaskOrderPO.java
+2 -2
View File
@@ -69,12 +69,12 @@ public class HandoverTaskOrderPO 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/domain/handoverTaskOrder/repository/todo/HandoverTaskOrderDO.java
+2 -2
View File
@@ -65,12 +65,12 @@ public class HandoverTaskOrderDO 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/domain/inMaterialDetail/repository/po/InMaterialDetailPO.java
+3 -3
View File
@@ -357,17 +357,17 @@ public class InMaterialDetailPO extends StockInOrderBasePO {
@ApiModelProperty("生产日期")
@Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date productionDate;
@ApiModelProperty("过期日期")
@Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date expiryDate;
@ApiModelProperty("存货日期")
@Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date inventoryDate;
@ApiModelProperty("扩展属性1")
mhd_wms/src/main/java/com/mhd/wms/domain/inventoryWarningAnalyze/entity/InventoryWarningAnalyze.java
+2 -2
View File
@@ -144,7 +144,7 @@ public class InventoryWarningAnalyze 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;
@@ -157,4 +157,4 @@ public class InventoryWarningAnalyze extends BaseVOEntity {
@Excel(name = "物料条形码")
private String barCode;
}
}
mhd_wms/src/main/java/com/mhd/wms/domain/inventoryWarningAnalyze/repository/po/InventoryWarningAnalyzePO.java
+2 -2
View File
@@ -143,7 +143,7 @@ public class InventoryWarningAnalyzePO 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 InventoryWarningAnalyzePO extends BaseVOEntity {
private String barCode;
}
}
mhd_wms/src/main/java/com/mhd/wms/domain/inventoryWarningAnalyze/repository/todo/InventoryWarningAnalyzeDO.java
+2 -2
View File
@@ -142,7 +142,7 @@ public class InventoryWarningAnalyzeDO 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 InventoryWarningAnalyzeDO extends BaseVOEntity {
@ApiModelProperty("物料条形码")
@Excel(name = "物料条形码")
private String barCode;
}
}
mhd_wms/src/main/java/com/mhd/wms/domain/investigationManage/entity/InvestigationManage.java
+3 -3
View File
@@ -110,7 +110,7 @@ public class InvestigationManage 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;
@@ -119,7 +119,7 @@ public class InvestigationManage 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;
@@ -142,4 +142,4 @@ public class InvestigationManage extends BaseVOEntity {
@ApiModelProperty("盘点详情")
@TableField(exist = false)
private List<InvestigetionManageDetail> investigetionManageDetailList;
}
}
mhd_wms/src/main/java/com/mhd/wms/domain/investigationManage/repository/po/InvestigationManagePO.java
+3 -3
View File
@@ -110,7 +110,7 @@ public class InvestigationManagePO 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;
@@ -119,7 +119,7 @@ public class InvestigationManagePO 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;
@@ -165,4 +165,4 @@ public class InvestigationManagePO extends BaseVOEntity {
@ApiModelProperty("盘点进度=已盘点状态的库存数量/盘点单库存总数量")
private BigDecimal investigationProgress;
}
}
mhd_wms/src/main/java/com/mhd/wms/domain/investigationManage/repository/todo/InvestigationManageDO.java
+3 -3
View File
@@ -108,7 +108,7 @@ public class InvestigationManageDO 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;
@@ -117,7 +117,7 @@ public class InvestigationManageDO 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 InvestigationManageDO extends BaseVOEntity {
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@TableField(exist = false)
private Date createEndTime;
}
}
mhd_wms/src/main/java/com/mhd/wms/domain/materialCommon/entity/MaterialCommon.java
+3 -3
View File
@@ -84,12 +84,12 @@ public class MaterialCommon 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;
@@ -98,4 +98,4 @@ public class MaterialCommon extends BaseVOEntity {
private String remark;
}
}
mhd_wms/src/main/java/com/mhd/wms/domain/materialCommon/repository/po/MaterialCommonPO.java
+3 -3
View File
@@ -83,12 +83,12 @@ public class MaterialCommonPO 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;
@@ -98,4 +98,4 @@ public class MaterialCommonPO extends BaseVOEntity {
}
}
mhd_wms/src/main/java/com/mhd/wms/domain/materialCommon/repository/todo/MaterialCommonDO.java
+3 -3
View File
@@ -82,12 +82,12 @@ public class MaterialCommonDO 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 MaterialCommonDO extends BaseVOEntity {
@ApiModelProperty(name = "权限菜单ID")
private Long permissionMenuId;
}
}
mhd_wms/src/main/java/com/mhd/wms/domain/mobilizeManage/entity/MobilizeManage.java
+2 -2
View File
@@ -88,7 +88,7 @@ public class MobilizeManage 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;
@@ -97,7 +97,7 @@ public class MobilizeManage 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/domain/mobilizeManage/repository/po/MobilizeManagePO.java
+2 -2
View File
@@ -89,7 +89,7 @@ public class MobilizeManagePO 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 MobilizeManagePO 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/domain/mobilizeManage/repository/todo/MobilizeManageDO.java
+2 -2
View File
@@ -90,7 +90,7 @@ public class MobilizeManageDO 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;
@@ -99,7 +99,7 @@ public class MobilizeManageDO 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/domain/qualityInspection/entity/QualityInspection.java
+3 -3
View File
@@ -76,7 +76,7 @@ public class QualityInspection 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;
@@ -101,7 +101,7 @@ public class QualityInspection 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;
@@ -134,4 +134,4 @@ public class QualityInspection extends BaseVOEntity {
private String remark;
}
}
mhd_wms/src/main/java/com/mhd/wms/domain/qualityInspection/repository/po/QualityInspectionPO.java
+3 -3
View File
@@ -75,7 +75,7 @@ public class QualityInspectionPO 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;
@@ -100,7 +100,7 @@ public class QualityInspectionPO 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;
@@ -198,4 +198,4 @@ public class QualityInspectionPO extends BaseVOEntity {
}
}
mhd_wms/src/main/java/com/mhd/wms/domain/qualityInspection/repository/todo/QualityInspectionDO.java
+3 -3
View File
@@ -74,7 +74,7 @@ public class QualityInspectionDO 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;
@@ -99,7 +99,7 @@ public class QualityInspectionDO 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;
@@ -201,4 +201,4 @@ public class QualityInspectionDO extends BaseVOEntity {
@Excel(name = "质检项: 1-包装 2-纯度")
private Integer qualityInspectionTerm;
}
}
mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/entity/ReceiptMaterialDetail.java
+3 -3
View File
@@ -273,17 +273,17 @@ public class ReceiptMaterialDetail extends BaseVOEntity {
@ApiModelProperty("生产日期")
@Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date productionDate;
@ApiModelProperty("过期日期")
@Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date expiryDate;
@ApiModelProperty("存货日期")
@Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date inventoryDate;
@ApiModelProperty("扩展属性1")
mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/po/ReceiptMaterialDetailPO.java
+3 -3
View File
@@ -303,17 +303,17 @@ public class ReceiptMaterialDetailPO extends BaseVOEntity {
@ApiModelProperty("生产日期")
@Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date productionDate;
@ApiModelProperty("过期日期")
@Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date expiryDate;
@ApiModelProperty("存货日期")
@Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date inventoryDate;
@ApiModelProperty("扩展属性1")
mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/todo/ReceiptMaterialDetailDO.java
+3 -3
View File
@@ -287,17 +287,17 @@ public class ReceiptMaterialDetailDO extends BaseVOEntity {
@ApiModelProperty("生产日期")
@Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date productionDate;
@ApiModelProperty("过期日期")
@Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date expiryDate;
@ApiModelProperty("存货日期")
@Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date inventoryDate;
@ApiModelProperty("扩展属性1")
mhd_wms/src/main/java/com/mhd/wms/domain/shiftManage/entity/ShiftManage.java
+3 -3
View File
@@ -96,7 +96,7 @@ public class ShiftManage 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;
@@ -105,7 +105,7 @@ public class ShiftManage 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;
@@ -150,4 +150,4 @@ public class ShiftManage extends BaseVOEntity {
private List<ShiftMaterialDetailPO> shiftMaterialDetailList;
}
}
mhd_wms/src/main/java/com/mhd/wms/domain/shiftManage/repository/po/ShiftManagePO.java
+3 -3
View File
@@ -103,7 +103,7 @@ public class ShiftManagePO 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;
@@ -112,7 +112,7 @@ public class ShiftManagePO 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;
@@ -150,4 +150,4 @@ public class ShiftManagePO extends BaseVOEntity {
}
}
mhd_wms/src/main/java/com/mhd/wms/domain/shiftManage/repository/todo/ShiftManageDO.java
+3 -3
View File
@@ -94,7 +94,7 @@ public class ShiftManageDO 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 ShiftManageDO 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;
@@ -157,4 +157,4 @@ public class ShiftManageDO extends BaseVOEntity {
@ApiModelProperty("移位详情")
@TableField(exist = false)
private String shiftProgress;
}
}
mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/entity/StockOutOrder.java
+3 -3
View File
@@ -71,7 +71,7 @@ public class StockOutOrder 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;
@@ -198,7 +198,7 @@ public class StockOutOrder 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;
@@ -219,7 +219,7 @@ public class StockOutOrder extends BaseVOEntity {
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/domain/stockOutOrder/repository/po/StockOutOrderPO.java
+3 -3
View File
@@ -73,7 +73,7 @@ public class StockOutOrderPO 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;
@@ -200,7 +200,7 @@ public class StockOutOrderPO 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;
@@ -221,7 +221,7 @@ public class StockOutOrderPO extends BaseVOEntity {
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/domain/stockOutOrder/repository/todo/StockOutOrderDO.java
+3 -3
View File
@@ -70,7 +70,7 @@ public class StockOutOrderDO 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;
@@ -197,7 +197,7 @@ public class StockOutOrderDO 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;
@@ -218,7 +218,7 @@ public class StockOutOrderDO extends BaseVOEntity {
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/domain/waveOrder/entity/WaveOrder.java
+2 -2
View File
@@ -155,7 +155,7 @@ public class WaveOrder 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;
@@ -164,4 +164,4 @@ public class WaveOrder extends BaseVOEntity {
private String remark;
}
}
mhd_wms/src/main/java/com/mhd/wms/domain/waveOrder/repository/po/WaveOrderPO.java
+2 -2
View File
@@ -156,7 +156,7 @@ public class WaveOrderPO 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;
@@ -167,4 +167,4 @@ public class WaveOrderPO extends BaseVOEntity {
@ApiModelProperty("物料明细")
private List<WaveMaterialDetailPO> materialDetailList;
}
}
mhd_wms/src/main/java/com/mhd/wms/domain/waveOrder/repository/todo/WaveOrderDO.java
+2 -2
View File
@@ -154,7 +154,7 @@ public class WaveOrderDO 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 WaveOrderDO extends BaseVOEntity {
@ApiModelProperty("物料明细")
private List<WaveMaterialDetailDO> materialDetailList;
}
}
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;
}
}