Merge remote-tracking branch 'origin/dev' into dev

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

@@ -29,6 +29,8 @@ import org.springblade.los.edi.dto.*;
 import org.springblade.los.edi.service.IEDISenderService;
 import org.springblade.los.Util.RegularUtils;
 import org.springblade.los.Util.Regular_ONE;
+import org.springblade.los.basic.lines.entity.BLines;
+import org.springblade.los.basic.lines.service.IBLinesService;
 
 /**
  * @author :jixinyuan
@@ -38,6 +40,7 @@ import org.springblade.los.Util.Regular_ONE;
 @AllArgsConstructor
 public class EDISenderServiceImpl implements IEDISenderService {
 	private final IBPackagesService bPackagesService;
+	private final IBLinesService bLinesService;
 
 	public static boolean createDir(String folder) {
 		if (!folder.endsWith(File.separator)) {
@@ -2624,7 +2627,15 @@ public class EDISenderServiceImpl implements IEDISenderService {
 				// wfg
 				writer.write("11:" + oneSoDto.getVesselCode() + ":" + oneSoDto.getVesselName() + ":" + oneSoDto.getVoyageNo() + "::::");
 				// 亿通 航线代码 lineNo
-				writer.write(oneSoDto.getEtd() + ":lineNo:lineNo:::'");
+				String lineNo = "";
+				if(ObjectUtils.isNotNull(oneSoDto.getLineId())) {
+					BLines bLines = bLinesService.getOne(new LambdaQueryWrapper<BLines>()
+						.eq(BLines::getId, oneSoDto.getLineId()));
+					if (bLines != null) {
+						lineNo = RegularUtils.getEdiCode(carrierCode, bLines.getExtendedData());
+					}
+				}
+				writer.write(oneSoDto.getEtd() + ":" + lineNo + ":" + lineNo + ":::'");
 				writer.newLine();
 				count++;
 

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

@@ -38,6 +38,8 @@ import org.springblade.los.basic.ports.entity.BPorts;
 import org.springblade.los.basic.ports.service.IBPortsService;
 import org.springblade.los.basic.vessels.entity.BVessels;
 import org.springblade.los.basic.vessels.service.IBVesselsService;
+import org.springblade.los.basic.lines.entity.BLines;
+import org.springblade.los.basic.lines.service.IBLinesService;
 import org.springblade.los.business.files.entity.FilesCenter;
 import org.springblade.los.business.files.service.IFilesCenterService;
 import org.springblade.los.business.sea.entity.Bills;
@@ -107,6 +109,7 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 
 	private final IContainersCommodityService containersCommodityService;
 
+	private final IBLinesService bLinesService;
 
 	@Override
 	public IPage<EdiTypesVO> selectEdiTypesPage(IPage<EdiTypesVO> page, EdiTypesVO ediTypes) {