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

chenlu

2 天以前 96d60dcd18b3d8c304afb8131fcbe547c0e74554

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

@@ -31,9 +31,11 @@

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

    List<DeliveryDetail> getSelectDeliveryPrintingMoneySpecifications(@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<DeliveryDetail> getSelectDeliveryPrintingNoMoneySpecifications(@Param("deliveryId") String deliveryId,@Param("type") String type);
    List<Map<String, Object>> getSelectDeliveryPrintingNoMoneySpecifications(@Param("deliveryId") String deliveryId,
                                                                             @Param("productId") Integer productId,@Param("orderId") String orderId);

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

@@ -98,4 +100,13 @@

    OrderDetail selectOrderDetailDeliveryCount(@Param("orderDetail") OrderDetail orderDetail);

    List<DeliveryDetail> getDeliverDetailOrderNumber(@Param("orderId") String orderId,
                                         @Param("orderNumber") Integer orderNumber,@Param("deliveryId") String deliveryId);

    List<Delivery> getDeliverOrderNumber(@Param("orderId") String orderId,
                                                     @Param("orderNumber") Integer orderNumber);

    Boolean updateDeliveryDetailmonye(@Param("price") Double price,@Param("deliveryDetail") DeliveryDetail deliveryDetail);
    Boolean updateDeliverymonye(@Param("deliveryId") String deliveryId,@Param("money") Double money);

}