VOLTA EDI

blade-service/blade-los/src/main/java/org/springblade/los/gmy/service/impl/GmyDataExchangApiServiceImpl.java

@@ -630,6 +630,7 @@ public class GmyDataExchangApiServiceImpl implements IGmyDataExchangApiService {
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public R<List<GmyDeclHead>> importDecl(String ids) throws Exception {
+		String message = "";
 		if (ObjectUtils.isNotNull(ids)) {
 			List<GmyDeclHead> declHeads = gmyDeclHeadService.list(new LambdaQueryWrapper<GmyDeclHead>()
 				.eq(GmyDeclHead::getIsDeleted, 0)
@@ -656,12 +657,12 @@ public class GmyDataExchangApiServiceImpl implements IGmyDataExchangApiService {
 					String declBusinessType = "";
 					String billNoFormat = "";
 					if ("2".equals(transTypeCode)) {
-						declBusinessType = ieType == "E" ? "BGSE" : "BGSI";
-						billNoFormat = ieType == "E" ? "BG-HYCK" : "BG-HYJK";
+						declBusinessType = ieType.equals("E") ? "BGSE" : "BGSI";
+						billNoFormat = ieType.equals("E") ? "BG-HYCK" : "BG-HYJK";
 					}
 					if ("5".equals(transTypeCode)) {
-						declBusinessType = ieType == "E" ? "BGAE" : "BGAI";
-						billNoFormat = ieType == "E" ? "BG-KYCK" : "BG-KYJK";
+						declBusinessType = ieType.equals("E") ? "BGAE" : "BGAI";
+						billNoFormat = ieType.equals("E") ? "BG-KYCK" : "BG-KYJK";
 					}
 
 					String import_message = "";
@@ -836,8 +837,10 @@ public class GmyDataExchangApiServiceImpl implements IGmyDataExchangApiService {
 							// 3 更新单据状态
 							declHead.setStatus(9);
 							updateIds.add(declHead.getId().toString());
+							message += "报关单号 " + declHead.getCustomsNo() + " 导入成功！<br/>";
+						}else{
+							message += "报关单号 " + declHead.getCustomsNo() + " 导入失败：" + import_message + "<br/>";
 						}
-
 					}
 					declHead.setImportMessage(import_message.trim());
 				}
@@ -857,9 +860,9 @@ public class GmyDataExchangApiServiceImpl implements IGmyDataExchangApiService {
 				}
 			}
 
-			return R.data(declHeads);
-		} else {
-			return R.data(new ArrayList<>());
+		}else {
+			message = "没有可导入关贸云报关单！";
 		}
+		return R.success(message);
 	}
 }