饮用日期格式修改;

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")

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")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     private Date drinkDate;
 }

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")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     private Date drinkDate;
 }

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")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     private Date drinkDate;
 }

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")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     private Date drinkDate;
 
 }

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")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     private Date drinkDate;
 }

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();
     }
 
 }

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")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     private Date drinkDate;
 }

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")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     private Date drinkDate;
 }

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")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     private Date drinkDate;
 }

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")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     private Date drinkDate;
 
 }

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")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     private Date drinkDate;
 }

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")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     private Date drinkDate;
 }

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")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     private Date drinkDate;
 }

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")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     private Date drinkDate;
 }