From 89613641a381091d478fbb99a81628853b822d6f Mon Sep 17 00:00:00 2001 From: yinq Date: Fri, 28 Mar 2025 17:11:51 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E9=80=BB=E8=BE=91=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/dromara/dms/domain/BaseAlarmLevel.java | 6 +++++- .../java/org/dromara/dms/domain/BaseAlarmRule.java | 6 ++++++ .../java/org/dromara/dms/domain/BaseAlarmType.java | 7 ++++++- .../org/dromara/mes/domain/BaseClassTeamInfo.java | 6 ++++++ .../org/dromara/mes/domain/BaseDeviceCategory.java | 6 ++++++ .../java/org/dromara/mes/domain/BaseDeviceType.java | 5 +++++ .../org/dromara/mes/domain/BaseEqualMaterialInfo.java | 11 +++++++---- .../org/dromara/mes/domain/BaseMaterialCategory.java | 6 +++++- .../java/org/dromara/mes/domain/BaseMaterialInfo.java | 11 +++++++---- .../java/org/dromara/mes/domain/BaseMaterialType.java | 6 ++++++ .../dromara/mes/domain/BaseMeasurementUnitInfo.java | 6 +++++- .../java/org/dromara/mes/domain/BaseShiftInfo.java | 5 +++++ .../java/org/dromara/mes/domain/BaseStructureBom.java | 6 +++++- .../java/org/dromara/mes/domain/BaseSupplierInfo.java | 6 +++++- .../java/org/dromara/mes/domain/BaseToolingInfo.java | 7 ++++++- .../org/dromara/mes/domain/ProdBaseEpiRoller.java | 6 ++++++ .../org/dromara/mes/domain/ProdBaseFactoryInfo.java | 6 +++++- .../org/dromara/mes/domain/ProdBaseMachineInfo.java | 6 ++++++ .../org/dromara/mes/domain/ProdBaseMouldInfo.java | 6 ++++++ .../org/dromara/mes/domain/ProdBaseMouthPlate.java | 6 ++++++ .../org/dromara/mes/domain/ProdBaseProcessInfo.java | 6 ++++++ .../org/dromara/mes/domain/ProdBaseProdLineInfo.java | 6 ++++++ .../java/org/dromara/mes/domain/ProdBaseRoute.java | 6 +++++- .../org/dromara/mes/domain/ProdBaseStationInfo.java | 6 ++++++ .../org/dromara/mes/domain/ProdBaseWorkshopInfo.java | 6 ++++++ .../java/org/dromara/mes/domain/ProdMaterialBom.java | 6 +++++- .../dromara/mes/domain/ProdMaterialBomVersion.java | 6 ++++++ .../org/dromara/mes/domain/ProdMouldChangePlan.java | 6 +++++- .../dromara/mes/domain/ProdSamplePrescription.java | 6 ++++++ .../java/org/dromara/mes/domain/ProdShiftChange.java | 11 +++++++---- .../org/dromara/mes/domain/ProdTechnologyInfo.java | 6 ++++++ .../dromara/mes/domain/ProdTechnologyStepInfo.java | 6 +++++- .../java/org/dromara/system/domain/SysMasterData.java | 6 ++++++ .../dromara/system/domain/SysMasterDataDetail.java | 6 +++++- 34 files changed, 194 insertions(+), 25 deletions(-) diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/BaseAlarmLevel.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/BaseAlarmLevel.java index e86c484..e042037 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/BaseAlarmLevel.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/BaseAlarmLevel.java @@ -53,5 +53,9 @@ public class BaseAlarmLevel extends TenantEntity { */ private String remark; - + /** + * 删除标志（0代表存在 2代表删除） + */ + @TableLogic + private String delFlag; } diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/BaseAlarmRule.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/BaseAlarmRule.java index bd735a0..d24c18d 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/BaseAlarmRule.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/BaseAlarmRule.java @@ -112,6 +112,12 @@ public class BaseAlarmRule extends TenantEntity { */ private String remark; + /** + * 删除标志（0代表存在 2代表删除） + */ + @TableLogic + private String delFlag; + /** * 报警级别名称 */ diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/BaseAlarmType.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/BaseAlarmType.java index af4d97f..7087857 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/BaseAlarmType.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/BaseAlarmType.java @@ -50,7 +50,6 @@ public class BaseAlarmType extends TenantEntity { /** * 状态（1、正常，9、删除） */ - @TableLogic(value="1", delval="9") private String typeStatus; /** @@ -58,6 +57,12 @@ public class BaseAlarmType extends TenantEntity { */ private String remark; + /** + * 删除标志（0代表存在 2代表删除） + */ + @TableLogic + private String delFlag; + /** * 设备大类名称 */ diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseClassTeamInfo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseClassTeamInfo.java index f6f17cf..37a1d61 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseClassTeamInfo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseClassTeamInfo.java @@ -68,6 +68,12 @@ public class BaseClassTeamInfo extends TenantEntity { */ private String activeFlag; + /** + * 删除标志（0代表存在 2代表删除） + */ + @TableLogic + private String delFlag; + /** * BaseShiftInfo的班次名称 */ diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseDeviceCategory.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseDeviceCategory.java index 4a761a2..734fbfd 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseDeviceCategory.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseDeviceCategory.java @@ -47,5 +47,11 @@ public class BaseDeviceCategory extends TenantEntity { */ private String remark; + /** + * 删除标志（0代表存在 2代表删除） + */ + @TableLogic + private String delFlag; + } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseDeviceType.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseDeviceType.java index 1b0ae8a..65aad9b 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseDeviceType.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseDeviceType.java @@ -68,5 +68,10 @@ public class BaseDeviceType extends TenantEntity { @TableField(exist = false) private String deviceCategoryName;//join映射字段 + /** + * 删除标志（0代表存在 2代表删除） + */ + @TableLogic + private String delFlag; } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseEqualMaterialInfo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseEqualMaterialInfo.java index 965f5a0..86c54dc 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseEqualMaterialInfo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseEqualMaterialInfo.java @@ -1,9 +1,6 @@ package org.dromara.mes.domain; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; import org.dromara.common.tenant.core.TenantEntity; @@ -60,6 +57,12 @@ public class BaseEqualMaterialInfo extends TenantEntity { */ private String materialBomVersion; + /** + * 删除标志（0代表存在 2代表删除） + */ + @TableLogic + private String delFlag; + /** * 物料名称 */ diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseMaterialCategory.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseMaterialCategory.java index 5aadc03..0e3431e 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseMaterialCategory.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseMaterialCategory.java @@ -47,5 +47,9 @@ public class BaseMaterialCategory extends TenantEntity { */ private String remark; - + /** + * 删除标志（0代表存在 2代表删除） + */ + @TableLogic + private String delFlag; } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseMaterialInfo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseMaterialInfo.java index 9da1de0..07f6578 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseMaterialInfo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseMaterialInfo.java @@ -1,9 +1,6 @@ package org.dromara.mes.domain; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; import org.dromara.common.tenant.core.TenantEntity; @@ -267,6 +264,12 @@ public class BaseMaterialInfo extends TenantEntity { */ private String remark; + /** + * 删除标志（0代表存在 2代表删除） + */ + @TableLogic + private String delFlag; + /** * 所属工厂名称 diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseMaterialType.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseMaterialType.java index 27acd10..bc6e4f7 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseMaterialType.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseMaterialType.java @@ -73,6 +73,12 @@ public class BaseMaterialType extends TenantEntity { */ private String remark; + /** + * 删除标志（0代表存在 2代表删除） + */ + @TableLogic + private String delFlag; + /** * 工序名称 diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseMeasurementUnitInfo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseMeasurementUnitInfo.java index 4505e4d..db4c56d 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseMeasurementUnitInfo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseMeasurementUnitInfo.java @@ -67,5 +67,9 @@ public class BaseMeasurementUnitInfo extends BaseEntity { */ private String activeFlag; - + /** + * 删除标志（0代表存在 2代表删除） + */ + @TableLogic + private String delFlag; } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseShiftInfo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseShiftInfo.java index 42f5841..2cdb4ef 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseShiftInfo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseShiftInfo.java @@ -67,4 +67,9 @@ public class BaseShiftInfo extends TenantEntity { */ private String activeFlag; + /** + * 删除标志（0代表存在 2代表删除） + */ + @TableLogic + private String delFlag; } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseStructureBom.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseStructureBom.java index 932b51c..1df5900 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseStructureBom.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseStructureBom.java @@ -82,5 +82,9 @@ public class BaseStructureBom extends TenantEntity { */ private String remark; - + /** + * 删除标志（0代表存在 2代表删除） + */ + @TableLogic + private String delFlag; } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseSupplierInfo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseSupplierInfo.java index 3d98124..b925a3f 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseSupplierInfo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseSupplierInfo.java @@ -64,5 +64,9 @@ public class BaseSupplierInfo extends TenantEntity { */ private String remark; - + /** + * 删除标志（0代表存在 2代表删除） + */ + @TableLogic + private String delFlag; } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseToolingInfo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseToolingInfo.java index b55811d..57da41c 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseToolingInfo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseToolingInfo.java @@ -2,6 +2,7 @@ package org.dromara.mes.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; @@ -80,5 +81,9 @@ public class BaseToolingInfo extends TenantEntity { */ private String activeFlag; - + /** + * 删除标志（0代表存在 2代表删除） + */ + @TableLogic + private String delFlag; } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseEpiRoller.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseEpiRoller.java index 02f44f6..d5d863d 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseEpiRoller.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseEpiRoller.java @@ -52,6 +52,12 @@ public class ProdBaseEpiRoller extends TenantEntity { */ private String remark; + /** + * 删除标志（0代表存在 2代表删除） + */ + @TableLogic + private String delFlag; + /** * 机台名称 */ diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseFactoryInfo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseFactoryInfo.java index b8b83c3..11dec6e 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseFactoryInfo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseFactoryInfo.java @@ -57,5 +57,9 @@ public class ProdBaseFactoryInfo extends TenantEntity { */ private String remark; - + /** + * 删除标志（0代表存在 2代表删除） + */ + @TableLogic + private String delFlag; } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseMachineInfo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseMachineInfo.java index da74ae2..f991310 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseMachineInfo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseMachineInfo.java @@ -122,6 +122,12 @@ public class ProdBaseMachineInfo extends TenantEntity { */ private Long requestInterval; + /** + * 删除标志（0代表存在 2代表删除） + */ + @TableLogic + private String delFlag; + /** * 车间名称 */ diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseMouldInfo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseMouldInfo.java index 4a9cf06..31e9ef4 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseMouldInfo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseMouldInfo.java @@ -47,6 +47,12 @@ public class ProdBaseMouldInfo extends TenantEntity { */ private String remark; + /** + * 删除标志（0代表存在 2代表删除） + */ + @TableLogic + private String delFlag; + /** * 机台名称 */ diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseMouthPlate.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseMouthPlate.java index cc81512..adee193 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseMouthPlate.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseMouthPlate.java @@ -62,6 +62,12 @@ public class ProdBaseMouthPlate extends TenantEntity { */ private String remark; + /** + * 删除标志（0代表存在 2代表删除） + */ + @TableLogic + private String delFlag; + /** * 机台名称 */ diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseProcessInfo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseProcessInfo.java index 9b9c10c..ee3cd5d 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseProcessInfo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseProcessInfo.java @@ -63,6 +63,12 @@ public class ProdBaseProcessInfo extends TenantEntity { */ private String remark; + /** + * 删除标志（0代表存在 2代表删除） + */ + @TableLogic + private String delFlag; + /** * 工序关联产线信息 */ diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseProdLineInfo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseProdLineInfo.java index 7f02b10..5ab7e09 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseProdLineInfo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseProdLineInfo.java @@ -57,6 +57,12 @@ public class ProdBaseProdLineInfo extends TenantEntity { */ private String remark; + /** + * 删除标志（0代表存在 2代表删除） + */ + @TableLogic + private String delFlag; + @TableField(exist = false) private String workshopName;//字段映射 diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseRoute.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseRoute.java index fc6b03f..1027c2c 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseRoute.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseRoute.java @@ -48,7 +48,11 @@ public class ProdBaseRoute extends TenantEntity { */ private String remark; - + /** + * 删除标志（0代表存在 2代表删除） + */ + @TableLogic + private String delFlag; @TableField(exist = false) List prodBaseRouteProcess;//映射字段 diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseStationInfo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseStationInfo.java index 5d2aba6..0f5233e 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseStationInfo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseStationInfo.java @@ -77,6 +77,12 @@ public class ProdBaseStationInfo extends TenantEntity { */ private Long machineId; + /** + * 删除标志（0代表存在 2代表删除） + */ + @TableLogic + private String delFlag; + @TableField(exist = false) private String processName;//字段映射 diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseWorkshopInfo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseWorkshopInfo.java index 2465417..b8ed4a9 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseWorkshopInfo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseWorkshopInfo.java @@ -52,6 +52,12 @@ public class ProdBaseWorkshopInfo extends TenantEntity { */ private String remark; + /** + * 删除标志（0代表存在 2代表删除） + */ + @TableLogic + private String delFlag; + @TableField(exist = false) private String factoryName;//字段映射 diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdMaterialBom.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdMaterialBom.java index 01d0634..9882abf 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdMaterialBom.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdMaterialBom.java @@ -129,5 +129,9 @@ public class ProdMaterialBom extends TenantEntity { */ private String remark; - + /** + * 删除标志（0代表存在 2代表删除） + */ + @TableLogic + private String delFlag; } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdMaterialBomVersion.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdMaterialBomVersion.java index fa12632..e221638 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdMaterialBomVersion.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdMaterialBomVersion.java @@ -40,4 +40,10 @@ public class ProdMaterialBomVersion extends TenantEntity { * bom版本说明 */ private String bomVersionDesc; + + /** + * 删除标志（0代表存在 2代表删除） + */ + @TableLogic + private String delFlag; } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdMouldChangePlan.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdMouldChangePlan.java index 0d4dd48..0242a1a 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdMouldChangePlan.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdMouldChangePlan.java @@ -74,5 +74,9 @@ public class ProdMouldChangePlan extends TenantEntity { */ private String remark; - + /** + * 删除标志（0代表存在 2代表删除） + */ + @TableLogic + private String delFlag; } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdSamplePrescription.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdSamplePrescription.java index af7a876..5a1011d 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdSamplePrescription.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdSamplePrescription.java @@ -72,6 +72,12 @@ public class ProdSamplePrescription extends TenantEntity { */ private String remark; + /** + * 删除标志（0代表存在 2代表删除） + */ + @TableLogic + private String delFlag; + /** * 工序名称 */ diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdShiftChange.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdShiftChange.java index 40a965f..2de48d0 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdShiftChange.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdShiftChange.java @@ -1,9 +1,6 @@ package org.dromara.mes.domain; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; import org.dromara.common.tenant.core.TenantEntity; @@ -66,6 +63,12 @@ public class ProdShiftChange extends TenantEntity { */ private String remark; + /** + * 删除标志（0代表存在 2代表删除） + */ + @TableLogic + private String delFlag; + /** 班组名称 */ @TableField(exist = false) private String teamName;//JOIN连表查询 diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdTechnologyInfo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdTechnologyInfo.java index 7f05d3d..74072da 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdTechnologyInfo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdTechnologyInfo.java @@ -67,6 +67,12 @@ public class ProdTechnologyInfo extends TenantEntity { */ private String remark; + /** + * 删除标志（0代表存在 2代表删除） + */ + @TableLogic + private String delFlag; + @TableField(exist = false) private String processName; diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdTechnologyStepInfo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdTechnologyStepInfo.java index 7dc5903..5bda190 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdTechnologyStepInfo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdTechnologyStepInfo.java @@ -67,5 +67,9 @@ public class ProdTechnologyStepInfo extends TenantEntity { */ private String remark; - + /** + * 删除标志（0代表存在 2代表删除） + */ + @TableLogic + private String delFlag; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysMasterData.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysMasterData.java index c03a44c..d8d1431 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysMasterData.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysMasterData.java @@ -128,4 +128,10 @@ public class SysMasterData extends TenantEntity { */ @TableField("remark") private String remark; + + /** + * 删除标志（0代表存在 2代表删除） + */ + @TableLogic + private String delFlag; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysMasterDataDetail.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysMasterDataDetail.java index 2a64173..ebb5b4a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysMasterDataDetail.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysMasterDataDetail.java @@ -105,6 +105,10 @@ public class SysMasterDataDetail extends BaseEntity { @TableField("active_flag") private String activeFlag; - + /** + * 删除标志（0代表存在 2代表删除） + */ + @TableLogic + private String delFlag; }