From 27d6b7ab6564462a08a622010c3b33e9e1b571fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Thu, 28 May 2026 16:32:02 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A5=AE=E7=94=A8=E6=97=A5=E6=9C=9F=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/mhd/system/api/OmsServiceFeign.java     | 2 +-
 .../main/java/com/mhd/system/api/domain/InMaterialDetail.java | 4 ++--
 .../entity/ReservationInMaterialDetail.java                   | 4 ++--
 .../repository/po/ReservationInMaterialDetailPO.java          | 4 ++--
 .../repository/todo/ReservationInMaterialDetailDO.java        | 4 ++--
 .../repository/todo/ReservationInMaterialDetailDTO.java       | 4 ++--
 .../ReservationMaterialInventoryApi.java                      | 3 +--
 .../wms/domain/inMaterialDetail/entity/InMaterialDetail.java  | 4 ++--
 .../inMaterialDetail/repository/po/InMaterialDetailPO.java    | 4 ++--
 .../inMaterialDetail/repository/todo/InMaterialDetailDO.java  | 4 ++--
 .../receiptMaterialDetail/entity/ReceiptMaterialDetail.java   | 4 ++--
 .../repository/po/ReceiptMaterialDetailPO.java                | 4 ++--
 .../repository/todo/ReceiptMaterialDetailDO.java              | 4 ++--
 .../interfaces/dto/inMaterialDetail/InMaterialDetailDTO.java  | 4 ++--
 .../dto/receiptMaterialDetail/ReceiptMaterialDetailDTO.java   | 4 ++--
 15 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java
index d8064498d..17315d454 100644
--- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java
+++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java
@@ -35,7 +35,7 @@ public interface OmsServiceFeign {
 
     @ApiOperation("编辑物料库存")
     @PostMapping("/reservationMaterialInventoryApi/omsEdit")
-    public AjaxResult omsEdit(@RequestBody MaterialInventoryOmsParamDO materialInventoryOmsParamDO);
+    public void omsEdit(@RequestBody MaterialInventoryOmsParamDO materialInventoryOmsParamDO);
 
     @ApiOperation("查询企业单位列表-新增物料时显示下拉框数据")
     @GetMapping("/erpEnterpriseUnitApi/unitList")
diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/InMaterialDetail.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/InMaterialDetail.java
index 9327fea0e..00e1e3e2b 100644
--- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/InMaterialDetail.java
+++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/InMaterialDetail.java
@@ -373,7 +373,7 @@ public class InMaterialDetail extends BaseVOEntity {
     private String omsInMaterialDetail;
 
     @ApiModelProperty(value = "饮用时间")
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     private Date drinkDate;
 }
\ No newline at end of file
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/entity/ReservationInMaterialDetail.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/entity/ReservationInMaterialDetail.java
index 826d02746..ec3ddbd60 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/entity/ReservationInMaterialDetail.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/entity/ReservationInMaterialDetail.java
@@ -368,7 +368,7 @@ public class ReservationInMaterialDetail extends BaseVOEntity {
     @Excel(name = "lot编号")
     private String lotNo;
     @ApiModelProperty(value = "饮用时间")
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     private Date drinkDate;
 }
\ No newline at end of file
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/po/ReservationInMaterialDetailPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/po/ReservationInMaterialDetailPO.java
index 6c4bfc308..b863181e7 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/po/ReservationInMaterialDetailPO.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/po/ReservationInMaterialDetailPO.java
@@ -469,7 +469,7 @@ public class ReservationInMaterialDetailPO extends ReservationStockInOrderBasePO
     @Excel(name = "调整后面积")
     private BigDecimal adjustedArea;
     @ApiModelProperty(value = "饮用时间")
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     private Date drinkDate;
 }
\ No newline at end of file
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/todo/ReservationInMaterialDetailDO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/todo/ReservationInMaterialDetailDO.java
index 1fcab5a19..12030f44d 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/todo/ReservationInMaterialDetailDO.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/todo/ReservationInMaterialDetailDO.java
@@ -433,8 +433,8 @@ public class ReservationInMaterialDetailDO extends ReservationStockInOrderBaseDO
     private BigDecimal adjustedArea;
 
     @ApiModelProperty(value = "饮用时间")
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     private Date drinkDate;
 
 }
\ No newline at end of file
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/todo/ReservationInMaterialDetailDTO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/todo/ReservationInMaterialDetailDTO.java
index dc5e9d503..4c058b8de 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/todo/ReservationInMaterialDetailDTO.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/todo/ReservationInMaterialDetailDTO.java
@@ -444,7 +444,7 @@ public class ReservationInMaterialDetailDTO extends BaseVOEntity {
     private BigDecimal adjustedArea;
 
     @ApiModelProperty(value = "饮用时间")
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     private Date drinkDate;
 }
\ No newline at end of file
diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/reservationMaterialInventory/ReservationMaterialInventoryApi.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/reservationMaterialInventory/ReservationMaterialInventoryApi.java
index 725028897..fc199db06 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/reservationMaterialInventory/ReservationMaterialInventoryApi.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/reservationMaterialInventory/ReservationMaterialInventoryApi.java
@@ -185,10 +185,9 @@ public class ReservationMaterialInventoryApi extends BaseController {
      */
     @ApiOperation("编辑物料库存")
     @PostMapping("/omsEdit")
-    public AjaxResult omsEdit(@RequestBody MaterialInventoryOmsParamDO materialInventoryOmsParamDO)
+    public void omsEdit(@RequestBody MaterialInventoryOmsParamDO materialInventoryOmsParamDO)
     {
         materialInventoryApplicationService.omsEdit(materialInventoryOmsParamDO);
-        return AjaxResult.success();
     }
 
 }
\ No newline at end of file
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/entity/InMaterialDetail.java b/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/entity/InMaterialDetail.java
index 415c0bee9..ba73df65a 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/entity/InMaterialDetail.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/entity/InMaterialDetail.java
@@ -378,7 +378,7 @@ public class InMaterialDetail extends BaseVOEntity {
 
 
     @ApiModelProperty(value = "饮用时间")
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     private Date drinkDate;
 }
\ No newline at end of file
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/po/InMaterialDetailPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/po/InMaterialDetailPO.java
index 6d0015b47..e4ace113c 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/po/InMaterialDetailPO.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/po/InMaterialDetailPO.java
@@ -420,7 +420,7 @@ public class InMaterialDetailPO extends StockInOrderBasePO {
     private String omsInMaterialDetail;
 
     @ApiModelProperty(value = "饮用时间")
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     private Date drinkDate;
 }
\ No newline at end of file
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/todo/InMaterialDetailDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/todo/InMaterialDetailDO.java
index e20dff8c2..328d3fd79 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/todo/InMaterialDetailDO.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/todo/InMaterialDetailDO.java
@@ -386,7 +386,7 @@ public class InMaterialDetailDO extends StockInOrderBaseDO {
 
 
     @ApiModelProperty(value = "饮用时间")
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     private Date drinkDate;
 }
\ No newline at end of file
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/entity/ReceiptMaterialDetail.java b/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/entity/ReceiptMaterialDetail.java
index f0177b035..357fb3a87 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/entity/ReceiptMaterialDetail.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/entity/ReceiptMaterialDetail.java
@@ -369,8 +369,8 @@ public class ReceiptMaterialDetail extends BaseVOEntity {
 
 
     @ApiModelProperty(value = "饮用时间")
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     private Date drinkDate;
 
 }
\ No newline at end of file
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/po/ReceiptMaterialDetailPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/po/ReceiptMaterialDetailPO.java
index a12a57139..6301f377a 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/po/ReceiptMaterialDetailPO.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/po/ReceiptMaterialDetailPO.java
@@ -367,7 +367,7 @@ public class ReceiptMaterialDetailPO extends BaseVOEntity {
 
 
     @ApiModelProperty(value = "饮用时间")
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     private Date drinkDate;
 }
\ No newline at end of file
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/todo/ReceiptMaterialDetailDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/todo/ReceiptMaterialDetailDO.java
index 8ab0089ce..b41786099 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/todo/ReceiptMaterialDetailDO.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/todo/ReceiptMaterialDetailDO.java
@@ -361,7 +361,7 @@ public class ReceiptMaterialDetailDO extends BaseVOEntity {
     private String omsInMaterialDetail;
 
     @ApiModelProperty(value = "饮用时间")
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     private Date drinkDate;
 }
\ No newline at end of file
diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/inMaterialDetail/InMaterialDetailDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/inMaterialDetail/InMaterialDetailDTO.java
index 927d78d5d..0518b1f93 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/inMaterialDetail/InMaterialDetailDTO.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/inMaterialDetail/InMaterialDetailDTO.java
@@ -384,7 +384,7 @@ public class InMaterialDetailDTO extends BaseVOEntity {
     private String lotNo;
 
     @ApiModelProperty(value = "饮用时间")
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     private Date drinkDate;
 }
\ No newline at end of file
diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/receiptMaterialDetail/ReceiptMaterialDetailDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/receiptMaterialDetail/ReceiptMaterialDetailDTO.java
index 9118d27a0..7077eff54 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/receiptMaterialDetail/ReceiptMaterialDetailDTO.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/receiptMaterialDetail/ReceiptMaterialDetailDTO.java
@@ -313,7 +313,7 @@ public class ReceiptMaterialDetailDTO extends BaseVOEntity {
 
 
     @ApiModelProperty(value = "饮用时间")
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     private Date drinkDate;
 }
\ No newline at end of file