From 56b06e0be65b19f976572c7a118b5edf09292721 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Mon, 27 Mar 2023 17:30:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=8D=95=E6=8D=AE=E6=B5=81?=
 =?UTF-8?q?=E8=BD=ACbug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/api/controller/purchase/IoPurChangeService.java   | 3 ++-
 .../com/glxp/api/controller/purchase/PurPlanController.java    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

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<PurPlanDetailEntity> purPlanDetailEntities = purPlanDetailService.findByOrderId(purPlanEntity.getId() + "");
         //对计划单里面的供应商进行分组
         Map<String, List<PurPlanDetailEntity>> 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);