基础修改

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);

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());

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 "";
     }