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<String> 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<MesSpotCheckOrderPart> 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<String> 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<MesSpotCheckOrderPart> orderPartOptional = model.getOrderPartList().stream().filter(k -> !StringUtils.isEmpty(k.getSn())).findFirst();
+            if (!orderPartOptional.isPresent()) {
+                throw new ImppBusiException("未扫描条码，请扫描条码后再查询设备数据，请检查数据");
             }
         }
         model.getOrderPartList().forEach(k -> {