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

Junjie

2024-05-31 93b17a7e74d8e16ac6fa30e90e9db3960736d57f

 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/OrderDetlMapper.java

@@ -17,7 +17,7 @@

    List<OrderDetl> selectWorkingDetls(Long orderId);

    OrderDetl selectItem(@Param("orderId") Long orderId, @Param("matnr") String matnr, @Param("batch") String batch);
    OrderDetl selectItem(@Param("orderId") Long orderId, @Param("matnr") String matnr, @Param("batch") String batch, @Param("hostId") Long hostId);

    OrderDetl selectItem2(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("batch") String batch, @Param("hostId") Long hostId);