From 109d49e6e8420a3bb80dfb9fffac125496b5a8d6 Mon Sep 17 00:00:00 2001 From: yiming Date: Thu, 5 Jan 2023 14:26:06 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=B1=E4=BA=8E=E5=A4=9A=E6=B0=9F=E5=A4=9A?= =?UTF-8?q?=E4=BC=9A=E4=B8=8A=E4=BC=A0=E5=BA=93=E5=8F=A3=E6=95=B0=E5=AD=97?= =?UTF-8?q?=EF=BC=8C=E5=8E=BB=E6=8E=89=E8=A1=8C=E5=88=97=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E5=AD=97=E9=99=90=E5=88=B6=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zhehekeji/web/service/PlcService.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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 33aeca1..79f93b7 100644 --- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java +++ b/web/src/main/java/com/zhehekeji/web/service/PlcService.java @@ -99,17 +99,17 @@ public class PlcService { Street street = streetService.getStreetByPlcId(plcCmdInfo.getPlcId()); if (street != null) { - if(plcCmdInfo.getLeftRight1() == 1){ - if(plcCmdInfo.getRow1()>street.getLeftRow() && plcCmdInfo.getColumn1() > street.getLeftColumn()){ - log.error("row:{},column:{},error in streetId:{} left",plcCmdInfo.getRow1(),plcCmdInfo.getColumn1(),street.getId()); - return; - } - }else { - if(plcCmdInfo.getRow1()>street.getRightRow() && plcCmdInfo.getColumn1() > street.getRightColumn()){ - log.error("row:{},column:{},error in streetId:{} right",plcCmdInfo.getRow1(),plcCmdInfo.getColumn1(),street.getId()); - return; - } - } +// if(plcCmdInfo.getLeftRight1() == 1){ +// if(plcCmdInfo.getRow1()>street.getLeftRow() && plcCmdInfo.getColumn1() > street.getLeftColumn()){ +// log.error("row:{},column:{},error in streetId:{} left",plcCmdInfo.getRow1(),plcCmdInfo.getColumn1(),street.getId()); +// return; +// } +// }else { +// if(plcCmdInfo.getRow1()>street.getRightRow() && plcCmdInfo.getColumn1() > street.getRightColumn()){ +// log.error("row:{},column:{},error in streetId:{} right",plcCmdInfo.getRow1(),plcCmdInfo.getColumn1(),street.getId()); +// return; +// } +// } Order order = new Order(); order.setOrderNum(plcCmdInfo.getOrderNum()); order.setStatus(0);