|
|
|
@ -61,7 +61,7 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService { |
|
|
|
*/ |
|
|
|
private static final List<String> TX_REQUIRED_FIXED_HEADERS = Arrays.asList( |
|
|
|
"发票号", "发票序号", "客户", "可提货时间", "发运方式", "目的地", |
|
|
|
"PO", "ERP编码", "HS Code", "申报品名", "名称", |
|
|
|
"PO", "ERP编码", "名称", |
|
|
|
"Currency", "TP", "Total Revanue", "托数", "总体积", "净重", "毛重", "箱数","Qty" |
|
|
|
); |
|
|
|
@Override |
|
|
|
@ -468,7 +468,7 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService { |
|
|
|
} else { |
|
|
|
PartData partData = parts.getFirst(); |
|
|
|
detail.setPartNo(partData.getPartNo()); |
|
|
|
String hsCode = headerMap.containsKey("HS Code") ? getMergedCellValue(sheet, r, headerMap.get("HS Code")) : ""; |
|
|
|
/*String hsCode = headerMap.containsKey("HS Code") ? getMergedCellValue(sheet, r, headerMap.get("HS Code")) : ""; |
|
|
|
String hsCodeDesc = headerMap.containsKey("申报品名") ? getMergedCellValue(sheet, r, headerMap.get("申报品名")) : ""; |
|
|
|
String brand = "无"; |
|
|
|
if (headerMap.containsKey("品牌")) { |
|
|
|
@ -496,7 +496,7 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService { |
|
|
|
coDelMapper.insertHsCodeData(hsCodeData); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
}*/ |
|
|
|
} |
|
|
|
if (headerMap.containsKey("名称")) detail.setPartDescription(getMergedCellValue(sheet, r, headerMap.get("名称"))); |
|
|
|
if (headerMap.containsKey("Manufacturer Name")) detail.setManufacturerName(getMergedCellValue(sheet, r, headerMap.get("Manufacturer Name"))); |
|
|
|
|