2024年3月8日11:42:21

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

@@ -197,6 +197,7 @@ public class RegularUtils {
 		if (ObjectUtils.isNull(inttraSoDto.getTransportTermCode())) {
 			msg += "运输条款代码,";
 		} else {
+			inttraSoDto.setTransportTermName(inttraSoDto.getTransportTermCode());
 			if ("CY to DOOR".equals(inttraSoDto.getTransportTermCode())){
 				inttraSoDto.setTransportTermCode("29");
 			}else if ("DOOR to DOOR".equals(inttraSoDto.getTransportTermCode())){
@@ -1059,19 +1060,19 @@ public class RegularUtils {
 				textLength += "HS 编码,";
 			}
 		}
-		//品名
+		//货描
 		if (ObjectUtils.isNull(inttraSoDto.getProductName())) {
-			msg += "品名,";
+			msg += "货描,";
 		} else {
 			Map<String, String> mapString = regularEn(inttraSoDto.getProductName());
 			if ("200".equals(mapString.get("code"))) {
 				if (regularLength(mapString.get("susscess"), 512)) {
-					textLength += "品名,";
+					textLength += "货描,";
 				} else {
 					inttraSoDto.setProductName(mapString.get("susscess"));
 				}
 			} else {
-				character += "品名,";
+				character += "货描,";
 			}
 		}
 		//重量
@@ -2093,19 +2094,19 @@ public class RegularUtils {
 				textLength += "HS 编码,";
 			}
 		}
-		//品名
+		//货描
 		if (ObjectUtils.isNull(inttraSoDto.getProductName())) {
-			msg += "品名,";
+			msg += "货描,";
 		} else {
 			Map<String, String> mapString = regularEn(inttraSoDto.getProductName());
 			if ("200".equals(mapString.get("code"))) {
 				if (regularLength(mapString.get("susscess"), 512)) {
-					textLength += "品名,";
+					textLength += "货描,";
 				} else {
 					inttraSoDto.setProductName(mapString.get("susscess"));
 				}
 			} else {
-				character += "品名,";
+				character += "货描,";
 			}
 		}
 		//重量

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

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

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

@@ -370,8 +370,8 @@ public class EDISenderServiceImpl implements IEDISenderService {
 				writer.newLine();
 				count += 1;
 			}
-			if (ObjectUtils.isNotNull(inttraSoDto.getTransportTermCode())){
-				if ("DOOR".equals(inttraSoDto.getTransportTermCode().substring(0, 4))) {
+			if (ObjectUtils.isNotNull(inttraSoDto.getTransportTermName())){
+				if ("DOOR".equals(inttraSoDto.getTransportTermName().substring(0, 4))) {
 					/* =================0580=================  */
 					if (ObjectUtils.isNotNull(inttraSoDto.getInttraDoorToName())) {
 						writer.write("NAD+SF+++" + inttraSoDto.getInttraDoorToName());
@@ -436,7 +436,7 @@ public class EDISenderServiceImpl implements IEDISenderService {
 						writer.newLine();
 						count += 1;
 					}
-				} else if ("DOOR".equals(inttraSoDto.getTransportTermCode().substring(inttraSoDto.getTransportTermCode().length() - 4))) {
+				} else if ("DOOR".equals(inttraSoDto.getTransportTermName().substring(inttraSoDto.getTransportTermName().length() - 4))) {
 					/* =================0580=================  */
 					if (ObjectUtils.isNotNull(inttraSoDto.getInttraToDoorName())) {
 						writer.write("NAD+ST+++" + inttraSoDto.getInttraToDoorName());

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

@@ -259,9 +259,9 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 						inttraSoDto.setPlaceDeliveryName(bPorts.getEnName());
 					}
 				}
-				inttraSoDto.setHsHipperOne(details.getHshipperEnName());
-				inttraSoDto.setHConsigneeOne(details.getHconsigneeEnName());
-				inttraSoDto.setHNotifyOne(details.getHnotifyEnName());
+				inttraSoDto.setHsHipperOne(details.getHshipperDetails());
+				inttraSoDto.setHConsigneeOne(details.getHconsigneeDetails());
+				inttraSoDto.setHNotifyOne(details.getHnotifyDetails());
 				inttraSoDto.setCarrierName(details.getCarrierEnName());
 				if (ObjectUtils.isNotNull(details.getCarrierId())) {
 					BCorps bCorps = bCorpsService.getById(details.getCarrierId());
@@ -287,9 +287,9 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 				inttraSoDto.setSenderContacts("Emma chen");
 				inttraSoDto.setSenderTel("JMS-tel");
 				inttraSoDto.setSenderEmail("lag-seataocn@jms-logistics.com");
-				if ("SEA WAY BILL".equals(details.getIssueType())){
+				if ("SEA WAY BILL".equals(details.getIssueType())) {
 					inttraSoDto.setBillLadingType("710");
-				}else{
+				} else {
 					inttraSoDto.setBillLadingType("706");
 				}
 				if (details.getStlCrStatus() >= 3 || details.getStlDrStatus() >= 3) {
@@ -301,7 +301,7 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 				inttraSoDto.setPackagesNumbers(details.getQuantity());
 				inttraSoDto.setPackagesCode(details.getPackingUnit());
 				inttraSoDto.setPackagesDescribe("");//包装描述
-				inttraSoDto.setProductName(details.getCommodityEnName());
+				inttraSoDto.setProductName(details.getCommodityDescr());
 				inttraSoDto.setGrossWeight(details.getGrossWeight());
 				inttraSoDto.setMeasurement(details.getMeasurement());
 				inttraSoDto.setMarks(details.getMarks());
@@ -310,7 +310,7 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 					inttraSoDto.setDgImdgCode(details.getDgImdgCode());
 					inttraSoDto.setPageNumber(new BigDecimal("007"));
 					inttraSoDto.setDgUnCode(details.getDgUnCode());
-					inttraSoDto.setDgFlashPoint(details.getDgFlashPoint()+"");
+					inttraSoDto.setDgFlashPoint(details.getDgFlashPoint() + "");
 					inttraSoDto.setDgFlashPointUnit(details.getDgFlashPointUnit());
 					inttraSoDto.setPackingGroup("");//包装组别
 					inttraSoDto.setEmergencyMeasureNo("");//应急措施号
@@ -497,9 +497,9 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 						inttraSoDto.setPlaceDeliveryName(bPorts.getEnName());
 					}
 				}
-				inttraSoDto.setHsHipperOne(details.getHshipperEnName());
-				inttraSoDto.setHConsigneeOne(details.getHconsigneeEnName());
-				inttraSoDto.setHNotifyOne(details.getHnotifyEnName());
+				inttraSoDto.setHsHipperOne(details.getHshipperDetails());
+				inttraSoDto.setHConsigneeOne(details.getHconsigneeDetails());
+				inttraSoDto.setHNotifyOne(details.getHnotifyDetails());
 				inttraSoDto.setCarrierName(details.getCarrierEnName());
 				if (ObjectUtils.isNotNull(details.getCarrierId())) {
 					BCorps bCorps = bCorpsService.getById(details.getCarrierId());
@@ -529,8 +529,7 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 					}
 				}
 				inttraSoDto.setPackagesDescribe("");//包装描述
-				inttraSoDto.setHsCode(new BigDecimal("001"));
-				inttraSoDto.setProductName(details.getCommodityCnName());
+				inttraSoDto.setProductName(details.getCommodityDescr());
 				inttraSoDto.setGrossWeight(details.getGrossWeight());
 				inttraSoDto.setMeasurement(details.getMeasurement());
 				inttraSoDto.setMarks(details.getMarks());
@@ -583,16 +582,19 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 					inttraSoDto.setBoxGoodWeight(boxGoodWeight);
 					inttraSoDto.setBoxGoodMeasurement(boxGoodMeasurement);
 				}*/
-				inttraSoDto.setDgImdgCode(details.getDgImdgCode());
-				inttraSoDto.setPageNumber(new BigDecimal("007"));
-				inttraSoDto.setDgUnCode(1);
-				inttraSoDto.setDgFlashPoint(1);
-				inttraSoDto.setDgFlashPointUnit(details.getDgFlashPointUnit());
-				inttraSoDto.setPackingGroup("");//包装组别
-				inttraSoDto.setEmergencyMeasureNo("");//应急措施号
-				inttraSoDto.setDgRemarks(details.getDgRemarks());
-				inttraSoDto.setDgContacts(details.getDgContacts());
-				inttraSoDto.setDgTel(details.getDgTel());
+				if ("danger".equals(details.getCargoType())) {
+					inttraSoDto.setHsCode(new BigDecimal(details.getHscode()));
+					inttraSoDto.setDgImdgCode(details.getDgImdgCode());
+					inttraSoDto.setPageNumber(new BigDecimal("007"));
+					inttraSoDto.setDgUnCode(1);
+					inttraSoDto.setDgFlashPoint(1);
+					inttraSoDto.setDgFlashPointUnit(details.getDgFlashPointUnit());
+					inttraSoDto.setPackingGroup("");//包装组别
+					inttraSoDto.setEmergencyMeasureNo("");//应急措施号
+					inttraSoDto.setDgRemarks(details.getDgRemarks());
+					inttraSoDto.setDgContacts(details.getDgContacts());
+					inttraSoDto.setDgTel(details.getDgTel());
+				}
 				/*inttraSoDto.setBoxCode(details.getQuantityCntrDescr());
 				inttraSoDto.setTemperature(1);
 				inttraSoDto.setTemperatureUnit("温度单位");*/
@@ -705,7 +707,6 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 					}
 				}
 				inttraSoDto.setPackagesDescribe("");//包装描述
-				inttraSoDto.setHsCode(new BigDecimal("001"));
 				inttraSoDto.setMarks(details.getMarks());
 				List<PreContainers> preContainersList = preContainersService.list(new LambdaQueryWrapper<PreContainers>()
 					.eq(PreContainers::getPid, details.getId())
@@ -747,16 +748,19 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 				} else {
 					inttraSoDto.setBoxGoodNumber(boxGoodNumber);
 				}*/
-				inttraSoDto.setDgImdgCode(details.getDgImdgCode());
-				inttraSoDto.setPageNumber(new BigDecimal("007"));
-				inttraSoDto.setDgUnCode(1);
-				inttraSoDto.setDgFlashPoint(new BigDecimal("1"));
-				inttraSoDto.setDgFlashPointUnit(details.getDgFlashPointUnit());
-				inttraSoDto.setPackingGroup("");//包装组别
-				inttraSoDto.setEmergencyMeasureNo("");//应急措施号
-				inttraSoDto.setDgRemarks(details.getDgRemarks());
-				inttraSoDto.setDgContacts(details.getDgContacts());
-				inttraSoDto.setDgTel(details.getDgTel());
+				if ("danger".equals(details.getCargoType())) {
+					inttraSoDto.setHsCode(new BigDecimal(details.getHscode()));
+					inttraSoDto.setDgImdgCode(details.getDgImdgCode());
+					inttraSoDto.setPageNumber(new BigDecimal("007"));
+					inttraSoDto.setDgUnCode(1);
+					inttraSoDto.setDgFlashPoint(new BigDecimal("1"));
+					inttraSoDto.setDgFlashPointUnit(details.getDgFlashPointUnit());
+					inttraSoDto.setPackingGroup("");//包装组别
+					inttraSoDto.setEmergencyMeasureNo("");//应急措施号
+					inttraSoDto.setDgRemarks(details.getDgRemarks());
+					inttraSoDto.setDgContacts(details.getDgContacts());
+					inttraSoDto.setDgTel(details.getDgTel());
+				}
 				/*inttraSoDto.setBoxCode(details.getQuantityCntrDescr());
 				inttraSoDto.setTemperature(1);
 				inttraSoDto.setTemperatureUnit("温度单位");*/