|
|
@@ -57,6 +57,8 @@ import org.springframework.transaction.annotation.Transactional;
|
|
|
import org.springframework.transaction.interceptor.TransactionAspectSupport;
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
+import java.time.LocalDateTime;
|
|
|
+import java.time.format.DateTimeFormatter;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.Date;
|
|
|
import java.util.List;
|
|
|
@@ -128,6 +130,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
|
|
|
bills.setMblno(bills.getMblno().replaceAll(" ", ""));
|
|
|
}
|
|
|
List<Bills> count = baseMapper.selectList(new LambdaQueryWrapper<Bills>()
|
|
|
+ .select(Bills::getId)
|
|
|
.eq(Bills::getCreateDept, AuthUtil.getDeptId())
|
|
|
.eq(Bills::getTenantId, AuthUtil.getTenantId())
|
|
|
.eq(Bills::getIsDeleted, 0)
|
|
|
@@ -146,6 +149,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
|
|
|
}
|
|
|
}
|
|
|
BusinessType businessType = bBusinessTypeService.getOne(new LambdaQueryWrapper<BusinessType>()
|
|
|
+ .select(BusinessType::getId)
|
|
|
.eq(BusinessType::getTenantId, AuthUtil.getTenantId())
|
|
|
.eq(BusinessType::getIsDeleted, 0)
|
|
|
.eq(BusinessType::getStatus, 0)
|
|
|
@@ -183,9 +187,19 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
|
|
|
|
|
|
//主单信息同步分单
|
|
|
if ("MM".equals(bills.getBillType())) {
|
|
|
- Bills details = baseMapper.selectById(bills.getId());
|
|
|
- if (!details.getVesselId().equals(bills.getVesselId()) || !details.getVoyageNo().equals(bills.getVoyageNo())) {
|
|
|
+ Bills details = baseMapper.selectById(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())) {
|
|
|
List<Bills> billsList = baseMapper.selectList(new LambdaQueryWrapper<Bills>()
|
|
|
+ .select(Bills::getId,Bills::getEtd,Bills::getVesselId,Bills::getVesselCnName,Bills::getVesselEnName,Bills::getVoyageNo,Bills::getPolId
|
|
|
+ ,Bills::getPolCnName,Bills::getPolEnName,Bills::getPolCode,Bills::getPolNamePrint,Bills::getPodId,Bills::getPodCnName
|
|
|
+ ,Bills::getPodEnName,Bills::getPodNamePrint,Bills::getPodCode,Bills::getPlaceReceiptId,Bills::getPlaceReceiptCode,Bills::getPlaceReceiptName
|
|
|
+ ,Bills::getPlaceReceiptNamePrint,Bills::getPlaceDeliveryId,Bills::getPlaceDeliveryCode,Bills::getPlaceDeliveryName,Bills::getPlaceDeliveryNamePrint,Bills::getDestinationId
|
|
|
+ ,Bills::getDestinationName,Bills::getDestinationCode,Bills::getDestinationNamePrint,Bills::getFinalDestinationId,Bills::getFinalDestinationCode,Bills::getFinalDestinationName
|
|
|
+ ,Bills::getFinalDestinationNamePrint,Bills::getCyId,Bills::getCyCode,Bills::getCyCnName,Bills::getCyEnName,Bills::getCyAddress
|
|
|
+ ,Bills::getCyTel,Bills::getCyRemarks,Bills::getCyTrailerTime,Bills::getCyReturnTime,Bills::getCarrierId,Bills::getCarrierCnName
|
|
|
+ ,Bills::getCarrierEnName,Bills::getCarrierArgreementNo,Bills::getBookingDate)
|
|
|
.eq(Bills::getCreateDept, AuthUtil.getDeptId())
|
|
|
.eq(Bills::getTenantId, AuthUtil.getTenantId())
|
|
|
.eq(Bills::getIsDeleted, 0)
|
|
|
@@ -313,7 +327,14 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ LocalDateTime now = LocalDateTime.now();
|
|
|
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
|
|
+ String formatted = now.format(formatter);
|
|
|
+ System.out.println("起 "+formatted);
|
|
|
this.saveOrUpdate(bills);
|
|
|
+ LocalDateTime now2 = LocalDateTime.now();
|
|
|
+ String formatted2 = now2.format(formatter);
|
|
|
+ System.out.println("止 "+formatted2);
|
|
|
/**-------------箱型箱量计算---------*/
|
|
|
Integer GP20 = 0;
|
|
|
Integer GP40 = 0;
|