From 943acd1b4cf218260fbb2d64eca4a648f65150aa Mon Sep 17 00:00:00 2001 From: gongbaoxiong <751575283@qq.com> Date: Fri, 12 Jul 2024 17:13:45 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=B8=B4=E6=97=B6=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E5=8D=B7=E8=A3=85=E4=B8=80=E7=AE=B1=E6=96=B9?= =?UTF-8?q?=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/BstIvtPackageinfoivtServiceImpl.java | 27 ------------------- .../auto/AutoSendZxToDjw.java | 22 ++++++++++----- 2 files changed, 16 insertions(+), 33 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java index 901d8c0a9..7dea812bd 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java @@ -5,7 +5,6 @@ import cn.hutool.core.map.MapUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -421,32 +420,6 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl checkEndPointTask1(String ivtType, String ivtStatus, String pointCode, String sortType, String taskType) { - List packageinfoivtList = getBstIvtPackageinfoivts(ivtType, ivtStatus, sortType); - Set pointIds = packageinfoivtList.stream().map(BstIvtPackageinfoivt::getPoint_code).collect(Collectors.toSet()); - if (CollectionUtils.isEmpty(pointIds)) { - return null; - } - if (pointCode.equals("1")) { - List taskList = taskService.list(new LambdaUpdateWrapper() - //起点未完成任务 - .lt(SchBaseTask::getTask_status, TaskStatusEnum.FINISHED.getCode()) - .eq(taskType != null && !taskType.equals(""), SchBaseTask::getTask_type, taskType) - .and( - r -> r.in(SchBaseTask::getPoint_code1, pointIds) - )); - return packageinfoivtList.stream().filter(r -> !taskList.stream().map(SchBaseTask::getPoint_code1).collect(Collectors.toSet()).contains(r.getPoint_code())).collect(Collectors.toList()); - } else { - List taskList = taskService.list(new LambdaUpdateWrapper() - //终点未完成任务 - .lt(SchBaseTask::getTask_status, TaskStatusEnum.FINISHED.getCode()) - .eq(taskType != null && !taskType.equals(""), SchBaseTask::getTask_type, taskType) - .and( - r -> r.in(SchBaseTask::getPoint_code2, pointIds) - )); - return packageinfoivtList.stream().filter(r -> !taskList.stream().map(SchBaseTask::getPoint_code2).collect(Collectors.toSet()).contains(r.getPoint_code())).collect(Collectors.toList()); - } - } /** diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendZxToDjw.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendZxToDjw.java index ff505497a..955ee7c38 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendZxToDjw.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendZxToDjw.java @@ -50,6 +50,8 @@ import static org.nl.wms.util.TaskUtil.getMaxNum; public class AutoSendZxToDjw { private final String THIS_CLASS = AutoSendZxToDjw.class.getName(); + private Integer NUM = 0; + private final RedissonClient redissonClient; @Resource private IschBaseTaskService taskService; @@ -141,8 +143,8 @@ public class AutoSendZxToDjw { jo.put("is_send", IOSEnum.IS_NOTANDYES.code("是")); //扩展参数 JSONObject param = new JSONObject(); - //查询是否为最后一个子卷，暂时默认1 - param.put("lastOne", IOSEnum.IS_NOTANDYES.code("是")); + //子卷号 + param.put("barcode", containerName); //获取木箱高度等级 param.put("heightLevel", getHeightLevel(bstIvtBoxinfo)); //获取子卷长度 @@ -151,11 +153,19 @@ public class AutoSendZxToDjw { param.put("maxNo", bstIvtBoxinfo.getNum()); //托盘类型 1小托盘 2大托盘 param.put("containerType", bstIvtBoxinfo.getVehicle_type()); - //木箱需放入子卷数量 + //木箱计划放入子卷数量 //param.put("boxNo", relationList.get(0).getQuanlity_in_box()); - param.put("boxNo", 1); - //子卷号 - param.put("barcode", containerName); + //todo 木箱计划放入子卷数量，暂时默认1 + param.put("boxNo", relationList.get(0).getQuanlity_in_box()); + NUM = NUM + 1; + if (NUM == Integer.parseInt(bstIvtBoxinfo.getNum())) { + //todo 查询是否为最后一个子卷，暂时默认1 + param.put("lastOne", IOSEnum.IS_NOTANDYES.code("是")); + NUM = 0; + } else { + //todo 查询是否为最后一个子卷，暂时默认1 + param.put("lastOne", IOSEnum.IS_NOTANDYES.code("否")); + } jo.put("request_param", param.toString()); zxDjwTask.createTask(jo); // try {