edi

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

@@ -464,7 +464,7 @@ public class Regular_INTTRA {
 				msg += "ETD,";
 			}
 		} else {
-			Map<String, String> mapString = RegularUtils.regularEn(ediData.getVoyageNo(),true);
+			Map<String, String> mapString = RegularUtils.regularEn(ediData.getEtd(),true);
 			if ("200".equals(mapString.get("code"))) {
 				ediData.setEtd(mapString.get("susscess"));
 			} else {

blade-service/blade-los/src/main/java/org/springblade/los/edi/dto/InttraSoDto.java

@@ -747,7 +747,7 @@ public class InttraSoDto {
 		if(ObjectUtils.isNull(this.ediTypes)){
 			return false;
 		}else {
-			return ("HYCK".equals(this.ediTypes.getType()) && "INTTRA-SO".equals(ediTypes.getCode()));
+			return ("HYCK".equals(this.ediTypes.getType()) && ediTypes.getCode().startsWith("INTTRA-SO"));
 		}
 	}
 
@@ -755,7 +755,7 @@ public class InttraSoDto {
 		if(ObjectUtils.isNull(this.ediTypes)){
 			return false;
 		}else {
-			return ("HYCK".equals(this.ediTypes.getType()) && "INTTRA-SI".equals(ediTypes.getCode()));
+			return ("HYCK".equals(this.ediTypes.getType()) && ediTypes.getCode().startsWith("INTTRA-SI"));
 		}
 	}
 	public Boolean ediTypeIsHYCK_APL_SO (){

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

@@ -328,7 +328,7 @@ public class EDISenderServiceImpl implements IEDISenderService {
 		try {
 //			String localFolder = genEdiLocalFolder(inttraSoDto, ediParamCarrier);
 			String localFolder = "/home/minio/file/" + AuthUtil.getTenantId() + "-bladex/upload";
-//			String localFolder = "D:/home/minio/file/" + AuthUtil.getTenantId() + "-bladex/upload";
+//			localFolder = "D:/home/minio/file/" + AuthUtil.getTenantId() + "-bladex/upload";
 			String localFileName = genEdiLocalFileName(inttraSoDto, ediParamCarrier);
 			File file = new File(localFolder, localFileName);
 			file.createNewFile();
@@ -413,7 +413,8 @@ public class EDISenderServiceImpl implements IEDISenderService {
 			if ("HLCU".equals(carrierCode)) {
 				// HLCU 不传订舱号
 			} else {
-				writer.write("RFF+BN:" + RegularUtils.forceEmpty(inttraSoDto.getBookingNo()) + "'");
+				String bn = RegularUtils.forceEmpty(inttraSoDto.getBookingNo());
+				writer.write("RFF+BN:" + (!bn.isEmpty()?bn:RegularUtils.forceEmpty(inttraSoDto.getMblNo())) + "'");
 				writer.newLine();
 				count += 1;
 			}
@@ -498,7 +499,7 @@ public class EDISenderServiceImpl implements IEDISenderService {
 			writer.newLine();
 			count += 1;
 			// wfg IUCA 的处理
-			writer.write("NAD+CA+" + carrierCode + ":160:86++" + inttraSoDto.getCarrierName() + "'");
+			writer.write("NAD+CA+" + carrierCode + ":160:86++" + inttraSoDto.getCarrierName().substring(0, 35) + "'");
 			writer.newLine();
 			count += 1;
 			writer.write("NAD+HI+" + inttraSoDto.getSenderCode() + ":160:86++" + inttraSoDto.getSenderCode() + "'");