Skip to content

C
clx-performance
提交 1301cd42 authored 作者: 杨启发's avatar 杨启发
浏览文件
操作

磅单OCR识别需求

上级 8fde9e18
显示空白字符变更
内嵌 并排
正在显示 包含 32 行增加 和 21 行删除
performance-api/src/main/java/com/clx/performance/param/app/OrderChildLoadAndUnloadAgainParam.java
浏览文件 @ 1301cd42
......@@ -48,10 +48,10 @@ public class OrderChildLoadAndUnloadAgainParam extends PositionParam {
@ApiModelProperty(value = "装货时间")
@NotBlank(message = "装货时间不能为空")
private String firstLoadTime;
private String loadTime;
@ApiModelProperty(value = "交货时间")
@NotBlank(message = "交货时间不能为空")
private String firstUnloadTime;
private String unloadTime;
}
performance-api/src/main/java/com/clx/performance/param/app/OrderChildLoadParam.java
浏览文件 @ 1301cd42
......@@ -35,5 +35,5 @@ public class OrderChildLoadParam extends PositionParam {
@ApiModelProperty(value = "装货时间")
@NotBlank(message = "装货时间不能为空")
private String firstLoadTime;
private String loadTime;
}
performance-api/src/main/java/com/clx/performance/param/app/OrderChildUnloadParam.java
浏览文件 @ 1301cd42
......@@ -33,6 +33,6 @@ public class OrderChildUnloadParam extends PositionParam {
@ApiModelProperty(value = "交货时间")
@NotBlank(message = "交货时间不能为空")
private String firstUnloadTime;
private String unloadTime;
}
performance-api/src/main/java/com/clx/performance/vo/app/OrderChildPoundInfoVO.java
浏览文件 @ 1301cd42
......@@ -9,6 +9,7 @@ import lombok.Setter;
import lombok.ToString;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;
@Getter
......@@ -54,4 +55,15 @@ public class OrderChildPoundInfoVO {
@ApiModelProperty(value = "卸车磅单图片列表")
private List<String> unloadImageList;
@ApiModelProperty(value = "到达货源地时间")
private LocalDateTime arriveSendTime;
@ApiModelProperty(value = "首次装货时间")
private LocalDateTime firstLoadTime;
@ApiModelProperty(value = "到达目的地时间")
private LocalDateTime arriveReceiveTime;
@ApiModelProperty(value = "首次交货时间")
private LocalDateTime firstUnloadTime;
}
\ No newline at end of file
performance-api/src/main/java/com/clx/performance/vo/pc/OrderChildPoundAuditDetailVO.java
浏览文件 @ 1301cd42
......@@ -60,10 +60,10 @@ public class OrderChildPoundAuditDetailVO {
private String truckNo;
@ApiModelProperty(value = "装车时间")
private String firstLoadTime;
private String loadTime;
@ApiModelProperty(value = "卸车时间")
private String firstUnloadTime;
private String unloadTime;
@ApiModelProperty(value = "发货地址")
private String sendAddress;
......
performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java
浏览文件 @ 1301cd42
......@@ -81,7 +81,7 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
.set(OrderChild::getUnloadRough, item.getUnloadRough())
.set(OrderChild::getUnloadTare, item.getUnloadTare())
.set(OrderChild::getUnloadNet, item.getUnloadNet())
.set(OrderChild::getFirstUnloadTime,item.getFirstUnloadTime())
.set(OrderChild::getUnloadTime, item.getUnloadTime())
.set(OrderChild::getPoundStatus, item.getPoundStatus())
.set(OrderChild::getWeight, item.getWeight())
......@@ -100,11 +100,11 @@ 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::getUnloadRough, item.getUnloadRough())
.set(OrderChild::getUnloadTare, item.getUnloadTare())
.set(OrderChild::getUnloadNet, item.getUnloadNet())
.set(OrderChild::getFirstUnloadTime,item.getFirstUnloadTime())
.set(OrderChild::getUnloadTime,item.getUnloadTime())
.set(OrderChild::getWeight, item.getWeight())
.set(OrderChild::getFreight, item.getFreight())
.set(OrderChild::getPoundStatus, item.getPoundStatus())
......
performance-web/src/main/java/com/clx/performance/service/impl/OrderChildPoundAuditServiceImpl.java
浏览文件 @ 1301cd42
......@@ -79,8 +79,8 @@ public class OrderChildPoundAuditServiceImpl implements OrderChildPoundAuditSer
vo.setRemark(poundAuditDetail.getRemark());
vo.setRejectType(poundAuditDetail.getRejectType());
vo.setTruckNo(orderChild.getTruckNo());
vo.setFirstLoadTime(orderChild.getFirstLoadTime()==null?null:convertLocalDateTimeToDefaultString(orderChild.getFirstLoadTime()));
vo.setFirstUnloadTime(orderChild.getFirstUnloadTime()==null?null:convertLocalDateTimeToDefaultString(orderChild.getFirstUnloadTime()));
vo.setLoadTime(orderChild.getLoadTime()==null?null:convertLocalDateTimeToDefaultString(orderChild.getLoadTime()));
vo.setUnloadTime(orderChild.getUnloadTime()==null?null:convertLocalDateTimeToDefaultString(orderChild.getUnloadTime()));
vo.setSendAddress(orderChild.getSendAddress());
vo.setReceiveAddress(orderChild.getReceiveAddress());
vo.setLoadGrossWeight(imageTypeOcrRecognitionMap.getOrDefault(OrderChildImage.Type.LOAD.getCode(),new OcrRecognition()).getGrossWeight());
......
performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java
浏览文件 @ 1301cd42
......@@ -944,11 +944,11 @@ public class OrderChildServiceImpl implements OrderChildService {
orderChild.setLoadRough(param.getLoadRough());
orderChild.setLoadTare(param.getLoadTare());
orderChild.setLoadNet(loadNet);
orderChild.setLoadTime(LocalDateTime.now());
orderChild.setLoadTime(covertStringToDefaultLocalDateTime(param.getLoadTime()));
orderChild.setWeight(orderChildWeightCalc(orderChild));
orderChild.setFreight(orderChildFreightCalc(orderChild));
orderChild.setStatus(OrderChildEnum.Status.LOAD.getCode());
orderChild.setFirstLoadTime(covertStringToDefaultLocalDateTime(param.getFirstLoadTime()));
orderChild.setFirstLoadTime(LocalDateTime.now());
orderChildDao.updateLoad(orderChild);
orderChildImageDao.batchSaveEntity(imageList);
......@@ -982,10 +982,9 @@ public class OrderChildServiceImpl implements OrderChildService {
orderChild.setLoadRough(param.getLoadRough());
orderChild.setLoadTare(param.getLoadTare());
orderChild.setLoadNet(loadNet);
orderChild.setLoadTime(LocalDateTime.now());
orderChild.setLoadTime(covertStringToDefaultLocalDateTime(param.getLoadTime()));
orderChild.setWeight(orderChildWeightCalc(orderChild));
orderChild.setFreight(orderChildFreightCalc(orderChild));
orderChild.setFirstLoadTime(covertStringToDefaultLocalDateTime(param.getFirstLoadTime()));
//更新货单吨数
updateOrderGoodsAmountLoad(orderGoods,childNo, dif,OrderGoodsStatusEnum.Status.GO_TO_SEND.getCode());
......@@ -1116,12 +1115,12 @@ public class OrderChildServiceImpl implements OrderChildService {
orderChild.setUnloadRough(param.getUnloadRough());
orderChild.setUnloadTare(param.getUnloadTare());
orderChild.setUnloadNet(loadNet);
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());
orderChild.setFreight(orderChildFreightCalc(orderChild));
orderChild.setFirstUnloadTime(covertStringToDefaultLocalDateTime(param.getFirstUnloadTime()));
orderChild.setFirstUnloadTime(LocalDateTime.now());
OrderChildPoundAudit audit = new OrderChildPoundAudit();
audit.setChildNo(childNo);
......@@ -1178,11 +1177,10 @@ public class OrderChildServiceImpl implements OrderChildService {
orderChild.setUnloadRough(param.getUnloadRough());
orderChild.setUnloadTare(param.getUnloadTare());
orderChild.setUnloadNet(loadNet);
orderChild.setUnloadTime(LocalDateTime.now());
orderChild.setUnloadTime(covertStringToDefaultLocalDateTime(param.getUnloadTime()));
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);
......@@ -1282,8 +1280,8 @@ public class OrderChildServiceImpl implements OrderChildService {
orderChild.setWeight(orderChildWeightCalc(orderChild));
orderChild.setFreight(orderChildFreightCalc(orderChild));
orderChild.setPoundStatus(OrderChildPoundAuditEnum.Status.AUDIT.getCode());
orderChild.setFirstLoadTime(covertStringToDefaultLocalDateTime(param.getFirstLoadTime()));
orderChild.setFirstUnloadTime(covertStringToDefaultLocalDateTime(param.getFirstUnloadTime()));
orderChild.setLoadTime(covertStringToDefaultLocalDateTime(param.getLoadTime()));
orderChild.setUnloadTime(covertStringToDefaultLocalDateTime(param.getUnloadTime()));
OrderChildPoundAudit audit = new OrderChildPoundAudit();
audit.setChildNo(childNo);
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论