diff --git a/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java b/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java index 639a01f79..bfe0a874f 100644 --- a/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java +++ b/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java @@ -238,7 +238,7 @@ public class IoPurChangeService { //最后一层,无法流转业务单 BasicBusTypeChangeEntity basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction(ConstantStatus.BUS_ORDER_CGDD); - if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable() == true) { + if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetAction()) && basicBusTypeChangeEntity.isEnable() == true) { purOrderGen(purOrderEntity); } @@ -362,6 +362,7 @@ public class IoPurChangeService { //采购计划生成扫码单据 public void purPlanGen(PurPlanEntity purPlanEntity) { BasicBusTypeChangeEntity basicBusTypeChangeEntity = new BasicBusTypeChangeEntity(); + basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction("CGJH"); List purPlanDetailEntities = purPlanDetailService.findByOrderId(purPlanEntity.getId() + ""); //对计划单里面的供应商进行分组 Map> map = purPlanDetailEntities.stream().collect(Collectors.groupingBy(PurPlanDetailEntity::getSupId)); diff --git a/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java b/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java index ba24e39bc..c0229178d 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java @@ -189,7 +189,7 @@ public class PurPlanController { purPlanEntity.setAuditUser(userId + ""); purPlanEntity.setAuditUser(userId + ""); purPlanEntity.setStatus(postPurPlanRequest.getEditStatus()); -// purPlanService.update(purApplyEntity); + purPlanService.update(purPlanEntity); if (purPlanEntity.getStatus() == 3) { purChangeService.purPlanChange(purPlanEntity); // generateDocument(purPlanEntity);