|
@@ -179,6 +179,8 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
|
|
tranCarInfo.setSignStatus(StatusEnum.NOT_SIGNED.getName());
|
|
tranCarInfo.setSignStatus(StatusEnum.NOT_SIGNED.getName());
|
|
tranCarInfo.setSignStatusFlag(StatusEnum.NOT_SIGNED.getFlag());
|
|
tranCarInfo.setSignStatusFlag(StatusEnum.NOT_SIGNED.getFlag());
|
|
}
|
|
}
|
|
|
|
+ TranTaskInfo tranTaskInfo = tranTaskInfoService.selectById(tranProcessInfo.getInfoId());
|
|
|
|
+ tranCarInfo.setContractNo(tranTaskInfo.getContractNo());
|
|
tranCarInfo.setStatusFlag(StatusEnum.NOT_LOADED.getFlag());
|
|
tranCarInfo.setStatusFlag(StatusEnum.NOT_LOADED.getFlag());
|
|
tranCarInfo.setStatus(StatusEnum.NOT_LOADED.getName());
|
|
tranCarInfo.setStatus(StatusEnum.NOT_LOADED.getName());
|
|
tranCarInfoService.insert(tranCarInfo);
|
|
tranCarInfoService.insert(tranCarInfo);
|
|
@@ -195,6 +197,8 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
|
|
if (tranCarInfo.getLoadNetWeight() > 0) {
|
|
if (tranCarInfo.getLoadNetWeight() > 0) {
|
|
tranCarInfo.setStatusFlag(StatusEnum.LOADED.getFlag());
|
|
tranCarInfo.setStatusFlag(StatusEnum.LOADED.getFlag());
|
|
tranCarInfo.setStatus(StatusEnum.LOADED.getName());
|
|
tranCarInfo.setStatus(StatusEnum.LOADED.getName());
|
|
|
|
+ TranTaskInfo tranTaskInfo = tranTaskInfoService.selectById(tranProcessInfo.getInfoId());
|
|
|
|
+ tranCarInfo.setContractNo(tranTaskInfo.getContractNo());
|
|
//汽运类型
|
|
//汽运类型
|
|
if (tranCarInfo.getTranType().equals(NumberConstant.CONSTANT1)) {
|
|
if (tranCarInfo.getTranType().equals(NumberConstant.CONSTANT1)) {
|
|
List<TranSettlementReport> tranSettlementReportList = tranSettlementReportService.selectList(new EntityWrapper<TranSettlementReport>()
|
|
List<TranSettlementReport> tranSettlementReportList = tranSettlementReportService.selectList(new EntityWrapper<TranSettlementReport>()
|
|
@@ -228,7 +232,6 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
|
|
} else {
|
|
} else {
|
|
//生成汽运报表
|
|
//生成汽运报表
|
|
TranSettlementReport tranSettlementReport = new TranSettlementReport();
|
|
TranSettlementReport tranSettlementReport = new TranSettlementReport();
|
|
- TranTaskInfo tranTaskInfo = tranTaskInfoService.selectById(tranProcessInfo.getInfoId());
|
|
|
|
tranSettlementReport.setCompId(tranTaskInfo.getCompId());
|
|
tranSettlementReport.setCompId(tranTaskInfo.getCompId());
|
|
tranSettlementReport.setCarId(tranCarInfo.getId());
|
|
tranSettlementReport.setCarId(tranCarInfo.getId());
|
|
tranSettlementReport.setId(IdGenerator.generateUUID());
|
|
tranSettlementReport.setId(IdGenerator.generateUUID());
|