增加巷道查询

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

@@ -40,6 +40,7 @@ public class CheckLogService {
                 .eq(search.getSide() != null && search.getSide() > 0, "`side`", search.getSide())
                 .eq(search.getRow() != null && search.getRow() > 0, "`row`", search.getRow())
                 .eq(search.getColumn() != null && search.getColumn() > 0, "`column`", search.getColumn())
+                .eq(search.getStreetId() != null && search.getStreetId() > 0, "`street_Id`", search.getStreetId())
                 .orderByDesc("create_time");
         List<CheckLog> stockChecks = checkLogMapper.selectList(wrapper);
 

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

@@ -711,6 +711,8 @@ public class PlcService {
         stock.setSide(dataInfo.getFromSide());
         stock.setRow(dataInfo.getFromRow());
         stock.setColumn(dataInfo.getFromColumn());
+        stock.setWmsCategory(dataInfo.getTypeNum());
+        stock.setWmsCount(dataInfo.getQuantity());
         stock.setCategory(dataInfo.getTypeNum());
         stock.setCount(dataInfo.getQuantity());
         stock.setTaskId((dataInfo.getTaskId()));

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

@@ -439,6 +439,16 @@ public class StockService {
                 .orderByDesc("export_time").last("limit 1");
         Stock stock =stockMapper.selectOne(stockQueryWrapper);
 
+        Order order = orderMapper.selectOne(new QueryWrapper<Order>()
+                .eq("street_Id",stock.getStreetId())
+                .eq("left_right1",stock.getDirection())
+                .eq("column1",stock.getColumn())
+                .eq("row1",stock.getRow())
+                .orderByDesc("into_Stock_Over_Time")
+                .last("limit 1"));
+        if(order != null){
+            stock.setOveroperationPic(order.getIntoStockOverPic());
+        }
         return stock;
     }
 

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

@@ -38,7 +38,7 @@ public class TransmissionPojo {
         this.column = checkLog.getColumn();
         this.direction = checkLog.getDirection();
         this.count = checkLog.getCount();
-        if(checkLog.getCategory().contains("/")) {
+        if(checkLog.getCategory() != null && checkLog.getCategory().contains("/")) {
             this.category = checkLog.getCategory().split("/")[0];
         }else {
             this.category = checkLog.getCategory();