diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/StatisticalReportServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/StatisticalReportServiceImpl.java index 7550cf7c..cac7a47c 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/StatisticalReportServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/StatisticalReportServiceImpl.java @@ -31,6 +31,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; +import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.*; import java.util.stream.Collectors; @@ -630,7 +632,8 @@ public class StatisticalReportServiceImpl implements StatisticalReportService { dtl_map.put("序号", i+1); dtl_map.put("物料编码", row.getString("material_code")); dtl_map.put("批次号", row.getString("pcsn")); - dtl_map.put("重量", row.getString("total_qty")); + dtl_map.put("托盘号", row.getString("storagevehicle_code")); + dtl_map.put("重量", StringUtils.isNotEmpty(row.getString("total_qty"))?new BigDecimal(row.getString("total_qty")).setScale(3, RoundingMode.HALF_UP).toString():""); dtl_map.put("桶数", row.getString("num_bucket")); dtl_map.put("计划发货时间", row.getString("send_date")); String clientName = "";