dtest

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

@@ -69,6 +69,7 @@ public class InttraSiBillDto {
 	 * 运输条款代码
 	 */
 	private String transportTermCode;
+	private String transportTermName;
 	/**
 	 * 拼箱类型
 	 */

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

@@ -58,6 +58,7 @@ public class InttraSiDto {
 	 * 运输条款代码
 	 */
 	private String transportTermCode;
+	private String transportTermName;
 	/**
 	 * 拼箱类型
 	 */

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

@@ -547,4 +547,16 @@ public class InttraSoDto {
 	 */
 	private EdiTypes ediTypes;
 
+	/**
+	 * 是否 DOOR TO 服务方式
+	 */
+	public Boolean isDoorToServiceTerm (){
+		return this.transportTermCode.equals("27") || this.transportTermCode.equals("28");
+	}
+	/**
+	 * 是否 TO DOOR 服务方式
+	 */
+	public Boolean isToDoorServiceTerm (){
+		return this.transportTermCode.equals("27") || this.transportTermCode.equals("29");
+	}
 }

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

@@ -41,13 +41,13 @@ public class EDISenderServiceImpl implements IEDISenderService {
 			file.createNewFile();
 			// 打开文件输出流进行写入操作
 			BufferedWriter writer = new BufferedWriter(new FileWriter(file));
+			// count : ：从UNH到UNT的总的行数（包括UNH和UNT行）,实际为总行数-2
 			int count = 0;
 			// 向文件写入数据
 			/* =================005=================  */
 			SimpleDateFormat sdf = new SimpleDateFormat("yyMMdd:hhmm");
 			writer.write("UNB+UNOA:2+" + inttraSoDto.getIdentifying() + ":ZZZ+INTTRA:ZZZ+" + sdf.format(date) + "+" + inttraSoDto.getFileExchangeNumber() + "'");
 			writer.newLine();
-			count += 1;
 			/* =================0010=================  */
 			writer.write("UNH+80+IFTMIN:D:99B:UN'");
 			writer.newLine();
@@ -122,7 +122,7 @@ public class EDISenderServiceImpl implements IEDISenderService {
 				count += 1;
 			}
 			/* =================0200=================  */
-			writer.write("RFF+BN:" + inttraSoDto.getBookingNo() + "'");
+			writer.write("RFF+BN:" + (ObjectUtils.isNotNull(inttraSoDto.getBookingNo()) ? inttraSoDto.getBookingNo() : "") + "'");
 			writer.newLine();
 			count += 1;
 			if (ObjectUtils.isNotNull(inttraSoDto.getBillNo())) {
@@ -684,7 +684,7 @@ public class EDISenderServiceImpl implements IEDISenderService {
 			}
 
 			/* =================2000=================  */
-			count = count + 2;
+			count += 1;
 			writer.write("UNT+" + count + "+80'");
 			writer.newLine();
 			/* =================2010=================  */
@@ -803,7 +803,7 @@ public class EDISenderServiceImpl implements IEDISenderService {
 				count += 1;
 			}
 			/* =================0200=================  */
-			writer.write("RFF+BN:" + inttraSiDto.getBookingNo() + "'");
+			writer.write("RFF+BN:" + (ObjectUtils.isNotNull(inttraSiDto.getBookingNo()) ? inttraSiDto.getBookingNo() : "") + "'");
 			writer.newLine();
 			count += 1;
 			if (ObjectUtils.isNotNull(inttraSiDto.getBillNo())) {

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

@@ -152,8 +152,8 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 			.eq(Containers::getTenantId, AuthUtil.getTenantId())
 			.eq(Containers::getIsDeleted, 0)
 			.apply("find_in_set(pid,'" + ediTypes.getBillId() + "')"));
+		Date date = new Date();
 		if ("HYCK".equals(ediTypes.getType()) && "INTTRA-SO".equals(ediTypes.getCode())) {
-			Date date = new Date();
 			for (Bills details : billsList) {
 				InttraSoDto inttraSoDto = new InttraSoDto();
 				inttraSoDto.setIdentifying("JMSLOGQDSO");
@@ -207,7 +207,7 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 						inttraSoDto.setIssuanceLand(bPorts.getEnName());
 					}
 				}
-				SimpleDateFormat sdf2 = new SimpleDateFormat("yyyymmdd");
+				SimpleDateFormat sdf2 = new SimpleDateFormat("yyyyMMdd");
 				if (ObjectUtils.isNotNull(details.getIssueDate())) {
 					inttraSoDto.setIssueDate(sdf2.format(details.getIssueDate()));
 				}
@@ -237,7 +237,7 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 					}
 				}
 				inttraSoDto.setPolName(details.getPolEnName());
-				SimpleDateFormat sdf3 = new SimpleDateFormat("yyyymmdd");
+				SimpleDateFormat sdf3 = new SimpleDateFormat("yyyyMMdd");
 				if (ObjectUtils.isNotNull(details.getEtd())) {
 					inttraSoDto.setEtd(sdf3.format(details.getEtd()));
 				}
@@ -413,7 +413,6 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 			}
 			billsService.updateBatchById(billsList);
 		} else if ("HYCK".equals(ediTypes.getType()) && "INTTRA-SI".equals(ediTypes.getCode())) {
-			Date date = new Date();
 			for (Bills details : billsList) {
 				InttraSiDto inttraSoDto = new InttraSiDto();
 				inttraSoDto.setIdentifying("JMSLOGQDSO");
@@ -462,7 +461,7 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 
 					}
 				}
-				SimpleDateFormat sdf2 = new SimpleDateFormat("yyyymmdd");
+				SimpleDateFormat sdf2 = new SimpleDateFormat("yyyyMMdd");
 				if (ObjectUtils.isNotNull(details.getIssueDate())) {
 					inttraSoDto.setIssueDate(sdf2.format(details.getIssueDate()));
 				}
@@ -669,7 +668,6 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 			}
 			billsService.updateBatchById(billsList);
 		} else if ("HYCK".equals(ediTypes.getType()) && "INTTRA-SI-bill".equals(ediTypes.getCode())) {
-			Date date = new Date();
 			for (Bills details : billsList) {
 				InttraSiBillDto inttraSoDto = new InttraSiBillDto();
 				inttraSoDto.setIdentifying("JMSLOGQDSO");
@@ -691,7 +689,7 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 				inttraSoDto.setTransportTermCode(details.getServiceTerms());
 				inttraSoDto.setLclType("2");
 				inttraSoDto.setRemarks(details.getRemarks());
-				SimpleDateFormat sdf2 = new SimpleDateFormat("yyyymmdd");
+				SimpleDateFormat sdf2 = new SimpleDateFormat("yyyyMMdd");
 				if (ObjectUtils.isNotNull(details.getIssueDate())) {
 					inttraSoDto.setIssueDate(sdf2.format(details.getIssueDate()));
 				}
@@ -836,7 +834,6 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 			}
 			billsService.updateBatchById(billsList);
 		} else if ("HYCK".equals(ediTypes.getType()) && "APL-SO".equals(ediTypes.getCode())) {
-			Date date = new Date();
 			for (Bills details : billsList) {
 				APLSoDto aplSoDto = new APLSoDto();
 				aplSoDto.setMessageType("IFTMBF");
@@ -1022,7 +1019,6 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 			}
 			billsService.updateBatchById(billsList);
 		} else if ("HYCK".equals(ediTypes.getType()) && "APL-SI".equals(ediTypes.getCode())) {
-			Date date = new Date();
 			for (Bills details : billsList) {
 				//数据处理
 			}
@@ -1032,4 +1028,21 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 		return R.data("发送成功");
 	}
 
+	private InttraSoDto buildEDI_InttraSO(EdiTypes ediTypes, List<Bills> billsList, List<Containers> containersList){
+		return null;
+
+	}
+	private InttraSiDto buildEDI_InttraSI(){
+		return null;
+
+	}
+
+	private APLSoDto buildEDI_APLSO(){
+		return null;
+
+	}
+
+	private APLSoDto buildEDI_APLSI(){
+		return null;
+	}
 }