fix:预警配置功能调整，新增安全上下限，已读未读等功能

nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/ForewarningTask.java

@@ -73,41 +73,40 @@ public class ForewarningTask {
     /**
      * 预警数据生成
      * <p>
-     * 1、删除st_ivt_overdueforewarning、st_ivt_safetyforewarning表中的全部数据
+     * 1、查询st_ivt_forewarningconfig，获取正在启用的、未删除的配置
-     * 2、查询st_ivt_forewarningconfig，获取正在启用的、未删除的配置
+     * 2、通过st_ivt_forewarningconfig表的id字段，匹配上st_ivt_forewarningmaterial表的config_id字段，获取对应的物料。赋值给
-     * 3、通过st_ivt_forewarningconfig表的id字段，匹配上st_ivt_forewarningmaterial表的config_id字段，获取对应的物料。赋值给
      * StIvtForewarningconfigDto的tableData
-     * 4、循环，判断每条数据下的对应物料的安全库存数量、入库时间（以组盘时间为准）
+     * 3、循环，判断每条数据下的对应物料的安全库存数量、入库时间（以组盘时间为准）
      * 其中库存表：md_pb_groupplate，实体类：GroupPlate，组盘时间create_time，物料编码id material_id
-     * 5、 分别生成st_ivt_safetyforewarning(安全库存数量超期) 和 st_ivt_overdueforewarning（安全库存天数超期） ，插入到对应数据库中
+     * 4、 分别生成st_ivt_safetyforewarning(安全库存数量超期) 和 st_ivt_overdueforewarning（超期天数超期） ，插入到对应数据库中
      */
     private void runTask() {
         // 1. 删除st_ivt_overdueforewarning、st_ivt_safetyforewarning表中的全部数据
-        stIvtOverdueforewarningService.deleteAllNoParam();
+      //  stIvtOverdueforewarningService.deleteAllNoParam();
-        stIvtSafetyforewarningService.deleteAllNoParam();
+      //  stIvtSafetyforewarningService.deleteAllNoParam();
 
         // 2. 查询st_ivt_forewarningconfig，获取正在启用的、未删除的配置
         List<StIvtForewarningconfig> configList = forewarningconfigService.list(new LambdaQueryWrapper<StIvtForewarningconfig>()
-                .eq(StIvtForewarningconfig::getIs_active,true)
+                .eq(StIvtForewarningconfig::getIs_active, true)
-                .eq(StIvtForewarningconfig::getIs_delete,false));
+                .eq(StIvtForewarningconfig::getIs_delete, false));
         if (CollectionUtil.isEmpty(configList)) {
             return;
         }
 
-        List<String> configStringList =configList.stream().map(StIvtForewarningconfig::getId).collect(Collectors.toList());
+        List<String> configStringList = configList.stream().map(StIvtForewarningconfig::getId).collect(Collectors.toList());
 
         // 获取配置文件下的所有物料
         List<StIvtForewarningmaterial> materialList = stIvtForewarningmaterialService.list(new LambdaQueryWrapper<StIvtForewarningmaterial>()
-                .eq(StIvtForewarningmaterial::getIs_active,true)
+                .eq(StIvtForewarningmaterial::getIs_active, true)
-                .eq(StIvtForewarningmaterial::getIs_delete,false)
+                .eq(StIvtForewarningmaterial::getIs_delete, false)
-                .in(StIvtForewarningmaterial::getConfig_id,configStringList));
+                .in(StIvtForewarningmaterial::getConfig_id, configStringList));
 
-        List<String> materialIdList =  materialList.stream().map(StIvtForewarningmaterial::getMaterial_id).collect(Collectors.toList());
+        Set<String> materialIdList = materialList.stream().map(StIvtForewarningmaterial::getMaterial_id).collect(Collectors.toSet());
-        List<String> storCodeList =  configList.stream().map(StIvtForewarningconfig::getStor_code).collect(Collectors.toList());
+        Set<String> storCodeList = configList.stream().map(StIvtForewarningconfig::getStor_code).collect(Collectors.toSet());
         // 查询库存信息
-        Map<String,Object> queryMap = new HashMap();
+        Map<String, Object> queryMap = new HashMap();
-        queryMap.put("stor_code_list",storCodeList);
+        queryMap.put("stor_code_list", storCodeList);
-        queryMap.put("material_id_list",materialIdList);
+        queryMap.put("material_id_list", materialIdList);
         List<MdPbStoragevehicleextDto> mdPbStoragevehicleextDtos = mdPbStoragevehicleextMapper.queryAll(queryMap);
         if (CollectionUtil.isEmpty(mdPbStoragevehicleextDtos)) {
             return;
@@ -116,22 +115,32 @@ public class ForewarningTask {
         for (StIvtForewarningconfig config : configList) {
             //3. 通过st_ivt_forewarningconfig表的id字段，匹配上st_ivt_forewarningmaterial表的config_id字段，获取对应的物料
             List<StIvtForewarningmaterial> configMaterialList = materialList.stream().
-                    filter(a->config.getId().equals(a.getConfig_id())).collect(Collectors.toList());
+                    filter(a -> config.getId().equals(a.getConfig_id())).collect(Collectors.toList());
+
+            // 按照struct_code对mdPbStoragevehicleextDtos进行分组
+            Map<String, List<MdPbStoragevehicleextDto>> structCodeGroupMap = mdPbStoragevehicleextDtos.stream()
+                    .filter(a->config.getStor_code().equals(a.getStor_code()))
+                    .collect(Collectors.groupingBy(MdPbStoragevehicleextDto::getStruct_code));
+
             // 4. 循环，判断每条数据下的对应物料的安全库存数量、入库时间（以组盘时间为准）
             for (StIvtForewarningmaterial material : configMaterialList) {
 
+                // 遍历structCodeGroupMap，获取每个struct_code下的mdPbStoragevehicleextDtos
+                for (Map.Entry<String, List<MdPbStoragevehicleextDto>> entry : structCodeGroupMap.entrySet()) {
+                    List<MdPbStoragevehicleextDto> mdPbStoragevehicleextDtoStructs = entry.getValue();
+
+
                     // 计算安全库存数量
-                BigDecimal totalQty = mdPbStoragevehicleextDtos.stream()
+                    BigDecimal totalQty = mdPbStoragevehicleextDtoStructs.stream()
                             .filter(a -> config.getStor_code().equals(a.getStor_code())
                                     && material.getMaterial_id().equals(a.getMaterial_id()))
                             .map(MdPbStoragevehicleextDto::getQty)
                             .reduce(BigDecimal.ZERO, BigDecimal::add);
 
-
                     // 计算最早的组盘时间
                     LocalDateTime earliestPlate = null;
                     try {
-                    earliestPlate = mdPbStoragevehicleextDtos.stream()
+                        earliestPlate = mdPbStoragevehicleextDtoStructs.stream()
                                 .filter(a -> config.getStor_code().equals(a.getStor_code())
                                         && material.getMaterial_id().equals(a.getMaterial_id()))
                                 .map(a -> {
@@ -160,16 +169,21 @@ public class ForewarningTask {
                     }
 
 
-
+                    // 5. 分别生成st_ivt_safetyforewarning(安全库存数量超期) 和 st_ivt_overdueforewarning（超期天数超期）
-                // 5. 分别生成st_ivt_safetyforewarning(安全库存数量超期) 和 st_ivt_overdueforewarning（安全库存天数超期）
+                    // 安全库存数量超限
-                // 安全库存数量超期
+                    if ((config.getSafe_qty_lower_limit() != null && totalQty.compareTo(config.getSafe_qty_lower_limit()) < 0)
-                if (config.getSafe_qty() != null && totalQty.compareTo(config.getSafe_qty()) > 0) {
+                            || (config.getSafe_qty_upper_limit() != null && totalQty.compareTo(config.getSafe_qty_upper_limit()) > 0)) {
                         StIvtSafetyforewarning safety = new StIvtSafetyforewarning();
                         safety.setId(IdUtil.getSnowflake(1, 1).nextIdStr());
                         safety.setConfig_id(config.getId());
                         safety.setMaterial_code(material.getMaterial_code());
                         safety.setMaterial_name(material.getMaterial_name());
-                    safety.setSafe_qty(config.getSafe_qty());
+                        safety.setSect_code(mdPbStoragevehicleextDtoStructs.get(0).getSect_code());
+                        safety.setSect_name(mdPbStoragevehicleextDtoStructs.get(0).getSect_name());
+                        safety.setStruct_code(mdPbStoragevehicleextDtoStructs.get(0).getStruct_code());
+                        safety.setStruct_name(mdPbStoragevehicleextDtoStructs.get(0).getStruct_name());
+                        safety.setSafe_qty_lower_limit(config.getSafe_qty_lower_limit());
+                        safety.setSafe_qty_upper_limit(config.getSafe_qty_upper_limit());
                         safety.setStor_code(config.getStor_code());
                         safety.setCurrent_qty(totalQty);
                         safety.setCreate_name("JOB");
@@ -177,9 +191,9 @@ public class ForewarningTask {
                         stIvtSafetyforewarningService.save(safety);
                     }
 
-                // 安全库存天数超期
+                    // 超期天数超期
 
-                if (config.getSafe_days() != null && daysDiff.compareTo(config.getSafe_days())>0) {
+                    if (config.getSafe_days() != null && daysDiff.compareTo(config.getSafe_days()) > 0) {
                         // 将 earliestPlate 转化成 yyyy-MM-dd HH:mm:ss 的String 类型
                         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
                         String earliestPlateStr = earliestPlate.format(formatter);
@@ -191,13 +205,17 @@ public class ForewarningTask {
                         overdue.setMaterial_name(material.getMaterial_name());
                         overdue.setOverdue_days(daysDiff);
                         overdue.setStor_code(config.getStor_code());
+                        overdue.setSect_code(mdPbStoragevehicleextDtoStructs.get(0).getSect_code());
+                        overdue.setSect_name(mdPbStoragevehicleextDtoStructs.get(0).getSect_name());
+                        overdue.setStruct_code(mdPbStoragevehicleextDtoStructs.get(0).getStruct_code());
+                        overdue.setStruct_name(mdPbStoragevehicleextDtoStructs.get(0).getStruct_name());
                         overdue.setSafe_days(config.getSafe_days());
                         overdue.setInsert_time(earliestPlateStr);
                         overdue.setCreate_name("JOB");
                         overdue.setCreate_time(DateUtil.now());
                         stIvtOverdueforewarningService.save(overdue);
                     }
-
+                }
             }
         }
     }

nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/controller/StIvtOverdueforewarningController.java

@@ -56,4 +56,12 @@ public class StIvtOverdueforewarningController {
         stIvtOverdueforewarningService.deleteAll(ids);
         return new ResponseEntity<>(HttpStatus.OK);
     }
+
+    @Log("将预警信息设置为已读")
+    //@SaCheckPermission("stIvtOverdueforewarning:del")
+    @PostMapping("/read")
+    public ResponseEntity<Object> read(@RequestBody Set<String> ids) {
+        stIvtOverdueforewarningService.read(ids);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
 }

nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/controller/StIvtSafetyforewarningController.java

@@ -56,4 +56,12 @@ public class StIvtSafetyforewarningController {
         stIvtSafetyforewarningService.deleteAll(ids);
         return new ResponseEntity<>(HttpStatus.OK);
     }
+
+    @Log("将预警信息设置为已读")
+    //@SaCheckPermission("stIvtOverdueforewarning:del")
+    @PostMapping("/read")
+    public ResponseEntity<Object> read(@RequestBody Set<String> ids) {
+        stIvtSafetyforewarningService.read(ids);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
 }

nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/IStIvtOverdueforewarningService.java

@@ -47,4 +47,10 @@ public interface IStIvtOverdueforewarningService extends IService<StIvtOverduefo
      * 删除全部
      */
     void deleteAllNoParam();
+
+    /**
+     * 已读全部
+     * @param ids /
+     */
+    void read(Set<String> ids);
 }

nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/IStIvtSafetyforewarningService.java

@@ -43,4 +43,10 @@ public interface IStIvtSafetyforewarningService extends IService<StIvtSafetyfore
     void deleteAll(Set<String> ids);
 
     void deleteAllNoParam();
+
+    /**
+     * 已读全部
+     * @param ids /
+     */
+    void read(Set<String> ids);
 }

nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/StIvtForewarningconfig.java

@@ -32,10 +32,13 @@ private static final long serialVersionUID = 1L;
     /** 仓库编码 */
     private String stor_code;
 
-    /** 安全库存数量 */
+    /** 安全数量下限 */
-    private BigDecimal safe_qty;
+    private BigDecimal safe_qty_lower_limit;
 
-    /** 安全库存天数 */
+    /** 安全数量上限 */
+    private BigDecimal safe_qty_upper_limit;
+
+    /** 超期天数 */
     private BigDecimal safe_days;
 
     /** 备注 */

nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/StIvtOverdueforewarning.java

@@ -35,9 +35,21 @@ private static final long serialVersionUID = 1L;
     /** 物料名称 */
     private String material_name;
 
-    /** 仓位编码 */
+    /** 仓库编码 */
     private String stor_code;
 
+    /** 库区编码 */
+    private String sect_code;
+
+    /** 库区名称 */
+    private String sect_name;
+
+    /** 仓位编码 */
+    private String struct_code;
+
+    /** 仓位名称 */
+    private String struct_name;
+
     /** 入库时间 */
     private String insert_time;
 
@@ -53,6 +65,9 @@ private static final long serialVersionUID = 1L;
     /** 是否删除 */
     private String is_delete;
 
+    /** 是否已读 */
+    private Boolean is_read;
+
     /** 创建id */
     private String create_id;
 

nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/StIvtSafetyforewarning.java

@@ -35,14 +35,29 @@ private static final long serialVersionUID = 1L;
     /** 物料名称 */
     private String material_name;
 
-    /** 仓位编码 */
+    /** 仓库编码 */
     private String stor_code;
 
+    /** 库区编码 */
+    private String sect_code;
+
+    /** 库区名称 */
+    private String sect_name;
+
+    /** 仓位编码 */
+    private String struct_code;
+
+    /** 仓位名称 */
+    private String struct_name;
+
     /** 当前数量 */
     private BigDecimal current_qty;
 
-    /** 安全数量 */
+    /** 安全数量下限 */
-    private BigDecimal safe_qty;
+    private BigDecimal safe_qty_lower_limit;
+
+    /** 安全数量上限 */
+    private BigDecimal safe_qty_upper_limit;
 
     /** 备注 */
     private String remark;
@@ -50,6 +65,9 @@ private static final long serialVersionUID = 1L;
     /** 是否删除 */
     private String is_delete;
 
+    /** 是否已读 */
+    private Boolean is_read;
+
     /** 创建id */
     private String create_id;
 

nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtForewarningconfigMapper.xml

@@ -15,9 +15,13 @@
                 AND
                 config.stor_code  = #{params.stor_code}
             </if>
-            <if test="params.safe_qty != null">
+            <if test="params.safe_qty_lower_limit != null">
                 AND
-                config.safe_qty  = #{params.safe_qty}
+                config.safe_qty_lower_limit  = #{params.safe_qty_lower_limit}
+            </if>
+            <if test="params.safe_qty_upper_limit != null">
+                AND
+                config.safe_qty_upper_limit  = #{params.safe_qty_upper_limit}
             </if>
             <if test="params.safe_days != null">
                 AND

nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtOverdueforewarningMapper.xml

@@ -20,7 +20,11 @@
                 AND
                 forewarning.stor_code = #{params.stor_code}
             </if>
+            <if test="params.is_read != null">
+                AND
+                forewarning.is_read = #{params.is_read}
+            </if>
         </where>
-        ORDER BY forewarning.update_time Desc
+        ORDER BY is_read asc,forewarning.create_time Desc
     </select>
 </mapper>

nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtSafetyforewarningMapper.xml

@@ -20,7 +20,11 @@
                 AND
                 forewarning.stor_code = #{params.stor_code}
             </if>
+            <if test="params.is_read != null">
+                AND
+                forewarning.is_read = #{params.is_read}
+            </if>
         </where>
-        ORDER BY forewarning.update_time Desc
+        ORDER BY is_read asc,forewarning.create_time Desc
     </select>
 </mapper>

nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dto/StIvtForewarningconfigDto.java

@@ -29,10 +29,13 @@ public class StIvtForewarningconfigDto implements Serializable {
     /** 仓库名称 */
     private String stor_name;
 
-    /** 安全库存数量 */
+    /** 安全数量下限 */
-    private BigDecimal safe_qty;
+    private BigDecimal safe_qty_lower_limit;
 
-    /** 安全库存天数 */
+    /** 安全数量上限 */
+    private BigDecimal safe_qty_upper_limit;
+
+    /** 超期天数 */
     private BigDecimal safe_days;
 
     /** 备注 */

nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dto/StIvtOverdueforewarningDto.java

@@ -28,11 +28,23 @@ public class StIvtOverdueforewarningDto implements Serializable {
     /** 物料名称 */
     private String material_name;
 
-    /** 仓位编码 */
+    /** 仓库编码 */
     private String stor_code;
 
     private String stor_name;
 
+    /** 库区编码 */
+    private String sect_code;
+
+    /** 库区名称 */
+    private String sect_name;
+
+    /** 仓位编码 */
+    private String struct_code;
+
+    /** 仓位名称 */
+    private String struct_name;
+
     /** 入库时间 */
     private String insert_time;
 
@@ -48,6 +60,9 @@ public class StIvtOverdueforewarningDto implements Serializable {
     /** 是否删除 */
     private String is_delete;
 
+    /** 是否已读 */
+    private Boolean is_read;
+
     /** 创建id */
     private String create_id;
 

nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dto/StIvtSafetyforewarningDto.java

@@ -28,16 +28,31 @@ public class StIvtSafetyforewarningDto implements Serializable {
     /** 物料名称 */
     private String material_name;
 
-    /** 仓位编码 */
+    /** 仓库编码 */
     private String stor_code;
 
     private String stor_name;
 
+    /** 库区编码 */
+    private String sect_code;
+
+    /** 库区名称 */
+    private String sect_name;
+
+    /** 仓位编码 */
+    private String struct_code;
+
+    /** 仓位名称 */
+    private String struct_name;
+
     /** 当前数量 */
     private BigDecimal current_qty;
 
-    /** 安全数量 */
+    /** 安全数量下限 */
-    private BigDecimal safe_qty;
+    private BigDecimal safe_qty_lower_limit;
+
+    /** 安全数量上限 */
+    private BigDecimal safe_qty_upper_limit;
 
     /** 备注 */
     private String remark;
@@ -45,6 +60,9 @@ public class StIvtSafetyforewarningDto implements Serializable {
     /** 是否删除 */
     private String is_delete;
 
+    /** 是否已读 */
+    private Boolean is_read;
+
     /** 创建id */
     private String create_id;
 

nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtOverdueforewarningServiceImpl.java

@@ -3,6 +3,7 @@ package org.nl.wms.warehouse_manage.service.impl;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -12,6 +13,8 @@ import org.nl.config.language.LangProcess;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.exception.BadRequestException;
 import org.nl.common.utils.SecurityUtils;
+import org.nl.wms.warehouse_manage.enums.IOSConstant;
+import org.nl.wms.warehouse_manage.inAndOut.service.dao.IOStorInv;
 import org.nl.wms.warehouse_manage.service.IStIvtOverdueforewarningService;
 import org.nl.wms.warehouse_manage.service.dao.mapper.StIvtOverdueforewarningMapper;
 import org.nl.wms.warehouse_manage.service.dao.StIvtOverdueforewarning;
@@ -82,4 +85,17 @@ public class StIvtOverdueforewarningServiceImpl extends ServiceImpl<StIvtOverdue
         stIvtOverdueforewarningMapper.deleteByMap(null);
     }
 
+    @Override
+    public void read(Set<String> ids) {
+        this.update(
+                new UpdateWrapper<StIvtOverdueforewarning>().lambda()
+                        .in(StIvtOverdueforewarning::getId, ids)
+                        .eq(StIvtOverdueforewarning::getIs_read,false)
+                        .set(StIvtOverdueforewarning::getIs_read, true)
+                        .set(StIvtOverdueforewarning::getUpdate_id, SecurityUtils.getCurrentUserId())
+                        .set(StIvtOverdueforewarning::getUpdate_name, SecurityUtils.getCurrentNickName())
+                        .set(StIvtOverdueforewarning::getUpdate_time, DateUtil.now())
+        );
+    }
+
 }

nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtSafetyforewarningServiceImpl.java

@@ -3,6 +3,7 @@ package org.nl.wms.warehouse_manage.service.impl;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -16,6 +17,8 @@ import org.nl.wms.basedata_manage.service.dao.BsrealStorattr;
 import org.nl.wms.basedata_manage.service.dao.mapper.BsrealStorattrMapper;
 import org.nl.wms.warehouse_manage.service.IStIvtSafetyforewarningService;
 import org.nl.wms.warehouse_manage.service.dao.StIvtForewarningconfig;
+import org.nl.wms.warehouse_manage.service.dao.StIvtOverdueforewarning;
+import org.nl.wms.warehouse_manage.service.dao.StIvtSafetyforewarning;
 import org.nl.wms.warehouse_manage.service.dao.mapper.StIvtForewarningconfigMapper;
 import org.nl.wms.warehouse_manage.service.dao.mapper.StIvtSafetyforewarningMapper;
 import org.nl.wms.warehouse_manage.service.dao.StIvtSafetyforewarning;
@@ -92,4 +95,17 @@ public class StIvtSafetyforewarningServiceImpl extends ServiceImpl<StIvtSafetyfo
         stIvtSafetyforewarningMapper.deleteByMap(null);
     }
 
+    @Override
+    public void read(Set<String> ids) {
+        this.update(
+                new UpdateWrapper<StIvtSafetyforewarning>().lambda()
+                        .in(StIvtSafetyforewarning::getId, ids)
+                        .eq(StIvtSafetyforewarning::getIs_read,false)
+                        .set(StIvtSafetyforewarning::getIs_read, true)
+                        .set(StIvtSafetyforewarning::getUpdate_id, SecurityUtils.getCurrentUserId())
+                        .set(StIvtSafetyforewarning::getUpdate_name, SecurityUtils.getCurrentNickName())
+                        .set(StIvtSafetyforewarning::getUpdate_time, DateUtil.now())
+        );
+    }
+
 }

nladmin-ui/src/views/wms/forewarning_management/forewarning_config/AddDialog.vue

@@ -45,22 +45,22 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="安全库存天数" prop="safe_days">
+          <el-form-item label="超期天数" prop="safe_days">
             <el-input v-model="form.safe_days" style="width: 200px;" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row>
         <el-col :span="8">
-          <el-form-item label="安全库存数量" prop="safe_qty">
+          <el-form-item label="安全库存数量下限" prop="safe_qty_lower_limit">
-            <el-input v-model="form.safe_qty" style="width: 200px;" />
+            <el-input v-model="form.safe_qty_lower_limit" style="width: 200px;" />
           </el-form-item>
         </el-col>
-        <!--        <el-col :span="8">
+        <el-col :span="8">
-          <el-form-item label="表达式" prop="cron">
+          <el-form-item label="安全库存数量上限" prop="safe_qty_upper_limit">
-            <el-input v-model="form.cron" style="width: 200px;" />
+            <el-input v-model="form.safe_qty_upper_limit" style="width: 200px;" />
           </el-form-item>
-        </el-col>-->
+        </el-col>
         <el-col :span="8">
           <el-form-item label="通知类型" prop="notify_type">
             <el-select v-model="form.notify_type" filterable placeholder="请选择">
@@ -73,8 +73,10 @@
             </el-select>
           </el-form-item>
         </el-col>
+      </el-row>
+      <el-row>
         <el-col :span="8">
-          <el-form-item label="描述" prop="remark">
+          <el-form-item label="备注" prop="remark">
             <el-input
               v-model="form.remark"
               type="textarea"
@@ -142,23 +144,30 @@ import crudBsrealstorattr from '@/views/wms/basedata/bsrealstorattr/bsrealstorat
 import crudStorattr from '@/views/wms/basedata/bsrealstorattr/bsrealstorattr'
 
 const defaultForm = {
-  bill_code: '',
+  id: null,
-  stor_code: '',
+  name: null,
-  bill_status: '10',
+  stor_code: null,
-  total_qty: '0',
+  safe_qty_lower_limit: null,
-  detail_count: '0',
+  safe_qty_upper_limit: null,
-  bill_type: '',
+  safe_days: null,
-  remark: '',
+  remark: null,
-  biz_date: new Date(),
+  is_active: null,
-  create_mode: '',
+  is_delete: null,
-  tableData: []
+  create_id: null,
+  create_name: null,
+  create_time: null,
+  update_id: null,
+  update_name: null,
+  update_time: null,
+  cron: null,
+  notify_type: null
 }
 
 export default {
   name: 'AddDialog',
   components: { AddMaterial },
   mixins: [crud(), form(defaultForm)],
-  dicts: ['io_bill_status', 'ST_QUALITY_SCODE', 'ST_INV_IN_TYPE', 'NOTIFY_TYPE'],
+  dicts: ['ST_INV_IN_TYPE', 'NOTIFY_TYPE'],
   props: {
     dialogShow: {
       type: Boolean,
@@ -186,7 +195,7 @@ export default {
   },
   watch: {
     dialogShow: {
-      handler(newValue, oldValue) {
+      handler(newValue) {
         this.dialogVisible = newValue
       }
     }
@@ -217,43 +226,21 @@ export default {
       })
     },
     [CRUD.HOOK.afterToAdd]() {
-      this.bill_btn = false
-      this.mater_btn = false
     },
-    [CRUD.HOOK.afterToView]() {
+    [CRUD.HOOK.afterSubmit]() {
-      this.bill_btn = true
-      this.mater_btn = true
-      stIvtForewarningconfig.getWarningMaterial({ 'bill_code': this.form.id }).then(res => {
-        this.form.tableData = res
-        // 将明细变成不可编辑
-        for (let i = 0; i < this.form.tableData.length; i++) {
-          const row = this.form.tableData[i]
-          this.form.tableData.splice(i, 1, row)
-        }
-      })
     },
-
     [CRUD.HOOK.beforeSubmit]() {
       // 提交前校验
       if (this.form.tableData.length === 0) {
         this.crud.notify('请至少选择一条明细', CRUD.NOTIFICATION_TYPE.INFO)
         return false
       }
-    },
+
-    billTypeChange(val) {
+      if (this.form.safe_qty_upper_limit !== '' && this.form.safe_qty_lower_limit !== '' &&
-      if (val === '000101') {
+        this.form.safe_qty_upper_limit < this.form.safe_qty_lower_limit) {
-        this.bill_btn = false
+        this.crud.notify('下限不能大于上限', CRUD.NOTIFICATION_TYPE.INFO)
-        this.mater_btn = true
+        return false
-      } else if (val === '000102') {
-        this.bill_btn = true
-        this.mater_btn = false
-      } else {
-        this.bill_btn = true
-        this.mater_btn = true
       }
-      this.form.tableData = []
-      this.form.total_qty = 0
-      this.form.detail_count = 0
     },
     fun(val) {
       return Number(val).toFixed(3)

nladmin-ui/src/views/wms/forewarning_management/forewarning_config/index.vue

@@ -21,9 +21,10 @@
             :value="item.stor_code"
           />
         </el-select>        <label class="el-form-item-label">安全库存数量</label>
-        <el-input v-model="query.safe_qty" clearable placeholder="安全库存数量" style="width: 185px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
+        <el-input v-model="query.safe_qty_lower_limit" clearable placeholder="安全库存数量下限" style="width: 185px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
-        <label class="el-form-item-label">安全库存天数</label>
+        <el-input v-model="query.safe_qty_upper_limit" clearable placeholder="安全库存数量上限" style="width: 185px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
-        <el-input v-model="query.safe_days" clearable placeholder="安全库存天数" style="width: 185px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
+        <label class="el-form-item-label">超期天数</label>
+        <el-input v-model="query.safe_days" clearable placeholder="超期天数" style="width: 185px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
         <label class="el-form-item-label">通知类型</label>
         <el-select
           v-model="query.notify_type"
@@ -51,72 +52,6 @@
         :title="crud.status.title"
         width="80%"
       >
-        <el-form ref="form" :model="form" label-width="100px" :rules="rules" class="custom-form-spacing">
-          <el-row>
-            <el-col :span="8">
-              <el-form-item label="方案名称" prop="name">
-                <el-input v-model="form.name" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="仓库名称" prop="stor_code">
-                <el-select
-                  v-model="form.stor_code"
-                  placeholder=""
-                  style="width: 200px"
-                >
-                  <el-option
-                    v-for="item in stors"
-                    :key="item.stor_code"
-                    :label="item.stor_name"
-                    :value="item.stor_code"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="安全库存天数" prop="safe_days">
-                <el-input v-model="form.safe_days" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="8">
-              <el-form-item label="安全库存数量" prop="safe_qty">
-                <el-input v-model="form.safe_qty" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="表达式" prop="cron">
-                <el-input v-model="form.cron" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="通知类型" prop="notify_type">
-                <el-select v-model="form.notify_type" filterable placeholder="请选择">
-                  <el-option
-                    v-for="item in dict.NOTIFY_TYPE"
-                    :key="item.id"
-                    :label="item.label"
-                    :value="item.value"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="8">
-              <el-form-item label="描述" prop="remark">
-                <el-input
-                  v-model="form.remark"
-                  type="textarea"
-                  :rows="3"
-                  style="width: 400px;"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="text" @click="crud.cancelCU">取消</el-button>
           <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
@@ -127,8 +62,9 @@
         <el-table-column type="selection" width="55" />
         <el-table-column prop="name" label="方案名称" :min-width="flexWidth('name',crud.data,'方案名称')" />
         <el-table-column prop="stor_name" label="仓库名称" :min-width="flexWidth('stor_name',crud.data,'仓库名称')" />
-        <el-table-column prop="safe_qty" label="安全库存数量" :min-width="flexWidth('safe_qty',crud.data,'安全库存数量')" />
+        <el-table-column prop="safe_qty_lower_limit" label="安全数量下限" :min-width="flexWidth('safe_qty_lower_limit',crud.data,'安全数量下限')" />
-        <el-table-column prop="safe_days" label="安全库存天数" :min-width="flexWidth('safe_days',crud.data,'安全库存天数')" />
+        <el-table-column prop="safe_qty_upper_limit" label="安全数量上限" :min-width="flexWidth('safe_qty_upper_limit',crud.data,'安全数量上限')" />
+        <el-table-column prop="safe_days" label="超期天数" :min-width="flexWidth('safe_days',crud.data,'超期天数')" />
         <el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
         <el-table-column label="是否启用" align="center" prop="is_active">
           <template slot-scope="scope">
@@ -164,7 +100,7 @@
 
 <script>
 import crudStIvtForewarningconfig from './stIvtForewarningconfig'
-import CRUD, { crud, form, header, presenter } from '@crud/crud'
+import CRUD, { crud, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
@@ -173,28 +109,10 @@ import crudStorattr from '@/views/wms/basedata/bsrealstorattr/bsrealstorattr'
 import AddDialog from '@/views/wms/forewarning_management/forewarning_config/AddDialog.vue'
 import stIvtForewarningconfig from '@/views/wms/forewarning_management/forewarning_config/stIvtForewarningconfig'
 
-const defaultForm = {
-  id: null,
-  name: null,
-  stor_code: null,
-  safe_qty: null,
-  safe_days: null,
-  remark: null,
-  is_active: null,
-  is_delete: null,
-  create_id: null,
-  create_name: null,
-  create_time: null,
-  update_id: null,
-  update_name: null,
-  update_time: null,
-  cron: null,
-  notify_type: null
-}
 export default {
   name: 'StIvtForewarningconfig',
   components: { AddDialog, pagination, crudOperation, rrOperation, udOperation },
-  mixins: [presenter(), header(), form(defaultForm), crud()],
+  mixins: [presenter(), header(), crud()],
   dicts: ['NOTIFY_TYPE'],
   cruds() {
     return CRUD({
@@ -220,8 +138,9 @@ export default {
       queryTypeOptions: [
         { key: 'name', display_name: '方案名称' },
         { key: 'stor_code', display_name: '仓库编码' },
-        { key: 'safe_qty', display_name: '安全库存数量' },
+        { key: 'safe_qty_lower_limit', display_name: '安全库存数量下限' },
-        { key: 'safe_days', display_name: '安全库存天数' },
+        { key: 'safe_qty_upper_limit', display_name: '安全库存数量上限' },
+        { key: 'safe_days', display_name: '超期天数' },
         { key: 'notify_type', display_name: '通知类型' }
       ],
       stors: []
@@ -238,6 +157,7 @@ export default {
       return true
     },
     querytable() {
+      this.$refs.table.clearSelection()
       this.crud.toQuery()
     },
     changeEnabled(data, val) {

nladmin-ui/src/views/wms/forewarning_management/overdue_forewarning/index.vue

@@ -21,10 +21,34 @@
             :value="item.stor_code"
           />
         </el-select>
+        <label class="el-form-item-label">已读/未读</label>
+        <el-select
+          v-model="query.is_read"
+          placeholder=""
+          style="width: 200px"
+        >
+          <el-option
+            v-for="item in readList"
+            :key="item.key"
+            :label="item.label"
+            :value="item.key"
+          />
+        </el-select>
         <rrOperation :crud="crud" />
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission" />
+      <crudOperation :permission="permission">
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="success"
+          icon="el-icon-position"
+          size="mini"
+          @click="read"
+        >
+          已读
+        </el-button>
+      </crudOperation>
       <!--表格渲染-->
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="55" />
@@ -33,10 +57,22 @@
         <el-table-column prop="material_name" label="物料名称" :min-width="flexWidth('material_name',crud.data,'物料名称')" />
         <el-table-column prop="stor_code" label="仓库编码" :min-width="flexWidth('stor_code',crud.data,'仓库编码')" />
         <el-table-column prop="stor_name" label="仓库名称" :min-width="flexWidth('stor_name',crud.data,'仓库名称')" />
+        <el-table-column prop="sect_code" label="库区编码" :min-width="flexWidth('sect_code',crud.data,'库区编码')" />
+        <el-table-column prop="sect_name" label="库区名称" :min-width="flexWidth('sect_name',crud.data,'库区名称')" />
+        <el-table-column prop="struct_code" label="仓位编码" :min-width="flexWidth('struct_code',crud.data,'仓位编码')" />
+        <el-table-column prop="struct_name" label="仓位名称" :min-width="flexWidth('struct_name',crud.data,'仓位名称')" />
         <el-table-column prop="insert_time" label="入库时间" :min-width="flexWidth('insert_time',crud.data,'入库时间')" />
         <el-table-column prop="overdue_days" label="超时天数" :min-width="flexWidth('overdue_days',crud.data,'超时天数')" />
         <el-table-column prop="safe_days" label="安全天数" :min-width="flexWidth('safe_days',crud.data,'安全天数')" />
+        <el-table-column label="已读/未读" align="center" prop="is_read" :min-width="flexWidth('is_read',crud.data,'已读/未读')">
+          <template #default="scope">
+            <span :style="{ color: getColor(scope.row.is_read) }">{{ scope.row.is_read?'已读':'未读' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="create_time" label="预警时间" :min-width="flexWidth('create_time',crud.data,'预警时间')" />
+        <!--
         <el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
+-->
       </el-table>
       <!--分页组件-->
       <pagination />
@@ -102,7 +138,11 @@ export default {
         { key: 'material_name', display_name: '物料名称' },
         { key: 'stor_code', display_name: '仓位编码' }
       ],
-      stors: []
+      stors: [],
+      readList: [
+        { key: '1', label: '已读' },
+        { key: '0', label: '未读' }
+      ]
     }
   },
   created() {
@@ -114,6 +154,33 @@ export default {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据
     [CRUD.HOOK.beforeRefresh]() {
       return true
+    },
+    read() {
+      const res = this.$refs.table.selection
+      if (!res || res.length < 1) {
+        this.crud.notify('请选择一条记录', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      this.fullscreenLoading = true
+      const ids = []
+      if (res instanceof Array) {
+        res.forEach(val => {
+          ids.push(val.id)
+        })
+      } else {
+        ids.push(res.id)
+      }
+      crudStIvtOverdueforewarning.read(ids).then(res => {
+        this.crud.notify('操作成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
+      }).finally(() => {
+        this.fullscreenLoading = false
+        this.crud.toQuery()
+      })
+    },
+    getColor(is_read) {
+      if (is_read === false) {
+        return 'red'
+      }
     }
   }
 }

nladmin-ui/src/views/wms/forewarning_management/overdue_forewarning/stIvtOverdueforewarning.js

@@ -24,4 +24,12 @@ export function edit(data) {
   })
 }
 
-export default { add, edit, del }
+export function read(data) {
+  return request({
+    url: 'api/stIvtOverdueforewarning/read',
+    method: 'post',
+    data
+  })
+}
+
+export default { add, edit, del, read }

nladmin-ui/src/views/wms/forewarning_management/safety_forewarning/index.vue

@@ -21,10 +21,34 @@
             :value="item.stor_code"
           />
         </el-select>
+        <label class="el-form-item-label">已读/未读</label>
+        <el-select
+          v-model="query.is_read"
+          placeholder=""
+          style="width: 200px"
+        >
+          <el-option
+            v-for="item in readList"
+            :key="item.key"
+            :label="item.label"
+            :value="item.key"
+          />
+        </el-select>
         <rrOperation :crud="crud" />
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission" />
+      <crudOperation :permission="permission">
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="success"
+          icon="el-icon-position"
+          size="mini"
+          @click="read"
+        >
+          已读
+        </el-button>
+      </crudoperation>
       <!--表格渲染-->
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="55" />
@@ -33,9 +57,22 @@
         <el-table-column prop="material_name" label="物料名称" :min-width="flexWidth('material_name',crud.data,'物料名称')" />
         <el-table-column prop="stor_code" label="仓库编码" :min-width="flexWidth('stor_code',crud.data,'仓库编码')" />
         <el-table-column prop="stor_name" label="仓库名称" :min-width="flexWidth('stor_name',crud.data,'仓库名称')" />
+        <el-table-column prop="sect_code" label="库区编码" :min-width="flexWidth('sect_code',crud.data,'库区编码')" />
+        <el-table-column prop="sect_name" label="库区名称" :min-width="flexWidth('sect_name',crud.data,'库区名称')" />
+        <el-table-column prop="struct_code" label="仓位编码" :min-width="flexWidth('struct_code',crud.data,'仓位编码')" />
+        <el-table-column prop="struct_name" label="仓位名称" :min-width="flexWidth('struct_name',crud.data,'仓位名称')" />
         <el-table-column prop="current_qty" label="当前数量" :min-width="flexWidth('current_qty',crud.data,'当前数量')" />
-        <el-table-column prop="safe_qty" label="安全数量" :min-width="flexWidth('safe_qty',crud.data,'安全数量')" />
+        <el-table-column prop="safe_qty_lower_limit" label="安全数量下限" :min-width="flexWidth('safe_qty_lower_limit',crud.data,'安全数量下限')" />
+        <el-table-column prop="safe_qty_upper_limit" label="安全数量上限" :min-width="flexWidth('safe_qty_upper_limit',crud.data,'安全数量上限')" />
+        <el-table-column label="已读/未读" align="center" prop="is_read" :min-width="flexWidth('is_read',crud.data,'已读/未读')">
+          <template #default="scope">
+            <span :style="{ color: getColor(scope.row.is_read) }">{{ scope.row.is_read?'已读':'未读' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="create_time" label="预警时间" :min-width="flexWidth('create_time',crud.data,'预警时间')" />
+        <!--
                 <el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
+        -->
       </el-table>
       <!--分页组件-->
       <pagination />
@@ -58,7 +95,8 @@ const defaultForm = {
   material_name: null,
   stor_code: null,
   current_qty: null,
-  safe_qty: null,
+  safe_qty_lower_limit: null,
+  safe_qty_upper_limit: null,
   remark: null,
   is_delete: null,
   create_id: null,
@@ -100,7 +138,11 @@ export default {
         { key: 'material_name', display_name: '物料名称' },
         { key: 'stor_code', display_name: '仓位编码' }
       ],
-      stors: []
+      stors: [],
+      readList: [
+        { key: '1', label: '已读' },
+        { key: '0', label: '未读' }
+      ]
     }
   },
   created() {
@@ -112,6 +154,33 @@ export default {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据
     [CRUD.HOOK.beforeRefresh]() {
       return true
+    },
+    read() {
+      const res = this.$refs.table.selection
+      if (!res || res.length < 1) {
+        this.crud.notify('请选择一条记录', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      this.fullscreenLoading = true
+      const ids = []
+      if (res instanceof Array) {
+        res.forEach(val => {
+          ids.push(val.id)
+        })
+      } else {
+        ids.push(res.id)
+      }
+      crudStIvtSafetyforewarning.read(ids).then(res => {
+        this.crud.notify('操作成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
+      }).finally(() => {
+        this.fullscreenLoading = false
+        this.crud.toQuery()
+      })
+    },
+    getColor(is_read) {
+      if (is_read === false) {
+        return 'red'
+      }
     }
   }
 }

nladmin-ui/src/views/wms/forewarning_management/safety_forewarning/stIvtSafetyforewarning.js

@@ -23,5 +23,12 @@ export function edit(data) {
     data
   })
 }
+export function read(data) {
+  return request({
+    url: 'api/stIvtSafetyforewarning/read',
+    method: 'post',
+    data
+  })
+}
 
-export default { add, edit, del }
+export default { add, edit, del, read }