From dc0a842edf89efe4fedcb8de3f3d1c09120b4e1c Mon Sep 17 00:00:00 2001
From: wj <1285151836@qq.com>
Date: Tue, 23 May 2023 16:17:09 +0800
Subject: [PATCH] =?UTF-8?q?ThrSystemDetailEntity=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=A1=A8=E5=90=8D,ThrProductsEntity=E5=A2=9E=E5=8A=A0=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5[=E7=94=9F=E4=BA=A7=E5=8E=82=E5=AE=B6=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81,=E9=85=8D=E9=80=81=E4=BC=81=E4=B8=9A=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/api/entity/thrsys/ThrProductsEntity.java    | 12 ++++++++++++
 .../api/entity/thrsys/ThrSystemDetailEntity.java     |  2 ++
 .../service/thrsys/impl/ThrProductsServiceImpl.java  |  2 ++
 src/main/resources/schemas/schema_v2.1.sql           |  5 +++++
 4 files changed, 21 insertions(+)

diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrProductsEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrProductsEntity.java
index 604a05607..e571a5c1a 100644
--- a/src/main/java/com/glxp/api/entity/thrsys/ThrProductsEntity.java
+++ b/src/main/java/com/glxp/api/entity/thrsys/ThrProductsEntity.java
@@ -179,5 +179,17 @@ public class ThrProductsEntity {
     @TableField("updateUser")
     private String updateUser;
 
+    /**
+     * 生产厂家编码
+     */
+    @TableField("manufactoryCode")
+    private String manufactoryCode;
+
+    /**
+     * 配送企业编码
+     */
+    @TableField("supCode")
+    private String supCode;
+
 
 }
diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrSystemDetailEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrSystemDetailEntity.java
index 64205c117..a6be1535c 100644
--- a/src/main/java/com/glxp/api/entity/thrsys/ThrSystemDetailEntity.java
+++ b/src/main/java/com/glxp/api/entity/thrsys/ThrSystemDetailEntity.java
@@ -1,8 +1,10 @@
 package com.glxp.api.entity.thrsys;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 @Data
+@TableName("thr_system_detail")
 public class ThrSystemDetailEntity {
 
     private Integer id;
diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java
index 7156d9de9..7102118c2 100644
--- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java
@@ -1,6 +1,7 @@
 package com.glxp.api.service.thrsys.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
@@ -188,6 +189,7 @@ public class ThrProductsServiceImpl extends ServiceImpl<ThrProductsDao, ThrProdu
                     } else {
                         boolean isChange = verifyDataChange(thrProductsEntity, item);
                         if (isChange) {
+                            BeanUtil.copyProperties(item,thrProductsEntity,new CopyOptions().setIgnoreNullValue(true));
                             thrProductsEntity.setUpdateTime(new Date());
                             thrProductsDao.updateEntityById(thrProductsEntity);
                         }
diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql
index a08100bc1..26ebe4816 100644
--- a/src/main/resources/schemas/schema_v2.1.sql
+++ b/src/main/resources/schemas/schema_v2.1.sql
@@ -1,5 +1,10 @@
 #   字段新增   （表名，字段名，字段类型，修改方式（1：新增，2：修改，3：删除）
 
+CALL Pro_Temp_ColumnWork('thr_products', 'manufactoryCode',
+                         'varchar(255) comment '生产厂家编码' ', 1);
+CALL Pro_Temp_ColumnWork('thr_products', 'supCode',
+                         'varchar(255) comment '配送企业编码' ', 1);
+
 CALL Pro_Temp_ColumnWork('basic_download_status', 'cacheFilePath',
                          'varchar(255) ', 1);