EDI 及 HMM

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

@@ -283,6 +283,46 @@ public class HmmEdi implements Serializable {
 	 */
 	@ApiModelProperty(value = "化工品标识")
 	private String chemicalIdentification;
+	/**
+	 * 主表用用户自定义1
+	 */
+	@ApiModelProperty(value = "主表用用户自定义1")
+	private String userDefine1;
+	/**
+	 * 主表用用户自定义2
+	 */
+	@ApiModelProperty(value = "主表用用户自定义2")
+	private String userDefine2;
+	/**
+	 * 主表用用户自定义3
+	 */
+	@ApiModelProperty(value = "主表用用户自定义3")
+	private String userDefine3;
+	/**
+	 * 主表用用户自定义4
+	 */
+	@ApiModelProperty(value = "主表用用户自定义4")
+	private String userDefine4;
+	/**
+	 * 主表用用户自定义5
+	 */
+	@ApiModelProperty(value = "主表用用户自定义5")
+	private String userDefine5;
+	/**
+	 * 主表用用户自定义6
+	 */
+	@ApiModelProperty(value = "主表用用户自定义6")
+	private String userDefine6;
+	/**
+	 * 主表用用户自定义7
+	 */
+	@ApiModelProperty(value = "主表用用户自定义7")
+	private String userDefine7;
+	/**
+	 * 主表用用户自定义8
+	 */
+	@ApiModelProperty(value = "主表用用户自定义8")
+	private String userDefine8;
 
 
 }

blade-service-api/blade-los-api/src/main/java/org/springblade/los/edi/entity/EdiTypes.java

@@ -166,6 +166,24 @@ public class EdiTypes implements Serializable {
 	private String type;
 
 	/**
+	 * EDI业务类型
+	 */
+	@ApiModelProperty(value = "组别, SO, SI")
+	private String groupName;
+
+	/**
+	 * EDI业务类型
+	 */
+	@ApiModelProperty(value = "子组别")
+	private String subGroupName;
+
+	/**
+	 * EDI业务类型
+	 */
+	@ApiModelProperty(value = "船公司代码(SCAC NO)")
+	private String carrierNo;
+
+	/**
 	 * 业务id
 	 */
 	@TableField(exist = false)

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

@@ -279,7 +279,9 @@ public class Regular_INTTRA {
 		}
 		//客户订舱约号
 		if (ObjectUtils.isNull(ediData.getCorpArgreementNo())) {
-			msg += "客户约号,";
+			if("SO".equals(type)) {
+				msg += "客户约号,";
+			}
 		}else{
 			Map<String, String> mapString = RegularUtils.regularEn(ediData.getCorpArgreementNo(),true);
 			if ("200".equals(mapString.get("code"))) {
@@ -551,7 +553,8 @@ public class Regular_INTTRA {
 		}
 		//交货地代码
 		if (ObjectUtils.isNull(ediData.getPlaceDeliveryCode())) {
-			msg += "交货地代码,";
+			// 交货地可以为空
+			// msg += "交货地代码,";
 		} else {
 			Map<String, String> mapString = RegularUtils.regularEn(ediData.getPlaceDeliveryCode(),true);
 			if ("200".equals(mapString.get("code"))) {
@@ -562,7 +565,8 @@ public class Regular_INTTRA {
 		}
 		//交货地
 		if (ObjectUtils.isNull(ediData.getPlaceDeliveryName())) {
-			msg += "交货地,";
+			// 交货地可以为空
+			// msg += "交货地,";
 		} else {
 			Map<String, String> mapString = RegularUtils.regularEn(ediData.getPlaceDeliveryName(),true);
 			if ("200".equals(mapString.get("code"))) {

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/mapper/HmmEdiMapper.xml

@@ -53,6 +53,14 @@
         <result column="notifier_postal_code" property="notifierPostalCode"/>
         <result column="notifier_tel" property="notifierTel"/>
         <result column="chemical_identification" property="chemicalIdentification"/>
+        <result column="user_define1" property="userDefine1"/>
+        <result column="user_define2" property="userDefine2"/>
+        <result column="user_define3" property="userDefine3"/>
+        <result column="user_define4" property="userDefine4"/>
+        <result column="user_define5" property="userDefine5"/>
+        <result column="user_define6" property="userDefine6"/>
+        <result column="user_define7" property="userDefine7"/>
+        <result column="user_define8" property="userDefine8"/>
     </resultMap>
 
 

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

@@ -140,7 +140,7 @@ public class InttraSoDto {
 
 	/*   FTX+AAI+++   */
 	/**
-	 * 备注
+	 * si 备注
 	 */
 	private String siRemarks;
 

blade-service/blade-los/src/main/java/org/springblade/los/edi/mapper/EdiTypesMapper.xml

@@ -24,6 +24,10 @@
         <result column="version" property="version"/>
         <result column="status" property="status"/>
         <result column="remarks" property="remarks"/>
+        <result column="type" property="type"/>
+        <result column="group_name" property="groupName"/>
+        <result column="sub_group_name" property="subGroupName"/>
+        <result column="carrier_no" property="carrierNo"/>
     </resultMap>
 
 

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

@@ -154,6 +154,12 @@ public class EDISenderServiceImpl implements IEDISenderService {
 							if ("const".equals(type)) {
 								fileName += readEdiParamStringValue(jn, "value", "");
 							}
+							if ("mblno".equals(type)) {
+								fileName += (ObjectUtils.isNotNull(edi.getMblNo()) ? edi.getMblNo() : "");
+							}
+							if ("bookingno".equals(type)) {
+								fileName += (ObjectUtils.isNotNull(edi.getBookingNo()) ? edi.getBookingNo() : "");
+							}
 							if ("datetime".equals(type)) {
 								String fmt = readEdiParamStringValue(jn, "format", "");
 								if (ObjectUtils.isNotNull(fmt)) {
@@ -936,7 +942,7 @@ public class EDISenderServiceImpl implements IEDISenderService {
 
 			// 向文件写入数据
 			/* =================0005=================  */
-			writer.write("UNB+UNOC:2+" + inttraSiDto.getSenderId() + ":ZZZ+INTTRA:ZZZ+" + inttraSiDto.getMessageDate() + "+100'");
+			writer.write("UNB+UNOC:2+" + inttraSiDto.getSenderCode() + ":ZZZ+INTTRA:ZZZ+" + inttraSiDto.getMessageDate() + "+100'");
 			writer.newLine();
 			count += 1;
 			/* =================0010=================  */
@@ -944,7 +950,7 @@ public class EDISenderServiceImpl implements IEDISenderService {
 			writer.newLine();
 			count += 1;
 			/* =================0020=================  */
-			writer.write("BGM+340+" + inttraSiDto.getIdentificationCode() + "+" + inttraSiDto.getFilesFunction() + "'");
+			writer.write("BGM+340+" + inttraSiDto.getMblNo() + "+" + inttraSiDto.getFilesFunction() + "'");
 			writer.newLine();
 			count += 1;
 			/* =================0050=================  */
@@ -959,25 +965,36 @@ public class EDISenderServiceImpl implements IEDISenderService {
 			// if(Mpaymode='PP', 'FREIGHT PREPAID AT '+MPAYPLACE,
 			// // if(Mpaymode='CC', 'FREIGHT PAYABLE AT '+MPAYPLACE,
 			// // if(Mpaymode='FPA', 'FREIGHT PAYABLE AT '+MPAYPLACE+': IN CHINA ALL AS FREIGHT PREPAID, OTHERS ARE FREIGHT COLLECT TO '+InttraCarrierNo, '')))
-			String aai1 = ""; // inttraSiDto.getTransportTermName();
+			String aai1 = inttraSiDto.getTransportTermName();
 			String mPayPlace = RegularUtils.forceEmpty(inttraSiDto.getMPayPlaceName());
 			if ("PP".equals(inttraSiDto.getMPayMode())) {
-				aai1 = "FREIGHT PREPAID AT " + mPayPlace;
+				aai1 += " FREIGHT PREPAID AT " + mPayPlace;
 			} else if ("CC".equals(inttraSiDto.getMPayMode())) {
-				aai1 = "FREIGHT PAYABLE AT " + mPayPlace;
+				aai1 += " FREIGHT PAYABLE AT " + mPayPlace;
 			} else if ("FPA".equals(inttraSiDto.getMPayMode())) {
-				aai1 = "FREIGHT PAYABLE AT " + mPayPlace + ": IN CHINA ALL AS FREIGHT PREPAID, OTHERS ARE FREIGHT COLLECT TO " + carrierCode;
+				aai1 += " FREIGHT PAYABLE AT " + mPayPlace + ": IN CHINA ALL AS FREIGHT PREPAID, OTHERS ARE FREIGHT COLLECT TO " + carrierCode;
 			}
-			writer.write("FTX+AAI+++" + aai1 + "'");
+			writer.write("FTX+AAI+++" + aai1.trim() + "'");
 			writer.newLine();
 			count += 1;
 
-			List<String> bookingRemarks = RegularUtils.reformatEDIText(inttraSiDto.getBookingRemarks(), 512, true);
-			for (String line : bookingRemarks) {
-				if(!line.trim().isEmpty()) {
-					writer.write("FTX+AAI+++" + line + "'");
-					writer.newLine();
-					count += 1;
+			List<String> siRemarks = RegularUtils.reformatEDIText(inttraSiDto.getSiRemarks(), 512, true);
+			if(siRemarks.size()>0){
+				for (String line : siRemarks) {
+					if (!line.trim().isEmpty()) {
+						writer.write("FTX+AAI+++" + line + "'");
+						writer.newLine();
+						count += 1;
+					}
+				}
+			}else {
+				List<String> bookingRemarks = RegularUtils.reformatEDIText(inttraSiDto.getBookingRemarks(), 512, true);
+				for (String line : bookingRemarks) {
+					if (!line.trim().isEmpty()) {
+						writer.write("FTX+AAI+++" + line + "'");
+						writer.newLine();
+						count += 1;
+					}
 				}
 			}
 
@@ -1077,6 +1094,9 @@ public class EDISenderServiceImpl implements IEDISenderService {
 			}
 
 			/* =================0520=================  */
+			System.out.println("getTransportTermCode: " + inttraSiDto.getTransportTermCode());
+			System.out.println("getTransportTermCode: " + inttraSiDto.getPlaceDeliveryCode());
+			System.out.println("getPodCode: " + inttraSiDto.getPodCode());
 			if (Objects.equals(carrierCode, "CMDU") && !"27".equals(inttraSiDto.getTransportTermCode())) {
 				if ("28".equals(inttraSiDto.getTransportTermCode()) || "30".equals(inttraSiDto.getTransportTermCode())) {
 					if (!inttraSiDto.getPlaceDeliveryCode().equals(inttraSiDto.getPodCode())) {
@@ -1084,6 +1104,10 @@ public class EDISenderServiceImpl implements IEDISenderService {
 						writer.newLine();
 						count += 1;
 					}
+				}else{
+					writer.write("LOC+7+" + inttraSiDto.getPlaceDeliveryCode() + "::6:" + inttraSiDto.getPlaceDeliveryName() + "'");
+					writer.newLine();
+					count += 1;
 				}
 				writer.write("LOC+9+" + inttraSiDto.getPolCode() + "::6:" + inttraSiDto.getPolName() + "'");
 				writer.newLine();
@@ -1097,6 +1121,10 @@ public class EDISenderServiceImpl implements IEDISenderService {
 						writer.newLine();
 						count += 1;
 					}
+				}else{
+					writer.write("LOC+88+" + inttraSiDto.getPlaceReceiptCode() + "::6:" + inttraSiDto.getPlaceReceiptName() + "'");
+					writer.newLine();
+					count += 1;
 				}
 			} else {
 				writer.write("LOC+7+" + inttraSiDto.getPlaceDeliveryCode() + "::6:" + inttraSiDto.getPlaceDeliveryName() + "'");
@@ -1113,7 +1141,7 @@ public class EDISenderServiceImpl implements IEDISenderService {
 				count += 1;
 			}
 
-			writer.write("NAD+CA+" + inttraSiDto.getCarrierCode() + ":160:86++" + inttraSiDto.getCarrierName() + "'");
+			writer.write("NAD+CA+" + inttraSiDto.getCarrierCode() + ":160:86++" + inttraSiDto.getCarrierName().substring(0, 35) + "'");
 			writer.newLine();
 			count += 1;
 
@@ -1296,7 +1324,7 @@ public class EDISenderServiceImpl implements IEDISenderService {
 						}
 
 						/* =================1660=================  */
-						writer.write("EQD+CN++" + map1.get("cntrNo") + "+" + map1.get("sizeType") + ":::" + map1.get("cntrTypeName"));
+						writer.write("EQD+CN+" + map1.get("cntrNo") + "+" + map1.get("sizeType") + ":::" + map1.get("cntrTypeName"));
 						if (ObjectUtils.isNotNull(map1.get("isSoc"))) {
 							writer.write("+" + (map1.get("isSoc").equals(1) ? "1" : "2") + "'");
 						} else {
@@ -1384,10 +1412,10 @@ public class EDISenderServiceImpl implements IEDISenderService {
 						writer.newLine();
 						count += 1;
 						/* =================1400=================  */
-						writer.write("MEA+AAE+WT+KGM:" + map1.get("grossWeight") + "'");
+						writer.write("MEA+AAE+AAW+MTQ:" + map1.get("volume") + "'");
 						writer.newLine();
 						count += 1;
-						writer.write("MEA+AAE+AAW+MTQ:" + map1.get("volume") + "'");
+						writer.write("MEA+AAE+WT+KGM:" + map1.get("grossWeight") + "'");
 						writer.newLine();
 						count += 1;
 					}
@@ -1447,7 +1475,7 @@ public class EDISenderServiceImpl implements IEDISenderService {
 					List<Map<String, Object>> mapList = inttraSiDto.getLoadedCntrs();
 					for (Map<String, Object> map1 : mapList) {
 						/* =================1660=================  */
-						writer.write("EQD+CN++" + map1.get("cntrNo") + "+" + map1.get("sizeType") + ":::" + map1.get("cntrTypeName"));
+						writer.write("EQD+CN+" + map1.get("cntrNo") + "+" + map1.get("sizeType") + ":::" + map1.get("cntrTypeName"));
 						if (ObjectUtils.isNotNull(map1.get("isSoc"))) {
 							writer.write("+" + (map1.get("isSoc").equals(1) ? "1" : "2") + "'");
 						} else {
@@ -1456,13 +1484,13 @@ public class EDISenderServiceImpl implements IEDISenderService {
 						writer.newLine();
 						count += 1;
 						/* =================1690=================  */
-						if (ObjectUtils.isNotNull(map1.get("grossWeight"))) {
-							writer.write("MEA+AAE+WT+KGM:" + map1.get("grossWeight") + "'");
+						if (ObjectUtils.isNotNull(map1.get("volume"))) {
+							writer.write("MEA+AAE+AAW+MTQ:" + map1.get("volume") + "'");
 							writer.newLine();
 							count += 1;
 						}
-						if (ObjectUtils.isNotNull(map1.get("boxGoodMeasurement"))) {
-							writer.write("MEA+AAE+AAW+MTQ:" + map1.get("boxGoodMeasurement") + "'");
+						if (ObjectUtils.isNotNull(map1.get("grossWeight"))) {
+							writer.write("MEA+AAE+WT+KGM:" + map1.get("grossWeight") + "'");
 							writer.newLine();
 							count += 1;
 						}
@@ -1494,8 +1522,9 @@ public class EDISenderServiceImpl implements IEDISenderService {
 			}
 
 			/* =================2000=================  */
-			count = count + 2;
-			writer.write("UNT+" + count + "+" + inttraSiDto.getInformationNoEnd() + "'");
+			// count = count + 2;
+			// writer.write("UNT+" + count + "+" + inttraSiDto.getInformationNoEnd() + "'");
+			writer.write("UNT+" + count + "+80'");
 			writer.newLine();
 			/* =================2010=================  */
 			writer.write("UNZ+1+100'");

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

@@ -54,6 +54,7 @@ import org.springblade.los.edi.vo.EdiTypesVO;
 import org.springblade.system.feign.ISysClient;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.stringtemplate.v4.ST;
 
 import java.lang.reflect.Field;
 import java.math.BigDecimal;
@@ -305,7 +306,9 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 				inttraSoDto.setHPayPlaceName(bLines.getEnName());
 			}
 		}
-		inttraSoDto.setPilHBL(details.getPilHbl());
+		// 默认无
+		String pilHbl = ObjectUtils.isNotNull(details.getPilHbl())?details.getPilHbl().trim():"3";
+		inttraSoDto.setPilHBL(pilHbl.equals("1") || pilHbl.equals("2") || pilHbl.equals("3") ? pilHbl : "3");
 		inttraSoDto.setMainPinyin("");
 		inttraSoDto.setHPayMode(details.getHpaymode());
 		inttraSoDto.setMPayMode(details.getMpaymode());
@@ -495,7 +498,7 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 		inttraSoDto.setGrossWeight(details.getGrossWeight());
 		inttraSoDto.setMeasurement(details.getMeasurement());
 		inttraSoDto.setMarks(details.getMarks());
-		inttraSoDto.setHsCode(details.getHscode());
+		inttraSoDto.setHsCode(ObjectUtils.isNotNull(details.getHscode()) ? details.getHscode().trim() : "");
 		inttraSoDto.setCargoType(details.getCargoType());
 		if ("danger".equals(details.getCargoType())) {
 			inttraSoDto.setDgImdgCode(details.getDgImdgCode());
@@ -831,7 +834,9 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 			inttraSoDto.setInformationNo(inttraSoDto.getFileExchangeNumber());
 
 			String mblNo = ObjectUtils.isNotNull(details.getMblno()) ? details.getMblno() : "";
+			details.setMblno(mblNo);
 			String bookingNo = ObjectUtils.isNotNull(details.getBookingNo()) ? details.getBookingNo() : "";
+			details.setBookingNo(bookingNo);
 			if ("CMDU".equals(carrierCode)) {
 				inttraSoDto.setIdentificationCode((mblNo.isEmpty() ? bookingNo : mblNo) + "FB");
 			} else if ("HLCU".equals(carrierCode)) {