|
@@ -838,10 +838,10 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
|
|
BigDecimal decimal = new BigDecimal(allSum);
|
|
BigDecimal decimal = new BigDecimal(allSum);
|
|
decimal=decimal.subtract(new BigDecimal(plan.getNum()));
|
|
decimal=decimal.subtract(new BigDecimal(plan.getNum()));
|
|
decimal=decimal.add(new BigDecimal(plan.getNum())).setScale(2,BigDecimal.ROUND_HALF_UP);
|
|
decimal=decimal.add(new BigDecimal(plan.getNum())).setScale(2,BigDecimal.ROUND_HALF_UP);
|
|
- if(decimal.doubleValue()>product.getOrderNumber()){
|
|
|
|
- msg.setError("创建失败,该产品下的排产计划总数量大于当前产品下的订单数量");
|
|
|
|
- return msg;
|
|
|
|
- }
|
|
|
|
|
|
+// if(decimal.doubleValue()>product.getOrderNumber()){
|
|
|
|
+// msg.setError("创建失败,该产品下的排产计划总数量大于当前产品下的订单数量");
|
|
|
|
+// return msg;
|
|
|
|
+// }
|
|
List<ProdProcedure> list = procedureList.stream().filter(pl -> pl.getVersionNumber().equals(procedureList.get(0).getVersionNumber())).collect(Collectors.toList());
|
|
List<ProdProcedure> list = procedureList.stream().filter(pl -> pl.getVersionNumber().equals(procedureList.get(0).getVersionNumber())).collect(Collectors.toList());
|
|
list=list.stream().sorted(Comparator.comparing(ProdProcedure::getId)).collect(Collectors.toList());
|
|
list=list.stream().sorted(Comparator.comparing(ProdProcedure::getId)).collect(Collectors.toList());
|
|
for (ProdProcedure prodProcedure : list) {
|
|
for (ProdProcedure prodProcedure : list) {
|