From 4f88171f28775d7a758ec9460ecaa00ec0550585 Mon Sep 17 00:00:00 2001 From: zhengxuming <739390650@QQ.COM> Date: Wed, 22 Oct 2025 10:47:13 +0800 Subject: [PATCH] =?UTF-8?q?opt:mes=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/MdPbStoragevehicleextMapper.java | 7 + .../mapper/MdPbStoragevehicleextMapper.xml | 64 ++++++++ .../controller/MesToWmsController.java | 6 +- .../nl/wms/ext_manage/enums/EXTConstant.java | 5 + .../ext_manage/service/MesToWmsService.java | 8 + .../service/impl/MesToWmsServiceImpl.java | 21 +-- .../service/util/GetMaterialFromMesTask.java | 155 ++++++++++++++++++ .../util/dto/MaterialInfoRequestDataDto.java | 13 ++ .../util/dto/MaterialInfoRequestDto.java | 17 ++ .../util/dto/MaterialInfoRespondDataDto.java | 17 ++ .../dto/MaterialInfoRespondDataRecordDto.java | 28 ++++ .../util/dto/MaterialInfoRespondDto.java | 15 ++ 12 files changed, 341 insertions(+), 15 deletions(-) create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/GetMaterialFromMesTask.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/dto/MaterialInfoRequestDataDto.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/dto/MaterialInfoRequestDto.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/dto/MaterialInfoRespondDataDto.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/dto/MaterialInfoRespondDataRecordDto.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/dto/MaterialInfoRespondDto.java diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.java index 903d297..1ade3eb 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.java @@ -45,6 +45,13 @@ public interface MdPbStoragevehicleextMapper extends BaseMapper queryAll( @Param("param") Map whereJson); + /** + * 查询 + * @param whereJson 查询条件 + * @return IPage + */ + List queryAllIn( @Param("param") Map whereJson); + /** * 分页查询 * @param page 分页条件 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.xml index c9d152b..0aec00b 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.xml @@ -130,7 +130,9 @@ ext.supp_name, attr.struct_code, attr.struct_name, + attr.stor_code, attr.stor_name, + attr.sect_code, attr.sect_name, mater.material_code, mater.material_name, @@ -177,6 +179,68 @@ ORDER BY ext.create_time Desc +