From 7f285706214961e5c6e6b1c61db7d2e39984ac3a Mon Sep 17 00:00:00 2001
From: wangzhenglan <wzl@midao100.com>
Date: Tue, 7 Feb 2023 15:05:14 +0800
Subject: [PATCH] =?UTF-8?q?11.21=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/lan/textja/entity/Product.java  |  1 +
 .../java/com/lan/textja/mapper/ProductMapper.java |  9 ++++++++-
 .../com/lan/textja/service/HomeServiceImp.java    |  1 +
 .../com/lan/textja/mapper/InventoryMapper.xml     |  4 ++--
 .../com/lan/textja/mapper/ProductMapper.xml       | 15 ++++++++++++---
 5 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/textja/src/main/java/com/lan/textja/entity/Product.java b/textja/src/main/java/com/lan/textja/entity/Product.java
index ff96f18..250c538 100644
--- a/textja/src/main/java/com/lan/textja/entity/Product.java
+++ b/textja/src/main/java/com/lan/textja/entity/Product.java
@@ -22,4 +22,5 @@ public class Product implements Serializable {
     private String productChannel;
     private Integer productSellingPrice;
     private Integer productTypeNo;
+    private Integer productSupplierNo;
 }
diff --git a/textja/src/main/java/com/lan/textja/mapper/ProductMapper.java b/textja/src/main/java/com/lan/textja/mapper/ProductMapper.java
index 0867c35..5679983 100644
--- a/textja/src/main/java/com/lan/textja/mapper/ProductMapper.java
+++ b/textja/src/main/java/com/lan/textja/mapper/ProductMapper.java
@@ -6,6 +6,7 @@ import com.lan.textja.util.TreeResult;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
+import java.util.Map;
 
 public interface ProductMapper extends BaseMapper<Product> {
 
@@ -24,7 +25,13 @@ public interface ProductMapper extends BaseMapper<Product> {
 
     Product updateProuduct(Integer productNum);
 
-    List<Integer> selectSupplierNo();
+    List<Product> selectTree();
+
+    List<Product> selectTreePtn(Integer productSupplierNo);
+
+    List<Product> selectTreePn(Integer productTypeNo);
+
+
 
 
 //    @Update("pudate prouduct set name=#{name},type=#{type},state=#{state},size=#{size},alias=#{alias},brands=#{brands},num=#{num} where id=#{id}")
diff --git a/textja/src/main/java/com/lan/textja/service/HomeServiceImp.java b/textja/src/main/java/com/lan/textja/service/HomeServiceImp.java
index 2f8f5ca..1384b53 100644
--- a/textja/src/main/java/com/lan/textja/service/HomeServiceImp.java
+++ b/textja/src/main/java/com/lan/textja/service/HomeServiceImp.java
@@ -24,6 +24,7 @@ public class HomeServiceImp implements HomeService {
            List<MenuResult>List2= homeMapper.selectList2(oneRights.getId());
 
            oneRights.setChildren(List2);
+
         }
         return oneList;
     }
diff --git a/textja/src/main/resources/com/lan/textja/mapper/InventoryMapper.xml b/textja/src/main/resources/com/lan/textja/mapper/InventoryMapper.xml
index ac3941e..c595ec1 100644
--- a/textja/src/main/resources/com/lan/textja/mapper/InventoryMapper.xml
+++ b/textja/src/main/resources/com/lan/textja/mapper/InventoryMapper.xml
@@ -70,7 +70,7 @@
 
     <update id="addQty" parameterType="integer">
         update product_inventory set
-            Inventory_Remaining_Qty=#{inventoryRemainingQty}
-        where inventory_Product_Num=#{inventoryProductNum};
+            Inventory_Remaining_Qty=#{remainingQty}
+        where inventory_Product_Num=#{productNum};
     </update>
 </mapper>
diff --git a/textja/src/main/resources/com/lan/textja/mapper/ProductMapper.xml b/textja/src/main/resources/com/lan/textja/mapper/ProductMapper.xml
index fa973d4..504fa6b 100644
--- a/textja/src/main/resources/com/lan/textja/mapper/ProductMapper.xml
+++ b/textja/src/main/resources/com/lan/textja/mapper/ProductMapper.xml
@@ -13,7 +13,8 @@
         product_Num AS "productNum",
         product_Channel AS "productChannel",
         product_Selling_Price AS "productSellingPrice",
-        product_Type_No AS "productTypeNo"
+        product_Type_No AS "productTypeNo",
+        product_Supplier_No AS "productSupplierNo"
     </sql>
 
     <select id="onSubmit" resultType="com.lan.textja.entity.Product">
@@ -56,7 +57,15 @@
         select <include refid="productColumns"></include> from product where product_Num=#{productNum}
     </select>
 
-    <select id="selectSupplierNo" resultType="Integer">
-        select distinct product_Supplier_No from product
+    <select id="selectTree" resultType="com.lan.textja.entity.Product">
+        select product_Name, product_Type, product_Type_No, product_Num, product_Supplier_No, product_Brands FROM product
+    </select>
+
+    <select id="selectTreePtn" resultType="com.lan.textja.entity.Product">
+        select product_Type, product_Type_No FROM product where product_Supplier_No =#{productSupplierNo}
+    </select>
+
+    <select id="selectTreePn" resultType="com.lan.textja.entity.Product">
+        select product_Name, product_Num FROM product where product_Type_No =#{productTypeNo}
     </select>
 </mapper>