Merge branch 'phyzwms2' into phyzasrs-erp

zhangchao

2024-11-11 0ff927605ae5df1cb63fbe6cb838c35da43be8ac

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

@@ -48,10 +48,12 @@
    }

    @Override
    public OrderDetl selectItem(String orderNo, String matnr, String threeCode) {
        return this.baseMapper.selectItemByOrderNo2(orderNo, matnr, threeCode);
    public OrderDetl selectItem(String orderNo, String matnr,String batch, String threeCode) {
        return this.baseMapper.selectItemByOrderNo2(orderNo, matnr, batch, threeCode);
    }



    @Override
    public OrderDetl selectItemNoneOfBatch(String orderNo, String matnr) {
        return this.baseMapper.selectItemNoneOfBatch(orderNo, matnr);