新增修改删除页面，物资上报后，利库数量，剩余数量修改

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

@@ -3429,7 +3429,16 @@ public class MaterialReportDetailsController extends BaseController {
                                 }
                             }
                         }
+                        BigDecimal begin = BigDecimal.valueOf(0.0);
+                        BigDecimal bigDecimal = BigDecimal.valueOf(pool.getLengthOfCable());
+                        for (MaterialReportDetails a :
+                                bestChose) {
+                            begin  = begin.add(BigDecimal.valueOf(a.getTotal()));
+                        }
                         //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal decimal = bigDecimal.subtract(begin).setScale(2, ROUND_HALF_UP);
+                        pool.setNumberOfNiches(begin.doubleValue());
+                        pool.setRemaining(decimal.doubleValue());
                         pool.setCompleteLiKu(1);
                     }
                 }
@@ -3475,6 +3484,16 @@ public class MaterialReportDetailsController extends BaseController {
                             }
                         }
                         //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal begin = BigDecimal.valueOf(0.0);
+                        BigDecimal bigDecimal = BigDecimal.valueOf(pool.getLengthOfCable());
+                        for (MaterialReportDetails a :
+                                bestChose) {
+                            begin  = begin.add(BigDecimal.valueOf(a.getTotal()));
+                        }
+                        //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal decimal = bigDecimal.subtract(begin).setScale(2, ROUND_HALF_UP);
+                        pool.setNumberOfNiches(begin.doubleValue());
+                        pool.setRemaining(decimal.doubleValue());
                         pool.setCompleteLiKu(1);
                     }
                 }
@@ -3520,6 +3539,16 @@ public class MaterialReportDetailsController extends BaseController {
                             }
                         }
                         //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal begin = BigDecimal.valueOf(0.0);
+                        BigDecimal bigDecimal = BigDecimal.valueOf(pool.getLengthOfCable());
+                        for (MaterialReportDetails a :
+                                bestChose) {
+                            begin  = begin.add(BigDecimal.valueOf(a.getTotal()));
+                        }
+                        //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal decimal = bigDecimal.subtract(begin).setScale(2, ROUND_HALF_UP);
+                        pool.setNumberOfNiches(begin.doubleValue());
+                        pool.setRemaining(decimal.doubleValue());
                         pool.setCompleteLiKu(1);
                     }
                 }
@@ -3565,6 +3594,16 @@ public class MaterialReportDetailsController extends BaseController {
                             }
                         }
                         //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal begin = BigDecimal.valueOf(0.0);
+                        BigDecimal bigDecimal = BigDecimal.valueOf(pool.getLengthOfCable());
+                        for (MaterialReportDetails a :
+                                bestChose) {
+                            begin  = begin.add(BigDecimal.valueOf(a.getTotal()));
+                        }
+                        //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal decimal = bigDecimal.subtract(begin).setScale(2, ROUND_HALF_UP);
+                        pool.setNumberOfNiches(begin.doubleValue());
+                        pool.setRemaining(decimal.doubleValue());
                         pool.setCompleteLiKu(1);
                     }
                 }
@@ -3611,6 +3650,16 @@ public class MaterialReportDetailsController extends BaseController {
                             }
                         }
                         //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal begin = BigDecimal.valueOf(0.0);
+                        BigDecimal bigDecimal = BigDecimal.valueOf(pool.getLengthOfCable());
+                        for (MaterialReportDetails a :
+                                bestChose) {
+                            begin  = begin.add(BigDecimal.valueOf(a.getTotal()));
+                        }
+                        //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal decimal = bigDecimal.subtract(begin).setScale(2, ROUND_HALF_UP);
+                        pool.setNumberOfNiches(begin.doubleValue());
+                        pool.setRemaining(decimal.doubleValue());
                         pool.setCompleteLiKu(1);
                     }
                 }
@@ -3656,6 +3705,16 @@ public class MaterialReportDetailsController extends BaseController {
                             }
                         }
                         //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal begin = BigDecimal.valueOf(0.0);
+                        BigDecimal bigDecimal = BigDecimal.valueOf(pool.getLengthOfCable());
+                        for (MaterialReportDetails a :
+                                bestChose) {
+                            begin  = begin.add(BigDecimal.valueOf(a.getTotal()));
+                        }
+                        //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal decimal = bigDecimal.subtract(begin).setScale(2, ROUND_HALF_UP);
+                        pool.setNumberOfNiches(begin.doubleValue());
+                        pool.setRemaining(decimal.doubleValue());
                         pool.setCompleteLiKu(1);
                     }
                 }
@@ -3701,6 +3760,16 @@ public class MaterialReportDetailsController extends BaseController {
                             }
                         }
                         //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal begin = BigDecimal.valueOf(0.0);
+                        BigDecimal bigDecimal = BigDecimal.valueOf(pool.getLengthOfCable());
+                        for (MaterialReportDetails a :
+                                bestChose) {
+                            begin  = begin.add(BigDecimal.valueOf(a.getTotal()));
+                        }
+                        //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal decimal = bigDecimal.subtract(begin).setScale(2, ROUND_HALF_UP);
+                        pool.setNumberOfNiches(begin.doubleValue());
+                        pool.setRemaining(decimal.doubleValue());
                         pool.setCompleteLiKu(1);
                     }
                 }
@@ -3747,6 +3816,16 @@ public class MaterialReportDetailsController extends BaseController {
                             }
                         }
                         //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal begin = BigDecimal.valueOf(0.0);
+                        BigDecimal bigDecimal = BigDecimal.valueOf(pool.getLengthOfCable());
+                        for (MaterialReportDetails a :
+                                bestChose) {
+                            begin  = begin.add(BigDecimal.valueOf(a.getTotal()));
+                        }
+                        //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal decimal = bigDecimal.subtract(begin).setScale(2, ROUND_HALF_UP);
+                        pool.setNumberOfNiches(begin.doubleValue());
+                        pool.setRemaining(decimal.doubleValue());
                         pool.setCompleteLiKu(1);
                     }
                 }
@@ -3792,6 +3871,16 @@ public class MaterialReportDetailsController extends BaseController {
                             }
                         }
                         //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal begin = BigDecimal.valueOf(0.0);
+                        BigDecimal bigDecimal = BigDecimal.valueOf(pool.getLengthOfCable());
+                        for (MaterialReportDetails a :
+                                bestChose) {
+                            begin  = begin.add(BigDecimal.valueOf(a.getTotal()));
+                        }
+                        //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal decimal = bigDecimal.subtract(begin).setScale(2, ROUND_HALF_UP);
+                        pool.setNumberOfNiches(begin.doubleValue());
+                        pool.setRemaining(decimal.doubleValue());
                         pool.setCompleteLiKu(1);
                     }
                 }
@@ -3837,6 +3926,16 @@ public class MaterialReportDetailsController extends BaseController {
                             }
                         }
                         //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal begin = BigDecimal.valueOf(0.0);
+                        BigDecimal bigDecimal = BigDecimal.valueOf(pool.getLengthOfCable());
+                        for (MaterialReportDetails a :
+                                bestChose) {
+                            begin  = begin.add(BigDecimal.valueOf(a.getTotal()));
+                        }
+                        //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal decimal = bigDecimal.subtract(begin).setScale(2, ROUND_HALF_UP);
+                        pool.setNumberOfNiches(begin.doubleValue());
+                        pool.setRemaining(decimal.doubleValue());
                         pool.setCompleteLiKu(1);
                     }
                 }
@@ -3883,6 +3982,16 @@ public class MaterialReportDetailsController extends BaseController {
                             }
                         }
                         //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal begin = BigDecimal.valueOf(0.0);
+                        BigDecimal bigDecimal = BigDecimal.valueOf(pool.getLengthOfCable());
+                        for (MaterialReportDetails a :
+                                bestChose) {
+                            begin  = begin.add(BigDecimal.valueOf(a.getTotal()));
+                        }
+                        //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal decimal = bigDecimal.subtract(begin).setScale(2, ROUND_HALF_UP);
+                        pool.setNumberOfNiches(begin.doubleValue());
+                        pool.setRemaining(decimal.doubleValue());
                         pool.setCompleteLiKu(1);
                     }
                 }
@@ -3928,6 +4037,16 @@ public class MaterialReportDetailsController extends BaseController {
                             }
                         }
                         //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal begin = BigDecimal.valueOf(0.0);
+                        BigDecimal bigDecimal = BigDecimal.valueOf(pool.getLengthOfCable());
+                        for (MaterialReportDetails a :
+                                bestChose) {
+                            begin  = begin.add(BigDecimal.valueOf(a.getTotal()));
+                        }
+                        //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal decimal = bigDecimal.subtract(begin).setScale(2, ROUND_HALF_UP);
+                        pool.setNumberOfNiches(begin.doubleValue());
+                        pool.setRemaining(decimal.doubleValue());
                         pool.setCompleteLiKu(1);
                     }
                 }
@@ -3973,6 +4092,16 @@ public class MaterialReportDetailsController extends BaseController {
                             }
                         }
                         //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal begin = BigDecimal.valueOf(0.0);
+                        BigDecimal bigDecimal = BigDecimal.valueOf(pool.getLengthOfCable());
+                        for (MaterialReportDetails a :
+                                bestChose) {
+                            begin  = begin.add(BigDecimal.valueOf(a.getTotal()));
+                        }
+                        //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal decimal = bigDecimal.subtract(begin).setScale(2, ROUND_HALF_UP);
+                        pool.setNumberOfNiches(begin.doubleValue());
+                        pool.setRemaining(decimal.doubleValue());
                         pool.setCompleteLiKu(1);
                     }
                 }
@@ -4020,6 +4149,16 @@ public class MaterialReportDetailsController extends BaseController {
                             }
                         }
                         //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal begin = BigDecimal.valueOf(0.0);
+                        BigDecimal bigDecimal = BigDecimal.valueOf(pool.getLengthOfCable());
+                        for (MaterialReportDetails a :
+                                bestChose) {
+                            begin  = begin.add(BigDecimal.valueOf(a.getTotal()));
+                        }
+                        //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal decimal = bigDecimal.subtract(begin).setScale(2, ROUND_HALF_UP);
+                        pool.setNumberOfNiches(begin.doubleValue());
+                        pool.setRemaining(decimal.doubleValue());
                         pool.setCompleteLiKu(1);
                     }
                 }
@@ -4065,6 +4204,16 @@ public class MaterialReportDetailsController extends BaseController {
                             }
                         }
                         //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal begin = BigDecimal.valueOf(0.0);
+                        BigDecimal bigDecimal = BigDecimal.valueOf(pool.getLengthOfCable());
+                        for (MaterialReportDetails a :
+                                bestChose) {
+                            begin  = begin.add(BigDecimal.valueOf(a.getTotal()));
+                        }
+                        //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal decimal = bigDecimal.subtract(begin).setScale(2, ROUND_HALF_UP);
+                        pool.setNumberOfNiches(begin.doubleValue());
+                        pool.setRemaining(decimal.doubleValue());
                         pool.setCompleteLiKu(1);
                     }
                 }
@@ -4110,6 +4259,16 @@ public class MaterialReportDetailsController extends BaseController {
                             }
                         }
                         //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal begin = BigDecimal.valueOf(0.0);
+                        BigDecimal bigDecimal = BigDecimal.valueOf(pool.getLengthOfCable());
+                        for (MaterialReportDetails a :
+                                bestChose) {
+                            begin  = begin.add(BigDecimal.valueOf(a.getTotal()));
+                        }
+                        //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal decimal = bigDecimal.subtract(begin).setScale(2, ROUND_HALF_UP);
+                        pool.setNumberOfNiches(begin.doubleValue());
+                        pool.setRemaining(decimal.doubleValue());
                         pool.setCompleteLiKu(1);
                     }
                 }
@@ -4171,6 +4330,16 @@ public class MaterialReportDetailsController extends BaseController {
                             }
                         }
                         //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal begin = BigDecimal.valueOf(0.0);
+                        BigDecimal bigDecimal = BigDecimal.valueOf(pool.getLengthOfCable());
+                        for (MaterialReportDetails a :
+                                bestChose) {
+                            begin  = begin.add(BigDecimal.valueOf(a.getTotal()));
+                        }
+                        //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal decimal = bigDecimal.subtract(begin).setScale(2, ROUND_HALF_UP);
+                        pool.setNumberOfNiches(begin.doubleValue());
+                        pool.setRemaining(decimal.doubleValue());
                         pool.setCompleteLiKu(1);
                     }
                 }
@@ -4216,6 +4385,16 @@ public class MaterialReportDetailsController extends BaseController {
                             }
                         }
                         //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal begin = BigDecimal.valueOf(0.0);
+                        BigDecimal bigDecimal = BigDecimal.valueOf(pool.getLengthOfCable());
+                        for (MaterialReportDetails a :
+                                bestChose) {
+                            begin  = begin.add(BigDecimal.valueOf(a.getTotal()));
+                        }
+                        //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal decimal = bigDecimal.subtract(begin).setScale(2, ROUND_HALF_UP);
+                        pool.setNumberOfNiches(begin.doubleValue());
+                        pool.setRemaining(decimal.doubleValue());
                         pool.setCompleteLiKu(1);
                     }
                 }
@@ -4261,6 +4440,16 @@ public class MaterialReportDetailsController extends BaseController {
                             }
                         }
                         //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal begin = BigDecimal.valueOf(0.0);
+                        BigDecimal bigDecimal = BigDecimal.valueOf(pool.getLengthOfCable());
+                        for (MaterialReportDetails a :
+                                bestChose) {
+                            begin  = begin.add(BigDecimal.valueOf(a.getTotal()));
+                        }
+                        //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal decimal = bigDecimal.subtract(begin).setScale(2, ROUND_HALF_UP);
+                        pool.setNumberOfNiches(begin.doubleValue());
+                        pool.setRemaining(decimal.doubleValue());
                         pool.setCompleteLiKu(1);
                     }
                 }
@@ -4306,6 +4495,16 @@ public class MaterialReportDetailsController extends BaseController {
                             }
                         }
                         //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal begin = BigDecimal.valueOf(0.0);
+                        BigDecimal bigDecimal = BigDecimal.valueOf(pool.getLengthOfCable());
+                        for (MaterialReportDetails a :
+                                bestChose) {
+                            begin  = begin.add(BigDecimal.valueOf(a.getTotal()));
+                        }
+                        //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal decimal = bigDecimal.subtract(begin).setScale(2, ROUND_HALF_UP);
+                        pool.setNumberOfNiches(begin.doubleValue());
+                        pool.setRemaining(decimal.doubleValue());
                         pool.setCompleteLiKu(1);
                     }
                 }
@@ -4410,6 +4609,16 @@ public class MaterialReportDetailsController extends BaseController {
                             }
                         }
                         //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal begin = BigDecimal.valueOf(0.0);
+                        BigDecimal bigDecimal = BigDecimal.valueOf(pool.getLengthOfCable());
+                        for (MaterialReportDetails a :
+                                bestChose) {
+                            begin  = begin.add(BigDecimal.valueOf(a.getTotal()));
+                        }
+                        //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal decimal = bigDecimal.subtract(begin).setScale(2, ROUND_HALF_UP);
+                        pool.setNumberOfNiches(begin.doubleValue());
+                        pool.setRemaining(decimal.doubleValue());
                         pool.setCompleteLiKu(1);
                     }
                 }
@@ -4455,6 +4664,16 @@ public class MaterialReportDetailsController extends BaseController {
                             }
                         }
                         //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal begin = BigDecimal.valueOf(0.0);
+                        BigDecimal bigDecimal = BigDecimal.valueOf(pool.getLengthOfCable());
+                        for (MaterialReportDetails a :
+                                bestChose) {
+                            begin  = begin.add(BigDecimal.valueOf(a.getTotal()));
+                        }
+                        //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal decimal = bigDecimal.subtract(begin).setScale(2, ROUND_HALF_UP);
+                        pool.setNumberOfNiches(begin.doubleValue());
+                        pool.setRemaining(decimal.doubleValue());
                         pool.setCompleteLiKu(1);
                     }
                 }
@@ -4500,6 +4719,16 @@ public class MaterialReportDetailsController extends BaseController {
                             }
                         }
                         //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal begin = BigDecimal.valueOf(0.0);
+                        BigDecimal bigDecimal = BigDecimal.valueOf(pool.getLengthOfCable());
+                        for (MaterialReportDetails a :
+                                bestChose) {
+                            begin  = begin.add(BigDecimal.valueOf(a.getTotal()));
+                        }
+                        //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal decimal = bigDecimal.subtract(begin).setScale(2, ROUND_HALF_UP);
+                        pool.setNumberOfNiches(begin.doubleValue());
+                        pool.setRemaining(decimal.doubleValue());
                         pool.setCompleteLiKu(1);
                     }
                 }
@@ -4545,6 +4774,16 @@ public class MaterialReportDetailsController extends BaseController {
                             }
                         }
                         //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal begin = BigDecimal.valueOf(0.0);
+                        BigDecimal bigDecimal = BigDecimal.valueOf(pool.getLengthOfCable());
+                        for (MaterialReportDetails a :
+                                bestChose) {
+                            begin  = begin.add(BigDecimal.valueOf(a.getTotal()));
+                        }
+                        //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal decimal = bigDecimal.subtract(begin).setScale(2, ROUND_HALF_UP);
+                        pool.setNumberOfNiches(begin.doubleValue());
+                        pool.setRemaining(decimal.doubleValue());
                         pool.setCompleteLiKu(1);
                     }
                 }
@@ -4591,6 +4830,16 @@ public class MaterialReportDetailsController extends BaseController {
                             }
                         }
                         //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal begin = BigDecimal.valueOf(0.0);
+                        BigDecimal bigDecimal = BigDecimal.valueOf(pool.getLengthOfCable());
+                        for (MaterialReportDetails a :
+                                bestChose) {
+                            begin  = begin.add(BigDecimal.valueOf(a.getTotal()));
+                        }
+                        //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal decimal = bigDecimal.subtract(begin).setScale(2, ROUND_HALF_UP);
+                        pool.setNumberOfNiches(begin.doubleValue());
+                        pool.setRemaining(decimal.doubleValue());
                         pool.setCompleteLiKu(1);
                     }
                 }
@@ -4636,6 +4885,16 @@ public class MaterialReportDetailsController extends BaseController {
                             }
                         }
                         //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal begin = BigDecimal.valueOf(0.0);
+                        BigDecimal bigDecimal = BigDecimal.valueOf(pool.getLengthOfCable());
+                        for (MaterialReportDetails a :
+                                bestChose) {
+                            begin  = begin.add(BigDecimal.valueOf(a.getTotal()));
+                        }
+                        //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal decimal = bigDecimal.subtract(begin).setScale(2, ROUND_HALF_UP);
+                        pool.setNumberOfNiches(begin.doubleValue());
+                        pool.setRemaining(decimal.doubleValue());
                         pool.setCompleteLiKu(1);
                     }
                 }
@@ -4681,6 +4940,16 @@ public class MaterialReportDetailsController extends BaseController {
                             }
                         }
                         //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal begin = BigDecimal.valueOf(0.0);
+                        BigDecimal bigDecimal = BigDecimal.valueOf(pool.getLengthOfCable());
+                        for (MaterialReportDetails a :
+                                bestChose) {
+                            begin  = begin.add(BigDecimal.valueOf(a.getTotal()));
+                        }
+                        //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal decimal = bigDecimal.subtract(begin).setScale(2, ROUND_HALF_UP);
+                        pool.setNumberOfNiches(begin.doubleValue());
+                        pool.setRemaining(decimal.doubleValue());
                         pool.setCompleteLiKu(1);
                     }
                 }
@@ -4727,6 +4996,16 @@ public class MaterialReportDetailsController extends BaseController {
                             }
                         }
                         //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal begin = BigDecimal.valueOf(0.0);
+                        BigDecimal bigDecimal = BigDecimal.valueOf(pool.getLengthOfCable());
+                        for (MaterialReportDetails a :
+                                bestChose) {
+                            begin  = begin.add(BigDecimal.valueOf(a.getTotal()));
+                        }
+                        //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal decimal = bigDecimal.subtract(begin).setScale(2, ROUND_HALF_UP);
+                        pool.setNumberOfNiches(begin.doubleValue());
+                        pool.setRemaining(decimal.doubleValue());
                         pool.setCompleteLiKu(1);
                     }
                 }
@@ -4772,6 +5051,16 @@ public class MaterialReportDetailsController extends BaseController {
                             }
                         }
                         //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal begin = BigDecimal.valueOf(0.0);
+                        BigDecimal bigDecimal = BigDecimal.valueOf(pool.getLengthOfCable());
+                        for (MaterialReportDetails a :
+                                bestChose) {
+                            begin  = begin.add(BigDecimal.valueOf(a.getTotal()));
+                        }
+                        //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal decimal = bigDecimal.subtract(begin).setScale(2, ROUND_HALF_UP);
+                        pool.setNumberOfNiches(begin.doubleValue());
+                        pool.setRemaining(decimal.doubleValue());
                         pool.setCompleteLiKu(1);
                     }
                 }
@@ -4817,6 +5106,16 @@ public class MaterialReportDetailsController extends BaseController {
                             }
                         }
                         //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal begin = BigDecimal.valueOf(0.0);
+                        BigDecimal bigDecimal = BigDecimal.valueOf(pool.getLengthOfCable());
+                        for (MaterialReportDetails a :
+                                bestChose) {
+                            begin  = begin.add(BigDecimal.valueOf(a.getTotal()));
+                        }
+                        //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal decimal = bigDecimal.subtract(begin).setScale(2, ROUND_HALF_UP);
+                        pool.setNumberOfNiches(begin.doubleValue());
+                        pool.setRemaining(decimal.doubleValue());
                         pool.setCompleteLiKu(1);
                     }
                 }
@@ -4863,6 +5162,16 @@ public class MaterialReportDetailsController extends BaseController {
                             }
                         }
                         //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal begin = BigDecimal.valueOf(0.0);
+                        BigDecimal bigDecimal = BigDecimal.valueOf(pool.getLengthOfCable());
+                        for (MaterialReportDetails a :
+                                bestChose) {
+                            begin  = begin.add(BigDecimal.valueOf(a.getTotal()));
+                        }
+                        //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal decimal = bigDecimal.subtract(begin).setScale(2, ROUND_HALF_UP);
+                        pool.setNumberOfNiches(begin.doubleValue());
+                        pool.setRemaining(decimal.doubleValue());
                         pool.setCompleteLiKu(1);
                     }
                 }
@@ -4908,6 +5217,16 @@ public class MaterialReportDetailsController extends BaseController {
                             }
                         }
                         //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal begin = BigDecimal.valueOf(0.0);
+                        BigDecimal bigDecimal = BigDecimal.valueOf(pool.getLengthOfCable());
+                        for (MaterialReportDetails a :
+                                bestChose) {
+                            begin  = begin.add(BigDecimal.valueOf(a.getTotal()));
+                        }
+                        //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal decimal = bigDecimal.subtract(begin).setScale(2, ROUND_HALF_UP);
+                        pool.setNumberOfNiches(begin.doubleValue());
+                        pool.setRemaining(decimal.doubleValue());
                         pool.setCompleteLiKu(1);
                     }
                 }
@@ -4953,6 +5272,16 @@ public class MaterialReportDetailsController extends BaseController {
                             }
                         }
                         //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal begin = BigDecimal.valueOf(0.0);
+                        BigDecimal bigDecimal = BigDecimal.valueOf(pool.getLengthOfCable());
+                        for (MaterialReportDetails a :
+                                bestChose) {
+                            begin  = begin.add(BigDecimal.valueOf(a.getTotal()));
+                        }
+                        //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal decimal = bigDecimal.subtract(begin).setScale(2, ROUND_HALF_UP);
+                        pool.setNumberOfNiches(begin.doubleValue());
+                        pool.setRemaining(decimal.doubleValue());
                         pool.setCompleteLiKu(1);
                     }
                 }
@@ -4999,6 +5328,16 @@ public class MaterialReportDetailsController extends BaseController {
                             }
                         }
                         //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal begin = BigDecimal.valueOf(0.0);
+                        BigDecimal bigDecimal = BigDecimal.valueOf(pool.getLengthOfCable());
+                        for (MaterialReportDetails a :
+                                bestChose) {
+                            begin  = begin.add(BigDecimal.valueOf(a.getTotal()));
+                        }
+                        //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal decimal = bigDecimal.subtract(begin).setScale(2, ROUND_HALF_UP);
+                        pool.setNumberOfNiches(begin.doubleValue());
+                        pool.setRemaining(decimal.doubleValue());
                         pool.setCompleteLiKu(1);
                     }
                 }
@@ -5044,6 +5383,16 @@ public class MaterialReportDetailsController extends BaseController {
                             }
                         }
                         //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal begin = BigDecimal.valueOf(0.0);
+                        BigDecimal bigDecimal = BigDecimal.valueOf(pool.getLengthOfCable());
+                        for (MaterialReportDetails a :
+                                bestChose) {
+                            begin  = begin.add(BigDecimal.valueOf(a.getTotal()));
+                        }
+                        //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal decimal = bigDecimal.subtract(begin).setScale(2, ROUND_HALF_UP);
+                        pool.setNumberOfNiches(begin.doubleValue());
+                        pool.setRemaining(decimal.doubleValue());
                         pool.setCompleteLiKu(1);
                     }
                 }
@@ -5089,6 +5438,16 @@ public class MaterialReportDetailsController extends BaseController {
                             }
                         }
                         //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal begin = BigDecimal.valueOf(0.0);
+                        BigDecimal bigDecimal = BigDecimal.valueOf(pool.getLengthOfCable());
+                        for (MaterialReportDetails a :
+                                bestChose) {
+                            begin  = begin.add(BigDecimal.valueOf(a.getTotal()));
+                        }
+                        //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal decimal = bigDecimal.subtract(begin).setScale(2, ROUND_HALF_UP);
+                        pool.setNumberOfNiches(begin.doubleValue());
+                        pool.setRemaining(decimal.doubleValue());
                         pool.setCompleteLiKu(1);
                     }
                 }
@@ -5149,6 +5508,16 @@ public class MaterialReportDetailsController extends BaseController {
                             }
                         }
                         //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal begin = BigDecimal.valueOf(0.0);
+                        BigDecimal bigDecimal = BigDecimal.valueOf(pool.getLengthOfCable());
+                        for (MaterialReportDetails a :
+                                bestChose) {
+                            begin  = begin.add(BigDecimal.valueOf(a.getTotal()));
+                        }
+                        //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal decimal = bigDecimal.subtract(begin).setScale(2, ROUND_HALF_UP);
+                        pool.setNumberOfNiches(begin.doubleValue());
+                        pool.setRemaining(decimal.doubleValue());
                         pool.setCompleteLiKu(1);
                     }
                 }
@@ -5194,6 +5563,16 @@ public class MaterialReportDetailsController extends BaseController {
                             }
                         }
                         //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal begin = BigDecimal.valueOf(0.0);
+                        BigDecimal bigDecimal = BigDecimal.valueOf(pool.getLengthOfCable());
+                        for (MaterialReportDetails a :
+                                bestChose) {
+                            begin  = begin.add(BigDecimal.valueOf(a.getTotal()));
+                        }
+                        //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal decimal = bigDecimal.subtract(begin).setScale(2, ROUND_HALF_UP);
+                        pool.setNumberOfNiches(begin.doubleValue());
+                        pool.setRemaining(decimal.doubleValue());
                         pool.setCompleteLiKu(1);
                     }
                 }
@@ -5239,6 +5618,16 @@ public class MaterialReportDetailsController extends BaseController {
                             }
                         }
                         //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal begin = BigDecimal.valueOf(0.0);
+                        BigDecimal bigDecimal = BigDecimal.valueOf(pool.getLengthOfCable());
+                        for (MaterialReportDetails a :
+                                bestChose) {
+                            begin  = begin.add(BigDecimal.valueOf(a.getTotal()));
+                        }
+                        //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal decimal = bigDecimal.subtract(begin).setScale(2, ROUND_HALF_UP);
+                        pool.setNumberOfNiches(begin.doubleValue());
+                        pool.setRemaining(decimal.doubleValue());
                         pool.setCompleteLiKu(1);
                     }
                 }
@@ -5284,6 +5673,16 @@ public class MaterialReportDetailsController extends BaseController {
                             }
                         }
                         //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal begin = BigDecimal.valueOf(0.0);
+                        BigDecimal bigDecimal = BigDecimal.valueOf(pool.getLengthOfCable());
+                        for (MaterialReportDetails a :
+                                bestChose) {
+                            begin  = begin.add(BigDecimal.valueOf(a.getTotal()));
+                        }
+                        //存在最优解，当前利库信息使用，变更状态
+                        BigDecimal decimal = bigDecimal.subtract(begin).setScale(2, ROUND_HALF_UP);
+                        pool.setNumberOfNiches(begin.doubleValue());
+                        pool.setRemaining(decimal.doubleValue());
                         pool.setCompleteLiKu(1);
                     }
                 }
@@ -5598,6 +5997,18 @@ public class MaterialReportDetailsController extends BaseController {
             if (jRPoolList.size() > 0) {
                 replaceList.addAll(jRPoolList);
             }
+            if (bBList.size() > 0) {
+                replaceList.addAll(bBPoolList);
+            }
+            if (yZList.size() > 0) {
+                replaceList.addAll(yZPoolList);
+            }
+            if (dYList.size() > 0) {
+                replaceList.addAll(dYPoolList);
+            }
+            if (jRList.size() > 0) {
+                replaceList.addAll(jRPoolList);
+            }
             if (replaceList.size() > 0) {
                 poolService.updateAllList(replaceList);
             }

src/main/java/com/jeeplus/modules/sg/balancedlibrary/replaceMaterial/mapper/xml/ReplaceMaterialMapper.xml

@@ -74,20 +74,36 @@
 	<insert id="insert">
 		INSERT INTO bla_replace_material(
 			id,
-			create_by,
-			create_date,
-			update_by,
-			update_date,
-			remarks,
-			del_flag
+			 create_by,
+			 create_date,
+			 update_by,
+			 update_date,
+			 del_flag,
+			 remarks,
+			 materialCode,
+			 materialDescription,
+			 extendedCoding,
+			 extendedDescription,
+			 materialCodeRep,
+			 materialDescriptionRep,
+			 extendedCodingRep,
+			 extendedDescriptionRep
 		) VALUES (
 			#{id},
 			#{createBy.id},
 			#{createDate},
 			#{updateBy.id},
 			#{updateDate},
+			#{delFlag},
 			#{remarks},
-			#{delFlag}
+		    #{materialCode},
+			#{materialDescription},
+			#{extendedCoding},
+			#{extendedDescription},
+			#{materialCodeRep},
+			#{materialDescriptionRep},
+			#{extendedCodingRep},
+			#{extendedDescriptionRep}
 		)
 	</insert>
 	<insert id="insertList">
@@ -133,7 +149,15 @@
 		UPDATE bla_replace_material SET
 			update_by = #{updateBy.id},
 			update_date = #{updateDate},
-			remarks = #{remarks}
+			remarks = #{remarks},
+			materialCode = #{materialCode},
+			materialDescription = #{materialDescription},
+			extendedCoding = #{extendedCoding},
+			extendedDescription = #{extendedDescription},
+			materialCodeRep = #{materialCodeRep},
+			materialDescriptionRep = #{materialDescriptionRep},
+			extendedCodingRep = #{extendedCodingRep},
+			extendedDescriptionRep = #{extendedDescriptionRep}
 		WHERE id = #{id}
 	</update>
 

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

@@ -95,7 +95,7 @@ public class ReplaceMaterialController extends BaseController {
 	@RequestMapping(value = "form")
 	public String form(ReplaceMaterial entity, Model model) {
 		model.addAttribute("entity", entity);
-		return "modules/test/one/dialog/ReplaceMaterialForm";
+		return "modules/sg/balancedlibrary/replaceMaterial/replaceMaterialForm";
 	}
 
 	/**

src/main/webapp/webpage/modules/sg/balancedlibrary/replaceMaterial/replaceMaterialForm.jsp

@@ -0,0 +1,89 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>物料替换</title>
+	<meta name="decorator" content="ani"/>
+	<script type="text/javascript">
+
+		$(document).ready(function() {
+
+	        $('#beginDate').datetimepicker({
+				 format: "YYYY-MM-DD HH:mm:ss"
+		    });
+	        $('#endDate').datetimepicker({
+				 format: "YYYY-MM-DD HH:mm:ss"
+		    });
+		});
+		function save() {
+            var isValidate = jp.validateForm('#inputForm');//校验表单
+            if(!isValidate){
+                return false;
+			}else{
+                jp.loading();
+                jp.post("${ctx}/replaceMaterial/save",$('#inputForm').serialize(),function(data){
+                    if(data.success){
+                        jp.getParent().refresh();
+                        var dialogIndex = parent.layer.getFrameIndex(window.name); // 获取窗口索引
+                        parent.layer.close(dialogIndex);
+                        jp.success(data.msg)
+
+                    }else{
+                        jp.error(data.msg);
+                    }
+                })
+			}
+
+        }
+	</script>
+</head>
+<body class="bg-white">
+		<form:form id="inputForm" modelAttribute="entity" class="form-horizontal">
+		<form:hidden path="id"/>	
+		<table class="table table-bordered">
+		   <tbody>
+				<tr>
+					<td class="width-15 active"><label class="pull-right"><font color="red">*</font>物料编码：</label></td>
+					<td class="width-35">
+						<form:input path="materialCode" htmlEscape="false" rows="4"    class="form-control required"/>
+					</td>
+					<td class="width-15 active"><label class="pull-right"><font color="red">*</font>物料描述：</label></td>
+					<td class="width-35">
+						<form:input path="materialDescription" htmlEscape="false" rows="4"    class="form-control required"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class="pull-right"><font color="red">*</font>扩展编码：</label></td>
+					<td class="width-35">
+						<form:input path="extendedCoding" htmlEscape="false" rows="4"    class="form-control required"/>
+					</td>
+					<td class="width-15 active"><label class="pull-right"><font color="red">*</font>扩展描述：</label></td>
+					<td class="width-35">
+						<form:input path="extendedDescription" htmlEscape="false" rows="4"    class="form-control required"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class="pull-right"><font color="red">*</font>物料编码-替换：</label></td>
+					<td class="width-35">
+						<form:input path="materialCodeRep" htmlEscape="false" rows="4"    class="form-control required"/>
+					</td>
+					<td class="width-15 active"><label class="pull-right"><font color="red">*</font>物料描述-替换：</label></td>
+					<td class="width-35">
+						<form:input path="materialDescriptionRep" htmlEscape="false" rows="4"    class="form-control required"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class="pull-right"><font color="red">*</font>扩展编码-替换：</label></td>
+					<td class="width-35">
+						<form:input path="extendedCodingRep" htmlEscape="false" rows="4"    class="form-control required"/>
+					</td>
+					<td class="width-15 active"><label class="pull-right"><font color="red">*</font>扩展描述-替换：</label></td>
+					<td class="width-35">
+						<form:input path="extendedDescriptionRep" htmlEscape="false" rows="4"    class="form-control required"/>
+					</td>
+				</tr>
+		 	</tbody>
+		</table>
+	</form:form>
+</body>
+</html>