EDI 及 报表

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

@@ -175,7 +175,7 @@ public class Regular_ONE {
 		}
 		//交货地代码
 		if (ObjectUtils.isNull(ediData.getPlaceDeliveryCode())) {
-			msg += "交货地代码,";
+			// msg += "交货地代码,";
 		} else {
 			Map<String, String> mapString = RegularUtils.regularEn(ediData.getPlaceDeliveryCode(),true);
 			if ("200".equals(mapString.get("code"))) {
@@ -186,7 +186,7 @@ public class Regular_ONE {
 		}
 		//交货地
 		if (ObjectUtils.isNull(ediData.getPlaceDeliveryName())) {
-			msg += "交货地,";
+			// msg += "交货地,";
 		} else {
 			Map<String, String> mapString = RegularUtils.regularEn(ediData.getPlaceDeliveryName(),true);
 			if ("200".equals(mapString.get("code"))) {
@@ -200,8 +200,8 @@ public class Regular_ONE {
 			}
 		}
 		//目的地代码
-		/*if (ObjectUtils.isNull(ediData.getPlaceDestinationCode())) {
-			msg += "目的地代码,";
+		if (ObjectUtils.isNull(ediData.getPlaceDestinationCode())) {
+			// msg += "目的地代码,";
 		} else {
 			Map<String, String> mapString = RegularUtils.regularEn(ediData.getPlaceDestinationCode(),true);
 			if ("200".equals(mapString.get("code"))) {
@@ -209,10 +209,10 @@ public class Regular_ONE {
 			} else {
 				character += "目的地代码,";
 			}
-		}*/
+		}
 		//目的地
-		/*if (ObjectUtils.isNull(ediData.getPlaceDestinationName())) {
-			msg += "目的地,";
+		if (ObjectUtils.isNull(ediData.getPlaceDestinationName())) {
+			// msg += "目的地,";
 		} else {
 			Map<String, String> mapString = RegularUtils.regularEn(ediData.getPlaceDestinationName(),true);
 			if ("200".equals(mapString.get("code"))) {
@@ -224,7 +224,7 @@ public class Regular_ONE {
 			} else {
 				character += "目的地,";
 			}
-		}*/
+		}
 
 		String text = "";
 		if (ObjectUtils.isNotNull(ediData.getBookingRemarks())) {

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

@@ -44,14 +44,8 @@ import org.springblade.los.business.amends.service.IAmendsService;
 import org.springblade.los.business.customsDeclaration.entity.CustomsDeclaration;
 import org.springblade.los.business.customsDeclaration.service.ICustomsDeclarationService;
 import org.springblade.los.business.sea.dto.ContainersReports;
-import org.springblade.los.business.sea.entity.Bills;
-import org.springblade.los.business.sea.entity.Containers;
-import org.springblade.los.business.sea.entity.PreContainers;
-import org.springblade.los.business.sea.entity.SeaBillsDetail;
-import org.springblade.los.business.sea.service.IBillsService;
-import org.springblade.los.business.sea.service.IContainersService;
-import org.springblade.los.business.sea.service.IPreContainersService;
-import org.springblade.los.business.sea.service.ISeaBillsDetailService;
+import org.springblade.los.business.sea.entity.*;
+import org.springblade.los.business.sea.service.*;
 import org.springblade.los.finance.agreement.entity.AgreementPrice;
 import org.springblade.los.finance.agreement.entity.AgreementPriceItems;
 import org.springblade.los.finance.agreement.service.IAgreementPriceItemsService;
@@ -139,6 +133,8 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 
 	private final ISeaBillsDetailService seaBillsDetailService;
 
+	private final IHmmEdiService hmmEdiService;
+
 
 	@Override
 	public IPage<ReportsVO> selectReportsPage(IPage<ReportsVO> page, ReportsVO reports) {
@@ -6071,6 +6067,10 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					bills.setMnotify2Details(seaBillsDetail.getMnotify2Details());
 					bills.setMforwarderDetails(seaBillsDetail.getMforwarderDetails());
 				}
+				HmmEdi hmmEdi = hmmEdiService.getOne(new LambdaQueryWrapper<HmmEdi>()
+					.eq(HmmEdi::getTenantId, AuthUtil.getTenantId())
+					.eq(HmmEdi::getPid, bills.getId()));
+				bills.setHmmEdi(hmmEdi != null ? hmmEdi : new HmmEdi());
 				// 提取 USD 汇率
 				if (bCurrency != null) {
 					bills.setRate(bCurrency.getExrate());
@@ -7779,6 +7779,12 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 				}
 //				bills.setFM(MagicValues.FM);
 				bills.setVesselCnName(bills.getVesselEnName() + "/" + bills.getVoyageNo());
+
+				HmmEdi hmmEdi = hmmEdiService.getOne(new LambdaQueryWrapper<HmmEdi>()
+					.eq(HmmEdi::getTenantId, AuthUtil.getTenantId())
+					.eq(HmmEdi::getPid, bills.getId()));
+				bills.setHmmEdi(hmmEdi != null ? hmmEdi : new HmmEdi());
+
 				List<FeeCenter> feeCenterList;
 				List<Long> ids = new ArrayList<>();
 				if (MagicValues.MM.equals(bills.getBillType())) {

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

@@ -94,7 +94,7 @@ public class ContainersServiceImpl extends ServiceImpl<ContainersMapper, Contain
 
 		String sealNo = ObjectUtils.isNotNull(containers.getSealNo()) ? containers.getSealNo().toUpperCase() : "";
 		// 普柜可以设定为，铅封不能重复，但框架 FR  FH这一类的，HMM要求录入NIL,MSK要求录入000000
-		Boolean isNilSealNo = "NIL".equals(sealNo) || "000000".equals(sealNo);
+		Boolean isNilSealNo = "".equals(sealNo) || "NIL".equals(sealNo) || "000000".equals(sealNo);
 
 		List<Containers> sealNoCount = baseMapper.selectList(new LambdaQueryWrapper<Containers>()
 			.eq(Containers::getTenantId, AuthUtil.getTenantId())
@@ -502,7 +502,7 @@ public class ContainersServiceImpl extends ServiceImpl<ContainersMapper, Contain
 		for (Containers containers : list) {
 			String sealNo = ObjectUtils.isNotNull(containers.getSealNo()) ? containers.getSealNo().toUpperCase() : "";
 			// 普柜可以设定为，铅封不能重复，但框架 FR  FH这一类的，HMM要求录入NIL,MSK要求录入000000
-			Boolean isNilSealNo = "NIL".equals(sealNo) || "000000".equals(sealNo);
+			Boolean isNilSealNo = "".equals(sealNo) || "NIL".equals(sealNo) || "000000".equals(sealNo);
 
 			List<Containers> sealNoCount = baseMapper.selectList(new LambdaQueryWrapper<Containers>()
 				.eq(Containers::getTenantId, AuthUtil.getTenantId())