提交 6b5adb24 authored 作者: 杨启发's avatar 杨启发

磅单OCR识别需求

Former-commit-id: 29bbf26c
上级 d1cbd190
......@@ -34,6 +34,6 @@ public class OrderChildLoadParam extends PositionParam {
private List<String> loadImageList;
@ApiModelProperty(value = "装货时间")
@NotBlank(message = "装货时间不能为空")
//@NotBlank(message = "装货时间不能为空")
private String loadTime;
}
......@@ -32,7 +32,7 @@ public class OrderChildUnloadParam extends PositionParam {
private List<String> unloadImageList;
@ApiModelProperty(value = "交货时间")
@NotBlank(message = "交货时间不能为空")
//NotBlank(message = "交货时间不能为空")
private String unloadTime;
}
......@@ -955,7 +955,8 @@ public class OrderChildServiceImpl implements OrderChildService {
orderChild.setLoadRough(param.getLoadRough());
orderChild.setLoadTare(param.getLoadTare());
orderChild.setLoadNet(loadNet);
orderChild.setLoadTime(covertStringToDefaultLocalDateTime(param.getLoadTime()));
//orderChild.setLoadTime(covertStringToDefaultLocalDateTime(param.getLoadTime()));
orderChild.setLoadTime(LocalDateTime.now());
orderChild.setWeight(orderChildWeightCalc(orderChild));
orderChild.setFreight(orderChildFreightCalc(orderChild));
orderChild.setStatus(OrderChildEnum.Status.LOAD.getCode());
......@@ -993,7 +994,8 @@ public class OrderChildServiceImpl implements OrderChildService {
orderChild.setLoadRough(param.getLoadRough());
orderChild.setLoadTare(param.getLoadTare());
orderChild.setLoadNet(loadNet);
orderChild.setLoadTime(covertStringToDefaultLocalDateTime(param.getLoadTime()));
//orderChild.setLoadTime(covertStringToDefaultLocalDateTime(param.getLoadTime()));
orderChild.setLoadTime(LocalDateTime.now());
orderChild.setWeight(orderChildWeightCalc(orderChild));
orderChild.setFreight(orderChildFreightCalc(orderChild));
//更新货单吨数
......@@ -1126,7 +1128,8 @@ public class OrderChildServiceImpl implements OrderChildService {
orderChild.setUnloadRough(param.getUnloadRough());
orderChild.setUnloadTare(param.getUnloadTare());
orderChild.setUnloadNet(loadNet);
orderChild.setUnloadTime(covertStringToDefaultLocalDateTime(param.getUnloadTime()));
//orderChild.setUnloadTime(covertStringToDefaultLocalDateTime(param.getUnloadTime()));
orderChild.setUnloadTime(LocalDateTime.now());
orderChild.setWeight(orderChildWeightCalc(orderChild));
orderChild.setStatus(OrderChildEnum.Status.UNLOAD.getCode());
orderChild.setPoundStatus(OrderChildPoundAuditEnum.Status.AUDIT.getCode());
......@@ -1188,7 +1191,8 @@ public class OrderChildServiceImpl implements OrderChildService {
orderChild.setUnloadRough(param.getUnloadRough());
orderChild.setUnloadTare(param.getUnloadTare());
orderChild.setUnloadNet(loadNet);
orderChild.setUnloadTime(covertStringToDefaultLocalDateTime(param.getUnloadTime()));
//orderChild.setUnloadTime(covertStringToDefaultLocalDateTime(param.getUnloadTime()));
orderChild.setUnloadTime(LocalDateTime.now());
orderChild.setWeight(orderChildWeightCalc(orderChild));
orderChild.setPoundStatus(OrderChildPoundAuditEnum.Status.AUDIT.getCode());
orderChild.setFreight(orderChildFreightCalc(orderChild));
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论