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

liyong

11 小时以前 1765150bd38a53f6466a6e355f231e21f25fc9f2

 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();
    ProductWorkOrderDto getProductWorkOrderFlowCard(@Param("id") Long id);
}