From 96a998e66e889e584c3dcc430a4dda5d8f33e745 Mon Sep 17 00:00:00 2001 From: zhaoxl Date: Fri, 25 Aug 2023 10:37:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6=E8=87=B3?= =?UTF-8?q?=20'op-modules/op-quality/src/main/java/com/op/quality/controll?= =?UTF-8?q?er'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/quality/controller/QuaController.java | 43 ++++++++++++++++--- 1 file changed, 37 insertions(+), 6 deletions(-) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java index 4f64f5460..0b43fbd70 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java @@ -34,18 +34,18 @@ public class QuaController { QcProCheck qcProCheck = map.keySet().iterator().next(); BaseFile baseFile = map.values().iterator().next(); - if (!qcProCheck.getFactoryId().isEmpty()){ + if (!qcProCheck.getFactoryCode().isEmpty()){ if (baseFile==null){ baseFile = new BaseFile(); qcProCheckService.saveQcProCheck(qcProCheck,baseFile); } if (qcProCheck.getIsqua()=="1"){ -// System.out.println("调用wcs接口开发转移"); - WCSDTO wcsdto = new WCSDTO(); - wcsdto.setFactory(qcProCheck.getFactoryCode()); - wcsdto.setRfidNo(qcProCheck.getRfid()); - remoteMesService.requestDestinationStations(wcsdto); + System.out.println("调用wcs接口开发转移"); +// WCSDTO wcsdto = new WCSDTO(); +// wcsdto.setFactory(qcProCheck.getFactoryCode()); +// wcsdto.setRfidNo(qcProCheck.getRfid()); +// remoteMesService.requestDestinationStations(wcsdto); return R.ok(); } else{ @@ -54,6 +54,37 @@ public class QuaController { } return R.fail(); } + @PostMapping("/test") + public R test() { +// System.out.println(qcProCheck); +// System.out.println(baseFile); +// QcProCheck qcProCheck = map.keySet().iterator().next(); +// BaseFile baseFile = map.values().iterator().next(); + QcProCheck qcProCheck = new QcProCheck(); + BaseFile baseFile = new BaseFile(); +// qcProCheck.setId("1232132132121321"); + qcProCheck.setRfid("rfiddddddddddddddddddddddddddddddddddddd"); + qcProCheck.setFactoryCode("qewqewqewq"); + qcProCheck.setIsqua("1"); + baseFile.setFileAddress("qwewqewqewqewqewqq"); + if (!qcProCheck.getFactoryCode().isEmpty()){ + if (baseFile==null){ + baseFile = new BaseFile(); + qcProCheckService.saveQcProCheck(qcProCheck,baseFile); + } + else { + qcProCheckService.saveQcProCheck(qcProCheck,baseFile); + } + if (qcProCheck.getIsqua()=="1"){ + System.out.println("调用下一个接口"); + return R.ok(); + } + else{ + return R.ok(); + } + } + return R.fail(); + } }