From 90b4e8c74dc92d0554a1af067416893b502ae26c 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, 22 May 2024 17:33:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A1=B6=E9=83=A8=E4=B8=AA?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/zhehekeji/web/entity/Stock.java  |  3 +++
 .../com/zhehekeji/web/pojo/stock/StockCheck.java   |  1 +
 .../java/com/zhehekeji/web/service/PlcService.java |  2 ++
 .../com/zhehekeji/web/service/StockService.java    | 14 +++++++++++++-
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/web/src/main/java/com/zhehekeji/web/entity/Stock.java b/web/src/main/java/com/zhehekeji/web/entity/Stock.java
index 5706685..1a13912 100644
--- a/web/src/main/java/com/zhehekeji/web/entity/Stock.java
+++ b/web/src/main/java/com/zhehekeji/web/entity/Stock.java
@@ -84,6 +84,9 @@ public class Stock {
     @ApiModelProperty("盘点图片")
     private String checkPic;
 
+    @ApiModelProperty("顶部个数")
+    private int countTop;
+
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private LocalDateTime exportTime;
 
diff --git a/web/src/main/java/com/zhehekeji/web/pojo/stock/StockCheck.java b/web/src/main/java/com/zhehekeji/web/pojo/stock/StockCheck.java
index 8f6806a..e395a88 100644
--- a/web/src/main/java/com/zhehekeji/web/pojo/stock/StockCheck.java
+++ b/web/src/main/java/com/zhehekeji/web/pojo/stock/StockCheck.java
@@ -29,5 +29,6 @@ public class StockCheck {
 
     private String category;
     private Integer count;
+    private Integer countTop;
 
 }
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 27bacd8..c7c6e08 100644
--- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java
+++ b/web/src/main/java/com/zhehekeji/web/service/PlcService.java
@@ -736,6 +736,8 @@ public class PlcService {
                     .lotnum(plcCmdInfo.getLotnum())
                     .count(algorithmPojo.getGoodsNumberResult())
                     .category(algorithmPojo.getGoodsTypeResult())
+                    .wmsCount(algorithmPojo.getGoodsNumber())
+                    .wmsCategory(algorithmPojo.getGoodsType())
                     .streetId(orderInfo.getStreetId())
                     .direction(plcCmdInfo.getFromDirection())
                     .side(orderInfo.getSeparation())
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 ff241e0..52809b6 100644
--- a/web/src/main/java/com/zhehekeji/web/service/StockService.java
+++ b/web/src/main/java/com/zhehekeji/web/service/StockService.java
@@ -398,8 +398,15 @@ public class StockService {
         //Assert.isTrue( StockStatus.PENDING.getStatus().equals(oldStatus) || StockStatus.ERROR.getStatus().equals(oldStatus), "无需核对");
 
         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());
+        if(stockCheck.getCountTop()+stock.getCount() == stock.getWmsCount() && stockCheck.getCategory().equals( stock.getWmsCategory())){
+
+            stock.setStatus(StockStatus.MANUAL.getStatus());
+        }else {
+
+            stock.setStatus(StockStatus.ERROR.getStatus());
+        }
         stock.setCount(stockCheck.getCount());
+        stock.setCountTop(stockCheck.getCountTop());
         stock.setCategory(stockCheck.getCategory());
         stockMapper.updateById(stock);
         stock = stockMapper.selectById(stock.getId());
@@ -407,6 +414,11 @@ public class StockService {
         return stock;
     }
 
+    public static void main(String[] args) {
+        System.out.println(3%4
+        );
+    }
+
     @Resource
     private CheckLogMapper checkLogMapper;