From 33c0f8d98a9a6fa3d922d20c4b44e641555ff735 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Tue, 13 Aug 2024 14:04:54 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8C=85=E9=87=8D=E5=91=BD=E5=90=8D?= =?UTF-8?q?=E4=B8=8E=E6=8C=AA=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mps/service/impl/SlitterPdaServiceImpl.java | 4 ++-- .../impl/PdmBiRawfoilworkorderServiceImpl.java | 5 ++--- .../controller/StIvtCutpointivtController.java | 6 +++--- .../java/org/nl/wms/pdm/ivt/cut/package-info.java | 4 ++++ .../service/IstIvtCutpointivtService.java | 6 +++--- .../{ => cut/service}/dao/StIvtCutpointivt.java | 3 +-- .../service/dao}/dto/StIvtCutpointivtDto.java | 2 +- .../service/dao}/dto/StIvtCutpointivtParam.java | 4 ++-- .../dao/mapper/StIvtCutpointivtMapper.java | 4 ++-- .../dao/mapper}/StIvtCutpointivtMapper.xml | 2 +- .../service/impl/StIvtCutpointivtServiceImpl.java | 15 +++++---------- .../controller/StIvtHotpointivtController.java | 6 +++--- .../controller/StIvtHotregioniomstController.java | 6 +++--- .../java/org/nl/wms/pdm/ivt/hot/package-info.java | 4 ++++ .../service/IstIvtHotpointivtService.java | 6 +++--- .../service/IstIvtHotregioniomstService.java | 6 +++--- .../{ => hot/service}/dao/StIvtHotpointivt.java | 3 +-- .../service}/dao/StIvtHotregioniomst.java | 2 +- .../service/dao}/dto/StIvtHotpointivtDto.java | 2 +- .../service/dao}/dto/StIvtHotpointivtParam.java | 4 ++-- .../service/dao}/dto/StIvtHotregioniomstDto.java | 2 +- .../dao}/dto/StIvtHotregioniomstParam.java | 4 ++-- .../dao/mapper/StIvtHotpointivtMapper.java | 4 ++-- .../dao/mapper}/StIvtHotpointivtMapper.xml | 4 ++-- .../dao/mapper/StIvtHotregioniomstMapper.java | 4 ++-- .../dao/mapper}/StIvtHotregioniomstMapper.xml | 2 +- .../service/impl/StIvtHotpointivtServiceImpl.java | 15 +++++---------- .../impl/StIvtHotregioniomstServiceImpl.java | 15 +++++---------- .../controller/StIvtCoolpointivtController.java | 6 +++--- .../controller/StIvtCoolregionioController.java | 6 +++--- .../StIvtDeliverypointivtController.java | 6 +++--- .../controller/StIvtEmptytubeivtController.java | 6 +++--- .../StIvtEmptyvehiclerecordController.java | 6 +++--- .../controller/StIvtStpointivtController.java | 6 +++--- .../org/nl/wms/pdm/ivt/other/package-info.java | 4 ++++ .../service/IstIvtCoolpointivtService.java | 6 +++--- .../service/IstIvtCoolregionioService.java | 6 +++--- .../service/IstIvtDeliverypointivtService.java | 6 +++--- .../service/IstIvtEmptytubeivtService.java | 6 +++--- .../service/IstIvtEmptyvehiclerecordService.java | 6 +++--- .../service/IstIvtStpointivtService.java | 6 +++--- .../service}/dao/StIvtCoolpointivt.java | 2 +- .../service}/dao/StIvtCoolregionio.java | 2 +- .../service}/dao/StIvtDeliverypointivt.java | 2 +- .../service}/dao/StIvtEmptytubeivt.java | 2 +- .../service}/dao/StIvtEmptyvehiclerecord.java | 2 +- .../{ => other/service}/dao/StIvtStpointivt.java | 2 +- .../service/dao}/dto/StIvtCoolpointivtDto.java | 2 +- .../service/dao}/dto/StIvtCoolpointivtParam.java | 4 ++-- .../service/dao}/dto/StIvtCoolregionioDto.java | 2 +- .../service/dao}/dto/StIvtCoolregionioParam.java | 4 ++-- .../dao}/dto/StIvtDeliverypointivtDto.java | 2 +- .../dao}/dto/StIvtDeliverypointivtParam.java | 4 ++-- .../service/dao}/dto/StIvtEmptytubeivtDto.java | 2 +- .../service/dao}/dto/StIvtEmptytubeivtParam.java | 4 ++-- .../dao}/dto/StIvtEmptyvehiclerecordDto.java | 2 +- .../dao}/dto/StIvtEmptyvehiclerecordParam.java | 4 ++-- .../service/dao}/dto/StIvtStpointivtDto.java | 2 +- .../service/dao}/dto/StIvtStpointivtParam.java | 4 ++-- .../dao/mapper/StIvtCoolpointivtMapper.java | 4 ++-- .../dao/mapper/StIvtCoolregionioMapper.java | 4 ++-- .../dao/mapper/StIvtDeliverypointivtMapper.java | 4 ++-- .../dao/mapper/StIvtEmptytubeivtMapper.java | 4 ++-- .../dao/mapper/StIvtEmptyvehiclerecordMapper.java | 4 ++-- .../dao/mapper/StIvtStpointivtMapper.java | 4 ++-- .../dao/mapper/xml/StIvtCoolpointivtMapper.xml | 2 +- .../dao/mapper/xml/StIvtCoolregionioMapper.xml | 2 +- .../mapper/xml/StIvtDeliverypointivtMapper.xml | 2 +- .../dao/mapper/xml/StIvtEmptytubeivtMapper.xml | 2 +- .../mapper/xml/StIvtEmptyvehiclerecordMapper.xml | 2 +- .../dao/mapper/xml/StIvtStpointivtMapper.xml | 2 +- .../impl/StIvtCoolpointivtServiceImpl.java | 15 +++++---------- .../impl/StIvtCoolregionioServiceImpl.java | 11 +++++------ .../impl/StIvtDeliverypointivtServiceImpl.java | 14 +++++--------- .../impl/StIvtEmptytubeivtServiceImpl.java | 14 +++++--------- .../impl/StIvtEmptyvehiclerecordServiceImpl.java | 14 +++++--------- .../service/impl/StIvtStpointivtServiceImpl.java | 14 +++++--------- .../controller/StIvtSbpointivtController.java | 6 +++--- .../java/org/nl/wms/pdm/ivt/raw/package-info.java | 4 ++++ .../service/IstIvtSbpointivtService.java | 6 +++--- .../{ => raw/service}/dao/StIvtSbpointivt.java | 2 +- .../service/dao}/dto/StIvtSbpointivtDto.java | 2 +- .../service/dao}/dto/StIvtSbpointivtParam.java | 4 ++-- .../dao/mapper/StIvtSbpointivtMapper.java | 4 ++-- .../service/dao/mapper}/StIvtSbpointivtMapper.xml | 2 +- .../service/impl/StIvtSbpointivtServiceImpl.java | 10 +++++----- .../org/nl/wms/quartz/AutoQueryDeviceStatus.java | 2 +- .../tasks/auto/AutoInHotTrussTask.java | 4 ++-- .../sch/task_manage/tasks/hot/InHotTrussTask.java | 4 ++-- .../task_manage/tasks/hot/OutHotTrussTask.java | 4 ++-- .../tasks/raw/RawCallRollTrussTask.java | 4 ++-- .../tasks/slitter/SlitterSendRollAGVTask.java | 4 ++-- .../tasks/slitter/SlitterUpAGVTask.java | 5 ++--- .../src/main/java/org/nl/wms/util/PointUtils.java | 8 ++++---- 94 files changed, 218 insertions(+), 243 deletions(-) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => cut}/controller/StIvtCutpointivtController.java (93%) create mode 100644 lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/cut/package-info.java rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => cut}/service/IstIvtCutpointivtService.java (90%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => cut/service}/dao/StIvtCutpointivt.java (97%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => cut/service/dao}/dto/StIvtCutpointivtDto.java (98%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => cut/service/dao}/dto/StIvtCutpointivtParam.java (95%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => cut/service}/dao/mapper/StIvtCutpointivtMapper.java (71%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{dao/mapper/xml => cut/service/dao/mapper}/StIvtCutpointivtMapper.xml (64%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => cut}/service/impl/StIvtCutpointivtServiceImpl.java (92%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => hot}/controller/StIvtHotpointivtController.java (94%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => hot}/controller/StIvtHotregioniomstController.java (93%) create mode 100644 lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/package-info.java rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => hot}/service/IstIvtHotpointivtService.java (91%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => hot}/service/IstIvtHotregioniomstService.java (88%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => hot/service}/dao/StIvtHotpointivt.java (97%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => hot/service}/dao/StIvtHotregioniomst.java (98%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => hot/service/dao}/dto/StIvtHotpointivtDto.java (97%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => hot/service/dao}/dto/StIvtHotpointivtParam.java (95%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => hot/service/dao}/dto/StIvtHotregioniomstDto.java (97%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => hot/service/dao}/dto/StIvtHotregioniomstParam.java (95%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => hot/service}/dao/mapper/StIvtHotpointivtMapper.java (81%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{dao/mapper/xml => hot/service/dao/mapper}/StIvtHotpointivtMapper.xml (90%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => hot/service}/dao/mapper/StIvtHotregioniomstMapper.java (71%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{dao/mapper/xml => hot/service/dao/mapper}/StIvtHotregioniomstMapper.xml (64%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => hot}/service/impl/StIvtHotpointivtServiceImpl.java (91%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => hot}/service/impl/StIvtHotregioniomstServiceImpl.java (91%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => other}/controller/StIvtCoolpointivtController.java (94%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => other}/controller/StIvtCoolregionioController.java (93%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => other}/controller/StIvtDeliverypointivtController.java (93%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => other}/controller/StIvtEmptytubeivtController.java (93%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => other}/controller/StIvtEmptyvehiclerecordController.java (93%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => other}/controller/StIvtStpointivtController.java (93%) create mode 100644 lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/package-info.java rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => other}/service/IstIvtCoolpointivtService.java (86%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => other}/service/IstIvtCoolregionioService.java (87%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => other}/service/IstIvtDeliverypointivtService.java (86%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => other}/service/IstIvtEmptytubeivtService.java (86%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => other}/service/IstIvtEmptyvehiclerecordService.java (86%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => other}/service/IstIvtStpointivtService.java (86%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => other/service}/dao/StIvtCoolpointivt.java (98%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => other/service}/dao/StIvtCoolregionio.java (98%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => other/service}/dao/StIvtDeliverypointivt.java (97%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => other/service}/dao/StIvtEmptytubeivt.java (97%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => other/service}/dao/StIvtEmptyvehiclerecord.java (97%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => other/service}/dao/StIvtStpointivt.java (98%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => other/service/dao}/dto/StIvtCoolpointivtDto.java (97%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => other/service/dao}/dto/StIvtCoolpointivtParam.java (95%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => other/service/dao}/dto/StIvtCoolregionioDto.java (97%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => other/service/dao}/dto/StIvtCoolregionioParam.java (94%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => other/service/dao}/dto/StIvtDeliverypointivtDto.java (96%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => other/service/dao}/dto/StIvtDeliverypointivtParam.java (93%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => other/service/dao}/dto/StIvtEmptytubeivtDto.java (96%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => other/service/dao}/dto/StIvtEmptytubeivtParam.java (93%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => other/service/dao}/dto/StIvtEmptyvehiclerecordDto.java (97%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => other/service/dao}/dto/StIvtEmptyvehiclerecordParam.java (93%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => other/service/dao}/dto/StIvtStpointivtDto.java (97%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => other/service/dao}/dto/StIvtStpointivtParam.java (94%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => other/service}/dao/mapper/StIvtCoolpointivtMapper.java (70%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => other/service}/dao/mapper/StIvtCoolregionioMapper.java (70%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => other/service}/dao/mapper/StIvtDeliverypointivtMapper.java (71%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => other/service}/dao/mapper/StIvtEmptytubeivtMapper.java (71%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => other/service}/dao/mapper/StIvtEmptyvehiclerecordMapper.java (71%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => other/service}/dao/mapper/StIvtStpointivtMapper.java (70%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => other/service}/dao/mapper/xml/StIvtCoolpointivtMapper.xml (64%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => other/service}/dao/mapper/xml/StIvtCoolregionioMapper.xml (64%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => other/service}/dao/mapper/xml/StIvtDeliverypointivtMapper.xml (63%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => other/service}/dao/mapper/xml/StIvtEmptytubeivtMapper.xml (64%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => other/service}/dao/mapper/xml/StIvtEmptyvehiclerecordMapper.xml (62%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => other/service}/dao/mapper/xml/StIvtStpointivtMapper.xml (64%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => other}/service/impl/StIvtCoolpointivtServiceImpl.java (92%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => other}/service/impl/StIvtCoolregionioServiceImpl.java (94%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => other}/service/impl/StIvtDeliverypointivtServiceImpl.java (91%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => other}/service/impl/StIvtEmptytubeivtServiceImpl.java (91%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => other}/service/impl/StIvtEmptyvehiclerecordServiceImpl.java (91%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => other}/service/impl/StIvtStpointivtServiceImpl.java (91%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => raw}/controller/StIvtSbpointivtController.java (93%) create mode 100644 lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/raw/package-info.java rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => raw}/service/IstIvtSbpointivtService.java (89%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => raw/service}/dao/StIvtSbpointivt.java (97%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => raw/service/dao}/dto/StIvtSbpointivtDto.java (96%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => raw/service/dao}/dto/StIvtSbpointivtParam.java (93%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => raw/service}/dao/mapper/StIvtSbpointivtMapper.java (71%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{dao/mapper/xml => raw/service/dao/mapper}/StIvtSbpointivtMapper.xml (65%) rename lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/{ => raw}/service/impl/StIvtSbpointivtServiceImpl.java (94%) diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/mps/service/impl/SlitterPdaServiceImpl.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/mps/service/impl/SlitterPdaServiceImpl.java index ea20d6c0d..91f1fdfe3 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/mps/service/impl/SlitterPdaServiceImpl.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/mps/service/impl/SlitterPdaServiceImpl.java @@ -10,8 +10,8 @@ import org.nl.wms.ext.acs.service.WmsToAcsService; import org.nl.wms.pda.mps.service.SlitterPdaService; import org.nl.wms.pdm.bi.dao.PdmBiRawfoilworkorder; import org.nl.wms.pdm.bi.service.IpdmBiRawfoilworkorderService; -import org.nl.wms.pdm.ivt.dao.StIvtCutpointivt; -import org.nl.wms.pdm.ivt.service.IstIvtCutpointivtService; +import org.nl.wms.pdm.ivt.cut.service.dao.StIvtCutpointivt; +import org.nl.wms.pdm.ivt.cut.service.IstIvtCutpointivtService; import org.nl.wms.sch.task.service.ISchBaseTaskService; import org.nl.wms.sch.task.service.dao.SchBaseTask; import org.nl.wms.sch.task_manage.core.constant.GeneralDefinition; diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/bi/service/impl/PdmBiRawfoilworkorderServiceImpl.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/bi/service/impl/PdmBiRawfoilworkorderServiceImpl.java index 5c916d8f5..49c16a5b4 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/bi/service/impl/PdmBiRawfoilworkorderServiceImpl.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/bi/service/impl/PdmBiRawfoilworkorderServiceImpl.java @@ -2,7 +2,6 @@ package org.nl.wms.pdm.bi.service.impl; import cn.hutool.core.collection.CollectionUtil; 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; @@ -23,8 +22,8 @@ import org.nl.wms.pdm.bi.dao.PdmBiRawfoilworkorder; import org.nl.wms.pdm.bi.dao.mapper.PdmBiRawfoilworkorderMapper; import org.nl.wms.pdm.bi.dto.PdmBiRawfoilworkorderParam; import org.nl.wms.pdm.bi.service.IpdmBiRawfoilworkorderService; -import org.nl.wms.pdm.ivt.dao.StIvtSbpointivt; -import org.nl.wms.pdm.ivt.dao.mapper.StIvtSbpointivtMapper; +import org.nl.wms.pdm.ivt.raw.service.dao.StIvtSbpointivt; +import org.nl.wms.pdm.ivt.raw.service.dao.mapper.StIvtSbpointivtMapper; import org.nl.wms.sch.task.service.dao.SchBaseTask; import org.nl.wms.sch.task.service.dao.mapper.SchBaseTaskMapper; import org.nl.wms.sch.task_manage.TaskStatus; diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/controller/StIvtCutpointivtController.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/cut/controller/StIvtCutpointivtController.java similarity index 93% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/controller/StIvtCutpointivtController.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/cut/controller/StIvtCutpointivtController.java index 3541ea4b6..c1f2accbe 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/controller/StIvtCutpointivtController.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/cut/controller/StIvtCutpointivtController.java @@ -1,4 +1,4 @@ -package org.nl.wms.pdm.ivt.controller; +package org.nl.wms.pdm.ivt.cut.controller; import java.util.Set; import java.util.Map; @@ -14,8 +14,8 @@ import org.nl.common.domain.query.PageQuery; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.nl.common.logging.annotation.Log; -import org.nl.wms.pdm.ivt.dto.StIvtCutpointivtParam; -import org.nl.wms.pdm.ivt.service.IstIvtCutpointivtService; +import org.nl.wms.pdm.ivt.cut.service.dao.dto.StIvtCutpointivtParam; +import org.nl.wms.pdm.ivt.cut.service.IstIvtCutpointivtService; /** diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/cut/package-info.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/cut/package-info.java new file mode 100644 index 000000000..983afc01c --- /dev/null +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/cut/package-info.java @@ -0,0 +1,4 @@ +/** + * 分切相关的控制层、服务层、持久层 + */ +package org.nl.wms.pdm.ivt.cut; diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/IstIvtCutpointivtService.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/cut/service/IstIvtCutpointivtService.java similarity index 90% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/IstIvtCutpointivtService.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/cut/service/IstIvtCutpointivtService.java index 0544c10de..9e8e53641 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/IstIvtCutpointivtService.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/cut/service/IstIvtCutpointivtService.java @@ -1,10 +1,10 @@ -package org.nl.wms.pdm.ivt.service; +package org.nl.wms.pdm.ivt.cut.service; import com.baomidou.mybatisplus.core.metadata.IPage; import org.nl.common.domain.query.PageQuery; -import org.nl.wms.pdm.ivt.dao.StIvtCutpointivt; +import org.nl.wms.pdm.ivt.cut.service.dao.StIvtCutpointivt; import com.baomidou.mybatisplus.extension.service.IService; -import org.nl.wms.pdm.ivt.dto.StIvtCutpointivtParam; +import org.nl.wms.pdm.ivt.cut.service.dao.dto.StIvtCutpointivtParam; import java.util.List; import java.util.Map; diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/StIvtCutpointivt.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/cut/service/dao/StIvtCutpointivt.java similarity index 97% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/StIvtCutpointivt.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/cut/service/dao/StIvtCutpointivt.java index 3bdbcde5e..f4767ec4e 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/StIvtCutpointivt.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/cut/service/dao/StIvtCutpointivt.java @@ -1,7 +1,6 @@ -package org.nl.wms.pdm.ivt.dao; +package org.nl.wms.pdm.ivt.cut.service.dao; import java.math.BigDecimal; -import java.io.Serializable; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtCutpointivtDto.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/cut/service/dao/dto/StIvtCutpointivtDto.java similarity index 98% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtCutpointivtDto.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/cut/service/dao/dto/StIvtCutpointivtDto.java index 1d325f50c..f683fa5ed 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtCutpointivtDto.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/cut/service/dao/dto/StIvtCutpointivtDto.java @@ -1,4 +1,4 @@ -package org.nl.wms.pdm.ivt.dto; +package org.nl.wms.pdm.ivt.cut.service.dao.dto; import java.math.BigDecimal; import java.io.Serializable; diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtCutpointivtParam.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/cut/service/dao/dto/StIvtCutpointivtParam.java similarity index 95% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtCutpointivtParam.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/cut/service/dao/dto/StIvtCutpointivtParam.java index e71352957..1ab72c1ed 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtCutpointivtParam.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/cut/service/dao/dto/StIvtCutpointivtParam.java @@ -1,4 +1,4 @@ -package org.nl.wms.pdm.ivt.dto; +package org.nl.wms.pdm.ivt.cut.service.dao.dto; import java.math.BigDecimal; @@ -7,7 +7,7 @@ import lombok.Data; import lombok.*; import lombok.EqualsAndHashCode; import org.nl.common.domain.query.BaseQuery; -import org.nl.wms.pdm.ivt.dao.StIvtCutpointivt; +import org.nl.wms.pdm.ivt.cut.service.dao.StIvtCutpointivt; /** * {@code @Description:} 分切区点位库存表(StIvtCutpointivt)查询参数类 diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/StIvtCutpointivtMapper.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/cut/service/dao/mapper/StIvtCutpointivtMapper.java similarity index 71% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/StIvtCutpointivtMapper.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/cut/service/dao/mapper/StIvtCutpointivtMapper.java index 699554184..7612cd2b1 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/StIvtCutpointivtMapper.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/cut/service/dao/mapper/StIvtCutpointivtMapper.java @@ -1,6 +1,6 @@ -package org.nl.wms.pdm.ivt.dao.mapper; +package org.nl.wms.pdm.ivt.cut.service.dao.mapper; -import org.nl.wms.pdm.ivt.dao.StIvtCutpointivt; +import org.nl.wms.pdm.ivt.cut.service.dao.StIvtCutpointivt; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/xml/StIvtCutpointivtMapper.xml b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/cut/service/dao/mapper/StIvtCutpointivtMapper.xml similarity index 64% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/xml/StIvtCutpointivtMapper.xml rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/cut/service/dao/mapper/StIvtCutpointivtMapper.xml index 5ab884d59..feafc7908 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/xml/StIvtCutpointivtMapper.xml +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/cut/service/dao/mapper/StIvtCutpointivtMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/impl/StIvtCutpointivtServiceImpl.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/cut/service/impl/StIvtCutpointivtServiceImpl.java similarity index 92% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/impl/StIvtCutpointivtServiceImpl.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/cut/service/impl/StIvtCutpointivtServiceImpl.java index abdffc356..a4465b7cb 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/impl/StIvtCutpointivtServiceImpl.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/cut/service/impl/StIvtCutpointivtServiceImpl.java @@ -1,18 +1,14 @@ -package org.nl.wms.pdm.ivt.service.impl; +package org.nl.wms.pdm.ivt.cut.service.impl; 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 org.nl.wms.pdm.ivt.dao.StIvtCutpointivt; -import org.nl.wms.pdm.ivt.dto.StIvtCutpointivtParam; -import org.nl.wms.pdm.ivt.dao.mapper.StIvtCutpointivtMapper; -import cn.hutool.core.util.ObjectUtil; -import org.nl.wms.pdm.ivt.service.IstIvtCutpointivtService; -import cn.hutool.core.date.DateUtil; +import org.nl.wms.pdm.ivt.cut.service.dao.StIvtCutpointivt; +import org.nl.wms.pdm.ivt.cut.service.dao.dto.StIvtCutpointivtParam; +import org.nl.wms.pdm.ivt.cut.service.dao.mapper.StIvtCutpointivtMapper; +import org.nl.wms.pdm.ivt.cut.service.IstIvtCutpointivtService; import org.nl.wms.storage_manage.ios.enums.IOSEnum; import org.springframework.beans.BeanUtils; -import org.nl.common.utils.SecurityUtils; -import org.nl.common.utils.IdUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; @@ -20,7 +16,6 @@ import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.metadata.IPage; import org.nl.common.domain.query.PageQuery; -import javax.annotation.Resource; import java.util.Map; import java.util.Set; import java.util.List; diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/controller/StIvtHotpointivtController.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/controller/StIvtHotpointivtController.java similarity index 94% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/controller/StIvtHotpointivtController.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/controller/StIvtHotpointivtController.java index 4ef1b17ed..36ef7e4f9 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/controller/StIvtHotpointivtController.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/controller/StIvtHotpointivtController.java @@ -1,4 +1,4 @@ -package org.nl.wms.pdm.ivt.controller; +package org.nl.wms.pdm.ivt.hot.controller; import java.util.Set; import java.util.Map; @@ -15,8 +15,8 @@ import org.nl.common.domain.query.PageQuery; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.nl.common.logging.annotation.Log; -import org.nl.wms.pdm.ivt.dto.StIvtHotpointivtParam; -import org.nl.wms.pdm.ivt.service.IstIvtHotpointivtService; +import org.nl.wms.pdm.ivt.hot.service.dao.dto.StIvtHotpointivtParam; +import org.nl.wms.pdm.ivt.hot.service.IstIvtHotpointivtService; /** diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/controller/StIvtHotregioniomstController.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/controller/StIvtHotregioniomstController.java similarity index 93% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/controller/StIvtHotregioniomstController.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/controller/StIvtHotregioniomstController.java index d10b8a163..075ad570e 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/controller/StIvtHotregioniomstController.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/controller/StIvtHotregioniomstController.java @@ -1,4 +1,4 @@ -package org.nl.wms.pdm.ivt.controller; +package org.nl.wms.pdm.ivt.hot.controller; import java.util.Set; import java.util.Map; @@ -14,8 +14,8 @@ import org.nl.common.domain.query.PageQuery; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.nl.common.logging.annotation.Log; -import org.nl.wms.pdm.ivt.dto.StIvtHotregioniomstParam; -import org.nl.wms.pdm.ivt.service.IstIvtHotregioniomstService; +import org.nl.wms.pdm.ivt.hot.service.dao.dto.StIvtHotregioniomstParam; +import org.nl.wms.pdm.ivt.hot.service.IstIvtHotregioniomstService; /** diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/package-info.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/package-info.java new file mode 100644 index 000000000..4a0246ba7 --- /dev/null +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/package-info.java @@ -0,0 +1,4 @@ +/** + * 烘烤相关的控制层、服务层、持久层 + */ +package org.nl.wms.pdm.ivt.hot; diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/IstIvtHotpointivtService.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/IstIvtHotpointivtService.java similarity index 91% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/IstIvtHotpointivtService.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/IstIvtHotpointivtService.java index 3e0540fb9..45ceebffa 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/IstIvtHotpointivtService.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/IstIvtHotpointivtService.java @@ -1,11 +1,11 @@ -package org.nl.wms.pdm.ivt.service; +package org.nl.wms.pdm.ivt.hot.service; import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.metadata.IPage; import org.nl.common.domain.query.PageQuery; -import org.nl.wms.pdm.ivt.dao.StIvtHotpointivt; +import org.nl.wms.pdm.ivt.hot.service.dao.StIvtHotpointivt; import com.baomidou.mybatisplus.extension.service.IService; -import org.nl.wms.pdm.ivt.dto.StIvtHotpointivtParam; +import org.nl.wms.pdm.ivt.hot.service.dao.dto.StIvtHotpointivtParam; import java.util.List; import java.util.Map; diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/IstIvtHotregioniomstService.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/IstIvtHotregioniomstService.java similarity index 88% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/IstIvtHotregioniomstService.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/IstIvtHotregioniomstService.java index 877068f32..abf77b569 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/IstIvtHotregioniomstService.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/IstIvtHotregioniomstService.java @@ -1,10 +1,10 @@ -package org.nl.wms.pdm.ivt.service; +package org.nl.wms.pdm.ivt.hot.service; import com.baomidou.mybatisplus.core.metadata.IPage; import org.nl.common.domain.query.PageQuery; -import org.nl.wms.pdm.ivt.dao.StIvtHotregioniomst; +import org.nl.wms.pdm.ivt.hot.service.dao.StIvtHotregioniomst; import com.baomidou.mybatisplus.extension.service.IService; -import org.nl.wms.pdm.ivt.dto.StIvtHotregioniomstParam; +import org.nl.wms.pdm.ivt.hot.service.dao.dto.StIvtHotregioniomstParam; import java.util.List; import java.util.Map; diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/StIvtHotpointivt.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/dao/StIvtHotpointivt.java similarity index 97% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/StIvtHotpointivt.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/dao/StIvtHotpointivt.java index 6a9b75590..a975ac5a8 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/StIvtHotpointivt.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/dao/StIvtHotpointivt.java @@ -1,7 +1,6 @@ -package org.nl.wms.pdm.ivt.dao; +package org.nl.wms.pdm.ivt.hot.service.dao; import java.math.BigDecimal; -import java.io.Serializable; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/StIvtHotregioniomst.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/dao/StIvtHotregioniomst.java similarity index 98% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/StIvtHotregioniomst.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/dao/StIvtHotregioniomst.java index f0aa10e65..8dcfb0a24 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/StIvtHotregioniomst.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/dao/StIvtHotregioniomst.java @@ -1,4 +1,4 @@ -package org.nl.wms.pdm.ivt.dao; +package org.nl.wms.pdm.ivt.hot.service.dao; import java.math.BigDecimal; import java.io.Serializable; diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtHotpointivtDto.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/dao/dto/StIvtHotpointivtDto.java similarity index 97% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtHotpointivtDto.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/dao/dto/StIvtHotpointivtDto.java index da06dcecb..20878c3aa 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtHotpointivtDto.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/dao/dto/StIvtHotpointivtDto.java @@ -1,4 +1,4 @@ -package org.nl.wms.pdm.ivt.dto; +package org.nl.wms.pdm.ivt.hot.service.dao.dto; import java.math.BigDecimal; import java.io.Serializable; diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtHotpointivtParam.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/dao/dto/StIvtHotpointivtParam.java similarity index 95% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtHotpointivtParam.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/dao/dto/StIvtHotpointivtParam.java index 26e6cfdba..22c995cee 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtHotpointivtParam.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/dao/dto/StIvtHotpointivtParam.java @@ -1,4 +1,4 @@ -package org.nl.wms.pdm.ivt.dto; +package org.nl.wms.pdm.ivt.hot.service.dao.dto; import java.math.BigDecimal; @@ -7,7 +7,7 @@ import lombok.Data; import lombok.*; import lombok.EqualsAndHashCode; import org.nl.common.domain.query.BaseQuery; -import org.nl.wms.pdm.ivt.dao.StIvtHotpointivt; +import org.nl.wms.pdm.ivt.hot.service.dao.StIvtHotpointivt; /** * {@code @Description:} 烘烤区点位库存表(StIvtHotpointivt)查询参数类 diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtHotregioniomstDto.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/dao/dto/StIvtHotregioniomstDto.java similarity index 97% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtHotregioniomstDto.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/dao/dto/StIvtHotregioniomstDto.java index d18c9f0a5..c16005c1d 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtHotregioniomstDto.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/dao/dto/StIvtHotregioniomstDto.java @@ -1,4 +1,4 @@ -package org.nl.wms.pdm.ivt.dto; +package org.nl.wms.pdm.ivt.hot.service.dao.dto; import java.math.BigDecimal; import java.io.Serializable; diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtHotregioniomstParam.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/dao/dto/StIvtHotregioniomstParam.java similarity index 95% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtHotregioniomstParam.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/dao/dto/StIvtHotregioniomstParam.java index 388412258..4b5a1cf10 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtHotregioniomstParam.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/dao/dto/StIvtHotregioniomstParam.java @@ -1,4 +1,4 @@ -package org.nl.wms.pdm.ivt.dto; +package org.nl.wms.pdm.ivt.hot.service.dao.dto; import java.math.BigDecimal; @@ -7,7 +7,7 @@ import lombok.Data; import lombok.*; import lombok.EqualsAndHashCode; import org.nl.common.domain.query.BaseQuery; -import org.nl.wms.pdm.ivt.dao.StIvtHotregioniomst; +import org.nl.wms.pdm.ivt.hot.service.dao.StIvtHotregioniomst; /** * {@code @Description:} 烘箱区出入主表(StIvtHotregioniomst)查询参数类 diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/StIvtHotpointivtMapper.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/dao/mapper/StIvtHotpointivtMapper.java similarity index 81% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/StIvtHotpointivtMapper.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/dao/mapper/StIvtHotpointivtMapper.java index 5d6e38341..6e4f4c56d 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/StIvtHotpointivtMapper.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/dao/mapper/StIvtHotpointivtMapper.java @@ -1,7 +1,7 @@ -package org.nl.wms.pdm.ivt.dao.mapper; +package org.nl.wms.pdm.ivt.hot.service.dao.mapper; import com.alibaba.fastjson.JSONArray; -import org.nl.wms.pdm.ivt.dao.StIvtHotpointivt; +import org.nl.wms.pdm.ivt.hot.service.dao.StIvtHotpointivt; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import java.util.List; diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/xml/StIvtHotpointivtMapper.xml b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/dao/mapper/StIvtHotpointivtMapper.xml similarity index 90% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/xml/StIvtHotpointivtMapper.xml rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/dao/mapper/StIvtHotpointivtMapper.xml index 4a587952a..5198aa980 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/xml/StIvtHotpointivtMapper.xml +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/dao/mapper/StIvtHotpointivtMapper.xml @@ -1,9 +1,9 @@ - + - SELECT ht.* FROM `st_ivt_hotpointivt` ht WHERE ht.point_status = '01' diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/StIvtHotregioniomstMapper.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/dao/mapper/StIvtHotregioniomstMapper.java similarity index 71% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/StIvtHotregioniomstMapper.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/dao/mapper/StIvtHotregioniomstMapper.java index 7cfb8931f..1e1d72fc2 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/StIvtHotregioniomstMapper.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/dao/mapper/StIvtHotregioniomstMapper.java @@ -1,6 +1,6 @@ -package org.nl.wms.pdm.ivt.dao.mapper; +package org.nl.wms.pdm.ivt.hot.service.dao.mapper; -import org.nl.wms.pdm.ivt.dao.StIvtHotregioniomst; +import org.nl.wms.pdm.ivt.hot.service.dao.StIvtHotregioniomst; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/xml/StIvtHotregioniomstMapper.xml b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/dao/mapper/StIvtHotregioniomstMapper.xml similarity index 64% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/xml/StIvtHotregioniomstMapper.xml rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/dao/mapper/StIvtHotregioniomstMapper.xml index 9cc711216..806cd765a 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/xml/StIvtHotregioniomstMapper.xml +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/dao/mapper/StIvtHotregioniomstMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/impl/StIvtHotpointivtServiceImpl.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/impl/StIvtHotpointivtServiceImpl.java similarity index 91% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/impl/StIvtHotpointivtServiceImpl.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/impl/StIvtHotpointivtServiceImpl.java index 2249075b6..5d209635d 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/impl/StIvtHotpointivtServiceImpl.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/impl/StIvtHotpointivtServiceImpl.java @@ -1,20 +1,16 @@ -package org.nl.wms.pdm.ivt.service.impl; +package org.nl.wms.pdm.ivt.hot.service.impl; import cn.hutool.core.lang.Assert; import com.alibaba.fastjson.JSONArray; 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 org.nl.wms.pdm.ivt.dao.StIvtHotpointivt; -import org.nl.wms.pdm.ivt.dto.StIvtHotpointivtParam; -import org.nl.wms.pdm.ivt.dao.mapper.StIvtHotpointivtMapper; -import cn.hutool.core.util.ObjectUtil; -import org.nl.wms.pdm.ivt.service.IstIvtHotpointivtService; -import cn.hutool.core.date.DateUtil; +import org.nl.wms.pdm.ivt.hot.service.dao.StIvtHotpointivt; +import org.nl.wms.pdm.ivt.hot.service.dao.dto.StIvtHotpointivtParam; +import org.nl.wms.pdm.ivt.hot.service.dao.mapper.StIvtHotpointivtMapper; +import org.nl.wms.pdm.ivt.hot.service.IstIvtHotpointivtService; import org.nl.wms.storage_manage.ios.enums.IOSEnum; import org.springframework.beans.BeanUtils; -import org.nl.common.utils.SecurityUtils; -import org.nl.common.utils.IdUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; @@ -22,7 +18,6 @@ import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.metadata.IPage; import org.nl.common.domain.query.PageQuery; -import javax.annotation.Resource; import java.util.Map; import java.util.Set; import java.util.List; diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/impl/StIvtHotregioniomstServiceImpl.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/impl/StIvtHotregioniomstServiceImpl.java similarity index 91% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/impl/StIvtHotregioniomstServiceImpl.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/impl/StIvtHotregioniomstServiceImpl.java index 2448fe4d0..e0d0184c7 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/impl/StIvtHotregioniomstServiceImpl.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/impl/StIvtHotregioniomstServiceImpl.java @@ -1,19 +1,14 @@ -package org.nl.wms.pdm.ivt.service.impl; +package org.nl.wms.pdm.ivt.hot.service.impl; 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 org.nl.wms.pdm.ivt.dao.StIvtCoolregionio; -import org.nl.wms.pdm.ivt.dao.StIvtHotregioniomst; -import org.nl.wms.pdm.ivt.dto.StIvtHotregioniomstParam; -import org.nl.wms.pdm.ivt.dao.mapper.StIvtHotregioniomstMapper; -import cn.hutool.core.util.ObjectUtil; -import org.nl.wms.pdm.ivt.service.IstIvtHotregioniomstService; -import cn.hutool.core.date.DateUtil; +import org.nl.wms.pdm.ivt.hot.service.dao.StIvtHotregioniomst; +import org.nl.wms.pdm.ivt.hot.service.dao.dto.StIvtHotregioniomstParam; +import org.nl.wms.pdm.ivt.hot.service.dao.mapper.StIvtHotregioniomstMapper; +import org.nl.wms.pdm.ivt.hot.service.IstIvtHotregioniomstService; import org.nl.wms.storage_manage.ios.enums.IOSEnum; import org.springframework.beans.BeanUtils; -import org.nl.common.utils.SecurityUtils; -import org.nl.common.utils.IdUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/controller/StIvtCoolpointivtController.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/controller/StIvtCoolpointivtController.java similarity index 94% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/controller/StIvtCoolpointivtController.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/controller/StIvtCoolpointivtController.java index 656f21d76..a676294f0 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/controller/StIvtCoolpointivtController.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/controller/StIvtCoolpointivtController.java @@ -1,4 +1,4 @@ -package org.nl.wms.pdm.ivt.controller; +package org.nl.wms.pdm.ivt.other.controller; import java.util.Set; import java.util.Map; @@ -16,8 +16,8 @@ import org.nl.common.domain.query.PageQuery; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.nl.common.logging.annotation.Log; -import org.nl.wms.pdm.ivt.dto.StIvtCoolpointivtParam; -import org.nl.wms.pdm.ivt.service.IstIvtCoolpointivtService; +import org.nl.wms.pdm.ivt.other.service.dao.dto.StIvtCoolpointivtParam; +import org.nl.wms.pdm.ivt.other.service.IstIvtCoolpointivtService; /** diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/controller/StIvtCoolregionioController.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/controller/StIvtCoolregionioController.java similarity index 93% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/controller/StIvtCoolregionioController.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/controller/StIvtCoolregionioController.java index 4ded2a7bc..e56dc5af4 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/controller/StIvtCoolregionioController.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/controller/StIvtCoolregionioController.java @@ -1,4 +1,4 @@ -package org.nl.wms.pdm.ivt.controller; +package org.nl.wms.pdm.ivt.other.controller; import java.util.Set; import java.util.Map; @@ -14,8 +14,8 @@ import org.nl.common.domain.query.PageQuery; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.nl.common.logging.annotation.Log; -import org.nl.wms.pdm.ivt.dto.StIvtCoolregionioParam; -import org.nl.wms.pdm.ivt.service.IstIvtCoolregionioService; +import org.nl.wms.pdm.ivt.other.service.dao.dto.StIvtCoolregionioParam; +import org.nl.wms.pdm.ivt.other.service.IstIvtCoolregionioService; /** diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/controller/StIvtDeliverypointivtController.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/controller/StIvtDeliverypointivtController.java similarity index 93% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/controller/StIvtDeliverypointivtController.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/controller/StIvtDeliverypointivtController.java index c7f82027c..706ce5f32 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/controller/StIvtDeliverypointivtController.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/controller/StIvtDeliverypointivtController.java @@ -1,4 +1,4 @@ -package org.nl.wms.pdm.ivt.controller; +package org.nl.wms.pdm.ivt.other.controller; import java.util.Set; import java.util.Map; @@ -14,8 +14,8 @@ import org.nl.common.domain.query.PageQuery; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.nl.common.logging.annotation.Log; -import org.nl.wms.pdm.ivt.dto.StIvtDeliverypointivtParam; -import org.nl.wms.pdm.ivt.service.IstIvtDeliverypointivtService; +import org.nl.wms.pdm.ivt.other.service.dao.dto.StIvtDeliverypointivtParam; +import org.nl.wms.pdm.ivt.other.service.IstIvtDeliverypointivtService; /** diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/controller/StIvtEmptytubeivtController.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/controller/StIvtEmptytubeivtController.java similarity index 93% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/controller/StIvtEmptytubeivtController.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/controller/StIvtEmptytubeivtController.java index c505c20f4..97c0e7740 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/controller/StIvtEmptytubeivtController.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/controller/StIvtEmptytubeivtController.java @@ -1,4 +1,4 @@ -package org.nl.wms.pdm.ivt.controller; +package org.nl.wms.pdm.ivt.other.controller; import java.util.Set; import java.util.Map; @@ -14,8 +14,8 @@ import org.nl.common.domain.query.PageQuery; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.nl.common.logging.annotation.Log; -import org.nl.wms.pdm.ivt.dto.StIvtEmptytubeivtParam; -import org.nl.wms.pdm.ivt.service.IstIvtEmptytubeivtService; +import org.nl.wms.pdm.ivt.other.service.dao.dto.StIvtEmptytubeivtParam; +import org.nl.wms.pdm.ivt.other.service.IstIvtEmptytubeivtService; /** diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/controller/StIvtEmptyvehiclerecordController.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/controller/StIvtEmptyvehiclerecordController.java similarity index 93% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/controller/StIvtEmptyvehiclerecordController.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/controller/StIvtEmptyvehiclerecordController.java index 4f64dd361..a2e7c5732 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/controller/StIvtEmptyvehiclerecordController.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/controller/StIvtEmptyvehiclerecordController.java @@ -1,4 +1,4 @@ -package org.nl.wms.pdm.ivt.controller; +package org.nl.wms.pdm.ivt.other.controller; import java.util.Set; import java.util.Map; @@ -14,8 +14,8 @@ import org.nl.common.domain.query.PageQuery; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.nl.common.logging.annotation.Log; -import org.nl.wms.pdm.ivt.dto.StIvtEmptyvehiclerecordParam; -import org.nl.wms.pdm.ivt.service.IstIvtEmptyvehiclerecordService; +import org.nl.wms.pdm.ivt.other.service.dao.dto.StIvtEmptyvehiclerecordParam; +import org.nl.wms.pdm.ivt.other.service.IstIvtEmptyvehiclerecordService; /** diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/controller/StIvtStpointivtController.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/controller/StIvtStpointivtController.java similarity index 93% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/controller/StIvtStpointivtController.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/controller/StIvtStpointivtController.java index 43cb24f4f..b115ad85a 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/controller/StIvtStpointivtController.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/controller/StIvtStpointivtController.java @@ -1,4 +1,4 @@ -package org.nl.wms.pdm.ivt.controller; +package org.nl.wms.pdm.ivt.other.controller; import java.util.Set; import java.util.Map; @@ -14,8 +14,8 @@ import org.nl.common.domain.query.PageQuery; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.nl.common.logging.annotation.Log; -import org.nl.wms.pdm.ivt.dto.StIvtStpointivtParam; -import org.nl.wms.pdm.ivt.service.IstIvtStpointivtService; +import org.nl.wms.pdm.ivt.other.service.dao.dto.StIvtStpointivtParam; +import org.nl.wms.pdm.ivt.other.service.IstIvtStpointivtService; /** diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/package-info.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/package-info.java new file mode 100644 index 000000000..e9ff18088 --- /dev/null +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/package-info.java @@ -0,0 +1,4 @@ +/** + * 其他没用到的 相关的控制层、服务层、持久层 + */ +package org.nl.wms.pdm.ivt.other; diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/IstIvtCoolpointivtService.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/IstIvtCoolpointivtService.java similarity index 86% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/IstIvtCoolpointivtService.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/IstIvtCoolpointivtService.java index ea4c3a63c..c5514b53b 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/IstIvtCoolpointivtService.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/IstIvtCoolpointivtService.java @@ -1,10 +1,10 @@ -package org.nl.wms.pdm.ivt.service; +package org.nl.wms.pdm.ivt.other.service; import com.baomidou.mybatisplus.core.metadata.IPage; import org.nl.common.domain.query.PageQuery; -import org.nl.wms.pdm.ivt.dao.StIvtCoolpointivt; +import org.nl.wms.pdm.ivt.other.service.dao.StIvtCoolpointivt; import com.baomidou.mybatisplus.extension.service.IService; -import org.nl.wms.pdm.ivt.dto.StIvtCoolpointivtParam; +import org.nl.wms.pdm.ivt.other.service.dao.dto.StIvtCoolpointivtParam; import java.util.List; import java.util.Map; diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/IstIvtCoolregionioService.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/IstIvtCoolregionioService.java similarity index 87% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/IstIvtCoolregionioService.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/IstIvtCoolregionioService.java index a0b76d1d2..601090697 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/IstIvtCoolregionioService.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/IstIvtCoolregionioService.java @@ -1,10 +1,10 @@ -package org.nl.wms.pdm.ivt.service; +package org.nl.wms.pdm.ivt.other.service; import com.baomidou.mybatisplus.core.metadata.IPage; import org.nl.common.domain.query.PageQuery; -import org.nl.wms.pdm.ivt.dao.StIvtCoolregionio; +import org.nl.wms.pdm.ivt.other.service.dao.StIvtCoolregionio; import com.baomidou.mybatisplus.extension.service.IService; -import org.nl.wms.pdm.ivt.dto.StIvtCoolregionioParam; +import org.nl.wms.pdm.ivt.other.service.dao.dto.StIvtCoolregionioParam; import java.util.List; import java.util.Map; diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/IstIvtDeliverypointivtService.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/IstIvtDeliverypointivtService.java similarity index 86% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/IstIvtDeliverypointivtService.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/IstIvtDeliverypointivtService.java index 0122eafeb..5ca7c9d52 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/IstIvtDeliverypointivtService.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/IstIvtDeliverypointivtService.java @@ -1,10 +1,10 @@ -package org.nl.wms.pdm.ivt.service; +package org.nl.wms.pdm.ivt.other.service; import com.baomidou.mybatisplus.core.metadata.IPage; import org.nl.common.domain.query.PageQuery; -import org.nl.wms.pdm.ivt.dao.StIvtDeliverypointivt; +import org.nl.wms.pdm.ivt.other.service.dao.StIvtDeliverypointivt; import com.baomidou.mybatisplus.extension.service.IService; -import org.nl.wms.pdm.ivt.dto.StIvtDeliverypointivtParam; +import org.nl.wms.pdm.ivt.other.service.dao.dto.StIvtDeliverypointivtParam; import java.util.List; import java.util.Map; diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/IstIvtEmptytubeivtService.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/IstIvtEmptytubeivtService.java similarity index 86% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/IstIvtEmptytubeivtService.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/IstIvtEmptytubeivtService.java index 728e2f9f4..dc15f0430 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/IstIvtEmptytubeivtService.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/IstIvtEmptytubeivtService.java @@ -1,10 +1,10 @@ -package org.nl.wms.pdm.ivt.service; +package org.nl.wms.pdm.ivt.other.service; import com.baomidou.mybatisplus.core.metadata.IPage; import org.nl.common.domain.query.PageQuery; -import org.nl.wms.pdm.ivt.dao.StIvtEmptytubeivt; +import org.nl.wms.pdm.ivt.other.service.dao.StIvtEmptytubeivt; import com.baomidou.mybatisplus.extension.service.IService; -import org.nl.wms.pdm.ivt.dto.StIvtEmptytubeivtParam; +import org.nl.wms.pdm.ivt.other.service.dao.dto.StIvtEmptytubeivtParam; import java.util.List; import java.util.Map; diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/IstIvtEmptyvehiclerecordService.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/IstIvtEmptyvehiclerecordService.java similarity index 86% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/IstIvtEmptyvehiclerecordService.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/IstIvtEmptyvehiclerecordService.java index 522f3bb6e..d86113ac2 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/IstIvtEmptyvehiclerecordService.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/IstIvtEmptyvehiclerecordService.java @@ -1,10 +1,10 @@ -package org.nl.wms.pdm.ivt.service; +package org.nl.wms.pdm.ivt.other.service; import com.baomidou.mybatisplus.core.metadata.IPage; import org.nl.common.domain.query.PageQuery; -import org.nl.wms.pdm.ivt.dao.StIvtEmptyvehiclerecord; +import org.nl.wms.pdm.ivt.other.service.dao.StIvtEmptyvehiclerecord; import com.baomidou.mybatisplus.extension.service.IService; -import org.nl.wms.pdm.ivt.dto.StIvtEmptyvehiclerecordParam; +import org.nl.wms.pdm.ivt.other.service.dao.dto.StIvtEmptyvehiclerecordParam; import java.util.List; import java.util.Map; diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/IstIvtStpointivtService.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/IstIvtStpointivtService.java similarity index 86% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/IstIvtStpointivtService.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/IstIvtStpointivtService.java index 1bf47698f..987ac7b77 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/IstIvtStpointivtService.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/IstIvtStpointivtService.java @@ -1,10 +1,10 @@ -package org.nl.wms.pdm.ivt.service; +package org.nl.wms.pdm.ivt.other.service; import com.baomidou.mybatisplus.core.metadata.IPage; import org.nl.common.domain.query.PageQuery; -import org.nl.wms.pdm.ivt.dao.StIvtStpointivt; +import org.nl.wms.pdm.ivt.other.service.dao.StIvtStpointivt; import com.baomidou.mybatisplus.extension.service.IService; -import org.nl.wms.pdm.ivt.dto.StIvtStpointivtParam; +import org.nl.wms.pdm.ivt.other.service.dao.dto.StIvtStpointivtParam; import java.util.List; import java.util.Map; diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/StIvtCoolpointivt.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/StIvtCoolpointivt.java similarity index 98% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/StIvtCoolpointivt.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/StIvtCoolpointivt.java index b412d96a1..c4a6d736c 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/StIvtCoolpointivt.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/StIvtCoolpointivt.java @@ -1,4 +1,4 @@ -package org.nl.wms.pdm.ivt.dao; +package org.nl.wms.pdm.ivt.other.service.dao; import java.math.BigDecimal; import java.io.Serializable; diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/StIvtCoolregionio.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/StIvtCoolregionio.java similarity index 98% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/StIvtCoolregionio.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/StIvtCoolregionio.java index 4d2dcaa51..bbd94eef5 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/StIvtCoolregionio.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/StIvtCoolregionio.java @@ -1,4 +1,4 @@ -package org.nl.wms.pdm.ivt.dao; +package org.nl.wms.pdm.ivt.other.service.dao; import java.math.BigDecimal; import java.io.Serializable; diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/StIvtDeliverypointivt.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/StIvtDeliverypointivt.java similarity index 97% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/StIvtDeliverypointivt.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/StIvtDeliverypointivt.java index fc207544f..640694ef9 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/StIvtDeliverypointivt.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/StIvtDeliverypointivt.java @@ -1,4 +1,4 @@ -package org.nl.wms.pdm.ivt.dao; +package org.nl.wms.pdm.ivt.other.service.dao; import java.math.BigDecimal; import java.io.Serializable; diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/StIvtEmptytubeivt.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/StIvtEmptytubeivt.java similarity index 97% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/StIvtEmptytubeivt.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/StIvtEmptytubeivt.java index f3bd41861..b5e9801d5 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/StIvtEmptytubeivt.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/StIvtEmptytubeivt.java @@ -1,4 +1,4 @@ -package org.nl.wms.pdm.ivt.dao; +package org.nl.wms.pdm.ivt.other.service.dao; import java.math.BigDecimal; import java.io.Serializable; diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/StIvtEmptyvehiclerecord.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/StIvtEmptyvehiclerecord.java similarity index 97% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/StIvtEmptyvehiclerecord.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/StIvtEmptyvehiclerecord.java index dff383c3e..ab5861dec 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/StIvtEmptyvehiclerecord.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/StIvtEmptyvehiclerecord.java @@ -1,4 +1,4 @@ -package org.nl.wms.pdm.ivt.dao; +package org.nl.wms.pdm.ivt.other.service.dao; import java.math.BigDecimal; import java.io.Serializable; diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/StIvtStpointivt.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/StIvtStpointivt.java similarity index 98% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/StIvtStpointivt.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/StIvtStpointivt.java index 05bfacf5e..6e337a929 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/StIvtStpointivt.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/StIvtStpointivt.java @@ -1,4 +1,4 @@ -package org.nl.wms.pdm.ivt.dao; +package org.nl.wms.pdm.ivt.other.service.dao; import java.io.Serializable; diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtCoolpointivtDto.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/dto/StIvtCoolpointivtDto.java similarity index 97% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtCoolpointivtDto.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/dto/StIvtCoolpointivtDto.java index ccdabbbca..cc4cdc4bf 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtCoolpointivtDto.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/dto/StIvtCoolpointivtDto.java @@ -1,4 +1,4 @@ -package org.nl.wms.pdm.ivt.dto; +package org.nl.wms.pdm.ivt.other.service.dao.dto; import java.math.BigDecimal; import java.io.Serializable; diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtCoolpointivtParam.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/dto/StIvtCoolpointivtParam.java similarity index 95% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtCoolpointivtParam.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/dto/StIvtCoolpointivtParam.java index c5c1ccf5d..b6c5a6a54 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtCoolpointivtParam.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/dto/StIvtCoolpointivtParam.java @@ -1,4 +1,4 @@ -package org.nl.wms.pdm.ivt.dto; +package org.nl.wms.pdm.ivt.other.service.dao.dto; import java.math.BigDecimal; @@ -7,7 +7,7 @@ import lombok.Data; import lombok.*; import lombok.EqualsAndHashCode; import org.nl.common.domain.query.BaseQuery; -import org.nl.wms.pdm.ivt.dao.StIvtCoolpointivt; +import org.nl.wms.pdm.ivt.other.service.dao.StIvtCoolpointivt; /** * {@code @Description:} 冷却区点位库存表(StIvtCoolpointivt)查询参数类 diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtCoolregionioDto.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/dto/StIvtCoolregionioDto.java similarity index 97% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtCoolregionioDto.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/dto/StIvtCoolregionioDto.java index f37b6a99a..c1039c657 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtCoolregionioDto.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/dto/StIvtCoolregionioDto.java @@ -1,4 +1,4 @@ -package org.nl.wms.pdm.ivt.dto; +package org.nl.wms.pdm.ivt.other.service.dao.dto; import java.math.BigDecimal; import java.io.Serializable; diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtCoolregionioParam.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/dto/StIvtCoolregionioParam.java similarity index 94% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtCoolregionioParam.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/dto/StIvtCoolregionioParam.java index e93e81146..5ac958eb1 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtCoolregionioParam.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/dto/StIvtCoolregionioParam.java @@ -1,4 +1,4 @@ -package org.nl.wms.pdm.ivt.dto; +package org.nl.wms.pdm.ivt.other.service.dao.dto; import java.math.BigDecimal; @@ -7,7 +7,7 @@ import lombok.Data; import lombok.*; import lombok.EqualsAndHashCode; import org.nl.common.domain.query.BaseQuery; -import org.nl.wms.pdm.ivt.dao.StIvtCoolregionio; +import org.nl.wms.pdm.ivt.other.service.dao.StIvtCoolregionio; /** * {@code @Description:} 冷却区出入表(StIvtCoolregionio)查询参数类 diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtDeliverypointivtDto.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/dto/StIvtDeliverypointivtDto.java similarity index 96% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtDeliverypointivtDto.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/dto/StIvtDeliverypointivtDto.java index 2d21214aa..0f86cf8d7 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtDeliverypointivtDto.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/dto/StIvtDeliverypointivtDto.java @@ -1,4 +1,4 @@ -package org.nl.wms.pdm.ivt.dto; +package org.nl.wms.pdm.ivt.other.service.dao.dto; import java.math.BigDecimal; import java.io.Serializable; diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtDeliverypointivtParam.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/dto/StIvtDeliverypointivtParam.java similarity index 93% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtDeliverypointivtParam.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/dto/StIvtDeliverypointivtParam.java index 5f87a810a..61909bef9 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtDeliverypointivtParam.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/dto/StIvtDeliverypointivtParam.java @@ -1,4 +1,4 @@ -package org.nl.wms.pdm.ivt.dto; +package org.nl.wms.pdm.ivt.other.service.dao.dto; import java.math.BigDecimal; @@ -7,7 +7,7 @@ import lombok.Data; import lombok.*; import lombok.EqualsAndHashCode; import org.nl.common.domain.query.BaseQuery; -import org.nl.wms.pdm.ivt.dao.StIvtDeliverypointivt; +import org.nl.wms.pdm.ivt.other.service.dao.StIvtDeliverypointivt; /** * {@code @Description:} 分切输送线点位库存表(StIvtDeliverypointivt)查询参数类 diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtEmptytubeivtDto.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/dto/StIvtEmptytubeivtDto.java similarity index 96% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtEmptytubeivtDto.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/dto/StIvtEmptytubeivtDto.java index 1a3932697..f36893558 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtEmptytubeivtDto.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/dto/StIvtEmptytubeivtDto.java @@ -1,4 +1,4 @@ -package org.nl.wms.pdm.ivt.dto; +package org.nl.wms.pdm.ivt.other.service.dao.dto; import java.math.BigDecimal; import java.io.Serializable; diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtEmptytubeivtParam.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/dto/StIvtEmptytubeivtParam.java similarity index 93% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtEmptytubeivtParam.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/dto/StIvtEmptytubeivtParam.java index 1377eaab5..cb3fafba5 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtEmptytubeivtParam.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/dto/StIvtEmptytubeivtParam.java @@ -1,4 +1,4 @@ -package org.nl.wms.pdm.ivt.dto; +package org.nl.wms.pdm.ivt.other.service.dao.dto; import java.math.BigDecimal; @@ -7,7 +7,7 @@ import lombok.Data; import lombok.*; import lombok.EqualsAndHashCode; import org.nl.common.domain.query.BaseQuery; -import org.nl.wms.pdm.ivt.dao.StIvtEmptytubeivt; +import org.nl.wms.pdm.ivt.other.service.dao.StIvtEmptytubeivt; /** * {@code @Description:} 空纸管库区点位库存表(StIvtEmptytubeivt)查询参数类 diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtEmptyvehiclerecordDto.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/dto/StIvtEmptyvehiclerecordDto.java similarity index 97% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtEmptyvehiclerecordDto.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/dto/StIvtEmptyvehiclerecordDto.java index 19365eb95..71f401ce6 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtEmptyvehiclerecordDto.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/dto/StIvtEmptyvehiclerecordDto.java @@ -1,4 +1,4 @@ -package org.nl.wms.pdm.ivt.dto; +package org.nl.wms.pdm.ivt.other.service.dao.dto; import java.math.BigDecimal; import java.io.Serializable; diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtEmptyvehiclerecordParam.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/dto/StIvtEmptyvehiclerecordParam.java similarity index 93% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtEmptyvehiclerecordParam.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/dto/StIvtEmptyvehiclerecordParam.java index bd273ad14..1a6c4c69b 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtEmptyvehiclerecordParam.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/dto/StIvtEmptyvehiclerecordParam.java @@ -1,4 +1,4 @@ -package org.nl.wms.pdm.ivt.dto; +package org.nl.wms.pdm.ivt.other.service.dao.dto; import java.math.BigDecimal; @@ -7,7 +7,7 @@ import lombok.Data; import lombok.*; import lombok.EqualsAndHashCode; import org.nl.common.domain.query.BaseQuery; -import org.nl.wms.pdm.ivt.dao.StIvtEmptyvehiclerecord; +import org.nl.wms.pdm.ivt.other.service.dao.StIvtEmptyvehiclerecord; /** * {@code @Description:} 空载具作业记录表(StIvtEmptyvehiclerecord)查询参数类 diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtStpointivtDto.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/dto/StIvtStpointivtDto.java similarity index 97% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtStpointivtDto.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/dto/StIvtStpointivtDto.java index a0f32d43f..b06ba495b 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtStpointivtDto.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/dto/StIvtStpointivtDto.java @@ -1,4 +1,4 @@ -package org.nl.wms.pdm.ivt.dto; +package org.nl.wms.pdm.ivt.other.service.dao.dto; import java.io.Serializable; diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtStpointivtParam.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/dto/StIvtStpointivtParam.java similarity index 94% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtStpointivtParam.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/dto/StIvtStpointivtParam.java index 0bff5081e..07509a1f1 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtStpointivtParam.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/dto/StIvtStpointivtParam.java @@ -1,11 +1,11 @@ -package org.nl.wms.pdm.ivt.dto; +package org.nl.wms.pdm.ivt.other.service.dao.dto; import lombok.Data; import lombok.*; import lombok.EqualsAndHashCode; import org.nl.common.domain.query.BaseQuery; -import org.nl.wms.pdm.ivt.dao.StIvtStpointivt; +import org.nl.wms.pdm.ivt.other.service.dao.StIvtStpointivt; /** * {@code @Description:} 表处点位库存表(StIvtStpointivt)查询参数类 diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/StIvtCoolpointivtMapper.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/mapper/StIvtCoolpointivtMapper.java similarity index 70% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/StIvtCoolpointivtMapper.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/mapper/StIvtCoolpointivtMapper.java index 578c44598..50a1c94a4 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/StIvtCoolpointivtMapper.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/mapper/StIvtCoolpointivtMapper.java @@ -1,6 +1,6 @@ -package org.nl.wms.pdm.ivt.dao.mapper; +package org.nl.wms.pdm.ivt.other.service.dao.mapper; -import org.nl.wms.pdm.ivt.dao.StIvtCoolpointivt; +import org.nl.wms.pdm.ivt.other.service.dao.StIvtCoolpointivt; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/StIvtCoolregionioMapper.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/mapper/StIvtCoolregionioMapper.java similarity index 70% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/StIvtCoolregionioMapper.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/mapper/StIvtCoolregionioMapper.java index e122a47d0..6bd4fd61a 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/StIvtCoolregionioMapper.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/mapper/StIvtCoolregionioMapper.java @@ -1,6 +1,6 @@ -package org.nl.wms.pdm.ivt.dao.mapper; +package org.nl.wms.pdm.ivt.other.service.dao.mapper; -import org.nl.wms.pdm.ivt.dao.StIvtCoolregionio; +import org.nl.wms.pdm.ivt.other.service.dao.StIvtCoolregionio; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/StIvtDeliverypointivtMapper.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/mapper/StIvtDeliverypointivtMapper.java similarity index 71% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/StIvtDeliverypointivtMapper.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/mapper/StIvtDeliverypointivtMapper.java index 40b6158de..05936eee1 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/StIvtDeliverypointivtMapper.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/mapper/StIvtDeliverypointivtMapper.java @@ -1,6 +1,6 @@ -package org.nl.wms.pdm.ivt.dao.mapper; +package org.nl.wms.pdm.ivt.other.service.dao.mapper; -import org.nl.wms.pdm.ivt.dao.StIvtDeliverypointivt; +import org.nl.wms.pdm.ivt.other.service.dao.StIvtDeliverypointivt; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/StIvtEmptytubeivtMapper.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/mapper/StIvtEmptytubeivtMapper.java similarity index 71% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/StIvtEmptytubeivtMapper.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/mapper/StIvtEmptytubeivtMapper.java index edc873e87..0895c6162 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/StIvtEmptytubeivtMapper.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/mapper/StIvtEmptytubeivtMapper.java @@ -1,6 +1,6 @@ -package org.nl.wms.pdm.ivt.dao.mapper; +package org.nl.wms.pdm.ivt.other.service.dao.mapper; -import org.nl.wms.pdm.ivt.dao.StIvtEmptytubeivt; +import org.nl.wms.pdm.ivt.other.service.dao.StIvtEmptytubeivt; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/StIvtEmptyvehiclerecordMapper.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/mapper/StIvtEmptyvehiclerecordMapper.java similarity index 71% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/StIvtEmptyvehiclerecordMapper.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/mapper/StIvtEmptyvehiclerecordMapper.java index cb6386da9..b55a5acc8 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/StIvtEmptyvehiclerecordMapper.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/mapper/StIvtEmptyvehiclerecordMapper.java @@ -1,6 +1,6 @@ -package org.nl.wms.pdm.ivt.dao.mapper; +package org.nl.wms.pdm.ivt.other.service.dao.mapper; -import org.nl.wms.pdm.ivt.dao.StIvtEmptyvehiclerecord; +import org.nl.wms.pdm.ivt.other.service.dao.StIvtEmptyvehiclerecord; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/StIvtStpointivtMapper.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/mapper/StIvtStpointivtMapper.java similarity index 70% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/StIvtStpointivtMapper.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/mapper/StIvtStpointivtMapper.java index b9ee25179..cf4d3243b 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/StIvtStpointivtMapper.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/mapper/StIvtStpointivtMapper.java @@ -1,6 +1,6 @@ -package org.nl.wms.pdm.ivt.dao.mapper; +package org.nl.wms.pdm.ivt.other.service.dao.mapper; -import org.nl.wms.pdm.ivt.dao.StIvtStpointivt; +import org.nl.wms.pdm.ivt.other.service.dao.StIvtStpointivt; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/xml/StIvtCoolpointivtMapper.xml b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/mapper/xml/StIvtCoolpointivtMapper.xml similarity index 64% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/xml/StIvtCoolpointivtMapper.xml rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/mapper/xml/StIvtCoolpointivtMapper.xml index 2a479ada2..8fa095930 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/xml/StIvtCoolpointivtMapper.xml +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/mapper/xml/StIvtCoolpointivtMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/xml/StIvtCoolregionioMapper.xml b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/mapper/xml/StIvtCoolregionioMapper.xml similarity index 64% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/xml/StIvtCoolregionioMapper.xml rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/mapper/xml/StIvtCoolregionioMapper.xml index 33294b7fb..0350feebf 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/xml/StIvtCoolregionioMapper.xml +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/mapper/xml/StIvtCoolregionioMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/xml/StIvtDeliverypointivtMapper.xml b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/mapper/xml/StIvtDeliverypointivtMapper.xml similarity index 63% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/xml/StIvtDeliverypointivtMapper.xml rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/mapper/xml/StIvtDeliverypointivtMapper.xml index 63532fbc1..b023cbf5a 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/xml/StIvtDeliverypointivtMapper.xml +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/mapper/xml/StIvtDeliverypointivtMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/xml/StIvtEmptytubeivtMapper.xml b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/mapper/xml/StIvtEmptytubeivtMapper.xml similarity index 64% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/xml/StIvtEmptytubeivtMapper.xml rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/mapper/xml/StIvtEmptytubeivtMapper.xml index 5d8b0242b..486a8691d 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/xml/StIvtEmptytubeivtMapper.xml +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/mapper/xml/StIvtEmptytubeivtMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/xml/StIvtEmptyvehiclerecordMapper.xml b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/mapper/xml/StIvtEmptyvehiclerecordMapper.xml similarity index 62% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/xml/StIvtEmptyvehiclerecordMapper.xml rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/mapper/xml/StIvtEmptyvehiclerecordMapper.xml index 9ece1e6fe..1f9548abb 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/xml/StIvtEmptyvehiclerecordMapper.xml +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/mapper/xml/StIvtEmptyvehiclerecordMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/xml/StIvtStpointivtMapper.xml b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/mapper/xml/StIvtStpointivtMapper.xml similarity index 64% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/xml/StIvtStpointivtMapper.xml rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/mapper/xml/StIvtStpointivtMapper.xml index d767a52ce..4324e50a9 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/xml/StIvtStpointivtMapper.xml +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/dao/mapper/xml/StIvtStpointivtMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/impl/StIvtCoolpointivtServiceImpl.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/impl/StIvtCoolpointivtServiceImpl.java similarity index 92% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/impl/StIvtCoolpointivtServiceImpl.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/impl/StIvtCoolpointivtServiceImpl.java index 18a35229a..28b16015d 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/impl/StIvtCoolpointivtServiceImpl.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/impl/StIvtCoolpointivtServiceImpl.java @@ -1,19 +1,14 @@ -package org.nl.wms.pdm.ivt.service.impl; +package org.nl.wms.pdm.ivt.other.service.impl; 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 org.nl.wms.pdm.bi.dao.PdmBiRawfoilworkorder; -import org.nl.wms.pdm.ivt.dao.StIvtCoolpointivt; -import org.nl.wms.pdm.ivt.dto.StIvtCoolpointivtParam; -import org.nl.wms.pdm.ivt.dao.mapper.StIvtCoolpointivtMapper; -import cn.hutool.core.util.ObjectUtil; -import org.nl.wms.pdm.ivt.service.IstIvtCoolpointivtService; -import cn.hutool.core.date.DateUtil; +import org.nl.wms.pdm.ivt.other.service.dao.StIvtCoolpointivt; +import org.nl.wms.pdm.ivt.other.service.dao.dto.StIvtCoolpointivtParam; +import org.nl.wms.pdm.ivt.other.service.dao.mapper.StIvtCoolpointivtMapper; +import org.nl.wms.pdm.ivt.other.service.IstIvtCoolpointivtService; import org.nl.wms.storage_manage.ios.enums.IOSEnum; import org.springframework.beans.BeanUtils; -import org.nl.common.utils.SecurityUtils; -import org.nl.common.utils.IdUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/impl/StIvtCoolregionioServiceImpl.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/impl/StIvtCoolregionioServiceImpl.java similarity index 94% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/impl/StIvtCoolregionioServiceImpl.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/impl/StIvtCoolregionioServiceImpl.java index 8078ccad4..06909adfb 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/impl/StIvtCoolregionioServiceImpl.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/impl/StIvtCoolregionioServiceImpl.java @@ -1,14 +1,13 @@ -package org.nl.wms.pdm.ivt.service.impl; +package org.nl.wms.pdm.ivt.other.service.impl; 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 org.nl.common.exception.BadRequestException; -import org.nl.wms.pdm.ivt.dao.StIvtCoolregionio; -import org.nl.wms.pdm.ivt.dto.StIvtCoolregionioParam; -import org.nl.wms.pdm.ivt.dao.mapper.StIvtCoolregionioMapper; -import cn.hutool.core.util.ObjectUtil; -import org.nl.wms.pdm.ivt.service.IstIvtCoolregionioService; +import org.nl.wms.pdm.ivt.other.service.dao.StIvtCoolregionio; +import org.nl.wms.pdm.ivt.other.service.dao.dto.StIvtCoolregionioParam; +import org.nl.wms.pdm.ivt.other.service.dao.mapper.StIvtCoolregionioMapper; +import org.nl.wms.pdm.ivt.other.service.IstIvtCoolregionioService; import cn.hutool.core.date.DateUtil; import org.nl.wms.storage_manage.ios.enums.IOSEnum; import org.springframework.beans.BeanUtils; diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/impl/StIvtDeliverypointivtServiceImpl.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/impl/StIvtDeliverypointivtServiceImpl.java similarity index 91% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/impl/StIvtDeliverypointivtServiceImpl.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/impl/StIvtDeliverypointivtServiceImpl.java index aa839e2a1..7ebf8fa76 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/impl/StIvtDeliverypointivtServiceImpl.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/impl/StIvtDeliverypointivtServiceImpl.java @@ -1,18 +1,14 @@ -package org.nl.wms.pdm.ivt.service.impl; +package org.nl.wms.pdm.ivt.other.service.impl; 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 org.nl.wms.pdm.ivt.dao.StIvtDeliverypointivt; -import org.nl.wms.pdm.ivt.dto.StIvtDeliverypointivtParam; -import org.nl.wms.pdm.ivt.dao.mapper.StIvtDeliverypointivtMapper; -import cn.hutool.core.util.ObjectUtil; -import org.nl.wms.pdm.ivt.service.IstIvtDeliverypointivtService; -import cn.hutool.core.date.DateUtil; +import org.nl.wms.pdm.ivt.other.service.dao.StIvtDeliverypointivt; +import org.nl.wms.pdm.ivt.other.service.dao.dto.StIvtDeliverypointivtParam; +import org.nl.wms.pdm.ivt.other.service.dao.mapper.StIvtDeliverypointivtMapper; +import org.nl.wms.pdm.ivt.other.service.IstIvtDeliverypointivtService; import org.nl.wms.storage_manage.ios.enums.IOSEnum; import org.springframework.beans.BeanUtils; -import org.nl.common.utils.SecurityUtils; -import org.nl.common.utils.IdUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/impl/StIvtEmptytubeivtServiceImpl.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/impl/StIvtEmptytubeivtServiceImpl.java similarity index 91% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/impl/StIvtEmptytubeivtServiceImpl.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/impl/StIvtEmptytubeivtServiceImpl.java index 3087991f7..1c8200031 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/impl/StIvtEmptytubeivtServiceImpl.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/impl/StIvtEmptytubeivtServiceImpl.java @@ -1,18 +1,14 @@ -package org.nl.wms.pdm.ivt.service.impl; +package org.nl.wms.pdm.ivt.other.service.impl; 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 org.nl.wms.pdm.ivt.dao.StIvtEmptytubeivt; -import org.nl.wms.pdm.ivt.dto.StIvtEmptytubeivtParam; -import org.nl.wms.pdm.ivt.dao.mapper.StIvtEmptytubeivtMapper; -import cn.hutool.core.util.ObjectUtil; -import org.nl.wms.pdm.ivt.service.IstIvtEmptytubeivtService; -import cn.hutool.core.date.DateUtil; +import org.nl.wms.pdm.ivt.other.service.dao.StIvtEmptytubeivt; +import org.nl.wms.pdm.ivt.other.service.dao.dto.StIvtEmptytubeivtParam; +import org.nl.wms.pdm.ivt.other.service.dao.mapper.StIvtEmptytubeivtMapper; +import org.nl.wms.pdm.ivt.other.service.IstIvtEmptytubeivtService; import org.nl.wms.storage_manage.ios.enums.IOSEnum; import org.springframework.beans.BeanUtils; -import org.nl.common.utils.SecurityUtils; -import org.nl.common.utils.IdUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/impl/StIvtEmptyvehiclerecordServiceImpl.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/impl/StIvtEmptyvehiclerecordServiceImpl.java similarity index 91% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/impl/StIvtEmptyvehiclerecordServiceImpl.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/impl/StIvtEmptyvehiclerecordServiceImpl.java index a28f9c1f0..c3637cf7f 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/impl/StIvtEmptyvehiclerecordServiceImpl.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/impl/StIvtEmptyvehiclerecordServiceImpl.java @@ -1,18 +1,14 @@ -package org.nl.wms.pdm.ivt.service.impl; +package org.nl.wms.pdm.ivt.other.service.impl; 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 org.nl.wms.pdm.ivt.dao.StIvtEmptyvehiclerecord; -import org.nl.wms.pdm.ivt.dto.StIvtEmptyvehiclerecordParam; -import org.nl.wms.pdm.ivt.dao.mapper.StIvtEmptyvehiclerecordMapper; -import cn.hutool.core.util.ObjectUtil; -import org.nl.wms.pdm.ivt.service.IstIvtEmptyvehiclerecordService; -import cn.hutool.core.date.DateUtil; +import org.nl.wms.pdm.ivt.other.service.dao.StIvtEmptyvehiclerecord; +import org.nl.wms.pdm.ivt.other.service.dao.dto.StIvtEmptyvehiclerecordParam; +import org.nl.wms.pdm.ivt.other.service.dao.mapper.StIvtEmptyvehiclerecordMapper; +import org.nl.wms.pdm.ivt.other.service.IstIvtEmptyvehiclerecordService; import org.nl.wms.storage_manage.ios.enums.IOSEnum; import org.springframework.beans.BeanUtils; -import org.nl.common.utils.SecurityUtils; -import org.nl.common.utils.IdUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/impl/StIvtStpointivtServiceImpl.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/impl/StIvtStpointivtServiceImpl.java similarity index 91% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/impl/StIvtStpointivtServiceImpl.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/impl/StIvtStpointivtServiceImpl.java index 9407b3465..c255ce095 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/impl/StIvtStpointivtServiceImpl.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/other/service/impl/StIvtStpointivtServiceImpl.java @@ -1,18 +1,14 @@ -package org.nl.wms.pdm.ivt.service.impl; +package org.nl.wms.pdm.ivt.other.service.impl; 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 org.nl.wms.pdm.ivt.dao.StIvtStpointivt; -import org.nl.wms.pdm.ivt.dto.StIvtStpointivtParam; -import org.nl.wms.pdm.ivt.dao.mapper.StIvtStpointivtMapper; -import cn.hutool.core.util.ObjectUtil; -import org.nl.wms.pdm.ivt.service.IstIvtStpointivtService; -import cn.hutool.core.date.DateUtil; +import org.nl.wms.pdm.ivt.other.service.dao.StIvtStpointivt; +import org.nl.wms.pdm.ivt.other.service.dao.dto.StIvtStpointivtParam; +import org.nl.wms.pdm.ivt.other.service.dao.mapper.StIvtStpointivtMapper; +import org.nl.wms.pdm.ivt.other.service.IstIvtStpointivtService; import org.nl.wms.storage_manage.ios.enums.IOSEnum; import org.springframework.beans.BeanUtils; -import org.nl.common.utils.SecurityUtils; -import org.nl.common.utils.IdUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/controller/StIvtSbpointivtController.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/raw/controller/StIvtSbpointivtController.java similarity index 93% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/controller/StIvtSbpointivtController.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/raw/controller/StIvtSbpointivtController.java index 6f0d227c5..14f3c0ab7 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/controller/StIvtSbpointivtController.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/raw/controller/StIvtSbpointivtController.java @@ -1,4 +1,4 @@ -package org.nl.wms.pdm.ivt.controller; +package org.nl.wms.pdm.ivt.raw.controller; import java.util.Set; import java.util.Map; @@ -14,8 +14,8 @@ import org.nl.common.domain.query.PageQuery; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.nl.common.logging.annotation.Log; -import org.nl.wms.pdm.ivt.dto.StIvtSbpointivtParam; -import org.nl.wms.pdm.ivt.service.IstIvtSbpointivtService; +import org.nl.wms.pdm.ivt.raw.service.dao.dto.StIvtSbpointivtParam; +import org.nl.wms.pdm.ivt.raw.service.IstIvtSbpointivtService; /** diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/raw/package-info.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/raw/package-info.java new file mode 100644 index 000000000..ab37c2836 --- /dev/null +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/raw/package-info.java @@ -0,0 +1,4 @@ +/** + * 生箔相关的控制层、服务层、持久层 + */ +package org.nl.wms.pdm.ivt.raw; diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/IstIvtSbpointivtService.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/raw/service/IstIvtSbpointivtService.java similarity index 89% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/IstIvtSbpointivtService.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/raw/service/IstIvtSbpointivtService.java index 202beb4f5..dcb5f3a12 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/IstIvtSbpointivtService.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/raw/service/IstIvtSbpointivtService.java @@ -1,10 +1,10 @@ -package org.nl.wms.pdm.ivt.service; +package org.nl.wms.pdm.ivt.raw.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import org.nl.common.domain.query.PageQuery; -import org.nl.wms.pdm.ivt.dao.StIvtSbpointivt; -import org.nl.wms.pdm.ivt.dto.StIvtSbpointivtParam; +import org.nl.wms.pdm.ivt.raw.service.dao.StIvtSbpointivt; +import org.nl.wms.pdm.ivt.raw.service.dao.dto.StIvtSbpointivtParam; import java.util.List; import java.util.Map; diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/StIvtSbpointivt.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/raw/service/dao/StIvtSbpointivt.java similarity index 97% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/StIvtSbpointivt.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/raw/service/dao/StIvtSbpointivt.java index d4870cf8b..2a887b2d3 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/StIvtSbpointivt.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/raw/service/dao/StIvtSbpointivt.java @@ -1,4 +1,4 @@ -package org.nl.wms.pdm.ivt.dao; +package org.nl.wms.pdm.ivt.raw.service.dao; import java.io.Serializable; diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtSbpointivtDto.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/raw/service/dao/dto/StIvtSbpointivtDto.java similarity index 96% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtSbpointivtDto.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/raw/service/dao/dto/StIvtSbpointivtDto.java index 680aeb350..01395c624 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtSbpointivtDto.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/raw/service/dao/dto/StIvtSbpointivtDto.java @@ -1,4 +1,4 @@ -package org.nl.wms.pdm.ivt.dto; +package org.nl.wms.pdm.ivt.raw.service.dao.dto; import java.io.Serializable; diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtSbpointivtParam.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/raw/service/dao/dto/StIvtSbpointivtParam.java similarity index 93% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtSbpointivtParam.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/raw/service/dao/dto/StIvtSbpointivtParam.java index 67f8260d7..d7f64ed06 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dto/StIvtSbpointivtParam.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/raw/service/dao/dto/StIvtSbpointivtParam.java @@ -1,11 +1,11 @@ -package org.nl.wms.pdm.ivt.dto; +package org.nl.wms.pdm.ivt.raw.service.dao.dto; import lombok.Data; import lombok.*; import lombok.EqualsAndHashCode; import org.nl.common.domain.query.BaseQuery; -import org.nl.wms.pdm.ivt.dao.StIvtSbpointivt; +import org.nl.wms.pdm.ivt.raw.service.dao.StIvtSbpointivt; /** * {@code @Description:} 生箔点位库存表(StIvtSbpointivt)查询参数类 diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/StIvtSbpointivtMapper.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/raw/service/dao/mapper/StIvtSbpointivtMapper.java similarity index 71% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/StIvtSbpointivtMapper.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/raw/service/dao/mapper/StIvtSbpointivtMapper.java index ae3ea5b91..66c268174 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/StIvtSbpointivtMapper.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/raw/service/dao/mapper/StIvtSbpointivtMapper.java @@ -1,6 +1,6 @@ -package org.nl.wms.pdm.ivt.dao.mapper; +package org.nl.wms.pdm.ivt.raw.service.dao.mapper; -import org.nl.wms.pdm.ivt.dao.StIvtSbpointivt; +import org.nl.wms.pdm.ivt.raw.service.dao.StIvtSbpointivt; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/xml/StIvtSbpointivtMapper.xml b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/raw/service/dao/mapper/StIvtSbpointivtMapper.xml similarity index 65% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/xml/StIvtSbpointivtMapper.xml rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/raw/service/dao/mapper/StIvtSbpointivtMapper.xml index 6e7e8de79..7a221b86d 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/dao/mapper/xml/StIvtSbpointivtMapper.xml +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/raw/service/dao/mapper/StIvtSbpointivtMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/impl/StIvtSbpointivtServiceImpl.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/raw/service/impl/StIvtSbpointivtServiceImpl.java similarity index 94% rename from lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/impl/StIvtSbpointivtServiceImpl.java rename to lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/raw/service/impl/StIvtSbpointivtServiceImpl.java index 5b9413f62..c7a7c0659 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/service/impl/StIvtSbpointivtServiceImpl.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/raw/service/impl/StIvtSbpointivtServiceImpl.java @@ -1,4 +1,4 @@ -package org.nl.wms.pdm.ivt.service.impl; +package org.nl.wms.pdm.ivt.raw.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -7,10 +7,10 @@ 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.nl.common.domain.query.PageQuery; -import org.nl.wms.pdm.ivt.dao.StIvtSbpointivt; -import org.nl.wms.pdm.ivt.dao.mapper.StIvtSbpointivtMapper; -import org.nl.wms.pdm.ivt.dto.StIvtSbpointivtParam; -import org.nl.wms.pdm.ivt.service.IstIvtSbpointivtService; +import org.nl.wms.pdm.ivt.raw.service.dao.StIvtSbpointivt; +import org.nl.wms.pdm.ivt.raw.service.dao.mapper.StIvtSbpointivtMapper; +import org.nl.wms.pdm.ivt.raw.service.dao.dto.StIvtSbpointivtParam; +import org.nl.wms.pdm.ivt.raw.service.IstIvtSbpointivtService; import org.nl.wms.storage_manage.ios.enums.IOSEnum; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/quartz/AutoQueryDeviceStatus.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/quartz/AutoQueryDeviceStatus.java index 843794cac..665a92928 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/quartz/AutoQueryDeviceStatus.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/quartz/AutoQueryDeviceStatus.java @@ -7,7 +7,7 @@ import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.nl.common.utils.RedisUtils; import org.nl.wms.ext.acs.service.WmsToAcsService; -import org.nl.wms.pdm.ivt.service.IstIvtHotpointivtService; +import org.nl.wms.pdm.ivt.hot.service.IstIvtHotpointivtService; import org.nl.wms.util.URLEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/auto/AutoInHotTrussTask.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/auto/AutoInHotTrussTask.java index a23fe9a63..6082e1b51 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/auto/AutoInHotTrussTask.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/auto/AutoInHotTrussTask.java @@ -9,8 +9,8 @@ import org.nl.common.exception.BadRequestException; import org.nl.common.utils.CodeUtil; import org.nl.wms.pdm.bi.dao.PdmBiRawfoilworkorder; import org.nl.wms.pdm.bi.service.IpdmBiRawfoilworkorderService; -import org.nl.wms.pdm.ivt.dao.StIvtHotpointivt; -import org.nl.wms.pdm.ivt.service.IstIvtHotpointivtService; +import org.nl.wms.pdm.ivt.hot.service.dao.StIvtHotpointivt; +import org.nl.wms.pdm.ivt.hot.service.IstIvtHotpointivtService; import org.nl.wms.sch.point.service.ISchBasePointService; import org.nl.wms.sch.point.service.dao.SchBasePoint; import org.nl.wms.sch.task.service.ISchBaseTaskService; diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/hot/InHotTrussTask.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/hot/InHotTrussTask.java index 0bd7d9cbd..0b0d81d6c 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/hot/InHotTrussTask.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/hot/InHotTrussTask.java @@ -9,8 +9,8 @@ import org.nl.common.exception.BadRequestException; import org.nl.common.utils.RedisUtils; import org.nl.wms.pdm.bi.dao.PdmBiRawfoilworkorder; import org.nl.wms.pdm.bi.service.IpdmBiRawfoilworkorderService; -import org.nl.wms.pdm.ivt.dao.StIvtHotpointivt; -import org.nl.wms.pdm.ivt.service.IstIvtHotpointivtService; +import org.nl.wms.pdm.ivt.hot.service.dao.StIvtHotpointivt; +import org.nl.wms.pdm.ivt.hot.service.IstIvtHotpointivtService; import org.nl.wms.sch.point.service.ISchBasePointService; import org.nl.wms.sch.point.service.dao.SchBasePoint; import org.nl.wms.sch.task.service.ISchBaseTaskService; diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/hot/OutHotTrussTask.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/hot/OutHotTrussTask.java index 9bdb7af5a..9ce209859 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/hot/OutHotTrussTask.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/hot/OutHotTrussTask.java @@ -3,8 +3,8 @@ package org.nl.wms.sch.task_manage.tasks.hot; import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; import org.nl.common.exception.BadRequestException; -import org.nl.wms.pdm.ivt.dao.StIvtHotpointivt; -import org.nl.wms.pdm.ivt.service.IstIvtHotpointivtService; +import org.nl.wms.pdm.ivt.hot.service.dao.StIvtHotpointivt; +import org.nl.wms.pdm.ivt.hot.service.IstIvtHotpointivtService; import org.nl.wms.sch.point.service.ISchBasePointService; import org.nl.wms.sch.point.service.dao.SchBasePoint; import org.nl.wms.sch.task.service.ISchBaseTaskService; diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/raw/RawCallRollTrussTask.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/raw/RawCallRollTrussTask.java index 6b33f12f4..300c229b7 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/raw/RawCallRollTrussTask.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/raw/RawCallRollTrussTask.java @@ -4,8 +4,8 @@ import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; import org.nl.common.exception.BadRequestException; -import org.nl.wms.pdm.ivt.dao.StIvtSbpointivt; -import org.nl.wms.pdm.ivt.service.IstIvtSbpointivtService; +import org.nl.wms.pdm.ivt.raw.service.dao.StIvtSbpointivt; +import org.nl.wms.pdm.ivt.raw.service.IstIvtSbpointivtService; import org.nl.wms.sch.point.service.ISchBasePointService; import org.nl.wms.sch.point.service.dao.SchBasePoint; import org.nl.wms.sch.task.service.ISchBaseTaskService; diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/slitter/SlitterSendRollAGVTask.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/slitter/SlitterSendRollAGVTask.java index 393cbc7c3..d56129e43 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/slitter/SlitterSendRollAGVTask.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/slitter/SlitterSendRollAGVTask.java @@ -3,8 +3,8 @@ package org.nl.wms.sch.task_manage.tasks.slitter; import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; import org.nl.common.exception.BadRequestException; -import org.nl.wms.pdm.ivt.dao.StIvtCutpointivt; -import org.nl.wms.pdm.ivt.service.IstIvtCutpointivtService; +import org.nl.wms.pdm.ivt.cut.service.dao.StIvtCutpointivt; +import org.nl.wms.pdm.ivt.cut.service.IstIvtCutpointivtService; import org.nl.wms.sch.point.service.ISchBasePointService; import org.nl.wms.sch.point.service.dao.SchBasePoint; import org.nl.wms.sch.task.service.ISchBaseTaskService; diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/slitter/SlitterUpAGVTask.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/slitter/SlitterUpAGVTask.java index a627928dd..ad04c194e 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/slitter/SlitterUpAGVTask.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/slitter/SlitterUpAGVTask.java @@ -3,13 +3,12 @@ package org.nl.wms.sch.task_manage.tasks.slitter; 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 lombok.extern.slf4j.Slf4j; import org.nl.common.exception.BadRequestException; import org.nl.wms.pdm.bi.dao.PdmBiRawfoilworkorder; import org.nl.wms.pdm.bi.service.IpdmBiRawfoilworkorderService; -import org.nl.wms.pdm.ivt.dao.StIvtCutpointivt; -import org.nl.wms.pdm.ivt.service.IstIvtCutpointivtService; +import org.nl.wms.pdm.ivt.cut.service.dao.StIvtCutpointivt; +import org.nl.wms.pdm.ivt.cut.service.IstIvtCutpointivtService; import org.nl.wms.sch.point.service.ISchBasePointService; import org.nl.wms.sch.point.service.dao.SchBasePoint; import org.nl.wms.sch.task.service.ISchBaseTaskService; diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/PointUtils.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/PointUtils.java index c3e047aad..f927ff6dd 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/PointUtils.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/PointUtils.java @@ -5,10 +5,10 @@ import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; import org.nl.common.utils.SecurityUtils; import org.nl.config.SpringContextHolder; -import org.nl.wms.pdm.ivt.dao.StIvtCutpointivt; -import org.nl.wms.pdm.ivt.dao.StIvtHotpointivt; -import org.nl.wms.pdm.ivt.service.IstIvtHotpointivtService; -import org.nl.wms.pdm.ivt.service.impl.StIvtHotpointivtServiceImpl; +import org.nl.wms.pdm.ivt.cut.service.dao.StIvtCutpointivt; +import org.nl.wms.pdm.ivt.hot.service.dao.StIvtHotpointivt; +import org.nl.wms.pdm.ivt.hot.service.IstIvtHotpointivtService; +import org.nl.wms.pdm.ivt.hot.service.impl.StIvtHotpointivtServiceImpl; import org.nl.wms.sch.point.service.dao.SchBasePoint; import org.nl.wms.sch.point.service.impl.SchBasePointServiceImpl; import org.nl.wms.sch.task_manage.core.constant.GeneralDefinition;