From 0bf0428b63a9ed7a97a39cb2cc899a6fa35534f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?LAPTOP-S9HJSOEB=5C=E6=98=8A=E5=A4=A9?=
 <wang.haotian@hzleaper.com>
Date: Wed, 15 May 2024 10:17:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B7=B7=E9=81=93=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/zhehekeji/web/service/CheckLogService.java     |  1 +
 .../java/com/zhehekeji/web/service/PlcService.java     |  2 ++
 .../java/com/zhehekeji/web/service/StockService.java   | 10 ++++++++++
 .../zhehekeji/web/service/client/TransmissionPojo.java |  2 +-
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/web/src/main/java/com/zhehekeji/web/service/CheckLogService.java b/web/src/main/java/com/zhehekeji/web/service/CheckLogService.java
index e29982e..9503ac8 100644
--- a/web/src/main/java/com/zhehekeji/web/service/CheckLogService.java
+++ b/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);
 
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 bd4b358..a787227 100644
--- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java
+++ b/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()));
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 8770a57..c259398 100644
--- a/web/src/main/java/com/zhehekeji/web/service/StockService.java
+++ b/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;
     }
 
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 7c52061..5749a7b 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
@@ -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();