#erp对接修改

lty

2025-07-25 cdfb6025516e43275982780291b4c5bd866bd9d7

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

@@ -6,6 +6,7 @@
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.StockStatisDTO;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.param.StockOutFloorParam;
import com.zy.asrs.entity.param.StockOutParam;
import com.zy.asrs.entity.result.StockVo;
import com.zy.asrs.mapper.LocDetlMapper;
@@ -86,10 +87,17 @@
    }


//    @Override
//    public Page<StockStatisDTO> getStockStatis1(Page<StockStatisDTO> page) {
//        page.setRecords(baseMapper.asrsAndErpList(page.getCondition()));
//        page.setTotal(baseMapper.asrsAndErpCount(page.getCondition()));
//        return page;
//    }

    @Override
    public Page<StockStatisDTO> getStockStatis(Page<StockStatisDTO> page) {
        page.setRecords(baseMapper.asrsAndErpList(page.getCondition()));
        page.setTotal(baseMapper.asrsAndErpCount(page.getCondition()));
    public Page<LocDetl> getStockStatis(Page<LocDetl> page) {
        page.setRecords(baseMapper.getStockStatis(page.getCondition()));
        page.setTotal(baseMapper.getStockStatisCount(page.getCondition()));
        return page;
    }

@@ -121,7 +129,17 @@
    @Override
    public List<LocDetl> queryStock(OrderDetl orderDetl) {
        List<LocDetl> data = new ArrayList<>();
        List<LocDetl> locDetls = this.baseMapper.queryStock(null, orderDetl.getMatnr(), null, null, null);
        List<LocDetl> locDetls = this.baseMapper.queryStock(
                null,
                orderDetl.getMatnr(),
                orderDetl.getBatch(),
                orderDetl.getOutOrderNo(),
                orderDetl.getTemp2(),
                orderDetl.getProType(),
                orderDetl.getModel(),
                null,
                null  // locNos 如果有排除列表也可以传
        );
        if (locDetls == null) {
            return null;
        }
@@ -228,5 +246,17 @@
        }
        return null;
    }
    @Override
    public LocDetl selectItem(String locNo, StockOutFloorParam.LocDetl locDetl) {
        List<LocDetl> locDetls = this.baseMapper.selectItem3(locNo, locDetl.getMatnr());
        if (locDetls != null) {
            for (LocDetl detl : locDetls) {
                if (MatCompareUtils.compare(locDetl, detl)) {
                    return detl;
                }
            }
        }
        return null;
    }

}