From 82a6ce44f2a5637fced9ef89f38597282ca0197c Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Sat, 16 Sep 2023 10:44:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B9=BF=E6=96=99=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/op/plan/domain/BaseProduct.java    | 17 +++++++++++------
 .../resources/mapper/plan/BaseProductMapper.xml |  3 ++-
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/op-modules/op-plan/src/main/java/com/op/plan/domain/BaseProduct.java b/op-modules/op-plan/src/main/java/com/op/plan/domain/BaseProduct.java
index a5400f5d..da27ed38 100644
--- a/op-modules/op-plan/src/main/java/com/op/plan/domain/BaseProduct.java
+++ b/op-modules/op-plan/src/main/java/com/op/plan/domain/BaseProduct.java
@@ -2,17 +2,27 @@ package com.op.plan.domain;
 
 // 订单-物料实体类
 public class BaseProduct {
+    private String productId;
     private String productCode;
     private String productDescZh;
 
     @Override
     public String toString() {
         return "BaseProduct{" +
-                "productCode='" + productCode + '\'' +
+                "productId='" + productId + '\'' +
+                ", productCode='" + productCode + '\'' +
                 ", productDescZh='" + productDescZh + '\'' +
                 '}';
     }
 
+    public String getProductId() {
+        return productId;
+    }
+
+    public void setProductId(String productId) {
+        this.productId = productId;
+    }
+
     public String getProductCode() {
         return productCode;
     }
@@ -29,11 +39,6 @@ public class BaseProduct {
         this.productDescZh = productDescZh;
     }
 
-    public BaseProduct(String productCode, String productDescZh) {
-        this.productCode = productCode;
-        this.productDescZh = productDescZh;
-    }
-
     public BaseProduct() {
     }
 }
diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/BaseProductMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/BaseProductMapper.xml
index 1590447a..5669ebf6 100644
--- a/op-modules/op-plan/src/main/resources/mapper/plan/BaseProductMapper.xml
+++ b/op-modules/op-plan/src/main/resources/mapper/plan/BaseProductMapper.xml
@@ -6,12 +6,13 @@
 
     <resultMap type="BaseProduct" id="BaseProductResult">
         <result property="productCode"	column="product_code"	/>
+        <result property="productId"	column="product_id"	/>
         <result property="productDescZh"	column="product_desc_zh"	/>
     </resultMap>
 
 
     <sql id="selectBaseProductVo">
-        select product_code, product_desc_zh from base_product
+        select product_id,product_code, product_desc_zh from base_product
     </sql>
 
     <select id="selectBaseProductList" parameterType="BaseProduct" resultMap="BaseProductResult">