This commit is contained in:
van
2026-10-08 00:31:11 +08:00
parent fe37c0baf3
commit 08d6399324
@@ -26,10 +26,14 @@ import java.io.ByteArrayOutputStream;
import java.io.InputStream; import java.io.InputStream;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode; import java.math.RoundingMode;
import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
@@ -262,7 +266,7 @@ public class RebateSheetConvertService {
continue; continue;
} }
SourceRow src = new SourceRow(); SourceRow src = new SourceRow();
src.dateText = cellText(row, header.dateCol); src.dateText = dateCellText(row, header.dateCol);
src.orderNo = normalizeOrderNo(cellText(row, header.orderCol)); src.orderNo = normalizeOrderNo(cellText(row, header.orderCol));
src.model = cellText(row, header.modelCol); src.model = cellText(row, header.modelCol);
String rebateText = firstNonEmpty(cellText(row, header.totalRebateCol), cellText(row, header.rebateCol)); String rebateText = firstNonEmpty(cellText(row, header.totalRebateCol), cellText(row, header.rebateCol));