From 8bb61fdb737c62b062dd33d657b6f099015c8af8 Mon Sep 17 00:00:00 2001 From: zhengxuming Date: Wed, 20 Aug 2025 10:26:22 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E7=A7=BB=E5=BA=93=E6=8E=A8=E8=8D=90?= =?UTF-8?q?=E5=BA=93=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SchBasePointServiceImpl.java | 7 ++- .../service/util/tasks/VehicleInTask.java | 14 +++--- .../service/util/tasks/VehicleOutTask.java | 2 +- .../service/impl/StIvtMoveinvServiceImpl.java | 32 ++++++++++++- .../src/views/wms/st/movebill/AddDialog.vue | 45 ++++++++++--------- 5 files changed, 70 insertions(+), 30 deletions(-) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBasePointServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBasePointServiceImpl.java index 1552b72..97992f6 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBasePointServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBasePointServiceImpl.java @@ -342,8 +342,11 @@ public class SchBasePointServiceImpl extends ServiceImpl collect = Arrays.stream(regions.split(",")).collect(Collectors.toList()); - return pointMapper.selectList(new LambdaQueryWrapper() - .in(SchBasePoint::getRegion_code, collect)); + List schBasePointList = pointMapper.selectList(new LambdaQueryWrapper() + .in(SchBasePoint::getRegion_code, collect) + .ne(SchBasePoint::getPoint_status, "3")); + schBasePointList = schBasePointList.stream().filter(a -> !(a.getRegion_code().equals("YLXCQ") && "1".equals(a.getPoint_type()))).collect(Collectors.toList()); + return schBasePointList; } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleInTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleInTask.java index d189be0..f597174 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleInTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleInTask.java @@ -3,8 +3,10 @@ package org.nl.wms.sch_manage.service.util.tasks; 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 com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import org.apache.commons.collections4.CollectionUtils; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.CodeUtil; import org.nl.common.utils.SecurityUtils; @@ -28,6 +30,8 @@ import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.util.List; +import java.util.stream.Collectors; /** * @Author: gbx @@ -179,12 +183,12 @@ public class VehicleInTask extends AbstractTask { ); //更新组盘 - iMdPbGroupPlateService.update( - new GroupPlate(), - new LambdaUpdateWrapper() - .set(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("入库")) - .eq(GroupPlate::getStoragevehicle_code, taskObj.getVehicle_code()) + List groupPlateList = iMdPbGroupPlateService.list(new QueryWrapper().lambda() + .eq(GroupPlate::getStoragevehicle_code, taskObj.getVehicle_code()) ); + if(CollectionUtils.isNotEmpty(groupPlateList)){ + iMdPbGroupPlateService.delete(groupPlateList.stream().map(GroupPlate::getGroup_id).collect(Collectors.toSet())); + } // 更新任务 taskObj.setRemark("已完成"); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleOutTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleOutTask.java index 83a904a..a518942 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleOutTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleOutTask.java @@ -196,7 +196,7 @@ public class VehicleOutTask extends AbstractTask { //删除 Set groupSet = iMdPbGroupplateService.list(new QueryWrapper().lambda() .in(GroupPlate::getStoragevehicle_code, taskObj.getVehicle_code())) - .stream().map(GroupPlate::getStoragevehicle_code).collect(Collectors.toSet()); + .stream().map(GroupPlate::getGroup_id).collect(Collectors.toSet()); if(CollectionUtils.isNotEmpty(groupSet)) { iMdPbGroupplateService.delete(groupSet); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtMoveinvServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtMoveinvServiceImpl.java index 95ac12d..e6f9af1 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtMoveinvServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtMoveinvServiceImpl.java @@ -2,11 +2,13 @@ package org.nl.wms.warehouse_manage.service.impl; import cn.hutool.core.date.DateUtil; 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.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.commons.collections4.CollectionUtils; import org.nl.common.domain.query.PageQuery; import org.nl.common.utils.CodeUtil; import org.nl.common.utils.IdUtil; @@ -115,6 +117,13 @@ public class StIvtMoveinvServiceImpl extends ServiceImpl getCanuseIvt(Map whereJson, PageQuery page) { - return mdPbStoragevehicleextMapper.getCanuseIvt(new Page<>(page.getPage() + 1, page.getSize()), + IPage iPage = mdPbStoragevehicleextMapper.getCanuseIvt(new Page<>(page.getPage() + 1, page.getSize()), whereJson); + Integer a = 0; + for(JSONObject jsonObject: iPage.getRecords()){ + //查找一个 + List inPoints = iStructattrService.list(new LambdaQueryWrapper() + .eq(Structattr::getOccupancy_state, 1) + .eq(Structattr::getLock_type, "0") + .eq(Structattr::getSect_id, jsonObject.getString("sect_id")) + .isNull(Structattr::getStoragevehicle_code) + .isNull(Structattr::getTask_code)); + + if(CollectionUtils.isNotEmpty(inPoints) && a < inPoints.size()){ + jsonObject.put("turnin_struct_id",inPoints.get(a).getStruct_id()); + jsonObject.put("turnin_struct_code",inPoints.get(a).getStruct_code()); + jsonObject.put("turnin_struct_name",inPoints.get(a).getStruct_name()); + jsonObject.put("turnin_sect_id",inPoints.get(a).getSect_id()); + jsonObject.put("turnin_sect_code",inPoints.get(a).getSect_code()); + jsonObject.put("turnin_sect_name",inPoints.get(a).getSect_name()); + } + a++; + } + return iPage; } @Override diff --git a/lms/nladmin-ui/src/views/wms/st/movebill/AddDialog.vue b/lms/nladmin-ui/src/views/wms/st/movebill/AddDialog.vue index 3c85e64..5ce95b9 100644 --- a/lms/nladmin-ui/src/views/wms/st/movebill/AddDialog.vue +++ b/lms/nladmin-ui/src/views/wms/st/movebill/AddDialog.vue @@ -69,8 +69,8 @@ > @@ -136,8 +136,8 @@ - - - - - - - - - - - - + + + + + + + + + + + + +