From 513bb696a272f36aef9380c3f56856ac84e3be3f Mon Sep 17 00:00:00 2001 From: zhengxuming <739390650@QQ.COM> Date: Mon, 3 Nov 2025 10:30:11 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E4=B8=8A=E6=96=99/=E9=80=80=E6=96=99?= =?UTF-8?q?=E7=82=B9=E4=BD=8D=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/ext_manage/service/impl/MesToWmsServiceImpl.java | 1 + .../ios_manage/service/impl/PdaIosOutServiceImpl.java | 7 ++----- .../service/util/tasks/zw/DownEmptyUpFullTask.java | 7 +++++++ .../service/util/tasks/zw/SeparateMaterialTask.java | 8 ++++++++ 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/MesToWmsServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/MesToWmsServiceImpl.java index e3976e8..c1333f4 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/MesToWmsServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/MesToWmsServiceImpl.java @@ -512,6 +512,7 @@ public class MesToWmsServiceImpl implements MesToWmsService { //查询组盘 GroupPlate groupPlate = iMdPbGroupplateService.getOne(new LambdaQueryWrapper() .eq(GroupPlate::getStoragevehicle_code, point.getVehicle_code()) + .eq(GroupPlate::getGroup_id, point.getRemark()) .eq(GroupPlate::getStatus, "03")); if (ObjectUtil.isEmpty(groupPlate)) { throw new BadRequestException("点位" + point.getPoint_code() + "上的托盘不存在组盘信息!"); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosOutServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosOutServiceImpl.java index 36eeedb..444854a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosOutServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosOutServiceImpl.java @@ -469,9 +469,10 @@ public class PdaIosOutServiceImpl implements PdaIosOutService { public PdaResponse getMaterialSuppByVehicleCode(JSONObject whereJson) { //查找状态为入库状态的组盘表 List groupPlateList = iMdPbGroupPlateService.list(new QueryWrapper().lambda() - .eq(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("组盘")) + .eq(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("出库")) .ne(GroupPlate::getPcsn, "空托盘入库") .eq(GroupPlate::getStoragevehicle_code, whereJson.getString("vehicle_code")) + .orderByDesc(GroupPlate::getCreate_time) ); if (CollectionUtils.isEmpty(groupPlateList)) { @@ -479,10 +480,6 @@ public class PdaIosOutServiceImpl implements PdaIosOutService { } - if (groupPlateList.size() > 1) { - throw new BadRequestException("载具组盘信息重复，请核对！"); - } - JSONObject outJson = new JSONObject(); //根据物料id获取物料名称等信息 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/DownEmptyUpFullTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/DownEmptyUpFullTask.java index ff29bf1..0a96114 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/DownEmptyUpFullTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/DownEmptyUpFullTask.java @@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; 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 org.apache.commons.collections4.CollectionUtils; import org.nl.common.exception.BadRequestException; @@ -235,11 +236,17 @@ public class DownEmptyUpFullTask extends AbstractTask { .set(SchBasePoint::getUpdate_time, DateUtil.now()) .set(SchBasePoint::getIng_task_code,null) .eq(SchBasePoint::getPoint_code, taskObj.getPoint_code1())); + + List groupPlates = iMdPbGroupplateService.list(new QueryWrapper().lambda() + .eq(GroupPlate::getStoragevehicle_code, taskObj.getVehicle_code()) + .eq(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("入库"))); + //点位3 pointService.update(new LambdaUpdateWrapper() .set(SchBasePoint::getVehicle_code, taskObj.getVehicle_code()) .set(SchBasePoint::getPoint_status, "3") .set(SchBasePoint::getVehicle_qty, 1) + .set(CollectionUtils.isNotEmpty(groupPlates),SchBasePoint::getRemark,groupPlates.get(0).getGroup_id()) .set(SchBasePoint::getUpdate_id, SecurityUtils.getCurrentUserId()) .set(SchBasePoint::getUpdate_name, SecurityUtils.getCurrentNickName()) .set(SchBasePoint::getUpdate_time, DateUtil.now()) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/SeparateMaterialTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/SeparateMaterialTask.java index 547aa9c..c6c0afb 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/SeparateMaterialTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/SeparateMaterialTask.java @@ -3,7 +3,9 @@ package org.nl.wms.sch_manage.service.util.tasks.zw; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import org.apache.commons.collections4.CollectionUtils; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.CodeUtil; import org.nl.common.utils.IdUtil; @@ -175,11 +177,17 @@ public class SeparateMaterialTask extends AbstractTask { taskService.updateById(taskObj); outBillService.taskFinish(taskObj); + List groupPlates = iMdPbGroupplateService.list(new QueryWrapper().lambda() + .eq(GroupPlate::getStoragevehicle_code, taskObj.getVehicle_code()) + .eq(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("入库"))); + + //更改点位的托盘信息，空托盘的点位 2为空托盘放置点位 pointService.update(new LambdaUpdateWrapper() .set(SchBasePoint::getVehicle_code, taskObj.getVehicle_code()) .set(SchBasePoint::getPoint_status, "3") .set(SchBasePoint::getVehicle_qty, 1) + .set(CollectionUtils.isNotEmpty(groupPlates),SchBasePoint::getRemark,groupPlates.get(0).getGroup_id()) .set(SchBasePoint::getUpdate_id, SecurityUtils.getCurrentUserId()) .set(SchBasePoint::getUpdate_name, SecurityUtils.getCurrentNickName()) .set(SchBasePoint::getUpdate_time, DateUtil.now())