1.业务修改数据bug修改

2.主单同步分单数据修改订舱数据bug修改
3.订舱，出口，托书增加联系人字段
4.财务列表增加备注检索条件

blade-service-api/blade-los-api/src/main/java/org/springblade/los/business/sea/entity/Bills.java

@@ -1633,6 +1633,11 @@ public class Bills implements Serializable {
 	@ApiModelProperty(value = "文件联络人电话")
 	private String fileTel;
 	/**
+	 * 联系人
+	 */
+	@ApiModelProperty(value = "联系人")
+	private String contact;
+	/**
 	 * 是否修改过箱型箱量
 	 */
 	@ApiModelProperty(value = "是否修改过箱型箱量")

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

@@ -38,7 +38,6 @@ import org.springblade.los.Util.StringTools;
 import org.springblade.los.Util.ZrUtil;
 import org.springblade.los.basic.business.entity.BusinessType;
 import org.springblade.los.basic.business.service.IBusinessTypeService;
-import org.springblade.los.basic.commodity.entity.BCommodity;
 import org.springblade.los.basic.commodity.mapper.CommodityMapper;
 import org.springblade.los.basic.corps.entity.BCorps;
 import org.springblade.los.basic.corps.mapper.CorpsMapper;
@@ -341,32 +340,16 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 			if (ObjectUtils.isNotNull(bills.getTemporaryId())) {
 				Bills bills1 = baseMapper.selectById(bills.getTemporaryId());
 				if (bills1 != null) {
-					if ("MM".equals(bills.getBillType())) {
-						if (ObjectUtils.isNotNull(bills.getMblno())) {
-							bills1.setMblno(bills.getMblno());
-							bills1.setHblno(bills.getHblno());
-							bills1.setVesselId(bills.getVesselId());
-							bills1.setVesselCnName(bills.getVesselCnName());
-							bills1.setVesselEnName(bills.getVesselEnName());
-							bills1.setVoyageNo(bills.getVoyageNo());
-							bills1.setCyReturnTime(bills.getCyReturnTime());
-							bills1.setCyTrailerTime(bills.getCyTrailerTime());
-							this.updateById(bills1);
-						}
-					} else if ("MH".equals(bills.getBillType())) {
-						if (ObjectUtils.isNotNull(bills.getHblno())) {
-							bills1.setMblno(bills.getMblno());
-							bills1.setHblno(bills.getHblno());
-							bills1.setVesselId(bills.getVesselId());
-							bills1.setVesselCnName(bills.getVesselCnName());
-							bills1.setVesselEnName(bills.getVesselEnName());
-							bills1.setVoyageNo(bills.getVoyageNo());
-							bills1.setCyReturnTime(bills.getCyReturnTime());
-							bills1.setCyTrailerTime(bills.getCyTrailerTime());
-							bills1.setSiRemarks(bills.getSiRemarks());
-							this.updateById(bills1);
-						}
-					}
+					bills1.setMblno(bills.getMblno());
+					bills1.setHblno(bills.getHblno());
+					bills1.setVesselId(bills.getVesselId());
+					bills1.setVesselCnName(bills.getVesselCnName());
+					bills1.setVesselEnName(bills.getVesselEnName());
+					bills1.setVoyageNo(bills.getVoyageNo());
+					bills1.setCyReturnTime(bills.getCyReturnTime());
+					bills1.setCyTrailerTime(bills.getCyTrailerTime());
+					bills1.setSiRemarks(bills.getSiRemarks());
+					this.updateById(bills1);
 				}
 			}
 		}
@@ -5331,7 +5314,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 				sendMessage.setPageLabel("海运出口");
 				sendMessage.setPageStatus("this.$store.getters.domSaleStatus");
 				sendMessage.setMessageBody("客户已撤销订舱，请及时待处理！订舱单号：" + (ObjectUtils.isNull(bills.getHblno())
-					?bills.getBillNo():bills.getHblno()) + "时间：" + formatted);
+					? bills.getBillNo() : bills.getHblno()) + "时间：" + formatted);
 				R save = messageClient.save(sendMessage);
 				if (!save.isSuccess()) {
 					throw new SecurityException("发送消息失败");
@@ -6122,7 +6105,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 					sendMessage.setPageLabel("海运出口");
 					sendMessage.setPageStatus("this.$store.getters.domSaleStatus");
 					sendMessage.setMessageBody("客户已退舱，请及时待处理！订舱单号：" + (ObjectUtils.isNull(bills.getHblno())
-						?bills.getBillNo():bills.getHblno()) + "时间：" + formatted);
+						? bills.getBillNo() : bills.getHblno()) + "时间：" + formatted);
 					R save = messageClient.save(sendMessage);
 					if (!save.isSuccess()) {
 						throw new SecurityException("发送消息失败");
@@ -6195,7 +6178,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 	}
 
 	@Override
-	public R applySwitch(Long id,BigDecimal boxPackingAmount) {
+	public R applySwitch(Long id, BigDecimal boxPackingAmount) {
 		if (id == null) {
 			throw new RuntimeException("缺少必要参数");
 		}

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

@@ -277,10 +277,29 @@ public class PreContainersServiceImpl extends ServiceImpl<PreContainersMapper, P
 			BigDecimal grossWeightSum = preContainersList.stream().map(PreContainers::getGrossWeight).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
 			BigDecimal quantitySum = preContainersList.stream().map(PreContainers::getNumber).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
 			StringBuilder boxTypeSum = new StringBuilder();
+			Integer V20 = 0;
+			Integer V40 = 0;
+			Integer V40HC = 0;
+			Integer V45 = 0;
+			Integer V48 = 0;
+			Integer other = 0;
 			for (PreContainers preContainers : preContainersList) {
 				if (ObjectUtils.isNotNull(preContainers.getQuantity()) && ObjectUtils.isNotNull(preContainers.getTeu())) {
 					teu = teu.add(new BigDecimal(preContainers.getQuantity()).multiply(preContainers.getTeu()));
 				}
+				if (preContainers.getCntrTypeCode().equals("20GP")) {
+					V20 += preContainers.getQuantity();
+				} else if (preContainers.getCntrTypeCode().equals("20HC")) {
+					V45 += preContainers.getQuantity();
+				} else if (preContainers.getCntrTypeCode().equals("40FR")) {
+					V48 += preContainers.getQuantity();
+				} else if (preContainers.getCntrTypeCode().equals("40GP")) {
+					V40 += preContainers.getQuantity();
+				} else if (preContainers.getCntrTypeCode().equals("40HC")) {
+					V40HC += preContainers.getQuantity();
+				} else {
+					other += preContainers.getQuantity();
+				}
 				boxTypeSum.append(preContainers.getCntrTypeCode()).append("*").append(preContainers.getQuantity()).append(",");
 			}
 			if (measurementSum.compareTo(new BigDecimal("0")) != 0) {
@@ -292,6 +311,12 @@ public class PreContainersServiceImpl extends ServiceImpl<PreContainersMapper, P
 			if (quantitySum.compareTo(new BigDecimal("0")) != 0) {
 				bills.setQuantity(quantitySum);
 			}
+			bills.setQuantityV20(V20);
+			bills.setQuantityV40(V40);
+			bills.setQuantityV40hc(V40HC);
+			bills.setQuantityV45(V45);
+			bills.setQuantityV48(V48);
+			bills.setQuantityOther(other);
 			bills.setTeu(teu.intValue());
 			if (boxTypeSum.length() > 0) {
 				boxTypeSum = new StringBuilder(boxTypeSum.substring(0, boxTypeSum.length() - 1));

blade-service/blade-los/src/main/java/org/springblade/los/finance/invoices/controller/FinInvoicesController.java

@@ -97,6 +97,8 @@ public class FinInvoicesController extends BladeController {
 			.eq(ObjectUtils.isNotNull(finInvoices.getStatus()), FinInvoices::getStatus, finInvoices.getStatus())
 			.like(ObjectUtils.isNotNull(finInvoices.getFeeCnName()), FinInvoices::getFeeCnName, finInvoices.getFeeCnName())
 			.like(ObjectUtils.isNotNull(finInvoices.getBookingNo()), FinInvoices::getBookingNo, finInvoices.getBookingNo())
+			.like(ObjectUtils.isNotNull(finInvoices.getRemarks()), FinInvoices::getRemarks, finInvoices.getRemarks())
+			.like(ObjectUtils.isNotNull(finInvoices.getElecRemarks()), FinInvoices::getElecRemarks, finInvoices.getElecRemarks())
 			.eq(ObjectUtils.isNotNull(finInvoices.getBillStatus()), FinInvoices::getBillStatus, finInvoices.getBillStatus())
 			.eq(ObjectUtils.isNotNull(finInvoices.getInvCurCode()), FinInvoices::getInvCurCode, finInvoices.getInvCurCode())
 			.ge(ObjectUtils.isNotNull(finInvoices.getInvoiceDateStart()), FinInvoices::getInvoiceDate, finInvoices.getInvoiceDateStart())

blade-service/blade-los/src/main/java/org/springblade/los/finance/stl/controller/FinStlBillsController.java

@@ -104,6 +104,7 @@ public class FinStlBillsController extends BladeController {
 			.eq((ObjectUtils.isNotNull(finStlBills.getIsCleared()) && finStlBills.getIsCleared() != 0), FinStlBills::getIsCleared, finStlBills.getIsCleared())
 			.eq((ObjectUtils.isNotNull(finStlBills.getIsInvoice()) && finStlBills.getIsInvoice() != 0), FinStlBills::getIsInvoice, finStlBills.getIsInvoice())
 			.like(ObjectUtils.isNotNull(finStlBills.getVoucherNo()), FinStlBills::getVoucherNo, finStlBills.getVoucherNo())
+			.like(ObjectUtils.isNotNull(finStlBills.getRemarks()), FinStlBills::getRemarks, finStlBills.getRemarks())
 			.and(ObjectUtils.isNotNull(finStlBills.getCorpCnName()), i -> i.like(FinStlBills::getCorpCnName, finStlBills.getCorpCnName()).or()
 				.like(FinStlBills::getCorpEnName, finStlBills.getCorpCnName()))
 			.like(ObjectUtils.isNotNull(finStlBills.getFeeCnName()), FinStlBills::getFeeCnName, finStlBills.getFeeCnName())