diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/dto/MtOrderStatusDTO.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/dto/MtOrderStatusDTO.java index a700e516f..d96686453 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/dto/MtOrderStatusDTO.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/dto/MtOrderStatusDTO.java @@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import java.io.Serializable; -import java.util.Date; /** * 梦天 @@ -22,7 +21,7 @@ public class MtOrderStatusDTO implements Serializable { private String unitNo; @JsonProperty("操作时间") - private Date operationTime; + private String operationTime; @JsonProperty("仓库编号") private String warehouse; diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/dto/MtReceiveContentDTO.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/dto/MtReceiveContentDTO.java index 1e98a5641..487b358b7 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/dto/MtReceiveContentDTO.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/dto/MtReceiveContentDTO.java @@ -3,8 +3,6 @@ package com.logpm.factory.mt.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; -import java.util.Date; - @Data public class MtReceiveContentDTO { @@ -15,7 +13,7 @@ public class MtReceiveContentDTO { private String unitNo;//包条码 @JsonProperty("签收时间") - private Date operateDate;//签收时间 + private String operateDate;//签收时间 @JsonProperty("仓库编号") private String warehouseCode;//仓库编码 diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryDataServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryDataServiceImpl.java index 95c1d3125..a546f3e9f 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryDataServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryDataServiceImpl.java @@ -317,7 +317,7 @@ public class MtFactoryDataServiceImpl implements IMtFactoryDataService { mtOrderStatusDTO.setInvoiceOrderCode(mtFactoryOrderMain.getInvoiceOrderCode()); mtOrderStatusDTO.setOrderNo(orderNo); mtOrderStatusDTO.setUnitNo(unitNo); - mtOrderStatusDTO.setOperationTime(CommonUtil.StringToDate(orderStatusDTO.getOperationTime())); + mtOrderStatusDTO.setOperationTime(orderStatusDTO.getOperationTime()); mtOrderStatusDTO.setWarehouse(mtFactoryOrderMain.getCenterWarehouseCode()); mtOrderStatusDTO.setDealerName(mtFactoryOrder.getDealerName()); @@ -411,7 +411,7 @@ public class MtFactoryDataServiceImpl implements IMtFactoryDataService { mtReceiveContentDTO.setWarehouse(mtFactoryOrderMain.getCenterWarehouseName()); mtReceiveContentDTO.setOrderCode(mtFactoryOrder.getOrderCode()); mtReceiveContentDTO.setUnitNo(unitNo); - mtReceiveContentDTO.setOperateDate(CommonUtil.StringToDate(receiveBodyDTO.getOperateDate())); + mtReceiveContentDTO.setOperateDate(receiveBodyDTO.getOperateDate()); mtReceiveContentDTOList.add(mtReceiveContentDTO); } //签收信息数据存入头部数据