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

maven

10 小时以前 34e986e6e158450ee35319f1cac872a4bc974a74

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

@@ -17,14 +17,5 @@

    IPage<ProductWorkOrderDto> pageProductWorkOrder(Page<ProductWorkOrderDto> page, @Param("c") ProductWorkOrderDto productWorkOrder);

    int updatePlanQuantity(Map<String, Object> params);

    /**
     * 回滚工单计划数量：从production_product_output取quantity加回plan_quantity
     * @param productMainId
     * @return
     */
    int rollbackPlanQuantity(@Param("productMainId") Long productMainId);

    List<ProductWorkOrderDto> selectProductWorkOrderDtoList();
}