From ba106f11161477013a9632eb850753c99925fa55 Mon Sep 17 00:00:00 2001 From: xs Date: Tue, 10 Dec 2024 16:55:51 +0800 Subject: [PATCH] =?UTF-8?q?3.6.5=20=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E7=B2=BE=E7=A1=AE=E5=88=B0=E6=97=B6=E5=88=86=E7=A7=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/hw/wms/domain/WmsInventoryCheck.java | 8 ++++---- .../com/hw/wms/domain/WmsInventoryCheckDetail.java | 4 ++-- .../main/java/com/hw/wms/domain/WmsMoveDetail.java | 2 +- .../java/com/hw/wms/domain/WmsProductInstock.java | 2 +- hw-ui/src/views/wms/info/inventoryCheck/index.vue | 12 ------------ hw-ui/src/views/wms/info/productInstock/index.vue | 3 --- hw-ui/src/views/wms/info/rawreturn/index.vue | 3 --- 7 files changed, 8 insertions(+), 26 deletions(-) diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsInventoryCheck.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsInventoryCheck.java index 8e39f6c3..8ce9bbb1 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsInventoryCheck.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsInventoryCheck.java @@ -37,12 +37,12 @@ public class WmsInventoryCheck extends BaseEntity private String checkType; /** 盘点开始时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "盘点开始时间", width = 30, dateFormat = "yyyy-MM-dd") private Date beginTime; /** 盘点结束时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "盘点结束时间", width = 30, dateFormat = "yyyy-MM-dd") private Date endTime; @@ -59,12 +59,12 @@ public class WmsInventoryCheck extends BaseEntity private Long inventoriedAmount; /** 创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") private Date createDate; /** 最后更新时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "最后更新时间", width = 30, dateFormat = "yyyy-MM-dd") private Date updateDate; diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsInventoryCheckDetail.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsInventoryCheckDetail.java index 390756bf..87513e9a 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsInventoryCheckDetail.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsInventoryCheckDetail.java @@ -72,12 +72,12 @@ public class WmsInventoryCheckDetail extends BaseEntity private BigDecimal erpAmount; /** 创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") private Date createDate; /** 最后更新时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "最后更新时间", width = 30, dateFormat = "yyyy-MM-dd") private Date updateDate; diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsMoveDetail.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsMoveDetail.java index a45824ff..fc2b7326 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsMoveDetail.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsMoveDetail.java @@ -61,7 +61,7 @@ public class WmsMoveDetail extends BaseEntity private String executePerson; /** 执行时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "执行时间", width = 30, dateFormat = "yyyy-MM-dd") private Date executeTime; diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsProductInstock.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsProductInstock.java index b39463c0..b5bf34ed 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsProductInstock.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsProductInstock.java @@ -126,7 +126,7 @@ public class WmsProductInstock extends BaseEntity { /** * 申请时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "申请时间", width = 30, dateFormat = "yyyy-MM-dd") private Date applyDate; diff --git a/hw-ui/src/views/wms/info/inventoryCheck/index.vue b/hw-ui/src/views/wms/info/inventoryCheck/index.vue index 22bfc113..dbbf4dfa 100644 --- a/hw-ui/src/views/wms/info/inventoryCheck/index.vue +++ b/hw-ui/src/views/wms/info/inventoryCheck/index.vue @@ -85,29 +85,17 @@ - - - - diff --git a/hw-ui/src/views/wms/info/productInstock/index.vue b/hw-ui/src/views/wms/info/productInstock/index.vue index 398146f7..0aa2f325 100644 --- a/hw-ui/src/views/wms/info/productInstock/index.vue +++ b/hw-ui/src/views/wms/info/productInstock/index.vue @@ -146,9 +146,6 @@ - diff --git a/hw-ui/src/views/wms/info/rawreturn/index.vue b/hw-ui/src/views/wms/info/rawreturn/index.vue index 558e0a32..883ad82a 100644 --- a/hw-ui/src/views/wms/info/rawreturn/index.vue +++ b/hw-ui/src/views/wms/info/rawreturn/index.vue @@ -90,9 +90,6 @@ -