From c2d171693264ed6210a2fd0c485710bb74da2681 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Tue, 11 Nov 2025 17:53:50 +0800 Subject: [PATCH] =?UTF-8?q?opt:=20=E6=89=98=E7=9B=98=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/IMdPbStoragevehicleinfoService.java | 3 +++ .../dao/mapper/MdPbStoragevehicleinfoMapper.java | 3 +++ .../dao/mapper/MdPbStoragevehicleinfoMapper.xml | 9 +++++++++ .../impl/MdPbStoragevehicleinfoServiceImpl.java | 6 ++++++ .../ext_manage/service/impl/AcsToWmsServiceImpl.java | 2 -- .../sch_manage/controller/PdaJBController.java | 5 +++++ .../pda_manage/sch_manage/service/PdaJBService.java | 2 ++ .../sch_manage/service/impl/PdaJBServiceImpl.java | 10 ++++++++++ 8 files changed, 38 insertions(+), 2 deletions(-) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IMdPbStoragevehicleinfoService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IMdPbStoragevehicleinfoService.java index b0607fc..7511ac3 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IMdPbStoragevehicleinfoService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IMdPbStoragevehicleinfoService.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import org.nl.common.domain.query.PageQuery; import org.nl.wms.basedata_manage.service.dao.MdPbStoragevehicleinfo; +import java.util.List; import java.util.Map; import java.util.Set; @@ -52,4 +53,6 @@ public interface IMdPbStoragevehicleinfoService extends IService getCanUseEmptyVehicle(); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleinfoMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleinfoMapper.java index b87f9d0..4263e7b 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleinfoMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleinfoMapper.java @@ -3,6 +3,8 @@ package org.nl.wms.basedata_manage.service.dao.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.nl.wms.basedata_manage.service.dao.MdPbStoragevehicleinfo; +import java.util.List; + /** *

* 载具信息表 Mapper 接口 @@ -13,4 +15,5 @@ import org.nl.wms.basedata_manage.service.dao.MdPbStoragevehicleinfo; */ public interface MdPbStoragevehicleinfoMapper extends BaseMapper { + List getCanUseEmptyVehicle(); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleinfoMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleinfoMapper.xml index 82a536d..fd6cf7e 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleinfoMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleinfoMapper.xml @@ -2,4 +2,13 @@ + diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdPbStoragevehicleinfoServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdPbStoragevehicleinfoServiceImpl.java index ad3cbbb..a84accd 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdPbStoragevehicleinfoServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdPbStoragevehicleinfoServiceImpl.java @@ -25,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.List; import java.util.Map; import java.util.Set; @@ -136,4 +137,9 @@ public class MdPbStoragevehicleinfoServiceImpl extends ServiceImpl getCanUseEmptyVehicle() { + return this.baseMapper.getCanUseEmptyVehicle(); + } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/AcsToWmsServiceImpl.java index e3090b3..03396d3 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/AcsToWmsServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import lombok.Data; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.nl.common.exception.BadRequestException; @@ -21,7 +20,6 @@ import org.nl.wms.sch_manage.service.util.AbstractTask; import org.nl.wms.sch_manage.service.util.TaskFactory; import org.redisson.api.RLock; import org.redisson.api.RedissonClient; -import org.redisson.executor.TasksService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/controller/PdaJBController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/controller/PdaJBController.java index 92f2ab5..5a3da96 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/controller/PdaJBController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/controller/PdaJBController.java @@ -116,4 +116,9 @@ public class PdaJBController { public ResponseEntity suppList(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pdaJBService.suppList(whereJson), HttpStatus.OK); } + @PostMapping("/vehicleList") + @SaIgnore + public ResponseEntity vehicleList(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(pdaJBService.vehicleList(whereJson), HttpStatus.OK); + } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/PdaJBService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/PdaJBService.java index b702244..7835bb4 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/PdaJBService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/PdaJBService.java @@ -62,4 +62,6 @@ public interface PdaJBService { PdaResponse combination(JSONObject param); PdaResponse suppList(JSONObject param); + + PdaResponse vehicleList(JSONObject param); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/impl/PdaJBServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/impl/PdaJBServiceImpl.java index 81a2773..ffb7d70 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/impl/PdaJBServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/impl/PdaJBServiceImpl.java @@ -818,6 +818,16 @@ public class PdaJBServiceImpl implements PdaJBService { return PdaResponse.requestParamOk(collect); } + @Override + public PdaResponse vehicleList(JSONObject param) { + List vehicles = storagevehicleinfoService.getCanUseEmptyVehicle(); + List selectList = new ArrayList<>(); + vehicles.forEach(r -> + selectList.add(SelectItemVo.builder().text(r.getStoragevehicle_code()).value(r.getStoragevehicle_code()).build()) + ); + return PdaResponse.requestParamOk(selectList); + } + private Map buildTaskData(String pointCode, String workorderId, String invId) { Map jsonMst = new HashMap<>(); // ru库点