Merge remote-tracking branch 'origin/jx-fyxc-wms' into jx-fyxc-wms

zhangc

2025-04-18 a144c412981c49658c951db098a701a58f8e1ee3

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

@@ -90,8 +90,8 @@
    }

    @Override
    public List<ManLocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos) {
        return this.baseMapper.queryStock(matnr, batch, orderNo, locNos);
    public List<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos,String supp,String temp1,String temp2) {
        return this.baseMapper.queryStock(matnr, batch, orderNo, locNos,supp,temp1,temp2);
    }

    @Override