1.海、空运舱单amend，快递业务amend，海运派车模块增加amend请核逻辑

2.海、空运舱单amend，快递业务amend，海运派车amend模块增加审核通过，审核驳回逻辑

blade-service-api/blade-los-api/src/main/java/org/springblade/los/business/amends/entity/Amends.java

@@ -99,6 +99,7 @@ public class Amends implements Serializable {
 	private Date updateTime;
 	/**
 	 * 业务类型, SEA=海运出口AMEND SIA=海运进口AMEND AEA=空运出口AMEND AIA=空运进口AMEND
+	 *EXPA=快递amend  TRUCKA=海运派车amend  MFAA=空运舱单amend  MFSA=海运舱单amend
 	 */
 	@ApiModelProperty(value = "业务类型, SEA=海运出口AMEND SIA=海运进口AMEND AEA=空运出口AMEND AIA=空运进口AMEND")
 	private String businessType;

blade-service-api/blade-los-api/src/main/java/org/springblade/los/business/generalBill/entity/GeneralBill.java

@@ -94,9 +94,9 @@ public class GeneralBill implements Serializable {
 	@ApiModelProperty(value = "修改时间")
 	private Date updateTime;
 	/**
-	 * 单据类型, MFS=海运舱单 MFA=空运运舱单, EXP=快递业务，TRUCK=海运派车
+	 * 单据类型, SECMS=海运舱单 MFA=空运运舱单, EXP=快递业务，TRUCK=海运派车
 	 */
-	@ApiModelProperty(value = "单据类型, MFS=海运舱单 MFA=空运运舱单, EXP=快递业务，TRUCK=海运派车")
+	@ApiModelProperty(value = "单据类型, SECMS=海运舱单 MFA=空运运舱单, EXP=快递业务，TRUCK=海运派车")
 	private String billType;
 	/**
 	 * 业务类型，根据单据类型不同，取不同的值

blade-service/blade-los/src/main/java/org/springblade/los/Util/MagicValues.java

@@ -67,6 +67,14 @@ public class MagicValues {
 	public static final String BGSI = "BGSI";
 	public static final String BGAE = "BGAE";
 	public static final String BGAI = "BGAI";
+	public static final String EXPA = "EXPA";
+	public static final String TRUCKA = "TRUCKA";
+	public static final String MFAA = "MFAA";
+	public static final String MFSA = "MFSA";
+	public static final String SECMS = "SECMS";
+	public static final String MFA = "MFA";
+	public static final String EXP = "EXP";
+	public static final String TRUCK = "TRUCK";
 	public static final String USD = "USD";
 	public static final String CNY = "CNY";
 	public static final String D = "D";

blade-service/blade-los/src/main/java/org/springblade/los/basic/reports/service/impl/ReportsServiceImpl.java

@@ -223,6 +223,8 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 			return this.getReportDataAmend(billId, reportCode, groupCode, corpIds, itemIds, type, curCode, BillNumber);
 		} else if (MagicValues.BGSE.equals(type) || MagicValues.BGSI.equals(type) || MagicValues.BGAE.equals(type) || MagicValues.BGAI.equals(type)) {
 			return this.getReportDataBG(billId, reportCode, groupCode, corpIds, itemIds, type, curCode, BillNumber);
+		}else if((MagicValues.SECMS.equals(type) || MagicValues.MFA.equals(type) || MagicValues.EXP.equals(type) || MagicValues.TRUCK.equals(type))){
+
 		} else {
 			if (MagicValues.PAID_APPLICATION.equals(reportCode) && MagicValues.PAID_APPLICATION.equals(groupCode)) {
 				FinStlBills finStlBills = finStlBillsService.getById(billId);

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

@@ -250,6 +250,22 @@ public class AmendsServiceImpl extends ServiceImpl<AmendsMapper, Amends> impleme
 			actId = 1112;
 			processType = "空运进口AMEND";
 			checkType = "aia-approve";
+		}else if ("EXPA".equals(declare.getBusinessType())) {
+			actId = 1129;
+			processType = "快递业务amend审核";
+			checkType = "EXPA";
+		}else if ("TRUCKA".equals(declare.getBusinessType())) {
+			actId = 1135;
+			processType = "海运派车amend审核";
+			checkType = "TRUCKA";
+		}else if ("MFAA".equals(declare.getBusinessType())) {
+			actId = 1133;
+			processType = "空运舱单amend审核";
+			checkType = "MFAA";
+		}else if ("MFSA".equals(declare.getBusinessType())) {
+			actId = 1131;
+			processType = "海运舱单amend审核";
+			checkType = "MFSA";
 		}
 		//审批数据
 		LosAuditProecessDTO auditProecessDTO = new LosAuditProecessDTO();

blade-service/blade-los/src/main/java/org/springblade/los/business/generalBill/service/impl/GeneralBillServiceImpl.java

@@ -308,10 +308,10 @@ public class GeneralBillServiceImpl extends ServiceImpl<GeneralBillMapper, Gener
 		Integer actId = null;
 		String processType = "";
 		String checkType = "";
-		if ("MFS".equals(declare.getBillType())) {
+		if ("SECMS".equals(declare.getBillType())) {
 			actId = 1130;
 			processType = "海运舱单审核";
-			checkType = "MFS";
+			checkType = "SECMS";
 		} else if ("MFA".equals(declare.getBillType())) {
 			actId = 1132;
 			processType = "空运舱单审核";
@@ -451,7 +451,7 @@ public class GeneralBillServiceImpl extends ServiceImpl<GeneralBillMapper, Gener
 			throw new RuntimeException("缺少必要参数");
 		}
 		LambdaQueryWrapper<GeneralBill> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-		lambdaQueryWrapper.eq(ObjectUtils.isNotNull(bills.getBusinessType()), GeneralBill::getBusinessType, bills.getBusinessType())
+		lambdaQueryWrapper.eq(ObjectUtils.isNotNull(bills.getBillType()), GeneralBill::getBillType, bills.getBillType())
 			.like(ObjectUtils.isNotNull(bills.getMblno()), GeneralBill::getMblno, bills.getMblno())
 			.like(ObjectUtils.isNotNull(bills.getHblno()), GeneralBill::getHblno, bills.getHblno())
 			.like(ObjectUtils.isNotNull(bills.getRefno()), GeneralBill::getRefno, bills.getRefno())

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

@@ -33,7 +33,6 @@ import org.springblade.los.business.sea.entity.ContainersBills;
 import org.springblade.los.business.sea.entity.ContainersCommodity;
 import org.springblade.los.business.sea.mapper.BillsMapper;
 import org.springblade.los.business.sea.mapper.ContainersMapper;
-import org.springblade.los.business.sea.mapper.PreContainersMapper;
 import org.springblade.los.business.sea.service.IContainersBillsService;
 import org.springblade.los.business.sea.service.IContainersCommodityService;
 import org.springblade.los.business.sea.service.IContainersService;
@@ -70,8 +69,6 @@ public class ContainersServiceImpl extends ServiceImpl<ContainersMapper, Contain
 
 	private final IContainersCommodityService containersCommodityService;
 
-	private final PreContainersMapper preContainersMapper;
-
 	@Override
 	public IPage<ContainersVO> selectContainersPage(IPage<ContainersVO> page, ContainersVO containers) {
 		return page.setRecords(baseMapper.selectContainersPage(page, containers));

blade-service/blade-los/src/main/java/org/springblade/los/check/controller/AuditProecessController.java

@@ -256,13 +256,15 @@ public class AuditProecessController extends BladeController {
 		} else if ("HYCK-FPSQ".equals(proecess.getCheckType())) {
 			auditProecessService.losFinInvoicesCheck(auditProecess);
 		} else if ("sea-approve".equals(proecess.getCheckType()) || "sia-approve".equals(proecess.getCheckType()) ||
-			"aea-approve".equals(proecess.getCheckType()) || "aia-approve".equals(proecess.getCheckType())) {
+			"aea-approve".equals(proecess.getCheckType()) || "aia-approve".equals(proecess.getCheckType()) ||
+			"EXPA".equals(proecess.getCheckType()) || "TRUCKA".equals(proecess.getCheckType()) ||
+			"MFAA".equals(proecess.getCheckType()) ||"MFSA".equals(proecess.getCheckType()) ) {
 			auditProecessService.amendsCheck(auditProecess);
 		} else if ("MYDL".equals(proecess.getCheckType()) || "FFSQ-SK".equals(proecess.getCheckType())
 			|| "FFSQ-WK".equals(proecess.getCheckType()) || "YSQR-D".equals(proecess.getCheckType())
 			|| "YSQR-C".equals(proecess.getCheckType())) {
 			auditProecessService.agentCheck(auditProecess);
-		}else if ("MFS".equals(proecess.getCheckType()) || "MFA".equals(proecess.getCheckType())
+		}else if ("SECMS".equals(proecess.getCheckType()) || "MFA".equals(proecess.getCheckType())
 			|| "EXP".equals(proecess.getCheckType()) || "TRUCK".equals(proecess.getCheckType())) {
 			auditProecessService.generalBillCheck(auditProecess);
 		}

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

@@ -295,6 +295,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");
@@ -1147,6 +1163,26 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, L
 						+ "单据日期:" + billsDate + ",请审核。"
 						+ "提交人:" + proecessTemp.getSendName() + "  " + "提交时间" + simpleDateFormat.format(proecessTemp.getSendTime())
 					);
+				} else if ("快递业务amend审核".equals(auditProecess.getProcessType())) {
+					message.setMessageBody("您有新的快递业务amend审核,业务单号:" + proecessTemp.getBillNo() + ","
+						+ "单据日期:" + billsDate + ",请审核。"
+						+ "提交人:" + proecessTemp.getSendName() + "  " + "提交时间" + simpleDateFormat.format(proecessTemp.getSendTime())
+					);
+				} else if ("海运派车amend审核".equals(auditProecess.getProcessType())) {
+					message.setMessageBody("您有新的海运派车amend审核,业务单号:" + proecessTemp.getBillNo() + ","
+						+ "单据日期:" + billsDate + ",请审核。"
+						+ "提交人:" + proecessTemp.getSendName() + "  " + "提交时间" + simpleDateFormat.format(proecessTemp.getSendTime())
+					);
+				} else if ("空运舱单amend审核".equals(auditProecess.getProcessType())) {
+					message.setMessageBody("您有新的空运舱单amend审核,业务单号:" + proecessTemp.getBillNo() + ","
+						+ "单据日期:" + billsDate + ",请审核。"
+						+ "提交人:" + proecessTemp.getSendName() + "  " + "提交时间" + simpleDateFormat.format(proecessTemp.getSendTime())
+					);
+				} else if ("海运舱单amend审核".equals(auditProecess.getProcessType())) {
+					message.setMessageBody("您有新的海运舱单amend审核,业务单号:" + proecessTemp.getBillNo() + ","
+						+ "单据日期:" + billsDate + ",请审核。"
+						+ "提交人:" + proecessTemp.getSendName() + "  " + "提交时间" + simpleDateFormat.format(proecessTemp.getSendTime())
+					);
 				}
 				message.setUrl(auditProecess.getUrl());
 				message.setPageLabel(auditProecess.getPageLabel());
@@ -1177,6 +1213,14 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, L
 					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()) {
@@ -1220,6 +1264,9 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, L
 					} else if ("AEA".equals(detail.getBusinessType()) || "AIA".equals(detail.getBusinessType())) {
 						finAccBills.setBusinessTypeCode("KYZD");
 						finAccBills.setBillNoFormat("KYZD");
+					}else {
+						finAccBills.setBusinessTypeCode("ZDZX");
+						finAccBills.setBillNoFormat("ZDZX");
 					}
 					finAccBills.setAccountType("");
 					finAccBills.setCorpArgreementNo(bills.getCorpArgreementNo());
@@ -1231,7 +1278,9 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, L
 				}
 				String status = sysClient.getParamServiceNew("automatic.generate.voucher");
 				if ("1".equals(status)) {
-					generateVoucher(auditProecess.getCheckType(), bills.getId());
+					if (!"EXPA,TRUCKA,MFAA,MFSA".contains(bills.getBusinessType())){
+						generateVoucher(auditProecess.getCheckType(), bills.getId());
+					}
 				}
 				if ("海运出口AMEND".equals(auditProecess.getProcessType())) {
 					sendMessage.setMessageBody("您的海运出口AMEND审核已通过" + ",业务单号:" + proecessTemp.getBillNo() + ",驳回原因:" + auditProecess.getAuditMsg());
@@ -1241,6 +1290,14 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, L
 					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()) {
@@ -1268,6 +1325,14 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, L
 					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()) {