点检

modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/spot/IMesSpotCheckOrderService.java

@@ -47,7 +47,7 @@ public interface IMesSpotCheckOrderService {
      * @return
      */
     @ApiOperation("扫描产品条码")
-    List<MesSpotCheckOrderPart> scanProduceSn(MesSpotCheckOrderModel model, String org);
+    MesSpotCheckOrderModel scanProduceSn(MesSpotCheckOrderModel model, String org);
 
     /**
      * 开始点检-查询设备数据

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

@@ -73,7 +73,7 @@ public class MesSpotCheckOrderController {
             if (CollectionUtils.isEmpty(model.getOrderPartList())) {
                 throw new ImppBusiException("点检明细零件不能为空");
             }
-            return ResultBean.success("扫描产品条码成功").setResultList(spotCheckOrderService.scanProduceSn(model, AuthUtil.getOrganizeCode()));
+            return ResultBean.success("扫描产品条码成功").setResultObject(spotCheckOrderService.scanProduceSn(model, AuthUtil.getOrganizeCode()));
         } catch (ImppBusiException imppException) {
             return ResultBean.fail(imppException);
         } catch (Exception e) {

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

@@ -72,7 +72,7 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService {
     }
 
     @Override
-    public List<MesSpotCheckOrderPart> scanProduceSn(MesSpotCheckOrderModel model, String org) {
+    public MesSpotCheckOrderModel scanProduceSn(MesSpotCheckOrderModel model, String org) {
 
         //校验点检单
         checkSpotCheckOrder(model.getSpotCheckOrder());
@@ -93,7 +93,7 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService {
             throw new ImppBusiException(String.format("扫描的条码【%s】对应的物料号【%s】在点检单中不存在", produceSn.getProductSn(), produceSn.getPartNo()));
         }
 
-        return model.getOrderPartList();
+        return model;
     }
 
     /**