【优化】免检物料和质量通知的是否启用字段名称改为enable

nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsExemptMaterialController.java

@@ -110,7 +110,7 @@ public class QmsExemptMaterialController extends BaseController {
      */
     @PostMapping("toggleEnable")
     public ApiResult<Void> toggleEnable(@RequestBody ToggleEnableQO request) {
-        exemptMaterialService.toggleEnable(request.getId(), request.getEnableStatus());
+        exemptMaterialService.toggleEnable(request.getId(), request.getEnable());
         return ApiResult.success();
     }
 

nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QualityNotificationControllerService.java

@@ -69,7 +69,7 @@ public class QualityNotificationControllerService {
                 .setTitle(request.getTitle())
                 .setTargetType(request.getTargetType())
                 .setContent(request.getContent())
-                .setState(1) // 默认启用
+                .setEnable(true) // 默认启用
                 .setCreateById(operatorId)
                 .setCreateBy(operator)
                 .setCreateTime(now)
@@ -165,7 +165,7 @@ public class QualityNotificationControllerService {
         vo.setTitle(entity.getTitle());
         vo.setTargetType(entity.getTargetType());
         vo.setContent(entity.getContent());
-        vo.setState(entity.getState());
+        vo.setEnable(entity.getEnable());
         vo.setCreateById(entity.getCreateById());
         vo.setCreateBy(entity.getCreateBy());
         vo.setCreateTime(entity.getCreateTime());
@@ -253,8 +253,8 @@ public class QualityNotificationControllerService {
             vo.setTargetTypeName(vo.getTargetType() == 1 ? "全部" : "手动选择");
         }
         // 启用状态名称
-        if (vo.getState() != null) {
+        if (vo.getEnable() != null) {
-            vo.setStateName(vo.getState() == 1 ? "启用" : "禁用");
+            vo.setEnableName(vo.getEnable() ? "启用" : "禁用");
         }
     }
 
@@ -272,7 +272,7 @@ public class QualityNotificationControllerService {
 
         qualityNotificationService.lambdaUpdate()
                 .eq(QmsQualityNotification::getId, id)
-                .set(QmsQualityNotification::getState, enable ? 1 : 2)
+                .set(QmsQualityNotification::getEnable, enable)
                 .set(QmsQualityNotification::getUpdateById, operatorId)
                 .set(QmsQualityNotification::getUpdateBy, operator)
                 .set(QmsQualityNotification::getUpdateTime, now)

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsExemptMaterialSearchQO.java

@@ -31,9 +31,9 @@ public class QmsExemptMaterialSearchQO extends PageQO {
     private Integer auditStatus;
 
     /**
-     * 启用状态；false 禁用；true 启用
+     * 启用状态：true=启用，false=禁用
      */
-    private Boolean enableStatus;
+    private Boolean enable;
 
     /**
      * 有效开始日期 - 起始

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsQualityNotificationSearchQO.java

@@ -21,7 +21,7 @@ public class QmsQualityNotificationSearchQO extends SearchBaseQO {
     private Long notificationTypeId;
 
     /**
-     * 启用状态：1=启用，2=禁用
+     * 启用状态：true=启用，false=禁用
      */
-    private Integer state;
+    private Boolean enable;
 }

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ToggleEnableQO.java

@@ -9,5 +9,5 @@ import lombok.Data;
 public class ToggleEnableQO {
 
     private Long id;
-    private Boolean enableStatus;
+    private Boolean enable;
 }

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsExemptMaterialVO.java

@@ -51,9 +51,9 @@ public class QmsExemptMaterialVO {
     private String rejectReason;
 
     /**
-     * 启用状态；false 禁用；true 启用
+     * 启用状态：true=启用，false=禁用
      */
-    private Boolean enableStatus;
+    private Boolean enable;
 
     /**
      * 免检模式；0 永久；1 周期

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsQualityNotificationVO.java

@@ -44,14 +44,14 @@ public class QmsQualityNotificationVO {
     private String content;
 
     /**
-     * 启用状态：1=启用，2=禁用
+     * 启用状态：true=启用，false=禁用
      */
-    private Integer state;
+    private Boolean enable;
 
     /**
      * 启用状态名称
      */
-    private String stateName;
+    private String enableName;
 
     /**
      * 创建人ID

nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsExemptMaterial.java

@@ -44,9 +44,9 @@ public class QmsExemptMaterial implements Serializable {
     private Integer auditStatus;
 
     /**
-     * 启用状态；false 禁用；true 启用
+     * 启用状态：true=启用，false=禁用
      */
-    private Boolean enableStatus;
+    private Boolean enable;
 
     /**
      * 免检模式；0 永久；1 周期

nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsQualityNotification.java

@@ -47,9 +47,9 @@ public class QmsQualityNotification implements Serializable {
     private String content;
 
     /**
-     * 启用状态：1=启用，2=禁用
+     * 启用状态：true=启用，false=禁用
      */
-    private Integer state;
+    private Boolean enable;
 
     /**
      * 创建人ID

nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsExemptMaterialService.java

@@ -38,7 +38,7 @@ public interface IQmsExemptMaterialService extends IService<QmsExemptMaterial> {
     /**
      * 启用/禁用切换
      */
-    void toggleEnable(Long id, Boolean enableStatus);
+    void toggleEnable(Long id, Boolean enable);
 
     /**
      * 审核免检物料

nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsExemptMaterialServiceImpl.java

@@ -85,7 +85,7 @@ public class QmsExemptMaterialServiceImpl extends ServiceImpl<QmsExemptMaterialM
                 entity.setSupplierId(supplierId);
                 entity.setMaterialNo(materialNo);
                 entity.setAuditStatus(0);
-                entity.setEnableStatus(true);
+                entity.setEnable(true);
                 entity.setCreateBy(userId);
                 entity.setCreateByName(userName);
                 entity.setCreateTime(now);
@@ -123,12 +123,12 @@ public class QmsExemptMaterialServiceImpl extends ServiceImpl<QmsExemptMaterialM
     }
 
     @Override
-    public void toggleEnable(Long id, Boolean enableStatus) {
+    public void toggleEnable(Long id, Boolean enable) {
         QmsExemptMaterial entity = this.getById(id);
         if (entity == null) {
             throw new NflgException(STATE.BusinessError, "记录不存在");
         }
-        entity.setEnableStatus(enableStatus);
+        entity.setEnable(enable);
         entity.setUpdateBy(UserUtil.getUserId());
         entity.setUpdateByName(UserUtil.getUserName());
         entity.setUpdateTime(LocalDateTime.now());

nflg-wms-repository/src/main/resources/mapper/QmsExemptMaterialMapper.xml

@@ -12,7 +12,7 @@
             em.material_no,
             qm.material_desc,
             em.audit_status,
-            em.enable_status,
+            em.enable,
             em.exempt_mode,
             em.valid_start_date,
             em.valid_end_date,
@@ -45,8 +45,8 @@
             <if test="request.auditStatus != null">
                 AND em.audit_status = #{request.auditStatus}
             </if>
-            <if test="request.enableStatus != null">
+            <if test="request.enable != null">
-                AND em.enable_status = #{request.enableStatus}
+                AND em.enable = #{request.enable}
             </if>
             <if test="request.validStartDateBegin != null">
                 AND em.valid_start_date &gt;= #{request.validStartDateBegin}
@@ -80,7 +80,7 @@
             em.material_no,
             qm.material_desc,
             em.audit_status,
-            em.enable_status,
+            em.enable,
             em.exempt_mode,
             em.valid_start_date,
             em.valid_end_date,
@@ -112,7 +112,7 @@
             em.material_no,
             qm.material_desc,
             em.audit_status,
-            em.enable_status,
+            em.enable,
             em.exempt_mode,
             em.valid_start_date,
             em.valid_end_date,

nflg-wms-repository/src/main/resources/mapper/QmsQualityNotificationMapper.xml

@@ -9,7 +9,7 @@
                q.title,
                q.target_type,
                q.content,
-               q.state,
+               q.enable,
                q.create_by_id,
                q.create_by,
                q.create_time,
@@ -25,8 +25,8 @@
             <if test="request.notificationTypeId != null">
                 AND q.notification_type_id = #{request.notificationTypeId}
             </if>
-            <if test="request.state != null">
+            <if test="request.enable != null">
-                AND q.state = #{request.state}
+                AND q.enable = #{request.enable}
             </if>
             <if test="request.startDate != null">
                 AND q.create_time &gt;= #{request.startDate}