dtest

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

@@ -31,6 +31,7 @@ public class RegularUtils {
 		String code = "200";
 		String msg = "";
 		String susscess = data;
+		Integer pc = 0;
 		Pattern pattern = Pattern.compile("[^a-zA-Z0-9\\s]|\t");
 		Matcher matcher = pattern.matcher(data);
 		while (matcher.find()) {
@@ -54,13 +55,9 @@ public class RegularUtils {
 			// 判断特殊符号是英文符号还是中文符号
 			if (unicode >= 0x0020 && unicode <= 0x007E) {
 				//English
-				if (format) {
-					if ("?".equals(character) || "'".equals(character) || "+".equals(character) || ":".equals(character)) {
-						data = data.replaceAll(character, "?" + character);
-					}
-				}
+				// 要先替换 ?
+				pc++;
 				code = "200";
-				susscess = data;
 			} else if (unicode >= 0x4E00 && unicode <= 0x9FFF) {
 				code = "500";
 				msg = "存在中文特殊字符:“" + character + "”";
@@ -73,6 +70,10 @@ public class RegularUtils {
 				msg = "存在既不是中文特殊字符又不是英文特殊字符:“" + character + "”";*/
 			}
 		}
+		if (format && "200".equals(code) && pc>0) {
+			susscess = data.replaceAll("\\?", "\\?\\?").replaceAll("\\+", "\\?\\+").replaceAll("\\:", "\\?\\:").replaceAll("\\'", "\\?\\'");
+		}
+
 		map.put("code", code);
 		map.put("msg", msg);
 		map.put("susscess", susscess);
@@ -171,6 +172,9 @@ public class RegularUtils {
 		String symbol = "";
 		if(S.equals("0")) {
 			S="";
+			while (S.length() < len) {
+				S = "0" + S;
+			}
 		}else{
 			if (S.startsWith("-")) {
 				symbol = "-";
@@ -584,7 +588,7 @@ public class RegularUtils {
 			if ("200".equals(mapString.get("code"))) {
 				// 赫伯罗特 或者 达飞
 				String CC = mapString.get("susscess");
-				if ("HLCU".equals(CC) || "CMDU".equals(CC) || "ANNU".equals(CC) || "CHNL".equals(CC)) {
+				if ("HLCU".equals(CC) || "CMDU".equals(CC) || "ANNU".equals(CC) || "CHNL".equals(CC) || "MAEU".equals(CC)) {
 					String text = "";
 					if (ObjectUtils.isNotNull(inttraSoDto.getBillNo())) {
 						text += inttraSoDto.getBillNo() + ";";
@@ -641,7 +645,7 @@ public class RegularUtils {
 						}
 					}
 					inttraSoDto.setBookingRemarks(text);
-				} else if ("MAEU".equals(CC) || "MCCQ".equals(CC) ) {
+				} else if ("MCCQ".equals(CC) ) {
 					// 马士基
 					String text = "";
 					if (ObjectUtils.isNotNull(inttraSoDto.getPaymentType())) {
@@ -661,7 +665,7 @@ public class RegularUtils {
 						text += inttraSoDto.getTransportTermName() + ";";
 					}
 					if (ObjectUtils.isNotNull(inttraSoDto.getPackagesNumber()) && ObjectUtils.isNotNull(inttraSoDto.getPackagesCode())) {
-						text += inttraSoDto.getPageNumber() + " " + inttraSoDto.getPackagesCode();
+						text += inttraSoDto.getPackagesNumber() + " " + inttraSoDto.getPackagesCode() + ";";
 					}else{
 						msg += "件数及包装单位,";
 					}
@@ -1236,6 +1240,14 @@ public class RegularUtils {
 		}
 		//危险品国际编码
 		if (inttraSoDto.getCargoType().equals("danger")) {
+			if (ObjectUtils.isNotNull(inttraSoDto.getDgImdgCode())) {
+				if (regularLength(inttraSoDto.getDgImdgCode(), 4)) {
+					textLength += "危险品 IMDG 编码,";
+				}
+			}else{
+				msg += "危险品 IMDG 编码,";
+			}
+
 			if (ObjectUtils.isNotNull(inttraSoDto.getDgUnCode())) {
 				if (regularLength(inttraSoDto.getDgUnCode(), 4)) {
 					textLength += "危险品国际编码,";
@@ -1245,31 +1257,42 @@ public class RegularUtils {
 			}
 			//页号
 			if (ObjectUtils.isNotNull(inttraSoDto.getPageNumber())) {
-				if (regularLength(inttraSoDto.getPageNumber().toString(), 7)) {
+				if (regularLength(inttraSoDto.getPageNumber(), 7)) {
 					textLength += "页号,";
 				}
 			}
 			//闪点
 			if (ObjectUtils.isNotNull(inttraSoDto.getDgFlashPoint())) {
-				// todo
-				StringBuilder data = new StringBuilder();
-				boolean status = false;
-				if (inttraSoDto.getDgFlashPoint().indexOf("-") != 0) {
-					data = new StringBuilder(inttraSoDto.getDgFlashPoint().substring(0, inttraSoDto.getDgFlashPoint().indexOf("-")));
-					status = true;
-				}
-				if (regularLength(data.toString(), 3)) {
-					textLength += "闪点,";
-				} else {
-					int count = 3 - data.length();
-					if (status) {
-						for (int i = 0; i < count; i++) {
-							data.insert(0, "0");
-						}
-						inttraSoDto.setDgFlashPoint("-" + data);
-					}
+				inttraSoDto.setDgFlashPoint(formatTempNumber(new BigDecimal(inttraSoDto.getDgFlashPoint()), 3));
+//				// todo
+//				StringBuilder data = new StringBuilder();
+//				boolean status = false;
+//				if (inttraSoDto.getDgFlashPoint().indexOf("-") != 0) {
+//					data = new StringBuilder(inttraSoDto.getDgFlashPoint().substring(0, inttraSoDto.getDgFlashPoint().indexOf("-")));
+//					status = true;
+//				}
+//				if (regularLength(data.toString(), 3)) {
+//					textLength += "闪点,";
+//				} else {
+//					int count = 3 - data.length();
+//					if (status) {
+//						for (int i = 0; i < count; i++) {
+//							data.insert(0, "0");
+//						}
+//						inttraSoDto.setDgFlashPoint("-" + data);
+//					}
+//				}
+			}
+			//包装组别
+			if (ObjectUtils.isNull(inttraSoDto.getPackingGroup())) {
+				inttraSoDto.setPackingGroup("0");
+			}
+			if(!"0".equals(inttraSoDto.getPackingGroup())){
+				if(ObjectUtils.isNull(inttraSoDto.getDgFlashPoint())){
+					msg += "闪点,";
 				}
 			}
+
 			//应急措施号
 			if (ObjectUtils.isNotNull(inttraSoDto.getEmergencyMeasureNo())) {
 				Map<String, String> mapString = regularEn(inttraSoDto.getEmergencyMeasureNo(), true);
@@ -1329,7 +1352,7 @@ public class RegularUtils {
 		} else {
 			List<Map<String, Object>> mapList = inttraSoDto.getBox();
 			for (Map<String, Object> map1 : mapList) {
-				Double temperature = ObjectUtils.isNotNull(map1.get("temperature")) ? Double.parseDouble(map1.get("temperature").toString()) : 0;
+				// Double temperature = ObjectUtils.isNotNull(map1.get("temperature")) ? Double.parseDouble(map1.get("temperature").toString()) : 0;
 				//箱型代码
 				if (ObjectUtils.isNull(map1.get("boxCode").toString())) {
 					msg += "箱型代码,";
@@ -1344,10 +1367,6 @@ public class RegularUtils {
 				//箱量
 				if (ObjectUtils.isNull(map1.get("boxNumber"))) {
 					msg += "箱量,";
-				} else {
-					if (regularLength(map1.get("temperature").toString(), 15)) {
-						textLength += "箱量,";
-					}
 				}
 				//冷藏通风量
 				if (ObjectUtils.isNotNull(map1.get("ventilation").toString())) {
@@ -1366,12 +1385,6 @@ public class RegularUtils {
 						character += "冷藏通风量,";
 					}
 				}
-				//温度
-				if (ObjectUtils.isNotNull(temperature)) {
-					if (regularLength(temperature.toString(), 4)) {
-						textLength += "温度,";
-					}
-				}
 				//温度单位
 				if (ObjectUtils.isNotNull(map1.get("temperatureUnit").toString())) {
 					Map<String, String> mapString = regularEn(map1.get("temperatureUnit").toString(),true);

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

@@ -452,7 +452,7 @@ public class InttraSoDto {
 	/**
 	 * 页号
 	 */
-	private BigDecimal pageNumber;
+	private String pageNumber;
 	/**
 	 * 联合国编号
 	 */

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

@@ -65,9 +65,12 @@ public class EDISenderServiceImpl implements IEDISenderService {
 			writer.newLine();
 			count += 1;
 			/* =================0090=================  */
-			writer.write("FTX+AAI+++" + inttraSoDto.getBookingRemarks() + "'");
-			writer.newLine();
-			count += 1;
+			// 除 HLCU,CMDU,ANNU,CHNL, MAEU, MCCQ 之外的船公司不填
+			if (ObjectUtils.isNotNull(inttraSoDto.getBookingRemarks())) {
+				writer.write("FTX+AAI+++" + inttraSoDto.getBookingRemarks() + "'");
+				writer.newLine();
+				count += 1;
+			}
 			if (ObjectUtils.isNotNull(inttraSoDto.getCarrySingleRemarks())) {
 				writer.write("FTX+BLC+++" + inttraSoDto.getCarrySingleRemarks() + "'");
 				writer.newLine();
@@ -166,7 +169,7 @@ public class EDISenderServiceImpl implements IEDISenderService {
 			if (inttraSoDto.getVoyageNo().indexOf("V.") > 0) {
 				throw new RuntimeException("航次中不能存在‘V.’");
 			} else {
-				if ("MAEU---AA".equals(inttraSoDto.getCarrierCode())) {
+				if ("MAEU".equals(inttraSoDto.getCarrierCode())) {
 					writer.write("TDT+20+XXX+1++");
 					if (ObjectUtils.isNotNull(inttraSoDto.getVesselCarrierCode())) {
 						writer.write(inttraSoDto.getVesselCarrierCode() + ":172+++:::XXX'");
@@ -227,17 +230,38 @@ public class EDISenderServiceImpl implements IEDISenderService {
 			writer.newLine();
 			count += 1;
 			/* =================0580=================  */
-			if (ObjectUtils.isNotNull(inttraSoDto.getFreightForwarderCode())) {
-				writer.write("NAD+FW+++" + inttraSoDto.getFreightForwarderCode());
-				if (ObjectUtils.isNotNull(inttraSoDto.getFreightForwarderName())) {
-					writer.write(":160:86++" + inttraSoDto.getFreightForwarderName() + "'");
-					writer.newLine();
+			String fw = ObjectUtils.isNotNull(inttraSoDto.getFreightForwarderName()) ?
+				inttraSoDto.getFreightForwarderName().trim() :
+				(ObjectUtils.isNotNull(inttraSoDto.getFreightForwarderCode()) ?
+					inttraSoDto.getFreightForwarderCode() : "");
+			if("".equals(fw)){
+				fw="JET MARINE";
+			}
+			List<String> hForwarder = RegularUtils.reformatEDIText(fw, 35, true);
+			writer.write("NAD+FW+++");
+			for (int l=0; l<hForwarder.size(); l++){
+				if (l<5) {
+					writer.write((l > 0) ? ((l == 1) ? "+" : ":") : "");
+					writer.write(hForwarder.get(l));
 				} else {
-					writer.write("'");
-					writer.newLine();
+					break;
 				}
-				count += 1;
 			}
+			writer.write("'");
+			writer.newLine();
+			count += 1;
+
+//			if (ObjectUtils.isNotNull(inttraSoDto.getFreightForwarderCode())) {
+//				writer.write("NAD+FW+++" + inttraSoDto.getFreightForwarderCode());
+//				if (ObjectUtils.isNotNull(inttraSoDto.getFreightForwarderName())) {
+//					writer.write(":160:86++" + inttraSoDto.getFreightForwarderName() + "'");
+//					writer.newLine();
+//				} else {
+//					writer.write("'");
+//					writer.newLine();
+//				}
+//				count += 1;
+//			}
 			/* =================0580=================  */
 			// 处理收发通之前，先处理货描，因为收发通多余的部分要追加到货描
 			List<String> goodsDesc = RegularUtils.reformatEDIText(inttraSoDto.getGoodsDesc(), 35, true);
@@ -492,115 +516,116 @@ public class EDISenderServiceImpl implements IEDISenderService {
 
 			/* =================1520=================  */
 			if (ObjectUtils.isNotNull(inttraSoDto.getDgImdgCode())) {
-				writer.write("DGS+IMD+" + inttraSoDto.getDgImdgCode());
-				if (ObjectUtils.isNotNull(inttraSoDto.getEmergencyMeasureNo())) {
-					if (ObjectUtils.isNotNull(inttraSoDto.getPageNumber())) {
-						writer.write(":" + inttraSoDto.getPageNumber());
-					} else {
-						writer.write(":");
-					}
-					if (ObjectUtils.isNotNull(inttraSoDto.getDgUnCode())) {
-						writer.write("+" + inttraSoDto.getDgUnCode());
-					} else {
-						writer.write("+");
-					}
-					if (ObjectUtils.isNotNull(inttraSoDto.getDgFlashPoint())) {
-						writer.write("+" + inttraSoDto.getDgFlashPoint());
-					} else {
-						writer.write("+");
-					}
-					if (ObjectUtils.isNotNull(inttraSoDto.getDgFlashPointUnit())) {
-						writer.write(":" + inttraSoDto.getDgFlashPointUnit());
-					} else {
-						writer.write(":");
-					}
-					if (ObjectUtils.isNotNull(inttraSoDto.getPackingGroup())) {
-						writer.write("+" + inttraSoDto.getPackingGroup());
-					} else {
-						writer.write("+");
-					}
-					if (ObjectUtils.isNotNull(inttraSoDto.getEmergencyMeasureNo())) {
-						writer.write("+" + inttraSoDto.getEmergencyMeasureNo());
-					}
-				} else {
-					if (ObjectUtils.isNotNull(inttraSoDto.getPackingGroup())) {
-						if (ObjectUtils.isNotNull(inttraSoDto.getPageNumber())) {
-							writer.write(":" + inttraSoDto.getPageNumber());
-						} else {
-							writer.write(":");
-						}
-						if (ObjectUtils.isNotNull(inttraSoDto.getDgUnCode())) {
-							writer.write("+" + inttraSoDto.getDgUnCode());
-						} else {
-							writer.write("+");
-						}
-						if (ObjectUtils.isNotNull(inttraSoDto.getDgFlashPoint())) {
-							writer.write("+" + inttraSoDto.getDgFlashPoint());
-						} else {
-							writer.write("+");
-						}
-						if (ObjectUtils.isNotNull(inttraSoDto.getDgFlashPointUnit())) {
-							writer.write(":" + inttraSoDto.getDgFlashPointUnit());
-						} else {
-							writer.write(":");
-						}
-						if (ObjectUtils.isNotNull(inttraSoDto.getPackingGroup())) {
-							writer.write("+" + inttraSoDto.getPackingGroup());
-						}
-					} else {
-						if (ObjectUtils.isNotNull(inttraSoDto.getDgFlashPointUnit())) {
-							if (ObjectUtils.isNotNull(inttraSoDto.getPageNumber())) {
-								writer.write(":" + inttraSoDto.getPageNumber());
-							} else {
-								writer.write(":");
-							}
-							if (ObjectUtils.isNotNull(inttraSoDto.getDgUnCode())) {
-								writer.write("+" + inttraSoDto.getDgUnCode());
-							} else {
-								writer.write("+");
-							}
-							if (ObjectUtils.isNotNull(inttraSoDto.getDgFlashPoint())) {
-								writer.write("+" + inttraSoDto.getDgFlashPoint());
-							} else {
-								writer.write("+");
-							}
-							if (ObjectUtils.isNotNull(inttraSoDto.getDgFlashPointUnit())) {
-								writer.write(":" + inttraSoDto.getDgFlashPointUnit());
-							}
-						} else {
-							if (ObjectUtils.isNotNull(inttraSoDto.getDgFlashPoint())) {
-								if (ObjectUtils.isNotNull(inttraSoDto.getPageNumber())) {
-									writer.write(":" + inttraSoDto.getPageNumber());
-								} else {
-									writer.write(":");
-								}
-								if (ObjectUtils.isNotNull(inttraSoDto.getDgUnCode())) {
-									writer.write("+" + inttraSoDto.getDgUnCode());
-								} else {
-									writer.write("+");
-								}
-								if (ObjectUtils.isNotNull(inttraSoDto.getDgFlashPoint())) {
-									writer.write("+" + inttraSoDto.getDgFlashPoint());
-								}
-							} else {
-								if (ObjectUtils.isNotNull(inttraSoDto.getDgUnCode())) {
-									if (ObjectUtils.isNotNull(inttraSoDto.getPageNumber())) {
-										writer.write(":" + inttraSoDto.getPageNumber());
-									} else {
-										writer.write(":");
-									}
-									if (ObjectUtils.isNotNull(inttraSoDto.getDgUnCode())) {
-										writer.write("+" + inttraSoDto.getDgUnCode());
-									}
-								} else {
-									if (ObjectUtils.isNotNull(inttraSoDto.getPageNumber())) {
-										writer.write(":" + inttraSoDto.getPageNumber());
-									}
-								}
-							}
-						}
-					}
-				}
+				writer.write("DGS+IMD+" + inttraSoDto.getDgImdgCode() + "+" + inttraSoDto.getDgUnCode());
+				if(!"0".equals(inttraSoDto.getPackingGroup())) {
+					writer.write("+" + inttraSoDto.getDgFlashPoint() + ":" + inttraSoDto.getDgFlashPointUnit() + "+" + inttraSoDto.getPackingGroup());
+				}
+//				if (ObjectUtils.isNotNull(inttraSoDto.getEmergencyMeasureNo())) {
+//					if (ObjectUtils.isNotNull(inttraSoDto.getPageNumber())) {
+//						writer.write(":" + inttraSoDto.getPageNumber());
+//					}
+//					if (ObjectUtils.isNotNull(inttraSoDto.getDgUnCode())) {
+//						writer.write("+" + inttraSoDto.getDgUnCode());
+//					} else {
+//						writer.write("+");
+//					}
+//					if (ObjectUtils.isNotNull(inttraSoDto.getDgFlashPoint())) {
+//						writer.write("+" + inttraSoDto.getDgFlashPoint());
+//					} else {
+//						writer.write("+");
+//					}
+//					if (ObjectUtils.isNotNull(inttraSoDto.getDgFlashPointUnit())) {
+//						writer.write(":" + inttraSoDto.getDgFlashPointUnit());
+//					} else {
+//						writer.write(":");
+//					}
+//					if (ObjectUtils.isNotNull(inttraSoDto.getPackingGroup())) {
+//						writer.write("+" + inttraSoDto.getPackingGroup());
+//					} else {
+//						writer.write("+");
+//					}
+//					if (ObjectUtils.isNotNull(inttraSoDto.getEmergencyMeasureNo())) {
+//						writer.write("+" + inttraSoDto.getEmergencyMeasureNo());
+//					}
+//				} else {
+//					if (ObjectUtils.isNotNull(inttraSoDto.getPackingGroup())) {
+//						if (ObjectUtils.isNotNull(inttraSoDto.getPageNumber())) {
+//							writer.write(":" + inttraSoDto.getPageNumber());
+//						} else {
+//							writer.write(":");
+//						}
+//						if (ObjectUtils.isNotNull(inttraSoDto.getDgUnCode())) {
+//							writer.write("+" + inttraSoDto.getDgUnCode());
+//						} else {
+//							writer.write("+");
+//						}
+//						if (ObjectUtils.isNotNull(inttraSoDto.getDgFlashPoint())) {
+//							writer.write("+" + inttraSoDto.getDgFlashPoint());
+//						} else {
+//							writer.write("+");
+//						}
+//						if (ObjectUtils.isNotNull(inttraSoDto.getDgFlashPointUnit())) {
+//							writer.write(":" + inttraSoDto.getDgFlashPointUnit());
+//						} else {
+//							writer.write(":");
+//						}
+//						if (ObjectUtils.isNotNull(inttraSoDto.getPackingGroup())) {
+//							writer.write("+" + inttraSoDto.getPackingGroup());
+//						}
+//					} else {
+//						if (ObjectUtils.isNotNull(inttraSoDto.getDgFlashPointUnit())) {
+//							if (ObjectUtils.isNotNull(inttraSoDto.getPageNumber())) {
+//								writer.write(":" + inttraSoDto.getPageNumber());
+//							} else {
+//								writer.write(":");
+//							}
+//							if (ObjectUtils.isNotNull(inttraSoDto.getDgUnCode())) {
+//								writer.write("+" + inttraSoDto.getDgUnCode());
+//							} else {
+//								writer.write("+");
+//							}
+//							if (ObjectUtils.isNotNull(inttraSoDto.getDgFlashPoint())) {
+//								writer.write("+" + inttraSoDto.getDgFlashPoint());
+//							} else {
+//								writer.write("+");
+//							}
+//							if (ObjectUtils.isNotNull(inttraSoDto.getDgFlashPointUnit())) {
+//								writer.write(":" + inttraSoDto.getDgFlashPointUnit());
+//							}
+//						} else {
+//							if (ObjectUtils.isNotNull(inttraSoDto.getDgFlashPoint())) {
+//								if (ObjectUtils.isNotNull(inttraSoDto.getPageNumber())) {
+//									writer.write(":" + inttraSoDto.getPageNumber());
+//								} else {
+//									writer.write(":");
+//								}
+//								if (ObjectUtils.isNotNull(inttraSoDto.getDgUnCode())) {
+//									writer.write("+" + inttraSoDto.getDgUnCode());
+//								} else {
+//									writer.write("+");
+//								}
+//								if (ObjectUtils.isNotNull(inttraSoDto.getDgFlashPoint())) {
+//									writer.write("+" + inttraSoDto.getDgFlashPoint());
+//								}
+//							} else {
+//								if (ObjectUtils.isNotNull(inttraSoDto.getDgUnCode())) {
+//									if (ObjectUtils.isNotNull(inttraSoDto.getPageNumber())) {
+//										writer.write(":" + inttraSoDto.getPageNumber());
+//									} else {
+//										writer.write(":");
+//									}
+//									if (ObjectUtils.isNotNull(inttraSoDto.getDgUnCode())) {
+//										writer.write("+" + inttraSoDto.getDgUnCode());
+//									}
+//								} else {
+//									if (ObjectUtils.isNotNull(inttraSoDto.getPageNumber())) {
+//										writer.write(":" + inttraSoDto.getPageNumber());
+//									}
+//								}
+//							}
+//						}
+//					}
+//				}
 				writer.write("'");
 				writer.newLine();
 				count += 1;
@@ -613,13 +638,13 @@ public class EDISenderServiceImpl implements IEDISenderService {
 			}
 			/* =================1530=================  */
 			if (ObjectUtils.isNotNull(inttraSoDto.getDgContacts())) {
-				writer.write("CTA+HG+:" + inttraSoDto.getDgContacts() + "'");
+				writer.write("CTA+HG+:" + inttraSoDto.getDgContacts().toUpperCase() + "'");
 				writer.newLine();
 				count += 1;
 			}
 			/* =================1560=================  */
 			if (ObjectUtils.isNotNull(inttraSoDto.getDgTel())) {
-				writer.write("COM+" + inttraSoDto.getDgTel() + "'");
+				writer.write("COM+" + inttraSoDto.getDgTel().toUpperCase() + ":TE'");
 				writer.newLine();
 				count += 1;
 			}

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

@@ -287,7 +287,7 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 				inttraSoDto.setInttraDoorToContacts(details.getInttraDoorToCorpContacts());
 				inttraSoDto.setInttraDoorToTel(details.getInttraDoorToCorpTel());
 				inttraSoDto.setFreightForwarderCode("JET MARINE");
-				inttraSoDto.setFreightForwarderName("");
+				inttraSoDto.setFreightForwarderName(details.getForwarding());
 				inttraSoDto.setSenderCodeS("JMSLOGQINGDAO");
 				inttraSoDto.setSenderName("JMS");
 				inttraSoDto.setSenderContacts("Yuki Cai");
@@ -322,11 +322,11 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 				inttraSoDto.setCargoType(details.getCargoType());
 				if ("danger".equals(details.getCargoType())) {
 					inttraSoDto.setDgImdgCode(details.getDgImdgCode());
-					inttraSoDto.setPageNumber(new BigDecimal("007"));
+					inttraSoDto.setPageNumber("");
 					inttraSoDto.setDgUnCode(details.getDgUnCode());
-					inttraSoDto.setDgFlashPoint(details.getDgFlashPoint() + "");
+					inttraSoDto.setDgFlashPoint(details.getDgFlashPoint().toString());
 					inttraSoDto.setDgFlashPointUnit(details.getDgFlashPointUnit());
-					inttraSoDto.setPackingGroup("");//包装组别
+					inttraSoDto.setPackingGroup(details.getDgPackingLevel());//包装组别
 					inttraSoDto.setEmergencyMeasureNo("");//应急措施号
 					inttraSoDto.setDgRemarks(details.getDgRemarks());
 					inttraSoDto.setDgContacts(details.getDgContacts());
@@ -608,7 +608,7 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 					inttraSoDto.setDgFlashPointUnit(details.getDgFlashPointUnit());
 					inttraSoDto.setPackingGroup("");//包装组别
 					inttraSoDto.setEmergencyMeasureNo("");//应急措施号
-					inttraSoDto.setDgRemarks(details.getDgRemarks());
+					inttraSoDto.setDgRemarks(""); // details.getDgRemarks() 不加
 					inttraSoDto.setDgContacts(details.getDgContacts());
 					inttraSoDto.setDgTel(details.getDgTel());
 				}