单证调整

src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelServiceImpl.java

@@ -458,6 +458,13 @@ public class CoDelExcelServiceImpl implements CoDelExcelService {
                     continue;
                 }
 
+                // 获取pn列索引
+                Integer pnIdx = columnMap.get("PN");
+                if (pnIdx == null) {
+                    log.warn("Sheet [{}] 中未找到 'PN' 列，跳过该Sheet", sheetName);
+                    continue;
+                }
+
                 // Cargo Ready Date 列存在，说明要处理这个 sheet，验证其他必填列
                 String[] requiredColumns = {
                     "PO#",              // 必填
@@ -543,13 +550,12 @@ public class CoDelExcelServiceImpl implements CoDelExcelService {
                     continue;
                 }
 
-                // 检查Cargo Ready Date列，如果没有值则跳过该行
-                if (row.getCell(cargoReadyDateIdx) == null
-                        || row.getCell(cargoReadyDateIdx).getCellType() == CellType.BLANK
-                        || row.getCell(cargoReadyDateIdx).getCellType() == CellType.ERROR) {
-                    log.debug("第{}行的Cargo Ready Date列为空，跳过该行", j+1);
-                    continue;
-                }
+                // 检查PN列，如果没有值则跳过该行
+                    if (row.getCell(pnIdx) == null || row.getCell(pnIdx).getCellType() == CellType.BLANK
+                            || row.getCell(pnIdx).getCellType() == CellType.ERROR) {
+                        log.debug("第{}行的PN列为空，跳过该行", j+1);
+                        continue;
+                    }
 
                 // 跳过内销数据（如果"内外销方式"列存在）
                 Integer saleTypeIdx = columnMap.get("内外销方式");
@@ -566,7 +572,7 @@ public class CoDelExcelServiceImpl implements CoDelExcelService {
                     continue; // 跳过这一行，继续处理下一行
                 }
 
-                Integer pnIdx = columnMap.get("PN");
+                //Integer pnIdx = columnMap.get("PN");
                 if (row.getCell(pnIdx) == null) {
                     currentSheetError.addErrorDetail("第" + (j+1) + "行的 [PN] 列不能为空");
                     hasRowError = true;
@@ -624,7 +630,7 @@ public class CoDelExcelServiceImpl implements CoDelExcelService {
                     String formatted = localDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
                     readDate = DateUtils.getDateByParten(formatted, "yyyy-MM-dd");
                 } catch (Exception e) {
-                    currentSheetError.addErrorDetail("第" + (j+1) + "行的 [Cargo Ready Date] 列格式有误: " + e.getMessage());
+                    currentSheetError.addErrorDetail("第" + (j+1) + "行的 [Cargo Ready Date] 列格式有误");
                     hasRowError = true;
                     continue;
                 }

src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java

@@ -4206,7 +4206,9 @@ public class CoDelServiceImpl implements CoDelService {
                         }
 
                         Object detailRollsObj = detail.get("detailRolls");
-                        if (detailRollsObj instanceof BigDecimal) {
+                        if (detailRollsObj == null || "".equals(detailRollsObj)) {
+                            palletDetailData.setRolls(BigDecimal.valueOf(0));
+                        } else if (detailRollsObj instanceof BigDecimal) {
                             palletDetailData.setRolls((BigDecimal) detailRollsObj);
                         } else if (detailRollsObj instanceof Integer) {
                             palletDetailData.setRolls(BigDecimal.valueOf((Integer) detailRollsObj));
@@ -4214,7 +4216,7 @@ public class CoDelServiceImpl implements CoDelService {
                             palletDetailData.setRolls(BigDecimal.valueOf((Double) detailRollsObj));
                         } else if (detailRollsObj instanceof String) {
                             palletDetailData.setRolls(new BigDecimal((String) detailRollsObj));
-                        } else if (detailRollsObj != null) {
+                        } else {
                             palletDetailData.setRolls(BigDecimal.valueOf(((Number) detailRollsObj).doubleValue()));
                         }
 

src/main/resources/mapper/ecss/CoDelMapper.xml

@@ -881,7 +881,7 @@ left join ecss_CoDelNotifyHeader noHeader on a.site=noHeader.site and a.delNo=no
     </select>
 
     <select id="exportEcssCoDelNotifyDetail"  resultType="java.util.Map">
-        select a.customerPO,a.part_no,a.part_description,a.currency,
+        select a.customerPO,a.part_no,a.part_description,LEFT(a.currency, 3) as currency,
                CONVERT(DECIMAL(20, 0), a.qty) as qty,CONVERT(DECIMAL(20, 6), a.tp) as unitPrice,b.hsCode,
                a.upc,a.so,a.ttl_amount,a.pn,h.hsCodeDesc,h.hsCodeDescEn,a.salesOrder
         from ecss_CoDelNotifydetail a