设备点检，点检类型：设备点检、工艺参数点检，点击开始点检后，需要强制扫描/输入设备ID

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java

@@ -141,16 +141,10 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService {
 
         //校验点检单
         checkSpotCheckOrder(model.getSpotCheckOrder());
-
+        //校验设备信息
         if (MesExtEnumUtil.SPOT_CHECK_ORDER_TYPE.PROCESS_PARAMETER_INSPECTION.getValue() == model.getSpotCheckOrder().getSpotCheckOrderType() ||
                 MesExtEnumUtil.SPOT_CHECK_ORDER_TYPE.EQUIPMENT_INSPECTION.getValue() == model.getSpotCheckOrder().getSpotCheckOrderType()) {
-            MesEquipment mesEquipment = mesEquipmentExtService.getMesEquipment(org, model.getSpotCheckOrder().getEquipCode());
-            if (Objects.isNull(mesEquipment)) {
-                throw new ImppBusiException(String.format("点检单对应的设备【%s】信息不存在", model.getSpotCheckOrder().getEquipCode()));
-            }
-            if (StringUtils.isEmpty(mesEquipment.getEquipId()) || !model.getProduceSn().equals(mesEquipment.getEquipId() + "")) {
-                throw new ImppBusiException(String.format("点检单对应的设备编号【%s】和扫描的设备编号【%s】不匹配，请检查数据", mesEquipment.getEquipId(), model.getProduceSn()));
-            }
+            checkEquipment(model, org);
             return model;
         } else {
             //检查条码
@@ -624,5 +618,15 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService {
         return produceSn;
     }
 
+    private void checkEquipment(MesSpotCheckOrderModel model, String org) {
+        MesEquipment mesEquipment = mesEquipmentExtService.getMesEquipment(org, model.getSpotCheckOrder().getEquipCode());
+        if (Objects.isNull(mesEquipment)) {
+            throw new ImppBusiException(String.format("点检单对应的设备【%s】信息不存在", model.getSpotCheckOrder().getEquipCode()));
+        }
+        if (StringUtils.isEmpty(mesEquipment.getEquipId()) || !model.getProduceSn().equals(mesEquipment.getEquipId() + "")) {
+            throw new ImppBusiException(String.format("点检单对应的设备编号【%s】和扫描的设备编号【%s】不匹配，请检查数据", mesEquipment.getEquipId(), model.getProduceSn()));
+        }
+    }
+
 
 }