From 570e2bfab109365e245e343dcd1cc7707b161b89 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 17 Dec 2024 15:59:06 +0800 Subject: [PATCH] =?UTF-8?q?44244=20PDA=E4=B8=8A=E5=85=81=E8=AE=B8=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=88=A0=E9=99=A4=E7=82=B9=E6=A3=80=E5=8D=95=EF=BC=8C?= =?UTF-8?q?=E5=B9=B6=E4=B8=94=E5=90=8C=E6=AD=A5=E5=88=B0WEB=E7=AB=AF=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../busi/spot/MesSpotCheckOrderController.java | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) 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 2cd578d..3c59358 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 @@ -34,7 +34,7 @@ public class MesSpotCheckOrderController { public ResultBean findEquipmentSpotCheck(MesEquipmentSpotCheck spotCheckOrder) { try { spotCheckOrder.setOrganizeCode(!StringUtils.isEmpty(spotCheckOrder.getOrganizeCode())?spotCheckOrder.getOrganizeCode():AuthUtil.getOrganizeCode()); - return ResultBean.success("查询成功").setResultList(spotCheckOrderService.findEquipmentSpotCheck(spotCheckOrder)); + return ResultBean.success("查询成功!").setResultList(spotCheckOrderService.findEquipmentSpotCheck(spotCheckOrder)); } catch (ImppBusiException imppException) { return ResultBean.fail(imppException); } catch (Exception e) { @@ -50,7 +50,7 @@ public class MesSpotCheckOrderController { try { spotCheckOrder.setOrganizeCode(!StringUtils.isEmpty(spotCheckOrder.getOrganizeCode())?spotCheckOrder.getOrganizeCode():AuthUtil.getOrganizeCode()); - return ResultBean.success("查询成功").setResultList(spotCheckOrderService.queryEquipmentSpotCheck(spotCheckOrder)); + return ResultBean.success("查询成功!").setResultList(spotCheckOrderService.queryEquipmentSpotCheck(spotCheckOrder)); } catch (ImppBusiException imppException) { return ResultBean.fail(imppException); } catch (Exception e) { @@ -68,7 +68,7 @@ public class MesSpotCheckOrderController { throw new ImppBusiException("点检单不能为空"); } bean.setOrganizeCode(!StringUtils.isEmpty(bean.getOrganizeCode())?bean.getOrganizeCode():AuthUtil.getOrganizeCode()); - return ResultBean.success("扫描产品条码成功").setResultObject(spotCheckOrderService.insert(bean)); + return ResultBean.success("扫描产品条码成功!").setResultObject(spotCheckOrderService.insert(bean)); } catch (ImppBusiException imppException) { return ResultBean.fail(imppException); } catch (Exception e) { @@ -83,7 +83,7 @@ public class MesSpotCheckOrderController { try { spotCheckOrder.setOrganizeCode(!StringUtils.isEmpty(spotCheckOrder.getOrganizeCode())?spotCheckOrder.getOrganizeCode():AuthUtil.getOrganizeCode()); - return ResultBean.success("查询成功").setListPager(spotCheckOrderService.querySpotCheckOrder(spotCheckOrder, pager)); + return ResultBean.success("查询成功!").setListPager(spotCheckOrderService.querySpotCheckOrder(spotCheckOrder, pager)); } catch (ImppBusiException imppException) { return ResultBean.fail(imppException); } catch (Exception e) { @@ -98,7 +98,7 @@ public class MesSpotCheckOrderController { try { spotCheckOrder.setOrganizeCode(!StringUtils.isEmpty(spotCheckOrder.getOrganizeCode())?spotCheckOrder.getOrganizeCode():AuthUtil.getOrganizeCode()); - return ResultBean.success("查询成功").setResultObject(spotCheckOrderService.querySpotCheckOrderResult(spotCheckOrder)); + return ResultBean.success("查询成功!").setResultObject(spotCheckOrderService.querySpotCheckOrderResult(spotCheckOrder)); } catch (ImppBusiException imppException) { return ResultBean.fail(imppException); } catch (Exception e) { @@ -121,7 +121,7 @@ public class MesSpotCheckOrderController { if (CollectionUtils.isEmpty(model.getOrderPartList())) { throw new ImppBusiException("点检明细零件不能为空"); } - return ResultBean.success("扫描产品条码成功").setResultObject(spotCheckOrderService.scanProduceSn(model, !StringUtils.isEmpty(model.getOrganizeCode())?model.getOrganizeCode():AuthUtil.getOrganizeCode())); + return ResultBean.success("扫描产品条码成功!").setResultObject(spotCheckOrderService.scanProduceSn(model, !StringUtils.isEmpty(model.getOrganizeCode())?model.getOrganizeCode():AuthUtil.getOrganizeCode())); } catch (ImppBusiException imppException) { return ResultBean.fail(imppException); } catch (Exception e) { @@ -142,7 +142,7 @@ public class MesSpotCheckOrderController { if (CollectionUtils.isEmpty(model.getOrderResultList())) { throw new ImppBusiException("点检单明细不能为空"); } - return ResultBean.success("点检结果获取成功").setResultObject(spotCheckOrderService.queryEquipInfo(model, !StringUtils.isEmpty(model.getOrganizeCode())?model.getOrganizeCode():AuthUtil.getOrganizeCode())); + return ResultBean.success("点检结果获取成功!").setResultObject(spotCheckOrderService.queryEquipInfo(model, !StringUtils.isEmpty(model.getOrganizeCode())?model.getOrganizeCode():AuthUtil.getOrganizeCode())); } catch (ImppBusiException imppException) { return ResultBean.fail(imppException); } catch (Exception e) { @@ -165,7 +165,7 @@ public class MesSpotCheckOrderController { } spotCheckOrderService.saveCheck(model, !StringUtils.isEmpty(model.getOrganizeCode())?model.getOrganizeCode():AuthUtil.getOrganizeCode()); - return ResultBean.success("完成点检成功"); + return ResultBean.success("完成点检成功!"); } catch (ImppBusiException imppException) { return ResultBean.fail(imppException); } catch (Exception e) { @@ -185,7 +185,7 @@ public class MesSpotCheckOrderController { spotCheckOrderService.saveReCheck(model, !StringUtils.isEmpty(model.getOrganizeCode())?model.getOrganizeCode():AuthUtil.getOrganizeCode()); - return ResultBean.success("重新点检成功"); + return ResultBean.success("重新点检成功!"); } catch (ImppBusiException imppException) { return ResultBean.fail(imppException); } catch (Exception e) { @@ -194,14 +194,14 @@ public class MesSpotCheckOrderController { } @PostMapping("/batch-delete-ids") - @ApiOperation(value = "重新点检") + @ApiOperation(value = "删除点检") public ResultBean deleteBatchIds(Long[] ids, String userName, String organizeCode) { try { if (StringUtils.isEmpty(organizeCode) || StringUtils.isEmpty(userName) || null == ids) { throw new ImppBusiException("请检查参数"); } spotCheckOrderService.deleteBatchIds(ids, userName, organizeCode); - return ResultBean.success("重新点检成功"); + return ResultBean.success("删除成功!"); } catch (ImppBusiException imppException) { return ResultBean.fail(imppException); } catch (Exception e) {