增加顶部个数

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;
 

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

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

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;