From c1c7cae9ebaa7f743e51660265c8dfa6ac52f10d Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 09 十月 2025 16:07:42 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/mapper/sd/ProductMapper.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/sd/ProductMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/sd/ProductMapper.java
index 6880c20..4827b51 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/sd/ProductMapper.java
+++ b/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);
 }

--
Gitblit v1.8.0