修改导出

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

@@ -955,7 +955,8 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         sheet.setColumnWidth(31, 12 * 256 + 184);
         sheet.setColumnWidth(32, 12 * 256 + 184);
         sheet.setColumnWidth(33, 12 * 256 + 184);
-        sheet.setColumnWidth(34, 1 * 256 + 184);
+        sheet.setColumnWidth(34, 12 * 256 + 184);
+        sheet.setColumnWidth(35, 1 * 256 + 184);
 
         // 创建单元格对象
         HSSFCell cell = null;
@@ -1043,6 +1044,8 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         cell.setCellStyle(styleTitle);
         cell = row0.createCell(33);
         cell.setCellStyle(styleTitle);
+        cell = row0.createCell(34);
+        cell.setCellStyle(styleTitle);
         rownum++;
 
         HSSFRow row1 = sheet.createRow((int) rownum);
@@ -1108,42 +1111,45 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         cell.setCellValue("车牌号");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(21);
-        cell.setCellValue("净重单价");
+        cell.setCellValue("车数");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(22);
-        cell.setCellValue("毛重");
+        cell.setCellValue("净重单价");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(23);
-        cell.setCellValue("皮重");
+        cell.setCellValue("毛重");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(24);
-        cell.setCellValue("扣重");
+        cell.setCellValue("皮重");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(25);
-        cell.setCellValue("净重");
+        cell.setCellValue("扣重");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(26);
-        cell.setCellValue("扣单价");
+        cell.setCellValue("净重");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(27);
-        cell.setCellValue("纯重单价");
+        cell.setCellValue("扣单价");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(28);
-        cell.setCellValue("纯重");
+        cell.setCellValue("纯重单价");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(29);
-        cell.setCellValue("合计应付");
+        cell.setCellValue("纯重");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(30);
-        cell.setCellValue("实付金额");
+        cell.setCellValue("合计应付");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(31);
-        cell.setCellValue("姓名");
+        cell.setCellValue("实付金额");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(32);
-        cell.setCellValue("卡号");
+        cell.setCellValue("姓名");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(33);
+        cell.setCellValue("卡号");
+        cell.setCellStyle(styleDetail);
+        cell = row1.createCell(34);
         cell.setCellValue("开户支行");
         cell.setCellStyle(styleDetail);
 
@@ -1241,50 +1247,45 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
                 cell.setCellValue(editString(paymentManagement1.getCarNo()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(21);
-//                if("潮粮".equals(paymentManagement1.getType())){
-//                    cell.setCellValue(new Formatter().format("%.3f", editFloat(paymentManagement1.getTidalGrainPrice())).toString());
-//
-//                }
-//                else{
-//                    cell.setCellValue(new Formatter().format("%.3f", editFloat(paymentManagement1.getSolidGrainPrice())).toString());
-//
-//                }
-                cell.setCellValue(new Formatter().format("%.3f", editFloat(paymentManagement1.getTidalGrainPrice())).toString());
+                cell.setCellValue("1");
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(22);
-                cell.setCellValue(editFloat(paymentManagement1.getGrossWeight()));
+                cell.setCellValue(new Formatter().format("%.3f", editFloat(paymentManagement1.getTidalGrainPrice())).toString());
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(23);
-                cell.setCellValue(editFloat(paymentManagement1.getTare()));
+                cell.setCellValue(editFloat(paymentManagement1.getGrossWeight()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(24);
-                cell.setCellValue(new Formatter().format("%.2f", editFloat(paymentManagement1.getWeightDeduction())).toString());
+                cell.setCellValue(editFloat(paymentManagement1.getTare()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(25);
-                cell.setCellValue(editFloat(paymentManagement1.getNetWeight()));
+                cell.setCellValue(new Formatter().format("%.2f", editFloat(paymentManagement1.getWeightDeduction())).toString());
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(26);
-                cell.setCellValue(editDouble(paymentManagement1.getUnitDeduction()));
+                cell.setCellValue(editFloat(paymentManagement1.getNetWeight()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(27);
-                cell.setCellValue(new Formatter().format("%.2f", editFloat(paymentManagement1.getSolidGrainPrice())).toString());
+                cell.setCellValue(editDouble(paymentManagement1.getUnitDeduction()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(28);
-                cell.setCellValue(editFloat(paymentManagement1.getPureWeight()));
+                cell.setCellValue(new Formatter().format("%.2f", editFloat(paymentManagement1.getSolidGrainPrice())).toString());
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(29);
-                cell.setCellValue(editDouble(paymentManagement1.getAmountIngPayable()));
+                cell.setCellValue(editFloat(paymentManagement1.getPureWeight()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(30);
-                cell.setCellValue(editDouble(paymentManagement1.getAmountEdPayable()));
+                cell.setCellValue(editDouble(paymentManagement1.getAmountIngPayable()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(31);
-                cell.setCellValue(editString(paymentManagement1.getCustomerName()));
+                cell.setCellValue(editDouble(paymentManagement1.getAmountEdPayable()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(32);
-                cell.setCellValue(editString(paymentManagement1.getIdentityAuthenticationInfo().getBankCard()));
+                cell.setCellValue(editString(paymentManagement1.getCustomerName()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(33);
+                cell.setCellValue(editString(paymentManagement1.getIdentityAuthenticationInfo().getBankCard()));
+                cell.setCellStyle(styleDetail);
+                cell = rowx.createCell(34);
                 cell.setCellValue(editString(paymentManagement1.getIdentityAuthenticationInfo().getBankDeposit() + "-" +paymentManagement1.getIdentityAuthenticationInfo().getBankDepositBranch()));
                 cell.setCellStyle(styleDetail);
 
@@ -1352,28 +1353,29 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
             cell = rowp.createCell(20);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(21);
+            cell.setCellValue(paymentManagement.getPaymentManagementList().size());
+            cell.setCellStyle(styleDetail);
+            cell = rowp.createCell(22);
             cell.setCellValue(amountIngPayableTotal/netWeightTotal);
             cell.setCellStyle(contextstyle);
-            cell = rowp.createCell(22);
-            cell.setCellStyle(styleDetail);
             cell = rowp.createCell(23);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(24);
             cell.setCellStyle(styleDetail);
-            //净重合计
             cell = rowp.createCell(25);
-            cell.setCellValue(netWeightTotal);
             cell.setCellStyle(styleDetail);
+            //净重合计
             cell = rowp.createCell(26);
+            cell.setCellValue(netWeightTotal);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(27);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(28);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(29);
-            cell.setCellValue(amountIngPayableTotal);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(30);
+            cell.setCellValue(amountIngPayableTotal);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(31);
             cell.setCellStyle(styleDetail);
@@ -1381,6 +1383,8 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(33);
             cell.setCellStyle(styleDetail);
+            cell = rowp.createCell(34);
+            cell.setCellStyle(styleDetail);
         }
 
 

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

@@ -1653,7 +1653,8 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         sheet.setColumnWidth(38, 12 * 256 + 184);
         sheet.setColumnWidth(39, 12 * 256 + 184);
         sheet.setColumnWidth(40, 12 * 256 + 184);
-        sheet.setColumnWidth(41, 1 * 256 + 184);
+        sheet.setColumnWidth(41, 12 * 256 + 184);
+        sheet.setColumnWidth(42, 1 * 256 + 184);
 
         // 创建单元格对象
         HSSFCell cell = null;
@@ -1755,6 +1756,8 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         cell.setCellStyle(styleTitle);
         cell = row0.createCell(40);
         cell.setCellStyle(styleTitle);
+        cell = row0.createCell(41);
+        cell.setCellStyle(styleTitle);
         rownum++;
 
         HSSFRow row1 = sheet.createRow((int) rownum);
@@ -1817,66 +1820,69 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         cell.setCellValue("车牌号");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(20);
-        cell.setCellValue("箱号1");
+        cell.setCellValue("车数");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(21);
-        cell.setCellValue("箱号2");
+        cell.setCellValue("箱号1");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(22);
-        cell.setCellValue("封号1");
+        cell.setCellValue("箱号2");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(23);
-        cell.setCellValue("封号2");
+        cell.setCellValue("封号1");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(24);
+        cell.setCellValue("封号2");
+        cell.setCellStyle(styleDetail);
+        cell = row1.createCell(25);
         cell.setCellValue("净重单价");
         cell.setCellStyle(contextstyle);
-        cell = row1.createCell(25);
+        cell = row1.createCell(26);
         cell.setCellValue("毛重");
         cell.setCellStyle(styleDetail);
-        cell = row1.createCell(26);
+        cell = row1.createCell(27);
         cell.setCellValue("皮重");
         cell.setCellStyle(styleDetail);
-        cell = row1.createCell(27);
+        cell = row1.createCell(28);
         cell.setCellValue("扣重");
         cell.setCellStyle(styleDetail);
-        cell = row1.createCell(28);
+        cell = row1.createCell(29);
         cell.setCellValue("净重");
         cell.setCellStyle(styleDetail);
-        cell = row1.createCell(29);
+        cell = row1.createCell(30);
         cell.setCellValue("发货净重");
         cell.setCellStyle(styleDetail);
-        cell = row1.createCell(30);
+        cell = row1.createCell(31);
         cell.setCellValue("发货库");
         cell.setCellStyle(styleDetail);
-        cell = row1.createCell(31);
+        cell = row1.createCell(32);
         cell.setCellValue("运输单价");
         cell.setCellStyle(styleDetail);
-        cell = row1.createCell(32);
+        cell = row1.createCell(33);
         cell.setCellValue("运费");
         cell.setCellStyle(styleDetail);
-        cell = row1.createCell(33);
+        cell = row1.createCell(34);
         cell.setCellValue("扣单价");
         cell.setCellStyle(styleDetail);
-        cell = row1.createCell(34);
+        cell = row1.createCell(35);
         cell.setCellValue("纯重单价");
         cell.setCellStyle(styleDetail);
-        cell = row1.createCell(35);
+        cell = row1.createCell(36);
         cell.setCellValue("纯重");
         cell.setCellStyle(styleDetail);
-        cell = row1.createCell(36);
+        cell = row1.createCell(37);
         cell.setCellValue("合计应付");
         cell.setCellStyle(styleDetail);
-        cell = row1.createCell(37);
+        cell = row1.createCell(38);
         cell.setCellValue("实付金额");
         cell.setCellStyle(styleDetail);
-        cell = row1.createCell(38);
+        cell = row1.createCell(39);
         cell.setCellValue("姓名");
         cell.setCellStyle(styleDetail);
-        cell = row1.createCell(39);
+        cell = row1.createCell(40);
         cell.setCellValue("卡号");
         cell.setCellStyle(styleDetail);
-        cell = row1.createCell(40);
+        cell = row1.createCell(41);
         cell.setCellValue("开户支行");
         cell.setCellStyle(styleDetail);
 
@@ -1889,7 +1895,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         pageView.put("startDate", warehouseBaseInfo.getStartDate());
         pageView.put("endDate", warehouseBaseInfo.getEndDate());
         pageView.put("warehouseName", warehouseBaseInfo.getWarehouseName());
-        // 查询服务商总数
+        // 查询入库记录总数
         List<ExportVView> dataList = baseMapper.getListByCondition(pageView);
         // 详情信息
         if (!CollectionUtils.isEmpty(dataList)) {
@@ -1899,7 +1905,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             Double imperfectGrainTotal = 0d;//不完善粒合计
             Double bulkDensityTotal = 0d;//容重合计
             Double jiaorenliTotal = 0d;//热损伤合计
-//            Double netWeightPriceTotal = 0d;//净重单价合计
+            Double carTotal = 0d;//车数合计
             Double netWeightTotal = 0d;//净重合计
             Double amountIngPayableTotal = 0d;//合计应付合计
             for (int i = 0; i < dataList.size(); i++) {
@@ -1969,69 +1975,72 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 cell.setCellValue(editString(exportVView.getCarNo()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(20);
-                cell.setCellValue(editString(exportVView.getBoxNo()));
+                cell.setCellValue("1");
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(21);
-                cell.setCellValue(editString(exportVView.getBoxNoOther()));
+                cell.setCellValue(editString(exportVView.getBoxNo()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(22);
-                cell.setCellValue(editString(exportVView.getTitleNo()));
+                cell.setCellValue(editString(exportVView.getBoxNoOther()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(23);
-                cell.setCellValue(editString(exportVView.getTitleNoOther()));
+                cell.setCellValue(editString(exportVView.getTitleNo()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(24);
+                cell.setCellValue(editString(exportVView.getTitleNoOther()));
+                cell.setCellStyle(styleDetail);
+                cell = rowx.createCell(25);
                 cell.setCellValue(Double.parseDouble(exportVView.getNetWeightPrice()!=null?exportVView.getNetWeightPrice():"0"));
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(25);
+                cell = rowx.createCell(26);
                 HSSFDataFormat df = wb.createDataFormat(); // 此处设置数据格式
                 contextstyle.setDataFormat(df.getBuiltinFormat("#,##0.00"));//保留两位小数点
                 cell.setCellValue(Double.parseDouble(exportVView.getGrossWeight()));
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(26);
+                cell = rowx.createCell(27);
                 cell.setCellValue(Double.parseDouble(exportVView.getTare()));
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(27);
+                cell = rowx.createCell(28);
                 cell.setCellValue(editFloat(exportVView.getBuckleWeight()));
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(28);
+                cell = rowx.createCell(29);
                 cell.setCellValue(Double.parseDouble(exportVView.getNetWeight()));
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(29);
+                cell = rowx.createCell(30);
                 cell.setCellValue(editDouble(exportVView.getDeliveryVolume()));
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(30);
+                cell = rowx.createCell(31);
                 cell.setCellValue(editString(exportVView.getSendWarehouse()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(31);
+                cell = rowx.createCell(32);
                 cell.setCellValue(new Formatter().format("%.2f", editDouble(exportVView.getTranPrice())).toString());
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(32);
+                cell = rowx.createCell(33);
                 cell.setCellValue(editFloat(exportVView.getFreight()));
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(33);
+                cell = rowx.createCell(34);
                 cell.setCellValue(editDouble(exportVView.getUnitDeduction()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(34);
+                cell = rowx.createCell(35);
                 cell.setCellValue(new Formatter().format("%.3f", editDouble(exportVView.getPureWeightPrice())).toString());
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(35);
+                cell = rowx.createCell(36);
                 cell.setCellValue(editFloat(exportVView.getPureWeight()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(36);
+                cell = rowx.createCell(37);
                 cell.setCellValue(editDouble(exportVView.getAmountIngPayable()));
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(37);
+                cell = rowx.createCell(38);
                 cell.setCellValue(new Formatter().format("%.2f", editDouble(exportVView.getAmountEdPayable())).toString());
 //                cell.setCellValue(editDouble(exportVView.getAmountEdPayable()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(38);
+                cell = rowx.createCell(39);
                 cell.setCellValue(editString(exportVView.getCustomerName()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(39);
+                cell = rowx.createCell(40);
                 cell.setCellValue(editString(exportVView.getCardNo()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(40);
+                cell = rowx.createCell(41);
                 cell.setCellValue(editString(exportVView.getBankDeposit() + "-" +exportVView.getBankDepositBranch()));
                 cell.setCellStyle(styleDetail);
 
@@ -2097,6 +2106,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             cell = rowp.createCell(19);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(20);
+            cell.setCellValue(dataList.size());
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(21);
             cell.setCellStyle(styleDetail);
@@ -2105,20 +2115,20 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             cell = rowp.createCell(23);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(24);
+            cell.setCellStyle(styleDetail);
+            cell = rowp.createCell(25);
             cell.setCellValue(amountIngPayableTotal/netWeightTotal);
             cell.setCellStyle(contextstyle);
-            cell = rowp.createCell(25);
-            cell.setCellStyle(styleDetail);
             cell = rowp.createCell(26);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(27);
             cell.setCellStyle(styleDetail);
-            //纯重合计
             cell = rowp.createCell(28);
+            cell.setCellStyle(styleDetail);
+            //纯重合计
+            cell = rowp.createCell(29);
             cell.setCellValue(netWeightTotal);
             cell.setCellStyle(contextstyle);
-            cell = rowp.createCell(29);
-            cell.setCellStyle(styleDetail);
             cell = rowp.createCell(30);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(31);
@@ -2132,16 +2142,18 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             cell = rowp.createCell(35);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(36);
+            cell.setCellStyle(styleDetail);
+            cell = rowp.createCell(37);
             cell.setCellValue(amountIngPayableTotal);
             cell.setCellStyle(contextstyle);
-            cell = rowp.createCell(37);
-            cell.setCellStyle(styleDetail);
             cell = rowp.createCell(38);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(39);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(40);
             cell.setCellStyle(styleDetail);
+            cell = rowp.createCell(41);
+            cell.setCellStyle(styleDetail);
         }
 
 
@@ -2396,7 +2408,8 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         sheet.setColumnWidth(42, 12 * 256 + 184);
         sheet.setColumnWidth(43, 12 * 256 + 184);
         sheet.setColumnWidth(44, 12 * 256 + 184);
-        sheet.setColumnWidth(45, 1 * 256 + 184);
+        sheet.setColumnWidth(45, 12 * 256 + 184);
+        sheet.setColumnWidth(46, 1 * 256 + 184);
 
         // 创建单元格对象
         HSSFCell cell = null;
@@ -2506,6 +2519,8 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         cell.setCellStyle(styleTitle);
         cell = row0.createCell(44);
         cell.setCellStyle(styleTitle);
+        cell = row0.createCell(45);
+        cell.setCellStyle(styleTitle);
         rownum++;
 
         HSSFRow row1 = sheet.createRow((int) rownum);
@@ -2592,54 +2607,57 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         cell.setCellValue("车牌号");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(28);
-        cell.setCellValue("毛重(吨)");
+        cell.setCellValue("车数");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(29);
-        cell.setCellValue("皮重(吨)");
+        cell.setCellValue("毛重(吨)");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(30);
-        cell.setCellValue("出库净重(吨)");
+        cell.setCellValue("皮重(吨)");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(31);
-        cell.setCellValue("反馈重量(吨)");
+        cell.setCellValue("出库净重(吨)");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(32);
-        cell.setCellValue("反馈日期");
+        cell.setCellValue("反馈重量(吨)");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(33);
-        cell.setCellValue("结算重量(吨)");
+        cell.setCellValue("反馈日期");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(34);
-        cell.setCellValue("结算单价(元/吨)");
+        cell.setCellValue("结算重量(吨)");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(35);
-        cell.setCellValue("汽运运费(元/吨)");
+        cell.setCellValue("结算单价(元/吨)");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(36);
-        cell.setCellValue("火运运费(元/吨)");
+        cell.setCellValue("汽运运费(元/吨)");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(37);
-        cell.setCellValue("船运运费(元/吨)");
+        cell.setCellValue("火运运费(元/吨)");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(38);
-        cell.setCellValue("运费");
+        cell.setCellValue("船运运费(元/吨)");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(39);
-        cell.setCellValue("应收金额(元)");
+        cell.setCellValue("运费");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(40);
-        cell.setCellValue("已收金额(元)");
+        cell.setCellValue("应收金额(元)");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(41);
-        cell.setCellValue("未收金额(元)");
+        cell.setCellValue("已收金额(元)");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(42);
-        cell.setCellValue("收款日期");
+        cell.setCellValue("未收金额(元)");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(43);
-        cell.setCellValue("已开票金额(元)");
+        cell.setCellValue("收款日期");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(44);
+        cell.setCellValue("已开票金额(元)");
+        cell.setCellStyle(styleDetail);
+        cell = row1.createCell(45);
         cell.setCellValue("状态");
         cell.setCellStyle(styleDetail);
         rownum++;
@@ -2750,59 +2768,62 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 cell = rowx.createCell(27);
                 cell.setCellValue(editString(exportVView.getCarNo()));
                 cell.setCellStyle(styleDetail);
+                cell = rowx.createCell(28);
+                cell.setCellValue("1");
+                cell.setCellStyle(styleDetail);
                 HSSFDataFormat df = wb.createDataFormat(); // 此处设置数据格式
                 contextstyle.setDataFormat(df.getBuiltinFormat("#,##0.00"));//保留两位小数点
-                cell = rowx.createCell(28);
+                cell = rowx.createCell(29);
                 cell.setCellValue(Double.parseDouble(exportVView.getGrossWeight()));
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(29);
+                cell = rowx.createCell(30);
                 cell.setCellValue(Double.parseDouble(exportVView.getTare()));
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(30);
+                cell = rowx.createCell(31);
                 cell.setCellValue(Double.parseDouble(exportVView.getNetWeight()));
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(31);
+                cell = rowx.createCell(32);
                 cell.setCellValue(editFloat(exportVView.getFeedbackWeight()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(32);
+                cell = rowx.createCell(33);
                 String date1 = addDateOneDay(exportVView.getFeedbackDate()!=null?exportVView.getFeedbackDate():new Date());
                 cell.setCellValue(date1);
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(33);
+                cell = rowx.createCell(34);
                 cell.setCellValue(editFloat(exportVView.getSettlementWeight()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(34);
+                cell = rowx.createCell(35);
                 cell.setCellValue(editFloat(exportVView.getSettlementPrice()));
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(35);
+                cell = rowx.createCell(36);
                 cell.setCellValue(editFloat(exportVView.getCarFreight()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(36);
+                cell = rowx.createCell(37);
                 cell.setCellValue(editFloat(exportVView.getTrainFreight()));
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(37);
-                cell.setCellValue(editFloat(exportVView.getShipFreight()));
-                cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(38);
                 cell.setCellValue(editFloat(exportVView.getShipFreight()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(39);
+                cell.setCellValue(editFloat(exportVView.getShipFreight()));
+                cell.setCellStyle(styleDetail);
+                cell = rowx.createCell(40);
                 cell.setCellValue(editDouble(exportVView.getAmountIngReceivable()));
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(40);
+                cell = rowx.createCell(41);
                 cell.setCellValue(editDouble(exportVView.getAmountEdReceivable()));
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(41);
+                cell = rowx.createCell(42);
                 cell.setCellValue(editDouble(exportVView.getAmountNotReceivable()));
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(42);
+                cell = rowx.createCell(43);
                 String date2 = addDateOneDay(exportVView.getCollectionDate()!=null?exportVView.getCollectionDate():new Date());
                 cell.setCellValue(date2);
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(43);
+                cell = rowx.createCell(44);
                 cell.setCellValue(editFloat(exportVView.getMoney()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(44);
+                cell = rowx.createCell(45);
                 cell.setCellValue(editString(exportVView.getStatus()));
                 cell.setCellStyle(styleDetail);
 
@@ -2885,15 +2906,16 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             cell = rowp.createCell(27);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(28);
+            cell.setCellValue(dataList.size());
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(29);
             cell.setCellStyle(styleDetail);
-            //纯重合计
             cell = rowp.createCell(30);
+            cell.setCellStyle(styleDetail);
+            //纯重合计
+            cell = rowp.createCell(31);
             cell.setCellValue(netWeightTotal);
             cell.setCellStyle(contextstyle);
-            cell = rowp.createCell(31);
-            cell.setCellStyle(styleDetail);
             cell = rowp.createCell(32);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(33);
@@ -2909,10 +2931,10 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             cell = rowp.createCell(38);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(39);
+            cell.setCellStyle(styleDetail);
+            cell = rowp.createCell(40);
             cell.setCellValue(amountIngPayableTotal);
             cell.setCellStyle(contextstyle);
-            cell = rowp.createCell(40);
-            cell.setCellStyle(styleDetail);
             cell = rowp.createCell(41);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(42);
@@ -2921,6 +2943,8 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(44);
             cell.setCellStyle(styleDetail);
+            cell = rowp.createCell(45);
+            cell.setCellStyle(styleDetail);
         }