修改入库导出

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

@@ -2286,22 +2286,22 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         cell.setCellStyle(styleDetail);
         //水分平均值
         cell = rowp.createCell(13);
-        cell.setCellValue(waterContentTotal / netWeightTotal);
+        cell.setCellValue(bulkDensityTotal / netWeightTotal);
         cell.setCellStyle(contextstyle1);
         cell = rowp.createCell(14);
-        cell.setCellValue(impurityTotal / netWeightTotal);
+        cell.setCellValue(waterContentTotal / netWeightTotal);
         cell.setCellStyle(contextstyle1);
         cell = rowp.createCell(15);
         cell.setCellValue(mildewGrainTotal / netWeightTotal);
         cell.setCellStyle(contextstyle1);
         cell = rowp.createCell(16);
-        cell.setCellValue(imperfectGrainTotal / netWeightTotal);
+        cell.setCellValue(impurityTotal / netWeightTotal);
         cell.setCellStyle(contextstyle1);
         cell = rowp.createCell(17);
-        cell.setCellValue(bulkDensityTotal / netWeightTotal);
+        cell.setCellValue(jiaorenliTotal / netWeightTotal);
         cell.setCellStyle(contextstyle1);
         cell = rowp.createCell(18);
-        cell.setCellValue(jiaorenliTotal / netWeightTotal);
+        cell.setCellValue(imperfectGrainTotal / netWeightTotal);
         cell.setCellStyle(contextstyle1);
         cell = rowp.createCell(19);
         cell.setCellStyle(styleDetail);
@@ -2395,22 +2395,22 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         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.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("车牌号");
@@ -2541,13 +2541,13 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 cell.setCellValue(editString(exportVView.getGrade()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(13);
-                if (!StringUtils.isEmpty(exportVView.getWaterContent())) {
-                    cell.setCellValue(Double.parseDouble(exportVView.getWaterContent()));
+                if (!StringUtils.isEmpty(exportVView.getBulkDensity())) {
+                    cell.setCellValue(Double.parseDouble(exportVView.getBulkDensity()));
                 }
                 cell.setCellStyle(contextstyle);
                 cell = rowx.createCell(14);
-                if (!StringUtils.isEmpty(exportVView.getImpurity())) {
-                    cell.setCellValue(Double.parseDouble(exportVView.getImpurity()));
+                if (!StringUtils.isEmpty(exportVView.getWaterContent())) {
+                    cell.setCellValue(Double.parseDouble(exportVView.getWaterContent()));
                 }
                 cell.setCellStyle(contextstyle);
                 cell = rowx.createCell(15);
@@ -2556,18 +2556,18 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 }
                 cell.setCellStyle(contextstyle);
                 cell = rowx.createCell(16);
-                if (!StringUtils.isEmpty(exportVView.getImperfectGrain())) {
-                    cell.setCellValue(Double.parseDouble(exportVView.getImperfectGrain()));
+                if (!StringUtils.isEmpty(exportVView.getImpurity())) {
+                    cell.setCellValue(Double.parseDouble(exportVView.getImpurity()));
                 }
                 cell.setCellStyle(contextstyle);
                 cell = rowx.createCell(17);
-                if (!StringUtils.isEmpty(exportVView.getBulkDensity())) {
-                    cell.setCellValue(Double.parseDouble(exportVView.getBulkDensity()));
+                if (!StringUtils.isEmpty(exportVView.getJiaorenli())) {
+                    cell.setCellValue(Double.parseDouble(exportVView.getJiaorenli()));
                 }
                 cell.setCellStyle(contextstyle);
                 cell = rowx.createCell(18);
-                if (!StringUtils.isEmpty(exportVView.getJiaorenli())) {
-                    cell.setCellValue(Double.parseDouble(exportVView.getJiaorenli()));
+                if (!StringUtils.isEmpty(exportVView.getImperfectGrain())) {
+                    cell.setCellValue(Double.parseDouble(exportVView.getImperfectGrain()));
                 }
                 cell.setCellStyle(contextstyle);
                 cell = rowx.createCell(19);