opt:现场问题的一些处理与优化

wms_pro/hd/nladmin-system/src/main/java/org/nl/common/enums/StatusEnum.java

@@ -71,7 +71,7 @@ public enum StatusEnum {
     /**
      * 点位锁类型
      */
-    LOCK(ForkMap.of("无锁", "00", null, "入库锁", "10", null, "入库盘点锁", "16", null, "出库锁", "20", null, "盘点出库锁", "26", null, "移库锁", "50", null, "异常锁定", "60", null, "空出锁", "70", null,"临时锁", "99", null)),
+    LOCK(ForkMap.of("无锁", "00", null, "入库锁", "10", null, "入库盘点锁", "16", null, "出库锁", "20", null, "盘点出库锁", "26", null, "移库锁", "50", null, "异常锁定", "60", null, "空出锁", "70", null,"暂停锁", "98", null,"临时锁", "99", null)),
     STRATEGY_TYPE(ForkMap.of("入库", "1", null, "出库", "2", null, "出入库", "3", null)),
 
 

wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/InterationUtil.java

@@ -45,19 +45,19 @@ public class InterationUtil {
             if (execute.getStatus() != 200){
                 throw new BadRequestException("acs申请失败："+response.getString("message"));
             }
-            if (!"200".equals(response.getString("code"))){
+            //            if (!"200".equals(response.getString("code"))){
-                String error = "";
+            //                String error = "";
-                if (response.get("data")!=null){
+            //                if (response.get("data")!=null){
-                    JSONArray data = response.getJSONArray("data");
+            //                    JSONArray data = response.getJSONArray("data");
-                    for (int i = 0; i < data.size(); i++) {
+            //                    for (int i = 0; i < data.size(); i++) {
-                        JSONObject item = data.getJSONObject(i);
+            //                        JSONObject item = data.getJSONObject(i);
-                        error = error+"_"+item.getString("task_code") + ":" + item.getString("msg");
+            //                        error = error+"_"+item.getString("task_code") + ":" + item.getString("msg");
-                    }
+            //                    }
-                }else {
+            //                }else {
-                    error = response.getString("msg");
+            //                    error = response.getString("msg");
-                }
+            //                }
-                throw new BadRequestException("acs返回错误："+error);
+            // throw new BadRequestException("acs返回错误："+error);
-            }
+            //  }
             return response.toJavaObject(TableDataInfo.class);
         } catch (Exception ex) {
             log.error("ACS反馈异常----------------------------------------+"+api+",---"+ex.getMessage());

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/decisioner/impl/base/AlleyAveRuleHandler.java

@@ -98,6 +98,9 @@ public class AlleyAveRuleHandler extends Decisioner<StIvtStructattr, JSONObject>
             log.error("均衡策略结果：载具号：" + param.getString("vehicle_code") + "当前分配策略货位数量为0");
             return Collections.emptyList();
         }
+        //防止多线程并发分配异常
+        //Collections.reverse(subList);
+        Collections.shuffle(subList);
         return subList;
     }
 

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/decisioner/impl/diy/DepthPriorityHandler.java

@@ -14,9 +14,11 @@ import org.nl.wms.stor_manage.struct.service.IStIvtStructattrService;
 import org.nl.wms.stor_manage.struct.service.dao.StIvtStructattr;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /*
  *深位优先
@@ -64,52 +66,46 @@ public class DepthPriorityHandler extends Decisioner<StIvtStructattr, JSONObject
         }
         if (returnResult.isEmpty() || returnResult.size() < 3) {
             //深位为空或数量小于3，分配有货的浅库位
-            return getOtherStructattr(list, param, startTime1, depCollect);
+            return getOtherStructattr(list, param, startTime1, shallowCollect);
         }
         log.info("深位优先策略：载具号：{} 分配结果: 存在深位并对应浅位无货的库位，分配仓位：{}", param.getString("vehicle_code"), returnResult.get(0).getStruct_code());
         log.info("深位优先策略：载具号:{} 获取深货位且浅货位无货仓位耗时:{}", param.getString("vehicle_code"), System.currentTimeMillis() - startTime1);
         return returnResult;
     }
 
-    private static List<StIvtStructattr> getOtherStructattr(List<StIvtStructattr> list, JSONObject param, long startTime1, List<StIvtStructattr> depCollect) {
+    private static List<StIvtStructattr> getOtherStructattr(List<StIvtStructattr> list, JSONObject param, long startTime1, List<StIvtStructattr> shallowCollect) {
-        //        if (!depCollect.isEmpty()) {
-        //            log.info("深位优先策略：载具号：" + param.getString("vehicle_code") + "分配结果: 存在深位无货但对应浅位有货的库位，需要移库，分配仓位：" + depCollect.get(0).getStruct_code());
-        //            log.info("深位优先策略：获取深货位无货且浅货位有货仓位耗时:{}", System.currentTimeMillis() - startTime1);
-        //            return depCollect;
-        //        }
         //浅货位，则需要判断对应
         IStIvtStructattrService iStIvtStructattrService = SpringContextHolder.getBean(IStIvtStructattrService.class);
         if (list.get(0).getStor_code().equals(StatusEnum.STOCK_INFO.code("料箱库"))) {
             //深位有任务不可分配
-            ISchBaseTaskService iSchBaseTaskService = SpringContextHolder.getBean(ISchBaseTaskService.class);
+//            ISchBaseTaskService iSchBaseTaskService = SpringContextHolder.getBean(ISchBaseTaskService.class);
-            List<SchBaseTask> taskList = iSchBaseTaskService.list(
+//            List<SchBaseTask> taskList = iSchBaseTaskService.list(
-                    new LambdaQueryWrapper<SchBaseTask>()
+//                    new LambdaQueryWrapper<SchBaseTask>()
-                            .lt(SchBaseTask::getStatus, StatusEnum.FORM_STATUS.code("完成"))
+//                            .lt(SchBaseTask::getStatus, StatusEnum.FORM_STATUS.code("完成"))
-                            .select(SchBaseTask::getPoint_code1, SchBaseTask::getPoint_code2)
+//                            .select(SchBaseTask::getPoint_code1, SchBaseTask::getPoint_code2)
-            );
+//            );
-            Set<String> pointCodes = taskList.stream()
+//            Set<String> pointCodes = taskList.stream()
-                    .flatMap(t -> Stream.of(t.getPoint_code1(), t.getPoint_code2()))
+//                    .flatMap(t -> Stream.of(t.getPoint_code1(), t.getPoint_code2()))
-                    .filter(Objects::nonNull)
+//                    .filter(Objects::nonNull)
-                    .collect(Collectors.toSet());
+//                    .collect(Collectors.toSet());
-            List<StIvtStructattr> list1 = iStIvtStructattrService.list(new LambdaUpdateWrapper<StIvtStructattr>()
+            // log.error("深位优先策略：深货位有货且浅货位无货：载具号：" + param.getString("vehicle_code") + "查询正在执行的起点终点集合为："+pointCodes);
-                    .in(StIvtStructattr::getRow_num, Arrays.asList(1, 4))
-                    .eq(StIvtStructattr::getStor_code, StatusEnum.STOCK_INFO.code("料箱库"))
-                    .eq(StIvtStructattr::getIs_used, 1)
-                    .eq(StIvtStructattr::getLock_type, StatusEnum.LOCK.code("无锁")));
-            list1 = list1.stream()
-                    .filter(s -> !pointCodes.contains(s.getStruct_code()))
-                    .collect(Collectors.toList());
-            //先找1排对应的2排的再找3排对应的4排
-            if (!list1.isEmpty()) {
-                List<StIvtStructattr> combinedResult = new ArrayList<>();
             //1排
-                List<StIvtStructattr> deepCollect1 = list1.stream()
+            List<StIvtStructattr> list1 = iStIvtStructattrService.list(new LambdaUpdateWrapper<StIvtStructattr>()
-                        .filter(a -> a.getRow_num() == 1)
+                    .eq(StIvtStructattr::getRow_num, "1")
-                        .collect(Collectors.toList());
+                    .eq(StIvtStructattr::getLock_type, StatusEnum.LOCK.code("无锁"))
-                List<StIvtStructattr> shallowCollect1 = list.stream()
+                    .isNotNull(StIvtStructattr::getVehicle_code)
+                    .eq(StIvtStructattr::getStor_code, StatusEnum.STOCK_INFO.code("料箱库"))
+                    .eq(StIvtStructattr::getIs_used, 1));
+//            list1 = list1.stream()
+//                    .filter(s -> !pointCodes.contains(s.getStruct_code()))
+//                    .collect(Collectors.toList());
+            //log.error("深位优先策略：深货位有货且浅货位无货：载具号：" + param.getString("vehicle_code") + "1排过滤后的库位为："+list1);
+            //先找1排对应的2排的再找3排对应的4排
+            List<StIvtStructattr> combinedResult = new ArrayList<>();
+            List<StIvtStructattr> shallowCollect1 = shallowCollect.stream()
                     .filter(a -> a.getRow_num() == 2)
                     .collect(Collectors.toList());
-                Set<String> deepCollect1Set = deepCollect1.stream()
+            Set<String> deepCollect1Set = list1.stream()
                     .map(r -> r.getCol_num() + "_" + r.getLayer_num())
                     .collect(Collectors.toSet());
             List<StIvtStructattr> intersection1 = shallowCollect1.stream()
@@ -119,13 +115,20 @@ public class DepthPriorityHandler extends Decisioner<StIvtStructattr, JSONObject
                 combinedResult.addAll(intersection1);
             } else {
                 //4排
-                    List<StIvtStructattr> deepCollect2 = list1.stream()
+                List<StIvtStructattr> list2 = iStIvtStructattrService.list(new LambdaUpdateWrapper<StIvtStructattr>()
-                            .filter(a -> a.getRow_num() == 4)
+                        .eq(StIvtStructattr::getRow_num, "4")
-                            .collect(Collectors.toList());
+                        .eq(StIvtStructattr::getLock_type, StatusEnum.LOCK.code("无锁"))
-                    List<StIvtStructattr> shallowCollect2 = list.stream()
+                        .isNotNull(StIvtStructattr::getVehicle_code)
+                        .eq(StIvtStructattr::getStor_code, StatusEnum.STOCK_INFO.code("料箱库"))
+                        .eq(StIvtStructattr::getIs_used, 1));
+//                list2 = list2.stream()
+//                        .filter(s -> !pointCodes.contains(s.getStruct_code()))
+//                        .collect(Collectors.toList());
+                //log.error("深位优先策略：深货位有货且浅货位无货：载具号：" + param.getString("vehicle_code") + "4排过滤后的库位为："+list2);
+                List<StIvtStructattr> shallowCollect2 = shallowCollect.stream()
                         .filter(a -> a.getRow_num() == 3)
                         .collect(Collectors.toList());
-                    Set<String> deepCollect2Set = deepCollect2.stream()
+                Set<String> deepCollect2Set = list2.stream()
                         .map(r -> r.getCol_num() + "_" + r.getLayer_num())
                         .collect(Collectors.toSet());
                 List<StIvtStructattr> intersection2 = shallowCollect2.stream()
@@ -133,17 +136,24 @@ public class DepthPriorityHandler extends Decisioner<StIvtStructattr, JSONObject
                         .collect(Collectors.toList());
                 combinedResult.addAll(intersection2);
             }
-                if (CollectionUtils.isEmpty(combinedResult)) {
+            if (combinedResult.size() < 30) {
-                    log.error("深位优先策略：获取深货位有货且浅货位无货仓位：载具号：" + param.getString("vehicle_code") + "获取仓位失败，该策略对应库位数量为0！");
+                ISchBaseTaskService iSchBaseTaskService = SpringContextHolder.getBean(ISchBaseTaskService.class);
+                List<SchBaseTask> taskList = iSchBaseTaskService.list(
+                        new LambdaQueryWrapper<SchBaseTask>()
+                                .lt(SchBaseTask::getStatus, StatusEnum.FORM_STATUS.code("完成"))
+                                .eq(SchBaseTask::getVehicle_code, param.getString("vehicle_code"))
+                );
+                taskList=taskList.stream()
+                        .filter(t -> t.getTask_type().equals(StatusEnum.IOBILL_TYPE_OUT.code("生产入库"))||t.getTask_type().equals(StatusEnum.IOBILL_TYPE_IN.code("拣选回库")))
+                        .collect(Collectors.toList());
+                if (CollectionUtils.isNotEmpty(taskList)) {
+                    log.error("深位优先策略：获取深货位有货且浅货位无货仓位：载具号：" + param.getString("vehicle_code") + "获取仓位失败，该策略对应库位已不足30个！");
                     return Collections.emptyList();
                 }
+            }
             log.info("深位优先策略：载具号：" + param.getString("vehicle_code") + "分配结果: 深货位有货且浅货位无货仓位，无需移库，分配仓位：" + combinedResult.get(0).getStruct_code());
             log.info("深位优先策略：获取深货位有货且浅货位无货仓位耗时:{}", System.currentTimeMillis() - startTime1);
             return combinedResult;
-            } else {
-                log.error("深位优先策略：载具号：" + param.getString("vehicle_code") + "分配结果: 获取深货位有货且浅货位无货仓位失败，无空余仓位！");
-                return Collections.emptyList();
-            }
         } else {
             return list;
         }

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/MoveStorageTask.java

@@ -77,8 +77,8 @@ public class MoveStorageTask extends AbstractTask {
         task.setTask_code(CodeUtil.getNewCode("TASK_CODE"));
         task.setStatus(StatusEnum.FORM_STATUS.code("生成"));
         task.setHandle_class(this.getClass().getName());
-        task.setAcs_type(StatusEnum.ACS_TYPE.code("立库"));
+        task.setAcs_type(end_struct_code.contains("B") ? StatusEnum.ACS_TYPE.code("三楼CTU") : StatusEnum.ACS_TYPE.code("立库"));
-        task.setCreate_time(now);
+        task.setCreate_time(DateUtil.now());
         task.setCreate_name(SecurityUtils.getCurrentNickName());
         task.setTask_type(from.getString("task_type"));
         task.setVehicle_code(vehicle_code);
@@ -107,6 +107,7 @@ public class MoveStorageTask extends AbstractTask {
     }
 
     @Override
+    @Transactional
     public void finish(JSONObject data) {
         data.put("status", StatusEnum.FORM_STATUS.code("完成"));
         this.updateTask(data);
@@ -114,16 +115,33 @@ public class MoveStorageTask extends AbstractTask {
         iStIvtStructattrService.changeStruct(schBaseTask.getPoint_code1(), schBaseTask.getVehicle_code(), schBaseTask.getTask_type(), null, Boolean.FALSE, schBaseTask.getPoint_code2());
         iStIvtStructattrService.changeStruct(schBaseTask.getPoint_code2(), schBaseTask.getVehicle_code(), schBaseTask.getTask_type(), null, Boolean.TRUE, schBaseTask.getPoint_code2());
         if ("99".equals(schBaseTask.getSource_form_id())) {
+            //移库完成后，起点作为临时锁，支持技改，不再入库，技改完成后需要解锁
             iStIvtStructattrService.update(
                     new UpdateWrapper<StIvtStructattr>()
                             .set("lock_type", StatusEnum.LOCK.code("临时锁"))
                             .eq("struct_code", schBaseTask.getPoint_code1())
             );
+            List<SchBaseTask> taskList = taskService.list(new QueryWrapper<SchBaseTask>().eq("source_form_id", "99").lt("status", StatusEnum.FORM_STATUS.code("完成")));
+            //移库任务完成，解锁需要维护不能分配的区域
+            if (taskList.size() == 0) {
+                UpdateWrapper<StIvtStructattr> wrapper = new UpdateWrapper<>();
+                wrapper.set("update_time", DateUtil.now())
+                        .set("lock_type", StatusEnum.LOCK.code("无锁"))
+                        .eq("lock_type", StatusEnum.LOCK.code("暂停锁"));
+                iStIvtStructattrService.update(wrapper);
+            }
         }
     }
 
     @Override
+    @Transactional
     public void cancel(JSONObject data) {
+        SchBaseTask schBaseTask = taskService.getOne(new QueryWrapper<SchBaseTask>().eq("task_code", data.getString("task_code")));
+        UpdateWrapper<StIvtStructattr> wrapper = new UpdateWrapper<>();
+        wrapper.set("update_time", DateUtil.now())
+                .set("lock_type", StatusEnum.LOCK.code("无锁"))
+                .eq("struct_code", schBaseTask.getPoint_code1());
+        iStIvtStructattrService.update(wrapper);
         this.updateTask(data);
     }
 }

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_msg/dao/AlmEarlyMsg.java

@@ -1,7 +1,10 @@
 package org.nl.wms.early_manage.service.early_msg.dao;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
+import java.math.BigDecimal;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -32,6 +35,18 @@ public class AlmEarlyMsg implements Serializable {
      */
     private String stor_code;
 
+    /**
+     * 仓库编码
+     */
+    @TableField(exist = false)
+    private String material_code;
+    /**
+     * 仓库编码
+     */
+    @TableField(exist = false)
+    private String material_name;
+
+
     /**
      * 载具编码
      */
@@ -50,7 +65,7 @@ public class AlmEarlyMsg implements Serializable {
     /**
      * 库存数量
      */
-    private Integer qty;
+    private BigDecimal qty;
 
     /**
      * 创建时间

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_msg/dao/mapper/AlmEarlyMsgMapper.java

@@ -4,6 +4,8 @@ import org.apache.ibatis.annotations.Insert;
 import org.nl.wms.early_manage.service.early_msg.dao.AlmEarlyMsg;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 仓库报警消息表 Mapper 接口
@@ -13,5 +15,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @since 2024-04-09
  */
 public interface AlmEarlyMsgMapper extends BaseMapper<AlmEarlyMsg> {
-
+     List<AlmEarlyMsg> getAllMsg();
 }

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_msg/dao/mapper/xml/AlmEarlyMsgMapper.xml

@@ -2,4 +2,13 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.nl.wms.early_manage.service.early_msg.dao.mapper.AlmEarlyMsgMapper">
 
+    <select id="getAllMsg" resultType="org.nl.wms.early_manage.service.early_msg.dao.AlmEarlyMsg">
+        SELECT
+        md_me_materialbase.material_code,
+        md_me_materialbase.material_name,
+        alm_early_msg.*
+        FROM
+        alm_early_msg
+        LEFT JOIN md_me_materialbase ON alm_early_msg.material_id = md_me_materialbase.material_id
+    </select>
 </mapper>

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_msg/impl/AlmEarlyMsgServiceImpl.java

@@ -30,24 +30,19 @@ public class AlmEarlyMsgServiceImpl extends ServiceImpl<AlmEarlyMsgMapper, AlmEa
 
     @Autowired
     private IMdMeMaterialbaseService materialbaseService;
+    @Autowired
+    private AlmEarlyMsgMapper almEarlyMsgMapper;
 
     @Override
     public Object getAll(PageQuery page, AlmMsgQuery query) {
+
         Page<AlmEarlyMsg> almMsgQueryPage = this.page(page.build(), query.build());
+        List<AlmEarlyMsg> list =almEarlyMsgMapper.getAllMsg();
         long total = almMsgQueryPage.getTotal();
         List<AlmEarlyMsg> records = almMsgQueryPage.getRecords();
-        JSONArray jsonArray = JSONArray.parseArray(JSONArray.toJSONString(records));
-        for (int i = 0; i < jsonArray.size(); i++) {
-            JSONObject jsonObject = jsonArray.getJSONObject(i);
-            MdMeMaterialbase material = materialbaseService.getById(jsonObject.getString("material_id"));
-            if (ObjectUtil.isNotEmpty(material)) {
-                jsonObject.put("material_code", material.getMaterial_code());
-                jsonObject.put("material_name", material.getMaterial_name());
-            }
-        }
         JSONObject json = new JSONObject();
         json.put("totalElements", total);
-        json.put("content", jsonArray);
+        json.put("content", list);
         return json;
     }
 

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/listen/EarlyEventListener.java

@@ -59,8 +59,8 @@ public class EarlyEventListener extends AbstraceListener<EarlyEvent> {
             if (daysDifference < safety_day) {
                 Integer safety_max_qty = earlyInv.getSafety_max_qty();
                 Integer safety_min_qty = earlyInv.getSafety_min_qty();
-                Integer sumQty = mdPbVehicleMaterService.getQtySumByMaterial(material_id);
+                BigDecimal sumQty = mdPbVehicleMaterService.getQtySumByMaterial(material_id);
-                if (sumQty < safety_min_qty || sumQty > safety_max_qty) {
+                if (sumQty.compareTo(BigDecimal.valueOf(safety_min_qty)) < 0 || sumQty.compareTo(BigDecimal.valueOf(safety_max_qty)) > 0) {
                     //插入消息表
                     AlmEarlyMsg almEarlyMsg = new AlmEarlyMsg();
                     almEarlyMsg.setId(IdUtil.getStringId());

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/tasks/AutoDeferralNotice.java

@@ -18,6 +18,8 @@ import org.nl.wms.system_manage.service.notice.ISysNoticeService;
 import org.nl.wms.system_manage.service.notice.enums.NoticeTypeEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -30,6 +32,8 @@ import java.util.stream.Collectors;
 @Component
 public class AutoDeferralNotice {
 
+    private static final Logger log = LoggerFactory.getLogger(AutoDeferralNotice.class);
+
     @Autowired
     private IAlmEarlyDeferralService almEarlyDeferralService;
     @Autowired
@@ -59,28 +63,46 @@ public class AutoDeferralNotice {
             List<MdPbVehicleMater> mdPbVehicleMaters = mdPbVehicleMaterService.list(mdPbVehicleMaterLambdaQueryWrapper);
             List<MdPbVehicleMater> filteredMdPbVehicleMaters = mdPbVehicleMaters.stream()
                     .filter(mater -> {
+                        try {
+                            if (mater.getUpdate_time() == null) {
+                                log.warn("物料更新时间为空，物料ID: {}", mater.getMaterial_id());
+                                return false;
+                            }
                             long daysBetween = DateUtil.betweenDay(DateUtil.parse(mater.getUpdate_time()), DateUtil.parse(DateUtil.now()), true);
                             return daysBetween > almEarlyDeferral.getStay_days();
+                        } catch (Exception e) {
+                            log.error("处理物料更新时间时发生异常，物料ID: {}，更新时间: {}", mater.getMaterial_id(), mater.getUpdate_time(), e);
+                            return false;
+                        }
                     })
                     .collect(Collectors.toList());
             for (MdPbVehicleMater filteredMdPbVehicleMater : filteredMdPbVehicleMaters) {
+                try {
                     AlmEarlyMsg almEarlyMsg = new AlmEarlyMsg();
                     almEarlyMsg.setId(IdUtil.getStringId());
                     almEarlyMsg.setEarly_type("2");
                     almEarlyMsg.setStor_code(almEarlyDeferral.getStor_code());
                     almEarlyMsg.setMaterial_id(filteredMdPbVehicleMater.getMaterial_id());
                     almEarlyMsg.setCreate_time(DateUtil.now());
-                almEarlyMsg.setQty(filteredMdPbVehicleMater.getQty().intValue());
+                    almEarlyMsg.setQty(filteredMdPbVehicleMater.getQty());
                     almEarlyMsg.setCreate_time(DateUtil.now());
                     almEarlyMsg.setVehicle_code(filteredMdPbVehicleMater.getVehicle_code());
                     almEarlyMsg.setPcsn(filteredMdPbVehicleMater.getPcsn());
+                    almEarlyMsg.setIs_read(false);
                     almEarlyMsgService.save(almEarlyMsg);
                     MdMeMaterialbase materialbase = materialbaseService.getById(filteredMdPbVehicleMater.getMaterial_id());
+                    if (materialbase == null) {
+                        log.warn("未找到物料基础信息，物料ID: {}", filteredMdPbVehicleMater.getMaterial_id());
+                        continue;
+                    }
                     String msg = "仓库: " + almEarlyDeferral.getStor_code() + ", 物料: " + materialbase.getMaterial_code()
                             + ", 在仓库呆料时间已超过 " + almEarlyDeferral.getStay_days() + "天";
                     noticeService.createNotice(msg, "呆料预警",
                             NoticeTypeEnum.NOTIFICATION.getCode());
                     NotificationFactory.getNotification(almEarlyDeferral.getNotice_type()).send("");
+                } catch (Exception e) {
+                    log.error("处理呆料预警消息时发生异常，物料ID: {}", filteredMdPbVehicleMater.getMaterial_id(), e);
+                }
             }
         }
     }

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/mapper/xml/MdGruopDickMapper.xml

@@ -51,7 +51,12 @@
             <if test="query.pcsn != null and query.pcsn != ''">
                 and d.pcsn = #{query.pcsn}
             </if>
-
+            <if test="query.end_time != null">
+                AND d.create_time <![CDATA[<=]]> #{query.end_time}
+            </if>
+            <if test="query.start_time != null">
+                AND d.create_time <![CDATA[>=]]> #{query.start_time}
+            </if>
             <if test="query.status != null and query.status != ''">
                 and d.status = #{query.status}
             </if>

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dto/GroupDickQuery.java

@@ -21,5 +21,7 @@ public class GroupDickQuery extends BaseQuery<MdGruopDick> {
    private String pcsn;
    private String status;
    private String billCode;
+   private String start_time;
+   private String end_time;
    private Map<String,String> form_query;
 }

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/IMdPbVehicleMaterService.java

@@ -18,7 +18,7 @@ import java.util.Map;
  */
 public interface IMdPbVehicleMaterService extends IService<MdPbVehicleMater> {
 
-    Integer getQtySumByMaterial(String material_id);
+    java.math.BigDecimal getQtySumByMaterial(String material_id);
 
     MdPbVehicleMater getGroupMst(String vehicle_code);
 

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/dao/mapper/MdPbVehicleMaterMapper.java

@@ -18,7 +18,7 @@ import java.util.List;
 public interface MdPbVehicleMaterMapper extends BaseMapper<MdPbVehicleMater> {
 
     @Select("SELECT SUM(qty) FROM md_pb_vehicleMater WHERE material_id = #{materialId}")
-    Integer getQtySumByMaterial(String material_id);
+    java.math.BigDecimal getQtySumByMaterial(String material_id);
 
     List<MdPbVehicleMaterVo> getVehicleMaters(String vehicle_code);
     List<MdPbVehicleMaterVo> getCheckMaters(String vehicle_code);

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/impl/MdPbVehicleMaterServiceImpl.java

@@ -33,7 +33,7 @@ public class MdPbVehicleMaterServiceImpl extends ServiceImpl<MdPbVehicleMaterMap
     private MdPbVehicleMaterMapper mdPbVehicleMaterMapper;
 
     @Override
-    public Integer getQtySumByMaterial(String material_id) {
+    public java.math.BigDecimal getQtySumByMaterial(String material_id) {
         return this.baseMapper.getQtySumByMaterial(material_id);
     }
 

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/common/PdaCommonController.java

@@ -76,9 +76,9 @@ public class PdaCommonController {
         Long z = list.stream().filter(a -> a.getH() == 2).count();
         Long d = list.stream().filter(a -> a.getH() == 1).count();
         JSONObject result = new JSONObject();
-        result.put("g", "FStockPallet".equals(storeCoe) ? g : d);
+        result.put("g", g);
         result.put("z", z);
-        result.put("d", "FStockPallet".equals(storeCoe) ? d : g);
+        result.put("d", d);
         return new ResponseEntity<>(result, HttpStatus.OK);
     }
 

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/controller/StIvtStructattrController.java

@@ -171,8 +171,8 @@ public class StIvtStructattrController {
      */
     @PostMapping("/createMoveTask")
     @Log("批量移库下发")
-    public ResponseEntity<Object> createMoveTask(@RequestBody List<Map<String, Object>> taskList) {
+    public ResponseEntity<Object> createMoveTask(@RequestBody String structCodeList) {
-        structattrService.createMoveTask(taskList);
+        structattrService.createMoveTask(structCodeList);
         return new ResponseEntity<>(HttpStatus.OK);
     }
 

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/IStIvtStructattrService.java

@@ -68,6 +68,6 @@ public interface IStIvtStructattrService extends IService<StIvtStructattr> {
     void createIdleTask( List<Map<String, Object>> taskList);
 
 
-    void createMoveTask( List<Map<String, Object>> taskList);
+    void createMoveTask(String structCodeList);
 
 }

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/StIvtStructattrMapper.java

@@ -41,4 +41,8 @@ public interface StIvtStructattrMapper extends BaseMapper<StIvtStructattr> {
 
     Long getIoBillCounts(@Param("vehicleCode") String vehicleCode);
 
+    List<StIvtStructattr> getMoveStruct();
+
+    List<StIvtStructattr> getMoveStructList();
+
 }

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/xml/StIvtStructattrMapper.xml

@@ -428,4 +428,45 @@
                 AND st_ivt_iostorinv.create_time  >= DATE_SUB(CURDATE(), INTERVAL 1 DAY)
                 AND st_ivt_iostorinv.create_time <= NOW()) table_count
     </select>
+
+    <select id="getMoveStruct" resultType="org.nl.wms.stor_manage.struct.service.dao.StIvtStructattr">
+        SELECT s.*
+        FROM st_ivt_structattr s
+        WHERE s.sect_code = 'LXBCP01'
+        AND s.row_num = 2
+        AND s.vehicle_code IS NOT NULL
+        AND s.lock_type = '00'
+        AND s.is_used = 1
+        AND EXISTS (
+        SELECT 1
+        FROM st_ivt_structattr d
+        WHERE d.sect_code = s.sect_code
+        AND d.col_num = s.col_num
+        AND d.layer_num = s.layer_num
+        AND d.row_num  &lt; s.row_num
+                        AND d.vehicle_code IS NULL
+                        AND d.lock_type = '00'
+                        AND d.is_used = 1
+        );
+    </select>
+    <select id="getMoveStructList" resultType="org.nl.wms.stor_manage.struct.service.dao.StIvtStructattr">
+        SELECT s.*
+        FROM st_ivt_structattr s
+        WHERE s.sect_code = 'LXBCP01'
+        AND s.row_num = 4
+        AND s.vehicle_code IS  NULL
+        AND s.lock_type = '00'
+        AND s.is_used = 1
+        AND EXISTS (
+        SELECT 1
+        FROM st_ivt_structattr d
+        WHERE d.sect_code = s.sect_code
+        AND d.col_num = s.col_num
+        AND d.layer_num = s.layer_num
+        AND d.row_num  &lt; s.row_num
+                         AND d.vehicle_code IS not NULL
+                         AND d.lock_type = '00'
+                         AND d.is_used = 1
+        );
+    </select>
 </mapper>

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/impl/StIvtStructattrServiceImpl.java

@@ -49,6 +49,8 @@ import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
@@ -63,11 +65,15 @@ import java.util.stream.Collectors;
 @Service
 @Slf4j
 public class StIvtStructattrServiceImpl extends ServiceImpl<StIvtStructattrMapper, StIvtStructattr> implements IStIvtStructattrService {
-
+    private static final ExecutorService DELAY_EXECUTOR = Executors.newSingleThreadExecutor();
     @Autowired
     private IMdPbVehicleMaterService vehicleMaterService;
     @Autowired
     private IStIvtStructivtflowService structivtflowService;
+
+    @Autowired
+    private StIvtStructattrMapper stIvtStructattrMapper;
+
     @Autowired
     private ISysParamService iSysParamService;
     @Autowired
@@ -346,6 +352,12 @@ public class StIvtStructattrServiceImpl extends ServiceImpl<StIvtStructattrMappe
                 }
             }
         }
+        if (StringUtils.isNotBlank(query.getSearch())) {
+            String structCode = query.getSearch().trim();
+            if (structCode.contains(",")) {
+                query.setSearch(structCode.substring(0, structCode.indexOf(",")));
+            }
+        }
         Long counts = this.baseMapper.getPageCount1(query);
         if (counts > 0) {
             page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize());
@@ -467,33 +479,68 @@ public class StIvtStructattrServiceImpl extends ServiceImpl<StIvtStructattrMappe
      */
     @Override
     @Transactional
-    public void createMoveTask(List<Map<String, Object>> taskList) {
+    public void createMoveTask(String structCodeList) {
-        if (CollectionUtils.isEmpty(taskList)) {
+        if (StringUtils.isBlank(structCodeList)) {
             return;
         }
-        String structCode = taskList.get(0).get("struct_code").toString();
+        Set<String> structCodeSet;
+        String structCodeQuery;
+        String structCode = structCodeList.trim();
+        if (structCode.contains(",")) {
+            String otherStructCode = structCode.substring(structCode.indexOf(",") + 1);
+            if (otherStructCode.contains(",")) {
+                String[] parts = otherStructCode.split(",");
+                structCodeSet = new HashSet<>(Arrays.asList(parts));
+            } else {
+                structCodeSet = new HashSet<>();
+            }
+            structCodeQuery = structCode.substring(0, structCode.indexOf(","));
+        } else {
+            structCodeSet = new HashSet<>();
+            structCodeQuery = structCode;
+        }
         ISchBaseTaskService taskService = SpringContextHolder.getBean(ISchBaseTaskService.class);
         QueryWrapper<SchBaseTask> query1 = new QueryWrapper<SchBaseTask>()
-                .nested(qw -> qw.likeRight("point_code1", structCode.substring(0, structCode.lastIndexOf("-")))
+                .likeRight("point_code1", structCodeQuery)
-                        .or()
-                        .likeRight("point_code2", structCode.substring(0, structCode.lastIndexOf("-"))))
                 .lt("status", StatusEnum.FORM_STATUS.code("完成"));
         List<SchBaseTask> schBaseTaskList = taskService.list(query1);
         if (!CollectionUtils.isEmpty(schBaseTaskList)) {
             throw new BadRequestException("当前同排同列库位在任务，请完成后再下发批量移库任务");
         }
+        //L01-02,L02-03,L03-01,L02-04
         QueryWrapper<StIvtStructattr> query = new QueryWrapper<StIvtStructattr>()
                 .eq("is_used", true)
-                .likeRight("struct_code", structCode.substring(0, structCode.lastIndexOf("-")))
+                .likeRight("struct_code", structCodeQuery)
                 .eq("stor_code", StatusEnum.STOCK_INFO.code("料箱库"));
         List<StIvtStructattr> list = this.list(query);
         List<StIvtStructattr> list1 = list.stream().filter(r -> StringUtils.isNotBlank(r.getVehicle_code())).collect(Collectors.toList());
+        list1.stream().filter(r -> StringUtils.isNotBlank(r.getVehicle_code())).collect(Collectors.toList());
         Set<String> list2 = list.stream()
                 .filter(r -> StringUtils.isBlank(r.getVehicle_code()))
                 .map(StIvtStructattr::getStruct_code)
                 .collect(Collectors.toSet());
         if (ObjectUtils.isNotEmpty(list1)) {
+            if (ObjectUtils.isNotEmpty(structCodeSet)) {
+                UpdateWrapper<StIvtStructattr> updateWrapper = new UpdateWrapper<StIvtStructattr>()
+                        .set("lock_type", "98");
+                updateWrapper.and(wrapper -> {
+                    boolean first = true;
+                    for (String code : structCodeSet) {
+                        if (first) {
+                            wrapper.likeRight("struct_code", code);
+                            first = false;
+                        } else {
+                            wrapper.or().likeRight("struct_code", code);
+                        }
+                    }
+                });
+                this.update(updateWrapper);
+            }
+            //list1= list1.subList(0, Math.min(list.size(), 10));
             list1.forEach(r -> {
+                DELAY_EXECUTOR.execute(() -> {
+                    try {
+                        Thread.sleep(3000);
                         AtomicReference<String> moveStruct = new AtomicReference<>();
                         String vehicleCode = r.getVehicle_code();
                         RedissonUtils.lock(() -> {
@@ -505,11 +552,16 @@ public class StIvtStructattrServiceImpl extends ServiceImpl<StIvtStructattrMappe
                         Map moveForm = MapOf.of("task_type", StatusEnum.IOBILL_TYPE_MOVE.code("移库")
                                 , "is_send", false
                                 , "vehicle_code", StringUtils.isEmpty(vehicleCode) ? "YCZJ" + r.getVehicle_code() : vehicleCode, "form_data", new JSONObject(MapOf.of("start_struct_code", r.getStruct_code(), "end_struct_code", moveStruct.get())));
-
                         moveForm.put("isAllMove", "1");
                         SpringContextHolder.getBean(MoveStorageTask.class).createTask(new JSONObject(moveForm));
-            });
+                    } catch (InterruptedException e) {
+                        Thread.currentThread().interrupt();
+                        log.error("延迟任务被中断", e);
+                    } catch (Exception e) {
+                        log.error("延迟下发任务执行失败", e);
                     }
+                });
+            });
             if (ObjectUtils.isNotEmpty(list2)) {
                 LambdaUpdateWrapper<StIvtStructattr> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
                 lambdaUpdateWrapper.set(StIvtStructattr::getLock_type, "99");
@@ -518,3 +570,40 @@ public class StIvtStructattrServiceImpl extends ServiceImpl<StIvtStructattrMappe
             }
         }
     }
+
+//    @Override
+//    @Transactional
+//    public void createMoveTask(String structCodeList) {
+//        if (StringUtils.isBlank(structCodeList)) {
+//            return;
+//        }
+//        List<StIvtStructattr>  list1 =stIvtStructattrMapper.getMoveStruct();
+//        List<StIvtStructattr>  list2 = stIvtStructattrMapper.getMoveStructList();
+//        if (ObjectUtils.isNotEmpty(list1)) {
+//            list1.addAll(list2);
+//            list1.forEach(r -> {
+//                DELAY_EXECUTOR.execute(() -> {
+//                    try {
+//                        Thread.sleep(3000);
+//                        AtomicReference<String> moveStruct = new AtomicReference<>();
+//                        String vehicleCode = r.getVehicle_code();
+//                        RedissonUtils.lock(() -> {
+//                            Map process = SpringContextHolder.getBean(DecisionHandler.class).dispenseTransa(ListOf.of("limitStorage", "depthPriority", "alleyAve"), new JSONObject(MapOf.of("is_move", true, "stor_code", r.getStor_code(), "vehicle_code", vehicleCode, "errorTask", "errorTask")));
+//                            moveStruct.set(((Map<String, String>) process.get("form_data")).get("end_struct_code"));
+//                        }, "1" + r.getStor_code(), 5);
+//                        Map moveForm = MapOf.of("task_type", StatusEnum.IOBILL_TYPE_MOVE.code("移库")
+//                                , "is_send", false
+//                                , "vehicle_code", StringUtils.isEmpty(vehicleCode) ? "YCZJ" + r.getVehicle_code() : vehicleCode, "form_data", new JSONObject(MapOf.of("start_struct_code", r.getStruct_code(), "end_struct_code", moveStruct.get())));
+//                        moveForm.put("isAllMove", "1");
+//                        SpringContextHolder.getBean(MoveStorageTask.class).createTask(new JSONObject(moveForm));
+//                    } catch (InterruptedException e) {
+//                        Thread.currentThread().interrupt();
+//                        log.error("延迟任务被中断", e);
+//                    } catch (Exception e) {
+//                        log.error("延迟下发任务执行失败", e);
+//                    }
+//                });
+//            });
+        //}
+    //}
+}

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/monitor/impl/MonitorServiceImpl.java

@@ -53,18 +53,18 @@ public class MonitorServiceImpl implements MonitorService {
         Map<String, Object> resultMap = new LinkedHashMap<>(8);
         try {
             SystemInfo si = new SystemInfo();
-//            OperatingSystem os = si.getOperatingSystem();
+            OperatingSystem os = si.getOperatingSystem();
             HardwareAbstractionLayer hal = si.getHardware();
             // 系统信息
-            resultMap.put("sys", "getSystemInfo(os)");
+            resultMap.put("sys", getSystemInfo(os));
             // cpu 信息
-            resultMap.put("cpu", "getCpuInfo(hal.getProcessor())");
+            resultMap.put("cpu", getCpuInfo(hal.getProcessor()));
             // 内存信息
-            resultMap.put("memory", "getMemoryInfo(hal.getMemory())");
+            resultMap.put("memory", getMemoryInfo(hal.getMemory()));
             // 交换区信息
-            resultMap.put("swap", "getSwapInfo(hal.getMemory())");
+            resultMap.put("swap", getSwapInfo(hal.getMemory()));
             // 磁盘
-            resultMap.put("disk", "getDiskInfo(os)");
+            resultMap.put("disk", getDiskInfo(os));
             resultMap.put("time", DateUtil.format(new Date(), "HH:mm:ss"));
         } catch (Exception e) {
             e.printStackTrace();

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/task/TaskScheduleService.java

@@ -72,28 +72,27 @@ public class TaskScheduleService {
         boolean islock = lock.tryLock();
         try {
             if (islock) {
-                //定时任务，查询所有自动下发acs的任务与CTU出库完成的任务wwf
+                //定时任务，查询所有自动下发acs的任务与CTU出库完成的任务
                 List<SchBaseTask> taskList = iSchBaseTaskService.list(new LambdaQueryWrapper<SchBaseTask>().in(SchBaseTask::getStatus, ListOf.of("10", "15", "20")));
                 if (ObjectUtil.isEmpty(taskList)) {
                     return;
                 }
-                taskList = taskList.stream()
+                //                taskList = taskList.stream()
-                        .collect(Collectors.groupingBy(SchBaseTask::getVehicle_code))
+                //                        .collect(Collectors.groupingBy(SchBaseTask::getVehicle_code))
-                        .entrySet()
+                //                        .entrySet()
-                        .stream()
+                //                        .stream()
-                        .filter(r -> r.getValue().size() == 1)
+                //                        .filter(r -> r.getValue().size() == 1)
-                        .flatMap(r -> r.getValue().stream())
+                //                        .flatMap(r -> r.getValue().stream())
-                        .collect(Collectors.toList());
+                //                        .collect(Collectors.toList());
                 List<SchBaseTask> createTaskList = taskList.stream()
                         .filter(r -> r.getStatus().equals(StatusEnum.FORM_STATUS.code("生成")))
                         .sorted(Comparator.comparing(SchBaseTask::getCreate_time))
-                        .limit(15)
                         .collect(Collectors.toList());
                 //生成的任务处理
                 if (ObjectUtil.isNotEmpty(createTaskList)) {
                     // 优先发送移库任务
                     List<SchBaseTask> immediatelyTaskList = createTaskList.stream()
-                            .filter(r -> r.getTask_type().equals(StatusEnum.IOBILL_TYPE_MOVE.code("异常位移库")))
+                            .filter(r -> r.getTask_type().equals(StatusEnum.IOBILL_TYPE_MOVE.code("异常位移库"))||r.getTask_type().equals(StatusEnum.IOBILL_TYPE_MOVE.code("移库")))
                             .collect(Collectors.toList());
                     List<SchBaseTask> delayTaskList = new ArrayList<>(createTaskList);
                     delayTaskList.removeAll(immediatelyTaskList);
@@ -148,7 +147,7 @@ public class TaskScheduleService {
                         if (ObjectUtil.isNotEmpty(delayTaskList)) {
                             DELAY_EXECUTOR.execute(() -> {
                                 try {
-                                    Thread.sleep(2000);
+                                    Thread.sleep(4000);
                                     List<String> taskCodes = delayTaskList.stream().map(SchBaseTask::getTask_code).collect(Collectors.toList());
                                     log.info("---延迟下发任务: " + taskCodes);
                                     TableDataInfo response = wmsToAcsService.interationToExt(delayTaskList, "createTask");
@@ -174,25 +173,33 @@ public class TaskScheduleService {
         }
     }
     private void handleTaskResponse(TableDataInfo response, List<String> taskCodes) {
-        if (!response.getCode().equals(String.valueOf(HttpStatus.HTTP_OK))) {
+        if (response.getCode().equals(String.valueOf(HttpStatus.HTTP_OK))) {
+            iSchBaseTaskService.update(new UpdateWrapper<SchBaseTask>()
+                    .set("status", StatusEnum.FORM_STATUS.code("下发"))
+                    .in("task_code", taskCodes));
+        } else {
             JSONArray results = (JSONArray) JSON.toJSON(response.getData());
             if (!CollectionUtils.isEmpty(results)) {
                 for (Object result : results) {
                     Map resultM = (Map) result;
-                    taskCodes.remove(resultM.get("task_code"));
+                    UpdateWrapper<SchBaseTask> updateWrapper = new UpdateWrapper<SchBaseTask>();
-                    iSchBaseTaskService.update(new UpdateWrapper<SchBaseTask>()
+                    updateWrapper.eq("task_code", resultM.get("task_code"))
-                            .eq("task_code", resultM.get("task_code"))
-                            .set("status", StatusEnum.FORM_STATUS.code("暂停"))
                             .set("update_time", DateUtil.now())
-                            .set("remark", resultM.get("msg")));
+                            .set("remark", resultM.get("msg"));
+                    if (resultM.get("msg").toString().contains("存在相同的任务号")) {
+                        updateWrapper.set("status", StatusEnum.FORM_STATUS.code("下发"));
+                    } else {
+                        updateWrapper.set("status", StatusEnum.FORM_STATUS.code("暂停"));
+                    }
+                    iSchBaseTaskService.update(updateWrapper);
                 }
             }
         }
-        if (!CollectionUtils.isEmpty(taskCodes)) {
+        //        if (!CollectionUtils.isEmpty(taskCodes)) {
-            iSchBaseTaskService.update(new UpdateWrapper<SchBaseTask>()
+        //            iSchBaseTaskService.update(new UpdateWrapper<SchBaseTask>()
-                    .set("status", StatusEnum.FORM_STATUS.code("下发"))
+        //                    .set("status", StatusEnum.FORM_STATUS.code("下发"))
-                    .in("task_code", taskCodes));
+        //                    .in("task_code", taskCodes));
-        }
+        //        }
     }
 
 }

wms_pro/qd/src/views/monitor/server/index.vue

@@ -223,8 +223,8 @@ export default {
     this.monitor = window.setInterval(() => {
       setTimeout(() => {
         this.init()
-      }, 2)
+      }, 7)
-    }, 3500)
+    }, 9500)
   },
   destroyed() {
     clearInterval(this.monitor)

wms_pro/qd/src/views/wms/early_manage/deferral_early/index.vue

@@ -27,7 +27,7 @@
               <el-option
                 v-for="item in storList"
                 :key="item.stor_id"
-                :label="item.stor_code"
+                :label="item.stor_name"
                 :value="item.stor_code"
               />
             </el-select>

wms_pro/qd/src/views/wms/early_manage/early_data/index.vue

@@ -11,23 +11,23 @@
           label-width="90px"
           label-suffix=":"
         >
-          <el-form-item label="消息类型">
+          <!--          <el-form-item label="消息类型">-->
-            <el-select
+          <!--            <el-select-->
-              v-model="query.early_type"
+          <!--              v-model="query.early_type"-->
-              placeholder="请选择类型"
+          <!--              placeholder="请选择类型"-->
-              clearable
+          <!--              clearable-->
-              filterable
+          <!--              filterable-->
-              size="mini"
+          <!--              size="mini"-->
-              class="filter-item"
+          <!--              class="filter-item"-->
-              style="width: 185px;">
+          <!--              style="width: 185px;">-->
-              <el-option
+          <!--              <el-option-->
-                v-for="item in form_types"
+          <!--                v-for="item in form_types"-->
-                :key="item.value"
+          <!--                :key="item.value"-->
-                :label="item.label"
+          <!--                :label="item.label"-->
-                :value="item.value">
+          <!--                :value="item.value">-->
-              </el-option>
+          <!--              </el-option>-->
-            </el-select>
+          <!--            </el-select>-->
-          </el-form-item>
+          <!--          </el-form-item>-->
           <el-form-item label="仓库编码">
             <el-select
               v-model="query.stor_code"
@@ -36,24 +36,24 @@
               filterable
               size="mini"
               class="filter-item"
-              style="width: 185px;">
+              style="width: 185px;"
+            >
               <el-option
                 v-for="item in storList"
                 :key="item.id"
-                :label="item.stor_code"
+                :label="item.stor_name"
-                :value="item.stor_code">
+                :value="item.stor_code"
-              </el-option>
+              />
             </el-select>
           </el-form-item>
           <el-form-item label="载具编码">
-            <el-input clearable v-model="query.vehicle_code" style="width: 185px;"/>
+            <el-input v-model="query.vehicle_code" clearable style="width: 185px;" />
           </el-form-item>
           <rrOperation :crud="crud" />
         </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission">
+      <crudOperation :permission="permission" />
-      </crudOperation>
       <!--表单组件-->
       <el-dialog
         :close-on-click-modal="false"
@@ -91,8 +91,8 @@
             <el-col>
               <el-form-item label="是否含有子表" prop="class_name">
                 <el-radio-group v-model="form.has_child" style="width: 140px">
-                  <el-radio label=true>是</el-radio>
+                  <el-radio label="true">是</el-radio>
-                  <el-radio label=false>否</el-radio>
+                  <el-radio label="false">否</el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-col>
@@ -156,7 +156,7 @@
             </el-col>
           </el-row>
           <el-form-item label="自定义映射" prop="class_desc">
-            <el-input type="textarea" v-model="form.form_param" style="width: 370px;"/>
+            <el-input v-model="form.form_param" type="textarea" style="width: 370px;" />
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
@@ -173,10 +173,8 @@
         row-key="id"
       >
         <el-table-column type="selection" width="55" />
-        <el-table-column prop="early_type" label="消息类型" min-width="150" show-tooltip-when-overflow>
+        <el-table-column prop="early_type" label="消息类型" min-width="150" show-tooltip-when-overflow />
-        </el-table-column>
+        <el-table-column prop="is_read" label="是否处理" min-width="150" :formatter="formatIsRead" show-tooltip-when-overflow />
-        <el-table-column prop="is_read" label="是否处理" min-width="150" :formatter="formatIsRead" show-tooltip-when-overflow>
-        </el-table-column>
         <el-table-column prop="stor_code" label="仓库编码" min-width="150" show-tooltip-when-overflow />
         <el-table-column prop="vehicle_code" label="载具编码" min-width="150" show-tooltip-when-overflow />
         <el-table-column v-if="false" prop="material_id" label="物料标识" min-width="150" show-tooltip-when-overflow />
@@ -220,7 +218,6 @@ import pagination from '@crud/Pagination'
 import UploadDialog from './UploadDialog'
 import crudStorattr from '@/views/wms/base_manage/stor/storattr'
 
-
 const defaultForm = {
   id: null,
   early_type: null,
@@ -257,7 +254,7 @@ export default {
       uploadShow: false,
       form_types: [],
       permission: {},
-      storList: [],
+      storList: []
     }
   },
   created() {
@@ -280,7 +277,7 @@ export default {
       return ''
     },
     formatIsRead(row, column, cellValue) {
-      return cellValue ? '已处理' : '未处理';
+      return cellValue ? '已处理' : '未处理'
     }
   }
 }

wms_pro/qd/src/views/wms/early_manage/early_inv/index.vue

@@ -22,13 +22,14 @@
               filterable
               size="mini"
               class="filter-item"
-              style="width: 185px;">
+              style="width: 185px;"
+            >
               <el-option
                 v-for="item in storList"
                 :key="item.id"
-                :label="item.stor_code"
+                :label="item.stor_name"
-                :value="item.stor_code">
+                :value="item.stor_code"
-              </el-option>
+              />
             </el-select>
           </el-form-item>
           <rrOperation :crud="crud" />
@@ -69,9 +70,9 @@
                   <el-option
                     v-for="item in storList"
                     :key="item.id"
-                    :label="item.stor_code"
+                    :label="item.stor_name"
-                    :value="item.stor_code">
+                    :value="item.stor_code"
-                  </el-option>
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -104,16 +105,16 @@
             <el-col :span="12">
               <el-form-item label="通知类型" prop="notice_type">
                 <el-radio-group v-model="form.notice_type" style="width: 150px">
-                  <el-radio label=1>站内信</el-radio>
+                  <el-radio label="1">站内信</el-radio>
-                  <el-radio label=2>微信</el-radio>
+                  <el-radio label="2">微信</el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="是否启用" prop="is_used">
                 <el-radio-group v-model="form.is_used" style="width: 150px">
-                  <el-radio label=true>是</el-radio>
+                  <el-radio label="true">是</el-radio>
-                  <el-radio label=false>否</el-radio>
+                  <el-radio label="false">否</el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-col>
@@ -121,14 +122,14 @@
           <el-row>
             <el-col :span="24">
               <el-form-item label="自定义映射" prop="ext_json">
-                <el-input type="textarea" v-model="form.ext_json" style="width: 430px;"/>
+                <el-input v-model="form.ext_json" type="textarea" style="width: 430px;" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="24">
               <el-form-item label="备注" prop="remark">
-                <el-input type="textarea" v-model="form.remark" style="width: 430px;"/>
+                <el-input v-model="form.remark" type="textarea" style="width: 430px;" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -190,7 +191,7 @@
       <pagination />
     </div>
     <ViewDialog ref="itemview" />
-    <EditDialog ref="editDialog" @editChanged="crud.toQuery()" :dialog-show.sync="editShow"/>
+    <EditDialog ref="editDialog" :dialog-show.sync="editShow" @editChanged="crud.toQuery()" />
     <UploadDialog :dialog-show.sync="uploadShow" @tableChanged3="crud.toQuery()" />
   </div>
 </template>
@@ -255,7 +256,7 @@ export default {
         ],
         safety_day: [
           { required: true, message: '安全库存天数不能为空', trigger: 'blur' }
-        ],
+        ]
       }
     }
   },
@@ -293,7 +294,7 @@ export default {
     edit(row) {
       this.$refs.editDialog.setForm(row)
       this.editShow = true
-    },
+    }
   }
 }
 </script>

wms_pro/qd/src/views/wms/md_manage/group_dick/index.vue

@@ -43,12 +43,13 @@
           </el-form-item>
           <el-form-item label="组盘日期">
             <el-date-picker
-              v-model="query.create_time"
+              v-model="query.createTime"
               :default-time="['00:00:00','23:59:59']"
               end-placeholder="结束日期"
               start-placeholder="开始日期"
               type="daterange"
-              value-format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              @change="crud.toQuery"
             />
           </el-form-item>
           <el-form-item label=" 组盘状态">
@@ -257,6 +258,7 @@ export default {
   },
   methods: {
     [CRUD.HOOK.beforeRefresh]() {
+      this.setDefaultDate()
       formstruc.getHeader('md_group_dick').then(res => {
         this.cols = res
         res.forEach(a => {
@@ -270,6 +272,21 @@ export default {
     vechile(row) {
       this.$refs.viewRef.setForm(row)
     },
+    setDefaultDate() {
+      const now = new Date()
+      const lastWeek = new Date()
+      lastWeek.setDate(now.getDate() - 1)
+      const format = (date, time) => {
+        const yyyy = date.getFullYear()
+        const mm = String(date.getMonth() + 1).padStart(2, '0')
+        const dd = String(date.getDate()).padStart(2, '0')
+        return `${yyyy}-${mm}-${dd} ${time}`
+      }
+      const start_time = format(lastWeek, '00:00:00')
+      const end_time = format(now, '23:59:59')
+      this.query.start_time = start_time
+      this.query.end_time = end_time
+    },
     editStatus(row) {
       this.editForm = row,
       this.statusEdit = true

wms_pro/qd/src/views/wms/stor_manage/storIvtInfo/index.vue

@@ -34,6 +34,7 @@
               placeholder="请输入仓位信息"
               prefix-icon="el-icon-search"
               class="filter-item"
+              :style="{ width: '400px' }"
               @input="handleSearchInput('search')"
             />
           </el-form-item>
@@ -407,10 +408,11 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-      structattr.createMoveTask(this.crud.selections).then(res => {
+        structattr.createMoveTask(this.query.search).then(res => {
           this.crud.notify('批量移库任务下发成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
           this.crud.toQuery()
-      })})
+        })
+      })
     }
   }
 }