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

maven

昨天 bb78ea38792502cbff36c9a4486b7b12e1940615

 src/main/java/com/ruoyi/production/mapper/ProductOrderMapper.java

@@ -17,12 +17,14 @@
public interface ProductOrderMapper extends BaseMapper<ProductOrder> {

    IPage<ProductOrderDto> pageProductOrder(Page page, @Param("c") ProductOrderDto productOrder);
    /**
     * 根据订单ID查询工单报工
     */
     ProductOrderDto productMainByOrderId(@Param("c") ProductOrder productOrder);

    List<ProcessRoute> listProcessRoute(@Param("productModelId") Long productModelId);

    List<ProductStructureDto> listProcessBom(@Param("orderId") Long orderId);

    Integer countCreated(@Param("startDate") String startDate, @Param("endDate") String endDate);

    Integer countCompleted(@Param("startDate") String startDate, @Param("endDate") String endDate);

    Integer countPending(@Param("startDate") String startDate, @Param("endDate") String endDate);
}