磅单OCR识别需求

performance-api/src/main/java/com/clx/performance/param/app/OrderChildLoadAndUnloadAgainParam.java

@@ -21,10 +21,6 @@ public class OrderChildLoadAndUnloadAgainParam extends PositionParam {
     @NotBlank(message = "运单编号不能为空")
     private String childNo;
 
-    @ApiModelProperty(value = "卸货磅单编号", example = "url")
-    @NotBlank(message = "交货磅单号不能为空")
-    private String unloadPoundNo;
-
     @ApiModelProperty(value = "装货毛重（单位吨）", example = "2.46")
     @NotNull
     private BigDecimal loadRough;
@@ -50,4 +46,12 @@ public class OrderChildLoadAndUnloadAgainParam extends PositionParam {
     @NotEmpty(message = "请上传磅单照片")
     private List<String> unloadImageList;
 
+    @ApiModelProperty(value = "装货时间")
+    @NotBlank(message = "装货时间不能为空")
+    private String firstLoadTime;
+
+    @ApiModelProperty(value = "交货时间")
+    @NotBlank(message = "交货时间不能为空")
+    private String firstUnloadTime;
+
 }

performance-api/src/main/java/com/clx/performance/param/app/OrderChildLoadParam.java

@@ -33,4 +33,7 @@ public class OrderChildLoadParam extends PositionParam {
     @NotEmpty(message = "请上传磅单照片")
     private List<String> loadImageList;
 
+    @ApiModelProperty(value = "装货时间")
+    @NotBlank(message = "装货时间不能为空")
+    private String firstLoadTime;
 }

performance-api/src/main/java/com/clx/performance/param/app/OrderChildUnloadParam.java

@@ -21,10 +21,6 @@ public class OrderChildUnloadParam extends PositionParam {
     @NotBlank(message = "运单编号不能为空")
     private String childNo;
 
-    @ApiModelProperty(value = "卸货磅单编号", example = "url")
-    @NotBlank(message = "交货磅单号不能为空")
-    private String unloadPoundNo;
-
     @ApiModelProperty(value = "卸货毛重（单位吨）", example = "2.46")
     private BigDecimal unloadRough;
 
@@ -35,4 +31,8 @@ public class OrderChildUnloadParam extends PositionParam {
     @NotEmpty(message = "请上传磅单照片")
     private List<String> unloadImageList;
 
+    @ApiModelProperty(value = "交货时间")
+    @NotBlank(message = "交货时间不能为空")
+    private String firstUnloadTime;
+
 }

performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java

@@ -63,7 +63,7 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
                 .set(OrderChild::getLoadRough, item.getLoadRough())
                 .set(OrderChild::getLoadTare, item.getLoadTare())
                 .set(OrderChild::getLoadNet, item.getLoadNet())
-
+                .set(OrderChild::getFirstLoadTime,item.getFirstLoadTime())
                 .set(OrderChild::getLoadTime, item.getLoadTime())
                 .set(OrderChild::getWeight, item.getWeight())
                 .set(OrderChild::getFreight, item.getFreight())
@@ -96,16 +96,15 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
     public boolean updateLoadAndUnload(OrderChild item) {
         return update(lUdWrapper()
                 .eq(OrderChild::getId, item.getId())
-
                 .set(OrderChild::getUnloadPoundNo, item.getUnloadPoundNo())
                 .set(OrderChild::getLoadRough, item.getLoadRough())
                 .set(OrderChild::getLoadTare, item.getLoadTare())
                 .set(OrderChild::getLoadNet, item.getLoadNet())
-
+                .set(OrderChild::getFirstLoadTime,item.getFirstLoadTime())
                 .set(OrderChild::getUnloadRough, item.getUnloadRough())
                 .set(OrderChild::getUnloadTare, item.getUnloadTare())
                 .set(OrderChild::getUnloadNet, item.getUnloadNet())
-
+                .set(OrderChild::getFirstUnloadTime,item.getFirstUnloadTime())
                 .set(OrderChild::getWeight, item.getWeight())
                 .set(OrderChild::getFreight, item.getFreight())
                 .set(OrderChild::getPoundStatus, item.getPoundStatus())

performance-web/src/main/java/com/clx/performance/model/OrderChild.java

@@ -80,8 +80,10 @@ public class OrderChild implements HasKey<Integer> {
 
     private LocalDateTime payTime;                         //支付时间(抢单时间)
     private LocalDateTime arriveSendTime;                  //到达货源地时间
+    private LocalDateTime firstLoadTime;                  //装货时间
     private LocalDateTime loadTime;                        //装车时间
     private LocalDateTime arriveReceiveTime;               //到达目的地时间
+    private LocalDateTime firstUnloadTime;                  //交货时间
     private LocalDateTime unloadTime;                      //卸车时间
     private LocalDateTime confirmTime;                     //司机确认交货时间
     private LocalDateTime settleTime;                      //结算时间

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

@@ -102,6 +102,8 @@ import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
+import static com.msl.common.utils.LocalDateTimeUtils.covertStringToDefaultLocalDateTime;
+
 /**
  * @Author: aiqinguo
  * @Description: 运单表
@@ -946,7 +948,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         orderChild.setWeight(orderChildWeightCalc(orderChild));
         orderChild.setFreight(orderChildFreightCalc(orderChild));
         orderChild.setStatus(OrderChildEnum.Status.LOAD.getCode());
-
+        orderChild.setFirstLoadTime(covertStringToDefaultLocalDateTime(param.getFirstLoadTime()));
         orderChildDao.updateLoad(orderChild);
 
         orderChildImageDao.batchSaveEntity(imageList);
@@ -983,7 +985,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         orderChild.setLoadTime(LocalDateTime.now());
         orderChild.setWeight(orderChildWeightCalc(orderChild));
         orderChild.setFreight(orderChildFreightCalc(orderChild));
-
+        orderChild.setFirstLoadTime(covertStringToDefaultLocalDateTime(param.getFirstLoadTime()));
         //更新货单吨数
         updateOrderGoodsAmountLoad(orderGoods,childNo, dif,OrderGoodsStatusEnum.Status.GO_TO_SEND.getCode());
 
@@ -1111,7 +1113,6 @@ public class OrderChildServiceImpl implements OrderChildService {
             imageList.add(image);
         }
 
-        orderChild.setUnloadPoundNo(param.getUnloadPoundNo());
         orderChild.setUnloadRough(param.getUnloadRough());
         orderChild.setUnloadTare(param.getUnloadTare());
         orderChild.setUnloadNet(loadNet);
@@ -1120,6 +1121,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         orderChild.setStatus(OrderChildEnum.Status.UNLOAD.getCode());
         orderChild.setPoundStatus(OrderChildPoundAuditEnum.Status.AUDIT.getCode());
         orderChild.setFreight(orderChildFreightCalc(orderChild));
+        orderChild.setFirstUnloadTime(covertStringToDefaultLocalDateTime(param.getFirstUnloadTime()));
 
         OrderChildPoundAudit audit = new OrderChildPoundAudit();
         audit.setChildNo(childNo);
@@ -1173,7 +1175,6 @@ public class OrderChildServiceImpl implements OrderChildService {
             imageList.add(image);
         }
 
-        orderChild.setUnloadPoundNo(param.getUnloadPoundNo());
         orderChild.setUnloadRough(param.getUnloadRough());
         orderChild.setUnloadTare(param.getUnloadTare());
         orderChild.setUnloadNet(loadNet);
@@ -1181,6 +1182,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         orderChild.setWeight(orderChildWeightCalc(orderChild));
         orderChild.setPoundStatus(OrderChildPoundAuditEnum.Status.AUDIT.getCode());
         orderChild.setFreight(orderChildFreightCalc(orderChild));
+        orderChild.setFirstUnloadTime(covertStringToDefaultLocalDateTime(param.getFirstUnloadTime()));
 
         OrderChildPoundAudit audit = new OrderChildPoundAudit();
         audit.setChildNo(childNo);
@@ -1279,8 +1281,9 @@ public class OrderChildServiceImpl implements OrderChildService {
         orderChild.setUnloadNet(unLoadNet);
         orderChild.setWeight(orderChildWeightCalc(orderChild));
         orderChild.setFreight(orderChildFreightCalc(orderChild));
-
         orderChild.setPoundStatus(OrderChildPoundAuditEnum.Status.AUDIT.getCode());
+        orderChild.setFirstLoadTime(covertStringToDefaultLocalDateTime(param.getFirstLoadTime()));
+        orderChild.setFirstUnloadTime(covertStringToDefaultLocalDateTime(param.getFirstUnloadTime()));
 
         OrderChildPoundAudit audit = new OrderChildPoundAudit();
         audit.setChildNo(childNo);