Merge remote-tracking branch 'refs/remotes/origin/stasrs' into stasrs

Junjie

2023-03-14 163bdd3a71de83b9e36340be3fe6380b6758e4fd

 src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java

@@ -87,8 +87,10 @@
    }

    @Override
    public List<StockVo> queryStockTotal() {
        return this.baseMapper.queryStockTotal();
    public List<StockVo> queryStockTotal(StockVo stockVo) {
        String matnr=stockVo.getMatnr();
        String batch=stockVo.getBatch();
        return this.baseMapper.queryStockTotal(matnr,batch);
    }

    /**