From a428777b6f52b2cf3aec1b74a2b45c3601af3864 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LAPTOP-S9HJSOEB=5C=E6=98=8A=E5=A4=A9?= Date: Wed, 21 Feb 2024 15:57:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/main/java/com/zhehekeji/web/service/PlcService.java | 6 ++++-- .../main/java/com/zhehekeji/web/service/StockService.java | 2 +- .../com/zhehekeji/web/service/client/TransmissionPojo.java | 4 ++-- 3 files changed, 7 insertions(+), 5 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 452c58a..4a101df 100644 --- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java +++ b/web/src/main/java/com/zhehekeji/web/service/PlcService.java @@ -695,10 +695,12 @@ public class PlcService { stock.setCategory(transmissionPojo.getCategory()); } - stock.setPcd("http://" + street.getPlcIp() + ":8007" + transmissionPojo.getPcd()); + if(transmissionPojo.getPcd() != null && "".equals(transmissionPojo.getPcd())) { + stock.setPcd("http://" + street.getPlcIp() + ":8007" + transmissionPojo.getPcd()); + } if (transmissionPojo.getPicsPath() != null && transmissionPojo.getPicsPath().length > 0) { - String pics = Arrays.stream(transmissionPojo.getPicsPath()).map(v -> { + String pics = Arrays.stream(transmissionPojo.getPicsPath()).distinct().map(v -> { return "http://" + street.getPlcIp() + ":8007" + v; }).collect(Collectors.joining(";")); checkLog.setPic(pics); 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 1b450aa..1a534ab 100644 --- a/web/src/main/java/com/zhehekeji/web/service/StockService.java +++ b/web/src/main/java/com/zhehekeji/web/service/StockService.java @@ -355,7 +355,6 @@ public class StockService { public Stock checkCorrect(StockCheck stockCheck) { Stock stock = stockInfo(stockCheck); Assert.isTrue(stock != null && stock.getId() != null, "该货位暂时没有记录"); - log.info("check stock correct, street_id:{},direction:{},side:{},row:{},column:{}", stockCheck.getStreetId(),stockCheck.getDirection(),stockCheck.getSide(), stockCheck.getRow(), stockCheck.getColumn()); stock.setStatus(StockStatus.MANUAL.getStatus()); stock.setCount(stockCheck.getCount()); @@ -390,6 +389,7 @@ public class StockService { .eq("check_num",stock.getCheckNum()) .last("limit 1")); checkLog.setRow(stock.getRow()); + checkLog.setStreetId(stock.getStreetId()); checkLog.setColumn(stock.getColumn()); checkLog.setCheckNum(stock.getCheckNum()); checkLog.setPic(stock.getCheckPic()); diff --git a/web/src/main/java/com/zhehekeji/web/service/client/TransmissionPojo.java b/web/src/main/java/com/zhehekeji/web/service/client/TransmissionPojo.java index e5b361a..ab7a70c 100644 --- a/web/src/main/java/com/zhehekeji/web/service/client/TransmissionPojo.java +++ b/web/src/main/java/com/zhehekeji/web/service/client/TransmissionPojo.java @@ -43,9 +43,9 @@ public class TransmissionPojo { if (type == TransmissionType.ST) { return "ST&" + streetNumber + "&" + checkId + "&" + taskId + "&" + direction ; }else if (type == TransmissionType.GPS) { - return "GPS&" + streetNumber + "&" + checkId + "&" + taskId + "&" + direction+ "&" + category + "&" + count; + return "GPS&" + streetNumber +"/"+row+ "&" + checkId + "&" + taskId + "&" + direction+ "&" + category + "&" + count; }else if (type == TransmissionType.RTS) { - return "RTS&" + streetNumber + "&" + checkId + "&" + taskId + "&" + direction + "&" + category + "&" + count; + return "RTS&" + streetNumber +"/"+row+ "&" + checkId + "&" + taskId + "&" + direction + "&" + category + "&" + count; } return ""; }