磅单OCR识别需求

performance-api/src/main/java/com/clx/performance/vo/app/OrderChildPoundInfoVO.java

 package com.clx.performance.vo.app;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.msl.common.convertor.type.MoneyOutConvert;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -9,7 +8,6 @@ import lombok.Setter;
 import lombok.ToString;
 
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 import java.util.List;
 
 @Getter
@@ -56,14 +54,14 @@ public class OrderChildPoundInfoVO {
     private List<String> unloadImageList;
 
     @ApiModelProperty(value = "到达货源地时间")
-    private LocalDateTime arriveSendTime;
+    private String arriveSendTime;
 
     @ApiModelProperty(value = "首次装货时间")
-    private LocalDateTime firstLoadTime;
+    private String firstLoadTime;
 
     @ApiModelProperty(value = "到达目的地时间")
-    private LocalDateTime arriveReceiveTime;
+    private String arriveReceiveTime;
 
     @ApiModelProperty(value = "首次交货时间")
-    private LocalDateTime firstUnloadTime;
+    private String firstUnloadTime;
 }
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java

@@ -102,6 +102,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
+import static com.msl.common.utils.LocalDateTimeUtils.convertLocalDateTimeToDefaultString;
 import static com.msl.common.utils.LocalDateTimeUtils.covertStringToDefaultLocalDateTime;
 
 /**
@@ -1603,9 +1604,9 @@ public class OrderChildServiceImpl implements OrderChildService {
         OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderChild.getOrderGoodsNo()).orElseThrow(PerformanceResultEnum.ORDER_CHILD_NO_FOUND);
 
         OrderChildVO result = orderChildStruct.convert(orderChild);
-        result.setLastArriveSendTime(orderGoods.getLastArriveSendTime()==null? null : LocalDateTimeUtils.convertLocalDateTimeToDefaultString(orderGoods.getLastArriveSendTime()));
-        result.setLastArriveReceiveTime(orderGoods.getLastArriveReceiveTime()==null? null : LocalDateTimeUtils.convertLocalDateTimeToDefaultString(orderGoods.getLastArriveReceiveTime()));
-        result.setLastLoadTime(orderGoods.getLastLoadTime()==null? null : LocalDateTimeUtils.convertLocalDateTimeToDefaultString(orderGoods.getLastLoadTime()));
+        result.setLastArriveSendTime(orderGoods.getLastArriveSendTime()==null? null : convertLocalDateTimeToDefaultString(orderGoods.getLastArriveSendTime()));
+        result.setLastArriveReceiveTime(orderGoods.getLastArriveReceiveTime()==null? null : convertLocalDateTimeToDefaultString(orderGoods.getLastArriveReceiveTime()));
+        result.setLastLoadTime(orderGoods.getLastLoadTime()==null? null : convertLocalDateTimeToDefaultString(orderGoods.getLastLoadTime()));
 
         // 磅单
         if (Objects.equals(orderChild.getPoundStatus(), OrderChildPoundAuditEnum.Status.REJECT.getCode())) {
@@ -1688,9 +1689,9 @@ public class OrderChildServiceImpl implements OrderChildService {
         OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderChild.getOrderGoodsNo()).orElseThrow(PerformanceResultEnum.ORDER_CHILD_NO_FOUND);
 
         OrderChildVO result = orderChildStruct.convert(orderChild);
-        result.setLastArriveSendTime(orderGoods.getLastArriveSendTime()==null? null : LocalDateTimeUtils.convertLocalDateTimeToDefaultString(orderGoods.getLastArriveSendTime()));
-        result.setLastArriveReceiveTime(orderGoods.getLastArriveReceiveTime()==null? null : LocalDateTimeUtils.convertLocalDateTimeToDefaultString(orderGoods.getLastArriveReceiveTime()));
-        result.setLastLoadTime(orderGoods.getLastLoadTime()==null? null : LocalDateTimeUtils.convertLocalDateTimeToDefaultString(orderGoods.getLastLoadTime()));
+        result.setLastArriveSendTime(orderGoods.getLastArriveSendTime()==null? null : convertLocalDateTimeToDefaultString(orderGoods.getLastArriveSendTime()));
+        result.setLastArriveReceiveTime(orderGoods.getLastArriveReceiveTime()==null? null : convertLocalDateTimeToDefaultString(orderGoods.getLastArriveReceiveTime()));
+        result.setLastLoadTime(orderGoods.getLastLoadTime()==null? null : convertLocalDateTimeToDefaultString(orderGoods.getLastLoadTime()));
 
         // 磅单
         if (Objects.equals(orderChild.getPoundStatus(), OrderChildPoundAuditEnum.Status.REJECT.getCode())) {
@@ -1873,6 +1874,11 @@ public class OrderChildServiceImpl implements OrderChildService {
                 item -> Objects.equals(item.getType(), OrderChildImage.Type.UNLOAD.getCode())).map(
                 item -> item.getImage()).collect(Collectors.toList()));
 
+        result.setArriveSendTime(orderChild.getArriveSendTime()==null?null:convertLocalDateTimeToDefaultString(orderChild.getArriveSendTime()));
+        result.setFirstLoadTime(orderChild.getFirstLoadTime()==null?null:convertLocalDateTimeToDefaultString(orderChild.getFirstLoadTime()));
+        result.setArriveReceiveTime(orderChild.getArriveReceiveTime()==null?null:convertLocalDateTimeToDefaultString(orderChild.getArriveReceiveTime()));
+        result.setFirstUnloadTime(orderChild.getFirstUnloadTime()==null?null:convertLocalDateTimeToDefaultString(orderChild.getFirstUnloadTime()));
+
         return result;
     }
 
@@ -2241,9 +2247,9 @@ public class OrderChildServiceImpl implements OrderChildService {
             //查询货单
             OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderChild.getOrderGoodsNo()).orElseThrow(
                     PerformanceResultEnum.ORDER_INVALID);
-            orderChildVO.setLastArriveSendTime(LocalDateTimeUtils.convertLocalDateTimeToDefaultString(orderGoods.getLastArriveSendTime()));
-            orderChildVO.setLastArriveReceiveTime(LocalDateTimeUtils.convertLocalDateTimeToDefaultString(orderGoods.getLastArriveReceiveTime()));
-            orderChildVO.setLastLoadTime(LocalDateTimeUtils.convertLocalDateTimeToDefaultString(orderGoods.getLastLoadTime()));
+            orderChildVO.setLastArriveSendTime(convertLocalDateTimeToDefaultString(orderGoods.getLastArriveSendTime()));
+            orderChildVO.setLastArriveReceiveTime(convertLocalDateTimeToDefaultString(orderGoods.getLastArriveReceiveTime()));
+            orderChildVO.setLastLoadTime(convertLocalDateTimeToDefaultString(orderGoods.getLastLoadTime()));
         }
 
         return orderChildVO;