1.增加盘点后随行拍照的逻辑

web/src/main/java/com/zhehekeji/web/config/ConfigProperties.java

@@ -50,6 +50,8 @@ public class ConfigProperties {
 
     private String productDoc;
 
+    private boolean inventorySimulationFollow = false;
+
 
     @Data
     public static class CameraConfig{

web/src/main/java/com/zhehekeji/web/service/PlcService.java

@@ -734,11 +734,17 @@ public class PlcService {
             if (lock.tryLock()) {
                 //队列中没有任务，发送取图指令
                 if (GetPhotoDelayExecutor.cameraDelayTasks.size() == 0 && ClientChanel.get(dataInfo.getSRMNumber()) != null) {
-                    ClientChanel.get(dataInfo.getSRMNumber()).writeAndFlush(transmissionPojo.toString(TransmissionType.GPS));
+                    ClientChanel.get(street.getPlcId()).writeAndFlush(transmissionPojo.toString(TransmissionType.GPS));
                 }
                 //放置到队列中，等待取图返回后删除
                 GetPhotoDelayExecutor.addCameraDelayTask(street.getPlcId(), transmissionPojo.toString(TransmissionType.GPS), configProperties.getQueueSpanTime());
             }
+
+            if (configProperties.isInventorySimulationFollow()) {
+                ClientChanel.get(dataInfo.getSRMNumber()).writeAndFlush(
+                        (new TransmissionPojo(street, transmissionPojo.getRow(), transmissionPojo.getColumn(), transmissionPojo.getDirection(), "")).toString(TransmissionType.GPS));
+
+            }
         } catch (InterruptedException e) {
             log.error("取图命令 error", e);
         } finally {
@@ -749,6 +755,7 @@ public class PlcService {
 
     }
 
+
     public void visualCalculationResults(TransmissionPojo transmissionPojo) {
         CheckLog checkLog = checkLogMapper.selectById(transmissionPojo.getCheckId());
         Stock stock = stockMapper.selectOne(new QueryWrapper<Stock>().eq("check_Num", checkLog.getId()));

web/src/main/java/com/zhehekeji/web/service/StockService.java

@@ -336,7 +336,7 @@ public class StockService {
                 .orderByDesc("into_Stock_Over_Time")
                 .last("limit 1"));
         if(order != null){
-            stock.setOveroperationPic(order.getIntoStockOverPic());
+            stock.setOveroperationPic("http://" + street.getPlcIp() + ":8007" + "/storeData/" + street.getPlcId() + "/" + stock.getRow() + "/" + stock.getColumn() + "/" + (stock.getDirection() + 2) + ".PNG");
         }
         return stock;
     }

web/src/main/java/com/zhehekeji/web/service/client/TransmissionPojo.java

@@ -151,6 +151,7 @@ public class TransmissionPojo {
     }
 
     public static void main(String[] args) {
+
         TransmissionPojo transmissionPojo = new TransmissionPojo("GPE&002/1/18&7&2&123&41111&30&0&fff;.\\\\f.png;/f.png>");
         System.out.println(transmissionPojo);
     }

web/src/main/resources/application-prod.yml

@@ -97,3 +97,5 @@ scanCodeMode:
 deleteFileDays: 30
 
 productDoc: "C:/Users/昊天/Desktop/新建 文本文档 (3).txt"
+
+inventorySimulationFollow: false