From 688066da780cceeca1a4115d1f9a780b2414b230 Mon Sep 17 00:00:00 2001 From: "HUOJIN\\92525" Date: Tue, 8 Apr 2025 09:45:20 +0800 Subject: [PATCH] no message --- .../address/domain/form/AddressSelect.java | 9 --- .../itemKey/manager/ItemKeyManager.java | 20 ------- .../receive/asn/manager/AsnManager.java | 20 ------- .../asnDetail/manager/AsnDetailManager.java | 20 ------- .../address/controller/AddressController.java | 31 ++++++---- .../base/address/dao/AddressDao.java | 8 +-- .../address/domain/entity/AddressEntity.java | 2 +- .../address/domain/form/AddressAddForm.java | 2 +- .../domain/form/AddressImportForm.java | 2 +- .../address/domain/form/AddressQueryForm.java | 2 +- .../address/domain/form/AddressSelect.java | 9 +++ .../domain/form/AddressUpdateForm.java | 2 +- .../address/domain/vo/AddressExcelVO.java | 2 +- .../base/address/domain/vo/AddressVO.java | 2 +- .../base/address/manager/AddressManager.java | 8 ++- .../address/service/AddressQueryService.java | 21 +++---- .../base/address/service/AddressService.java | 23 ++++--- .../base/address/sql/AddressMenu.sql | 0 .../base/area/controller/AreaController.java | 21 ++++--- .../{ => wms}/base/area/dao/AreaDao.java | 10 ++-- .../base/area/domain/entity/AreaEntity.java | 2 +- .../base/area/domain/form/AreaAddForm.java | 2 +- .../base/area/domain/form/AreaQueryForm.java | 2 +- .../base/area/domain/form/AreaSelect.java | 2 +- .../base/area/domain/form/AreaUpdateForm.java | 2 +- .../{ => wms}/base/area/domain/vo/AreaVO.java | 2 +- .../base/area/manager/AreaManager.java | 6 +- .../base/area/service/AreaQueryService.java | 15 ++--- .../base/area/service/AreaService.java | 19 +++--- .../{ => wms}/base/area/sql/AreaMenu.sql | 0 .../controller/CustomerController.java | 21 ++++--- .../base/customer/dao/CustomerDao.java | 8 +-- .../domain/entity/CustomerEntity.java | 2 +- .../customer/domain/form/CustomerAddForm.java | 2 +- .../domain/form/CustomerQueryForm.java | 2 +- .../customer/domain/form/CustomerSelect.java | 2 +- .../domain/form/CustomerUpdateForm.java | 2 +- .../base/customer/domain/vo/CustomerVO.java | 2 +- .../customer/manager/CustomerManager.java | 8 ++- .../service/CustomerQueryService.java | 21 ++++--- .../customer/service/CustomerService.java | 15 ++--- .../base/customer/sql/CustomerMenu.sql | 0 .../base/item/controller/ItemController.java | 24 ++++---- .../{ => wms}/base/item/dao/ItemDao.java | 8 +-- .../base/item/domain/entity/ItemEntity.java | 2 +- .../base/item/domain/form/ItemAddForm.java | 2 +- .../base/item/domain/form/ItemQueryForm.java | 2 +- .../base/item/domain/form/ItemSelect.java | 2 +- .../base/item/domain/form/ItemUpdateForm.java | 2 +- .../item/domain/form/ItemsImportForm.java | 2 +- .../{ => wms}/base/item/domain/vo/ItemVO.java | 2 +- .../base/item/domain/vo/ItemsExcelVO.java | 2 +- .../base/item/manager/ItemManager.java | 12 ++-- .../base/item/service/ItemQueryService.java | 17 +++--- .../base/item/service/ItemService.java | 16 ++--- .../{ => wms}/base/item/sql/ItemMenu.sql | 0 .../controller/LocationController.java | 10 ++-- .../base/location/dao/LocationDao.java | 10 ++-- .../domain/entity/LocationEntity.java | 2 +- .../location/domain/form/LocationAddForm.java | 2 +- .../domain/form/LocationQueryForm.java | 2 +- .../location/domain/form/LocationSelect.java | 2 +- .../domain/form/LocationUpdateForm.java | 2 +- .../domain/form/LocationsExcelVO.java | 2 +- .../domain/form/LocationsImportForm.java | 2 +- .../location/domain/form/MultipleAdjust.java | 2 +- .../location/domain/form/MultipleInsert.java | 2 +- .../base/location/domain/vo/LocationVO.java | 2 +- .../location/manager/LocationManager.java | 7 ++- .../service/LocationQueryService.java | 35 +++++++---- .../location/service/LocationService.java | 14 ++--- .../base/location/sql/LocationMenu.sql | 0 .../stock/controller/StockController.java | 28 +++++---- .../{ => wms}/base/stock/dao/StockDao.java | 10 ++-- .../base/stock/domain/entity/StockEntity.java | 2 +- .../base/stock/domain/form/StockAddForm.java | 2 +- .../stock/domain/form/StockQueryForm.java | 2 +- .../base/stock/domain/form/StockSelect.java | 2 +- .../stock/domain/form/StockUpdateForm.java | 2 +- .../stock/domain/form/StocksImportForm.java | 2 +- .../base/stock/domain/vo/StockVO.java | 2 +- .../base/stock/domain/vo/StocksExcelVO.java | 2 +- .../base/stock/manager/StockManager.java | 6 +- .../base/stock/service/StockQueryService.java | 30 ++++++---- .../base/stock/service/StockService.java | 29 +++++---- .../{ => wms}/base/stock/sql/StockMenu.sql | 0 .../controller/InventoryController.java | 14 ++--- .../{ => wms}/inventory/dao/InventoryDao.java | 10 ++-- .../domain/entity/InventoryEntity.java | 2 +- .../domain/form/InventoryAddForm.java | 2 +- .../domain/form/InventoryQueryForm.java | 2 +- .../domain/form/InventoryUpdateForm.java | 2 +- .../inventory/domain/vo/InventoryVO.java | 2 +- .../inventory/manager/InventoryManager.java | 6 +- .../service/InventoryQueryService.java | 10 ++-- .../inventory/service/InventoryService.java | 16 ++--- .../{ => wms}/inventory/sql/InventoryMenu.sql | 0 .../itemKey/controller/ItemKeyController.java | 19 +++--- .../{ => wms}/itemKey/dao/ItemKeyDao.java | 11 ++-- .../itemKey/domain/entity/ItemKeyEntity.java | 2 +- .../itemKey/domain/form/ItemKeyAddForm.java | 2 +- .../itemKey/domain/form/ItemKeyQueryForm.java | 2 +- .../domain/form/ItemKeyUpdateForm.java | 2 +- .../itemKey/domain/vo/ItemKeyVO.java | 2 +- .../wms/itemKey/manager/ItemKeyManager.java | 22 +++++++ .../itemKey/service/ItemKeyQueryService.java | 14 +++-- .../itemKey/service/ItemKeyService.java | 20 ++++--- .../{ => wms}/itemKey/sql/ItemKeyMenu.sql | 0 .../{ => wms}/receive/ReceiveController.java | 2 +- .../{ => wms}/receive/ReceiveService.java | 60 ++++++++++--------- .../asn/constant/AsnOrderStatusEnum.java | 2 +- .../asn/constant/AsnOrderTypeEnum.java | 2 +- .../receive/asn/controller/AsnController.java | 18 +++--- .../{ => wms}/receive/asn/dao/AsnDao.java | 8 +-- .../receive/asn/domain/entity/AsnEntity.java | 2 +- .../receive/asn/domain/form/AsnAddForm.java | 8 ++- .../receive/asn/domain/form/AsnQueryForm.java | 2 +- .../asn/domain/form/AsnUpdateForm.java | 2 +- .../receive/asn/domain/vo/AsnVO.java | 2 +- .../wms/receive/asn/manager/AsnManager.java | 22 +++++++ .../receive/asn/service/AsnQueryService.java | 26 ++++---- .../receive/asn/service/AsnService.java | 29 +++++---- .../{ => wms}/receive/asn/sql/AsnMenu.sql | 0 .../controller/AsnDetailController.java | 20 ++++--- .../receive/asnDetail/dao/AsnDetailDao.java | 10 ++-- .../domain/entity/AsnDetailEntity.java | 2 +- .../domain/form/AsnDetailAddForm.java | 2 +- .../domain/form/AsnDetailQueryForm.java | 2 +- .../domain/form/AsnDetailUpdateForm.java | 2 +- .../asnDetail/domain/vo/AsnDetailVO.java | 2 +- .../asnDetail/manager/AsnDetailManager.java | 22 +++++++ .../service/AsnDetailQueryService.java | 30 +++++----- .../asnDetail/service/AsnDetailService.java | 27 +++++---- .../receive/asnDetail/sql/AsnDetailMenu.sql | 0 .../task/constant/TaskStatusEnum.java | 2 +- .../{ => wms}/task/constant/TaskTypeEnum.java | 2 +- .../task/controller/TaskController.java | 15 ++--- .../business/{ => wms}/task/dao/TaskDao.java | 11 ++-- .../task/domain/entity/TaskEntity.java | 2 +- .../task/domain/form/TaskAddForm.java | 2 +- .../task/domain/form/TaskQueryForm.java | 2 +- .../task/domain/form/TaskUpdateForm.java | 2 +- .../{ => wms}/task/domain/vo/TaskVO.java | 2 +- .../{ => wms}/task/manager/TaskManager.java | 6 +- .../task/service/TaskQueryService.java | 8 +-- .../{ => wms}/task/service/TaskService.java | 24 ++++---- .../business/{ => wms}/task/sql/TaskMenu.sql | 0 .../{ => wms}/base/address/AddressMapper.xml | 4 +- .../{ => wms}/base/area/AreaMapper.xml | 4 +- .../base/customer/CustomerMapper.xml | 4 +- .../{ => wms}/base/item/ItemMapper.xml | 4 +- .../base/location/LocationMapper.xml | 4 +- .../{ => wms}/base/stock/StockMapper.xml | 4 +- .../{ => wms}/inventory/InventoryMapper.xml | 4 +- .../{ => wms}/itemKey/ItemKeyMapper.xml | 4 +- .../{ => wms}/receive/asn/AsnMapper.xml | 4 +- .../receive/asnDetail/AsnDetailMapper.xml | 4 +- .../business/{ => wms}/task/TaskMapper.xml | 4 +- 158 files changed, 684 insertions(+), 563 deletions(-) delete mode 100644 nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/address/domain/form/AddressSelect.java delete mode 100644 nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/itemKey/manager/ItemKeyManager.java delete mode 100644 nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/manager/AsnManager.java delete mode 100644 nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asnDetail/manager/AsnDetailManager.java rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/address/controller/AddressController.java (69%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/address/dao/AddressDao.java (66%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/address/domain/entity/AddressEntity.java (94%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/address/domain/form/AddressAddForm.java (89%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/address/domain/form/AddressImportForm.java (82%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/address/domain/form/AddressQueryForm.java (85%) create mode 100644 nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/address/domain/form/AddressSelect.java rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/address/domain/form/AddressUpdateForm.java (85%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/address/domain/vo/AddressExcelVO.java (88%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/address/domain/vo/AddressVO.java (90%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/address/manager/AddressManager.java (71%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/address/service/AddressQueryService.java (81%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/address/service/AddressService.java (82%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/address/sql/AddressMenu.sql (100%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/area/controller/AreaController.java (72%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/area/dao/AreaDao.java (60%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/area/domain/entity/AreaEntity.java (94%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/area/domain/form/AreaAddForm.java (93%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/area/domain/form/AreaQueryForm.java (87%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/area/domain/form/AreaSelect.java (81%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/area/domain/form/AreaUpdateForm.java (85%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/area/domain/vo/AreaVO.java (90%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/area/manager/AreaManager.java (81%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/area/service/AreaQueryService.java (85%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/area/service/AreaService.java (81%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/area/sql/AreaMenu.sql (100%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/customer/controller/CustomerController.java (72%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/customer/dao/CustomerDao.java (66%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/customer/domain/entity/CustomerEntity.java (95%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/customer/domain/form/CustomerAddForm.java (94%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/customer/domain/form/CustomerQueryForm.java (87%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/customer/domain/form/CustomerSelect.java (70%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/customer/domain/form/CustomerUpdateForm.java (85%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/customer/domain/vo/CustomerVO.java (92%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/customer/manager/CustomerManager.java (71%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/customer/service/CustomerQueryService.java (73%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/customer/service/CustomerService.java (82%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/customer/sql/CustomerMenu.sql (100%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/item/controller/ItemController.java (75%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/item/dao/ItemDao.java (67%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/item/domain/entity/ItemEntity.java (95%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/item/domain/form/ItemAddForm.java (95%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/item/domain/form/ItemQueryForm.java (87%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/item/domain/form/ItemSelect.java (70%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/item/domain/form/ItemUpdateForm.java (87%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/item/domain/form/ItemsImportForm.java (83%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/item/domain/vo/ItemVO.java (92%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/item/domain/vo/ItemsExcelVO.java (89%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/item/manager/ItemManager.java (64%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/item/service/ItemQueryService.java (86%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/item/service/ItemService.java (91%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/item/sql/ItemMenu.sql (100%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/location/controller/LocationController.java (91%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/location/dao/LocationDao.java (56%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/location/domain/entity/LocationEntity.java (95%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/location/domain/form/LocationAddForm.java (95%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/location/domain/form/LocationQueryForm.java (89%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/location/domain/form/LocationSelect.java (84%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/location/domain/form/LocationUpdateForm.java (86%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/location/domain/form/LocationsExcelVO.java (88%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/location/domain/form/LocationsImportForm.java (81%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/location/domain/form/MultipleAdjust.java (88%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/location/domain/form/MultipleInsert.java (89%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/location/domain/vo/LocationVO.java (95%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/location/manager/LocationManager.java (75%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/location/service/LocationQueryService.java (81%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/location/service/LocationService.java (96%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/location/sql/LocationMenu.sql (100%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/stock/controller/StockController.java (73%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/stock/dao/StockDao.java (57%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/stock/domain/entity/StockEntity.java (95%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/stock/domain/form/StockAddForm.java (93%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/stock/domain/form/StockQueryForm.java (89%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/stock/domain/form/StockSelect.java (76%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/stock/domain/form/StockUpdateForm.java (85%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/stock/domain/form/StocksImportForm.java (76%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/stock/domain/vo/StockVO.java (92%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/stock/domain/vo/StocksExcelVO.java (87%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/stock/manager/StockManager.java (81%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/stock/service/StockQueryService.java (77%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/stock/service/StockService.java (85%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/base/stock/sql/StockMenu.sql (100%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/inventory/controller/InventoryController.java (80%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/inventory/dao/InventoryDao.java (56%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/inventory/domain/entity/InventoryEntity.java (95%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/inventory/domain/form/InventoryAddForm.java (94%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/inventory/domain/form/InventoryQueryForm.java (81%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/inventory/domain/form/InventoryUpdateForm.java (85%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/inventory/domain/vo/InventoryVO.java (91%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/inventory/manager/InventoryManager.java (57%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/inventory/service/InventoryQueryService.java (74%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/inventory/service/InventoryService.java (81%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/inventory/sql/InventoryMenu.sql (100%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/itemKey/controller/ItemKeyController.java (70%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/itemKey/dao/ItemKeyDao.java (52%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/itemKey/domain/entity/ItemKeyEntity.java (96%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/itemKey/domain/form/ItemKeyAddForm.java (83%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/itemKey/domain/form/ItemKeyQueryForm.java (82%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/itemKey/domain/form/ItemKeyUpdateForm.java (85%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/itemKey/domain/vo/ItemKeyVO.java (95%) create mode 100644 nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/itemKey/manager/ItemKeyManager.java rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/itemKey/service/ItemKeyQueryService.java (66%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/itemKey/service/ItemKeyService.java (76%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/itemKey/sql/ItemKeyMenu.sql (100%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/receive/ReceiveController.java (93%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/receive/ReceiveService.java (73%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/receive/asn/constant/AsnOrderStatusEnum.java (94%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/receive/asn/constant/AsnOrderTypeEnum.java (90%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/receive/asn/controller/AsnController.java (75%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/receive/asn/dao/AsnDao.java (67%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/receive/asn/domain/entity/AsnEntity.java (96%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/receive/asn/domain/form/AsnAddForm.java (81%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/receive/asn/domain/form/AsnQueryForm.java (85%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/receive/asn/domain/form/AsnUpdateForm.java (85%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/receive/asn/domain/vo/AsnVO.java (95%) create mode 100644 nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/manager/AsnManager.java rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/receive/asn/service/AsnQueryService.java (76%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/receive/asn/service/AsnService.java (80%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/receive/asn/sql/AsnMenu.sql (100%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/receive/asnDetail/controller/AsnDetailController.java (67%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/receive/asnDetail/dao/AsnDetailDao.java (55%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/receive/asnDetail/domain/entity/AsnDetailEntity.java (94%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/receive/asnDetail/domain/form/AsnDetailAddForm.java (92%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/receive/asnDetail/domain/form/AsnDetailQueryForm.java (86%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/receive/asnDetail/domain/form/AsnDetailUpdateForm.java (85%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/receive/asnDetail/domain/vo/AsnDetailVO.java (93%) create mode 100644 nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asnDetail/manager/AsnDetailManager.java rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/receive/asnDetail/service/AsnDetailQueryService.java (70%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/receive/asnDetail/service/AsnDetailService.java (83%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/receive/asnDetail/sql/AsnDetailMenu.sql (100%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/task/constant/TaskStatusEnum.java (94%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/task/constant/TaskTypeEnum.java (91%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/task/controller/TaskController.java (77%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/task/dao/TaskDao.java (55%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/task/domain/entity/TaskEntity.java (97%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/task/domain/form/TaskAddForm.java (83%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/task/domain/form/TaskQueryForm.java (86%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/task/domain/form/TaskUpdateForm.java (86%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/task/domain/vo/TaskVO.java (97%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/task/manager/TaskManager.java (59%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/task/service/TaskQueryService.java (70%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/task/service/TaskService.java (79%) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/{ => wms}/task/sql/TaskMenu.sql (100%) rename nc_wms_java/sa-admin/src/main/resources/mapper/business/{ => wms}/base/address/AddressMapper.xml (86%) rename nc_wms_java/sa-admin/src/main/resources/mapper/business/{ => wms}/base/area/AreaMapper.xml (88%) rename nc_wms_java/sa-admin/src/main/resources/mapper/business/{ => wms}/base/customer/CustomerMapper.xml (88%) rename nc_wms_java/sa-admin/src/main/resources/mapper/business/{ => wms}/base/item/ItemMapper.xml (89%) rename nc_wms_java/sa-admin/src/main/resources/mapper/business/{ => wms}/base/location/LocationMapper.xml (91%) rename nc_wms_java/sa-admin/src/main/resources/mapper/business/{ => wms}/base/stock/StockMapper.xml (91%) rename nc_wms_java/sa-admin/src/main/resources/mapper/business/{ => wms}/inventory/InventoryMapper.xml (84%) rename nc_wms_java/sa-admin/src/main/resources/mapper/business/{ => wms}/itemKey/ItemKeyMapper.xml (86%) rename nc_wms_java/sa-admin/src/main/resources/mapper/business/{ => wms}/receive/asn/AsnMapper.xml (89%) rename nc_wms_java/sa-admin/src/main/resources/mapper/business/{ => wms}/receive/asnDetail/AsnDetailMapper.xml (87%) rename nc_wms_java/sa-admin/src/main/resources/mapper/business/{ => wms}/task/TaskMapper.xml (91%) diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/address/domain/form/AddressSelect.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/address/domain/form/AddressSelect.java deleted file mode 100644 index e6e7382..0000000 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/address/domain/form/AddressSelect.java +++ /dev/null @@ -1,9 +0,0 @@ -package net.lab1024.sa.admin.module.business.base.address.domain.form; - -import lombok.Data; - -@Data -public class AddressSelect { - - -} diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/itemKey/manager/ItemKeyManager.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/itemKey/manager/ItemKeyManager.java deleted file mode 100644 index 407d404..0000000 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/itemKey/manager/ItemKeyManager.java +++ /dev/null @@ -1,20 +0,0 @@ -package net.lab1024.sa.admin.module.business.itemKey.manager; - -import net.lab1024.sa.admin.module.business.itemKey.domain.entity.ItemKeyEntity; -import net.lab1024.sa.admin.module.business.itemKey.dao.ItemKeyDao; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - * 物料属性 Manager - * - * @Author 霍锦 - * @Date 2024-12-05 21:38:40 - * @Copyright 友仓 - */ -@Service -public class ItemKeyManager extends ServiceImpl { - - -} diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/manager/AsnManager.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/manager/AsnManager.java deleted file mode 100644 index d540f43..0000000 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/manager/AsnManager.java +++ /dev/null @@ -1,20 +0,0 @@ -package net.lab1024.sa.admin.module.business.receive.asn.manager; - -import net.lab1024.sa.admin.module.business.receive.asn.domain.entity.AsnEntity; -import net.lab1024.sa.admin.module.business.receive.asn.dao.AsnDao; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - * 入库单 Manager - * - * @Author 霍锦 - * @Date 2025-03-26 15:10:02 - * @Copyright 友仓 - */ -@Service -public class AsnManager extends ServiceImpl { - - -} diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asnDetail/manager/AsnDetailManager.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asnDetail/manager/AsnDetailManager.java deleted file mode 100644 index 454ff82..0000000 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asnDetail/manager/AsnDetailManager.java +++ /dev/null @@ -1,20 +0,0 @@ -package net.lab1024.sa.admin.module.business.receive.asnDetail.manager; - -import net.lab1024.sa.admin.module.business.receive.asnDetail.domain.entity.AsnDetailEntity; -import net.lab1024.sa.admin.module.business.receive.asnDetail.dao.AsnDetailDao; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - * 入库明细 Manager - * - * @Author 霍锦 - * @Date 2025-03-26 15:16:28 - * @Copyright 友仓 - */ -@Service -public class AsnDetailManager extends ServiceImpl { - - -} diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/address/controller/AddressController.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/address/controller/AddressController.java similarity index 69% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/address/controller/AddressController.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/address/controller/AddressController.java index 3d19214..f7b3580 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/address/controller/AddressController.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/address/controller/AddressController.java @@ -1,18 +1,23 @@ -package net.lab1024.sa.admin.module.business.base.address.controller; +package net.lab1024.sa.admin.module.business.wms.base.address.controller; import jakarta.servlet.http.HttpServletResponse; -import net.lab1024.sa.admin.module.business.base.address.domain.entity.AddressEntity; -import net.lab1024.sa.admin.module.business.base.address.domain.form.AddressAddForm; -import net.lab1024.sa.admin.module.business.base.address.domain.form.AddressQueryForm; -import net.lab1024.sa.admin.module.business.base.address.domain.form.AddressSelect; -import net.lab1024.sa.admin.module.business.base.address.domain.form.AddressUpdateForm; -import net.lab1024.sa.admin.module.business.base.address.domain.vo.AddressExcelVO; -import net.lab1024.sa.admin.module.business.base.address.domain.vo.AddressVO; -import net.lab1024.sa.admin.module.business.base.address.service.AddressQueryService; -import net.lab1024.sa.admin.module.business.base.address.service.AddressService; -import net.lab1024.sa.admin.module.business.base.item.domain.entity.ItemEntity; -import net.lab1024.sa.admin.module.business.base.item.domain.form.ItemSelect; -import net.lab1024.sa.admin.module.business.base.item.domain.vo.ItemsExcelVO; +import net.lab1024.sa.admin.module.business.wms.base.address.domain.entity.AddressEntity; +import net.lab1024.sa.admin.module.business.wms.base.address.domain.form.AddressAddForm; +import net.lab1024.sa.admin.module.business.wms.base.address.domain.form.AddressQueryForm; +import net.lab1024.sa.admin.module.business.wms.base.address.domain.form.AddressSelect; +import net.lab1024.sa.admin.module.business.wms.base.address.domain.form.AddressUpdateForm; +import net.lab1024.sa.admin.module.business.wms.base.address.domain.vo.AddressExcelVO; +import net.lab1024.sa.admin.module.business.wms.base.address.domain.vo.AddressVO; +import net.lab1024.sa.admin.module.business.wms.base.address.service.AddressQueryService; +import net.lab1024.sa.admin.module.business.wms.base.address.service.AddressService; +import net.lab1024.sa.admin.module.business.wms.base.item.domain.entity.ItemEntity; +import net.lab1024.sa.admin.module.business.wms.base.item.domain.form.ItemSelect; +import net.lab1024.sa.admin.module.business.wms.base.item.domain.vo.ItemsExcelVO; +import net.lab1024.sa.admin.module.business.wms.base.address.domain.entity.AddressEntity; +import net.lab1024.sa.admin.module.business.wms.base.address.domain.form.AddressQueryForm; +import net.lab1024.sa.admin.module.business.wms.base.address.domain.form.AddressUpdateForm; +import net.lab1024.sa.admin.module.business.wms.base.address.service.AddressQueryService; +import net.lab1024.sa.admin.module.business.wms.base.address.service.AddressService; import net.lab1024.sa.base.common.domain.RequestUser; import net.lab1024.sa.base.common.domain.ValidateList; import net.lab1024.sa.base.common.util.SmartExcelUtil; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/address/dao/AddressDao.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/address/dao/AddressDao.java similarity index 66% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/address/dao/AddressDao.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/address/dao/AddressDao.java index 3ce927a..484cd4d 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/address/dao/AddressDao.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/address/dao/AddressDao.java @@ -1,9 +1,9 @@ -package net.lab1024.sa.admin.module.business.base.address.dao; +package net.lab1024.sa.admin.module.business.wms.base.address.dao; import java.util.List; -import net.lab1024.sa.admin.module.business.base.address.domain.entity.AddressEntity; -import net.lab1024.sa.admin.module.business.base.address.domain.form.AddressQueryForm; -import net.lab1024.sa.admin.module.business.base.address.domain.vo.AddressVO; +import net.lab1024.sa.admin.module.business.wms.base.address.domain.entity.AddressEntity; +import net.lab1024.sa.admin.module.business.wms.base.address.domain.form.AddressQueryForm; +import net.lab1024.sa.admin.module.business.wms.base.address.domain.vo.AddressVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/address/domain/entity/AddressEntity.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/address/domain/entity/AddressEntity.java similarity index 94% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/address/domain/entity/AddressEntity.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/address/domain/entity/AddressEntity.java index b1c0e51..b588fa7 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/address/domain/entity/AddressEntity.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/address/domain/entity/AddressEntity.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.base.address.domain.entity; +package net.lab1024.sa.admin.module.business.wms.base.address.domain.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/address/domain/form/AddressAddForm.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/address/domain/form/AddressAddForm.java similarity index 89% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/address/domain/form/AddressAddForm.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/address/domain/form/AddressAddForm.java index d2f0e58..75f9fb1 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/address/domain/form/AddressAddForm.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/address/domain/form/AddressAddForm.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.base.address.domain.form; +package net.lab1024.sa.admin.module.business.wms.base.address.domain.form; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/address/domain/form/AddressImportForm.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/address/domain/form/AddressImportForm.java similarity index 82% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/address/domain/form/AddressImportForm.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/address/domain/form/AddressImportForm.java index 4c3aef9..ba1faea 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/address/domain/form/AddressImportForm.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/address/domain/form/AddressImportForm.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.base.address.domain.form; +package net.lab1024.sa.admin.module.business.wms.base.address.domain.form; import cn.idev.excel.annotation.ExcelProperty; import lombok.Data; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/address/domain/form/AddressQueryForm.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/address/domain/form/AddressQueryForm.java similarity index 85% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/address/domain/form/AddressQueryForm.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/address/domain/form/AddressQueryForm.java index c55bcb4..c6940d5 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/address/domain/form/AddressQueryForm.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/address/domain/form/AddressQueryForm.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.base.address.domain.form; +package net.lab1024.sa.admin.module.business.wms.base.address.domain.form; import net.lab1024.sa.base.common.domain.PageParam; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/address/domain/form/AddressSelect.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/address/domain/form/AddressSelect.java new file mode 100644 index 0000000..807e812 --- /dev/null +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/address/domain/form/AddressSelect.java @@ -0,0 +1,9 @@ +package net.lab1024.sa.admin.module.business.wms.base.address.domain.form; + +import lombok.Data; + +@Data +public class AddressSelect { + + +} diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/address/domain/form/AddressUpdateForm.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/address/domain/form/AddressUpdateForm.java similarity index 85% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/address/domain/form/AddressUpdateForm.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/address/domain/form/AddressUpdateForm.java index cbc3e4c..599574d 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/address/domain/form/AddressUpdateForm.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/address/domain/form/AddressUpdateForm.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.base.address.domain.form; +package net.lab1024.sa.admin.module.business.wms.base.address.domain.form; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/address/domain/vo/AddressExcelVO.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/address/domain/vo/AddressExcelVO.java similarity index 88% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/address/domain/vo/AddressExcelVO.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/address/domain/vo/AddressExcelVO.java index b437231..dc29170 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/address/domain/vo/AddressExcelVO.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/address/domain/vo/AddressExcelVO.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.base.address.domain.vo; +package net.lab1024.sa.admin.module.business.wms.base.address.domain.vo; import cn.idev.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/address/domain/vo/AddressVO.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/address/domain/vo/AddressVO.java similarity index 90% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/address/domain/vo/AddressVO.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/address/domain/vo/AddressVO.java index a1f08a1..24ae55b 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/address/domain/vo/AddressVO.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/address/domain/vo/AddressVO.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.base.address.domain.vo; +package net.lab1024.sa.admin.module.business.wms.base.address.domain.vo; import io.swagger.v3.oas.annotations.media.Schema; import java.time.LocalDateTime; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/address/manager/AddressManager.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/address/manager/AddressManager.java similarity index 71% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/address/manager/AddressManager.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/address/manager/AddressManager.java index da29427..b48e0fe 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/address/manager/AddressManager.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/address/manager/AddressManager.java @@ -1,12 +1,14 @@ -package net.lab1024.sa.admin.module.business.base.address.manager; +package net.lab1024.sa.admin.module.business.wms.base.address.manager; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import net.lab1024.sa.admin.constant.AdminCacheConst; -import net.lab1024.sa.admin.module.business.base.address.domain.entity.AddressEntity; -import net.lab1024.sa.admin.module.business.base.address.dao.AddressDao; +import net.lab1024.sa.admin.module.business.wms.base.address.domain.entity.AddressEntity; +import net.lab1024.sa.admin.module.business.wms.base.address.dao.AddressDao; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import net.lab1024.sa.admin.module.business.wms.base.address.dao.AddressDao; +import net.lab1024.sa.admin.module.business.wms.base.address.domain.entity.AddressEntity; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/address/service/AddressQueryService.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/address/service/AddressQueryService.java similarity index 81% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/address/service/AddressQueryService.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/address/service/AddressQueryService.java index a033300..560d8be 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/address/service/AddressQueryService.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/address/service/AddressQueryService.java @@ -1,18 +1,19 @@ -package net.lab1024.sa.admin.module.business.base.address.service; +package net.lab1024.sa.admin.module.business.wms.base.address.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.google.common.collect.Maps; import jakarta.annotation.Resource; -import net.lab1024.sa.admin.module.business.base.address.dao.AddressDao; -import net.lab1024.sa.admin.module.business.base.address.domain.entity.AddressEntity; -import net.lab1024.sa.admin.module.business.base.address.domain.form.AddressQueryForm; -import net.lab1024.sa.admin.module.business.base.address.domain.form.AddressSelect; -import net.lab1024.sa.admin.module.business.base.address.domain.vo.AddressExcelVO; -import net.lab1024.sa.admin.module.business.base.address.domain.vo.AddressVO; -import net.lab1024.sa.admin.module.business.base.address.manager.AddressManager; -import net.lab1024.sa.admin.module.business.base.item.domain.entity.ItemEntity; -import net.lab1024.sa.admin.module.business.base.item.domain.vo.ItemsExcelVO; +import net.lab1024.sa.admin.module.business.wms.base.address.dao.AddressDao; +import net.lab1024.sa.admin.module.business.wms.base.address.domain.entity.AddressEntity; +import net.lab1024.sa.admin.module.business.wms.base.address.domain.form.AddressQueryForm; +import net.lab1024.sa.admin.module.business.wms.base.address.domain.form.AddressSelect; +import net.lab1024.sa.admin.module.business.wms.base.address.domain.vo.AddressExcelVO; +import net.lab1024.sa.admin.module.business.wms.base.address.domain.vo.AddressVO; +import net.lab1024.sa.admin.module.business.wms.base.address.manager.AddressManager; +import net.lab1024.sa.admin.module.business.wms.base.item.domain.entity.ItemEntity; +import net.lab1024.sa.admin.module.business.wms.base.item.domain.vo.ItemsExcelVO; +import net.lab1024.sa.admin.module.business.wms.base.address.dao.AddressDao; import net.lab1024.sa.base.common.domain.PageResult; import net.lab1024.sa.base.common.util.SmartPageUtil; import net.lab1024.sa.base.module.support.dict.constant.DictConst; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/address/service/AddressService.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/address/service/AddressService.java similarity index 82% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/address/service/AddressService.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/address/service/AddressService.java index 292ded0..8dc2ec6 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/address/service/AddressService.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/address/service/AddressService.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.base.address.service; +package net.lab1024.sa.admin.module.business.wms.base.address.service; import java.io.IOException; import java.math.BigDecimal; @@ -8,14 +8,19 @@ import java.util.Map; import java.util.stream.Collectors; import cn.idev.excel.FastExcel; -import net.lab1024.sa.admin.module.business.base.address.dao.AddressDao; -import net.lab1024.sa.admin.module.business.base.address.domain.entity.AddressEntity; -import net.lab1024.sa.admin.module.business.base.address.domain.form.AddressAddForm; -import net.lab1024.sa.admin.module.business.base.address.domain.form.AddressImportForm; -import net.lab1024.sa.admin.module.business.base.address.domain.form.AddressUpdateForm; -import net.lab1024.sa.admin.module.business.base.address.manager.AddressManager; -import net.lab1024.sa.admin.module.business.base.item.domain.entity.ItemEntity; -import net.lab1024.sa.admin.module.business.base.item.domain.form.ItemsImportForm; +import net.lab1024.sa.admin.module.business.wms.base.address.dao.AddressDao; +import net.lab1024.sa.admin.module.business.wms.base.address.domain.entity.AddressEntity; +import net.lab1024.sa.admin.module.business.wms.base.address.domain.form.AddressAddForm; +import net.lab1024.sa.admin.module.business.wms.base.address.domain.form.AddressImportForm; +import net.lab1024.sa.admin.module.business.wms.base.address.domain.form.AddressUpdateForm; +import net.lab1024.sa.admin.module.business.wms.base.address.manager.AddressManager; +import net.lab1024.sa.admin.module.business.wms.base.item.domain.entity.ItemEntity; +import net.lab1024.sa.admin.module.business.wms.base.item.domain.form.ItemsImportForm; +import net.lab1024.sa.admin.module.business.wms.base.address.dao.AddressDao; +import net.lab1024.sa.admin.module.business.wms.base.address.domain.entity.AddressEntity; +import net.lab1024.sa.admin.module.business.wms.base.address.domain.form.AddressImportForm; +import net.lab1024.sa.admin.module.business.wms.base.address.domain.form.AddressUpdateForm; +import net.lab1024.sa.admin.module.business.wms.base.address.manager.AddressManager; import net.lab1024.sa.admin.util.JoinerResult; import net.lab1024.sa.admin.util.ResponseDTOUtils; import net.lab1024.sa.base.common.exception.BusinessException; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/address/sql/AddressMenu.sql b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/address/sql/AddressMenu.sql similarity index 100% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/address/sql/AddressMenu.sql rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/address/sql/AddressMenu.sql diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/area/controller/AreaController.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/area/controller/AreaController.java similarity index 72% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/area/controller/AreaController.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/area/controller/AreaController.java index c887b02..5e8795a 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/area/controller/AreaController.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/area/controller/AreaController.java @@ -1,13 +1,16 @@ -package net.lab1024.sa.admin.module.business.base.area.controller; +package net.lab1024.sa.admin.module.business.wms.base.area.controller; -import net.lab1024.sa.admin.module.business.base.area.domain.entity.AreaEntity; -import net.lab1024.sa.admin.module.business.base.area.domain.form.AreaAddForm; -import net.lab1024.sa.admin.module.business.base.area.domain.form.AreaQueryForm; -import net.lab1024.sa.admin.module.business.base.area.domain.form.AreaSelect; -import net.lab1024.sa.admin.module.business.base.area.domain.form.AreaUpdateForm; -import net.lab1024.sa.admin.module.business.base.area.domain.vo.AreaVO; -import net.lab1024.sa.admin.module.business.base.area.service.AreaQueryService; -import net.lab1024.sa.admin.module.business.base.area.service.AreaService; +import net.lab1024.sa.admin.module.business.wms.base.area.domain.entity.AreaEntity; +import net.lab1024.sa.admin.module.business.wms.base.area.domain.form.AreaAddForm; +import net.lab1024.sa.admin.module.business.wms.base.area.domain.form.AreaQueryForm; +import net.lab1024.sa.admin.module.business.wms.base.area.domain.form.AreaSelect; +import net.lab1024.sa.admin.module.business.wms.base.area.domain.form.AreaUpdateForm; +import net.lab1024.sa.admin.module.business.wms.base.area.domain.vo.AreaVO; +import net.lab1024.sa.admin.module.business.wms.base.area.service.AreaQueryService; +import net.lab1024.sa.admin.module.business.wms.base.area.service.AreaService; +import net.lab1024.sa.admin.module.business.wms.base.area.domain.form.AreaAddForm; +import net.lab1024.sa.admin.module.business.wms.base.area.domain.vo.AreaVO; +import net.lab1024.sa.admin.module.business.wms.base.area.service.AreaQueryService; import net.lab1024.sa.base.common.domain.RequestUser; import net.lab1024.sa.base.common.domain.ValidateList; import net.lab1024.sa.base.common.util.SmartRequestUtil; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/area/dao/AreaDao.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/area/dao/AreaDao.java similarity index 60% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/area/dao/AreaDao.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/area/dao/AreaDao.java index 4c26810..4411da0 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/area/dao/AreaDao.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/area/dao/AreaDao.java @@ -1,12 +1,14 @@ -package net.lab1024.sa.admin.module.business.base.area.dao; +package net.lab1024.sa.admin.module.business.wms.base.area.dao; import java.util.List; -import net.lab1024.sa.admin.module.business.base.area.domain.entity.AreaEntity; -import net.lab1024.sa.admin.module.business.base.area.domain.form.AreaQueryForm; -import net.lab1024.sa.admin.module.business.base.area.domain.vo.AreaVO; +import net.lab1024.sa.admin.module.business.wms.base.area.domain.entity.AreaEntity; +import net.lab1024.sa.admin.module.business.wms.base.area.domain.form.AreaQueryForm; +import net.lab1024.sa.admin.module.business.wms.base.area.domain.vo.AreaVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import net.lab1024.sa.admin.module.business.wms.base.area.domain.entity.AreaEntity; +import net.lab1024.sa.admin.module.business.wms.base.area.domain.vo.AreaVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/area/domain/entity/AreaEntity.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/area/domain/entity/AreaEntity.java similarity index 94% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/area/domain/entity/AreaEntity.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/area/domain/entity/AreaEntity.java index 88bb9ae..e08621e 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/area/domain/entity/AreaEntity.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/area/domain/entity/AreaEntity.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.base.area.domain.entity; +package net.lab1024.sa.admin.module.business.wms.base.area.domain.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/area/domain/form/AreaAddForm.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/area/domain/form/AreaAddForm.java similarity index 93% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/area/domain/form/AreaAddForm.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/area/domain/form/AreaAddForm.java index 175bbe3..2357dce 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/area/domain/form/AreaAddForm.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/area/domain/form/AreaAddForm.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.base.area.domain.form; +package net.lab1024.sa.admin.module.business.wms.base.area.domain.form; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/area/domain/form/AreaQueryForm.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/area/domain/form/AreaQueryForm.java similarity index 87% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/area/domain/form/AreaQueryForm.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/area/domain/form/AreaQueryForm.java index 2344e63..b2936fe 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/area/domain/form/AreaQueryForm.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/area/domain/form/AreaQueryForm.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.base.area.domain.form; +package net.lab1024.sa.admin.module.business.wms.base.area.domain.form; import net.lab1024.sa.base.common.domain.PageParam; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/area/domain/form/AreaSelect.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/area/domain/form/AreaSelect.java similarity index 81% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/area/domain/form/AreaSelect.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/area/domain/form/AreaSelect.java index 22dbb4e..21e262f 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/area/domain/form/AreaSelect.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/area/domain/form/AreaSelect.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.base.area.domain.form; +package net.lab1024.sa.admin.module.business.wms.base.area.domain.form; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/area/domain/form/AreaUpdateForm.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/area/domain/form/AreaUpdateForm.java similarity index 85% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/area/domain/form/AreaUpdateForm.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/area/domain/form/AreaUpdateForm.java index 966aa48..07b2cb8 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/area/domain/form/AreaUpdateForm.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/area/domain/form/AreaUpdateForm.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.base.area.domain.form; +package net.lab1024.sa.admin.module.business.wms.base.area.domain.form; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/area/domain/vo/AreaVO.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/area/domain/vo/AreaVO.java similarity index 90% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/area/domain/vo/AreaVO.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/area/domain/vo/AreaVO.java index 5401eb0..9ff013a 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/area/domain/vo/AreaVO.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/area/domain/vo/AreaVO.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.base.area.domain.vo; +package net.lab1024.sa.admin.module.business.wms.base.area.domain.vo; import io.swagger.v3.oas.annotations.media.Schema; import java.time.LocalDateTime; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/area/manager/AreaManager.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/area/manager/AreaManager.java similarity index 81% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/area/manager/AreaManager.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/area/manager/AreaManager.java index f9fb554..7a7f35a 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/area/manager/AreaManager.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/area/manager/AreaManager.java @@ -1,10 +1,10 @@ -package net.lab1024.sa.admin.module.business.base.area.manager; +package net.lab1024.sa.admin.module.business.wms.base.area.manager; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import net.lab1024.sa.admin.constant.AdminCacheConst; -import net.lab1024.sa.admin.module.business.base.area.domain.entity.AreaEntity; -import net.lab1024.sa.admin.module.business.base.area.dao.AreaDao; +import net.lab1024.sa.admin.module.business.wms.base.area.domain.entity.AreaEntity; +import net.lab1024.sa.admin.module.business.wms.base.area.dao.AreaDao; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.cache.annotation.CacheEvict; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/area/service/AreaQueryService.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/area/service/AreaQueryService.java similarity index 85% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/area/service/AreaQueryService.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/area/service/AreaQueryService.java index 322daf7..730f69d 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/area/service/AreaQueryService.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/area/service/AreaQueryService.java @@ -1,15 +1,16 @@ -package net.lab1024.sa.admin.module.business.base.area.service; +package net.lab1024.sa.admin.module.business.wms.base.area.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.google.common.collect.Maps; import jakarta.annotation.Resource; -import net.lab1024.sa.admin.module.business.base.area.dao.AreaDao; -import net.lab1024.sa.admin.module.business.base.area.domain.entity.AreaEntity; -import net.lab1024.sa.admin.module.business.base.area.domain.form.AreaQueryForm; -import net.lab1024.sa.admin.module.business.base.area.domain.form.AreaSelect; -import net.lab1024.sa.admin.module.business.base.area.domain.vo.AreaVO; -import net.lab1024.sa.admin.module.business.base.area.manager.AreaManager; +import net.lab1024.sa.admin.module.business.wms.base.area.dao.AreaDao; +import net.lab1024.sa.admin.module.business.wms.base.area.domain.entity.AreaEntity; +import net.lab1024.sa.admin.module.business.wms.base.area.domain.form.AreaQueryForm; +import net.lab1024.sa.admin.module.business.wms.base.area.domain.form.AreaSelect; +import net.lab1024.sa.admin.module.business.wms.base.area.domain.vo.AreaVO; +import net.lab1024.sa.admin.module.business.wms.base.area.manager.AreaManager; +import net.lab1024.sa.admin.module.business.wms.base.area.domain.vo.AreaVO; import net.lab1024.sa.base.common.domain.PageResult; import net.lab1024.sa.base.common.util.SmartPageUtil; import org.apache.commons.collections4.CollectionUtils; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/area/service/AreaService.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/area/service/AreaService.java similarity index 81% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/area/service/AreaService.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/area/service/AreaService.java index 96d831f..ecf5c42 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/area/service/AreaService.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/area/service/AreaService.java @@ -1,13 +1,18 @@ -package net.lab1024.sa.admin.module.business.base.area.service; +package net.lab1024.sa.admin.module.business.wms.base.area.service; import java.util.*; -import net.lab1024.sa.admin.module.business.base.area.dao.AreaDao; -import net.lab1024.sa.admin.module.business.base.area.domain.entity.AreaEntity; -import net.lab1024.sa.admin.module.business.base.area.domain.form.AreaAddForm; -import net.lab1024.sa.admin.module.business.base.area.domain.form.AreaUpdateForm; -import net.lab1024.sa.admin.module.business.base.area.manager.AreaManager; -import net.lab1024.sa.admin.module.business.base.location.service.LocationQueryService; +import net.lab1024.sa.admin.module.business.wms.base.area.dao.AreaDao; +import net.lab1024.sa.admin.module.business.wms.base.area.domain.entity.AreaEntity; +import net.lab1024.sa.admin.module.business.wms.base.area.domain.form.AreaAddForm; +import net.lab1024.sa.admin.module.business.wms.base.area.domain.form.AreaUpdateForm; +import net.lab1024.sa.admin.module.business.wms.base.area.manager.AreaManager; +import net.lab1024.sa.admin.module.business.wms.base.location.service.LocationQueryService; +import net.lab1024.sa.admin.module.business.wms.base.area.dao.AreaDao; +import net.lab1024.sa.admin.module.business.wms.base.area.domain.entity.AreaEntity; +import net.lab1024.sa.admin.module.business.wms.base.area.domain.form.AreaAddForm; +import net.lab1024.sa.admin.module.business.wms.base.area.domain.form.AreaUpdateForm; +import net.lab1024.sa.admin.module.business.wms.base.area.manager.AreaManager; import net.lab1024.sa.admin.util.JoinerResult; import net.lab1024.sa.admin.util.ResponseDTOUtils; import net.lab1024.sa.base.common.code.UserErrorCode; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/area/sql/AreaMenu.sql b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/area/sql/AreaMenu.sql similarity index 100% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/area/sql/AreaMenu.sql rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/area/sql/AreaMenu.sql diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/customer/controller/CustomerController.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/customer/controller/CustomerController.java similarity index 72% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/customer/controller/CustomerController.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/customer/controller/CustomerController.java index cd0b789..59ae9a8 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/customer/controller/CustomerController.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/customer/controller/CustomerController.java @@ -1,13 +1,16 @@ -package net.lab1024.sa.admin.module.business.base.customer.controller; +package net.lab1024.sa.admin.module.business.wms.base.customer.controller; -import net.lab1024.sa.admin.module.business.base.customer.domain.entity.CustomerEntity; -import net.lab1024.sa.admin.module.business.base.customer.domain.form.CustomerAddForm; -import net.lab1024.sa.admin.module.business.base.customer.domain.form.CustomerQueryForm; -import net.lab1024.sa.admin.module.business.base.customer.domain.form.CustomerSelect; -import net.lab1024.sa.admin.module.business.base.customer.domain.form.CustomerUpdateForm; -import net.lab1024.sa.admin.module.business.base.customer.domain.vo.CustomerVO; -import net.lab1024.sa.admin.module.business.base.customer.service.CustomerQueryService; -import net.lab1024.sa.admin.module.business.base.customer.service.CustomerService; +import net.lab1024.sa.admin.module.business.wms.base.customer.domain.entity.CustomerEntity; +import net.lab1024.sa.admin.module.business.wms.base.customer.domain.form.CustomerAddForm; +import net.lab1024.sa.admin.module.business.wms.base.customer.domain.form.CustomerQueryForm; +import net.lab1024.sa.admin.module.business.wms.base.customer.domain.form.CustomerSelect; +import net.lab1024.sa.admin.module.business.wms.base.customer.domain.form.CustomerUpdateForm; +import net.lab1024.sa.admin.module.business.wms.base.customer.domain.vo.CustomerVO; +import net.lab1024.sa.admin.module.business.wms.base.customer.service.CustomerQueryService; +import net.lab1024.sa.admin.module.business.wms.base.customer.service.CustomerService; +import net.lab1024.sa.admin.module.business.wms.base.customer.domain.entity.CustomerEntity; +import net.lab1024.sa.admin.module.business.wms.base.customer.domain.form.CustomerSelect; +import net.lab1024.sa.admin.module.business.wms.base.customer.service.CustomerService; import net.lab1024.sa.base.common.domain.RequestUser; import net.lab1024.sa.base.common.domain.ValidateList; import net.lab1024.sa.base.common.util.SmartRequestUtil; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/customer/dao/CustomerDao.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/customer/dao/CustomerDao.java similarity index 66% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/customer/dao/CustomerDao.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/customer/dao/CustomerDao.java index c9ccd71..abb4888 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/customer/dao/CustomerDao.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/customer/dao/CustomerDao.java @@ -1,9 +1,9 @@ -package net.lab1024.sa.admin.module.business.base.customer.dao; +package net.lab1024.sa.admin.module.business.wms.base.customer.dao; import java.util.List; -import net.lab1024.sa.admin.module.business.base.customer.domain.entity.CustomerEntity; -import net.lab1024.sa.admin.module.business.base.customer.domain.form.CustomerQueryForm; -import net.lab1024.sa.admin.module.business.base.customer.domain.vo.CustomerVO; +import net.lab1024.sa.admin.module.business.wms.base.customer.domain.entity.CustomerEntity; +import net.lab1024.sa.admin.module.business.wms.base.customer.domain.form.CustomerQueryForm; +import net.lab1024.sa.admin.module.business.wms.base.customer.domain.vo.CustomerVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/customer/domain/entity/CustomerEntity.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/customer/domain/entity/CustomerEntity.java similarity index 95% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/customer/domain/entity/CustomerEntity.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/customer/domain/entity/CustomerEntity.java index 19fdf11..00df2cc 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/customer/domain/entity/CustomerEntity.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/customer/domain/entity/CustomerEntity.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.base.customer.domain.entity; +package net.lab1024.sa.admin.module.business.wms.base.customer.domain.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/customer/domain/form/CustomerAddForm.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/customer/domain/form/CustomerAddForm.java similarity index 94% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/customer/domain/form/CustomerAddForm.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/customer/domain/form/CustomerAddForm.java index cb4fc63..177f268 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/customer/domain/form/CustomerAddForm.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/customer/domain/form/CustomerAddForm.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.base.customer.domain.form; +package net.lab1024.sa.admin.module.business.wms.base.customer.domain.form; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/customer/domain/form/CustomerQueryForm.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/customer/domain/form/CustomerQueryForm.java similarity index 87% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/customer/domain/form/CustomerQueryForm.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/customer/domain/form/CustomerQueryForm.java index a8068f6..b6e13fd 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/customer/domain/form/CustomerQueryForm.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/customer/domain/form/CustomerQueryForm.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.base.customer.domain.form; +package net.lab1024.sa.admin.module.business.wms.base.customer.domain.form; import net.lab1024.sa.base.common.domain.PageParam; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/customer/domain/form/CustomerSelect.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/customer/domain/form/CustomerSelect.java similarity index 70% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/customer/domain/form/CustomerSelect.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/customer/domain/form/CustomerSelect.java index f91e6db..5d1aba9 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/customer/domain/form/CustomerSelect.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/customer/domain/form/CustomerSelect.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.base.customer.domain.form; +package net.lab1024.sa.admin.module.business.wms.base.customer.domain.form; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/customer/domain/form/CustomerUpdateForm.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/customer/domain/form/CustomerUpdateForm.java similarity index 85% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/customer/domain/form/CustomerUpdateForm.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/customer/domain/form/CustomerUpdateForm.java index 9dd6829..e16b0fd 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/customer/domain/form/CustomerUpdateForm.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/customer/domain/form/CustomerUpdateForm.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.base.customer.domain.form; +package net.lab1024.sa.admin.module.business.wms.base.customer.domain.form; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/customer/domain/vo/CustomerVO.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/customer/domain/vo/CustomerVO.java similarity index 92% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/customer/domain/vo/CustomerVO.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/customer/domain/vo/CustomerVO.java index f5e3311..a4fddb7 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/customer/domain/vo/CustomerVO.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/customer/domain/vo/CustomerVO.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.base.customer.domain.vo; +package net.lab1024.sa.admin.module.business.wms.base.customer.domain.vo; import io.swagger.v3.oas.annotations.media.Schema; import java.time.LocalDateTime; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/customer/manager/CustomerManager.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/customer/manager/CustomerManager.java similarity index 71% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/customer/manager/CustomerManager.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/customer/manager/CustomerManager.java index a1854b1..e9ccfe0 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/customer/manager/CustomerManager.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/customer/manager/CustomerManager.java @@ -1,12 +1,14 @@ -package net.lab1024.sa.admin.module.business.base.customer.manager; +package net.lab1024.sa.admin.module.business.wms.base.customer.manager; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import net.lab1024.sa.admin.constant.AdminCacheConst; -import net.lab1024.sa.admin.module.business.base.customer.domain.entity.CustomerEntity; -import net.lab1024.sa.admin.module.business.base.customer.dao.CustomerDao; +import net.lab1024.sa.admin.module.business.wms.base.customer.domain.entity.CustomerEntity; +import net.lab1024.sa.admin.module.business.wms.base.customer.dao.CustomerDao; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import net.lab1024.sa.admin.module.business.wms.base.customer.dao.CustomerDao; +import net.lab1024.sa.admin.module.business.wms.base.customer.domain.entity.CustomerEntity; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/customer/service/CustomerQueryService.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/customer/service/CustomerQueryService.java similarity index 73% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/customer/service/CustomerQueryService.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/customer/service/CustomerQueryService.java index 28796ba..84f9b84 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/customer/service/CustomerQueryService.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/customer/service/CustomerQueryService.java @@ -1,17 +1,20 @@ -package net.lab1024.sa.admin.module.business.base.customer.service; +package net.lab1024.sa.admin.module.business.wms.base.customer.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.google.common.collect.Maps; import jakarta.annotation.Resource; -import net.lab1024.sa.admin.module.business.base.area.domain.entity.AreaEntity; -import net.lab1024.sa.admin.module.business.base.area.domain.form.AreaSelect; -import net.lab1024.sa.admin.module.business.base.customer.dao.CustomerDao; -import net.lab1024.sa.admin.module.business.base.customer.domain.entity.CustomerEntity; -import net.lab1024.sa.admin.module.business.base.customer.domain.form.CustomerQueryForm; -import net.lab1024.sa.admin.module.business.base.customer.domain.form.CustomerSelect; -import net.lab1024.sa.admin.module.business.base.customer.domain.vo.CustomerVO; -import net.lab1024.sa.admin.module.business.base.customer.manager.CustomerManager; +import net.lab1024.sa.admin.module.business.wms.base.area.domain.entity.AreaEntity; +import net.lab1024.sa.admin.module.business.wms.base.area.domain.form.AreaSelect; +import net.lab1024.sa.admin.module.business.wms.base.customer.dao.CustomerDao; +import net.lab1024.sa.admin.module.business.wms.base.customer.domain.entity.CustomerEntity; +import net.lab1024.sa.admin.module.business.wms.base.customer.domain.form.CustomerQueryForm; +import net.lab1024.sa.admin.module.business.wms.base.customer.domain.form.CustomerSelect; +import net.lab1024.sa.admin.module.business.wms.base.customer.domain.vo.CustomerVO; +import net.lab1024.sa.admin.module.business.wms.base.customer.manager.CustomerManager; +import net.lab1024.sa.admin.module.business.wms.base.customer.dao.CustomerDao; +import net.lab1024.sa.admin.module.business.wms.base.customer.domain.entity.CustomerEntity; +import net.lab1024.sa.admin.module.business.wms.base.customer.domain.form.CustomerSelect; import net.lab1024.sa.base.common.domain.PageResult; import net.lab1024.sa.base.common.util.SmartPageUtil; import org.apache.commons.collections4.CollectionUtils; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/customer/service/CustomerService.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/customer/service/CustomerService.java similarity index 82% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/customer/service/CustomerService.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/customer/service/CustomerService.java index 02e8ae1..2defe4e 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/customer/service/CustomerService.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/customer/service/CustomerService.java @@ -1,13 +1,14 @@ -package net.lab1024.sa.admin.module.business.base.customer.service; +package net.lab1024.sa.admin.module.business.wms.base.customer.service; import java.util.List; -import net.lab1024.sa.admin.module.business.base.area.domain.entity.AreaEntity; -import net.lab1024.sa.admin.module.business.base.customer.dao.CustomerDao; -import net.lab1024.sa.admin.module.business.base.customer.domain.entity.CustomerEntity; -import net.lab1024.sa.admin.module.business.base.customer.domain.form.CustomerAddForm; -import net.lab1024.sa.admin.module.business.base.customer.domain.form.CustomerUpdateForm; -import net.lab1024.sa.admin.module.business.base.customer.manager.CustomerManager; +import net.lab1024.sa.admin.module.business.wms.base.area.domain.entity.AreaEntity; +import net.lab1024.sa.admin.module.business.wms.base.customer.dao.CustomerDao; +import net.lab1024.sa.admin.module.business.wms.base.customer.domain.entity.CustomerEntity; +import net.lab1024.sa.admin.module.business.wms.base.customer.domain.form.CustomerAddForm; +import net.lab1024.sa.admin.module.business.wms.base.customer.domain.form.CustomerUpdateForm; +import net.lab1024.sa.admin.module.business.wms.base.customer.manager.CustomerManager; +import net.lab1024.sa.admin.module.business.wms.base.customer.dao.CustomerDao; import net.lab1024.sa.base.common.code.UserErrorCode; import net.lab1024.sa.base.common.util.SmartBeanUtil; import net.lab1024.sa.base.common.domain.ResponseDTO; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/customer/sql/CustomerMenu.sql b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/customer/sql/CustomerMenu.sql similarity index 100% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/customer/sql/CustomerMenu.sql rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/customer/sql/CustomerMenu.sql diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/item/controller/ItemController.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/item/controller/ItemController.java similarity index 75% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/item/controller/ItemController.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/item/controller/ItemController.java index a460fc1..f0f4377 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/item/controller/ItemController.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/item/controller/ItemController.java @@ -1,15 +1,19 @@ -package net.lab1024.sa.admin.module.business.base.item.controller; +package net.lab1024.sa.admin.module.business.wms.base.item.controller; import jakarta.servlet.http.HttpServletResponse; -import net.lab1024.sa.admin.module.business.base.item.domain.entity.ItemEntity; -import net.lab1024.sa.admin.module.business.base.item.domain.form.ItemAddForm; -import net.lab1024.sa.admin.module.business.base.item.domain.form.ItemQueryForm; -import net.lab1024.sa.admin.module.business.base.item.domain.form.ItemSelect; -import net.lab1024.sa.admin.module.business.base.item.domain.form.ItemUpdateForm; -import net.lab1024.sa.admin.module.business.base.item.domain.vo.ItemVO; -import net.lab1024.sa.admin.module.business.base.item.domain.vo.ItemsExcelVO; -import net.lab1024.sa.admin.module.business.base.item.service.ItemQueryService; -import net.lab1024.sa.admin.module.business.base.item.service.ItemService; +import net.lab1024.sa.admin.module.business.wms.base.item.domain.entity.ItemEntity; +import net.lab1024.sa.admin.module.business.wms.base.item.domain.form.ItemAddForm; +import net.lab1024.sa.admin.module.business.wms.base.item.domain.form.ItemQueryForm; +import net.lab1024.sa.admin.module.business.wms.base.item.domain.form.ItemSelect; +import net.lab1024.sa.admin.module.business.wms.base.item.domain.form.ItemUpdateForm; +import net.lab1024.sa.admin.module.business.wms.base.item.domain.vo.ItemVO; +import net.lab1024.sa.admin.module.business.wms.base.item.domain.vo.ItemsExcelVO; +import net.lab1024.sa.admin.module.business.wms.base.item.service.ItemQueryService; +import net.lab1024.sa.admin.module.business.wms.base.item.service.ItemService; +import net.lab1024.sa.admin.module.business.wms.base.item.domain.form.ItemAddForm; +import net.lab1024.sa.admin.module.business.wms.base.item.domain.form.ItemQueryForm; +import net.lab1024.sa.admin.module.business.wms.base.item.service.ItemQueryService; +import net.lab1024.sa.admin.module.business.wms.base.item.service.ItemService; import net.lab1024.sa.base.common.domain.PageResult; import net.lab1024.sa.base.common.domain.RequestUser; import net.lab1024.sa.base.common.domain.ValidateList; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/item/dao/ItemDao.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/item/dao/ItemDao.java similarity index 67% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/item/dao/ItemDao.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/item/dao/ItemDao.java index 86dd68d..734de60 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/item/dao/ItemDao.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/item/dao/ItemDao.java @@ -1,9 +1,9 @@ -package net.lab1024.sa.admin.module.business.base.item.dao; +package net.lab1024.sa.admin.module.business.wms.base.item.dao; import java.util.List; -import net.lab1024.sa.admin.module.business.base.item.domain.entity.ItemEntity; -import net.lab1024.sa.admin.module.business.base.item.domain.form.ItemQueryForm; -import net.lab1024.sa.admin.module.business.base.item.domain.vo.ItemVO; +import net.lab1024.sa.admin.module.business.wms.base.item.domain.entity.ItemEntity; +import net.lab1024.sa.admin.module.business.wms.base.item.domain.form.ItemQueryForm; +import net.lab1024.sa.admin.module.business.wms.base.item.domain.vo.ItemVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/item/domain/entity/ItemEntity.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/item/domain/entity/ItemEntity.java similarity index 95% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/item/domain/entity/ItemEntity.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/item/domain/entity/ItemEntity.java index 8d487d2..b55208c 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/item/domain/entity/ItemEntity.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/item/domain/entity/ItemEntity.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.base.item.domain.entity; +package net.lab1024.sa.admin.module.business.wms.base.item.domain.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/item/domain/form/ItemAddForm.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/item/domain/form/ItemAddForm.java similarity index 95% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/item/domain/form/ItemAddForm.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/item/domain/form/ItemAddForm.java index 184e4f4..d69c9a1 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/item/domain/form/ItemAddForm.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/item/domain/form/ItemAddForm.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.base.item.domain.form; +package net.lab1024.sa.admin.module.business.wms.base.item.domain.form; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/item/domain/form/ItemQueryForm.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/item/domain/form/ItemQueryForm.java similarity index 87% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/item/domain/form/ItemQueryForm.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/item/domain/form/ItemQueryForm.java index 927abdf..7255bbe 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/item/domain/form/ItemQueryForm.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/item/domain/form/ItemQueryForm.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.base.item.domain.form; +package net.lab1024.sa.admin.module.business.wms.base.item.domain.form; import net.lab1024.sa.base.common.domain.PageParam; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/item/domain/form/ItemSelect.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/item/domain/form/ItemSelect.java similarity index 70% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/item/domain/form/ItemSelect.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/item/domain/form/ItemSelect.java index f8548d4..83cdafa 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/item/domain/form/ItemSelect.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/item/domain/form/ItemSelect.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.base.item.domain.form; +package net.lab1024.sa.admin.module.business.wms.base.item.domain.form; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/item/domain/form/ItemUpdateForm.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/item/domain/form/ItemUpdateForm.java similarity index 87% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/item/domain/form/ItemUpdateForm.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/item/domain/form/ItemUpdateForm.java index 3cfcc8a..357b969 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/item/domain/form/ItemUpdateForm.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/item/domain/form/ItemUpdateForm.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.base.item.domain.form; +package net.lab1024.sa.admin.module.business.wms.base.item.domain.form; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/item/domain/form/ItemsImportForm.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/item/domain/form/ItemsImportForm.java similarity index 83% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/item/domain/form/ItemsImportForm.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/item/domain/form/ItemsImportForm.java index a05b21b..cd30a44 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/item/domain/form/ItemsImportForm.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/item/domain/form/ItemsImportForm.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.base.item.domain.form; +package net.lab1024.sa.admin.module.business.wms.base.item.domain.form; import cn.idev.excel.annotation.ExcelProperty; import lombok.Data; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/item/domain/vo/ItemVO.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/item/domain/vo/ItemVO.java similarity index 92% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/item/domain/vo/ItemVO.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/item/domain/vo/ItemVO.java index 8e7e5ef..16d21bc 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/item/domain/vo/ItemVO.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/item/domain/vo/ItemVO.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.base.item.domain.vo; +package net.lab1024.sa.admin.module.business.wms.base.item.domain.vo; import io.swagger.v3.oas.annotations.media.Schema; import java.math.BigDecimal; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/item/domain/vo/ItemsExcelVO.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/item/domain/vo/ItemsExcelVO.java similarity index 89% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/item/domain/vo/ItemsExcelVO.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/item/domain/vo/ItemsExcelVO.java index aa94ea0..5031481 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/item/domain/vo/ItemsExcelVO.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/item/domain/vo/ItemsExcelVO.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.base.item.domain.vo; +package net.lab1024.sa.admin.module.business.wms.base.item.domain.vo; import cn.idev.excel.annotation.ExcelProperty; import lombok.AllArgsConstructor; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/item/manager/ItemManager.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/item/manager/ItemManager.java similarity index 64% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/item/manager/ItemManager.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/item/manager/ItemManager.java index 43bc119..407050f 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/item/manager/ItemManager.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/item/manager/ItemManager.java @@ -1,14 +1,16 @@ -package net.lab1024.sa.admin.module.business.base.item.manager; +package net.lab1024.sa.admin.module.business.wms.base.item.manager; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import net.lab1024.sa.admin.constant.AdminCacheConst; -import net.lab1024.sa.admin.module.business.base.area.dao.AreaDao; -import net.lab1024.sa.admin.module.business.base.area.domain.entity.AreaEntity; -import net.lab1024.sa.admin.module.business.base.item.dao.ItemDao; -import net.lab1024.sa.admin.module.business.base.item.domain.entity.ItemEntity; +import net.lab1024.sa.admin.module.business.wms.base.area.dao.AreaDao; +import net.lab1024.sa.admin.module.business.wms.base.area.domain.entity.AreaEntity; +import net.lab1024.sa.admin.module.business.wms.base.item.dao.ItemDao; +import net.lab1024.sa.admin.module.business.wms.base.item.domain.entity.ItemEntity; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import net.lab1024.sa.admin.module.business.wms.base.item.dao.ItemDao; +import net.lab1024.sa.admin.module.business.wms.base.item.domain.entity.ItemEntity; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/item/service/ItemQueryService.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/item/service/ItemQueryService.java similarity index 86% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/item/service/ItemQueryService.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/item/service/ItemQueryService.java index eb11bc0..954e9f1 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/item/service/ItemQueryService.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/item/service/ItemQueryService.java @@ -1,16 +1,17 @@ -package net.lab1024.sa.admin.module.business.base.item.service; +package net.lab1024.sa.admin.module.business.wms.base.item.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.google.common.collect.Maps; import jakarta.annotation.Resource; -import net.lab1024.sa.admin.module.business.base.item.dao.ItemDao; -import net.lab1024.sa.admin.module.business.base.item.domain.entity.ItemEntity; -import net.lab1024.sa.admin.module.business.base.item.domain.form.ItemQueryForm; -import net.lab1024.sa.admin.module.business.base.item.domain.form.ItemSelect; -import net.lab1024.sa.admin.module.business.base.item.domain.vo.ItemVO; -import net.lab1024.sa.admin.module.business.base.item.domain.vo.ItemsExcelVO; -import net.lab1024.sa.admin.module.business.base.item.manager.ItemManager; +import net.lab1024.sa.admin.module.business.wms.base.item.dao.ItemDao; +import net.lab1024.sa.admin.module.business.wms.base.item.domain.entity.ItemEntity; +import net.lab1024.sa.admin.module.business.wms.base.item.domain.form.ItemQueryForm; +import net.lab1024.sa.admin.module.business.wms.base.item.domain.form.ItemSelect; +import net.lab1024.sa.admin.module.business.wms.base.item.domain.vo.ItemVO; +import net.lab1024.sa.admin.module.business.wms.base.item.domain.vo.ItemsExcelVO; +import net.lab1024.sa.admin.module.business.wms.base.item.manager.ItemManager; +import net.lab1024.sa.admin.module.business.wms.base.item.dao.ItemDao; import net.lab1024.sa.base.common.domain.PageResult; import net.lab1024.sa.base.common.util.SmartPageUtil; import net.lab1024.sa.base.module.support.dict.constant.DictConst; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/item/service/ItemService.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/item/service/ItemService.java similarity index 91% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/item/service/ItemService.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/item/service/ItemService.java index 5a89dc2..cbf6342 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/item/service/ItemService.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/item/service/ItemService.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.base.item.service; +package net.lab1024.sa.admin.module.business.wms.base.item.service; import java.io.IOException; import java.math.BigDecimal; @@ -8,12 +8,14 @@ import java.util.Map; import java.util.stream.Collectors; import cn.idev.excel.FastExcel; -import net.lab1024.sa.admin.module.business.base.item.dao.ItemDao; -import net.lab1024.sa.admin.module.business.base.item.domain.entity.ItemEntity; -import net.lab1024.sa.admin.module.business.base.item.domain.form.ItemAddForm; -import net.lab1024.sa.admin.module.business.base.item.domain.form.ItemUpdateForm; -import net.lab1024.sa.admin.module.business.base.item.domain.form.ItemsImportForm; -import net.lab1024.sa.admin.module.business.base.item.manager.ItemManager; +import net.lab1024.sa.admin.module.business.wms.base.item.dao.ItemDao; +import net.lab1024.sa.admin.module.business.wms.base.item.domain.entity.ItemEntity; +import net.lab1024.sa.admin.module.business.wms.base.item.domain.form.ItemAddForm; +import net.lab1024.sa.admin.module.business.wms.base.item.domain.form.ItemUpdateForm; +import net.lab1024.sa.admin.module.business.wms.base.item.domain.form.ItemsImportForm; +import net.lab1024.sa.admin.module.business.wms.base.item.manager.ItemManager; +import net.lab1024.sa.admin.module.business.wms.base.item.dao.ItemDao; +import net.lab1024.sa.admin.module.business.wms.base.item.domain.form.ItemAddForm; import net.lab1024.sa.admin.util.JoinerResult; import net.lab1024.sa.admin.util.ResponseDTOUtils; import net.lab1024.sa.admin.util.ValidateDictKey; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/item/sql/ItemMenu.sql b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/item/sql/ItemMenu.sql similarity index 100% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/item/sql/ItemMenu.sql rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/item/sql/ItemMenu.sql diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/location/controller/LocationController.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/controller/LocationController.java similarity index 91% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/location/controller/LocationController.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/controller/LocationController.java index 00cdcde..1acdb50 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/location/controller/LocationController.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/controller/LocationController.java @@ -1,11 +1,11 @@ -package net.lab1024.sa.admin.module.business.base.location.controller; +package net.lab1024.sa.admin.module.business.wms.base.location.controller; import jakarta.servlet.http.HttpServletResponse; -import net.lab1024.sa.admin.module.business.base.location.domain.form.*; -import net.lab1024.sa.admin.module.business.base.location.domain.vo.LocationVO; -import net.lab1024.sa.admin.module.business.base.location.service.LocationQueryService; -import net.lab1024.sa.admin.module.business.base.location.service.LocationService; +import net.lab1024.sa.admin.module.business.wms.base.location.domain.form.*; +import net.lab1024.sa.admin.module.business.wms.base.location.domain.vo.LocationVO; +import net.lab1024.sa.admin.module.business.wms.base.location.service.LocationQueryService; +import net.lab1024.sa.admin.module.business.wms.base.location.service.LocationService; import net.lab1024.sa.base.common.domain.RequestUser; import net.lab1024.sa.base.common.domain.ValidateList; import net.lab1024.sa.base.common.util.SmartExcelUtil; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/location/dao/LocationDao.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/dao/LocationDao.java similarity index 56% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/location/dao/LocationDao.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/dao/LocationDao.java index 7ca9e5f..d51d2cc 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/location/dao/LocationDao.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/dao/LocationDao.java @@ -1,11 +1,13 @@ -package net.lab1024.sa.admin.module.business.base.location.dao; +package net.lab1024.sa.admin.module.business.wms.base.location.dao; import java.util.List; -import net.lab1024.sa.admin.module.business.base.location.domain.entity.LocationEntity; -import net.lab1024.sa.admin.module.business.base.location.domain.form.LocationQueryForm; -import net.lab1024.sa.admin.module.business.base.location.domain.vo.LocationVO; +import net.lab1024.sa.admin.module.business.wms.base.location.domain.entity.LocationEntity; +import net.lab1024.sa.admin.module.business.wms.base.location.domain.form.LocationQueryForm; +import net.lab1024.sa.admin.module.business.wms.base.location.domain.vo.LocationVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import net.lab1024.sa.admin.module.business.wms.base.location.domain.entity.LocationEntity; +import net.lab1024.sa.admin.module.business.wms.base.location.domain.vo.LocationVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Component; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/location/domain/entity/LocationEntity.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/domain/entity/LocationEntity.java similarity index 95% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/location/domain/entity/LocationEntity.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/domain/entity/LocationEntity.java index 899688f..596ce07 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/location/domain/entity/LocationEntity.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/domain/entity/LocationEntity.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.base.location.domain.entity; +package net.lab1024.sa.admin.module.business.wms.base.location.domain.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/location/domain/form/LocationAddForm.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/domain/form/LocationAddForm.java similarity index 95% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/location/domain/form/LocationAddForm.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/domain/form/LocationAddForm.java index ae3ad35..934d57f 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/location/domain/form/LocationAddForm.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/domain/form/LocationAddForm.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.base.location.domain.form; +package net.lab1024.sa.admin.module.business.wms.base.location.domain.form; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/location/domain/form/LocationQueryForm.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/domain/form/LocationQueryForm.java similarity index 89% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/location/domain/form/LocationQueryForm.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/domain/form/LocationQueryForm.java index b040f9f..71989c1 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/location/domain/form/LocationQueryForm.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/domain/form/LocationQueryForm.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.base.location.domain.form; +package net.lab1024.sa.admin.module.business.wms.base.location.domain.form; import net.lab1024.sa.base.common.domain.PageParam; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/location/domain/form/LocationSelect.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/domain/form/LocationSelect.java similarity index 84% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/location/domain/form/LocationSelect.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/domain/form/LocationSelect.java index bd88a39..f508a90 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/location/domain/form/LocationSelect.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/domain/form/LocationSelect.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.base.location.domain.form; +package net.lab1024.sa.admin.module.business.wms.base.location.domain.form; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/location/domain/form/LocationUpdateForm.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/domain/form/LocationUpdateForm.java similarity index 86% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/location/domain/form/LocationUpdateForm.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/domain/form/LocationUpdateForm.java index 1790dd0..765c31d 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/location/domain/form/LocationUpdateForm.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/domain/form/LocationUpdateForm.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.base.location.domain.form; +package net.lab1024.sa.admin.module.business.wms.base.location.domain.form; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/location/domain/form/LocationsExcelVO.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/domain/form/LocationsExcelVO.java similarity index 88% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/location/domain/form/LocationsExcelVO.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/domain/form/LocationsExcelVO.java index fccaec8..c1ab77d 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/location/domain/form/LocationsExcelVO.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/domain/form/LocationsExcelVO.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.base.location.domain.form; +package net.lab1024.sa.admin.module.business.wms.base.location.domain.form; import cn.idev.excel.annotation.ExcelProperty; import lombok.AllArgsConstructor; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/location/domain/form/LocationsImportForm.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/domain/form/LocationsImportForm.java similarity index 81% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/location/domain/form/LocationsImportForm.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/domain/form/LocationsImportForm.java index 615d65c..c62a848 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/location/domain/form/LocationsImportForm.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/domain/form/LocationsImportForm.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.base.location.domain.form; +package net.lab1024.sa.admin.module.business.wms.base.location.domain.form; import cn.idev.excel.annotation.ExcelProperty; import lombok.Data; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/location/domain/form/MultipleAdjust.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/domain/form/MultipleAdjust.java similarity index 88% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/location/domain/form/MultipleAdjust.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/domain/form/MultipleAdjust.java index fc97368..354a1f6 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/location/domain/form/MultipleAdjust.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/domain/form/MultipleAdjust.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.base.location.domain.form; +package net.lab1024.sa.admin.module.business.wms.base.location.domain.form; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/location/domain/form/MultipleInsert.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/domain/form/MultipleInsert.java similarity index 89% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/location/domain/form/MultipleInsert.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/domain/form/MultipleInsert.java index 518d1ce..ef383a6 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/location/domain/form/MultipleInsert.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/domain/form/MultipleInsert.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.base.location.domain.form; +package net.lab1024.sa.admin.module.business.wms.base.location.domain.form; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/location/domain/vo/LocationVO.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/domain/vo/LocationVO.java similarity index 95% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/location/domain/vo/LocationVO.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/domain/vo/LocationVO.java index 76b59c7..99e50c0 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/location/domain/vo/LocationVO.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/domain/vo/LocationVO.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.base.location.domain.vo; +package net.lab1024.sa.admin.module.business.wms.base.location.domain.vo; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/location/manager/LocationManager.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/manager/LocationManager.java similarity index 75% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/location/manager/LocationManager.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/manager/LocationManager.java index 2e009d4..9fcb206 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/location/manager/LocationManager.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/manager/LocationManager.java @@ -1,12 +1,13 @@ -package net.lab1024.sa.admin.module.business.base.location.manager; +package net.lab1024.sa.admin.module.business.wms.base.location.manager; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import net.lab1024.sa.admin.constant.AdminCacheConst; -import net.lab1024.sa.admin.module.business.base.location.dao.LocationDao; -import net.lab1024.sa.admin.module.business.base.location.domain.entity.LocationEntity; +import net.lab1024.sa.admin.module.business.wms.base.location.dao.LocationDao; +import net.lab1024.sa.admin.module.business.wms.base.location.domain.entity.LocationEntity; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import net.lab1024.sa.admin.module.business.wms.base.location.domain.entity.LocationEntity; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/location/service/LocationQueryService.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/service/LocationQueryService.java similarity index 81% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/location/service/LocationQueryService.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/service/LocationQueryService.java index 82d9d70..8ceeec2 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/location/service/LocationQueryService.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/service/LocationQueryService.java @@ -1,21 +1,32 @@ -package net.lab1024.sa.admin.module.business.base.location.service; +package net.lab1024.sa.admin.module.business.wms.base.location.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.google.common.collect.Maps; import jakarta.annotation.Resource; import net.lab1024.sa.admin.constant.UsageStatusEnum; -import net.lab1024.sa.admin.module.business.base.area.domain.entity.AreaEntity; -import net.lab1024.sa.admin.module.business.base.area.domain.form.AreaSelect; -import net.lab1024.sa.admin.module.business.base.area.manager.AreaManager; -import net.lab1024.sa.admin.module.business.base.area.service.AreaQueryService; -import net.lab1024.sa.admin.module.business.base.location.dao.LocationDao; -import net.lab1024.sa.admin.module.business.base.location.domain.entity.LocationEntity; -import net.lab1024.sa.admin.module.business.base.location.domain.form.LocationQueryForm; -import net.lab1024.sa.admin.module.business.base.location.domain.form.LocationSelect; -import net.lab1024.sa.admin.module.business.base.location.domain.form.LocationsExcelVO; -import net.lab1024.sa.admin.module.business.base.location.domain.vo.LocationVO; -import net.lab1024.sa.admin.module.business.base.location.manager.LocationManager; +import net.lab1024.sa.admin.module.business.wms.base.area.domain.entity.AreaEntity; +import net.lab1024.sa.admin.module.business.wms.base.area.domain.form.AreaSelect; +import net.lab1024.sa.admin.module.business.wms.base.area.manager.AreaManager; +import net.lab1024.sa.admin.module.business.wms.base.area.service.AreaQueryService; +import net.lab1024.sa.admin.module.business.wms.base.location.dao.LocationDao; +import net.lab1024.sa.admin.module.business.wms.base.location.domain.entity.LocationEntity; +import net.lab1024.sa.admin.module.business.wms.base.location.domain.form.LocationQueryForm; +import net.lab1024.sa.admin.module.business.wms.base.location.domain.form.LocationSelect; +import net.lab1024.sa.admin.module.business.wms.base.location.domain.form.LocationsExcelVO; +import net.lab1024.sa.admin.module.business.wms.base.location.domain.vo.LocationVO; +import net.lab1024.sa.admin.module.business.wms.base.location.manager.LocationManager; +import net.lab1024.sa.admin.module.business.wms.base.area.domain.entity.AreaEntity; +import net.lab1024.sa.admin.module.business.wms.base.area.domain.form.AreaSelect; +import net.lab1024.sa.admin.module.business.wms.base.area.manager.AreaManager; +import net.lab1024.sa.admin.module.business.wms.base.area.service.AreaQueryService; +import net.lab1024.sa.admin.module.business.wms.base.location.dao.LocationDao; +import net.lab1024.sa.admin.module.business.wms.base.location.domain.entity.LocationEntity; +import net.lab1024.sa.admin.module.business.wms.base.location.domain.form.LocationQueryForm; +import net.lab1024.sa.admin.module.business.wms.base.location.domain.form.LocationSelect; +import net.lab1024.sa.admin.module.business.wms.base.location.domain.form.LocationsExcelVO; +import net.lab1024.sa.admin.module.business.wms.base.location.domain.vo.LocationVO; +import net.lab1024.sa.admin.module.business.wms.base.location.manager.LocationManager; import net.lab1024.sa.base.common.domain.PageResult; import net.lab1024.sa.base.common.util.SmartEnumUtil; import net.lab1024.sa.base.common.util.SmartPageUtil; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/location/service/LocationService.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/service/LocationService.java similarity index 96% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/location/service/LocationService.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/service/LocationService.java index f81a1e7..81d6118 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/location/service/LocationService.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/service/LocationService.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.base.location.service; +package net.lab1024.sa.admin.module.business.wms.base.location.service; import java.io.IOException; import java.util.*; @@ -7,12 +7,12 @@ import java.util.stream.Collectors; import cn.idev.excel.FastExcel; import lombok.extern.slf4j.Slf4j; import net.lab1024.sa.admin.constant.UsageStatusEnum; -import net.lab1024.sa.admin.module.business.base.area.domain.entity.AreaEntity; -import net.lab1024.sa.admin.module.business.base.area.service.AreaQueryService; -import net.lab1024.sa.admin.module.business.base.location.dao.LocationDao; -import net.lab1024.sa.admin.module.business.base.location.domain.entity.LocationEntity; -import net.lab1024.sa.admin.module.business.base.location.domain.form.*; -import net.lab1024.sa.admin.module.business.base.location.manager.LocationManager; +import net.lab1024.sa.admin.module.business.wms.base.area.domain.entity.AreaEntity; +import net.lab1024.sa.admin.module.business.wms.base.area.service.AreaQueryService; +import net.lab1024.sa.admin.module.business.wms.base.location.dao.LocationDao; +import net.lab1024.sa.admin.module.business.wms.base.location.domain.entity.LocationEntity; +import net.lab1024.sa.admin.module.business.wms.base.location.domain.form.*; +import net.lab1024.sa.admin.module.business.wms.base.location.manager.LocationManager; import net.lab1024.sa.admin.util.JoinerResult; import net.lab1024.sa.admin.util.ResponseDTOUtils; import net.lab1024.sa.admin.util.ValidateDictKey; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/location/sql/LocationMenu.sql b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/sql/LocationMenu.sql similarity index 100% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/location/sql/LocationMenu.sql rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/sql/LocationMenu.sql diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/stock/controller/StockController.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/controller/StockController.java similarity index 73% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/stock/controller/StockController.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/controller/StockController.java index aef145a..a486772 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/stock/controller/StockController.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/controller/StockController.java @@ -1,18 +1,20 @@ -package net.lab1024.sa.admin.module.business.base.stock.controller; +package net.lab1024.sa.admin.module.business.wms.base.stock.controller; import jakarta.servlet.http.HttpServletResponse; -import net.lab1024.sa.admin.module.business.base.item.domain.entity.ItemEntity; -import net.lab1024.sa.admin.module.business.base.item.domain.form.ItemSelect; -import net.lab1024.sa.admin.module.business.base.item.domain.vo.ItemsExcelVO; -import net.lab1024.sa.admin.module.business.base.stock.domain.entity.StockEntity; -import net.lab1024.sa.admin.module.business.base.stock.domain.form.StockAddForm; -import net.lab1024.sa.admin.module.business.base.stock.domain.form.StockQueryForm; -import net.lab1024.sa.admin.module.business.base.stock.domain.form.StockSelect; -import net.lab1024.sa.admin.module.business.base.stock.domain.form.StockUpdateForm; -import net.lab1024.sa.admin.module.business.base.stock.domain.vo.StockVO; -import net.lab1024.sa.admin.module.business.base.stock.domain.vo.StocksExcelVO; -import net.lab1024.sa.admin.module.business.base.stock.service.StockQueryService; -import net.lab1024.sa.admin.module.business.base.stock.service.StockService; +import net.lab1024.sa.admin.module.business.wms.base.item.domain.entity.ItemEntity; +import net.lab1024.sa.admin.module.business.wms.base.item.domain.form.ItemSelect; +import net.lab1024.sa.admin.module.business.wms.base.item.domain.vo.ItemsExcelVO; +import net.lab1024.sa.admin.module.business.wms.base.stock.domain.entity.StockEntity; +import net.lab1024.sa.admin.module.business.wms.base.stock.domain.form.StockAddForm; +import net.lab1024.sa.admin.module.business.wms.base.stock.domain.form.StockQueryForm; +import net.lab1024.sa.admin.module.business.wms.base.stock.domain.form.StockSelect; +import net.lab1024.sa.admin.module.business.wms.base.stock.domain.form.StockUpdateForm; +import net.lab1024.sa.admin.module.business.wms.base.stock.domain.vo.StockVO; +import net.lab1024.sa.admin.module.business.wms.base.stock.domain.vo.StocksExcelVO; +import net.lab1024.sa.admin.module.business.wms.base.stock.service.StockQueryService; +import net.lab1024.sa.admin.module.business.wms.base.stock.service.StockService; +import net.lab1024.sa.admin.module.business.wms.base.stock.domain.form.StockQueryForm; +import net.lab1024.sa.admin.module.business.wms.base.stock.domain.form.StockUpdateForm; import net.lab1024.sa.base.common.domain.RequestUser; import net.lab1024.sa.base.common.domain.ValidateList; import net.lab1024.sa.base.common.util.SmartExcelUtil; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/stock/dao/StockDao.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/dao/StockDao.java similarity index 57% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/stock/dao/StockDao.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/dao/StockDao.java index ae0b5e5..2dbced7 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/stock/dao/StockDao.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/dao/StockDao.java @@ -1,11 +1,13 @@ -package net.lab1024.sa.admin.module.business.base.stock.dao; +package net.lab1024.sa.admin.module.business.wms.base.stock.dao; import java.util.List; -import net.lab1024.sa.admin.module.business.base.stock.domain.entity.StockEntity; -import net.lab1024.sa.admin.module.business.base.stock.domain.form.StockQueryForm; -import net.lab1024.sa.admin.module.business.base.stock.domain.vo.StockVO; +import net.lab1024.sa.admin.module.business.wms.base.stock.domain.entity.StockEntity; +import net.lab1024.sa.admin.module.business.wms.base.stock.domain.form.StockQueryForm; +import net.lab1024.sa.admin.module.business.wms.base.stock.domain.vo.StockVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import net.lab1024.sa.admin.module.business.wms.base.stock.domain.entity.StockEntity; +import net.lab1024.sa.admin.module.business.wms.base.stock.domain.form.StockQueryForm; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Component; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/stock/domain/entity/StockEntity.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/domain/entity/StockEntity.java similarity index 95% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/stock/domain/entity/StockEntity.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/domain/entity/StockEntity.java index 4c0133f..23468e1 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/stock/domain/entity/StockEntity.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/domain/entity/StockEntity.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.base.stock.domain.entity; +package net.lab1024.sa.admin.module.business.wms.base.stock.domain.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/stock/domain/form/StockAddForm.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/domain/form/StockAddForm.java similarity index 93% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/stock/domain/form/StockAddForm.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/domain/form/StockAddForm.java index 62bc4fe..c52f69e 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/stock/domain/form/StockAddForm.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/domain/form/StockAddForm.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.base.stock.domain.form; +package net.lab1024.sa.admin.module.business.wms.base.stock.domain.form; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/stock/domain/form/StockQueryForm.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/domain/form/StockQueryForm.java similarity index 89% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/stock/domain/form/StockQueryForm.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/domain/form/StockQueryForm.java index eac7b19..7030221 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/stock/domain/form/StockQueryForm.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/domain/form/StockQueryForm.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.base.stock.domain.form; +package net.lab1024.sa.admin.module.business.wms.base.stock.domain.form; import net.lab1024.sa.base.common.domain.PageParam; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/stock/domain/form/StockSelect.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/domain/form/StockSelect.java similarity index 76% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/stock/domain/form/StockSelect.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/domain/form/StockSelect.java index 0832732..dc8a503 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/stock/domain/form/StockSelect.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/domain/form/StockSelect.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.base.stock.domain.form; +package net.lab1024.sa.admin.module.business.wms.base.stock.domain.form; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/stock/domain/form/StockUpdateForm.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/domain/form/StockUpdateForm.java similarity index 85% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/stock/domain/form/StockUpdateForm.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/domain/form/StockUpdateForm.java index 94f81f7..0f65702 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/stock/domain/form/StockUpdateForm.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/domain/form/StockUpdateForm.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.base.stock.domain.form; +package net.lab1024.sa.admin.module.business.wms.base.stock.domain.form; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/stock/domain/form/StocksImportForm.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/domain/form/StocksImportForm.java similarity index 76% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/stock/domain/form/StocksImportForm.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/domain/form/StocksImportForm.java index 5b38b32..7713d13 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/stock/domain/form/StocksImportForm.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/domain/form/StocksImportForm.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.base.stock.domain.form; +package net.lab1024.sa.admin.module.business.wms.base.stock.domain.form; import cn.idev.excel.annotation.ExcelProperty; import lombok.Data; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/stock/domain/vo/StockVO.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/domain/vo/StockVO.java similarity index 92% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/stock/domain/vo/StockVO.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/domain/vo/StockVO.java index 3a01eff..56ed00f 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/stock/domain/vo/StockVO.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/domain/vo/StockVO.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.base.stock.domain.vo; +package net.lab1024.sa.admin.module.business.wms.base.stock.domain.vo; import io.swagger.v3.oas.annotations.media.Schema; import java.time.LocalDateTime; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/stock/domain/vo/StocksExcelVO.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/domain/vo/StocksExcelVO.java similarity index 87% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/stock/domain/vo/StocksExcelVO.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/domain/vo/StocksExcelVO.java index e422d85..98dd6ed 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/stock/domain/vo/StocksExcelVO.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/domain/vo/StocksExcelVO.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.base.stock.domain.vo; +package net.lab1024.sa.admin.module.business.wms.base.stock.domain.vo; import cn.idev.excel.annotation.ExcelProperty; import lombok.AllArgsConstructor; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/stock/manager/StockManager.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/manager/StockManager.java similarity index 81% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/stock/manager/StockManager.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/manager/StockManager.java index fbc5648..ea1777a 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/stock/manager/StockManager.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/manager/StockManager.java @@ -1,10 +1,10 @@ -package net.lab1024.sa.admin.module.business.base.stock.manager; +package net.lab1024.sa.admin.module.business.wms.base.stock.manager; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import net.lab1024.sa.admin.constant.AdminCacheConst; -import net.lab1024.sa.admin.module.business.base.stock.dao.StockDao; -import net.lab1024.sa.admin.module.business.base.stock.domain.entity.StockEntity; +import net.lab1024.sa.admin.module.business.wms.base.stock.dao.StockDao; +import net.lab1024.sa.admin.module.business.wms.base.stock.domain.entity.StockEntity; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.cache.annotation.CacheEvict; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/stock/service/StockQueryService.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/service/StockQueryService.java similarity index 77% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/stock/service/StockQueryService.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/service/StockQueryService.java index ab0955f..7da8de7 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/stock/service/StockQueryService.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/service/StockQueryService.java @@ -1,19 +1,25 @@ -package net.lab1024.sa.admin.module.business.base.stock.service; +package net.lab1024.sa.admin.module.business.wms.base.stock.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jakarta.annotation.Resource; -import net.lab1024.sa.admin.module.business.base.area.domain.entity.AreaEntity; -import net.lab1024.sa.admin.module.business.base.location.domain.entity.LocationEntity; -import net.lab1024.sa.admin.module.business.base.location.domain.vo.LocationVO; -import net.lab1024.sa.admin.module.business.base.location.manager.LocationManager; -import net.lab1024.sa.admin.module.business.base.location.service.LocationQueryService; -import net.lab1024.sa.admin.module.business.base.stock.dao.StockDao; -import net.lab1024.sa.admin.module.business.base.stock.domain.entity.StockEntity; -import net.lab1024.sa.admin.module.business.base.stock.domain.form.StockQueryForm; -import net.lab1024.sa.admin.module.business.base.stock.domain.form.StockSelect; -import net.lab1024.sa.admin.module.business.base.stock.domain.vo.StockVO; -import net.lab1024.sa.admin.module.business.base.stock.domain.vo.StocksExcelVO; +import net.lab1024.sa.admin.module.business.wms.base.area.domain.entity.AreaEntity; +import net.lab1024.sa.admin.module.business.wms.base.location.domain.entity.LocationEntity; +import net.lab1024.sa.admin.module.business.wms.base.location.domain.vo.LocationVO; +import net.lab1024.sa.admin.module.business.wms.base.location.manager.LocationManager; +import net.lab1024.sa.admin.module.business.wms.base.location.service.LocationQueryService; +import net.lab1024.sa.admin.module.business.wms.base.stock.dao.StockDao; +import net.lab1024.sa.admin.module.business.wms.base.stock.domain.entity.StockEntity; +import net.lab1024.sa.admin.module.business.wms.base.stock.domain.form.StockQueryForm; +import net.lab1024.sa.admin.module.business.wms.base.stock.domain.form.StockSelect; +import net.lab1024.sa.admin.module.business.wms.base.stock.domain.vo.StockVO; +import net.lab1024.sa.admin.module.business.wms.base.stock.domain.vo.StocksExcelVO; +import net.lab1024.sa.admin.module.business.wms.base.location.domain.entity.LocationEntity; +import net.lab1024.sa.admin.module.business.wms.base.location.manager.LocationManager; +import net.lab1024.sa.admin.module.business.wms.base.stock.domain.entity.StockEntity; +import net.lab1024.sa.admin.module.business.wms.base.stock.domain.form.StockQueryForm; +import net.lab1024.sa.admin.module.business.wms.base.stock.domain.form.StockSelect; +import net.lab1024.sa.admin.module.business.wms.base.stock.domain.vo.StocksExcelVO; import net.lab1024.sa.base.common.domain.PageResult; import net.lab1024.sa.base.common.util.SmartPageUtil; import net.lab1024.sa.base.module.support.dict.constant.DictConst; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/stock/service/StockService.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/service/StockService.java similarity index 85% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/stock/service/StockService.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/service/StockService.java index 2dd7ce4..61f0f12 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/stock/service/StockService.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/service/StockService.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.base.stock.service; +package net.lab1024.sa.admin.module.business.wms.base.stock.service; import java.io.IOException; import java.math.BigDecimal; @@ -9,18 +9,21 @@ import java.util.stream.Collectors; import cn.idev.excel.FastExcel; import net.lab1024.sa.admin.constant.UsageStatusEnum; -import net.lab1024.sa.admin.module.business.base.item.domain.entity.ItemEntity; -import net.lab1024.sa.admin.module.business.base.item.domain.form.ItemsImportForm; -import net.lab1024.sa.admin.module.business.base.location.dao.LocationDao; -import net.lab1024.sa.admin.module.business.base.location.domain.entity.LocationEntity; -import net.lab1024.sa.admin.module.business.base.location.service.LocationQueryService; -import net.lab1024.sa.admin.module.business.base.location.service.LocationService; -import net.lab1024.sa.admin.module.business.base.stock.dao.StockDao; -import net.lab1024.sa.admin.module.business.base.stock.domain.entity.StockEntity; -import net.lab1024.sa.admin.module.business.base.stock.domain.form.StockAddForm; -import net.lab1024.sa.admin.module.business.base.stock.domain.form.StockUpdateForm; -import net.lab1024.sa.admin.module.business.base.stock.domain.form.StocksImportForm; -import net.lab1024.sa.admin.module.business.base.stock.manager.StockManager; +import net.lab1024.sa.admin.module.business.wms.base.item.domain.entity.ItemEntity; +import net.lab1024.sa.admin.module.business.wms.base.item.domain.form.ItemsImportForm; +import net.lab1024.sa.admin.module.business.wms.base.location.dao.LocationDao; +import net.lab1024.sa.admin.module.business.wms.base.location.domain.entity.LocationEntity; +import net.lab1024.sa.admin.module.business.wms.base.location.service.LocationQueryService; +import net.lab1024.sa.admin.module.business.wms.base.location.service.LocationService; +import net.lab1024.sa.admin.module.business.wms.base.stock.dao.StockDao; +import net.lab1024.sa.admin.module.business.wms.base.stock.domain.entity.StockEntity; +import net.lab1024.sa.admin.module.business.wms.base.stock.domain.form.StockAddForm; +import net.lab1024.sa.admin.module.business.wms.base.stock.domain.form.StockUpdateForm; +import net.lab1024.sa.admin.module.business.wms.base.stock.domain.form.StocksImportForm; +import net.lab1024.sa.admin.module.business.wms.base.stock.manager.StockManager; +import net.lab1024.sa.admin.module.business.wms.base.location.domain.entity.LocationEntity; +import net.lab1024.sa.admin.module.business.wms.base.stock.domain.form.StockUpdateForm; +import net.lab1024.sa.admin.module.business.wms.base.stock.domain.form.StocksImportForm; import net.lab1024.sa.admin.util.JoinerResult; import net.lab1024.sa.admin.util.ResponseDTOUtils; import net.lab1024.sa.admin.util.ValidateDictKey; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/stock/sql/StockMenu.sql b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/sql/StockMenu.sql similarity index 100% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/stock/sql/StockMenu.sql rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/sql/StockMenu.sql diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/inventory/controller/InventoryController.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/inventory/controller/InventoryController.java similarity index 80% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/inventory/controller/InventoryController.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/inventory/controller/InventoryController.java index 0fa7e11..216b261 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/inventory/controller/InventoryController.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/inventory/controller/InventoryController.java @@ -1,11 +1,11 @@ -package net.lab1024.sa.admin.module.business.inventory.controller; +package net.lab1024.sa.admin.module.business.wms.inventory.controller; -import net.lab1024.sa.admin.module.business.inventory.domain.form.InventoryAddForm; -import net.lab1024.sa.admin.module.business.inventory.domain.form.InventoryQueryForm; -import net.lab1024.sa.admin.module.business.inventory.domain.form.InventoryUpdateForm; -import net.lab1024.sa.admin.module.business.inventory.domain.vo.InventoryVO; -import net.lab1024.sa.admin.module.business.inventory.service.InventoryQueryService; -import net.lab1024.sa.admin.module.business.inventory.service.InventoryService; +import net.lab1024.sa.admin.module.business.wms.inventory.domain.form.InventoryAddForm; +import net.lab1024.sa.admin.module.business.wms.inventory.domain.form.InventoryQueryForm; +import net.lab1024.sa.admin.module.business.wms.inventory.domain.form.InventoryUpdateForm; +import net.lab1024.sa.admin.module.business.wms.inventory.domain.vo.InventoryVO; +import net.lab1024.sa.admin.module.business.wms.inventory.service.InventoryQueryService; +import net.lab1024.sa.admin.module.business.wms.inventory.service.InventoryService; import net.lab1024.sa.base.common.domain.ValidateList; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/inventory/dao/InventoryDao.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/inventory/dao/InventoryDao.java similarity index 56% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/inventory/dao/InventoryDao.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/inventory/dao/InventoryDao.java index 833e02a..646f621 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/inventory/dao/InventoryDao.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/inventory/dao/InventoryDao.java @@ -1,11 +1,13 @@ -package net.lab1024.sa.admin.module.business.inventory.dao; +package net.lab1024.sa.admin.module.business.wms.inventory.dao; import java.util.List; -import net.lab1024.sa.admin.module.business.inventory.domain.entity.InventoryEntity; -import net.lab1024.sa.admin.module.business.inventory.domain.form.InventoryQueryForm; -import net.lab1024.sa.admin.module.business.inventory.domain.vo.InventoryVO; +import net.lab1024.sa.admin.module.business.wms.inventory.domain.entity.InventoryEntity; +import net.lab1024.sa.admin.module.business.wms.inventory.domain.form.InventoryQueryForm; +import net.lab1024.sa.admin.module.business.wms.inventory.domain.vo.InventoryVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import net.lab1024.sa.admin.module.business.wms.inventory.domain.entity.InventoryEntity; +import net.lab1024.sa.admin.module.business.wms.inventory.domain.form.InventoryQueryForm; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Component; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/inventory/domain/entity/InventoryEntity.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/inventory/domain/entity/InventoryEntity.java similarity index 95% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/inventory/domain/entity/InventoryEntity.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/inventory/domain/entity/InventoryEntity.java index 7d57e79..e547b68 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/inventory/domain/entity/InventoryEntity.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/inventory/domain/entity/InventoryEntity.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.inventory.domain.entity; +package net.lab1024.sa.admin.module.business.wms.inventory.domain.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/inventory/domain/form/InventoryAddForm.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/inventory/domain/form/InventoryAddForm.java similarity index 94% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/inventory/domain/form/InventoryAddForm.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/inventory/domain/form/InventoryAddForm.java index 3016eb4..cd13706 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/inventory/domain/form/InventoryAddForm.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/inventory/domain/form/InventoryAddForm.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.inventory.domain.form; +package net.lab1024.sa.admin.module.business.wms.inventory.domain.form; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/inventory/domain/form/InventoryQueryForm.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/inventory/domain/form/InventoryQueryForm.java similarity index 81% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/inventory/domain/form/InventoryQueryForm.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/inventory/domain/form/InventoryQueryForm.java index 64ed910..d86a042 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/inventory/domain/form/InventoryQueryForm.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/inventory/domain/form/InventoryQueryForm.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.inventory.domain.form; +package net.lab1024.sa.admin.module.business.wms.inventory.domain.form; import net.lab1024.sa.base.common.domain.PageParam; import lombok.Data; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/inventory/domain/form/InventoryUpdateForm.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/inventory/domain/form/InventoryUpdateForm.java similarity index 85% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/inventory/domain/form/InventoryUpdateForm.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/inventory/domain/form/InventoryUpdateForm.java index 47cd019..345219a 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/inventory/domain/form/InventoryUpdateForm.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/inventory/domain/form/InventoryUpdateForm.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.inventory.domain.form; +package net.lab1024.sa.admin.module.business.wms.inventory.domain.form; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/inventory/domain/vo/InventoryVO.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/inventory/domain/vo/InventoryVO.java similarity index 91% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/inventory/domain/vo/InventoryVO.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/inventory/domain/vo/InventoryVO.java index 9ff1a70..3d08d16 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/inventory/domain/vo/InventoryVO.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/inventory/domain/vo/InventoryVO.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.inventory.domain.vo; +package net.lab1024.sa.admin.module.business.wms.inventory.domain.vo; import io.swagger.v3.oas.annotations.media.Schema; import java.math.BigDecimal; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/inventory/manager/InventoryManager.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/inventory/manager/InventoryManager.java similarity index 57% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/inventory/manager/InventoryManager.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/inventory/manager/InventoryManager.java index 32a9bdd..02748e9 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/inventory/manager/InventoryManager.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/inventory/manager/InventoryManager.java @@ -1,7 +1,7 @@ -package net.lab1024.sa.admin.module.business.inventory.manager; +package net.lab1024.sa.admin.module.business.wms.inventory.manager; -import net.lab1024.sa.admin.module.business.inventory.dao.InventoryDao; -import net.lab1024.sa.admin.module.business.inventory.domain.entity.InventoryEntity; +import net.lab1024.sa.admin.module.business.wms.inventory.dao.InventoryDao; +import net.lab1024.sa.admin.module.business.wms.inventory.domain.entity.InventoryEntity; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/inventory/service/InventoryQueryService.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/inventory/service/InventoryQueryService.java similarity index 74% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/inventory/service/InventoryQueryService.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/inventory/service/InventoryQueryService.java index f8a1528..8b3d7f6 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/inventory/service/InventoryQueryService.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/inventory/service/InventoryQueryService.java @@ -1,12 +1,12 @@ -package net.lab1024.sa.admin.module.business.inventory.service; +package net.lab1024.sa.admin.module.business.wms.inventory.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jakarta.annotation.Resource; -import net.lab1024.sa.admin.module.business.inventory.dao.InventoryDao; -import net.lab1024.sa.admin.module.business.inventory.domain.entity.InventoryEntity; -import net.lab1024.sa.admin.module.business.inventory.domain.form.InventoryQueryForm; -import net.lab1024.sa.admin.module.business.inventory.domain.vo.InventoryVO; +import net.lab1024.sa.admin.module.business.wms.inventory.dao.InventoryDao; +import net.lab1024.sa.admin.module.business.wms.inventory.domain.entity.InventoryEntity; +import net.lab1024.sa.admin.module.business.wms.inventory.domain.form.InventoryQueryForm; +import net.lab1024.sa.admin.module.business.wms.inventory.domain.vo.InventoryVO; import net.lab1024.sa.base.common.domain.PageResult; import net.lab1024.sa.base.common.util.SmartPageUtil; import org.apache.commons.collections4.CollectionUtils; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/inventory/service/InventoryService.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/inventory/service/InventoryService.java similarity index 81% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/inventory/service/InventoryService.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/inventory/service/InventoryService.java index 291dfb2..d72f5cf 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/inventory/service/InventoryService.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/inventory/service/InventoryService.java @@ -1,14 +1,14 @@ -package net.lab1024.sa.admin.module.business.inventory.service; +package net.lab1024.sa.admin.module.business.wms.inventory.service; import java.math.BigDecimal; import java.util.List; -import net.lab1024.sa.admin.module.business.inventory.dao.InventoryDao; -import net.lab1024.sa.admin.module.business.inventory.domain.entity.InventoryEntity; -import net.lab1024.sa.admin.module.business.inventory.domain.form.InventoryAddForm; -import net.lab1024.sa.admin.module.business.inventory.domain.form.InventoryQueryForm; -import net.lab1024.sa.admin.module.business.inventory.domain.form.InventoryUpdateForm; -import net.lab1024.sa.admin.module.business.inventory.domain.vo.InventoryVO; -import net.lab1024.sa.admin.module.business.inventory.manager.InventoryManager; +import net.lab1024.sa.admin.module.business.wms.inventory.dao.InventoryDao; +import net.lab1024.sa.admin.module.business.wms.inventory.domain.entity.InventoryEntity; +import net.lab1024.sa.admin.module.business.wms.inventory.domain.form.InventoryAddForm; +import net.lab1024.sa.admin.module.business.wms.inventory.domain.form.InventoryQueryForm; +import net.lab1024.sa.admin.module.business.wms.inventory.domain.form.InventoryUpdateForm; +import net.lab1024.sa.admin.module.business.wms.inventory.domain.vo.InventoryVO; +import net.lab1024.sa.admin.module.business.wms.inventory.manager.InventoryManager; import net.lab1024.sa.base.common.code.UserErrorCode; import net.lab1024.sa.base.common.util.SmartBeanUtil; import net.lab1024.sa.base.common.util.SmartPageUtil; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/inventory/sql/InventoryMenu.sql b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/inventory/sql/InventoryMenu.sql similarity index 100% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/inventory/sql/InventoryMenu.sql rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/inventory/sql/InventoryMenu.sql diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/itemKey/controller/ItemKeyController.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/itemKey/controller/ItemKeyController.java similarity index 70% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/itemKey/controller/ItemKeyController.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/itemKey/controller/ItemKeyController.java index 58a7da1..bef7642 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/itemKey/controller/ItemKeyController.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/itemKey/controller/ItemKeyController.java @@ -1,11 +1,16 @@ -package net.lab1024.sa.admin.module.business.itemKey.controller; +package net.lab1024.sa.admin.module.business.wms.itemKey.controller; -import net.lab1024.sa.admin.module.business.itemKey.domain.form.ItemKeyAddForm; -import net.lab1024.sa.admin.module.business.itemKey.domain.form.ItemKeyQueryForm; -import net.lab1024.sa.admin.module.business.itemKey.domain.form.ItemKeyUpdateForm; -import net.lab1024.sa.admin.module.business.itemKey.domain.vo.ItemKeyVO; -import net.lab1024.sa.admin.module.business.itemKey.service.ItemKeyQueryService; -import net.lab1024.sa.admin.module.business.itemKey.service.ItemKeyService; +import net.lab1024.sa.admin.module.business.wms.itemKey.domain.form.ItemKeyAddForm; +import net.lab1024.sa.admin.module.business.wms.itemKey.domain.form.ItemKeyQueryForm; +import net.lab1024.sa.admin.module.business.wms.itemKey.domain.form.ItemKeyUpdateForm; +import net.lab1024.sa.admin.module.business.wms.itemKey.domain.vo.ItemKeyVO; +import net.lab1024.sa.admin.module.business.wms.itemKey.service.ItemKeyQueryService; +import net.lab1024.sa.admin.module.business.wms.itemKey.service.ItemKeyService; +import net.lab1024.sa.admin.module.business.wms.itemKey.domain.form.ItemKeyAddForm; +import net.lab1024.sa.admin.module.business.wms.itemKey.domain.form.ItemKeyQueryForm; +import net.lab1024.sa.admin.module.business.wms.itemKey.domain.form.ItemKeyUpdateForm; +import net.lab1024.sa.admin.module.business.wms.itemKey.domain.vo.ItemKeyVO; +import net.lab1024.sa.admin.module.business.wms.itemKey.service.ItemKeyService; import net.lab1024.sa.base.common.domain.ValidateList; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/itemKey/dao/ItemKeyDao.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/itemKey/dao/ItemKeyDao.java similarity index 52% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/itemKey/dao/ItemKeyDao.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/itemKey/dao/ItemKeyDao.java index 1df7049..48c68d0 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/itemKey/dao/ItemKeyDao.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/itemKey/dao/ItemKeyDao.java @@ -1,11 +1,14 @@ -package net.lab1024.sa.admin.module.business.itemKey.dao; +package net.lab1024.sa.admin.module.business.wms.itemKey.dao; import java.util.List; -import net.lab1024.sa.admin.module.business.itemKey.domain.entity.ItemKeyEntity; -import net.lab1024.sa.admin.module.business.itemKey.domain.form.ItemKeyQueryForm; -import net.lab1024.sa.admin.module.business.itemKey.domain.vo.ItemKeyVO; +import net.lab1024.sa.admin.module.business.wms.itemKey.domain.entity.ItemKeyEntity; +import net.lab1024.sa.admin.module.business.wms.itemKey.domain.form.ItemKeyQueryForm; +import net.lab1024.sa.admin.module.business.wms.itemKey.domain.vo.ItemKeyVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import net.lab1024.sa.admin.module.business.wms.itemKey.domain.entity.ItemKeyEntity; +import net.lab1024.sa.admin.module.business.wms.itemKey.domain.form.ItemKeyQueryForm; +import net.lab1024.sa.admin.module.business.wms.itemKey.domain.vo.ItemKeyVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/itemKey/domain/entity/ItemKeyEntity.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/itemKey/domain/entity/ItemKeyEntity.java similarity index 96% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/itemKey/domain/entity/ItemKeyEntity.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/itemKey/domain/entity/ItemKeyEntity.java index 0ff177d..a6bd3e9 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/itemKey/domain/entity/ItemKeyEntity.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/itemKey/domain/entity/ItemKeyEntity.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.itemKey.domain.entity; +package net.lab1024.sa.admin.module.business.wms.itemKey.domain.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/itemKey/domain/form/ItemKeyAddForm.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/itemKey/domain/form/ItemKeyAddForm.java similarity index 83% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/itemKey/domain/form/ItemKeyAddForm.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/itemKey/domain/form/ItemKeyAddForm.java index bbb02aa..661da33 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/itemKey/domain/form/ItemKeyAddForm.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/itemKey/domain/form/ItemKeyAddForm.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.itemKey.domain.form; +package net.lab1024.sa.admin.module.business.wms.itemKey.domain.form; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/itemKey/domain/form/ItemKeyQueryForm.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/itemKey/domain/form/ItemKeyQueryForm.java similarity index 82% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/itemKey/domain/form/ItemKeyQueryForm.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/itemKey/domain/form/ItemKeyQueryForm.java index 734b282..de37854 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/itemKey/domain/form/ItemKeyQueryForm.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/itemKey/domain/form/ItemKeyQueryForm.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.itemKey.domain.form; +package net.lab1024.sa.admin.module.business.wms.itemKey.domain.form; import net.lab1024.sa.base.common.domain.PageParam; import lombok.Data; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/itemKey/domain/form/ItemKeyUpdateForm.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/itemKey/domain/form/ItemKeyUpdateForm.java similarity index 85% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/itemKey/domain/form/ItemKeyUpdateForm.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/itemKey/domain/form/ItemKeyUpdateForm.java index b254e37..512c49d 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/itemKey/domain/form/ItemKeyUpdateForm.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/itemKey/domain/form/ItemKeyUpdateForm.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.itemKey.domain.form; +package net.lab1024.sa.admin.module.business.wms.itemKey.domain.form; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/itemKey/domain/vo/ItemKeyVO.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/itemKey/domain/vo/ItemKeyVO.java similarity index 95% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/itemKey/domain/vo/ItemKeyVO.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/itemKey/domain/vo/ItemKeyVO.java index 11633c9..58ca521 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/itemKey/domain/vo/ItemKeyVO.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/itemKey/domain/vo/ItemKeyVO.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.itemKey.domain.vo; +package net.lab1024.sa.admin.module.business.wms.itemKey.domain.vo; import io.swagger.v3.oas.annotations.media.Schema; import java.time.LocalDate; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/itemKey/manager/ItemKeyManager.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/itemKey/manager/ItemKeyManager.java new file mode 100644 index 0000000..ee933ef --- /dev/null +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/itemKey/manager/ItemKeyManager.java @@ -0,0 +1,22 @@ +package net.lab1024.sa.admin.module.business.wms.itemKey.manager; + +import net.lab1024.sa.admin.module.business.wms.itemKey.domain.entity.ItemKeyEntity; +import net.lab1024.sa.admin.module.business.wms.itemKey.dao.ItemKeyDao; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import net.lab1024.sa.admin.module.business.wms.itemKey.dao.ItemKeyDao; +import net.lab1024.sa.admin.module.business.wms.itemKey.domain.entity.ItemKeyEntity; +import org.springframework.stereotype.Service; + +/** + * 物料属性 Manager + * + * @Author 霍锦 + * @Date 2024-12-05 21:38:40 + * @Copyright 友仓 + */ +@Service +public class ItemKeyManager extends ServiceImpl { + + +} diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/itemKey/service/ItemKeyQueryService.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/itemKey/service/ItemKeyQueryService.java similarity index 66% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/itemKey/service/ItemKeyQueryService.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/itemKey/service/ItemKeyQueryService.java index 7cc5056..e69c54a 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/itemKey/service/ItemKeyQueryService.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/itemKey/service/ItemKeyQueryService.java @@ -1,12 +1,16 @@ -package net.lab1024.sa.admin.module.business.itemKey.service; +package net.lab1024.sa.admin.module.business.wms.itemKey.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jakarta.annotation.Resource; -import net.lab1024.sa.admin.module.business.itemKey.dao.ItemKeyDao; -import net.lab1024.sa.admin.module.business.itemKey.domain.entity.ItemKeyEntity; -import net.lab1024.sa.admin.module.business.itemKey.domain.form.ItemKeyQueryForm; -import net.lab1024.sa.admin.module.business.itemKey.domain.vo.ItemKeyVO; +import net.lab1024.sa.admin.module.business.wms.itemKey.dao.ItemKeyDao; +import net.lab1024.sa.admin.module.business.wms.itemKey.domain.entity.ItemKeyEntity; +import net.lab1024.sa.admin.module.business.wms.itemKey.domain.form.ItemKeyQueryForm; +import net.lab1024.sa.admin.module.business.wms.itemKey.domain.vo.ItemKeyVO; +import net.lab1024.sa.admin.module.business.wms.itemKey.dao.ItemKeyDao; +import net.lab1024.sa.admin.module.business.wms.itemKey.domain.entity.ItemKeyEntity; +import net.lab1024.sa.admin.module.business.wms.itemKey.domain.form.ItemKeyQueryForm; +import net.lab1024.sa.admin.module.business.wms.itemKey.domain.vo.ItemKeyVO; import net.lab1024.sa.base.common.domain.PageResult; import net.lab1024.sa.base.common.util.SmartPageUtil; import org.apache.commons.collections4.CollectionUtils; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/itemKey/service/ItemKeyService.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/itemKey/service/ItemKeyService.java similarity index 76% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/itemKey/service/ItemKeyService.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/itemKey/service/ItemKeyService.java index de030f2..59ddaef 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/itemKey/service/ItemKeyService.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/itemKey/service/ItemKeyService.java @@ -1,15 +1,19 @@ -package net.lab1024.sa.admin.module.business.itemKey.service; +package net.lab1024.sa.admin.module.business.wms.itemKey.service; import java.time.LocalDateTime; import java.util.List; -import net.lab1024.sa.admin.module.business.itemKey.dao.ItemKeyDao; -import net.lab1024.sa.admin.module.business.itemKey.domain.entity.ItemKeyEntity; -import net.lab1024.sa.admin.module.business.itemKey.domain.form.ItemKeyAddForm; -import net.lab1024.sa.admin.module.business.itemKey.domain.form.ItemKeyQueryForm; -import net.lab1024.sa.admin.module.business.itemKey.domain.form.ItemKeyUpdateForm; -import net.lab1024.sa.admin.module.business.itemKey.domain.vo.ItemKeyVO; -import net.lab1024.sa.admin.module.business.itemKey.manager.ItemKeyManager; +import net.lab1024.sa.admin.module.business.wms.itemKey.dao.ItemKeyDao; +import net.lab1024.sa.admin.module.business.wms.itemKey.domain.entity.ItemKeyEntity; +import net.lab1024.sa.admin.module.business.wms.itemKey.domain.form.ItemKeyAddForm; +import net.lab1024.sa.admin.module.business.wms.itemKey.domain.form.ItemKeyQueryForm; +import net.lab1024.sa.admin.module.business.wms.itemKey.domain.form.ItemKeyUpdateForm; +import net.lab1024.sa.admin.module.business.wms.itemKey.domain.vo.ItemKeyVO; +import net.lab1024.sa.admin.module.business.wms.itemKey.manager.ItemKeyManager; +import net.lab1024.sa.admin.module.business.wms.itemKey.dao.ItemKeyDao; +import net.lab1024.sa.admin.module.business.wms.itemKey.domain.entity.ItemKeyEntity; +import net.lab1024.sa.admin.module.business.wms.itemKey.domain.form.ItemKeyAddForm; +import net.lab1024.sa.admin.module.business.wms.itemKey.domain.form.ItemKeyUpdateForm; import net.lab1024.sa.base.common.code.UserErrorCode; import net.lab1024.sa.base.common.util.SmartBeanUtil; import net.lab1024.sa.base.common.util.SmartPageUtil; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/itemKey/sql/ItemKeyMenu.sql b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/itemKey/sql/ItemKeyMenu.sql similarity index 100% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/itemKey/sql/ItemKeyMenu.sql rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/itemKey/sql/ItemKeyMenu.sql diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/ReceiveController.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/ReceiveController.java similarity index 93% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/ReceiveController.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/ReceiveController.java index 920e354..b8f96dc 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/ReceiveController.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/ReceiveController.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.receive; +package net.lab1024.sa.admin.module.business.wms.receive; import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.v3.oas.annotations.Operation; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/ReceiveService.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/ReceiveService.java similarity index 73% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/ReceiveService.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/ReceiveService.java index 62a1436..c1759f3 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/ReceiveService.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/ReceiveService.java @@ -1,35 +1,37 @@ -package net.lab1024.sa.admin.module.business.receive; +package net.lab1024.sa.admin.module.business.wms.receive; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import jakarta.annotation.Resource; -import net.lab1024.sa.admin.module.business.base.item.domain.entity.ItemEntity; -import net.lab1024.sa.admin.module.business.base.item.service.ItemQueryService; -import net.lab1024.sa.admin.module.business.base.location.dao.LocationDao; -import net.lab1024.sa.admin.module.business.base.location.domain.entity.LocationEntity; -import net.lab1024.sa.admin.module.business.base.location.service.LocationQueryService; -import net.lab1024.sa.admin.module.business.base.stock.dao.StockDao; -import net.lab1024.sa.admin.module.business.base.stock.domain.entity.StockEntity; -import net.lab1024.sa.admin.module.business.base.stock.service.StockQueryService; -import net.lab1024.sa.admin.module.business.inventory.domain.entity.InventoryEntity; -import net.lab1024.sa.admin.module.business.inventory.manager.InventoryManager; -import net.lab1024.sa.admin.module.business.inventory.service.InventoryQueryService; -import net.lab1024.sa.admin.module.business.inventory.service.InventoryService; -import net.lab1024.sa.admin.module.business.itemKey.domain.entity.ItemKeyEntity; -import net.lab1024.sa.admin.module.business.itemKey.manager.ItemKeyManager; -import net.lab1024.sa.admin.module.business.itemKey.service.ItemKeyQueryService; -import net.lab1024.sa.admin.module.business.itemKey.service.ItemKeyService; -import net.lab1024.sa.admin.module.business.receive.asn.domain.entity.AsnEntity; -import net.lab1024.sa.admin.module.business.receive.asn.service.AsnQueryService; -import net.lab1024.sa.admin.module.business.receive.asnDetail.domain.entity.AsnDetailEntity; -import net.lab1024.sa.admin.module.business.receive.asnDetail.domain.vo.AsnDetailVO; -import net.lab1024.sa.admin.module.business.receive.asnDetail.manager.AsnDetailManager; -import net.lab1024.sa.admin.module.business.receive.asnDetail.service.AsnDetailQueryService; -import net.lab1024.sa.admin.module.business.receive.asnDetail.service.AsnDetailService; -import net.lab1024.sa.admin.module.business.task.constant.TaskStatusEnum; -import net.lab1024.sa.admin.module.business.task.constant.TaskTypeEnum; -import net.lab1024.sa.admin.module.business.task.domain.entity.TaskEntity; -import net.lab1024.sa.admin.module.business.task.manager.TaskManager; -import net.lab1024.sa.admin.module.business.task.service.TaskService; +import net.lab1024.sa.admin.module.business.wms.base.item.domain.entity.ItemEntity; +import net.lab1024.sa.admin.module.business.wms.base.item.service.ItemQueryService; +import net.lab1024.sa.admin.module.business.wms.base.location.dao.LocationDao; +import net.lab1024.sa.admin.module.business.wms.base.location.domain.entity.LocationEntity; +import net.lab1024.sa.admin.module.business.wms.base.location.service.LocationQueryService; +import net.lab1024.sa.admin.module.business.wms.base.stock.dao.StockDao; +import net.lab1024.sa.admin.module.business.wms.base.stock.domain.entity.StockEntity; +import net.lab1024.sa.admin.module.business.wms.base.stock.service.StockQueryService; +import net.lab1024.sa.admin.module.business.wms.inventory.domain.entity.InventoryEntity; +import net.lab1024.sa.admin.module.business.wms.inventory.manager.InventoryManager; +import net.lab1024.sa.admin.module.business.wms.inventory.service.InventoryQueryService; +import net.lab1024.sa.admin.module.business.wms.inventory.service.InventoryService; +import net.lab1024.sa.admin.module.business.wms.itemKey.domain.entity.ItemKeyEntity; +import net.lab1024.sa.admin.module.business.wms.itemKey.manager.ItemKeyManager; +import net.lab1024.sa.admin.module.business.wms.itemKey.service.ItemKeyQueryService; +import net.lab1024.sa.admin.module.business.wms.itemKey.service.ItemKeyService; +import net.lab1024.sa.admin.module.business.wms.receive.asn.domain.entity.AsnEntity; +import net.lab1024.sa.admin.module.business.wms.receive.asn.service.AsnQueryService; +import net.lab1024.sa.admin.module.business.wms.receive.asnDetail.domain.entity.AsnDetailEntity; +import net.lab1024.sa.admin.module.business.wms.receive.asnDetail.domain.vo.AsnDetailVO; +import net.lab1024.sa.admin.module.business.wms.receive.asnDetail.manager.AsnDetailManager; +import net.lab1024.sa.admin.module.business.wms.receive.asnDetail.service.AsnDetailQueryService; +import net.lab1024.sa.admin.module.business.wms.receive.asnDetail.service.AsnDetailService; +import net.lab1024.sa.admin.module.business.wms.task.constant.TaskStatusEnum; +import net.lab1024.sa.admin.module.business.wms.task.constant.TaskTypeEnum; +import net.lab1024.sa.admin.module.business.wms.task.domain.entity.TaskEntity; +import net.lab1024.sa.admin.module.business.wms.task.manager.TaskManager; +import net.lab1024.sa.admin.module.business.wms.task.service.TaskService; +import net.lab1024.sa.admin.module.business.wms.itemKey.domain.entity.ItemKeyEntity; +import net.lab1024.sa.admin.module.business.wms.receive.asn.service.AsnQueryService; import net.lab1024.sa.admin.util.JoinerResult; import net.lab1024.sa.admin.util.ResponseDTOUtils; import net.lab1024.sa.base.common.code.UserErrorCode; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/constant/AsnOrderStatusEnum.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/constant/AsnOrderStatusEnum.java similarity index 94% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/constant/AsnOrderStatusEnum.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/constant/AsnOrderStatusEnum.java index ee9a6b1..8be408d 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/constant/AsnOrderStatusEnum.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/constant/AsnOrderStatusEnum.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.receive.asn.constant; +package net.lab1024.sa.admin.module.business.wms.receive.asn.constant; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/constant/AsnOrderTypeEnum.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/constant/AsnOrderTypeEnum.java similarity index 90% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/constant/AsnOrderTypeEnum.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/constant/AsnOrderTypeEnum.java index 6941a3f..d5045ae 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/constant/AsnOrderTypeEnum.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/constant/AsnOrderTypeEnum.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.receive.asn.constant; +package net.lab1024.sa.admin.module.business.wms.receive.asn.constant; import lombok.AllArgsConstructor; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/controller/AsnController.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/controller/AsnController.java similarity index 75% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/controller/AsnController.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/controller/AsnController.java index 432cd60..4818b9b 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/controller/AsnController.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/controller/AsnController.java @@ -1,12 +1,14 @@ -package net.lab1024.sa.admin.module.business.receive.asn.controller; +package net.lab1024.sa.admin.module.business.wms.receive.asn.controller; -import net.lab1024.sa.admin.module.business.receive.asn.domain.entity.AsnEntity; -import net.lab1024.sa.admin.module.business.receive.asn.domain.form.AsnAddForm; -import net.lab1024.sa.admin.module.business.receive.asn.domain.form.AsnQueryForm; -import net.lab1024.sa.admin.module.business.receive.asn.domain.form.AsnUpdateForm; -import net.lab1024.sa.admin.module.business.receive.asn.domain.vo.AsnVO; -import net.lab1024.sa.admin.module.business.receive.asn.service.AsnQueryService; -import net.lab1024.sa.admin.module.business.receive.asn.service.AsnService; +import net.lab1024.sa.admin.module.business.wms.receive.asn.domain.entity.AsnEntity; +import net.lab1024.sa.admin.module.business.wms.receive.asn.domain.form.AsnAddForm; +import net.lab1024.sa.admin.module.business.wms.receive.asn.domain.form.AsnQueryForm; +import net.lab1024.sa.admin.module.business.wms.receive.asn.domain.form.AsnUpdateForm; +import net.lab1024.sa.admin.module.business.wms.receive.asn.domain.vo.AsnVO; +import net.lab1024.sa.admin.module.business.wms.receive.asn.service.AsnQueryService; +import net.lab1024.sa.admin.module.business.wms.receive.asn.service.AsnService; +import net.lab1024.sa.admin.module.business.wms.receive.asn.domain.form.AsnUpdateForm; +import net.lab1024.sa.admin.module.business.wms.receive.asn.service.AsnQueryService; import net.lab1024.sa.base.common.domain.RequestUser; import net.lab1024.sa.base.common.domain.ValidateList; import net.lab1024.sa.base.common.util.SmartRequestUtil; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/dao/AsnDao.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/dao/AsnDao.java similarity index 67% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/dao/AsnDao.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/dao/AsnDao.java index cdfa200..189a2e9 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/dao/AsnDao.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/dao/AsnDao.java @@ -1,9 +1,9 @@ -package net.lab1024.sa.admin.module.business.receive.asn.dao; +package net.lab1024.sa.admin.module.business.wms.receive.asn.dao; import java.util.List; -import net.lab1024.sa.admin.module.business.receive.asn.domain.entity.AsnEntity; -import net.lab1024.sa.admin.module.business.receive.asn.domain.form.AsnQueryForm; -import net.lab1024.sa.admin.module.business.receive.asn.domain.vo.AsnVO; +import net.lab1024.sa.admin.module.business.wms.receive.asn.domain.entity.AsnEntity; +import net.lab1024.sa.admin.module.business.wms.receive.asn.domain.form.AsnQueryForm; +import net.lab1024.sa.admin.module.business.wms.receive.asn.domain.vo.AsnVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/domain/entity/AsnEntity.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/domain/entity/AsnEntity.java similarity index 96% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/domain/entity/AsnEntity.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/domain/entity/AsnEntity.java index 0581678..872ce53 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/domain/entity/AsnEntity.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/domain/entity/AsnEntity.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.receive.asn.domain.entity; +package net.lab1024.sa.admin.module.business.wms.receive.asn.domain.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/domain/form/AsnAddForm.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/domain/form/AsnAddForm.java similarity index 81% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/domain/form/AsnAddForm.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/domain/form/AsnAddForm.java index b3aefa4..eca9d4c 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/domain/form/AsnAddForm.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/domain/form/AsnAddForm.java @@ -1,12 +1,14 @@ -package net.lab1024.sa.admin.module.business.receive.asn.domain.form; +package net.lab1024.sa.admin.module.business.wms.receive.asn.domain.form; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import java.time.LocalDate; import lombok.Data; -import net.lab1024.sa.admin.module.business.receive.asn.constant.AsnOrderStatusEnum; -import net.lab1024.sa.admin.module.business.receive.asn.constant.AsnOrderTypeEnum; +import net.lab1024.sa.admin.module.business.wms.receive.asn.constant.AsnOrderStatusEnum; +import net.lab1024.sa.admin.module.business.wms.receive.asn.constant.AsnOrderTypeEnum; +import net.lab1024.sa.admin.module.business.wms.receive.asn.constant.AsnOrderStatusEnum; +import net.lab1024.sa.admin.module.business.wms.receive.asn.constant.AsnOrderTypeEnum; import net.lab1024.sa.base.common.swagger.SchemaEnum; import net.lab1024.sa.base.common.validator.enumeration.CheckEnum; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/domain/form/AsnQueryForm.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/domain/form/AsnQueryForm.java similarity index 85% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/domain/form/AsnQueryForm.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/domain/form/AsnQueryForm.java index bb9227f..c7d684d 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/domain/form/AsnQueryForm.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/domain/form/AsnQueryForm.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.receive.asn.domain.form; +package net.lab1024.sa.admin.module.business.wms.receive.asn.domain.form; import net.lab1024.sa.base.common.domain.PageParam; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/domain/form/AsnUpdateForm.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/domain/form/AsnUpdateForm.java similarity index 85% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/domain/form/AsnUpdateForm.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/domain/form/AsnUpdateForm.java index 9094f53..4fac9ff 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/domain/form/AsnUpdateForm.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/domain/form/AsnUpdateForm.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.receive.asn.domain.form; +package net.lab1024.sa.admin.module.business.wms.receive.asn.domain.form; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/domain/vo/AsnVO.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/domain/vo/AsnVO.java similarity index 95% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/domain/vo/AsnVO.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/domain/vo/AsnVO.java index bded1fb..ba2abdc 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/domain/vo/AsnVO.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/domain/vo/AsnVO.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.receive.asn.domain.vo; +package net.lab1024.sa.admin.module.business.wms.receive.asn.domain.vo; import io.swagger.v3.oas.annotations.media.Schema; import java.math.BigDecimal; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/manager/AsnManager.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/manager/AsnManager.java new file mode 100644 index 0000000..a7e43be --- /dev/null +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/manager/AsnManager.java @@ -0,0 +1,22 @@ +package net.lab1024.sa.admin.module.business.wms.receive.asn.manager; + +import net.lab1024.sa.admin.module.business.wms.receive.asn.domain.entity.AsnEntity; +import net.lab1024.sa.admin.module.business.wms.receive.asn.dao.AsnDao; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import net.lab1024.sa.admin.module.business.wms.receive.asn.dao.AsnDao; +import net.lab1024.sa.admin.module.business.wms.receive.asn.domain.entity.AsnEntity; +import org.springframework.stereotype.Service; + +/** + * 入库单 Manager + * + * @Author 霍锦 + * @Date 2025-03-26 15:10:02 + * @Copyright 友仓 + */ +@Service +public class AsnManager extends ServiceImpl { + + +} diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/service/AsnQueryService.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/service/AsnQueryService.java similarity index 76% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/service/AsnQueryService.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/service/AsnQueryService.java index 7ac4801..846eebd 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/service/AsnQueryService.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/service/AsnQueryService.java @@ -1,20 +1,20 @@ -package net.lab1024.sa.admin.module.business.receive.asn.service; +package net.lab1024.sa.admin.module.business.wms.receive.asn.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jakarta.annotation.Resource; -import net.lab1024.sa.admin.module.business.base.address.domain.entity.AddressEntity; -import net.lab1024.sa.admin.module.business.base.address.service.AddressQueryService; -import net.lab1024.sa.admin.module.business.base.area.domain.entity.AreaEntity; -import net.lab1024.sa.admin.module.business.base.customer.domain.entity.CustomerEntity; -import net.lab1024.sa.admin.module.business.base.customer.service.CustomerQueryService; -import net.lab1024.sa.admin.module.business.base.location.domain.entity.LocationEntity; -import net.lab1024.sa.admin.module.business.base.location.domain.vo.LocationVO; -import net.lab1024.sa.admin.module.business.receive.asn.dao.AsnDao; -import net.lab1024.sa.admin.module.business.receive.asn.domain.entity.AsnEntity; -import net.lab1024.sa.admin.module.business.receive.asn.domain.form.AsnQueryForm; -import net.lab1024.sa.admin.module.business.receive.asn.domain.vo.AsnVO; -import net.lab1024.sa.admin.module.business.receive.asnDetail.domain.entity.AsnDetailEntity; +import net.lab1024.sa.admin.module.business.wms.base.address.domain.entity.AddressEntity; +import net.lab1024.sa.admin.module.business.wms.base.address.service.AddressQueryService; +import net.lab1024.sa.admin.module.business.wms.base.area.domain.entity.AreaEntity; +import net.lab1024.sa.admin.module.business.wms.base.customer.domain.entity.CustomerEntity; +import net.lab1024.sa.admin.module.business.wms.base.customer.service.CustomerQueryService; +import net.lab1024.sa.admin.module.business.wms.base.location.domain.entity.LocationEntity; +import net.lab1024.sa.admin.module.business.wms.base.location.domain.vo.LocationVO; +import net.lab1024.sa.admin.module.business.wms.receive.asn.dao.AsnDao; +import net.lab1024.sa.admin.module.business.wms.receive.asn.domain.entity.AsnEntity; +import net.lab1024.sa.admin.module.business.wms.receive.asn.domain.form.AsnQueryForm; +import net.lab1024.sa.admin.module.business.wms.receive.asn.domain.vo.AsnVO; +import net.lab1024.sa.admin.module.business.wms.receive.asnDetail.domain.entity.AsnDetailEntity; import net.lab1024.sa.base.common.domain.PageResult; import net.lab1024.sa.base.common.util.SmartPageUtil; import org.apache.commons.collections4.CollectionUtils; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/service/AsnService.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/service/AsnService.java similarity index 80% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/service/AsnService.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/service/AsnService.java index 08a544e..b1a4788 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/service/AsnService.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/service/AsnService.java @@ -1,21 +1,26 @@ -package net.lab1024.sa.admin.module.business.receive.asn.service; +package net.lab1024.sa.admin.module.business.wms.receive.asn.service; import java.util.List; import java.util.Map; import java.util.Set; import java.util.stream.Collectors; -import net.lab1024.sa.admin.module.business.receive.asn.constant.AsnOrderStatusEnum; -import net.lab1024.sa.admin.module.business.receive.asn.dao.AsnDao; -import net.lab1024.sa.admin.module.business.receive.asn.domain.entity.AsnEntity; -import net.lab1024.sa.admin.module.business.receive.asn.domain.form.AsnAddForm; -import net.lab1024.sa.admin.module.business.receive.asn.domain.form.AsnQueryForm; -import net.lab1024.sa.admin.module.business.receive.asn.domain.form.AsnUpdateForm; -import net.lab1024.sa.admin.module.business.receive.asn.domain.vo.AsnVO; -import net.lab1024.sa.admin.module.business.receive.asn.manager.AsnManager; -import net.lab1024.sa.admin.module.business.receive.asnDetail.domain.entity.AsnDetailEntity; -import net.lab1024.sa.admin.module.business.receive.asnDetail.manager.AsnDetailManager; -import net.lab1024.sa.admin.module.business.receive.asnDetail.service.AsnDetailQueryService; +import net.lab1024.sa.admin.module.business.wms.receive.asn.constant.AsnOrderStatusEnum; +import net.lab1024.sa.admin.module.business.wms.receive.asn.dao.AsnDao; +import net.lab1024.sa.admin.module.business.wms.receive.asn.domain.entity.AsnEntity; +import net.lab1024.sa.admin.module.business.wms.receive.asn.domain.form.AsnAddForm; +import net.lab1024.sa.admin.module.business.wms.receive.asn.domain.form.AsnQueryForm; +import net.lab1024.sa.admin.module.business.wms.receive.asn.domain.form.AsnUpdateForm; +import net.lab1024.sa.admin.module.business.wms.receive.asn.domain.vo.AsnVO; +import net.lab1024.sa.admin.module.business.wms.receive.asn.manager.AsnManager; +import net.lab1024.sa.admin.module.business.wms.receive.asnDetail.domain.entity.AsnDetailEntity; +import net.lab1024.sa.admin.module.business.wms.receive.asnDetail.manager.AsnDetailManager; +import net.lab1024.sa.admin.module.business.wms.receive.asnDetail.service.AsnDetailQueryService; +import net.lab1024.sa.admin.module.business.wms.receive.asn.constant.AsnOrderStatusEnum; +import net.lab1024.sa.admin.module.business.wms.receive.asn.dao.AsnDao; +import net.lab1024.sa.admin.module.business.wms.receive.asn.domain.entity.AsnEntity; +import net.lab1024.sa.admin.module.business.wms.receive.asn.domain.form.AsnUpdateForm; +import net.lab1024.sa.admin.module.business.wms.receive.asnDetail.service.AsnDetailQueryService; import net.lab1024.sa.admin.util.JoinerResult; import net.lab1024.sa.admin.util.ResponseDTOUtils; import net.lab1024.sa.base.common.code.UserErrorCode; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/sql/AsnMenu.sql b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/sql/AsnMenu.sql similarity index 100% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/sql/AsnMenu.sql rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/sql/AsnMenu.sql diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asnDetail/controller/AsnDetailController.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asnDetail/controller/AsnDetailController.java similarity index 67% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asnDetail/controller/AsnDetailController.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asnDetail/controller/AsnDetailController.java index edea6fb..f43f8be 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asnDetail/controller/AsnDetailController.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asnDetail/controller/AsnDetailController.java @@ -1,11 +1,17 @@ -package net.lab1024.sa.admin.module.business.receive.asnDetail.controller; +package net.lab1024.sa.admin.module.business.wms.receive.asnDetail.controller; -import net.lab1024.sa.admin.module.business.receive.asnDetail.domain.form.AsnDetailAddForm; -import net.lab1024.sa.admin.module.business.receive.asnDetail.domain.form.AsnDetailQueryForm; -import net.lab1024.sa.admin.module.business.receive.asnDetail.domain.form.AsnDetailUpdateForm; -import net.lab1024.sa.admin.module.business.receive.asnDetail.domain.vo.AsnDetailVO; -import net.lab1024.sa.admin.module.business.receive.asnDetail.service.AsnDetailQueryService; -import net.lab1024.sa.admin.module.business.receive.asnDetail.service.AsnDetailService; +import net.lab1024.sa.admin.module.business.wms.receive.asnDetail.domain.form.AsnDetailAddForm; +import net.lab1024.sa.admin.module.business.wms.receive.asnDetail.domain.form.AsnDetailQueryForm; +import net.lab1024.sa.admin.module.business.wms.receive.asnDetail.domain.form.AsnDetailUpdateForm; +import net.lab1024.sa.admin.module.business.wms.receive.asnDetail.domain.vo.AsnDetailVO; +import net.lab1024.sa.admin.module.business.wms.receive.asnDetail.service.AsnDetailQueryService; +import net.lab1024.sa.admin.module.business.wms.receive.asnDetail.service.AsnDetailService; +import net.lab1024.sa.admin.module.business.wms.receive.asnDetail.domain.form.AsnDetailAddForm; +import net.lab1024.sa.admin.module.business.wms.receive.asnDetail.domain.form.AsnDetailQueryForm; +import net.lab1024.sa.admin.module.business.wms.receive.asnDetail.domain.form.AsnDetailUpdateForm; +import net.lab1024.sa.admin.module.business.wms.receive.asnDetail.domain.vo.AsnDetailVO; +import net.lab1024.sa.admin.module.business.wms.receive.asnDetail.service.AsnDetailQueryService; +import net.lab1024.sa.admin.module.business.wms.receive.asnDetail.service.AsnDetailService; import net.lab1024.sa.base.common.domain.RequestUser; import net.lab1024.sa.base.common.domain.ValidateList; import net.lab1024.sa.base.common.util.SmartRequestUtil; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asnDetail/dao/AsnDetailDao.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asnDetail/dao/AsnDetailDao.java similarity index 55% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asnDetail/dao/AsnDetailDao.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asnDetail/dao/AsnDetailDao.java index 396bd23..a6235f9 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asnDetail/dao/AsnDetailDao.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asnDetail/dao/AsnDetailDao.java @@ -1,11 +1,13 @@ -package net.lab1024.sa.admin.module.business.receive.asnDetail.dao; +package net.lab1024.sa.admin.module.business.wms.receive.asnDetail.dao; import java.util.List; -import net.lab1024.sa.admin.module.business.receive.asnDetail.domain.entity.AsnDetailEntity; -import net.lab1024.sa.admin.module.business.receive.asnDetail.domain.form.AsnDetailQueryForm; -import net.lab1024.sa.admin.module.business.receive.asnDetail.domain.vo.AsnDetailVO; +import net.lab1024.sa.admin.module.business.wms.receive.asnDetail.domain.entity.AsnDetailEntity; +import net.lab1024.sa.admin.module.business.wms.receive.asnDetail.domain.form.AsnDetailQueryForm; +import net.lab1024.sa.admin.module.business.wms.receive.asnDetail.domain.vo.AsnDetailVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import net.lab1024.sa.admin.module.business.wms.receive.asnDetail.domain.form.AsnDetailQueryForm; +import net.lab1024.sa.admin.module.business.wms.receive.asnDetail.domain.vo.AsnDetailVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Component; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asnDetail/domain/entity/AsnDetailEntity.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asnDetail/domain/entity/AsnDetailEntity.java similarity index 94% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asnDetail/domain/entity/AsnDetailEntity.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asnDetail/domain/entity/AsnDetailEntity.java index dca8ced..ec22c39 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asnDetail/domain/entity/AsnDetailEntity.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asnDetail/domain/entity/AsnDetailEntity.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.receive.asnDetail.domain.entity; +package net.lab1024.sa.admin.module.business.wms.receive.asnDetail.domain.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asnDetail/domain/form/AsnDetailAddForm.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asnDetail/domain/form/AsnDetailAddForm.java similarity index 92% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asnDetail/domain/form/AsnDetailAddForm.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asnDetail/domain/form/AsnDetailAddForm.java index b15151f..0dbd0ff 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asnDetail/domain/form/AsnDetailAddForm.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asnDetail/domain/form/AsnDetailAddForm.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.receive.asnDetail.domain.form; +package net.lab1024.sa.admin.module.business.wms.receive.asnDetail.domain.form; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.DecimalMin; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asnDetail/domain/form/AsnDetailQueryForm.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asnDetail/domain/form/AsnDetailQueryForm.java similarity index 86% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asnDetail/domain/form/AsnDetailQueryForm.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asnDetail/domain/form/AsnDetailQueryForm.java index 8230127..6ab9ab7 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asnDetail/domain/form/AsnDetailQueryForm.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asnDetail/domain/form/AsnDetailQueryForm.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.receive.asnDetail.domain.form; +package net.lab1024.sa.admin.module.business.wms.receive.asnDetail.domain.form; import net.lab1024.sa.base.common.domain.PageParam; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asnDetail/domain/form/AsnDetailUpdateForm.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asnDetail/domain/form/AsnDetailUpdateForm.java similarity index 85% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asnDetail/domain/form/AsnDetailUpdateForm.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asnDetail/domain/form/AsnDetailUpdateForm.java index 5d31ea8..7f73565 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asnDetail/domain/form/AsnDetailUpdateForm.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asnDetail/domain/form/AsnDetailUpdateForm.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.receive.asnDetail.domain.form; +package net.lab1024.sa.admin.module.business.wms.receive.asnDetail.domain.form; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asnDetail/domain/vo/AsnDetailVO.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asnDetail/domain/vo/AsnDetailVO.java similarity index 93% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asnDetail/domain/vo/AsnDetailVO.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asnDetail/domain/vo/AsnDetailVO.java index e5eeb26..ffe37a1 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asnDetail/domain/vo/AsnDetailVO.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asnDetail/domain/vo/AsnDetailVO.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.receive.asnDetail.domain.vo; +package net.lab1024.sa.admin.module.business.wms.receive.asnDetail.domain.vo; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asnDetail/manager/AsnDetailManager.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asnDetail/manager/AsnDetailManager.java new file mode 100644 index 0000000..3426b36 --- /dev/null +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asnDetail/manager/AsnDetailManager.java @@ -0,0 +1,22 @@ +package net.lab1024.sa.admin.module.business.wms.receive.asnDetail.manager; + +import net.lab1024.sa.admin.module.business.wms.receive.asnDetail.domain.entity.AsnDetailEntity; +import net.lab1024.sa.admin.module.business.wms.receive.asnDetail.dao.AsnDetailDao; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import net.lab1024.sa.admin.module.business.wms.receive.asnDetail.dao.AsnDetailDao; +import net.lab1024.sa.admin.module.business.wms.receive.asnDetail.domain.entity.AsnDetailEntity; +import org.springframework.stereotype.Service; + +/** + * 入库明细 Manager + * + * @Author 霍锦 + * @Date 2025-03-26 15:16:28 + * @Copyright 友仓 + */ +@Service +public class AsnDetailManager extends ServiceImpl { + + +} diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asnDetail/service/AsnDetailQueryService.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asnDetail/service/AsnDetailQueryService.java similarity index 70% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asnDetail/service/AsnDetailQueryService.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asnDetail/service/AsnDetailQueryService.java index 2671be7..63b4247 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asnDetail/service/AsnDetailQueryService.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asnDetail/service/AsnDetailQueryService.java @@ -1,22 +1,22 @@ -package net.lab1024.sa.admin.module.business.receive.asnDetail.service; +package net.lab1024.sa.admin.module.business.wms.receive.asnDetail.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jakarta.annotation.Resource; -import net.lab1024.sa.admin.module.business.base.address.domain.entity.AddressEntity; -import net.lab1024.sa.admin.module.business.base.area.domain.entity.AreaEntity; -import net.lab1024.sa.admin.module.business.base.customer.domain.entity.CustomerEntity; -import net.lab1024.sa.admin.module.business.base.item.domain.entity.ItemEntity; -import net.lab1024.sa.admin.module.business.base.item.manager.ItemManager; -import net.lab1024.sa.admin.module.business.base.item.service.ItemQueryService; -import net.lab1024.sa.admin.module.business.base.location.domain.entity.LocationEntity; -import net.lab1024.sa.admin.module.business.base.location.domain.vo.LocationVO; -import net.lab1024.sa.admin.module.business.receive.asn.domain.vo.AsnVO; -import net.lab1024.sa.admin.module.business.receive.asnDetail.dao.AsnDetailDao; -import net.lab1024.sa.admin.module.business.receive.asnDetail.domain.entity.AsnDetailEntity; -import net.lab1024.sa.admin.module.business.receive.asnDetail.domain.form.AsnDetailQueryForm; -import net.lab1024.sa.admin.module.business.receive.asnDetail.domain.vo.AsnDetailVO; -import net.lab1024.sa.admin.module.business.receive.asnDetail.manager.AsnDetailManager; +import net.lab1024.sa.admin.module.business.wms.base.address.domain.entity.AddressEntity; +import net.lab1024.sa.admin.module.business.wms.base.area.domain.entity.AreaEntity; +import net.lab1024.sa.admin.module.business.wms.base.customer.domain.entity.CustomerEntity; +import net.lab1024.sa.admin.module.business.wms.base.item.domain.entity.ItemEntity; +import net.lab1024.sa.admin.module.business.wms.base.item.manager.ItemManager; +import net.lab1024.sa.admin.module.business.wms.base.item.service.ItemQueryService; +import net.lab1024.sa.admin.module.business.wms.base.location.domain.entity.LocationEntity; +import net.lab1024.sa.admin.module.business.wms.base.location.domain.vo.LocationVO; +import net.lab1024.sa.admin.module.business.wms.receive.asn.domain.vo.AsnVO; +import net.lab1024.sa.admin.module.business.wms.receive.asnDetail.dao.AsnDetailDao; +import net.lab1024.sa.admin.module.business.wms.receive.asnDetail.domain.entity.AsnDetailEntity; +import net.lab1024.sa.admin.module.business.wms.receive.asnDetail.domain.form.AsnDetailQueryForm; +import net.lab1024.sa.admin.module.business.wms.receive.asnDetail.domain.vo.AsnDetailVO; +import net.lab1024.sa.admin.module.business.wms.receive.asnDetail.manager.AsnDetailManager; import net.lab1024.sa.base.common.domain.PageResult; import net.lab1024.sa.base.common.util.SmartPageUtil; import org.apache.commons.collections4.CollectionUtils; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asnDetail/service/AsnDetailService.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asnDetail/service/AsnDetailService.java similarity index 83% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asnDetail/service/AsnDetailService.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asnDetail/service/AsnDetailService.java index bd5b03a..8e1e3ab 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asnDetail/service/AsnDetailService.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asnDetail/service/AsnDetailService.java @@ -1,20 +1,21 @@ -package net.lab1024.sa.admin.module.business.receive.asnDetail.service; +package net.lab1024.sa.admin.module.business.wms.receive.asnDetail.service; import java.math.BigDecimal; import java.util.*; -import net.lab1024.sa.admin.module.business.base.item.dao.ItemDao; -import net.lab1024.sa.admin.module.business.base.item.domain.entity.ItemEntity; -import net.lab1024.sa.admin.module.business.base.item.service.ItemQueryService; -import net.lab1024.sa.admin.module.business.base.item.service.ItemService; -import net.lab1024.sa.admin.module.business.receive.asn.constant.AsnOrderStatusEnum; -import net.lab1024.sa.admin.module.business.receive.asn.dao.AsnDao; -import net.lab1024.sa.admin.module.business.receive.asn.domain.entity.AsnEntity; -import net.lab1024.sa.admin.module.business.receive.asnDetail.dao.AsnDetailDao; -import net.lab1024.sa.admin.module.business.receive.asnDetail.domain.entity.AsnDetailEntity; -import net.lab1024.sa.admin.module.business.receive.asnDetail.domain.form.AsnDetailAddForm; -import net.lab1024.sa.admin.module.business.receive.asnDetail.domain.form.AsnDetailUpdateForm; -import net.lab1024.sa.admin.module.business.receive.asnDetail.manager.AsnDetailManager; +import net.lab1024.sa.admin.module.business.wms.base.item.dao.ItemDao; +import net.lab1024.sa.admin.module.business.wms.base.item.domain.entity.ItemEntity; +import net.lab1024.sa.admin.module.business.wms.base.item.service.ItemQueryService; +import net.lab1024.sa.admin.module.business.wms.base.item.service.ItemService; +import net.lab1024.sa.admin.module.business.wms.receive.asn.constant.AsnOrderStatusEnum; +import net.lab1024.sa.admin.module.business.wms.receive.asn.dao.AsnDao; +import net.lab1024.sa.admin.module.business.wms.receive.asn.domain.entity.AsnEntity; +import net.lab1024.sa.admin.module.business.wms.receive.asnDetail.dao.AsnDetailDao; +import net.lab1024.sa.admin.module.business.wms.receive.asnDetail.domain.entity.AsnDetailEntity; +import net.lab1024.sa.admin.module.business.wms.receive.asnDetail.domain.form.AsnDetailAddForm; +import net.lab1024.sa.admin.module.business.wms.receive.asnDetail.domain.form.AsnDetailUpdateForm; +import net.lab1024.sa.admin.module.business.wms.receive.asnDetail.manager.AsnDetailManager; +import net.lab1024.sa.admin.module.business.wms.base.item.dao.ItemDao; import net.lab1024.sa.admin.util.JoinerResult; import net.lab1024.sa.admin.util.ResponseDTOUtils; import net.lab1024.sa.base.common.code.UserErrorCode; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asnDetail/sql/AsnDetailMenu.sql b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asnDetail/sql/AsnDetailMenu.sql similarity index 100% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asnDetail/sql/AsnDetailMenu.sql rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asnDetail/sql/AsnDetailMenu.sql diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/task/constant/TaskStatusEnum.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/task/constant/TaskStatusEnum.java similarity index 94% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/task/constant/TaskStatusEnum.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/task/constant/TaskStatusEnum.java index ea7b7a3..846b4c5 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/task/constant/TaskStatusEnum.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/task/constant/TaskStatusEnum.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.task.constant; +package net.lab1024.sa.admin.module.business.wms.task.constant; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/task/constant/TaskTypeEnum.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/task/constant/TaskTypeEnum.java similarity index 91% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/task/constant/TaskTypeEnum.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/task/constant/TaskTypeEnum.java index 5be5d9b..c8c1447 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/task/constant/TaskTypeEnum.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/task/constant/TaskTypeEnum.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.task.constant; +package net.lab1024.sa.admin.module.business.wms.task.constant; import lombok.AllArgsConstructor; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/task/controller/TaskController.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/task/controller/TaskController.java similarity index 77% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/task/controller/TaskController.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/task/controller/TaskController.java index de962c3..08a3dd3 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/task/controller/TaskController.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/task/controller/TaskController.java @@ -1,11 +1,12 @@ -package net.lab1024.sa.admin.module.business.task.controller; +package net.lab1024.sa.admin.module.business.wms.task.controller; -import net.lab1024.sa.admin.module.business.task.domain.form.TaskAddForm; -import net.lab1024.sa.admin.module.business.task.domain.form.TaskQueryForm; -import net.lab1024.sa.admin.module.business.task.domain.form.TaskUpdateForm; -import net.lab1024.sa.admin.module.business.task.domain.vo.TaskVO; -import net.lab1024.sa.admin.module.business.task.service.TaskQueryService; -import net.lab1024.sa.admin.module.business.task.service.TaskService; +import net.lab1024.sa.admin.module.business.wms.task.domain.form.TaskAddForm; +import net.lab1024.sa.admin.module.business.wms.task.domain.form.TaskQueryForm; +import net.lab1024.sa.admin.module.business.wms.task.domain.form.TaskUpdateForm; +import net.lab1024.sa.admin.module.business.wms.task.domain.vo.TaskVO; +import net.lab1024.sa.admin.module.business.wms.task.service.TaskQueryService; +import net.lab1024.sa.admin.module.business.wms.task.service.TaskService; +import net.lab1024.sa.admin.module.business.wms.task.service.TaskQueryService; import net.lab1024.sa.base.common.domain.ValidateList; import org.springframework.web.bind.annotation.*; import net.lab1024.sa.base.common.domain.ResponseDTO; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/task/dao/TaskDao.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/task/dao/TaskDao.java similarity index 55% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/task/dao/TaskDao.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/task/dao/TaskDao.java index 8cb1c63..f9fe7c1 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/task/dao/TaskDao.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/task/dao/TaskDao.java @@ -1,11 +1,14 @@ -package net.lab1024.sa.admin.module.business.task.dao; +package net.lab1024.sa.admin.module.business.wms.task.dao; import java.util.List; -import net.lab1024.sa.admin.module.business.task.domain.entity.TaskEntity; -import net.lab1024.sa.admin.module.business.task.domain.form.TaskQueryForm; -import net.lab1024.sa.admin.module.business.task.domain.vo.TaskVO; +import net.lab1024.sa.admin.module.business.wms.task.domain.entity.TaskEntity; +import net.lab1024.sa.admin.module.business.wms.task.domain.form.TaskQueryForm; +import net.lab1024.sa.admin.module.business.wms.task.domain.vo.TaskVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import net.lab1024.sa.admin.module.business.wms.task.domain.entity.TaskEntity; +import net.lab1024.sa.admin.module.business.wms.task.domain.form.TaskQueryForm; +import net.lab1024.sa.admin.module.business.wms.task.domain.vo.TaskVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Component; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/task/domain/entity/TaskEntity.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/task/domain/entity/TaskEntity.java similarity index 97% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/task/domain/entity/TaskEntity.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/task/domain/entity/TaskEntity.java index 4cfa762..bb9699c 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/task/domain/entity/TaskEntity.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/task/domain/entity/TaskEntity.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.task.domain.entity; +package net.lab1024.sa.admin.module.business.wms.task.domain.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/task/domain/form/TaskAddForm.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/task/domain/form/TaskAddForm.java similarity index 83% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/task/domain/form/TaskAddForm.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/task/domain/form/TaskAddForm.java index 8d0d37b..21ced81 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/task/domain/form/TaskAddForm.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/task/domain/form/TaskAddForm.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.task.domain.form; +package net.lab1024.sa.admin.module.business.wms.task.domain.form; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/task/domain/form/TaskQueryForm.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/task/domain/form/TaskQueryForm.java similarity index 86% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/task/domain/form/TaskQueryForm.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/task/domain/form/TaskQueryForm.java index 2f07326..c9e829c 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/task/domain/form/TaskQueryForm.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/task/domain/form/TaskQueryForm.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.task.domain.form; +package net.lab1024.sa.admin.module.business.wms.task.domain.form; import net.lab1024.sa.base.common.domain.PageParam; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/task/domain/form/TaskUpdateForm.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/task/domain/form/TaskUpdateForm.java similarity index 86% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/task/domain/form/TaskUpdateForm.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/task/domain/form/TaskUpdateForm.java index d364c74..e8e3ab7 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/task/domain/form/TaskUpdateForm.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/task/domain/form/TaskUpdateForm.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.task.domain.form; +package net.lab1024.sa.admin.module.business.wms.task.domain.form; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/task/domain/vo/TaskVO.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/task/domain/vo/TaskVO.java similarity index 97% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/task/domain/vo/TaskVO.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/task/domain/vo/TaskVO.java index 98bdc2a..80de5cb 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/task/domain/vo/TaskVO.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/task/domain/vo/TaskVO.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.task.domain.vo; +package net.lab1024.sa.admin.module.business.wms.task.domain.vo; import io.swagger.v3.oas.annotations.media.Schema; import java.math.BigDecimal; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/task/manager/TaskManager.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/task/manager/TaskManager.java similarity index 59% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/task/manager/TaskManager.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/task/manager/TaskManager.java index 1a1665c..446d673 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/task/manager/TaskManager.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/task/manager/TaskManager.java @@ -1,7 +1,7 @@ -package net.lab1024.sa.admin.module.business.task.manager; +package net.lab1024.sa.admin.module.business.wms.task.manager; -import net.lab1024.sa.admin.module.business.task.domain.entity.TaskEntity; -import net.lab1024.sa.admin.module.business.task.dao.TaskDao; +import net.lab1024.sa.admin.module.business.wms.task.domain.entity.TaskEntity; +import net.lab1024.sa.admin.module.business.wms.task.dao.TaskDao; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/task/service/TaskQueryService.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/task/service/TaskQueryService.java similarity index 70% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/task/service/TaskQueryService.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/task/service/TaskQueryService.java index 5e3aba1..b3636b0 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/task/service/TaskQueryService.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/task/service/TaskQueryService.java @@ -1,10 +1,10 @@ -package net.lab1024.sa.admin.module.business.task.service; +package net.lab1024.sa.admin.module.business.wms.task.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jakarta.annotation.Resource; -import net.lab1024.sa.admin.module.business.task.dao.TaskDao; -import net.lab1024.sa.admin.module.business.task.domain.form.TaskQueryForm; -import net.lab1024.sa.admin.module.business.task.domain.vo.TaskVO; +import net.lab1024.sa.admin.module.business.wms.task.dao.TaskDao; +import net.lab1024.sa.admin.module.business.wms.task.domain.form.TaskQueryForm; +import net.lab1024.sa.admin.module.business.wms.task.domain.vo.TaskVO; import net.lab1024.sa.base.common.domain.PageResult; import net.lab1024.sa.base.common.util.SmartPageUtil; import org.springframework.stereotype.Service; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/task/service/TaskService.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/task/service/TaskService.java similarity index 79% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/task/service/TaskService.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/task/service/TaskService.java index 29e94cf..aa6eb16 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/task/service/TaskService.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/task/service/TaskService.java @@ -1,17 +1,21 @@ -package net.lab1024.sa.admin.module.business.task.service; +package net.lab1024.sa.admin.module.business.wms.task.service; import java.math.BigDecimal; import java.util.List; -import net.lab1024.sa.admin.module.business.base.location.domain.entity.LocationEntity; -import net.lab1024.sa.admin.module.business.base.stock.domain.entity.StockEntity; -import net.lab1024.sa.admin.module.business.task.dao.TaskDao; -import net.lab1024.sa.admin.module.business.task.domain.entity.TaskEntity; -import net.lab1024.sa.admin.module.business.task.domain.form.TaskAddForm; -import net.lab1024.sa.admin.module.business.task.domain.form.TaskQueryForm; -import net.lab1024.sa.admin.module.business.task.domain.form.TaskUpdateForm; -import net.lab1024.sa.admin.module.business.task.domain.vo.TaskVO; -import net.lab1024.sa.admin.module.business.task.manager.TaskManager; +import net.lab1024.sa.admin.module.business.wms.base.location.domain.entity.LocationEntity; +import net.lab1024.sa.admin.module.business.wms.base.stock.domain.entity.StockEntity; +import net.lab1024.sa.admin.module.business.wms.task.dao.TaskDao; +import net.lab1024.sa.admin.module.business.wms.task.domain.entity.TaskEntity; +import net.lab1024.sa.admin.module.business.wms.task.domain.form.TaskAddForm; +import net.lab1024.sa.admin.module.business.wms.task.domain.form.TaskQueryForm; +import net.lab1024.sa.admin.module.business.wms.task.domain.form.TaskUpdateForm; +import net.lab1024.sa.admin.module.business.wms.task.domain.vo.TaskVO; +import net.lab1024.sa.admin.module.business.wms.task.manager.TaskManager; +import net.lab1024.sa.admin.module.business.wms.base.location.domain.entity.LocationEntity; +import net.lab1024.sa.admin.module.business.wms.base.stock.domain.entity.StockEntity; +import net.lab1024.sa.admin.module.business.wms.task.domain.entity.TaskEntity; +import net.lab1024.sa.admin.module.business.wms.task.manager.TaskManager; import net.lab1024.sa.base.common.code.UserErrorCode; import net.lab1024.sa.base.common.util.SmartBeanUtil; import net.lab1024.sa.base.common.util.SmartPageUtil; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/task/sql/TaskMenu.sql b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/task/sql/TaskMenu.sql similarity index 100% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/task/sql/TaskMenu.sql rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/task/sql/TaskMenu.sql diff --git a/nc_wms_java/sa-admin/src/main/resources/mapper/business/base/address/AddressMapper.xml b/nc_wms_java/sa-admin/src/main/resources/mapper/business/wms/base/address/AddressMapper.xml similarity index 86% rename from nc_wms_java/sa-admin/src/main/resources/mapper/business/base/address/AddressMapper.xml rename to nc_wms_java/sa-admin/src/main/resources/mapper/business/wms/base/address/AddressMapper.xml index d3a94b8..1838e16 100644 --- a/nc_wms_java/sa-admin/src/main/resources/mapper/business/base/address/AddressMapper.xml +++ b/nc_wms_java/sa-admin/src/main/resources/mapper/business/wms/base/address/AddressMapper.xml @@ -1,6 +1,6 @@ - + @@ -16,7 +16,7 @@ - SELECT FROM t_address diff --git a/nc_wms_java/sa-admin/src/main/resources/mapper/business/base/area/AreaMapper.xml b/nc_wms_java/sa-admin/src/main/resources/mapper/business/wms/base/area/AreaMapper.xml similarity index 88% rename from nc_wms_java/sa-admin/src/main/resources/mapper/business/base/area/AreaMapper.xml rename to nc_wms_java/sa-admin/src/main/resources/mapper/business/wms/base/area/AreaMapper.xml index 1c2573a..7cd45e9 100644 --- a/nc_wms_java/sa-admin/src/main/resources/mapper/business/base/area/AreaMapper.xml +++ b/nc_wms_java/sa-admin/src/main/resources/mapper/business/wms/base/area/AreaMapper.xml @@ -1,6 +1,6 @@ - + @@ -16,7 +16,7 @@ - SELECT FROM t_area diff --git a/nc_wms_java/sa-admin/src/main/resources/mapper/business/base/customer/CustomerMapper.xml b/nc_wms_java/sa-admin/src/main/resources/mapper/business/wms/base/customer/CustomerMapper.xml similarity index 88% rename from nc_wms_java/sa-admin/src/main/resources/mapper/business/base/customer/CustomerMapper.xml rename to nc_wms_java/sa-admin/src/main/resources/mapper/business/wms/base/customer/CustomerMapper.xml index d6809de..1bbdea8 100644 --- a/nc_wms_java/sa-admin/src/main/resources/mapper/business/base/customer/CustomerMapper.xml +++ b/nc_wms_java/sa-admin/src/main/resources/mapper/business/wms/base/customer/CustomerMapper.xml @@ -1,6 +1,6 @@ - + @@ -19,7 +19,7 @@ - SELECT FROM t_customer diff --git a/nc_wms_java/sa-admin/src/main/resources/mapper/business/base/item/ItemMapper.xml b/nc_wms_java/sa-admin/src/main/resources/mapper/business/wms/base/item/ItemMapper.xml similarity index 89% rename from nc_wms_java/sa-admin/src/main/resources/mapper/business/base/item/ItemMapper.xml rename to nc_wms_java/sa-admin/src/main/resources/mapper/business/wms/base/item/ItemMapper.xml index e3dd6b8..ad445ca 100644 --- a/nc_wms_java/sa-admin/src/main/resources/mapper/business/base/item/ItemMapper.xml +++ b/nc_wms_java/sa-admin/src/main/resources/mapper/business/wms/base/item/ItemMapper.xml @@ -1,6 +1,6 @@ - + @@ -19,7 +19,7 @@ - SELECT FROM t_item diff --git a/nc_wms_java/sa-admin/src/main/resources/mapper/business/base/location/LocationMapper.xml b/nc_wms_java/sa-admin/src/main/resources/mapper/business/wms/base/location/LocationMapper.xml similarity index 91% rename from nc_wms_java/sa-admin/src/main/resources/mapper/business/base/location/LocationMapper.xml rename to nc_wms_java/sa-admin/src/main/resources/mapper/business/wms/base/location/LocationMapper.xml index e8bdc18..058b920 100644 --- a/nc_wms_java/sa-admin/src/main/resources/mapper/business/base/location/LocationMapper.xml +++ b/nc_wms_java/sa-admin/src/main/resources/mapper/business/wms/base/location/LocationMapper.xml @@ -1,6 +1,6 @@ - + @@ -22,7 +22,7 @@ - SELECT FROM t_location diff --git a/nc_wms_java/sa-admin/src/main/resources/mapper/business/base/stock/StockMapper.xml b/nc_wms_java/sa-admin/src/main/resources/mapper/business/wms/base/stock/StockMapper.xml similarity index 91% rename from nc_wms_java/sa-admin/src/main/resources/mapper/business/base/stock/StockMapper.xml rename to nc_wms_java/sa-admin/src/main/resources/mapper/business/wms/base/stock/StockMapper.xml index e3b9cda..59e8f40 100644 --- a/nc_wms_java/sa-admin/src/main/resources/mapper/business/base/stock/StockMapper.xml +++ b/nc_wms_java/sa-admin/src/main/resources/mapper/business/wms/base/stock/StockMapper.xml @@ -1,6 +1,6 @@ - + @@ -18,7 +18,7 @@ - SELECT FROM t_stock diff --git a/nc_wms_java/sa-admin/src/main/resources/mapper/business/inventory/InventoryMapper.xml b/nc_wms_java/sa-admin/src/main/resources/mapper/business/wms/inventory/InventoryMapper.xml similarity index 84% rename from nc_wms_java/sa-admin/src/main/resources/mapper/business/inventory/InventoryMapper.xml rename to nc_wms_java/sa-admin/src/main/resources/mapper/business/wms/inventory/InventoryMapper.xml index ab8acd1..c912ac1 100644 --- a/nc_wms_java/sa-admin/src/main/resources/mapper/business/inventory/InventoryMapper.xml +++ b/nc_wms_java/sa-admin/src/main/resources/mapper/business/wms/inventory/InventoryMapper.xml @@ -1,6 +1,6 @@ - + @@ -17,7 +17,7 @@ - SELECT FROM t_inventory diff --git a/nc_wms_java/sa-admin/src/main/resources/mapper/business/itemKey/ItemKeyMapper.xml b/nc_wms_java/sa-admin/src/main/resources/mapper/business/wms/itemKey/ItemKeyMapper.xml similarity index 86% rename from nc_wms_java/sa-admin/src/main/resources/mapper/business/itemKey/ItemKeyMapper.xml rename to nc_wms_java/sa-admin/src/main/resources/mapper/business/wms/itemKey/ItemKeyMapper.xml index 0420212..0127232 100644 --- a/nc_wms_java/sa-admin/src/main/resources/mapper/business/itemKey/ItemKeyMapper.xml +++ b/nc_wms_java/sa-admin/src/main/resources/mapper/business/wms/itemKey/ItemKeyMapper.xml @@ -1,6 +1,6 @@ - + @@ -22,7 +22,7 @@ - SELECT FROM t_item_key diff --git a/nc_wms_java/sa-admin/src/main/resources/mapper/business/receive/asn/AsnMapper.xml b/nc_wms_java/sa-admin/src/main/resources/mapper/business/wms/receive/asn/AsnMapper.xml similarity index 89% rename from nc_wms_java/sa-admin/src/main/resources/mapper/business/receive/asn/AsnMapper.xml rename to nc_wms_java/sa-admin/src/main/resources/mapper/business/wms/receive/asn/AsnMapper.xml index 4038685..a48f626 100644 --- a/nc_wms_java/sa-admin/src/main/resources/mapper/business/receive/asn/AsnMapper.xml +++ b/nc_wms_java/sa-admin/src/main/resources/mapper/business/wms/receive/asn/AsnMapper.xml @@ -1,6 +1,6 @@ - + @@ -24,7 +24,7 @@ - SELECT FROM t_asn diff --git a/nc_wms_java/sa-admin/src/main/resources/mapper/business/receive/asnDetail/AsnDetailMapper.xml b/nc_wms_java/sa-admin/src/main/resources/mapper/business/wms/receive/asnDetail/AsnDetailMapper.xml similarity index 87% rename from nc_wms_java/sa-admin/src/main/resources/mapper/business/receive/asnDetail/AsnDetailMapper.xml rename to nc_wms_java/sa-admin/src/main/resources/mapper/business/wms/receive/asnDetail/AsnDetailMapper.xml index 18f2931..a47eacd 100644 --- a/nc_wms_java/sa-admin/src/main/resources/mapper/business/receive/asnDetail/AsnDetailMapper.xml +++ b/nc_wms_java/sa-admin/src/main/resources/mapper/business/wms/receive/asnDetail/AsnDetailMapper.xml @@ -1,6 +1,6 @@ - + @@ -16,7 +16,7 @@ - SELECT FROM t_asn_detail diff --git a/nc_wms_java/sa-admin/src/main/resources/mapper/business/task/TaskMapper.xml b/nc_wms_java/sa-admin/src/main/resources/mapper/business/wms/task/TaskMapper.xml similarity index 91% rename from nc_wms_java/sa-admin/src/main/resources/mapper/business/task/TaskMapper.xml rename to nc_wms_java/sa-admin/src/main/resources/mapper/business/wms/task/TaskMapper.xml index 9872e54..d799111 100644 --- a/nc_wms_java/sa-admin/src/main/resources/mapper/business/task/TaskMapper.xml +++ b/nc_wms_java/sa-admin/src/main/resources/mapper/business/wms/task/TaskMapper.xml @@ -1,6 +1,6 @@ - + @@ -32,7 +32,7 @@ - SELECT FROM t_task