From 82343d253f72a8a41358ac907e616674d1f86bdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LAPTOP-S9HJSOEB=5C=E6=98=8A=E5=A4=A9?= Date: Fri, 7 Jun 2024 14:56:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=BE=E7=BD=AE=E4=B8=AA=E6=95=B0=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA=20=E5=8F=96=E6=B6=88=E9=9A=8F=E8=A1=8C=E6=8B=8D?= =?UTF-8?q?=E7=85=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zhehekeji/web/controller/OrderController.java | 8 +++++++- .../main/java/com/zhehekeji/web/service/PlcService.java | 2 +- .../main/java/com/zhehekeji/web/service/StockService.java | 3 ++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/web/src/main/java/com/zhehekeji/web/controller/OrderController.java b/web/src/main/java/com/zhehekeji/web/controller/OrderController.java index c8bc038..b8f8bc0 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/OrderController.java +++ b/web/src/main/java/com/zhehekeji/web/controller/OrderController.java @@ -74,7 +74,13 @@ public class OrderController { List dataInfos = KsecInfos.getList(ksecInfos); List ksecDataInfos = new ArrayList<>(); for (KsecInfo ksecInfo :dataInfos) { - KsecDataInfo ksecDataInfo = plcService.orderDecoder(ksecInfo); + + KsecDataInfo ksecDataInfo ; + try { + ksecDataInfo = plcService.orderDecoder(ksecInfo); + }catch (Exception e){ + ksecDataInfo =ksecInfo.getData(); + } ksecDataInfos.add(ksecDataInfo); } return ResultResp.success(ksecDataInfos); diff --git a/web/src/main/java/com/zhehekeji/web/service/PlcService.java b/web/src/main/java/com/zhehekeji/web/service/PlcService.java index 806a5e6..8f9fa1f 100644 --- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java +++ b/web/src/main/java/com/zhehekeji/web/service/PlcService.java @@ -376,7 +376,7 @@ public class PlcService { delayTime = configProperties.getCameraConfig().getC2OutDelayCaptureTime(); } if (configProperties.getOrderTest() == 1) { - checkTest(plcCmdInfo); + //checkTest(plcCmdInfo); } } else if (code.startsWith("C3")) { delayTime = configProperties.getCameraConfig().getC3DelayCaptureTime(); diff --git a/web/src/main/java/com/zhehekeji/web/service/StockService.java b/web/src/main/java/com/zhehekeji/web/service/StockService.java index d7619a9..8faae84 100644 --- a/web/src/main/java/com/zhehekeji/web/service/StockService.java +++ b/web/src/main/java/com/zhehekeji/web/service/StockService.java @@ -398,7 +398,8 @@ public class StockService { //Assert.isTrue( StockStatus.PENDING.getStatus().equals(oldStatus) || StockStatus.ERROR.getStatus().equals(oldStatus), "无需核对"); log.info("check stock correct, street_id:{},direction:{},side:{},row:{},column:{}", stockCheck.getStreetId(),stockCheck.getDirection(),stockCheck.getSide(), stockCheck.getRow(), stockCheck.getColumn()); - if(stockCheck.getCountTop()+stock.getCount() == stock.getWmsCount() && stockCheck.getCategory().equals( stock.getWmsCategory())){ + int count =(stock.getCount() != null) ? stock.getCount() : 0; + if(stockCheck.getCountTop()+ count == stock.getWmsCount() && stock.getWmsCategory().equals(stockCheck.getCategory())){ stock.setStatus(StockStatus.MANUAL.getStatus()); }else {