1.atd修改保存单据同步账单日期bug修改

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/service/impl/BillsServiceImpl.java

@@ -1011,6 +1011,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 					.eq(Bills::getTenantId, AuthUtil.getTenantId())
 					.eq(Bills::getIsDeleted, 0)
 					.eq(Bills::getMasterId, details.getId()));
+				List<Long> billIds = new ArrayList<>();
 				if (!billsList.isEmpty()) {
 					for (Bills item : billsList) {
 						item.setEtd(bills.getEtd());
@@ -1060,56 +1061,57 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 						item.setIssueAt(bills.getIssueAt());
 					}
 					this.updateBatchById(billsList);
-					List<Long> billIds = billsList.stream().map(Bills::getId).collect(Collectors.toList());
-					List<FeeCenter> feeCenterList = feeCenterService.list(new LambdaQueryWrapper<FeeCenter>()
-						.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
-						.eq(FeeCenter::getIsDeleted, 0)
-						.in(FeeCenter::getPid, billIds));
-					for (FeeCenter item : feeCenterList) {
-						item.setEta(bills.getEta());
-						item.setEtd(bills.getEtd());
-						item.setBillDate(bills.getBillDate());
-						item.setVesselId(bills.getVesselId());
-						item.setVesselCnName(bills.getVesselCnName());
-						item.setVesselEnName(bills.getVesselEnName());
-						item.setVoyageNo(bills.getVoyageNo());
-						item.setPolId(bills.getPolId());
-						item.setPolCnName(bills.getPolCnName());
-						item.setPolEnName(bills.getPolEnName());
-						item.setPolCode(bills.getPolCode());
-						item.setPodId(bills.getPodId());
-						item.setPodCnName(bills.getPodCnName());
-						item.setPodEnName(bills.getPodEnName());
-						item.setPodCode(bills.getPodCode());
-					}
-					feeCenterService.updateBatchById(feeCenterList);
-					List<FinAccBills> finAccBillsList = finAccBillsService.list(new LambdaQueryWrapper<FinAccBills>()
-						.eq(FinAccBills::getTenantId, AuthUtil.getTenantId())
-						.eq(FinAccBills::getIsDeleted, 0)
-						.in(FinAccBills::getBusinessBillId, billIds));
-					for (FinAccBills item : finAccBillsList) {
-						Bills bill = billsList.stream().filter(e -> e.getId().equals(item.getBusinessBillId())).findFirst().orElse(null);
-						if (bill != null) {
-							item.setEtd(bill.getEtd());
-							item.setEta(bill.getEta());
-							item.setBillDate(bill.getBillDate());
-							item.setBusinessDate(bill.getBillDate());
-							item.setVesselId(bill.getVesselId());
-							item.setVesselCnName(bill.getVesselCnName());
-							item.setVesselEnName(bill.getVesselEnName());
-							item.setVoyageNo(bill.getVoyageNo());
-							item.setPolId(bill.getPolId());
-							item.setPolCnName(bill.getPolCnName());
-							item.setPolEnName(bill.getPolEnName());
-							item.setPolCode(bill.getPolCode());
-							item.setPodId(bill.getPodId());
-							item.setPodCnName(bill.getPodCnName());
-							item.setPodEnName(bill.getPodEnName());
-							item.setPodCode(bill.getPodCode());
-						}
-					}
-					finAccBillsService.updateBatchById(finAccBillsList);
+					billIds = billsList.stream().map(Bills::getId).collect(Collectors.toList());
+				}
+				if (ObjectUtils.isNull(billIds) || billIds.isEmpty()) {
+					billIds = new ArrayList<>();
+				}
+				billIds.add(details.getId());
+				List<FeeCenter> feeCenterList = feeCenterService.list(new LambdaQueryWrapper<FeeCenter>()
+					.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
+					.eq(FeeCenter::getIsDeleted, 0)
+					.in(FeeCenter::getPid, billIds));
+				for (FeeCenter item : feeCenterList) {
+					item.setEta(bills.getEta());
+					item.setEtd(bills.getEtd());
+					item.setBillDate(bills.getBillDate());
+					item.setVesselId(bills.getVesselId());
+					item.setVesselCnName(bills.getVesselCnName());
+					item.setVesselEnName(bills.getVesselEnName());
+					item.setVoyageNo(bills.getVoyageNo());
+					item.setPolId(bills.getPolId());
+					item.setPolCnName(bills.getPolCnName());
+					item.setPolEnName(bills.getPolEnName());
+					item.setPolCode(bills.getPolCode());
+					item.setPodId(bills.getPodId());
+					item.setPodCnName(bills.getPodCnName());
+					item.setPodEnName(bills.getPodEnName());
+					item.setPodCode(bills.getPodCode());
+				}
+				feeCenterService.updateBatchById(feeCenterList);
+				List<FinAccBills> finAccBillsList = finAccBillsService.list(new LambdaQueryWrapper<FinAccBills>()
+					.eq(FinAccBills::getTenantId, AuthUtil.getTenantId())
+					.eq(FinAccBills::getIsDeleted, 0)
+					.in(FinAccBills::getBusinessBillId, billIds));
+				for (FinAccBills item : finAccBillsList) {
+					item.setEtd(bills.getEtd());
+					item.setEta(bills.getEta());
+					item.setBillDate(bills.getBillDate());
+					item.setBusinessDate(bills.getBillDate());
+					item.setVesselId(bills.getVesselId());
+					item.setVesselCnName(bills.getVesselCnName());
+					item.setVesselEnName(bills.getVesselEnName());
+					item.setVoyageNo(bills.getVoyageNo());
+					item.setPolId(bills.getPolId());
+					item.setPolCnName(bills.getPolCnName());
+					item.setPolEnName(bills.getPolEnName());
+					item.setPolCode(bills.getPolCode());
+					item.setPodId(bills.getPodId());
+					item.setPodCnName(bills.getPodCnName());
+					item.setPodEnName(bills.getPodEnName());
+					item.setPodCode(bills.getPodCode());
 				}
+				finAccBillsService.updateBatchById(finAccBillsList);
 				if ("SI".equals(bills.getBillType())) {
 					Bills detailsCk = baseMapper.selectById(details.getSrcBusId());
 					if (detailsCk != null) {
@@ -4919,7 +4921,8 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 			sendMessage.setUrl("/iosBasicData/SeafreightExportF/bills/index");
 			sendMessage.setPageLabel("海运出口");
 			sendMessage.setPageStatus("this.$store.getters.domSaleStatus");
-			sendMessage.setMessageBody("您有新的预定舱生成海运出口，请及时待处理！单号：" + copyBills.getBillNo() + "时间：" + formatted);
+			sendMessage.setMessageBody("您有新的预定舱生成海运出口，请及时待处理！单号：" + (ObjectUtils.isNull(copyBills.getHblno())
+				? copyBills.getBillNo() : copyBills.getHblno()) + "时间：" + formatted);
 			R save = messageClient.save(sendMessage);
 			if (!save.isSuccess()) {
 				throw new SecurityException("发送消息失败");
@@ -5202,7 +5205,8 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 					sendMessage.setUrl("/iosBasicData/SeafreightExportF/bills/index");
 					sendMessage.setPageLabel("海运出口");
 					sendMessage.setPageStatus("this.$store.getters.domSaleStatus");
-					sendMessage.setMessageBody("您有新的预定舱，请及时待处理！单号：" + detail.getBillNo() + "时间：" + formatted);
+					sendMessage.setMessageBody("您有新的预定舱，请及时待处理！单号：" + (ObjectUtils.isNull(detail.getHblno())
+						? detail.getBillNo() : detail.getHblno()) + "时间：" + formatted);
 					R save = messageClient.save(sendMessage);
 					if (!save.isSuccess()) {
 						throw new SecurityException("发送消息失败");
@@ -5385,7 +5389,8 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 				sendMessage.setUrl("/iosBasicData/businessCenter/customerLetter/index");
 				sendMessage.setPageLabel("海运出口");
 				sendMessage.setPageStatus("this.$store.getters.domSaleStatus");
-				sendMessage.setMessageBody("您有客户订舱已提交，请及时待处理！客户订舱单号：" + bills.getBillNo() + "时间：" + formatted);
+				sendMessage.setMessageBody("您有客户订舱已提交，请及时待处理！客户订舱单号：" + (ObjectUtils.isNull(bills.getHblno())
+					? bills.getBillNo() : bills.getHblno()) + "时间：" + formatted);
 				R save = messageClient.save(sendMessage);
 				if (!save.isSuccess()) {
 					throw new SecurityException("发送消息失败");
@@ -5636,7 +5641,8 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 					sendMessage.setUrl("/iosBasicData/SeafreightExportF/bills/index");
 					sendMessage.setPageLabel("海运出口");
 					sendMessage.setPageStatus("this.$store.getters.domSaleStatus");
-					sendMessage.setMessageBody("您有客户订舱已提交确认，请及时待处理！提单号：" + billsFd.getHblno() + "时间：" + formatted);
+					sendMessage.setMessageBody("您有客户订舱已提交确认，请及时待处理！提单号：" + (ObjectUtils.isNull(billsFd.getHblno())
+						? billsFd.getBillNo() : billsFd.getHblno()) + "时间：" + formatted);
 					R save = messageClient.save(sendMessage);
 					if (!save.isSuccess()) {
 						throw new SecurityException("发送消息失败");
@@ -5661,7 +5667,8 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 					sendMessage.setUrl("/iosBasicData/SeafreightExportF/bills/index");
 					sendMessage.setPageLabel("海运出口");
 					sendMessage.setPageStatus("this.$store.getters.domSaleStatus");
-					sendMessage.setMessageBody("您有客户订舱已提交确认，请及时待处理！提单号：" + billsFd.getHblno() + "时间：" + formatted);
+					sendMessage.setMessageBody("您有客户订舱已提交确认，请及时待处理！提单号：" + (ObjectUtils.isNull(billsFd.getHblno())
+						? billsFd.getBillNo() : billsFd.getHblno()) + "时间：" + formatted);
 					R save = messageClient.save(sendMessage);
 					if (!save.isSuccess()) {
 						throw new SecurityException("发送消息失败");
@@ -5987,7 +5994,8 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 					sendMessage.setUrl("/iosBasicData/SeafreightExportF/bills/index");
 					sendMessage.setPageLabel("海运出口");
 					sendMessage.setPageStatus("this.$store.getters.domSaleStatus");
-					sendMessage.setMessageBody("客户已提交修改箱型箱量，请及时待处理！订舱单号：" + bookingCabin.getHblno() + "时间：" + formatted);
+					sendMessage.setMessageBody("客户已提交修改箱型箱量，请及时待处理！订舱单号：" + (ObjectUtils.isNull(bookingCabin.getHblno())
+						? bookingCabin.getBillNo() : bookingCabin.getHblno()) + "时间：" + formatted);
 					R save = messageClient.save(sendMessage);
 					if (!save.isSuccess()) {
 						throw new SecurityException("发送消息失败");
@@ -6013,7 +6021,8 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 					sendMessage.setUrl("/iosBasicData/SeafreightExportF/bills/index");
 					sendMessage.setPageLabel("海运出口");
 					sendMessage.setPageStatus("this.$store.getters.domSaleStatus");
-					sendMessage.setMessageBody("客户已提交修改箱型箱量，请及时待处理！订舱单号：" + bookingCabin.getHblno() + "时间：" + formatted);
+					sendMessage.setMessageBody("客户已提交修改箱型箱量，请及时待处理！订舱单号：" + (ObjectUtils.isNull(bookingCabin.getHblno())
+						? bookingCabin.getBillNo() : bookingCabin.getHblno()) + "时间：" + formatted);
 					R save = messageClient.save(sendMessage);
 					if (!save.isSuccess()) {
 						throw new SecurityException("发送消息失败");
@@ -6240,7 +6249,8 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 					sendMessage.setUrl("/iosBasicData/SeafreightExportF/bills/index");
 					sendMessage.setPageLabel("海运出口");
 					sendMessage.setPageStatus("this.$store.getters.domSaleStatus");
-					sendMessage.setMessageBody("客户已退舱，请及时待处理！订舱单号：" + bills.getBillNo() + "时间：" + formatted);
+					sendMessage.setMessageBody("客户已退舱，请及时待处理！订舱单号：" + (ObjectUtils.isNull(bills.getHblno())
+						? bills.getBillNo() : bills.getHblno()) + "时间：" + formatted);
 					R save = messageClient.save(sendMessage);
 					if (!save.isSuccess()) {
 						throw new SecurityException("发送消息失败");
@@ -6277,7 +6287,8 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 			sendMessage.setUrl("/iosBasicData/businessCenter/customerBooking/index");
 			sendMessage.setPageLabel("客户订舱");
 			sendMessage.setPageStatus("this.$store.getters.domSaleStatus");
-			sendMessage.setMessageBody("订舱单号：" + bills.getBillNo() + " 已驳回,驳回原因：" + bills.getReason() + ",驳回时间：" + formatted);
+			sendMessage.setMessageBody("订舱单号：" + bills.getBillNo() + " 已驳回,驳回原因：" + (ObjectUtils.isNull(bills.getHblno())
+				? bills.getBillNo() : bills.getHblno()) + ",驳回时间：" + formatted);
 			R save = messageClient.save(sendMessage);
 			if (!save.isSuccess()) {
 				throw new SecurityException("发送消息失败");