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

野心家

2023-04-24 f96c2adc8d6bab6a4ee67a50ecfc9e6c7e435efd

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

    /**