From 6d609f8156d5f513f832ca04b1c24af950ea2419 Mon Sep 17 00:00:00 2001 From: c Date: Thu, 12 Feb 2026 13:58:35 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90=E7=9A=84=E5=85=A8=E9=83=A8?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BB=A3=E7=A0=81=EF=BC=8C=E9=9D=9E=E5=B8=B8?= =?UTF-8?q?=E7=B2=97=E7=B3=99=EF=BC=8C=E6=AF=8F=E4=B8=AA=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E9=83=BD=E9=9C=80=E8=A6=81=E8=BF=9B=E8=A1=8C=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitattributes | 3 + .gitignore | 37 +++ build.gradle.kts | 74 ++++++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43764 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 251 ++++++++++++++++++ gradlew.bat | 94 +++++++ settings.gradle.kts | 1 + .../java/com/niuan/erp/ErpApplication.java | 17 ++ .../niuan/erp/common/annotation/ApiLog.java | 19 ++ .../erp/common/annotation/ModuleLog.java | 14 + .../niuan/erp/common/base/BaseDeleteBody.java | 8 + .../erp/common/base/BasePageReqParams.java | 17 ++ .../com/niuan/erp/common/base/BaseResult.java | 27 ++ .../com/niuan/erp/common/base/BaseStatus.java | 31 +++ .../niuan/erp/common/base/BaseStatusBody.java | 15 ++ .../com/niuan/erp/common/base/BaseTree.java | 14 + .../erp/common/base/CommonValidateGroup.java | 14 + .../com/niuan/erp/common/base/LoginUser.java | 41 +++ .../niuan/erp/common/base/OperationType.java | 44 +++ .../erp/common/bean/Md5PasswordEncoder.java | 34 +++ .../erp/common/bean/SysLogInterceptor.java | 116 ++++++++ .../com/niuan/erp/common/bean/SysLogSink.java | 77 ++++++ .../UrlPermissionAuthorizationManager.java | 51 ++++ .../niuan/erp/common/config/I18nConfig.java | 20 ++ .../erp/common/config/MybatisConfig.java | 29 ++ .../erp/common/config/SecurityConfig.java | 156 +++++++++++ .../erp/common/config/ValidationConfig.java | 27 ++ .../niuan/erp/common/config/WebMvcConfig.java | 15 ++ .../common/exception/BusinessException.java | 7 + .../erp/common/exception/SystemException.java | 7 + .../handler/GlobalExceptionHandler.java | 97 +++++++ .../niuan/erp/common/utils/MessageUtils.java | 24 ++ .../erp/common/utils/OperationContext.java | 36 +++ .../niuan/erp/common/utils/SecurityUtils.java | 32 +++ .../erp/common/utils/SystemAuthFactory.java | 176 ++++++++++++ .../common/utils/TeekFrameMappingUtils.java | 26 ++ .../com/niuan/erp/common/utils/TreeUtils.java | 48 ++++ .../auth/controller/LoginController.java | 18 ++ .../auth/controller/SystemAuthController.java | 22 ++ .../auth/controller/dto/ButtonProp.java | 31 +++ .../module/auth/controller/dto/LoginDto.java | 10 + .../auth/controller/dto/RouterConfigRaw.java | 57 ++++ .../controller/dto/RouterConfigRawMeta.java | 139 ++++++++++ .../service/CustomUserDetailsService.java | 72 +++++ .../auth/service/SystemAuthService.java | 11 + .../service/impl/SystemAuthServiceImpl.java | 27 ++ .../common/controller/QtCodeController.java | 68 +++++ .../common/controller/dto/QtCodeDto.java | 10 + .../common/converter/QtCodeConverter.java | 15 ++ .../erp/module/common/entity/Document.java | 101 +++++++ .../common/entity/DocumentMaterial.java | 83 ++++++ .../erp/module/common/entity/QtCode.java | 49 ++++ .../erp/module/common/enums/DocumentType.java | 30 +++ .../module/common/mapper/DocumentMapper.java | 16 ++ .../common/mapper/DocumentMaterialMapper.java | 16 ++ .../module/common/mapper/QtCodeMapper.java | 16 ++ .../module/common/service/QtCodeService.java | 23 ++ .../service/impl/QtCodeServiceImpl.java | 58 ++++ .../production/controller/BomController.java | 85 ++++++ .../controller/BomItemController.java | 76 ++++++ .../FinishedProductReceiptController.java | 76 ++++++ .../FinishedProductShipmentController.java | 76 ++++++ .../controller/ProductionIssueController.java | 76 ++++++ .../controller/ProductionPlanController.java | 85 ++++++ .../ProductionReturnController.java | 76 ++++++ .../production/controller/dto/BomDto.java | 23 ++ .../production/controller/dto/BomItemDto.java | 18 ++ .../dto/FinishedProductReceiptDto.java | 29 ++ .../dto/FinishedProductShipmentDto.java | 29 ++ .../controller/dto/ProductionIssueDto.java | 29 ++ .../controller/dto/ProductionPlanDto.java | 29 ++ .../controller/dto/ProductionReturnDto.java | 29 ++ .../production/converter/BomConverter.java | 15 ++ .../converter/BomItemConverter.java | 15 ++ .../FinishedProductReceiptConverter.java | 15 ++ .../FinishedProductShipmentConverter.java | 15 ++ .../converter/ProductionIssueConverter.java | 15 ++ .../converter/ProductionPlanConverter.java | 15 ++ .../converter/ProductionReturnConverter.java | 15 ++ .../erp/module/production/entity/Bom.java | 80 ++++++ .../erp/module/production/entity/BomItem.java | 73 +++++ .../production/entity/ProductionPlan.java | 98 +++++++ .../production/mapper/BomItemMapper.java | 16 ++ .../module/production/mapper/BomMapper.java | 16 ++ .../mapper/ProductionPlanMapper.java | 16 ++ .../production/service/BomItemService.java | 23 ++ .../module/production/service/BomService.java | 23 ++ .../FinishedProductReceiptService.java | 23 ++ .../FinishedProductShipmentService.java | 23 ++ .../service/ProductionIssueService.java | 23 ++ .../service/ProductionPlanService.java | 23 ++ .../service/ProductionReturnService.java | 23 ++ .../service/impl/BomItemServiceImpl.java | 56 ++++ .../service/impl/BomServiceImpl.java | 65 +++++ .../FinishedProductReceiptServiceImpl.java | 65 +++++ .../FinishedProductShipmentServiceImpl.java | 65 +++++ .../impl/ProductionIssueServiceImpl.java | 65 +++++ .../impl/ProductionPlanServiceImpl.java | 65 +++++ .../impl/ProductionReturnServiceImpl.java | 65 +++++ .../controller/PurchaseOrderController.java | 76 ++++++ .../controller/PurchasePlanController.java | 82 ++++++ .../controller/dto/PurchaseOrderDto.java | 29 ++ .../controller/dto/PurchaseOrderItemDto.java | 25 ++ .../controller/dto/PurchasePlanDto.java | 21 ++ .../controller/dto/PurchasePlanItemDto.java | 15 ++ .../converter/PurchaseOrderConverter.java | 15 ++ .../converter/PurchaseOrderItemConverter.java | 15 ++ .../converter/PurchasePlanConverter.java | 15 ++ .../converter/PurchasePlanItemConverter.java | 15 ++ .../purchase/entity/PurchaseOrderItem.java | 89 +++++++ .../module/purchase/entity/PurchasePlan.java | 77 ++++++ .../purchase/entity/PurchasePlanItem.java | 59 ++++ .../mapper/PurchaseOrderItemMapper.java | 16 ++ .../mapper/PurchasePlanItemMapper.java | 16 ++ .../purchase/mapper/PurchasePlanMapper.java | 16 ++ .../service/PurchaseOrderItemService.java | 23 ++ .../service/PurchaseOrderService.java | 23 ++ .../service/PurchasePlanItemService.java | 23 ++ .../purchase/service/PurchasePlanService.java | 23 ++ .../impl/PurchaseOrderItemServiceImpl.java | 65 +++++ .../impl/PurchaseOrderServiceImpl.java | 65 +++++ .../impl/PurchasePlanItemServiceImpl.java | 56 ++++ .../service/impl/PurchasePlanServiceImpl.java | 64 +++++ .../sale/controller/DeviceController.java | 83 ++++++ .../controller/RepairRecordController.java | 82 ++++++ .../sale/controller/SaleOrderController.java | 82 ++++++ .../controller/SaleOrderItemController.java | 76 ++++++ .../module/sale/controller/dto/DeviceDto.java | 32 +++ .../sale/controller/dto/RepairRecordDto.java | 27 ++ .../sale/controller/dto/SaleOrderDto.java | 30 +++ .../sale/controller/dto/SaleOrderItemDto.java | 24 ++ .../sale/converter/DeviceConverter.java | 15 ++ .../sale/converter/RepairRecordConverter.java | 15 ++ .../sale/converter/SaleOrderConverter.java | 15 ++ .../converter/SaleOrderItemConverter.java | 15 ++ .../niuan/erp/module/sale/entity/Device.java | 107 ++++++++ .../erp/module/sale/entity/RepairRecord.java | 92 +++++++ .../erp/module/sale/entity/SaleOrderItem.java | 86 ++++++ .../erp/module/sale/mapper/DeviceMapper.java | 16 ++ .../sale/mapper/RepairRecordMapper.java | 16 ++ .../sale/mapper/SaleOrderItemMapper.java | 16 ++ .../module/sale/service/DeviceService.java | 23 ++ .../sale/service/RepairRecordService.java | 23 ++ .../sale/service/SaleOrderItemService.java | 23 ++ .../module/sale/service/SaleOrderService.java | 23 ++ .../sale/service/impl/DeviceServiceImpl.java | 65 +++++ .../service/impl/RepairRecordServiceImpl.java | 65 +++++ .../impl/SaleOrderItemServiceImpl.java | 65 +++++ .../service/impl/SaleOrderServiceImpl.java | 65 +++++ .../sys/controller/KeyAccountController.java | 59 ++++ .../sys/controller/StoreController.java | 64 +++++ .../sys/controller/SysChannelController.java | 79 ++++++ .../sys/controller/SysRecordController.java | 43 +++ .../sys/controller/SysRoleController.java | 67 +++++ .../sys/controller/SysUserController.java | 45 ++++ .../sys/controller/VendorController.java | 79 ++++++ .../sys/controller/dto/KeyAccountDto.java | 24 ++ .../module/sys/controller/dto/StoreDto.java | 20 ++ .../sys/controller/dto/SysChannelDto.java | 28 ++ .../sys/controller/dto/SysRecordDto.java | 17 ++ .../module/sys/controller/dto/SysRoleDto.java | 19 ++ .../sys/controller/dto/SysRoleSelectDto.java | 6 + .../module/sys/controller/dto/SysUserDto.java | 28 ++ .../module/sys/controller/dto/VendorDto.java | 24 ++ .../sys/converter/KeyAccountConverter.java | 15 ++ .../module/sys/converter/StoreConverter.java | 15 ++ .../sys/converter/SysChannelConverter.java | 15 ++ .../sys/converter/SysRecordConverter.java | 15 ++ .../sys/converter/SysRoleConverter.java | 21 ++ .../sys/converter/SysUserConverter.java | 15 ++ .../module/sys/converter/VendorConverter.java | 15 ++ .../erp/module/sys/entity/KeyAccount.java | 86 ++++++ .../niuan/erp/module/sys/entity/Store.java | 74 ++++++ .../erp/module/sys/entity/SysChannel.java | 78 ++++++ .../erp/module/sys/entity/SysRecord.java | 72 +++++ .../niuan/erp/module/sys/entity/SysRole.java | 51 ++++ .../erp/module/sys/entity/SysRoleChannel.java | 27 ++ .../niuan/erp/module/sys/entity/SysUser.java | 83 ++++++ .../niuan/erp/module/sys/entity/UserRole.java | 23 ++ .../niuan/erp/module/sys/entity/Vendor.java | 86 ++++++ .../module/sys/mapper/KeyAccountMapper.java | 16 ++ .../erp/module/sys/mapper/StoreMapper.java | 16 ++ .../module/sys/mapper/SysChannelMapper.java | 24 ++ .../module/sys/mapper/SysRecordMapper.java | 16 ++ .../sys/mapper/SysRoleChannelMapper.java | 9 + .../erp/module/sys/mapper/SysRoleMapper.java | 12 + .../erp/module/sys/mapper/SysUserMapper.java | 9 + .../erp/module/sys/mapper/UserRoleMapper.java | 9 + .../erp/module/sys/mapper/VendorMapper.java | 16 ++ .../module/sys/service/KeyAccountService.java | 23 ++ .../erp/module/sys/service/StoreService.java | 23 ++ .../module/sys/service/SysChannelService.java | 34 +++ .../module/sys/service/SysRecordService.java | 15 ++ .../module/sys/service/SysRoleService.java | 25 ++ .../module/sys/service/SysUserService.java | 23 ++ .../erp/module/sys/service/VendorService.java | 23 ++ .../service/impl/KeyAccountServiceImpl.java | 66 +++++ .../sys/service/impl/StoreServiceImpl.java | 66 +++++ .../service/impl/SysChannelServiceImpl.java | 85 ++++++ .../service/impl/SysRecordServiceImpl.java | 39 +++ .../sys/service/impl/SysRoleServiceImpl.java | 95 +++++++ .../sys/service/impl/SysUserServiceImpl.java | 68 +++++ .../sys/service/impl/VendorServiceImpl.java | 66 +++++ .../controller/InventoryCountController.java | 82 ++++++ .../InventoryCountItemController.java | 76 ++++++ .../controller/StockByBrandController.java | 82 ++++++ .../controller/StockByTypeController.java | 82 ++++++ .../StockByWarehouseController.java | 82 ++++++ .../StockTransferOrderController.java | 82 ++++++ .../controller/WarehouseController.java | 82 ++++++ .../controller/WarehouseItemController.java | 82 ++++++ .../WarehouseReceiptController.java | 82 ++++++ .../controller/dto/InventoryCountDto.java | 30 +++ .../controller/dto/InventoryCountItemDto.java | 23 ++ .../controller/dto/StockByBrandDto.java | 21 ++ .../controller/dto/StockByTypeDto.java | 21 ++ .../warehouse/controller/dto/StockDto.java | 21 ++ .../controller/dto/StockTransferOrderDto.java | 30 +++ .../controller/dto/WarehouseDto.java | 20 ++ .../controller/dto/WarehouseItemDto.java | 32 +++ .../controller/dto/WarehouseReceiptDto.java | 30 +++ .../converter/InventoryCountConverter.java | 15 ++ .../InventoryCountItemConverter.java | 15 ++ .../converter/StockByBrandConverter.java | 15 ++ .../converter/StockByTypeConverter.java | 15 ++ .../warehouse/converter/StockConverter.java | 15 ++ .../StockTransferOrderConverter.java | 15 ++ .../converter/WarehouseConverter.java | 15 ++ .../converter/WarehouseItemConverter.java | 15 ++ .../converter/WarehouseReceiptConverter.java | 15 ++ .../warehouse/entity/InventoryCountItem.java | 83 ++++++ .../erp/module/warehouse/entity/Stock.java | 77 ++++++ .../module/warehouse/entity/Warehouse.java | 74 ++++++ .../warehouse/entity/WarehouseItem.java | 110 ++++++++ .../mapper/InventoryCountItemMapper.java | 16 ++ .../module/warehouse/mapper/StockMapper.java | 16 ++ .../warehouse/mapper/WarehouseItemMapper.java | 16 ++ .../warehouse/mapper/WarehouseMapper.java | 16 ++ .../service/InventoryCountItemService.java | 23 ++ .../service/InventoryCountService.java | 23 ++ .../service/StockByBrandService.java | 23 ++ .../warehouse/service/StockByTypeService.java | 23 ++ .../warehouse/service/StockService.java | 23 ++ .../service/StockTransferOrderService.java | 23 ++ .../service/WarehouseItemService.java | 23 ++ .../service/WarehouseReceiptService.java | 23 ++ .../warehouse/service/WarehouseService.java | 23 ++ .../impl/InventoryCountItemServiceImpl.java | 65 +++++ .../impl/InventoryCountServiceImpl.java | 65 +++++ .../service/impl/StockByBrandServiceImpl.java | 65 +++++ .../service/impl/StockByTypeServiceImpl.java | 65 +++++ .../service/impl/StockServiceImpl.java | 65 +++++ .../impl/StockTransferOrderServiceImpl.java | 65 +++++ .../impl/WarehouseItemServiceImpl.java | 65 +++++ .../impl/WarehouseReceiptServiceImpl.java | 65 +++++ .../service/impl/WarehouseServiceImpl.java | 65 +++++ src/main/resources/application-dev.yml | 17 ++ src/main/resources/application.yml | 23 ++ src/main/resources/i18n/messages.properties | 30 +++ .../resources/i18n/messages_en_US.properties | 0 .../resources/i18n/messages_zh_CN.properties | 2 + .../mapper/common/DocumentMapper.xml | 33 +++ .../mapper/common/DocumentMaterialMapper.xml | 27 ++ .../resources/mapper/common/QtCodeMapper.xml | 16 ++ .../mapper/production/BomItemMapper.xml | 24 ++ .../resources/mapper/production/BomMapper.xml | 26 ++ .../production/ProductionPlanMapper.xml | 32 +++ .../purchase/PurchaseOrderItemMapper.xml | 29 ++ .../purchase/PurchasePlanItemMapper.xml | 19 ++ .../mapper/purchase/PurchasePlanMapper.xml | 25 ++ .../resources/mapper/sale/DeviceMapper.xml | 35 +++ .../mapper/sale/RepairRecordMapper.xml | 30 +++ .../mapper/sale/SaleOrderItemMapper.xml | 28 ++ .../resources/mapper/sys/KeyAccountMapper.xml | 28 ++ src/main/resources/mapper/sys/StoreMapper.xml | 24 ++ .../resources/mapper/sys/SysChannelMapper.xml | 45 ++++ .../resources/mapper/sys/SysRecordMapper.xml | 24 ++ .../resources/mapper/sys/SysRoleMapper.xml | 27 ++ .../resources/mapper/sys/VendorMapper.xml | 28 ++ .../warehouse/InventoryCountItemMapper.xml | 27 ++ .../mapper/warehouse/StockMapper.xml | 25 ++ .../warehouse/StockTransferOrderMapper.xml | 33 +++ .../mapper/warehouse/WarehouseItemMapper.xml | 36 +++ .../mapper/warehouse/WarehouseMapper.xml | 24 ++ src/main/resources/sql/dev/id.sql | 10 + .../com/niuan/erp/ErpApplicationTests.java | 13 + 287 files changed, 11535 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 build.gradle.kts create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle.kts create mode 100644 src/main/java/com/niuan/erp/ErpApplication.java create mode 100644 src/main/java/com/niuan/erp/common/annotation/ApiLog.java create mode 100644 src/main/java/com/niuan/erp/common/annotation/ModuleLog.java create mode 100644 src/main/java/com/niuan/erp/common/base/BaseDeleteBody.java create mode 100644 src/main/java/com/niuan/erp/common/base/BasePageReqParams.java create mode 100644 src/main/java/com/niuan/erp/common/base/BaseResult.java create mode 100644 src/main/java/com/niuan/erp/common/base/BaseStatus.java create mode 100644 src/main/java/com/niuan/erp/common/base/BaseStatusBody.java create mode 100644 src/main/java/com/niuan/erp/common/base/BaseTree.java create mode 100644 src/main/java/com/niuan/erp/common/base/CommonValidateGroup.java create mode 100644 src/main/java/com/niuan/erp/common/base/LoginUser.java create mode 100644 src/main/java/com/niuan/erp/common/base/OperationType.java create mode 100644 src/main/java/com/niuan/erp/common/bean/Md5PasswordEncoder.java create mode 100644 src/main/java/com/niuan/erp/common/bean/SysLogInterceptor.java create mode 100644 src/main/java/com/niuan/erp/common/bean/SysLogSink.java create mode 100644 src/main/java/com/niuan/erp/common/bean/UrlPermissionAuthorizationManager.java create mode 100644 src/main/java/com/niuan/erp/common/config/I18nConfig.java create mode 100644 src/main/java/com/niuan/erp/common/config/MybatisConfig.java create mode 100644 src/main/java/com/niuan/erp/common/config/SecurityConfig.java create mode 100644 src/main/java/com/niuan/erp/common/config/ValidationConfig.java create mode 100644 src/main/java/com/niuan/erp/common/config/WebMvcConfig.java create mode 100644 src/main/java/com/niuan/erp/common/exception/BusinessException.java create mode 100644 src/main/java/com/niuan/erp/common/exception/SystemException.java create mode 100644 src/main/java/com/niuan/erp/common/handler/GlobalExceptionHandler.java create mode 100644 src/main/java/com/niuan/erp/common/utils/MessageUtils.java create mode 100644 src/main/java/com/niuan/erp/common/utils/OperationContext.java create mode 100644 src/main/java/com/niuan/erp/common/utils/SecurityUtils.java create mode 100644 src/main/java/com/niuan/erp/common/utils/SystemAuthFactory.java create mode 100644 src/main/java/com/niuan/erp/common/utils/TeekFrameMappingUtils.java create mode 100644 src/main/java/com/niuan/erp/common/utils/TreeUtils.java create mode 100644 src/main/java/com/niuan/erp/module/auth/controller/LoginController.java create mode 100644 src/main/java/com/niuan/erp/module/auth/controller/SystemAuthController.java create mode 100644 src/main/java/com/niuan/erp/module/auth/controller/dto/ButtonProp.java create mode 100644 src/main/java/com/niuan/erp/module/auth/controller/dto/LoginDto.java create mode 100644 src/main/java/com/niuan/erp/module/auth/controller/dto/RouterConfigRaw.java create mode 100644 src/main/java/com/niuan/erp/module/auth/controller/dto/RouterConfigRawMeta.java create mode 100644 src/main/java/com/niuan/erp/module/auth/service/CustomUserDetailsService.java create mode 100644 src/main/java/com/niuan/erp/module/auth/service/SystemAuthService.java create mode 100644 src/main/java/com/niuan/erp/module/auth/service/impl/SystemAuthServiceImpl.java create mode 100644 src/main/java/com/niuan/erp/module/common/controller/QtCodeController.java create mode 100644 src/main/java/com/niuan/erp/module/common/controller/dto/QtCodeDto.java create mode 100644 src/main/java/com/niuan/erp/module/common/converter/QtCodeConverter.java create mode 100644 src/main/java/com/niuan/erp/module/common/entity/Document.java create mode 100644 src/main/java/com/niuan/erp/module/common/entity/DocumentMaterial.java create mode 100644 src/main/java/com/niuan/erp/module/common/entity/QtCode.java create mode 100644 src/main/java/com/niuan/erp/module/common/enums/DocumentType.java create mode 100644 src/main/java/com/niuan/erp/module/common/mapper/DocumentMapper.java create mode 100644 src/main/java/com/niuan/erp/module/common/mapper/DocumentMaterialMapper.java create mode 100644 src/main/java/com/niuan/erp/module/common/mapper/QtCodeMapper.java create mode 100644 src/main/java/com/niuan/erp/module/common/service/QtCodeService.java create mode 100644 src/main/java/com/niuan/erp/module/common/service/impl/QtCodeServiceImpl.java create mode 100644 src/main/java/com/niuan/erp/module/production/controller/BomController.java create mode 100644 src/main/java/com/niuan/erp/module/production/controller/BomItemController.java create mode 100644 src/main/java/com/niuan/erp/module/production/controller/FinishedProductReceiptController.java create mode 100644 src/main/java/com/niuan/erp/module/production/controller/FinishedProductShipmentController.java create mode 100644 src/main/java/com/niuan/erp/module/production/controller/ProductionIssueController.java create mode 100644 src/main/java/com/niuan/erp/module/production/controller/ProductionPlanController.java create mode 100644 src/main/java/com/niuan/erp/module/production/controller/ProductionReturnController.java create mode 100644 src/main/java/com/niuan/erp/module/production/controller/dto/BomDto.java create mode 100644 src/main/java/com/niuan/erp/module/production/controller/dto/BomItemDto.java create mode 100644 src/main/java/com/niuan/erp/module/production/controller/dto/FinishedProductReceiptDto.java create mode 100644 src/main/java/com/niuan/erp/module/production/controller/dto/FinishedProductShipmentDto.java create mode 100644 src/main/java/com/niuan/erp/module/production/controller/dto/ProductionIssueDto.java create mode 100644 src/main/java/com/niuan/erp/module/production/controller/dto/ProductionPlanDto.java create mode 100644 src/main/java/com/niuan/erp/module/production/controller/dto/ProductionReturnDto.java create mode 100644 src/main/java/com/niuan/erp/module/production/converter/BomConverter.java create mode 100644 src/main/java/com/niuan/erp/module/production/converter/BomItemConverter.java create mode 100644 src/main/java/com/niuan/erp/module/production/converter/FinishedProductReceiptConverter.java create mode 100644 src/main/java/com/niuan/erp/module/production/converter/FinishedProductShipmentConverter.java create mode 100644 src/main/java/com/niuan/erp/module/production/converter/ProductionIssueConverter.java create mode 100644 src/main/java/com/niuan/erp/module/production/converter/ProductionPlanConverter.java create mode 100644 src/main/java/com/niuan/erp/module/production/converter/ProductionReturnConverter.java create mode 100644 src/main/java/com/niuan/erp/module/production/entity/Bom.java create mode 100644 src/main/java/com/niuan/erp/module/production/entity/BomItem.java create mode 100644 src/main/java/com/niuan/erp/module/production/entity/ProductionPlan.java create mode 100644 src/main/java/com/niuan/erp/module/production/mapper/BomItemMapper.java create mode 100644 src/main/java/com/niuan/erp/module/production/mapper/BomMapper.java create mode 100644 src/main/java/com/niuan/erp/module/production/mapper/ProductionPlanMapper.java create mode 100644 src/main/java/com/niuan/erp/module/production/service/BomItemService.java create mode 100644 src/main/java/com/niuan/erp/module/production/service/BomService.java create mode 100644 src/main/java/com/niuan/erp/module/production/service/FinishedProductReceiptService.java create mode 100644 src/main/java/com/niuan/erp/module/production/service/FinishedProductShipmentService.java create mode 100644 src/main/java/com/niuan/erp/module/production/service/ProductionIssueService.java create mode 100644 src/main/java/com/niuan/erp/module/production/service/ProductionPlanService.java create mode 100644 src/main/java/com/niuan/erp/module/production/service/ProductionReturnService.java create mode 100644 src/main/java/com/niuan/erp/module/production/service/impl/BomItemServiceImpl.java create mode 100644 src/main/java/com/niuan/erp/module/production/service/impl/BomServiceImpl.java create mode 100644 src/main/java/com/niuan/erp/module/production/service/impl/FinishedProductReceiptServiceImpl.java create mode 100644 src/main/java/com/niuan/erp/module/production/service/impl/FinishedProductShipmentServiceImpl.java create mode 100644 src/main/java/com/niuan/erp/module/production/service/impl/ProductionIssueServiceImpl.java create mode 100644 src/main/java/com/niuan/erp/module/production/service/impl/ProductionPlanServiceImpl.java create mode 100644 src/main/java/com/niuan/erp/module/production/service/impl/ProductionReturnServiceImpl.java create mode 100644 src/main/java/com/niuan/erp/module/purchase/controller/PurchaseOrderController.java create mode 100644 src/main/java/com/niuan/erp/module/purchase/controller/PurchasePlanController.java create mode 100644 src/main/java/com/niuan/erp/module/purchase/controller/dto/PurchaseOrderDto.java create mode 100644 src/main/java/com/niuan/erp/module/purchase/controller/dto/PurchaseOrderItemDto.java create mode 100644 src/main/java/com/niuan/erp/module/purchase/controller/dto/PurchasePlanDto.java create mode 100644 src/main/java/com/niuan/erp/module/purchase/controller/dto/PurchasePlanItemDto.java create mode 100644 src/main/java/com/niuan/erp/module/purchase/converter/PurchaseOrderConverter.java create mode 100644 src/main/java/com/niuan/erp/module/purchase/converter/PurchaseOrderItemConverter.java create mode 100644 src/main/java/com/niuan/erp/module/purchase/converter/PurchasePlanConverter.java create mode 100644 src/main/java/com/niuan/erp/module/purchase/converter/PurchasePlanItemConverter.java create mode 100644 src/main/java/com/niuan/erp/module/purchase/entity/PurchaseOrderItem.java create mode 100644 src/main/java/com/niuan/erp/module/purchase/entity/PurchasePlan.java create mode 100644 src/main/java/com/niuan/erp/module/purchase/entity/PurchasePlanItem.java create mode 100644 src/main/java/com/niuan/erp/module/purchase/mapper/PurchaseOrderItemMapper.java create mode 100644 src/main/java/com/niuan/erp/module/purchase/mapper/PurchasePlanItemMapper.java create mode 100644 src/main/java/com/niuan/erp/module/purchase/mapper/PurchasePlanMapper.java create mode 100644 src/main/java/com/niuan/erp/module/purchase/service/PurchaseOrderItemService.java create mode 100644 src/main/java/com/niuan/erp/module/purchase/service/PurchaseOrderService.java create mode 100644 src/main/java/com/niuan/erp/module/purchase/service/PurchasePlanItemService.java create mode 100644 src/main/java/com/niuan/erp/module/purchase/service/PurchasePlanService.java create mode 100644 src/main/java/com/niuan/erp/module/purchase/service/impl/PurchaseOrderItemServiceImpl.java create mode 100644 src/main/java/com/niuan/erp/module/purchase/service/impl/PurchaseOrderServiceImpl.java create mode 100644 src/main/java/com/niuan/erp/module/purchase/service/impl/PurchasePlanItemServiceImpl.java create mode 100644 src/main/java/com/niuan/erp/module/purchase/service/impl/PurchasePlanServiceImpl.java create mode 100644 src/main/java/com/niuan/erp/module/sale/controller/DeviceController.java create mode 100644 src/main/java/com/niuan/erp/module/sale/controller/RepairRecordController.java create mode 100644 src/main/java/com/niuan/erp/module/sale/controller/SaleOrderController.java create mode 100644 src/main/java/com/niuan/erp/module/sale/controller/SaleOrderItemController.java create mode 100644 src/main/java/com/niuan/erp/module/sale/controller/dto/DeviceDto.java create mode 100644 src/main/java/com/niuan/erp/module/sale/controller/dto/RepairRecordDto.java create mode 100644 src/main/java/com/niuan/erp/module/sale/controller/dto/SaleOrderDto.java create mode 100644 src/main/java/com/niuan/erp/module/sale/controller/dto/SaleOrderItemDto.java create mode 100644 src/main/java/com/niuan/erp/module/sale/converter/DeviceConverter.java create mode 100644 src/main/java/com/niuan/erp/module/sale/converter/RepairRecordConverter.java create mode 100644 src/main/java/com/niuan/erp/module/sale/converter/SaleOrderConverter.java create mode 100644 src/main/java/com/niuan/erp/module/sale/converter/SaleOrderItemConverter.java create mode 100644 src/main/java/com/niuan/erp/module/sale/entity/Device.java create mode 100644 src/main/java/com/niuan/erp/module/sale/entity/RepairRecord.java create mode 100644 src/main/java/com/niuan/erp/module/sale/entity/SaleOrderItem.java create mode 100644 src/main/java/com/niuan/erp/module/sale/mapper/DeviceMapper.java create mode 100644 src/main/java/com/niuan/erp/module/sale/mapper/RepairRecordMapper.java create mode 100644 src/main/java/com/niuan/erp/module/sale/mapper/SaleOrderItemMapper.java create mode 100644 src/main/java/com/niuan/erp/module/sale/service/DeviceService.java create mode 100644 src/main/java/com/niuan/erp/module/sale/service/RepairRecordService.java create mode 100644 src/main/java/com/niuan/erp/module/sale/service/SaleOrderItemService.java create mode 100644 src/main/java/com/niuan/erp/module/sale/service/SaleOrderService.java create mode 100644 src/main/java/com/niuan/erp/module/sale/service/impl/DeviceServiceImpl.java create mode 100644 src/main/java/com/niuan/erp/module/sale/service/impl/RepairRecordServiceImpl.java create mode 100644 src/main/java/com/niuan/erp/module/sale/service/impl/SaleOrderItemServiceImpl.java create mode 100644 src/main/java/com/niuan/erp/module/sale/service/impl/SaleOrderServiceImpl.java create mode 100644 src/main/java/com/niuan/erp/module/sys/controller/KeyAccountController.java create mode 100644 src/main/java/com/niuan/erp/module/sys/controller/StoreController.java create mode 100644 src/main/java/com/niuan/erp/module/sys/controller/SysChannelController.java create mode 100644 src/main/java/com/niuan/erp/module/sys/controller/SysRecordController.java create mode 100644 src/main/java/com/niuan/erp/module/sys/controller/SysRoleController.java create mode 100644 src/main/java/com/niuan/erp/module/sys/controller/SysUserController.java create mode 100644 src/main/java/com/niuan/erp/module/sys/controller/VendorController.java create mode 100644 src/main/java/com/niuan/erp/module/sys/controller/dto/KeyAccountDto.java create mode 100644 src/main/java/com/niuan/erp/module/sys/controller/dto/StoreDto.java create mode 100644 src/main/java/com/niuan/erp/module/sys/controller/dto/SysChannelDto.java create mode 100644 src/main/java/com/niuan/erp/module/sys/controller/dto/SysRecordDto.java create mode 100644 src/main/java/com/niuan/erp/module/sys/controller/dto/SysRoleDto.java create mode 100644 src/main/java/com/niuan/erp/module/sys/controller/dto/SysRoleSelectDto.java create mode 100644 src/main/java/com/niuan/erp/module/sys/controller/dto/SysUserDto.java create mode 100644 src/main/java/com/niuan/erp/module/sys/controller/dto/VendorDto.java create mode 100644 src/main/java/com/niuan/erp/module/sys/converter/KeyAccountConverter.java create mode 100644 src/main/java/com/niuan/erp/module/sys/converter/StoreConverter.java create mode 100644 src/main/java/com/niuan/erp/module/sys/converter/SysChannelConverter.java create mode 100644 src/main/java/com/niuan/erp/module/sys/converter/SysRecordConverter.java create mode 100644 src/main/java/com/niuan/erp/module/sys/converter/SysRoleConverter.java create mode 100644 src/main/java/com/niuan/erp/module/sys/converter/SysUserConverter.java create mode 100644 src/main/java/com/niuan/erp/module/sys/converter/VendorConverter.java create mode 100644 src/main/java/com/niuan/erp/module/sys/entity/KeyAccount.java create mode 100644 src/main/java/com/niuan/erp/module/sys/entity/Store.java create mode 100644 src/main/java/com/niuan/erp/module/sys/entity/SysChannel.java create mode 100644 src/main/java/com/niuan/erp/module/sys/entity/SysRecord.java create mode 100644 src/main/java/com/niuan/erp/module/sys/entity/SysRole.java create mode 100644 src/main/java/com/niuan/erp/module/sys/entity/SysRoleChannel.java create mode 100644 src/main/java/com/niuan/erp/module/sys/entity/SysUser.java create mode 100644 src/main/java/com/niuan/erp/module/sys/entity/UserRole.java create mode 100644 src/main/java/com/niuan/erp/module/sys/entity/Vendor.java create mode 100644 src/main/java/com/niuan/erp/module/sys/mapper/KeyAccountMapper.java create mode 100644 src/main/java/com/niuan/erp/module/sys/mapper/StoreMapper.java create mode 100644 src/main/java/com/niuan/erp/module/sys/mapper/SysChannelMapper.java create mode 100644 src/main/java/com/niuan/erp/module/sys/mapper/SysRecordMapper.java create mode 100644 src/main/java/com/niuan/erp/module/sys/mapper/SysRoleChannelMapper.java create mode 100644 src/main/java/com/niuan/erp/module/sys/mapper/SysRoleMapper.java create mode 100644 src/main/java/com/niuan/erp/module/sys/mapper/SysUserMapper.java create mode 100644 src/main/java/com/niuan/erp/module/sys/mapper/UserRoleMapper.java create mode 100644 src/main/java/com/niuan/erp/module/sys/mapper/VendorMapper.java create mode 100644 src/main/java/com/niuan/erp/module/sys/service/KeyAccountService.java create mode 100644 src/main/java/com/niuan/erp/module/sys/service/StoreService.java create mode 100644 src/main/java/com/niuan/erp/module/sys/service/SysChannelService.java create mode 100644 src/main/java/com/niuan/erp/module/sys/service/SysRecordService.java create mode 100644 src/main/java/com/niuan/erp/module/sys/service/SysRoleService.java create mode 100644 src/main/java/com/niuan/erp/module/sys/service/SysUserService.java create mode 100644 src/main/java/com/niuan/erp/module/sys/service/VendorService.java create mode 100644 src/main/java/com/niuan/erp/module/sys/service/impl/KeyAccountServiceImpl.java create mode 100644 src/main/java/com/niuan/erp/module/sys/service/impl/StoreServiceImpl.java create mode 100644 src/main/java/com/niuan/erp/module/sys/service/impl/SysChannelServiceImpl.java create mode 100644 src/main/java/com/niuan/erp/module/sys/service/impl/SysRecordServiceImpl.java create mode 100644 src/main/java/com/niuan/erp/module/sys/service/impl/SysRoleServiceImpl.java create mode 100644 src/main/java/com/niuan/erp/module/sys/service/impl/SysUserServiceImpl.java create mode 100644 src/main/java/com/niuan/erp/module/sys/service/impl/VendorServiceImpl.java create mode 100644 src/main/java/com/niuan/erp/module/warehouse/controller/InventoryCountController.java create mode 100644 src/main/java/com/niuan/erp/module/warehouse/controller/InventoryCountItemController.java create mode 100644 src/main/java/com/niuan/erp/module/warehouse/controller/StockByBrandController.java create mode 100644 src/main/java/com/niuan/erp/module/warehouse/controller/StockByTypeController.java create mode 100644 src/main/java/com/niuan/erp/module/warehouse/controller/StockByWarehouseController.java create mode 100644 src/main/java/com/niuan/erp/module/warehouse/controller/StockTransferOrderController.java create mode 100644 src/main/java/com/niuan/erp/module/warehouse/controller/WarehouseController.java create mode 100644 src/main/java/com/niuan/erp/module/warehouse/controller/WarehouseItemController.java create mode 100644 src/main/java/com/niuan/erp/module/warehouse/controller/WarehouseReceiptController.java create mode 100644 src/main/java/com/niuan/erp/module/warehouse/controller/dto/InventoryCountDto.java create mode 100644 src/main/java/com/niuan/erp/module/warehouse/controller/dto/InventoryCountItemDto.java create mode 100644 src/main/java/com/niuan/erp/module/warehouse/controller/dto/StockByBrandDto.java create mode 100644 src/main/java/com/niuan/erp/module/warehouse/controller/dto/StockByTypeDto.java create mode 100644 src/main/java/com/niuan/erp/module/warehouse/controller/dto/StockDto.java create mode 100644 src/main/java/com/niuan/erp/module/warehouse/controller/dto/StockTransferOrderDto.java create mode 100644 src/main/java/com/niuan/erp/module/warehouse/controller/dto/WarehouseDto.java create mode 100644 src/main/java/com/niuan/erp/module/warehouse/controller/dto/WarehouseItemDto.java create mode 100644 src/main/java/com/niuan/erp/module/warehouse/controller/dto/WarehouseReceiptDto.java create mode 100644 src/main/java/com/niuan/erp/module/warehouse/converter/InventoryCountConverter.java create mode 100644 src/main/java/com/niuan/erp/module/warehouse/converter/InventoryCountItemConverter.java create mode 100644 src/main/java/com/niuan/erp/module/warehouse/converter/StockByBrandConverter.java create mode 100644 src/main/java/com/niuan/erp/module/warehouse/converter/StockByTypeConverter.java create mode 100644 src/main/java/com/niuan/erp/module/warehouse/converter/StockConverter.java create mode 100644 src/main/java/com/niuan/erp/module/warehouse/converter/StockTransferOrderConverter.java create mode 100644 src/main/java/com/niuan/erp/module/warehouse/converter/WarehouseConverter.java create mode 100644 src/main/java/com/niuan/erp/module/warehouse/converter/WarehouseItemConverter.java create mode 100644 src/main/java/com/niuan/erp/module/warehouse/converter/WarehouseReceiptConverter.java create mode 100644 src/main/java/com/niuan/erp/module/warehouse/entity/InventoryCountItem.java create mode 100644 src/main/java/com/niuan/erp/module/warehouse/entity/Stock.java create mode 100644 src/main/java/com/niuan/erp/module/warehouse/entity/Warehouse.java create mode 100644 src/main/java/com/niuan/erp/module/warehouse/entity/WarehouseItem.java create mode 100644 src/main/java/com/niuan/erp/module/warehouse/mapper/InventoryCountItemMapper.java create mode 100644 src/main/java/com/niuan/erp/module/warehouse/mapper/StockMapper.java create mode 100644 src/main/java/com/niuan/erp/module/warehouse/mapper/WarehouseItemMapper.java create mode 100644 src/main/java/com/niuan/erp/module/warehouse/mapper/WarehouseMapper.java create mode 100644 src/main/java/com/niuan/erp/module/warehouse/service/InventoryCountItemService.java create mode 100644 src/main/java/com/niuan/erp/module/warehouse/service/InventoryCountService.java create mode 100644 src/main/java/com/niuan/erp/module/warehouse/service/StockByBrandService.java create mode 100644 src/main/java/com/niuan/erp/module/warehouse/service/StockByTypeService.java create mode 100644 src/main/java/com/niuan/erp/module/warehouse/service/StockService.java create mode 100644 src/main/java/com/niuan/erp/module/warehouse/service/StockTransferOrderService.java create mode 100644 src/main/java/com/niuan/erp/module/warehouse/service/WarehouseItemService.java create mode 100644 src/main/java/com/niuan/erp/module/warehouse/service/WarehouseReceiptService.java create mode 100644 src/main/java/com/niuan/erp/module/warehouse/service/WarehouseService.java create mode 100644 src/main/java/com/niuan/erp/module/warehouse/service/impl/InventoryCountItemServiceImpl.java create mode 100644 src/main/java/com/niuan/erp/module/warehouse/service/impl/InventoryCountServiceImpl.java create mode 100644 src/main/java/com/niuan/erp/module/warehouse/service/impl/StockByBrandServiceImpl.java create mode 100644 src/main/java/com/niuan/erp/module/warehouse/service/impl/StockByTypeServiceImpl.java create mode 100644 src/main/java/com/niuan/erp/module/warehouse/service/impl/StockServiceImpl.java create mode 100644 src/main/java/com/niuan/erp/module/warehouse/service/impl/StockTransferOrderServiceImpl.java create mode 100644 src/main/java/com/niuan/erp/module/warehouse/service/impl/WarehouseItemServiceImpl.java create mode 100644 src/main/java/com/niuan/erp/module/warehouse/service/impl/WarehouseReceiptServiceImpl.java create mode 100644 src/main/java/com/niuan/erp/module/warehouse/service/impl/WarehouseServiceImpl.java create mode 100644 src/main/resources/application-dev.yml create mode 100644 src/main/resources/application.yml create mode 100644 src/main/resources/i18n/messages.properties create mode 100644 src/main/resources/i18n/messages_en_US.properties create mode 100644 src/main/resources/i18n/messages_zh_CN.properties create mode 100644 src/main/resources/mapper/common/DocumentMapper.xml create mode 100644 src/main/resources/mapper/common/DocumentMaterialMapper.xml create mode 100644 src/main/resources/mapper/common/QtCodeMapper.xml create mode 100644 src/main/resources/mapper/production/BomItemMapper.xml create mode 100644 src/main/resources/mapper/production/BomMapper.xml create mode 100644 src/main/resources/mapper/production/ProductionPlanMapper.xml create mode 100644 src/main/resources/mapper/purchase/PurchaseOrderItemMapper.xml create mode 100644 src/main/resources/mapper/purchase/PurchasePlanItemMapper.xml create mode 100644 src/main/resources/mapper/purchase/PurchasePlanMapper.xml create mode 100644 src/main/resources/mapper/sale/DeviceMapper.xml create mode 100644 src/main/resources/mapper/sale/RepairRecordMapper.xml create mode 100644 src/main/resources/mapper/sale/SaleOrderItemMapper.xml create mode 100644 src/main/resources/mapper/sys/KeyAccountMapper.xml create mode 100644 src/main/resources/mapper/sys/StoreMapper.xml create mode 100644 src/main/resources/mapper/sys/SysChannelMapper.xml create mode 100644 src/main/resources/mapper/sys/SysRecordMapper.xml create mode 100644 src/main/resources/mapper/sys/SysRoleMapper.xml create mode 100644 src/main/resources/mapper/sys/VendorMapper.xml create mode 100644 src/main/resources/mapper/warehouse/InventoryCountItemMapper.xml create mode 100644 src/main/resources/mapper/warehouse/StockMapper.xml create mode 100644 src/main/resources/mapper/warehouse/StockTransferOrderMapper.xml create mode 100644 src/main/resources/mapper/warehouse/WarehouseItemMapper.xml create mode 100644 src/main/resources/mapper/warehouse/WarehouseMapper.xml create mode 100644 src/main/resources/sql/dev/id.sql create mode 100644 src/test/java/com/niuan/erp/ErpApplicationTests.java diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..8af972c --- /dev/null +++ b/.gitattributes @@ -0,0 +1,3 @@ +/gradlew text eol=lf +*.bat text eol=crlf +*.jar binary diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c2065bc --- /dev/null +++ b/.gitignore @@ -0,0 +1,37 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..513f5a1 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,74 @@ +plugins { + java + id("org.springframework.boot") version "3.5.9" + id("io.spring.dependency-management") version "1.1.7" +} + +group = "com.niuan" +version = "0.0.1-SNAPSHOT" +description = "erp" + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} + +configurations { + compileOnly { + extendsFrom(configurations.annotationProcessor.get()) + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation("org.springframework.boot:spring-boot-starter-actuator") + implementation("org.springframework.boot:spring-boot-starter-batch") + implementation("org.springframework.boot:spring-boot-starter-quartz") + implementation("org.springframework.boot:spring-boot-starter-security") + implementation("org.springframework.boot:spring-boot-starter-web") + implementation("org.springframework.boot:spring-boot-starter-websocket") + implementation("org.springframework.boot:spring-boot-starter-validation") + compileOnly("com.baomidou:mybatis-plus-spring-boot3-starter:3.5.16") + implementation("com.baomidou:mybatis-plus-jsqlparser:3.5.16") + developmentOnly("org.springframework.boot:spring-boot-devtools") + runtimeOnly("com.mysql:mysql-connector-j") + annotationProcessor("org.projectlombok:lombok") + testImplementation("org.springframework.boot:spring-boot-starter-test") + testImplementation("org.mybatis.spring.boot:mybatis-spring-boot-starter-test:3.0.5") + testImplementation("org.springframework.batch:spring-batch-test") + testImplementation("org.springframework.security:spring-security-test") + testRuntimeOnly("org.junit.platform:junit-platform-launcher") + + // lombok + compileOnly("org.projectlombok:lombok") + annotationProcessor("org.projectlombok:lombok") + // MapStruct + implementation("org.mapstruct:mapstruct:1.6.3") + annotationProcessor("org.mapstruct:mapstruct-processor:1.6.3") + // lombok 和 MapStruct 兼容类 + annotationProcessor("org.projectlombok:lombok-mapstruct-binding:0.2.0") + + // 内部缓存 + implementation("org.springframework.boot:spring-boot-starter-cache") + implementation("com.github.ben-manes.caffeine:caffeine") + + // jwt + implementation("io.jsonwebtoken:jjwt-api:0.13.0") + runtimeOnly("io.jsonwebtoken:jjwt-impl:0.13.0") + runtimeOnly("io.jsonwebtoken:jjwt-jackson:0.13.0") + + // api文档 + implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.15") + implementation("com.github.xiaoymin:knife4j-openapi3-jakarta-spring-boot-starter:4.5.0") + + // 日志 + implementation("org.zalando:logbook-spring-boot-starter:4.0.1") +} + +tasks.withType { + useJUnitPlatform() +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..1b33c55baabb587c669f562ae36f953de2481846 GIT binary patch literal 43764 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 '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH="\\\"\\\"" + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..db3a6ac --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH= + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..ec8bd9d --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "erp" diff --git a/src/main/java/com/niuan/erp/ErpApplication.java b/src/main/java/com/niuan/erp/ErpApplication.java new file mode 100644 index 0000000..a30eb6b --- /dev/null +++ b/src/main/java/com/niuan/erp/ErpApplication.java @@ -0,0 +1,17 @@ +package com.niuan.erp; + +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.scheduling.annotation.EnableAsync; + +@SpringBootApplication +@EnableAsync +@MapperScan(basePackages = "com.niuan.erp.module.*.mapper") +public class ErpApplication { + + public static void main(String[] args) { + SpringApplication.run(ErpApplication.class, args); + } + +} diff --git a/src/main/java/com/niuan/erp/common/annotation/ApiLog.java b/src/main/java/com/niuan/erp/common/annotation/ApiLog.java new file mode 100644 index 0000000..83dd207 --- /dev/null +++ b/src/main/java/com/niuan/erp/common/annotation/ApiLog.java @@ -0,0 +1,19 @@ +package com.niuan.erp.common.annotation; + +import com.niuan.erp.common.base.OperationType; + +import java.lang.annotation.*; + +/** + * 记录接口 API 的日志，包含类型和备注，记录功能模块的使用 {@link com.niuan.erp.common.annotation.ModuleLog} + */ +@Target(ElementType.METHOD) +@Retention(RetentionPolicy.RUNTIME) +@Documented +public @interface ApiLog { + + OperationType type(); + + String remark() default ""; + +} diff --git a/src/main/java/com/niuan/erp/common/annotation/ModuleLog.java b/src/main/java/com/niuan/erp/common/annotation/ModuleLog.java new file mode 100644 index 0000000..a07a481 --- /dev/null +++ b/src/main/java/com/niuan/erp/common/annotation/ModuleLog.java @@ -0,0 +1,14 @@ +package com.niuan.erp.common.annotation; + +import java.lang.annotation.*; + + +/** + * 记录日志中的功能模块，记录 API 接口的使用 {@link com.niuan.erp.common.annotation.ApiLog} + */ +@Target(ElementType.TYPE) +@Retention(RetentionPolicy.RUNTIME) +@Documented +public @interface ModuleLog { + String value(); +} diff --git a/src/main/java/com/niuan/erp/common/base/BaseDeleteBody.java b/src/main/java/com/niuan/erp/common/base/BaseDeleteBody.java new file mode 100644 index 0000000..691126e --- /dev/null +++ b/src/main/java/com/niuan/erp/common/base/BaseDeleteBody.java @@ -0,0 +1,8 @@ +package com.niuan.erp.common.base; + +import java.util.List; + +public record BaseDeleteBody( + Long id, + List ids +) {} diff --git a/src/main/java/com/niuan/erp/common/base/BasePageReqParams.java b/src/main/java/com/niuan/erp/common/base/BasePageReqParams.java new file mode 100644 index 0000000..490287f --- /dev/null +++ b/src/main/java/com/niuan/erp/common/base/BasePageReqParams.java @@ -0,0 +1,17 @@ +package com.niuan.erp.common.base; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; + +@Schema(description = "分页请求参数") +public record BasePageReqParams( + @Schema(description = "页码，从 0 开始", example = "0") + @NotNull(message = "validation.common.pageParams.page.notNull") + @Min(value = 0, message = "validation.common.pageParams.page.min") + int page, + @Schema(description = "页面大小", example = "10") + @NotNull(message = "validation.common.pageParams.pageSize.notNull") + @Min(value = 0, message = "validation.common.pageParams.pageSize.min") + int pageSize +) {} diff --git a/src/main/java/com/niuan/erp/common/base/BaseResult.java b/src/main/java/com/niuan/erp/common/base/BaseResult.java new file mode 100644 index 0000000..9c58ea3 --- /dev/null +++ b/src/main/java/com/niuan/erp/common/base/BaseResult.java @@ -0,0 +1,27 @@ +package com.niuan.erp.common.base; + +import com.niuan.erp.common.utils.MessageUtils; + + +public record BaseResult(int code, String msg, T data) { + + public static BaseResult success() { + return success(MessageUtils.get("result.success")); + } + + public static BaseResult successWithData(T data) { + return new BaseResult(0, MessageUtils.get("result.success"), data); + } + + public static BaseResult success(String msg) { + return new BaseResult(0, msg, null); + } + + public static BaseResult error() { + return BaseResult.error(500, MessageUtils.get("result.error")); + } + + public static BaseResult error(int code, String msg) { + return new BaseResult(code, msg, null); + } +} diff --git a/src/main/java/com/niuan/erp/common/base/BaseStatus.java b/src/main/java/com/niuan/erp/common/base/BaseStatus.java new file mode 100644 index 0000000..4bba198 --- /dev/null +++ b/src/main/java/com/niuan/erp/common/base/BaseStatus.java @@ -0,0 +1,31 @@ +package com.niuan.erp.common.base; + +import com.baomidou.mybatisplus.annotation.IEnum; +import lombok.Getter; + +@Getter +public enum BaseStatus implements IEnum { + ENABLE(0, "启用"), + DISABLE(1, "禁用"); + final int code; + final String description; + BaseStatus(int code, String description) { + this.code = code; + this.description = description; + } + + /** + * code 只能是 0 和 1 + * @param code + * @return + */ + public static BaseStatus fromCode(int code) { + return BaseStatus.values()[code]; + } + + + @Override + public Integer getValue() { + return code; + } +} diff --git a/src/main/java/com/niuan/erp/common/base/BaseStatusBody.java b/src/main/java/com/niuan/erp/common/base/BaseStatusBody.java new file mode 100644 index 0000000..dd1b470 --- /dev/null +++ b/src/main/java/com/niuan/erp/common/base/BaseStatusBody.java @@ -0,0 +1,15 @@ +package com.niuan.erp.common.base; + +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; + +public record BaseStatusBody( + @NotNull(message = "validation.common.status.idNull") + Long id, + @NotNull(message = "validation.common.status.notNull") + @Max(value = 1, message = "validation.common.status.valueError") + @Min(value = 0, message = "validation.common.status.valueError") + Integer status +) { +} diff --git a/src/main/java/com/niuan/erp/common/base/BaseTree.java b/src/main/java/com/niuan/erp/common/base/BaseTree.java new file mode 100644 index 0000000..00cef6a --- /dev/null +++ b/src/main/java/com/niuan/erp/common/base/BaseTree.java @@ -0,0 +1,14 @@ +package com.niuan.erp.common.base; + +import lombok.AllArgsConstructor; +import lombok.Data; + +import java.util.List; + +@Data +@AllArgsConstructor +public class BaseTree { + Object id; + String label; + List children; +} diff --git a/src/main/java/com/niuan/erp/common/base/CommonValidateGroup.java b/src/main/java/com/niuan/erp/common/base/CommonValidateGroup.java new file mode 100644 index 0000000..6e48886 --- /dev/null +++ b/src/main/java/com/niuan/erp/common/base/CommonValidateGroup.java @@ -0,0 +1,14 @@ +package com.niuan.erp.common.base; + +public interface CommonValidateGroup { + + interface Get {} + + interface Add {} + + interface Update {} + + interface DeleteOne {} + + interface DeleteBatch {} +} diff --git a/src/main/java/com/niuan/erp/common/base/LoginUser.java b/src/main/java/com/niuan/erp/common/base/LoginUser.java new file mode 100644 index 0000000..a1b3ff0 --- /dev/null +++ b/src/main/java/com/niuan/erp/common/base/LoginUser.java @@ -0,0 +1,41 @@ +package com.niuan.erp.common.base; + +import com.niuan.erp.module.sys.entity.SysRole; +import com.niuan.erp.module.sys.entity.SysUser; +import lombok.Builder; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; + +import java.util.Collection; +import java.util.List; + +@Getter +@Setter +@Builder +@ToString +public class LoginUser implements UserDetails { + + private SysUser user; + + private List roleList; + + private List authorities; + + @Override + public Collection getAuthorities() { + return authorities; + } + + @Override + public String getPassword() { + return user.getPassWord(); + } + + @Override + public String getUsername() { + return user.getUserName(); + } +} diff --git a/src/main/java/com/niuan/erp/common/base/OperationType.java b/src/main/java/com/niuan/erp/common/base/OperationType.java new file mode 100644 index 0000000..72118cc --- /dev/null +++ b/src/main/java/com/niuan/erp/common/base/OperationType.java @@ -0,0 +1,44 @@ +package com.niuan.erp.common.base; + +import com.baomidou.mybatisplus.annotation.IEnum; +import com.niuan.erp.common.exception.BusinessException; +import lombok.Getter; + +import java.util.Arrays; + +/** + * 接口日志中辨别操作的枚举 + */ +@Getter +public enum OperationType implements IEnum { + ADD(1, "添加"), + UPDATE(2, "修改"), + DELETE(3, "删除"), + ENABLE(4, "启用"), + DISABLE(5, "禁用"), + RECYCLE(6, "回收"), + RESTORE(7, "还原"), + LOGIN(8, "登录"), + LOGOUT(9, "退出"), + OTHER(10, "其他"); + + final int code; + final String description; + + OperationType(int code, String description) { + this.code = code; + this.description = description; + } + + public static OperationType fromCode(int code) { + return Arrays.stream(OperationType.values()) + .filter(e -> e.getCode() == code) + .findFirst() + .orElseThrow(() -> new BusinessException("sys.operationType.codeNotExists")); + } + + @Override + public Integer getValue() { + return code; + } +} diff --git a/src/main/java/com/niuan/erp/common/bean/Md5PasswordEncoder.java b/src/main/java/com/niuan/erp/common/bean/Md5PasswordEncoder.java new file mode 100644 index 0000000..67890cf --- /dev/null +++ b/src/main/java/com/niuan/erp/common/bean/Md5PasswordEncoder.java @@ -0,0 +1,34 @@ +package com.niuan.erp.common.bean; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Component; + +import java.nio.charset.StandardCharsets; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.HexFormat; + +@Component +public class Md5PasswordEncoder implements PasswordEncoder { + + @Value("${erp.encrypt.md5-salt}") + private String md5Salt; + + private final MessageDigest messageDigest = MessageDigest.getInstance("MD5"); + + public Md5PasswordEncoder() throws NoSuchAlgorithmException { + } + + @Override + public String encode(CharSequence rawPassword) { + byte[] md5 = messageDigest.digest("%s_%s".formatted(md5Salt, rawPassword).getBytes(StandardCharsets.UTF_8)); + return HexFormat.of().formatHex(md5); + } + + @Override + public boolean matches(CharSequence rawPassword, String encodedPassword) { + System.out.printf("对比密码：未加密密码[%s]，加密后[%s]，对比的加密码[%s]%n", rawPassword, encode(rawPassword), encodedPassword); + return encodedPassword.equals(encode(rawPassword)); + } +} diff --git a/src/main/java/com/niuan/erp/common/bean/SysLogInterceptor.java b/src/main/java/com/niuan/erp/common/bean/SysLogInterceptor.java new file mode 100644 index 0000000..107a120 --- /dev/null +++ b/src/main/java/com/niuan/erp/common/bean/SysLogInterceptor.java @@ -0,0 +1,116 @@ +package com.niuan.erp.common.bean; + +import com.niuan.erp.common.annotation.ApiLog; +import com.niuan.erp.common.annotation.ModuleLog; +import com.niuan.erp.common.utils.OperationContext; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import org.jspecify.annotations.Nullable; +import org.springframework.stereotype.Component; +import org.springframework.web.method.HandlerMethod; +import org.springframework.web.servlet.HandlerInterceptor; +import org.springframework.web.servlet.ModelAndView; + +import java.net.Inet4Address; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.Arrays; +import java.util.List; + +@Component +public class SysLogInterceptor implements HandlerInterceptor { + + @Override + public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, + @Nullable ModelAndView modelAndView) throws Exception { + if (handler instanceof HandlerMethod hm) { + ModuleLog module = hm.getBeanType().getAnnotation(ModuleLog.class); + ApiLog methodLog = hm.getMethodAnnotation(ApiLog.class); + if (module != null && methodLog != null) { + OperationContext.set(module.value(), methodLog.type(), methodLog.remark(), getClientIpAddress(request)); + } + } + } + + private String getClientIpAddress(HttpServletRequest request) { + // 常见的代理头字段，按优先级顺序 + List headers = Arrays.asList( + "X-Forwarded-For", + "X-Real-IP", + "Proxy-Client-IP", + "WL-Proxy-Client-IP", + "HTTP_CLIENT_IP", + "HTTP_X_FORWARDED_FOR" + ); + + String ip = null; + + // 1. 从请求头中逐个尝试获取 + for (String header : headers) { + ip = request.getHeader(header); + if (ip != null && !ip.isEmpty() && !"unknown".equalsIgnoreCase(ip)) { + // X-Forwarded-For 可能是逗号分隔的多个 IP，取第一个非 unknown 的 + for (String candidate : ip.split(",")) { + candidate = candidate.trim(); + if (isValidIPv4(candidate)) { + return candidate; + } + } + } + } + + // 2. 如果头里没有有效 IPv4，尝试 getRemoteAddr() + ip = request.getRemoteAddr(); + if (isValidIPv4(ip)) { + return ip; + } + + // 3. 如果是 IPv6（比如 ::1 或 0:0:0:0:0:0:0:1），尝试映射或忽略 + if ("0:0:0:0:0:0:0:1".equals(ip) || "::1".equals(ip)) { + return "127.0.0.1"; + } + + // 4. 尝试解析为 InetAddress 并检查是否为 IPv4 + try { + InetAddress address = InetAddress.getByName(ip); + if (address instanceof Inet4Address) { + return address.getHostAddress(); + } + } catch (UnknownHostException ignored) { + // ignore + } + + // 5. 实在找不到合法 IPv4，返回 unknown + return "unknown"; + } + + /** + * 判断字符串是否为合法的 IPv4 地址（不含端口） + */ + private boolean isValidIPv4(String ip) { + if (ip == null || ip.isEmpty()) return false; + + // 快速排除明显非法字符 + if (!ip.matches("\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}")) { + return false; + } + + String[] parts = ip.split("\\."); + if (parts.length != 4) return false; + + for (String part : parts) { + try { + int num = Integer.parseInt(part); + if (num < 0 || num > 255) { + return false; + } + // 防止前导零（如 "01" 不是标准写法，但有些系统接受） + // 如果严格要求，可加：if (!String.valueOf(num).equals(part)) return false; + } catch (NumberFormatException e) { + return false; + } + } + + return true; + } +} diff --git a/src/main/java/com/niuan/erp/common/bean/SysLogSink.java b/src/main/java/com/niuan/erp/common/bean/SysLogSink.java new file mode 100644 index 0000000..28759f4 --- /dev/null +++ b/src/main/java/com/niuan/erp/common/bean/SysLogSink.java @@ -0,0 +1,77 @@ +package com.niuan.erp.common.bean; + +import com.niuan.erp.common.base.BaseStatus; +import com.niuan.erp.common.utils.OperationContext; +import com.niuan.erp.common.utils.SecurityUtils; +import com.niuan.erp.module.sys.entity.SysRecord; +import com.niuan.erp.module.sys.service.SysRecordService; +import lombok.RequiredArgsConstructor; +import lombok.SneakyThrows; +import org.springframework.stereotype.Component; +import org.zalando.logbook.*; + +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.time.LocalDateTime; + +@Component +@RequiredArgsConstructor +public class SysLogSink implements Sink { + + private final SysRecordService sysRecordService; + + @Override + public void write(Precorrelation precorrelation, HttpRequest request) throws IOException { + + } + + @Override + public void write(Correlation correlation, HttpRequest request, HttpResponse response) throws IOException { + try { + if (OperationContext.getOperationType() != null) + sysRecordService.addSysRecord(buildRecord(request, response)); + } catch (Exception e) { + throw e; + } finally { + OperationContext.clear(); + } + } + + public SysRecord buildRecord(HttpRequest request, HttpResponse response) { + var record = new SysRecord(); + // 用户信息 和 预处理 + record.setCreateUserId(SecurityUtils.getUserId()); + record.setCreateUserName(SecurityUtils.getUserName()); + record.setCreateDate(LocalDateTime.now()); + record.setStatus(BaseStatus.ENABLE.getCode()); + + // record 信息 + record.setChannelName(OperationContext.getModuleName()); + record.setRecordType(OperationContext.getOperationType().getCode()); + record.setRemark(OperationContext.getRemark()); + record.setIp(OperationContext.getIp()); + + record.setLinkUrl(request.getPath()); + record.setRequestParams(extractParams(request)); + record.setIsSuccess(response.getStatus() >= 200 && response.getStatus() < 400); + + return record; + } + + @SneakyThrows + private String extractParams(HttpRequest request) { + + String params; + + // Query 参数 + params = request.getQuery(); + + // Body（JSON） + if (request.getContentType() != null && + request.getContentType().contains("application/json")) { + params = new String(request.getBody(), StandardCharsets.UTF_8); + } + + return params; + } +} diff --git a/src/main/java/com/niuan/erp/common/bean/UrlPermissionAuthorizationManager.java b/src/main/java/com/niuan/erp/common/bean/UrlPermissionAuthorizationManager.java new file mode 100644 index 0000000..2683039 --- /dev/null +++ b/src/main/java/com/niuan/erp/common/bean/UrlPermissionAuthorizationManager.java @@ -0,0 +1,51 @@ +package com.niuan.erp.common.bean; + +import jakarta.servlet.http.HttpServletRequest; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.jspecify.annotations.Nullable; +import org.springframework.security.authorization.AuthorizationDecision; +import org.springframework.security.authorization.AuthorizationManager; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.web.access.intercept.RequestAuthorizationContext; +import org.springframework.stereotype.Component; +import org.springframework.util.AntPathMatcher; + +import java.util.function.Supplier; + +@Slf4j +@Component +@RequiredArgsConstructor +public class UrlPermissionAuthorizationManager implements AuthorizationManager { + + private final AntPathMatcher antPathMatcher = new AntPathMatcher(); + + @Override + public @Nullable AuthorizationDecision check(Supplier authentication, + RequestAuthorizationContext context) { + + HttpServletRequest request = context.getRequest(); + String requestURI = request.getRequestURI(); + if (antPathMatcher.match("/auth/user/me", requestURI)) { + return new AuthorizationDecision(true); + } + Authentication auth = authentication.get(); + log.info("数据库鉴权：{}", auth); + if (auth == null || !auth.isAuthenticated()) { + return new AuthorizationDecision(false); + } + + Object principal = auth.getPrincipal(); + if (principal instanceof UserDetails userDetails) { + for (GrantedAuthority grantedAuthority : userDetails.getAuthorities()) { + if (antPathMatcher.match(grantedAuthority.getAuthority(), requestURI)) { + return new AuthorizationDecision(true); + } + } + } + + return new AuthorizationDecision(false); + } +} diff --git a/src/main/java/com/niuan/erp/common/config/I18nConfig.java b/src/main/java/com/niuan/erp/common/config/I18nConfig.java new file mode 100644 index 0000000..683f119 --- /dev/null +++ b/src/main/java/com/niuan/erp/common/config/I18nConfig.java @@ -0,0 +1,20 @@ +package com.niuan.erp.common.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.stereotype.Component; +import org.springframework.web.servlet.LocaleResolver; +import org.springframework.web.servlet.i18n.AcceptHeaderLocaleResolver; + +import java.util.Locale; + +@Component +public class I18nConfig { + + @Bean + public LocaleResolver localeResolver() { + AcceptHeaderLocaleResolver localeResolver = new AcceptHeaderLocaleResolver(); + localeResolver.setDefaultLocale(Locale.CHINESE); + return localeResolver; + } + +} diff --git a/src/main/java/com/niuan/erp/common/config/MybatisConfig.java b/src/main/java/com/niuan/erp/common/config/MybatisConfig.java new file mode 100644 index 0000000..8eba77f --- /dev/null +++ b/src/main/java/com/niuan/erp/common/config/MybatisConfig.java @@ -0,0 +1,29 @@ +package com.niuan.erp.common.config; + +import com.baomidou.mybatisplus.annotation.DbType; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.autoconfigure.MybatisPlusPropertiesCustomizer; +import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class MybatisConfig { + + @Bean + public MybatisPlusInterceptor mybatisPlusInterceptor() { + MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); + interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); + return interceptor; + } + + @Bean + public MybatisPlusPropertiesCustomizer mybatisPlusPropertiesCustomizer() { + return properties -> { + properties.getGlobalConfig() + .getDbConfig() + .setIdType(IdType.AUTO); + }; + } +} diff --git a/src/main/java/com/niuan/erp/common/config/SecurityConfig.java b/src/main/java/com/niuan/erp/common/config/SecurityConfig.java new file mode 100644 index 0000000..2bba7d2 --- /dev/null +++ b/src/main/java/com/niuan/erp/common/config/SecurityConfig.java @@ -0,0 +1,156 @@ +package com.niuan.erp.common.config; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.niuan.erp.common.base.BaseResult; +import com.niuan.erp.common.base.LoginUser; +import com.niuan.erp.common.bean.UrlPermissionAuthorizationManager; +import lombok.RequiredArgsConstructor; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; +import org.springframework.http.HttpStatus; +import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.core.session.SessionRegistry; +import org.springframework.security.core.session.SessionRegistryImpl; +import org.springframework.security.web.SecurityFilterChain; +import org.springframework.security.web.session.ConcurrentSessionFilter; +import org.springframework.web.cors.CorsConfiguration; +import org.springframework.web.cors.CorsConfigurationSource; +import org.springframework.web.cors.UrlBasedCorsConfigurationSource; + +import java.util.List; + +@Configuration +@EnableWebSecurity // 启用 Web 安全 +@EnableMethodSecurity +@RequiredArgsConstructor +public class SecurityConfig { + + private final UrlPermissionAuthorizationManager urlPermissionAuthorizationManager; + + @Bean + public SecurityFilterChain filterChain(HttpSecurity http, SessionRegistry sessionRegistry) throws Exception { + http + // 👇 1. 启用 CSRF + .csrf(csrf -> csrf.disable()) + + .cors(cors -> cors.configurationSource(corsConfigurationSource())) + + // 👇 2. 设置 Session + .sessionManagement(session -> session + .maximumSessions(1) + .maxSessionsPreventsLogin(false) + .sessionRegistry(sessionRegistry)) + + // 👇 3. 请求授权规则 + .authorizeHttpRequests(authz -> authz + .requestMatchers( + "/v3/api-docs/**", "/v3/api-docs", + "/swagger-ui/**", + "/swagger-ui.html", + "/webjars/**", + "/doc.html", + "/favicon.ico").permitAll() + .anyRequest().authenticated() + ) + + // + .formLogin(form -> form + .loginProcessingUrl("/auth/login") // 指定登录提交地址 + .successHandler((request, response, authentication) -> { + // 登录成功：返回 JSON + response.setContentType("application/json;charset=UTF-8"); + LoginUser user = (LoginUser) authentication.getPrincipal(); + response.getWriter().write(new ObjectMapper().writeValueAsString(BaseResult.success())); + }) + .failureHandler((request, response, exception) -> { + // 登录失败：返回 JSON + response.setStatus(HttpStatus.OK.value()); + response.setContentType("application/json;charset=UTF-8"); + response.getWriter().write(new ObjectMapper().writeValueAsString(BaseResult.error(3, exception.getMessage()))); + }) + ) + .logout(logout -> logout + .logoutUrl("/auth/logout") + .invalidateHttpSession(true) + .deleteCookies("JSESSIONID") + .clearAuthentication(true) + .logoutSuccessHandler((request, response, authentication) -> { + response.setContentType("application/json;charset=UTF-8"); + response.getWriter().write(new ObjectMapper().writeValueAsString(BaseResult.success())); + }) + ) + + // 👇 6. 异常处理（认证失败 / 权限不足） + .exceptionHandling(ex -> ex + .authenticationEntryPoint((request, response, authException) -> { + response.setStatus(401); + response.getWriter().write("Unauthorized: " + authException.getMessage()); + }) + .accessDeniedHandler((request, response, accessDeniedException) -> { + response.setStatus(403); + response.getWriter().write("Forbidden: " + accessDeniedException.getMessage()); + }) + ); + + return http.build(); + } + + @Bean + public SessionRegistry sessionRegistry() { + return new SessionRegistryImpl(); + } + + @Bean + public ConcurrentSessionFilter concurrentSessionFilter(SessionRegistry sessionRegistry) { + return new ConcurrentSessionFilter(sessionRegistry); + } + + // 👇 提供 CORS 配置（生产环境请严格限制 origin） + @Bean + @Primary + public CorsConfigurationSource corsConfigurationSource() { + CorsConfiguration configuration = new CorsConfiguration(); + + // ✅ 允许的前端 origin（必须是具体地址，不能 *） + configuration.setAllowedOriginPatterns(List.of("http://localhost:*", "http://127.0.0.1:*")); + // ⚠️ 注意：Spring Boot 2.4+ 用 allowedOriginPatterns 支持通配符 + + // ✅ 允许凭证（Cookie） + configuration.setAllowCredentials(true); + + // 允许的方法和头 + configuration.setAllowedMethods(List.of("GET", "POST", "PUT", "DELETE", "OPTIONS")); + configuration.setAllowedHeaders(List.of("*")); + configuration.setExposedHeaders(List.of("Authorization", "Content-Disposition")); + + UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); + source.registerCorsConfiguration("/**", configuration); + return source; + } + + // 👇 密码编码器（必须） +// @Bean +// public PasswordEncoder passwordEncoder() { +// return md5PasswordEncoder; +// } + + // 👇 AuthenticationProvider（用于 DaoAuthenticationProvider） +// @Bean +// public AuthenticationProvider authenticationProvider() { +// DaoAuthenticationProvider authProvider = new DaoAuthenticationProvider(); +// authProvider.setUserDetailsService(userDetailsService); +// authProvider.setPasswordEncoder(passwordEncoder()); +// return authProvider; +// } + + // 👇 AuthenticationManager（用于登录时 authenticate） +// @Bean +// public AuthenticationManager authenticationManager( +// org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration config) +// throws Exception { +// return config.getAuthenticationManager(); +// } +} diff --git a/src/main/java/com/niuan/erp/common/config/ValidationConfig.java b/src/main/java/com/niuan/erp/common/config/ValidationConfig.java new file mode 100644 index 0000000..da7bf13 --- /dev/null +++ b/src/main/java/com/niuan/erp/common/config/ValidationConfig.java @@ -0,0 +1,27 @@ +package com.niuan.erp.common.config; + +import jakarta.validation.Validator; +import org.springframework.context.MessageSource; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean; +import org.springframework.validation.beanvalidation.MethodValidationPostProcessor; + +@Configuration +public class ValidationConfig { + + @Bean + public LocalValidatorFactoryBean validator(MessageSource messageSource) { + LocalValidatorFactoryBean bean = new LocalValidatorFactoryBean(); + bean.setValidationMessageSource(messageSource); + return bean; + } + + @Bean + public MethodValidationPostProcessor methodValidationPostProcessor(Validator validator) { + MethodValidationPostProcessor processor = new MethodValidationPostProcessor(); + processor.setValidator(validator); + return processor; + } + +} diff --git a/src/main/java/com/niuan/erp/common/config/WebMvcConfig.java b/src/main/java/com/niuan/erp/common/config/WebMvcConfig.java new file mode 100644 index 0000000..eb8276e --- /dev/null +++ b/src/main/java/com/niuan/erp/common/config/WebMvcConfig.java @@ -0,0 +1,15 @@ +package com.niuan.erp.common.config; + +import com.niuan.erp.common.bean.SysLogInterceptor; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.InterceptorRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@Configuration +public class WebMvcConfig implements WebMvcConfigurer { + + @Override + public void addInterceptors(InterceptorRegistry registry) { + registry.addInterceptor(new SysLogInterceptor()); + } +} diff --git a/src/main/java/com/niuan/erp/common/exception/BusinessException.java b/src/main/java/com/niuan/erp/common/exception/BusinessException.java new file mode 100644 index 0000000..0343c34 --- /dev/null +++ b/src/main/java/com/niuan/erp/common/exception/BusinessException.java @@ -0,0 +1,7 @@ +package com.niuan.erp.common.exception; + +public class BusinessException extends RuntimeException { + public BusinessException(String message) { + super(message); + } +} diff --git a/src/main/java/com/niuan/erp/common/exception/SystemException.java b/src/main/java/com/niuan/erp/common/exception/SystemException.java new file mode 100644 index 0000000..4d0aeed --- /dev/null +++ b/src/main/java/com/niuan/erp/common/exception/SystemException.java @@ -0,0 +1,7 @@ +package com.niuan.erp.common.exception; + +public class SystemException extends RuntimeException { + public SystemException(String message) { + super(message); + } +} diff --git a/src/main/java/com/niuan/erp/common/handler/GlobalExceptionHandler.java b/src/main/java/com/niuan/erp/common/handler/GlobalExceptionHandler.java new file mode 100644 index 0000000..61eb37c --- /dev/null +++ b/src/main/java/com/niuan/erp/common/handler/GlobalExceptionHandler.java @@ -0,0 +1,97 @@ +package com.niuan.erp.common.handler; + + +import com.niuan.erp.common.base.BaseResult; +import com.niuan.erp.common.exception.BusinessException; +import com.niuan.erp.common.exception.SystemException; +import lombok.RequiredArgsConstructor; +import org.springframework.context.MessageSource; +import org.springframework.http.ResponseEntity; +import org.springframework.http.converter.HttpMessageNotReadableException; +import org.springframework.web.bind.MethodArgumentNotValidException; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; + +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; + +@RestControllerAdvice +@RequiredArgsConstructor +public class GlobalExceptionHandler { + + private final MessageSource messageSource; + + /** + * 未传参数错误 + * @param e + * @param locale + * @return + */ + @ExceptionHandler(HttpMessageNotReadableException.class) + public ResponseEntity handleHttpMessageNotReadableException( + HttpMessageNotReadableException e, + Locale locale){ + return ResponseEntity.badRequest().body( + new BaseResult<>(1, + messageSource.getMessage("httpMessage.notNull", null, locale), + null)); + } + + /** + * 参数错误 + * @param e + * @param locale + * @return + */ + @ExceptionHandler(MethodArgumentNotValidException.class) + public ResponseEntity handleMethodArgumentNotValidException( + MethodArgumentNotValidException e, + Locale locale) { + Map errors = new HashMap<>(); + e.getBindingResult().getFieldErrors().forEach((fieldError) -> { + String msg = messageSource.getMessage(fieldError.getDefaultMessage(), null, fieldError.getDefaultMessage(), locale); + errors.put(fieldError.getField(), msg); + }); + return ResponseEntity.badRequest().body( + new BaseResult<>(2, + messageSource.getMessage("validated.error", null, locale), + errors)); + } + + /** + * 业务错误 + * @param e + * @param locale + * @return + */ + @ExceptionHandler(BusinessException.class) + public ResponseEntity handleBusinessException(BusinessException e, Locale locale) { + return ResponseEntity.ok().body( + BaseResult.error(3, messageSource.getMessage(e.getMessage(), null, locale))); + } + + /** + * 系统错误 + * @param e + * @param locale + * @return + */ + @ExceptionHandler(SystemException.class) + public ResponseEntity handleSystemException(SystemException e, Locale locale) { + return ResponseEntity.ok().body( + BaseResult.error(4, messageSource.getMessage(e.getMessage(), null, locale))); + } + +// /** +// * 通用错误 +// * @param e +// * @param locale +// * @return +// */ +// @ExceptionHandler(Exception.class) +// public ResponseEntity handleException(Exception e, Locale locale) { +// return ResponseEntity.badRequest().body( +// BaseResult.error(-1, e.getMessage())); +// } +} diff --git a/src/main/java/com/niuan/erp/common/utils/MessageUtils.java b/src/main/java/com/niuan/erp/common/utils/MessageUtils.java new file mode 100644 index 0000000..291d72a --- /dev/null +++ b/src/main/java/com/niuan/erp/common/utils/MessageUtils.java @@ -0,0 +1,24 @@ +package com.niuan.erp.common.utils; + +import org.springframework.context.MessageSource; +import org.springframework.stereotype.Component; + +import java.util.Locale; + +@Component +public class MessageUtils { + + private static MessageSource messageSource; + + public MessageUtils(MessageSource messageSource) { + MessageUtils.messageSource = messageSource; + } + + public static String get(String code, Object... args) { + try { + return messageSource.getMessage(code, args, Locale.getDefault()); + } catch (Exception ignored) {} + return code; + } + +} diff --git a/src/main/java/com/niuan/erp/common/utils/OperationContext.java b/src/main/java/com/niuan/erp/common/utils/OperationContext.java new file mode 100644 index 0000000..e8c02e5 --- /dev/null +++ b/src/main/java/com/niuan/erp/common/utils/OperationContext.java @@ -0,0 +1,36 @@ +package com.niuan.erp.common.utils; + +import com.niuan.erp.common.base.OperationType; + +public class OperationContext { + + private static final ThreadLocal contextHolder = new ThreadLocal<>(); + + public static void set(String moduleName, OperationType operationType, String remark, String ip) { + contextHolder.set(new Context(moduleName, operationType, remark, ip)); + } + + public static String getModuleName() { + return contextHolder.get().moduleName; + } + + public static OperationType getOperationType() { + return contextHolder.get() == null ? null : contextHolder.get().operationType; + } + + public static String getRemark() { + return contextHolder.get().remark; + } + + public static String getIp() { + return contextHolder.get().ip; + } + + public static void clear() { + contextHolder.remove(); + } + + + public record Context(String moduleName, OperationType operationType, String remark, String ip) {} + +} diff --git a/src/main/java/com/niuan/erp/common/utils/SecurityUtils.java b/src/main/java/com/niuan/erp/common/utils/SecurityUtils.java new file mode 100644 index 0000000..b7496df --- /dev/null +++ b/src/main/java/com/niuan/erp/common/utils/SecurityUtils.java @@ -0,0 +1,32 @@ +package com.niuan.erp.common.utils; + +import com.niuan.erp.common.base.LoginUser; +import com.niuan.erp.common.exception.BusinessException; +import com.niuan.erp.common.exception.SystemException; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; + +public class SecurityUtils { + + public static LoginUser getLoginUser() { + Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); + if (authentication == null || !authentication.isAuthenticated()) { + throw new BusinessException("auth.unLogin"); + } + Object principal = authentication.getPrincipal(); + System.out.println(principal); + if (principal instanceof LoginUser user) { + return user; + } + throw new SystemException("auth.userDetailsError"); + } + + public static Long getUserId(){ + return getLoginUser().getUser().getId(); + } + + public static String getUserName(){ + return getLoginUser().getUsername(); + } + +} diff --git a/src/main/java/com/niuan/erp/common/utils/SystemAuthFactory.java b/src/main/java/com/niuan/erp/common/utils/SystemAuthFactory.java new file mode 100644 index 0000000..71df947 --- /dev/null +++ b/src/main/java/com/niuan/erp/common/utils/SystemAuthFactory.java @@ -0,0 +1,176 @@ +package com.niuan.erp.common.utils; + +import com.niuan.erp.module.auth.controller.dto.ButtonProp; +import com.niuan.erp.module.auth.controller.dto.RouterConfigRaw; +import com.niuan.erp.module.auth.controller.dto.RouterConfigRawMeta; +import com.niuan.erp.module.sys.entity.SysChannel; + +import java.util.*; + +/** + * 生成数据库菜单对应的前端菜单数据 + */ +public class SystemAuthFactory { + + + private static final Long ROOT_ID = 0L; + + private static final Integer MENU_TYPE = 0; + + private static final Integer BUTTON_TYPE = 1; + + /** + * 生成 Teek 框架的前端动态菜单数据 + * @param sysChannels + * @return + */ + public static List generateTeekFrameMenu(List sysChannels) { + List configList = new ArrayList<>(); + + HashMap configMap = new HashMap<>(); + resolveTeekMenu(sysChannels, configList, configMap); + resolveButtonAuth(sysChannels, configMap); + improveRouteConfig(configList, ""); + return configList; + } + + /** + * 解析权限表内的按钮权限，要在解析完菜单才能执行 + * @param sysChannels + * @param configMap + */ + private static void resolveButtonAuth(List sysChannels, HashMap configMap) { + sysChannels.stream().filter(s -> Objects.equals(s.getChannelType(), BUTTON_TYPE)) + .forEach(sysChannel -> { + var buttonProp = convertToButtonProp(sysChannel); + var menuConfig = configMap.get(sysChannel.getParentId()); + if (menuConfig != null) { + if (sysChannel.getIsButtonShow()) { + saveInButtonAuthList(menuConfig.getMeta().getButtonAuth(), buttonProp); + } + if (sysChannel.getIsToolShow()) { + saveInButtonAuthList(menuConfig.getMeta().getToolButtonAuth(), buttonProp); + } + } + }); + } + + /** + * 解析权限表里的菜单权限，将其生成前端 TeekFrame 框架的菜单树 + * @param sysChannels + * @param configList + * @param configMap + */ + private static void resolveTeekMenu(List sysChannels, + List configList, + Map configMap) { + sysChannels.stream().filter(s -> Objects.equals(s.getChannelType(), MENU_TYPE)) + .forEach(sysChannel -> { + var config = convertToRouterConfigRaw(sysChannel); + if (Objects.equals(sysChannel.getParentId(), ROOT_ID)) { + // 如果是顶级节点则加入最后结果 + configList.add(config); + // 将自身添加进 Map 中 + saveInConfigMap(config, sysChannel.getId(), configMap); + } else { + // 如果不是是顶级节点则说明有上级节点 + // 先添加到父组件 + if (configMap.containsKey(sysChannel.getParentId())) { + // 如果 Map 里有保存这个内容，说明已经被作为父组件 + var parentConfig = configMap.get(sysChannel.getParentId()); + if (parentConfig.getChildren() != null) parentConfig.getChildren().add(config); + else parentConfig.setChildren(new ArrayList<>(List.of(config))); + } else { + // 如果 Map 没有父节点则缓存一个父节点 + var parentConfig = new RouterConfigRaw(null, null); + parentConfig.setChildren(new ArrayList<>(List.of(config))); + configMap.put(sysChannel.getParentId(), parentConfig); + } + // 接着将自身添加进 Map 中 + saveInConfigMap(config, sysChannel.getId(), configMap); + } + }); + } + + /** + * 完善路径和组件模块 + * @param configList + * @param path + */ + private static void improveRouteConfig(List configList, String path) { + configList.forEach(config -> { + if (config.getChildren() == null) { + // 设置组件 + config.setComponent("%s/%s".formatted(path, config.getPath())); + } else { + improveRouteConfig(config.getChildren(), "%s/%s".formatted(path, config.getName())); + } + // 设置路径 + config.setPath("%s/%s".formatted(path, config.getName())); + }); + } + + private static void saveInButtonAuthList(List buttonList, ButtonProp buttonProp) { + if (buttonList.isEmpty()) { + buttonList.add(buttonProp); + } else { + for (int i = 0; i < buttonList.size(); i++) { + if (buttonList.get(i).getRank() > buttonProp.getRank()) { + buttonList.add(i, buttonProp); + return; + } + } + buttonList.add(buttonProp); + } + } + + private static void saveInConfigMap(RouterConfigRaw config, long id, Map configMap) { + if (configMap.containsKey(id)) { + // 如果 Map 里有保存自身，则说明自身已经是别人的父节点，将子节点的数据保存 + var tempConfig = configMap.get(id); + config.setChildren(tempConfig.getChildren()); + } + configMap.put(id, config); + } + + /** + * 转化成权限按钮属性，里面包含按钮的各项属性 + * @param sysChannel + * @return + */ + private static ButtonProp convertToButtonProp(SysChannel sysChannel) { + ButtonProp buttonProp = new ButtonProp(); + buttonProp.setButtonName(sysChannel.getChannelLink()); + buttonProp.setText(sysChannel.getChannelName()); + buttonProp.setEventName(sysChannel.getEventName()); + buttonProp.setColorType(TeekFrameMappingUtils.getTeekButtonType(sysChannel.getClassName())); + buttonProp.setIcon(TeekFrameMappingUtils.getTeekFrameIcon(sysChannel.getIconName())); + buttonProp.setRank(sysChannel.getSort()); + return buttonProp; + } + + /** + * 转化成 初始化的 RouterConfigRaw，需要进一步完善才能匹配前端框架 + * @param sysChannel + * @return + */ + private static RouterConfigRaw convertToRouterConfigRaw(SysChannel sysChannel) { + // 使用 channelLink 和 eventName 来作为菜单路径和名字 + RouterConfigRaw config = new RouterConfigRaw(sysChannel.getChannelLink(), sysChannel.getEventName()); + RouterConfigRawMeta meta = new RouterConfigRawMeta(); + + // 设置 i18n 的位置 + meta.setTitle("{{ _route.%s }}".formatted(sysChannel.getEventName())); + // 设置排序 + meta.setRank(sysChannel.getSort()); + // 设置图标 + meta.setIcon(TeekFrameMappingUtils.getTeekFrameIcon(sysChannel.getIconName())); + // 设置是否隐藏图标 + meta.setHideInMenu(!sysChannel.getIsMenuShow()); + + config.setMeta(meta); + return config; + } + + +} diff --git a/src/main/java/com/niuan/erp/common/utils/TeekFrameMappingUtils.java b/src/main/java/com/niuan/erp/common/utils/TeekFrameMappingUtils.java new file mode 100644 index 0000000..eb2d1ae --- /dev/null +++ b/src/main/java/com/niuan/erp/common/utils/TeekFrameMappingUtils.java @@ -0,0 +1,26 @@ +package com.niuan.erp.common.utils; + +import java.util.HashMap; +import java.util.Map; + +public class TeekFrameMappingUtils { + + private static final Map ICON_MAP = new HashMap<>(); + + private static final Map BUTTON_TYPE_MAP = new HashMap<>(); + + static { + BUTTON_TYPE_MAP.put("layui-btn-danger", "danger"); + } + + public static String getTeekFrameIcon(String databaseIcon) { + if (ICON_MAP.containsKey(databaseIcon)) return ICON_MAP.get(databaseIcon); + return databaseIcon; + } + + public static String getTeekButtonType(String databaseButtonType) { + if (BUTTON_TYPE_MAP.containsKey(databaseButtonType)) return BUTTON_TYPE_MAP.get(databaseButtonType); + return databaseButtonType; + } + +} diff --git a/src/main/java/com/niuan/erp/common/utils/TreeUtils.java b/src/main/java/com/niuan/erp/common/utils/TreeUtils.java new file mode 100644 index 0000000..271f349 --- /dev/null +++ b/src/main/java/com/niuan/erp/common/utils/TreeUtils.java @@ -0,0 +1,48 @@ +package com.niuan.erp.common.utils; + +import com.niuan.erp.common.base.BaseTree; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.function.Function; + +public class TreeUtils { + + public static List generateTree(List nodeList, + Function getIdFunc, + Function getLabelFunc, + Function getParentIdFunc, + Object rootId) { + HashMap map = new HashMap<>(); + List rootList = new ArrayList<>(); + nodeList.forEach(node -> { + Object id = getIdFunc.apply(node); + String label = getLabelFunc.apply(node); + Object parentId = getParentIdFunc.apply(node); + BaseTree treeNode = new BaseTree(id, label, null); + // 检查是不是顶级 Node + if (rootId.equals(parentId)) { + rootList.add(treeNode); + } + // 添加父节点 + if (map.containsKey(parentId)) { + if (map.get(parentId).getChildren() != null) map.get(parentId).getChildren().add(treeNode); + else map.get(parentId).setChildren(new ArrayList<>(List.of(treeNode))); + } else { + map.put(parentId, new BaseTree(parentId, null, new ArrayList<>(List.of(treeNode)))); + } + + // 判断自己 + if (!map.containsKey(id)) { + map.put(id, treeNode); + } else { + treeNode.setChildren(map.get(id).getChildren()); + map.put(id, treeNode); + } + }); + System.out.println(rootList); + return rootList; + } + +} diff --git a/src/main/java/com/niuan/erp/module/auth/controller/LoginController.java b/src/main/java/com/niuan/erp/module/auth/controller/LoginController.java new file mode 100644 index 0000000..e69086b --- /dev/null +++ b/src/main/java/com/niuan/erp/module/auth/controller/LoginController.java @@ -0,0 +1,18 @@ +package com.niuan.erp.module.auth.controller; + + +import com.niuan.erp.common.base.BaseResult; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RequestMapping("/auth") +@RestController +public class LoginController { + + @GetMapping("/user/me") + public BaseResult getCurrentUser() { + return BaseResult.success(); + } + +} diff --git a/src/main/java/com/niuan/erp/module/auth/controller/SystemAuthController.java b/src/main/java/com/niuan/erp/module/auth/controller/SystemAuthController.java new file mode 100644 index 0000000..1436047 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/auth/controller/SystemAuthController.java @@ -0,0 +1,22 @@ +package com.niuan.erp.module.auth.controller; + +import com.niuan.erp.common.base.BaseResult; +import com.niuan.erp.module.auth.service.SystemAuthService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/auth") +@RequiredArgsConstructor +public class SystemAuthController { + + private final SystemAuthService systemAuthService; + + @GetMapping("/getRouterConfigRawList") + public BaseResult getRouterConfigRawList() { + return BaseResult.successWithData(systemAuthService.getRouterConfigRawList()); + } + +} diff --git a/src/main/java/com/niuan/erp/module/auth/controller/dto/ButtonProp.java b/src/main/java/com/niuan/erp/module/auth/controller/dto/ButtonProp.java new file mode 100644 index 0000000..645fa4b --- /dev/null +++ b/src/main/java/com/niuan/erp/module/auth/controller/dto/ButtonProp.java @@ -0,0 +1,31 @@ +package com.niuan.erp.module.auth.controller.dto; + +import lombok.Data; + +@Data +public class ButtonProp { + /** + * 按钮文本 + */ + private String text; + /** + * 按钮名称 + */ + private String buttonName; + /** + * 事件名称 + */ + private String eventName; + /** + * 按钮类型 + */ + private String colorType; + /** + * 按钮标签 + */ + private String icon; + /** + * 排序 + */ + private Integer rank; +} diff --git a/src/main/java/com/niuan/erp/module/auth/controller/dto/LoginDto.java b/src/main/java/com/niuan/erp/module/auth/controller/dto/LoginDto.java new file mode 100644 index 0000000..7e2e3d6 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/auth/controller/dto/LoginDto.java @@ -0,0 +1,10 @@ +package com.niuan.erp.module.auth.controller.dto; + +import jakarta.validation.constraints.NotNull; + +public record LoginDto( + @NotNull(message = "{loginName.notNull}") + String loginName, + @NotNull(message = "{password.notNull}") + String password +) {} diff --git a/src/main/java/com/niuan/erp/module/auth/controller/dto/RouterConfigRaw.java b/src/main/java/com/niuan/erp/module/auth/controller/dto/RouterConfigRaw.java new file mode 100644 index 0000000..948c085 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/auth/controller/dto/RouterConfigRaw.java @@ -0,0 +1,57 @@ +package com.niuan.erp.module.auth.controller.dto; + + +import com.fasterxml.jackson.annotation.JsonInclude; +import lombok.Getter; +import lombok.Setter; + +import java.util.List; + +/** + * 前端路由配置项 + */ +@Getter +@Setter +public class RouterConfigRaw { + + /** + * 路由地址，必须设置 + */ + private String path; + + /** + * 路由名字，必须设置 + */ + private String name; + + /** + * 重定向 + */ + @JsonInclude(JsonInclude.Include.NON_NULL) + private String redirect; + + /** + * 视图文件路径 + */ + @JsonInclude(JsonInclude.Include.NON_NULL) + private String component; + + /** + * 菜单信息 + */ + @JsonInclude(JsonInclude.Include.NON_NULL) + private RouterConfigRawMeta meta; + + /** + * 子菜单 + */ + @JsonInclude(JsonInclude.Include.NON_NULL) + private List children; + + private RouterConfigRaw() {} + + public RouterConfigRaw(String path, String name) { + this.path = path; + this.name = name; + } +} diff --git a/src/main/java/com/niuan/erp/module/auth/controller/dto/RouterConfigRawMeta.java b/src/main/java/com/niuan/erp/module/auth/controller/dto/RouterConfigRawMeta.java new file mode 100644 index 0000000..4d68979 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/auth/controller/dto/RouterConfigRawMeta.java @@ -0,0 +1,139 @@ +package com.niuan.erp.module.auth.controller.dto; + +import com.fasterxml.jackson.annotation.JsonInclude; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * 菜单信息 + */ +@Data +@JsonInclude(JsonInclude.Include.NON_NULL) +public class RouterConfigRawMeta { + + /** + * 可访问该页面的权限数组，会影响子路由 + */ + private List roles; + + /** + * 路由内的按钮权限 + */ + private List auths; + + /** + * 如果使用 {{ 字段 }} 表示，则前端会使用该字段的 i18n + */ + private String title; + + /** + * 菜单图标 + */ + private String icon; + + /** + * 是否允许点击面包屑，如果是 true，则不允许点击，默认 false + */ + private Boolean notClickBread; + + /** + * 不放在面包屑里，默认为 false + */ + private Boolean hideInBread; + + /** + * 不添加在左侧菜单栏，默认为 false + */ + private Boolean hideInMenu; + + /** + * 是否渲染为菜单，如果为 true，一级菜单永远是下拉菜单； + * 如果是 false，只有一个二级菜单时，不显示一级菜单，直接显示二级菜单。 + * 默认为 false + */ + private Boolean alwaysShowRoot; + + /** + * 不渲染 Layout 布局，只渲染当前路由组件 + */ + private Boolean isFull; + + /** + * Restful 路由搭配使用（未使用） + */ + private Boolean activeMenu; + + /** + * (未使用） + */ + private Boolean beforeCloseName; + + /** + * 排序，没有时根据顺序 + */ + private Integer rank; + + /** + * IFrame 链接（未使用） + */ + private String iframeSrc; + + /** + * 是否开启首次加载动画，默认 true（未使用） + */ + private Boolean iframeLoading; + + // IFrame 页是否开启缓存（默认 false） + private Boolean iframeKeepAlive; + + // IFrame 页是否开新标签页打开，true 以新标签页打开，false 不打开（默认 false） + private Boolean iframeOpen; + + // 页面加载动画，即 Transition 组件的 Props（有两种形式，一种直接采用 vue 内置的 transitions 动画，另一种是使用 animate.css 写进、离场动画） + private Object transitionProps; + + // 是否不添加到标签栏，默认 false + private Boolean hideInTab; + + // 动态路由可打开的最大数量，默认为空 + private Integer dynamicLevel; + + // 是否开启 i18n。默认读取全局的 routeUseI18n（src/config/base-config.ts） + private Boolean useI18n; + + // 菜单的文字超出后，是否使用 el-toolTip 提示，仅针对二级路由及以上生效。默认读取全局的 routeUseTooltip（src/config/base-config.ts） + private Boolean useTooltip; + + // 自定义 Render 菜单元素（TSX 语法） + private Object render; + + // 菜单标签，使用 ElTag 组件 + private String tagText; + + // 菜单标签的属性，即 ElTag 组件的 props + private Object tagProps; + + // 是否显示点标记 + private Boolean pointTag; + + // 点标记的属性，即 PointTag 组件的 props + private String pointTagProps; + + // 菜单可以看到，但是访问会被重定向到 403 + private Boolean menuVisibleWithForbidden; + + // 查询参数，Teek 不做任何处理，自行取出处理 + private String query; + + /** + * 表头 Button 权限 + */ + private List buttonAuth = new ArrayList<>(); + + /** + * 操作栏 Button 权限 + */ + private List toolButtonAuth = new ArrayList<>(); +} diff --git a/src/main/java/com/niuan/erp/module/auth/service/CustomUserDetailsService.java b/src/main/java/com/niuan/erp/module/auth/service/CustomUserDetailsService.java new file mode 100644 index 0000000..f500249 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/auth/service/CustomUserDetailsService.java @@ -0,0 +1,72 @@ +package com.niuan.erp.module.auth.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.github.benmanes.caffeine.cache.Caffeine; +import com.github.benmanes.caffeine.cache.LoadingCache; +import com.niuan.erp.common.base.LoginUser; +import com.niuan.erp.common.exception.BusinessException; +import com.niuan.erp.module.sys.entity.SysChannel; +import com.niuan.erp.module.sys.entity.SysRole; +import com.niuan.erp.module.sys.entity.SysUser; +import com.niuan.erp.module.sys.mapper.SysChannelMapper; +import com.niuan.erp.module.sys.mapper.SysRoleMapper; +import com.niuan.erp.module.sys.mapper.SysUserMapper; +import lombok.RequiredArgsConstructor; +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.core.userdetails.UsernameNotFoundException; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.StringUtils; + +import java.time.Duration; +import java.util.List; + +@Service +@Transactional +@RequiredArgsConstructor +public class CustomUserDetailsService implements UserDetailsService { + + private final SysUserMapper sysUserMapper; + + private final SysChannelMapper sysChannelMapper; + + private final SysRoleMapper sysRoleMapper; + + private final LoadingCache userCache = Caffeine.newBuilder() + .maximumSize(100) + .expireAfterWrite(Duration.ofMinutes(10)) + .build(this::loadUserFromDatabase); + + @Override + public UserDetails loadUserByUsername(String loginName) throws UsernameNotFoundException { + return userCache.get(loginName); + } + + private UserDetails loadUserFromDatabase(String loginName) { + SysUser user = sysUserMapper.selectOne(new LambdaQueryWrapper() + .eq(SysUser::getLoginName, loginName) + .eq(SysUser::getStatus, 1)); + if (user == null) { + throw new BusinessException(""); + } + List roleList = sysRoleMapper.selectByUserId(user.getId()); + List channelList = sysChannelMapper.selectByUserId(user.getId()); + List authorityList = channelList.stream() + .map(SysChannel::getChannelLink) + .filter(StringUtils::hasText) + .toList(); + return LoginUser.builder() + .user(user) + .roleList(roleList) + .authorities(List.of(new SimpleGrantedAuthority("vendor:index"))) + .build(); + } + + public void evictUserCache(String loginName) { + userCache.invalidate(loginName); + } + + +} diff --git a/src/main/java/com/niuan/erp/module/auth/service/SystemAuthService.java b/src/main/java/com/niuan/erp/module/auth/service/SystemAuthService.java new file mode 100644 index 0000000..fae883e --- /dev/null +++ b/src/main/java/com/niuan/erp/module/auth/service/SystemAuthService.java @@ -0,0 +1,11 @@ +package com.niuan.erp.module.auth.service; + +import com.niuan.erp.module.auth.controller.dto.RouterConfigRaw; + +import java.util.List; + +public interface SystemAuthService { + + List getRouterConfigRawList(); + +} diff --git a/src/main/java/com/niuan/erp/module/auth/service/impl/SystemAuthServiceImpl.java b/src/main/java/com/niuan/erp/module/auth/service/impl/SystemAuthServiceImpl.java new file mode 100644 index 0000000..d1bdca6 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/auth/service/impl/SystemAuthServiceImpl.java @@ -0,0 +1,27 @@ +package com.niuan.erp.module.auth.service.impl; + +import com.niuan.erp.common.base.LoginUser; +import com.niuan.erp.common.utils.SecurityUtils; +import com.niuan.erp.common.utils.SystemAuthFactory; +import com.niuan.erp.module.auth.controller.dto.RouterConfigRaw; +import com.niuan.erp.module.auth.service.SystemAuthService; +import com.niuan.erp.module.sys.entity.SysChannel; +import com.niuan.erp.module.sys.mapper.SysChannelMapper; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +@RequiredArgsConstructor +public class SystemAuthServiceImpl implements SystemAuthService { + + private final SysChannelMapper sysChannelMapper; + + @Override + public List getRouterConfigRawList() { + LoginUser loginUser = SecurityUtils.getLoginUser(); + List sysChannels = sysChannelMapper.selectByUserId(loginUser.getUser().getId()); + return SystemAuthFactory.generateTeekFrameMenu(sysChannels); + } +} diff --git a/src/main/java/com/niuan/erp/module/common/controller/QtCodeController.java b/src/main/java/com/niuan/erp/module/common/controller/QtCodeController.java new file mode 100644 index 0000000..6a5e54a --- /dev/null +++ b/src/main/java/com/niuan/erp/module/common/controller/QtCodeController.java @@ -0,0 +1,68 @@ +package com.niuan.erp.module.common.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.base.BaseDeleteBody; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.base.BaseResult; +import com.niuan.erp.common.base.CommonValidateGroup.*; +import com.niuan.erp.module.common.controller.dto.QtCodeDto; +import com.niuan.erp.module.common.entity.QtCode; +import com.niuan.erp.module.common.service.QtCodeService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +@Tag(name = "QtCode") +@RestController +@RequestMapping("/common/qtcode") +@RequiredArgsConstructor +public class QtCodeController { + + private final QtCodeService qtCodeService; + + @Operation(summary = "分页查询QtCode数据", operationId = "getQtCodePage") + @GetMapping("/getQtCodePage") + @PreAuthorize("hasAuthority('qtcode:index')") + public BaseResult> getQtCodePage(@Validated BasePageReqParams pageParams, + @Validated(Get.class) QtCodeDto searchParams) { + var wrapper = new LambdaQueryWrapper(); + return BaseResult.successWithData(qtCodeService.getQtCodePage(pageParams, wrapper)); + } + + + @Operation(summary = "新增QtCode", operationId = "addQtCode") + @PostMapping("/addQtCode") + @PreAuthorize("hasAuthority('qtcode:add')") + public BaseResult addQtCode(@Validated(Add.class) @RequestBody QtCodeDto dto) { + qtCodeService.addQtCode(dto); + return BaseResult.success(); + } + + @Operation(summary = "更新QtCode", operationId = "updateQtCode") + @PostMapping("/updateQtCode") + @PreAuthorize("hasAuthority('qtcode:update')") + public BaseResult updateQtCode(@Validated(Update.class) @RequestBody QtCodeDto dto) { + qtCodeService.updateQtCode(dto); + return BaseResult.success(); + } + + @Operation(summary = "删除QtCode", operationId = "deleteQtCode") + @PostMapping("/deleteQtCode") + @PreAuthorize("hasAuthority('qtcode:delete')") + public BaseResult deleteQtCode(@Validated(DeleteOne.class) @RequestBody BaseDeleteBody req) { + qtCodeService.deleteQtCode(req.id()); + return BaseResult.success(); + } + + @Operation(summary = "批量删除QtCode", operationId = "deleteQtCodeBatch") + @PostMapping("/deleteQtCodeBatch") + @PreAuthorize("hasAuthority('qtcode:deleteBatch')") + public BaseResult deleteQtCodeBatch(@Validated(DeleteBatch.class) @RequestBody BaseDeleteBody req) { + qtCodeService.deleteBatch(req.ids()); + return BaseResult.success(); + } +} diff --git a/src/main/java/com/niuan/erp/module/common/controller/dto/QtCodeDto.java b/src/main/java/com/niuan/erp/module/common/controller/dto/QtCodeDto.java new file mode 100644 index 0000000..5c72431 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/common/controller/dto/QtCodeDto.java @@ -0,0 +1,10 @@ +package com.niuan.erp.module.common.controller.dto; + +public record QtCodeDto( + Integer id, + String printCode, + Integer partNumber, + String productPacking, + String datecode, + String vendCode, + String brandCode) {} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/common/converter/QtCodeConverter.java b/src/main/java/com/niuan/erp/module/common/converter/QtCodeConverter.java new file mode 100644 index 0000000..fe0a2a4 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/common/converter/QtCodeConverter.java @@ -0,0 +1,15 @@ +package com.niuan.erp.module.common.converter; + +import com.niuan.erp.module.common.controller.dto.QtCodeDto; +import com.niuan.erp.module.common.entity.QtCode; +import org.mapstruct.Mapper; +import org.mapstruct.ReportingPolicy; + +import java.util.List; + +@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) +public interface QtCodeConverter { + QtCode toEntity(QtCodeDto dto); + QtCodeDto toDto(QtCode entity); + List toDtoList(List entities); +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/common/entity/Document.java b/src/main/java/com/niuan/erp/module/common/entity/Document.java new file mode 100644 index 0000000..ee5f30a --- /dev/null +++ b/src/main/java/com/niuan/erp/module/common/entity/Document.java @@ -0,0 +1,101 @@ +package com.niuan.erp.module.common.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *

+ * + *

+ * + * @author + * @since 2026-02-11 + */ +@Getter +@Setter +@ToString +@TableName("productionform") +public class Document implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "Id", type = IdType.AUTO) + private Long id; + + @TableField("Status") + private Integer status; + + @TableField("CreateDate") + private LocalDateTime createDate; + + @TableField("CreateUserId") + private Long createUserId; + + @TableField("CreateUserName") + private String createUserName; + + @TableField("UpdateDate") + private LocalDateTime updateDate; + + @TableField("UpdateUserId") + private Long updateUserId; + + @TableField("UpdateUserName") + private String updateUserName; + + @TableField("StoreNo") + private Integer storeNo; + + @TableField("StoreName") + private String storeName; + + @TableField("FormType") + private Integer formType; + + @TableField("FormCode") + private String formCode; + + @TableField("FormName") + private String formName; + + @TableField("FormStatus") + private Integer formStatus; + + @TableField("FormMark") + private String formMark; + + @TableField("reserve1") + private Integer reserve1; + + @TableField("reserve2") + private String reserve2; + + @TableField("VendorNo") + private Integer vendorNo; + + @TableField("VendorName") + private String vendorName; + + @TableField("TotalValue") + private Double totalValue; + + @TableField("OutStoreNo") + private Integer outStoreNo; + + @TableField("OutStoreName") + private String outStoreName; + + @TableField("GroupId") + private Integer groupId; + + @TableField("CustomerId") + private Integer customerId; +} diff --git a/src/main/java/com/niuan/erp/module/common/entity/DocumentMaterial.java b/src/main/java/com/niuan/erp/module/common/entity/DocumentMaterial.java new file mode 100644 index 0000000..6aad53e --- /dev/null +++ b/src/main/java/com/niuan/erp/module/common/entity/DocumentMaterial.java @@ -0,0 +1,83 @@ +package com.niuan.erp.module.common.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *

+ * + *

+ * + * @author + * @since 2026-02-11 + */ +@Getter +@Setter +@ToString +@TableName("materialinout") +public class DocumentMaterial implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "Id", type = IdType.AUTO) + private Long id; + + @TableField("Status") + private Integer status; + + @TableField("CreateDate") + private LocalDateTime createDate; + + @TableField("CreateUserId") + private Long createUserId; + + @TableField("CreateUserName") + private String createUserName; + + @TableField("UpdateDate") + private LocalDateTime updateDate; + + @TableField("UpdateUserId") + private Long updateUserId; + + @TableField("UpdateUserName") + private String updateUserName; + + @TableField("DocumentNo") + private Integer documentNo; + + @TableField("PartNumber") + private String partNumber; + + @TableField("OriginalCount") + private Integer originalCount; + + @TableField("ProductCount") + private Integer productCount; + + @TableField("ProductMark") + private String productMark; + + @TableField("reserve1") + private Integer reserve1; + + @TableField("reserve2") + private String reserve2; + + @TableField("StoreNo") + private Integer storeNo; + + @TableField("DemandCount") + private Integer demandCount; + + @TableField("PartId") + private Long partId; +} diff --git a/src/main/java/com/niuan/erp/module/common/entity/QtCode.java b/src/main/java/com/niuan/erp/module/common/entity/QtCode.java new file mode 100644 index 0000000..667b1f2 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/common/entity/QtCode.java @@ -0,0 +1,49 @@ +package com.niuan.erp.module.common.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author + * @since 2026-02-11 + */ +@Getter +@Setter +@ToString +@TableName("printcodelist") +public class QtCode implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @TableField("printCode") + private String printCode; + + @TableField("PartNumber") + private Integer partNumber; + + @TableField("ProductPacking") + private String productPacking; + + @TableField("datecode") + private String datecode; + + @TableField("vendCode") + private String vendCode; + + @TableField("brandCode") + private String brandCode; +} diff --git a/src/main/java/com/niuan/erp/module/common/enums/DocumentType.java b/src/main/java/com/niuan/erp/module/common/enums/DocumentType.java new file mode 100644 index 0000000..8335714 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/common/enums/DocumentType.java @@ -0,0 +1,30 @@ +package com.niuan.erp.module.common.enums; + +import lombok.Getter; + +/** + * 单据类型枚举 + * code 对应业务编号： + * 1.采购订单 2.销售订单 3.仓库入库单 4.仓库出库单（修正重复项） + * 5.生产发料单 6.生产退料单 7.成品出货单 8.仓库调拨单 9.库存盘点单 + */ +@Getter +public enum DocumentType { + PURCHASE_ORDER(1, "采购订单"), + SALES_ORDER(2, "销售订单"), + WAREHOUSE_RECEIPT(3, "仓库入库单"), + WAREHOUSE_ISSUE(4, "仓库出库单"), // 修正：原第4项应为出库单 + PRODUCTION_ISSUE(5, "生产发料单"), + PRODUCTION_RETURN(6, "生产退料单"), + FINISHED_PRODUCT_SHIPMENT(7, "成品出货单"), + STOCK_TRANSFER_ORDER(8, "仓库调拨单"), + INVENTORY_COUNT(9, "库存盘点单"); + final int code; + final String description; + DocumentType(int code, String description) { + this.code = code; + this.description = description; + } + + +} diff --git a/src/main/java/com/niuan/erp/module/common/mapper/DocumentMapper.java b/src/main/java/com/niuan/erp/module/common/mapper/DocumentMapper.java new file mode 100644 index 0000000..0dece08 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/common/mapper/DocumentMapper.java @@ -0,0 +1,16 @@ +package com.niuan.erp.module.common.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.niuan.erp.module.common.entity.Document; + +/** + *

+ * Mapper 接口 + *

+ * + * @author + * @since 2026-02-11 + */ +public interface DocumentMapper extends BaseMapper { + +} diff --git a/src/main/java/com/niuan/erp/module/common/mapper/DocumentMaterialMapper.java b/src/main/java/com/niuan/erp/module/common/mapper/DocumentMaterialMapper.java new file mode 100644 index 0000000..c8441bf --- /dev/null +++ b/src/main/java/com/niuan/erp/module/common/mapper/DocumentMaterialMapper.java @@ -0,0 +1,16 @@ +package com.niuan.erp.module.common.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.niuan.erp.module.common.entity.DocumentMaterial; + +/** + *

+ * Mapper 接口 + *

+ * + * @author + * @since 2026-02-11 + */ +public interface DocumentMaterialMapper extends BaseMapper { + +} diff --git a/src/main/java/com/niuan/erp/module/common/mapper/QtCodeMapper.java b/src/main/java/com/niuan/erp/module/common/mapper/QtCodeMapper.java new file mode 100644 index 0000000..7cd8801 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/common/mapper/QtCodeMapper.java @@ -0,0 +1,16 @@ +package com.niuan.erp.module.common.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.niuan.erp.module.common.entity.QtCode; + +/** + *

+ * Mapper 接口 + *

+ * + * @author + * @since 2026-02-11 + */ +public interface QtCodeMapper extends BaseMapper { + +} diff --git a/src/main/java/com/niuan/erp/module/common/service/QtCodeService.java b/src/main/java/com/niuan/erp/module/common/service/QtCodeService.java new file mode 100644 index 0000000..8f5c8c4 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/common/service/QtCodeService.java @@ -0,0 +1,23 @@ +package com.niuan.erp.module.common.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.module.common.controller.dto.QtCodeDto; +import com.niuan.erp.module.common.entity.QtCode; + +import java.util.List; + +public interface QtCodeService { + + IPage getQtCodePage(BasePageReqParams pageParams, LambdaQueryWrapper wrapper); + + void addQtCode(QtCodeDto dto); + + void updateQtCode(QtCodeDto dto); + + void deleteQtCode(long id); + + void deleteBatch(List ids); + +} diff --git a/src/main/java/com/niuan/erp/module/common/service/impl/QtCodeServiceImpl.java b/src/main/java/com/niuan/erp/module/common/service/impl/QtCodeServiceImpl.java new file mode 100644 index 0000000..60fdc15 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/common/service/impl/QtCodeServiceImpl.java @@ -0,0 +1,58 @@ +package com.niuan.erp.module.common.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.utils.SecurityUtils; +import com.niuan.erp.module.common.controller.dto.QtCodeDto; +import com.niuan.erp.module.common.converter.QtCodeConverter; +import com.niuan.erp.module.common.entity.QtCode; +import com.niuan.erp.module.common.mapper.QtCodeMapper; +import com.niuan.erp.module.common.service.QtCodeService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.util.List; + + +@Service +@Transactional +@RequiredArgsConstructor +public class QtCodeServiceImpl extends ServiceImpl implements QtCodeService { + + + private final QtCodeConverter qtCodeConverter; + + @Override + public IPage getQtCodePage(BasePageReqParams pageParams, LambdaQueryWrapper wrapper) { + IPage result = this.baseMapper.selectPage(new Page<>(pageParams.page(), pageParams.pageSize()), wrapper); + return result.convert(qtCodeConverter::toDto); + } + + @Override + public void addQtCode(QtCodeDto dto) { + QtCode entity = qtCodeConverter.toEntity(dto); + this.baseMapper.insert(entity); + } + + @Override + public void updateQtCode(QtCodeDto dto) { + QtCode entity = qtCodeConverter.toEntity(dto); + this.baseMapper.updateById(entity); + } + + @Override + public void deleteQtCode(long id) { + this.baseMapper.deleteById(id); + } + + @Override + public void deleteBatch(List ids) { + this.baseMapper.deleteByIds(ids); + } + +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/production/controller/BomController.java b/src/main/java/com/niuan/erp/module/production/controller/BomController.java new file mode 100644 index 0000000..8fbded1 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/production/controller/BomController.java @@ -0,0 +1,85 @@ +package com.niuan.erp.module.production.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.annotation.ApiLog; +import com.niuan.erp.common.annotation.ModuleLog; +import com.niuan.erp.common.base.BaseDeleteBody; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.base.BaseResult; +import com.niuan.erp.common.base.CommonValidateGroup.*; +import com.niuan.erp.common.base.OperationType; +import com.niuan.erp.module.production.controller.dto.BomDto; +import com.niuan.erp.module.production.entity.Bom; +import com.niuan.erp.module.production.service.BomService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.util.StringUtils; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +@Tag(name = "Bom") +@ModuleLog("Bom管理") +@RestController +@RequestMapping("/production/bom") +@RequiredArgsConstructor +public class BomController { + + private final BomService bomService; + + @Operation(summary = "分页查询Bom数据", operationId = "getBomPage") + @GetMapping("/getBomPage") + @PreAuthorize("hasAuthority('bom:index')") + public BaseResult> getBomPage(@Validated BasePageReqParams pageParams, + @Validated(Get.class) BomDto searchParams) { + var wrapper = new LambdaQueryWrapper(); + if (searchParams != null) { + if (StringUtils.hasText(searchParams.customerName())) { + wrapper.like(Bom::getCustomerName, searchParams.customerName()); + } + if (StringUtils.hasText(searchParams.searchCode())) { + wrapper.like(Bom::getBomNo, searchParams.searchCode()); + } + } + return BaseResult.successWithData(bomService.getBomPage(pageParams, wrapper)); + } + + + @ApiLog(type = OperationType.ADD, remark = "新增一条Bom记录") + @Operation(summary = "新增Bom", operationId = "addBom") + @PostMapping("/addBom") + @PreAuthorize("hasAuthority('bom:add')") + public BaseResult addBom(@Validated(Add.class) @RequestBody BomDto dto) { + bomService.addBom(dto); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.UPDATE, remark = "更新一条Bom记录") + @Operation(summary = "更新Bom", operationId = "updateBom") + @PostMapping("/updateBom") + @PreAuthorize("hasAuthority('bom:update')") + public BaseResult updateBom(@Validated(Update.class) @RequestBody BomDto dto) { + bomService.updateBom(dto); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.DELETE, remark = "删除一条Bom记录") + @Operation(summary = "删除Bom", operationId = "deleteBom") + @PostMapping("/deleteBom") + @PreAuthorize("hasAuthority('bom:delete')") + public BaseResult deleteBom(@Validated(DeleteOne.class) @RequestBody BaseDeleteBody req) { + bomService.deleteBom(req.id()); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.DELETE, remark = "批量删除Bom记录") + @Operation(summary = "批量删除Bom", operationId = "deleteBomBatch") + @PostMapping("/deleteBomBatch") + @PreAuthorize("hasAuthority('bom:deleteBatch')") + public BaseResult deleteBomBatch(@Validated(DeleteBatch.class) @RequestBody BaseDeleteBody req) { + bomService.deleteBatch(req.ids()); + return BaseResult.success(); + } +} diff --git a/src/main/java/com/niuan/erp/module/production/controller/BomItemController.java b/src/main/java/com/niuan/erp/module/production/controller/BomItemController.java new file mode 100644 index 0000000..c0aa991 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/production/controller/BomItemController.java @@ -0,0 +1,76 @@ +package com.niuan.erp.module.production.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.annotation.ApiLog; +import com.niuan.erp.common.annotation.ModuleLog; +import com.niuan.erp.common.base.BaseDeleteBody; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.base.BaseResult; +import com.niuan.erp.common.base.CommonValidateGroup.*; +import com.niuan.erp.common.base.OperationType; +import com.niuan.erp.module.production.controller.dto.BomItemDto; +import com.niuan.erp.module.production.entity.BomItem; +import com.niuan.erp.module.production.service.BomItemService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +@Tag(name = "BomItem") +@ModuleLog("BomItem管理") +@RestController +@RequestMapping("/production/bomitem") +@RequiredArgsConstructor +public class BomItemController { + + private final BomItemService bomItemService; + + @Operation(summary = "分页查询BomItem数据", operationId = "getBomItemPage") + @GetMapping("/getBomItemPage") + @PreAuthorize("hasAuthority('bomitem:index')") + public BaseResult> getBomItemPage(@Validated BasePageReqParams pageParams, + @Validated(Get.class) BomItemDto searchParams) { + var wrapper = new LambdaQueryWrapper(); + return BaseResult.successWithData(bomItemService.getBomItemPage(pageParams, wrapper)); + } + + + @ApiLog(type = OperationType.ADD, remark = "新增一条BomItem记录") + @Operation(summary = "新增BomItem", operationId = "addBomItem") + @PostMapping("/addBomItem") + @PreAuthorize("hasAuthority('bomitem:add')") + public BaseResult addBomItem(@Validated(Add.class) @RequestBody BomItemDto dto) { + bomItemService.addBomItem(dto); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.UPDATE, remark = "更新一条BomItem记录") + @Operation(summary = "更新BomItem", operationId = "updateBomItem") + @PostMapping("/updateBomItem") + @PreAuthorize("hasAuthority('bomitem:update')") + public BaseResult updateBomItem(@Validated(Update.class) @RequestBody BomItemDto dto) { + bomItemService.updateBomItem(dto); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.DELETE, remark = "删除一条BomItem记录") + @Operation(summary = "删除BomItem", operationId = "deleteBomItem") + @PostMapping("/deleteBomItem") + @PreAuthorize("hasAuthority('bomitem:delete')") + public BaseResult deleteBomItem(@Validated(DeleteOne.class) @RequestBody BaseDeleteBody req) { + bomItemService.deleteBomItem(req.id()); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.DELETE, remark = "批量删除BomItem记录") + @Operation(summary = "批量删除BomItem", operationId = "deleteBomItemBatch") + @PostMapping("/deleteBomItemBatch") + @PreAuthorize("hasAuthority('bomitem:deleteBatch')") + public BaseResult deleteBomItemBatch(@Validated(DeleteBatch.class) @RequestBody BaseDeleteBody req) { + bomItemService.deleteBatch(req.ids()); + return BaseResult.success(); + } +} diff --git a/src/main/java/com/niuan/erp/module/production/controller/FinishedProductReceiptController.java b/src/main/java/com/niuan/erp/module/production/controller/FinishedProductReceiptController.java new file mode 100644 index 0000000..a7f9a8a --- /dev/null +++ b/src/main/java/com/niuan/erp/module/production/controller/FinishedProductReceiptController.java @@ -0,0 +1,76 @@ +package com.niuan.erp.module.production.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.annotation.ApiLog; +import com.niuan.erp.common.annotation.ModuleLog; +import com.niuan.erp.common.base.BaseDeleteBody; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.base.BaseResult; +import com.niuan.erp.common.base.CommonValidateGroup.*; +import com.niuan.erp.common.base.OperationType; +import com.niuan.erp.module.common.entity.Document; +import com.niuan.erp.module.production.controller.dto.FinishedProductReceiptDto; +import com.niuan.erp.module.production.service.FinishedProductReceiptService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +@Tag(name = "FinishedProductReceipt") +@ModuleLog("FinishedProductReceipt管理") +@RestController +@RequestMapping("/production/finishedproductreceipt") +@RequiredArgsConstructor +public class FinishedProductReceiptController { + + private final FinishedProductReceiptService finishedProductReceiptService; + + @Operation(summary = "分页查询FinishedProductReceipt数据", operationId = "getFinishedProductReceiptPage") + @GetMapping("/getFinishedProductReceiptPage") + @PreAuthorize("hasAuthority('finishedproductreceipt:index')") + public BaseResult> getFinishedProductReceiptPage(@Validated BasePageReqParams pageParams, + @Validated(Get.class) FinishedProductReceiptDto searchParams) { + var wrapper = new LambdaQueryWrapper(); + return BaseResult.successWithData(finishedProductReceiptService.getFinishedProductReceiptPage(pageParams, wrapper)); + } + + + @ApiLog(type = OperationType.ADD, remark = "新增一条FinishedProductReceipt记录") + @Operation(summary = "新增FinishedProductReceipt", operationId = "addFinishedProductReceipt") + @PostMapping("/addFinishedProductReceipt") + @PreAuthorize("hasAuthority('finishedproductreceipt:add')") + public BaseResult addFinishedProductReceipt(@Validated(Add.class) @RequestBody FinishedProductReceiptDto dto) { + finishedProductReceiptService.addFinishedProductReceipt(dto); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.UPDATE, remark = "更新一条FinishedProductReceipt记录") + @Operation(summary = "更新FinishedProductReceipt", operationId = "updateFinishedProductReceipt") + @PostMapping("/updateFinishedProductReceipt") + @PreAuthorize("hasAuthority('finishedproductreceipt:update')") + public BaseResult updateFinishedProductReceipt(@Validated(Update.class) @RequestBody FinishedProductReceiptDto dto) { + finishedProductReceiptService.updateFinishedProductReceipt(dto); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.DELETE, remark = "删除一条FinishedProductReceipt记录") + @Operation(summary = "删除FinishedProductReceipt", operationId = "deleteFinishedProductReceipt") + @PostMapping("/deleteFinishedProductReceipt") + @PreAuthorize("hasAuthority('finishedproductreceipt:delete')") + public BaseResult deleteFinishedProductReceipt(@Validated(DeleteOne.class) @RequestBody BaseDeleteBody req) { + finishedProductReceiptService.deleteFinishedProductReceipt(req.id()); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.DELETE, remark = "批量删除FinishedProductReceipt记录") + @Operation(summary = "批量删除FinishedProductReceipt", operationId = "deleteFinishedProductReceiptBatch") + @PostMapping("/deleteFinishedProductReceiptBatch") + @PreAuthorize("hasAuthority('finishedproductreceipt:deleteBatch')") + public BaseResult deleteFinishedProductReceiptBatch(@Validated(DeleteBatch.class) @RequestBody BaseDeleteBody req) { + finishedProductReceiptService.deleteBatch(req.ids()); + return BaseResult.success(); + } +} diff --git a/src/main/java/com/niuan/erp/module/production/controller/FinishedProductShipmentController.java b/src/main/java/com/niuan/erp/module/production/controller/FinishedProductShipmentController.java new file mode 100644 index 0000000..6e93ed2 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/production/controller/FinishedProductShipmentController.java @@ -0,0 +1,76 @@ +package com.niuan.erp.module.production.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.annotation.ApiLog; +import com.niuan.erp.common.annotation.ModuleLog; +import com.niuan.erp.common.base.BaseDeleteBody; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.base.BaseResult; +import com.niuan.erp.common.base.CommonValidateGroup.*; +import com.niuan.erp.common.base.OperationType; +import com.niuan.erp.module.common.entity.Document; +import com.niuan.erp.module.production.controller.dto.FinishedProductShipmentDto; +import com.niuan.erp.module.production.service.FinishedProductShipmentService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +@Tag(name = "FinishedProductShipment") +@ModuleLog("FinishedProductShipment管理") +@RestController +@RequestMapping("/production/finishedproductshipment") +@RequiredArgsConstructor +public class FinishedProductShipmentController { + + private final FinishedProductShipmentService finishedProductShipmentService; + + @Operation(summary = "分页查询FinishedProductShipment数据", operationId = "getFinishedProductShipmentPage") + @GetMapping("/getFinishedProductShipmentPage") + @PreAuthorize("hasAuthority('finishedproductshipment:index')") + public BaseResult> getFinishedProductShipmentPage(@Validated BasePageReqParams pageParams, + @Validated(Get.class) FinishedProductShipmentDto searchParams) { + var wrapper = new LambdaQueryWrapper(); + return BaseResult.successWithData(finishedProductShipmentService.getFinishedProductShipmentPage(pageParams, wrapper)); + } + + + @ApiLog(type = OperationType.ADD, remark = "新增一条FinishedProductShipment记录") + @Operation(summary = "新增FinishedProductShipment", operationId = "addFinishedProductShipment") + @PostMapping("/addFinishedProductShipment") + @PreAuthorize("hasAuthority('finishedproductshipment:add')") + public BaseResult addFinishedProductShipment(@Validated(Add.class) @RequestBody FinishedProductShipmentDto dto) { + finishedProductShipmentService.addFinishedProductShipment(dto); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.UPDATE, remark = "更新一条FinishedProductShipment记录") + @Operation(summary = "更新FinishedProductShipment", operationId = "updateFinishedProductShipment") + @PostMapping("/updateFinishedProductShipment") + @PreAuthorize("hasAuthority('finishedproductshipment:update')") + public BaseResult updateFinishedProductShipment(@Validated(Update.class) @RequestBody FinishedProductShipmentDto dto) { + finishedProductShipmentService.updateFinishedProductShipment(dto); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.DELETE, remark = "删除一条FinishedProductShipment记录") + @Operation(summary = "删除FinishedProductShipment", operationId = "deleteFinishedProductShipment") + @PostMapping("/deleteFinishedProductShipment") + @PreAuthorize("hasAuthority('finishedproductshipment:delete')") + public BaseResult deleteFinishedProductShipment(@Validated(DeleteOne.class) @RequestBody BaseDeleteBody req) { + finishedProductShipmentService.deleteFinishedProductShipment(req.id()); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.DELETE, remark = "批量删除FinishedProductShipment记录") + @Operation(summary = "批量删除FinishedProductShipment", operationId = "deleteFinishedProductShipmentBatch") + @PostMapping("/deleteFinishedProductShipmentBatch") + @PreAuthorize("hasAuthority('finishedproductshipment:deleteBatch')") + public BaseResult deleteFinishedProductShipmentBatch(@Validated(DeleteBatch.class) @RequestBody BaseDeleteBody req) { + finishedProductShipmentService.deleteBatch(req.ids()); + return BaseResult.success(); + } +} diff --git a/src/main/java/com/niuan/erp/module/production/controller/ProductionIssueController.java b/src/main/java/com/niuan/erp/module/production/controller/ProductionIssueController.java new file mode 100644 index 0000000..ddf169c --- /dev/null +++ b/src/main/java/com/niuan/erp/module/production/controller/ProductionIssueController.java @@ -0,0 +1,76 @@ +package com.niuan.erp.module.production.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.annotation.ApiLog; +import com.niuan.erp.common.annotation.ModuleLog; +import com.niuan.erp.common.base.BaseDeleteBody; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.base.BaseResult; +import com.niuan.erp.common.base.CommonValidateGroup.*; +import com.niuan.erp.common.base.OperationType; +import com.niuan.erp.module.common.entity.Document; +import com.niuan.erp.module.production.controller.dto.ProductionIssueDto; +import com.niuan.erp.module.production.service.ProductionIssueService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +@Tag(name = "ProductionIssue") +@ModuleLog("ProductionIssue管理") +@RestController +@RequestMapping("/production/productionissue") +@RequiredArgsConstructor +public class ProductionIssueController { + + private final ProductionIssueService productionIssueService; + + @Operation(summary = "分页查询ProductionIssue数据", operationId = "getProductionIssuePage") + @GetMapping("/getProductionIssuePage") + @PreAuthorize("hasAuthority('productionissue:index')") + public BaseResult> getProductionIssuePage(@Validated BasePageReqParams pageParams, + @Validated(Get.class) ProductionIssueDto searchParams) { + var wrapper = new LambdaQueryWrapper(); + return BaseResult.successWithData(productionIssueService.getProductionIssuePage(pageParams, wrapper)); + } + + + @ApiLog(type = OperationType.ADD, remark = "新增一条ProductionIssue记录") + @Operation(summary = "新增ProductionIssue", operationId = "addProductionIssue") + @PostMapping("/addProductionIssue") + @PreAuthorize("hasAuthority('productionissue:add')") + public BaseResult addProductionIssue(@Validated(Add.class) @RequestBody ProductionIssueDto dto) { + productionIssueService.addProductionIssue(dto); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.UPDATE, remark = "更新一条ProductionIssue记录") + @Operation(summary = "更新ProductionIssue", operationId = "updateProductionIssue") + @PostMapping("/updateProductionIssue") + @PreAuthorize("hasAuthority('productionissue:update')") + public BaseResult updateProductionIssue(@Validated(Update.class) @RequestBody ProductionIssueDto dto) { + productionIssueService.updateProductionIssue(dto); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.DELETE, remark = "删除一条ProductionIssue记录") + @Operation(summary = "删除ProductionIssue", operationId = "deleteProductionIssue") + @PostMapping("/deleteProductionIssue") + @PreAuthorize("hasAuthority('productionissue:delete')") + public BaseResult deleteProductionIssue(@Validated(DeleteOne.class) @RequestBody BaseDeleteBody req) { + productionIssueService.deleteProductionIssue(req.id()); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.DELETE, remark = "批量删除ProductionIssue记录") + @Operation(summary = "批量删除ProductionIssue", operationId = "deleteProductionIssueBatch") + @PostMapping("/deleteProductionIssueBatch") + @PreAuthorize("hasAuthority('productionissue:deleteBatch')") + public BaseResult deleteProductionIssueBatch(@Validated(DeleteBatch.class) @RequestBody BaseDeleteBody req) { + productionIssueService.deleteBatch(req.ids()); + return BaseResult.success(); + } +} diff --git a/src/main/java/com/niuan/erp/module/production/controller/ProductionPlanController.java b/src/main/java/com/niuan/erp/module/production/controller/ProductionPlanController.java new file mode 100644 index 0000000..f92f0a4 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/production/controller/ProductionPlanController.java @@ -0,0 +1,85 @@ +package com.niuan.erp.module.production.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.annotation.ApiLog; +import com.niuan.erp.common.annotation.ModuleLog; +import com.niuan.erp.common.base.BaseDeleteBody; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.base.BaseResult; +import com.niuan.erp.common.base.CommonValidateGroup.*; +import com.niuan.erp.common.base.OperationType; +import com.niuan.erp.module.production.controller.dto.ProductionPlanDto; +import com.niuan.erp.module.production.entity.ProductionPlan; +import com.niuan.erp.module.production.service.ProductionPlanService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.util.StringUtils; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +@Tag(name = "ProductionPlan") +@ModuleLog("ProductionPlan管理") +@RestController +@RequestMapping("/production/productionplan") +@RequiredArgsConstructor +public class ProductionPlanController { + + private final ProductionPlanService productionPlanService; + + @Operation(summary = "分页查询ProductionPlan数据", operationId = "getProductionPlanPage") + @GetMapping("/getProductionPlanPage") + @PreAuthorize("hasAuthority('productionplan:index')") + public BaseResult> getProductionPlanPage(@Validated BasePageReqParams pageParams, + @Validated(Get.class) ProductionPlanDto searchParams) { + var wrapper = new LambdaQueryWrapper(); + if (searchParams != null) { + if (StringUtils.hasText(searchParams.customerName())) { + wrapper.like(ProductionPlan::getCreateUserName, searchParams.customerName()); + } + if (StringUtils.hasText(searchParams.projectName())) { + wrapper.like(ProductionPlan::getProjectName, searchParams.projectName()); + } + } + return BaseResult.successWithData(productionPlanService.getProductionPlanPage(pageParams, wrapper)); + } + + + @ApiLog(type = OperationType.ADD, remark = "新增一条ProductionPlan记录") + @Operation(summary = "新增ProductionPlan", operationId = "addProductionPlan") + @PostMapping("/addProductionPlan") + @PreAuthorize("hasAuthority('productionplan:add')") + public BaseResult addProductionPlan(@Validated(Add.class) @RequestBody ProductionPlanDto dto) { + productionPlanService.addProductionPlan(dto); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.UPDATE, remark = "更新一条ProductionPlan记录") + @Operation(summary = "更新ProductionPlan", operationId = "updateProductionPlan") + @PostMapping("/updateProductionPlan") + @PreAuthorize("hasAuthority('productionplan:update')") + public BaseResult updateProductionPlan(@Validated(Update.class) @RequestBody ProductionPlanDto dto) { + productionPlanService.updateProductionPlan(dto); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.DELETE, remark = "删除一条ProductionPlan记录") + @Operation(summary = "删除ProductionPlan", operationId = "deleteProductionPlan") + @PostMapping("/deleteProductionPlan") + @PreAuthorize("hasAuthority('productionplan:delete')") + public BaseResult deleteProductionPlan(@Validated(DeleteOne.class) @RequestBody BaseDeleteBody req) { + productionPlanService.deleteProductionPlan(req.id()); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.DELETE, remark = "批量删除ProductionPlan记录") + @Operation(summary = "批量删除ProductionPlan", operationId = "deleteProductionPlanBatch") + @PostMapping("/deleteProductionPlanBatch") + @PreAuthorize("hasAuthority('productionplan:deleteBatch')") + public BaseResult deleteProductionPlanBatch(@Validated(DeleteBatch.class) @RequestBody BaseDeleteBody req) { + productionPlanService.deleteBatch(req.ids()); + return BaseResult.success(); + } +} diff --git a/src/main/java/com/niuan/erp/module/production/controller/ProductionReturnController.java b/src/main/java/com/niuan/erp/module/production/controller/ProductionReturnController.java new file mode 100644 index 0000000..7eafeca --- /dev/null +++ b/src/main/java/com/niuan/erp/module/production/controller/ProductionReturnController.java @@ -0,0 +1,76 @@ +package com.niuan.erp.module.production.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.annotation.ApiLog; +import com.niuan.erp.common.annotation.ModuleLog; +import com.niuan.erp.common.base.BaseDeleteBody; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.base.BaseResult; +import com.niuan.erp.common.base.CommonValidateGroup.*; +import com.niuan.erp.common.base.OperationType; +import com.niuan.erp.module.common.entity.Document; +import com.niuan.erp.module.production.controller.dto.ProductionReturnDto; +import com.niuan.erp.module.production.service.ProductionReturnService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +@Tag(name = "ProductionReturn") +@ModuleLog("ProductionReturn管理") +@RestController +@RequestMapping("/production/productionreturn") +@RequiredArgsConstructor +public class ProductionReturnController { + + private final ProductionReturnService productionReturnService; + + @Operation(summary = "分页查询ProductionReturn数据", operationId = "getProductionReturnPage") + @GetMapping("/getProductionReturnPage") + @PreAuthorize("hasAuthority('productionreturn:index')") + public BaseResult> getProductionReturnPage(@Validated BasePageReqParams pageParams, + @Validated(Get.class) ProductionReturnDto searchParams) { + var wrapper = new LambdaQueryWrapper(); + return BaseResult.successWithData(productionReturnService.getProductionReturnPage(pageParams, wrapper)); + } + + + @ApiLog(type = OperationType.ADD, remark = "新增一条ProductionReturn记录") + @Operation(summary = "新增ProductionReturn", operationId = "addProductionReturn") + @PostMapping("/addProductionReturn") + @PreAuthorize("hasAuthority('productionreturn:add')") + public BaseResult addProductionReturn(@Validated(Add.class) @RequestBody ProductionReturnDto dto) { + productionReturnService.addProductionReturn(dto); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.UPDATE, remark = "更新一条ProductionReturn记录") + @Operation(summary = "更新ProductionReturn", operationId = "updateProductionReturn") + @PostMapping("/updateProductionReturn") + @PreAuthorize("hasAuthority('productionreturn:update')") + public BaseResult updateProductionReturn(@Validated(Update.class) @RequestBody ProductionReturnDto dto) { + productionReturnService.updateProductionReturn(dto); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.DELETE, remark = "删除一条ProductionReturn记录") + @Operation(summary = "删除ProductionReturn", operationId = "deleteProductionReturn") + @PostMapping("/deleteProductionReturn") + @PreAuthorize("hasAuthority('productionreturn:delete')") + public BaseResult deleteProductionReturn(@Validated(DeleteOne.class) @RequestBody BaseDeleteBody req) { + productionReturnService.deleteProductionReturn(req.id()); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.DELETE, remark = "批量删除ProductionReturn记录") + @Operation(summary = "批量删除ProductionReturn", operationId = "deleteProductionReturnBatch") + @PostMapping("/deleteProductionReturnBatch") + @PreAuthorize("hasAuthority('productionreturn:deleteBatch')") + public BaseResult deleteProductionReturnBatch(@Validated(DeleteBatch.class) @RequestBody BaseDeleteBody req) { + productionReturnService.deleteBatch(req.ids()); + return BaseResult.success(); + } +} diff --git a/src/main/java/com/niuan/erp/module/production/controller/dto/BomDto.java b/src/main/java/com/niuan/erp/module/production/controller/dto/BomDto.java new file mode 100644 index 0000000..f791e43 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/production/controller/dto/BomDto.java @@ -0,0 +1,23 @@ +package com.niuan.erp.module.production.controller.dto; + +import java.time.LocalDateTime; + +public record BomDto( + Long id, + Integer status, + LocalDateTime createDate, + Long createUserId, + String createUserName, + LocalDateTime updateDate, + Long updateUserId, + String updateUserName, + Long parentId, + String bomNo, + String manufacturer, + String bomName, + String spec, + String brandName, + String formMark, + String customerName, + Integer customerId, + String searchCode) {} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/production/controller/dto/BomItemDto.java b/src/main/java/com/niuan/erp/module/production/controller/dto/BomItemDto.java new file mode 100644 index 0000000..efb2574 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/production/controller/dto/BomItemDto.java @@ -0,0 +1,18 @@ +package com.niuan.erp.module.production.controller.dto; + +public record BomItemDto( + Long id, + Integer bomId, + String projectName, + String partNumber, + String itemPosition, + Integer manufactureCount, + Integer sameUseCount, + String sameUseNum1, + String sameUseNum2, + String sameUseNum3, + Integer loseRate, + Integer manufactureSpec, + String productMark, + Integer reserve1, + String reserve2) {} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/production/controller/dto/FinishedProductReceiptDto.java b/src/main/java/com/niuan/erp/module/production/controller/dto/FinishedProductReceiptDto.java new file mode 100644 index 0000000..677d693 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/production/controller/dto/FinishedProductReceiptDto.java @@ -0,0 +1,29 @@ +package com.niuan.erp.module.production.controller.dto; + +import java.time.LocalDateTime; + +public record FinishedProductReceiptDto( + Long id, + Integer status, + LocalDateTime createDate, + Long createUserId, + String createUserName, + LocalDateTime updateDate, + Long updateUserId, + String updateUserName, + Integer storeNo, + String storeName, + Integer formType, + String formCode, + String formName, + Integer formStatus, + String formMark, + Integer reserve1, + String reserve2, + Integer vendorNo, + String vendorName, + Double totalValue, + Integer outStoreNo, + String outStoreName, + Integer groupId, + Integer customerId) {} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/production/controller/dto/FinishedProductShipmentDto.java b/src/main/java/com/niuan/erp/module/production/controller/dto/FinishedProductShipmentDto.java new file mode 100644 index 0000000..84b8f43 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/production/controller/dto/FinishedProductShipmentDto.java @@ -0,0 +1,29 @@ +package com.niuan.erp.module.production.controller.dto; + +import java.time.LocalDateTime; + +public record FinishedProductShipmentDto( + Long id, + Integer status, + LocalDateTime createDate, + Long createUserId, + String createUserName, + LocalDateTime updateDate, + Long updateUserId, + String updateUserName, + Integer storeNo, + String storeName, + Integer formType, + String formCode, + String formName, + Integer formStatus, + String formMark, + Integer reserve1, + String reserve2, + Integer vendorNo, + String vendorName, + Double totalValue, + Integer outStoreNo, + String outStoreName, + Integer groupId, + Integer customerId) {} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/production/controller/dto/ProductionIssueDto.java b/src/main/java/com/niuan/erp/module/production/controller/dto/ProductionIssueDto.java new file mode 100644 index 0000000..1ca6d47 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/production/controller/dto/ProductionIssueDto.java @@ -0,0 +1,29 @@ +package com.niuan.erp.module.production.controller.dto; + +import java.time.LocalDateTime; + +public record ProductionIssueDto( + Long id, + Integer status, + LocalDateTime createDate, + Long createUserId, + String createUserName, + LocalDateTime updateDate, + Long updateUserId, + String updateUserName, + Integer storeNo, + String storeName, + Integer formType, + String formCode, + String formName, + Integer formStatus, + String formMark, + Integer reserve1, + String reserve2, + Integer vendorNo, + String vendorName, + Double totalValue, + Integer outStoreNo, + String outStoreName, + Integer groupId, + Integer customerId) {} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/production/controller/dto/ProductionPlanDto.java b/src/main/java/com/niuan/erp/module/production/controller/dto/ProductionPlanDto.java new file mode 100644 index 0000000..7ac8a8c --- /dev/null +++ b/src/main/java/com/niuan/erp/module/production/controller/dto/ProductionPlanDto.java @@ -0,0 +1,29 @@ +package com.niuan.erp.module.production.controller.dto; + +import java.time.LocalDateTime; + +public record ProductionPlanDto( + Long id, + Integer status, + LocalDateTime createDate, + Long createUserId, + String createUserName, + LocalDateTime updateDate, + Long updateUserId, + String updateUserName, + String productionNum, + String projectName, + Integer projectId, + Integer productionCount, + Integer productionStatus, + String productionNote, + String productionReport, + String productionMark, + String reserve1, + String reserve2, + Integer storeNo, + String storeName, + Integer groupId, + String groupName, + Integer customerId, + String customerName) {} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/production/controller/dto/ProductionReturnDto.java b/src/main/java/com/niuan/erp/module/production/controller/dto/ProductionReturnDto.java new file mode 100644 index 0000000..1231e6a --- /dev/null +++ b/src/main/java/com/niuan/erp/module/production/controller/dto/ProductionReturnDto.java @@ -0,0 +1,29 @@ +package com.niuan.erp.module.production.controller.dto; + +import java.time.LocalDateTime; + +public record ProductionReturnDto( + Long id, + Integer status, + LocalDateTime createDate, + Long createUserId, + String createUserName, + LocalDateTime updateDate, + Long updateUserId, + String updateUserName, + Integer storeNo, + String storeName, + Integer formType, + String formCode, + String formName, + Integer formStatus, + String formMark, + Integer reserve1, + String reserve2, + Integer vendorNo, + String vendorName, + Double totalValue, + Integer outStoreNo, + String outStoreName, + Integer groupId, + Integer customerId) {} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/production/converter/BomConverter.java b/src/main/java/com/niuan/erp/module/production/converter/BomConverter.java new file mode 100644 index 0000000..e6194bd --- /dev/null +++ b/src/main/java/com/niuan/erp/module/production/converter/BomConverter.java @@ -0,0 +1,15 @@ +package com.niuan.erp.module.production.converter; + +import com.niuan.erp.module.production.controller.dto.BomDto; +import com.niuan.erp.module.production.entity.Bom; +import org.mapstruct.Mapper; +import org.mapstruct.ReportingPolicy; + +import java.util.List; + +@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) +public interface BomConverter { + Bom toEntity(BomDto dto); + BomDto toDto(Bom entity); + List toDtoList(List entities); +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/production/converter/BomItemConverter.java b/src/main/java/com/niuan/erp/module/production/converter/BomItemConverter.java new file mode 100644 index 0000000..1a15dbc --- /dev/null +++ b/src/main/java/com/niuan/erp/module/production/converter/BomItemConverter.java @@ -0,0 +1,15 @@ +package com.niuan.erp.module.production.converter; + +import com.niuan.erp.module.production.controller.dto.BomItemDto; +import com.niuan.erp.module.production.entity.BomItem; +import org.mapstruct.Mapper; +import org.mapstruct.ReportingPolicy; + +import java.util.List; + +@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) +public interface BomItemConverter { + BomItem toEntity(BomItemDto dto); + BomItemDto toDto(BomItem entity); + List toDtoList(List entities); +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/production/converter/FinishedProductReceiptConverter.java b/src/main/java/com/niuan/erp/module/production/converter/FinishedProductReceiptConverter.java new file mode 100644 index 0000000..b31b411 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/production/converter/FinishedProductReceiptConverter.java @@ -0,0 +1,15 @@ +package com.niuan.erp.module.production.converter; + +import com.niuan.erp.module.common.entity.Document; +import com.niuan.erp.module.production.controller.dto.FinishedProductReceiptDto; +import org.mapstruct.Mapper; +import org.mapstruct.ReportingPolicy; + +import java.util.List; + +@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) +public interface FinishedProductReceiptConverter { + Document toEntity(FinishedProductReceiptDto dto); + FinishedProductReceiptDto toDto(Document entity); + List toDtoList(List entities); +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/production/converter/FinishedProductShipmentConverter.java b/src/main/java/com/niuan/erp/module/production/converter/FinishedProductShipmentConverter.java new file mode 100644 index 0000000..41608e7 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/production/converter/FinishedProductShipmentConverter.java @@ -0,0 +1,15 @@ +package com.niuan.erp.module.production.converter; + +import com.niuan.erp.module.common.entity.Document; +import com.niuan.erp.module.production.controller.dto.FinishedProductShipmentDto; +import org.mapstruct.Mapper; +import org.mapstruct.ReportingPolicy; + +import java.util.List; + +@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) +public interface FinishedProductShipmentConverter { + Document toEntity(FinishedProductShipmentDto dto); + FinishedProductShipmentDto toDto(Document entity); + List toDtoList(List entities); +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/production/converter/ProductionIssueConverter.java b/src/main/java/com/niuan/erp/module/production/converter/ProductionIssueConverter.java new file mode 100644 index 0000000..166fd5e --- /dev/null +++ b/src/main/java/com/niuan/erp/module/production/converter/ProductionIssueConverter.java @@ -0,0 +1,15 @@ +package com.niuan.erp.module.production.converter; + +import com.niuan.erp.module.common.entity.Document; +import com.niuan.erp.module.production.controller.dto.ProductionIssueDto; +import org.mapstruct.Mapper; +import org.mapstruct.ReportingPolicy; + +import java.util.List; + +@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) +public interface ProductionIssueConverter { + Document toEntity(ProductionIssueDto dto); + ProductionIssueDto toDto(Document entity); + List toDtoList(List entities); +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/production/converter/ProductionPlanConverter.java b/src/main/java/com/niuan/erp/module/production/converter/ProductionPlanConverter.java new file mode 100644 index 0000000..c272ee7 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/production/converter/ProductionPlanConverter.java @@ -0,0 +1,15 @@ +package com.niuan.erp.module.production.converter; + +import com.niuan.erp.module.production.controller.dto.ProductionPlanDto; +import com.niuan.erp.module.production.entity.ProductionPlan; +import org.mapstruct.Mapper; +import org.mapstruct.ReportingPolicy; + +import java.util.List; + +@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) +public interface ProductionPlanConverter { + ProductionPlan toEntity(ProductionPlanDto dto); + ProductionPlanDto toDto(ProductionPlan entity); + List toDtoList(List entities); +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/production/converter/ProductionReturnConverter.java b/src/main/java/com/niuan/erp/module/production/converter/ProductionReturnConverter.java new file mode 100644 index 0000000..e9b148e --- /dev/null +++ b/src/main/java/com/niuan/erp/module/production/converter/ProductionReturnConverter.java @@ -0,0 +1,15 @@ +package com.niuan.erp.module.production.converter; + +import com.niuan.erp.module.common.entity.Document; +import com.niuan.erp.module.production.controller.dto.ProductionReturnDto; +import org.mapstruct.Mapper; +import org.mapstruct.ReportingPolicy; + +import java.util.List; + +@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) +public interface ProductionReturnConverter { + Document toEntity(ProductionReturnDto dto); + ProductionReturnDto toDto(Document entity); + List toDtoList(List entities); +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/production/entity/Bom.java b/src/main/java/com/niuan/erp/module/production/entity/Bom.java new file mode 100644 index 0000000..e693cc1 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/production/entity/Bom.java @@ -0,0 +1,80 @@ +package com.niuan.erp.module.production.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *

+ * + *

+ * + * @author + * @since 2026-02-11 + */ +@Getter +@Setter +@ToString +@TableName("bom_list") +public class Bom implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "Id", type = IdType.AUTO) + private Long id; + + @TableField("Status") + private Integer status; + + @TableField("CreateDate") + private LocalDateTime createDate; + + @TableField("CreateUserId") + private Long createUserId; + + @TableField("CreateUserName") + private String createUserName; + + @TableField("UpdateDate") + private LocalDateTime updateDate; + + @TableField("UpdateUserId") + private Long updateUserId; + + @TableField("UpdateUserName") + private String updateUserName; + + @TableField("ParentId") + private Long parentId; + + @TableField("BomNo") + private String bomNo; + + @TableField("Manufacturer") + private String manufacturer; + + @TableField("BomName") + private String bomName; + + @TableField("Spec") + private String spec; + + @TableField("BrandName") + private String brandName; + + @TableField("FormMark") + private String formMark; + + @TableField("customerName") + private String customerName; + + @TableField("CustomerId") + private Integer customerId; +} diff --git a/src/main/java/com/niuan/erp/module/production/entity/BomItem.java b/src/main/java/com/niuan/erp/module/production/entity/BomItem.java new file mode 100644 index 0000000..9ed3af5 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/production/entity/BomItem.java @@ -0,0 +1,73 @@ +package com.niuan.erp.module.production.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author + * @since 2026-02-11 + */ +@Getter +@Setter +@ToString +@TableName("bom") +public class BomItem implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "Id", type = IdType.AUTO) + private Long id; + + @TableField("BomId") + private Integer bomId; + + @TableField("ProjectName") + private String projectName; + + @TableField("PartNumber") + private String partNumber; + + @TableField("ItemPosition") + private String itemPosition; + + @TableField("ManufactureCount") + private Integer manufactureCount; + + @TableField("SameUseCount") + private Integer sameUseCount; + + @TableField("SameUseNum1") + private String sameUseNum1; + + @TableField("SameUseNum2") + private String sameUseNum2; + + @TableField("SameUseNum3") + private String sameUseNum3; + + @TableField("LoseRate") + private Integer loseRate; + + @TableField("ManufactureSpec") + private Integer manufactureSpec; + + @TableField("ProductMark") + private String productMark; + + @TableField("reserve1") + private Integer reserve1; + + @TableField("reserve2") + private String reserve2; +} diff --git a/src/main/java/com/niuan/erp/module/production/entity/ProductionPlan.java b/src/main/java/com/niuan/erp/module/production/entity/ProductionPlan.java new file mode 100644 index 0000000..0242056 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/production/entity/ProductionPlan.java @@ -0,0 +1,98 @@ +package com.niuan.erp.module.production.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *

+ * + *

+ * + * @author + * @since 2026-02-11 + */ +@Getter +@Setter +@ToString +@TableName("produceorder") +public class ProductionPlan implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "Id", type = IdType.AUTO) + private Long id; + + @TableField("Status") + private Integer status; + + @TableField("CreateDate") + private LocalDateTime createDate; + + @TableField("CreateUserId") + private Long createUserId; + + @TableField("CreateUserName") + private String createUserName; + + @TableField("UpdateDate") + private LocalDateTime updateDate; + + @TableField("UpdateUserId") + private Long updateUserId; + + @TableField("UpdateUserName") + private String updateUserName; + + @TableField("ProductionNum") + private String productionNum; + + @TableField("ProjectName") + private String projectName; + + @TableField("ProjectId") + private Integer projectId; + + @TableField("ProductionCount") + private Integer productionCount; + + @TableField("ProductionStatus") + private Integer productionStatus; + + @TableField("ProductionNote") + private String productionNote; + + @TableField("ProductionReport") + private String productionReport; + + @TableField("ProductionMark") + private String productionMark; + + @TableField("reserve1") + private String reserve1; + + @TableField("reserve2") + private String reserve2; + + @TableField("StoreNo") + private Integer storeNo; + + @TableField("StoreName") + private String storeName; + + @TableField("GroupId") + private Integer groupId; + + @TableField("GroupName") + private String groupName; + + @TableField("CustomerId") + private Integer customerId; +} diff --git a/src/main/java/com/niuan/erp/module/production/mapper/BomItemMapper.java b/src/main/java/com/niuan/erp/module/production/mapper/BomItemMapper.java new file mode 100644 index 0000000..f8186d5 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/production/mapper/BomItemMapper.java @@ -0,0 +1,16 @@ +package com.niuan.erp.module.production.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.niuan.erp.module.production.entity.BomItem; + +/** + *

+ * Mapper 接口 + *

+ * + * @author + * @since 2026-02-11 + */ +public interface BomItemMapper extends BaseMapper { + +} diff --git a/src/main/java/com/niuan/erp/module/production/mapper/BomMapper.java b/src/main/java/com/niuan/erp/module/production/mapper/BomMapper.java new file mode 100644 index 0000000..b04074d --- /dev/null +++ b/src/main/java/com/niuan/erp/module/production/mapper/BomMapper.java @@ -0,0 +1,16 @@ +package com.niuan.erp.module.production.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.niuan.erp.module.production.entity.Bom; + +/** + *

+ * Mapper 接口 + *

+ * + * @author + * @since 2026-02-11 + */ +public interface BomMapper extends BaseMapper { + +} diff --git a/src/main/java/com/niuan/erp/module/production/mapper/ProductionPlanMapper.java b/src/main/java/com/niuan/erp/module/production/mapper/ProductionPlanMapper.java new file mode 100644 index 0000000..c35b12c --- /dev/null +++ b/src/main/java/com/niuan/erp/module/production/mapper/ProductionPlanMapper.java @@ -0,0 +1,16 @@ +package com.niuan.erp.module.production.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.niuan.erp.module.production.entity.ProductionPlan; + +/** + *

+ * Mapper 接口 + *

+ * + * @author + * @since 2026-02-11 + */ +public interface ProductionPlanMapper extends BaseMapper { + +} diff --git a/src/main/java/com/niuan/erp/module/production/service/BomItemService.java b/src/main/java/com/niuan/erp/module/production/service/BomItemService.java new file mode 100644 index 0000000..f7928ee --- /dev/null +++ b/src/main/java/com/niuan/erp/module/production/service/BomItemService.java @@ -0,0 +1,23 @@ +package com.niuan.erp.module.production.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.module.production.controller.dto.BomItemDto; +import com.niuan.erp.module.production.entity.BomItem; + +import java.util.List; + +public interface BomItemService { + + IPage getBomItemPage(BasePageReqParams pageParams, LambdaQueryWrapper wrapper); + + void addBomItem(BomItemDto dto); + + void updateBomItem(BomItemDto dto); + + void deleteBomItem(long id); + + void deleteBatch(List ids); + +} diff --git a/src/main/java/com/niuan/erp/module/production/service/BomService.java b/src/main/java/com/niuan/erp/module/production/service/BomService.java new file mode 100644 index 0000000..b684398 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/production/service/BomService.java @@ -0,0 +1,23 @@ +package com.niuan.erp.module.production.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.module.production.controller.dto.BomDto; +import com.niuan.erp.module.production.entity.Bom; + +import java.util.List; + +public interface BomService { + + IPage getBomPage(BasePageReqParams pageParams, LambdaQueryWrapper wrapper); + + void addBom(BomDto dto); + + void updateBom(BomDto dto); + + void deleteBom(long id); + + void deleteBatch(List ids); + +} diff --git a/src/main/java/com/niuan/erp/module/production/service/FinishedProductReceiptService.java b/src/main/java/com/niuan/erp/module/production/service/FinishedProductReceiptService.java new file mode 100644 index 0000000..8b68919 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/production/service/FinishedProductReceiptService.java @@ -0,0 +1,23 @@ +package com.niuan.erp.module.production.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.module.common.entity.Document; +import com.niuan.erp.module.production.controller.dto.FinishedProductReceiptDto; + +import java.util.List; + +public interface FinishedProductReceiptService { + + IPage getFinishedProductReceiptPage(BasePageReqParams pageParams, LambdaQueryWrapper wrapper); + + void addFinishedProductReceipt(FinishedProductReceiptDto dto); + + void updateFinishedProductReceipt(FinishedProductReceiptDto dto); + + void deleteFinishedProductReceipt(long id); + + void deleteBatch(List ids); + +} diff --git a/src/main/java/com/niuan/erp/module/production/service/FinishedProductShipmentService.java b/src/main/java/com/niuan/erp/module/production/service/FinishedProductShipmentService.java new file mode 100644 index 0000000..26cf8dd --- /dev/null +++ b/src/main/java/com/niuan/erp/module/production/service/FinishedProductShipmentService.java @@ -0,0 +1,23 @@ +package com.niuan.erp.module.production.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.module.common.entity.Document; +import com.niuan.erp.module.production.controller.dto.FinishedProductShipmentDto; + +import java.util.List; + +public interface FinishedProductShipmentService { + + IPage getFinishedProductShipmentPage(BasePageReqParams pageParams, LambdaQueryWrapper wrapper); + + void addFinishedProductShipment(FinishedProductShipmentDto dto); + + void updateFinishedProductShipment(FinishedProductShipmentDto dto); + + void deleteFinishedProductShipment(long id); + + void deleteBatch(List ids); + +} diff --git a/src/main/java/com/niuan/erp/module/production/service/ProductionIssueService.java b/src/main/java/com/niuan/erp/module/production/service/ProductionIssueService.java new file mode 100644 index 0000000..3a6531c --- /dev/null +++ b/src/main/java/com/niuan/erp/module/production/service/ProductionIssueService.java @@ -0,0 +1,23 @@ +package com.niuan.erp.module.production.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.module.common.entity.Document; +import com.niuan.erp.module.production.controller.dto.ProductionIssueDto; + +import java.util.List; + +public interface ProductionIssueService { + + IPage getProductionIssuePage(BasePageReqParams pageParams, LambdaQueryWrapper wrapper); + + void addProductionIssue(ProductionIssueDto dto); + + void updateProductionIssue(ProductionIssueDto dto); + + void deleteProductionIssue(long id); + + void deleteBatch(List ids); + +} diff --git a/src/main/java/com/niuan/erp/module/production/service/ProductionPlanService.java b/src/main/java/com/niuan/erp/module/production/service/ProductionPlanService.java new file mode 100644 index 0000000..faff2f3 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/production/service/ProductionPlanService.java @@ -0,0 +1,23 @@ +package com.niuan.erp.module.production.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.module.production.controller.dto.ProductionPlanDto; +import com.niuan.erp.module.production.entity.ProductionPlan; + +import java.util.List; + +public interface ProductionPlanService { + + IPage getProductionPlanPage(BasePageReqParams pageParams, LambdaQueryWrapper wrapper); + + void addProductionPlan(ProductionPlanDto dto); + + void updateProductionPlan(ProductionPlanDto dto); + + void deleteProductionPlan(long id); + + void deleteBatch(List ids); + +} diff --git a/src/main/java/com/niuan/erp/module/production/service/ProductionReturnService.java b/src/main/java/com/niuan/erp/module/production/service/ProductionReturnService.java new file mode 100644 index 0000000..04ed2ba --- /dev/null +++ b/src/main/java/com/niuan/erp/module/production/service/ProductionReturnService.java @@ -0,0 +1,23 @@ +package com.niuan.erp.module.production.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.module.common.entity.Document; +import com.niuan.erp.module.production.controller.dto.ProductionReturnDto; + +import java.util.List; + +public interface ProductionReturnService { + + IPage getProductionReturnPage(BasePageReqParams pageParams, LambdaQueryWrapper wrapper); + + void addProductionReturn(ProductionReturnDto dto); + + void updateProductionReturn(ProductionReturnDto dto); + + void deleteProductionReturn(long id); + + void deleteBatch(List ids); + +} diff --git a/src/main/java/com/niuan/erp/module/production/service/impl/BomItemServiceImpl.java b/src/main/java/com/niuan/erp/module/production/service/impl/BomItemServiceImpl.java new file mode 100644 index 0000000..c03540e --- /dev/null +++ b/src/main/java/com/niuan/erp/module/production/service/impl/BomItemServiceImpl.java @@ -0,0 +1,56 @@ +package com.niuan.erp.module.production.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.module.production.controller.dto.BomItemDto; +import com.niuan.erp.module.production.converter.BomItemConverter; +import com.niuan.erp.module.production.entity.BomItem; +import com.niuan.erp.module.production.mapper.BomItemMapper; +import com.niuan.erp.module.production.service.BomItemService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + + +@Service +@Transactional +@RequiredArgsConstructor +public class BomItemServiceImpl extends ServiceImpl implements BomItemService { + + + private final BomItemConverter bomItemConverter; + + @Override + public IPage getBomItemPage(BasePageReqParams pageParams, LambdaQueryWrapper wrapper) { + IPage result = this.baseMapper.selectPage(new Page<>(pageParams.page(), pageParams.pageSize()), wrapper); + return result.convert(bomItemConverter::toDto); + } + + @Override + public void addBomItem(BomItemDto dto) { + BomItem entity = bomItemConverter.toEntity(dto); + this.baseMapper.insert(entity); + } + + @Override + public void updateBomItem(BomItemDto dto) { + BomItem entity = bomItemConverter.toEntity(dto); + this.baseMapper.updateById(entity); + } + + @Override + public void deleteBomItem(long id) { + this.baseMapper.deleteById(id); + } + + @Override + public void deleteBatch(List ids) { + this.baseMapper.deleteByIds(ids); + } + +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/production/service/impl/BomServiceImpl.java b/src/main/java/com/niuan/erp/module/production/service/impl/BomServiceImpl.java new file mode 100644 index 0000000..b9d4a48 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/production/service/impl/BomServiceImpl.java @@ -0,0 +1,65 @@ +package com.niuan.erp.module.production.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.utils.SecurityUtils; +import com.niuan.erp.module.production.controller.dto.BomDto; +import com.niuan.erp.module.production.converter.BomConverter; +import com.niuan.erp.module.production.entity.Bom; +import com.niuan.erp.module.production.mapper.BomMapper; +import com.niuan.erp.module.production.service.BomService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.util.List; + + +@Service +@Transactional +@RequiredArgsConstructor +public class BomServiceImpl extends ServiceImpl implements BomService { + + + private final BomConverter bomConverter; + + @Override + public IPage getBomPage(BasePageReqParams pageParams, LambdaQueryWrapper wrapper) { + IPage result = this.baseMapper.selectPage(new Page<>(pageParams.page(), pageParams.pageSize()), wrapper); + return result.convert(bomConverter::toDto); + } + + @Override + public void addBom(BomDto dto) { + Bom entity = bomConverter.toEntity(dto); + entity.setCreateUserId(SecurityUtils.getUserId()); + entity.setCreateUserName(SecurityUtils.getUserName()); + entity.setCreateDate(LocalDateTime.now()); + entity.setStatus(0); + this.baseMapper.insert(entity); + } + + @Override + public void updateBom(BomDto dto) { + Bom entity = bomConverter.toEntity(dto); + entity.setUpdateUserId(SecurityUtils.getUserId()); + entity.setUpdateUserName(SecurityUtils.getUserName()); + entity.setUpdateDate(LocalDateTime.now()); + this.baseMapper.updateById(entity); + } + + @Override + public void deleteBom(long id) { + this.baseMapper.deleteById(id); + } + + @Override + public void deleteBatch(List ids) { + this.baseMapper.deleteByIds(ids); + } + +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/production/service/impl/FinishedProductReceiptServiceImpl.java b/src/main/java/com/niuan/erp/module/production/service/impl/FinishedProductReceiptServiceImpl.java new file mode 100644 index 0000000..8591717 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/production/service/impl/FinishedProductReceiptServiceImpl.java @@ -0,0 +1,65 @@ +package com.niuan.erp.module.production.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.utils.SecurityUtils; +import com.niuan.erp.module.common.entity.Document; +import com.niuan.erp.module.common.mapper.DocumentMapper; +import com.niuan.erp.module.production.controller.dto.FinishedProductReceiptDto; +import com.niuan.erp.module.production.converter.FinishedProductReceiptConverter; +import com.niuan.erp.module.production.service.FinishedProductReceiptService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.util.List; + + +@Service +@Transactional +@RequiredArgsConstructor +public class FinishedProductReceiptServiceImpl extends ServiceImpl implements FinishedProductReceiptService { + + + private final FinishedProductReceiptConverter finishedProductReceiptConverter; + + @Override + public IPage getFinishedProductReceiptPage(BasePageReqParams pageParams, LambdaQueryWrapper wrapper) { + IPage result = this.baseMapper.selectPage(new Page<>(pageParams.page(), pageParams.pageSize()), wrapper); + return result.convert(finishedProductReceiptConverter::toDto); + } + + @Override + public void addFinishedProductReceipt(FinishedProductReceiptDto dto) { + Document entity = finishedProductReceiptConverter.toEntity(dto); + entity.setCreateUserId(SecurityUtils.getUserId()); + entity.setCreateUserName(SecurityUtils.getUserName()); + entity.setCreateDate(LocalDateTime.now()); + entity.setStatus(0); + this.baseMapper.insert(entity); + } + + @Override + public void updateFinishedProductReceipt(FinishedProductReceiptDto dto) { + Document entity = finishedProductReceiptConverter.toEntity(dto); + entity.setUpdateUserId(SecurityUtils.getUserId()); + entity.setUpdateUserName(SecurityUtils.getUserName()); + entity.setUpdateDate(LocalDateTime.now()); + this.baseMapper.updateById(entity); + } + + @Override + public void deleteFinishedProductReceipt(long id) { + this.baseMapper.deleteById(id); + } + + @Override + public void deleteBatch(List ids) { + this.baseMapper.deleteByIds(ids); + } + +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/production/service/impl/FinishedProductShipmentServiceImpl.java b/src/main/java/com/niuan/erp/module/production/service/impl/FinishedProductShipmentServiceImpl.java new file mode 100644 index 0000000..526ff7b --- /dev/null +++ b/src/main/java/com/niuan/erp/module/production/service/impl/FinishedProductShipmentServiceImpl.java @@ -0,0 +1,65 @@ +package com.niuan.erp.module.production.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.utils.SecurityUtils; +import com.niuan.erp.module.common.entity.Document; +import com.niuan.erp.module.common.mapper.DocumentMapper; +import com.niuan.erp.module.production.controller.dto.FinishedProductShipmentDto; +import com.niuan.erp.module.production.converter.FinishedProductShipmentConverter; +import com.niuan.erp.module.production.service.FinishedProductShipmentService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.util.List; + + +@Service +@Transactional +@RequiredArgsConstructor +public class FinishedProductShipmentServiceImpl extends ServiceImpl implements FinishedProductShipmentService { + + + private final FinishedProductShipmentConverter finishedProductShipmentConverter; + + @Override + public IPage getFinishedProductShipmentPage(BasePageReqParams pageParams, LambdaQueryWrapper wrapper) { + IPage result = this.baseMapper.selectPage(new Page<>(pageParams.page(), pageParams.pageSize()), wrapper); + return result.convert(finishedProductShipmentConverter::toDto); + } + + @Override + public void addFinishedProductShipment(FinishedProductShipmentDto dto) { + Document entity = finishedProductShipmentConverter.toEntity(dto); + entity.setCreateUserId(SecurityUtils.getUserId()); + entity.setCreateUserName(SecurityUtils.getUserName()); + entity.setCreateDate(LocalDateTime.now()); + entity.setStatus(0); + this.baseMapper.insert(entity); + } + + @Override + public void updateFinishedProductShipment(FinishedProductShipmentDto dto) { + Document entity = finishedProductShipmentConverter.toEntity(dto); + entity.setUpdateUserId(SecurityUtils.getUserId()); + entity.setUpdateUserName(SecurityUtils.getUserName()); + entity.setUpdateDate(LocalDateTime.now()); + this.baseMapper.updateById(entity); + } + + @Override + public void deleteFinishedProductShipment(long id) { + this.baseMapper.deleteById(id); + } + + @Override + public void deleteBatch(List ids) { + this.baseMapper.deleteByIds(ids); + } + +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/production/service/impl/ProductionIssueServiceImpl.java b/src/main/java/com/niuan/erp/module/production/service/impl/ProductionIssueServiceImpl.java new file mode 100644 index 0000000..d671821 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/production/service/impl/ProductionIssueServiceImpl.java @@ -0,0 +1,65 @@ +package com.niuan.erp.module.production.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.utils.SecurityUtils; +import com.niuan.erp.module.common.entity.Document; +import com.niuan.erp.module.common.mapper.DocumentMapper; +import com.niuan.erp.module.production.controller.dto.ProductionIssueDto; +import com.niuan.erp.module.production.converter.ProductionIssueConverter; +import com.niuan.erp.module.production.service.ProductionIssueService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.util.List; + + +@Service +@Transactional +@RequiredArgsConstructor +public class ProductionIssueServiceImpl extends ServiceImpl implements ProductionIssueService { + + + private final ProductionIssueConverter productionIssueConverter; + + @Override + public IPage getProductionIssuePage(BasePageReqParams pageParams, LambdaQueryWrapper wrapper) { + IPage result = this.baseMapper.selectPage(new Page<>(pageParams.page(), pageParams.pageSize()), wrapper); + return result.convert(productionIssueConverter::toDto); + } + + @Override + public void addProductionIssue(ProductionIssueDto dto) { + Document entity = productionIssueConverter.toEntity(dto); + entity.setCreateUserId(SecurityUtils.getUserId()); + entity.setCreateUserName(SecurityUtils.getUserName()); + entity.setCreateDate(LocalDateTime.now()); + entity.setStatus(0); + this.baseMapper.insert(entity); + } + + @Override + public void updateProductionIssue(ProductionIssueDto dto) { + Document entity = productionIssueConverter.toEntity(dto); + entity.setUpdateUserId(SecurityUtils.getUserId()); + entity.setUpdateUserName(SecurityUtils.getUserName()); + entity.setUpdateDate(LocalDateTime.now()); + this.baseMapper.updateById(entity); + } + + @Override + public void deleteProductionIssue(long id) { + this.baseMapper.deleteById(id); + } + + @Override + public void deleteBatch(List ids) { + this.baseMapper.deleteByIds(ids); + } + +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/production/service/impl/ProductionPlanServiceImpl.java b/src/main/java/com/niuan/erp/module/production/service/impl/ProductionPlanServiceImpl.java new file mode 100644 index 0000000..5b94833 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/production/service/impl/ProductionPlanServiceImpl.java @@ -0,0 +1,65 @@ +package com.niuan.erp.module.production.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.utils.SecurityUtils; +import com.niuan.erp.module.production.controller.dto.ProductionPlanDto; +import com.niuan.erp.module.production.converter.ProductionPlanConverter; +import com.niuan.erp.module.production.entity.ProductionPlan; +import com.niuan.erp.module.production.mapper.ProductionPlanMapper; +import com.niuan.erp.module.production.service.ProductionPlanService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.util.List; + + +@Service +@Transactional +@RequiredArgsConstructor +public class ProductionPlanServiceImpl extends ServiceImpl implements ProductionPlanService { + + + private final ProductionPlanConverter productionPlanConverter; + + @Override + public IPage getProductionPlanPage(BasePageReqParams pageParams, LambdaQueryWrapper wrapper) { + IPage result = this.baseMapper.selectPage(new Page<>(pageParams.page(), pageParams.pageSize()), wrapper); + return result.convert(productionPlanConverter::toDto); + } + + @Override + public void addProductionPlan(ProductionPlanDto dto) { + ProductionPlan entity = productionPlanConverter.toEntity(dto); + entity.setCreateUserId(SecurityUtils.getUserId()); + entity.setCreateUserName(SecurityUtils.getUserName()); + entity.setCreateDate(LocalDateTime.now()); + entity.setStatus(0); + this.baseMapper.insert(entity); + } + + @Override + public void updateProductionPlan(ProductionPlanDto dto) { + ProductionPlan entity = productionPlanConverter.toEntity(dto); + entity.setUpdateUserId(SecurityUtils.getUserId()); + entity.setUpdateUserName(SecurityUtils.getUserName()); + entity.setUpdateDate(LocalDateTime.now()); + this.baseMapper.updateById(entity); + } + + @Override + public void deleteProductionPlan(long id) { + this.baseMapper.deleteById(id); + } + + @Override + public void deleteBatch(List ids) { + this.baseMapper.deleteByIds(ids); + } + +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/production/service/impl/ProductionReturnServiceImpl.java b/src/main/java/com/niuan/erp/module/production/service/impl/ProductionReturnServiceImpl.java new file mode 100644 index 0000000..cbefb3a --- /dev/null +++ b/src/main/java/com/niuan/erp/module/production/service/impl/ProductionReturnServiceImpl.java @@ -0,0 +1,65 @@ +package com.niuan.erp.module.production.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.utils.SecurityUtils; +import com.niuan.erp.module.common.entity.Document; +import com.niuan.erp.module.common.mapper.DocumentMapper; +import com.niuan.erp.module.production.controller.dto.ProductionReturnDto; +import com.niuan.erp.module.production.converter.ProductionReturnConverter; +import com.niuan.erp.module.production.service.ProductionReturnService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.util.List; + + +@Service +@Transactional +@RequiredArgsConstructor +public class ProductionReturnServiceImpl extends ServiceImpl implements ProductionReturnService { + + + private final ProductionReturnConverter productionReturnConverter; + + @Override + public IPage getProductionReturnPage(BasePageReqParams pageParams, LambdaQueryWrapper wrapper) { + IPage result = this.baseMapper.selectPage(new Page<>(pageParams.page(), pageParams.pageSize()), wrapper); + return result.convert(productionReturnConverter::toDto); + } + + @Override + public void addProductionReturn(ProductionReturnDto dto) { + Document entity = productionReturnConverter.toEntity(dto); + entity.setCreateUserId(SecurityUtils.getUserId()); + entity.setCreateUserName(SecurityUtils.getUserName()); + entity.setCreateDate(LocalDateTime.now()); + entity.setStatus(0); + this.baseMapper.insert(entity); + } + + @Override + public void updateProductionReturn(ProductionReturnDto dto) { + Document entity = productionReturnConverter.toEntity(dto); + entity.setUpdateUserId(SecurityUtils.getUserId()); + entity.setUpdateUserName(SecurityUtils.getUserName()); + entity.setUpdateDate(LocalDateTime.now()); + this.baseMapper.updateById(entity); + } + + @Override + public void deleteProductionReturn(long id) { + this.baseMapper.deleteById(id); + } + + @Override + public void deleteBatch(List ids) { + this.baseMapper.deleteByIds(ids); + } + +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/purchase/controller/PurchaseOrderController.java b/src/main/java/com/niuan/erp/module/purchase/controller/PurchaseOrderController.java new file mode 100644 index 0000000..72f0712 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/purchase/controller/PurchaseOrderController.java @@ -0,0 +1,76 @@ +package com.niuan.erp.module.purchase.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.annotation.ApiLog; +import com.niuan.erp.common.annotation.ModuleLog; +import com.niuan.erp.common.base.BaseDeleteBody; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.base.BaseResult; +import com.niuan.erp.common.base.CommonValidateGroup.*; +import com.niuan.erp.common.base.OperationType; +import com.niuan.erp.module.common.entity.Document; +import com.niuan.erp.module.purchase.controller.dto.PurchaseOrderDto; +import com.niuan.erp.module.purchase.service.PurchaseOrderService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +@Tag(name = "PurchaseOrder") +@ModuleLog("PurchaseOrder管理") +@RestController +@RequestMapping("/purchase/purchaseorder") +@RequiredArgsConstructor +public class PurchaseOrderController { + + private final PurchaseOrderService purchaseOrderService; + + @Operation(summary = "分页查询PurchaseOrder数据", operationId = "getPurchaseOrderPage") + @GetMapping("/getPurchaseOrderPage") + @PreAuthorize("hasAuthority('purchaseorder:index')") + public BaseResult> getPurchaseOrderPage(@Validated BasePageReqParams pageParams, + @Validated(Get.class) PurchaseOrderDto searchParams) { + var wrapper = new LambdaQueryWrapper(); + return BaseResult.successWithData(purchaseOrderService.getPurchaseOrderPage(pageParams, wrapper)); + } + + + @ApiLog(type = OperationType.ADD, remark = "新增一条PurchaseOrder记录") + @Operation(summary = "新增PurchaseOrder", operationId = "addPurchaseOrder") + @PostMapping("/addPurchaseOrder") + @PreAuthorize("hasAuthority('purchaseorder:add')") + public BaseResult addPurchaseOrder(@Validated(Add.class) @RequestBody PurchaseOrderDto dto) { + purchaseOrderService.addPurchaseOrder(dto); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.UPDATE, remark = "更新一条PurchaseOrder记录") + @Operation(summary = "更新PurchaseOrder", operationId = "updatePurchaseOrder") + @PostMapping("/updatePurchaseOrder") + @PreAuthorize("hasAuthority('purchaseorder:update')") + public BaseResult updatePurchaseOrder(@Validated(Update.class) @RequestBody PurchaseOrderDto dto) { + purchaseOrderService.updatePurchaseOrder(dto); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.DELETE, remark = "删除一条PurchaseOrder记录") + @Operation(summary = "删除PurchaseOrder", operationId = "deletePurchaseOrder") + @PostMapping("/deletePurchaseOrder") + @PreAuthorize("hasAuthority('purchaseorder:delete')") + public BaseResult deletePurchaseOrder(@Validated(DeleteOne.class) @RequestBody BaseDeleteBody req) { + purchaseOrderService.deletePurchaseOrder(req.id()); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.DELETE, remark = "批量删除PurchaseOrder记录") + @Operation(summary = "批量删除PurchaseOrder", operationId = "deletePurchaseOrderBatch") + @PostMapping("/deletePurchaseOrderBatch") + @PreAuthorize("hasAuthority('purchaseorder:deleteBatch')") + public BaseResult deletePurchaseOrderBatch(@Validated(DeleteBatch.class) @RequestBody BaseDeleteBody req) { + purchaseOrderService.deleteBatch(req.ids()); + return BaseResult.success(); + } +} diff --git a/src/main/java/com/niuan/erp/module/purchase/controller/PurchasePlanController.java b/src/main/java/com/niuan/erp/module/purchase/controller/PurchasePlanController.java new file mode 100644 index 0000000..db0d2fa --- /dev/null +++ b/src/main/java/com/niuan/erp/module/purchase/controller/PurchasePlanController.java @@ -0,0 +1,82 @@ +package com.niuan.erp.module.purchase.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.annotation.ApiLog; +import com.niuan.erp.common.annotation.ModuleLog; +import com.niuan.erp.common.base.BaseDeleteBody; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.base.BaseResult; +import com.niuan.erp.common.base.CommonValidateGroup.*; +import com.niuan.erp.common.base.OperationType; +import com.niuan.erp.module.purchase.controller.dto.PurchasePlanDto; +import com.niuan.erp.module.purchase.entity.PurchasePlan; +import com.niuan.erp.module.purchase.service.PurchasePlanService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.util.StringUtils; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +@Tag(name = "PurchasePlan") +@ModuleLog("PurchasePlan管理") +@RestController +@RequestMapping("/purchase/purchaseplan") +@RequiredArgsConstructor +public class PurchasePlanController { + + private final PurchasePlanService purchasePlanService; + + @Operation(summary = "分页查询PurchasePlan数据", operationId = "getPurchasePlanPage") + @GetMapping("/getPurchasePlanPage") + @PreAuthorize("hasAuthority('purchaseplan:index')") + public BaseResult> getPurchasePlanPage(@Validated BasePageReqParams pageParams, + @Validated(Get.class) PurchasePlanDto searchParams) { + var wrapper = new LambdaQueryWrapper(); + if (searchParams != null) { + if (StringUtils.hasText(searchParams.vendorName())) { + wrapper.like(PurchasePlan::getVendorName, searchParams.vendorName()); + } + } + return BaseResult.successWithData(purchasePlanService.getPurchasePlanPage(pageParams, wrapper)); + } + + + @ApiLog(type = OperationType.ADD, remark = "新增一条PurchasePlan记录") + @Operation(summary = "新增PurchasePlan", operationId = "addPurchasePlan") + @PostMapping("/addPurchasePlan") + @PreAuthorize("hasAuthority('purchaseplan:add')") + public BaseResult addPurchasePlan(@Validated(Add.class) @RequestBody PurchasePlanDto dto) { + purchasePlanService.addPurchasePlan(dto); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.UPDATE, remark = "更新一条PurchasePlan记录") + @Operation(summary = "更新PurchasePlan", operationId = "updatePurchasePlan") + @PostMapping("/updatePurchasePlan") + @PreAuthorize("hasAuthority('purchaseplan:update')") + public BaseResult updatePurchasePlan(@Validated(Update.class) @RequestBody PurchasePlanDto dto) { + purchasePlanService.updatePurchasePlan(dto); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.DELETE, remark = "删除一条PurchasePlan记录") + @Operation(summary = "删除PurchasePlan", operationId = "deletePurchasePlan") + @PostMapping("/deletePurchasePlan") + @PreAuthorize("hasAuthority('purchaseplan:delete')") + public BaseResult deletePurchasePlan(@Validated(DeleteOne.class) @RequestBody BaseDeleteBody req) { + purchasePlanService.deletePurchasePlan(req.id()); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.DELETE, remark = "批量删除PurchasePlan记录") + @Operation(summary = "批量删除PurchasePlan", operationId = "deletePurchasePlanBatch") + @PostMapping("/deletePurchasePlanBatch") + @PreAuthorize("hasAuthority('purchaseplan:deleteBatch')") + public BaseResult deletePurchasePlanBatch(@Validated(DeleteBatch.class) @RequestBody BaseDeleteBody req) { + purchasePlanService.deleteBatch(req.ids()); + return BaseResult.success(); + } +} diff --git a/src/main/java/com/niuan/erp/module/purchase/controller/dto/PurchaseOrderDto.java b/src/main/java/com/niuan/erp/module/purchase/controller/dto/PurchaseOrderDto.java new file mode 100644 index 0000000..78687f9 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/purchase/controller/dto/PurchaseOrderDto.java @@ -0,0 +1,29 @@ +package com.niuan.erp.module.purchase.controller.dto; + +import java.time.LocalDateTime; + +public record PurchaseOrderDto( + Long id, + Integer status, + LocalDateTime createDate, + Long createUserId, + String createUserName, + LocalDateTime updateDate, + Long updateUserId, + String updateUserName, + Integer storeNo, + String storeName, + Integer formType, + String formCode, + String formName, + Integer formStatus, + String formMark, + Integer reserve1, + String reserve2, + Integer vendorNo, + String vendorName, + Double totalValue, + Integer outStoreNo, + String outStoreName, + Integer groupId, + Integer customerId) {} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/purchase/controller/dto/PurchaseOrderItemDto.java b/src/main/java/com/niuan/erp/module/purchase/controller/dto/PurchaseOrderItemDto.java new file mode 100644 index 0000000..41f7625 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/purchase/controller/dto/PurchaseOrderItemDto.java @@ -0,0 +1,25 @@ +package com.niuan.erp.module.purchase.controller.dto; + +import java.time.LocalDateTime; + +public record PurchaseOrderItemDto( + Long id, + Integer status, + LocalDateTime createDate, + Long createUserId, + String createUserName, + LocalDateTime updateDate, + Long updateUserId, + String updateUserName, + Integer documentNo, + String documentCode, + String projectName, + String partNumber, + Integer purchaseCount, + Double price, + Double totalPrice, + String purchaseMark, + Integer reserve1, + String reserve2, + Integer receiptCount, + Long partId) {} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/purchase/controller/dto/PurchasePlanDto.java b/src/main/java/com/niuan/erp/module/purchase/controller/dto/PurchasePlanDto.java new file mode 100644 index 0000000..6f38df4 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/purchase/controller/dto/PurchasePlanDto.java @@ -0,0 +1,21 @@ +package com.niuan.erp.module.purchase.controller.dto; + +import java.time.LocalDateTime; + +public record PurchasePlanDto( + Long id, + Long createUserId, + String createUserName, + LocalDateTime createDate, + LocalDateTime updateDate, + Integer updateUserId, + LocalDateTime updateUserName, + Integer status, + String planNo, + Long vendorId, + String vendorName, + Long storeNo, + Integer planStatus, + String storeName, + String remask, + String planName) {} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/purchase/controller/dto/PurchasePlanItemDto.java b/src/main/java/com/niuan/erp/module/purchase/controller/dto/PurchasePlanItemDto.java new file mode 100644 index 0000000..33dca35 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/purchase/controller/dto/PurchasePlanItemDto.java @@ -0,0 +1,15 @@ +package com.niuan.erp.module.purchase.controller.dto; + +import java.math.BigDecimal; + +public record PurchasePlanItemDto( + Long id, + Long planId, + String partNumber, + BigDecimal price, + Integer purchaseCount, + BigDecimal totalPrice, + Integer completeCount, + Integer currentCount, + Integer completeStatus, + Long partId) {} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/purchase/converter/PurchaseOrderConverter.java b/src/main/java/com/niuan/erp/module/purchase/converter/PurchaseOrderConverter.java new file mode 100644 index 0000000..010ec05 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/purchase/converter/PurchaseOrderConverter.java @@ -0,0 +1,15 @@ +package com.niuan.erp.module.purchase.converter; + +import com.niuan.erp.module.common.entity.Document; +import com.niuan.erp.module.purchase.controller.dto.PurchaseOrderDto; +import org.mapstruct.Mapper; +import org.mapstruct.ReportingPolicy; + +import java.util.List; + +@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) +public interface PurchaseOrderConverter { + Document toEntity(PurchaseOrderDto dto); + PurchaseOrderDto toDto(Document entity); + List toDtoList(List entities); +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/purchase/converter/PurchaseOrderItemConverter.java b/src/main/java/com/niuan/erp/module/purchase/converter/PurchaseOrderItemConverter.java new file mode 100644 index 0000000..b0f26ea --- /dev/null +++ b/src/main/java/com/niuan/erp/module/purchase/converter/PurchaseOrderItemConverter.java @@ -0,0 +1,15 @@ +package com.niuan.erp.module.purchase.converter; + +import com.niuan.erp.module.purchase.controller.dto.PurchaseOrderItemDto; +import com.niuan.erp.module.purchase.entity.PurchaseOrderItem; +import org.mapstruct.Mapper; +import org.mapstruct.ReportingPolicy; + +import java.util.List; + +@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) +public interface PurchaseOrderItemConverter { + PurchaseOrderItem toEntity(PurchaseOrderItemDto dto); + PurchaseOrderItemDto toDto(PurchaseOrderItem entity); + List toDtoList(List entities); +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/purchase/converter/PurchasePlanConverter.java b/src/main/java/com/niuan/erp/module/purchase/converter/PurchasePlanConverter.java new file mode 100644 index 0000000..8609b24 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/purchase/converter/PurchasePlanConverter.java @@ -0,0 +1,15 @@ +package com.niuan.erp.module.purchase.converter; + +import com.niuan.erp.module.purchase.controller.dto.PurchasePlanDto; +import com.niuan.erp.module.purchase.entity.PurchasePlan; +import org.mapstruct.Mapper; +import org.mapstruct.ReportingPolicy; + +import java.util.List; + +@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) +public interface PurchasePlanConverter { + PurchasePlan toEntity(PurchasePlanDto dto); + PurchasePlanDto toDto(PurchasePlan entity); + List toDtoList(List entities); +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/purchase/converter/PurchasePlanItemConverter.java b/src/main/java/com/niuan/erp/module/purchase/converter/PurchasePlanItemConverter.java new file mode 100644 index 0000000..7412a32 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/purchase/converter/PurchasePlanItemConverter.java @@ -0,0 +1,15 @@ +package com.niuan.erp.module.purchase.converter; + +import com.niuan.erp.module.purchase.controller.dto.PurchasePlanItemDto; +import com.niuan.erp.module.purchase.entity.PurchasePlanItem; +import org.mapstruct.Mapper; +import org.mapstruct.ReportingPolicy; + +import java.util.List; + +@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) +public interface PurchasePlanItemConverter { + PurchasePlanItem toEntity(PurchasePlanItemDto dto); + PurchasePlanItemDto toDto(PurchasePlanItem entity); + List toDtoList(List entities); +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/purchase/entity/PurchaseOrderItem.java b/src/main/java/com/niuan/erp/module/purchase/entity/PurchaseOrderItem.java new file mode 100644 index 0000000..c595a71 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/purchase/entity/PurchaseOrderItem.java @@ -0,0 +1,89 @@ +package com.niuan.erp.module.purchase.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *

+ * + *

+ * + * @author + * @since 2026-02-11 + */ +@Getter +@Setter +@ToString +@TableName("purchasematerial") +public class PurchaseOrderItem implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "Id", type = IdType.AUTO) + private Long id; + + @TableField("Status") + private Integer status; + + @TableField("CreateDate") + private LocalDateTime createDate; + + @TableField("CreateUserId") + private Long createUserId; + + @TableField("CreateUserName") + private String createUserName; + + @TableField("UpdateDate") + private LocalDateTime updateDate; + + @TableField("UpdateUserId") + private Long updateUserId; + + @TableField("UpdateUserName") + private String updateUserName; + + @TableField("DocumentNo") + private Integer documentNo; + + @TableField("DocumentCode") + private String documentCode; + + @TableField("ProjectName") + private String projectName; + + @TableField("PartNumber") + private String partNumber; + + @TableField("PurchaseCount") + private Integer purchaseCount; + + @TableField("Price") + private Double price; + + @TableField("TotalPrice") + private Double totalPrice; + + @TableField("PurchaseMark") + private String purchaseMark; + + @TableField("reserve1") + private Integer reserve1; + + @TableField("reserve2") + private String reserve2; + + @TableField("ReceiptCount") + private Integer receiptCount; + + @TableField("PartId") + private Long partId; +} diff --git a/src/main/java/com/niuan/erp/module/purchase/entity/PurchasePlan.java b/src/main/java/com/niuan/erp/module/purchase/entity/PurchasePlan.java new file mode 100644 index 0000000..2fb2518 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/purchase/entity/PurchasePlan.java @@ -0,0 +1,77 @@ +package com.niuan.erp.module.purchase.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *

+ * + *

+ * + * @author + * @since 2026-02-11 + */ +@Getter +@Setter +@ToString +@TableName("purchaseplans") +public class PurchasePlan implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "Id", type = IdType.AUTO) + private Long id; + + @TableField("CreateUserId") + private Long createUserId; + + @TableField("CreateUserName") + private String createUserName; + + @TableField("CreateDate") + private LocalDateTime createDate; + + @TableField("UpdateDate") + private LocalDateTime updateDate; + + @TableField("UpdateUserId") + private Integer updateUserId; + + @TableField("UpdateUserName") + private LocalDateTime updateUserName; + + @TableField("Status") + private Integer status; + + @TableField("PlanNo") + private String planNo; + + @TableField("VendorId") + private Long vendorId; + + @TableField("VendorName") + private String vendorName; + + @TableField("StoreNo") + private Long storeNo; + + @TableField("PlanStatus") + private Integer planStatus; + + @TableField("StoreName") + private String storeName; + + @TableField("Remask") + private String remask; + + @TableField("PlanName") + private String planName; +} diff --git a/src/main/java/com/niuan/erp/module/purchase/entity/PurchasePlanItem.java b/src/main/java/com/niuan/erp/module/purchase/entity/PurchasePlanItem.java new file mode 100644 index 0000000..40ad278 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/purchase/entity/PurchasePlanItem.java @@ -0,0 +1,59 @@ +package com.niuan.erp.module.purchase.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + *

+ * + *

+ * + * @author + * @since 2026-02-11 + */ +@Getter +@Setter +@ToString +@TableName("purchaseplandetails") +public class PurchasePlanItem implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "Id", type = IdType.AUTO) + private Long id; + + @TableField("PlanId") + private Long planId; + + @TableField("PartNumber") + private String partNumber; + + @TableField("Price") + private BigDecimal price; + + @TableField("PurchaseCount") + private Integer purchaseCount; + + @TableField("TotalPrice") + private BigDecimal totalPrice; + + @TableField("CompleteCount") + private Integer completeCount; + + @TableField("CurrentCount") + private Integer currentCount; + + @TableField("completeStatus") + private Integer completeStatus; + + @TableField("PartId") + private Long partId; +} diff --git a/src/main/java/com/niuan/erp/module/purchase/mapper/PurchaseOrderItemMapper.java b/src/main/java/com/niuan/erp/module/purchase/mapper/PurchaseOrderItemMapper.java new file mode 100644 index 0000000..278387d --- /dev/null +++ b/src/main/java/com/niuan/erp/module/purchase/mapper/PurchaseOrderItemMapper.java @@ -0,0 +1,16 @@ +package com.niuan.erp.module.purchase.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.niuan.erp.module.purchase.entity.PurchaseOrderItem; + +/** + *

+ * Mapper 接口 + *

+ * + * @author + * @since 2026-02-11 + */ +public interface PurchaseOrderItemMapper extends BaseMapper { + +} diff --git a/src/main/java/com/niuan/erp/module/purchase/mapper/PurchasePlanItemMapper.java b/src/main/java/com/niuan/erp/module/purchase/mapper/PurchasePlanItemMapper.java new file mode 100644 index 0000000..c9d8c5e --- /dev/null +++ b/src/main/java/com/niuan/erp/module/purchase/mapper/PurchasePlanItemMapper.java @@ -0,0 +1,16 @@ +package com.niuan.erp.module.purchase.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.niuan.erp.module.purchase.entity.PurchasePlanItem; + +/** + *

+ * Mapper 接口 + *

+ * + * @author + * @since 2026-02-11 + */ +public interface PurchasePlanItemMapper extends BaseMapper { + +} diff --git a/src/main/java/com/niuan/erp/module/purchase/mapper/PurchasePlanMapper.java b/src/main/java/com/niuan/erp/module/purchase/mapper/PurchasePlanMapper.java new file mode 100644 index 0000000..ce4866f --- /dev/null +++ b/src/main/java/com/niuan/erp/module/purchase/mapper/PurchasePlanMapper.java @@ -0,0 +1,16 @@ +package com.niuan.erp.module.purchase.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.niuan.erp.module.purchase.entity.PurchasePlan; + +/** + *

+ * Mapper 接口 + *

+ * + * @author + * @since 2026-02-11 + */ +public interface PurchasePlanMapper extends BaseMapper { + +} diff --git a/src/main/java/com/niuan/erp/module/purchase/service/PurchaseOrderItemService.java b/src/main/java/com/niuan/erp/module/purchase/service/PurchaseOrderItemService.java new file mode 100644 index 0000000..90dd2fa --- /dev/null +++ b/src/main/java/com/niuan/erp/module/purchase/service/PurchaseOrderItemService.java @@ -0,0 +1,23 @@ +package com.niuan.erp.module.purchase.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.module.purchase.controller.dto.PurchaseOrderItemDto; +import com.niuan.erp.module.purchase.entity.PurchaseOrderItem; + +import java.util.List; + +public interface PurchaseOrderItemService { + + IPage getPurchaseOrderItemPage(BasePageReqParams pageParams, LambdaQueryWrapper wrapper); + + void addPurchaseOrderItem(PurchaseOrderItemDto dto); + + void updatePurchaseOrderItem(PurchaseOrderItemDto dto); + + void deletePurchaseOrderItem(long id); + + void deleteBatch(List ids); + +} diff --git a/src/main/java/com/niuan/erp/module/purchase/service/PurchaseOrderService.java b/src/main/java/com/niuan/erp/module/purchase/service/PurchaseOrderService.java new file mode 100644 index 0000000..b15b105 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/purchase/service/PurchaseOrderService.java @@ -0,0 +1,23 @@ +package com.niuan.erp.module.purchase.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.module.common.entity.Document; +import com.niuan.erp.module.purchase.controller.dto.PurchaseOrderDto; + +import java.util.List; + +public interface PurchaseOrderService { + + IPage getPurchaseOrderPage(BasePageReqParams pageParams, LambdaQueryWrapper wrapper); + + void addPurchaseOrder(PurchaseOrderDto dto); + + void updatePurchaseOrder(PurchaseOrderDto dto); + + void deletePurchaseOrder(long id); + + void deleteBatch(List ids); + +} diff --git a/src/main/java/com/niuan/erp/module/purchase/service/PurchasePlanItemService.java b/src/main/java/com/niuan/erp/module/purchase/service/PurchasePlanItemService.java new file mode 100644 index 0000000..cb42b94 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/purchase/service/PurchasePlanItemService.java @@ -0,0 +1,23 @@ +package com.niuan.erp.module.purchase.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.module.purchase.controller.dto.PurchasePlanItemDto; +import com.niuan.erp.module.purchase.entity.PurchasePlanItem; + +import java.util.List; + +public interface PurchasePlanItemService { + + IPage getPurchasePlanItemPage(BasePageReqParams pageParams, LambdaQueryWrapper wrapper); + + void addPurchasePlanItem(PurchasePlanItemDto dto); + + void updatePurchasePlanItem(PurchasePlanItemDto dto); + + void deletePurchasePlanItem(long id); + + void deleteBatch(List ids); + +} diff --git a/src/main/java/com/niuan/erp/module/purchase/service/PurchasePlanService.java b/src/main/java/com/niuan/erp/module/purchase/service/PurchasePlanService.java new file mode 100644 index 0000000..afb89e9 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/purchase/service/PurchasePlanService.java @@ -0,0 +1,23 @@ +package com.niuan.erp.module.purchase.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.module.purchase.controller.dto.PurchasePlanDto; +import com.niuan.erp.module.purchase.entity.PurchasePlan; + +import java.util.List; + +public interface PurchasePlanService { + + IPage getPurchasePlanPage(BasePageReqParams pageParams, LambdaQueryWrapper wrapper); + + void addPurchasePlan(PurchasePlanDto dto); + + void updatePurchasePlan(PurchasePlanDto dto); + + void deletePurchasePlan(long id); + + void deleteBatch(List ids); + +} diff --git a/src/main/java/com/niuan/erp/module/purchase/service/impl/PurchaseOrderItemServiceImpl.java b/src/main/java/com/niuan/erp/module/purchase/service/impl/PurchaseOrderItemServiceImpl.java new file mode 100644 index 0000000..01c1039 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/purchase/service/impl/PurchaseOrderItemServiceImpl.java @@ -0,0 +1,65 @@ +package com.niuan.erp.module.purchase.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.utils.SecurityUtils; +import com.niuan.erp.module.purchase.controller.dto.PurchaseOrderItemDto; +import com.niuan.erp.module.purchase.converter.PurchaseOrderItemConverter; +import com.niuan.erp.module.purchase.entity.PurchaseOrderItem; +import com.niuan.erp.module.purchase.mapper.PurchaseOrderItemMapper; +import com.niuan.erp.module.purchase.service.PurchaseOrderItemService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.util.List; + + +@Service +@Transactional +@RequiredArgsConstructor +public class PurchaseOrderItemServiceImpl extends ServiceImpl implements PurchaseOrderItemService { + + + private final PurchaseOrderItemConverter purchaseOrderItemConverter; + + @Override + public IPage getPurchaseOrderItemPage(BasePageReqParams pageParams, LambdaQueryWrapper wrapper) { + IPage result = this.baseMapper.selectPage(new Page<>(pageParams.page(), pageParams.pageSize()), wrapper); + return result.convert(purchaseOrderItemConverter::toDto); + } + + @Override + public void addPurchaseOrderItem(PurchaseOrderItemDto dto) { + PurchaseOrderItem entity = purchaseOrderItemConverter.toEntity(dto); + entity.setCreateUserId(SecurityUtils.getUserId()); + entity.setCreateUserName(SecurityUtils.getUserName()); + entity.setCreateDate(LocalDateTime.now()); + entity.setStatus(0); + this.baseMapper.insert(entity); + } + + @Override + public void updatePurchaseOrderItem(PurchaseOrderItemDto dto) { + PurchaseOrderItem entity = purchaseOrderItemConverter.toEntity(dto); + entity.setUpdateUserId(SecurityUtils.getUserId()); + entity.setUpdateUserName(SecurityUtils.getUserName()); + entity.setUpdateDate(LocalDateTime.now()); + this.baseMapper.updateById(entity); + } + + @Override + public void deletePurchaseOrderItem(long id) { + this.baseMapper.deleteById(id); + } + + @Override + public void deleteBatch(List ids) { + this.baseMapper.deleteByIds(ids); + } + +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/purchase/service/impl/PurchaseOrderServiceImpl.java b/src/main/java/com/niuan/erp/module/purchase/service/impl/PurchaseOrderServiceImpl.java new file mode 100644 index 0000000..ce48fb7 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/purchase/service/impl/PurchaseOrderServiceImpl.java @@ -0,0 +1,65 @@ +package com.niuan.erp.module.purchase.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.utils.SecurityUtils; +import com.niuan.erp.module.common.entity.Document; +import com.niuan.erp.module.common.mapper.DocumentMapper; +import com.niuan.erp.module.purchase.controller.dto.PurchaseOrderDto; +import com.niuan.erp.module.purchase.converter.PurchaseOrderConverter; +import com.niuan.erp.module.purchase.service.PurchaseOrderService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.util.List; + + +@Service +@Transactional +@RequiredArgsConstructor +public class PurchaseOrderServiceImpl extends ServiceImpl implements PurchaseOrderService { + + + private final PurchaseOrderConverter purchaseOrderConverter; + + @Override + public IPage getPurchaseOrderPage(BasePageReqParams pageParams, LambdaQueryWrapper wrapper) { + IPage result = this.baseMapper.selectPage(new Page<>(pageParams.page(), pageParams.pageSize()), wrapper); + return result.convert(purchaseOrderConverter::toDto); + } + + @Override + public void addPurchaseOrder(PurchaseOrderDto dto) { + Document entity = purchaseOrderConverter.toEntity(dto); + entity.setCreateUserId(SecurityUtils.getUserId()); + entity.setCreateUserName(SecurityUtils.getUserName()); + entity.setCreateDate(LocalDateTime.now()); + entity.setStatus(0); + this.baseMapper.insert(entity); + } + + @Override + public void updatePurchaseOrder(PurchaseOrderDto dto) { + Document entity = purchaseOrderConverter.toEntity(dto); + entity.setUpdateUserId(SecurityUtils.getUserId()); + entity.setUpdateUserName(SecurityUtils.getUserName()); + entity.setUpdateDate(LocalDateTime.now()); + this.baseMapper.updateById(entity); + } + + @Override + public void deletePurchaseOrder(long id) { + this.baseMapper.deleteById(id); + } + + @Override + public void deleteBatch(List ids) { + this.baseMapper.deleteByIds(ids); + } + +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/purchase/service/impl/PurchasePlanItemServiceImpl.java b/src/main/java/com/niuan/erp/module/purchase/service/impl/PurchasePlanItemServiceImpl.java new file mode 100644 index 0000000..7f41a33 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/purchase/service/impl/PurchasePlanItemServiceImpl.java @@ -0,0 +1,56 @@ +package com.niuan.erp.module.purchase.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.module.purchase.controller.dto.PurchasePlanItemDto; +import com.niuan.erp.module.purchase.converter.PurchasePlanItemConverter; +import com.niuan.erp.module.purchase.entity.PurchasePlanItem; +import com.niuan.erp.module.purchase.mapper.PurchasePlanItemMapper; +import com.niuan.erp.module.purchase.service.PurchasePlanItemService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + + +@Service +@Transactional +@RequiredArgsConstructor +public class PurchasePlanItemServiceImpl extends ServiceImpl implements PurchasePlanItemService { + + + private final PurchasePlanItemConverter purchasePlanItemConverter; + + @Override + public IPage getPurchasePlanItemPage(BasePageReqParams pageParams, LambdaQueryWrapper wrapper) { + IPage result = this.baseMapper.selectPage(new Page<>(pageParams.page(), pageParams.pageSize()), wrapper); + return result.convert(purchasePlanItemConverter::toDto); + } + + @Override + public void addPurchasePlanItem(PurchasePlanItemDto dto) { + PurchasePlanItem entity = purchasePlanItemConverter.toEntity(dto); + this.baseMapper.insert(entity); + } + + @Override + public void updatePurchasePlanItem(PurchasePlanItemDto dto) { + PurchasePlanItem entity = purchasePlanItemConverter.toEntity(dto); + this.baseMapper.updateById(entity); + } + + @Override + public void deletePurchasePlanItem(long id) { + this.baseMapper.deleteById(id); + } + + @Override + public void deleteBatch(List ids) { + this.baseMapper.deleteByIds(ids); + } + +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/purchase/service/impl/PurchasePlanServiceImpl.java b/src/main/java/com/niuan/erp/module/purchase/service/impl/PurchasePlanServiceImpl.java new file mode 100644 index 0000000..cab243f --- /dev/null +++ b/src/main/java/com/niuan/erp/module/purchase/service/impl/PurchasePlanServiceImpl.java @@ -0,0 +1,64 @@ +package com.niuan.erp.module.purchase.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.utils.SecurityUtils; +import com.niuan.erp.module.purchase.controller.dto.PurchasePlanDto; +import com.niuan.erp.module.purchase.converter.PurchasePlanConverter; +import com.niuan.erp.module.purchase.entity.PurchasePlan; +import com.niuan.erp.module.purchase.mapper.PurchasePlanMapper; +import com.niuan.erp.module.purchase.service.PurchasePlanService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.util.List; + + +@Service +@Transactional +@RequiredArgsConstructor +public class PurchasePlanServiceImpl extends ServiceImpl implements PurchasePlanService { + + + private final PurchasePlanConverter purchasePlanConverter; + + @Override + public IPage getPurchasePlanPage(BasePageReqParams pageParams, LambdaQueryWrapper wrapper) { + IPage result = this.baseMapper.selectPage(new Page<>(pageParams.page(), pageParams.pageSize()), wrapper); + return result.convert(purchasePlanConverter::toDto); + } + + @Override + public void addPurchasePlan(PurchasePlanDto dto) { + PurchasePlan entity = purchasePlanConverter.toEntity(dto); + entity.setCreateUserId(SecurityUtils.getUserId()); + entity.setCreateUserName(SecurityUtils.getUserName()); + entity.setCreateDate(LocalDateTime.now()); + entity.setStatus(0); + this.baseMapper.insert(entity); + } + + @Override + public void updatePurchasePlan(PurchasePlanDto dto) { + PurchasePlan entity = purchasePlanConverter.toEntity(dto); + entity.setUpdateUserId(SecurityUtils.getUserId().intValue()); + entity.setUpdateDate(LocalDateTime.now()); + this.baseMapper.updateById(entity); + } + + @Override + public void deletePurchasePlan(long id) { + this.baseMapper.deleteById(id); + } + + @Override + public void deleteBatch(List ids) { + this.baseMapper.deleteByIds(ids); + } + +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/sale/controller/DeviceController.java b/src/main/java/com/niuan/erp/module/sale/controller/DeviceController.java new file mode 100644 index 0000000..bf245da --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sale/controller/DeviceController.java @@ -0,0 +1,83 @@ +package com.niuan.erp.module.sale.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.annotation.ApiLog; +import com.niuan.erp.common.annotation.ModuleLog; +import com.niuan.erp.common.base.BaseDeleteBody; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.base.BaseResult; +import com.niuan.erp.common.base.CommonValidateGroup.*; +import com.niuan.erp.common.base.OperationType; +import com.niuan.erp.module.sale.controller.dto.DeviceDto; +import com.niuan.erp.module.sale.entity.Device; +import com.niuan.erp.module.sale.service.DeviceService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.util.StringUtils; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +@Tag(name = "Device") +@ModuleLog("Device管理") +@RestController +@RequestMapping("/sale/device") +@RequiredArgsConstructor +public class DeviceController { + + private final DeviceService deviceService; + + @Operation(summary = "分页查询Device数据", operationId = "getDevicePage") + @GetMapping("/getDevicePage") + @PreAuthorize("hasAuthority('device:index')") + public BaseResult> getDevicePage(@Validated BasePageReqParams pageParams, + @Validated(Get.class) DeviceDto searchParams) { + var wrapper = new LambdaQueryWrapper(); + if (searchParams != null) { + if (StringUtils.hasText(searchParams.searchCode())) { + wrapper.like(Device::getProductSn, searchParams.searchCode()) + .or().like(Device::getMac, searchParams.mac()); + } + } + return BaseResult.successWithData(deviceService.getDevicePage(pageParams, wrapper)); + } + + + @ApiLog(type = OperationType.ADD, remark = "新增一条Device记录") + @Operation(summary = "新增Device", operationId = "addDevice") + @PostMapping("/addDevice") + @PreAuthorize("hasAuthority('device:add')") + public BaseResult addDevice(@Validated(Add.class) @RequestBody DeviceDto dto) { + deviceService.addDevice(dto); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.UPDATE, remark = "更新一条Device记录") + @Operation(summary = "更新Device", operationId = "updateDevice") + @PostMapping("/updateDevice") + @PreAuthorize("hasAuthority('device:update')") + public BaseResult updateDevice(@Validated(Update.class) @RequestBody DeviceDto dto) { + deviceService.updateDevice(dto); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.DELETE, remark = "删除一条Device记录") + @Operation(summary = "删除Device", operationId = "deleteDevice") + @PostMapping("/deleteDevice") + @PreAuthorize("hasAuthority('device:delete')") + public BaseResult deleteDevice(@Validated(DeleteOne.class) @RequestBody BaseDeleteBody req) { + deviceService.deleteDevice(req.id()); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.DELETE, remark = "批量删除Device记录") + @Operation(summary = "批量删除Device", operationId = "deleteDeviceBatch") + @PostMapping("/deleteDeviceBatch") + @PreAuthorize("hasAuthority('device:deleteBatch')") + public BaseResult deleteDeviceBatch(@Validated(DeleteBatch.class) @RequestBody BaseDeleteBody req) { + deviceService.deleteBatch(req.ids()); + return BaseResult.success(); + } +} diff --git a/src/main/java/com/niuan/erp/module/sale/controller/RepairRecordController.java b/src/main/java/com/niuan/erp/module/sale/controller/RepairRecordController.java new file mode 100644 index 0000000..6b51209 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sale/controller/RepairRecordController.java @@ -0,0 +1,82 @@ +package com.niuan.erp.module.sale.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.annotation.ApiLog; +import com.niuan.erp.common.annotation.ModuleLog; +import com.niuan.erp.common.base.*; +import com.niuan.erp.common.base.CommonValidateGroup.*; +import com.niuan.erp.module.sale.controller.dto.RepairRecordDto; +import com.niuan.erp.module.sale.service.RepairRecordService; +import com.niuan.erp.module.sale.entity.RepairRecord; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.boot.actuate.autoconfigure.web.ManagementContextFactory;import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.util.StringUtils; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; + +import java.util.List; + +@Tag(name = "RepairRecord") +@ModuleLog("RepairRecord管理") +@RestController +@RequestMapping("/sale/repairrecord") +@RequiredArgsConstructor +public class RepairRecordController { + + private final RepairRecordService repairRecordService;private final ManagementContextFactory managementContextFactory; + + @Operation(summary = "分页查询RepairRecord数据", operationId = "getRepairRecordPage") + @GetMapping("/getRepairRecordPage") + @PreAuthorize("hasAuthority('repairrecord:index')") + public BaseResult> getRepairRecordPage(@Validated BasePageReqParams pageParams, + @Validated(Get.class) RepairRecordDto searchParams) { + var wrapper = new LambdaQueryWrapper(); + if (searchParams != null) { + if (StringUtils.hasText(searchParams.searchCode())) { + wrapper.like(RepairRecord::getProductSn, searchParams.searchCode()) + .or().like(RepairRecord::getMac, searchParams.searchCode()); + } + } + return BaseResult.successWithData(repairRecordService.getRepairRecordPage(pageParams, wrapper)); + } + + + @ApiLog(type = OperationType.ADD, remark = "新增一条RepairRecord记录") + @Operation(summary = "新增RepairRecord", operationId = "addRepairRecord") + @PostMapping("/addRepairRecord") + @PreAuthorize("hasAuthority('repairrecord:add')") + public BaseResult addRepairRecord(@Validated(Add.class) @RequestBody RepairRecordDto dto) { + repairRecordService.addRepairRecord(dto); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.UPDATE, remark = "更新一条RepairRecord记录") + @Operation(summary = "更新RepairRecord", operationId = "updateRepairRecord") + @PostMapping("/updateRepairRecord") + @PreAuthorize("hasAuthority('repairrecord:update')") + public BaseResult updateRepairRecord(@Validated(Update.class) @RequestBody RepairRecordDto dto) { + repairRecordService.updateRepairRecord(dto); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.DELETE, remark = "删除一条RepairRecord记录") + @Operation(summary = "删除RepairRecord", operationId = "deleteRepairRecord") + @PostMapping("/deleteRepairRecord") + @PreAuthorize("hasAuthority('repairrecord:delete')") + public BaseResult deleteRepairRecord(@Validated(DeleteOne.class) @RequestBody BaseDeleteBody req) { + repairRecordService.deleteRepairRecord(req.id()); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.DELETE, remark = "批量删除RepairRecord记录") + @Operation(summary = "批量删除RepairRecord", operationId = "deleteRepairRecordBatch") + @PostMapping("/deleteRepairRecordBatch") + @PreAuthorize("hasAuthority('repairrecord:deleteBatch')") + public BaseResult deleteRepairRecordBatch(@Validated(DeleteBatch.class) @RequestBody BaseDeleteBody req) { + repairRecordService.deleteBatch(req.ids()); + return BaseResult.success(); + } +} diff --git a/src/main/java/com/niuan/erp/module/sale/controller/SaleOrderController.java b/src/main/java/com/niuan/erp/module/sale/controller/SaleOrderController.java new file mode 100644 index 0000000..837e488 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sale/controller/SaleOrderController.java @@ -0,0 +1,82 @@ +package com.niuan.erp.module.sale.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.annotation.ApiLog; +import com.niuan.erp.common.annotation.ModuleLog; +import com.niuan.erp.common.base.BaseDeleteBody; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.base.BaseResult; +import com.niuan.erp.common.base.CommonValidateGroup.*; +import com.niuan.erp.common.base.OperationType; +import com.niuan.erp.module.common.entity.Document; +import com.niuan.erp.module.sale.controller.dto.SaleOrderDto; +import com.niuan.erp.module.sale.service.SaleOrderService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.util.StringUtils; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +@Tag(name = "SaleOrder") +@ModuleLog("SaleOrder管理") +@RestController +@RequestMapping("/sale/saleorder") +@RequiredArgsConstructor +public class SaleOrderController { + + private final SaleOrderService saleOrderService; + + @Operation(summary = "分页查询SaleOrder数据", operationId = "getSaleOrderPage") + @GetMapping("/getSaleOrderPage") + @PreAuthorize("hasAuthority('saleorder:index')") + public BaseResult> getSaleOrderPage(@Validated BasePageReqParams pageParams, + @Validated(Get.class) SaleOrderDto searchParams) { + var wrapper = new LambdaQueryWrapper(); + if (searchParams != null) { + if (StringUtils.hasText(searchParams.customerName())) { + wrapper.like(Document::getCustomerId, searchParams.customerId()); + } + } + return BaseResult.successWithData(saleOrderService.getSaleOrderPage(pageParams, wrapper)); + } + + + @ApiLog(type = OperationType.ADD, remark = "新增一条SaleOrder记录") + @Operation(summary = "新增SaleOrder", operationId = "addSaleOrder") + @PostMapping("/addSaleOrder") + @PreAuthorize("hasAuthority('saleorder:add')") + public BaseResult addSaleOrder(@Validated(Add.class) @RequestBody SaleOrderDto dto) { + saleOrderService.addSaleOrder(dto); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.UPDATE, remark = "更新一条SaleOrder记录") + @Operation(summary = "更新SaleOrder", operationId = "updateSaleOrder") + @PostMapping("/updateSaleOrder") + @PreAuthorize("hasAuthority('saleorder:update')") + public BaseResult updateSaleOrder(@Validated(Update.class) @RequestBody SaleOrderDto dto) { + saleOrderService.updateSaleOrder(dto); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.DELETE, remark = "删除一条SaleOrder记录") + @Operation(summary = "删除SaleOrder", operationId = "deleteSaleOrder") + @PostMapping("/deleteSaleOrder") + @PreAuthorize("hasAuthority('saleorder:delete')") + public BaseResult deleteSaleOrder(@Validated(DeleteOne.class) @RequestBody BaseDeleteBody req) { + saleOrderService.deleteSaleOrder(req.id()); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.DELETE, remark = "批量删除SaleOrder记录") + @Operation(summary = "批量删除SaleOrder", operationId = "deleteSaleOrderBatch") + @PostMapping("/deleteSaleOrderBatch") + @PreAuthorize("hasAuthority('saleorder:deleteBatch')") + public BaseResult deleteSaleOrderBatch(@Validated(DeleteBatch.class) @RequestBody BaseDeleteBody req) { + saleOrderService.deleteBatch(req.ids()); + return BaseResult.success(); + } +} diff --git a/src/main/java/com/niuan/erp/module/sale/controller/SaleOrderItemController.java b/src/main/java/com/niuan/erp/module/sale/controller/SaleOrderItemController.java new file mode 100644 index 0000000..23f82f1 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sale/controller/SaleOrderItemController.java @@ -0,0 +1,76 @@ +package com.niuan.erp.module.sale.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.annotation.ApiLog; +import com.niuan.erp.common.annotation.ModuleLog; +import com.niuan.erp.common.base.BaseDeleteBody; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.base.BaseResult; +import com.niuan.erp.common.base.CommonValidateGroup.*; +import com.niuan.erp.common.base.OperationType; +import com.niuan.erp.module.sale.controller.dto.SaleOrderItemDto; +import com.niuan.erp.module.sale.entity.SaleOrderItem; +import com.niuan.erp.module.sale.service.SaleOrderItemService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +@Tag(name = "SaleOrderItem") +@ModuleLog("SaleOrderItem管理") +@RestController +@RequestMapping("/sale/saleorderitem") +@RequiredArgsConstructor +public class SaleOrderItemController { + + private final SaleOrderItemService saleOrderItemService; + + @Operation(summary = "分页查询SaleOrderItem数据", operationId = "getSaleOrderItemPage") + @GetMapping("/getSaleOrderItemPage") + @PreAuthorize("hasAuthority('saleorderitem:index')") + public BaseResult> getSaleOrderItemPage(@Validated BasePageReqParams pageParams, + @Validated(Get.class) SaleOrderItemDto searchParams) { + var wrapper = new LambdaQueryWrapper(); + return BaseResult.successWithData(saleOrderItemService.getSaleOrderItemPage(pageParams, wrapper)); + } + + + @ApiLog(type = OperationType.ADD, remark = "新增一条SaleOrderItem记录") + @Operation(summary = "新增SaleOrderItem", operationId = "addSaleOrderItem") + @PostMapping("/addSaleOrderItem") + @PreAuthorize("hasAuthority('saleorderitem:add')") + public BaseResult addSaleOrderItem(@Validated(Add.class) @RequestBody SaleOrderItemDto dto) { + saleOrderItemService.addSaleOrderItem(dto); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.UPDATE, remark = "更新一条SaleOrderItem记录") + @Operation(summary = "更新SaleOrderItem", operationId = "updateSaleOrderItem") + @PostMapping("/updateSaleOrderItem") + @PreAuthorize("hasAuthority('saleorderitem:update')") + public BaseResult updateSaleOrderItem(@Validated(Update.class) @RequestBody SaleOrderItemDto dto) { + saleOrderItemService.updateSaleOrderItem(dto); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.DELETE, remark = "删除一条SaleOrderItem记录") + @Operation(summary = "删除SaleOrderItem", operationId = "deleteSaleOrderItem") + @PostMapping("/deleteSaleOrderItem") + @PreAuthorize("hasAuthority('saleorderitem:delete')") + public BaseResult deleteSaleOrderItem(@Validated(DeleteOne.class) @RequestBody BaseDeleteBody req) { + saleOrderItemService.deleteSaleOrderItem(req.id()); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.DELETE, remark = "批量删除SaleOrderItem记录") + @Operation(summary = "批量删除SaleOrderItem", operationId = "deleteSaleOrderItemBatch") + @PostMapping("/deleteSaleOrderItemBatch") + @PreAuthorize("hasAuthority('saleorderitem:deleteBatch')") + public BaseResult deleteSaleOrderItemBatch(@Validated(DeleteBatch.class) @RequestBody BaseDeleteBody req) { + saleOrderItemService.deleteBatch(req.ids()); + return BaseResult.success(); + } +} diff --git a/src/main/java/com/niuan/erp/module/sale/controller/dto/DeviceDto.java b/src/main/java/com/niuan/erp/module/sale/controller/dto/DeviceDto.java new file mode 100644 index 0000000..c171faa --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sale/controller/dto/DeviceDto.java @@ -0,0 +1,32 @@ +package com.niuan.erp.module.sale.controller.dto; + +import java.time.LocalDateTime; + +public record DeviceDto( + Long id, + Integer status, + LocalDateTime createDate, + Long createUserId, + String createUserName, + LocalDateTime updateDate, + Long updateUserId, + String updateUserName, + Integer documentNo, + String productType, + String productSn, + String mac, + String serialNum, + String softVersion, + String alVersion, + String alNum, + Boolean alStatus, + Integer repairStatus, + String mark, + Integer reserve1, + String reserve2, + Integer keyAccountId, + Integer customerId, + Boolean outStatus, + LocalDateTime outProductDate, + String repairMark, + String searchCode) {} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/sale/controller/dto/RepairRecordDto.java b/src/main/java/com/niuan/erp/module/sale/controller/dto/RepairRecordDto.java new file mode 100644 index 0000000..2c1ebbe --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sale/controller/dto/RepairRecordDto.java @@ -0,0 +1,27 @@ +package com.niuan.erp.module.sale.controller.dto; + +import java.time.LocalDateTime; + +public record RepairRecordDto( + Long id, + Integer status, + LocalDateTime createDate, + Long createUserId, + String createUserName, + LocalDateTime updateDate, + Long updateUserId, + String updateUserName, + String productType, + String productSn, + String mac, + Integer repairStatus, + String mark, + Integer reserve1, + String reserve2, + Integer keyAccountId, + Integer customerId, + Boolean outStatus, + LocalDateTime outProductDate, + LocalDateTime repairDate, + String repairMark, + String searchCode) {} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/sale/controller/dto/SaleOrderDto.java b/src/main/java/com/niuan/erp/module/sale/controller/dto/SaleOrderDto.java new file mode 100644 index 0000000..92d9875 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sale/controller/dto/SaleOrderDto.java @@ -0,0 +1,30 @@ +package com.niuan.erp.module.sale.controller.dto; + +import java.time.LocalDateTime; + +public record SaleOrderDto( + Long id, + Integer status, + LocalDateTime createDate, + Long createUserId, + String createUserName, + LocalDateTime updateDate, + Long updateUserId, + String updateUserName, + Integer storeNo, + String storeName, + Integer formType, + String formCode, + String formName, + Integer formStatus, + String formMark, + Integer reserve1, + String reserve2, + Integer vendorNo, + String vendorName, + Double totalValue, + Integer outStoreNo, + String outStoreName, + Integer groupId, + Integer customerId, + String customerName) {} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/sale/controller/dto/SaleOrderItemDto.java b/src/main/java/com/niuan/erp/module/sale/controller/dto/SaleOrderItemDto.java new file mode 100644 index 0000000..596c226 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sale/controller/dto/SaleOrderItemDto.java @@ -0,0 +1,24 @@ +package com.niuan.erp.module.sale.controller.dto; + +import java.time.LocalDateTime; + +public record SaleOrderItemDto( + Long id, + Integer status, + LocalDateTime createDate, + Long createUserId, + String createUserName, + LocalDateTime updateDate, + Long updateUserId, + String updateUserName, + Integer documentNo, + String documentCode, + String projectName, + String partNumber, + Integer saleCount, + Double price, + Double totalPrice, + Integer sendCount, + String saleMark, + Integer reserve1, + String reserve2) {} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/sale/converter/DeviceConverter.java b/src/main/java/com/niuan/erp/module/sale/converter/DeviceConverter.java new file mode 100644 index 0000000..911798e --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sale/converter/DeviceConverter.java @@ -0,0 +1,15 @@ +package com.niuan.erp.module.sale.converter; + +import com.niuan.erp.module.sale.controller.dto.DeviceDto; +import com.niuan.erp.module.sale.entity.Device; +import org.mapstruct.Mapper; +import org.mapstruct.ReportingPolicy; + +import java.util.List; + +@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) +public interface DeviceConverter { + Device toEntity(DeviceDto dto); + DeviceDto toDto(Device entity); + List toDtoList(List entities); +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/sale/converter/RepairRecordConverter.java b/src/main/java/com/niuan/erp/module/sale/converter/RepairRecordConverter.java new file mode 100644 index 0000000..aae441c --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sale/converter/RepairRecordConverter.java @@ -0,0 +1,15 @@ +package com.niuan.erp.module.sale.converter; + +import com.niuan.erp.module.sale.controller.dto.RepairRecordDto; +import com.niuan.erp.module.sale.entity.RepairRecord; +import org.mapstruct.Mapper; +import org.mapstruct.ReportingPolicy; + +import java.util.List; + +@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) +public interface RepairRecordConverter { + RepairRecord toEntity(RepairRecordDto dto); + RepairRecordDto toDto(RepairRecord entity); + List toDtoList(List entities); +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/sale/converter/SaleOrderConverter.java b/src/main/java/com/niuan/erp/module/sale/converter/SaleOrderConverter.java new file mode 100644 index 0000000..3a4586f --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sale/converter/SaleOrderConverter.java @@ -0,0 +1,15 @@ +package com.niuan.erp.module.sale.converter; + +import com.niuan.erp.module.common.entity.Document; +import com.niuan.erp.module.sale.controller.dto.SaleOrderDto; +import org.mapstruct.Mapper; +import org.mapstruct.ReportingPolicy; + +import java.util.List; + +@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) +public interface SaleOrderConverter { + Document toEntity(SaleOrderDto dto); + SaleOrderDto toDto(Document entity); + List toDtoList(List entities); +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/sale/converter/SaleOrderItemConverter.java b/src/main/java/com/niuan/erp/module/sale/converter/SaleOrderItemConverter.java new file mode 100644 index 0000000..a2fc827 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sale/converter/SaleOrderItemConverter.java @@ -0,0 +1,15 @@ +package com.niuan.erp.module.sale.converter; + +import com.niuan.erp.module.sale.controller.dto.SaleOrderItemDto; +import com.niuan.erp.module.sale.entity.SaleOrderItem; +import org.mapstruct.Mapper; +import org.mapstruct.ReportingPolicy; + +import java.util.List; + +@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) +public interface SaleOrderItemConverter { + SaleOrderItem toEntity(SaleOrderItemDto dto); + SaleOrderItemDto toDto(SaleOrderItem entity); + List toDtoList(List entities); +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/sale/entity/Device.java b/src/main/java/com/niuan/erp/module/sale/entity/Device.java new file mode 100644 index 0000000..35a46da --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sale/entity/Device.java @@ -0,0 +1,107 @@ +package com.niuan.erp.module.sale.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *

+ * + *

+ * + * @author + * @since 2026-02-11 + */ +@Getter +@Setter +@ToString +@TableName("modulesn") +public class Device implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "Id", type = IdType.AUTO) + private Long id; + + @TableField("Status") + private Integer status; + + @TableField("CreateDate") + private LocalDateTime createDate; + + @TableField("CreateUserId") + private Long createUserId; + + @TableField("CreateUserName") + private String createUserName; + + @TableField("UpdateDate") + private LocalDateTime updateDate; + + @TableField("UpdateUserId") + private Long updateUserId; + + @TableField("UpdateUserName") + private String updateUserName; + + @TableField("DocumentNo") + private Integer documentNo; + + @TableField("ProductType") + private String productType; + + @TableField("ProductSn") + private String productSn; + + @TableField("Mac") + private String mac; + + @TableField("SerialNum") + private String serialNum; + + @TableField("SoftVersion") + private String softVersion; + + @TableField("AlVersion") + private String alVersion; + + @TableField("AlNum") + private String alNum; + + @TableField("AlStatus") + private Boolean alStatus; + + @TableField("RepairStatus") + private Integer repairStatus; + + @TableField("Mark") + private String mark; + + @TableField("reserve1") + private Integer reserve1; + + @TableField("reserve2") + private String reserve2; + + @TableField("KeyAccountId") + private Integer keyAccountId; + + @TableField("CustomerId") + private Integer customerId; + + @TableField("OutStatus") + private Boolean outStatus; + + @TableField("OutProductDate") + private LocalDateTime outProductDate; + + @TableField("RepairMark") + private String repairMark; +} diff --git a/src/main/java/com/niuan/erp/module/sale/entity/RepairRecord.java b/src/main/java/com/niuan/erp/module/sale/entity/RepairRecord.java new file mode 100644 index 0000000..cccbd44 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sale/entity/RepairRecord.java @@ -0,0 +1,92 @@ +package com.niuan.erp.module.sale.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *

+ * + *

+ * + * @author + * @since 2026-02-11 + */ +@Getter +@Setter +@ToString +@TableName("repairrecord") +public class RepairRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "Id", type = IdType.AUTO) + private Long id; + + @TableField("Status") + private Integer status; + + @TableField("CreateDate") + private LocalDateTime createDate; + + @TableField("CreateUserId") + private Long createUserId; + + @TableField("CreateUserName") + private String createUserName; + + @TableField("UpdateDate") + private LocalDateTime updateDate; + + @TableField("UpdateUserId") + private Long updateUserId; + + @TableField("UpdateUserName") + private String updateUserName; + + @TableField("ProductType") + private String productType; + + @TableField("ProductSn") + private String productSn; + + @TableField("Mac") + private String mac; + + @TableField("RepairStatus") + private Integer repairStatus; + + @TableField("Mark") + private String mark; + + @TableField("reserve1") + private Integer reserve1; + + @TableField("reserve2") + private String reserve2; + + @TableField("KeyAccountId") + private Integer keyAccountId; + + @TableField("CustomerId") + private Integer customerId; + + @TableField("OutStatus") + private Boolean outStatus; + + @TableField("OutProductDate") + private LocalDateTime outProductDate; + + @TableField("RepairDate") + private LocalDateTime repairDate; + + @TableField("RepairMark") + private String repairMark; +} diff --git a/src/main/java/com/niuan/erp/module/sale/entity/SaleOrderItem.java b/src/main/java/com/niuan/erp/module/sale/entity/SaleOrderItem.java new file mode 100644 index 0000000..9c96739 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sale/entity/SaleOrderItem.java @@ -0,0 +1,86 @@ +package com.niuan.erp.module.sale.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *

+ * + *

+ * + * @author + * @since 2026-02-11 + */ +@Getter +@Setter +@ToString +@TableName("sale") +public class SaleOrderItem implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "Id", type = IdType.AUTO) + private Long id; + + @TableField("Status") + private Integer status; + + @TableField("CreateDate") + private LocalDateTime createDate; + + @TableField("CreateUserId") + private Long createUserId; + + @TableField("CreateUserName") + private String createUserName; + + @TableField("UpdateDate") + private LocalDateTime updateDate; + + @TableField("UpdateUserId") + private Long updateUserId; + + @TableField("UpdateUserName") + private String updateUserName; + + @TableField("DocumentNo") + private Integer documentNo; + + @TableField("DocumentCode") + private String documentCode; + + @TableField("ProjectName") + private String projectName; + + @TableField("PartNumber") + private String partNumber; + + @TableField("SaleCount") + private Integer saleCount; + + @TableField("Price") + private Double price; + + @TableField("TotalPrice") + private Double totalPrice; + + @TableField("SendCount") + private Integer sendCount; + + @TableField("SaleMark") + private String saleMark; + + @TableField("reserve1") + private Integer reserve1; + + @TableField("reserve2") + private String reserve2; +} diff --git a/src/main/java/com/niuan/erp/module/sale/mapper/DeviceMapper.java b/src/main/java/com/niuan/erp/module/sale/mapper/DeviceMapper.java new file mode 100644 index 0000000..a711098 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sale/mapper/DeviceMapper.java @@ -0,0 +1,16 @@ +package com.niuan.erp.module.sale.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.niuan.erp.module.sale.entity.Device; + +/** + *

+ * Mapper 接口 + *

+ * + * @author + * @since 2026-02-11 + */ +public interface DeviceMapper extends BaseMapper { + +} diff --git a/src/main/java/com/niuan/erp/module/sale/mapper/RepairRecordMapper.java b/src/main/java/com/niuan/erp/module/sale/mapper/RepairRecordMapper.java new file mode 100644 index 0000000..112776b --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sale/mapper/RepairRecordMapper.java @@ -0,0 +1,16 @@ +package com.niuan.erp.module.sale.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.niuan.erp.module.sale.entity.RepairRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author + * @since 2026-02-11 + */ +public interface RepairRecordMapper extends BaseMapper { + +} diff --git a/src/main/java/com/niuan/erp/module/sale/mapper/SaleOrderItemMapper.java b/src/main/java/com/niuan/erp/module/sale/mapper/SaleOrderItemMapper.java new file mode 100644 index 0000000..5a1b27a --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sale/mapper/SaleOrderItemMapper.java @@ -0,0 +1,16 @@ +package com.niuan.erp.module.sale.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.niuan.erp.module.sale.entity.SaleOrderItem; + +/** + *

+ * Mapper 接口 + *

+ * + * @author + * @since 2026-02-11 + */ +public interface SaleOrderItemMapper extends BaseMapper { + +} diff --git a/src/main/java/com/niuan/erp/module/sale/service/DeviceService.java b/src/main/java/com/niuan/erp/module/sale/service/DeviceService.java new file mode 100644 index 0000000..056734d --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sale/service/DeviceService.java @@ -0,0 +1,23 @@ +package com.niuan.erp.module.sale.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.module.sale.controller.dto.DeviceDto; +import com.niuan.erp.module.sale.entity.Device; + +import java.util.List; + +public interface DeviceService { + + IPage getDevicePage(BasePageReqParams pageParams, LambdaQueryWrapper wrapper); + + void addDevice(DeviceDto dto); + + void updateDevice(DeviceDto dto); + + void deleteDevice(long id); + + void deleteBatch(List ids); + +} diff --git a/src/main/java/com/niuan/erp/module/sale/service/RepairRecordService.java b/src/main/java/com/niuan/erp/module/sale/service/RepairRecordService.java new file mode 100644 index 0000000..9798df6 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sale/service/RepairRecordService.java @@ -0,0 +1,23 @@ +package com.niuan.erp.module.sale.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.module.sale.controller.dto.RepairRecordDto; +import com.niuan.erp.module.sale.entity.RepairRecord; + +import java.util.List; + +public interface RepairRecordService { + + IPage getRepairRecordPage(BasePageReqParams pageParams, LambdaQueryWrapper wrapper); + + void addRepairRecord(RepairRecordDto dto); + + void updateRepairRecord(RepairRecordDto dto); + + void deleteRepairRecord(long id); + + void deleteBatch(List ids); + +} diff --git a/src/main/java/com/niuan/erp/module/sale/service/SaleOrderItemService.java b/src/main/java/com/niuan/erp/module/sale/service/SaleOrderItemService.java new file mode 100644 index 0000000..19c5d96 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sale/service/SaleOrderItemService.java @@ -0,0 +1,23 @@ +package com.niuan.erp.module.sale.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.module.sale.controller.dto.SaleOrderItemDto; +import com.niuan.erp.module.sale.entity.SaleOrderItem; + +import java.util.List; + +public interface SaleOrderItemService { + + IPage getSaleOrderItemPage(BasePageReqParams pageParams, LambdaQueryWrapper wrapper); + + void addSaleOrderItem(SaleOrderItemDto dto); + + void updateSaleOrderItem(SaleOrderItemDto dto); + + void deleteSaleOrderItem(long id); + + void deleteBatch(List ids); + +} diff --git a/src/main/java/com/niuan/erp/module/sale/service/SaleOrderService.java b/src/main/java/com/niuan/erp/module/sale/service/SaleOrderService.java new file mode 100644 index 0000000..4c16f08 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sale/service/SaleOrderService.java @@ -0,0 +1,23 @@ +package com.niuan.erp.module.sale.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.module.common.entity.Document; +import com.niuan.erp.module.sale.controller.dto.SaleOrderDto; + +import java.util.List; + +public interface SaleOrderService { + + IPage getSaleOrderPage(BasePageReqParams pageParams, LambdaQueryWrapper wrapper); + + void addSaleOrder(SaleOrderDto dto); + + void updateSaleOrder(SaleOrderDto dto); + + void deleteSaleOrder(long id); + + void deleteBatch(List ids); + +} diff --git a/src/main/java/com/niuan/erp/module/sale/service/impl/DeviceServiceImpl.java b/src/main/java/com/niuan/erp/module/sale/service/impl/DeviceServiceImpl.java new file mode 100644 index 0000000..07ac4b5 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sale/service/impl/DeviceServiceImpl.java @@ -0,0 +1,65 @@ +package com.niuan.erp.module.sale.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.utils.SecurityUtils; +import com.niuan.erp.module.sale.controller.dto.DeviceDto; +import com.niuan.erp.module.sale.converter.DeviceConverter; +import com.niuan.erp.module.sale.entity.Device; +import com.niuan.erp.module.sale.mapper.DeviceMapper; +import com.niuan.erp.module.sale.service.DeviceService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.util.List; + + +@Service +@Transactional +@RequiredArgsConstructor +public class DeviceServiceImpl extends ServiceImpl implements DeviceService { + + + private final DeviceConverter deviceConverter; + + @Override + public IPage getDevicePage(BasePageReqParams pageParams, LambdaQueryWrapper wrapper) { + IPage result = this.baseMapper.selectPage(new Page<>(pageParams.page(), pageParams.pageSize()), wrapper); + return result.convert(deviceConverter::toDto); + } + + @Override + public void addDevice(DeviceDto dto) { + Device entity = deviceConverter.toEntity(dto); + entity.setCreateUserId(SecurityUtils.getUserId()); + entity.setCreateUserName(SecurityUtils.getUserName()); + entity.setCreateDate(LocalDateTime.now()); + entity.setStatus(0); + this.baseMapper.insert(entity); + } + + @Override + public void updateDevice(DeviceDto dto) { + Device entity = deviceConverter.toEntity(dto); + entity.setUpdateUserId(SecurityUtils.getUserId()); + entity.setUpdateUserName(SecurityUtils.getUserName()); + entity.setUpdateDate(LocalDateTime.now()); + this.baseMapper.updateById(entity); + } + + @Override + public void deleteDevice(long id) { + this.baseMapper.deleteById(id); + } + + @Override + public void deleteBatch(List ids) { + this.baseMapper.deleteByIds(ids); + } + +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/sale/service/impl/RepairRecordServiceImpl.java b/src/main/java/com/niuan/erp/module/sale/service/impl/RepairRecordServiceImpl.java new file mode 100644 index 0000000..b395c92 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sale/service/impl/RepairRecordServiceImpl.java @@ -0,0 +1,65 @@ +package com.niuan.erp.module.sale.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.utils.SecurityUtils; +import com.niuan.erp.module.sale.controller.dto.RepairRecordDto; +import com.niuan.erp.module.sale.converter.RepairRecordConverter; +import com.niuan.erp.module.sale.entity.RepairRecord; +import com.niuan.erp.module.sale.mapper.RepairRecordMapper; +import com.niuan.erp.module.sale.service.RepairRecordService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.util.List; + + +@Service +@Transactional +@RequiredArgsConstructor +public class RepairRecordServiceImpl extends ServiceImpl implements RepairRecordService { + + + private final RepairRecordConverter repairRecordConverter; + + @Override + public IPage getRepairRecordPage(BasePageReqParams pageParams, LambdaQueryWrapper wrapper) { + IPage result = this.baseMapper.selectPage(new Page<>(pageParams.page(), pageParams.pageSize()), wrapper); + return result.convert(repairRecordConverter::toDto); + } + + @Override + public void addRepairRecord(RepairRecordDto dto) { + RepairRecord entity = repairRecordConverter.toEntity(dto); + entity.setCreateUserId(SecurityUtils.getUserId()); + entity.setCreateUserName(SecurityUtils.getUserName()); + entity.setCreateDate(LocalDateTime.now()); + entity.setStatus(0); + this.baseMapper.insert(entity); + } + + @Override + public void updateRepairRecord(RepairRecordDto dto) { + RepairRecord entity = repairRecordConverter.toEntity(dto); + entity.setUpdateUserId(SecurityUtils.getUserId()); + entity.setUpdateUserName(SecurityUtils.getUserName()); + entity.setUpdateDate(LocalDateTime.now()); + this.baseMapper.updateById(entity); + } + + @Override + public void deleteRepairRecord(long id) { + this.baseMapper.deleteById(id); + } + + @Override + public void deleteBatch(List ids) { + this.baseMapper.deleteByIds(ids); + } + +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/sale/service/impl/SaleOrderItemServiceImpl.java b/src/main/java/com/niuan/erp/module/sale/service/impl/SaleOrderItemServiceImpl.java new file mode 100644 index 0000000..600ed48 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sale/service/impl/SaleOrderItemServiceImpl.java @@ -0,0 +1,65 @@ +package com.niuan.erp.module.sale.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.utils.SecurityUtils; +import com.niuan.erp.module.sale.controller.dto.SaleOrderItemDto; +import com.niuan.erp.module.sale.converter.SaleOrderItemConverter; +import com.niuan.erp.module.sale.entity.SaleOrderItem; +import com.niuan.erp.module.sale.mapper.SaleOrderItemMapper; +import com.niuan.erp.module.sale.service.SaleOrderItemService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.util.List; + + +@Service +@Transactional +@RequiredArgsConstructor +public class SaleOrderItemServiceImpl extends ServiceImpl implements SaleOrderItemService { + + + private final SaleOrderItemConverter saleOrderItemConverter; + + @Override + public IPage getSaleOrderItemPage(BasePageReqParams pageParams, LambdaQueryWrapper wrapper) { + IPage result = this.baseMapper.selectPage(new Page<>(pageParams.page(), pageParams.pageSize()), wrapper); + return result.convert(saleOrderItemConverter::toDto); + } + + @Override + public void addSaleOrderItem(SaleOrderItemDto dto) { + SaleOrderItem entity = saleOrderItemConverter.toEntity(dto); + entity.setCreateUserId(SecurityUtils.getUserId()); + entity.setCreateUserName(SecurityUtils.getUserName()); + entity.setCreateDate(LocalDateTime.now()); + entity.setStatus(0); + this.baseMapper.insert(entity); + } + + @Override + public void updateSaleOrderItem(SaleOrderItemDto dto) { + SaleOrderItem entity = saleOrderItemConverter.toEntity(dto); + entity.setUpdateUserId(SecurityUtils.getUserId()); + entity.setUpdateUserName(SecurityUtils.getUserName()); + entity.setUpdateDate(LocalDateTime.now()); + this.baseMapper.updateById(entity); + } + + @Override + public void deleteSaleOrderItem(long id) { + this.baseMapper.deleteById(id); + } + + @Override + public void deleteBatch(List ids) { + this.baseMapper.deleteByIds(ids); + } + +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/sale/service/impl/SaleOrderServiceImpl.java b/src/main/java/com/niuan/erp/module/sale/service/impl/SaleOrderServiceImpl.java new file mode 100644 index 0000000..d2675f3 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sale/service/impl/SaleOrderServiceImpl.java @@ -0,0 +1,65 @@ +package com.niuan.erp.module.sale.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.utils.SecurityUtils; +import com.niuan.erp.module.common.entity.Document; +import com.niuan.erp.module.common.mapper.DocumentMapper; +import com.niuan.erp.module.sale.controller.dto.SaleOrderDto; +import com.niuan.erp.module.sale.converter.SaleOrderConverter; +import com.niuan.erp.module.sale.service.SaleOrderService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.util.List; + + +@Service +@Transactional +@RequiredArgsConstructor +public class SaleOrderServiceImpl extends ServiceImpl implements SaleOrderService { + + + private final SaleOrderConverter saleOrderConverter; + + @Override + public IPage getSaleOrderPage(BasePageReqParams pageParams, LambdaQueryWrapper wrapper) { + IPage result = this.baseMapper.selectPage(new Page<>(pageParams.page(), pageParams.pageSize()), wrapper); + return result.convert(saleOrderConverter::toDto); + } + + @Override + public void addSaleOrder(SaleOrderDto dto) { + Document entity = saleOrderConverter.toEntity(dto); + entity.setCreateUserId(SecurityUtils.getUserId()); + entity.setCreateUserName(SecurityUtils.getUserName()); + entity.setCreateDate(LocalDateTime.now()); + entity.setStatus(0); + this.baseMapper.insert(entity); + } + + @Override + public void updateSaleOrder(SaleOrderDto dto) { + Document entity = saleOrderConverter.toEntity(dto); + entity.setUpdateUserId(SecurityUtils.getUserId()); + entity.setUpdateUserName(SecurityUtils.getUserName()); + entity.setUpdateDate(LocalDateTime.now()); + this.baseMapper.updateById(entity); + } + + @Override + public void deleteSaleOrder(long id) { + this.baseMapper.deleteById(id); + } + + @Override + public void deleteBatch(List ids) { + this.baseMapper.deleteByIds(ids); + } + +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/sys/controller/KeyAccountController.java b/src/main/java/com/niuan/erp/module/sys/controller/KeyAccountController.java new file mode 100644 index 0000000..e4dbc70 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sys/controller/KeyAccountController.java @@ -0,0 +1,59 @@ +package com.niuan.erp.module.sys.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.base.BaseDeleteBody; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.base.BaseResult; +import com.niuan.erp.common.base.CommonValidateGroup.DeleteBatch; +import com.niuan.erp.common.base.CommonValidateGroup.DeleteOne; +import com.niuan.erp.module.sys.controller.dto.KeyAccountDto; +import com.niuan.erp.module.sys.entity.KeyAccount; +import com.niuan.erp.module.sys.service.KeyAccountService; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.util.StringUtils; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/sys/keyaccount") +@RequiredArgsConstructor +public class KeyAccountController { + + private final KeyAccountService keyAccountService; + + @GetMapping("/getKeyAccountPage") + public BaseResult> getKeyAccountPage(BasePageReqParams dto, KeyAccountDto searchParam) { + var wrapper = new LambdaQueryWrapper(); + System.out.println(searchParam.keyAccountName()); + if (searchParam != null && StringUtils.hasText(searchParam.keyAccountName())) { + wrapper.like(KeyAccount::getKeyAccountName, searchParam.keyAccountName().trim()); + } + return BaseResult.successWithData(keyAccountService.getKeyAccountPage(dto, wrapper)); + } + + @PostMapping("/addKeyAccount") + public BaseResult addKeyAccount(@Valid @RequestBody KeyAccountDto dto) { + keyAccountService.addKeyAccount(dto); + return BaseResult.success(); + } + + @PostMapping("/updateKeyAccount") + public BaseResult updateKeyAccount(@Valid @RequestBody KeyAccountDto dto) { + keyAccountService.updateKeyAccount(dto); + return BaseResult.success(); + } + + @PostMapping("/deleteKeyAccount") + public BaseResult deleteKeyAccount(@Validated(DeleteOne.class) @RequestBody BaseDeleteBody req) { + keyAccountService.deleteKeyAccount(req.id()); + return BaseResult.success(); + } + + @PostMapping("/deleteBatch") + public BaseResult deleteBatch(@Validated(DeleteBatch.class) @RequestBody BaseDeleteBody req) { + keyAccountService.deleteBatch(req.ids()); + return BaseResult.success(); + } +} diff --git a/src/main/java/com/niuan/erp/module/sys/controller/StoreController.java b/src/main/java/com/niuan/erp/module/sys/controller/StoreController.java new file mode 100644 index 0000000..f245bcb --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sys/controller/StoreController.java @@ -0,0 +1,64 @@ +package com.niuan.erp.module.sys.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.base.BaseDeleteBody; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.base.BaseResult; +import com.niuan.erp.common.base.CommonValidateGroup.DeleteBatch; +import com.niuan.erp.common.base.CommonValidateGroup.DeleteOne; +import com.niuan.erp.module.sys.controller.dto.StoreDto; +import com.niuan.erp.module.sys.entity.Store; +import com.niuan.erp.module.sys.service.StoreService; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.util.StringUtils; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/sys/store") +@RequiredArgsConstructor +public class StoreController { + + private final StoreService storeService; + + @GetMapping("/getStorePage") + @PreAuthorize("hasAuthority('store:index')") + public BaseResult> getStorePage(BasePageReqParams dto, StoreDto searchParams) { + var wrapper = new LambdaQueryWrapper(); + if (searchParams != null && StringUtils.hasText(searchParams.storeName())) { + wrapper.like(Store::getStoreName, searchParams.storeName()); + } + return BaseResult.successWithData(storeService.getStorePage(dto, wrapper)); + } + + @PostMapping("/addStore") + @PreAuthorize("hasAuthority('store:add')") + public BaseResult addStore(@Valid @RequestBody StoreDto dto) { + storeService.addStore(dto); + return BaseResult.success(); + } + + @PostMapping("/updateStore") + @PreAuthorize("hasAuthority('store:update')") + public BaseResult updateStore(@Valid @RequestBody StoreDto dto) { + storeService.updateStore(dto); + return BaseResult.success(); + } + + @PostMapping("/deleteStore") + @PreAuthorize("hasAuthority('store:delete')") + public BaseResult deleteStore(@Validated(DeleteOne.class) @RequestBody BaseDeleteBody req) { + storeService.deleteStore(req.id()); + return BaseResult.success(); + } + + @PostMapping("/deleteBatch") + @PreAuthorize("hasAuthority('store:deleteBatch')") + public BaseResult deleteBatch(@Validated(DeleteBatch.class) @RequestBody BaseDeleteBody req) { + storeService.deleteBatch(req.ids()); + return BaseResult.success(); + } +} diff --git a/src/main/java/com/niuan/erp/module/sys/controller/SysChannelController.java b/src/main/java/com/niuan/erp/module/sys/controller/SysChannelController.java new file mode 100644 index 0000000..79b33cc --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sys/controller/SysChannelController.java @@ -0,0 +1,79 @@ +package com.niuan.erp.module.sys.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.base.*; +import com.niuan.erp.common.base.CommonValidateGroup.DeleteBatch; +import com.niuan.erp.common.base.CommonValidateGroup.DeleteOne; +import com.niuan.erp.module.sys.controller.dto.SysChannelDto; +import com.niuan.erp.module.sys.entity.SysChannel; +import com.niuan.erp.module.sys.service.SysChannelService; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.util.StringUtils; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/sys/syschannel") +@RequiredArgsConstructor +public class SysChannelController { + + private final SysChannelService sysChannelService; + + @GetMapping("/getSysChannelPage") + public BaseResult> getSysChannelPage(BasePageReqParams dto, SysChannelDto searchParams) { + var wrapper = new LambdaQueryWrapper(); + if (searchParams != null) { + if (StringUtils.hasText(searchParams.channelName())) { + wrapper.like(SysChannel::getChannelName, searchParams.channelName()); + } + if (searchParams.parentId() != null) { + wrapper.eq(SysChannel::getParentId, searchParams.parentId()); + } + } + return BaseResult.successWithData(sysChannelService.getSysChannelPage(dto, wrapper)); + } + + @GetMapping("/getSysChannelTree") + public BaseResult> getSysChannelTree() { + return BaseResult.successWithData(sysChannelService.getSysChannelTree(false)); + } + + @GetMapping("/getMenuTree") + public BaseResult> getMenuTree() { + return BaseResult.successWithData(sysChannelService.getSysChannelTree(true)); + } + + @PostMapping("/addSysChannel") + public BaseResult addSysChannel(@Valid @RequestBody SysChannelDto dto) { + sysChannelService.addSysChannel(dto); + return BaseResult.success(); + } + + @PostMapping("/updateSysChannel") + public BaseResult updateSysChannel(@Valid @RequestBody SysChannelDto dto) { + sysChannelService.updateSysChannel(dto); + return BaseResult.success(); + } + + @PostMapping("/deleteSysChannel") + public BaseResult deleteSysChannel(@Validated(DeleteOne.class) @RequestBody BaseDeleteBody req) { + sysChannelService.deleteSysChannel(req.id()); + return BaseResult.success(); + } + + @PostMapping("/deleteBatch") + public BaseResult deleteBatch(@Validated(DeleteBatch.class) @RequestBody BaseDeleteBody req) { + sysChannelService.deleteBatch(req.ids()); + return BaseResult.success(); + } + + @PostMapping("/setStatus") + public BaseResult setStatus(@Valid @RequestBody BaseStatusBody req) { + sysChannelService.setStatus(req.id(), req.status()); + return BaseResult.success(); + } +} diff --git a/src/main/java/com/niuan/erp/module/sys/controller/SysRecordController.java b/src/main/java/com/niuan/erp/module/sys/controller/SysRecordController.java new file mode 100644 index 0000000..4ae452c --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sys/controller/SysRecordController.java @@ -0,0 +1,43 @@ +package com.niuan.erp.module.sys.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.base.BaseResult; +import com.niuan.erp.module.sys.controller.dto.SysRecordDto; +import com.niuan.erp.module.sys.entity.SysRecord; +import com.niuan.erp.module.sys.service.SysRecordService; +import lombok.RequiredArgsConstructor; +import org.springframework.util.StringUtils; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/sys/sysrecord") +@RequiredArgsConstructor +public class SysRecordController { + + private final SysRecordService sysRecordService; + + @GetMapping("/getSysRecordPage") + public BaseResult> getSysRecordPage(BasePageReqParams dto, SysRecordDto searchParams) { + var wrapper = new LambdaQueryWrapper(); + if (searchParams != null) { + if (StringUtils.hasText(searchParams.createUserName())) { + wrapper.like(SysRecord::getCreateUserName, searchParams.createUserName()); + } + if (searchParams.isSuccess() != null) { + wrapper.eq(SysRecord::getIsSuccess, searchParams.isSuccess()); + } + if (searchParams.recordType() != null) { + wrapper.eq(SysRecord::getRecordType, searchParams.recordType()); + } + if (StringUtils.hasText(searchParams.createDate())) { + String[] dates = searchParams.createDate().split(","); + wrapper.between(SysRecord::getCreateDate, dates[0].trim(), dates[1].trim()); + } + } + return BaseResult.successWithData(sysRecordService.getSysRecordPage(dto, wrapper)); + } +} diff --git a/src/main/java/com/niuan/erp/module/sys/controller/SysRoleController.java b/src/main/java/com/niuan/erp/module/sys/controller/SysRoleController.java new file mode 100644 index 0000000..768f15a --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sys/controller/SysRoleController.java @@ -0,0 +1,67 @@ +package com.niuan.erp.module.sys.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.base.BaseDeleteBody; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.base.BaseResult; +import com.niuan.erp.common.base.BaseStatusBody; +import com.niuan.erp.common.base.CommonValidateGroup.DeleteBatch; +import com.niuan.erp.common.base.CommonValidateGroup.DeleteOne; +import com.niuan.erp.module.sys.controller.dto.SysRoleDto; +import com.niuan.erp.module.sys.entity.SysRole; +import com.niuan.erp.module.sys.service.SysRoleService; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.util.StringUtils; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/sys/sysrole") +@RequiredArgsConstructor +public class SysRoleController { + + private final SysRoleService sysRoleService; + + @GetMapping("/getSysRolePage") + public BaseResult> getSysRolePage(BasePageReqParams dto, SysRoleDto searchParams) { + var wrapper = new LambdaQueryWrapper(); + if (searchParams != null) { + if (StringUtils.hasText(searchParams.roleName())) { + wrapper.like(SysRole::getRoleName, searchParams.roleName()); + } + } + return BaseResult.successWithData(sysRoleService.getSysRolePage(dto, wrapper)); + } + + @PostMapping("/addSysRole") + public BaseResult addSysRole(@Valid @RequestBody SysRoleDto dto) { + sysRoleService.addSysRole(dto); + return BaseResult.success(); + } + + @PostMapping("/updateSysRole") + public BaseResult updateSysRole(@Valid @RequestBody SysRoleDto dto) { + sysRoleService.updateSysRole(dto); + return BaseResult.success(); + } + + @PostMapping("/deleteSysRole") + public BaseResult deleteSysRole(@Validated(DeleteOne.class) @RequestBody BaseDeleteBody req) { + sysRoleService.deleteSysRole(req.id()); + return BaseResult.success(); + } + + @PostMapping("/deleteBatch") + public BaseResult deleteBatch(@Validated(DeleteBatch.class) @RequestBody BaseDeleteBody req) { + sysRoleService.deleteBatch(req.ids()); + return BaseResult.success(); + } + + @PostMapping("/setStatus") + public BaseResult setStatus(@Valid @RequestBody BaseStatusBody req) { + sysRoleService.setStatus(req.id(), req.status()); + return BaseResult.success(); + } +} diff --git a/src/main/java/com/niuan/erp/module/sys/controller/SysUserController.java b/src/main/java/com/niuan/erp/module/sys/controller/SysUserController.java new file mode 100644 index 0000000..8605f58 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sys/controller/SysUserController.java @@ -0,0 +1,45 @@ +package com.niuan.erp.module.sys.controller; + +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.base.BaseResult; +import com.niuan.erp.module.sys.controller.dto.SysUserDto; +import com.niuan.erp.module.sys.service.SysUserService; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/sys/sysuser") +@RequiredArgsConstructor +public class SysUserController { + + private final SysUserService userService; + + @GetMapping("/getSysUserPage") + public BaseResult getUserPage(BasePageReqParams dto) { + return BaseResult.successWithData(userService.getUserPage(dto, null)); + } + + @PostMapping + public void addUser(@Valid @RequestBody SysUserDto dto) { + userService.addUser(dto); + } + + @PutMapping("/{id}") + public BaseResult updateUser(@PathVariable Long id, @Valid @RequestBody SysUserDto dto) { + userService.updateUser(id, dto); + return BaseResult.success(); + } + + @DeleteMapping("/{id}") + public void deleteUser(@PathVariable Long id) { + userService.deleteUser(id); + } + + @DeleteMapping("/batch") + public void deleteBatch(@RequestBody List ids) { + userService.deleteBatch(ids); + } +} diff --git a/src/main/java/com/niuan/erp/module/sys/controller/VendorController.java b/src/main/java/com/niuan/erp/module/sys/controller/VendorController.java new file mode 100644 index 0000000..488a4e6 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sys/controller/VendorController.java @@ -0,0 +1,79 @@ +package com.niuan.erp.module.sys.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.annotation.ApiLog; +import com.niuan.erp.common.annotation.ModuleLog; +import com.niuan.erp.common.base.BaseDeleteBody; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.base.BaseResult; +import com.niuan.erp.common.base.CommonValidateGroup.*; +import com.niuan.erp.common.base.OperationType; +import com.niuan.erp.module.sys.controller.dto.VendorDto; +import com.niuan.erp.module.sys.entity.Vendor; +import com.niuan.erp.module.sys.service.VendorService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.util.StringUtils; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +@Tag(name = "供应商管理") +@ModuleLog("供应商管理") +@RestController +@RequestMapping("/sys/vendor") +@RequiredArgsConstructor +public class VendorController { + + private final VendorService vendorService; + + @Operation(summary = "分页查询供应商数据", operationId = "getVendorPage") + @PreAuthorize("hasAuthority('vendor:index')") + @GetMapping("/getVendorPage") + public BaseResult> getVendorPage(@Validated BasePageReqParams dto, + @Validated(Get.class) VendorDto searchParams) { + var wrapper = new LambdaQueryWrapper(); + if (searchParams != null && StringUtils.hasText(searchParams.vendorName())) { + wrapper.like(Vendor::getVendorName, searchParams.vendorName()); + } + return BaseResult.successWithData(vendorService.getVendorPage(dto, wrapper)); + } + + @ApiLog(type = OperationType.ADD, remark = "新增一条供应商记录") + @Operation(summary = "新增供应商", operationId = "addVendor") + @PreAuthorize("hasAuthority('vendor:add')") + @PostMapping("/addVendor") + public BaseResult addVendor(@Validated(Add.class) @RequestBody VendorDto dto) { + vendorService.addVendor(dto); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.UPDATE, remark = "更新一条供应商记录") + @Operation(summary = "更新供应商", operationId = "updateVendor") + @PreAuthorize("hasAuthority('vendor:update')") + @PostMapping("/updateVendor") + public BaseResult updateVendor(@Validated(Update.class) @RequestBody VendorDto dto) { + vendorService.updateVendor(dto); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.DELETE, remark = "删除一条供应商记录") + @Operation(summary = "删除供应商", operationId = "deleteVendor") + @PreAuthorize("hasAuthority('vendor:delete')") + @PostMapping("/deleteVendor") + public BaseResult deleteVendor(@Validated(DeleteOne.class) @RequestBody BaseDeleteBody req) { + vendorService.deleteVendor(req.id()); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.DELETE, remark = "批量删除供应商记录") + @Operation(summary = "批量删除供应商", operationId = "deleteVendorBatch") + @PreAuthorize("hasAuthority('vendor:deleteBatch')") + @PostMapping("/deleteVendorBatch") + public BaseResult deleteVendorBatch(@Validated(DeleteBatch.class) @RequestBody BaseDeleteBody req) { + vendorService.deleteBatch(req.ids()); + return BaseResult.success(); + } +} diff --git a/src/main/java/com/niuan/erp/module/sys/controller/dto/KeyAccountDto.java b/src/main/java/com/niuan/erp/module/sys/controller/dto/KeyAccountDto.java new file mode 100644 index 0000000..83459b7 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sys/controller/dto/KeyAccountDto.java @@ -0,0 +1,24 @@ +package com.niuan.erp.module.sys.controller.dto; + +import java.time.LocalDateTime; + +public record KeyAccountDto( + Long id, + Integer status, + LocalDateTime createDate, + Long createUserId, + String createUserName, + LocalDateTime updateDate, + Long updateUserId, + String updateUserName, + String keyAccountCode, + Long parentId, + String levelPath, + String keyAccountName, + String keyAccountMark, + String contactPerson, + String tel, + String address, + Integer reserve1, + String reserve2, + Long customerId) {} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/sys/controller/dto/StoreDto.java b/src/main/java/com/niuan/erp/module/sys/controller/dto/StoreDto.java new file mode 100644 index 0000000..7ee230b --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sys/controller/dto/StoreDto.java @@ -0,0 +1,20 @@ +package com.niuan.erp.module.sys.controller.dto; + +import java.time.LocalDateTime; + +public record StoreDto( + Long id, + Integer status, + LocalDateTime createDate, + Long createUserId, + String createUserName, + LocalDateTime updateDate, + Long updateUserId, + String updateUserName, + Integer storeNo, + String storeName, + String storeMark, + Integer reserve1, + String reserve2, + Long projectId, + Integer customerId) {} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/sys/controller/dto/SysChannelDto.java b/src/main/java/com/niuan/erp/module/sys/controller/dto/SysChannelDto.java new file mode 100644 index 0000000..deca3ff --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sys/controller/dto/SysChannelDto.java @@ -0,0 +1,28 @@ +package com.niuan.erp.module.sys.controller.dto; + +import java.time.LocalDateTime; + +public record SysChannelDto( + Long id, + Integer status, + LocalDateTime createDate, + Long createUserId, + String createUserName, + LocalDateTime updateDate, + Long updateUserId, + String updateUserName, + Integer channelType, + Long parentId, + Integer levelNumber, + String levelPath, + String channelName, + String viewLink, + String channelLink, + Integer sort, + String eventName, + String className, + String iconName, + Boolean isMenuShow, + Boolean isButtonShow, + Boolean isToolShow +) {} diff --git a/src/main/java/com/niuan/erp/module/sys/controller/dto/SysRecordDto.java b/src/main/java/com/niuan/erp/module/sys/controller/dto/SysRecordDto.java new file mode 100644 index 0000000..df137b7 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sys/controller/dto/SysRecordDto.java @@ -0,0 +1,17 @@ +package com.niuan.erp.module.sys.controller.dto; + +public record SysRecordDto( + Long id, + Integer status, + String createDate, + Long createUserId, + String createUserName, + Long updateUserId, + String updateUserName, + String channelName, + Integer recordType, + String remark, + Boolean isSuccess, + String ip, + String linkUrl, + String requestParams) {} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/sys/controller/dto/SysRoleDto.java b/src/main/java/com/niuan/erp/module/sys/controller/dto/SysRoleDto.java new file mode 100644 index 0000000..f350f6b --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sys/controller/dto/SysRoleDto.java @@ -0,0 +1,19 @@ +package com.niuan.erp.module.sys.controller.dto; + +import java.time.LocalDateTime; +import java.util.List; + +public record SysRoleDto( + Long id, + Integer status, + LocalDateTime createDate, + Long createUserId, + String createUserName, + LocalDateTime updateDate, + Long updateUserId, + String updateUserName, + Integer roleType, + String roleName, + String remark, + List channelIds +) {} diff --git a/src/main/java/com/niuan/erp/module/sys/controller/dto/SysRoleSelectDto.java b/src/main/java/com/niuan/erp/module/sys/controller/dto/SysRoleSelectDto.java new file mode 100644 index 0000000..ebbbcae --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sys/controller/dto/SysRoleSelectDto.java @@ -0,0 +1,6 @@ +package com.niuan.erp.module.sys.controller.dto; + +public record SysRoleSelectDto( + long roleId, + String roleName +) {} diff --git a/src/main/java/com/niuan/erp/module/sys/controller/dto/SysUserDto.java b/src/main/java/com/niuan/erp/module/sys/controller/dto/SysUserDto.java new file mode 100644 index 0000000..c5bfcaf --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sys/controller/dto/SysUserDto.java @@ -0,0 +1,28 @@ +package com.niuan.erp.module.sys.controller.dto; + +import java.time.LocalDateTime; + +public record SysUserDto( + Long id, + Integer status, + LocalDateTime createDate, + Long createUserId, + String createUserName, + LocalDateTime updateDate, + Long updateUserId, + String updateUserName, + Long userType, + String loginName, + String userName, + Integer loginCount, + LocalDateTime loginDate, + String loginIp, + Long projectId, + String contactPerson, + String tel, + String address, + String customerMark, + Integer isCustomer, + Integer customerId, + String openid +) {} diff --git a/src/main/java/com/niuan/erp/module/sys/controller/dto/VendorDto.java b/src/main/java/com/niuan/erp/module/sys/controller/dto/VendorDto.java new file mode 100644 index 0000000..d6a5252 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sys/controller/dto/VendorDto.java @@ -0,0 +1,24 @@ +package com.niuan.erp.module.sys.controller.dto; + +import java.time.LocalDateTime; + +public record VendorDto( + Long id, + Integer status, + LocalDateTime createDate, + Long createUserId, + String createUserName, + LocalDateTime updateDate, + Long updateUserId, + String updateUserName, + Integer vendorNo, + String vendorName, + String vdName, + Integer projectId, + String vendorMark, + String contactPerson, + String tel, + String address, + Integer reserve1, + String reserve2, + Integer customerId) {} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/sys/converter/KeyAccountConverter.java b/src/main/java/com/niuan/erp/module/sys/converter/KeyAccountConverter.java new file mode 100644 index 0000000..a9a999f --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sys/converter/KeyAccountConverter.java @@ -0,0 +1,15 @@ +package com.niuan.erp.module.sys.converter; + +import com.niuan.erp.module.sys.controller.dto.KeyAccountDto; +import com.niuan.erp.module.sys.entity.KeyAccount; +import org.mapstruct.Mapper; +import org.mapstruct.ReportingPolicy; + +import java.util.List; + +@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) +public interface KeyAccountConverter { + KeyAccount toEntity(KeyAccountDto dto); + KeyAccountDto toDto(KeyAccount entity); + List toDtoList(List entities); +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/sys/converter/StoreConverter.java b/src/main/java/com/niuan/erp/module/sys/converter/StoreConverter.java new file mode 100644 index 0000000..40eec57 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sys/converter/StoreConverter.java @@ -0,0 +1,15 @@ +package com.niuan.erp.module.sys.converter; + +import com.niuan.erp.module.sys.controller.dto.StoreDto; +import com.niuan.erp.module.sys.entity.Store; +import org.mapstruct.Mapper; +import org.mapstruct.ReportingPolicy; + +import java.util.List; + +@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) +public interface StoreConverter { + Store toEntity(StoreDto dto); + StoreDto toDto(Store entity); + List toDtoList(List entities); +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/sys/converter/SysChannelConverter.java b/src/main/java/com/niuan/erp/module/sys/converter/SysChannelConverter.java new file mode 100644 index 0000000..a373834 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sys/converter/SysChannelConverter.java @@ -0,0 +1,15 @@ +package com.niuan.erp.module.sys.converter; + +import com.niuan.erp.module.sys.controller.dto.SysChannelDto; +import com.niuan.erp.module.sys.entity.SysChannel; +import org.mapstruct.Mapper; +import org.mapstruct.ReportingPolicy; + +import java.util.List; + +@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) +public interface SysChannelConverter { + SysChannel toEntity(SysChannelDto dto); + SysChannelDto toDto(SysChannel entity); + List toDtoList(List entities); +} diff --git a/src/main/java/com/niuan/erp/module/sys/converter/SysRecordConverter.java b/src/main/java/com/niuan/erp/module/sys/converter/SysRecordConverter.java new file mode 100644 index 0000000..b8787c5 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sys/converter/SysRecordConverter.java @@ -0,0 +1,15 @@ +package com.niuan.erp.module.sys.converter; + +import com.niuan.erp.module.sys.controller.dto.SysRecordDto; +import com.niuan.erp.module.sys.entity.SysRecord; +import org.mapstruct.Mapper; +import org.mapstruct.ReportingPolicy; + +import java.util.List; + +@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) +public interface SysRecordConverter { + SysRecord toEntity(SysRecordDto dto); + SysRecordDto toDto(SysRecord entity); + List toDtoList(List entities); +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/sys/converter/SysRoleConverter.java b/src/main/java/com/niuan/erp/module/sys/converter/SysRoleConverter.java new file mode 100644 index 0000000..57865bb --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sys/converter/SysRoleConverter.java @@ -0,0 +1,21 @@ +package com.niuan.erp.module.sys.converter; + +import com.niuan.erp.module.sys.controller.dto.SysRoleDto; +import com.niuan.erp.module.sys.controller.dto.SysRoleSelectDto; +import com.niuan.erp.module.sys.entity.SysRole; +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.ReportingPolicy; + +import java.util.List; + +@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) +public interface SysRoleConverter { + + SysRoleDto toDto(SysRole entity); + SysRole toEntity(SysRoleDto dto); + + @Mapping(source = "id", target = "roleId") + SysRoleSelectDto toSelectDto(SysRole entity); + List toSelectDtoList(List entity); +} diff --git a/src/main/java/com/niuan/erp/module/sys/converter/SysUserConverter.java b/src/main/java/com/niuan/erp/module/sys/converter/SysUserConverter.java new file mode 100644 index 0000000..7f032a8 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sys/converter/SysUserConverter.java @@ -0,0 +1,15 @@ +package com.niuan.erp.module.sys.converter; + +import com.niuan.erp.module.sys.controller.dto.SysUserDto; +import com.niuan.erp.module.sys.entity.SysUser; +import org.mapstruct.Mapper; +import org.mapstruct.ReportingPolicy; + +@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) +public interface SysUserConverter { + + SysUserDto toDto(SysUser entity); + + SysUser toEntity(SysUserDto dto); + +} diff --git a/src/main/java/com/niuan/erp/module/sys/converter/VendorConverter.java b/src/main/java/com/niuan/erp/module/sys/converter/VendorConverter.java new file mode 100644 index 0000000..673902b --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sys/converter/VendorConverter.java @@ -0,0 +1,15 @@ +package com.niuan.erp.module.sys.converter; + +import com.niuan.erp.module.sys.controller.dto.VendorDto; +import com.niuan.erp.module.sys.entity.Vendor; +import org.mapstruct.Mapper; +import org.mapstruct.ReportingPolicy; + +import java.util.List; + +@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) +public interface VendorConverter { + Vendor toEntity(VendorDto dto); + VendorDto toDto(Vendor entity); + List toDtoList(List entities); +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/sys/entity/KeyAccount.java b/src/main/java/com/niuan/erp/module/sys/entity/KeyAccount.java new file mode 100644 index 0000000..c75526b --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sys/entity/KeyAccount.java @@ -0,0 +1,86 @@ +package com.niuan.erp.module.sys.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *

+ * + *

+ * + * @author + * @since 2026-02-05 + */ +@Getter +@Setter +@ToString +@TableName("keyaccount") +public class KeyAccount implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "Id", type = IdType.AUTO) + private Long id; + + @TableField("Status") + private Integer status; + + @TableField("CreateDate") + private LocalDateTime createDate; + + @TableField("CreateUserId") + private Long createUserId; + + @TableField("CreateUserName") + private String createUserName; + + @TableField("UpdateDate") + private LocalDateTime updateDate; + + @TableField("UpdateUserId") + private Long updateUserId; + + @TableField("UpdateUserName") + private String updateUserName; + + @TableField("KeyAccountCode") + private String keyAccountCode; + + @TableField("parent_id") + private Long parentId; + + @TableField("level_path") + private String levelPath; + + @TableField("KeyAccountName") + private String keyAccountName; + + @TableField("KeyAccountMark") + private String keyAccountMark; + + @TableField("ContactPerson") + private String contactPerson; + + @TableField("Tel") + private String tel; + + @TableField("Address") + private String address; + + @TableField("reserve1") + private Integer reserve1; + + @TableField("reserve2") + private String reserve2; + + @TableField("CustomerId") + private Long customerId; +} diff --git a/src/main/java/com/niuan/erp/module/sys/entity/Store.java b/src/main/java/com/niuan/erp/module/sys/entity/Store.java new file mode 100644 index 0000000..06d4b60 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sys/entity/Store.java @@ -0,0 +1,74 @@ +package com.niuan.erp.module.sys.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *

+ * + *

+ * + * @author + * @since 2026-02-05 + */ +@Getter +@Setter +@ToString +@TableName("storage_list") +public class Store implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "Id", type = IdType.AUTO) + private Long id; + + @TableField("Status") + private Integer status; + + @TableField("CreateDate") + private LocalDateTime createDate; + + @TableField("CreateUserId") + private Long createUserId; + + @TableField("CreateUserName") + private String createUserName; + + @TableField("UpdateDate") + private LocalDateTime updateDate; + + @TableField("UpdateUserId") + private Long updateUserId; + + @TableField("UpdateUserName") + private String updateUserName; + + @TableField("StoreNo") + private Integer storeNo; + + @TableField("StoreName") + private String storeName; + + @TableField("StoreMark") + private String storeMark; + + @TableField("reserve1") + private Integer reserve1; + + @TableField("reserve2") + private String reserve2; + + @TableField("ProjectId") + private Long projectId; + + @TableField("CustomerId") + private Integer customerId; +} diff --git a/src/main/java/com/niuan/erp/module/sys/entity/SysChannel.java b/src/main/java/com/niuan/erp/module/sys/entity/SysChannel.java new file mode 100644 index 0000000..5a3b997 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sys/entity/SysChannel.java @@ -0,0 +1,78 @@ +package com.niuan.erp.module.sys.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.time.LocalDateTime; + +@Data +@TableName("yy_syschannel") +public class SysChannel { + + @TableField("Id") + private Long id; + + @TableField("Status") + private Integer status; + + @TableField("CreateDate") + private LocalDateTime createDate; + + @TableField("CreateUserId") + private Long createUserId; + + @TableField("CreateUserName") + private String createUserName; + + @TableField("UpdateDate") + private LocalDateTime updateDate; + + @TableField("UpdateUserId") + private Long updateUserId; + + @TableField("UpdateUserName") + private String updateUserName; + + @TableField("ChannelType") + private Integer channelType; + + @TableField("ParentId") + private Long parentId; + + @TableField("LevelNumber") + private Integer levelNumber; + + @TableField("LevelPath") + private String levelPath; + + @TableField("ChannelName") + private String channelName; + + @TableField("ViewLink") + private String viewLink; + + @TableField("ChannelLink") + private String channelLink; + + @TableField("Sort") + private Integer sort; + + @TableField("EventName") + private String eventName; + + @TableField("ClassName") + private String className; + + @TableField("IconName") + private String iconName; + + @TableField("IsMenuShow") + private Boolean isMenuShow; // tinyint(1) → Boolean + + @TableField("IsButtonShow") + private Boolean isButtonShow; + + @TableField("IsToolShow") + private Boolean isToolShow; +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/sys/entity/SysRecord.java b/src/main/java/com/niuan/erp/module/sys/entity/SysRecord.java new file mode 100644 index 0000000..737508c --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sys/entity/SysRecord.java @@ -0,0 +1,72 @@ +package com.niuan.erp.module.sys.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *

+ * + *

+ * + * @author + * @since 2026-02-05 + */ +@Getter +@Setter +@ToString +@TableName("yy_sysrecord") +public class SysRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableField("Id") + private Long id; + + @TableField("Status") + private Integer status; + + @TableField("CreateDate") + private LocalDateTime createDate; + + @TableField("CreateUserId") + private Long createUserId; + + @TableField("CreateUserName") + private String createUserName; + + @TableField("UpdateDate") + private LocalDateTime updateDate; + + @TableField("UpdateUserId") + private Long updateUserId; + + @TableField("UpdateUserName") + private String updateUserName; + + @TableField("ChannelName") + private String channelName; + + @TableField("RecordType") + private Integer recordType; + + @TableField("Remark") + private String remark; + + @TableField("IsSuccess") + private Boolean isSuccess; + + @TableField("Ip") + private String ip; + + @TableField("LinkUrl") + private String linkUrl; + + @TableField("RequestParams") + private String requestParams; +} diff --git a/src/main/java/com/niuan/erp/module/sys/entity/SysRole.java b/src/main/java/com/niuan/erp/module/sys/entity/SysRole.java new file mode 100644 index 0000000..c3af179 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sys/entity/SysRole.java @@ -0,0 +1,51 @@ +package com.niuan.erp.module.sys.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.time.LocalDateTime; +import java.util.List; + +@Data +@TableName("yy_sysrole") +public class SysRole { + + @TableId(value = "Id", type = IdType.NONE) // 非自增，允许 null + private Long id; + + @TableField("Status") + private Integer status; + + @TableField("CreateDate") + private LocalDateTime createDate; + + @TableField("CreateUserId") + private Long createUserId; + + @TableField("CreateUserName") + private String createUserName; + + @TableField("UpdateDate") + private LocalDateTime updateDate; + + @TableField("UpdateUserId") + private Long updateUserId; + + @TableField("UpdateUserName") + private String updateUserName; + + @TableField("RoleType") + private Integer roleType; + + @TableField("RoleName") + private String roleName; + + @TableField("Remark") + private String remark; + + @TableField(exist = false) + private List channelIds; +} diff --git a/src/main/java/com/niuan/erp/module/sys/entity/SysRoleChannel.java b/src/main/java/com/niuan/erp/module/sys/entity/SysRoleChannel.java new file mode 100644 index 0000000..bdebc9b --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sys/entity/SysRoleChannel.java @@ -0,0 +1,27 @@ +package com.niuan.erp.module.sys.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +@Data +@TableName("yy_sysrolechannelmapping") +public class SysRoleChannel { + + @TableId("Id") + private Long id; + + @TableField("ChannelId") + private Long channelId; + + @TableField("RoleId") + private Long roleId; + + public static SysRoleChannel newRoleChannel(Long channelId, Long roleId) { + SysRoleChannel channel = new SysRoleChannel(); + channel.setChannelId(channelId); + channel.setRoleId(roleId); + return channel; + } +} diff --git a/src/main/java/com/niuan/erp/module/sys/entity/SysUser.java b/src/main/java/com/niuan/erp/module/sys/entity/SysUser.java new file mode 100644 index 0000000..9e78db9 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sys/entity/SysUser.java @@ -0,0 +1,83 @@ +package com.niuan.erp.module.sys.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.time.LocalDateTime; + +@Data +@TableName("yy_users") +public class SysUser { + + @TableId(value = "Id", type = IdType.AUTO) + private Long id; + + @TableField("Status") + private Integer status; + + @TableField("CreateDate") + private LocalDateTime createDate; + + @TableField("CreateUserId") + private Long createUserId; + + @TableField("CreateUserName") + private String createUserName; + + @TableField("UpdateDate") + private LocalDateTime updateDate; + + @TableField("UpdateUserId") + private Long updateUserId; + + @TableField("UpdateUserName") + private String updateUserName; + + @TableField("UserType") + private Long userType; + + @TableField("LoginName") + private String loginName; + + @TableField("PassWord") + private String passWord; // 注意：实际项目建议加密，且字段名可考虑改为 password（但这里按表结构） + + @TableField("UserName") + private String userName; + + @TableField("LoginCount") + private Integer loginCount; + + @TableField("LoginDate") + private LocalDateTime loginDate; + + @TableField("LoginIp") + private String loginIp; + + @TableField("ProjectId") + private Long projectId; + + @TableField("ContactPerson") + private String contactPerson; + + @TableField("Tel") + private String tel; + + @TableField("Address") + private String address; + + @TableField("CustomerMark") + private String customerMark; + + @TableField("isCustomer") + private Integer isCustomer; + + @TableField("CustomerId") + private Integer customerId; + + @TableField(value = "openid") + private String openid; +} diff --git a/src/main/java/com/niuan/erp/module/sys/entity/UserRole.java b/src/main/java/com/niuan/erp/module/sys/entity/UserRole.java new file mode 100644 index 0000000..7f90bfa --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sys/entity/UserRole.java @@ -0,0 +1,23 @@ +package com.niuan.erp.module.sys.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +/** + * User 和 Role 关联表 + */ +@Data +@TableName("yy_usersrolemapping") +public class UserRole { + + @TableId("Id") + private Long id; + + @TableField("UserId") + private Long userId; + + @TableField("RoleId") + private Long roleId; +} diff --git a/src/main/java/com/niuan/erp/module/sys/entity/Vendor.java b/src/main/java/com/niuan/erp/module/sys/entity/Vendor.java new file mode 100644 index 0000000..1492888 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sys/entity/Vendor.java @@ -0,0 +1,86 @@ +package com.niuan.erp.module.sys.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *

+ * + *

+ * + * @author + * @since 2026-02-02 + */ +@Getter +@Setter +@ToString +@TableName("vendor") +public class Vendor implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "Id", type = IdType.AUTO) + private Long id; + + @TableField("Status") + private Integer status; + + @TableField("CreateDate") + private LocalDateTime createDate; + + @TableField("CreateUserId") + private Long createUserId; + + @TableField("CreateUserName") + private String createUserName; + + @TableField("UpdateDate") + private LocalDateTime updateDate; + + @TableField("UpdateUserId") + private Long updateUserId; + + @TableField("UpdateUserName") + private String updateUserName; + + @TableField("VendorNo") + private Integer vendorNo; + + @TableField("VendorName") + private String vendorName; + + @TableField("VdName") + private String vdName; + + @TableField("ProjectId") + private Integer projectId; + + @TableField("VendorMark") + private String vendorMark; + + @TableField("ContactPerson") + private String contactPerson; + + @TableField("Tel") + private String tel; + + @TableField("Address") + private String address; + + @TableField("reserve1") + private Integer reserve1; + + @TableField("reserve2") + private String reserve2; + + @TableField("CustomerId") + private Integer customerId; +} diff --git a/src/main/java/com/niuan/erp/module/sys/mapper/KeyAccountMapper.java b/src/main/java/com/niuan/erp/module/sys/mapper/KeyAccountMapper.java new file mode 100644 index 0000000..3786748 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sys/mapper/KeyAccountMapper.java @@ -0,0 +1,16 @@ +package com.niuan.erp.module.sys.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.niuan.erp.module.sys.entity.KeyAccount; + +/** + *

+ * Mapper 接口 + *

+ * + * @author + * @since 2026-02-05 + */ +public interface KeyAccountMapper extends BaseMapper { + +} diff --git a/src/main/java/com/niuan/erp/module/sys/mapper/StoreMapper.java b/src/main/java/com/niuan/erp/module/sys/mapper/StoreMapper.java new file mode 100644 index 0000000..bd85720 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sys/mapper/StoreMapper.java @@ -0,0 +1,16 @@ +package com.niuan.erp.module.sys.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.niuan.erp.module.sys.entity.Store; + +/** + *

+ * Mapper 接口 + *

+ * + * @author + * @since 2026-02-05 + */ +public interface StoreMapper extends BaseMapper { + +} diff --git a/src/main/java/com/niuan/erp/module/sys/mapper/SysChannelMapper.java b/src/main/java/com/niuan/erp/module/sys/mapper/SysChannelMapper.java new file mode 100644 index 0000000..6ce002a --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sys/mapper/SysChannelMapper.java @@ -0,0 +1,24 @@ +package com.niuan.erp.module.sys.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.niuan.erp.module.sys.entity.SysChannel; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface SysChannelMapper extends BaseMapper { + /** + * 通过 userId 查询所有权限 + * @param userId + * @return + */ + List selectByUserId(long userId); + + /** + * 通过 roleId 查询所有权限的 ID + * @param roleId + * @return + */ + List selectChannelIdByRoleId(Long roleId); +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/sys/mapper/SysRecordMapper.java b/src/main/java/com/niuan/erp/module/sys/mapper/SysRecordMapper.java new file mode 100644 index 0000000..4bb80c7 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sys/mapper/SysRecordMapper.java @@ -0,0 +1,16 @@ +package com.niuan.erp.module.sys.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.niuan.erp.module.sys.entity.SysRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author + * @since 2026-02-05 + */ +public interface SysRecordMapper extends BaseMapper { + +} diff --git a/src/main/java/com/niuan/erp/module/sys/mapper/SysRoleChannelMapper.java b/src/main/java/com/niuan/erp/module/sys/mapper/SysRoleChannelMapper.java new file mode 100644 index 0000000..47d5f7a --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sys/mapper/SysRoleChannelMapper.java @@ -0,0 +1,9 @@ +package com.niuan.erp.module.sys.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.niuan.erp.module.sys.entity.SysRoleChannel; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface SysRoleChannelMapper extends BaseMapper { +} diff --git a/src/main/java/com/niuan/erp/module/sys/mapper/SysRoleMapper.java b/src/main/java/com/niuan/erp/module/sys/mapper/SysRoleMapper.java new file mode 100644 index 0000000..9f71a63 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sys/mapper/SysRoleMapper.java @@ -0,0 +1,12 @@ +package com.niuan.erp.module.sys.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.niuan.erp.module.sys.entity.SysRole; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface SysRoleMapper extends BaseMapper { + List selectByUserId(long id); +} diff --git a/src/main/java/com/niuan/erp/module/sys/mapper/SysUserMapper.java b/src/main/java/com/niuan/erp/module/sys/mapper/SysUserMapper.java new file mode 100644 index 0000000..a78793d --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sys/mapper/SysUserMapper.java @@ -0,0 +1,9 @@ +package com.niuan.erp.module.sys.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.niuan.erp.module.sys.entity.SysUser; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface SysUserMapper extends BaseMapper { +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/sys/mapper/UserRoleMapper.java b/src/main/java/com/niuan/erp/module/sys/mapper/UserRoleMapper.java new file mode 100644 index 0000000..53bfe54 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sys/mapper/UserRoleMapper.java @@ -0,0 +1,9 @@ +package com.niuan.erp.module.sys.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.niuan.erp.module.sys.entity.UserRole; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface UserRoleMapper extends BaseMapper { +} diff --git a/src/main/java/com/niuan/erp/module/sys/mapper/VendorMapper.java b/src/main/java/com/niuan/erp/module/sys/mapper/VendorMapper.java new file mode 100644 index 0000000..3718463 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sys/mapper/VendorMapper.java @@ -0,0 +1,16 @@ +package com.niuan.erp.module.sys.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.niuan.erp.module.sys.entity.Vendor; + +/** + *

+ * Mapper 接口 + *

+ * + * @author + * @since 2026-02-02 + */ +public interface VendorMapper extends BaseMapper { + +} diff --git a/src/main/java/com/niuan/erp/module/sys/service/KeyAccountService.java b/src/main/java/com/niuan/erp/module/sys/service/KeyAccountService.java new file mode 100644 index 0000000..b64e021 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sys/service/KeyAccountService.java @@ -0,0 +1,23 @@ +package com.niuan.erp.module.sys.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.module.sys.controller.dto.KeyAccountDto; +import com.niuan.erp.module.sys.entity.KeyAccount; + +import java.util.List; + +public interface KeyAccountService { + + IPage getKeyAccountPage(BasePageReqParams dto, LambdaQueryWrapper wrapper); + + void addKeyAccount(KeyAccountDto dto); + + void updateKeyAccount(KeyAccountDto dto); + + void deleteKeyAccount(Long id); + + void deleteBatch(List ids); + +} diff --git a/src/main/java/com/niuan/erp/module/sys/service/StoreService.java b/src/main/java/com/niuan/erp/module/sys/service/StoreService.java new file mode 100644 index 0000000..6a1fc8d --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sys/service/StoreService.java @@ -0,0 +1,23 @@ +package com.niuan.erp.module.sys.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.module.sys.controller.dto.StoreDto; +import com.niuan.erp.module.sys.entity.Store; + +import java.util.List; + +public interface StoreService { + + IPage getStorePage(BasePageReqParams dto, LambdaQueryWrapper wrapper); + + void addStore(StoreDto dto); + + void updateStore(StoreDto dto); + + void deleteStore(Long id); + + void deleteBatch(List ids); + +} diff --git a/src/main/java/com/niuan/erp/module/sys/service/SysChannelService.java b/src/main/java/com/niuan/erp/module/sys/service/SysChannelService.java new file mode 100644 index 0000000..df97ec6 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sys/service/SysChannelService.java @@ -0,0 +1,34 @@ +package com.niuan.erp.module.sys.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.base.BaseTree; +import com.niuan.erp.module.sys.controller.dto.SysChannelDto; +import com.niuan.erp.module.sys.entity.SysChannel; + +import java.util.List; + +public interface SysChannelService { + + IPage getSysChannelPage(BasePageReqParams dto, LambdaQueryWrapper wrapper); + + + /** + * 查询权限表并同时封装成 {@link com.niuan.erp.common.base.BaseTree} + * @param isMenuType 如果为 true，则只返回菜单信息；反之则返回所有权限 + * @return + */ + List getSysChannelTree(boolean isMenuType); + + void addSysChannel(SysChannelDto dto); + + void updateSysChannel(SysChannelDto dto); + + void deleteSysChannel(long id); + + void deleteBatch(List ids); + + void setStatus(long id, int status); + +} diff --git a/src/main/java/com/niuan/erp/module/sys/service/SysRecordService.java b/src/main/java/com/niuan/erp/module/sys/service/SysRecordService.java new file mode 100644 index 0000000..d5023f5 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sys/service/SysRecordService.java @@ -0,0 +1,15 @@ +package com.niuan.erp.module.sys.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.module.sys.controller.dto.SysRecordDto; +import com.niuan.erp.module.sys.entity.SysRecord; + +public interface SysRecordService { + + IPage getSysRecordPage(BasePageReqParams dto, LambdaQueryWrapper wrapper); + + void addSysRecord(SysRecord record); + +} diff --git a/src/main/java/com/niuan/erp/module/sys/service/SysRoleService.java b/src/main/java/com/niuan/erp/module/sys/service/SysRoleService.java new file mode 100644 index 0000000..d03a123 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sys/service/SysRoleService.java @@ -0,0 +1,25 @@ +package com.niuan.erp.module.sys.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.module.sys.controller.dto.SysRoleDto; +import com.niuan.erp.module.sys.entity.SysRole; + +import java.util.List; + +public interface SysRoleService { + + IPage getSysRolePage(BasePageReqParams dto, LambdaQueryWrapper wrapper); + + void addSysRole(SysRoleDto dto); + + void updateSysRole(SysRoleDto dto); + + void deleteSysRole(Long id); + + void deleteBatch(List ids); + + void setStatus(Long id, Integer status); + +} diff --git a/src/main/java/com/niuan/erp/module/sys/service/SysUserService.java b/src/main/java/com/niuan/erp/module/sys/service/SysUserService.java new file mode 100644 index 0000000..2c5ef26 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sys/service/SysUserService.java @@ -0,0 +1,23 @@ +package com.niuan.erp.module.sys.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.module.sys.controller.dto.SysUserDto; +import com.niuan.erp.module.sys.entity.SysUser; + +import java.util.List; + +public interface SysUserService { + + IPage getUserPage(BasePageReqParams dto, LambdaQueryWrapper wrapper); + + void addUser(SysUserDto dto); + + void updateUser(Long id, SysUserDto dto); + + void deleteUser(Long id); + + void deleteBatch(List ids); + +} diff --git a/src/main/java/com/niuan/erp/module/sys/service/VendorService.java b/src/main/java/com/niuan/erp/module/sys/service/VendorService.java new file mode 100644 index 0000000..be9e9b7 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sys/service/VendorService.java @@ -0,0 +1,23 @@ +package com.niuan.erp.module.sys.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.module.sys.controller.dto.VendorDto; +import com.niuan.erp.module.sys.entity.Vendor; + +import java.util.List; + +public interface VendorService { + + IPage getVendorPage(BasePageReqParams dto, LambdaQueryWrapper wrapper); + + void addVendor(VendorDto dto); + + void updateVendor(VendorDto dto); + + void deleteVendor(long id); + + void deleteBatch(List ids); + +} diff --git a/src/main/java/com/niuan/erp/module/sys/service/impl/KeyAccountServiceImpl.java b/src/main/java/com/niuan/erp/module/sys/service/impl/KeyAccountServiceImpl.java new file mode 100644 index 0000000..dac88e1 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sys/service/impl/KeyAccountServiceImpl.java @@ -0,0 +1,66 @@ +package com.niuan.erp.module.sys.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.utils.SecurityUtils; +import com.niuan.erp.module.sys.controller.dto.KeyAccountDto; +import com.niuan.erp.module.sys.converter.KeyAccountConverter; +import com.niuan.erp.module.sys.entity.KeyAccount; +import com.niuan.erp.module.sys.mapper.KeyAccountMapper; +import com.niuan.erp.module.sys.service.KeyAccountService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.util.List; + + +@Service +@Transactional +@RequiredArgsConstructor +public class KeyAccountServiceImpl extends ServiceImpl implements KeyAccountService { + + + private final KeyAccountConverter keyAccountConverter; + + @Override + public IPage getKeyAccountPage(BasePageReqParams dto, LambdaQueryWrapper wrapper) { + IPage result = this.baseMapper.selectPage(new Page<>(dto.page(), dto.pageSize()), wrapper); + return result.convert(keyAccountConverter::toDto); + } + + @Override + public void addKeyAccount(KeyAccountDto dto) { + KeyAccount entity = keyAccountConverter.toEntity(dto); + entity.setCreateUserId(SecurityUtils.getUserId()); + entity.setCreateUserName(SecurityUtils.getUserName()); + entity.setCreateDate(LocalDateTime.now()); + entity.setCustomerId(Long.valueOf(SecurityUtils.getLoginUser().getUser().getCustomerId())); + entity.setStatus(1); + this.baseMapper.insert(entity); + } + + @Override + public void updateKeyAccount(KeyAccountDto dto) { + KeyAccount entity = keyAccountConverter.toEntity(dto); + entity.setUpdateUserId(SecurityUtils.getUserId()); + entity.setUpdateUserName(SecurityUtils.getUserName()); + entity.setUpdateDate(LocalDateTime.now()); + this.baseMapper.updateById(entity); + } + + @Override + public void deleteKeyAccount(Long id) { + this.baseMapper.deleteById(id); + } + + @Override + public void deleteBatch(List ids) { + this.baseMapper.deleteByIds(ids); + } + +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/sys/service/impl/StoreServiceImpl.java b/src/main/java/com/niuan/erp/module/sys/service/impl/StoreServiceImpl.java new file mode 100644 index 0000000..bfe5028 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sys/service/impl/StoreServiceImpl.java @@ -0,0 +1,66 @@ +package com.niuan.erp.module.sys.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.utils.SecurityUtils; +import com.niuan.erp.module.sys.controller.dto.StoreDto; +import com.niuan.erp.module.sys.converter.StoreConverter; +import com.niuan.erp.module.sys.entity.Store; +import com.niuan.erp.module.sys.mapper.StoreMapper; +import com.niuan.erp.module.sys.service.StoreService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.util.List; + + +@Service +@Transactional +@RequiredArgsConstructor +public class StoreServiceImpl extends ServiceImpl implements StoreService { + + + private final StoreConverter storeConverter; + + @Override + public IPage getStorePage(BasePageReqParams dto, LambdaQueryWrapper wrapper) { + IPage result = this.baseMapper.selectPage(new Page<>(dto.page(), dto.pageSize()), wrapper); + return result.convert(storeConverter::toDto); + } + + @Override + public void addStore(StoreDto dto) { + Store entity = storeConverter.toEntity(dto); + entity.setCreateUserId(SecurityUtils.getUserId()); + entity.setCreateUserName(SecurityUtils.getUserName()); + entity.setCreateDate(LocalDateTime.now()); + entity.setCustomerId(SecurityUtils.getLoginUser().getUser().getCustomerId()); + entity.setStatus(1); + this.baseMapper.insert(entity); + } + + @Override + public void updateStore(StoreDto dto) { + Store entity = storeConverter.toEntity(dto); + entity.setUpdateUserId(SecurityUtils.getUserId()); + entity.setUpdateUserName(SecurityUtils.getUserName()); + entity.setUpdateDate(LocalDateTime.now()); + this.baseMapper.updateById(entity); + } + + @Override + public void deleteStore(Long id) { + this.baseMapper.deleteById(id); + } + + @Override + public void deleteBatch(List ids) { + this.baseMapper.deleteByIds(ids); + } + +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/sys/service/impl/SysChannelServiceImpl.java b/src/main/java/com/niuan/erp/module/sys/service/impl/SysChannelServiceImpl.java new file mode 100644 index 0000000..6e09ea5 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sys/service/impl/SysChannelServiceImpl.java @@ -0,0 +1,85 @@ +package com.niuan.erp.module.sys.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.base.BaseTree; +import com.niuan.erp.common.utils.SecurityUtils; +import com.niuan.erp.common.utils.TreeUtils; +import com.niuan.erp.module.sys.controller.dto.SysChannelDto; +import com.niuan.erp.module.sys.converter.SysChannelConverter; +import com.niuan.erp.module.sys.entity.SysChannel; +import com.niuan.erp.module.sys.mapper.SysChannelMapper; +import com.niuan.erp.module.sys.service.SysChannelService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.util.Comparator; +import java.util.List; + + +@Service +@Transactional +@RequiredArgsConstructor +public class SysChannelServiceImpl extends ServiceImpl implements SysChannelService { + + + private final SysChannelConverter sysChannelConverter; + + @Override + public IPage getSysChannelPage(BasePageReqParams dto, LambdaQueryWrapper wrapper) { + IPage result = this.baseMapper.selectPage(new Page<>(dto.page(), dto.pageSize()), wrapper); + return result.convert(sysChannelConverter::toDto); + } + + @Override + public List getSysChannelTree(boolean isMenuType) { + var wrapper = new LambdaQueryWrapper().eq(SysChannel::getStatus, 1); + if (isMenuType) { + wrapper.eq(SysChannel::getChannelType, 0); + } + List sysChannels = this.baseMapper.selectList(wrapper); + sysChannels.sort(Comparator.comparing(SysChannel::getSort)); + return TreeUtils.generateTree(sysChannels, SysChannel::getId, + SysChannel::getChannelName, SysChannel::getParentId, 0L); + } + + @Override + public void addSysChannel(SysChannelDto dto) { + SysChannel entity = sysChannelConverter.toEntity(dto); + entity.setCreateUserId(SecurityUtils.getUserId()); + entity.setCreateUserName(SecurityUtils.getUserName()); + entity.setCreateDate(LocalDateTime.now()); + this.baseMapper.insert(entity); + } + + @Override + public void updateSysChannel(SysChannelDto dto) { + SysChannel entity = sysChannelConverter.toEntity(dto); + entity.setUpdateUserId(SecurityUtils.getUserId()); + entity.setUpdateUserName(SecurityUtils.getUserName()); + entity.setUpdateDate(LocalDateTime.now()); + this.baseMapper.updateById(entity); + } + + @Override + public void deleteSysChannel(long id) { + this.baseMapper.deleteById(id); + } + + @Override + public void deleteBatch(List ids) { + this.baseMapper.deleteByIds(ids); + } + + @Override + public void setStatus(long id, int status) { + SysChannel c = this.baseMapper.selectById(id); + c.setStatus(status); + this.baseMapper.updateById(c); + } +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/sys/service/impl/SysRecordServiceImpl.java b/src/main/java/com/niuan/erp/module/sys/service/impl/SysRecordServiceImpl.java new file mode 100644 index 0000000..78d873b --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sys/service/impl/SysRecordServiceImpl.java @@ -0,0 +1,39 @@ +package com.niuan.erp.module.sys.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.module.sys.controller.dto.SysRecordDto; +import com.niuan.erp.module.sys.converter.SysRecordConverter; +import com.niuan.erp.module.sys.entity.SysRecord; +import com.niuan.erp.module.sys.mapper.SysRecordMapper; +import com.niuan.erp.module.sys.service.SysRecordService; +import lombok.RequiredArgsConstructor; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + + +@Service +@Transactional +@RequiredArgsConstructor +public class SysRecordServiceImpl extends ServiceImpl implements SysRecordService { + + + private final SysRecordConverter sysRecordConverter; + + @Override + public IPage getSysRecordPage(BasePageReqParams dto, LambdaQueryWrapper wrapper) { + IPage result = this.baseMapper.selectPage(new Page<>(dto.page(), dto.pageSize()), wrapper); + return result.convert(sysRecordConverter::toDto); + } + + @Async + @Override + public void addSysRecord(SysRecord record) { + this.baseMapper.insert(record); + } + +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/sys/service/impl/SysRoleServiceImpl.java b/src/main/java/com/niuan/erp/module/sys/service/impl/SysRoleServiceImpl.java new file mode 100644 index 0000000..45b1b3e --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sys/service/impl/SysRoleServiceImpl.java @@ -0,0 +1,95 @@ +package com.niuan.erp.module.sys.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.utils.SecurityUtils; +import com.niuan.erp.module.sys.controller.dto.SysRoleDto; +import com.niuan.erp.module.sys.converter.SysRoleConverter; +import com.niuan.erp.module.sys.entity.SysRole; +import com.niuan.erp.module.sys.entity.SysRoleChannel; +import com.niuan.erp.module.sys.mapper.SysChannelMapper; +import com.niuan.erp.module.sys.mapper.SysRoleChannelMapper; +import com.niuan.erp.module.sys.mapper.SysRoleMapper; +import com.niuan.erp.module.sys.service.SysRoleService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.util.List; + + +@Service +@Transactional +@RequiredArgsConstructor +public class SysRoleServiceImpl extends ServiceImpl implements SysRoleService { + + private final SysRoleConverter sysRoleConverter; + + private final SysChannelMapper sysChannelMapper; + + private final SysRoleChannelMapper sysRoleChannelMapper; + + @Override + public IPage getSysRolePage(BasePageReqParams dto, LambdaQueryWrapper wrapper) { + IPage result = this.baseMapper.selectPage(new Page<>(dto.page(), dto.pageSize()), wrapper); + result.getRecords().forEach(sysRole -> { + sysRole.setChannelIds(sysChannelMapper.selectChannelIdByRoleId(sysRole.getId())); + }); + return result.convert(sysRoleConverter::toDto); + } + + @Override + public void addSysRole(SysRoleDto dto) { + SysRole entity = sysRoleConverter.toEntity(dto); + entity.setCreateUserId(SecurityUtils.getUserId()); + entity.setCreateUserName(SecurityUtils.getUserName()); + entity.setCreateDate(LocalDateTime.now()); + entity.setStatus(1); + this.baseMapper.insert(entity); + if (dto.channelIds() != null && !dto.channelIds().isEmpty()) { + List roleChannels = dto.channelIds().stream() + .map(channelId -> SysRoleChannel.newRoleChannel(channelId, entity.getId())) + .toList(); + sysRoleChannelMapper.insert(roleChannels); + } + } + + @Override + public void updateSysRole(SysRoleDto dto) { + SysRole entity = sysRoleConverter.toEntity(dto); + entity.setUpdateUserId(SecurityUtils.getUserId()); + entity.setUpdateUserName(SecurityUtils.getUserName()); + entity.setUpdateDate(LocalDateTime.now()); + this.baseMapper.updateById(entity); + var roleChannelWrapper = new LambdaQueryWrapper(); + roleChannelWrapper.eq(SysRoleChannel::getRoleId, entity.getId()); + sysRoleChannelMapper.delete(roleChannelWrapper); + if (dto.channelIds() != null && !dto.channelIds().isEmpty()) { + List newChannels = dto.channelIds().stream() + .map(id -> SysRoleChannel.newRoleChannel(id, entity.getId())) + .toList(); + sysRoleChannelMapper.insert(newChannels); + } + } + + @Override + public void deleteSysRole(Long id) { + this.baseMapper.deleteById(id); + } + + @Override + public void deleteBatch(List ids) { + this.baseMapper.deleteByIds(ids); + } + + @Override + public void setStatus(Long id, Integer status) { + SysRole entity = this.baseMapper.selectById(id); + entity.setStatus(status); + this.baseMapper.updateById(entity); + } +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/sys/service/impl/SysUserServiceImpl.java b/src/main/java/com/niuan/erp/module/sys/service/impl/SysUserServiceImpl.java new file mode 100644 index 0000000..b483de4 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sys/service/impl/SysUserServiceImpl.java @@ -0,0 +1,68 @@ +package com.niuan.erp.module.sys.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.utils.SecurityUtils; +import com.niuan.erp.module.sys.controller.dto.SysUserDto; +import com.niuan.erp.module.sys.converter.SysUserConverter; +import com.niuan.erp.module.sys.entity.SysUser; +import com.niuan.erp.module.sys.mapper.SysUserMapper; +import com.niuan.erp.module.sys.mapper.UserRoleMapper; +import com.niuan.erp.module.sys.service.SysRoleService; +import com.niuan.erp.module.sys.service.SysUserService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.util.List; + + +@Service +@Transactional +@RequiredArgsConstructor +public class SysUserServiceImpl extends ServiceImpl implements SysUserService { + + private final SysUserConverter sysUserConverter; + + private final SysRoleService sysRoleService; + + private final UserRoleMapper userRoleMapper; + + @Override + public IPage getUserPage(BasePageReqParams dto, LambdaQueryWrapper wrapper) { + IPage result = this.baseMapper.selectPage(new Page<>(dto.page(), dto.pageSize()), null); + return result.convert(sysUserConverter::toDto); + } + + @Override + public void addUser(SysUserDto dto) { + SysUser entity = sysUserConverter.toEntity(dto); + entity.setCreateUserId(SecurityUtils.getUserId()); + entity.setCreateUserName(SecurityUtils.getUserName()); + entity.setCreateDate(LocalDateTime.now()); + this.baseMapper.insert(entity); + } + + @Override + public void updateUser(Long id, SysUserDto dto) { + SysUser entity = sysUserConverter.toEntity(dto); + entity.setUpdateUserId(SecurityUtils.getUserId()); + entity.setUpdateUserName(SecurityUtils.getUserName()); + entity.setUpdateDate(LocalDateTime.now()); + this.baseMapper.updateById(entity); + } + + @Override + public void deleteUser(Long id) { + this.baseMapper.deleteById(id); + } + + @Override + public void deleteBatch(List ids) { + this.baseMapper.deleteByIds(ids); + } +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/sys/service/impl/VendorServiceImpl.java b/src/main/java/com/niuan/erp/module/sys/service/impl/VendorServiceImpl.java new file mode 100644 index 0000000..789269e --- /dev/null +++ b/src/main/java/com/niuan/erp/module/sys/service/impl/VendorServiceImpl.java @@ -0,0 +1,66 @@ +package com.niuan.erp.module.sys.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.utils.SecurityUtils; +import com.niuan.erp.module.sys.controller.dto.VendorDto; +import com.niuan.erp.module.sys.converter.VendorConverter; +import com.niuan.erp.module.sys.entity.Vendor; +import com.niuan.erp.module.sys.mapper.VendorMapper; +import com.niuan.erp.module.sys.service.VendorService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.util.List; + + +@Service +@Transactional +@RequiredArgsConstructor +public class VendorServiceImpl extends ServiceImpl implements VendorService { + + + private final VendorConverter vendorConverter; + + @Override + public IPage getVendorPage(BasePageReqParams dto, LambdaQueryWrapper wrapper) { + IPage result = this.baseMapper.selectPage(new Page<>(dto.page(), dto.pageSize()), wrapper); + return result.convert(vendorConverter::toDto); + } + + @Override + public void addVendor(VendorDto dto) { + Vendor entity = vendorConverter.toEntity(dto); + entity.setCreateUserId(SecurityUtils.getUserId()); + entity.setCreateUserName(SecurityUtils.getUserName()); + entity.setCreateDate(LocalDateTime.now()); + entity.setCustomerId(SecurityUtils.getLoginUser().getUser().getCustomerId()); + entity.setStatus(1); + this.baseMapper.insert(entity); + } + + @Override + public void updateVendor(VendorDto dto) { + Vendor entity = vendorConverter.toEntity(dto); + entity.setUpdateUserId(SecurityUtils.getUserId()); + entity.setUpdateUserName(SecurityUtils.getUserName()); + entity.setUpdateDate(LocalDateTime.now()); + this.baseMapper.updateById(entity); + } + + @Override + public void deleteVendor(long id) { + this.baseMapper.deleteById(id); + } + + @Override + public void deleteBatch(List ids) { + this.baseMapper.deleteByIds(ids); + } + +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/warehouse/controller/InventoryCountController.java b/src/main/java/com/niuan/erp/module/warehouse/controller/InventoryCountController.java new file mode 100644 index 0000000..c504559 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/warehouse/controller/InventoryCountController.java @@ -0,0 +1,82 @@ +package com.niuan.erp.module.warehouse.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.annotation.ApiLog; +import com.niuan.erp.common.annotation.ModuleLog; +import com.niuan.erp.common.base.BaseDeleteBody; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.base.BaseResult; +import com.niuan.erp.common.base.CommonValidateGroup.*; +import com.niuan.erp.common.base.OperationType; +import com.niuan.erp.module.common.entity.Document; +import com.niuan.erp.module.warehouse.controller.dto.InventoryCountDto; +import com.niuan.erp.module.warehouse.service.InventoryCountService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.util.StringUtils; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +@Tag(name = "InventoryCount") +@ModuleLog("InventoryCount管理") +@RestController +@RequestMapping("/warehouse/inventorycount") +@RequiredArgsConstructor +public class InventoryCountController { + + private final InventoryCountService inventoryCountService; + + @Operation(summary = "分页查询InventoryCount数据", operationId = "getInventoryCountPage") + @GetMapping("/getInventoryCountPage") + @PreAuthorize("hasAuthority('inventorycount:index')") + public BaseResult> getInventoryCountPage(@Validated BasePageReqParams pageParams, + @Validated(Get.class) InventoryCountDto searchParams) { + var wrapper = new LambdaQueryWrapper(); + if (searchParams != null) { + if (StringUtils.hasText(searchParams.searchCode())) { + wrapper.like(Document::getFormCode, searchParams.searchCode()); + } + } + return BaseResult.successWithData(inventoryCountService.getInventoryCountPage(pageParams, wrapper)); + } + + + @ApiLog(type = OperationType.ADD, remark = "新增一条InventoryCount记录") + @Operation(summary = "新增InventoryCount", operationId = "addInventoryCount") + @PostMapping("/addInventoryCount") + @PreAuthorize("hasAuthority('inventorycount:add')") + public BaseResult addInventoryCount(@Validated(Add.class) @RequestBody InventoryCountDto dto) { + inventoryCountService.addInventoryCount(dto); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.UPDATE, remark = "更新一条InventoryCount记录") + @Operation(summary = "更新InventoryCount", operationId = "updateInventoryCount") + @PostMapping("/updateInventoryCount") + @PreAuthorize("hasAuthority('inventorycount:update')") + public BaseResult updateInventoryCount(@Validated(Update.class) @RequestBody InventoryCountDto dto) { + inventoryCountService.updateInventoryCount(dto); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.DELETE, remark = "删除一条InventoryCount记录") + @Operation(summary = "删除InventoryCount", operationId = "deleteInventoryCount") + @PostMapping("/deleteInventoryCount") + @PreAuthorize("hasAuthority('inventorycount:delete')") + public BaseResult deleteInventoryCount(@Validated(DeleteOne.class) @RequestBody BaseDeleteBody req) { + inventoryCountService.deleteInventoryCount(req.id()); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.DELETE, remark = "批量删除InventoryCount记录") + @Operation(summary = "批量删除InventoryCount", operationId = "deleteInventoryCountBatch") + @PostMapping("/deleteInventoryCountBatch") + @PreAuthorize("hasAuthority('inventorycount:deleteBatch')") + public BaseResult deleteInventoryCountBatch(@Validated(DeleteBatch.class) @RequestBody BaseDeleteBody req) { + inventoryCountService.deleteBatch(req.ids()); + return BaseResult.success(); + } +} diff --git a/src/main/java/com/niuan/erp/module/warehouse/controller/InventoryCountItemController.java b/src/main/java/com/niuan/erp/module/warehouse/controller/InventoryCountItemController.java new file mode 100644 index 0000000..f349e21 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/warehouse/controller/InventoryCountItemController.java @@ -0,0 +1,76 @@ +package com.niuan.erp.module.warehouse.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.annotation.ApiLog; +import com.niuan.erp.common.annotation.ModuleLog; +import com.niuan.erp.common.base.BaseDeleteBody; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.base.BaseResult; +import com.niuan.erp.common.base.CommonValidateGroup.*; +import com.niuan.erp.common.base.OperationType; +import com.niuan.erp.module.warehouse.controller.dto.InventoryCountItemDto; +import com.niuan.erp.module.warehouse.entity.InventoryCountItem; +import com.niuan.erp.module.warehouse.service.InventoryCountItemService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +@Tag(name = "InventoryCountItem") +@ModuleLog("InventoryCountItem管理") +@RestController +@RequestMapping("/warehouse/inventorycountitem") +@RequiredArgsConstructor +public class InventoryCountItemController { + + private final InventoryCountItemService inventoryCountItemService; + + @Operation(summary = "分页查询InventoryCountItem数据", operationId = "getInventoryCountItemPage") + @GetMapping("/getInventoryCountItemPage") + @PreAuthorize("hasAuthority('inventorycountitem:index')") + public BaseResult> getInventoryCountItemPage(@Validated BasePageReqParams pageParams, + @Validated(Get.class) InventoryCountItemDto searchParams) { + var wrapper = new LambdaQueryWrapper(); + return BaseResult.successWithData(inventoryCountItemService.getInventoryCountItemPage(pageParams, wrapper)); + } + + + @ApiLog(type = OperationType.ADD, remark = "新增一条InventoryCountItem记录") + @Operation(summary = "新增InventoryCountItem", operationId = "addInventoryCountItem") + @PostMapping("/addInventoryCountItem") + @PreAuthorize("hasAuthority('inventorycountitem:add')") + public BaseResult addInventoryCountItem(@Validated(Add.class) @RequestBody InventoryCountItemDto dto) { + inventoryCountItemService.addInventoryCountItem(dto); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.UPDATE, remark = "更新一条InventoryCountItem记录") + @Operation(summary = "更新InventoryCountItem", operationId = "updateInventoryCountItem") + @PostMapping("/updateInventoryCountItem") + @PreAuthorize("hasAuthority('inventorycountitem:update')") + public BaseResult updateInventoryCountItem(@Validated(Update.class) @RequestBody InventoryCountItemDto dto) { + inventoryCountItemService.updateInventoryCountItem(dto); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.DELETE, remark = "删除一条InventoryCountItem记录") + @Operation(summary = "删除InventoryCountItem", operationId = "deleteInventoryCountItem") + @PostMapping("/deleteInventoryCountItem") + @PreAuthorize("hasAuthority('inventorycountitem:delete')") + public BaseResult deleteInventoryCountItem(@Validated(DeleteOne.class) @RequestBody BaseDeleteBody req) { + inventoryCountItemService.deleteInventoryCountItem(req.id()); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.DELETE, remark = "批量删除InventoryCountItem记录") + @Operation(summary = "批量删除InventoryCountItem", operationId = "deleteInventoryCountItemBatch") + @PostMapping("/deleteInventoryCountItemBatch") + @PreAuthorize("hasAuthority('inventorycountitem:deleteBatch')") + public BaseResult deleteInventoryCountItemBatch(@Validated(DeleteBatch.class) @RequestBody BaseDeleteBody req) { + inventoryCountItemService.deleteBatch(req.ids()); + return BaseResult.success(); + } +} diff --git a/src/main/java/com/niuan/erp/module/warehouse/controller/StockByBrandController.java b/src/main/java/com/niuan/erp/module/warehouse/controller/StockByBrandController.java new file mode 100644 index 0000000..9588628 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/warehouse/controller/StockByBrandController.java @@ -0,0 +1,82 @@ +package com.niuan.erp.module.warehouse.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.annotation.ApiLog; +import com.niuan.erp.common.annotation.ModuleLog; +import com.niuan.erp.common.base.BaseDeleteBody; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.base.BaseResult; +import com.niuan.erp.common.base.CommonValidateGroup.*; +import com.niuan.erp.common.base.OperationType; +import com.niuan.erp.module.warehouse.controller.dto.StockByBrandDto; +import com.niuan.erp.module.warehouse.entity.Stock; +import com.niuan.erp.module.warehouse.service.StockByBrandService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.util.StringUtils; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +@Tag(name = "StockByBrand") +@ModuleLog("StockByBrand管理") +@RestController +@RequestMapping("/warehouse/stockbybrand") +@RequiredArgsConstructor +public class StockByBrandController { + + private final StockByBrandService stockByBrandService; + + @Operation(summary = "分页查询StockByBrand数据", operationId = "getStockByBrandPage") + @GetMapping("/getStockByBrandPage") + @PreAuthorize("hasAuthority('stockbybrand:index')") + public BaseResult> getStockByBrandPage(@Validated BasePageReqParams pageParams, + @Validated(Get.class) StockByBrandDto searchParams) { + var wrapper = new LambdaQueryWrapper(); + if (searchParams != null) { + if (StringUtils.hasText(searchParams.partNumber())) { + wrapper.like(Stock::getPartNumber, searchParams.partNumber()); + } + } + return BaseResult.successWithData(stockByBrandService.getStockByBrandPage(pageParams, wrapper)); + } + + + @ApiLog(type = OperationType.ADD, remark = "新增一条StockByBrand记录") + @Operation(summary = "新增StockByBrand", operationId = "addStockByBrand") + @PostMapping("/addStockByBrand") + @PreAuthorize("hasAuthority('stockbybrand:add')") + public BaseResult addStockByBrand(@Validated(Add.class) @RequestBody StockByBrandDto dto) { + stockByBrandService.addStockByBrand(dto); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.UPDATE, remark = "更新一条StockByBrand记录") + @Operation(summary = "更新StockByBrand", operationId = "updateStockByBrand") + @PostMapping("/updateStockByBrand") + @PreAuthorize("hasAuthority('stockbybrand:update')") + public BaseResult updateStockByBrand(@Validated(Update.class) @RequestBody StockByBrandDto dto) { + stockByBrandService.updateStockByBrand(dto); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.DELETE, remark = "删除一条StockByBrand记录") + @Operation(summary = "删除StockByBrand", operationId = "deleteStockByBrand") + @PostMapping("/deleteStockByBrand") + @PreAuthorize("hasAuthority('stockbybrand:delete')") + public BaseResult deleteStockByBrand(@Validated(DeleteOne.class) @RequestBody BaseDeleteBody req) { + stockByBrandService.deleteStockByBrand(req.id()); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.DELETE, remark = "批量删除StockByBrand记录") + @Operation(summary = "批量删除StockByBrand", operationId = "deleteStockByBrandBatch") + @PostMapping("/deleteStockByBrandBatch") + @PreAuthorize("hasAuthority('stockbybrand:deleteBatch')") + public BaseResult deleteStockByBrandBatch(@Validated(DeleteBatch.class) @RequestBody BaseDeleteBody req) { + stockByBrandService.deleteBatch(req.ids()); + return BaseResult.success(); + } +} diff --git a/src/main/java/com/niuan/erp/module/warehouse/controller/StockByTypeController.java b/src/main/java/com/niuan/erp/module/warehouse/controller/StockByTypeController.java new file mode 100644 index 0000000..fba386e --- /dev/null +++ b/src/main/java/com/niuan/erp/module/warehouse/controller/StockByTypeController.java @@ -0,0 +1,82 @@ +package com.niuan.erp.module.warehouse.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.annotation.ApiLog; +import com.niuan.erp.common.annotation.ModuleLog; +import com.niuan.erp.common.base.BaseDeleteBody; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.base.BaseResult; +import com.niuan.erp.common.base.CommonValidateGroup.*; +import com.niuan.erp.common.base.OperationType; +import com.niuan.erp.module.warehouse.controller.dto.StockByTypeDto; +import com.niuan.erp.module.warehouse.entity.Stock; +import com.niuan.erp.module.warehouse.service.StockByTypeService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.util.StringUtils; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +@Tag(name = "StockByType") +@ModuleLog("StockByType管理") +@RestController +@RequestMapping("/warehouse/stockbytype") +@RequiredArgsConstructor +public class StockByTypeController { + + private final StockByTypeService stockByTypeService; + + @Operation(summary = "分页查询StockByType数据", operationId = "getStockByTypePage") + @GetMapping("/getStockByTypePage") + @PreAuthorize("hasAuthority('stockbytype:index')") + public BaseResult> getStockByTypePage(@Validated BasePageReqParams pageParams, + @Validated(Get.class) StockByTypeDto searchParams) { + var wrapper = new LambdaQueryWrapper(); + if (searchParams != null) { + if (StringUtils.hasText(searchParams.partNumber())) { + wrapper.like(Stock::getPartNumber, searchParams.partNumber()); + } + } + return BaseResult.successWithData(stockByTypeService.getStockByTypePage(pageParams, wrapper)); + } + + + @ApiLog(type = OperationType.ADD, remark = "新增一条StockByType记录") + @Operation(summary = "新增StockByType", operationId = "addStockByType") + @PostMapping("/addStockByType") + @PreAuthorize("hasAuthority('stockbytype:add')") + public BaseResult addStockByType(@Validated(Add.class) @RequestBody StockByTypeDto dto) { + stockByTypeService.addStockByType(dto); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.UPDATE, remark = "更新一条StockByType记录") + @Operation(summary = "更新StockByType", operationId = "updateStockByType") + @PostMapping("/updateStockByType") + @PreAuthorize("hasAuthority('stockbytype:update')") + public BaseResult updateStockByType(@Validated(Update.class) @RequestBody StockByTypeDto dto) { + stockByTypeService.updateStockByType(dto); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.DELETE, remark = "删除一条StockByType记录") + @Operation(summary = "删除StockByType", operationId = "deleteStockByType") + @PostMapping("/deleteStockByType") + @PreAuthorize("hasAuthority('stockbytype:delete')") + public BaseResult deleteStockByType(@Validated(DeleteOne.class) @RequestBody BaseDeleteBody req) { + stockByTypeService.deleteStockByType(req.id()); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.DELETE, remark = "批量删除StockByType记录") + @Operation(summary = "批量删除StockByType", operationId = "deleteStockByTypeBatch") + @PostMapping("/deleteStockByTypeBatch") + @PreAuthorize("hasAuthority('stockbytype:deleteBatch')") + public BaseResult deleteStockByTypeBatch(@Validated(DeleteBatch.class) @RequestBody BaseDeleteBody req) { + stockByTypeService.deleteBatch(req.ids()); + return BaseResult.success(); + } +} diff --git a/src/main/java/com/niuan/erp/module/warehouse/controller/StockByWarehouseController.java b/src/main/java/com/niuan/erp/module/warehouse/controller/StockByWarehouseController.java new file mode 100644 index 0000000..268acef --- /dev/null +++ b/src/main/java/com/niuan/erp/module/warehouse/controller/StockByWarehouseController.java @@ -0,0 +1,82 @@ +package com.niuan.erp.module.warehouse.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.annotation.ApiLog; +import com.niuan.erp.common.annotation.ModuleLog; +import com.niuan.erp.common.base.BaseDeleteBody; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.base.BaseResult; +import com.niuan.erp.common.base.CommonValidateGroup.*; +import com.niuan.erp.common.base.OperationType; +import com.niuan.erp.module.warehouse.controller.dto.StockDto; +import com.niuan.erp.module.warehouse.entity.Stock; +import com.niuan.erp.module.warehouse.service.StockService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.util.StringUtils; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +@Tag(name = "Stock") +@ModuleLog("Stock管理") +@RestController +@RequestMapping("/warehouse/stock") +@RequiredArgsConstructor +public class StockByWarehouseController { + + private final StockService stockService; + + @Operation(summary = "分页查询Stock数据", operationId = "getStockPage") + @GetMapping("/getStockPage") + @PreAuthorize("hasAuthority('stock:index')") + public BaseResult> getStockPage(@Validated BasePageReqParams pageParams, + @Validated(Get.class) StockDto searchParams) { + var wrapper = new LambdaQueryWrapper(); + if (searchParams != null) { + if (StringUtils.hasText(searchParams.partNumber())) { + wrapper.like(Stock::getPartNumber, searchParams.partNumber()); + } + } + return BaseResult.successWithData(stockService.getStockPage(pageParams, wrapper)); + } + + + @ApiLog(type = OperationType.ADD, remark = "新增一条Stock记录") + @Operation(summary = "新增Stock", operationId = "addStock") + @PostMapping("/addStock") + @PreAuthorize("hasAuthority('stock:add')") + public BaseResult addStock(@Validated(Add.class) @RequestBody StockDto dto) { + stockService.addStock(dto); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.UPDATE, remark = "更新一条Stock记录") + @Operation(summary = "更新Stock", operationId = "updateStock") + @PostMapping("/updateStock") + @PreAuthorize("hasAuthority('stock:update')") + public BaseResult updateStock(@Validated(Update.class) @RequestBody StockDto dto) { + stockService.updateStock(dto); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.DELETE, remark = "删除一条Stock记录") + @Operation(summary = "删除Stock", operationId = "deleteStock") + @PostMapping("/deleteStock") + @PreAuthorize("hasAuthority('stock:delete')") + public BaseResult deleteStock(@Validated(DeleteOne.class) @RequestBody BaseDeleteBody req) { + stockService.deleteStock(req.id()); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.DELETE, remark = "批量删除Stock记录") + @Operation(summary = "批量删除Stock", operationId = "deleteStockBatch") + @PostMapping("/deleteStockBatch") + @PreAuthorize("hasAuthority('stock:deleteBatch')") + public BaseResult deleteStockBatch(@Validated(DeleteBatch.class) @RequestBody BaseDeleteBody req) { + stockService.deleteBatch(req.ids()); + return BaseResult.success(); + } +} diff --git a/src/main/java/com/niuan/erp/module/warehouse/controller/StockTransferOrderController.java b/src/main/java/com/niuan/erp/module/warehouse/controller/StockTransferOrderController.java new file mode 100644 index 0000000..82b918e --- /dev/null +++ b/src/main/java/com/niuan/erp/module/warehouse/controller/StockTransferOrderController.java @@ -0,0 +1,82 @@ +package com.niuan.erp.module.warehouse.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.annotation.ApiLog; +import com.niuan.erp.common.annotation.ModuleLog; +import com.niuan.erp.common.base.BaseDeleteBody; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.base.BaseResult; +import com.niuan.erp.common.base.CommonValidateGroup.*; +import com.niuan.erp.common.base.OperationType; +import com.niuan.erp.module.common.entity.Document; +import com.niuan.erp.module.warehouse.controller.dto.StockTransferOrderDto; +import com.niuan.erp.module.warehouse.service.StockTransferOrderService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.util.StringUtils; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +@Tag(name = "StockTransferOrder") +@ModuleLog("StockTransferOrder管理") +@RestController +@RequestMapping("/warehouse/stocktransferorder") +@RequiredArgsConstructor +public class StockTransferOrderController { + + private final StockTransferOrderService stockTransferOrderService; + + @Operation(summary = "分页查询StockTransferOrder数据", operationId = "getStockTransferOrderPage") + @GetMapping("/getStockTransferOrderPage") + @PreAuthorize("hasAuthority('stocktransferorder:index')") + public BaseResult> getStockTransferOrderPage(@Validated BasePageReqParams pageParams, + @Validated(Get.class) StockTransferOrderDto searchParams) { + var wrapper = new LambdaQueryWrapper(); + if (searchParams != null) { + if (StringUtils.hasText(searchParams.searchCode())) { + wrapper.like(Document::getFormCode, searchParams.searchCode()); + } + } + return BaseResult.successWithData(stockTransferOrderService.getStockTransferOrderPage(pageParams, wrapper)); + } + + + @ApiLog(type = OperationType.ADD, remark = "新增一条StockTransferOrder记录") + @Operation(summary = "新增StockTransferOrder", operationId = "addStockTransferOrder") + @PostMapping("/addStockTransferOrder") + @PreAuthorize("hasAuthority('stocktransferorder:add')") + public BaseResult addStockTransferOrder(@Validated(Add.class) @RequestBody StockTransferOrderDto dto) { + stockTransferOrderService.addStockTransferOrder(dto); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.UPDATE, remark = "更新一条StockTransferOrder记录") + @Operation(summary = "更新StockTransferOrder", operationId = "updateStockTransferOrder") + @PostMapping("/updateStockTransferOrder") + @PreAuthorize("hasAuthority('stocktransferorder:update')") + public BaseResult updateStockTransferOrder(@Validated(Update.class) @RequestBody StockTransferOrderDto dto) { + stockTransferOrderService.updateStockTransferOrder(dto); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.DELETE, remark = "删除一条StockTransferOrder记录") + @Operation(summary = "删除StockTransferOrder", operationId = "deleteStockTransferOrder") + @PostMapping("/deleteStockTransferOrder") + @PreAuthorize("hasAuthority('stocktransferorder:delete')") + public BaseResult deleteStockTransferOrder(@Validated(DeleteOne.class) @RequestBody BaseDeleteBody req) { + stockTransferOrderService.deleteStockTransferOrder(req.id()); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.DELETE, remark = "批量删除StockTransferOrder记录") + @Operation(summary = "批量删除StockTransferOrder", operationId = "deleteStockTransferOrderBatch") + @PostMapping("/deleteStockTransferOrderBatch") + @PreAuthorize("hasAuthority('stocktransferorder:deleteBatch')") + public BaseResult deleteStockTransferOrderBatch(@Validated(DeleteBatch.class) @RequestBody BaseDeleteBody req) { + stockTransferOrderService.deleteBatch(req.ids()); + return BaseResult.success(); + } +} diff --git a/src/main/java/com/niuan/erp/module/warehouse/controller/WarehouseController.java b/src/main/java/com/niuan/erp/module/warehouse/controller/WarehouseController.java new file mode 100644 index 0000000..5b93e2b --- /dev/null +++ b/src/main/java/com/niuan/erp/module/warehouse/controller/WarehouseController.java @@ -0,0 +1,82 @@ +package com.niuan.erp.module.warehouse.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.annotation.ApiLog; +import com.niuan.erp.common.annotation.ModuleLog; +import com.niuan.erp.common.base.BaseDeleteBody; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.base.BaseResult; +import com.niuan.erp.common.base.CommonValidateGroup.*; +import com.niuan.erp.common.base.OperationType; +import com.niuan.erp.module.warehouse.controller.dto.WarehouseDto; +import com.niuan.erp.module.warehouse.entity.Warehouse; +import com.niuan.erp.module.warehouse.service.WarehouseService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.util.StringUtils; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +@Tag(name = "Warehouse") +@ModuleLog("Warehouse管理") +@RestController +@RequestMapping("/warehouse/warehouse") +@RequiredArgsConstructor +public class WarehouseController { + + private final WarehouseService warehouseService; + + @Operation(summary = "分页查询Warehouse数据", operationId = "getWarehousePage") + @GetMapping("/getWarehousePage") + @PreAuthorize("hasAuthority('warehouse:index')") + public BaseResult> getWarehousePage(@Validated BasePageReqParams pageParams, + @Validated(Get.class) WarehouseDto searchParams) { + var wrapper = new LambdaQueryWrapper(); + if (searchParams != null) { + if (StringUtils.hasText(searchParams.searchCode())) { + wrapper.like(Warehouse::getSearchCode, searchParams.searchCode()); + } + } + return BaseResult.successWithData(warehouseService.getWarehousePage(pageParams, wrapper)); + } + + + @ApiLog(type = OperationType.ADD, remark = "新增一条Warehouse记录") + @Operation(summary = "新增Warehouse", operationId = "addWarehouse") + @PostMapping("/addWarehouse") + @PreAuthorize("hasAuthority('warehouse:add')") + public BaseResult addWarehouse(@Validated(Add.class) @RequestBody WarehouseDto dto) { + warehouseService.addWarehouse(dto); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.UPDATE, remark = "更新一条Warehouse记录") + @Operation(summary = "更新Warehouse", operationId = "updateWarehouse") + @PostMapping("/updateWarehouse") + @PreAuthorize("hasAuthority('warehouse:update')") + public BaseResult updateWarehouse(@Validated(Update.class) @RequestBody WarehouseDto dto) { + warehouseService.updateWarehouse(dto); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.DELETE, remark = "删除一条Warehouse记录") + @Operation(summary = "删除Warehouse", operationId = "deleteWarehouse") + @PostMapping("/deleteWarehouse") + @PreAuthorize("hasAuthority('warehouse:delete')") + public BaseResult deleteWarehouse(@Validated(DeleteOne.class) @RequestBody BaseDeleteBody req) { + warehouseService.deleteWarehouse(req.id()); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.DELETE, remark = "批量删除Warehouse记录") + @Operation(summary = "批量删除Warehouse", operationId = "deleteWarehouseBatch") + @PostMapping("/deleteWarehouseBatch") + @PreAuthorize("hasAuthority('warehouse:deleteBatch')") + public BaseResult deleteWarehouseBatch(@Validated(DeleteBatch.class) @RequestBody BaseDeleteBody req) { + warehouseService.deleteBatch(req.ids()); + return BaseResult.success(); + } +} diff --git a/src/main/java/com/niuan/erp/module/warehouse/controller/WarehouseItemController.java b/src/main/java/com/niuan/erp/module/warehouse/controller/WarehouseItemController.java new file mode 100644 index 0000000..3a3a9a4 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/warehouse/controller/WarehouseItemController.java @@ -0,0 +1,82 @@ +package com.niuan.erp.module.warehouse.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.annotation.ApiLog; +import com.niuan.erp.common.annotation.ModuleLog; +import com.niuan.erp.common.base.BaseDeleteBody; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.base.BaseResult; +import com.niuan.erp.common.base.CommonValidateGroup.*; +import com.niuan.erp.common.base.OperationType; +import com.niuan.erp.module.warehouse.controller.dto.WarehouseItemDto; +import com.niuan.erp.module.warehouse.entity.WarehouseItem; +import com.niuan.erp.module.warehouse.service.WarehouseItemService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.util.StringUtils; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +@Tag(name = "WarehouseItem") +@ModuleLog("WarehouseItem管理") +@RestController +@RequestMapping("/warehouse/warehouseitem") +@RequiredArgsConstructor +public class WarehouseItemController { + + private final WarehouseItemService warehouseItemService; + + @Operation(summary = "分页查询WarehouseItem数据", operationId = "getWarehouseItemPage") + @GetMapping("/getWarehouseItemPage") + @PreAuthorize("hasAuthority('warehouseitem:index')") + public BaseResult> getWarehouseItemPage(@Validated BasePageReqParams pageParams, + @Validated(Get.class) WarehouseItemDto searchParams) { + var wrapper = new LambdaQueryWrapper(); + if (searchParams != null) { + if (StringUtils.hasText(searchParams.searchCode())) { + wrapper.like(WarehouseItem::getSearchCode, searchParams.searchCode()); + } + } + return BaseResult.successWithData(warehouseItemService.getWarehouseItemPage(pageParams, wrapper)); + } + + + @ApiLog(type = OperationType.ADD, remark = "新增一条WarehouseItem记录") + @Operation(summary = "新增WarehouseItem", operationId = "addWarehouseItem") + @PostMapping("/addWarehouseItem") + @PreAuthorize("hasAuthority('warehouseitem:add')") + public BaseResult addWarehouseItem(@Validated(Add.class) @RequestBody WarehouseItemDto dto) { + warehouseItemService.addWarehouseItem(dto); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.UPDATE, remark = "更新一条WarehouseItem记录") + @Operation(summary = "更新WarehouseItem", operationId = "updateWarehouseItem") + @PostMapping("/updateWarehouseItem") + @PreAuthorize("hasAuthority('warehouseitem:update')") + public BaseResult updateWarehouseItem(@Validated(Update.class) @RequestBody WarehouseItemDto dto) { + warehouseItemService.updateWarehouseItem(dto); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.DELETE, remark = "删除一条WarehouseItem记录") + @Operation(summary = "删除WarehouseItem", operationId = "deleteWarehouseItem") + @PostMapping("/deleteWarehouseItem") + @PreAuthorize("hasAuthority('warehouseitem:delete')") + public BaseResult deleteWarehouseItem(@Validated(DeleteOne.class) @RequestBody BaseDeleteBody req) { + warehouseItemService.deleteWarehouseItem(req.id()); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.DELETE, remark = "批量删除WarehouseItem记录") + @Operation(summary = "批量删除WarehouseItem", operationId = "deleteWarehouseItemBatch") + @PostMapping("/deleteWarehouseItemBatch") + @PreAuthorize("hasAuthority('warehouseitem:deleteBatch')") + public BaseResult deleteWarehouseItemBatch(@Validated(DeleteBatch.class) @RequestBody BaseDeleteBody req) { + warehouseItemService.deleteBatch(req.ids()); + return BaseResult.success(); + } +} diff --git a/src/main/java/com/niuan/erp/module/warehouse/controller/WarehouseReceiptController.java b/src/main/java/com/niuan/erp/module/warehouse/controller/WarehouseReceiptController.java new file mode 100644 index 0000000..0ca9489 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/warehouse/controller/WarehouseReceiptController.java @@ -0,0 +1,82 @@ +package com.niuan.erp.module.warehouse.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.annotation.ApiLog; +import com.niuan.erp.common.annotation.ModuleLog; +import com.niuan.erp.common.base.BaseDeleteBody; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.base.BaseResult; +import com.niuan.erp.common.base.CommonValidateGroup.*; +import com.niuan.erp.common.base.OperationType; +import com.niuan.erp.module.common.entity.Document; +import com.niuan.erp.module.warehouse.controller.dto.WarehouseReceiptDto; +import com.niuan.erp.module.warehouse.service.WarehouseReceiptService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.util.StringUtils; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +@Tag(name = "WarehouseReceipt") +@ModuleLog("WarehouseReceipt管理") +@RestController +@RequestMapping("/warehouse/warehousereceipt") +@RequiredArgsConstructor +public class WarehouseReceiptController { + + private final WarehouseReceiptService warehouseReceiptService; + + @Operation(summary = "分页查询WarehouseReceipt数据", operationId = "getWarehouseReceiptPage") + @GetMapping("/getWarehouseReceiptPage") + @PreAuthorize("hasAuthority('warehousereceipt:index')") + public BaseResult> getWarehouseReceiptPage(@Validated BasePageReqParams pageParams, + @Validated(Get.class) WarehouseReceiptDto searchParams) { + var wrapper = new LambdaQueryWrapper(); + if (searchParams != null) { + if (StringUtils.hasText(searchParams.searchCode())) { + wrapper.like(Document::getFormCode, searchParams.searchCode()); + } + } + return BaseResult.successWithData(warehouseReceiptService.getWarehouseReceiptPage(pageParams, wrapper)); + } + + + @ApiLog(type = OperationType.ADD, remark = "新增一条WarehouseReceipt记录") + @Operation(summary = "新增WarehouseReceipt", operationId = "addWarehouseReceipt") + @PostMapping("/addWarehouseReceipt") + @PreAuthorize("hasAuthority('warehousereceipt:add')") + public BaseResult addWarehouseReceipt(@Validated(Add.class) @RequestBody WarehouseReceiptDto dto) { + warehouseReceiptService.addWarehouseReceipt(dto); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.UPDATE, remark = "更新一条WarehouseReceipt记录") + @Operation(summary = "更新WarehouseReceipt", operationId = "updateWarehouseReceipt") + @PostMapping("/updateWarehouseReceipt") + @PreAuthorize("hasAuthority('warehousereceipt:update')") + public BaseResult updateWarehouseReceipt(@Validated(Update.class) @RequestBody WarehouseReceiptDto dto) { + warehouseReceiptService.updateWarehouseReceipt(dto); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.DELETE, remark = "删除一条WarehouseReceipt记录") + @Operation(summary = "删除WarehouseReceipt", operationId = "deleteWarehouseReceipt") + @PostMapping("/deleteWarehouseReceipt") + @PreAuthorize("hasAuthority('warehousereceipt:delete')") + public BaseResult deleteWarehouseReceipt(@Validated(DeleteOne.class) @RequestBody BaseDeleteBody req) { + warehouseReceiptService.deleteWarehouseReceipt(req.id()); + return BaseResult.success(); + } + + @ApiLog(type = OperationType.DELETE, remark = "批量删除WarehouseReceipt记录") + @Operation(summary = "批量删除WarehouseReceipt", operationId = "deleteWarehouseReceiptBatch") + @PostMapping("/deleteWarehouseReceiptBatch") + @PreAuthorize("hasAuthority('warehousereceipt:deleteBatch')") + public BaseResult deleteWarehouseReceiptBatch(@Validated(DeleteBatch.class) @RequestBody BaseDeleteBody req) { + warehouseReceiptService.deleteBatch(req.ids()); + return BaseResult.success(); + } +} diff --git a/src/main/java/com/niuan/erp/module/warehouse/controller/dto/InventoryCountDto.java b/src/main/java/com/niuan/erp/module/warehouse/controller/dto/InventoryCountDto.java new file mode 100644 index 0000000..130094a --- /dev/null +++ b/src/main/java/com/niuan/erp/module/warehouse/controller/dto/InventoryCountDto.java @@ -0,0 +1,30 @@ +package com.niuan.erp.module.warehouse.controller.dto; + +import java.time.LocalDateTime; + +public record InventoryCountDto( + Long id, + Integer status, + LocalDateTime createDate, + Long createUserId, + String createUserName, + LocalDateTime updateDate, + Long updateUserId, + String updateUserName, + Integer storeNo, + String storeName, + Integer formType, + String formCode, + String formName, + Integer formStatus, + String formMark, + Integer reserve1, + String reserve2, + Integer vendorNo, + String vendorName, + Double totalValue, + Integer outStoreNo, + String outStoreName, + Integer groupId, + Integer customerId, + String searchCode) {} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/warehouse/controller/dto/InventoryCountItemDto.java b/src/main/java/com/niuan/erp/module/warehouse/controller/dto/InventoryCountItemDto.java new file mode 100644 index 0000000..fb4be63 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/warehouse/controller/dto/InventoryCountItemDto.java @@ -0,0 +1,23 @@ +package com.niuan.erp.module.warehouse.controller.dto; + +import java.time.LocalDateTime; + +public record InventoryCountItemDto( + Long id, + Integer status, + LocalDateTime createDate, + Long createUserId, + String createUserName, + LocalDateTime updateDate, + Long updateUserId, + String updateUserName, + Integer storeNo, + String storeName, + String partNumber, + Integer productCount, + Integer diffCount, + String stockTakingMark, + Integer reserve1, + String reserve2, + Integer documentNo, + Integer originalProductCount) {} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/warehouse/controller/dto/StockByBrandDto.java b/src/main/java/com/niuan/erp/module/warehouse/controller/dto/StockByBrandDto.java new file mode 100644 index 0000000..a6d81f9 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/warehouse/controller/dto/StockByBrandDto.java @@ -0,0 +1,21 @@ +package com.niuan.erp.module.warehouse.controller.dto; + +import java.time.LocalDateTime; + +public record StockByBrandDto( + Long id, + Integer status, + LocalDateTime createDate, + Long createUserId, + String createUserName, + LocalDateTime updateDate, + Long updateUserId, + String updateUserName, + Integer storeNo, + String storeName, + String partNumber, + Integer productCount, + String storageMark, + Integer reserve1, + String reserve2, + Integer productOccupyTotal) {} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/warehouse/controller/dto/StockByTypeDto.java b/src/main/java/com/niuan/erp/module/warehouse/controller/dto/StockByTypeDto.java new file mode 100644 index 0000000..c5f9cc6 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/warehouse/controller/dto/StockByTypeDto.java @@ -0,0 +1,21 @@ +package com.niuan.erp.module.warehouse.controller.dto; + +import java.time.LocalDateTime; + +public record StockByTypeDto( + Long id, + Integer status, + LocalDateTime createDate, + Long createUserId, + String createUserName, + LocalDateTime updateDate, + Long updateUserId, + String updateUserName, + Integer storeNo, + String storeName, + String partNumber, + Integer productCount, + String storageMark, + Integer reserve1, + String reserve2, + Integer productOccupyTotal) {} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/warehouse/controller/dto/StockDto.java b/src/main/java/com/niuan/erp/module/warehouse/controller/dto/StockDto.java new file mode 100644 index 0000000..b2dd772 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/warehouse/controller/dto/StockDto.java @@ -0,0 +1,21 @@ +package com.niuan.erp.module.warehouse.controller.dto; + +import java.time.LocalDateTime; + +public record StockDto( + Long id, + Integer status, + LocalDateTime createDate, + Long createUserId, + String createUserName, + LocalDateTime updateDate, + Long updateUserId, + String updateUserName, + Integer storeNo, + String storeName, + String partNumber, + Integer productCount, + String storageMark, + Integer reserve1, + String reserve2, + Integer productOccupyTotal) {} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/warehouse/controller/dto/StockTransferOrderDto.java b/src/main/java/com/niuan/erp/module/warehouse/controller/dto/StockTransferOrderDto.java new file mode 100644 index 0000000..4479c2c --- /dev/null +++ b/src/main/java/com/niuan/erp/module/warehouse/controller/dto/StockTransferOrderDto.java @@ -0,0 +1,30 @@ +package com.niuan.erp.module.warehouse.controller.dto; + +import java.time.LocalDateTime; + +public record StockTransferOrderDto( + Long id, + Integer status, + LocalDateTime createDate, + Long createUserId, + String createUserName, + LocalDateTime updateDate, + Long updateUserId, + String updateUserName, + Integer storeNo, + String storeName, + Integer formType, + String formCode, + String formName, + Integer formStatus, + String formMark, + Integer reserve1, + String reserve2, + Integer vendorNo, + String vendorName, + Double totalValue, + Integer outStoreNo, + String outStoreName, + Integer groupId, + Integer customerId, + String searchCode) {} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/warehouse/controller/dto/WarehouseDto.java b/src/main/java/com/niuan/erp/module/warehouse/controller/dto/WarehouseDto.java new file mode 100644 index 0000000..bd4e01c --- /dev/null +++ b/src/main/java/com/niuan/erp/module/warehouse/controller/dto/WarehouseDto.java @@ -0,0 +1,20 @@ +package com.niuan.erp.module.warehouse.controller.dto; + +import java.time.LocalDateTime; + +public record WarehouseDto( + Long id, + Integer status, + LocalDateTime createDate, + Long createUserId, + String createUserName, + LocalDateTime updateDate, + Long updateUserId, + String updateUserName, + Integer storeNo, + String storeName, + String storeMark, + Integer reserve1, + String reserve2, + Long projectId, + Integer customerId) {} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/warehouse/controller/dto/WarehouseItemDto.java b/src/main/java/com/niuan/erp/module/warehouse/controller/dto/WarehouseItemDto.java new file mode 100644 index 0000000..42ff26a --- /dev/null +++ b/src/main/java/com/niuan/erp/module/warehouse/controller/dto/WarehouseItemDto.java @@ -0,0 +1,32 @@ +package com.niuan.erp.module.warehouse.controller.dto; + +import java.time.LocalDateTime; + +public record WarehouseItemDto( + Long id, + Integer status, + LocalDateTime createDate, + Long createUserId, + String createUserName, + LocalDateTime updateDate, + Long updateUserId, + String updateUserName, + String partNumber, + String productType, + String productSpecs, + String productBrand, + Integer productPacking, + String productPackUnit, + String productPackSize, + Double productPrice, + Integer productStockTotal, + String vdName, + Integer vendorCode1, + Integer vendorCode2, + Integer vendorCode3, + Integer manufactureSpec, + String productMark, + Integer reserve1, + String reserve2, + Integer productOccupyTotal, + Integer customerId) {} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/warehouse/controller/dto/WarehouseReceiptDto.java b/src/main/java/com/niuan/erp/module/warehouse/controller/dto/WarehouseReceiptDto.java new file mode 100644 index 0000000..f427b5d --- /dev/null +++ b/src/main/java/com/niuan/erp/module/warehouse/controller/dto/WarehouseReceiptDto.java @@ -0,0 +1,30 @@ +package com.niuan.erp.module.warehouse.controller.dto; + +import java.time.LocalDateTime; + +public record WarehouseReceiptDto( + Long id, + Integer status, + LocalDateTime createDate, + Long createUserId, + String createUserName, + LocalDateTime updateDate, + Long updateUserId, + String updateUserName, + Integer storeNo, + String storeName, + Integer formType, + String formCode, + String formName, + Integer formStatus, + String formMark, + Integer reserve1, + String reserve2, + Integer vendorNo, + String vendorName, + Double totalValue, + Integer outStoreNo, + String outStoreName, + Integer groupId, + Integer customerId, + String searchCode) {} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/warehouse/converter/InventoryCountConverter.java b/src/main/java/com/niuan/erp/module/warehouse/converter/InventoryCountConverter.java new file mode 100644 index 0000000..af12a0f --- /dev/null +++ b/src/main/java/com/niuan/erp/module/warehouse/converter/InventoryCountConverter.java @@ -0,0 +1,15 @@ +package com.niuan.erp.module.warehouse.converter; + +import com.niuan.erp.module.common.entity.Document; +import com.niuan.erp.module.warehouse.controller.dto.InventoryCountDto; +import org.mapstruct.Mapper; +import org.mapstruct.ReportingPolicy; + +import java.util.List; + +@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) +public interface InventoryCountConverter { + Document toEntity(InventoryCountDto dto); + InventoryCountDto toDto(Document entity); + List toDtoList(List entities); +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/warehouse/converter/InventoryCountItemConverter.java b/src/main/java/com/niuan/erp/module/warehouse/converter/InventoryCountItemConverter.java new file mode 100644 index 0000000..ed4e95e --- /dev/null +++ b/src/main/java/com/niuan/erp/module/warehouse/converter/InventoryCountItemConverter.java @@ -0,0 +1,15 @@ +package com.niuan.erp.module.warehouse.converter; + +import com.niuan.erp.module.warehouse.controller.dto.InventoryCountItemDto; +import com.niuan.erp.module.warehouse.entity.InventoryCountItem; +import org.mapstruct.Mapper; +import org.mapstruct.ReportingPolicy; + +import java.util.List; + +@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) +public interface InventoryCountItemConverter { + InventoryCountItem toEntity(InventoryCountItemDto dto); + InventoryCountItemDto toDto(InventoryCountItem entity); + List toDtoList(List entities); +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/warehouse/converter/StockByBrandConverter.java b/src/main/java/com/niuan/erp/module/warehouse/converter/StockByBrandConverter.java new file mode 100644 index 0000000..50a4fae --- /dev/null +++ b/src/main/java/com/niuan/erp/module/warehouse/converter/StockByBrandConverter.java @@ -0,0 +1,15 @@ +package com.niuan.erp.module.warehouse.converter; + +import com.niuan.erp.module.warehouse.controller.dto.StockByBrandDto; +import com.niuan.erp.module.warehouse.entity.Stock; +import org.mapstruct.Mapper; +import org.mapstruct.ReportingPolicy; + +import java.util.List; + +@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) +public interface StockByBrandConverter { + Stock toEntity(StockByBrandDto dto); + StockByBrandDto toDto(Stock entity); + List toDtoList(List entities); +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/warehouse/converter/StockByTypeConverter.java b/src/main/java/com/niuan/erp/module/warehouse/converter/StockByTypeConverter.java new file mode 100644 index 0000000..c197b1c --- /dev/null +++ b/src/main/java/com/niuan/erp/module/warehouse/converter/StockByTypeConverter.java @@ -0,0 +1,15 @@ +package com.niuan.erp.module.warehouse.converter; + +import com.niuan.erp.module.warehouse.controller.dto.StockByTypeDto; +import com.niuan.erp.module.warehouse.entity.Stock; +import org.mapstruct.Mapper; +import org.mapstruct.ReportingPolicy; + +import java.util.List; + +@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) +public interface StockByTypeConverter { + Stock toEntity(StockByTypeDto dto); + StockByTypeDto toDto(Stock entity); + List toDtoList(List entities); +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/warehouse/converter/StockConverter.java b/src/main/java/com/niuan/erp/module/warehouse/converter/StockConverter.java new file mode 100644 index 0000000..e0f547c --- /dev/null +++ b/src/main/java/com/niuan/erp/module/warehouse/converter/StockConverter.java @@ -0,0 +1,15 @@ +package com.niuan.erp.module.warehouse.converter; + +import com.niuan.erp.module.warehouse.controller.dto.StockDto; +import com.niuan.erp.module.warehouse.entity.Stock; +import org.mapstruct.Mapper; +import org.mapstruct.ReportingPolicy; + +import java.util.List; + +@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) +public interface StockConverter { + Stock toEntity(StockDto dto); + StockDto toDto(Stock entity); + List toDtoList(List entities); +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/warehouse/converter/StockTransferOrderConverter.java b/src/main/java/com/niuan/erp/module/warehouse/converter/StockTransferOrderConverter.java new file mode 100644 index 0000000..0a96a70 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/warehouse/converter/StockTransferOrderConverter.java @@ -0,0 +1,15 @@ +package com.niuan.erp.module.warehouse.converter; + +import com.niuan.erp.module.common.entity.Document; +import com.niuan.erp.module.warehouse.controller.dto.StockTransferOrderDto; +import org.mapstruct.Mapper; +import org.mapstruct.ReportingPolicy; + +import java.util.List; + +@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) +public interface StockTransferOrderConverter { + Document toEntity(StockTransferOrderDto dto); + StockTransferOrderDto toDto(Document entity); + List toDtoList(List entities); +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/warehouse/converter/WarehouseConverter.java b/src/main/java/com/niuan/erp/module/warehouse/converter/WarehouseConverter.java new file mode 100644 index 0000000..8a33fd0 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/warehouse/converter/WarehouseConverter.java @@ -0,0 +1,15 @@ +package com.niuan.erp.module.warehouse.converter; + +import com.niuan.erp.module.warehouse.controller.dto.WarehouseDto; +import com.niuan.erp.module.warehouse.entity.Warehouse; +import org.mapstruct.Mapper; +import org.mapstruct.ReportingPolicy; + +import java.util.List; + +@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) +public interface WarehouseConverter { + Warehouse toEntity(WarehouseDto dto); + WarehouseDto toDto(Warehouse entity); + List toDtoList(List entities); +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/warehouse/converter/WarehouseItemConverter.java b/src/main/java/com/niuan/erp/module/warehouse/converter/WarehouseItemConverter.java new file mode 100644 index 0000000..711ee74 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/warehouse/converter/WarehouseItemConverter.java @@ -0,0 +1,15 @@ +package com.niuan.erp.module.warehouse.converter; + +import com.niuan.erp.module.warehouse.controller.dto.WarehouseItemDto; +import com.niuan.erp.module.warehouse.entity.WarehouseItem; +import org.mapstruct.Mapper; +import org.mapstruct.ReportingPolicy; + +import java.util.List; + +@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) +public interface WarehouseItemConverter { + WarehouseItem toEntity(WarehouseItemDto dto); + WarehouseItemDto toDto(WarehouseItem entity); + List toDtoList(List entities); +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/warehouse/converter/WarehouseReceiptConverter.java b/src/main/java/com/niuan/erp/module/warehouse/converter/WarehouseReceiptConverter.java new file mode 100644 index 0000000..47bc42c --- /dev/null +++ b/src/main/java/com/niuan/erp/module/warehouse/converter/WarehouseReceiptConverter.java @@ -0,0 +1,15 @@ +package com.niuan.erp.module.warehouse.converter; + +import com.niuan.erp.module.common.entity.Document; +import com.niuan.erp.module.warehouse.controller.dto.WarehouseReceiptDto; +import org.mapstruct.Mapper; +import org.mapstruct.ReportingPolicy; + +import java.util.List; + +@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) +public interface WarehouseReceiptConverter { + Document toEntity(WarehouseReceiptDto dto); + WarehouseReceiptDto toDto(Document entity); + List toDtoList(List entities); +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/warehouse/entity/InventoryCountItem.java b/src/main/java/com/niuan/erp/module/warehouse/entity/InventoryCountItem.java new file mode 100644 index 0000000..1a75e02 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/warehouse/entity/InventoryCountItem.java @@ -0,0 +1,83 @@ +package com.niuan.erp.module.warehouse.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *

+ * + *

+ * + * @author + * @since 2026-02-12 + */ +@Getter +@Setter +@ToString +@TableName("stocktaking") +public class InventoryCountItem implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "Id", type = IdType.AUTO) + private Long id; + + @TableField("Status") + private Integer status; + + @TableField("CreateDate") + private LocalDateTime createDate; + + @TableField("CreateUserId") + private Long createUserId; + + @TableField("CreateUserName") + private String createUserName; + + @TableField("UpdateDate") + private LocalDateTime updateDate; + + @TableField("UpdateUserId") + private Long updateUserId; + + @TableField("UpdateUserName") + private String updateUserName; + + @TableField("StoreNo") + private Integer storeNo; + + @TableField("StoreName") + private String storeName; + + @TableField("PartNumber") + private String partNumber; + + @TableField("ProductCount") + private Integer productCount; + + @TableField("DiffCount") + private Integer diffCount; + + @TableField("StockTakingMark") + private String stockTakingMark; + + @TableField("reserve1") + private Integer reserve1; + + @TableField("reserve2") + private String reserve2; + + @TableField("DocumentNo") + private Integer documentNo; + + @TableField("OriginalProductCount") + private Integer originalProductCount; +} diff --git a/src/main/java/com/niuan/erp/module/warehouse/entity/Stock.java b/src/main/java/com/niuan/erp/module/warehouse/entity/Stock.java new file mode 100644 index 0000000..adafb64 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/warehouse/entity/Stock.java @@ -0,0 +1,77 @@ +package com.niuan.erp.module.warehouse.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *

+ * + *

+ * + * @author + * @since 2026-02-12 + */ +@Getter +@Setter +@ToString +@TableName("storagecount") +public class Stock implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "Id", type = IdType.AUTO) + private Long id; + + @TableField("Status") + private Integer status; + + @TableField("CreateDate") + private LocalDateTime createDate; + + @TableField("CreateUserId") + private Long createUserId; + + @TableField("CreateUserName") + private String createUserName; + + @TableField("UpdateDate") + private LocalDateTime updateDate; + + @TableField("UpdateUserId") + private Long updateUserId; + + @TableField("UpdateUserName") + private String updateUserName; + + @TableField("StoreNo") + private Integer storeNo; + + @TableField("StoreName") + private String storeName; + + @TableField("PartNumber") + private String partNumber; + + @TableField("ProductCount") + private Integer productCount; + + @TableField("StorageMark") + private String storageMark; + + @TableField("reserve1") + private Integer reserve1; + + @TableField("reserve2") + private String reserve2; + + @TableField("ProductOccupyTotal") + private Integer productOccupyTotal; +} diff --git a/src/main/java/com/niuan/erp/module/warehouse/entity/Warehouse.java b/src/main/java/com/niuan/erp/module/warehouse/entity/Warehouse.java new file mode 100644 index 0000000..6fd51e1 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/warehouse/entity/Warehouse.java @@ -0,0 +1,74 @@ +package com.niuan.erp.module.warehouse.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *

+ * + *

+ * + * @author + * @since 2026-02-12 + */ +@Getter +@Setter +@ToString +@TableName("storage_list") +public class Warehouse implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "Id", type = IdType.AUTO) + private Long id; + + @TableField("Status") + private Integer status; + + @TableField("CreateDate") + private LocalDateTime createDate; + + @TableField("CreateUserId") + private Long createUserId; + + @TableField("CreateUserName") + private String createUserName; + + @TableField("UpdateDate") + private LocalDateTime updateDate; + + @TableField("UpdateUserId") + private Long updateUserId; + + @TableField("UpdateUserName") + private String updateUserName; + + @TableField("StoreNo") + private Integer storeNo; + + @TableField("StoreName") + private String storeName; + + @TableField("StoreMark") + private String storeMark; + + @TableField("reserve1") + private Integer reserve1; + + @TableField("reserve2") + private String reserve2; + + @TableField("ProjectId") + private Long projectId; + + @TableField("CustomerId") + private Integer customerId; +} diff --git a/src/main/java/com/niuan/erp/module/warehouse/entity/WarehouseItem.java b/src/main/java/com/niuan/erp/module/warehouse/entity/WarehouseItem.java new file mode 100644 index 0000000..7c1a1d8 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/warehouse/entity/WarehouseItem.java @@ -0,0 +1,110 @@ +package com.niuan.erp.module.warehouse.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *

+ * + *

+ * + * @author + * @since 2026-02-12 + */ +@Getter +@Setter +@ToString +@TableName("product") +public class WarehouseItem implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "Id", type = IdType.AUTO) + private Long id; + + @TableField("Status") + private Integer status; + + @TableField("CreateDate") + private LocalDateTime createDate; + + @TableField("CreateUserId") + private Long createUserId; + + @TableField("CreateUserName") + private String createUserName; + + @TableField("UpdateDate") + private LocalDateTime updateDate; + + @TableField("UpdateUserId") + private Long updateUserId; + + @TableField("UpdateUserName") + private String updateUserName; + + @TableField("PartNumber") + private String partNumber; + + @TableField("ProductType") + private String productType; + + @TableField("ProductSpecs") + private String productSpecs; + + @TableField("ProductBrand") + private String productBrand; + + @TableField("ProductPacking") + private Integer productPacking; + + @TableField("ProductPackUnit") + private String productPackUnit; + + @TableField("ProductPackSize") + private String productPackSize; + + @TableField("ProductPrice") + private Double productPrice; + + @TableField("ProductStockTotal") + private Integer productStockTotal; + + @TableField("VdName") + private String vdName; + + @TableField("VendorCode1") + private Integer vendorCode1; + + @TableField("VendorCode2") + private Integer vendorCode2; + + @TableField("VendorCode3") + private Integer vendorCode3; + + @TableField("ManufactureSpec") + private Integer manufactureSpec; + + @TableField("ProductMark") + private String productMark; + + @TableField("reserve1") + private Integer reserve1; + + @TableField("reserve2") + private String reserve2; + + @TableField("ProductOccupyTotal") + private Integer productOccupyTotal; + + @TableField("CustomerId") + private Integer customerId; +} diff --git a/src/main/java/com/niuan/erp/module/warehouse/mapper/InventoryCountItemMapper.java b/src/main/java/com/niuan/erp/module/warehouse/mapper/InventoryCountItemMapper.java new file mode 100644 index 0000000..05705a9 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/warehouse/mapper/InventoryCountItemMapper.java @@ -0,0 +1,16 @@ +package com.niuan.erp.module.warehouse.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.niuan.erp.module.warehouse.entity.InventoryCountItem; + +/** + *

+ * Mapper 接口 + *

+ * + * @author + * @since 2026-02-12 + */ +public interface InventoryCountItemMapper extends BaseMapper { + +} diff --git a/src/main/java/com/niuan/erp/module/warehouse/mapper/StockMapper.java b/src/main/java/com/niuan/erp/module/warehouse/mapper/StockMapper.java new file mode 100644 index 0000000..3fb60f2 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/warehouse/mapper/StockMapper.java @@ -0,0 +1,16 @@ +package com.niuan.erp.module.warehouse.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.niuan.erp.module.warehouse.entity.Stock; + +/** + *

+ * Mapper 接口 + *

+ * + * @author + * @since 2026-02-12 + */ +public interface StockMapper extends BaseMapper { + +} diff --git a/src/main/java/com/niuan/erp/module/warehouse/mapper/WarehouseItemMapper.java b/src/main/java/com/niuan/erp/module/warehouse/mapper/WarehouseItemMapper.java new file mode 100644 index 0000000..5beaeb5 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/warehouse/mapper/WarehouseItemMapper.java @@ -0,0 +1,16 @@ +package com.niuan.erp.module.warehouse.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.niuan.erp.module.warehouse.entity.WarehouseItem; + +/** + *

+ * Mapper 接口 + *

+ * + * @author + * @since 2026-02-12 + */ +public interface WarehouseItemMapper extends BaseMapper { + +} diff --git a/src/main/java/com/niuan/erp/module/warehouse/mapper/WarehouseMapper.java b/src/main/java/com/niuan/erp/module/warehouse/mapper/WarehouseMapper.java new file mode 100644 index 0000000..ea985cc --- /dev/null +++ b/src/main/java/com/niuan/erp/module/warehouse/mapper/WarehouseMapper.java @@ -0,0 +1,16 @@ +package com.niuan.erp.module.warehouse.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.niuan.erp.module.warehouse.entity.Warehouse; + +/** + *

+ * Mapper 接口 + *

+ * + * @author + * @since 2026-02-12 + */ +public interface WarehouseMapper extends BaseMapper { + +} diff --git a/src/main/java/com/niuan/erp/module/warehouse/service/InventoryCountItemService.java b/src/main/java/com/niuan/erp/module/warehouse/service/InventoryCountItemService.java new file mode 100644 index 0000000..3795fa6 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/warehouse/service/InventoryCountItemService.java @@ -0,0 +1,23 @@ +package com.niuan.erp.module.warehouse.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.module.warehouse.controller.dto.InventoryCountItemDto; +import com.niuan.erp.module.warehouse.entity.InventoryCountItem; + +import java.util.List; + +public interface InventoryCountItemService { + + IPage getInventoryCountItemPage(BasePageReqParams pageParams, LambdaQueryWrapper wrapper); + + void addInventoryCountItem(InventoryCountItemDto dto); + + void updateInventoryCountItem(InventoryCountItemDto dto); + + void deleteInventoryCountItem(long id); + + void deleteBatch(List ids); + +} diff --git a/src/main/java/com/niuan/erp/module/warehouse/service/InventoryCountService.java b/src/main/java/com/niuan/erp/module/warehouse/service/InventoryCountService.java new file mode 100644 index 0000000..1f4c61d --- /dev/null +++ b/src/main/java/com/niuan/erp/module/warehouse/service/InventoryCountService.java @@ -0,0 +1,23 @@ +package com.niuan.erp.module.warehouse.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.module.common.entity.Document; +import com.niuan.erp.module.warehouse.controller.dto.InventoryCountDto; + +import java.util.List; + +public interface InventoryCountService { + + IPage getInventoryCountPage(BasePageReqParams pageParams, LambdaQueryWrapper wrapper); + + void addInventoryCount(InventoryCountDto dto); + + void updateInventoryCount(InventoryCountDto dto); + + void deleteInventoryCount(long id); + + void deleteBatch(List ids); + +} diff --git a/src/main/java/com/niuan/erp/module/warehouse/service/StockByBrandService.java b/src/main/java/com/niuan/erp/module/warehouse/service/StockByBrandService.java new file mode 100644 index 0000000..00cddb7 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/warehouse/service/StockByBrandService.java @@ -0,0 +1,23 @@ +package com.niuan.erp.module.warehouse.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.module.warehouse.controller.dto.StockByBrandDto; +import com.niuan.erp.module.warehouse.entity.Stock; + +import java.util.List; + +public interface StockByBrandService { + + IPage getStockByBrandPage(BasePageReqParams pageParams, LambdaQueryWrapper wrapper); + + void addStockByBrand(StockByBrandDto dto); + + void updateStockByBrand(StockByBrandDto dto); + + void deleteStockByBrand(long id); + + void deleteBatch(List ids); + +} diff --git a/src/main/java/com/niuan/erp/module/warehouse/service/StockByTypeService.java b/src/main/java/com/niuan/erp/module/warehouse/service/StockByTypeService.java new file mode 100644 index 0000000..e79784d --- /dev/null +++ b/src/main/java/com/niuan/erp/module/warehouse/service/StockByTypeService.java @@ -0,0 +1,23 @@ +package com.niuan.erp.module.warehouse.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.module.warehouse.controller.dto.StockByTypeDto; +import com.niuan.erp.module.warehouse.entity.Stock; + +import java.util.List; + +public interface StockByTypeService { + + IPage getStockByTypePage(BasePageReqParams pageParams, LambdaQueryWrapper wrapper); + + void addStockByType(StockByTypeDto dto); + + void updateStockByType(StockByTypeDto dto); + + void deleteStockByType(long id); + + void deleteBatch(List ids); + +} diff --git a/src/main/java/com/niuan/erp/module/warehouse/service/StockService.java b/src/main/java/com/niuan/erp/module/warehouse/service/StockService.java new file mode 100644 index 0000000..1b2603a --- /dev/null +++ b/src/main/java/com/niuan/erp/module/warehouse/service/StockService.java @@ -0,0 +1,23 @@ +package com.niuan.erp.module.warehouse.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.module.warehouse.controller.dto.StockDto; +import com.niuan.erp.module.warehouse.entity.Stock; + +import java.util.List; + +public interface StockService { + + IPage getStockPage(BasePageReqParams pageParams, LambdaQueryWrapper wrapper); + + void addStock(StockDto dto); + + void updateStock(StockDto dto); + + void deleteStock(long id); + + void deleteBatch(List ids); + +} diff --git a/src/main/java/com/niuan/erp/module/warehouse/service/StockTransferOrderService.java b/src/main/java/com/niuan/erp/module/warehouse/service/StockTransferOrderService.java new file mode 100644 index 0000000..ddd3513 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/warehouse/service/StockTransferOrderService.java @@ -0,0 +1,23 @@ +package com.niuan.erp.module.warehouse.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.module.common.entity.Document; +import com.niuan.erp.module.warehouse.controller.dto.StockTransferOrderDto; + +import java.util.List; + +public interface StockTransferOrderService { + + IPage getStockTransferOrderPage(BasePageReqParams pageParams, LambdaQueryWrapper wrapper); + + void addStockTransferOrder(StockTransferOrderDto dto); + + void updateStockTransferOrder(StockTransferOrderDto dto); + + void deleteStockTransferOrder(long id); + + void deleteBatch(List ids); + +} diff --git a/src/main/java/com/niuan/erp/module/warehouse/service/WarehouseItemService.java b/src/main/java/com/niuan/erp/module/warehouse/service/WarehouseItemService.java new file mode 100644 index 0000000..9063447 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/warehouse/service/WarehouseItemService.java @@ -0,0 +1,23 @@ +package com.niuan.erp.module.warehouse.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.module.warehouse.controller.dto.WarehouseItemDto; +import com.niuan.erp.module.warehouse.entity.WarehouseItem; + +import java.util.List; + +public interface WarehouseItemService { + + IPage getWarehouseItemPage(BasePageReqParams pageParams, LambdaQueryWrapper wrapper); + + void addWarehouseItem(WarehouseItemDto dto); + + void updateWarehouseItem(WarehouseItemDto dto); + + void deleteWarehouseItem(long id); + + void deleteBatch(List ids); + +} diff --git a/src/main/java/com/niuan/erp/module/warehouse/service/WarehouseReceiptService.java b/src/main/java/com/niuan/erp/module/warehouse/service/WarehouseReceiptService.java new file mode 100644 index 0000000..575d8e6 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/warehouse/service/WarehouseReceiptService.java @@ -0,0 +1,23 @@ +package com.niuan.erp.module.warehouse.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.module.common.entity.Document; +import com.niuan.erp.module.warehouse.controller.dto.WarehouseReceiptDto; + +import java.util.List; + +public interface WarehouseReceiptService { + + IPage getWarehouseReceiptPage(BasePageReqParams pageParams, LambdaQueryWrapper wrapper); + + void addWarehouseReceipt(WarehouseReceiptDto dto); + + void updateWarehouseReceipt(WarehouseReceiptDto dto); + + void deleteWarehouseReceipt(long id); + + void deleteBatch(List ids); + +} diff --git a/src/main/java/com/niuan/erp/module/warehouse/service/WarehouseService.java b/src/main/java/com/niuan/erp/module/warehouse/service/WarehouseService.java new file mode 100644 index 0000000..b1f20b2 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/warehouse/service/WarehouseService.java @@ -0,0 +1,23 @@ +package com.niuan.erp.module.warehouse.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.module.warehouse.controller.dto.WarehouseDto; +import com.niuan.erp.module.warehouse.entity.Warehouse; + +import java.util.List; + +public interface WarehouseService { + + IPage getWarehousePage(BasePageReqParams pageParams, LambdaQueryWrapper wrapper); + + void addWarehouse(WarehouseDto dto); + + void updateWarehouse(WarehouseDto dto); + + void deleteWarehouse(long id); + + void deleteBatch(List ids); + +} diff --git a/src/main/java/com/niuan/erp/module/warehouse/service/impl/InventoryCountItemServiceImpl.java b/src/main/java/com/niuan/erp/module/warehouse/service/impl/InventoryCountItemServiceImpl.java new file mode 100644 index 0000000..d0172c8 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/warehouse/service/impl/InventoryCountItemServiceImpl.java @@ -0,0 +1,65 @@ +package com.niuan.erp.module.warehouse.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.utils.SecurityUtils; +import com.niuan.erp.module.warehouse.controller.dto.InventoryCountItemDto; +import com.niuan.erp.module.warehouse.converter.InventoryCountItemConverter; +import com.niuan.erp.module.warehouse.entity.InventoryCountItem; +import com.niuan.erp.module.warehouse.mapper.InventoryCountItemMapper; +import com.niuan.erp.module.warehouse.service.InventoryCountItemService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.util.List; + + +@Service +@Transactional +@RequiredArgsConstructor +public class InventoryCountItemServiceImpl extends ServiceImpl implements InventoryCountItemService { + + + private final InventoryCountItemConverter inventoryCountItemConverter; + + @Override + public IPage getInventoryCountItemPage(BasePageReqParams pageParams, LambdaQueryWrapper wrapper) { + IPage result = this.baseMapper.selectPage(new Page<>(pageParams.page(), pageParams.pageSize()), wrapper); + return result.convert(inventoryCountItemConverter::toDto); + } + + @Override + public void addInventoryCountItem(InventoryCountItemDto dto) { + InventoryCountItem entity = inventoryCountItemConverter.toEntity(dto); + entity.setCreateUserId(SecurityUtils.getUserId()); + entity.setCreateUserName(SecurityUtils.getUserName()); + entity.setCreateDate(LocalDateTime.now()); + entity.setStatus(0); + this.baseMapper.insert(entity); + } + + @Override + public void updateInventoryCountItem(InventoryCountItemDto dto) { + InventoryCountItem entity = inventoryCountItemConverter.toEntity(dto); + entity.setUpdateUserId(SecurityUtils.getUserId()); + entity.setUpdateUserName(SecurityUtils.getUserName()); + entity.setUpdateDate(LocalDateTime.now()); + this.baseMapper.updateById(entity); + } + + @Override + public void deleteInventoryCountItem(long id) { + this.baseMapper.deleteById(id); + } + + @Override + public void deleteBatch(List ids) { + this.baseMapper.deleteByIds(ids); + } + +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/warehouse/service/impl/InventoryCountServiceImpl.java b/src/main/java/com/niuan/erp/module/warehouse/service/impl/InventoryCountServiceImpl.java new file mode 100644 index 0000000..c365256 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/warehouse/service/impl/InventoryCountServiceImpl.java @@ -0,0 +1,65 @@ +package com.niuan.erp.module.warehouse.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.utils.SecurityUtils; +import com.niuan.erp.module.common.entity.Document; +import com.niuan.erp.module.common.mapper.DocumentMapper; +import com.niuan.erp.module.warehouse.controller.dto.InventoryCountDto; +import com.niuan.erp.module.warehouse.converter.InventoryCountConverter; +import com.niuan.erp.module.warehouse.service.InventoryCountService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.util.List; + + +@Service +@Transactional +@RequiredArgsConstructor +public class InventoryCountServiceImpl extends ServiceImpl implements InventoryCountService { + + + private final InventoryCountConverter inventoryCountConverter; + + @Override + public IPage getInventoryCountPage(BasePageReqParams pageParams, LambdaQueryWrapper wrapper) { + IPage result = this.baseMapper.selectPage(new Page<>(pageParams.page(), pageParams.pageSize()), wrapper); + return result.convert(inventoryCountConverter::toDto); + } + + @Override + public void addInventoryCount(InventoryCountDto dto) { + Document entity = inventoryCountConverter.toEntity(dto); + entity.setCreateUserId(SecurityUtils.getUserId()); + entity.setCreateUserName(SecurityUtils.getUserName()); + entity.setCreateDate(LocalDateTime.now()); + entity.setStatus(0); + this.baseMapper.insert(entity); + } + + @Override + public void updateInventoryCount(InventoryCountDto dto) { + Document entity = inventoryCountConverter.toEntity(dto); + entity.setUpdateUserId(SecurityUtils.getUserId()); + entity.setUpdateUserName(SecurityUtils.getUserName()); + entity.setUpdateDate(LocalDateTime.now()); + this.baseMapper.updateById(entity); + } + + @Override + public void deleteInventoryCount(long id) { + this.baseMapper.deleteById(id); + } + + @Override + public void deleteBatch(List ids) { + this.baseMapper.deleteByIds(ids); + } + +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/warehouse/service/impl/StockByBrandServiceImpl.java b/src/main/java/com/niuan/erp/module/warehouse/service/impl/StockByBrandServiceImpl.java new file mode 100644 index 0000000..b137af1 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/warehouse/service/impl/StockByBrandServiceImpl.java @@ -0,0 +1,65 @@ +package com.niuan.erp.module.warehouse.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.utils.SecurityUtils; +import com.niuan.erp.module.warehouse.controller.dto.StockByBrandDto; +import com.niuan.erp.module.warehouse.converter.StockByBrandConverter; +import com.niuan.erp.module.warehouse.entity.Stock; +import com.niuan.erp.module.warehouse.mapper.StockMapper; +import com.niuan.erp.module.warehouse.service.StockByBrandService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.util.List; + + +@Service +@Transactional +@RequiredArgsConstructor +public class StockByBrandServiceImpl extends ServiceImpl implements StockByBrandService { + + + private final StockByBrandConverter stockByBrandConverter; + + @Override + public IPage getStockByBrandPage(BasePageReqParams pageParams, LambdaQueryWrapper wrapper) { + IPage result = this.baseMapper.selectPage(new Page<>(pageParams.page(), pageParams.pageSize()), wrapper); + return result.convert(stockByBrandConverter::toDto); + } + + @Override + public void addStockByBrand(StockByBrandDto dto) { + Stock entity = stockByBrandConverter.toEntity(dto); + entity.setCreateUserId(SecurityUtils.getUserId()); + entity.setCreateUserName(SecurityUtils.getUserName()); + entity.setCreateDate(LocalDateTime.now()); + entity.setStatus(0); + this.baseMapper.insert(entity); + } + + @Override + public void updateStockByBrand(StockByBrandDto dto) { + Stock entity = stockByBrandConverter.toEntity(dto); + entity.setUpdateUserId(SecurityUtils.getUserId()); + entity.setUpdateUserName(SecurityUtils.getUserName()); + entity.setUpdateDate(LocalDateTime.now()); + this.baseMapper.updateById(entity); + } + + @Override + public void deleteStockByBrand(long id) { + this.baseMapper.deleteById(id); + } + + @Override + public void deleteBatch(List ids) { + this.baseMapper.deleteByIds(ids); + } + +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/warehouse/service/impl/StockByTypeServiceImpl.java b/src/main/java/com/niuan/erp/module/warehouse/service/impl/StockByTypeServiceImpl.java new file mode 100644 index 0000000..82ac795 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/warehouse/service/impl/StockByTypeServiceImpl.java @@ -0,0 +1,65 @@ +package com.niuan.erp.module.warehouse.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.utils.SecurityUtils; +import com.niuan.erp.module.warehouse.controller.dto.StockByTypeDto; +import com.niuan.erp.module.warehouse.converter.StockByTypeConverter; +import com.niuan.erp.module.warehouse.entity.Stock; +import com.niuan.erp.module.warehouse.mapper.StockMapper; +import com.niuan.erp.module.warehouse.service.StockByTypeService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.util.List; + + +@Service +@Transactional +@RequiredArgsConstructor +public class StockByTypeServiceImpl extends ServiceImpl implements StockByTypeService { + + + private final StockByTypeConverter stockByTypeConverter; + + @Override + public IPage getStockByTypePage(BasePageReqParams pageParams, LambdaQueryWrapper wrapper) { + IPage result = this.baseMapper.selectPage(new Page<>(pageParams.page(), pageParams.pageSize()), wrapper); + return result.convert(stockByTypeConverter::toDto); + } + + @Override + public void addStockByType(StockByTypeDto dto) { + Stock entity = stockByTypeConverter.toEntity(dto); + entity.setCreateUserId(SecurityUtils.getUserId()); + entity.setCreateUserName(SecurityUtils.getUserName()); + entity.setCreateDate(LocalDateTime.now()); + entity.setStatus(0); + this.baseMapper.insert(entity); + } + + @Override + public void updateStockByType(StockByTypeDto dto) { + Stock entity = stockByTypeConverter.toEntity(dto); + entity.setUpdateUserId(SecurityUtils.getUserId()); + entity.setUpdateUserName(SecurityUtils.getUserName()); + entity.setUpdateDate(LocalDateTime.now()); + this.baseMapper.updateById(entity); + } + + @Override + public void deleteStockByType(long id) { + this.baseMapper.deleteById(id); + } + + @Override + public void deleteBatch(List ids) { + this.baseMapper.deleteByIds(ids); + } + +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/warehouse/service/impl/StockServiceImpl.java b/src/main/java/com/niuan/erp/module/warehouse/service/impl/StockServiceImpl.java new file mode 100644 index 0000000..d96b2e8 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/warehouse/service/impl/StockServiceImpl.java @@ -0,0 +1,65 @@ +package com.niuan.erp.module.warehouse.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.utils.SecurityUtils; +import com.niuan.erp.module.warehouse.controller.dto.StockDto; +import com.niuan.erp.module.warehouse.converter.StockConverter; +import com.niuan.erp.module.warehouse.entity.Stock; +import com.niuan.erp.module.warehouse.mapper.StockMapper; +import com.niuan.erp.module.warehouse.service.StockService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.util.List; + + +@Service +@Transactional +@RequiredArgsConstructor +public class StockServiceImpl extends ServiceImpl implements StockService { + + + private final StockConverter stockConverter; + + @Override + public IPage getStockPage(BasePageReqParams pageParams, LambdaQueryWrapper wrapper) { + IPage result = this.baseMapper.selectPage(new Page<>(pageParams.page(), pageParams.pageSize()), wrapper); + return result.convert(stockConverter::toDto); + } + + @Override + public void addStock(StockDto dto) { + Stock entity = stockConverter.toEntity(dto); + entity.setCreateUserId(SecurityUtils.getUserId()); + entity.setCreateUserName(SecurityUtils.getUserName()); + entity.setCreateDate(LocalDateTime.now()); + entity.setStatus(0); + this.baseMapper.insert(entity); + } + + @Override + public void updateStock(StockDto dto) { + Stock entity = stockConverter.toEntity(dto); + entity.setUpdateUserId(SecurityUtils.getUserId()); + entity.setUpdateUserName(SecurityUtils.getUserName()); + entity.setUpdateDate(LocalDateTime.now()); + this.baseMapper.updateById(entity); + } + + @Override + public void deleteStock(long id) { + this.baseMapper.deleteById(id); + } + + @Override + public void deleteBatch(List ids) { + this.baseMapper.deleteByIds(ids); + } + +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/warehouse/service/impl/StockTransferOrderServiceImpl.java b/src/main/java/com/niuan/erp/module/warehouse/service/impl/StockTransferOrderServiceImpl.java new file mode 100644 index 0000000..79564c1 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/warehouse/service/impl/StockTransferOrderServiceImpl.java @@ -0,0 +1,65 @@ +package com.niuan.erp.module.warehouse.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.utils.SecurityUtils; +import com.niuan.erp.module.common.entity.Document; +import com.niuan.erp.module.common.mapper.DocumentMapper; +import com.niuan.erp.module.warehouse.controller.dto.StockTransferOrderDto; +import com.niuan.erp.module.warehouse.converter.StockTransferOrderConverter; +import com.niuan.erp.module.warehouse.service.StockTransferOrderService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.util.List; + + +@Service +@Transactional +@RequiredArgsConstructor +public class StockTransferOrderServiceImpl extends ServiceImpl implements StockTransferOrderService { + + + private final StockTransferOrderConverter stockTransferOrderConverter; + + @Override + public IPage getStockTransferOrderPage(BasePageReqParams pageParams, LambdaQueryWrapper wrapper) { + IPage result = this.baseMapper.selectPage(new Page<>(pageParams.page(), pageParams.pageSize()), wrapper); + return result.convert(stockTransferOrderConverter::toDto); + } + + @Override + public void addStockTransferOrder(StockTransferOrderDto dto) { + Document entity = stockTransferOrderConverter.toEntity(dto); + entity.setCreateUserId(SecurityUtils.getUserId()); + entity.setCreateUserName(SecurityUtils.getUserName()); + entity.setCreateDate(LocalDateTime.now()); + entity.setStatus(0); + this.baseMapper.insert(entity); + } + + @Override + public void updateStockTransferOrder(StockTransferOrderDto dto) { + Document entity = stockTransferOrderConverter.toEntity(dto); + entity.setUpdateUserId(SecurityUtils.getUserId()); + entity.setUpdateUserName(SecurityUtils.getUserName()); + entity.setUpdateDate(LocalDateTime.now()); + this.baseMapper.updateById(entity); + } + + @Override + public void deleteStockTransferOrder(long id) { + this.baseMapper.deleteById(id); + } + + @Override + public void deleteBatch(List ids) { + this.baseMapper.deleteByIds(ids); + } + +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/warehouse/service/impl/WarehouseItemServiceImpl.java b/src/main/java/com/niuan/erp/module/warehouse/service/impl/WarehouseItemServiceImpl.java new file mode 100644 index 0000000..2bd5542 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/warehouse/service/impl/WarehouseItemServiceImpl.java @@ -0,0 +1,65 @@ +package com.niuan.erp.module.warehouse.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.utils.SecurityUtils; +import com.niuan.erp.module.warehouse.controller.dto.WarehouseItemDto; +import com.niuan.erp.module.warehouse.converter.WarehouseItemConverter; +import com.niuan.erp.module.warehouse.entity.WarehouseItem; +import com.niuan.erp.module.warehouse.mapper.WarehouseItemMapper; +import com.niuan.erp.module.warehouse.service.WarehouseItemService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.util.List; + + +@Service +@Transactional +@RequiredArgsConstructor +public class WarehouseItemServiceImpl extends ServiceImpl implements WarehouseItemService { + + + private final WarehouseItemConverter warehouseItemConverter; + + @Override + public IPage getWarehouseItemPage(BasePageReqParams pageParams, LambdaQueryWrapper wrapper) { + IPage result = this.baseMapper.selectPage(new Page<>(pageParams.page(), pageParams.pageSize()), wrapper); + return result.convert(warehouseItemConverter::toDto); + } + + @Override + public void addWarehouseItem(WarehouseItemDto dto) { + WarehouseItem entity = warehouseItemConverter.toEntity(dto); + entity.setCreateUserId(SecurityUtils.getUserId()); + entity.setCreateUserName(SecurityUtils.getUserName()); + entity.setCreateDate(LocalDateTime.now()); + entity.setStatus(0); + this.baseMapper.insert(entity); + } + + @Override + public void updateWarehouseItem(WarehouseItemDto dto) { + WarehouseItem entity = warehouseItemConverter.toEntity(dto); + entity.setUpdateUserId(SecurityUtils.getUserId()); + entity.setUpdateUserName(SecurityUtils.getUserName()); + entity.setUpdateDate(LocalDateTime.now()); + this.baseMapper.updateById(entity); + } + + @Override + public void deleteWarehouseItem(long id) { + this.baseMapper.deleteById(id); + } + + @Override + public void deleteBatch(List ids) { + this.baseMapper.deleteByIds(ids); + } + +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/warehouse/service/impl/WarehouseReceiptServiceImpl.java b/src/main/java/com/niuan/erp/module/warehouse/service/impl/WarehouseReceiptServiceImpl.java new file mode 100644 index 0000000..610e41d --- /dev/null +++ b/src/main/java/com/niuan/erp/module/warehouse/service/impl/WarehouseReceiptServiceImpl.java @@ -0,0 +1,65 @@ +package com.niuan.erp.module.warehouse.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.utils.SecurityUtils; +import com.niuan.erp.module.common.entity.Document; +import com.niuan.erp.module.common.mapper.DocumentMapper; +import com.niuan.erp.module.warehouse.controller.dto.WarehouseReceiptDto; +import com.niuan.erp.module.warehouse.converter.WarehouseReceiptConverter; +import com.niuan.erp.module.warehouse.service.WarehouseReceiptService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.util.List; + + +@Service +@Transactional +@RequiredArgsConstructor +public class WarehouseReceiptServiceImpl extends ServiceImpl implements WarehouseReceiptService { + + + private final WarehouseReceiptConverter warehouseReceiptConverter; + + @Override + public IPage getWarehouseReceiptPage(BasePageReqParams pageParams, LambdaQueryWrapper wrapper) { + IPage result = this.baseMapper.selectPage(new Page<>(pageParams.page(), pageParams.pageSize()), wrapper); + return result.convert(warehouseReceiptConverter::toDto); + } + + @Override + public void addWarehouseReceipt(WarehouseReceiptDto dto) { + Document entity = warehouseReceiptConverter.toEntity(dto); + entity.setCreateUserId(SecurityUtils.getUserId()); + entity.setCreateUserName(SecurityUtils.getUserName()); + entity.setCreateDate(LocalDateTime.now()); + entity.setStatus(0); + this.baseMapper.insert(entity); + } + + @Override + public void updateWarehouseReceipt(WarehouseReceiptDto dto) { + Document entity = warehouseReceiptConverter.toEntity(dto); + entity.setUpdateUserId(SecurityUtils.getUserId()); + entity.setUpdateUserName(SecurityUtils.getUserName()); + entity.setUpdateDate(LocalDateTime.now()); + this.baseMapper.updateById(entity); + } + + @Override + public void deleteWarehouseReceipt(long id) { + this.baseMapper.deleteById(id); + } + + @Override + public void deleteBatch(List ids) { + this.baseMapper.deleteByIds(ids); + } + +} \ No newline at end of file diff --git a/src/main/java/com/niuan/erp/module/warehouse/service/impl/WarehouseServiceImpl.java b/src/main/java/com/niuan/erp/module/warehouse/service/impl/WarehouseServiceImpl.java new file mode 100644 index 0000000..582ed44 --- /dev/null +++ b/src/main/java/com/niuan/erp/module/warehouse/service/impl/WarehouseServiceImpl.java @@ -0,0 +1,65 @@ +package com.niuan.erp.module.warehouse.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.utils.SecurityUtils; +import com.niuan.erp.module.warehouse.controller.dto.WarehouseDto; +import com.niuan.erp.module.warehouse.converter.WarehouseConverter; +import com.niuan.erp.module.warehouse.entity.Warehouse; +import com.niuan.erp.module.warehouse.mapper.WarehouseMapper; +import com.niuan.erp.module.warehouse.service.WarehouseService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.util.List; + + +@Service +@Transactional +@RequiredArgsConstructor +public class WarehouseServiceImpl extends ServiceImpl implements WarehouseService { + + + private final WarehouseConverter warehouseConverter; + + @Override + public IPage getWarehousePage(BasePageReqParams pageParams, LambdaQueryWrapper wrapper) { + IPage result = this.baseMapper.selectPage(new Page<>(pageParams.page(), pageParams.pageSize()), wrapper); + return result.convert(warehouseConverter::toDto); + } + + @Override + public void addWarehouse(WarehouseDto dto) { + Warehouse entity = warehouseConverter.toEntity(dto); + entity.setCreateUserId(SecurityUtils.getUserId()); + entity.setCreateUserName(SecurityUtils.getUserName()); + entity.setCreateDate(LocalDateTime.now()); + entity.setStatus(0); + this.baseMapper.insert(entity); + } + + @Override + public void updateWarehouse(WarehouseDto dto) { + Warehouse entity = warehouseConverter.toEntity(dto); + entity.setUpdateUserId(SecurityUtils.getUserId()); + entity.setUpdateUserName(SecurityUtils.getUserName()); + entity.setUpdateDate(LocalDateTime.now()); + this.baseMapper.updateById(entity); + } + + @Override + public void deleteWarehouse(long id) { + this.baseMapper.deleteById(id); + } + + @Override + public void deleteBatch(List ids) { + this.baseMapper.deleteByIds(ids); + } + +} \ No newline at end of file diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml new file mode 100644 index 0000000..0eb8883 --- /dev/null +++ b/src/main/resources/application-dev.yml @@ -0,0 +1,17 @@ +# 日志设置 +logging: + level: + web: debug + sql: debug + +springdoc: + swagger-ui: + path: /swagger-ui.html + tags-sorter: alpha + operations-sorter: alpha + api-docs: + path: /v3/api-docs + group-configs: + - group: 'default' + paths-to-match: '/**' + packages-to-scan: com.niuan.erp.module.sys.controller \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml new file mode 100644 index 0000000..3bd4db1 --- /dev/null +++ b/src/main/resources/application.yml @@ -0,0 +1,23 @@ + +spring: + profiles: + active: dev + messages: + basename: i18n/messages + encoding: UTF-8 + fallback-to-system-locale: false + datasource: + url: jdbc:mysql://localhost:3306/ai + username: steven + password: 781203 + +# mybatis 设置 +mybatis-plus: + type-aliases-package: com.niuan.erp.module.*.entity + configuration: + map-underscore-to-camel-case: false + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + +erp: + encrypt: + md5-salt: JiShiPai diff --git a/src/main/resources/i18n/messages.properties b/src/main/resources/i18n/messages.properties new file mode 100644 index 0000000..6bbb461 --- /dev/null +++ b/src/main/resources/i18n/messages.properties @@ -0,0 +1,30 @@ +result.success=请求成功 +result.error=请求失败 + +auth.unLogin=未登录 +auth.userDetailsError=用户信息错误 + +validation.common.status.notNull=状态值不能为空 +validation.common.status.valueError=状态值只能为 0 或 1 +validation.common.status.idNull=ID 不能为空 +validation.common.pageParams.page.notNull=页数不能为空 +validation.common.pageParams.pageSize.notNull=页数不能为空 +validation.common.pageParams.page.min=页数不能小于0 +validation.common.pageParams.pageSize.min=页数不能小于0 + +sys.operationType.codeNotExists=编号不存在 + +# ==========> 类型 + +loginName.notNull=登录名称不能为空 +password.notNull=密码不能为空 + + +# ==========> 参数错误信息 +httpMessage.notNull=参数不能为空 +validated.error=参数错误 + +#jakarta.validation.constraints.NotNull.message=“{0}”不能为空 +#jakarta.validation.constraints.NotBlank.message=“{0}”不能为空 +#jakarta.validation.constraints.Size.message=“{0}”长度必须在{min}到{max}之间 +#jakarta.validation.constraints.Pattern.message=“{0}”格式不正确 \ No newline at end of file diff --git a/src/main/resources/i18n/messages_en_US.properties b/src/main/resources/i18n/messages_en_US.properties new file mode 100644 index 0000000..e69de29 diff --git a/src/main/resources/i18n/messages_zh_CN.properties b/src/main/resources/i18n/messages_zh_CN.properties new file mode 100644 index 0000000..294a39c --- /dev/null +++ b/src/main/resources/i18n/messages_zh_CN.properties @@ -0,0 +1,2 @@ +result.success=请求成功 +result.error=请求失败 \ No newline at end of file diff --git a/src/main/resources/mapper/common/DocumentMapper.xml b/src/main/resources/mapper/common/DocumentMapper.xml new file mode 100644 index 0000000..2acb5a0 --- /dev/null +++ b/src/main/resources/mapper/common/DocumentMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/mapper/common/DocumentMaterialMapper.xml b/src/main/resources/mapper/common/DocumentMaterialMapper.xml new file mode 100644 index 0000000..a19c63c --- /dev/null +++ b/src/main/resources/mapper/common/DocumentMaterialMapper.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/mapper/common/QtCodeMapper.xml b/src/main/resources/mapper/common/QtCodeMapper.xml new file mode 100644 index 0000000..bd36425 --- /dev/null +++ b/src/main/resources/mapper/common/QtCodeMapper.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/src/main/resources/mapper/production/BomItemMapper.xml b/src/main/resources/mapper/production/BomItemMapper.xml new file mode 100644 index 0000000..7c47151 --- /dev/null +++ b/src/main/resources/mapper/production/BomItemMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/mapper/production/BomMapper.xml b/src/main/resources/mapper/production/BomMapper.xml new file mode 100644 index 0000000..30823e6 --- /dev/null +++ b/src/main/resources/mapper/production/BomMapper.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/mapper/production/ProductionPlanMapper.xml b/src/main/resources/mapper/production/ProductionPlanMapper.xml new file mode 100644 index 0000000..1775945 --- /dev/null +++ b/src/main/resources/mapper/production/ProductionPlanMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/mapper/purchase/PurchaseOrderItemMapper.xml b/src/main/resources/mapper/purchase/PurchaseOrderItemMapper.xml new file mode 100644 index 0000000..a71d81d --- /dev/null +++ b/src/main/resources/mapper/purchase/PurchaseOrderItemMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/mapper/purchase/PurchasePlanItemMapper.xml b/src/main/resources/mapper/purchase/PurchasePlanItemMapper.xml new file mode 100644 index 0000000..dc65dc7 --- /dev/null +++ b/src/main/resources/mapper/purchase/PurchasePlanItemMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/mapper/purchase/PurchasePlanMapper.xml b/src/main/resources/mapper/purchase/PurchasePlanMapper.xml new file mode 100644 index 0000000..3be3db7 --- /dev/null +++ b/src/main/resources/mapper/purchase/PurchasePlanMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/mapper/sale/DeviceMapper.xml b/src/main/resources/mapper/sale/DeviceMapper.xml new file mode 100644 index 0000000..30ceec6 --- /dev/null +++ b/src/main/resources/mapper/sale/DeviceMapper.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/mapper/sale/RepairRecordMapper.xml b/src/main/resources/mapper/sale/RepairRecordMapper.xml new file mode 100644 index 0000000..9dfbb21 --- /dev/null +++ b/src/main/resources/mapper/sale/RepairRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/mapper/sale/SaleOrderItemMapper.xml b/src/main/resources/mapper/sale/SaleOrderItemMapper.xml new file mode 100644 index 0000000..db24fc3 --- /dev/null +++ b/src/main/resources/mapper/sale/SaleOrderItemMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/mapper/sys/KeyAccountMapper.xml b/src/main/resources/mapper/sys/KeyAccountMapper.xml new file mode 100644 index 0000000..df735a0 --- /dev/null +++ b/src/main/resources/mapper/sys/KeyAccountMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/mapper/sys/StoreMapper.xml b/src/main/resources/mapper/sys/StoreMapper.xml new file mode 100644 index 0000000..256e3b9 --- /dev/null +++ b/src/main/resources/mapper/sys/StoreMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/mapper/sys/SysChannelMapper.xml b/src/main/resources/mapper/sys/SysChannelMapper.xml new file mode 100644 index 0000000..e2ae008 --- /dev/null +++ b/src/main/resources/mapper/sys/SysChannelMapper.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/sys/SysRecordMapper.xml b/src/main/resources/mapper/sys/SysRecordMapper.xml new file mode 100644 index 0000000..ab2b089 --- /dev/null +++ b/src/main/resources/mapper/sys/SysRecordMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/mapper/sys/SysRoleMapper.xml b/src/main/resources/mapper/sys/SysRoleMapper.xml new file mode 100644 index 0000000..d1e0c18 --- /dev/null +++ b/src/main/resources/mapper/sys/SysRoleMapper.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/sys/VendorMapper.xml b/src/main/resources/mapper/sys/VendorMapper.xml new file mode 100644 index 0000000..88235ae --- /dev/null +++ b/src/main/resources/mapper/sys/VendorMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/mapper/warehouse/InventoryCountItemMapper.xml b/src/main/resources/mapper/warehouse/InventoryCountItemMapper.xml new file mode 100644 index 0000000..b695eb3 --- /dev/null +++ b/src/main/resources/mapper/warehouse/InventoryCountItemMapper.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/mapper/warehouse/StockMapper.xml b/src/main/resources/mapper/warehouse/StockMapper.xml new file mode 100644 index 0000000..ba8c13e --- /dev/null +++ b/src/main/resources/mapper/warehouse/StockMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/mapper/warehouse/StockTransferOrderMapper.xml b/src/main/resources/mapper/warehouse/StockTransferOrderMapper.xml new file mode 100644 index 0000000..e76f564 --- /dev/null +++ b/src/main/resources/mapper/warehouse/StockTransferOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/mapper/warehouse/WarehouseItemMapper.xml b/src/main/resources/mapper/warehouse/WarehouseItemMapper.xml new file mode 100644 index 0000000..5c37c9a --- /dev/null +++ b/src/main/resources/mapper/warehouse/WarehouseItemMapper.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/mapper/warehouse/WarehouseMapper.xml b/src/main/resources/mapper/warehouse/WarehouseMapper.xml new file mode 100644 index 0000000..adb5ab6 --- /dev/null +++ b/src/main/resources/mapper/warehouse/WarehouseMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/sql/dev/id.sql b/src/main/resources/sql/dev/id.sql new file mode 100644 index 0000000..da1c92d --- /dev/null +++ b/src/main/resources/sql/dev/id.sql @@ -0,0 +1,10 @@ + +ALTER TABLE yy_sysrole ADD PRIMARY KEY (id); +ALTER TABLE yy_sysrole MODIFY id BIGINT NOT NULL AUTO_INCREMENT; + + +ALTER TABLE yy_sysrolechannelmapping ADD temp_id BIGINT AUTO_INCREMENT PRIMARY KEY FIRST; +UPDATE yy_sysrolechannelmapping SET id = temp_id; +ALTER TABLE yy_sysrolechannelmapping DROP temp_id; +ALTER TABLE yy_sysrolechannelmapping ADD PRIMARY KEY (id); +ALTER TABLE yy_sysrolechannelmapping MODIFY id BIGINT NOT NULL AUTO_INCREMENT; \ No newline at end of file diff --git a/src/test/java/com/niuan/erp/ErpApplicationTests.java b/src/test/java/com/niuan/erp/ErpApplicationTests.java new file mode 100644 index 0000000..695f0c8 --- /dev/null +++ b/src/test/java/com/niuan/erp/ErpApplicationTests.java @@ -0,0 +1,13 @@ +package com.niuan.erp; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class ErpApplicationTests { + + @Test + void contextLoads() { + } + +}