物料替换上传空数据过滤，物资上报比对规程更改

src/main/java/com/jeeplus/modules/sg/balancedlibrary/materialReportDetails/web/MaterialReportDetailsController.java

@@ -444,7 +444,7 @@ public class MaterialReportDetailsController extends BaseController {
                                 compareHistory.setNumberNiches(amount.doubleValue());
                                 materialDetails.setLiKuBatch(pool.getBatch());
                                 materialDetails.setWarehouseLocation(pool.getInvLocation());
-                                materialDetails.setNumberOfNiches(niches.toString());
+                                materialDetails.setNumberOfNiches(amount.toString());
                             } else if (total.compareTo(amount) < 0) {
                                 BigDecimal surplus = amount.subtract(total).setScale(2, ROUND_HALF_UP);
                                 BigDecimal bigDecimal = BigDecimal.valueOf(pool.getNumberOfNiches());
@@ -528,7 +528,7 @@ public class MaterialReportDetailsController extends BaseController {
                                 compareHistory.setNumberNiches(amount.doubleValue());
                                 materialDetails.setLiKuBatch(pool.getBatch());
                                 materialDetails.setWarehouseLocation(pool.getInvLocation());
-                                materialDetails.setNumberOfNiches(niches.toString());
+                                materialDetails.setNumberOfNiches(amount.toString());
                             } else if (total.compareTo(amount) < 0) {
                                 BigDecimal surplus = amount.subtract(total).setScale(2, ROUND_HALF_UP);
                                 BigDecimal bigDecimal = BigDecimal.valueOf(pool.getNumberOfNiches());
@@ -612,7 +612,7 @@ public class MaterialReportDetailsController extends BaseController {
                                 compareHistory.setNumberNiches(amount.doubleValue());
                                 materialDetails.setLiKuBatch(pool.getBatch());
                                 materialDetails.setWarehouseLocation(pool.getInvLocation());
-                                materialDetails.setNumberOfNiches(niches.toString());
+                                materialDetails.setNumberOfNiches(amount.toString());
                             } else if (total.compareTo(amount) < 0) {
                                 BigDecimal surplus = amount.subtract(total).setScale(2, ROUND_HALF_UP);
                                 BigDecimal bigDecimal = BigDecimal.valueOf(pool.getNumberOfNiches());
@@ -696,7 +696,7 @@ public class MaterialReportDetailsController extends BaseController {
                                 compareHistory.setNumberNiches(amount.doubleValue());
                                 materialDetails.setLiKuBatch(pool.getBatch());
                                 materialDetails.setWarehouseLocation(pool.getInvLocation());
-                                materialDetails.setNumberOfNiches(niches.toString());
+                                materialDetails.setNumberOfNiches(amount.toString());
                             } else if (total.compareTo(amount) < 0) {
                                 BigDecimal surplus = amount.subtract(total).setScale(2, ROUND_HALF_UP);
                                 BigDecimal bigDecimal = BigDecimal.valueOf(pool.getNumberOfNiches());
@@ -781,7 +781,7 @@ public class MaterialReportDetailsController extends BaseController {
                                 compareHistory.setNumberNiches(amount.doubleValue());
                                 materialDetails.setLiKuBatch(pool.getBatch());
                                 materialDetails.setWarehouseLocation(pool.getInvLocation());
-                                materialDetails.setNumberOfNiches(niches.toString());
+                                materialDetails.setNumberOfNiches(amount.toString());
                             } else if (total.compareTo(amount) < 0) {
                                 BigDecimal surplus = amount.subtract(total).setScale(2, ROUND_HALF_UP);
                                 BigDecimal bigDecimal = BigDecimal.valueOf(pool.getNumberOfNiches());
@@ -873,7 +873,7 @@ public class MaterialReportDetailsController extends BaseController {
                                 compareHistory.setNumberNiches(amount.doubleValue());
                                 materialDetails.setLiKuBatch(pool.getBatch());
                                 materialDetails.setWarehouseLocation(pool.getInvLocation());
-                                materialDetails.setNumberOfNiches(niches.toString());
+                                materialDetails.setNumberOfNiches(amount.toString());
                             } else if (total.compareTo(amount) < 0) {
                                 BigDecimal surplus = amount.subtract(total).setScale(2, ROUND_HALF_UP);
                                 BigDecimal bigDecimal = BigDecimal.valueOf(pool.getNumberOfNiches());
@@ -965,7 +965,7 @@ public class MaterialReportDetailsController extends BaseController {
                                 compareHistory.setNumberNiches(amount.doubleValue());
                                 materialDetails.setLiKuBatch(pool.getBatch());
                                 materialDetails.setWarehouseLocation(pool.getInvLocation());
-                                materialDetails.setNumberOfNiches(niches.toString());
+                                materialDetails.setNumberOfNiches(amount.toString());
                             } else if (total.compareTo(amount) < 0) {
                                 BigDecimal surplus = amount.subtract(total).setScale(2, ROUND_HALF_UP);
                                 BigDecimal bigDecimal = BigDecimal.valueOf(pool.getNumberOfNiches());
@@ -1058,7 +1058,7 @@ public class MaterialReportDetailsController extends BaseController {
                                 compareHistory.setNumberNiches(amount.doubleValue());
                                 materialDetails.setLiKuBatch(pool.getBatch());
                                 materialDetails.setWarehouseLocation(pool.getInvLocation());
-                                materialDetails.setNumberOfNiches(niches.toString());
+                                materialDetails.setNumberOfNiches(amount.toString());
                             } else if (total.compareTo(amount) < 0) {
                                 BigDecimal surplus = amount.subtract(total).setScale(2, ROUND_HALF_UP);
                                 BigDecimal bigDecimal = BigDecimal.valueOf(pool.getNumberOfNiches());
@@ -1150,7 +1150,7 @@ public class MaterialReportDetailsController extends BaseController {
                                 compareHistory.setNumberNiches(amount.doubleValue());
                                 materialDetails.setLiKuBatch(pool.getBatch());
                                 materialDetails.setWarehouseLocation(pool.getInvLocation());
-                                materialDetails.setNumberOfNiches(niches.toString());
+                                materialDetails.setNumberOfNiches(amount.toString());
                             } else if (total.compareTo(amount) < 0) {
                                 BigDecimal surplus = amount.subtract(total).setScale(2, ROUND_HALF_UP);
                                 BigDecimal bigDecimal = BigDecimal.valueOf(pool.getNumberOfNiches());
@@ -1242,7 +1242,7 @@ public class MaterialReportDetailsController extends BaseController {
                                 compareHistory.setNumberNiches(amount.doubleValue());
                                 materialDetails.setLiKuBatch(pool.getBatch());
                                 materialDetails.setWarehouseLocation(pool.getInvLocation());
-                                materialDetails.setNumberOfNiches(niches.toString());
+                                materialDetails.setNumberOfNiches(amount.toString());
                             } else if (total.compareTo(amount) < 0) {
                                 BigDecimal surplus = amount.subtract(total).setScale(2, ROUND_HALF_UP);
                                 BigDecimal bigDecimal = BigDecimal.valueOf(pool.getNumberOfNiches());
@@ -1335,7 +1335,7 @@ public class MaterialReportDetailsController extends BaseController {
                                 compareHistory.setNumberNiches(amount.doubleValue());
                                 materialDetails.setLiKuBatch(pool.getBatch());
                                 materialDetails.setWarehouseLocation(pool.getInvLocation());
-                                materialDetails.setNumberOfNiches(niches.toString());
+                                materialDetails.setNumberOfNiches(amount.toString());
                             } else if (total.compareTo(amount) < 0) {
                                 BigDecimal surplus = amount.subtract(total).setScale(2, ROUND_HALF_UP);
                                 BigDecimal bigDecimal = BigDecimal.valueOf(pool.getNumberOfNiches());
@@ -1427,7 +1427,7 @@ public class MaterialReportDetailsController extends BaseController {
                                 compareHistory.setNumberNiches(amount.doubleValue());
                                 materialDetails.setLiKuBatch(pool.getBatch());
                                 materialDetails.setWarehouseLocation(pool.getInvLocation());
-                                materialDetails.setNumberOfNiches(niches.toString());
+                                materialDetails.setNumberOfNiches(amount.toString());
                             } else if (total.compareTo(amount) < 0) {
                                 BigDecimal surplus = amount.subtract(total).setScale(2, ROUND_HALF_UP);
                                 BigDecimal bigDecimal = BigDecimal.valueOf(pool.getNumberOfNiches());
@@ -1519,7 +1519,7 @@ public class MaterialReportDetailsController extends BaseController {
                                 compareHistory.setNumberNiches(amount.doubleValue());
                                 materialDetails.setLiKuBatch(pool.getBatch());
                                 materialDetails.setWarehouseLocation(pool.getInvLocation());
-                                materialDetails.setNumberOfNiches(niches.toString());
+                                materialDetails.setNumberOfNiches(amount.toString());
                             } else if (total.compareTo(amount) < 0) {
                                 BigDecimal surplus = amount.subtract(total).setScale(2, ROUND_HALF_UP);
                                 BigDecimal bigDecimal = BigDecimal.valueOf(pool.getNumberOfNiches());
@@ -1612,7 +1612,7 @@ public class MaterialReportDetailsController extends BaseController {
                                 compareHistory.setNumberNiches(amount.doubleValue());
                                 materialDetails.setLiKuBatch(pool.getBatch());
                                 materialDetails.setWarehouseLocation(pool.getInvLocation());
-                                materialDetails.setNumberOfNiches(niches.toString());
+                                materialDetails.setNumberOfNiches(amount.toString());
                             } else if (total.compareTo(amount) < 0) {
                                 BigDecimal surplus = amount.subtract(total).setScale(2, ROUND_HALF_UP);
                                 BigDecimal bigDecimal = BigDecimal.valueOf(pool.getNumberOfNiches());
@@ -1704,7 +1704,7 @@ public class MaterialReportDetailsController extends BaseController {
                                 compareHistory.setNumberNiches(amount.doubleValue());
                                 materialDetails.setLiKuBatch(pool.getBatch());
                                 materialDetails.setWarehouseLocation(pool.getInvLocation());
-                                materialDetails.setNumberOfNiches(niches.toString());
+                                materialDetails.setNumberOfNiches(amount.toString());
                             } else if (total.compareTo(amount) < 0) {
                                 BigDecimal surplus = amount.subtract(total).setScale(2, ROUND_HALF_UP);
                                 BigDecimal bigDecimal = BigDecimal.valueOf(pool.getNumberOfNiches());
@@ -1796,7 +1796,7 @@ public class MaterialReportDetailsController extends BaseController {
                                 compareHistory.setNumberNiches(amount.doubleValue());
                                 materialDetails.setLiKuBatch(pool.getBatch());
                                 materialDetails.setWarehouseLocation(pool.getInvLocation());
-                                materialDetails.setNumberOfNiches(niches.toString());
+                                materialDetails.setNumberOfNiches(amount.toString());
                             } else if (total.compareTo(amount) < 0) {
                                 BigDecimal surplus = amount.subtract(total).setScale(2, ROUND_HALF_UP);
                                 BigDecimal bigDecimal = BigDecimal.valueOf(pool.getNumberOfNiches());
@@ -1931,7 +1931,7 @@ public class MaterialReportDetailsController extends BaseController {
                                     compareHistory.setNumberNiches(amount.doubleValue());
                                     materialDetails.setLiKuBatch(pool.getBatch());
                                     materialDetails.setWarehouseLocation(pool.getInvLocation());
-                                    materialDetails.setNumberOfNiches(niches.toString());
+                                    materialDetails.setNumberOfNiches(amount.toString());
                                 } else if (total.compareTo(amount) < 0) {
                                     BigDecimal surplus = amount.subtract(total).setScale(2, ROUND_HALF_UP);
                                     BigDecimal bigDecimal = BigDecimal.valueOf(pool.getNumberOfNiches());
@@ -1948,7 +1948,7 @@ public class MaterialReportDetailsController extends BaseController {
                                     compareHistory.setNumberNiches(total.doubleValue());
                                     materialDetails.setLiKuBatch(pool.getBatch());
                                     materialDetails.setWarehouseLocation(pool.getInvLocation());
-                                    materialDetails.setNumberOfNiches(niches.toString());
+                                    materialDetails.setNumberOfNiches(total.toString());
                                 }
                                 compareHistories.add(compareHistory);
                                 detailsList.add(materialDetails);
@@ -2019,7 +2019,7 @@ public class MaterialReportDetailsController extends BaseController {
                                     compareHistory.setNumberNiches(amount.doubleValue());
                                     materialDetails.setLiKuBatch(pool.getBatch());
                                     materialDetails.setWarehouseLocation(pool.getInvLocation());
-                                    materialDetails.setNumberOfNiches(niches.toString());
+                                    materialDetails.setNumberOfNiches(amount.toString());
                                 } else if (total.compareTo(amount) < 0) {
                                     BigDecimal surplus = amount.subtract(total).setScale(2, ROUND_HALF_UP);
                                     BigDecimal bigDecimal = BigDecimal.valueOf(pool.getNumberOfNiches());
@@ -2036,7 +2036,7 @@ public class MaterialReportDetailsController extends BaseController {
                                     compareHistory.setNumberNiches(total.doubleValue());
                                     materialDetails.setLiKuBatch(pool.getBatch());
                                     materialDetails.setWarehouseLocation(pool.getInvLocation());
-                                    materialDetails.setNumberOfNiches(niches.toString());
+                                    materialDetails.setNumberOfNiches(total.toString());
                                 }
                                 compareHistories.add(compareHistory);
                                 detailsList.add(materialDetails);
@@ -2106,7 +2106,7 @@ public class MaterialReportDetailsController extends BaseController {
                                     compareHistory.setNumberNiches(amount.doubleValue());
                                     materialDetails.setLiKuBatch(pool.getBatch());
                                     materialDetails.setWarehouseLocation(pool.getInvLocation());
-                                    materialDetails.setNumberOfNiches(niches.toString());
+                                    materialDetails.setNumberOfNiches(amount.toString());
                                 } else if (total.compareTo(amount) < 0) {
                                     BigDecimal surplus = amount.subtract(total).setScale(2, ROUND_HALF_UP);
                                     BigDecimal bigDecimal = BigDecimal.valueOf(pool.getNumberOfNiches());
@@ -2123,7 +2123,7 @@ public class MaterialReportDetailsController extends BaseController {
                                     compareHistory.setNumberNiches(total.doubleValue());
                                     materialDetails.setLiKuBatch(pool.getBatch());
                                     materialDetails.setWarehouseLocation(pool.getInvLocation());
-                                    materialDetails.setNumberOfNiches(niches.toString());
+                                    materialDetails.setNumberOfNiches(total.toString());
                                 }
                                 compareHistories.add(compareHistory);
                                 detailsList.add(materialDetails);
@@ -2193,7 +2193,7 @@ public class MaterialReportDetailsController extends BaseController {
                                     compareHistory.setNumberNiches(amount.doubleValue());
                                     materialDetails.setLiKuBatch(pool.getBatch());
                                     materialDetails.setWarehouseLocation(pool.getInvLocation());
-                                    materialDetails.setNumberOfNiches(niches.toString());
+                                    materialDetails.setNumberOfNiches(amount.toString());
                                 } else if (total.compareTo(amount) < 0) {
                                     BigDecimal surplus = amount.subtract(total).setScale(2, ROUND_HALF_UP);
                                     BigDecimal bigDecimal = BigDecimal.valueOf(pool.getNumberOfNiches());
@@ -2210,7 +2210,7 @@ public class MaterialReportDetailsController extends BaseController {
                                     compareHistory.setNumberNiches(total.doubleValue());
                                     materialDetails.setLiKuBatch(pool.getBatch());
                                     materialDetails.setWarehouseLocation(pool.getInvLocation());
-                                    materialDetails.setNumberOfNiches(niches.toString());
+                                    materialDetails.setNumberOfNiches(total.toString());
                                 }
                                 compareHistories.add(compareHistory);
                                 detailsList.add(materialDetails);
@@ -2282,7 +2282,7 @@ public class MaterialReportDetailsController extends BaseController {
                                     compareHistory.setNumberNiches(amount.doubleValue());
                                     materialDetails.setLiKuBatch(pool.getBatch());
                                     materialDetails.setWarehouseLocation(pool.getInvLocation());
-                                    materialDetails.setNumberOfNiches(niches.toString());
+                                    materialDetails.setNumberOfNiches(amount.toString());
                                 } else if (total.compareTo(amount) < 0) {
                                     BigDecimal surplus = amount.subtract(total).setScale(2, ROUND_HALF_UP);
                                     BigDecimal bigDecimal = BigDecimal.valueOf(pool.getNumberOfNiches());
@@ -2299,7 +2299,7 @@ public class MaterialReportDetailsController extends BaseController {
                                     compareHistory.setNumberNiches(total.doubleValue());
                                     materialDetails.setLiKuBatch(pool.getBatch());
                                     materialDetails.setWarehouseLocation(pool.getInvLocation());
-                                    materialDetails.setNumberOfNiches(niches.toString());
+                                    materialDetails.setNumberOfNiches(total.toString());
                                 }
                                 compareHistories.add(compareHistory);
                                 detailsList.add(materialDetails);
@@ -2314,6 +2314,7 @@ public class MaterialReportDetailsController extends BaseController {
                             details.setRegionalRepList(regionalRepList);
                         } else {
                             regionalRepList = new ArrayList<>();
+                            regionalRepList.addAll(detailsList);
                         }
                         details.setRegionalRepList(regionalRepList);
                     }
@@ -2376,7 +2377,7 @@ public class MaterialReportDetailsController extends BaseController {
                                     compareHistory.setNumberNiches(amount.doubleValue());
                                     materialDetails.setLiKuBatch(pool.getBatch());
                                     materialDetails.setWarehouseLocation(pool.getInvLocation());
-                                    materialDetails.setNumberOfNiches(niches.toString());
+                                    materialDetails.setNumberOfNiches(amount.toString());
                                 } else if (total.compareTo(amount) < 0) {
                                     BigDecimal surplus = amount.subtract(total).setScale(2, ROUND_HALF_UP);
                                     BigDecimal bigDecimal = BigDecimal.valueOf(pool.getNumberOfNiches());
@@ -2393,7 +2394,7 @@ public class MaterialReportDetailsController extends BaseController {
                                     compareHistory.setNumberNiches(total.doubleValue());
                                     materialDetails.setLiKuBatch(pool.getBatch());
                                     materialDetails.setWarehouseLocation(pool.getInvLocation());
-                                    materialDetails.setNumberOfNiches(niches.toString());
+                                    materialDetails.setNumberOfNiches(total.toString());
                                 }
                                 compareHistories.add(compareHistory);
                                 detailsList.add(materialDetails);
@@ -2408,6 +2409,7 @@ public class MaterialReportDetailsController extends BaseController {
                             details.setRegionalRepList(regionalRepList);
                         } else {
                             regionalRepList = new ArrayList<>();
+                            regionalRepList.addAll(detailsList);
                         }
                         details.setRegionalRepList(regionalRepList);
                     }
@@ -2470,7 +2472,7 @@ public class MaterialReportDetailsController extends BaseController {
                                     compareHistory.setNumberNiches(amount.doubleValue());
                                     materialDetails.setLiKuBatch(pool.getBatch());
                                     materialDetails.setWarehouseLocation(pool.getInvLocation());
-                                    materialDetails.setNumberOfNiches(niches.toString());
+                                    materialDetails.setNumberOfNiches(amount.toString());
                                 } else if (total.compareTo(amount) < 0) {
                                     BigDecimal surplus = amount.subtract(total).setScale(2, ROUND_HALF_UP);
                                     BigDecimal bigDecimal = BigDecimal.valueOf(pool.getNumberOfNiches());
@@ -2487,7 +2489,7 @@ public class MaterialReportDetailsController extends BaseController {
                                     compareHistory.setNumberNiches(total.doubleValue());
                                     materialDetails.setLiKuBatch(pool.getBatch());
                                     materialDetails.setWarehouseLocation(pool.getInvLocation());
-                                    materialDetails.setNumberOfNiches(niches.toString());
+                                    materialDetails.setNumberOfNiches(total.toString());
                                 }
                                 compareHistories.add(compareHistory);
                                 detailsList.add(materialDetails);
@@ -2502,6 +2504,7 @@ public class MaterialReportDetailsController extends BaseController {
                             details.setRegionalRepList(regionalRepList);
                         } else {
                             regionalRepList = new ArrayList<>();
+                            regionalRepList.addAll(detailsList);
                         }
                         details.setRegionalRepList(regionalRepList);
                     }
@@ -2565,7 +2568,7 @@ public class MaterialReportDetailsController extends BaseController {
                                     compareHistory.setNumberNiches(amount.doubleValue());
                                     materialDetails.setLiKuBatch(pool.getBatch());
                                     materialDetails.setWarehouseLocation(pool.getInvLocation());
-                                    materialDetails.setNumberOfNiches(niches.toString());
+                                    materialDetails.setNumberOfNiches(amount.toString());
                                 } else if (total.compareTo(amount) < 0) {
                                     BigDecimal surplus = amount.subtract(total).setScale(2, ROUND_HALF_UP);
                                     BigDecimal bigDecimal = BigDecimal.valueOf(pool.getNumberOfNiches());
@@ -2582,7 +2585,7 @@ public class MaterialReportDetailsController extends BaseController {
                                     compareHistory.setNumberNiches(total.doubleValue());
                                     materialDetails.setLiKuBatch(pool.getBatch());
                                     materialDetails.setWarehouseLocation(pool.getInvLocation());
-                                    materialDetails.setNumberOfNiches(niches.toString());
+                                    materialDetails.setNumberOfNiches(total.toString());
                                 }
                                 compareHistories.add(compareHistory);
                                 detailsList.add(materialDetails);
@@ -2597,6 +2600,7 @@ public class MaterialReportDetailsController extends BaseController {
                             details.setRegionalRepList(regionalRepList);
                         } else {
                             regionalRepList = new ArrayList<>();
+                            regionalRepList.addAll(detailsList);
                         }
                         details.setRegionalRepList(regionalRepList);
                     }
@@ -2659,7 +2663,7 @@ public class MaterialReportDetailsController extends BaseController {
                                     compareHistory.setNumberNiches(amount.doubleValue());
                                     materialDetails.setLiKuBatch(pool.getBatch());
                                     materialDetails.setWarehouseLocation(pool.getInvLocation());
-                                    materialDetails.setNumberOfNiches(niches.toString());
+                                    materialDetails.setNumberOfNiches(amount.toString());
                                 } else if (total.compareTo(amount) < 0) {
                                     BigDecimal surplus = amount.subtract(total).setScale(2, ROUND_HALF_UP);
                                     BigDecimal bigDecimal = BigDecimal.valueOf(pool.getNumberOfNiches());
@@ -2676,7 +2680,7 @@ public class MaterialReportDetailsController extends BaseController {
                                     compareHistory.setNumberNiches(total.doubleValue());
                                     materialDetails.setLiKuBatch(pool.getBatch());
                                     materialDetails.setWarehouseLocation(pool.getInvLocation());
-                                    materialDetails.setNumberOfNiches(niches.toString());
+                                    materialDetails.setNumberOfNiches(total.toString());
                                 }
                                 compareHistories.add(compareHistory);
                                 detailsList.add(materialDetails);
@@ -2691,6 +2695,7 @@ public class MaterialReportDetailsController extends BaseController {
                             details.setRegionalRepList(regionalRepList);
                         } else {
                             regionalRepList = new ArrayList<>();
+                            regionalRepList.addAll(detailsList);
                         }
                         details.setRegionalRepList(regionalRepList);
                     }
@@ -2753,7 +2758,7 @@ public class MaterialReportDetailsController extends BaseController {
                                     compareHistory.setNumberNiches(amount.doubleValue());
                                     materialDetails.setLiKuBatch(pool.getBatch());
                                     materialDetails.setWarehouseLocation(pool.getInvLocation());
-                                    materialDetails.setNumberOfNiches(niches.toString());
+                                    materialDetails.setNumberOfNiches(amount.toString());
                                 } else if (total.compareTo(amount) < 0) {
                                     BigDecimal surplus = amount.subtract(total).setScale(2, ROUND_HALF_UP);
                                     BigDecimal bigDecimal = BigDecimal.valueOf(pool.getNumberOfNiches());
@@ -2770,7 +2775,7 @@ public class MaterialReportDetailsController extends BaseController {
                                     compareHistory.setNumberNiches(total.doubleValue());
                                     materialDetails.setLiKuBatch(pool.getBatch());
                                     materialDetails.setWarehouseLocation(pool.getInvLocation());
-                                    materialDetails.setNumberOfNiches(niches.toString());
+                                    materialDetails.setNumberOfNiches(total.toString());
                                 }
                                 compareHistories.add(compareHistory);
                                 detailsList.add(materialDetails);
@@ -2785,6 +2790,7 @@ public class MaterialReportDetailsController extends BaseController {
                             details.setRegionalRepList(regionalRepList);
                         } else {
                             regionalRepList = new ArrayList<>();
+                            regionalRepList.addAll(detailsList);
                         }
                         details.setRegionalRepList(regionalRepList);
                     }
@@ -2848,7 +2854,7 @@ public class MaterialReportDetailsController extends BaseController {
                                     compareHistory.setNumberNiches(amount.doubleValue());
                                     materialDetails.setLiKuBatch(pool.getBatch());
                                     materialDetails.setWarehouseLocation(pool.getInvLocation());
-                                    materialDetails.setNumberOfNiches(niches.toString());
+                                    materialDetails.setNumberOfNiches(amount.toString());
                                 } else if (total.compareTo(amount) < 0) {
                                     BigDecimal surplus = amount.subtract(total).setScale(2, ROUND_HALF_UP);
                                     BigDecimal bigDecimal = BigDecimal.valueOf(pool.getNumberOfNiches());
@@ -2865,7 +2871,7 @@ public class MaterialReportDetailsController extends BaseController {
                                     compareHistory.setNumberNiches(total.doubleValue());
                                     materialDetails.setLiKuBatch(pool.getBatch());
                                     materialDetails.setWarehouseLocation(pool.getInvLocation());
-                                    materialDetails.setNumberOfNiches(niches.toString());
+                                    materialDetails.setNumberOfNiches(total.toString());
                                 }
                                 compareHistories.add(compareHistory);
                                 detailsList.add(materialDetails);
@@ -2880,6 +2886,7 @@ public class MaterialReportDetailsController extends BaseController {
                             details.setRegionalRepList(regionalRepList);
                         } else {
                             regionalRepList = new ArrayList<>();
+                            regionalRepList.addAll(detailsList);
                         }
                         details.setRegionalRepList(regionalRepList);
                     }
@@ -2942,7 +2949,7 @@ public class MaterialReportDetailsController extends BaseController {
                                     compareHistory.setNumberNiches(amount.doubleValue());
                                     materialDetails.setLiKuBatch(pool.getBatch());
                                     materialDetails.setWarehouseLocation(pool.getInvLocation());
-                                    materialDetails.setNumberOfNiches(niches.toString());
+                                    materialDetails.setNumberOfNiches(amount.toString());
                                 } else if (total.compareTo(amount) < 0) {
                                     BigDecimal surplus = amount.subtract(total).setScale(2, ROUND_HALF_UP);
                                     BigDecimal bigDecimal = BigDecimal.valueOf(pool.getNumberOfNiches());
@@ -2959,7 +2966,7 @@ public class MaterialReportDetailsController extends BaseController {
                                     compareHistory.setNumberNiches(total.doubleValue());
                                     materialDetails.setLiKuBatch(pool.getBatch());
                                     materialDetails.setWarehouseLocation(pool.getInvLocation());
-                                    materialDetails.setNumberOfNiches(niches.toString());
+                                    materialDetails.setNumberOfNiches(total.toString());
                                 }
                                 compareHistories.add(compareHistory);
                                 detailsList.add(materialDetails);
@@ -2974,6 +2981,7 @@ public class MaterialReportDetailsController extends BaseController {
                             details.setRegionalRepList(regionalRepList);
                         } else {
                             regionalRepList = new ArrayList<>();
+                            regionalRepList.addAll(detailsList);
                         }
                         details.setRegionalRepList(regionalRepList);
                     }
@@ -3036,7 +3044,7 @@ public class MaterialReportDetailsController extends BaseController {
                                     compareHistory.setNumberNiches(amount.doubleValue());
                                     materialDetails.setLiKuBatch(pool.getBatch());
                                     materialDetails.setWarehouseLocation(pool.getInvLocation());
-                                    materialDetails.setNumberOfNiches(niches.toString());
+                                    materialDetails.setNumberOfNiches(amount.toString());
                                 } else if (total.compareTo(amount) < 0) {
                                     BigDecimal surplus = amount.subtract(total).setScale(2, ROUND_HALF_UP);
                                     BigDecimal bigDecimal = BigDecimal.valueOf(pool.getNumberOfNiches());
@@ -3053,7 +3061,7 @@ public class MaterialReportDetailsController extends BaseController {
                                     compareHistory.setNumberNiches(total.doubleValue());
                                     materialDetails.setLiKuBatch(pool.getBatch());
                                     materialDetails.setWarehouseLocation(pool.getInvLocation());
-                                    materialDetails.setNumberOfNiches(niches.toString());
+                                    materialDetails.setNumberOfNiches(total.toString());
                                 }
                                 compareHistories.add(compareHistory);
                                 detailsList.add(materialDetails);
@@ -3068,6 +3076,7 @@ public class MaterialReportDetailsController extends BaseController {
                             details.setRegionalRepList(regionalRepList);
                         } else {
                             regionalRepList = new ArrayList<>();
+                            regionalRepList.addAll(detailsList);
                         }
                         details.setRegionalRepList(regionalRepList);
                     }
@@ -3131,7 +3140,7 @@ public class MaterialReportDetailsController extends BaseController {
                                     compareHistory.setNumberNiches(amount.doubleValue());
                                     materialDetails.setLiKuBatch(pool.getBatch());
                                     materialDetails.setWarehouseLocation(pool.getInvLocation());
-                                    materialDetails.setNumberOfNiches(niches.toString());
+                                    materialDetails.setNumberOfNiches(amount.toString());
                                 } else if (total.compareTo(amount) < 0) {
                                     BigDecimal surplus = amount.subtract(total).setScale(2, ROUND_HALF_UP);
                                     BigDecimal bigDecimal = BigDecimal.valueOf(pool.getNumberOfNiches());
@@ -3148,7 +3157,7 @@ public class MaterialReportDetailsController extends BaseController {
                                     compareHistory.setNumberNiches(total.doubleValue());
                                     materialDetails.setLiKuBatch(pool.getBatch());
                                     materialDetails.setWarehouseLocation(pool.getInvLocation());
-                                    materialDetails.setNumberOfNiches(niches.toString());
+                                    materialDetails.setNumberOfNiches(total.toString());
                                 }
                                 compareHistories.add(compareHistory);
                                 detailsList.add(materialDetails);
@@ -3163,6 +3172,7 @@ public class MaterialReportDetailsController extends BaseController {
                             details.setRegionalRepList(regionalRepList);
                         } else {
                             regionalRepList = new ArrayList<>();
+                            regionalRepList.addAll(detailsList);
                         }
                         details.setRegionalRepList(regionalRepList);
                     }
@@ -3226,7 +3236,7 @@ public class MaterialReportDetailsController extends BaseController {
                                     compareHistory.setNumberNiches(amount.doubleValue());
                                     materialDetails.setLiKuBatch(pool.getBatch());
                                     materialDetails.setWarehouseLocation(pool.getInvLocation());
-                                    materialDetails.setNumberOfNiches(niches.toString());
+                                    materialDetails.setNumberOfNiches(amount.toString());
                                 } else if (total.compareTo(amount) < 0) {
                                     BigDecimal surplus = amount.subtract(total).setScale(2, ROUND_HALF_UP);
                                     BigDecimal bigDecimal = BigDecimal.valueOf(pool.getNumberOfNiches());
@@ -3243,7 +3253,7 @@ public class MaterialReportDetailsController extends BaseController {
                                     compareHistory.setNumberNiches(total.doubleValue());
                                     materialDetails.setLiKuBatch(pool.getBatch());
                                     materialDetails.setWarehouseLocation(pool.getInvLocation());
-                                    materialDetails.setNumberOfNiches(niches.toString());
+                                    materialDetails.setNumberOfNiches(total.toString());
                                 }
                                 compareHistories.add(compareHistory);
                                 detailsList.add(materialDetails);
@@ -3258,6 +3268,7 @@ public class MaterialReportDetailsController extends BaseController {
                             details.setRegionalRepList(regionalRepList);
                         } else {
                             regionalRepList = new ArrayList<>();
+                            regionalRepList.addAll(detailsList);
                         }
                         details.setRegionalRepList(regionalRepList);
                     }
@@ -3320,7 +3331,7 @@ public class MaterialReportDetailsController extends BaseController {
                                     compareHistory.setNumberNiches(amount.doubleValue());
                                     materialDetails.setLiKuBatch(pool.getBatch());
                                     materialDetails.setWarehouseLocation(pool.getInvLocation());
-                                    materialDetails.setNumberOfNiches(niches.toString());
+                                    materialDetails.setNumberOfNiches(amount.toString());
                                 } else if (total.compareTo(amount) < 0) {
                                     BigDecimal surplus = amount.subtract(total).setScale(2, ROUND_HALF_UP);
                                     BigDecimal bigDecimal = BigDecimal.valueOf(pool.getNumberOfNiches());
@@ -3337,7 +3348,7 @@ public class MaterialReportDetailsController extends BaseController {
                                     compareHistory.setNumberNiches(total.doubleValue());
                                     materialDetails.setLiKuBatch(pool.getBatch());
                                     materialDetails.setWarehouseLocation(pool.getInvLocation());
-                                    materialDetails.setNumberOfNiches(niches.toString());
+                                    materialDetails.setNumberOfNiches(total.toString());
                                 }
                                 compareHistories.add(compareHistory);
                                 detailsList.add(materialDetails);
@@ -3352,6 +3363,7 @@ public class MaterialReportDetailsController extends BaseController {
                             details.setRegionalRepList(regionalRepList);
                         } else {
                             regionalRepList = new ArrayList<>();
+                            regionalRepList.addAll(detailsList);
                         }
                         details.setRegionalRepList(regionalRepList);
                     }

src/main/java/com/jeeplus/modules/sg/balancedlibrary/replaceMaterial/web/ReplaceMaterialController.java

@@ -184,11 +184,14 @@ public class ReplaceMaterialController extends BaseController {
 		AjaxJson j = new AjaxJson();
 		List<ReplaceMaterial> insertList = new ArrayList<>();
 		try {
-			ImportExcel ei = new ImportExcel(file, 1, 0);
+			ImportExcel ei = new ImportExcel(file, 0, 0);
 			for (int i = 1; i < ei.getLastDataRowNum(); i++) {
 				Row row = ei.getRow(i);
 				ReplaceMaterial replaceMaterial = new ReplaceMaterial();
 				Cell cell = row.getCell(0);
+				if (null == cell) {
+					continue;
+				}
 				String value = cell.toString();
 				if ("".equals(value) || null == value || value.contains("注：")) {
 					continue;