From d07ebd656d14781294547d715df99ca315b10b99 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Tue, 29 Oct 2024 16:29:38 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=A5=97=E8=BD=B4=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/wms/pda/st/service/impl/NbjPdaServiceImpl.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/st/service/impl/NbjPdaServiceImpl.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/st/service/impl/NbjPdaServiceImpl.java index 294c593c7..4470da118 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/st/service/impl/NbjPdaServiceImpl.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/st/service/impl/NbjPdaServiceImpl.java @@ -204,7 +204,11 @@ public class NbjPdaServiceImpl implements NbjPdaService { if (pointCode.equals(tzzcPoint.getTruss_point_code2()) && ObjectUtil.isNotEmpty(tzzcPoint.getQzz_no2())) { throw new BadRequestException("系统检测到点位[" + pointCode + "]状态不为空, 如实际已经清空，请手持操作点位清除!"); } + // 分切计划校验 JSONArray rows = param.getJSONArray("row"); + if (rows.size() > 2) { + throw new BadRequestException("一次只能绑定2个分切计划"); + } List planList = rows.toJavaList(PdmBiSlittingproductionplan.class); List orderIds = planList.stream() .map(o -> o.getWorkorder_id()) @@ -212,6 +216,10 @@ public class NbjPdaServiceImpl implements NbjPdaService { List plans = slittingproductionplanService.getByIds(orderIds); // 当前套轴的分切计划 PdmBiSlittingproductionplan demoPlan = plans.get(0); + boolean flag = planList.stream().anyMatch(p -> !p.getUp_or_down().equals(demoPlan.getUp_or_down())); + if (flag) { + throw new BadRequestException("分切计划需要都是在同一根轴"); + } String resourceName = demoPlan.getResource_name(); // 生成虚拟气胀轴编码 String qzzNo = TaskUtils.createVirtualQzzNo(resourceName, "yyMMddHHmmss", demoPlan);