From 8d689bc828fa8feaf18a1e6b20b8a38b5213d246 Mon Sep 17 00:00:00 2001 From: jun Date: Mon, 25 Nov 2024 15:14:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E9=A6=96=E6=A3=80=EF=BC=8C?= =?UTF-8?q?=E4=BA=A7=E5=93=81=E6=9C=AB=E6=A3=80=E5=8F=AF=E4=BB=A5=E5=8F=AA?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=E4=B8=80=E4=B8=AA=E4=BA=A7=E5=93=81=E6=9D=A1?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/busi/MesSpotCheckOrderService.java | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java index 7df1d5e..e717b0e 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java @@ -208,12 +208,11 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService { //校验点检单 checkSpotCheckOrder(model.getSpotCheckOrder()); - //点检单类型为产品首检时 需要判断单据的条码是否都扫描完成 - if (model.getSpotCheckOrder().getSpotCheckOrderType() == MesExtEnumUtil.SPOT_CHECK_ORDER_TYPE.FIRST_PRODUCT_INSPECTION.getValue()) { - - List partNoList = model.getOrderPartList().stream().filter(k -> StringUtils.isEmpty(k.getSn())).map(k -> k.getPartNo()).collect(Collectors.toList()); - if (!CollectionUtils.isEmpty(partNoList)) { - throw new ImppBusiException(String.format("剩余物料号【%s】对应的条码未扫描，请扫描完成后再完成质检", partNoList)); + //点检单类型为产品首检，产品末检时 需要判断单据的条码是否都扫描完成 + if (Stream.of(MesExtEnumUtil.EQUIPMENT_CHECK_ORDER_TYPE.FIRST_INSPECTION.getValue(),MesExtEnumUtil.EQUIPMENT_CHECK_ORDER_TYPE.END_INSPECTION.getValue()).collect(Collectors.toList()).contains(model.getSpotCheckOrder().getSpotCheckOrderType())) { + Optional orderPartOptional = model.getOrderPartList().stream().filter(k -> !StringUtils.isEmpty(k.getSn())).findFirst(); + if (!orderPartOptional.isPresent()) { + throw new ImppBusiException("未扫描条码，请扫描条码后再查询设备数据，请检查数据"); } } //根据设备代码获取EQUIP_ID @@ -313,12 +312,11 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService { //校验点检单 MesSpotCheckOrder spotCheckOrder = checkSpotCheckOrder(model.getSpotCheckOrder()); - //点检单类型为产品首检时 需要判断单据的条码是否都扫描完成 - if (model.getSpotCheckOrder().getSpotCheckOrderType() == MesExtEnumUtil.SPOT_CHECK_ORDER_TYPE.FIRST_PRODUCT_INSPECTION.getValue()) { - - List partNoList = model.getOrderPartList().stream().filter(k -> StringUtils.isEmpty(k.getSn())).map(k -> k.getPartNo()).collect(Collectors.toList()); - if (!CollectionUtils.isEmpty(partNoList)) { - throw new ImppBusiException(String.format("剩余物料号【%s】对应的条码未扫描，请扫描完成后再完成质检", partNoList)); + //点检单类型为产品首检，产品末检时 需要判断单据的条码是否都扫描完成 + if (Stream.of(MesExtEnumUtil.EQUIPMENT_CHECK_ORDER_TYPE.FIRST_INSPECTION.getValue(),MesExtEnumUtil.EQUIPMENT_CHECK_ORDER_TYPE.END_INSPECTION.getValue()).collect(Collectors.toList()).contains(model.getSpotCheckOrder().getSpotCheckOrderType())) { + Optional orderPartOptional = model.getOrderPartList().stream().filter(k -> !StringUtils.isEmpty(k.getSn())).findFirst(); + if (!orderPartOptional.isPresent()) { + throw new ImppBusiException("未扫描条码，请扫描条码后再查询设备数据，请检查数据"); } } model.getOrderPartList().forEach(k -> {