PIL EDI

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

@@ -79,7 +79,7 @@ public class Regular_APL {
 				character += "装货港,";
 			}
 		}
-		//收货地代码
+/*		//收货地代码
 		if (ObjectUtils.isNull(ediData.getPlaceReceiptCode())) {
 			msg += "收货地代码,";
 		} else {
@@ -104,7 +104,7 @@ public class Regular_APL {
 			} else {
 				character += "收货地,";
 			}
-		}
+		}*/
 		//卸货港代码
 		if (ObjectUtils.isNull(ediData.getPodCode())) {
 			msg += "卸货港代码,";
@@ -157,7 +157,7 @@ public class Regular_APL {
 				character += "交货地,";
 			}
 		}
-		//目的地代码
+/*		//目的地代码
 		if (ObjectUtils.isNull(ediData.getPlaceDestinationCode())) {
 			msg += "目的地代码,";
 		} else {
@@ -182,7 +182,7 @@ public class Regular_APL {
 			} else {
 				character += "目的地,";
 			}
-		}
+		}*/
 
 		String text = "";
 		if (ObjectUtils.isNotNull(ediData.getBookingRemarks())) {

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

@@ -121,18 +121,18 @@ public class Regular_PIL {
 		}
 
 		//收货地代码
-		if (ObjectUtils.isNull(ediData.getPlaceReceiptCode())) {
-			msg += "收货地代码,";
-		}
-		//收货地
-		if (ObjectUtils.isNull(ediData.getPlaceReceiptName())) {
-			msg += "收货地,";
-		} else {
-			Map<String, String> mapString = RegularUtils.regularEn(ediData.getPlaceReceiptName(),false);
-			if (!"200".equals(mapString.get("code"))) {
-				character += "收货地,";
-			}
-		}
+//		if (ObjectUtils.isNull(ediData.getPlaceReceiptCode())) {
+//			msg += "收货地代码,";
+//		}
+//		//收货地
+//		if (ObjectUtils.isNull(ediData.getPlaceReceiptName())) {
+//			msg += "收货地,";
+//		} else {
+//			Map<String, String> mapString = RegularUtils.regularEn(ediData.getPlaceReceiptName(),false);
+//			if (!"200".equals(mapString.get("code"))) {
+//				character += "收货地,";
+//			}
+//		}
 		//交货地代码
 		if (ObjectUtils.isNull(ediData.getPlaceDeliveryCode())) {
 			// msg += "交货地代码,";
@@ -147,18 +147,18 @@ public class Regular_PIL {
 			}
 		}
 		//目的地代码
-		if (ObjectUtils.isNull(ediData.getPlaceDestinationCode())) {
-			msg += "目的地代码,";
-		}
-		//目的地
-		if (ObjectUtils.isNull(ediData.getPlaceDestinationName())) {
-			msg += "目的地,";
-		} else {
-			Map<String, String> mapString = RegularUtils.regularEn(ediData.getPlaceDestinationName(),false);
-			if (!"200".equals(mapString.get("code"))) {
-				character += "目的地,";
-			}
-		}
+//		if (ObjectUtils.isNull(ediData.getPlaceDestinationCode())) {
+//			msg += "目的地代码,";
+//		}
+//		//目的地
+//		if (ObjectUtils.isNull(ediData.getPlaceDestinationName())) {
+//			msg += "目的地,";
+//		} else {
+//			Map<String, String> mapString = RegularUtils.regularEn(ediData.getPlaceDestinationName(),false);
+//			if (!"200".equals(mapString.get("code"))) {
+//				character += "目的地,";
+//			}
+//		}
 
 		if (ObjectUtils.isNull(ediData.getHshipperCntyCode())) {
 			if(ediData.ediTypeIsHYCK_PIL_Booking() || ediData.ediTypeIsHYCK_PIL_BL() || ediData.ediTypeIsHYCK_PIL_SI()) {

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

@@ -4185,7 +4185,7 @@ public class EDISenderServiceImpl implements IEDISenderService {
 							count += 1;
 
 							// 冻柜信息，只录冻柜及危险品
-							js = RegularUtils.copySubstring(mapLoaded.get("cntrTypeCode").toString(), 2, 2);
+							js = RegularUtils.copySubstring(mapLoaded.get("sizeType").toString(), 2, 2);
 							if (("RE".equals(js) || "RF".equals(js) || "RH".equals(js))) {
 								// 冻柜
 								line = "54   " + RegularUtils.paddingLeft("" + cargoline, '0', 3);

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

@@ -785,15 +785,15 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 			}*/
 
 			// 默认发送方
-			String defaultSenderId = "JMSLOGQDSO";
+			String defaultSenderId = "WFLLOGQDSO";
 			inttraSoDto.setSenderId(readEdiParamStringValue(ediParamCarrier, "senderId", defaultSenderId));
 
-			String defaultSenderCode = "JMSLOGQINGDAO";
+			String defaultSenderCode = "WFLLOGQINGDAO";
 			inttraSoDto.setSenderCode(readEdiParamStringValue(ediParamCarrier, "senderCode", defaultSenderCode));
-			inttraSoDto.setSenderName(readEdiParamStringValue(ediParamCarrier, "senderName", "JMS"));
+			inttraSoDto.setSenderName(readEdiParamStringValue(ediParamCarrier, "senderName", "WFL"));
 			inttraSoDto.setSenderContacts(readEdiParamStringValue(ediParamCarrier, "senderContacts", "Yuki Cai"));
 			inttraSoDto.setSenderTel(readEdiParamStringValue(ediParamCarrier, "senderTel", ""));
-			inttraSoDto.setSenderEmail(readEdiParamStringValue(ediParamCarrier, "senderEmail", "cma-seataocn@jms-logistics.com"));
+			inttraSoDto.setSenderEmail(readEdiParamStringValue(ediParamCarrier, "senderEmail", "cma-seataocn@WFL-logistics.com"));
 
 			String defaultForwardCode = "JET MARINE";
 			inttraSoDto.setForwarderCode(readEdiParamStringValue(ediParamCarrier, "forwarderCode", defaultForwardCode));