diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/enums/StatusEnum.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/enums/StatusEnum.java index 61d9c1c2..764ec832 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/enums/StatusEnum.java +++ b/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)), diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/InterationUtil.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/InterationUtil.java index d6f397c7..aeafac59 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/InterationUtil.java +++ b/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"))){ - String error = ""; - if (response.get("data")!=null){ - JSONArray data = response.getJSONArray("data"); - for (int i = 0; i < data.size(); i++) { - JSONObject item = data.getJSONObject(i); - error = error+"_"+item.getString("task_code") + ":" + item.getString("msg"); - } - }else { - error = response.getString("msg"); - } - throw new BadRequestException("acs返回错误："+error); - } + // if (!"200".equals(response.getString("code"))){ + // String error = ""; + // if (response.get("data")!=null){ + // JSONArray data = response.getJSONArray("data"); + // for (int i = 0; i < data.size(); i++) { + // JSONObject item = data.getJSONObject(i); + // error = error+"_"+item.getString("task_code") + ":" + item.getString("msg"); + // } + // }else { + // error = response.getString("msg"); + // } + // throw new BadRequestException("acs返回错误："+error); + // } return response.toJavaObject(TableDataInfo.class); } catch (Exception ex) { log.error("ACS反馈异常----------------------------------------+"+api+",---"+ex.getMessage()); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/decisioner/impl/base/AlleyAveRuleHandler.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/decisioner/impl/base/AlleyAveRuleHandler.java index 8bba3711..0d1ae0eb 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/decisioner/impl/base/AlleyAveRuleHandler.java +++ b/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 log.error("均衡策略结果：载具号：" + param.getString("vehicle_code") + "当前分配策略货位数量为0"); return Collections.emptyList(); } + //防止多线程并发分配异常 + //Collections.reverse(subList); + Collections.shuffle(subList); return subList; } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/decisioner/impl/diy/DepthPriorityHandler.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/decisioner/impl/diy/DepthPriorityHandler.java index c83fd6b6..3f0d1455 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/decisioner/impl/diy/DepthPriorityHandler.java +++ b/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,86 +66,94 @@ public class DepthPriorityHandler extends Decisioner getOtherStructattr(List list, JSONObject param, long startTime1, List depCollect) { - // if (!depCollect.isEmpty()) { - // log.info("深位优先策略：载具号：" + param.getString("vehicle_code") + "分配结果: 存在深位无货但对应浅位有货的库位，需要移库，分配仓位：" + depCollect.get(0).getStruct_code()); - // log.info("深位优先策略：获取深货位无货且浅货位有货仓位耗时:{}", System.currentTimeMillis() - startTime1); - // return depCollect; - // } + private static List getOtherStructattr(List list, JSONObject param, long startTime1, List shallowCollect) { //浅货位，则需要判断对应 IStIvtStructattrService iStIvtStructattrService = SpringContextHolder.getBean(IStIvtStructattrService.class); if (list.get(0).getStor_code().equals(StatusEnum.STOCK_INFO.code("料箱库"))) { //深位有任务不可分配 - ISchBaseTaskService iSchBaseTaskService = SpringContextHolder.getBean(ISchBaseTaskService.class); - List taskList = iSchBaseTaskService.list( - new LambdaQueryWrapper() - .lt(SchBaseTask::getStatus, StatusEnum.FORM_STATUS.code("完成")) - .select(SchBaseTask::getPoint_code1, SchBaseTask::getPoint_code2) - ); - Set pointCodes = taskList.stream() - .flatMap(t -> Stream.of(t.getPoint_code1(), t.getPoint_code2())) - .filter(Objects::nonNull) - .collect(Collectors.toSet()); +// ISchBaseTaskService iSchBaseTaskService = SpringContextHolder.getBean(ISchBaseTaskService.class); +// List taskList = iSchBaseTaskService.list( +// new LambdaQueryWrapper() +// .lt(SchBaseTask::getStatus, StatusEnum.FORM_STATUS.code("完成")) +// .select(SchBaseTask::getPoint_code1, SchBaseTask::getPoint_code2) +// ); +// Set pointCodes = taskList.stream() +// .flatMap(t -> Stream.of(t.getPoint_code1(), t.getPoint_code2())) +// .filter(Objects::nonNull) +// .collect(Collectors.toSet()); + // log.error("深位优先策略：深货位有货且浅货位无货：载具号：" + param.getString("vehicle_code") + "查询正在执行的起点终点集合为："+pointCodes); + //1排 List list1 = iStIvtStructattrService.list(new LambdaUpdateWrapper() - .in(StIvtStructattr::getRow_num, Arrays.asList(1, 4)) + .eq(StIvtStructattr::getRow_num, "1") + .eq(StIvtStructattr::getLock_type, StatusEnum.LOCK.code("无锁")) + .isNotNull(StIvtStructattr::getVehicle_code) .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()); + .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排 - if (!list1.isEmpty()) { - List combinedResult = new ArrayList<>(); - //1排 - List deepCollect1 = list1.stream() - .filter(a -> a.getRow_num() == 1) + List combinedResult = new ArrayList<>(); + List shallowCollect1 = shallowCollect.stream() + .filter(a -> a.getRow_num() == 2) + .collect(Collectors.toList()); + Set deepCollect1Set = list1.stream() + .map(r -> r.getCol_num() + "_" + r.getLayer_num()) + .collect(Collectors.toSet()); + List intersection1 = shallowCollect1.stream() + .filter(r -> deepCollect1Set.contains(r.getCol_num() + "_" + r.getLayer_num())) + .collect(Collectors.toList()); + if (!intersection1.isEmpty()) { + combinedResult.addAll(intersection1); + } else { + //4排 + List list2 = iStIvtStructattrService.list(new LambdaUpdateWrapper() + .eq(StIvtStructattr::getRow_num, "4") + .eq(StIvtStructattr::getLock_type, StatusEnum.LOCK.code("无锁")) + .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 shallowCollect2 = shallowCollect.stream() + .filter(a -> a.getRow_num() == 3) .collect(Collectors.toList()); - List shallowCollect1 = list.stream() - .filter(a -> a.getRow_num() == 2) - .collect(Collectors.toList()); - Set deepCollect1Set = deepCollect1.stream() + Set deepCollect2Set = list2.stream() .map(r -> r.getCol_num() + "_" + r.getLayer_num()) .collect(Collectors.toSet()); - List intersection1 = shallowCollect1.stream() - .filter(r ->deepCollect1Set.contains(r.getCol_num() + "_" + r.getLayer_num())) + List intersection2 = shallowCollect2.stream() + .filter(r -> deepCollect2Set.contains(r.getCol_num() + "_" + r.getLayer_num())) .collect(Collectors.toList()); - if (!intersection1.isEmpty()) { - combinedResult.addAll(intersection1); - } else { - //4排 - List deepCollect2 = list1.stream() - .filter(a -> a.getRow_num() == 4) - .collect(Collectors.toList()); - List shallowCollect2 = list.stream() - .filter(a -> a.getRow_num() == 3) - .collect(Collectors.toList()); - Set deepCollect2Set = deepCollect2.stream() - .map(r -> r.getCol_num() + "_" + r.getLayer_num()) - .collect(Collectors.toSet()); - List intersection2 = shallowCollect2.stream() - .filter(r -> deepCollect2Set.contains(r.getCol_num() + "_" + r.getLayer_num())) - .collect(Collectors.toList()); - combinedResult.addAll(intersection2); - } - if (CollectionUtils.isEmpty(combinedResult)) { - log.error("深位优先策略：获取深货位有货且浅货位无货仓位：载具号：" + param.getString("vehicle_code") + "获取仓位失败，该策略对应库位数量为0！"); + combinedResult.addAll(intersection2); + } + if (combinedResult.size() < 30) { + ISchBaseTaskService iSchBaseTaskService = SpringContextHolder.getBean(ISchBaseTaskService.class); + List taskList = iSchBaseTaskService.list( + new LambdaQueryWrapper() + .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(); } + log.info("深位优先策略：载具号：" + param.getString("vehicle_code") + "分配结果: 深货位有货且浅货位无货仓位，无需移库，分配仓位：" + combinedResult.get(0).getStruct_code()); + log.info("深位优先策略：获取深货位有货且浅货位无货仓位耗时:{}", System.currentTimeMillis() - startTime1); + return combinedResult; } else { return list; } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/MoveStorageTask.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/MoveStorageTask.java index 86a78de9..4b85b1bd 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/MoveStorageTask.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/MoveStorageTask.java @@ -58,27 +58,27 @@ public class MoveStorageTask extends AbstractTask { String isAllMove = from.getString("isAllMove"); List list = taskService.list(new QueryWrapper().eq("vehicle_code", vehicle_code) .lt("status", StatusEnum.FORM_STATUS.code("完成"))); - if (!CollectionUtils.isEmpty(list)){ - throw new BadRequestException("当前载具存在任务:"+list.stream().map(SchBaseTask::getTask_code).collect(Collectors.joining(","))); + if (!CollectionUtils.isEmpty(list)) { + throw new BadRequestException("当前载具存在任务:" + list.stream().map(SchBaseTask::getTask_code).collect(Collectors.joining(","))); } StIvtStructattr target = iStIvtStructattrService.getOne(new QueryWrapper().eq("struct_code", end_struct_code)); - if (StringUtils.isNotEmpty(target.getVehicle_code())){ - throw new BadRequestException("目标货位存在载具:"+target.getVehicle_code()); + if (StringUtils.isNotEmpty(target.getVehicle_code())) { + throw new BadRequestException("目标货位存在载具:" + target.getVehicle_code()); } String now = DateUtil.now(); iStIvtStructattrService.update(new UpdateWrapper() - .set("lock_type",StatusEnum.LOCK.code("移库锁")) - .set("update_time", now) - .in("struct_code",start_struct_code,end_struct_code)); - log.info("载具号{}移库任务创建成功，库位{}{}已更新移库锁。",vehicle_code,start_struct_code,end_struct_code); + .set("lock_type", StatusEnum.LOCK.code("移库锁")) + .set("update_time", now) + .in("struct_code", start_struct_code, end_struct_code)); + log.info("载具号{}移库任务创建成功，库位{}{}已更新移库锁。", vehicle_code, start_struct_code, end_struct_code); SchBaseTask task = new SchBaseTask(); - task.setId(IdUtil.getStringId()); - task.setPriority(StatusEnum.PRIORITY_TYPE.code("移库")); + task.setId(IdUtil.getStringId()); + task.setPriority(StatusEnum.PRIORITY_TYPE.code("移库")); 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.setCreate_time(now); + task.setAcs_type(end_struct_code.contains("B") ? StatusEnum.ACS_TYPE.code("三楼CTU") : StatusEnum.ACS_TYPE.code("立库")); + 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() .set("lock_type", StatusEnum.LOCK.code("临时锁")) .eq("struct_code", schBaseTask.getPoint_code1()) ); + List taskList = taskService.list(new QueryWrapper().eq("source_form_id", "99").lt("status", StatusEnum.FORM_STATUS.code("完成"))); + //移库任务完成，解锁需要维护不能分配的区域 + if (taskList.size() == 0) { + UpdateWrapper 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().eq("task_code", data.getString("task_code"))); + UpdateWrapper 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); } } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_msg/dao/AlmEarlyMsg.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_msg/dao/AlmEarlyMsg.java index bf845b74..d20333ed 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_msg/dao/AlmEarlyMsg.java +++ b/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; /** * 创建时间 diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_msg/dao/mapper/AlmEarlyMsgMapper.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_msg/dao/mapper/AlmEarlyMsgMapper.java index 22929d86..fee88910 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_msg/dao/mapper/AlmEarlyMsgMapper.java +++ b/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; + /** *

* 仓库报警消息表 Mapper 接口 @@ -13,5 +15,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @since 2024-04-09 */ public interface AlmEarlyMsgMapper extends BaseMapper { - + List getAllMsg(); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_msg/dao/mapper/xml/AlmEarlyMsgMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_msg/dao/mapper/xml/AlmEarlyMsgMapper.xml index 2ad9fefa..13b6fae5 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_msg/dao/mapper/xml/AlmEarlyMsgMapper.xml +++ b/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 @@ + diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_msg/impl/AlmEarlyMsgServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_msg/impl/AlmEarlyMsgServiceImpl.java index b88a86ca..d2271181 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_msg/impl/AlmEarlyMsgServiceImpl.java +++ b/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 almMsgQueryPage = this.page(page.build(), query.build()); + List list =almEarlyMsgMapper.getAllMsg(); long total = almMsgQueryPage.getTotal(); List 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; } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/listen/EarlyEventListener.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/listen/EarlyEventListener.java index b448bdda..fb8541b6 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/listen/EarlyEventListener.java +++ b/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 { 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); - if (sumQty < safety_min_qty || sumQty > safety_max_qty) { + BigDecimal sumQty = mdPbVehicleMaterService.getQtySumByMaterial(material_id); + 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()); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/tasks/AutoDeferralNotice.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/tasks/AutoDeferralNotice.java index ac12942a..fc29ccbb 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/tasks/AutoDeferralNotice.java +++ b/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,29 +63,47 @@ public class AutoDeferralNotice { List mdPbVehicleMaters = mdPbVehicleMaterService.list(mdPbVehicleMaterLambdaQueryWrapper); List filteredMdPbVehicleMaters = mdPbVehicleMaters.stream() .filter(mater -> { - long daysBetween = DateUtil.betweenDay(DateUtil.parse(mater.getUpdate_time()), DateUtil.parse(DateUtil.now()), true); - return daysBetween > almEarlyDeferral.getStay_days(); + 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) { - 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.setCreate_time(DateUtil.now()); - almEarlyMsg.setVehicle_code(filteredMdPbVehicleMater.getVehicle_code()); - almEarlyMsg.setPcsn(filteredMdPbVehicleMater.getPcsn()); - almEarlyMsgService.save(almEarlyMsg); - MdMeMaterialbase materialbase = materialbaseService.getById(filteredMdPbVehicleMater.getMaterial_id()); - String msg = "仓库: " + almEarlyDeferral.getStor_code() + ", 物料: " + materialbase.getMaterial_code() - + ", 在仓库呆料时间已超过 " + almEarlyDeferral.getStay_days() + "天"; - noticeService.createNotice(msg, "呆料预警", - NoticeTypeEnum.NOTIFICATION.getCode()); - NotificationFactory.getNotification(almEarlyDeferral.getNotice_type()).send(""); + 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()); + 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); + } } } } -} +} \ No newline at end of file diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/mapper/xml/MdGruopDickMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/mapper/xml/MdGruopDickMapper.xml index 03faec8e..ba039f3e 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/mapper/xml/MdGruopDickMapper.xml +++ b/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 @@ and d.pcsn = #{query.pcsn} - + + AND d.create_time #{query.end_time} + + + AND d.create_time =]]> #{query.start_time} + and d.status = #{query.status} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dto/GroupDickQuery.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dto/GroupDickQuery.java index 14da7855..883724c6 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dto/GroupDickQuery.java +++ b/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 { private String pcsn; private String status; private String billCode; + private String start_time; + private String end_time; private Map form_query; } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/IMdPbVehicleMaterService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/IMdPbVehicleMaterService.java index 32e99d08..392be708 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/IMdPbVehicleMaterService.java +++ b/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 { - Integer getQtySumByMaterial(String material_id); + java.math.BigDecimal getQtySumByMaterial(String material_id); MdPbVehicleMater getGroupMst(String vehicle_code); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/dao/mapper/MdPbVehicleMaterMapper.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/dao/mapper/MdPbVehicleMaterMapper.java index 60b65065..648b47ba 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/dao/mapper/MdPbVehicleMaterMapper.java +++ b/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 { @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 getVehicleMaters(String vehicle_code); List getCheckMaters(String vehicle_code); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/impl/MdPbVehicleMaterServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/impl/MdPbVehicleMaterServiceImpl.java index aa924481..e5a26303 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/impl/MdPbVehicleMaterServiceImpl.java +++ b/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 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); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/controller/StIvtStructattrController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/controller/StIvtStructattrController.java index 719c8ff5..dc44d990 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/controller/StIvtStructattrController.java +++ b/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 createMoveTask(@RequestBody List> taskList) { - structattrService.createMoveTask(taskList); + public ResponseEntity createMoveTask(@RequestBody String structCodeList) { + structattrService.createMoveTask(structCodeList); return new ResponseEntity<>(HttpStatus.OK); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/IStIvtStructattrService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/IStIvtStructattrService.java index 2b2f85f5..dcbd5099 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/IStIvtStructattrService.java +++ b/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 { void createIdleTask( List> taskList); - void createMoveTask( List> taskList); + void createMoveTask(String structCodeList); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/StIvtStructattrMapper.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/StIvtStructattrMapper.java index 724c0d5b..92e6b04e 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/StIvtStructattrMapper.java +++ b/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 { Long getIoBillCounts(@Param("vehicleCode") String vehicleCode); + List getMoveStruct(); + + List getMoveStructList(); + } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/xml/StIvtStructattrMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/xml/StIvtStructattrMapper.xml index 23c3a18c..675927fe 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/xml/StIvtStructattrMapper.xml +++ b/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 + + + diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/impl/StIvtStructattrServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/impl/StIvtStructattrServiceImpl.java index 683f4e85..c48e8fe9 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/impl/StIvtStructattrServiceImpl.java +++ b/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 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 0) { page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize()); @@ -467,54 +479,131 @@ public class StIvtStructattrServiceImpl extends ServiceImpl> taskList) { - if (CollectionUtils.isEmpty(taskList)) { + public void createMoveTask(String structCodeList) { + if (StringUtils.isBlank(structCodeList)) { return; } - String structCode = taskList.get(0).get("struct_code").toString(); + Set 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 query1 = new QueryWrapper() - .nested(qw -> qw.likeRight("point_code1", structCode.substring(0, structCode.lastIndexOf("-"))) - .or() - .likeRight("point_code2", structCode.substring(0, structCode.lastIndexOf("-")))) + .likeRight("point_code1", structCodeQuery) .lt("status", StatusEnum.FORM_STATUS.code("完成")); List schBaseTaskList = taskService.list(query1); if (!CollectionUtils.isEmpty(schBaseTaskList)) { throw new BadRequestException("当前同排同列库位在任务，请完成后再下发批量移库任务"); } + //L01-02,L02-03,L03-01,L02-04 QueryWrapper query = new QueryWrapper() .eq("is_used", true) - .likeRight("struct_code", structCode.substring(0, structCode.lastIndexOf("-"))) + .likeRight("struct_code", structCodeQuery) .eq("stor_code", StatusEnum.STOCK_INFO.code("料箱库")); List list = this.list(query); List 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 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 updateWrapper = new UpdateWrapper() + .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 -> { - AtomicReference moveStruct = new AtomicReference<>(); - String vehicleCode = r.getVehicle_code(); - RedissonUtils.lock(() -> { - System.out.println("---3--" + Thread.currentThread().getName()); - //出阻挡说明是同排跟任务一个类型载具 - 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) 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)); + DELAY_EXECUTOR.execute(() -> { + try { + Thread.sleep(3000); + AtomicReference moveStruct = new AtomicReference<>(); + String vehicleCode = r.getVehicle_code(); + RedissonUtils.lock(() -> { + System.out.println("---3--" + Thread.currentThread().getName()); + //出阻挡说明是同排跟任务一个类型载具 + 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) 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); + } + }); }); - } - if (ObjectUtils.isNotEmpty(list2)) { - LambdaUpdateWrapper lambdaUpdateWrapper = new LambdaUpdateWrapper<>(); - lambdaUpdateWrapper.set(StIvtStructattr::getLock_type, "99"); - lambdaUpdateWrapper.in(StIvtStructattr::getStruct_code, list2); - this.update(lambdaUpdateWrapper); + if (ObjectUtils.isNotEmpty(list2)) { + LambdaUpdateWrapper lambdaUpdateWrapper = new LambdaUpdateWrapper<>(); + lambdaUpdateWrapper.set(StIvtStructattr::getLock_type, "99"); + lambdaUpdateWrapper.in(StIvtStructattr::getStruct_code, list2); + this.update(lambdaUpdateWrapper); + } } } + +// @Override +// @Transactional +// public void createMoveTask(String structCodeList) { +// if (StringUtils.isBlank(structCodeList)) { +// return; +// } +// List list1 =stIvtStructattrMapper.getMoveStruct(); +// List list2 = stIvtStructattrMapper.getMoveStructList(); +// if (ObjectUtils.isNotEmpty(list1)) { +// list1.addAll(list2); +// list1.forEach(r -> { +// DELAY_EXECUTOR.execute(() -> { +// try { +// Thread.sleep(3000); +// AtomicReference 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) 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); +// } +// }); +// }); + //} + //} } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/monitor/impl/MonitorServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/monitor/impl/MonitorServiceImpl.java index c5953f92..005406a2 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/monitor/impl/MonitorServiceImpl.java +++ b/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 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(); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/task/TaskScheduleService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/task/TaskScheduleService.java index beb45719..86a5f8c6 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/task/TaskScheduleService.java +++ b/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 taskList = iSchBaseTaskService.list(new LambdaQueryWrapper().in(SchBaseTask::getStatus, ListOf.of("10", "15", "20"))); if (ObjectUtil.isEmpty(taskList)) { return; } - taskList = taskList.stream() - .collect(Collectors.groupingBy(SchBaseTask::getVehicle_code)) - .entrySet() - .stream() - .filter(r -> r.getValue().size() == 1) - .flatMap(r -> r.getValue().stream()) - .collect(Collectors.toList()); + // taskList = taskList.stream() + // .collect(Collectors.groupingBy(SchBaseTask::getVehicle_code)) + // .entrySet() + // .stream() + // .filter(r -> r.getValue().size() == 1) + // .flatMap(r -> r.getValue().stream()) + // .collect(Collectors.toList()); List 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 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 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 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 taskCodes) { - if (!response.getCode().equals(String.valueOf(HttpStatus.HTTP_OK))) { + if (response.getCode().equals(String.valueOf(HttpStatus.HTTP_OK))) { + iSchBaseTaskService.update(new UpdateWrapper() + .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")); - iSchBaseTaskService.update(new UpdateWrapper() - .eq("task_code", resultM.get("task_code")) - .set("status", StatusEnum.FORM_STATUS.code("暂停")) + UpdateWrapper updateWrapper = new UpdateWrapper(); + updateWrapper.eq("task_code", resultM.get("task_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)) { - iSchBaseTaskService.update(new UpdateWrapper() - .set("status", StatusEnum.FORM_STATUS.code("下发")) - .in("task_code", taskCodes)); - } + // if (!CollectionUtils.isEmpty(taskCodes)) { + // iSchBaseTaskService.update(new UpdateWrapper() + // .set("status", StatusEnum.FORM_STATUS.code("下发")) + // .in("task_code", taskCodes)); + // } } } diff --git a/wms_pro/qd/src/views/monitor/server/index.vue b/wms_pro/qd/src/views/monitor/server/index.vue index 920861ea..4efcd7b7 100644 --- a/wms_pro/qd/src/views/monitor/server/index.vue +++ b/wms_pro/qd/src/views/monitor/server/index.vue @@ -223,8 +223,8 @@ export default { this.monitor = window.setInterval(() => { setTimeout(() => { this.init() - }, 2) - }, 3500) + }, 7) + }, 9500) }, destroyed() { clearInterval(this.monitor) diff --git a/wms_pro/qd/src/views/wms/early_manage/deferral_early/index.vue b/wms_pro/qd/src/views/wms/early_manage/deferral_early/index.vue index 564527cb..d501578c 100644 --- a/wms_pro/qd/src/views/wms/early_manage/deferral_early/index.vue +++ b/wms_pro/qd/src/views/wms/early_manage/deferral_early/index.vue @@ -27,7 +27,7 @@ diff --git a/wms_pro/qd/src/views/wms/early_manage/early_data/index.vue b/wms_pro/qd/src/views/wms/early_manage/early_data/index.vue index ca057403..d631bb87 100644 --- a/wms_pro/qd/src/views/wms/early_manage/early_data/index.vue +++ b/wms_pro/qd/src/views/wms/early_manage/early_data/index.vue @@ -11,23 +11,23 @@ label-width="90px" label-suffix=":" > - - - - - - + + + + + + + + + + + + + + + + + + style="width: 185px;" + > - + :label="item.stor_name" + :value="item.stor_code" + /> - + - + - - + - + - + - + - + @@ -91,8 +91,8 @@ - 是 - 否 + 是 + 否 @@ -114,49 +114,49 @@ - + - + - + - + - + - + - + - + - +
@@ -172,20 +172,18 @@ :data="crud.data" row-key="id" > - - - - - - - - - - - - - - + + + + + + + + + + + + - +
- + diff --git a/wms_pro/qd/src/views/wms/md_manage/group_dick/index.vue b/wms_pro/qd/src/views/wms/md_manage/group_dick/index.vue index 02f294c5..5672a65e 100644 --- a/wms_pro/qd/src/views/wms/md_manage/group_dick/index.vue +++ b/wms_pro/qd/src/views/wms/md_manage/group_dick/index.vue @@ -43,12 +43,13 @@ @@ -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 diff --git a/wms_pro/qd/src/views/wms/stor_manage/storIvtInfo/index.vue b/wms_pro/qd/src/views/wms/stor_manage/storIvtInfo/index.vue index 6be98c2e..0d5a382c 100644 --- a/wms_pro/qd/src/views/wms/stor_manage/storIvtInfo/index.vue +++ b/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')" /> @@ -407,10 +408,11 @@ export default { cancelButtonText: '取消', type: 'warning' }).then(() => { - structattr.createMoveTask(this.crud.selections).then(res => { - this.crud.notify('批量移库任务下发成功！', CRUD.NOTIFICATION_TYPE.SUCCESS) - this.crud.toQuery() - })}) + structattr.createMoveTask(this.query.search).then(res => { + this.crud.notify('批量移库任务下发成功！', CRUD.NOTIFICATION_TYPE.SUCCESS) + this.crud.toQuery() + }) + }) } } }