修改导出

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

@@ -29,6 +29,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.httpclient.util.DateUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.*;
+import org.apache.poi.hssf.util.HSSFColor;
+import org.apache.poi.ss.usermodel.Font;
 import org.apache.poi.ss.usermodel.IndexedColors;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.ss.util.CellRangeAddress;
@@ -793,6 +795,11 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         fontDetail.setFontName("宋体");
         fontDetail.setFontHeightInPoints((short) 12);
 
+        HSSFFont fontDetail1 = wb.createFont();
+        fontDetail1.setFontName("宋体");
+        fontDetail1.setFontHeightInPoints((short) 12);
+        fontDetail1.setColor(HSSFColor.RED.index);
+
         // title
         HSSFCellStyle styleTitle = wb.createCellStyle();
         // 指定单元格居中对齐
@@ -867,6 +874,24 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         // 下styleDetailTitle
         styleDetail.setBorderBottom(HSSFCellStyle.BORDER_THIN);
 
+        HSSFCellStyle styleDetail1 = wb.createCellStyle();
+        // 指定单元格居中对齐
+        styleDetail1.setAlignment(HSSFCellStyle.ALIGN_CENTER);
+        // 指定单元格垂直居中对齐
+        styleDetail1.setVerticalAlignment(HSSFCellStyle.VERTICAL_CENTER);
+        // 指定单元格自动换行
+        styleDetail1.setWrapText(true);
+        // 设置单元格字体
+        styleDetail1.setFont(fontDetail1);
+        // 右边框
+        styleDetail1.setBorderRight(HSSFCellStyle.BORDER_THIN);
+        // 左边框
+        styleDetail1.setBorderLeft(HSSFCellStyle.BORDER_THIN);
+        // 上边框
+        styleDetail1.setBorderTop(HSSFCellStyle.BORDER_THIN);
+        // 下styleDetailTitle
+        styleDetail1.setBorderBottom(HSSFCellStyle.BORDER_THIN);
+
         HSSFCellStyle contextstyle = wb.createCellStyle();
         // 指定单元格居中对齐
         contextstyle.setAlignment(HSSFCellStyle.ALIGN_CENTER);
@@ -885,6 +910,24 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         // 下styleDetailTitle
         contextstyle.setBorderBottom(HSSFCellStyle.BORDER_THIN);
 
+        HSSFCellStyle contextstyle1 = wb.createCellStyle();
+        // 指定单元格居中对齐
+        contextstyle1.setAlignment(HSSFCellStyle.ALIGN_CENTER);
+        // 指定单元格垂直居中对齐
+        contextstyle1.setVerticalAlignment(HSSFCellStyle.VERTICAL_CENTER);
+        // 指定单元格自动换行
+        contextstyle1.setWrapText(true);
+        // 设置单元格字体
+        contextstyle1.setFont(fontDetail1);
+        // 右边框
+        contextstyle1.setBorderRight(HSSFCellStyle.BORDER_THIN);
+        // 左边框
+        contextstyle1.setBorderLeft(HSSFCellStyle.BORDER_THIN);
+        // 上边框
+        contextstyle1.setBorderTop(HSSFCellStyle.BORDER_THIN);
+        // 下styleDetailTitle
+        contextstyle1.setBorderBottom(HSSFCellStyle.BORDER_THIN);
+
         HSSFCellStyle styleDetailYellow = wb.createCellStyle();
         // 指定单元格居中对齐
         styleDetailYellow.setAlignment(HSSFCellStyle.ALIGN_CENTER);
@@ -927,17 +970,17 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
 
         // 设置列宽
         sheet.setColumnWidth(0, 1 * 256 + 184);
-        sheet.setColumnWidth(1, 12 * 256 + 184);
-        sheet.setColumnWidth(2, 12 * 256 + 184);
+        sheet.setColumnWidth(1, "采购公司".getBytes().length*3*256);
+        sheet.setColumnWidth(2, sheet.getColumnWidth(2)*18/10);
         sheet.setColumnWidth(3, 12 * 256 + 184);
-        sheet.setColumnWidth(4, 12 * 256 + 184);
-        sheet.setColumnWidth(5, 12 * 256 + 184);
+        sheet.setColumnWidth(4, "开票日期".getBytes().length*2*256);
+        sheet.setColumnWidth(5, "业务编号".getBytes().length*2*256);
         sheet.setColumnWidth(6, 12 * 256 + 184);
         sheet.setColumnWidth(7, 12 * 256 + 184);
         sheet.setColumnWidth(8, 12 * 256 + 184);
         sheet.setColumnWidth(9, 12 * 256 + 184);
         sheet.setColumnWidth(10, 12 * 256 + 184);
-        sheet.setColumnWidth(11, 12 * 256 + 184);
+        sheet.setColumnWidth(11, "货名".getBytes().length*3*256);
         sheet.setColumnWidth(12, 12 * 256 + 184);
         sheet.setColumnWidth(13, 12 * 256 + 184);
         sheet.setColumnWidth(14, 12 * 256 + 184);
@@ -959,8 +1002,8 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         sheet.setColumnWidth(30, 12 * 256 + 184);
         sheet.setColumnWidth(31, 12 * 256 + 184);
         sheet.setColumnWidth(32, 12 * 256 + 184);
-        sheet.setColumnWidth(33, 12 * 256 + 184);
-        sheet.setColumnWidth(34, 12 * 256 + 184);
+        sheet.setColumnWidth(33, "卡号".getBytes().length*4*256);
+        sheet.setColumnWidth(34, "开户支行".getBytes().length*4*256);
         sheet.setColumnWidth(35, 1 * 256 + 184);
 
         // 创建单元格对象
@@ -1157,9 +1200,8 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         cell = row1.createCell(34);
         cell.setCellValue("开户支行");
         cell.setCellStyle(styleDetail);
-
-
         rownum++;
+
         DecimalFormat decimalFormat=new DecimalFormat(".00");
         String compName = commonCompanyService.selectById(AuthSecurityUtils.getCurrentUserInfo().getCompId()).getCompName();
 
@@ -1173,6 +1215,7 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
             Double jiaorenliTotal = 0d;//热损伤合计
             Double netWeightTotal = 0d;//净重合计
             Double amountIngPayableTotal = 0d;//应收合计
+
             for (int i = 0; i < paymentManagement.getPaymentManagementList().size(); i++) {
                 PaymentManagement paymentManagement1 = paymentManagement.getPaymentManagementList().get(i);
                 paymentManagement1.setIdentityAuthenticationInfo(iIdentityAuthenticationInfoService.selectById(paymentManagement1.getIdentityId()));
@@ -1230,6 +1273,8 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
                 cell.setCellStyle(styleDetail);
                 HSSFDataFormat df = wb.createDataFormat(); // 此处设置数据格式
                 contextstyle.setDataFormat(df.getBuiltinFormat("#,##0.00"));//保留两位小数点
+                HSSFDataFormat df1 = wb.createDataFormat(); // 此处设置数据格式
+                contextstyle1.setDataFormat(df1.getBuiltinFormat("#,##0.00"));//保留两位小数点
                 cell = rowx.createCell(14);
                 cell.setCellValue(Double.parseDouble(paymentManagement1.getQualityInspectionManagement().getWaterContent()!=null?paymentManagement1.getQualityInspectionManagement().getWaterContent():"0"));
                 cell.setCellStyle(contextstyle);
@@ -1339,30 +1384,30 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
             //水分平均值
             cell = rowp.createCell(14);
             cell.setCellValue(waterContentTotal/netWeightTotal);
-            cell.setCellStyle(contextstyle);
+            cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(15);
             cell.setCellValue(impurityTotal/netWeightTotal);
-            cell.setCellStyle(contextstyle);
+            cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(16);
             cell.setCellValue(mildewGrainTotal/netWeightTotal);
-            cell.setCellStyle(contextstyle);
+            cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(17);
             cell.setCellValue(imperfectGrainTotal/netWeightTotal);
-            cell.setCellStyle(contextstyle);
+            cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(18);
             cell.setCellValue(bulkDensityTotal/netWeightTotal);
-            cell.setCellStyle(contextstyle);
+            cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(19);
             cell.setCellValue(jiaorenliTotal/netWeightTotal);
-            cell.setCellStyle(contextstyle);
+            cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(20);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(21);
             cell.setCellValue(paymentManagement.getPaymentManagementList().size());
-            cell.setCellStyle(styleDetail);
+            cell.setCellStyle(styleDetail1);
             cell = rowp.createCell(22);
             cell.setCellValue(amountIngPayableTotal/netWeightTotal);
-            cell.setCellStyle(contextstyle);
+            cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(23);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(24);
@@ -1372,7 +1417,7 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
             //净重合计
             cell = rowp.createCell(26);
             cell.setCellValue(netWeightTotal);
-            cell.setCellStyle(styleDetail);
+            cell.setCellStyle(styleDetail1);
             cell = rowp.createCell(27);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(28);
@@ -1381,7 +1426,7 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(30);
             cell.setCellValue(amountIngPayableTotal);
-            cell.setCellStyle(styleDetail);
+            cell.setCellStyle(styleDetail1);
             cell = rowp.createCell(31);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(32);

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

@@ -30,6 +30,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.httpclient.util.DateUtil;
 import org.apache.http.entity.ContentType;
 import org.apache.poi.hssf.usermodel.*;
+import org.apache.poi.hssf.util.HSSFColor;
 import org.apache.poi.ss.usermodel.IndexedColors;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.ss.util.CellRangeAddress;
@@ -1495,6 +1496,11 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         fontDetail.setFontName("宋体");
         fontDetail.setFontHeightInPoints((short) 12);
 
+        HSSFFont fontDetail1 = wb.createFont();
+        fontDetail1.setFontName("宋体");
+        fontDetail1.setFontHeightInPoints((short) 12);
+        fontDetail1.setColor(HSSFColor.RED.index);
+
         // title
         HSSFCellStyle styleTitle = wb.createCellStyle();
         // 指定单元格居中对齐
@@ -1569,6 +1575,42 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         // 下styleDetailTitle
         styleDetail.setBorderBottom(HSSFCellStyle.BORDER_THIN);
 
+        HSSFCellStyle styleDetail1 = wb.createCellStyle();
+        // 指定单元格居中对齐
+        styleDetail1.setAlignment(HSSFCellStyle.ALIGN_CENTER);
+        // 指定单元格垂直居中对齐
+        styleDetail1.setVerticalAlignment(HSSFCellStyle.VERTICAL_CENTER);
+        // 指定单元格自动换行
+        styleDetail1.setWrapText(true);
+        // 设置单元格字体
+        styleDetail1.setFont(fontDetail1);
+        // 右边框
+        styleDetail1.setBorderRight(HSSFCellStyle.BORDER_THIN);
+        // 左边框
+        styleDetail1.setBorderLeft(HSSFCellStyle.BORDER_THIN);
+        // 上边框
+        styleDetail1.setBorderTop(HSSFCellStyle.BORDER_THIN);
+        // 下styleDetailTitle
+        styleDetail1.setBorderBottom(HSSFCellStyle.BORDER_THIN);
+
+        HSSFCellStyle contextstyle1 = wb.createCellStyle();
+        // 指定单元格居中对齐
+        contextstyle1.setAlignment(HSSFCellStyle.ALIGN_CENTER);
+        // 指定单元格垂直居中对齐
+        contextstyle1.setVerticalAlignment(HSSFCellStyle.VERTICAL_CENTER);
+        // 指定单元格自动换行
+        contextstyle1.setWrapText(true);
+        // 设置单元格字体
+        contextstyle1.setFont(fontDetail1);
+        // 右边框
+        contextstyle1.setBorderRight(HSSFCellStyle.BORDER_THIN);
+        // 左边框
+        contextstyle1.setBorderLeft(HSSFCellStyle.BORDER_THIN);
+        // 上边框
+        contextstyle1.setBorderTop(HSSFCellStyle.BORDER_THIN);
+        // 下styleDetailTitle
+        contextstyle1.setBorderBottom(HSSFCellStyle.BORDER_THIN);
+
         HSSFCellStyle contextstyle = wb.createCellStyle();
         // 指定单元格居中对齐
         contextstyle.setAlignment(HSSFCellStyle.ALIGN_CENTER);
@@ -1629,16 +1671,16 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
 
         // 设置列宽
         sheet.setColumnWidth(0, 1 * 256 + 184);
-        sheet.setColumnWidth(1, 12 * 256 + 184);
-        sheet.setColumnWidth(2, 12 * 256 + 184);
+        sheet.setColumnWidth(1, "采购公司".getBytes().length*3*256);
+        sheet.setColumnWidth(2, "收货仓库".getBytes().length*25/10*256);
         sheet.setColumnWidth(3, 12 * 256 + 184);
-        sheet.setColumnWidth(4, 12 * 256 + 184);
-        sheet.setColumnWidth(5, 12 * 256 + 184);
-        sheet.setColumnWidth(6, 12 * 256 + 184);
+        sheet.setColumnWidth(4, "开票日期".getBytes().length*2*256);
+        sheet.setColumnWidth(5, "合同编号".getBytes().length*2*256);
+        sheet.setColumnWidth(6, "业务编号".getBytes().length*2*256);
         sheet.setColumnWidth(7, 12 * 256 + 184);
         sheet.setColumnWidth(8, 12 * 256 + 184);
         sheet.setColumnWidth(9, 12 * 256 + 184);
-        sheet.setColumnWidth(10, 12 * 256 + 184);
+        sheet.setColumnWidth(10, "货名".getBytes().length*3*256);
         sheet.setColumnWidth(11, 12 * 256 + 184);
         sheet.setColumnWidth(12, 12 * 256 + 184);
         sheet.setColumnWidth(13, 12 * 256 + 184);
@@ -1659,17 +1701,17 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         sheet.setColumnWidth(28, 12 * 256 + 184);
         sheet.setColumnWidth(29, 12 * 256 + 184);
         sheet.setColumnWidth(30, 12 * 256 + 184);
-        sheet.setColumnWidth(31, 12 * 256 + 184);
+        sheet.setColumnWidth(31, "发货库".getBytes().length*25/10*256);
         sheet.setColumnWidth(32, 12 * 256 + 184);
         sheet.setColumnWidth(33, 12 * 256 + 184);
         sheet.setColumnWidth(34, 12 * 256 + 184);
         sheet.setColumnWidth(35, 12 * 256 + 184);
         sheet.setColumnWidth(36, 12 * 256 + 184);
-        sheet.setColumnWidth(37, 12 * 256 + 184);
+        sheet.setColumnWidth(37, "合计应付".getBytes().length*2*256);
         sheet.setColumnWidth(38, 12 * 256 + 184);
         sheet.setColumnWidth(39, 12 * 256 + 184);
-        sheet.setColumnWidth(40, 12 * 256 + 184);
-        sheet.setColumnWidth(41, 12 * 256 + 184);
+        sheet.setColumnWidth(40, "卡号".getBytes().length*4*256);
+        sheet.setColumnWidth(41, "开户支行".getBytes().length*4*256);
         sheet.setColumnWidth(42, 1 * 256 + 184);
 
         // 创建单元格对象
@@ -2011,6 +2053,8 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 cell = rowx.createCell(26);
                 HSSFDataFormat df = wb.createDataFormat(); // 此处设置数据格式
                 contextstyle.setDataFormat(df.getBuiltinFormat("#,##0.00"));//保留两位小数点
+                HSSFDataFormat df1 = wb.createDataFormat(); // 此处设置数据格式
+                contextstyle1.setDataFormat(df1.getBuiltinFormat("#,##0.00"));//保留两位小数点
                 cell.setCellValue(Double.parseDouble(exportVView.getGrossWeight()));
                 cell.setCellStyle(contextstyle);
                 cell = rowx.createCell(27);
@@ -2103,27 +2147,27 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             //水分平均值
             cell = rowp.createCell(13);
             cell.setCellValue(waterContentTotal / netWeightTotal);
-            cell.setCellStyle(contextstyle);
+            cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(14);
             cell.setCellValue(impurityTotal / netWeightTotal);
-            cell.setCellStyle(contextstyle);
+            cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(15);
             cell.setCellValue(mildewGrainTotal / netWeightTotal);
-            cell.setCellStyle(contextstyle);
+            cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(16);
             cell.setCellValue(imperfectGrainTotal / netWeightTotal);
-            cell.setCellStyle(contextstyle);
+            cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(17);
             cell.setCellValue(bulkDensityTotal / netWeightTotal);
-            cell.setCellStyle(contextstyle);
+            cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(18);
             cell.setCellValue(jiaorenliTotal / netWeightTotal);
-            cell.setCellStyle(contextstyle);
+            cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(19);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(20);
             cell.setCellValue(dataList.size());
-            cell.setCellStyle(styleDetail);
+            cell.setCellStyle(styleDetail1);
             cell = rowp.createCell(21);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(22);
@@ -2134,7 +2178,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(25);
             cell.setCellValue(amountIngPayableTotal / netWeightTotal);
-            cell.setCellStyle(contextstyle);
+            cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(26);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(27);
@@ -2144,7 +2188,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             //纯重合计
             cell = rowp.createCell(29);
             cell.setCellValue(netWeightTotal);
-            cell.setCellStyle(contextstyle);
+            cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(30);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(31);
@@ -2161,7 +2205,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(37);
             cell.setCellValue(amountIngPayableTotal);
-            cell.setCellStyle(contextstyle);
+            cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(38);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(39);
@@ -2199,7 +2243,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
 
 
     /**
-     * 入库导出shouji
+     * 入库导出手机
      *
      * @param warehouseBaseInfo
      * @param response
@@ -2249,6 +2293,11 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         fontDetail.setFontName("宋体");
         fontDetail.setFontHeightInPoints((short) 12);
 
+        HSSFFont fontDetail1 = wb.createFont();
+        fontDetail1.setFontName("宋体");
+        fontDetail1.setFontHeightInPoints((short) 12);
+        fontDetail1.setColor(HSSFColor.RED.index);
+
         // title
         HSSFCellStyle styleTitle = wb.createCellStyle();
         // 指定单元格居中对齐
@@ -2323,6 +2372,24 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         // 下styleDetailTitle
         styleDetail.setBorderBottom(HSSFCellStyle.BORDER_THIN);
 
+        HSSFCellStyle styleDetail1 = wb.createCellStyle();
+        // 指定单元格居中对齐
+        styleDetail1.setAlignment(HSSFCellStyle.ALIGN_CENTER);
+        // 指定单元格垂直居中对齐
+        styleDetail1.setVerticalAlignment(HSSFCellStyle.VERTICAL_CENTER);
+        // 指定单元格自动换行
+        styleDetail1.setWrapText(true);
+        // 设置单元格字体
+        styleDetail1.setFont(fontDetail1);
+        // 右边框
+        styleDetail1.setBorderRight(HSSFCellStyle.BORDER_THIN);
+        // 左边框
+        styleDetail1.setBorderLeft(HSSFCellStyle.BORDER_THIN);
+        // 上边框
+        styleDetail1.setBorderTop(HSSFCellStyle.BORDER_THIN);
+        // 下styleDetailTitle
+        styleDetail1.setBorderBottom(HSSFCellStyle.BORDER_THIN);
+
         HSSFCellStyle contextstyle = wb.createCellStyle();
         // 指定单元格居中对齐
         contextstyle.setAlignment(HSSFCellStyle.ALIGN_CENTER);
@@ -2341,6 +2408,24 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         // 下styleDetailTitle
         contextstyle.setBorderBottom(HSSFCellStyle.BORDER_THIN);
 
+        HSSFCellStyle contextstyle1 = wb.createCellStyle();
+        // 指定单元格居中对齐
+        contextstyle1.setAlignment(HSSFCellStyle.ALIGN_CENTER);
+        // 指定单元格垂直居中对齐
+        contextstyle1.setVerticalAlignment(HSSFCellStyle.VERTICAL_CENTER);
+        // 指定单元格自动换行
+        contextstyle1.setWrapText(true);
+        // 设置单元格字体
+        contextstyle1.setFont(fontDetail1);
+        // 右边框
+        contextstyle1.setBorderRight(HSSFCellStyle.BORDER_THIN);
+        // 左边框
+        contextstyle1.setBorderLeft(HSSFCellStyle.BORDER_THIN);
+        // 上边框
+        contextstyle1.setBorderTop(HSSFCellStyle.BORDER_THIN);
+        // 下styleDetailTitle
+        contextstyle1.setBorderBottom(HSSFCellStyle.BORDER_THIN);
+
         HSSFCellStyle styleDetailYellow = wb.createCellStyle();
         // 指定单元格居中对齐
         styleDetailYellow.setAlignment(HSSFCellStyle.ALIGN_CENTER);
@@ -2383,16 +2468,16 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
 
         // 设置列宽
         sheet.setColumnWidth(0, 1 * 256 + 184);
-        sheet.setColumnWidth(1, 12 * 256 + 184);
-        sheet.setColumnWidth(2, 12 * 256 + 184);
+        sheet.setColumnWidth(1, "采购公司".getBytes().length*3*256);
+        sheet.setColumnWidth(2, "收货仓库".getBytes().length*25/10*256);
         sheet.setColumnWidth(3, 12 * 256 + 184);
-        sheet.setColumnWidth(4, 12 * 256 + 184);
-        sheet.setColumnWidth(5, 12 * 256 + 184);
-        sheet.setColumnWidth(6, 12 * 256 + 184);
+        sheet.setColumnWidth(4, "开票日期".getBytes().length*2*256);
+        sheet.setColumnWidth(5, "合同编号".getBytes().length*2*256);
+        sheet.setColumnWidth(6, "业务编号".getBytes().length*2*256);
         sheet.setColumnWidth(7, 12 * 256 + 184);
         sheet.setColumnWidth(8, 12 * 256 + 184);
         sheet.setColumnWidth(9, 12 * 256 + 184);
-        sheet.setColumnWidth(10, 12 * 256 + 184);
+        sheet.setColumnWidth(10, "货名".getBytes().length*3*256);
         sheet.setColumnWidth(11, 12 * 256 + 184);
         sheet.setColumnWidth(12, 12 * 256 + 184);
         sheet.setColumnWidth(13, 12 * 256 + 184);
@@ -2413,17 +2498,17 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         sheet.setColumnWidth(28, 12 * 256 + 184);
         sheet.setColumnWidth(29, 12 * 256 + 184);
         sheet.setColumnWidth(30, 12 * 256 + 184);
-        sheet.setColumnWidth(31, 12 * 256 + 184);
+        sheet.setColumnWidth(31, "发货库".getBytes().length*25/10*256);
         sheet.setColumnWidth(32, 12 * 256 + 184);
         sheet.setColumnWidth(33, 12 * 256 + 184);
         sheet.setColumnWidth(34, 12 * 256 + 184);
         sheet.setColumnWidth(35, 12 * 256 + 184);
         sheet.setColumnWidth(36, 12 * 256 + 184);
-        sheet.setColumnWidth(37, 12 * 256 + 184);
+        sheet.setColumnWidth(37, "合计应付".getBytes().length*2*256);
         sheet.setColumnWidth(38, 12 * 256 + 184);
         sheet.setColumnWidth(39, 12 * 256 + 184);
-        sheet.setColumnWidth(40, 12 * 256 + 184);
-        sheet.setColumnWidth(41, 12 * 256 + 184);
+        sheet.setColumnWidth(40, "卡号".getBytes().length*4*256);
+        sheet.setColumnWidth(41, "开户支行".getBytes().length*4*256);
         sheet.setColumnWidth(42, 1 * 256 + 184);
 
         // 创建单元格对象
@@ -2765,6 +2850,8 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 cell = rowx.createCell(26);
                 HSSFDataFormat df = wb.createDataFormat(); // 此处设置数据格式
                 contextstyle.setDataFormat(df.getBuiltinFormat("#,##0.00"));//保留两位小数点
+                HSSFDataFormat df1 = wb.createDataFormat(); // 此处设置数据格式
+                contextstyle1.setDataFormat(df1.getBuiltinFormat("#,##0.00"));//保留两位小数点
                 cell.setCellValue(Double.parseDouble(exportVView.getGrossWeight()));
                 cell.setCellStyle(contextstyle);
                 cell = rowx.createCell(27);
@@ -2857,27 +2944,27 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             //水分平均值
             cell = rowp.createCell(13);
             cell.setCellValue(waterContentTotal / netWeightTotal);
-            cell.setCellStyle(contextstyle);
+            cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(14);
             cell.setCellValue(impurityTotal / netWeightTotal);
-            cell.setCellStyle(contextstyle);
+            cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(15);
             cell.setCellValue(mildewGrainTotal / netWeightTotal);
-            cell.setCellStyle(contextstyle);
+            cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(16);
             cell.setCellValue(imperfectGrainTotal / netWeightTotal);
-            cell.setCellStyle(contextstyle);
+            cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(17);
             cell.setCellValue(bulkDensityTotal / netWeightTotal);
-            cell.setCellStyle(contextstyle);
+            cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(18);
             cell.setCellValue(jiaorenliTotal / netWeightTotal);
-            cell.setCellStyle(contextstyle);
+            cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(19);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(20);
             cell.setCellValue(dataList.size());
-            cell.setCellStyle(styleDetail);
+            cell.setCellStyle(styleDetail1);
             cell = rowp.createCell(21);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(22);
@@ -2888,7 +2975,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(25);
             cell.setCellValue(amountIngPayableTotal / netWeightTotal);
-            cell.setCellStyle(contextstyle);
+            cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(26);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(27);
@@ -2898,7 +2985,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             //纯重合计
             cell = rowp.createCell(29);
             cell.setCellValue(netWeightTotal);
-            cell.setCellStyle(contextstyle);
+            cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(30);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(31);
@@ -2915,7 +3002,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(37);
             cell.setCellValue(amountIngPayableTotal);
-            cell.setCellStyle(contextstyle);
+            cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(38);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(39);
@@ -3002,6 +3089,11 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         fontDetail.setFontName("宋体");
         fontDetail.setFontHeightInPoints((short) 12);
 
+        HSSFFont fontDetail1 = wb.createFont();
+        fontDetail1.setFontName("宋体");
+        fontDetail1.setFontHeightInPoints((short) 12);
+        fontDetail1.setColor(HSSFColor.RED.index);
+
         // title
         HSSFCellStyle styleTitle = wb.createCellStyle();
         // 指定单元格居中对齐
@@ -3076,6 +3168,24 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         // 下styleDetailTitle
         styleDetail.setBorderBottom(HSSFCellStyle.BORDER_THIN);
 
+        HSSFCellStyle styleDetail1 = wb.createCellStyle();
+        // 指定单元格居中对齐
+        styleDetail1.setAlignment(HSSFCellStyle.ALIGN_CENTER);
+        // 指定单元格垂直居中对齐
+        styleDetail1.setVerticalAlignment(HSSFCellStyle.VERTICAL_CENTER);
+        // 指定单元格自动换行
+        styleDetail1.setWrapText(true);
+        // 设置单元格字体
+        styleDetail1.setFont(fontDetail1);
+        // 右边框
+        styleDetail1.setBorderRight(HSSFCellStyle.BORDER_THIN);
+        // 左边框
+        styleDetail1.setBorderLeft(HSSFCellStyle.BORDER_THIN);
+        // 上边框
+        styleDetail1.setBorderTop(HSSFCellStyle.BORDER_THIN);
+        // 下styleDetailTitle
+        styleDetail1.setBorderBottom(HSSFCellStyle.BORDER_THIN);
+
         HSSFCellStyle contextstyle = wb.createCellStyle();
         // 指定单元格居中对齐
         contextstyle.setAlignment(HSSFCellStyle.ALIGN_CENTER);
@@ -3094,6 +3204,24 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         // 下styleDetailTitle
         contextstyle.setBorderBottom(HSSFCellStyle.BORDER_THIN);
 
+        HSSFCellStyle contextstyle1 = wb.createCellStyle();
+        // 指定单元格居中对齐
+        contextstyle1.setAlignment(HSSFCellStyle.ALIGN_CENTER);
+        // 指定单元格垂直居中对齐
+        contextstyle1.setVerticalAlignment(HSSFCellStyle.VERTICAL_CENTER);
+        // 指定单元格自动换行
+        contextstyle1.setWrapText(true);
+        // 设置单元格字体
+        contextstyle1.setFont(fontDetail1);
+        // 右边框
+        contextstyle1.setBorderRight(HSSFCellStyle.BORDER_THIN);
+        // 左边框
+        contextstyle1.setBorderLeft(HSSFCellStyle.BORDER_THIN);
+        // 上边框
+        contextstyle1.setBorderTop(HSSFCellStyle.BORDER_THIN);
+        // 下styleDetailTitle
+        contextstyle1.setBorderBottom(HSSFCellStyle.BORDER_THIN);
+
         HSSFCellStyle styleDetailYellow = wb.createCellStyle();
         // 指定单元格居中对齐
         styleDetailYellow.setAlignment(HSSFCellStyle.ALIGN_CENTER);
@@ -3136,17 +3264,17 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
 
         // 设置列宽
         sheet.setColumnWidth(0, 1 * 256 + 184);
-        sheet.setColumnWidth(1, 12 * 256 + 184);
-        sheet.setColumnWidth(2, 12 * 256 + 184);
+        sheet.setColumnWidth(1, "销售公司".getBytes().length*3*256);
+        sheet.setColumnWidth(2, "发货仓库".getBytes().length*25/10*256);
         sheet.setColumnWidth(3, 12 * 256 + 184);
         sheet.setColumnWidth(4, 12 * 256 + 184);
-        sheet.setColumnWidth(5, 12 * 256 + 184);
-        sheet.setColumnWidth(6, 12 * 256 + 184);
+        sheet.setColumnWidth(5, "发货日期".getBytes().length*2*256);
+        sheet.setColumnWidth(6, "合同编号".getBytes().length*2*256);
         sheet.setColumnWidth(7, 12 * 256 + 184);
         sheet.setColumnWidth(8, 12 * 256 + 184);
         sheet.setColumnWidth(9, 12 * 256 + 184);
-        sheet.setColumnWidth(10, 12 * 256 + 184);
-        sheet.setColumnWidth(11, 12 * 256 + 184);
+        sheet.setColumnWidth(10, "客户".getBytes().length*6*256);
+        sheet.setColumnWidth(11, "货名".getBytes().length*3*256);
         sheet.setColumnWidth(12, 12 * 256 + 184);
         sheet.setColumnWidth(13, 12 * 256 + 184);
         sheet.setColumnWidth(14, 12 * 256 + 184);
@@ -3168,7 +3296,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         sheet.setColumnWidth(30, 12 * 256 + 184);
         sheet.setColumnWidth(31, 12 * 256 + 184);
         sheet.setColumnWidth(32, 12 * 256 + 184);
-        sheet.setColumnWidth(33, 12 * 256 + 184);
+        sheet.setColumnWidth(33, "反馈日期".getBytes().length*2*256);
         sheet.setColumnWidth(34, 12 * 256 + 184);
         sheet.setColumnWidth(35, 12 * 256 + 184);
         sheet.setColumnWidth(36, 12 * 256 + 184);
@@ -3178,7 +3306,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         sheet.setColumnWidth(40, 12 * 256 + 184);
         sheet.setColumnWidth(41, 12 * 256 + 184);
         sheet.setColumnWidth(42, 12 * 256 + 184);
-        sheet.setColumnWidth(43, 12 * 256 + 184);
+        sheet.setColumnWidth(43, "收款日期".getBytes().length*2*256);
         sheet.setColumnWidth(44, 12 * 256 + 184);
         sheet.setColumnWidth(45, 12 * 256 + 184);
         sheet.setColumnWidth(46, 1 * 256 + 184);
@@ -3545,6 +3673,8 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 cell.setCellStyle(styleDetail);
                 HSSFDataFormat df = wb.createDataFormat(); // 此处设置数据格式
                 contextstyle.setDataFormat(df.getBuiltinFormat("#,##0.00"));//保留两位小数点
+                HSSFDataFormat df1 = wb.createDataFormat(); // 此处设置数据格式
+                contextstyle1.setDataFormat(df1.getBuiltinFormat("#,##0.00"));//保留两位小数点
                 cell = rowx.createCell(29);
                 cell.setCellValue(Double.parseDouble(exportVView.getGrossWeight()));
                 cell.setCellStyle(contextstyle);
@@ -3633,7 +3763,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(9);
             cell.setCellValue(netWeightPriceTotal / dataList.size());
-            cell.setCellStyle(contextstyle);
+            cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(10);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(11);
@@ -3644,23 +3774,23 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             cell.setCellStyle(styleDetail);
             //水分平均值
             cell = rowp.createCell(14);
-            cell.setCellStyle(contextstyle);
+            cell.setCellStyle(contextstyle1);
             cell.setCellValue(waterContentTotal / netWeightTotal);
             cell = rowp.createCell(15);
             cell.setCellValue(impurityTotal / netWeightTotal);
-            cell.setCellStyle(contextstyle);
+            cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(16);
             cell.setCellValue(mildewGrainTotal / netWeightTotal);
-            cell.setCellStyle(contextstyle);
+            cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(17);
             cell.setCellValue(imperfectGrainTotal / netWeightTotal);
-            cell.setCellStyle(contextstyle);
+            cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(18);
             cell.setCellValue(bulkDensityTotal / netWeightTotal);
-            cell.setCellStyle(contextstyle);
+            cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(19);
             cell.setCellValue(jiaorenliTotal / netWeightTotal);
-            cell.setCellStyle(contextstyle);
+            cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(20);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(21);
@@ -3679,7 +3809,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(28);
             cell.setCellValue(dataList.size());
-            cell.setCellStyle(styleDetail);
+            cell.setCellStyle(styleDetail1);
             cell = rowp.createCell(29);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(30);
@@ -3687,7 +3817,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             //纯重合计
             cell = rowp.createCell(31);
             cell.setCellValue(netWeightTotal);
-            cell.setCellStyle(contextstyle);
+            cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(32);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(33);
@@ -3706,7 +3836,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(40);
             cell.setCellValue(amountIngPayableTotal);
-            cell.setCellStyle(contextstyle);
+            cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(41);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(42);
@@ -3795,6 +3925,11 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         fontDetail.setFontName("宋体");
         fontDetail.setFontHeightInPoints((short) 12);
 
+        HSSFFont fontDetail1 = wb.createFont();
+        fontDetail1.setFontName("宋体");
+        fontDetail1.setFontHeightInPoints((short) 12);
+        fontDetail1.setColor(HSSFColor.RED.index);
+
         // title
         HSSFCellStyle styleTitle = wb.createCellStyle();
         // 指定单元格居中对齐
@@ -3869,6 +4004,24 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         // 下styleDetailTitle
         styleDetail.setBorderBottom(HSSFCellStyle.BORDER_THIN);
 
+        HSSFCellStyle styleDetail1 = wb.createCellStyle();
+        // 指定单元格居中对齐
+        styleDetail1.setAlignment(HSSFCellStyle.ALIGN_CENTER);
+        // 指定单元格垂直居中对齐
+        styleDetail1.setVerticalAlignment(HSSFCellStyle.VERTICAL_CENTER);
+        // 指定单元格自动换行
+        styleDetail1.setWrapText(true);
+        // 设置单元格字体
+        styleDetail1.setFont(fontDetail1);
+        // 右边框
+        styleDetail1.setBorderRight(HSSFCellStyle.BORDER_THIN);
+        // 左边框
+        styleDetail1.setBorderLeft(HSSFCellStyle.BORDER_THIN);
+        // 上边框
+        styleDetail1.setBorderTop(HSSFCellStyle.BORDER_THIN);
+        // 下styleDetailTitle
+        styleDetail1.setBorderBottom(HSSFCellStyle.BORDER_THIN);
+
         HSSFCellStyle contextstyle = wb.createCellStyle();
         // 指定单元格居中对齐
         contextstyle.setAlignment(HSSFCellStyle.ALIGN_CENTER);
@@ -3887,6 +4040,24 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         // 下styleDetailTitle
         contextstyle.setBorderBottom(HSSFCellStyle.BORDER_THIN);
 
+        HSSFCellStyle contextstyle1 = wb.createCellStyle();
+        // 指定单元格居中对齐
+        contextstyle1.setAlignment(HSSFCellStyle.ALIGN_CENTER);
+        // 指定单元格垂直居中对齐
+        contextstyle1.setVerticalAlignment(HSSFCellStyle.VERTICAL_CENTER);
+        // 指定单元格自动换行
+        contextstyle1.setWrapText(true);
+        // 设置单元格字体
+        contextstyle1.setFont(fontDetail1);
+        // 右边框
+        contextstyle1.setBorderRight(HSSFCellStyle.BORDER_THIN);
+        // 左边框
+        contextstyle1.setBorderLeft(HSSFCellStyle.BORDER_THIN);
+        // 上边框
+        contextstyle1.setBorderTop(HSSFCellStyle.BORDER_THIN);
+        // 下styleDetailTitle
+        contextstyle1.setBorderBottom(HSSFCellStyle.BORDER_THIN);
+
         HSSFCellStyle styleDetailYellow = wb.createCellStyle();
         // 指定单元格居中对齐
         styleDetailYellow.setAlignment(HSSFCellStyle.ALIGN_CENTER);
@@ -3929,17 +4100,17 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
 
         // 设置列宽
         sheet.setColumnWidth(0, 1 * 256 + 184);
-        sheet.setColumnWidth(1, 12 * 256 + 184);
-        sheet.setColumnWidth(2, 12 * 256 + 184);
+        sheet.setColumnWidth(1, "销售公司".getBytes().length*3*256);
+        sheet.setColumnWidth(2, "发货仓库".getBytes().length*25/10*256);
         sheet.setColumnWidth(3, 12 * 256 + 184);
         sheet.setColumnWidth(4, 12 * 256 + 184);
-        sheet.setColumnWidth(5, 12 * 256 + 184);
-        sheet.setColumnWidth(6, 12 * 256 + 184);
+        sheet.setColumnWidth(5, "发货日期".getBytes().length*2*256);
+        sheet.setColumnWidth(6, "合同编号".getBytes().length*2*256);
         sheet.setColumnWidth(7, 12 * 256 + 184);
         sheet.setColumnWidth(8, 12 * 256 + 184);
         sheet.setColumnWidth(9, 12 * 256 + 184);
-        sheet.setColumnWidth(10, 12 * 256 + 184);
-        sheet.setColumnWidth(11, 12 * 256 + 184);
+        sheet.setColumnWidth(10, "客户".getBytes().length*6*256);
+        sheet.setColumnWidth(11, "货名".getBytes().length*3*256);
         sheet.setColumnWidth(12, 12 * 256 + 184);
         sheet.setColumnWidth(13, 12 * 256 + 184);
         sheet.setColumnWidth(14, 12 * 256 + 184);
@@ -3961,7 +4132,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         sheet.setColumnWidth(30, 12 * 256 + 184);
         sheet.setColumnWidth(31, 12 * 256 + 184);
         sheet.setColumnWidth(32, 12 * 256 + 184);
-        sheet.setColumnWidth(33, 12 * 256 + 184);
+        sheet.setColumnWidth(33, "反馈日期".getBytes().length*2*256);
         sheet.setColumnWidth(34, 12 * 256 + 184);
         sheet.setColumnWidth(35, 12 * 256 + 184);
         sheet.setColumnWidth(36, 12 * 256 + 184);
@@ -3971,7 +4142,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         sheet.setColumnWidth(40, 12 * 256 + 184);
         sheet.setColumnWidth(41, 12 * 256 + 184);
         sheet.setColumnWidth(42, 12 * 256 + 184);
-        sheet.setColumnWidth(43, 12 * 256 + 184);
+        sheet.setColumnWidth(43, "收款日期".getBytes().length*2*256);
         sheet.setColumnWidth(44, 12 * 256 + 184);
         sheet.setColumnWidth(45, 12 * 256 + 184);
         sheet.setColumnWidth(46, 1 * 256 + 184);
@@ -4338,6 +4509,8 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 cell.setCellStyle(styleDetail);
                 HSSFDataFormat df = wb.createDataFormat(); // 此处设置数据格式
                 contextstyle.setDataFormat(df.getBuiltinFormat("#,##0.00"));//保留两位小数点
+                HSSFDataFormat df1 = wb.createDataFormat(); // 此处设置数据格式
+                contextstyle1.setDataFormat(df1.getBuiltinFormat("#,##0.00"));//保留两位小数点
                 cell = rowx.createCell(29);
                 cell.setCellValue(Double.parseDouble(exportVView.getGrossWeight()));
                 cell.setCellStyle(contextstyle);
@@ -4426,7 +4599,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(9);
             cell.setCellValue(netWeightPriceTotal / dataList.size());
-            cell.setCellStyle(contextstyle);
+            cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(10);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(11);
@@ -4437,23 +4610,23 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             cell.setCellStyle(styleDetail);
             //水分平均值
             cell = rowp.createCell(14);
-            cell.setCellStyle(contextstyle);
+            cell.setCellStyle(contextstyle1);
             cell.setCellValue(waterContentTotal / netWeightTotal);
             cell = rowp.createCell(15);
             cell.setCellValue(impurityTotal / netWeightTotal);
-            cell.setCellStyle(contextstyle);
+            cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(16);
             cell.setCellValue(mildewGrainTotal / netWeightTotal);
-            cell.setCellStyle(contextstyle);
+            cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(17);
             cell.setCellValue(imperfectGrainTotal / netWeightTotal);
-            cell.setCellStyle(contextstyle);
+            cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(18);
             cell.setCellValue(bulkDensityTotal / netWeightTotal);
-            cell.setCellStyle(contextstyle);
+            cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(19);
             cell.setCellValue(jiaorenliTotal / netWeightTotal);
-            cell.setCellStyle(contextstyle);
+            cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(20);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(21);
@@ -4472,7 +4645,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(28);
             cell.setCellValue(dataList.size());
-            cell.setCellStyle(styleDetail);
+            cell.setCellStyle(styleDetail1);
             cell = rowp.createCell(29);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(30);
@@ -4480,7 +4653,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             //纯重合计
             cell = rowp.createCell(31);
             cell.setCellValue(netWeightTotal);
-            cell.setCellStyle(contextstyle);
+            cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(32);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(33);
@@ -4499,7 +4672,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(40);
             cell.setCellValue(amountIngPayableTotal);
-            cell.setCellStyle(contextstyle);
+            cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(41);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(42);