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

pjb

2024-12-31 c4e8e814d2c9e0d03f6449860b70e58657fd7dc2

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

@@ -110,4 +110,9 @@
        Integer sum = this.baseMapper.sameOrderComb(orderNo, matnr, batch);
        return  sum != null ? sum : 0;
    }

    @Override
    public OrderDetl selectByOrderNoAndMaktx(String orderNo, String maktx) {
        return this.selectOne(new EntityWrapper<OrderDetl>().eq("order_no",orderNo).eq("maktx",maktx));
    }
}