2024年11月7日15:52:15

blade-service-api/blade-los-api/src/main/java/org/springblade/los/business/files/entity/FilesCenter.java

@@ -117,7 +117,7 @@ public class FilesCenter implements Serializable {
 	 * 自定义序号
 	 */
 	@ApiModelProperty(value = "自定义序号")
-	private Integer serialNo;
+	private String serialNo;
 	/**
 	 * 业务编号
 	 */

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

@@ -1812,4 +1812,32 @@ public class Bills implements Serializable {
 	@TableField(exist = false)
 	private String ventilation;
 
+	/**
+	 * 入货时间
+	 */
+	@TableField(exist = false)
+	private String goodsTime2;
+
+	/**
+	 * 截单时间
+	 */
+	@TableField(exist = false)
+	private String clearanceTime2;
+
+	/**
+	 * 截VGM时间
+	 */
+	@TableField(exist = false)
+	private String vgmDeadline2;
+	/**
+	 * 到厂时间
+	 */
+	@TableField(exist = false)
+	private String timeOn2;
+	/**
+	 * 返回场站时间
+	 */
+	@TableField(exist = false)
+	private String endTime2;
+
 }

blade-service/blade-los/src/main/java/org/springblade/los/basic/business/controller/BusinessTypeController.java

@@ -89,7 +89,6 @@ public class BusinessTypeController extends BladeController {
 			.like(ObjectUtils.isNotNull(businessType.getStatus()), BusinessType::getStatus, businessType.getStatus())
 			.eq(ObjectUtils.isNotNull(businessType.getEnableFee()), BusinessType::getEnableFee, businessType.getEnableFee())
 			.eq(ObjectUtils.isNotNull(businessType.getEnableVoucher()), BusinessType::getEnableVoucher, businessType.getEnableVoucher())
-			 // .orderByDesc(BusinessType::getCreateTime)
 			.orderBy(true, true, BusinessType::getZorder);
 		IPage<BusinessType> pages = bBusinessTypeService.page(Condition.getPage(query), lambdaQueryWrapper);
 		return R.data(pages);

blade-service/blade-los/src/main/java/org/springblade/los/business/amends/service/impl/AmendsServiceImpl.java

@@ -230,7 +230,7 @@ public class AmendsServiceImpl extends ServiceImpl<AmendsMapper, Amends> impleme
 			checkType = "sia-approve";
 		} else if ("AEA".equals(declare.getBusinessType())) {
 			actId = 1112;
-			processType = "空运进口AMEND";
+			processType = "空运出口AMEND";
 			checkType = "aea-approve";
 		} else if ("AIA".equals(declare.getBusinessType())) {
 			actId = 1112;

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/controller/BillsController.java

@@ -105,7 +105,9 @@ public class BillsController extends BladeController {
 			Bills::getStlCrStatusDescr, Bills::getStlDrStatusDescr, Bills::getInvoiceCrStatusDescr, Bills::getInvoiceDrStatusDescr, Bills::getCreateUserName,
 			Bills::getCreateTime, Bills::getUpdateUserName, Bills::getUpdateTime, Bills::getStatus, Bills::getBillStatus,
 			Bills::getAccountStatus, Bills::getRemarks, Bills::getPackingUnit, Bills::getBillDate, Bills::getTeamName,
-			Bills::getCreateUser, Bills::getTeu, Bills::getIssueType, Bills::getBookingNo, Bills::getQuantityCntrDescr, Bills::getCreateDeptName, Bills::getLineCnName);
+			Bills::getCreateUser, Bills::getTeu, Bills::getIssueType, Bills::getBookingNo, Bills::getQuantityCntrDescr,
+			Bills::getCreateDeptName, Bills::getLineCnName, Bills::getCarrierCnName, Bills::getCyCnName, Bills::getSrcType,
+			Bills::getSrcCnName, Bills::getBookingAgentCnName);
 		lambdaQueryWrapper.eq(Bills::getIsDeleted, 0)
 			.eq(Bills::getTenantId, AuthUtil.getTenantId())
 			.and(i -> i.isNull(Bills::getMasterId).or()

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

@@ -1,5 +1,6 @@
 package org.springblade.los.business.sea.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import lombok.AllArgsConstructor;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -7,9 +8,15 @@ import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
+import org.springblade.los.basic.ports.entity.BPorts;
+import org.springblade.los.basic.ports.service.IBPortsService;
+import org.springblade.los.basic.vessels.entity.BVessels;
+import org.springblade.los.basic.vessels.service.IBVesselsService;
 import org.springblade.los.business.sea.entity.Bills;
 import org.springblade.los.business.sea.entity.Containers;
+import org.springblade.los.business.sea.entity.SeaBillsDetail;
 import org.springblade.los.business.sea.service.ITemplateImportService;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
@@ -31,10 +38,14 @@ import java.util.List;
 @AllArgsConstructor
 public class TemplateImportServiceImpl implements ITemplateImportService {
 
+	private final IBVesselsService bVesselsService;
+
+	private final IBPortsService bPortsService;
 
 	@Override
 	public R<Bills> importOne(MultipartFile file) throws Exception {
 		Bills bills = new Bills();
+		SeaBillsDetail seaBillsDetail = new SeaBillsDetail();
 		// 创建临时文件
 		Path tempFile = Files.createTempFile("prefix", "suffix");
 		// 将MultipartFile的内容复制到临时文件
@@ -63,7 +74,8 @@ public class TemplateImportServiceImpl implements ITemplateImportService {
 			}
 		}
 		if (ObjectUtils.isNotNull(shipper)) {
-			bills.setHshipperDetails(shipper.toString());
+			seaBillsDetail.setHshipperDetails(shipper.toString());
+//			bills.setHshipperDetails(shipper.toString());
 			System.out.println("shipper:" + shipper);
 		} else {
 			throw new RuntimeException("发货人提单描述不能为空");
@@ -76,7 +88,8 @@ public class TemplateImportServiceImpl implements ITemplateImportService {
 			}
 		}
 		if (ObjectUtils.isNotNull(consignee)) {
-			bills.setHconsigneeDetails(consignee.toString());
+			seaBillsDetail.setHconsigneeDetails(consignee.toString());
+//			bills.setHconsigneeDetails(consignee.toString());
 			System.out.println("consignee:" + consignee);
 		} else {
 			throw new RuntimeException("收货人提单描述不能为空");
@@ -89,7 +102,8 @@ public class TemplateImportServiceImpl implements ITemplateImportService {
 			}
 		}
 		if (ObjectUtils.isNotNull(notifyParty)) {
-			bills.setHnotifyDetails(notifyParty.toString());
+			seaBillsDetail.setHnotifyDetails(notifyParty.toString());
+//			bills.setHnotifyDetails(notifyParty.toString());
 			System.out.println("notifyParty:" + notifyParty);
 		} else {
 			throw new RuntimeException("通知人提单描述不能为空");
@@ -108,7 +122,18 @@ public class TemplateImportServiceImpl implements ITemplateImportService {
 			if (vslVoy.contains("/")) {
 				String vsl = vslVoy.substring(0, vslVoy.indexOf("/"));
 				String voy = vslVoy.substring(vslVoy.indexOf("/") + 1);
-				bills.setVesselEnName(vsl);
+				if (ObjectUtils.isNotNull(vsl)) {
+					BVessels vessels = bVesselsService.getOne(new LambdaQueryWrapper<BVessels>()
+						.eq(BVessels::getTenantId, AuthUtil.getTenantId())
+						.eq(BVessels::getIsDeleted, 0)
+						.eq(BVessels::getEnName, vsl)
+						.last("limit 1"));
+					if (vessels != null) {
+						bills.setVesselEnName(vessels.getEnName());
+						bills.setVesselCnName(vessels.getCnName());
+						bills.setVesselId(vessels.getId());
+					}
+				}
 				bills.setVoyageNo(voy);
 				System.out.println("vsl:" + vsl);
 				System.out.println("voy:" + voy);
@@ -122,32 +147,83 @@ public class TemplateImportServiceImpl implements ITemplateImportService {
 		//POR
 		if (ObjectUtils.isNotNull(sheet.getRow(19).getCell(1))) {
 			String por = sheet.getRow(19).getCell(1).getStringCellValue();
+			if (ObjectUtils.isNotNull(por)) {
+				BPorts ports = bPortsService.getOne(new LambdaQueryWrapper<BPorts>()
+					.eq(BPorts::getTenantId, AuthUtil.getTenantId())
+					.eq(BPorts::getIsDeleted, 0)
+					.eq(BPorts::getEnName, por)
+					.last("limit 1"));
+				if (ports != null) {
+					bills.setPlaceReceiptId(ports.getId());
+					bills.setPlaceReceiptCode(ports.getCode());
+					bills.setPlaceReceiptName(ports.getEnName());
+					bills.setPlaceReceiptNamePrint(ports.getEnName());
+				}
+			}
 			System.out.println("por:" + por);
-			bills.setPlaceReceiptName(por);
+
 		} else {
 			throw new RuntimeException("收货港不能为空");
 		}
 		//POL
 		if (ObjectUtils.isNotNull(sheet.getRow(19).getCell(4))) {
 			String pol = sheet.getRow(19).getCell(4).getStringCellValue();
+			if (ObjectUtils.isNotNull(pol)) {
+				BPorts ports = bPortsService.getOne(new LambdaQueryWrapper<BPorts>()
+					.eq(BPorts::getTenantId, AuthUtil.getTenantId())
+					.eq(BPorts::getIsDeleted, 0)
+					.eq(BPorts::getEnName, pol)
+					.last("limit 1"));
+				if (ports != null) {
+					bills.setPolId(ports.getId());
+					bills.setPolCode(ports.getCode());
+					bills.setPolCnName(ports.getCnName());
+					bills.setPolEnName(ports.getEnName());
+					bills.setPolNamePrint(ports.getEnName());
+				}
+			}
 			System.out.println("pol:" + pol);
-			bills.setPolEnName(pol);
 		} else {
 			throw new RuntimeException("装运港不能为空");
 		}
 		//POD
 		if (ObjectUtils.isNotNull(sheet.getRow(20).getCell(1))) {
 			String pod = sheet.getRow(20).getCell(1).getStringCellValue();
+			if (ObjectUtils.isNotNull(pod)) {
+				BPorts ports = bPortsService.getOne(new LambdaQueryWrapper<BPorts>()
+					.eq(BPorts::getTenantId, AuthUtil.getTenantId())
+					.eq(BPorts::getIsDeleted, 0)
+					.eq(BPorts::getEnName, pod)
+					.last("limit 1"));
+				if (ports != null) {
+					bills.setPodId(ports.getId());
+					bills.setPodCode(ports.getCode());
+					bills.setPodCnName(ports.getCnName());
+					bills.setPodEnName(ports.getEnName());
+					bills.setPodNamePrint(ports.getEnName());
+				}
+			}
 			System.out.println("pod:" + pod);
-			bills.setPodEnName(pod);
 		} else {
 			throw new RuntimeException("卸货港不能为空");
 		}
 		//PLACE OF DELIVERY
 		if (ObjectUtils.isNotNull(sheet.getRow(20).getCell(4))) {
 			String placeOfDelivery = sheet.getRow(20).getCell(4).getStringCellValue();
+			if (ObjectUtils.isNotNull(placeOfDelivery)) {
+				BPorts ports = bPortsService.getOne(new LambdaQueryWrapper<BPorts>()
+					.eq(BPorts::getTenantId, AuthUtil.getTenantId())
+					.eq(BPorts::getIsDeleted, 0)
+					.eq(BPorts::getEnName, placeOfDelivery)
+					.last("limit 1"));
+				if (ports != null) {
+					bills.setDestinationId(ports.getId());
+					bills.setDestinationCode(ports.getCode());
+					bills.setDestinationName(ports.getEnName());
+					bills.setDestinationNamePrint(ports.getEnName());
+				}
+			}
 			System.out.println("placeOfDelivery:" + placeOfDelivery);
-			bills.setDestinationName(placeOfDelivery);
 		} else {
 			throw new RuntimeException("目的港不能为空");
 		}
@@ -239,8 +315,20 @@ public class TemplateImportServiceImpl implements ITemplateImportService {
 		//FINAL DESTINATION FOR THE MERCHANT’S REFERENCE
 		if (ObjectUtils.isNotNull(sheet.getRow(51).getCell(4))) {
 			String finalDestination = sheet.getRow(51).getCell(4).getStringCellValue();
+			if (ObjectUtils.isNotNull(finalDestination)) {
+				BPorts ports = bPortsService.getOne(new LambdaQueryWrapper<BPorts>()
+					.eq(BPorts::getTenantId, AuthUtil.getTenantId())
+					.eq(BPorts::getIsDeleted, 0)
+					.eq(BPorts::getEnName, finalDestination)
+					.last("limit 1"));
+				if (ports != null) {
+					bills.setFinalDestinationId(ports.getId());
+					bills.setFinalDestinationCode(ports.getCode());
+					bills.setFinalDestinationName(ports.getEnName());
+					bills.setFinalDestinationNamePrint(ports.getEnName());
+				}
+			}
 			System.out.println("finalDestination:" + finalDestination);
-			bills.setFinalDestinationName(finalDestination);
 		}
 		bills.setContainersList(new ArrayList<>());
 		bills.setPreContainersList(new ArrayList<>());
@@ -249,6 +337,7 @@ public class TemplateImportServiceImpl implements ITemplateImportService {
 		bills.setFeeCenterListD(new ArrayList<>());
 		bills.setFilesList(new ArrayList<>());
 		bills.setWaitingBoxList(new ArrayList<>());
+		bills.setDetail(seaBillsDetail);
 		//将字符串为null的赋默认值为""
 		Field[] fields = bills.getClass().getDeclaredFields();
 		for (Field field : fields) {
@@ -270,6 +359,7 @@ public class TemplateImportServiceImpl implements ITemplateImportService {
 	@Override
 	public R<Bills> importPilBooking(MultipartFile file) throws Exception {
 		Bills bills = new Bills();
+		SeaBillsDetail seaBillsDetail = new SeaBillsDetail();
 		// 创建临时文件
 		Path tempFile = Files.createTempFile("prefix", "suffix");
 		// 将MultipartFile的内容复制到临时文件
@@ -283,7 +373,8 @@ public class TemplateImportServiceImpl implements ITemplateImportService {
 		//SHIPPER
 		if (ObjectUtils.isNotNull(sheet.getRow(2).getCell(0))) {
 			String shipper = sheet.getRow(2).getCell(0).getStringCellValue();
-			bills.setHshipperDetails(shipper);
+//			bills.setHshipperDetails(shipper);
+			seaBillsDetail.setHshipperDetails(shipper);
 			System.out.println("shipper:" + shipper);
 		} else {
 			throw new RuntimeException("托运人不能为空");
@@ -291,7 +382,8 @@ public class TemplateImportServiceImpl implements ITemplateImportService {
 		//CONSIGNEE
 		if (ObjectUtils.isNotNull(sheet.getRow(9).getCell(0))) {
 			String consignee = sheet.getRow(9).getCell(0).getStringCellValue();
-			bills.setHconsigneeDetails(consignee);
+			seaBillsDetail.setHconsigneeDetails(consignee);
+//			bills.setHconsigneeDetails(consignee);
 			System.out.println("consignee:" + consignee);
 		} else {
 			throw new RuntimeException("收货人不能为空");
@@ -299,7 +391,8 @@ public class TemplateImportServiceImpl implements ITemplateImportService {
 		//NOTIFY PARTY
 		if (ObjectUtils.isNotNull(sheet.getRow(16).getCell(0))) {
 			String notifyParty = sheet.getRow(16).getCell(0).getStringCellValue();
-			bills.setHnotifyDetails(notifyParty);
+//			bills.setHnotifyDetails(notifyParty);
+			seaBillsDetail.setHnotifyDetails(notifyParty);
 			System.out.println("notifyParty:" + notifyParty);
 		} else {
 			throw new RuntimeException("通知人不能为空");
@@ -359,6 +452,7 @@ public class TemplateImportServiceImpl implements ITemplateImportService {
 		bills.setFeeCenterListD(new ArrayList<>());
 		bills.setFilesList(new ArrayList<>());
 		bills.setWaitingBoxList(new ArrayList<>());
+		bills.setDetail(seaBillsDetail);
 		Field[] fields = bills.getClass().getDeclaredFields();
 		for (Field field : fields) {
 			try {
@@ -379,6 +473,7 @@ public class TemplateImportServiceImpl implements ITemplateImportService {
 	@Override
 	public R<Bills> importPilCutOffOrders(MultipartFile file) throws Exception {
 		Bills bills = new Bills();
+		SeaBillsDetail seaBillsDetail = new SeaBillsDetail();
 		// 创建临时文件
 		Path tempFile = Files.createTempFile("prefix", "suffix");
 		// 将MultipartFile的内容复制到临时文件
@@ -392,7 +487,8 @@ public class TemplateImportServiceImpl implements ITemplateImportService {
 		//SHIPPER
 		if (ObjectUtils.isNotNull(sheet.getRow(2).getCell(0))) {
 			String shipper = sheet.getRow(2).getCell(0).getStringCellValue();
-			bills.setHshipperDetails(shipper);
+//			bills.setHshipperDetails(shipper);
+			seaBillsDetail.setHshipperDetails(shipper);
 			System.out.println("shipper:" + shipper);
 		} else {
 			throw new RuntimeException("托运人不能为空");
@@ -400,7 +496,8 @@ public class TemplateImportServiceImpl implements ITemplateImportService {
 		//CONSIGNEE
 		if (ObjectUtils.isNotNull(sheet.getRow(9).getCell(0))) {
 			String consignee = sheet.getRow(9).getCell(0).getStringCellValue();
-			bills.setHconsigneeDetails(consignee);
+			seaBillsDetail.setHconsigneeDetails(consignee);
+//			bills.setHconsigneeDetails(consignee);
 			System.out.println("consignee:" + consignee);
 		} else {
 			throw new RuntimeException("收货人不能为空");
@@ -408,7 +505,8 @@ public class TemplateImportServiceImpl implements ITemplateImportService {
 		//NOTIFY PARTY
 		if (ObjectUtils.isNotNull(sheet.getRow(16).getCell(0))) {
 			String notifyParty = sheet.getRow(16).getCell(0).getStringCellValue();
-			bills.setHnotifyDetails(notifyParty);
+			seaBillsDetail.setHnotifyDetails(notifyParty);
+//			bills.setHnotifyDetails(notifyParty);
 			System.out.println("notifyParty:" + notifyParty);
 		} else {
 			throw new RuntimeException("通知人不能为空");
@@ -461,6 +559,7 @@ public class TemplateImportServiceImpl implements ITemplateImportService {
 		bills.setFeeCenterList(new ArrayList<>());
 		bills.setFilesList(new ArrayList<>());
 		bills.setWaitingBoxList(new ArrayList<>());
+		bills.setDetail(seaBillsDetail);
 		Field[] fields = bills.getClass().getDeclaredFields();
 		for (Field field : fields) {
 			try {

blade-service/blade-los/src/main/java/org/springblade/los/check/service/impl/AuditProecessServiceImpl.java

@@ -257,6 +257,22 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, L
 					message.setMessageBody("您有新的付费申请待确认,业务单号:" + auditProecessDTO.getBillNo()+",请审核。"
 						+ "提交人:" + auditProecessDTO.getSendName() + "  " + "提交时间" + simpleDateFormat.format(auditProecessDTO.getSendTime())
 					);
+				}else if ("海运出口AMEND".equals(auditProecess.getProcessType())) {
+					message.setMessageBody("您有新的海运出口AMEND待确认,业务单号:" + auditProecessDTO.getBillNo()+",请审核。"
+						+ "提交人:" + auditProecessDTO.getSendName() + "  " + "提交时间" + simpleDateFormat.format(auditProecessDTO.getSendTime())
+					);
+				}else if ("海运进口AMEND".equals(auditProecess.getProcessType())) {
+					message.setMessageBody("您有新的海运进口AMEND待确认,业务单号:" + auditProecessDTO.getBillNo()+",请审核。"
+						+ "提交人:" + auditProecessDTO.getSendName() + "  " + "提交时间" + simpleDateFormat.format(auditProecessDTO.getSendTime())
+					);
+				}else if ("空运出口AMEND".equals(auditProecess.getProcessType())) {
+					message.setMessageBody("您有新的空运出口AMEND待确认,业务单号:" + auditProecessDTO.getBillNo()+",请审核。"
+						+ "提交人:" + auditProecessDTO.getSendName() + "  " + "提交时间" + simpleDateFormat.format(auditProecessDTO.getSendTime())
+					);
+				}else if ("空运进口AMEND".equals(auditProecess.getProcessType())) {
+					message.setMessageBody("您有新的空运进口AMEND待确认,业务单号:" + auditProecessDTO.getBillNo()+",请审核。"
+						+ "提交人:" + auditProecessDTO.getSendName() + "  " + "提交时间" + simpleDateFormat.format(auditProecessDTO.getSendTime())
+					);
 				}
 
 				message.setUrl("/approveDataH/index");
@@ -1088,7 +1104,7 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, L
 						+ "单据日期:" + billsDate + ",请审核。"
 						+ "提交人:" + proecessTemp.getSendName() + "  " + "提交时间" + simpleDateFormat.format(proecessTemp.getSendTime())
 					);
-				} else if ("海运进口口AMEND".equals(auditProecess.getProcessType())) {
+				} else if ("海运进口AMEND".equals(auditProecess.getProcessType())) {
 					message.setMessageBody("您有新的海运进口口AMEND审核,业务单号:" + proecessTemp.getBillNo() + ","
 						+ "单据日期:" + billsDate + ",请审核。"
 						+ "提交人:" + proecessTemp.getSendName() + "  " + "提交时间" + simpleDateFormat.format(proecessTemp.getSendTime())
@@ -1098,7 +1114,7 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, L
 						+ "单据日期:" + billsDate + ",请审核。"
 						+ "提交人:" + proecessTemp.getSendName() + "  " + "提交时间" + simpleDateFormat.format(proecessTemp.getSendTime())
 					);
-				} else if ("空运进口口AMEND".equals(auditProecess.getProcessType())) {
+				} else if ("空运进口AMEND".equals(auditProecess.getProcessType())) {
 					message.setMessageBody("您有新的空运进口口AMEND审核,业务单号:" + proecessTemp.getBillNo() + ","
 						+ "单据日期:" + billsDate + ",请审核。"
 						+ "提交人:" + proecessTemp.getSendName() + "  " + "提交时间" + simpleDateFormat.format(proecessTemp.getSendTime())
@@ -1127,12 +1143,12 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, L
 				}
 				if ("海运出口AMEND".equals(auditProecess.getProcessType())) {
 					sendMessage.setMessageBody("您的海运出口AMEND审核未通过" + ",业务单号:" + proecessTemp.getBillNo() + ",驳回原因:" + auditProecess.getAuditMsg());
-				} else if ("海运进口口AMEND".equals(auditProecess.getProcessType())) {
-					sendMessage.setMessageBody("您的海运进口口AMEND审核未通过" + ",业务单号:" + proecessTemp.getBillNo() + ",驳回原因:" + auditProecess.getAuditMsg());
+				} else if ("海运进口AMEND".equals(auditProecess.getProcessType())) {
+					sendMessage.setMessageBody("您的海运进口AMEND审核未通过" + ",业务单号:" + proecessTemp.getBillNo() + ",驳回原因:" + auditProecess.getAuditMsg());
 				} else if ("空运出口AMEND".equals(auditProecess.getProcessType())) {
 					sendMessage.setMessageBody("您的空运出口AMEND审核未通过" + ",业务单号:" + proecessTemp.getBillNo() + ",驳回原因:" + auditProecess.getAuditMsg());
-				} else if ("空运进口口AMEND".equals(auditProecess.getProcessType())) {
-					sendMessage.setMessageBody("您的空运进口口AMEND审核未通过" + ",业务单号:" + proecessTemp.getBillNo() + ",驳回原因:" + auditProecess.getAuditMsg());
+				} else if ("空运进口AMEND".equals(auditProecess.getProcessType())) {
+					sendMessage.setMessageBody("您的空运进口AMEND审核未通过" + ",业务单号:" + proecessTemp.getBillNo() + ",驳回原因:" + auditProecess.getAuditMsg());
 				}
 				R save = messageClient.save(sendMessage);
 				if (!save.isSuccess()) {
@@ -1191,12 +1207,12 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, L
 				}
 				if ("海运出口AMEND".equals(auditProecess.getProcessType())) {
 					sendMessage.setMessageBody("您的海运出口AMEND审核已通过" + ",业务单号:" + proecessTemp.getBillNo() + ",驳回原因:" + auditProecess.getAuditMsg());
-				} else if ("海运进口口AMEND".equals(auditProecess.getProcessType())) {
-					sendMessage.setMessageBody("您的海运进口口AMEND审核已通过" + ",业务单号:" + proecessTemp.getBillNo() + ",驳回原因:" + auditProecess.getAuditMsg());
+				} else if ("海运进口AMEND".equals(auditProecess.getProcessType())) {
+					sendMessage.setMessageBody("您的海运进口AMEND审核已通过" + ",业务单号:" + proecessTemp.getBillNo() + ",驳回原因:" + auditProecess.getAuditMsg());
 				} else if ("空运出口AMEND".equals(auditProecess.getProcessType())) {
 					sendMessage.setMessageBody("您的空运出口AMEND审核已通过" + ",业务单号:" + proecessTemp.getBillNo() + ",驳回原因:" + auditProecess.getAuditMsg());
-				} else if ("空运进口口AMEND".equals(auditProecess.getProcessType())) {
-					sendMessage.setMessageBody("您的空运进口口AMEND审核已通过" + ",业务单号:" + proecessTemp.getBillNo() + ",驳回原因:" + auditProecess.getAuditMsg());
+				} else if ("空运进口AMEND".equals(auditProecess.getProcessType())) {
+					sendMessage.setMessageBody("您的空运进口AMEND审核已通过" + ",业务单号:" + proecessTemp.getBillNo() + ",驳回原因:" + auditProecess.getAuditMsg());
 				}
 				R save = messageClient.save(sendMessage);
 				if (!save.isSuccess()) {
@@ -1218,12 +1234,12 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, L
 				}
 				if ("海运出口AMEND".equals(auditProecess.getProcessType())) {
 					sendMessage.setMessageBody("您的海运出口AMEND审核未通过" + ",业务单号:" + proecessTemp.getBillNo() + ",驳回原因:" + auditProecess.getAuditMsg());
-				} else if ("海运进口口AMEND".equals(auditProecess.getProcessType())) {
-					sendMessage.setMessageBody("您的海运进口口AMEND审核未通过" + ",业务单号:" + proecessTemp.getBillNo() + ",驳回原因:" + auditProecess.getAuditMsg());
+				} else if ("海运进口AMEND".equals(auditProecess.getProcessType())) {
+					sendMessage.setMessageBody("您的海运进口AMEND审核未通过" + ",业务单号:" + proecessTemp.getBillNo() + ",驳回原因:" + auditProecess.getAuditMsg());
 				} else if ("空运出口AMEND".equals(auditProecess.getProcessType())) {
 					sendMessage.setMessageBody("您的空运出口AMEND审核未通过" + ",业务单号:" + proecessTemp.getBillNo() + ",驳回原因:" + auditProecess.getAuditMsg());
-				} else if ("空运进口口AMEND".equals(auditProecess.getProcessType())) {
-					sendMessage.setMessageBody("您的空运进口口AMEND审核未通过" + ",业务单号:" + proecessTemp.getBillNo() + ",驳回原因:" + auditProecess.getAuditMsg());
+				} else if ("空运进口AMEND".equals(auditProecess.getProcessType())) {
+					sendMessage.setMessageBody("您的空运进口AMEND审核未通过" + ",业务单号:" + proecessTemp.getBillNo() + ",驳回原因:" + auditProecess.getAuditMsg());
 				}
 				R save = messageClient.save(sendMessage);
 				if (!save.isSuccess()) {

blade-service/blade-los/src/main/java/org/springblade/los/edi/service/impl/EdiTypesServiceImpl.java

@@ -1006,7 +1006,7 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 				filesCenter.setBusinessType(details.getBusinessType());
 				filesCenter.setClassifyCode("edi");
 				filesCenter.setGroupCode(ediTypes.getCode());
-				filesCenter.setSerialNo(1);
+				filesCenter.setSerialNo("1");
 				filesCenter.setSort(1);
 				filesCenter.setReceivedData(new Date());
 

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

@@ -77,6 +77,7 @@ public class FinInvoicesController extends BladeController {
 			.eq(ObjectUtils.isNotNull(finInvoices.getBillNo()), FinInvoices::getBillNo, finInvoices.getBillNo())
 			.eq(ObjectUtils.isNotNull(finInvoices.getType()), FinInvoices::getType, finInvoices.getType())
 			.eq(ObjectUtils.isNotNull(finInvoices.getStatus()), FinInvoices::getStatus, finInvoices.getStatus())
+			.like(ObjectUtils.isNotNull(finInvoices.getMblno()), FinInvoices::getMblno, finInvoices.getMblno())
 			.like(ObjectUtils.isNotNull(finInvoices.getFeeCnName()), FinInvoices::getFeeCnName, finInvoices.getFeeCnName())
 			.eq(ObjectUtils.isNotNull(finInvoices.getBillStatus()), FinInvoices::getBillStatus, finInvoices.getBillStatus())
 			.ge(ObjectUtils.isNotNull(finInvoices.getInvoiceDateStart()), FinInvoices::getBillDate, finInvoices.getInvoiceDateStart())

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

@@ -446,7 +446,7 @@ public class FinStlBillsServiceImpl extends ServiceImpl<FinStlBillsMapper, FinSt
 			finStlBillsItemsService.saveOrUpdateBatch(finStlBills.getFinStlBillsItemsList());
 			feeCenterService.saveOrUpdateBatch(feeCenterList);
 			finAccBillsService.saveOrUpdateBatch(finAccBillsList);
-			updateBillsStatus(finStlBills.getFinStlBillsItemsList(), 1,null);
+			updateBillsStatus(finStlBills.getFinStlBillsItemsList(), 1, null);
 		} else {
 			throw new RuntimeException("请选择明细");
 		}
@@ -946,7 +946,6 @@ public class FinStlBillsServiceImpl extends ServiceImpl<FinStlBillsMapper, FinSt
 				finAccBills.setStlAmountCrUsd(ObjectUtils.isNotNull(finAccBills.getStlAmountCrUsd()) ? finAccBills.getStlAmountCrUsd() : new BigDecimal("0.00"));
 				item.setStlTtlAmount(item.getStlTtlAmount().add(item.getCurrentStlAmount().add(item.getCurrentStlDiscount())));
 				item.setUnsettledAmount(item.getAmount().subtract(item.getStlTtlAmount()));
-				/*-----------------------账单数据处理 收--------------------------- */
 				if ("D".equals(item.getDc())) {
 					if (finAccBills.getStlAmountDr().compareTo(finAccBills.getAmountDr()) > 0 ||
 						finAccBills.getStlAmountDrUsd().compareTo(finAccBills.getAmountDrUsd()) > 0
@@ -972,8 +971,6 @@ public class FinStlBillsServiceImpl extends ServiceImpl<FinStlBillsMapper, FinSt
 						status = true;
 					}
 				}
-				/*-----------------------账单数据处理 收--------------------------- */
-				/*-----------------------账单数据处理 付--------------------------- */
 				else if ("C".equals(item.getDc())) {
 					if (finAccBills.getStlAmountCr().compareTo(finAccBills.getAmountCr()) > 0 ||
 						finAccBills.getStlAmountCrUsd().compareTo(finAccBills.getAmountCrUsd()) > 0
@@ -999,7 +996,6 @@ public class FinStlBillsServiceImpl extends ServiceImpl<FinStlBillsMapper, FinSt
 						status = true;
 					}
 				}
-				/*-----------------------账单数据处理 付--------------------------- */
 				if (status) {
 					finAccBills.setIsCleared(9);
 				} else {
@@ -1012,7 +1008,6 @@ public class FinStlBillsServiceImpl extends ServiceImpl<FinStlBillsMapper, FinSt
 				finAccBills.setUpdateTime(new Date());
 				finAccBills.setUpdateUserName(AuthUtil.getUserName());
 				finAccBillsList.add(finAccBills);
-				/*-----------------------费用中心数据处理--------------------------- */
 				List<FeeCenter> feeCenters = feeCenterService.list(new LambdaQueryWrapper<FeeCenter>()
 					.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
 					.eq(FeeCenter::getIsDeleted, 0)
@@ -1111,7 +1106,6 @@ public class FinStlBillsServiceImpl extends ServiceImpl<FinStlBillsMapper, FinSt
 				if (currentStlAmount.compareTo(new BigDecimal("0.00")) != 0) {
 					throw new RuntimeException("结算金额计算错误，操作失败");
 				}
-				/*-----------------------费用中心数据处理--------------------------- */
 			}
 			feeCenterService.saveOrUpdateBatch(feeCenterList);
 			finStlBillsItemsService.saveOrUpdateBatch(finStlBills.getFinStlBillsItemsList());
@@ -1126,9 +1120,9 @@ public class FinStlBillsServiceImpl extends ServiceImpl<FinStlBillsMapper, FinSt
 						.eq(FeeCenter::getIsDeleted, 0)
 						.in(FeeCenter::getPid, pids));
 					for (FeeCenter item : feeCenters) {
-                        feeCenterList.stream().filter(e -> e.getId().equals(item.getId())).findFirst()
+						feeCenterList.stream().filter(e -> e.getId().equals(item.getId())).findFirst()
 							.ifPresent(feeCenter -> item.setStlStatus(feeCenter.getStlStatus()));
-                    }
+					}
 					updateBillsStatus(finStlBills.getFinStlBillsItemsList(), 2, feeCenters);
 				}
 			}
@@ -1440,9 +1434,9 @@ public class FinStlBillsServiceImpl extends ServiceImpl<FinStlBillsMapper, FinSt
 						.eq(FeeCenter::getIsDeleted, 0)
 						.in(FeeCenter::getPid, pids));
 					for (FeeCenter item : feeCenters) {
-                        feeCenterList.stream().filter(e -> e.getId().equals(item.getId())).findFirst()
+						feeCenterList.stream().filter(e -> e.getId().equals(item.getId())).findFirst()
 							.ifPresent(feeCenter -> item.setStlStatus(feeCenter.getStlStatus()));
-                    }
+					}
 					updateBillsStatus(finStlBills.getFinStlBillsItemsList(), 3, feeCenters);
 				}
 			}
@@ -1696,10 +1690,10 @@ public class FinStlBillsServiceImpl extends ServiceImpl<FinStlBillsMapper, FinSt
 			auditProecessDTO.setReceivableAmount(detail.getAmountDrLoc());
 			auditProecessDTO.setGrossProfit(detail.getAmountSubLoc());
 			List<FinStlBillsItems> finStlBillsItemsList = finStlBillsItemsService.list(new LambdaQueryWrapper<FinStlBillsItems>()
-				.eq(FinStlBillsItems::getTenantId,AuthUtil.getTenantId())
-				.eq(FinStlBillsItems::getIsDeleted,0)
-				.eq(FinStlBillsItems::getPid,detail.getId()));
-			if (!finStlBillsItemsList.isEmpty()){
+				.eq(FinStlBillsItems::getTenantId, AuthUtil.getTenantId())
+				.eq(FinStlBillsItems::getIsDeleted, 0)
+				.eq(FinStlBillsItems::getPid, detail.getId()));
+			if (!finStlBillsItemsList.isEmpty()) {
 				auditProecessDTO.setReferenceNumber(finStlBillsItemsList.stream().map(FinStlBillsItems::getMblno)
 					.distinct().collect(Collectors.joining(",")));
 			}
@@ -2024,8 +2018,8 @@ public class FinStlBillsServiceImpl extends ServiceImpl<FinStlBillsMapper, FinSt
 		for (FinStlBillsItems item : finStlBillsItemsList) {
 			ListAccBillVO finAccBills = new ListAccBillVO();
 			finAccBills.setAccId(item.getAccBillId());
-			finAccBills.setPostId(AuthUtil.getPostId());
-			finAccBills.setBranchId(deptUtils.getDeptPid() + "");
+			/*finAccBills.setPostId(AuthUtil.getPostId());
+			finAccBills.setBranchId(deptUtils.getDeptPid() + "");*/
 			FinAccBillsVO finAccBillsVO = finAccBillsService.listByAccBillId(finAccBills);
 			if (finAccBillsVO != null) {
 				item.setAppliedAmount(finAccBillsVO.getAppliedAmount());
@@ -2033,18 +2027,10 @@ public class FinStlBillsServiceImpl extends ServiceImpl<FinStlBillsMapper, FinSt
 				item.setAppliedAmountStl(finAccBillsVO.getAppliedAmountStl());
 				item.setAppliedInvoiceAmountStl(finAccBillsVO.getAppliedInvoiceAmountStl());
 				item.setReconciliationAmount(finAccBillsVO.getReconciliationAmount());
-
 				item.setAppliedCurrentStlAmount(item.getCurrentStlAmount());
 				item.setAppliedInvoiceCurrentStlAmount(item.getCurrentStlAmount());
 				item.setReconciliationCurrentAmount(item.getCurrentStlAmount());
 				item.setAppliedInvoiceCurrentAmount(item.getCurrentStlAmount());
-				/*BigDecimal amount = finAccBillsVO.getAppliedAmount().subtract(finAccBillsVO.getAppliedAmountStl());
-				item.setAppliedCurrentStlAmount(finAccBillsVO.getAmount().subtract(amount).subtract(finAccBillsVO.getStlTtlAmount()));
-				item.setAppliedInvoiceCurrentStlAmount(finAccBillsVO.getAmount().subtract(finAccBillsVO.getStlTtlAmount()));
-//				item.setCurrentStlAmount(item.getAmount().subtract(finAccBillsVO.getStlTtlAmount()));
-				item.setReconciliationCurrentAmount(finAccBillsVO.getAmount().subtract(finAccBillsVO.getReconciliationAmount()));
-				BigDecimal invoice = finAccBillsVO.getAppliedInvoiceAmount().subtract(finAccBillsVO.getAppliedInvoiceAmountStl());
-				item.setAppliedInvoiceCurrentAmount(finAccBillsVO.getAmount().subtract(invoice).subtract(finAccBillsVO.getUninvoicedAmount()));*/
 			} else {
 				item.setAppliedAmount(new BigDecimal("0.00"));
 				item.setAppliedInvoiceAmount(new BigDecimal("0.00"));

blade-service/blade-los/src/main/java/org/springblade/los/trade/service/impl/AgentServiceImpl.java

@@ -745,7 +745,7 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 			for (FilesCenter item : agent.getFilesCenterList()) {
 				if (item.getId() == null) {
 					item.setBusinessType("MYDL");
-					item.setSerialNo(1);
+					item.setSerialNo("1");
 					item.setSort(1);
 					item.setBillNo(agent.getBusinessNo());
 					item.setPid(agent.getId());

blade-service/blade-los/src/main/java/org/springblade/los/trade/service/impl/StorageFeeServiceImpl.java

@@ -117,7 +117,7 @@ public class StorageFeeServiceImpl extends ServiceImpl<StorageFeeMapper, Storage
 			for (FilesCenter item : storageFee.getFilesCenterList()) {
 				if (item.getId() == null) {
 					item.setBusinessType("CCF");
-					item.setSerialNo(1);
+					item.setSerialNo("1");
 					item.setSort(1);
 					item.setPid(storageFee.getId());
 					item.setCreateTime(new Date());