导出

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/view/ExportVView.java

@@ -86,7 +86,7 @@ public class ExportVView {
     /**
      * 净重单价
      */
-    private Float netWeightPrice;
+    private String netWeightPrice;
     /**
      * 毛重
      */

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseBaseInfoServiceImpl.java

@@ -1494,21 +1494,21 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
 
         HSSFCellStyle contextstyle = wb.createCellStyle();
         // 指定单元格居中对齐
-        styleDetail.setAlignment(HSSFCellStyle.ALIGN_CENTER);
+        contextstyle.setAlignment(HSSFCellStyle.ALIGN_CENTER);
         // 指定单元格垂直居中对齐
-        styleDetail.setVerticalAlignment(HSSFCellStyle.VERTICAL_CENTER);
+        contextstyle.setVerticalAlignment(HSSFCellStyle.VERTICAL_CENTER);
         // 指定单元格自动换行
-        styleDetail.setWrapText(true);
+        contextstyle.setWrapText(true);
         // 设置单元格字体
-        styleDetail.setFont(fontDetail);
+        contextstyle.setFont(fontDetail);
         // 右边框
-        styleDetail.setBorderRight(HSSFCellStyle.BORDER_THIN);
+        contextstyle.setBorderRight(HSSFCellStyle.BORDER_THIN);
         // 左边框
-        styleDetail.setBorderLeft(HSSFCellStyle.BORDER_THIN);
+        contextstyle.setBorderLeft(HSSFCellStyle.BORDER_THIN);
         // 上边框
-        styleDetail.setBorderTop(HSSFCellStyle.BORDER_THIN);
+        contextstyle.setBorderTop(HSSFCellStyle.BORDER_THIN);
         // 下styleDetailTitle
-        styleDetail.setBorderBottom(HSSFCellStyle.BORDER_THIN);
+        contextstyle.setBorderBottom(HSSFCellStyle.BORDER_THIN);
 
         HSSFCellStyle styleDetailYellow = wb.createCellStyle();
         // 指定单元格居中对齐
@@ -1727,7 +1727,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(19);
         cell.setCellValue("净重单价");
-        cell.setCellStyle(styleDetail);
+        cell.setCellStyle(contextstyle);
         cell = row1.createCell(20);
         cell.setCellValue("毛重");
         cell.setCellStyle(styleDetail);
@@ -1817,10 +1817,10 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 cell.setCellValue(editString(exportVView.getGrade()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(12);
-                cell.setCellValue(editString(exportVView.getWaterContent()));
+                cell.setCellValue(Double.parseDouble(exportVView.getWaterContent()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(13);
-                cell.setCellValue(editString(exportVView.getImpurity()));
+                cell.setCellValue(Double.parseDouble(exportVView.getImpurity()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(14);
                 cell.setCellValue(editString(exportVView.getCarNo()));
@@ -1838,24 +1838,24 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 cell.setCellValue(editString(exportVView.getTitleNoOther()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(19);
-                cell.setCellValue(new Formatter().format("%.3f", editFloat(exportVView.getNetWeightPrice())).toString());
-                cell.setCellStyle(styleDetail);
+                cell.setCellValue(Double.parseDouble(exportVView.getNetWeightPrice()));
+                cell.setCellStyle(contextstyle);
                 cell = rowx.createCell(20);
                 HSSFDataFormat df = wb.createDataFormat(); // 此处设置数据格式
                 contextstyle.setDataFormat(df.getBuiltinFormat("#,##0.00"));//保留两位小数点
                 cell.setCellValue(Double.parseDouble(exportVView.getGrossWeight()));
-                cell.setCellStyle(styleDetail);
+                cell.setCellStyle(contextstyle);
                 cell = rowx.createCell(21);
                 cell.setCellValue(Double.parseDouble(exportVView.getTare()));
-                cell.setCellStyle(styleDetail);
+                cell.setCellStyle(contextstyle);
                 cell = rowx.createCell(22);
-                cell.setCellValue(new Formatter().format("%.2f", editFloat(exportVView.getBuckleWeight())).toString());
+                cell.setCellValue(editFloat(exportVView.getBuckleWeight()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(23);
                 cell.setCellValue(Double.parseDouble(exportVView.getNetWeight()));
-                cell.setCellStyle(styleDetail);
+                cell.setCellStyle(contextstyle);
                 cell = rowx.createCell(24);
-                cell.setCellValue(new Formatter().format("%.2f", editFloat(exportVView.getUnitDeduction())).toString());
+                cell.setCellValue(editFloat(exportVView.getUnitDeduction()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(25);
                 cell.setCellValue(new Formatter().format("%.3f", editFloat(exportVView.getPureWeightPrice())).toString());

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/WarehouseBaseInfoMapper.xml

@@ -26,7 +26,7 @@
         SELECT
         c.comp_name as compName,
         a.warehouse_name as warehouseName,
-        '' as binNumber,
+        q.bin_number as binNumber,
         a.create_date as createDate,
         a.contract_no as contractNo,
         a.payment_no as paymentNo,