From 81e0c5416d1d3abc930539fdb79caa2f24cabb91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= Date: Fri, 27 Mar 2026 17:07:09 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WorkOrderServiceImpl.java | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java index a5005c32..85549a51 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java @@ -1543,16 +1543,22 @@ public class WorkOrderServiceImpl extends BaseServiceImpl pa = plateAroundMapper.selectList(Wrappers.lambdaQuery(PlateAround.class).eq(PlateAround::getPaType, PlateAround.BEFORE_PLAN_OUT).eq(PlateAround::getWpId, workPlan.getId())); - if (CollectionUtils.isEmpty(pa)) { - if ("1".equals(frontWorkPlan.getOem())) { - //上序外协，本序如果可以接收，验证镀前出库记录 - throw new ServiceException("工序加工单位不同，未找到镀前出库记录，无法接收！"); - } else if (!frontWorkPlan.getMakeTeam().equals(workPlan.getMakeTeam())) { - //加工班组不同，验证镀前出库记录 - throw new ServiceException("工序加工单位不同，未找到镀前出库记录，无法接收！"); + List pa = plateAroundMapper.selectList(Wrappers.lambdaQuery(PlateAround.class).eq(PlateAround::getPaType, PlateAround.BEFORE_PLAT_IN).eq(PlateAround::getWpId, frontWorkPlan.getId())); + if (CollectionUtils.isNotEmpty(pa)) { + List pa2 = plateAroundMapper.selectList(Wrappers.lambdaQuery(PlateAround.class).eq(PlateAround::getPaType, PlateAround.BEFORE_PLAN_OUT).eq(PlateAround::getWpId, frontWorkPlan.getId())); + if (CollectionUtils.isEmpty(pa2)) { + throw new ServiceException("上序未查询到镀前出库记录，无法接收！"); } } +// if (CollectionUtils.isEmpty(pa)) { +// if ("1".equals(frontWorkPlan.getOem())) { +// //上序外协，本序如果可以接收，验证镀前出库记录 +// throw new ServiceException("工序加工单位不同，未找到镀前出库记录，无法接收！"); +// } else if (!frontWorkPlan.getMakeTeam().equals(workPlan.getMakeTeam())) { +// //加工班组不同，验证镀前出库记录 +// throw new ServiceException("工序加工单位不同，未找到镀前出库记录，无法接收！"); +// } +// } } private void workPlanStart(WorkPlan workPlan, Date startDate, Long userId, WorkOrder workOrder) {