From dc453d3e4a3eb9ced389d5ba6ac5942331ada8fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= Date: Mon, 25 May 2026 14:47:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E6=8E=A5=E6=94=B6=E8=80=90?= =?UTF-8?q?=E8=9A=80=E6=80=A7=E6=A3=80=E6=B5=8B=E9=A1=B9=E7=9B=AE=E7=94=9F?= =?UTF-8?q?=E6=88=90=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/produce/service/impl/WorkOrderServiceImpl.java | 7 +++++++ 1 file changed, 7 insertions(+) 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 9347e3634..14c084140 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 @@ -1741,6 +1741,13 @@ public class WorkOrderServiceImpl extends BaseServiceImpl inspectionItems = inspectionService.list(); for (DsProcessProjectVO project : projects) { + // 如果是耐蚀性检测，需要满足三个条件才允许生产对应的检测项目：1-工作订单备注包含HTBY，2-生产标识包含JHT，3-镀种含金或者Au + if ("耐蚀性检测".equals(project.getProjectName())) { + if (!yieldOrder.getYpMemo().contains("HTBY") || !yieldOrder.getProductIdent().contains("JHT") || + !(yieldOrder.getPlate().contains("金") || yieldOrder.getPlate().contains("Au") || yieldOrder.getPlate().contains("au"))) { + continue; + } + } workPlanItem = new WorkPlanItem(); workPlanItem.setWpId(workPlan.getId()); workPlanItem.setItemCode(project.getTrialNo());