diff --git a/web/src/main/java/com/zhehekeji/web/controller/StockController.java b/web/src/main/java/com/zhehekeji/web/controller/StockController.java index d777998..0d625f1 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/StockController.java +++ b/web/src/main/java/com/zhehekeji/web/controller/StockController.java @@ -154,8 +154,13 @@ public class StockController { Stock stock = stockService.stock(stockCheck); log.info("stockCheck:res:{}",stock); CheckInfo checkInfo= new CheckInfo(); - checkInfo.setTrayCode(stock.getWmsTrayCode()); - checkInfo.setCheckRlt(stock.getStatus()==2 || stock.getStatus()==3?1:0); + if (stock!=null) { + checkInfo.setTrayCode(stock.getWmsTrayCode()); + checkInfo.setCheckRlt(stock.getStatus() == 2 || stock.getStatus() == 3 ? 1 : 0); + }else { + + checkInfo.setCheckRlt(0); + } return Result.success(checkInfo); }