点检

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/spot/MesSpotCheckOrderController.java

@@ -130,7 +130,7 @@ public class MesSpotCheckOrderController {
 
         try {
 
-            if (StringUtils.isEmpty(model.getSpotCheckOrder())) {
+            if (StringUtils.isEmpty(model.getSpotCheckOrder().getId())) {
                 throw new ImppBusiException("点检单不能为空");
             }
 

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

@@ -106,6 +106,9 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService {
     @Override
     public MesSpotCheckOrderModel queryEquipInfo(MesSpotCheckOrderModel model, String org) {
 
+        //校验点检单
+        checkSpotCheckOrder(model.getSpotCheckOrder());
+
         //点检单类型为产品首检时 需要判断单据的条码是否都扫描完成
         if (model.getSpotCheckOrder().getSpotCheckOrderType() == MesExtEnumUtil.SPOT_CHECK_ORDER_TYPE.FIRST_PRODUCT_INSPECTION.getValue()) {