磅单OCR识别需求

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

@@ -34,6 +34,6 @@ public class OrderChildLoadParam extends PositionParam {
     private List<String> loadImageList;
 
     @ApiModelProperty(value = "装货时间")
-    //@NotBlank(message = "装货时间不能为空")
+    @NotBlank(message = "装货时间不能为空")
     private String loadTime;
 }

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

@@ -32,7 +32,7 @@ public class OrderChildUnloadParam extends PositionParam {
     private List<String> unloadImageList;
 
     @ApiModelProperty(value = "交货时间")
-    //NotBlank(message = "交货时间不能为空")
+    @NotBlank(message = "交货时间不能为空")
     private String unloadTime;
 
 }

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

@@ -955,8 +955,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         orderChild.setLoadRough(param.getLoadRough());
         orderChild.setLoadTare(param.getLoadTare());
         orderChild.setLoadNet(loadNet);
-        //orderChild.setLoadTime(covertStringToDefaultLocalDateTime(param.getLoadTime()));
-        orderChild.setLoadTime(LocalDateTime.now());
+        orderChild.setLoadTime(covertStringToDefaultLocalDateTime(param.getLoadTime()));
         orderChild.setWeight(orderChildWeightCalc(orderChild));
         orderChild.setFreight(orderChildFreightCalc(orderChild));
         orderChild.setStatus(OrderChildEnum.Status.LOAD.getCode());
@@ -994,8 +993,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         orderChild.setLoadRough(param.getLoadRough());
         orderChild.setLoadTare(param.getLoadTare());
         orderChild.setLoadNet(loadNet);
-        //orderChild.setLoadTime(covertStringToDefaultLocalDateTime(param.getLoadTime()));
-        orderChild.setLoadTime(LocalDateTime.now());
+        orderChild.setLoadTime(covertStringToDefaultLocalDateTime(param.getLoadTime()));
         orderChild.setWeight(orderChildWeightCalc(orderChild));
         orderChild.setFreight(orderChildFreightCalc(orderChild));
         //更新货单吨数
@@ -1128,8 +1126,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         orderChild.setUnloadRough(param.getUnloadRough());
         orderChild.setUnloadTare(param.getUnloadTare());
         orderChild.setUnloadNet(loadNet);
-        //orderChild.setUnloadTime(covertStringToDefaultLocalDateTime(param.getUnloadTime()));
-        orderChild.setUnloadTime(LocalDateTime.now());
+        orderChild.setUnloadTime(covertStringToDefaultLocalDateTime(param.getUnloadTime()));
         orderChild.setWeight(orderChildWeightCalc(orderChild));
         orderChild.setStatus(OrderChildEnum.Status.UNLOAD.getCode());
         orderChild.setPoundStatus(OrderChildPoundAuditEnum.Status.AUDIT.getCode());
@@ -1191,8 +1188,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         orderChild.setUnloadRough(param.getUnloadRough());
         orderChild.setUnloadTare(param.getUnloadTare());
         orderChild.setUnloadNet(loadNet);
-        //orderChild.setUnloadTime(covertStringToDefaultLocalDateTime(param.getUnloadTime()));
-        orderChild.setUnloadTime(LocalDateTime.now());
+        orderChild.setUnloadTime(covertStringToDefaultLocalDateTime(param.getUnloadTime()));
         orderChild.setWeight(orderChildWeightCalc(orderChild));
         orderChild.setPoundStatus(OrderChildPoundAuditEnum.Status.AUDIT.getCode());
         orderChild.setFreight(orderChildFreightCalc(orderChild));