src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -117,8 +117,8 @@ } @Override public List<LocDetl> queryStockViewMerge(String locNo) { return this.baseMapper.queryStockViewMerge(locNo); public List<LocDetl> queryStockViewMerge(String locNo,String zpallet,String matnr) { return this.baseMapper.queryStockViewMerge(locNo,zpallet,matnr); } @Override