From f445cf2de8fb08211257a9796fb6d75de55bf380 Mon Sep 17 00:00:00 2001 From: wb_zhanghaoyuan Date: Mon, 30 Jun 2025 16:57:24 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E9=87=87=E8=B4=ADfix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dal/mysql/materialplanboom/MaterialPlanBoomMapper.java | 1 + .../partpurchaseorder/PartPurchaseOrderServiceImpl.java | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/materialplanboom/MaterialPlanBoomMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/materialplanboom/MaterialPlanBoomMapper.java index 3ac2476..fa7a3af 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/materialplanboom/MaterialPlanBoomMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/materialplanboom/MaterialPlanBoomMapper.java @@ -210,6 +210,7 @@ public interface MaterialPlanBoomMapper extends BaseMapperX .select("d.spec as boomSpec","d.blueprint_no as blueprintNo","d.unit as unit","f.name as supplierName") .select("a.nickname as duEmpName","c.name as procedureName","e.name as compositionName") .select("t.mat_weight as theWeight") + .select(MaterialPlanDO::getProjectId) .select(MaterialPlanDO::getBrief, MaterialPlanDO::getCustomerId, MaterialPlanDO::getProjectId, MaterialPlanDO::getProjectNameSim) .leftJoin(MaterialPlanDO.class, "p", MaterialPlanDO::getId,MaterialPlanBoomDO::getProjectMaterialPlanId) .leftJoin(ProcessBomDetailDO.class,"d",ProcessBomDetailDO::getId,MaterialPlanBoomDO::getBoomDetailId) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/partpurchaseorder/PartPurchaseOrderServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/partpurchaseorder/PartPurchaseOrderServiceImpl.java index fc68f4f..8f415bd 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/partpurchaseorder/PartPurchaseOrderServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/partpurchaseorder/PartPurchaseOrderServiceImpl.java @@ -260,8 +260,10 @@ public class PartPurchaseOrderServiceImpl implements PartPurchaseOrderService{ purchaseOrderMakeDO.setSubmitUserId(getLoginUser().getId()); purchaseOrderMakeDO.setSubmitTime(LocalDateTime.now()); purchaseOrderMakeDO.setProjectId(updateReqVO.getProjectId()); - PlanDO planDO = planMapper.selectOne("plan_no", updateReqVO.getProjectId()); - purchaseOrderMakeDO.setProjectPlanId(Objects.nonNull(planDO)?planDO.getId(): null); + List planDOs = planMapper.selectList("project_id", updateReqVO.getProjectId()); + if (!CollectionUtils.isEmpty(planDOs) && planDOs.get(0) != null) { + purchaseOrderMakeDO.setProjectPlanId(planDOs.get(0).getId()); + } purchaseOrderMakeDO.setCustomerId(updateReqVO.getCustomerId()); purchaseOrderMakeDO.setBrief(updateReqVO.getBrief()); purchaseOrderMakeDO.setProjectName(updateReqVO.getProjectName());