From 3402d563a0a9cbe1307fffad2128e11e41fc306a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LML=E4=B8=B6?= Date: Sat, 18 May 2024 14:57:59 +0800 Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E6=A3=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/ext/mes/pcn/api/busi/spot/IMesSpotCheckOrderService.java | 2 +- .../apiservice/controller/busi/spot/MesSpotCheckOrderController.java | 2 +- .../mes/pcn/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/spot/IMesSpotCheckOrderService.java b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/spot/IMesSpotCheckOrderService.java index 8d8adc7..082c5ec 100644 --- a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/spot/IMesSpotCheckOrderService.java +++ b/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 scanProduceSn(MesSpotCheckOrderModel model, String org); + MesSpotCheckOrderModel scanProduceSn(MesSpotCheckOrderModel model, String org); /** * 开始点检-查询设备数据 diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/spot/MesSpotCheckOrderController.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/spot/MesSpotCheckOrderController.java index bc477e2..ecab435 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/spot/MesSpotCheckOrderController.java +++ b/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) { 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 e499cf0..ad87d33 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 @@ -72,7 +72,7 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService { } @Override - public List 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; } /**