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

廖井涛

2025-12-09 70a9b5ca60bafe50da533513f99b990147968a93

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

@@ -12,9 +12,15 @@
    List<Product> defaultProduct(@Param("offset") Integer offset,
                                 @Param("pageSize") Integer pageSiz,
                                 @Param("glassTypeId") String glassTypeId,
                                 @Param("product") Product product);
                                 @Param("product") Product product,String field, String orderBy);

    Integer getPageTotal(Integer offset, Integer pageSize, String glassTypeId, Product product);

    boolean updateProductStateById(Integer id,Integer state);

    List<Product> selectProduct(@Param("productName") String productName,@Param("productNameValue") String productNameValue);

    List<Product> selectProductId(@Param("productName") String productName,@Param("productNameValue") String productNameValue,@Param("id") Long id);

    Double getGlassThickness(Integer productId, Integer technologyNumber);
}