Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyujie

5 天以前 130fe64dd3eb0617ddc1f38afcd07656d56db27c

 north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryDetailMapper.java

@@ -27,6 +27,16 @@

    List<DeliveryDetail> getSelectDeliveryPrinting(@Param("deliveryId") String deliveryId,@Param("type") String type);

    List<DeliveryDetail> getSelectDeliveryPrintingMoney(@Param("deliveryId") String deliveryId,@Param("type") String type);

    List<DeliveryDetail> getSelectDeliveryPrintingNoMoney(@Param("deliveryId") String deliveryId,@Param("type") String type);

    List<Map<String, Object>> getSelectDeliveryPrintingMoneySpecifications(@Param("deliveryId") String deliveryId,
                                                                           @Param("productId") Integer productId,@Param("orderId") String orderId);

    List<Map<String, Object>> getSelectDeliveryPrintingNoMoneySpecifications(@Param("deliveryId") String deliveryId,
                                                                             @Param("productId") Integer productId,@Param("orderId") String orderId);

    List<OrderDetail> getSelectOrderPrinting(Object productId, String orderId);

    List <Map<String, Object>> getSelectDeliveryDetailPrinting(@Param("deliveryId") String deliveryId,