From 76a2a125bc1eb0059305e1dade5ff2b0bf906eb5 Mon Sep 17 00:00:00 2001 From: yinq Date: Mon, 25 Mar 2024 09:02:43 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20=E8=B4=A8=E9=87=8F=E6=A3=80?= =?UTF-8?q?=E6=B5=8B=EF=BC=9A=E6=9F=A5=E8=AF=A2=E7=89=A9=E6=96=99=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E3=80=81=E5=89=8D=E5=B7=A5=E4=BD=8D=E8=BF=94=E4=BF=AE?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/PdaApiController.java | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/aucma-api/src/main/java/com/aucma/api/controller/PdaApiController.java b/aucma-api/src/main/java/com/aucma/api/controller/PdaApiController.java index b6cb64b..8b79bc5 100644 --- a/aucma-api/src/main/java/com/aucma/api/controller/PdaApiController.java +++ b/aucma-api/src/main/java/com/aucma/api/controller/PdaApiController.java @@ -88,6 +88,25 @@ public class PdaApiController { } + /** + * 质量检测:查询物料名称、前工位返修数据 + * @param code + * @return + */ + @PostMapping("/check/query") + public AjaxResult checkQuery(String code) { + String boxName = service.selectBoxNameByCode(code); + if (boxName == null) { + // boxName = "固定数据"; + return error("箱壳条码扫描错误"); + } + //检验前一工位是否已完成质检 + + List list = service.checkSelectRepairInfo(code); + return success(boxName, list); + + } + // 质检提交 @PostMapping("/checkSubmit") public AjaxResult checkSubmit(@RequestBody CheckInfoDto checkInfo) { @@ -96,8 +115,6 @@ public class PdaApiController { for (int i = 0; i < size; i++) { ReportQualityInspection inspection = new ReportQualityInspection(); inspection.setBarCode(checkInfo.getCode()); - //检验前一工位是否已完成质检 - inspection.setMaterialName(checkInfo.getName()); String measure = checkInfo.getMeasure();