|
|
@@ -135,8 +135,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
|
|
|
.eq(Bills::getTenantId, AuthUtil.getTenantId())
|
|
|
.eq(Bills::getIsDeleted, 0)
|
|
|
.eq(Bills::getMblno, bills.getMblno())
|
|
|
- .eq(Bills::getBookingNo, bills.getBookingNo())
|
|
|
- );
|
|
|
+ .eq(Bills::getBookingNo, bills.getBookingNo()));
|
|
|
if ("SE".equals(bills.getBusinessType())) {
|
|
|
bills.setBillDate(bills.getEtd());
|
|
|
} else {
|
|
|
@@ -187,7 +186,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
|
|
|
|
|
|
//主单信息同步分单
|
|
|
if ("MM".equals(bills.getBillType())) {
|
|
|
- Bills details = baseMapper.selectById(new LambdaQueryWrapper<Bills>()
|
|
|
+ Bills details = baseMapper.selectOne(new LambdaQueryWrapper<Bills>()
|
|
|
.select(Bills::getId,Bills::getVesselId,Bills::getVoyageNo,Bills::getEtd)
|
|
|
.eq(Bills::getId,bills.getId()));
|
|
|
if (!details.getVesselId().equals(bills.getVesselId()) || !details.getVoyageNo().equals(bills.getVoyageNo()) || !details.getEtd().equals(bills.getEtd())) {
|
|
|
@@ -518,7 +517,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
|
|
|
|
|
|
}
|
|
|
} else if ("MH".equals(bills.getBillType()) && ObjectUtils.isNotNull(bills.getId())) {
|
|
|
- Bills details = baseMapper.selectById(new LambdaQueryWrapper<Bills>()
|
|
|
+ Bills details = baseMapper.selectOne(new LambdaQueryWrapper<Bills>()
|
|
|
.select(Bills::getAmountDr,Bills::getAmountCr,Bills::getAmountProfit,Bills::getAmountDrUsd,Bills::getAmountCrUsd
|
|
|
,Bills::getAmountProfitUsd,Bills::getAmountDrLoc,Bills::getAmountCrLoc,Bills::getAmountProfitLoc
|
|
|
,Bills::getQuantity,Bills::getGrossWeight,Bills::getMeasurement)
|