From 8e474df39cbb6dd2a713e762e2fc0466b6fb4c2c Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Fri, 25 Jul 2025 13:48:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=96=B0=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E4=B8=8D=E5=85=BC=E5=AE=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/klp/common/core/domain/BaseEntity.java  | 10 ----------
 .../java/com/klp/mes/dv/domain/DvCheckMachinery.java | 12 ++++++++++++
 .../java/com/klp/mes/dv/domain/DvCheckRecord.java    | 10 ++++++++++
 .../java/com/klp/mes/dv/domain/DvCheckSubject.java   | 10 ++++++++++
 .../main/java/com/klp/mes/dv/domain/DvMachinery.java | 10 ++++++++++
 .../java/com/klp/mes/dv/domain/DvMaintenRecord.java  | 10 ++++++++++
 .../main/java/com/klp/mes/dv/domain/DvRepair.java    | 10 ++++++++++
 .../java/com/klp/mes/dv/domain/DvRepairLine.java     | 10 ++++++++++
 .../main/java/com/klp/mes/dv/domain/DvSubject.java   | 10 ++++++++++
 klp-wms/src/main/java/com/klp/domain/WmsProduct.java |  4 ++++
 .../main/java/com/klp/domain/bo/WmsProductBo.java    |  4 ++--
 .../main/java/com/klp/domain/vo/WmsProductVo.java    |  5 +++++
 .../main/resources/mapper/klp/WmsProductMapper.xml   |  1 +
 13 files changed, 94 insertions(+), 12 deletions(-)

diff --git a/klp-common/src/main/java/com/klp/common/core/domain/BaseEntity.java b/klp-common/src/main/java/com/klp/common/core/domain/BaseEntity.java
index a81c4370..682f47db 100644
--- a/klp-common/src/main/java/com/klp/common/core/domain/BaseEntity.java
+++ b/klp-common/src/main/java/com/klp/common/core/domain/BaseEntity.java
@@ -22,16 +22,6 @@ public class BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    /** 备注 */
-    private String remark;
     /**
      * 搜索值
      */
diff --git a/klp-mes/src/main/java/com/klp/mes/dv/domain/DvCheckMachinery.java b/klp-mes/src/main/java/com/klp/mes/dv/domain/DvCheckMachinery.java
index 1593a6bf..462574d1 100644
--- a/klp-mes/src/main/java/com/klp/mes/dv/domain/DvCheckMachinery.java
+++ b/klp-mes/src/main/java/com/klp/mes/dv/domain/DvCheckMachinery.java
@@ -54,6 +54,18 @@ public class DvCheckMachinery extends BaseEntity
     /** 预留字段4 */
     private Long attr4;
 
+    /** 备注 */
+    private String remark;
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+
     public void setRecordId(Long recordId)
     {
         this.recordId = recordId;
diff --git a/klp-mes/src/main/java/com/klp/mes/dv/domain/DvCheckRecord.java b/klp-mes/src/main/java/com/klp/mes/dv/domain/DvCheckRecord.java
index b5faccce..91668a3f 100644
--- a/klp-mes/src/main/java/com/klp/mes/dv/domain/DvCheckRecord.java
+++ b/klp-mes/src/main/java/com/klp/mes/dv/domain/DvCheckRecord.java
@@ -83,6 +83,16 @@ public class DvCheckRecord extends BaseEntity
 
     /** 预留字段4 */
     private Long attr4;
+    /** 备注 */
+    private String remark;
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 
     public void setRecordId(Long recordId)
     {
diff --git a/klp-mes/src/main/java/com/klp/mes/dv/domain/DvCheckSubject.java b/klp-mes/src/main/java/com/klp/mes/dv/domain/DvCheckSubject.java
index 552b40eb..359d6561 100644
--- a/klp-mes/src/main/java/com/klp/mes/dv/domain/DvCheckSubject.java
+++ b/klp-mes/src/main/java/com/klp/mes/dv/domain/DvCheckSubject.java
@@ -57,6 +57,16 @@ public class DvCheckSubject extends BaseEntity
 
     /** 预留字段4 */
     private Long attr4;
+    /** 备注 */
+    private String remark;
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 
     public void setRecordId(Long recordId)
     {
diff --git a/klp-mes/src/main/java/com/klp/mes/dv/domain/DvMachinery.java b/klp-mes/src/main/java/com/klp/mes/dv/domain/DvMachinery.java
index 95bca116..ee85c670 100644
--- a/klp-mes/src/main/java/com/klp/mes/dv/domain/DvMachinery.java
+++ b/klp-mes/src/main/java/com/klp/mes/dv/domain/DvMachinery.java
@@ -84,6 +84,16 @@ public class DvMachinery extends BaseEntity
 
     /** 预留字段4 */
     private Long attr4;
+    /** 备注 */
+    private String remark;
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 
     public void setMachineryId(Long machineryId)
     {
diff --git a/klp-mes/src/main/java/com/klp/mes/dv/domain/DvMaintenRecord.java b/klp-mes/src/main/java/com/klp/mes/dv/domain/DvMaintenRecord.java
index 9ccaa3aa..a92cf506 100644
--- a/klp-mes/src/main/java/com/klp/mes/dv/domain/DvMaintenRecord.java
+++ b/klp-mes/src/main/java/com/klp/mes/dv/domain/DvMaintenRecord.java
@@ -89,6 +89,16 @@ public class DvMaintenRecord extends BaseEntity
 
     /** 预留字段4 */
     private Long attr4;
+    /** 备注 */
+    private String remark;
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 
     public void setRecordId(Long recordId)
     {
diff --git a/klp-mes/src/main/java/com/klp/mes/dv/domain/DvRepair.java b/klp-mes/src/main/java/com/klp/mes/dv/domain/DvRepair.java
index 2b6baecf..e5868853 100644
--- a/klp-mes/src/main/java/com/klp/mes/dv/domain/DvRepair.java
+++ b/klp-mes/src/main/java/com/klp/mes/dv/domain/DvRepair.java
@@ -109,6 +109,16 @@ public class DvRepair extends BaseEntity
 
     /** 预留字段4 */
     private Long attr4;
+    /** 备注 */
+    private String remark;
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 
     public void setRepairId(Long repairId)
     {
diff --git a/klp-mes/src/main/java/com/klp/mes/dv/domain/DvRepairLine.java b/klp-mes/src/main/java/com/klp/mes/dv/domain/DvRepairLine.java
index f3ea7f79..9dd0f720 100644
--- a/klp-mes/src/main/java/com/klp/mes/dv/domain/DvRepairLine.java
+++ b/klp-mes/src/main/java/com/klp/mes/dv/domain/DvRepairLine.java
@@ -69,6 +69,16 @@ public class DvRepairLine extends BaseEntity
 
     /** 预留字段4 */
     private Long attr4;
+    /** 备注 */
+    private String remark;
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 
     public void setLineId(Long lineId)
     {
diff --git a/klp-mes/src/main/java/com/klp/mes/dv/domain/DvSubject.java b/klp-mes/src/main/java/com/klp/mes/dv/domain/DvSubject.java
index 648d2884..cab487bf 100644
--- a/klp-mes/src/main/java/com/klp/mes/dv/domain/DvSubject.java
+++ b/klp-mes/src/main/java/com/klp/mes/dv/domain/DvSubject.java
@@ -53,6 +53,16 @@ public class DvSubject extends BaseEntity
 
     /** 预留字段4 */
     private Long attr4;
+    /** 备注 */
+    private String remark;
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 
     public void setSubjectId(Long subjectId)
     {
diff --git a/klp-wms/src/main/java/com/klp/domain/WmsProduct.java b/klp-wms/src/main/java/com/klp/domain/WmsProduct.java
index 42c18263..b7d37af8 100644
--- a/klp-wms/src/main/java/com/klp/domain/WmsProduct.java
+++ b/klp-wms/src/main/java/com/klp/domain/WmsProduct.java
@@ -78,5 +78,9 @@ public class WmsProduct extends BaseEntity {
      */
     @TableLogic
     private Integer delFlag;
+    /**
+     * 备注
+     */
+    private String remark;
 
 }
diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsProductBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsProductBo.java
index 5f324fbf..242179c3 100644
--- a/klp-wms/src/main/java/com/klp/domain/bo/WmsProductBo.java
+++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsProductBo.java
@@ -94,6 +94,6 @@ public class WmsProductBo extends BaseEntity {
      * 是否启用（0=否，1=是）
      */
     private Integer isEnabled;
-
-
+    //备注
+    private String remark;
 }
diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsProductVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsProductVo.java
index 335dbb22..ae2c57a3 100644
--- a/klp-wms/src/main/java/com/klp/domain/vo/WmsProductVo.java
+++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsProductVo.java
@@ -101,6 +101,11 @@ public class WmsProductVo {
     @ExcelProperty(value = "是否启用", converter = ExcelDictConvert.class)
     @ExcelDictFormat(readConverterExp = "0==否，1=是")
     private Integer isEnabled;
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
 
 
 }
diff --git a/klp-wms/src/main/resources/mapper/klp/WmsProductMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsProductMapper.xml
index ad39c161..094720f9 100644
--- a/klp-wms/src/main/resources/mapper/klp/WmsProductMapper.xml
+++ b/klp-wms/src/main/resources/mapper/klp/WmsProductMapper.xml
@@ -23,6 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime" column="update_time"/>
         <result property="updateBy" column="update_by"/>
         <result property="unit" column="unit"/>
+        <result property="remark" column="remark"/>
     </resultMap>