Showing
1 changed file
with
19 additions
and
0 deletions
| @@ -132,6 +132,7 @@ public class ProcurementPlanChangeServiceImpl extends | @@ -132,6 +132,7 @@ public class ProcurementPlanChangeServiceImpl extends | ||
| 132 | .set(ProcurementPlan::getWorkshopId, vo.getLines().get(0).getWorkshopId()) | 132 | .set(ProcurementPlan::getWorkshopId, vo.getLines().get(0).getWorkshopId()) |
| 133 | .set(ProcurementPlan::getProcessStatus, "COMPLETED") | 133 | .set(ProcurementPlan::getProcessStatus, "COMPLETED") |
| 134 | .set(ProcurementPlan::getProcessNode, null) | 134 | .set(ProcurementPlan::getProcessNode, null) |
| 135 | + .set(ProcurementPlan::getPlanType, "变") | ||
| 135 | .eq(ProcurementPlan::getId, vo.getProcurementPlanId()); | 136 | .eq(ProcurementPlan::getId, vo.getProcurementPlanId()); |
| 136 | procurementPlanService.update(parentWrapper); | 137 | procurementPlanService.update(parentWrapper); |
| 137 | //修改分厂 | 138 | //修改分厂 |
| @@ -154,12 +155,20 @@ public class ProcurementPlanChangeServiceImpl extends | @@ -154,12 +155,20 @@ public class ProcurementPlanChangeServiceImpl extends | ||
| 154 | //有子计划 | 155 | //有子计划 |
| 155 | if (CollectionUtil.isNotEmpty(list)) { | 156 | if (CollectionUtil.isNotEmpty(list)) { |
| 156 | //修改主计划 开票品名 公司名称 另付运费 | 157 | //修改主计划 开票品名 公司名称 另付运费 |
| 158 | + String planType = null; | ||
| 159 | + String type = plan.getPlanType(); | ||
| 160 | + if (type == null || "变".equals(type)) { | ||
| 161 | + planType = "变"; | ||
| 162 | + } else if ("补".equals(type) || "变 补".equals(type)) { | ||
| 163 | + planType = "变 补"; | ||
| 164 | + } | ||
| 157 | Wrapper<ProcurementPlan> parentWrapper = Wrappers.lambdaUpdate(ProcurementPlan.class) | 165 | Wrapper<ProcurementPlan> parentWrapper = Wrappers.lambdaUpdate(ProcurementPlan.class) |
| 158 | .set(ProcurementPlan::getInvoiceProductName, vo.getInvoiceProductName()) | 166 | .set(ProcurementPlan::getInvoiceProductName, vo.getInvoiceProductName()) |
| 159 | .set(ProcurementPlan::getCompanyShortId, vo.getCompanyShortId()) | 167 | .set(ProcurementPlan::getCompanyShortId, vo.getCompanyShortId()) |
| 160 | .set(ProcurementPlan::getShippingCost, vo.getShippingCost()) | 168 | .set(ProcurementPlan::getShippingCost, vo.getShippingCost()) |
| 161 | .set(ProcurementPlan::getProcessStatus, "COMPLETED") | 169 | .set(ProcurementPlan::getProcessStatus, "COMPLETED") |
| 162 | .set(ProcurementPlan::getProcessNode, null) | 170 | .set(ProcurementPlan::getProcessNode, null) |
| 171 | + .set(ProcurementPlan::getPlanType, planType) | ||
| 163 | .eq(ProcurementPlan::getId, vo.getProcurementPlanId()); | 172 | .eq(ProcurementPlan::getId, vo.getProcurementPlanId()); |
| 164 | procurementPlanService.update(parentWrapper); | 173 | procurementPlanService.update(parentWrapper); |
| 165 | 174 | ||
| @@ -170,6 +179,7 @@ public class ProcurementPlanChangeServiceImpl extends | @@ -170,6 +179,7 @@ public class ProcurementPlanChangeServiceImpl extends | ||
| 170 | .set(ProcurementPlan::getShippingCost, vo.getShippingCost()) | 179 | .set(ProcurementPlan::getShippingCost, vo.getShippingCost()) |
| 171 | .set(ProcurementPlan::getProcessStatus, "COMPLETED") | 180 | .set(ProcurementPlan::getProcessStatus, "COMPLETED") |
| 172 | .set(ProcurementPlan::getProcessNode, null) | 181 | .set(ProcurementPlan::getProcessNode, null) |
| 182 | + .set(ProcurementPlan::getPlanType, "变") | ||
| 173 | .eq(ProcurementPlan::getParentId, vo.getProcurementPlanId()); | 183 | .eq(ProcurementPlan::getParentId, vo.getProcurementPlanId()); |
| 174 | procurementPlanService.update(sonWrapper); | 184 | procurementPlanService.update(sonWrapper); |
| 175 | 185 | ||
| @@ -557,6 +567,7 @@ public class ProcurementPlanChangeServiceImpl extends | @@ -557,6 +567,7 @@ public class ProcurementPlanChangeServiceImpl extends | ||
| 557 | subVo.setProcessStatus("COMPLETED"); | 567 | subVo.setProcessStatus("COMPLETED"); |
| 558 | subVo.setProcessNode(null); | 568 | subVo.setProcessNode(null); |
| 559 | subVo.setWorkshopId(CollectionUtil.isNotEmpty(wLines) ? wLines.get(0).getWorkshopId() : null); | 569 | subVo.setWorkshopId(CollectionUtil.isNotEmpty(wLines) ? wLines.get(0).getWorkshopId() : null); |
| 570 | + subVo.setPlanType("变"); | ||
| 560 | 571 | ||
| 561 | List<ProcurementPlanLineVo> subLineVos = new ArrayList<>(); | 572 | List<ProcurementPlanLineVo> subLineVos = new ArrayList<>(); |
| 562 | for (ProcurementPlanChangeLine cl : wLines) { | 573 | for (ProcurementPlanChangeLine cl : wLines) { |
| @@ -570,11 +581,19 @@ public class ProcurementPlanChangeServiceImpl extends | @@ -570,11 +581,19 @@ public class ProcurementPlanChangeServiceImpl extends | ||
| 570 | } | 581 | } |
| 571 | 582 | ||
| 572 | // 5) 主计划标记冻结 | 583 | // 5) 主计划标记冻结 |
| 584 | + String planType = null; | ||
| 585 | + String type = mainPlan.getPlanType(); | ||
| 586 | + if (type == null || "变".equals(type)) { | ||
| 587 | + planType = "变"; | ||
| 588 | + } else if ("补".equals(type) || "变 补".equals(type)) { | ||
| 589 | + planType = "变 补"; | ||
| 590 | + } | ||
| 573 | procurementPlanService.update(Wrappers.lambdaUpdate(ProcurementPlan.class) | 591 | procurementPlanService.update(Wrappers.lambdaUpdate(ProcurementPlan.class) |
| 574 | .set(ProcurementPlan::getFrozen, Boolean.TRUE) | 592 | .set(ProcurementPlan::getFrozen, Boolean.TRUE) |
| 575 | .set(ProcurementPlan::getChangeStatus, "CHANGED") | 593 | .set(ProcurementPlan::getChangeStatus, "CHANGED") |
| 576 | .set(ProcurementPlan::getProcessStatus, "COMPLETED") | 594 | .set(ProcurementPlan::getProcessStatus, "COMPLETED") |
| 577 | .set(ProcurementPlan::getProcessNode, null) | 595 | .set(ProcurementPlan::getProcessNode, null) |
| 596 | + .set(ProcurementPlan::getPlanType, planType) | ||
| 578 | .eq(ProcurementPlan::getId, planId)); | 597 | .eq(ProcurementPlan::getId, planId)); |
| 579 | 598 | ||
| 580 | //todo 废弃原合同；生成新合同 | 599 | //todo 废弃原合同；生成新合同 |