|
|
@ -1208,9 +1208,9 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService { |
|
|
*/ |
|
|
*/ |
|
|
private String resolveDeclarationPackageUnit(EcssDeclarationHeaderData data, EcssCoDelNotifyHeaderData notifyHeader) { |
|
|
private String resolveDeclarationPackageUnit(EcssDeclarationHeaderData data, EcssCoDelNotifyHeaderData notifyHeader) { |
|
|
String packageUnit = data == null ? "" : stringInput(data.getPackageUnit()).trim(); |
|
|
String packageUnit = data == null ? "" : stringInput(data.getPackageUnit()).trim(); |
|
|
if (StringUtils.isNotBlank(packageUnit)) { |
|
|
|
|
|
|
|
|
/*if (StringUtils.isNotBlank(packageUnit)) { |
|
|
return packageUnit; |
|
|
return packageUnit; |
|
|
} |
|
|
|
|
|
|
|
|
}*/ |
|
|
String buNo = notifyHeader != null && StringUtils.isNotBlank(notifyHeader.getBuNo()) |
|
|
String buNo = notifyHeader != null && StringUtils.isNotBlank(notifyHeader.getBuNo()) |
|
|
? notifyHeader.getBuNo() : (data == null ? "" : data.getBuNo()); |
|
|
? notifyHeader.getBuNo() : (data == null ? "" : data.getBuNo()); |
|
|
if (!isUsaCanadaPackageUnitBu(buNo)) { |
|
|
if (!isUsaCanadaPackageUnitBu(buNo)) { |
|
|
|