修改导出

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

@@ -3744,16 +3744,16 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         sheet.setColumnWidth(0, 1 * 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(3, "收货仓库".getBytes().length * 25 / 10 * 256);
         sheet.setColumnWidth(4, 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(5, 12 * 256 + 184);
+        sheet.setColumnWidth(6, "发货日期".getBytes().length * 2 * 256);
+        sheet.setColumnWidth(7, "合同编号".getBytes().length * 2 * 256);
         sheet.setColumnWidth(8, 12 * 256 + 184);
         sheet.setColumnWidth(9, 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(10, 12 * 256 + 184);
+        sheet.setColumnWidth(11, "客户".getBytes().length * 6 * 256);
+        sheet.setColumnWidth(12, "货名".getBytes().length * 3 * 256);
         sheet.setColumnWidth(13, 12 * 256 + 184);
         sheet.setColumnWidth(14, 12 * 256 + 184);
         sheet.setColumnWidth(15, 12 * 256 + 184);
@@ -3774,8 +3774,8 @@ 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, "反馈日期".getBytes().length * 2 * 256);
-        sheet.setColumnWidth(34, 12 * 256 + 184);
+        sheet.setColumnWidth(33, 12 * 256 + 184);
+        sheet.setColumnWidth(34, "反馈日期".getBytes().length * 2 * 256);
         sheet.setColumnWidth(35, 12 * 256 + 184);
         sheet.setColumnWidth(36, 12 * 256 + 184);
         sheet.setColumnWidth(37, 12 * 256 + 184);
@@ -3784,10 +3784,11 @@ 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, "收款日期".getBytes().length * 2 * 256);
-        sheet.setColumnWidth(44, 12 * 256 + 184);
+        sheet.setColumnWidth(43, 12 * 256 + 184);
+        sheet.setColumnWidth(44, "收款日期".getBytes().length * 2 * 256);
         sheet.setColumnWidth(45, 12 * 256 + 184);
-        sheet.setColumnWidth(46, 1 * 256 + 184);
+        sheet.setColumnWidth(46, 12 * 256 + 184);
+        sheet.setColumnWidth(47, 1 * 256 + 184);
 
         // 创建单元格对象
         HSSFCell cell = null;
@@ -3899,6 +3900,8 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         cell.setCellStyle(styleTitle);
         cell = row0.createCell(45);
         cell.setCellStyle(styleTitle);
+        cell = row0.createCell(46);
+        cell.setCellStyle(styleTitle);
         rownum++;
 
         Map<String, Object> pageView = new HashMap<>();
@@ -3966,37 +3969,37 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             cell = rowp.createCell(8);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(9);
+            cell.setCellStyle(styleDetail);
+            cell = rowp.createCell(10);
             cell.setCellValue(netWeightPriceTotal / dataList.size());
             cell.setCellStyle(contextstyle1);
-            cell = rowp.createCell(10);
-            cell.setCellStyle(styleDetail);
             cell = rowp.createCell(11);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(12);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(13);
             cell.setCellStyle(styleDetail);
-            //水分平均值
             cell = rowp.createCell(14);
+            cell.setCellStyle(styleDetail);
+            //水分平均值
+            cell = rowp.createCell(15);
             cell.setCellStyle(contextstyle1);
             cell.setCellValue(waterContentTotal / netWeightTmp);
-            cell = rowp.createCell(15);
+            cell = rowp.createCell(16);
             cell.setCellValue(impurityTotal / netWeightTmp);
             cell.setCellStyle(contextstyle1);
-            cell = rowp.createCell(16);
+            cell = rowp.createCell(17);
             cell.setCellValue(mildewGrainTotal / netWeightTmp);
             cell.setCellStyle(contextstyle1);
-            cell = rowp.createCell(17);
+            cell = rowp.createCell(18);
             cell.setCellValue(imperfectGrainTotal / netWeightTmp);
             cell.setCellStyle(contextstyle1);
-            cell = rowp.createCell(18);
+            cell = rowp.createCell(19);
             cell.setCellValue(bulkDensityTotal / netWeightTmp);
             cell.setCellStyle(contextstyle1);
-            cell = rowp.createCell(19);
+            cell = rowp.createCell(20);
             cell.setCellValue(jiaorenliTotal / netWeightTmp);
             cell.setCellStyle(contextstyle1);
-            cell = rowp.createCell(20);
-            cell.setCellStyle(styleDetail);
             cell = rowp.createCell(21);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(22);
@@ -4012,18 +4015,18 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             cell = rowp.createCell(27);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(28);
+            cell.setCellStyle(styleDetail);
+            cell = rowp.createCell(29);
             cell.setCellValue(dataList.size());
             cell.setCellStyle(styleDetail1);
-            cell = rowp.createCell(29);
-            cell.setCellStyle(styleDetail);
             cell = rowp.createCell(30);
             cell.setCellStyle(styleDetail);
-            //纯重合计
             cell = rowp.createCell(31);
+            cell.setCellStyle(styleDetail);
+            //纯重合计
+            cell = rowp.createCell(32);
             cell.setCellValue(netWeightTotal);
             cell.setCellStyle(contextstyle1);
-            cell = rowp.createCell(32);
-            cell.setCellStyle(styleDetail);
             cell = rowp.createCell(33);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(34);
@@ -4039,10 +4042,10 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             cell = rowp.createCell(39);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(40);
+            cell.setCellStyle(styleDetail);
+            cell = rowp.createCell(41);
             cell.setCellValue(amountIngPayableTotal);
             cell.setCellStyle(contextstyle1);
-            cell = rowp.createCell(41);
-            cell.setCellStyle(styleDetail);
             cell = rowp.createCell(42);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(43);
@@ -4051,6 +4054,8 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(45);
             cell.setCellStyle(styleDetail);
+            cell = rowp.createCell(46);
+            cell.setCellStyle(styleDetail);
             rownum++;
         }
 
@@ -4064,132 +4069,135 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         cell.setCellValue("发货仓库");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(3);
-        cell.setCellValue("成本单价(元/吨)");
+        cell.setCellValue("收货仓库");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(4);
-        cell.setCellValue("仓位号");
+        cell.setCellValue("成本单价(元/吨)");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(5);
-        cell.setCellValue("发货日期");
+        cell.setCellValue("仓位号");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(6);
-        cell.setCellValue("合同编号");
+        cell.setCellValue("发货日期");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(7);
-        cell.setCellValue("合同结算状态");
+        cell.setCellValue("合同编号");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(8);
-        cell.setCellValue("合同重量(吨)");
+        cell.setCellValue("合同结算状态");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(9);
-        cell.setCellValue("合同单价(元/吨)");
+        cell.setCellValue("合同重量(吨)");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(10);
-        cell.setCellValue("客户");
+        cell.setCellValue("合同单价(元/吨)");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(11);
-        cell.setCellValue("货名");
+        cell.setCellValue("客户");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(12);
-        cell.setCellValue("类型");
+        cell.setCellValue("货名");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(13);
-        cell.setCellValue("等级");
+        cell.setCellValue("类型");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(14);
-        cell.setCellValue("水分");
+        cell.setCellValue("等级");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(15);
-        cell.setCellValue("杂质");
+        cell.setCellValue("水分");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(16);
-        cell.setCellValue("霉变粒");
+        cell.setCellValue("杂质");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(17);
-        cell.setCellValue("不完善粒");
+        cell.setCellValue("霉变粒");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(18);
-        cell.setCellValue("容重");
+        cell.setCellValue("不完善粒");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(19);
-        cell.setCellValue("热损伤");
+        cell.setCellValue("容重");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(20);
-        cell.setCellValue("车厢号");
+        cell.setCellValue("热损伤");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(21);
-        cell.setCellValue("箱号1");
+        cell.setCellValue("车厢号");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(22);
-        cell.setCellValue("箱号2");
+        cell.setCellValue("箱号1");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(23);
-        cell.setCellValue("封号1");
+        cell.setCellValue("箱号2");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(24);
+        cell.setCellValue("封号1");
+        cell.setCellStyle(styleDetail);
+        cell = row1.createCell(25);
         cell.setCellValue("封号2");
         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);
-        cell = row1.createCell(41);
+        cell = row1.createCell(42);
         cell.setCellValue("已收金额(元)");
         cell.setCellStyle(styleDetail);
-        cell = row1.createCell(42);
+        cell = row1.createCell(43);
         cell.setCellValue("未收金额(元)");
         cell.setCellStyle(styleDetail);
-        cell = row1.createCell(43);
+        cell = row1.createCell(44);
         cell.setCellValue("收款日期");
         cell.setCellStyle(styleDetail);
-        cell = row1.createCell(44);
+        cell = row1.createCell(45);
         cell.setCellValue("已开票金额(元)");
         cell.setCellStyle(styleDetail);
-        cell = row1.createCell(45);
+        cell = row1.createCell(46);
         cell.setCellValue("状态");
         cell.setCellStyle(styleDetail);
         rownum++;
@@ -4209,153 +4217,156 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 cell.setCellValue(editString(exportVView.getWarehouseName()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(3);
-                cell.setCellValue(new Formatter().format("%.2f", editFloat(exportVView.getCostPrice())).toString());
+                cell.setCellValue(editString(exportVView.getReceiveWarehouse()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(4);
-                cell.setCellValue(editString(exportVView.getBinNumber()));
+                cell.setCellValue(new Formatter().format("%.2f", editFloat(exportVView.getCostPrice())).toString());
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(5);
+                cell.setCellValue(editString(exportVView.getBinNumber()));
+                cell.setCellStyle(styleDetail);
+                cell = rowx.createCell(6);
                 String date = addDateOneDay(exportVView.getCreateDate());
                 cell.setCellValue(date);
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(6);
+                cell = rowx.createCell(7);
                 if(!StringUtils.isEmpty(exportVView.getContractNo())){
                     cell.setCellValue(editString(exportVView.getContractNo()));
                 }
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(7);
+                cell = rowx.createCell(8);
                 cell.setCellValue(editString(exportVView.getContractStatus()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(8);
+                cell = rowx.createCell(9);
                 cell.setCellValue(editFloat(exportVView.getWeight()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(9);
+                cell = rowx.createCell(10);
                 cell.setCellValue(editFloat(exportVView.getUnitContractPrice()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(10);
+                cell = rowx.createCell(11);
                 cell.setCellValue(editString(exportVView.getCustomerName()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(11);
+                cell = rowx.createCell(12);
                 cell.setCellValue(editString(exportVView.getGoodsName()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(12);
+                cell = rowx.createCell(13);
                 cell.setCellValue(editString(exportVView.getType()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(13);
+                cell = rowx.createCell(14);
                 cell.setCellValue(editString(exportVView.getGrade()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(14);
+                cell = rowx.createCell(15);
                 if (!StringUtils.isEmpty(exportVView.getWaterContent())) {
                     cell.setCellValue(Double.parseDouble(exportVView.getWaterContent()));
                 }
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(15);
+                cell = rowx.createCell(16);
                 if (!StringUtils.isEmpty(exportVView.getImpurity())) {
                     cell.setCellValue(Double.parseDouble(exportVView.getImpurity()));
                 }
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(16);
+                cell = rowx.createCell(17);
                 if (!StringUtils.isEmpty(exportVView.getMildewGrain())) {
                     cell.setCellValue(Double.parseDouble(exportVView.getMildewGrain()));
                 }
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(17);
+                cell = rowx.createCell(18);
                 if (!StringUtils.isEmpty(exportVView.getImperfectGrain())) {
                     cell.setCellValue(Double.parseDouble(exportVView.getImperfectGrain()));
                 }
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(18);
+                cell = rowx.createCell(19);
                 if (!StringUtils.isEmpty(exportVView.getBulkDensity())) {
                     cell.setCellValue(Double.parseDouble(exportVView.getBulkDensity()));
                 }
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(19);
+                cell = rowx.createCell(20);
                 if (!StringUtils.isEmpty(exportVView.getJiaorenli())) {
                     cell.setCellValue(Double.parseDouble(exportVView.getJiaorenli()));
                 }
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(20);
+                cell = rowx.createCell(21);
                 cell.setCellValue(editString(exportVView.getWingNumber()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(21);
+                cell = rowx.createCell(22);
                 cell.setCellValue(editString(exportVView.getBoxNo()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(22);
+                cell = rowx.createCell(23);
                 cell.setCellValue(editString(exportVView.getBoxNoOther()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(23);
+                cell = rowx.createCell(24);
                 cell.setCellValue(editString(exportVView.getTitleNo()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(24);
+                cell = rowx.createCell(25);
                 cell.setCellValue(editString(exportVView.getTitleNoOther()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(25);
+                cell = rowx.createCell(26);
                 cell.setCellValue(editString(exportVView.getShipNumber()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(26);
+                cell = rowx.createCell(27);
                 cell.setCellValue(editString(exportVView.getShipName()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(27);
+                cell = rowx.createCell(28);
                 cell.setCellValue(editString(exportVView.getCarNo()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(28);
+                cell = rowx.createCell(29);
                 cell.setCellValue("1");
                 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 = rowx.createCell(30);
                 cell.setCellValue(Double.parseDouble(exportVView.getGrossWeight()));
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(30);
+                cell = rowx.createCell(31);
                 cell.setCellValue(Double.parseDouble(exportVView.getTare()));
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(31);
+                cell = rowx.createCell(32);
                 cell.setCellValue(Double.parseDouble(exportVView.getNetWeight()));
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(32);
+                cell = rowx.createCell(33);
                 cell.setCellValue(editFloat(exportVView.getFeedbackWeight()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(33);
+                cell = rowx.createCell(34);
                 String date1 = addDateOneDay(exportVView.getFeedbackDate() != null ? exportVView.getFeedbackDate() : new Date());
                 cell.setCellValue(date1);
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(34);
+                cell = rowx.createCell(35);
                 cell.setCellValue(editFloat(exportVView.getSettlementWeight()));
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(35);
+                cell = rowx.createCell(36);
                 cell.setCellValue(editFloat(exportVView.getSettlementPrice()));
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(36);
+                cell = rowx.createCell(37);
                 cell.setCellValue(editFloat(exportVView.getCarFreight()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(37);
+                cell = rowx.createCell(38);
                 cell.setCellValue(editFloat(exportVView.getTrainFreight()));
                 cell.setCellStyle(contextstyle);
-                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(editFloat(exportVView.getShipFreight()));
+                cell.setCellStyle(styleDetail);
+                cell = rowx.createCell(41);
                 cell.setCellValue(editDouble(exportVView.getAmountIngReceivable()));
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(41);
+                cell = rowx.createCell(42);
                 cell.setCellValue(editDouble(exportVView.getAmountEdReceivable()));
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(42);
+                cell = rowx.createCell(43);
                 cell.setCellValue(editDouble(exportVView.getAmountNotReceivable()));
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(43);
+                cell = rowx.createCell(44);
                 String date2 = addDateOneDay(exportVView.getCollectionDate() != null ? exportVView.getCollectionDate() : new Date());
                 cell.setCellValue(date2);
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(44);
+                cell = rowx.createCell(45);
                 cell.setCellValue(editFloat(exportVView.getMoney()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(45);
+                cell = rowx.createCell(46);
                 cell.setCellValue(editString(exportVView.getStatus()));
                 cell.setCellStyle(styleDetail);
 
@@ -4616,16 +4627,16 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         sheet.setColumnWidth(0, 1 * 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(3, "收货仓库".getBytes().length * 25 / 10 * 256);
         sheet.setColumnWidth(4, 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(5, 12 * 256 + 184);
+        sheet.setColumnWidth(6, "发货日期".getBytes().length * 2 * 256);
+        sheet.setColumnWidth(7, "合同编号".getBytes().length * 2 * 256);
         sheet.setColumnWidth(8, 12 * 256 + 184);
         sheet.setColumnWidth(9, 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(10, 12 * 256 + 184);
+        sheet.setColumnWidth(11, "客户".getBytes().length * 6 * 256);
+        sheet.setColumnWidth(12, "货名".getBytes().length * 3 * 256);
         sheet.setColumnWidth(13, 12 * 256 + 184);
         sheet.setColumnWidth(14, 12 * 256 + 184);
         sheet.setColumnWidth(15, 12 * 256 + 184);
@@ -4646,8 +4657,8 @@ 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, "反馈日期".getBytes().length * 2 * 256);
-        sheet.setColumnWidth(34, 12 * 256 + 184);
+        sheet.setColumnWidth(33, 12 * 256 + 184);
+        sheet.setColumnWidth(34, "反馈日期".getBytes().length * 2 * 256);
         sheet.setColumnWidth(35, 12 * 256 + 184);
         sheet.setColumnWidth(36, 12 * 256 + 184);
         sheet.setColumnWidth(37, 12 * 256 + 184);
@@ -4656,10 +4667,11 @@ 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, "收款日期".getBytes().length * 2 * 256);
-        sheet.setColumnWidth(44, 12 * 256 + 184);
+        sheet.setColumnWidth(43, 12 * 256 + 184);
+        sheet.setColumnWidth(44, "收款日期".getBytes().length * 2 * 256);
         sheet.setColumnWidth(45, 12 * 256 + 184);
-        sheet.setColumnWidth(46, 1 * 256 + 184);
+        sheet.setColumnWidth(46, 12 * 256 + 184);
+        sheet.setColumnWidth(47, 1 * 256 + 184);
 
         // 创建单元格对象
         HSSFCell cell = null;
@@ -4769,7 +4781,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         cell.setCellStyle(styleTitle);
         cell = row0.createCell(44);
         cell.setCellStyle(styleTitle);
-        cell = row0.createCell(45);
+        cell = row0.createCell(46);
         cell.setCellStyle(styleTitle);
         rownum++;
 
@@ -4839,37 +4851,37 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             cell = rowp.createCell(8);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(9);
+            cell.setCellStyle(styleDetail);
+            cell = rowp.createCell(10);
             cell.setCellValue(netWeightPriceTotal / dataList.size());
             cell.setCellStyle(contextstyle1);
-            cell = rowp.createCell(10);
-            cell.setCellStyle(styleDetail);
             cell = rowp.createCell(11);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(12);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(13);
             cell.setCellStyle(styleDetail);
-            //水分平均值
             cell = rowp.createCell(14);
+            cell.setCellStyle(styleDetail);
+            //水分平均值
+            cell = rowp.createCell(15);
             cell.setCellStyle(contextstyle1);
             cell.setCellValue(waterContentTotal / netWeightTmp);
-            cell = rowp.createCell(15);
+            cell = rowp.createCell(16);
             cell.setCellValue(impurityTotal / netWeightTmp);
             cell.setCellStyle(contextstyle1);
-            cell = rowp.createCell(16);
+            cell = rowp.createCell(17);
             cell.setCellValue(mildewGrainTotal / netWeightTmp);
             cell.setCellStyle(contextstyle1);
-            cell = rowp.createCell(17);
+            cell = rowp.createCell(18);
             cell.setCellValue(imperfectGrainTotal / netWeightTmp);
             cell.setCellStyle(contextstyle1);
-            cell = rowp.createCell(18);
+            cell = rowp.createCell(19);
             cell.setCellValue(bulkDensityTotal / netWeightTmp);
             cell.setCellStyle(contextstyle1);
-            cell = rowp.createCell(19);
+            cell = rowp.createCell(20);
             cell.setCellValue(jiaorenliTotal / netWeightTmp);
             cell.setCellStyle(contextstyle1);
-            cell = rowp.createCell(20);
-            cell.setCellStyle(styleDetail);
             cell = rowp.createCell(21);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(22);
@@ -4885,18 +4897,18 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             cell = rowp.createCell(27);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(28);
+            cell.setCellStyle(styleDetail);
+            cell = rowp.createCell(29);
             cell.setCellValue(dataList.size());
             cell.setCellStyle(styleDetail1);
-            cell = rowp.createCell(29);
-            cell.setCellStyle(styleDetail);
             cell = rowp.createCell(30);
             cell.setCellStyle(styleDetail);
-            //纯重合计
             cell = rowp.createCell(31);
+            cell.setCellStyle(styleDetail);
+            //纯重合计
+            cell = rowp.createCell(32);
             cell.setCellValue(netWeightTotal);
             cell.setCellStyle(contextstyle1);
-            cell = rowp.createCell(32);
-            cell.setCellStyle(styleDetail);
             cell = rowp.createCell(33);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(34);
@@ -4912,10 +4924,10 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             cell = rowp.createCell(39);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(40);
+            cell.setCellStyle(styleDetail);
+            cell = rowp.createCell(41);
             cell.setCellValue(amountIngPayableTotal);
             cell.setCellStyle(contextstyle1);
-            cell = rowp.createCell(41);
-            cell.setCellStyle(styleDetail);
             cell = rowp.createCell(42);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(43);
@@ -4924,6 +4936,8 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(45);
             cell.setCellStyle(styleDetail);
+            cell = rowp.createCell(46);
+            cell.setCellStyle(styleDetail);
             rownum++;
         }
 
@@ -4937,132 +4951,135 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         cell.setCellValue("发货仓库");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(3);
-        cell.setCellValue("成本单价(元/吨)");
+        cell.setCellValue("收货仓库");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(4);
-        cell.setCellValue("仓位号");
+        cell.setCellValue("成本单价(元/吨)");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(5);
-        cell.setCellValue("发货日期");
+        cell.setCellValue("仓位号");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(6);
-        cell.setCellValue("合同编号");
+        cell.setCellValue("发货日期");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(7);
-        cell.setCellValue("合同结算状态");
+        cell.setCellValue("合同编号");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(8);
-        cell.setCellValue("合同重量(吨)");
+        cell.setCellValue("合同结算状态");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(9);
-        cell.setCellValue("合同单价(元/吨)");
+        cell.setCellValue("合同重量(吨)");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(10);
-        cell.setCellValue("客户");
+        cell.setCellValue("合同单价(元/吨)");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(11);
-        cell.setCellValue("货名");
+        cell.setCellValue("客户");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(12);
-        cell.setCellValue("类型");
+        cell.setCellValue("货名");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(13);
-        cell.setCellValue("等级");
+        cell.setCellValue("类型");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(14);
-        cell.setCellValue("水分");
+        cell.setCellValue("等级");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(15);
-        cell.setCellValue("杂质");
+        cell.setCellValue("水分");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(16);
-        cell.setCellValue("霉变粒");
+        cell.setCellValue("杂质");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(17);
-        cell.setCellValue("不完善粒");
+        cell.setCellValue("霉变粒");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(18);
-        cell.setCellValue("容重");
+        cell.setCellValue("不完善粒");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(19);
-        cell.setCellValue("热损伤");
+        cell.setCellValue("容重");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(20);
-        cell.setCellValue("车厢号");
+        cell.setCellValue("热损伤");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(21);
-        cell.setCellValue("箱号1");
+        cell.setCellValue("车厢号");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(22);
-        cell.setCellValue("箱号2");
+        cell.setCellValue("箱号1");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(23);
-        cell.setCellValue("封号1");
+        cell.setCellValue("箱号2");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(24);
+        cell.setCellValue("封号1");
+        cell.setCellStyle(styleDetail);
+        cell = row1.createCell(25);
         cell.setCellValue("封号2");
         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);
-        cell = row1.createCell(41);
+        cell = row1.createCell(42);
         cell.setCellValue("已收金额(元)");
         cell.setCellStyle(styleDetail);
-        cell = row1.createCell(42);
+        cell = row1.createCell(43);
         cell.setCellValue("未收金额(元)");
         cell.setCellStyle(styleDetail);
-        cell = row1.createCell(43);
+        cell = row1.createCell(44);
         cell.setCellValue("收款日期");
         cell.setCellStyle(styleDetail);
-        cell = row1.createCell(44);
+        cell = row1.createCell(45);
         cell.setCellValue("已开票金额(元)");
         cell.setCellStyle(styleDetail);
-        cell = row1.createCell(45);
+        cell = row1.createCell(46);
         cell.setCellValue("状态");
         cell.setCellStyle(styleDetail);
         rownum++;
@@ -5081,151 +5098,154 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 cell.setCellValue(editString(exportVView.getWarehouseName()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(3);
-                cell.setCellValue(new Formatter().format("%.2f", editFloat(exportVView.getCostPrice())).toString());
+                cell.setCellValue(editString(exportVView.getReceiveWarehouse()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(4);
-                cell.setCellValue(editString(exportVView.getBinNumber()));
+                cell.setCellValue(new Formatter().format("%.2f", editFloat(exportVView.getCostPrice())).toString());
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(5);
+                cell.setCellValue(editString(exportVView.getBinNumber()));
+                cell.setCellStyle(styleDetail);
+                cell = rowx.createCell(6);
                 String date = addDateOneDay(exportVView.getCreateDate());
                 cell.setCellValue(date);
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(6);
+                cell = rowx.createCell(7);
                 cell.setCellValue(editString(exportVView.getContractNo()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(7);
+                cell = rowx.createCell(8);
                 cell.setCellValue(editString(exportVView.getContractStatus()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(8);
+                cell = rowx.createCell(9);
                 cell.setCellValue(editFloat(exportVView.getWeight()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(9);
+                cell = rowx.createCell(10);
                 cell.setCellValue(editFloat(exportVView.getUnitContractPrice()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(10);
+                cell = rowx.createCell(11);
                 cell.setCellValue(editString(exportVView.getCustomerName()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(11);
+                cell = rowx.createCell(12);
                 cell.setCellValue(editString(exportVView.getGoodsName()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(12);
+                cell = rowx.createCell(13);
                 cell.setCellValue(editString(exportVView.getType()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(13);
+                cell = rowx.createCell(14);
                 cell.setCellValue(editString(exportVView.getGrade()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(14);
+                cell = rowx.createCell(15);
                 if (!StringUtils.isEmpty(exportVView.getWaterContent())) {
                     cell.setCellValue(Double.parseDouble(exportVView.getWaterContent()));
                 }
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(15);
+                cell = rowx.createCell(16);
                 if (!StringUtils.isEmpty(exportVView.getImpurity())) {
                     cell.setCellValue(Double.parseDouble(exportVView.getImpurity()));
                 }
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(16);
+                cell = rowx.createCell(17);
                 if (!StringUtils.isEmpty(exportVView.getMildewGrain())) {
                     cell.setCellValue(Double.parseDouble(exportVView.getMildewGrain()));
                 }
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(17);
+                cell = rowx.createCell(18);
                 if (!StringUtils.isEmpty(exportVView.getImperfectGrain())) {
                     cell.setCellValue(Double.parseDouble(exportVView.getImperfectGrain()));
                 }
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(18);
+                cell = rowx.createCell(19);
                 if (!StringUtils.isEmpty(exportVView.getBulkDensity())) {
                     cell.setCellValue(Double.parseDouble(exportVView.getBulkDensity()));
                 }
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(19);
+                cell = rowx.createCell(20);
                 if (!StringUtils.isEmpty(exportVView.getJiaorenli())) {
                     cell.setCellValue(Double.parseDouble(exportVView.getJiaorenli()));
                 }
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(20);
+                cell = rowx.createCell(21);
                 cell.setCellValue(editString(exportVView.getWingNumber()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(21);
+                cell = rowx.createCell(22);
                 cell.setCellValue(editString(exportVView.getBoxNo()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(22);
+                cell = rowx.createCell(23);
                 cell.setCellValue(editString(exportVView.getBoxNoOther()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(23);
+                cell = rowx.createCell(24);
                 cell.setCellValue(editString(exportVView.getTitleNo()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(24);
+                cell = rowx.createCell(25);
                 cell.setCellValue(editString(exportVView.getTitleNoOther()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(25);
+                cell = rowx.createCell(26);
                 cell.setCellValue(editString(exportVView.getShipNumber()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(26);
+                cell = rowx.createCell(27);
                 cell.setCellValue(editString(exportVView.getShipName()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(27);
+                cell = rowx.createCell(28);
                 cell.setCellValue(editString(exportVView.getCarNo()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(28);
+                cell = rowx.createCell(29);
                 cell.setCellValue("1");
                 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 = rowx.createCell(30);
                 cell.setCellValue(Double.parseDouble(exportVView.getGrossWeight()));
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(30);
+                cell = rowx.createCell(31);
                 cell.setCellValue(Double.parseDouble(exportVView.getTare()));
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(31);
+                cell = rowx.createCell(32);
                 cell.setCellValue(Double.parseDouble(exportVView.getNetWeight()));
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(32);
+                cell = rowx.createCell(33);
                 cell.setCellValue(editFloat(exportVView.getFeedbackWeight()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(33);
+                cell = rowx.createCell(34);
                 String date1 = addDateOneDay(exportVView.getFeedbackDate() != null ? exportVView.getFeedbackDate() : new Date());
                 cell.setCellValue(date1);
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(34);
+                cell = rowx.createCell(35);
                 cell.setCellValue(editFloat(exportVView.getSettlementWeight()));
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(35);
+                cell = rowx.createCell(36);
                 cell.setCellValue(editFloat(exportVView.getSettlementPrice()));
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(36);
+                cell = rowx.createCell(37);
                 cell.setCellValue(editFloat(exportVView.getCarFreight()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(37);
+                cell = rowx.createCell(38);
                 cell.setCellValue(editFloat(exportVView.getTrainFreight()));
                 cell.setCellStyle(contextstyle);
-                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(editFloat(exportVView.getShipFreight()));
+                cell.setCellStyle(styleDetail);
+                cell = rowx.createCell(41);
                 cell.setCellValue(editDouble(exportVView.getAmountIngReceivable()));
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(41);
+                cell = rowx.createCell(42);
                 cell.setCellValue(editDouble(exportVView.getAmountEdReceivable()));
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(42);
+                cell = rowx.createCell(43);
                 cell.setCellValue(editDouble(exportVView.getAmountNotReceivable()));
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(43);
+                cell = rowx.createCell(44);
                 String date2 = addDateOneDay(exportVView.getCollectionDate() != null ? exportVView.getCollectionDate() : new Date());
                 cell.setCellValue(date2);
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(44);
+                cell = rowx.createCell(45);
                 cell.setCellValue(editFloat(exportVView.getMoney()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(45);
+                cell = rowx.createCell(46);
                 cell.setCellValue(editString(exportVView.getStatus()));
                 cell.setCellStyle(styleDetail);