1.华翰业务利润导出起运港，目的港取值错误问题修改

2.海运进出口保存同步账单中起运港，目的港信息
3.发票申请删除同时删除明细问题修改
4.确认结算返回销项发票状态bug修改

blade-service-api/blade-los-api/src/main/java/org/springblade/los/statisticAnalysis/FeeSummaryDetailNotRC.java

@@ -31,9 +31,9 @@ public class FeeSummaryDetailNotRC {
 	@ExcelProperty(value = "提单号")
 	private String mblNo;
 	@ExcelProperty(value = "起运港")
-	private String pod;
-	@ExcelProperty(value = "目的港")
 	private String pol;
+	@ExcelProperty(value = "目的港")
+	private String pod;
 	@ExcelProperty(value = "汇率")
 	private BigDecimal rate;
 	@ExcelProperty(value = "箱型箱量")

blade-service-api/blade-los-api/src/main/java/org/springblade/los/statisticAnalysis/FeeSummaryDetailNotRD.java

@@ -36,9 +36,9 @@ public class FeeSummaryDetailNotRD {
 	@ExcelProperty(value = "提单号")
 	private String mblNo;
 	@ExcelProperty(value = "起运港")
-	private String pod;
-	@ExcelProperty(value = "目的港")
 	private String pol;
+	@ExcelProperty(value = "目的港")
+	private String pod;
 	@ExcelProperty(value = "汇率")
 	private BigDecimal rate;
 	@ExcelProperty(value = "箱型箱量")

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/mapper/BillsMapper.xml

@@ -349,6 +349,7 @@
                 and acc.is_checked in (0,1,2)
             </if>
             <if test='acc.isChecked != null and acc.isChecked == "1"'>
+                and fee.stl_ttl_amount = 0
                 and acc.is_checked in (0,1)
             </if>
             <if test='acc.isChecked != null and acc.isChecked == "2"'>

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

@@ -768,6 +768,27 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 		}
 		if (!feeCenterListAll.isEmpty()) {
 			feeCenterService.submitListOptimization(feeCenterListAll);
+			List<Long> idList = feeCenterListAll.stream().map(FeeCenter::getAccBillId).filter(Objects::nonNull)
+				.distinct().collect(Collectors.toList());
+			if (!idList.isEmpty()){
+				List<FinAccBills> finAccBillsList = finAccBillsService.list(new LambdaQueryWrapper<FinAccBills>()
+					.eq(FinAccBills::getTenantId,AuthUtil.getTenantId())
+					.eq(FinAccBills::getIsDeleted,0)
+					.in(FinAccBills::getId,idList));
+				if (!finAccBillsList.isEmpty()){
+					for (FinAccBills accBills : finAccBillsList){
+						accBills.setPolId(bills.getPolId());
+						accBills.setPolCode(bills.getPolCode());
+						accBills.setPolCnName(bills.getPolCnName());
+						accBills.setPolEnName(bills.getPolEnName());
+						accBills.setPodId(bills.getPodId());
+						accBills.setPodCode(bills.getPodCode());
+						accBills.setPodCnName(bills.getPodCnName());
+						accBills.setPodEnName(bills.getPodEnName());
+					}
+					finAccBillsService.updateBatchById(finAccBillsList);
+				}
+			}
 		}
 		if (0 == statusD && 0 == statusC) {
 			bills.setAccountStatus(0);

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

@@ -31,14 +31,16 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.los.business.sea.entity.Bills;
 import org.springblade.los.finance.invoices.entity.FinInvoices;
+import org.springblade.los.finance.invoices.entity.FinInvoicesItems;
+import org.springblade.los.finance.invoices.service.IFinInvoicesItemsService;
 import org.springblade.los.finance.invoices.service.IFinInvoicesService;
 import org.springblade.los.finance.invoices.vo.FinInvoicesVO;
-import org.springblade.los.finance.stl.entity.FinStlBills;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 业务-发票主表 控制器
@@ -54,6 +56,8 @@ public class FinInvoicesController extends BladeController {
 
 	private final IFinInvoicesService finInvoicesService;
 
+	private final IFinInvoicesItemsService finInvoicesItemsService;
+
 	/**
 	 * 详情
 	 */
@@ -155,7 +159,15 @@ public class FinInvoicesController extends BladeController {
 	@ApiOperation(value = "删除", notes = "传入ids")
 	@RepeatSubmit
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		return R.status(finInvoicesService.removeByIds(Func.toLongList(ids)));
+		List<Long> idList = Func.toLongList(ids);
+		List<FinInvoicesItems> finInvoicesItemsList = finInvoicesItemsService.list(new LambdaQueryWrapper<FinInvoicesItems>()
+			.eq(FinInvoicesItems::getIsDeleted, 0)
+			.eq(FinInvoicesItems::getTenantId, AuthUtil.getTenantId())
+			.in(FinInvoicesItems::getPid, idList));
+		if (!finInvoicesItemsList.isEmpty()) {
+			finInvoicesItemsService.removeByIds(finInvoicesItemsList.stream().map(FinInvoicesItems::getId).collect(Collectors.toList()));
+		}
+		return R.status(finInvoicesService.removeByIds(idList));
 	}
 
 	/**

blade-service/blade-los/src/main/java/org/springblade/los/finance/invoices/service/impl/FinInvoicesServiceImpl.java

@@ -872,7 +872,7 @@ public class FinInvoicesServiceImpl extends ServiceImpl<FinInvoicesMapper, FinIn
 					feeCenterList.add(feeCenter);
 				}
 			}
-			finInvoicesItemsService.saveOrUpdateBatch(finInvoices.getFinInvoicesItemsList());
+			finInvoicesItemsService.removeByIds(finInvoices.getFinInvoicesItemsList().stream().map(FinInvoicesItems::getId).collect(Collectors.toList()));
 			List<Long> ids = finInvoices.getFinInvoicesItemsList().stream().map(FinInvoicesItems::getApplySrcId).collect(Collectors.toList());
 			if (!ids.isEmpty()) {
 				List<FinInvoicesItems> finInvoicesItemsList = finInvoicesItemsService.list(new LambdaQueryWrapper<FinInvoicesItems>()
@@ -895,8 +895,8 @@ public class FinInvoicesServiceImpl extends ServiceImpl<FinInvoicesMapper, FinIn
 		} else {
 			throw new RuntimeException("请选择明细");
 		}
-		detail.setStatus(0);
-		baseMapper.updateById(detail);
+//		detail.setStatus(0);
+		baseMapper.deleteById(detail.getId());
 		return R.data(detail);
 	}
 

blade-service/blade-los/src/main/java/org/springblade/los/finance/stl/service/impl/FinStlBillsServiceImpl.java

@@ -1325,7 +1325,7 @@ public class FinStlBillsServiceImpl extends ServiceImpl<FinStlBillsMapper, FinSt
 					List<FinInvoicesItems> finInvoicesItemsList = finInvoicesItemsMapper.selectList(new LambdaQueryWrapper<FinInvoicesItems>()
 						.eq(FinInvoicesItems::getTenantId, AuthUtil.getTenantId())
 						.eq(FinInvoicesItems::getIsDeleted, 0)
-						.in(FinInvoicesItems::getPid, ids));
+						.in(FinInvoicesItems::getId, ids));
 					if (!finInvoicesItemsList.isEmpty()) {
 						List<Long> pid = finInvoicesItemsList.stream().map(FinInvoicesItems::getPid).filter(Objects::nonNull).distinct().collect(Collectors.toList());
 						List<FinInvoices> finInvoicesList = finInvoicesMapper.selectList(new LambdaQueryWrapper<FinInvoices>()