From 1373947c10ea2cd4cdde8a7ce3617820c6a5a384 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Mon, 7 Jul 2025 17:33:16 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E5=8E=BB=E6=8E=89=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E9=93=BE=E6=B6=89=E5=8F=8A=E5=86=85=E5=AE=B9=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 +- .../member/base/IMemberLevelServiceApi.java | 26 - bd-api/bd-api-scm/pom.xml | 32 - .../product/IBdProductBasSpecsServiceApi.java | 41 - .../scm/product/IProductBasServiceApi.java | 44 - .../hzs/scm/product/dto/ProductBasDTO.java | 90 -- .../com/hzs/scm/pub/IScmBillServiceApi.java | 40 - .../java/com/hzs/scm/pub/dto/BillDTO.java | 108 -- .../java/com/hzs/scm/pub/dto/BillItemDTO.java | 158 --- .../java/com/hzs/scm/pub/dto/DeliverDTO.java | 35 - .../com/hzs/system/sys/IBusinessLogApi.java | 6 +- .../java/com/hzs/system/sys/ICubasdocApi.java | 8 +- .../hzs/system/sys/IMenuColumnServiceApi.java | 6 +- .../system/sys/IOperationLogServiceApi.java | 6 +- .../hzs/system/sys/dto/BusinessLogDTO.java | 6 +- .../com/hzs/system/sys/dto/CubasdocDTO.java | 18 +- .../hzs/system/sys/dto/ThaliConfigDTO.java | 46 - .../hzs/system/sys/dto/UserAuthorityDTO.java | 6 +- .../third/cabin/ICabinThirdServiceApi.java | 41 - .../third/cabin/dto/CabinDeviceOpenDTO.java | 35 - .../com/hzs/third/cabin/dto/CabinInfoDTO.java | 82 -- .../hzs/third/cabin/dto/CabinPackageDTO.java | 46 - .../com/hzs/third/pay/IOnlineServiceApi.java | 33 - bd-api/pom.xml | 1 - .../bonus/base/param/MemberAddressParam.java | 6 +- .../provider/MemberLevelServiceProvider.java | 29 - .../detail/service/ICuMemberLevelService.java | 9 - .../impl/CuMemberLevelServiceImpl.java | 10 - .../report/member/vo/MemberPerkQueryVO.java | 17 +- bd-business/bd-business-sale/pom.xml | 5 - .../service/impl/ActivityServiceImpl.java | 2 +- .../impl/SaDeliverBusinessServiceImpl.java | 21 - .../api/ApiOthSaOrderController.java | 6 - .../api/ApiRegSaOrderController.java | 6 - .../mapper/SaOrderRelationItemsMapper.java | 16 - .../order/mapper/SaOrderRelationMapper.java | 24 - .../com/hzs/sale/order/param/OrderParam.java | 6 - .../service/ISaOrderRelationItemsService.java | 16 - .../service/ISaOrderRelationService.java | 24 - .../sale/order/service/ISaOrderService.java | 23 - .../impl/OrderBusinessServiceImpl.java | 9 - .../impl/SaOrderRelationItemsServiceImpl.java | 20 - .../impl/SaOrderRelationServiceImpl.java | 24 - .../service/impl/SaOrderServiceImpl.java | 1103 +---------------- .../manage/BdProductController.java | 41 - .../impl/BdProductSpecsServiceImpl.java | 6 +- .../src/main/resources/bootstrap.yml | 2 +- .../sale/order/SaOrderRelationItemsMapper.xml | 18 - .../sale/order/SaOrderRelationMapper.xml | 24 - bd-business/bd-business-scm/pom.xml | 71 -- .../src/main/java/com/hzs/ScmApplication.java | 25 - .../margin/controller/ThMarginController.java | 117 -- .../ground/margin/mapper/ThMarginMapper.java | 25 - .../margin/service/IThMarginService.java | 34 - .../service/impl/ThMarginServiceImpl.java | 57 - .../com/hzs/ground/margin/vo/ThMarginVO.java | 205 --- .../manage/SupplierOrderController.java | 221 ---- .../order/mapper/SaOrderSettleMapper.java | 36 - .../order/mapper/SupplierOrderMapper.java | 28 - .../ground/order/param/OrderItemsParam.java | 35 - .../ground/order/param/OrderQueryParam.java | 87 -- .../order/service/ISaOrderSettleService.java | 44 - .../order/service/ISupplierOrderService.java | 37 - .../impl/SaOrderSettleServiceImpl.java | 105 -- .../impl/SupplierOrderServiceImpl.java | 61 - .../hzs/ground/order/vo/SaOrderSettleVo.java | 69 -- .../manage/SupplierPostageController.java | 124 -- .../mapper/ThSupplierPostageMapper.java | 45 - .../postage/param/SupplierPostageParam.java | 50 - .../service/IThSupplierPostageService.java | 44 - .../impl/ThSupplierPostageServiceImpl.java | 46 - .../ground/postage/vo/SupplierPostageVo.java | 62 - .../controller/api/ApiProductController.java | 35 - .../manage/BdProductBasController.java | 415 ------- .../manage/ThProductController.java | 122 -- .../product/mapper/BdProductBasMapper.java | 98 -- .../mapper/BdProductBasSpecsMapper.java | 31 - .../product/mapper/ThApprovalLogMapper.java | 11 - .../product/mapper/ThProductExtendMapper.java | 11 - .../product/mapper/ThProductMapper.java | 26 - .../product/mapper/ThProductSpecsMapper.java | 12 - .../product/param/ProductBasParams.java | 148 --- .../product/param/ProductInfoParam.java | 268 ---- .../IBdProductBasSpecsServiceProvider.java | 53 - .../provider/IProductBasServiceProvider.java | 82 -- .../product/service/IBdProductBasService.java | 130 -- .../service/IBdProductBasSpecsService.java | 30 - .../service/IThApprovalLogService.java | 11 - .../service/IThProductExtendService.java | 11 - .../product/service/IThProductService.java | 30 - .../service/IThProductSpecsService.java | 11 - .../service/impl/BdProductBasServiceImpl.java | 190 --- .../impl/BdProductBasSpecsServiceImpl.java | 29 - .../impl/ThApprovalLogServiceImpl.java | 15 - .../impl/ThProductExtendServiceImpl.java | 15 - .../service/impl/ThProductServiceImpl.java | 30 - .../impl/ThProductSpecsServiceImpl.java | 15 - .../product/vo/BdProductBasSpecsVo.java | 50 - .../hzs/ground/product/vo/ProductBasVo.java | 121 -- .../hzs/ground/product/vo/ProductInfoVo.java | 56 - .../com/hzs/ground/product/vo/ProductVo.java | 192 --- .../com/hzs/ground/product/vo/SpecsVo.java | 31 - .../controller/ThSupplierApplyController.java | 138 --- .../mapper/ThSupplierApplyMapper.java | 24 - .../service/IThSupplierApplyService.java | 39 - .../impl/ThSupplierApplyServiceImpl.java | 121 -- .../ground/supplier/vo/ThSupplierApplyVO.java | 230 ---- .../controller/IcGeneralController.java | 68 - .../manage/IcGeneralInHController.java | 217 ---- .../manage/IcGeneralOutHController.java | 220 ---- .../general/mapper/IcGeneralInBMapper.java | 43 - .../general/mapper/IcGeneralInHMapper.java | 37 - .../general/mapper/IcGeneralOutBMapper.java | 43 - .../general/mapper/IcGeneralOutHMapper.java | 37 - .../hzs/scm/general/param/GeneralBParam.java | 72 -- .../hzs/scm/general/param/GeneralParam.java | 65 - .../general/service/IIcGeneralInBService.java | 52 - .../general/service/IIcGeneralInHService.java | 94 -- .../service/IIcGeneralOutBService.java | 50 - .../service/IIcGeneralOutHService.java | 94 -- .../service/impl/IcGeneralInBServiceImpl.java | 52 - .../service/impl/IcGeneralInHServiceImpl.java | 321 ----- .../impl/IcGeneralOutBServiceImpl.java | 52 - .../impl/IcGeneralOutHServiceImpl.java | 329 ----- .../hzs/scm/general/vo/IcGeneralInBVO.java | 142 --- .../scm/general/vo/IcGeneralInExcelVO.java | 126 -- .../com/hzs/scm/general/vo/IcGeneralInVO.java | 66 - .../hzs/scm/general/vo/IcGeneralOutBVO.java | 123 -- .../scm/general/vo/IcGeneralOutExcelVO.java | 123 -- .../hzs/scm/general/vo/IcGeneralOutVO.java | 57 - .../manage/IcAvailableNumController.java | 173 --- .../manage/IcBatchCodeController.java | 167 --- .../manage/IcOnHandNumController.java | 86 -- .../scm/ic/mapper/IcAvailableNumMapper.java | 48 - .../scm/ic/mapper/IcAvailableSpecsMapper.java | 35 - .../hzs/scm/ic/mapper/IcBatchCodeMapper.java | 36 - .../hzs/scm/ic/mapper/IcOnHandNumBMapper.java | 34 - .../hzs/scm/ic/mapper/IcOnHandNumMapper.java | 87 -- .../scm/ic/mapper/IcOnHandSpecsMapper.java | 26 - .../com/hzs/scm/ic/param/AvailableNum.java | 75 -- .../com/hzs/scm/ic/param/BatchCodeParam.java | 79 -- .../com/hzs/scm/ic/param/OnHandNumParam.java | 65 - .../ic/service/IIcAvailableNumService.java | 46 - .../ic/service/IIcAvailableSpecsService.java | 26 - .../scm/ic/service/IIcBatchCodeService.java | 59 - .../scm/ic/service/IIcOnHandNumBService.java | 34 - .../scm/ic/service/IIcOnHandNumService.java | 68 - .../scm/ic/service/IIcOnHandSpecsService.java | 25 - .../impl/IcAvailableNumServiceImpl.java | 331 ----- .../impl/IcAvailableSpecsServiceImpl.java | 27 - .../service/impl/IcBatchCodeServiceImpl.java | 78 -- .../service/impl/IcOnHandNumBServiceImpl.java | 31 - .../service/impl/IcOnHandNumServiceImpl.java | 479 ------- .../impl/IcOnHandSpecsServiceImpl.java | 26 - .../com/hzs/scm/ic/vo/IcAvailableNumVo.java | 60 - .../java/com/hzs/scm/ic/vo/IcOnHandNumVo.java | 98 -- .../manage/IcInventoryHController.java | 310 ----- .../inventory/mapper/IcInventoryBMapper.java | 46 - .../inventory/mapper/IcInventoryHMapper.java | 38 - .../scm/inventory/param/InventoryBParam.java | 85 -- .../scm/inventory/param/InventoryParam.java | 70 -- .../service/IIcInventoryBService.java | 51 - .../service/IIcInventoryHService.java | 94 -- .../service/impl/IcInventoryBServiceImpl.java | 54 - .../service/impl/IcInventoryHServiceImpl.java | 338 ----- .../hzs/scm/inventory/vo/InventoryBVO.java | 118 -- .../com/hzs/scm/inventory/vo/InventoryVO.java | 66 - .../controller/manage/IoOrderController.java | 256 ---- .../hzs/scm/io/mapper/IoOrderItemsMapper.java | 36 - .../com/hzs/scm/io/mapper/IoOrderMapper.java | 41 - .../hzs/scm/io/param/IoOrderItemsParam.java | 60 - .../com/hzs/scm/io/param/IoOrderParam.java | 75 -- .../scm/io/service/IIoOrderItemsService.java | 50 - .../hzs/scm/io/service/IIoOrderService.java | 101 -- .../service/impl/IoOrderItemsServiceImpl.java | 56 - .../io/service/impl/IoOrderServiceImpl.java | 462 ------- .../java/com/hzs/scm/io/vo/IoOrderBVo.java | 26 - .../java/com/hzs/scm/io/vo/IoOrderVo.java | 166 --- .../hzs/scm/listener/ScmDeliverListener.java | 85 -- .../manage/ScmBillNoController.java | 20 - .../hzs/scm/no/mapper/ScmBillNoMapper.java | 15 - .../hzs/scm/no/service/IScmBillNoService.java | 20 - .../no/service/impl/ScmBillNoServiceImpl.java | 56 - .../controller/manage/PoOrderController.java | 283 ----- .../hzs/scm/po/mapper/PoOrderItemsMapper.java | 52 - .../com/hzs/scm/po/mapper/PoOrderMapper.java | 64 - .../hzs/scm/po/param/PoOrderItemsParam.java | 79 -- .../com/hzs/scm/po/param/PoOrderParam.java | 50 - .../scm/po/service/IPoOrderItemsService.java | 67 - .../hzs/scm/po/service/IPoOrderService.java | 121 -- .../service/impl/PoOrderItemsServiceImpl.java | 67 - .../po/service/impl/PoOrderServiceImpl.java | 362 ------ .../java/com/hzs/scm/po/vo/PoOrderBVo.java | 51 - .../java/com/hzs/scm/po/vo/PoOrderVo.java | 134 -- .../hzs/scm/pub/component/ScmPubUtilTool.java | 38 - .../hzs/scm/pub/controller/ScmController.java | 350 ------ .../scm/pub/mapper/ScmItemSpecsMapper.java | 26 - .../pub/mapper/ScmOrderApproveLogMapper.java | 16 - .../com/hzs/scm/pub/param/ItemSpecsParam.java | 32 - .../hzs/scm/pub/param/ScmApproveParam.java | 37 - .../com/hzs/scm/pub/param/ScmPubParam.java | 85 -- .../pub/provider/ScmBillServiceProvider.java | 331 ----- .../scm/pub/service/IScmItemSpecsService.java | 60 - .../service/IScmOrderApproveLogService.java | 40 - .../service/impl/ScmItemSpecsServiceImpl.java | 117 -- .../impl/ScmOrderApproveLogServiceImpl.java | 122 -- .../java/com/hzs/scm/pub/vo/ScmReturnBVo.java | 114 -- .../java/com/hzs/scm/pub/vo/ScmReturnVo.java | 100 -- .../java/com/hzs/scm/pub/vo/ScmSpecsVO.java | 33 - .../manage/IcPurchaseInHController.java | 416 ------- .../purchase/mapper/IcPurchaseInBMapper.java | 51 - .../purchase/mapper/IcPurchaseInHMapper.java | 53 - .../scm/purchase/param/PurchaseInBParam.java | 94 -- .../scm/purchase/param/PurchaseInParam.java | 55 - .../service/IIcPurchaseInBService.java | 58 - .../service/IIcPurchaseInHService.java | 144 --- .../impl/IcPurchaseInBServiceImpl.java | 57 - .../impl/IcPurchaseinHServiceImpl.java | 552 --------- .../hzs/scm/purchase/vo/PurchaseExcelVO.java | 149 --- .../hzs/scm/purchase/vo/PurchaseInBVo.java | 168 --- .../com/hzs/scm/purchase/vo/PurchaseInVo.java | 126 -- .../scm/purchase/vo/PurchaseOutExcelVO.java | 148 --- .../manage/IcSaleoutHController.java | 271 ---- .../scm/sale/mapper/IcDelSaleLogMapper.java | 11 - .../hzs/scm/sale/mapper/IcSaleoutBMapper.java | 51 - .../hzs/scm/sale/mapper/IcSaleoutHMapper.java | 48 - .../com/hzs/scm/sale/param/SaleOutParam.java | 40 - .../sale/service/IIcDelSaleLogService.java | 11 - .../scm/sale/service/IIcSaleoutBService.java | 51 - .../scm/sale/service/IIcSaleoutHService.java | 68 - .../service/impl/IcDelSaleLogServiceImpl.java | 15 - .../service/impl/IcSaleoutBServiceImpl.java | 42 - .../service/impl/IcSaleoutHServiceImpl.java | 408 ------ .../java/com/hzs/scm/sale/vo/SaleOutBVO.java | 68 - .../hzs/scm/sale/vo/SaleOutBackExcelVO.java | 143 --- .../com/hzs/scm/sale/vo/SaleOutExcelVO.java | 143 --- .../java/com/hzs/scm/sale/vo/SaleOutHVO.java | 65 - .../manage/IcTransInHController.java | 271 ---- .../manage/IcTransOutHController.java | 281 ----- .../manage/TransferOrderController.java | 283 ----- .../scm/trans/mapper/IcTransInBMapper.java | 35 - .../scm/trans/mapper/IcTransInHMapper.java | 46 - .../scm/trans/mapper/IcTransOutBMapper.java | 35 - .../scm/trans/mapper/IcTransOutHMapper.java | 54 - .../mapper/TransferOrderItemsMapper.java | 62 - .../scm/trans/mapper/TransferOrderMapper.java | 69 -- .../hzs/scm/trans/param/QueryStoreParam.java | 27 - .../scm/trans/param/TransferItemParam.java | 152 --- .../hzs/scm/trans/param/TransferParam.java | 49 - .../scm/trans/service/IIcTransInBService.java | 42 - .../scm/trans/service/IIcTransInHService.java | 97 -- .../trans/service/IIcTransOutBService.java | 41 - .../trans/service/IIcTransOutHService.java | 112 -- .../service/ITransferOrderItemsService.java | 68 - .../trans/service/ITransferOrderService.java | 129 -- .../service/impl/IcTransInBServiceImpl.java | 47 - .../service/impl/IcTransInHServiceImpl.java | 391 ------ .../service/impl/IcTransOutBServiceImpl.java | 48 - .../service/impl/IcTransOutHServiceImpl.java | 390 ------ .../impl/TransferOrderItemsServiceImpl.java | 69 -- .../impl/TransferOrderServiceImpl.java | 356 ------ .../com/hzs/scm/trans/vo/TransferExcelVO.java | 151 --- .../com/hzs/scm/trans/vo/TransferInBVo.java | 166 --- .../com/hzs/scm/trans/vo/TransferInVo.java | 45 - .../hzs/scm/trans/vo/TransferOrderBVo.java | 76 -- .../com/hzs/scm/trans/vo/TransferOrderVo.java | 74 -- .../com/hzs/scm/trans/vo/TransferOutBVo.java | 96 -- .../hzs/scm/trans/vo/TransferOutExcelVO.java | 152 --- .../com/hzs/scm/trans/vo/TransferOutVo.java | 46 - .../controller/IcWarnConfigController.java | 125 -- .../scm/warn/mapper/IcWarnConfigMapper.java | 30 - .../warn/mapper/IcWarnConfigSpecsMapper.java | 16 - .../hzs/scm/warn/param/WarnConfigParam.java | 54 - .../warn/service/IIcWarnConfigService.java | 39 - .../service/IIcWarnConfigSpecsService.java | 23 - .../service/impl/IcWarnConfigServiceImpl.java | 93 -- .../impl/IcWarnConfigSpecsServiceImpl.java | 35 - .../src/main/resources/banner.txt | 2 - .../src/main/resources/bootstrap.yml | 80 -- .../src/main/resources/logback.xml | 74 -- .../mapper/ground/margin/ThMarginMapper.xml | 111 -- .../ground/order/SaOrderSettleMapper.xml | 81 -- .../ground/order/SupplierOrderMapper.xml | 99 -- .../postage/ThSupplierPostageMapper.xml | 72 -- .../ground/product/BdProductBasMapper.xml | 209 ---- .../product/BdProductBasSpecsMapper.xml | 34 - .../ground/product/ThApprovalLogMapper.xml | 5 - .../ground/product/ThProductExtendMapper.xml | 5 - .../mapper/ground/product/ThProductMapper.xml | 138 --- .../ground/product/ThProductSpecsMapper.xml | 5 - .../ground/supplier/ThSupplierApplyMapper.xml | 96 -- .../mapper/scm/general/IcGeneralInBMapper.xml | 75 -- .../mapper/scm/general/IcGeneralInHMapper.xml | 123 -- .../scm/general/IcGeneralOutBMapper.xml | 70 -- .../scm/general/IcGeneralOutHMapper.xml | 121 -- .../mapper/scm/ic/IcAvailableNumMapper.xml | 151 --- .../mapper/scm/ic/IcAvailableSpecsMapper.xml | 43 - .../mapper/scm/ic/IcBatchCodeMapper.xml | 48 - .../mapper/scm/ic/IcOnHandNumBMapper.xml | 39 - .../mapper/scm/ic/IcOnHandNumMapper.xml | 198 --- .../mapper/scm/ic/IcOnHandSpecsMapper.xml | 35 - .../scm/inventory/IcInventoryBMapper.xml | 78 -- .../scm/inventory/IcInventoryHMapper.xml | 130 -- .../mapper/scm/io/IoOrderItemsMapper.xml | 77 -- .../resources/mapper/scm/io/IoOrderMapper.xml | 132 -- .../mapper/scm/no/ScmBillNoMapper.xml | 31 - .../mapper/scm/po/PoOrderItemsMapper.xml | 93 -- .../resources/mapper/scm/po/PoOrderMapper.xml | 207 ---- .../mapper/scm/pub/ScmItemSpecsMapper.xml | 30 - .../scm/pub/ScmOrderApproveLogMapper.xml | 21 - .../scm/purchase/IcPurchaseinBMapper.xml | 83 -- .../scm/purchase/IcPurchaseinHMapper.xml | 230 ---- .../mapper/scm/sale/IcDelSaleLogMapper.xml | 21 - .../mapper/scm/sale/IcSaleoutBMapper.xml | 114 -- .../mapper/scm/sale/IcSaleoutHMapper.xml | 155 --- .../mapper/scm/trans/IcTransInBMapper.xml | 71 -- .../mapper/scm/trans/IcTransInHMapper.xml | 163 --- .../mapper/scm/trans/IcTransOutBMapper.xml | 65 - .../mapper/scm/trans/IcTransOutHMapper.xml | 212 ---- .../scm/trans/TransferOrderItemsMapper.xml | 120 -- .../mapper/scm/trans/TransferOrderMapper.xml | 215 ---- .../mapper/scm/warn/IcWarnConfigMapper.xml | 104 -- .../scm/warn/IcWarnConfigSpecsMapper.xml | 20 - bd-business/bd-business-system/pom.xml | 6 - .../controller/manage/BdAreaController.java | 38 - .../manage/BdCubasdocController.java | 21 +- .../base/provider/CubasdocProvider.java | 17 +- .../manage/BdTransferController.java | 144 +-- .../enums/controller/EnumsController.java | 42 - .../enums/controller/EnumsInitController.java | 14 - .../api/ApiHoAdvertBannerController.java | 52 - .../api/ApiHoBackgroundController.java | 45 - .../api/ApiHoEnterpriseMissionController.java | 70 -- .../api/ApiHoEnterpriseNewsController.java | 70 -- .../api/ApiHoEnterpriseStyleController.java | 71 -- .../api/ApiHoGlobalCompanyController.java | 56 - .../api/ApiHoMemoirHonorController.java | 48 - .../api/ApiHoMemoirProcessController.java | 57 - .../api/ApiHoProductDetailsController.java | 95 -- .../controller/api/ApiHoVrAreaController.java | 68 - .../api/ApiRegionDistributeController.java | 83 -- .../manage/HoAdvertBannerController.java | 279 ----- .../manage/HoBackgroundController.java | 130 -- .../manage/HoEnterpriseMissionController.java | 226 ---- .../manage/HoEnterpriseNewsController.java | 226 ---- .../manage/HoEnterpriseStyleController.java | 228 ---- .../manage/HoGlobalCompanyController.java | 205 --- .../manage/HoMemoirHonorController.java | 249 ---- .../manage/HoMemoirProcessController.java | 324 ----- .../manage/HoProductDetailsController.java | 179 --- .../manage/HoRegionDistributeController.java | 89 -- .../HoRegionDistributeItemController.java | 92 -- .../controller/manage/HoVrAreaController.java | 230 ---- .../home/mapper/HoAdvertBannerMapper.java | 17 - .../home/mapper/HoBackgroundMapper.java | 17 - .../mapper/HoEnterpriseMissionMapper.java | 17 - .../home/mapper/HoEnterpriseNewsMapper.java | 17 - .../home/mapper/HoEnterpriseStyleMapper.java | 17 - .../home/mapper/HoGlobalCompanyMapper.java | 38 - .../home/mapper/HoMemoirHonorMapper.java | 17 - .../home/mapper/HoMemoirProcessMapper.java | 17 - .../home/mapper/HoProductDetailsMapper.java | 38 - .../mapper/HoRegionDistributeItemMapper.java | 16 - .../home/mapper/HoRegionDistributeMapper.java | 17 - .../system/home/mapper/HoVrAreaMapper.java | 17 - .../hzs/system/home/param/HoArticleParam.java | 48 - .../hzs/system/home/param/HoLeaderParam.java | 26 - .../system/home/param/HoLeaderTitleParam.java | 27 - .../home/param/HoProductDetailsParam.java | 96 -- .../home/param/HoProductRangeParam.java | 32 - .../home/param/HoRegionDistributeParam.java | 41 - .../home/service/IHoAdvertBannerService.java | 17 - .../home/service/IHoBackgroundService.java | 17 - .../service/IHoEnterpriseMissionService.java | 17 - .../service/IHoEnterpriseNewsService.java | 17 - .../service/IHoEnterpriseStyleService.java | 17 - .../home/service/IHoGlobalCompanyService.java | 56 - .../home/service/IHoMemoirHonorService.java | 17 - .../home/service/IHoMemoirProcessService.java | 17 - .../service/IHoProductDetailsService.java | 56 - .../IHoRegionDistributeItemService.java | 17 - .../service/IHoRegionDistributeService.java | 16 - .../system/home/service/IHoVrAreaService.java | 17 - .../impl/HoAdvertBannerServiceImpl.java | 20 - .../service/impl/HoBackgroundServiceImpl.java | 20 - .../impl/HoEnterpriseMissionServiceImpl.java | 20 - .../impl/HoEnterpriseNewsServiceImpl.java | 20 - .../impl/HoEnterpriseStyleServiceImpl.java | 20 - .../impl/HoGlobalCompanyServiceImpl.java | 107 -- .../impl/HoMemoirHonorServiceImpl.java | 20 - .../impl/HoMemoirProcessServiceImpl.java | 20 - .../impl/HoProductDetailsServiceImpl.java | 100 -- .../HoRegionDistributeItemServiceImpl.java | 21 - .../impl/HoRegionDistributeServiceImpl.java | 21 - .../service/impl/HoVrAreaServiceImpl.java | 20 - .../system/home/vo/HoEnterpriseMissionVO.java | 74 -- .../system/home/vo/HoEnterpriseNewsVO.java | 72 -- .../system/home/vo/HoEnterpriseStyleVO.java | 72 -- .../hzs/system/home/vo/HoGlobalCompanyVO.java | 178 --- .../hzs/system/home/vo/HoMemoirHonorVO.java | 39 - .../hzs/system/home/vo/HoMemoirProcessVO.java | 66 - .../system/home/vo/HoProductDetailsVO.java | 85 -- .../com/hzs/system/home/vo/HoVrAreaVO.java | 66 - .../index/controller/IndexController.java | 6 +- .../manage/SysApprovalBusinessController.java | 24 - .../sys/service/impl/ApprovalServiceImpl.java | 14 - .../src/main/resources/bootstrap.yml | 2 +- .../system/home/HoAdvertBannerMapper.xml | 33 - .../mapper/system/home/HoBackgroundMapper.xml | 30 - .../system/home/HoEnterpriseMissionMapper.xml | 34 - .../system/home/HoEnterpriseNewsMapper.xml | 34 - .../system/home/HoEnterpriseStyleMapper.xml | 34 - .../system/home/HoGlobalCompanyMapper.xml | 125 -- .../system/home/HoMemoirHonorMapper.xml | 30 - .../system/home/HoMemoirProcessMapper.xml | 32 - .../system/home/HoProductDetailsMapper.xml | 86 -- .../home/HoRegionDistributeItemMapper.xml | 34 - .../system/home/HoRegionDistributeMapper.xml | 29 - .../mapper/system/home/HoVrAreaMapper.xml | 33 - bd-business/pom.xml | 2 - .../common/core/constant/CacheConstants.java | 68 - .../core/constant/EnumsPrefixConstants.java | 23 - .../core/constant/RabbitMqConstants.java | 43 - .../core/constant/ScmFieldConstants.java | 87 -- .../core/constant/msg/ScmMsgConstants.java | 101 -- .../common/core/enums/EApprovalBusiness.java | 79 -- .../hzs/common/core/enums/EApprovalType.java | 10 - .../com/hzs/common/core/enums/EGrade.java | 12 +- .../hzs/common/core/enums/EInventoryType.java | 47 - .../common/core/enums/EOperationBusiness.java | 39 +- .../common/core/enums/EOperationModule.java | 42 - .../hzs/common/core/enums/EOrderPrefix.java | 60 - .../core/enums/EScmGeneralOutStatus.java | 61 - .../common/core/enums/EScmOrderStatus.java | 71 -- .../hzs/common/core/enums/EScmOrderType.java | 85 -- .../common/core/enums/EScmTransferType.java | 52 - .../hzs/common/core/enums/ETradeClassify.java | 6 +- .../hzs/common/core/enums/ETradeStatus.java | 6 +- .../common/core/enums/ETransferStatus.java | 6 +- .../hzs/common/core/enums/ETransferType.java | 6 +- .../com/hzs/common/core/enums/EUpDown.java | 6 +- .../hzs/common/core/enums/EYesNoUpLoads.java | 6 +- .../domain/sale/order/SaOrderChargeLog.java | 3 - .../domain/sale/order/SaOrderItemsRevoke.java | 5 - .../domain/sale/order/SaOrderRelation.java | 5 - .../sale/order/SaOrderRelationItems.java | 49 - .../domain/sale/order/SaOrderSelfLog.java | 5 - .../domain/sale/order/SaOrderShareTmp.java | 6 +- .../common/domain/sale/order/SaOrderTemp.java | 3 - .../domain/sale/order/SaOrderWaresLimit.java | 3 - .../common/domain/sale/order/SaRefund.java | 3 - .../domain/sale/order/SaRefundItems.java | 3 - .../domain/scm/general/IcGeneralInB.java | 117 -- .../domain/scm/general/IcGeneralInH.java | 125 -- .../domain/scm/general/IcGeneralOutB.java | 117 -- .../domain/scm/general/IcGeneralOutH.java | 125 -- .../scm/general/ext/IcGeneralInBExt.java | 69 -- .../scm/general/ext/IcGeneralInHExt.java | 55 - .../scm/general/ext/IcGeneralOutBExt.java | 50 - .../scm/general/ext/IcGeneralOutHExt.java | 46 - .../common/domain/scm/ic/IcAvailableNum.java | 86 -- .../domain/scm/ic/IcAvailableSpecs.java | 62 - .../hzs/common/domain/scm/ic/IcBatchCode.java | 76 -- .../hzs/common/domain/scm/ic/IcOnHandNum.java | 107 -- .../common/domain/scm/ic/IcOnHandNumB.java | 69 -- .../common/domain/scm/ic/IcOnHandSpecs.java | 62 - .../domain/scm/ic/ext/IcAvailableNumExt.java | 63 - .../domain/scm/ic/ext/IcBatchCodeExt.java | 25 - .../domain/scm/ic/ext/IcOnHandNumExt.java | 83 -- .../domain/scm/inventory/IcInventoryB.java | 115 -- .../domain/scm/inventory/IcInventoryH.java | 112 -- .../scm/inventory/ext/IcInventoryBExt.java | 65 - .../scm/inventory/ext/IcInventoryHExt.java | 50 - .../com/hzs/common/domain/scm/io/IoOrder.java | 145 --- .../common/domain/scm/io/IoOrderItems.java | 77 -- .../common/domain/scm/io/ext/IoOrderExt.java | 62 - .../domain/scm/io/ext/IoOrderItemsExt.java | 69 -- .../hzs/common/domain/scm/no/ScmBillNo.java | 91 -- .../com/hzs/common/domain/scm/po/PoOrder.java | 124 -- .../common/domain/scm/po/PoOrderItems.java | 145 --- .../common/domain/scm/po/ext/PoOrderExt.java | 45 - .../domain/scm/po/ext/PoOrderItemsExt.java | 47 - .../domain/scm/postage/ThSupplierPostage.java | 61 - .../scm/postage/ext/ThSupplierPostageExt.java | 21 - .../common/domain/scm/pub/ScmItemSpecs.java | 72 -- .../domain/scm/pub/ScmOrderApproveLog.java | 68 - .../domain/scm/pub/ext/ScmItemSpecsExt.java | 14 - .../domain/scm/purchase/IcPurchaseInB.java | 183 --- .../domain/scm/purchase/IcPurchaseInH.java | 121 -- .../scm/purchase/ext/IcPurchaseInBExt.java | 66 - .../scm/purchase/ext/IcPurchaseInHExt.java | 49 - .../common/domain/scm/sale/IcDelSaleLog.java | 63 - .../common/domain/scm/sale/IcSaleoutB.java | 181 --- .../common/domain/scm/sale/IcSaleoutH.java | 125 -- .../domain/scm/sale/ext/IcSaleoutBExt.java | 66 - .../domain/scm/sale/ext/IcSaleoutHExt.java | 60 - .../common/domain/scm/th/ThApprovalLog.java | 83 -- .../hzs/common/domain/scm/th/ThProduct.java | 134 -- .../common/domain/scm/th/ThProductExtend.java | 100 -- .../common/domain/scm/th/ThProductSpecs.java | 43 - .../common/domain/scm/trans/IcTransInB.java | 175 --- .../common/domain/scm/trans/IcTransInH.java | 110 -- .../common/domain/scm/trans/IcTransOutB.java | 181 --- .../common/domain/scm/trans/IcTransOutH.java | 107 -- .../domain/scm/trans/TransferOrder.java | 123 -- .../domain/scm/trans/TransferOrderItems.java | 157 --- .../domain/scm/trans/ext/IcTransInBExt.java | 69 -- .../domain/scm/trans/ext/IcTransInHExt.java | 41 - .../domain/scm/trans/ext/IcTransOutBExt.java | 61 - .../domain/scm/trans/ext/IcTransOutHExt.java | 41 - .../scm/trans/ext/TransferOrderExt.java | 44 - .../scm/trans/ext/TransferOrderItemsExt.java | 56 - .../common/domain/scm/warn/IcWarnConfig.java | 58 - .../domain/scm/warn/IcWarnConfigSpecs.java | 62 - .../domain/scm/warn/ext/IcWarnConfigExt.java | 40 - .../domain/system/config/BdAgreement.java | 11 +- .../domain/system/ext/AreaCurrencyExt.java | 6 +- .../domain/system/ext/BdAgreementExt.java | 5 - .../domain/system/ext/BdGradeScopeExt.java | 9 +- .../common/domain/system/ext/BdLabelExt.java | 19 +- .../common/domain/system/ext/BdNoticeExt.java | 6 - .../ext/BdPlatformMessageDetailExt.java | 6 +- .../domain/system/ext/HoAdvertBannerExt.java | 44 - .../system/ext/HoEnterpriseMissionExt.java | 45 - .../domain/system/ext/HoGlobalCompanyExt.java | 69 -- .../domain/system/ext/HoMemoirProcessExt.java | 45 - .../domain/system/home/HoAdvertBanner.java | 79 -- .../domain/system/home/HoBackground.java | 58 - .../system/home/HoEnterpriseMission.java | 87 -- .../domain/system/home/HoEnterpriseNews.java | 85 -- .../domain/system/home/HoEnterpriseStyle.java | 86 -- .../domain/system/home/HoGlobalCompany.java | 110 -- .../domain/system/home/HoMemoirHonor.java | 55 - .../domain/system/home/HoMemoirProcess.java | 72 -- .../domain/system/home/HoProductDetails.java | 86 -- .../system/home/HoRegionDistribute.java | 54 - .../system/home/HoRegionDistributeItem.java | 84 -- .../common/domain/system/home/HoVrArea.java | 76 -- .../main/java/com/hzs/GatewayApplication.java | 2 - bd-gateway/src/main/resources/bootstrap.yml | 33 +- bd-third/pom.xml | 5 - .../listener/IcAvailableNumBackListener.java | 43 - .../listener/IcAvailableNumListener.java | 46 - .../java/com/hzs/third/sms/util/SmsUtil.java | 7 +- .../translate/service/ITranslateService.java | 7 - bd-third/src/main/resources/bootstrap.yml | 2 +- pom.xml | 6 - 547 files changed, 116 insertions(+), 42866 deletions(-) delete mode 100644 bd-api/bd-api-member/src/main/java/com/hzs/member/base/IMemberLevelServiceApi.java delete mode 100644 bd-api/bd-api-scm/pom.xml delete mode 100644 bd-api/bd-api-scm/src/main/java/com/hzs/scm/product/IBdProductBasSpecsServiceApi.java delete mode 100644 bd-api/bd-api-scm/src/main/java/com/hzs/scm/product/IProductBasServiceApi.java delete mode 100644 bd-api/bd-api-scm/src/main/java/com/hzs/scm/product/dto/ProductBasDTO.java delete mode 100644 bd-api/bd-api-scm/src/main/java/com/hzs/scm/pub/IScmBillServiceApi.java delete mode 100644 bd-api/bd-api-scm/src/main/java/com/hzs/scm/pub/dto/BillDTO.java delete mode 100644 bd-api/bd-api-scm/src/main/java/com/hzs/scm/pub/dto/BillItemDTO.java delete mode 100644 bd-api/bd-api-scm/src/main/java/com/hzs/scm/pub/dto/DeliverDTO.java delete mode 100644 bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/ThaliConfigDTO.java delete mode 100644 bd-api/bd-api-third/src/main/java/com/hzs/third/cabin/ICabinThirdServiceApi.java delete mode 100644 bd-api/bd-api-third/src/main/java/com/hzs/third/cabin/dto/CabinDeviceOpenDTO.java delete mode 100644 bd-api/bd-api-third/src/main/java/com/hzs/third/cabin/dto/CabinInfoDTO.java delete mode 100644 bd-api/bd-api-third/src/main/java/com/hzs/third/cabin/dto/CabinPackageDTO.java delete mode 100644 bd-api/bd-api-third/src/main/java/com/hzs/third/pay/IOnlineServiceApi.java delete mode 100644 bd-business/bd-business-member/src/main/java/com/hzs/member/base/provider/MemberLevelServiceProvider.java delete mode 100644 bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderRelationItemsMapper.java delete mode 100644 bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderRelationMapper.java delete mode 100644 bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderRelationItemsService.java delete mode 100644 bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderRelationService.java delete mode 100644 bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderRelationItemsServiceImpl.java delete mode 100644 bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderRelationServiceImpl.java delete mode 100644 bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderRelationItemsMapper.xml delete mode 100644 bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderRelationMapper.xml delete mode 100644 bd-business/bd-business-scm/pom.xml delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ScmApplication.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ground/margin/controller/ThMarginController.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ground/margin/mapper/ThMarginMapper.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ground/margin/service/IThMarginService.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ground/margin/service/impl/ThMarginServiceImpl.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ground/margin/vo/ThMarginVO.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ground/order/controller/manage/SupplierOrderController.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ground/order/mapper/SaOrderSettleMapper.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ground/order/mapper/SupplierOrderMapper.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ground/order/param/OrderItemsParam.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ground/order/param/OrderQueryParam.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ground/order/service/ISaOrderSettleService.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ground/order/service/ISupplierOrderService.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ground/order/service/impl/SaOrderSettleServiceImpl.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ground/order/service/impl/SupplierOrderServiceImpl.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ground/order/vo/SaOrderSettleVo.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ground/postage/controller/manage/SupplierPostageController.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ground/postage/mapper/ThSupplierPostageMapper.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ground/postage/param/SupplierPostageParam.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ground/postage/service/IThSupplierPostageService.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ground/postage/service/impl/ThSupplierPostageServiceImpl.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ground/postage/vo/SupplierPostageVo.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/controller/api/ApiProductController.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/controller/manage/BdProductBasController.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/controller/manage/ThProductController.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/mapper/BdProductBasMapper.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/mapper/BdProductBasSpecsMapper.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/mapper/ThApprovalLogMapper.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/mapper/ThProductExtendMapper.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/mapper/ThProductMapper.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/mapper/ThProductSpecsMapper.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/param/ProductBasParams.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/param/ProductInfoParam.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/provider/IBdProductBasSpecsServiceProvider.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/provider/IProductBasServiceProvider.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/IBdProductBasService.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/IBdProductBasSpecsService.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/IThApprovalLogService.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/IThProductExtendService.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/IThProductService.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/IThProductSpecsService.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/impl/BdProductBasServiceImpl.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/impl/BdProductBasSpecsServiceImpl.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/impl/ThApprovalLogServiceImpl.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/impl/ThProductExtendServiceImpl.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/impl/ThProductServiceImpl.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/impl/ThProductSpecsServiceImpl.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/vo/BdProductBasSpecsVo.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/vo/ProductBasVo.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/vo/ProductInfoVo.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/vo/ProductVo.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/vo/SpecsVo.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ground/supplier/controller/ThSupplierApplyController.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ground/supplier/mapper/ThSupplierApplyMapper.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ground/supplier/service/IThSupplierApplyService.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ground/supplier/service/impl/ThSupplierApplyServiceImpl.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/ground/supplier/vo/ThSupplierApplyVO.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/controller/IcGeneralController.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/controller/manage/IcGeneralInHController.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/controller/manage/IcGeneralOutHController.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/mapper/IcGeneralInBMapper.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/mapper/IcGeneralInHMapper.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/mapper/IcGeneralOutBMapper.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/mapper/IcGeneralOutHMapper.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/param/GeneralBParam.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/param/GeneralParam.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/service/IIcGeneralInBService.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/service/IIcGeneralInHService.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/service/IIcGeneralOutBService.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/service/IIcGeneralOutHService.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/service/impl/IcGeneralInBServiceImpl.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/service/impl/IcGeneralInHServiceImpl.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/service/impl/IcGeneralOutBServiceImpl.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/service/impl/IcGeneralOutHServiceImpl.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/vo/IcGeneralInBVO.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/vo/IcGeneralInExcelVO.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/vo/IcGeneralInVO.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/vo/IcGeneralOutBVO.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/vo/IcGeneralOutExcelVO.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/vo/IcGeneralOutVO.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/controller/manage/IcAvailableNumController.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/controller/manage/IcBatchCodeController.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/controller/manage/IcOnHandNumController.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/mapper/IcAvailableNumMapper.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/mapper/IcAvailableSpecsMapper.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/mapper/IcBatchCodeMapper.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/mapper/IcOnHandNumBMapper.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/mapper/IcOnHandNumMapper.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/mapper/IcOnHandSpecsMapper.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/param/AvailableNum.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/param/BatchCodeParam.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/param/OnHandNumParam.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/IIcAvailableNumService.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/IIcAvailableSpecsService.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/IIcBatchCodeService.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/IIcOnHandNumBService.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/IIcOnHandNumService.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/IIcOnHandSpecsService.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/impl/IcAvailableNumServiceImpl.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/impl/IcAvailableSpecsServiceImpl.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/impl/IcBatchCodeServiceImpl.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/impl/IcOnHandNumBServiceImpl.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/impl/IcOnHandNumServiceImpl.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/impl/IcOnHandSpecsServiceImpl.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/vo/IcAvailableNumVo.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/vo/IcOnHandNumVo.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/inventory/controller/manage/IcInventoryHController.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/inventory/mapper/IcInventoryBMapper.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/inventory/mapper/IcInventoryHMapper.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/inventory/param/InventoryBParam.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/inventory/param/InventoryParam.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/inventory/service/IIcInventoryBService.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/inventory/service/IIcInventoryHService.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/inventory/service/impl/IcInventoryBServiceImpl.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/inventory/service/impl/IcInventoryHServiceImpl.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/inventory/vo/InventoryBVO.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/inventory/vo/InventoryVO.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/io/controller/manage/IoOrderController.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/io/mapper/IoOrderItemsMapper.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/io/mapper/IoOrderMapper.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/io/param/IoOrderItemsParam.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/io/param/IoOrderParam.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/io/service/IIoOrderItemsService.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/io/service/IIoOrderService.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/io/service/impl/IoOrderItemsServiceImpl.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/io/service/impl/IoOrderServiceImpl.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/io/vo/IoOrderBVo.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/io/vo/IoOrderVo.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/listener/ScmDeliverListener.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/no/controller/manage/ScmBillNoController.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/no/mapper/ScmBillNoMapper.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/no/service/IScmBillNoService.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/no/service/impl/ScmBillNoServiceImpl.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/po/controller/manage/PoOrderController.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/po/mapper/PoOrderItemsMapper.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/po/mapper/PoOrderMapper.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/po/param/PoOrderItemsParam.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/po/param/PoOrderParam.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/po/service/IPoOrderItemsService.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/po/service/IPoOrderService.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/po/service/impl/PoOrderItemsServiceImpl.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/po/service/impl/PoOrderServiceImpl.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/po/vo/PoOrderBVo.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/po/vo/PoOrderVo.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/component/ScmPubUtilTool.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/controller/ScmController.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/mapper/ScmItemSpecsMapper.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/mapper/ScmOrderApproveLogMapper.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/param/ItemSpecsParam.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/param/ScmApproveParam.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/param/ScmPubParam.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/provider/ScmBillServiceProvider.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/service/IScmItemSpecsService.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/service/IScmOrderApproveLogService.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/service/impl/ScmItemSpecsServiceImpl.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/service/impl/ScmOrderApproveLogServiceImpl.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/vo/ScmReturnBVo.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/vo/ScmReturnVo.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/vo/ScmSpecsVO.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/controller/manage/IcPurchaseInHController.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/mapper/IcPurchaseInBMapper.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/mapper/IcPurchaseInHMapper.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/param/PurchaseInBParam.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/param/PurchaseInParam.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/service/IIcPurchaseInBService.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/service/IIcPurchaseInHService.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/service/impl/IcPurchaseInBServiceImpl.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/service/impl/IcPurchaseinHServiceImpl.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/vo/PurchaseExcelVO.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/vo/PurchaseInBVo.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/vo/PurchaseInVo.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/vo/PurchaseOutExcelVO.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/controller/manage/IcSaleoutHController.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/mapper/IcDelSaleLogMapper.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/mapper/IcSaleoutBMapper.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/mapper/IcSaleoutHMapper.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/param/SaleOutParam.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/service/IIcDelSaleLogService.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/service/IIcSaleoutBService.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/service/IIcSaleoutHService.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/service/impl/IcDelSaleLogServiceImpl.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/service/impl/IcSaleoutBServiceImpl.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/service/impl/IcSaleoutHServiceImpl.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/vo/SaleOutBVO.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/vo/SaleOutBackExcelVO.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/vo/SaleOutExcelVO.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/vo/SaleOutHVO.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/controller/manage/IcTransInHController.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/controller/manage/IcTransOutHController.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/controller/manage/TransferOrderController.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/mapper/IcTransInBMapper.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/mapper/IcTransInHMapper.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/mapper/IcTransOutBMapper.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/mapper/IcTransOutHMapper.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/mapper/TransferOrderItemsMapper.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/mapper/TransferOrderMapper.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/param/QueryStoreParam.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/param/TransferItemParam.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/param/TransferParam.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/IIcTransInBService.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/IIcTransInHService.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/IIcTransOutBService.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/IIcTransOutHService.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/ITransferOrderItemsService.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/ITransferOrderService.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/impl/IcTransInBServiceImpl.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/impl/IcTransInHServiceImpl.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/impl/IcTransOutBServiceImpl.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/impl/IcTransOutHServiceImpl.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/impl/TransferOrderItemsServiceImpl.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/impl/TransferOrderServiceImpl.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/vo/TransferExcelVO.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/vo/TransferInBVo.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/vo/TransferInVo.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/vo/TransferOrderBVo.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/vo/TransferOrderVo.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/vo/TransferOutBVo.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/vo/TransferOutExcelVO.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/vo/TransferOutVo.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/warn/manage/controller/IcWarnConfigController.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/warn/mapper/IcWarnConfigMapper.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/warn/mapper/IcWarnConfigSpecsMapper.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/warn/param/WarnConfigParam.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/warn/service/IIcWarnConfigService.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/warn/service/IIcWarnConfigSpecsService.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/warn/service/impl/IcWarnConfigServiceImpl.java delete mode 100644 bd-business/bd-business-scm/src/main/java/com/hzs/scm/warn/service/impl/IcWarnConfigSpecsServiceImpl.java delete mode 100644 bd-business/bd-business-scm/src/main/resources/banner.txt delete mode 100644 bd-business/bd-business-scm/src/main/resources/bootstrap.yml delete mode 100644 bd-business/bd-business-scm/src/main/resources/logback.xml delete mode 100644 bd-business/bd-business-scm/src/main/resources/mapper/ground/margin/ThMarginMapper.xml delete mode 100644 bd-business/bd-business-scm/src/main/resources/mapper/ground/order/SaOrderSettleMapper.xml delete mode 100644 bd-business/bd-business-scm/src/main/resources/mapper/ground/order/SupplierOrderMapper.xml delete mode 100644 bd-business/bd-business-scm/src/main/resources/mapper/ground/postage/ThSupplierPostageMapper.xml delete mode 100644 bd-business/bd-business-scm/src/main/resources/mapper/ground/product/BdProductBasMapper.xml delete mode 100644 bd-business/bd-business-scm/src/main/resources/mapper/ground/product/BdProductBasSpecsMapper.xml delete mode 100644 bd-business/bd-business-scm/src/main/resources/mapper/ground/product/ThApprovalLogMapper.xml delete mode 100644 bd-business/bd-business-scm/src/main/resources/mapper/ground/product/ThProductExtendMapper.xml delete mode 100644 bd-business/bd-business-scm/src/main/resources/mapper/ground/product/ThProductMapper.xml delete mode 100644 bd-business/bd-business-scm/src/main/resources/mapper/ground/product/ThProductSpecsMapper.xml delete mode 100644 bd-business/bd-business-scm/src/main/resources/mapper/ground/supplier/ThSupplierApplyMapper.xml delete mode 100644 bd-business/bd-business-scm/src/main/resources/mapper/scm/general/IcGeneralInBMapper.xml delete mode 100644 bd-business/bd-business-scm/src/main/resources/mapper/scm/general/IcGeneralInHMapper.xml delete mode 100644 bd-business/bd-business-scm/src/main/resources/mapper/scm/general/IcGeneralOutBMapper.xml delete mode 100644 bd-business/bd-business-scm/src/main/resources/mapper/scm/general/IcGeneralOutHMapper.xml delete mode 100644 bd-business/bd-business-scm/src/main/resources/mapper/scm/ic/IcAvailableNumMapper.xml delete mode 100644 bd-business/bd-business-scm/src/main/resources/mapper/scm/ic/IcAvailableSpecsMapper.xml delete mode 100644 bd-business/bd-business-scm/src/main/resources/mapper/scm/ic/IcBatchCodeMapper.xml delete mode 100644 bd-business/bd-business-scm/src/main/resources/mapper/scm/ic/IcOnHandNumBMapper.xml delete mode 100644 bd-business/bd-business-scm/src/main/resources/mapper/scm/ic/IcOnHandNumMapper.xml delete mode 100644 bd-business/bd-business-scm/src/main/resources/mapper/scm/ic/IcOnHandSpecsMapper.xml delete mode 100644 bd-business/bd-business-scm/src/main/resources/mapper/scm/inventory/IcInventoryBMapper.xml delete mode 100644 bd-business/bd-business-scm/src/main/resources/mapper/scm/inventory/IcInventoryHMapper.xml delete mode 100644 bd-business/bd-business-scm/src/main/resources/mapper/scm/io/IoOrderItemsMapper.xml delete mode 100644 bd-business/bd-business-scm/src/main/resources/mapper/scm/io/IoOrderMapper.xml delete mode 100644 bd-business/bd-business-scm/src/main/resources/mapper/scm/no/ScmBillNoMapper.xml delete mode 100644 bd-business/bd-business-scm/src/main/resources/mapper/scm/po/PoOrderItemsMapper.xml delete mode 100644 bd-business/bd-business-scm/src/main/resources/mapper/scm/po/PoOrderMapper.xml delete mode 100644 bd-business/bd-business-scm/src/main/resources/mapper/scm/pub/ScmItemSpecsMapper.xml delete mode 100644 bd-business/bd-business-scm/src/main/resources/mapper/scm/pub/ScmOrderApproveLogMapper.xml delete mode 100644 bd-business/bd-business-scm/src/main/resources/mapper/scm/purchase/IcPurchaseinBMapper.xml delete mode 100644 bd-business/bd-business-scm/src/main/resources/mapper/scm/purchase/IcPurchaseinHMapper.xml delete mode 100644 bd-business/bd-business-scm/src/main/resources/mapper/scm/sale/IcDelSaleLogMapper.xml delete mode 100644 bd-business/bd-business-scm/src/main/resources/mapper/scm/sale/IcSaleoutBMapper.xml delete mode 100644 bd-business/bd-business-scm/src/main/resources/mapper/scm/sale/IcSaleoutHMapper.xml delete mode 100644 bd-business/bd-business-scm/src/main/resources/mapper/scm/trans/IcTransInBMapper.xml delete mode 100644 bd-business/bd-business-scm/src/main/resources/mapper/scm/trans/IcTransInHMapper.xml delete mode 100644 bd-business/bd-business-scm/src/main/resources/mapper/scm/trans/IcTransOutBMapper.xml delete mode 100644 bd-business/bd-business-scm/src/main/resources/mapper/scm/trans/IcTransOutHMapper.xml delete mode 100644 bd-business/bd-business-scm/src/main/resources/mapper/scm/trans/TransferOrderItemsMapper.xml delete mode 100644 bd-business/bd-business-scm/src/main/resources/mapper/scm/trans/TransferOrderMapper.xml delete mode 100644 bd-business/bd-business-scm/src/main/resources/mapper/scm/warn/IcWarnConfigMapper.xml delete mode 100644 bd-business/bd-business-scm/src/main/resources/mapper/scm/warn/IcWarnConfigSpecsMapper.xml delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/api/ApiHoAdvertBannerController.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/api/ApiHoBackgroundController.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/api/ApiHoEnterpriseMissionController.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/api/ApiHoEnterpriseNewsController.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/api/ApiHoEnterpriseStyleController.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/api/ApiHoGlobalCompanyController.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/api/ApiHoMemoirHonorController.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/api/ApiHoMemoirProcessController.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/api/ApiHoProductDetailsController.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/api/ApiHoVrAreaController.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/api/ApiRegionDistributeController.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/manage/HoAdvertBannerController.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/manage/HoBackgroundController.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/manage/HoEnterpriseMissionController.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/manage/HoEnterpriseNewsController.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/manage/HoEnterpriseStyleController.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/manage/HoGlobalCompanyController.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/manage/HoMemoirHonorController.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/manage/HoMemoirProcessController.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/manage/HoProductDetailsController.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/manage/HoRegionDistributeController.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/manage/HoRegionDistributeItemController.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/manage/HoVrAreaController.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/mapper/HoAdvertBannerMapper.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/mapper/HoBackgroundMapper.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/mapper/HoEnterpriseMissionMapper.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/mapper/HoEnterpriseNewsMapper.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/mapper/HoEnterpriseStyleMapper.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/mapper/HoGlobalCompanyMapper.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/mapper/HoMemoirHonorMapper.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/mapper/HoMemoirProcessMapper.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/mapper/HoProductDetailsMapper.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/mapper/HoRegionDistributeItemMapper.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/mapper/HoRegionDistributeMapper.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/mapper/HoVrAreaMapper.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/param/HoArticleParam.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/param/HoLeaderParam.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/param/HoLeaderTitleParam.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/param/HoProductDetailsParam.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/param/HoProductRangeParam.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/param/HoRegionDistributeParam.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/IHoAdvertBannerService.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/IHoBackgroundService.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/IHoEnterpriseMissionService.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/IHoEnterpriseNewsService.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/IHoEnterpriseStyleService.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/IHoGlobalCompanyService.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/IHoMemoirHonorService.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/IHoMemoirProcessService.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/IHoProductDetailsService.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/IHoRegionDistributeItemService.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/IHoRegionDistributeService.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/IHoVrAreaService.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/impl/HoAdvertBannerServiceImpl.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/impl/HoBackgroundServiceImpl.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/impl/HoEnterpriseMissionServiceImpl.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/impl/HoEnterpriseNewsServiceImpl.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/impl/HoEnterpriseStyleServiceImpl.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/impl/HoGlobalCompanyServiceImpl.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/impl/HoMemoirHonorServiceImpl.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/impl/HoMemoirProcessServiceImpl.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/impl/HoProductDetailsServiceImpl.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/impl/HoRegionDistributeItemServiceImpl.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/impl/HoRegionDistributeServiceImpl.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/impl/HoVrAreaServiceImpl.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/vo/HoEnterpriseMissionVO.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/vo/HoEnterpriseNewsVO.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/vo/HoEnterpriseStyleVO.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/vo/HoGlobalCompanyVO.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/vo/HoMemoirHonorVO.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/vo/HoMemoirProcessVO.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/vo/HoProductDetailsVO.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/home/vo/HoVrAreaVO.java delete mode 100644 bd-business/bd-business-system/src/main/resources/mapper/system/home/HoAdvertBannerMapper.xml delete mode 100644 bd-business/bd-business-system/src/main/resources/mapper/system/home/HoBackgroundMapper.xml delete mode 100644 bd-business/bd-business-system/src/main/resources/mapper/system/home/HoEnterpriseMissionMapper.xml delete mode 100644 bd-business/bd-business-system/src/main/resources/mapper/system/home/HoEnterpriseNewsMapper.xml delete mode 100644 bd-business/bd-business-system/src/main/resources/mapper/system/home/HoEnterpriseStyleMapper.xml delete mode 100644 bd-business/bd-business-system/src/main/resources/mapper/system/home/HoGlobalCompanyMapper.xml delete mode 100644 bd-business/bd-business-system/src/main/resources/mapper/system/home/HoMemoirHonorMapper.xml delete mode 100644 bd-business/bd-business-system/src/main/resources/mapper/system/home/HoMemoirProcessMapper.xml delete mode 100644 bd-business/bd-business-system/src/main/resources/mapper/system/home/HoProductDetailsMapper.xml delete mode 100644 bd-business/bd-business-system/src/main/resources/mapper/system/home/HoRegionDistributeItemMapper.xml delete mode 100644 bd-business/bd-business-system/src/main/resources/mapper/system/home/HoRegionDistributeMapper.xml delete mode 100644 bd-business/bd-business-system/src/main/resources/mapper/system/home/HoVrAreaMapper.xml delete mode 100644 bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/ScmFieldConstants.java delete mode 100644 bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ScmMsgConstants.java delete mode 100644 bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EInventoryType.java delete mode 100644 bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EScmGeneralOutStatus.java delete mode 100644 bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EScmOrderStatus.java delete mode 100644 bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EScmOrderType.java delete mode 100644 bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EScmTransferType.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaOrderRelationItems.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/general/IcGeneralInB.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/general/IcGeneralInH.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/general/IcGeneralOutB.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/general/IcGeneralOutH.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/general/ext/IcGeneralInBExt.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/general/ext/IcGeneralInHExt.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/general/ext/IcGeneralOutBExt.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/general/ext/IcGeneralOutHExt.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/IcAvailableNum.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/IcAvailableSpecs.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/IcBatchCode.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/IcOnHandNum.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/IcOnHandNumB.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/IcOnHandSpecs.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/ext/IcAvailableNumExt.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/ext/IcBatchCodeExt.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/ext/IcOnHandNumExt.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/inventory/IcInventoryB.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/inventory/IcInventoryH.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/inventory/ext/IcInventoryBExt.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/inventory/ext/IcInventoryHExt.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/io/IoOrder.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/io/IoOrderItems.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/io/ext/IoOrderExt.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/io/ext/IoOrderItemsExt.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/no/ScmBillNo.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/po/PoOrder.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/po/PoOrderItems.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/po/ext/PoOrderExt.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/po/ext/PoOrderItemsExt.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/postage/ThSupplierPostage.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/postage/ext/ThSupplierPostageExt.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/pub/ScmItemSpecs.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/pub/ScmOrderApproveLog.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/pub/ext/ScmItemSpecsExt.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/purchase/IcPurchaseInB.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/purchase/IcPurchaseInH.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/purchase/ext/IcPurchaseInBExt.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/purchase/ext/IcPurchaseInHExt.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/sale/IcDelSaleLog.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/sale/IcSaleoutB.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/sale/IcSaleoutH.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/sale/ext/IcSaleoutBExt.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/sale/ext/IcSaleoutHExt.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/th/ThApprovalLog.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/th/ThProduct.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/th/ThProductExtend.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/th/ThProductSpecs.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/trans/IcTransInB.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/trans/IcTransInH.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/trans/IcTransOutB.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/trans/IcTransOutH.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/trans/TransferOrder.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/trans/TransferOrderItems.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/trans/ext/IcTransInBExt.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/trans/ext/IcTransInHExt.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/trans/ext/IcTransOutBExt.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/trans/ext/IcTransOutHExt.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/trans/ext/TransferOrderExt.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/trans/ext/TransferOrderItemsExt.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/warn/IcWarnConfig.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/warn/IcWarnConfigSpecs.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/warn/ext/IcWarnConfigExt.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/ext/HoAdvertBannerExt.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/ext/HoEnterpriseMissionExt.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/ext/HoGlobalCompanyExt.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/ext/HoMemoirProcessExt.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/home/HoAdvertBanner.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/home/HoBackground.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/home/HoEnterpriseMission.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/home/HoEnterpriseNews.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/home/HoEnterpriseStyle.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/home/HoGlobalCompany.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/home/HoMemoirHonor.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/home/HoMemoirProcess.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/home/HoProductDetails.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/home/HoRegionDistribute.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/home/HoRegionDistributeItem.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/home/HoVrArea.java delete mode 100644 bd-third/src/main/java/com/hzs/third/mqcall/listener/IcAvailableNumBackListener.java delete mode 100644 bd-third/src/main/java/com/hzs/third/mqcall/listener/IcAvailableNumListener.java diff --git a/README.md b/README.md index b946ea2f..ea7aadf4 100644 --- a/README.md +++ b/README.md @@ -7,19 +7,17 @@ bd-api-bonus -- 奖金服务接口以及RPC传输数据DTO实体 bd-api-member -- 会员服务接口以及RPC传输数据DTO实体 bd-api-report -- 报表服务接口以及RPC传输数据DTO实体 - bd-api-sale -- 销售、供应链服务接口以及RPC传输数据DTO实体 + bd-api-sale -- 销售服务接口以及RPC传输数据DTO实体 bd-api-system -- 系统基础服务接口以及RPC传输数据DTO实体 bd-api-third -- 三方服务接口以及RPC传输数据DTO实体 ### hzs-business（业务相关服务） - hzs-business-activity -- 活动服务（所有活动等） 8095 hzs-business-bonus -- 奖金服务（奖金计算等） 8098 hzs-business-common -- 业务服务公共类(工具类) hzs-business-member -- 会员服务（会员、账户、银行等） 8092 hzs-business-report -- 报表服务（统计分析、仪表盘等） 8097 - hzs-business-sale -- 销售服务（订单、商品、邮费、仓库进销存等） 8093 + hzs-business-sale -- 销售服务（订单、商品、邮费等） 8093 hzs-business-system -- 系统基础服务（基础配置、自定义配置等） 8091 - hzs-business-scm -- 进销存服务（进销存功能等） 8099 ### hzs-common（基础公用组件） hzs-common-core -- 核心公用组件、缓存操作等 diff --git a/bd-api/bd-api-member/src/main/java/com/hzs/member/base/IMemberLevelServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/base/IMemberLevelServiceApi.java deleted file mode 100644 index 4b066ccd..00000000 --- a/bd-api/bd-api-member/src/main/java/com/hzs/member/base/IMemberLevelServiceApi.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.hzs.member.base; - -import com.hzs.common.core.domain.R; -import com.hzs.common.domain.member.detail.CuMemberLevel; - -import java.util.List; - -/** - * @Description: 会员等级相关dubbo服务 - * @Author: jiang chao - * @Time: 2025/2/27 9:25 - * @Classname: IMemberLevelServiceApi - * @PackageName: com.hzs.member.base - */ -public interface IMemberLevelServiceApi { - - /** - * 获取会员升级记录 - * - * @param pkMember 会员ID - * @param pkOrder 订单ID -- 可为空 - * @return - */ - R> listMemberLevel(Long pkMember, Long pkOrder); - -} diff --git a/bd-api/bd-api-scm/pom.xml b/bd-api/bd-api-scm/pom.xml deleted file mode 100644 index dfcd0623..00000000 --- a/bd-api/bd-api-scm/pom.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - 4.0.0 - - - com.bd - bd-api - 1.2.0-SNAPSHOT - - - bd-api-scm - - - bd-api-scm进销存服务 - - - - - - com.bd - bd-api-system - - - com.bd - bd-common-domain - - - - - diff --git a/bd-api/bd-api-scm/src/main/java/com/hzs/scm/product/IBdProductBasSpecsServiceApi.java b/bd-api/bd-api-scm/src/main/java/com/hzs/scm/product/IBdProductBasSpecsServiceApi.java deleted file mode 100644 index fea2497e..00000000 --- a/bd-api/bd-api-scm/src/main/java/com/hzs/scm/product/IBdProductBasSpecsServiceApi.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.hzs.scm.product;/** - * @Description: - * @Author: yuhui - * @Time: 2023/11/23 18:28 - * @Classname: IBdProductBasSpecsServiceApi - * @PackageName: com.hzs.scm.product - */ - -import com.hzs.common.core.domain.R; -import com.hzs.common.domain.sale.product.BdProductBas; -import com.hzs.common.domain.sale.product.BdProductBasSpecs; - -import java.util.List; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.scm.product - *@Author: yh - *@CreateTime: 2023-11-23 18:28 - *@Description: TODO - *@Version: 1.0 - */ -public interface IBdProductBasSpecsServiceApi { - - - /** - * 新增 - * @param productBasSpecsList - * @return - */ - R saveAll(List productBasSpecsList); - - /** - * 删除 （根据pkProductBas删除） - * @param pkProductBasList - * @return - */ - R removeByPkProductBasList(List pkProductBasList); - - -} diff --git a/bd-api/bd-api-scm/src/main/java/com/hzs/scm/product/IProductBasServiceApi.java b/bd-api/bd-api-scm/src/main/java/com/hzs/scm/product/IProductBasServiceApi.java deleted file mode 100644 index 1bf46f55..00000000 --- a/bd-api/bd-api-scm/src/main/java/com/hzs/scm/product/IProductBasServiceApi.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.hzs.scm.product; - -import com.hzs.common.core.domain.R; -import com.hzs.common.domain.sale.product.BdProductBas; -import com.hzs.scm.product.dto.ProductBasDTO; - -import java.util.List; - -/** - * @Description: - * @Author: yuhui - * @Time: 2023/11/23 17:59 - * @Classname: IProductBasServiceApi - * @PackageName: com.hzs.scm.product - */ -public interface IProductBasServiceApi { - - - /** - * 批量新增 - * @param productBas - * @return - */ - R save(BdProductBas productBas); - - /** - * 根据id 修改 - */ - R updateById(BdProductBas productBas); - - /** - * 根据id 查询 - * @return - */ - R getProductBasById(Integer pkId); - - /** - * 根据产品编号 查询 - * @return - */ - R getProductBasByProductCode(String productCode); - - -} diff --git a/bd-api/bd-api-scm/src/main/java/com/hzs/scm/product/dto/ProductBasDTO.java b/bd-api/bd-api-scm/src/main/java/com/hzs/scm/product/dto/ProductBasDTO.java deleted file mode 100644 index 1252ad99..00000000 --- a/bd-api/bd-api-scm/src/main/java/com/hzs/scm/product/dto/ProductBasDTO.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.hzs.scm.product.dto;/** - * @Description: - * @Author: yuhui - * @Time: 2023/11/23 18:04 - * @Classname: ProductDTO - * @PackageName: com.hzs.scm.product.provider.dto - */ - -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.scm.product.provider.dto - *@Author: yh - *@CreateTime: 2023-11-23 18:04 - *@Description: TODO - *@Version: 1.0 - */ -@Data -public class ProductBasDTO implements Serializable { - /** - * 主键 - */ - - private Integer pkId; - - /** - * 产品编号 - */ - - private String productCode; - - /** - * 产品名称 - */ - - private String productName; - - /** - * 规格分类 - */ - - private Integer pkClassify; - - /** - * 单位 来源于枚举：单位 - */ - - private Integer unit; - - /** - * 重量 以千克作为单位 - */ - - private BigDecimal weight; - - /** - * 长 以厘米作为单位 - */ - - private BigDecimal length; - - /** - * 宽 以厘米作为单位 - */ - - private BigDecimal width; - - /** - * 高 以厘米作为单位 - */ - - private BigDecimal height; - - /** - * 封面图 - */ - - private String cover; - - /** - * 保质期 - */ - - private Integer shelfLife; - -} diff --git a/bd-api/bd-api-scm/src/main/java/com/hzs/scm/pub/IScmBillServiceApi.java b/bd-api/bd-api-scm/src/main/java/com/hzs/scm/pub/IScmBillServiceApi.java deleted file mode 100644 index 8844d7b9..00000000 --- a/bd-api/bd-api-scm/src/main/java/com/hzs/scm/pub/IScmBillServiceApi.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.hzs.scm.pub; - -import com.hzs.common.core.domain.R; -import com.hzs.common.core.enums.EApprovalBusiness; -import com.hzs.common.domain.sale.ext.SaOrderExt; -import com.hzs.common.domain.scm.ic.IcAvailableNum; -import com.hzs.common.domain.scm.ic.ext.IcAvailableNumExt; -import com.hzs.scm.pub.dto.BillDTO; -import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; - -import java.util.List; - -/** - * 供应链单据对外接口发布 - */ -public interface IScmBillServiceApi { - - /** - * 活动服务信息处理回调 - * - * @param approvalBusinessResultDTO 参数 - * @return - */ - R approvalCallback(ApprovalBusinessResultDTO approvalBusinessResultDTO); - - /** - * 查询单据信息 - */ - R> queryBillDtoByCondition(EApprovalBusiness eApprovalBusiness, String businessCode); - - /** - * 更新可用量 - */ - R updateDeductIcAvailableNumByList(List availableNumList); - - /** - * 撤单、退单回退可用量 - */ - R backSaOrderAvailable(SaOrderExt saOrderExt); -} diff --git a/bd-api/bd-api-scm/src/main/java/com/hzs/scm/pub/dto/BillDTO.java b/bd-api/bd-api-scm/src/main/java/com/hzs/scm/pub/dto/BillDTO.java deleted file mode 100644 index cecc8a70..00000000 --- a/bd-api/bd-api-scm/src/main/java/com/hzs/scm/pub/dto/BillDTO.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.hzs.scm.pub.dto; - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -/** - * @description: 单据主表表头 - * @author: sui q - * @time: 2023/11/25 09:23 - * @classname: BillDTO - * @package_name: com.hzs.scm.ic.dto - * version 1.0.0 - */ -@Data -public class BillDTO implements Serializable { - - /** - * 主键 - */ - private Long pkId; - - /** - * 采购部门 - */ - private Integer pkDept; - - /** - * 部门名称 - */ - private String deptName; - - /** - * 仓库管理员 - */ - private Long pkWhsmanager; - - /** - * 管理员名称 - */ - private String managerName; - - /** - * 供应商 取bd_cubasdoc 类型为1 2的 - */ - private Integer pkCubasdoc; - - /** - * 供应商名称 - */ - private String cubasdocName; - - /** - * 仓库 - */ - private Integer pkStorehouse; - - /** - * 仓库名称 - */ - private String storehouseName; - - /** - * 订单日期 2023-10 - */ - private String orderDate; - - /** - * 订单状态 EPoOrderStatus 1=已保存 2=已提交 3=已审核 4=已收货 5=已关闭 - */ - private Integer orderStatus; - - /** - * 退货状态 0=是 1=否 - */ - private Integer returnStatus; - - /** - * 采购组织 - */ - private Integer pkCorp; - - /** - * 采购组织名称 - */ - private String corpName; - - /** - * 总数量 - */ - private BigDecimal totalNum; - - /** - * 订单编号 - */ - private String orderCode; - - /** - * 退货理由 - */ - private String returnReason; - - private List billDtoList; -} diff --git a/bd-api/bd-api-scm/src/main/java/com/hzs/scm/pub/dto/BillItemDTO.java b/bd-api/bd-api-scm/src/main/java/com/hzs/scm/pub/dto/BillItemDTO.java deleted file mode 100644 index d3cf2960..00000000 --- a/bd-api/bd-api-scm/src/main/java/com/hzs/scm/pub/dto/BillItemDTO.java +++ /dev/null @@ -1,158 +0,0 @@ -package com.hzs.scm.pub.dto; - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -/** - * @description: 单据明细表 - * @author: sui q - * @time: 2023/11/25 09:23 - * @classname: BillItemDTO - * @package_name: com.hzs.scm.ic.dto - * version 1.0.0 - */ -@Data -public class BillItemDTO implements Serializable { - - /** - * 主键 - */ - private Long pkId; - - /** - * 单位 - */ - private Integer pkUnit; - - /** - * 单位名称 - */ - private String unitName; - - /** - * 采购订单主键 - */ - private Long pkPoOrder; - - /** - * 采购订单明细主键 - */ - private Long pkPoOrderItems; - - /** - * 主表主键 - */ - private Long pkPurchase; - - /** - * 货位 - */ - private Integer pkClocation; - - /** - * 货位名称 - */ - private String clocationName; - - /** - * 产品基础信息主键 - */ - private Integer pkProductBas; - - /** - * 产品信息主键 - */ - private Integer pkProduct; - - /** - * 产品编号 - */ - private String productCode; - - /** - * 产品名称 - */ - private String productName; - - /** - * 规格名称 - */ - private String specsName; - - /** - * 入库日期 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date bizDate; - - /** - * 出入口类型 1=入库 2=出库 - */ - private Integer transType; - - /** - * 仓库 - */ - private Integer pkStorehouse; - - /** - * 仓库名称 - */ - private String storehouseName; - - /** - * 汇率 - */ - private Integer pkRate; - - /** - * 数量 - */ - private BigDecimal nnum; - - /** - * 无税单价 - */ - private BigDecimal norigprice; - - /** - * 税率 - */ - private BigDecimal ntaxrate; - - /** - * 含税单价 = 无税单价*（1+税率） - */ - private BigDecimal norigtaxprice; - - /** - * 无税金额 = 无税单价*数量 - */ - private BigDecimal norigmny; - - /** - * 税额 =无税单价*数量 - */ - private BigDecimal ntax; - - /** - * 价税合计 含税单价*数量 - */ - private BigDecimal norigtaxmny; - - /** - * 批次主键 - */ - private Long pkBatchCode; - - private String batchCode; - - /** - * 是否赠品 - */ - private Integer isGift; -} diff --git a/bd-api/bd-api-scm/src/main/java/com/hzs/scm/pub/dto/DeliverDTO.java b/bd-api/bd-api-scm/src/main/java/com/hzs/scm/pub/dto/DeliverDTO.java deleted file mode 100644 index 028bdea4..00000000 --- a/bd-api/bd-api-scm/src/main/java/com/hzs/scm/pub/dto/DeliverDTO.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.hzs.scm.pub.dto; - -import com.hzs.system.sys.dto.LoginUser; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.util.List; - -/** - * @Description: 发货推送MQ数据 - * @Author: jiang chao - * @Time: 2023/12/19 14:16 - * @Classname: DeliverDTO - * @PackageName: com.hzs.scm.pub.dto - */ -@NoArgsConstructor -@AllArgsConstructor -@Builder -@Data -public class DeliverDTO implements Serializable { - - /** - * 发货单ID列表 - */ - private List deliverIdList; - - /** - * 登录用户 - */ - private LoginUser loginUser; - -} diff --git a/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/IBusinessLogApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/IBusinessLogApi.java index 7b60a2d9..4f857b84 100644 --- a/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/IBusinessLogApi.java +++ b/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/IBusinessLogApi.java @@ -6,11 +6,7 @@ import com.hzs.system.sys.dto.BusinessLogDTO; import java.util.List; /** - * @Description: 业务操作明细接口 - * @Author: jiang chao - * @Time: 2023/8/3 18:14 - * @Classname: IBusinessLogApi - * @PackageName: com.hzs.system.sys + * 业务操作明细接口 */ public interface IBusinessLogApi { diff --git a/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/ICubasdocApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/ICubasdocApi.java index 31e9ab5e..4f118e4e 100644 --- a/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/ICubasdocApi.java +++ b/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/ICubasdocApi.java @@ -3,17 +3,11 @@ package com.hzs.system.sys; import com.hzs.common.core.domain.R; import com.hzs.system.sys.dto.CubasdocDTO; -/** - * @Description: - * @Author: yuhui - * @Time: 2024/5/8 16:05 - * @Classname: ICubasdocApi - * @PackageName: com.hzs.system.sys - */ public interface ICubasdocApi { /** * 根据id 查询 + * * @return */ R getCubasdoc(Integer pkCubasdoc); diff --git a/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/IMenuColumnServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/IMenuColumnServiceApi.java index 7a2aa12b..6f24442e 100644 --- a/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/IMenuColumnServiceApi.java +++ b/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/IMenuColumnServiceApi.java @@ -6,11 +6,7 @@ import java.util.List; import java.util.Map; /** - * @Description: 菜单列服务 - * @Author: jiang chao - * @Time: 2023/6/8 11:21 - * @Classname: IMenuColumnServiceApi - * @PackageName: com.hzs.system.sys + * 菜单列服务 */ public interface IMenuColumnServiceApi { diff --git a/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/IOperationLogServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/IOperationLogServiceApi.java index d1f1c24d..57d0267b 100644 --- a/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/IOperationLogServiceApi.java +++ b/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/IOperationLogServiceApi.java @@ -4,11 +4,7 @@ import com.hzs.common.core.domain.R; import com.hzs.common.domain.system.sys.SysOperationLog; /** - * Description: 后台操作日志服务接口 - * Author: jiang chao - * Time: 2022/9/14 15:48 - * Classname: IOperationLogService - * PackageName: com.hzs.system.sys + * 后台操作日志服务接口 */ public interface IOperationLogServiceApi { diff --git a/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/BusinessLogDTO.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/BusinessLogDTO.java index 53642b2c..3a165adf 100644 --- a/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/BusinessLogDTO.java +++ b/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/BusinessLogDTO.java @@ -8,11 +8,7 @@ import lombok.NoArgsConstructor; import java.io.Serializable; /** - * @Description: 业务操作日志DTO - * @Author: jiang chao - * @Time: 2023/8/2 11:30 - * @Classname: BusinessLogDTO - * @PackageName: com.hzs.system.sys.dto + * 业务操作日志DTO */ @Builder @NoArgsConstructor diff --git a/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/CubasdocDTO.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/CubasdocDTO.java index b837f390..a9134761 100644 --- a/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/CubasdocDTO.java +++ b/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/CubasdocDTO.java @@ -1,13 +1,5 @@ -package com.hzs.system.sys.dto;/** - * @Description: - * @Author: yuhui - * @Time: 2024/5/8 16:06 - * @Classname: CubasdocDTO - * @PackageName: com.hzs.system.sys.dto - */ +package com.hzs.system.sys.dto; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -15,14 +7,6 @@ import lombok.NoArgsConstructor; import java.io.Serializable; -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.system.sys.dto - *@Author: yh - *@CreateTime: 2024-05-08 16:06 - *@Description: TODO - *@Version: 1.0 - */ @Builder @NoArgsConstructor @AllArgsConstructor diff --git a/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/ThaliConfigDTO.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/ThaliConfigDTO.java deleted file mode 100644 index 086d99ad..00000000 --- a/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/ThaliConfigDTO.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.hzs.system.sys.dto; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.math.BigDecimal; - -/** - * @Description: 能量仓套餐DTO - * @Author: jiang chao - * @Time: 2023/8/10 17:53 - * @Classname: ThaliConfigDTO - * @PackageName: com.hzs.system.sys.dto - */ -@NoArgsConstructor -@AllArgsConstructor -@Builder -@Data -public class ThaliConfigDTO implements Serializable { - - private static final long serialVersionUID = 3316294777261662729L; - - /** - * 套餐ID - */ - private Integer pkId; - - /** - * 三方套餐ID - */ - private Long packageId; - - /** - * 套餐时长 - */ - private Integer time; - - /** - * 套餐价格 - */ - private BigDecimal price; - -} diff --git a/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/UserAuthorityDTO.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/UserAuthorityDTO.java index 97bb528e..d5c39956 100644 --- a/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/UserAuthorityDTO.java +++ b/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/UserAuthorityDTO.java @@ -9,11 +9,7 @@ import java.io.Serializable; import java.util.List; /** - * @Description: 用户权限DTO - * @Author: jiang chao - * @Time: 2023/5/22 14:37 - * @Classname: UserAuthorityDTO - * @PackageName: com.hzs.system.sys.dto + * 用户权限DTO */ @NoArgsConstructor @AllArgsConstructor diff --git a/bd-api/bd-api-third/src/main/java/com/hzs/third/cabin/ICabinThirdServiceApi.java b/bd-api/bd-api-third/src/main/java/com/hzs/third/cabin/ICabinThirdServiceApi.java deleted file mode 100644 index 6ea88447..00000000 --- a/bd-api/bd-api-third/src/main/java/com/hzs/third/cabin/ICabinThirdServiceApi.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.hzs.third.cabin; - -import com.hzs.common.core.domain.R; -import com.hzs.third.cabin.dto.CabinDeviceOpenDTO; -import com.hzs.third.cabin.dto.CabinInfoDTO; -import com.hzs.third.cabin.dto.CabinPackageDTO; - -/** - * @Description: 能量仓dubbo服务 - * @Author: jiang chao - * @Time: 2023/8/10 18:19 - * @Classname: ICabinServiceApi - * @PackageName: com.hzs.third.cabin - */ -public interface ICabinThirdServiceApi { - - /** - * 新增、编辑套餐 - * - * @param dto 套餐数据 - * @return - */ - R packageSave(CabinPackageDTO dto); - - /** - * 设备详情 - * - * @param dto 查询设备DTO - * @return - */ - R deviceInfo(CabinInfoDTO dto); - - /** - * 设备开机 - * - * @param dto 开机数据 - * @return - */ - R deviceOpen(CabinDeviceOpenDTO dto); - -} diff --git a/bd-api/bd-api-third/src/main/java/com/hzs/third/cabin/dto/CabinDeviceOpenDTO.java b/bd-api/bd-api-third/src/main/java/com/hzs/third/cabin/dto/CabinDeviceOpenDTO.java deleted file mode 100644 index a2e5de58..00000000 --- a/bd-api/bd-api-third/src/main/java/com/hzs/third/cabin/dto/CabinDeviceOpenDTO.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.hzs.third.cabin.dto; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; - -/** - * @Description: 能量仓开机 - * @Author: jiang chao - * @Time: 2023/8/10 18:59 - * @Classname: CabinDeviceOpen - * @PackageName: com.hzs.third.cabin.dto - */ -@NoArgsConstructor -@AllArgsConstructor -@Builder -@Data -public class CabinDeviceOpenDTO implements Serializable { - - private static final long serialVersionUID = -5408924484380798929L; - - /** - * 套餐ID（必传） - */ - private Long packageId; - - /** - * 设备code（必传） - */ - private String serialNumber; - -} diff --git a/bd-api/bd-api-third/src/main/java/com/hzs/third/cabin/dto/CabinInfoDTO.java b/bd-api/bd-api-third/src/main/java/com/hzs/third/cabin/dto/CabinInfoDTO.java deleted file mode 100644 index 59f355be..00000000 --- a/bd-api/bd-api-third/src/main/java/com/hzs/third/cabin/dto/CabinInfoDTO.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.hzs.third.cabin.dto; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.util.Date; - -/** - * @Description: 能量仓详情DTO - * @Author: jiang chao - * @Time: 2023/8/11 9:54 - * @Classname: CabinInfoDTO - * @PackageName: com.hzs.third.cabin.dto - */ -@NoArgsConstructor -@AllArgsConstructor -@Builder -@Data -public class CabinInfoDTO implements Serializable { - - private static final long serialVersionUID = 3023891457338964400L; - - /** - * 店铺ID（必传） - */ - private Long storeId; - /** - * 设备编号（必传） - */ - private String serialNumber; - - //////////////////// 返回参数 //////////////////// - - /** - * 设备ID - */ - private Long id; - /** - * 设备名称 - */ - private String name; - /** - * 设备型号 - */ - private String type; - /** - * 设备地址 - */ - private String address; - /** - * 运行状态（0=未使用，1=运行中，2=暂停（老设备使用）） - */ - private Integer runState; - /** - * 最后开启时间（直接是年月日时分秒，2023-08-11 10:21:22） - */ - private Date lastOpenTime; - /** - * 最后的套餐时⻓ - */ - private Integer lastOpenDuration; - /** - * 设备类型（1=4G，2=蓝⽛，3=4G&蓝⽛，4=mqtt） - */ - private Integer deviceType; - /** - * mqtt 通信是否在线（0=不是，1=是） - */ - private Integer mqttType; - /** - * mqtt 最后一次通信信息（100623010008,0,0,0,0,0,0,1,18,235,1691987769 -- 设备号，剩余工作时长，当前能量，当前能将，蜂鸣器，工作状态，错误码，网络状态，网络信号值，校验位要，秒级时间戳） - */ - private String mqttInfo; - /** - * 备注 - */ - private String memo; - -} diff --git a/bd-api/bd-api-third/src/main/java/com/hzs/third/cabin/dto/CabinPackageDTO.java b/bd-api/bd-api-third/src/main/java/com/hzs/third/cabin/dto/CabinPackageDTO.java deleted file mode 100644 index 67870836..00000000 --- a/bd-api/bd-api-third/src/main/java/com/hzs/third/cabin/dto/CabinPackageDTO.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.hzs.third.cabin.dto; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.math.BigDecimal; - -/** - * @Description: 能量仓套餐DTO - * @Author: jiang chao - * @Time: 2023/8/10 18:20 - * @Classname: CabinPackageDTO - * @PackageName: com.hzs.third.cabin.dto - */ -@NoArgsConstructor -@AllArgsConstructor -@Builder -@Data -public class CabinPackageDTO implements Serializable { - - private static final long serialVersionUID = 7406391624983226295L; - - /** - * 三方套餐ID（新增不传，修改传） - */ - private Long packageId; - - /** - * 套餐名称（必传） - */ - private String packageName; - - /** - * 套餐时长（必传） - */ - private Integer unitTime; - - /** - * 套餐金额（不需要传，默认按0元处理） - */ - private BigDecimal unitPrice; - -} diff --git a/bd-api/bd-api-third/src/main/java/com/hzs/third/pay/IOnlineServiceApi.java b/bd-api/bd-api-third/src/main/java/com/hzs/third/pay/IOnlineServiceApi.java deleted file mode 100644 index b67189df..00000000 --- a/bd-api/bd-api-third/src/main/java/com/hzs/third/pay/IOnlineServiceApi.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.hzs.third.pay; - -import com.hzs.common.core.domain.R; -import com.hzs.common.core.enums.EApprovalBusiness; -import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; - -/** - * @Description: 在线支付等dubbo服务api - * @Author: jiang chao - * @Time: 2023/4/7 18:08 - * @Classname: IOnlineAgentServiceApi - * @PackageName: com.hzs.third.pay - */ -public interface IOnlineServiceApi { - - /** - * 三方服务信息处理回调 - * - * @param approvalBusinessResultDTO - * @return - */ - R approvalCallback(ApprovalBusinessResultDTO approvalBusinessResultDTO); - - /** - * 三方服务信息签呈查询 - * - * @param eApprovalBusiness 业务类型 - * @param businessCode 业务单号 - * @return - */ - R queryApprovalData(EApprovalBusiness eApprovalBusiness, String businessCode); - -} diff --git a/bd-api/pom.xml b/bd-api/pom.xml index 468a7bb0..8100a00f 100644 --- a/bd-api/pom.xml +++ b/bd-api/pom.xml @@ -34,7 +34,6 @@ bd-api-sale bd-api-system bd-api-third - bd-api-scm diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberAddressParam.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberAddressParam.java index 808b6ad0..11f64c3c 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberAddressParam.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberAddressParam.java @@ -3,11 +3,7 @@ package com.hzs.bonus.base.param; import lombok.Data; /** - * @Description: 会员地址入参 - * @Author: jiang chao - * @Time: 2023/1/18 10:19 - * @Classname: MemberAddressParam - * @PackageName: com.hzs.member.base.param + * 会员地址入参 */ @Data public class MemberAddressParam { diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/provider/MemberLevelServiceProvider.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/provider/MemberLevelServiceProvider.java deleted file mode 100644 index a7fa4e0c..00000000 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/provider/MemberLevelServiceProvider.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.hzs.member.base.provider; - -import com.hzs.common.core.domain.R; -import com.hzs.common.domain.member.detail.CuMemberLevel; -import com.hzs.member.base.IMemberLevelServiceApi; -import com.hzs.member.detail.service.ICuMemberLevelService; -import org.apache.dubbo.config.annotation.DubboService; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.List; - -/** - * @Description: 会员等级相关dubbo服务 - * @Author: jiang chao - * @Time: 2025/2/27 9:25 - * @Classname: MemberLevelServiceProvider - * @PackageName: com.hzs.member.base.provider - */ -@DubboService -public class MemberLevelServiceProvider implements IMemberLevelServiceApi { - - @Autowired - private ICuMemberLevelService iCuMemberLevelService; - - @Override - public R> listMemberLevel(Long pkMember, Long pkOrder) { - return R.ok(iCuMemberLevelService.listMemberLevel(pkMember, pkOrder)); - } -} diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberLevelService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberLevelService.java index db92ef4b..68239812 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberLevelService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberLevelService.java @@ -54,15 +54,6 @@ public interface ICuMemberLevelService extends IService { */ int insertGradeBatch(List memberGradeList); - /** - * 获取会员升级记录 - * - * @param pkMember 会员ID - * @param pkOrder 订单ID -- 可为空 - * @return - */ - List listMemberLevel(Long pkMember, Long pkOrder); - /** * 查询会员升级记录 * diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberLevelServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberLevelServiceImpl.java index 86477026..cbb74e76 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberLevelServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberLevelServiceImpl.java @@ -1,7 +1,6 @@ package com.hzs.member.detail.service.impl; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.common.core.enums.EYesNo; import com.hzs.common.domain.member.detail.CuMemberGrade; @@ -49,15 +48,6 @@ public class CuMemberLevelServiceImpl extends ServiceImpl listMemberLevel(Long pkMember, Long pkOrder) { - return this.list(Wrappers.lambdaQuery() - .eq(CuMemberLevel::getPkMember, pkMember) - .eq(null != pkOrder, CuMemberLevel::getPkOrder, pkOrder) - .orderByAsc(CuMemberLevel::getUpgradeTime) - ); - } - @Override public CuMemberLevel getLevelByGradeValue(Long pkMember, Integer gradeValue, Date queryTime, Integer pkCountry) { return baseMapper.getLevelByGradeValue(pkMember, gradeValue, queryTime, pkCountry); diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/MemberPerkQueryVO.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/MemberPerkQueryVO.java index b81f600c..4dee5c06 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/MemberPerkQueryVO.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/MemberPerkQueryVO.java @@ -11,11 +11,7 @@ import java.math.BigDecimal; import java.util.Date; /** - * @Description: 会员补配置查询返回VO - * @Author: jiang chao - * @Time: 2024/5/6 13:57 - * @Classname: MemberPerkQueryVO - * @PackageName: com.hzs.report.member.vo + * 会员补配置查询返回VO */ @Data public class MemberPerkQueryVO { @@ -87,17 +83,6 @@ public class MemberPerkQueryVO { @Excel(name = "考核类型") private String checkTypeVal; - /** - * 是否含舱（0=是，1=否） - */ - @Transaction(transactionKey = EnumsPrefixConstants.YES_NO) - private Integer containCabin; - /** - * 是否含舱显示 - */ - @Excel(name = "是否含舱") - private String containCabinVal; - /** * 是否扣除政策币（0=是，1=否） */ diff --git a/bd-business/bd-business-sale/pom.xml b/bd-business/bd-business-sale/pom.xml index da5b6533..f558c0a7 100644 --- a/bd-business/bd-business-sale/pom.xml +++ b/bd-business/bd-business-sale/pom.xml @@ -46,11 +46,6 @@ com.bd bd-api-bonus - - - com.bd - bd-api-scm - diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/impl/ActivityServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/impl/ActivityServiceImpl.java index f29462f9..b2e15b07 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/impl/ActivityServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/impl/ActivityServiceImpl.java @@ -776,7 +776,7 @@ public class ActivityServiceImpl implements IActivityService { @Override public List generateActivityGiftWaresAchieve(Integer specialArea, Integer pkCountry, List bdWaresDetailExtList, String parentCode, CuMember cuMember) { - // 兼容进销存处理，没有数据 + // 兼容没有数据 bdWaresDetailExtList = bdWaresDetailExtList.stream().filter(bdWaresDetailExt -> null != bdWaresDetailExt.getPkWares()).collect(Collectors.toList()); // 商品赠送 diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/service/impl/SaDeliverBusinessServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/service/impl/SaDeliverBusinessServiceImpl.java index e3e1857f..ddd520cc 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/service/impl/SaDeliverBusinessServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/service/impl/SaDeliverBusinessServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.hzs.common.core.constant.RabbitMqConstants; import com.hzs.common.core.constant.msg.CommonMsgConstants; import com.hzs.common.core.constant.msg.DocumentMsgConstants; import com.hzs.common.core.domain.R; @@ -29,7 +28,6 @@ import com.hzs.sale.deliver.service.ISaDeliverItemsService; import com.hzs.sale.deliver.service.ISaDeliverService; import com.hzs.sale.order.param.SelfPickUpParam; import com.hzs.sale.order.service.*; -import com.hzs.scm.pub.dto.DeliverDTO; import com.hzs.system.base.IBarCodeServiceApi; import com.hzs.system.sys.IApprovalServiceApi; import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; @@ -37,7 +35,6 @@ import com.hzs.system.sys.dto.ApprovalSubmitDTO; import com.hzs.system.sys.dto.LoginUser; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -69,8 +66,6 @@ public class SaDeliverBusinessServiceImpl implements ISaDeliverBusinessService { private ISaDeliverBarCodeService iSaDeliverBarCodeService; @Autowired private ISaOrderSelfLogService saOrderSelfLogService; - @Autowired - private RabbitTemplate rabbitTemplate; @DubboReference IApprovalServiceApi iApprovalServiceApi; @@ -333,22 +328,6 @@ public class SaDeliverBusinessServiceImpl implements ISaDeliverBusinessService { throw new ServiceException(TransactionUtils.getContent(CommonMsgConstants.APPROVAL_ERROR) + "：" + resultR.getMsg()); } } - if (saDeliver.getPkId() != null && deliverItemsList.size() > 0) { - List deliverIdList = new ArrayList<>(); - deliverIdList.add(saDeliver.getPkId()); - // 推送进销存处理数据 - rabbitTemplate.convertAndSend(RabbitMqConstants.SCM_DELIVER_EXCHANGE, RabbitMqConstants.SCM_DELIVER_KEY, DeliverDTO.builder() - .deliverIdList(deliverIdList) - .loginUser(approvalBusinessResultDTO.getLoginUser()) - .build()); - // 如果订单仓库跟提货仓库不一致，回退可用量，然后在扣减可用量 - if (saOrder.getPkStorehouse() != null && !saOrder.getPkStorehouse().equals(pkStorehouse)) { - rabbitTemplate.convertAndSend(RabbitMqConstants.AVAILABLE_NMU_BACK_EXCHANGE, RabbitMqConstants.AVAILABLE_NMU_BACK_KEY, saOrder); - saOrder.setPkStorehouse(pkStorehouse); - saOrder.setDeductFlag(Boolean.TRUE); - rabbitTemplate.convertAndSend(RabbitMqConstants.AVAILABLE_NMU_BACK_EXCHANGE, RabbitMqConstants.AVAILABLE_NMU_BACK_KEY, saOrder); - } - } return null; } log.error("订单自提同意处理失败: 更新数据失败"); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOthSaOrderController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOthSaOrderController.java index b9de71f0..4390a1af 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOthSaOrderController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOthSaOrderController.java @@ -49,10 +49,6 @@ public class ApiOthSaOrderController extends ParentOrderController { return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.REQUIRED_NOT_EMPTY)); } - if (!orderService.checkPreSalesQuantity(orderParam)) { - // 商品预售数量不足 - return AjaxResult.error(TransactionUtils.getContent(SaOrderMsgConstants.WARES_PRE_SALE_QUANTITY_LACK)); - } if (orderParam.getSpecialArea() != EOrderType.REGISTER_ORDER.getValue()) { convertShoppingCarToSku(orderParam); if (EOrderType.UPGRADE_ORDER.getValue() == orderParam.getSpecialArea() @@ -153,7 +149,6 @@ public class ApiOthSaOrderController extends ParentOrderController { // 升级订单 if (EOrderType.UPGRADE_ORDER.getValue() == orderParam.getSpecialArea()) { if (getOrderService().payUpgradeSaOrder(saOrderExt, cuMemberAccountExt)) { - getOrderService().convertAvailableNumMsg(oldOrderParam.getAvailableNumList()); return AjaxResult.success(saOrderExt); } else { return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.LEVEL_NOT_ENOUGH)); @@ -161,7 +156,6 @@ public class ApiOthSaOrderController extends ParentOrderController { } else { // 复购订单 if (getOrderService().payRepurchaseSaOrder(saOrderExt, cuMemberAccountExt)) { - getOrderService().convertAvailableNumMsg(oldOrderParam.getAvailableNumList()); return AjaxResult.success(saOrderExt); } } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiRegSaOrderController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiRegSaOrderController.java index 24bc3174..1e52e77d 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiRegSaOrderController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiRegSaOrderController.java @@ -68,11 +68,6 @@ public class ApiRegSaOrderController extends ParentOrderController { } orderParam.setSource(source); - if (!iSaOrderService.checkPreSalesQuantity(orderParam)) { - // 商品预售数量不足 - return AjaxResult.error(TransactionUtils.getContent(SaOrderMsgConstants.WARES_PRE_SALE_QUANTITY_LACK)); - } - AjaxResult result = validateSaveMember(orderParam); if ((Integer) result.get(AjaxResult.CODE_TAG) == HttpStatus.ERROR) { return result; @@ -165,7 +160,6 @@ public class ApiRegSaOrderController extends ParentOrderController { if (cuMemberAccountExt.getIsPayment()) { // 开始支付 扣款 getOrderService().payRegSaOrder(saOrderExt, newCuMember, cuMemberAccountExt, isHaiFun); - getOrderService().convertAvailableNumMsg(oldOrderParam.getAvailableNumList()); } else { if (StringUtils.isEmpty(cuMemberAccountExt.getErrorMsg())) { return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.MEMBER_BALANCE_NOT_PAY)); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderRelationItemsMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderRelationItemsMapper.java deleted file mode 100644 index 9de5b9c0..00000000 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderRelationItemsMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.hzs.sale.order.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.sale.order.SaOrderRelationItems; - -/** - *

- * Mapper 接口 - *

- * - * @author hzs - * @since 2023-03-17 - */ -public interface SaOrderRelationItemsMapper extends BaseMapper { - -} diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderRelationMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderRelationMapper.java deleted file mode 100644 index 5d3cf456..00000000 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderRelationMapper.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.hzs.sale.order.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.sale.order.SaOrderRelation; - -/** - *

- * 订单与虚拟订单关联表 Mapper 接口 - *

- * - * @author hzs - * @since 2023-03-17 - */ -public interface SaOrderRelationMapper extends BaseMapper { - - /** - * 根据订单编号查询订单关系，用于复购订单、福利订单支付页面，在线支付 - * @param orderCode 订单编号 - * @return: SaOrderRelation - * @Author: sui q - * @Date: 2023/3/17 17:49 - */ - SaOrderRelation querySaOrderRelationBySaOrder(String orderCode); -} diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/OrderParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/OrderParam.java index b2d0c0a7..a1cb7812 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/OrderParam.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/OrderParam.java @@ -2,7 +2,6 @@ package com.hzs.sale.order.param; import com.fasterxml.jackson.annotation.JsonIgnore; import com.hzs.common.core.constant.msg.MemberMsgConstants; -import com.hzs.common.domain.scm.ic.ext.IcAvailableNumExt; import com.hzs.sale.shopping.vo.ShoppingCartRedis; import com.hzs.sale.ticket.param.BuyTicketParam; import jdk.nashorn.internal.ir.annotations.Ignore; @@ -295,11 +294,6 @@ public class OrderParam implements Serializable { */ private List orderItemsParams; - /** - * 用于下单时更新可用量 - */ - private List availableNumList; - /** * 是否首单 */ diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderRelationItemsService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderRelationItemsService.java deleted file mode 100644 index b723be42..00000000 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderRelationItemsService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.hzs.sale.order.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.sale.order.SaOrderRelationItems; - -/** - *

- * 服务类 - *

- * - * @author hzs - * @since 2023-03-17 - */ -public interface ISaOrderRelationItemsService extends IService { - -} diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderRelationService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderRelationService.java deleted file mode 100644 index b336e5ef..00000000 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderRelationService.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.hzs.sale.order.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.sale.order.SaOrderRelation; - -/** - *

- * 订单与虚拟订单关联表 服务类 - *

- * - * @author hzs - * @since 2023-03-17 - */ -public interface ISaOrderRelationService extends IService { - - /** - * 根据订单编号查询订单关系，用于复购订单、福利订单支付页面，在线支付 - * @param orderCode 订单编号 - * @return: SaOrderRelation - * @Author: sui q - * @Date: 2023/3/17 17:49 - */ - SaOrderRelation querySaOrderRelationBySaOrder(String orderCode); -} diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderService.java index 0cafd5ca..ced1d7e7 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderService.java @@ -8,7 +8,6 @@ import com.hzs.common.domain.member.ext.CuMemberExt; import com.hzs.common.domain.sale.ext.*; import com.hzs.common.domain.sale.order.SaOrder; import com.hzs.common.domain.sale.order.SaOrderItems; -import com.hzs.common.domain.scm.ic.ext.IcAvailableNumExt; import com.hzs.common.domain.system.config.BdGrade; import com.hzs.sale.index.vo.CuMemberMyMarketVO; import com.hzs.sale.order.param.*; @@ -188,11 +187,6 @@ public interface ISaOrderService extends IService { Boolean payRegSaOrder(SaOrderExt saOrderExt, CuMember newCuMember, CuMemberAccountExt cuMemberAccountExt, Boolean isHaiFun); - /* - * 发送更新可用量的消息 - **/ - void convertAvailableNumMsg(List availableNumList); - /** * 支付升级订单 * @@ -573,23 +567,6 @@ public interface ISaOrderService extends IService { */ void saveSaOrderByOrderExt(SaOrderExt saOrderExt); - /** - * 校验预售库存数量是否充足 - * - * @param orderParam - * @return - */ - Boolean checkPreSalesQuantity(OrderParam orderParam); - - /** - * 扣减预售状态下预售库存使用量 - * - * @param orderCode - * @param specialArea - * @return - */ - Boolean reducePreSalesQuantity(String orderCode, Integer specialArea); - /** * 根据编号查询会员首单 * diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/OrderBusinessServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/OrderBusinessServiceImpl.java index f1af7b88..b0a8f124 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/OrderBusinessServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/OrderBusinessServiceImpl.java @@ -2646,15 +2646,6 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService { // 新旧订单的订单明细全部插入新订单中，并且变更为未删除 iSaOrderItemsService.copyDeductionItems(deductionDTO.getPkOrderOld(), deductionDTO.getPkOrderNew(), userId, nowDate); - // 推送MQ处理库存（新订单明细回退） - newOrder.setPkModified(userId); - rabbitTemplate.convertAndSend(RabbitMqConstants.AVAILABLE_NMU_BACK_EXCHANGE, RabbitMqConstants.AVAILABLE_NMU_BACK_KEY, newOrder); - - // 推送MQ处理库存（老订单明细扣减） - oldOrder.setDeductFlag(true); - oldOrder.setPkModified(userId); - rabbitTemplate.convertAndSend(RabbitMqConstants.AVAILABLE_NMU_BACK_EXCHANGE, RabbitMqConstants.AVAILABLE_NMU_BACK_KEY, oldOrder); - return null; } return "订单金额、业绩、BV存在不相同，不能进行抵扣"; diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderRelationItemsServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderRelationItemsServiceImpl.java deleted file mode 100644 index ee0d7485..00000000 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderRelationItemsServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.hzs.sale.order.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.domain.sale.order.SaOrderRelationItems; -import com.hzs.sale.order.mapper.SaOrderRelationItemsMapper; -import com.hzs.sale.order.service.ISaOrderRelationItemsService; -import org.springframework.stereotype.Service; - -/** - *

- * 服务实现类 - *

- * - * @author hzs - * @since 2023-03-17 - */ -@Service -public class SaOrderRelationItemsServiceImpl extends ServiceImpl implements ISaOrderRelationItemsService { - -} diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderRelationServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderRelationServiceImpl.java deleted file mode 100644 index f71e24e7..00000000 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderRelationServiceImpl.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.hzs.sale.order.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.domain.sale.order.SaOrderRelation; -import com.hzs.sale.order.mapper.SaOrderRelationMapper; -import com.hzs.sale.order.service.ISaOrderRelationService; -import org.springframework.stereotype.Service; - -/** - *

- * 订单与虚拟订单关联表 服务实现类 - *

- * - * @author hzs - * @since 2023-03-17 - */ -@Service -public class SaOrderRelationServiceImpl extends ServiceImpl implements ISaOrderRelationService { - - @Override - public SaOrderRelation querySaOrderRelationBySaOrder(String orderCode) { - return baseMapper.querySaOrderRelationBySaOrder(orderCode); - } -} diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java index d8c9f3d4..b7e7d233 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java @@ -6,9 +6,7 @@ import cn.hutool.crypto.SecureUtil; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.activity.pick.service.IAcRetailPickService; import com.hzs.common.core.config.BdConfig; @@ -32,7 +30,6 @@ import com.hzs.common.domain.member.ext.CuMemberExt; import com.hzs.common.domain.sale.ext.*; import com.hzs.common.domain.sale.order.*; import com.hzs.common.domain.sale.wares.BdWares; -import com.hzs.common.domain.scm.ic.ext.IcAvailableNumExt; import com.hzs.common.domain.system.base.BdCountry; import com.hzs.common.domain.system.base.ext.BdProductStorehouseExt; import com.hzs.common.domain.system.config.BdAwards; @@ -47,7 +44,6 @@ import com.hzs.member.account.dto.BusinessCommissionDTO; import com.hzs.member.account.dto.CuMemberBankParam; import com.hzs.member.account.dto.MemberAmountDTO; import com.hzs.member.achieve.IMemberAchieveServiceApi; -import com.hzs.member.base.IMemberLevelServiceApi; import com.hzs.member.base.IMemberServiceApi; import com.hzs.member.detail.ICuMemberDetailServiceApi; import com.hzs.member.detail.ICuMemberServiceLogServiceApi; @@ -88,7 +84,6 @@ import java.math.RoundingMode; import java.time.temporal.ChronoUnit; import java.util.*; import java.util.concurrent.TimeUnit; -import java.util.function.Function; import java.util.stream.Collectors; /** @@ -130,8 +125,6 @@ public class SaOrderServiceImpl extends ServiceImpl impl ICuMemberDetailServiceApi iCuMemberDetailServiceApi; @DubboReference IGradeServiceApi iGradeServiceApi; - @DubboReference - IMemberLevelServiceApi iMemberLevelServiceApi; @Autowired private IBdWaresService waresService; @@ -148,12 +141,8 @@ public class SaOrderServiceImpl extends ServiceImpl impl @Autowired private RabbitTemplate rabbitTemplate; @Autowired - private ISaOrderRelationService saOrderRelationService; - @Autowired private IBdWaresSpecsRelationService waresSpecsRelationService; @Autowired - private ISaOrderRelationItemsService saOrderRelationItemsService; - @Autowired private ISaDeliverItemsService saDeliverItemsService; @Autowired private IAcRetailPickService iAcRetailPickService; @@ -763,9 +752,6 @@ public class SaOrderServiceImpl extends ServiceImpl impl // 【休止期】普通会员6个月，奖衔会员12个月（先按6个月来，后续MQ会统一处理同姓名同手机号会员） newCuMember.setStopDate(DateUtils.addMonths(newCuMember.getExpireDate(), 6)); - String orderCode = saOrderExt.getOrderCode(); - Integer specialArea = saOrderExt.getSpecialArea(); - this.reducePreSalesQuantity(orderCode, specialArea); // 调用其他服务保存会员信息、会员注册信息 R saveResult = memberServiceApi.saveMember(newCuMember, saOrderExt, isToBePay, cuMemberAccountExt); if (saveResult.isSuccess()) { @@ -793,21 +779,10 @@ public class SaOrderServiceImpl extends ServiceImpl impl return Boolean.TRUE; } - @Override - public void convertAvailableNumMsg(List availableNumList) { - if (EYesNo.NO.getIntValue() == BdConfig.getEnable()) { - return; - } - log.info("生产活动消息，activity.exchange：{}", JSONUtil.toJsonStr(availableNumList)); - rabbitTemplate.convertAndSend(RabbitMqConstants.AVAILABLE_NMU_EXCHANGE, RabbitMqConstants.AVAILABLE_NMU_KEY, availableNumList); - } - /** + * 尝试重新换位置 + * * @param newCuMember 修改的会员 - * @Description: 尝试重新换位置 - * @return: CuMember - * @Author: sui q - * @Date: 2022/10/26 9:00 */ private synchronized CuMember repeatTry(CuMember newCuMember, Boolean isFirstAchieve) { CuMember cuMember = obtainLastResettleByRecommend(newCuMember, isFirstAchieve, null); @@ -822,19 +797,6 @@ public class SaOrderServiceImpl extends ServiceImpl impl return cuMember; } - private void insertSaOrder(SaOrderExt saOrderExt) { - redisService.lockKeyMany(CacheConstants.MEMBER_ORDER + saOrderExt.getOrderCode()); - try { - this.save(saOrderExt); - for (SaOrderItems saOrderItems : saOrderExt.getOrderItemsList()) { - saOrderItems.setPkOrder(saOrderExt.getPkId()); - } - saOrderItemsService.saveBatch(saOrderExt.getOrderItemsList()); - } finally { - redisService.unlock(CacheConstants.MEMBER_ORDER + saOrderExt.getOrderCode()); - } - } - private void updateSaOrder(SaOrderExt saOrderExt) { redisService.lockKeyMany(CacheConstants.MEMBER_ORDER + saOrderExt.getOrderCode()); try { @@ -846,11 +808,9 @@ public class SaOrderServiceImpl extends ServiceImpl impl } /** + * 销售订单更改状态为待支付 + * * @param saOrderExt 销售订单 - * @Description: 销售订单更改状态为待支付 - * @return: void - * @Author: sui q - * @Date: 2022/10/24 21:35 */ public void encapsulationSaOrder(SaOrderExt saOrderExt) { saOrderExt.setPayTime(new Date()); @@ -864,12 +824,6 @@ public class SaOrderServiceImpl extends ServiceImpl impl }); } - /** - * 支付升级订单 - * - * @param saOrderExt 订单信息 - * @param cuMemberAccountExt 会员账户 - */ @Override @Transactional(rollbackFor = Exception.class) public Boolean payUpgradeSaOrder(SaOrderExt saOrderExt, CuMemberAccountExt cuMemberAccountExt) { @@ -889,10 +843,6 @@ public class SaOrderServiceImpl extends ServiceImpl impl // 更新订单信息 updateSaOrder(saOrderExt); - // 扣减预售状态下预售库存使用量 - String orderCode = saOrderExt.getOrderCode(); - Integer specialArea = saOrderExt.getSpecialArea(); - reducePreSalesQuantity(orderCode, specialArea); // 处理会员信息，更新会员等级,扣款 R saveResult = memberServiceApi.saveMember(cuMember, saOrderExt, cuMemberAccountExt); if (saveResult.isSuccess()) { @@ -951,41 +901,6 @@ public class SaOrderServiceImpl extends ServiceImpl impl return true; } - /** - * @param orderAmount 订单金额 - * @param postage 邮费 - * @param saOrderExtList 订单列表 - * @Description: 复购订单、福利订单插入 订单跟虚拟订单关系 - * @return: void - * @Author: sui q - * @Date: 2023/3/17 17:46 - */ - private void saveSaOrderRelation(BigDecimal orderAmount, BigDecimal postage, List saOrderExtList) { - if (saOrderExtList.size() > 0) { - SaOrderExt saOrderExt = saOrderExtList.get(0); - SaOrderRelation saOrderRelation = SaOrderRelation.builder() - .orderCode(saOrderHandle.createOrderCode(EOrderPrefix.ORDER_CODE.getValue())) - .orderType(saOrderExt.getOrderType()) - .pkRate(saOrderExt.getPkRate()) - .orderAmount(orderAmount) - .postage(postage) - .build(); - saOrderRelation.setPkCreator(saOrderExt.getPkCreator()); - saOrderRelation.setPkCountry(saOrderExt.getPkCountry()); - saOrderRelationService.save(saOrderRelation); - List saOrderRelationItemsList = new ArrayList<>(); - for (SaOrderExt saOrder : saOrderExtList) { - SaOrderRelationItems saOrderRelationItems = SaOrderRelationItems.builder() - .pkOrder(saOrder.getPkId()) - .build(); - saOrderRelationItems.setPkCountry(saOrder.getPkCountry()); - saOrderRelationItems.setPkCreator(saOrder.getPkCreator()); - saOrderRelationItemsList.add(saOrderRelationItems); - } - saOrderRelationItemsService.saveBatch(saOrderRelationItemsList); - } - } - /** * 支付复购订单 * @@ -1005,11 +920,6 @@ public class SaOrderServiceImpl extends ServiceImpl impl CuMember member = getCuMemberByKey(saOrderExt.getPkMember()); CuMember cuMember = calculateHaFunMemberGrade(saOrderExt, member); - // 扣减预售状态下预售库存使用量 - String orderCode = saOrderExt.getOrderCode(); - Integer specialArea = saOrderExt.getSpecialArea(); - reducePreSalesQuantity(orderCode, specialArea); - R saveResult = memberServiceApi.saveMember(cuMember, saOrderExt, cuMemberAccountExt); if (saveResult.isSuccess()) { if (!saveResult.getData()) { @@ -1148,13 +1058,6 @@ public class SaOrderServiceImpl extends ServiceImpl impl return saOrderHandle.getMemberGradeAndAwardByCountry(cuMember, specialArea, orderAmount, orderAchieve, pkCountry, upgradeWay); } - /** - * 生成空单注册 - * - * @param orderBlankRegParams 参数 - * @return: String - * @Date: 2022/11/14 15:10 - */ @Override @Transactional(rollbackFor = Exception.class) public String registerEmptyOrder(OrderBlankRegParams orderBlankRegParams) { @@ -1624,38 +1527,16 @@ public class SaOrderServiceImpl extends ServiceImpl impl return baseMapper.myOrderList(param, memberId, pkCountry); } - /** - * @description: 自助撤单列表 - * @author: zhang jing - * @date: 2023/11/21 11:24 - * @param: [param, memberId, pkCountry] - * @return: java.util.List - **/ @Override public List selfRevokeOrderList(MyOrderParam param, Long memberId, Integer pkCountry) { return baseMapper.selfRevokeOrderList(param, memberId, pkCountry); } - - /** - * @description: 自助服务-可申请订单列表 - * @author: zhang jing - * @date: 2023/4/19 11:29 - * @param: [param, memberId, pkCountry] - * @return: java.util.List - **/ @Override public List selfOrderList(MyOrderParam param, Long memberId, Integer pkCountry) { return baseMapper.selfOrderList(param, memberId, pkCountry); } - /** - * @description: 查询最新待发货订单 - * @author: zhang jing - * @date: 2023/11/22 16:28 - * @param: [memberId, pkCountry] - * @return: java.util.List - **/ @Override public String lastOrderList(Long memberId, Integer pkCountry) { return baseMapper.lastOrderList(memberId, pkCountry); @@ -1721,7 +1602,6 @@ public class SaOrderServiceImpl extends ServiceImpl impl throw new ServiceException("取消订单失败"); } } - return null; } @@ -1833,9 +1713,6 @@ public class SaOrderServiceImpl extends ServiceImpl impl return true; } - /** - * 定时关单 订单三十分钟未支付自动关闭 - */ @Override public void closeOrder() { R> configMap = systemConfigServiceApi.getSystemConfig(); @@ -1875,27 +1752,11 @@ public class SaOrderServiceImpl extends ServiceImpl impl } } - /** - * 统计用户pv - * - * @param startPayDate 开始支付时间 - * @param endPayDate 结束支付时间 - * @param memberId 会员id - * @return - */ @Override public BigDecimal selectBySumPv(Date startPayDate, Date endPayDate, Long memberId) { return baseMapper.selectBySumPv(startPayDate, endPayDate, memberId); } - /** - * 统计用户金额 - * - * @param startPayDate 开始支付时间 - * @param endPayDate 结束支付时间 - * @param memberId 会员id - * @return - */ @Override public BigDecimal selectBySumAmount(Date startPayDate, Date endPayDate, Long memberId) { return baseMapper.selectBySumAmount(startPayDate, endPayDate, memberId); @@ -1906,9 +1767,6 @@ public class SaOrderServiceImpl extends ServiceImpl impl return baseMapper.queryOrderType(memberId, pkCountry); } - /** - * 商品销量累计 - */ @Override public void waresSalesAccrual(List waresNumberParamList) { try { @@ -1967,112 +1825,11 @@ public class SaOrderServiceImpl extends ServiceImpl impl saOrderItemsService.saveBatch(saOrderExt.getOrderItemsList()); } - /** - * 校验预售库存数量是否充足 - * - * @param orderParam - * @return - */ - @Override - public Boolean checkPreSalesQuantity(OrderParam orderParam) { - // 开关控制是否处理 - if (EYesNo.NO.getIntValue() == BdConfig.getEnable()) { - return true; - } - - Set waresCodeList = new HashSet<>(); - for (OrderItemsParam orderItemsParam : orderParam.getOrderItemsParams()) { - if (StringUtils.isNotBlank(orderItemsParam.getWaresCode())) { - waresCodeList.add(orderItemsParam.getWaresCode()); - } - } - if (waresCodeList.size() > 0) { - List waresPreSaleVoList = waresExtendService.selectByWaresCodeList(waresCodeList, orderParam.getSpecialArea()); - if (CollectionUtil.isNotEmpty(waresPreSaleVoList)) { - Map waresPreSaleMap = waresPreSaleVoList.stream().collect(Collectors.toMap(WaresPreSaleVo::getWaresCode, Function.identity())); - for (OrderItemsParam orderItemsParam : orderParam.getOrderItemsParams()) { - String waresCode = orderItemsParam.getWaresCode(); - if (StringUtils.isNotEmpty(waresCode)) { - WaresPreSaleVo waresPreSaleVo = waresPreSaleMap.get(waresCode); - if (null != waresPreSaleVo && waresPreSaleVo.getPreSaleStatus() != null && waresPreSaleVo.getPreSaleStatus().equals(EPresaleStatus.PRESALE.getValue())) { - // 如果是预售状态 校验预售数量是否足够 - if (waresPreSaleVo.getPreSaleQuantity() != null) { - // 预售数量不足 - return waresPreSaleVo.getPreSaleQuantity() >= orderItemsParam.getQuantity(); - } - } - } - } - } - } - return true; - } - - /** - * 扣减预售状态下预售库存使用量 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean reducePreSalesQuantity(String orderCode, Integer specialArea) { - // 开关控制是否处理 - if (EYesNo.NO.getIntValue() == BdConfig.getEnable()) { - return true; - } - - List orderItemsList = saOrderItemsService.selectByWaresCodeList(orderCode); - if (orderItemsList.size() > 0) { - Set waresCodeList = new HashSet<>(); - for (OrderItemsParam orderItemsParam : orderItemsList) { - if (StringUtils.isNotBlank(orderItemsParam.getWaresCode())) { - waresCodeList.add(orderItemsParam.getWaresCode()); - } - } - if (waresCodeList.size() > 0) { - List waresPreSaleVoList = waresExtendService.selectByWaresCodeList(waresCodeList, specialArea); - if (CollectionUtil.isNotEmpty(waresPreSaleVoList)) { - Map waresPreSaleMap = waresPreSaleVoList.stream().collect(Collectors.toMap(WaresPreSaleVo::getWaresCode, Function.identity())); - for (OrderItemsParam orderItemsParam : orderItemsList) { - String waresCode = orderItemsParam.getWaresCode(); - if (StringUtils.isNotEmpty(waresCode)) { - WaresPreSaleVo waresPreSaleVo = waresPreSaleMap.get(waresCode); - if (null != waresPreSaleVo && waresPreSaleVo.getPreSaleStatus() != null && waresPreSaleVo.getPreSaleStatus().equals(EPresaleStatus.PRESALE.getValue())) { - // 如果是预售状态 校验预售数量是否足够 - if (waresPreSaleVo.getPreSaleQuantity() != null) { - if (waresPreSaleVo.getPreSaleQuantity() < orderItemsParam.getQuantity()) { - // 预售数量不足 - return false; - } else { - waresService.updatePreSaleQuantityByWaresCode(waresCode, orderItemsParam.getQuantity()); - return true; - } - } - } - } - } - } - } - } - return true; - } - - /** - * 根据编号查询会员首单 - * - * @param memberCodeList - * @return - */ @Override public List checkMemberIsFirstOrder(List memberCodeList) { return baseMapper.checkMemberIsFirstOrder(memberCodeList); } - /** - * @description: 自助撤单 - * @author: zhang jing - * @date: 2023/11/21 15:27 - * @param: [pkApprove, orderCancelParam, validateCancelOrderVO] - * @return: void - **/ @Override @Transactional(rollbackFor = Exception.class) public void selfRevokeOrder(Long pkApprove, MyOrderVO myOrderVO) { @@ -2145,12 +1902,6 @@ public class SaOrderServiceImpl extends ServiceImpl impl return baseMapper.queryByPkIdOrCode(pkOrder, orderCode, pkCountry); } - - /** - * 查询订单单品统计 - * - * @return - */ @Override public List singleItemStat(SingleItemStatParam singleItemStatParam) { return baseMapper.singleItemStat(singleItemStatParam); @@ -2603,817 +2354,6 @@ public class SaOrderServiceImpl extends ServiceImpl impl } } return baseBoxNum; - - -// // 获取今天开始时间 -// Date todayDate = DateUtils.getStartTime(new Date()); -// // 2025.03.18 调整需求，升级走当天累计，当天买的所有都进行积累，24点之后则重新累积（手动升级前后的盒数都算累计） -// int baseBoxNum = 0; -// -// // 是否有升级记录 -// List memberLevelList = iCuMemberDetailServiceApi.getUpgradeList(cuMember.getPkId()).getData(); -// if (CollectionUtil.isNotEmpty(memberLevelList)) { -// // 如果今天有手动升级记录，则以手动升级记录的盒数 + 今天购买的盒数做累计 -// // 最新一次的手动升级记录 -// Optional lastManualOptional = memberLevelList.stream().filter(tmpGrade -> tmpGrade.getUpType().equals(EUpgradeType.MANUAL_UPGRADE.getValue())).findFirst(); -// if (lastManualOptional.isPresent() && lastManualOptional.get().getUpgradeTime().compareTo(todayDate) >= 0) { -// // 存在今天的手动升级记录 -// CuMemberLevel lastMemberLevel = lastManualOptional.get(); -// BdGrade lastUpdateGrade = gradeList.stream().filter(tmpGrade -> tmpGrade.getPkId().equals(lastMemberLevel.getNewLevel())).findFirst().get(); -// baseBoxNum = lastUpdateGrade.getBoxNumber(); -// } else { -// // 如果今天没有手动升级记录，则以今天以前最后一条升级记录的盒数 + 今天购买的盒数做累计 -// memberLevelList = memberLevelList.stream().filter(tmp -> tmp.getUpgradeTime().compareTo(todayDate) < 0).collect(Collectors.toList()); -// if (CollectionUtil.isNotEmpty(memberLevelList)) { -// CuMemberLevel lastMemberLevel = memberLevelList.get(0); -// BdGrade lastUpdateGrade = gradeList.stream().filter(tmpGrade -> tmpGrade.getPkId().equals(lastMemberLevel.getNewLevel())).findFirst().get(); -// baseBoxNum = lastUpdateGrade.getBoxNumber(); -// } -// } -// } -// -// return baseBoxNum + saOrderItemsService.getRetailWaresQuantityNew(cuMember.getPkId(), boxProductList, todayDate, -// Arrays.asList(EOrderType.RETAIL_REGISTER.getValue(), EOrderType.RETAIL_UPGRADE.getValue(), EOrderType.RETAIL_REPURCHASE.getValue()), systemType); - - -// // 是否当天购买（当天走累计升级，非当天走一次性补差） -// if (HzsUtil.checkCreateMember(cuMember.getCreationTime())) { -// // 当天，走累计升级 -// // 是否有升级记录 -// List memberLevelList = iCuMemberDetailServiceApi.getUpgradeList(cuMember.getPkId()).getData(); -// if (CollectionUtil.isNotEmpty(memberLevelList)) { -// // 最新一次的手动升级记录 -// Optional lastManualOptional = memberLevelList.stream().filter(tmpGrade -> tmpGrade.getUpType().equals(EUpgradeType.MANUAL_UPGRADE.getValue())).findFirst(); -// if (lastManualOptional.isPresent()) { -// // 有手动升级记录 -// CuMemberLevel lastManual = lastManualOptional.get(); -// // 手动升级等级 -// BdGrade lastUpdateGrade = gradeList.stream().filter(tmpGrade -> tmpGrade.getPkId().equals(lastManual.getNewLevel())).findFirst().get(); -// // 升级之后购买的订单盒数 -// int newBoxNumber = saOrderItemsService.getRetailWaresQuantity(cuMember.getPkId(), boxProductList, lastManual.getUpgradeTime(), -// Arrays.asList(EOrderType.RETAIL_REGISTER.getValue(), EOrderType.RETAIL_UPGRADE.getValue(), EOrderType.RETAIL_REPURCHASE.getValue()), systemType); -// // 基数盒数 = 手动升级的等级盒数 + 手动升级之后购买的盒数 -// return lastUpdateGrade.getBoxNumber() + newBoxNumber; -// } else { -// // 没有手动升级记录 -// // 基数盒数 = 购买的盒数 -// return saOrderItemsService.getRetailWaresQuantity(cuMember.getPkId(), boxProductList, null, -// Arrays.asList(EOrderType.RETAIL_REGISTER.getValue(), EOrderType.RETAIL_UPGRADE.getValue(), EOrderType.RETAIL_REPURCHASE.getValue()), systemType); -// } -// } -// } else { -// if (null != memberGrade) { -// // 非当天，走一次性补差 -// // 基数盒数 = 当前等级的盒数 -// return memberGrade.getBoxNumber(); -// } -// } -// return 0; - } - - /** - * 旧等级计算处理（累计升级） - * - * @param cuMember 会员信息 - * @param memberGrade 会员等级 - * @param gradeList 等级列表 - * @param boxProductList 盒数商品列表 - * @return - */ - private BdGrade handleOldGrade(CuMember cuMember, BdGrade memberGrade, List gradeList, List boxProductList) { - if (memberGrade.getGradeValue().compareTo(EGrade.MAKER.getValue()) > 0) { - // 当前等级大于V3，不需要重算 - return memberGrade; - } - - // 查询是否有升级记录 - List memberLevelList = iCuMemberDetailServiceApi.getUpgradeList(cuMember.getPkId()).getData(); - if (CollectionUtil.isNotEmpty(memberLevelList)) { - // 有升级记录 - int baseBoxNum; - // 最新一次的手动升级记录 - Optional lastManualOptional = memberLevelList.stream().filter(tmpGrade -> tmpGrade.getUpType().equals(EUpgradeType.MANUAL_UPGRADE.getValue())).findFirst(); - if (lastManualOptional.isPresent()) { - // 有手动升级记录 - CuMemberLevel lastManual = lastManualOptional.get(); - // 手动升级等级 - BdGrade lastUpdateGrade = gradeList.stream().filter(tmpGrade -> tmpGrade.getPkId().equals(lastManual.getNewLevel())).findFirst().get(); - // 升级之后购买的订单盒数 - int newBoxNumber = saOrderItemsService.getRetailWaresQuantity(cuMember.getPkId(), boxProductList, lastManual.getUpgradeTime(), - Arrays.asList(EOrderType.RETAIL_REGISTER.getValue(), EOrderType.RETAIL_UPGRADE.getValue()), cuMember.getSystemType()); - // 基数盒数 = 手动升级的等级盒数 + 手动升级之后购买的盒数 - baseBoxNum = lastUpdateGrade.getBoxNumber() + newBoxNumber; - } else { - // 没有手动升级记录 - // 基数盒数 = 购买的盒数 - baseBoxNum = saOrderItemsService.getRetailWaresQuantity(cuMember.getPkId(), boxProductList, null, - Arrays.asList(EOrderType.RETAIL_REGISTER.getValue(), EOrderType.RETAIL_UPGRADE.getValue()), cuMember.getSystemType()); - } - - // 计算的等级 - return this.getGradeByBox(baseBoxNum, gradeList, memberGrade, false); - } - return memberGrade; - } - - /** - * 新等级计算处理（当天累计升级，次日一次性） - * - * @param cuMember 会员信息 - * @param memberGrade 会员等级 - * @param gradeList 等级列表 - * @param saOrderExt 订单信息 - * @param createLevelList 添加等级列表 - * @param deleteLevelList 删除等级列表 - * @return - */ - private BdGrade handleNewGrade(CuMember cuMember, BdGrade memberGrade, List gradeList, SaOrderExt saOrderExt, - List createLevelList, List deleteLevelList) { - // 会员升级记录 - List memberLevelList = iMemberLevelServiceApi.listMemberLevel(cuMember.getPkId(), null).getData(); - - if (CollectionUtil.isNotEmpty(memberLevelList)) { - // 存在升级记录 - // 2025.03.18 调整需求，升级走当天累计，当天买的所有都进行积累，24点之后则重新累积（手动升级前后的盒数都算累计） - // 查询开始时间 - Date queryStartTime = DateUtils.getStartTime(saOrderExt.getPayTime()); - // 查询结束时间 - Date queryEndTime = DateUtils.getEndTime(queryStartTime); - - // 订单购买当天所有升级记录 - List todayLevelList = memberLevelList.stream() - .filter(tmp -> (tmp.getUpgradeTime().compareTo(queryStartTime) >= 0 && tmp.getUpgradeTime().compareTo(queryEndTime) <= 0)) - .collect(Collectors.toList()); - if (CollectionUtil.isNotEmpty(todayLevelList)) { - if (todayLevelList.stream().noneMatch(tmp -> tmp.getUpgradeTime().compareTo(saOrderExt.getPayTime()) >= 0)) { - // 订单购买时间之后没有升级记录，直接返回当前会员等级 - return memberGrade; - } else { - // 订单购买时间之后有升级记录，需要重新计算 - // 处理当日等级 - Integer oldLevel = todayLevelList.get(0).getOldLevel(); - Integer lastLevel = todayLevelList.get(todayLevelList.size() - 1).getNewLevel(); - // 手动升级记录 - Integer manualUpgradeLevel = null; - - // 当天最后一条手动升级记录 - Optional manualUpgradeOptional = todayLevelList.stream() - .filter(tmp -> EUpgradeType.MANUAL_UPGRADE.getValue() == tmp.getUpType()) - .max(Comparator.comparing(CuMemberLevel::getUpgradeTime)); - if (manualUpgradeOptional.isPresent()) { - // 存在手动升级记录（计算等级为手动升级盒数为基数 + 当天购买的订单盒数） - // 删除升级记录时，只删除非手动升级的 - deleteLevelList.addAll(todayLevelList.stream() - .filter(tmp -> EUpgradeType.MANUAL_UPGRADE.getValue() != tmp.getUpType()) - .collect(Collectors.toList())); - // 重算订单当天升级记录（存在手动升级） - manualUpgradeLevel = manualUpgradeOptional.get().getNewLevel(); - } else { - // 不存在手动升级记录（当天购买的订单盒数） - deleteLevelList.addAll(todayLevelList); - } - - // 今天重算等级 - BdGrade todayGrade = this.handleTodayGrade(cuMember, oldLevel, lastLevel, manualUpgradeLevel, - queryStartTime, queryEndTime, gradeList, createLevelList); - if (lastLevel.equals(todayGrade.getPkId())) { - // 重算之后和重算之前等级一致，直接返回当前会员等级 - return todayGrade; - } else { - // 重算之后和重算之前等级不一致，需要重算后面所有等级 - return this.handleTodayNextNew(cuMember, todayGrade, DateUtils.addDays(queryStartTime, 1), DateUtils.addDays(queryEndTime, 1), - memberLevelList, gradeList, createLevelList, deleteLevelList); - } - } - } else { - // 当天没有升级记录，直接返回当前会员等级 - return memberGrade; - } - } else { - // 没有升级记录，返回当前会员等级 - return memberGrade; - } - } - - /** - * 处理日升级新 - * - * @param cuMember 会员信息 - * @param oldLevel 旧等级 - * @param lastLevel 新等级（可为null） - * @param manualUpgradeLevel 手动升级等级（可为null） - * @param queryStartTime 查询开始时间 - * @param queryEndTime 查询结束时间 - * @param gradeList 等级列表 - * @param createLevelList 创建升级记录列表 - * @return - */ - private BdGrade handleTodayGrade(CuMember cuMember, Integer oldLevel, Integer lastLevel, Integer manualUpgradeLevel, Date queryStartTime, Date queryEndTime, - List gradeList, List createLevelList) { - // 升级之前对应的等级（如果有值则是等级值，如果没有默认V0） - Optional tmpGradeOptional = gradeList.stream().filter(tmp -> tmp.getPkId().equals(oldLevel)).findFirst(); - BdGrade oldGrade = tmpGradeOptional.orElseGet(() -> this.getGrade(EGrade.START_UP, gradeList)); - // 最终计算等级（如果没有默认为V3） - BdGrade endGrade = null != lastLevel ? this.getGrade(lastLevel, gradeList) : this.getGrade(EGrade.MAKER, gradeList); - // 获取需要处理的等级（大于升级记录的旧等级，小于等于升级记录的新等级） - List lowGradeList = gradeList.stream() - .filter(tmp -> (tmp.getGradeValue() > oldGrade.getGradeValue() && tmp.getGradeValue() <= endGrade.getGradeValue())) - .collect(Collectors.toList()); - - BdGrade newGrade = oldGrade; - - if (CollectionUtil.isNotEmpty(lowGradeList)) { - // 查询撤单当天的注册、复购订单 - List orderList = this.list(Wrappers.lambdaQuery() - .eq(SaOrder::getPkMember, cuMember.getPkId()) - .eq(SaOrder::getOrderStatus, EPayStatus.PAID.getValue()) - .in(SaOrder::getOrderType, EOrderType.RETAIL_REGISTER.getValue(), EOrderType.RETAIL_REPURCHASE.getValue()) - .ge(SaOrder::getPayTime, queryStartTime) - .le(SaOrder::getPayTime, queryEndTime) - .orderByAsc(SaOrder::getPayTime) - ); - - if (CollectionUtil.isNotEmpty(orderList)) { - // 订单购买时间和手动升级记录之间有订单，需要重算中间的等级 - // 取倒序（V3,V2,V1） - lowGradeList.sort(Comparator.comparing(BdGrade::getGradeValue).reversed()); - - SaOrder orderV1 = null; - SaOrder orderV2 = null; - SaOrder orderV3 = null; - // 旧等级盒数 - int oldGradeBox = oldGrade.getBoxNumber(); - // 如果存在手动升级，则以手动升级为基数 - if (null != manualUpgradeLevel) { - int tmpBox = this.getGrade(manualUpgradeLevel, gradeList).getBoxNumber(); - if (tmpBox != 0) { - oldGradeBox = tmpBox; - } - } - - orderFor: - for (SaOrder saOrder : orderList) { - // 累积盒数，校验等级 - oldGradeBox += saOrder.getBoxNum(); - - for (BdGrade tmpGrade : lowGradeList) { - if (oldGradeBox >= tmpGrade.getBoxNumber()) { - if (EGrade.MAKER.getValue() == tmpGrade.getGradeValue()) { - // V3订单 - orderV3 = saOrder; - // 达到V3等级，直接结束 - break orderFor; - } else if (null == orderV2 && EGrade.YOU_KE.getValue() == tmpGrade.getGradeValue()) { - // V2订单 - orderV2 = saOrder; - // 达到V2等级，V1就不需要处理了，直接处理下次订单 - break; - } else if (null == orderV1 && EGrade.HAI_FAN.getValue() == tmpGrade.getGradeValue()) { - // V1订单 - orderV1 = saOrder; - } - } - } - } - - BdGrade gradeV1 = this.getGrade(EGrade.HAI_FAN, gradeList); - BdGrade gradeV2 = this.getGrade(EGrade.YOU_KE, gradeList); - BdGrade gradeV3 = this.getGrade(EGrade.MAKER, gradeList); - if (null != orderV1) { - // V1等级订单 - createLevelList.add(this.packageMemberLevel(cuMember, orderV1, oldGrade.getPkId(), gradeV1.getPkId())); - newGrade = gradeV1; - if (null != orderV2) { - // V2等级订单 - createLevelList.add(this.packageMemberLevel(cuMember, orderV2, gradeV1.getPkId(), gradeV2.getPkId())); - newGrade = gradeV2; - if (null != orderV3) { - // V3等级订单 - createLevelList.add(this.packageMemberLevel(cuMember, orderV3, gradeV2.getPkId(), gradeV3.getPkId())); - newGrade = gradeV3; - } - } else { - // 没有V2等级订单 - if (null != orderV3) { - // V3等级订单 - createLevelList.add(this.packageMemberLevel(cuMember, orderV3, gradeV1.getPkId(), gradeV3.getPkId())); - newGrade = gradeV3; - } - } - } else if (null != orderV2) { - // V2等级订单 - createLevelList.add(this.packageMemberLevel(cuMember, orderV2, oldGrade.getPkId(), gradeV2.getPkId())); - newGrade = gradeV2; - if (null != orderV3) { - // V3等级订单 - createLevelList.add(this.packageMemberLevel(cuMember, orderV3, gradeV2.getPkId(), gradeV3.getPkId())); - newGrade = gradeV3; - } - } else if (null != orderV3) { - // V3等级订单 - createLevelList.add(this.packageMemberLevel(cuMember, orderV3, oldGrade.getPkId(), gradeV3.getPkId())); - newGrade = gradeV3; - } - } - } - - return newGrade; - } - - /** - * 处理日升级后每天升级 - * - * @param cuMember - * @param oldGrade - * @param queryStartTime - * @param queryEndTime - * @param memberLevelList - * @param gradeList - * @param createLevelList - * @param deleteLevelList - * @return - */ - private BdGrade handleTodayNextNew(CuMember cuMember, BdGrade oldGrade, Date queryStartTime, Date queryEndTime, - List memberLevelList, List gradeList, - List createLevelList, List deleteLevelList) { - if (queryStartTime.compareTo(new Date()) >= 0) { - // 查询时间大于等于当前时间了，则结束处理 - return oldGrade; - } - - // 订单购买当天所有升级记录 - List todayLevelList = memberLevelList.stream() - .filter(tmp -> (tmp.getUpgradeTime().compareTo(queryStartTime) >= 0 && tmp.getUpgradeTime().compareTo(queryEndTime) <= 0)) - .collect(Collectors.toList()); - if (CollectionUtil.isNotEmpty(todayLevelList)) { - // 处理当日等级 - Integer oldLevel = oldGrade.getPkId(); - Integer lastLevel = todayLevelList.get(todayLevelList.size() - 1).getNewLevel(); - // 手动升级记录 - Integer manualUpgradeLevel = null; - - // 当天最后一条手动升级记录 - Optional manualUpgradeOptional = todayLevelList.stream() - .filter(tmp -> EUpgradeType.MANUAL_UPGRADE.getValue() == tmp.getUpType()) - .max(Comparator.comparing(CuMemberLevel::getUpgradeTime)); - if (manualUpgradeOptional.isPresent()) { - // 存在手动升级记录（计算等级为手动升级盒数为基数 + 当天购买的订单盒数） - // 删除升级记录时，只删除非手动升级的 - deleteLevelList.addAll(todayLevelList.stream() - .filter(tmp -> EUpgradeType.MANUAL_UPGRADE.getValue() != tmp.getUpType()) - .collect(Collectors.toList())); - // 重算订单当天升级记录（存在手动升级） - manualUpgradeLevel = manualUpgradeOptional.get().getNewLevel(); - } else { - // 不存在手动升级记录（当天购买的订单盒数） - deleteLevelList.addAll(todayLevelList); - } - - // 今天重算等级 - oldGrade = this.handleTodayGrade(cuMember, oldLevel, lastLevel, manualUpgradeLevel, - queryStartTime, queryEndTime, gradeList, createLevelList); - if (lastLevel.equals(oldGrade.getPkId())) { - // 重算之后和重算之前等级一致，直接返回当前会员等级 - return oldGrade; - } - } - - return this.handleTodayNextNew(cuMember, oldGrade, DateUtils.addDays(queryStartTime, 1), DateUtils.addDays(queryEndTime, 1), - memberLevelList, gradeList, createLevelList, deleteLevelList); - } - - /** - * 处理首日升级 - * - * @param cuMember 会员信息 - * @param oldLevel 旧等级 - * @param lastLevel 最大等级 - * @param queryTime 查询开始时间 - * @param queryEndTime 查询结束时间 - * @param gradeList 等级列表 - * @param createLevelList 创建升级记录 - * @return - */ - private BdGrade handleToday(CuMember cuMember, Integer oldLevel, Integer lastLevel, Date queryTime, Date queryEndTime, - List gradeList, List createLevelList) { - // 存在手动升级，只需要重算手动升级之前的 - // 升级之前对应的等级（如果有值则是等级值，如果没有默认V0） - Optional tmpGradeOptional = gradeList.stream().filter(tmp -> tmp.getPkId().equals(oldLevel)).findFirst(); - BdGrade oldGrade = tmpGradeOptional.orElseGet(() -> this.getGrade(EGrade.START_UP, gradeList)); - // 最终计算等级（如果没有默认为V3） - BdGrade endGrade = null != lastLevel ? this.getGrade(lastLevel, gradeList) : this.getGrade(EGrade.MAKER, gradeList); - // 获取需要处理的等级（大于升级记录的旧等级，小于等于升级记录的新等级） - List lowGradeList = gradeList.stream() - .filter(tmp -> (tmp.getGradeValue() > oldGrade.getGradeValue() && tmp.getGradeValue() <= endGrade.getGradeValue())) - .collect(Collectors.toList()); - - BdGrade newGrade = oldGrade; - - if (CollectionUtil.isNotEmpty(lowGradeList)) { - // 查询大于升级时间，小于当天手动升级时间，全部订单 - List orderList = this.list(Wrappers.lambdaQuery() - .eq(SaOrder::getPkMember, cuMember.getPkId()) - .eq(SaOrder::getOrderStatus, EPayStatus.PAID.getValue()) - .eq(SaOrder::getOrderType, EOrderType.RETAIL_REPURCHASE.getValue()) - .ge(SaOrder::getPayTime, queryTime) - .le(SaOrder::getPayTime, queryEndTime) - .orderByAsc(SaOrder::getPayTime) - ); - - if (CollectionUtil.isNotEmpty(orderList)) { - // 订单购买时间和手动升级记录之间有订单，需要重算中间的等级 - // 取倒序（V3,V2,V1） - lowGradeList.sort(Comparator.comparing(BdGrade::getGradeValue).reversed()); - - SaOrder orderV1 = null; - SaOrder orderV2 = null; - SaOrder orderV3 = null; - // 旧等级盒数 - int oldGradeBox = oldGrade.getBoxNumber(); - - orderFor: - for (SaOrder saOrder : orderList) { - // 累积盒数，校验等级 - oldGradeBox += saOrder.getBoxNum(); - - for (BdGrade tmpGrade : lowGradeList) { - if (oldGradeBox >= tmpGrade.getBoxNumber()) { - if (EGrade.MAKER.getValue() == tmpGrade.getGradeValue()) { - // V3订单 - orderV3 = saOrder; - // 达到V3等级，直接结束 - break orderFor; - } else if (null == orderV2 && EGrade.YOU_KE.getValue() == tmpGrade.getGradeValue()) { - // V2订单 - orderV2 = saOrder; - // 达到V2等级，V1就不需要处理了，直接处理下次订单 - break; - } else if (null == orderV1 && EGrade.HAI_FAN.getValue() == tmpGrade.getGradeValue()) { - // V1订单 - orderV1 = saOrder; - } - } - - } - } - - BdGrade gradeV1 = this.getGrade(EGrade.HAI_FAN, gradeList); - BdGrade gradeV2 = this.getGrade(EGrade.YOU_KE, gradeList); - BdGrade gradeV3 = this.getGrade(EGrade.MAKER, gradeList); - if (null != orderV1) { - // V1等级订单 - createLevelList.add(this.packageMemberLevel(cuMember, orderV1, oldGrade.getPkId(), gradeV1.getPkId())); - newGrade = gradeV1; - if (null != orderV2) { - // V2等级订单 - createLevelList.add(this.packageMemberLevel(cuMember, orderV2, gradeV1.getPkId(), gradeV2.getPkId())); - newGrade = gradeV2; - if (null != orderV3) { - // V3等级订单 - createLevelList.add(this.packageMemberLevel(cuMember, orderV3, gradeV2.getPkId(), gradeV3.getPkId())); - newGrade = gradeV3; - } - } else { - // 没有V2等级订单 - if (null != orderV3) { - // V3等级订单 - createLevelList.add(this.packageMemberLevel(cuMember, orderV3, gradeV1.getPkId(), gradeV3.getPkId())); - newGrade = gradeV3; - } - } - } else if (null != orderV2) { - // V2等级订单 - createLevelList.add(this.packageMemberLevel(cuMember, orderV2, oldGrade.getPkId(), gradeV2.getPkId())); - newGrade = gradeV2; - if (null != orderV3) { - // V3等级订单 - createLevelList.add(this.packageMemberLevel(cuMember, orderV3, gradeV2.getPkId(), gradeV3.getPkId())); - newGrade = gradeV3; - } - } else if (null != orderV3) { - // V3等级订单 - createLevelList.add(this.packageMemberLevel(cuMember, orderV3, oldGrade.getPkId(), gradeV3.getPkId())); - newGrade = gradeV3; - } - } - } - return newGrade; - } - - /** - * 首日等级有变化，处理次日升级 - * - * @param cuMember 会员信息 - * @param oldLevel 旧等级 - * @param lastLevel 最大等级 - * @param queryTime 查询开始时间 - * @param queryEndTime 查询结束时间 - * @param gradeList 等级列表 - * @param createLevelList 创建升级记录 - * @return - */ - private BdGrade handleTodayNext(CuMember cuMember, Integer oldLevel, Integer lastLevel, Date queryTime, Date queryEndTime, - List gradeList, List createLevelList) { - // 次日升级之前的等级 - BdGrade oldGrade = this.getGrade(oldLevel, gradeList); - // 最终计算等级（如果没有默认为V3） - BdGrade endGrade = null != lastLevel ? this.getGrade(lastLevel, gradeList) : this.getGrade(EGrade.MAKER, gradeList); - // 获取需要处理的等级（大于升级记录的旧等级，小于等于升级记录的新等级） - List lowGradeList = gradeList.stream() - .filter(tmp -> (tmp.getGradeValue() > oldGrade.getGradeValue() && tmp.getGradeValue() <= endGrade.getGradeValue())) - .collect(Collectors.toList()); - - BdGrade newGrade = oldGrade; - - if (CollectionUtil.isNotEmpty(lowGradeList)) { - // 查询大于升级时间，小于当天手动升级时间，全部订单 - List orderList = this.list(Wrappers.lambdaQuery() - .eq(SaOrder::getPkMember, cuMember.getPkId()) - .eq(SaOrder::getOrderStatus, EPayStatus.PAID.getValue()) - .eq(SaOrder::getOrderType, EOrderType.RETAIL_REPURCHASE.getValue()) - .ge(SaOrder::getPayTime, queryTime) - .le(SaOrder::getPayTime, null != queryEndTime ? queryEndTime : new Date()) - .orderByAsc(SaOrder::getPayTime) - ); - - if (CollectionUtil.isNotEmpty(orderList)) { - // 升级记录以后有订单，才进行级别处理 - // 取倒序（V3,V2,V1） - lowGradeList.sort(Comparator.comparing(BdGrade::getGradeValue).reversed()); - - SaOrder orderV1 = null; - SaOrder orderV2 = null; - SaOrder orderV3 = null; - // 旧等级盒数 - int oldGradeBox = oldGrade.getBoxNumber(); - - orderFor: - for (SaOrder saOrder : orderList) { - for (BdGrade tmpGrade : lowGradeList) { - if (saOrder.getBoxNum() >= (tmpGrade.getBoxNumber() - oldGradeBox)) { - if (EGrade.MAKER.getValue() == tmpGrade.getGradeValue()) { - // V3订单 - orderV3 = saOrder; - // 达到V3等级，直接结束 - break orderFor; - } else if (null == orderV2 && EGrade.YOU_KE.getValue() == tmpGrade.getGradeValue()) { - // V2订单 - orderV2 = saOrder; - oldGradeBox = tmpGrade.getBoxNumber(); - // 达到V2等级，V1就不需要处理了，直接处理下次订单 - break; - } else if (null == orderV1 && EGrade.HAI_FAN.getValue() == tmpGrade.getGradeValue()) { - // V1订单 - orderV1 = saOrder; - oldGradeBox = tmpGrade.getBoxNumber(); - } - } - } - } - - BdGrade gradeV1 = this.getGrade(EGrade.HAI_FAN, gradeList); - BdGrade gradeV2 = this.getGrade(EGrade.YOU_KE, gradeList); - BdGrade gradeV3 = this.getGrade(EGrade.MAKER, gradeList); - if (null != orderV1) { - // 有V1等级订单 - if (null != orderV2) { - // 有V2等级订单 - if (orderV1.getPkId().equals(orderV2.getPkId())) { - // V1和V2订单相同，只处理V2 - if (null != orderV3) { - // 有V3等级订单 - if (orderV2.getPkId().equals(orderV3.getPkId())) { - // V2和V3订单相同，只处理V3 - createLevelList.add(this.packageMemberLevel(cuMember, orderV3, oldGrade.getPkId(), gradeV3.getPkId())); - newGrade = gradeV3; - } else { - // V2和V3订单不相同，先处理V2，再处理V3 - createLevelList.add(this.packageMemberLevel(cuMember, orderV2, oldGrade.getPkId(), gradeV2.getPkId())); - createLevelList.add(this.packageMemberLevel(cuMember, orderV3, gradeV2.getPkId(), gradeV3.getPkId())); - newGrade = gradeV3; - } - } else { - // 没有V3等级订单，只处理V2 - createLevelList.add(this.packageMemberLevel(cuMember, orderV2, oldGrade.getPkId(), gradeV2.getPkId())); - newGrade = gradeV2; - } - } else { - // V1和V2订单不相同 - if (null != orderV3) { - // 有V3等级订单 - if (orderV2.getPkId().equals(orderV3.getPkId())) { - // V2和V3等级相同，先处理V1，再处理V3 - createLevelList.add(this.packageMemberLevel(cuMember, orderV1, oldGrade.getPkId(), gradeV1.getPkId())); - createLevelList.add(this.packageMemberLevel(cuMember, orderV3, gradeV1.getPkId(), gradeV3.getPkId())); - newGrade = gradeV3; - } else { - // V2和V3等级不相同，先处理V1，再处理V2，最后处理V3 - createLevelList.add(this.packageMemberLevel(cuMember, orderV1, oldGrade.getPkId(), gradeV1.getPkId())); - createLevelList.add(this.packageMemberLevel(cuMember, orderV2, gradeV1.getPkId(), gradeV2.getPkId())); - createLevelList.add(this.packageMemberLevel(cuMember, orderV3, gradeV2.getPkId(), gradeV3.getPkId())); - newGrade = gradeV3; - } - } else { - // 没有V3等级订单，处理V1 V2 - createLevelList.add(this.packageMemberLevel(cuMember, orderV1, oldGrade.getPkId(), gradeV1.getPkId())); - createLevelList.add(this.packageMemberLevel(cuMember, orderV2, gradeV1.getPkId(), gradeV2.getPkId())); - newGrade = gradeV2; - } - } - } else { - // 没有V2等级订单，只处理V1 - createLevelList.add(this.packageMemberLevel(cuMember, orderV1, oldGrade.getPkId(), gradeV1.getPkId())); - newGrade = gradeV1; - } - } else if (null != orderV2) { - // 有V2等级订单，V1没有 - if (null != orderV3) { - // 有V3等级订单 - if (orderV2.getPkId().equals(orderV3.getPkId())) { - // V2和V3订单相同，只处理V3 - createLevelList.add(this.packageMemberLevel(cuMember, orderV3, oldGrade.getPkId(), gradeV3.getPkId())); - newGrade = gradeV3; - } else { - // V2和V3订单不相同，先处理V2，再处理V3 - createLevelList.add(this.packageMemberLevel(cuMember, orderV2, oldGrade.getPkId(), gradeV2.getPkId())); - createLevelList.add(this.packageMemberLevel(cuMember, orderV3, gradeV2.getPkId(), gradeV3.getPkId())); - newGrade = gradeV3; - } - } else { - // 没有V3，只处理V2 - createLevelList.add(this.packageMemberLevel(cuMember, orderV2, oldGrade.getPkId(), gradeV2.getPkId())); - newGrade = gradeV2; - } - } else if (null != orderV3) { - // 有V3等级订单，V1、V2没有 - createLevelList.add(this.packageMemberLevel(cuMember, orderV3, oldGrade.getPkId(), gradeV3.getPkId())); - newGrade = gradeV3; - } - } - } - - return newGrade; - } - - /** - * 处理次日一次性升级 - * - * @param cuMember 会员信息 - * @param queryStartTime 升级查询开始时间 - * @param queryEndTime 升级查询结束时间 - * @param oldGrade 升级旧等级 - * @param lowGradeList 需要处理的升级等级 - * @param gradeList 等级列表 - * @param createLevelList 需要新増的升级记录 - */ - private BdGrade handleNextDay(CuMember cuMember, Date queryStartTime, Date queryEndTime, BdGrade oldGrade, List lowGradeList, - List gradeList, List createLevelList) { - BdGrade newGrade = oldGrade; - - if (CollectionUtil.isNotEmpty(lowGradeList)) { - // 查询大于升级时间，订单盒数大于等于升级盒数的订单 - List orderList = this.list(Wrappers.lambdaQuery() - .eq(SaOrder::getPkMember, cuMember.getPkId()) - .eq(SaOrder::getOrderStatus, EPayStatus.PAID.getValue()) - .eq(SaOrder::getOrderType, EOrderType.RETAIL_REPURCHASE.getValue()) - .ge(SaOrder::getBoxNum, lowGradeList.get(0).getBoxNumber()) - .ge(SaOrder::getPayTime, queryStartTime) - .le(null != queryEndTime, SaOrder::getPayTime, queryEndTime) - .orderByAsc(SaOrder::getPayTime) - ); - - if (CollectionUtil.isNotEmpty(orderList)) { - // 升级记录以后有订单，才进行级别处理 - // 取倒序（V3,V2,V1） - lowGradeList.sort(Comparator.comparing(BdGrade::getGradeValue).reversed()); - - SaOrder orderV1 = null; - SaOrder orderV2 = null; - SaOrder orderV3 = null; - // 旧等级盒数 - int oldGradeBox = oldGrade.getBoxNumber(); - - orderFor: - for (SaOrder saOrder : orderList) { - for (BdGrade tmpGrade : lowGradeList) { - if (saOrder.getBoxNum() >= (tmpGrade.getBoxNumber() - oldGradeBox)) { - if (EGrade.MAKER.getValue() == tmpGrade.getGradeValue()) { - // V3订单 - orderV3 = saOrder; - // 达到V3等级，直接结束 - break orderFor; - } else if (null == orderV2 && EGrade.YOU_KE.getValue() == tmpGrade.getGradeValue()) { - // V2订单 - orderV2 = saOrder; - oldGradeBox = tmpGrade.getBoxNumber(); - // 达到V2等级，V1就不需要处理了，直接处理下次订单 - break; - } else if (null == orderV1 && EGrade.HAI_FAN.getValue() == tmpGrade.getGradeValue()) { - // V1订单 - orderV1 = saOrder; - oldGradeBox = tmpGrade.getBoxNumber(); - } - } - } - } - - BdGrade gradeV1 = this.getGrade(EGrade.HAI_FAN, gradeList); - BdGrade gradeV2 = this.getGrade(EGrade.YOU_KE, gradeList); - BdGrade gradeV3 = this.getGrade(EGrade.MAKER, gradeList); - if (null != orderV1) { - // 有V1等级订单 - if (null != orderV2) { - // 有V2等级订单 - if (orderV1.getPkId().equals(orderV2.getPkId())) { - // V1和V2订单相同，只处理V2 - if (null != orderV3) { - // 有V3等级订单 - if (orderV2.getPkId().equals(orderV3.getPkId())) { - // V2和V3订单相同，只处理V3 - createLevelList.add(this.packageMemberLevel(cuMember, orderV3, oldGrade.getPkId(), gradeV3.getPkId())); - newGrade = gradeV3; - } else { - // V2和V3订单不相同，先处理V2，再处理V3 - createLevelList.add(this.packageMemberLevel(cuMember, orderV2, oldGrade.getPkId(), gradeV2.getPkId())); - createLevelList.add(this.packageMemberLevel(cuMember, orderV3, gradeV2.getPkId(), gradeV3.getPkId())); - newGrade = gradeV3; - } - } else { - // 没有V3等级订单，只处理V2 - createLevelList.add(this.packageMemberLevel(cuMember, orderV2, oldGrade.getPkId(), gradeV2.getPkId())); - newGrade = gradeV2; - } - } else { - // V1和V2订单不相同 - if (null != orderV3) { - // 有V3等级订单 - if (orderV2.getPkId().equals(orderV3.getPkId())) { - // V2和V3等级相同，先处理V1，再处理V3 - createLevelList.add(this.packageMemberLevel(cuMember, orderV1, oldGrade.getPkId(), gradeV1.getPkId())); - createLevelList.add(this.packageMemberLevel(cuMember, orderV3, gradeV1.getPkId(), gradeV3.getPkId())); - newGrade = gradeV3; - } else { - // V2和V3等级不相同，先处理V1，再处理V2，最后处理V3 - createLevelList.add(this.packageMemberLevel(cuMember, orderV1, oldGrade.getPkId(), gradeV1.getPkId())); - createLevelList.add(this.packageMemberLevel(cuMember, orderV2, gradeV1.getPkId(), gradeV2.getPkId())); - createLevelList.add(this.packageMemberLevel(cuMember, orderV3, gradeV2.getPkId(), gradeV3.getPkId())); - newGrade = gradeV3; - } - } else { - // 没有V3等级订单，处理V1 V2 - createLevelList.add(this.packageMemberLevel(cuMember, orderV1, oldGrade.getPkId(), gradeV1.getPkId())); - createLevelList.add(this.packageMemberLevel(cuMember, orderV2, gradeV1.getPkId(), gradeV2.getPkId())); - newGrade = gradeV2; - } - } - } else { - // 没有V2等级订单 - if (null != orderV3) { - // 有V3等级订单 - if (orderV1.getPkId().equals(orderV3.getPkId())) { - // V1和V3相同，只处理V3 - createLevelList.add(this.packageMemberLevel(cuMember, orderV3, oldGrade.getPkId(), gradeV3.getPkId())); - newGrade = gradeV3; - } else { - // V1和V3不相同，先处理V1，再处理V3 - createLevelList.add(this.packageMemberLevel(cuMember, orderV1, oldGrade.getPkId(), gradeV1.getPkId())); - createLevelList.add(this.packageMemberLevel(cuMember, orderV3, gradeV1.getPkId(), gradeV3.getPkId())); - newGrade = gradeV3; - } - } else { - // 没有V3等级订单，只处理V1 - createLevelList.add(this.packageMemberLevel(cuMember, orderV1, oldGrade.getPkId(), gradeV1.getPkId())); - newGrade = gradeV1; - } - } - } else if (null != orderV2) { - // 有V2等级订单，V1没有 - if (null != orderV3) { - // 有V3等级订单 - if (orderV2.getPkId().equals(orderV3.getPkId())) { - // V2和V3订单相同，只处理V3 - createLevelList.add(this.packageMemberLevel(cuMember, orderV3, oldGrade.getPkId(), gradeV3.getPkId())); - newGrade = gradeV3; - } else { - // V2和V3订单不相同，先处理V2，再处理V3 - createLevelList.add(this.packageMemberLevel(cuMember, orderV2, oldGrade.getPkId(), gradeV2.getPkId())); - createLevelList.add(this.packageMemberLevel(cuMember, orderV3, gradeV2.getPkId(), gradeV3.getPkId())); - newGrade = gradeV3; - } - } else { - // 没有V3，只处理V2 - createLevelList.add(this.packageMemberLevel(cuMember, orderV2, oldGrade.getPkId(), gradeV2.getPkId())); - newGrade = gradeV2; - } - } else if (null != orderV3) { - // 有V3等级订单，V1、V2没有 - createLevelList.add(this.packageMemberLevel(cuMember, orderV3, oldGrade.getPkId(), gradeV3.getPkId())); - newGrade = gradeV3; - } - - } - } - return newGrade; } /** @@ -3428,39 +2368,4 @@ public class SaOrderServiceImpl extends ServiceImpl impl return gradeOptional.orElseGet(() -> this.getGrade(EGrade.START_UP, gradeList)); } - /** - * 获取等级（没有则返回V0） - * - * @param pkGrade 等级ID - * @param gradeList 等级列表 - * @return - */ - private BdGrade getGrade(Integer pkGrade, List gradeList) { - Optional gradeOptional = gradeList.stream().filter(tmp -> tmp.getPkId().equals(pkGrade)).findFirst(); - return gradeOptional.orElseGet(() -> this.getGrade(EGrade.START_UP, gradeList)); - } - - /** - * 封装会员等级 - * - * @param cuMember 会员信息 - * @param saOrder 订单信息 - * @param oldLevel 旧等级 - * @param newLevel 新等级 - * @return - */ - private CuMemberLevel packageMemberLevel(CuMember cuMember, SaOrder saOrder, Integer oldLevel, Integer newLevel) { - CuMemberLevel cuMemberLevel = CuMemberLevel.builder() - .pkMember(cuMember.getPkId()) - .upgradeTime(saOrder.getPayTime()) - .upType(EUpgradeType.BUY_UPGRADE.getValue()) - .oldLevel(oldLevel) - .newLevel(newLevel) - .pkOrder(saOrder.getPkId()) - .build(); - cuMemberLevel.setPkCreator(cuMember.getPkId()); - cuMemberLevel.setPkCountry(cuMember.getPkSettleCountry()); - return cuMemberLevel; - } - } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/controller/manage/BdProductController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/controller/manage/BdProductController.java index 705ac976..ff9d5f93 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/controller/manage/BdProductController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/controller/manage/BdProductController.java @@ -33,8 +33,6 @@ import com.hzs.sale.product.vo.ProductSpecsVo; import com.hzs.sale.product.vo.ProductVo; import com.hzs.sale.product.vo.SupplierProductCensusVo; import com.hzs.sale.wares.service.IBdWaresDetailService; -import com.hzs.scm.product.IProductBasServiceApi; -import com.hzs.scm.product.dto.ProductBasDTO; import com.hzs.system.base.ISystemConfigServiceApi; import com.hzs.system.base.dto.BdCubasdocDTO; import com.hzs.system.sys.dto.LoginUser; @@ -73,8 +71,6 @@ public class BdProductController extends BaseController { @DubboReference ISystemConfigServiceApi systemConfigServiceApi; - @DubboReference - IProductBasServiceApi productBasServiceApi; /** * 查询产品列表 @@ -526,43 +522,6 @@ public class BdProductController extends BaseController { return AjaxResult.success(productParams); } - /** - * 查询产品详情 根据产品基本信息主键 - * - * @return - */ - @GetMapping("/product-bas-detail") - public AjaxResult productBasDetail(Integer pkProductBas) { - R productBas = productBasServiceApi.getProductBasById(pkProductBas); - BdProduct product = productService.getOne(new LambdaQueryWrapper().eq(BdProduct::getPkProductBas, pkProductBas).eq(BdProduct::getPkCountry, SecurityUtils.getPkCountry())); - - if (productBas.getData() == null) { - return AjaxResult.error(TransactionUtils.getContent(ProductMsgConstants.PRODUCT_NOT_REQUIRED)); - } - ProductParams productParams = BeanUtil.copyProperties(productBas.getData(), ProductParams.class); - BdProductExtend productExtend = productExtendService.getProductExtend(product.getPkId()); - productParams.setIsPickUp(productExtend.getIsPickUp()); - productParams.setIsPrize(productExtend.getIsPrize()); - productParams.setIsBarCode(productExtend.getIsBarCode()); - productParams.setRepurchaseType(productExtend.getRepurchaseType()); - productParams.setIsMerge(productExtend.getIsMerge()); - productParams.setIsGift(productExtend.getIsGift()); - productParams.setIsLandTrans(productExtend.getIsLandTrans()); - productParams.setIsAirTrans(productExtend.getIsAirTrans()); - productParams.setIsOceanTrans(productExtend.getIsOceanTrans()); - productParams.setSort(productExtend.getSort()); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(BdProductSpecs::getPkProduct, product.getPkId()); - List pkSpecsType = new ArrayList<>(); - List productSpecList = productSpecsService.list(queryWrapper); - for (BdProductSpecs bdProductSpecs : productSpecList) { - pkSpecsType.add(bdProductSpecs.getPkSpecsType()); - } - productParams.setPkSpecsType(pkSpecsType); - productParams.setPkProductBas(productBas.getData().getPkId()); - return AjaxResult.success(productParams); - } - /** * @return */ diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/service/impl/BdProductSpecsServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/service/impl/BdProductSpecsServiceImpl.java index f50e9d95..ec9b0cbc 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/service/impl/BdProductSpecsServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/service/impl/BdProductSpecsServiceImpl.java @@ -11,17 +11,13 @@ import org.springframework.stereotype.Service; import java.util.List; /** - *

* 规格明细表 服务实现类 - *

- * - * @author hzs - * @since 2022-09-13 */ @Service public class BdProductSpecsServiceImpl extends ServiceImpl implements IBdProductSpecsService { /** * 产品规格 + * * @param pkProduct * @return */ diff --git a/bd-business/bd-business-sale/src/main/resources/bootstrap.yml b/bd-business/bd-business-sale/src/main/resources/bootstrap.yml index 44d6be61..63217e65 100644 --- a/bd-business/bd-business-sale/src/main/resources/bootstrap.yml +++ b/bd-business/bd-business-sale/src/main/resources/bootstrap.yml @@ -70,7 +70,7 @@ dubbo: payload: 10485760 cloud: # 订阅服务 - subscribed-services: bd-system, bd-member, bd-third, bd-bonus, bd-scm + subscribed-services: bd-system, bd-member, bd-third, bd-bonus scan: # dubbo 服务扫描包（开启之后才会对外提供服务） base-packages: com.hzs diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderRelationItemsMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderRelationItemsMapper.xml deleted file mode 100644 index 435468e6..00000000 --- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderRelationItemsMapper.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderRelationMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderRelationMapper.xml deleted file mode 100644 index 75b0f2c8..00000000 --- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderRelationMapper.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/bd-business/bd-business-scm/pom.xml b/bd-business/bd-business-scm/pom.xml deleted file mode 100644 index 4270c2a7..00000000 --- a/bd-business/bd-business-scm/pom.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - 4.0.0 - - - com.bd - bd-business - 1.2.0-SNAPSHOT - - - bd-business-scm - - - bd-business-scm进销存服务 - - - - - - com.bd - bd-business-common - - - - - com.bd - bd-api-sale - - - - - com.bd - bd-api-scm - - - - com.bd - bd-common-aop - - - com.bd - bd-common-domain - - - org.springframework.amqp - spring-rabbit - - - - - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - 2.3.12.RELEASE - - - - repackage - - - - - - - - diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ScmApplication.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ScmApplication.java deleted file mode 100644 index 29c0681d..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ScmApplication.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.hzs; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import com.hzs.common.security.annotation.EnableCustomConfig; -import org.springframework.cloud.client.discovery.EnableDiscoveryClient; -import org.springframework.scheduling.annotation.EnableScheduling; - -/** - * 进销存服务 - * - * @author hzs - */ -@EnableDiscoveryClient -@EnableCustomConfig -@SpringBootApplication -@EnableScheduling -public class ScmApplication { - - public static void main(String[] args) { - SpringApplication.run(ScmApplication.class, args); - System.out.println("ScmApplication 进销存服务启动成功"); - } - -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/margin/controller/ThMarginController.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/margin/controller/ThMarginController.java deleted file mode 100644 index 8f8da649..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/margin/controller/ThMarginController.java +++ /dev/null @@ -1,117 +0,0 @@ -package com.hzs.ground.margin.controller; - -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.hzs.common.core.annotation.Log; -import com.hzs.common.core.constant.msg.ScmMsgConstants; -import com.hzs.common.core.enums.*; -import com.hzs.common.core.utils.StringUtils; -import com.hzs.common.core.web.controller.BaseController; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.ground.margin.ThMargin; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.common.util.TransactionUtils; -import com.hzs.ground.margin.service.IThMarginService; -import com.hzs.ground.margin.vo.ThMarginVO; -import com.hzs.ground.supplier.service.IThSupplierApplyService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.Date; -import java.util.List; - -/** - * 保证金缴纳 前端控制器 - */ -@RestController -@RequestMapping("/manage/th-margin") -public class ThMarginController extends BaseController { - - @Autowired - private IThMarginService iThMarginService; - @Autowired - private IThSupplierApplyService iThSupplierApplyService; - - /** - * 保证金缴纳列表 - **/ - @GetMapping("/list") - @Log(module = EOperationModule.TH_SUPPLIER_APPLY, business = EOperationBusiness.TH_SUPPLIER_APPLY, method = EOperationMethod.SELECT) - public TableDataInfo listGeneralIn(ThMarginVO thMarginVO) { - Long userId = SecurityUtils.getUserId(); - thMarginVO.setPkCountry(SecurityUtils.getPkCountry()); - Integer checkUser = iThSupplierApplyService.queryThSupplierApplyUserList(userId); - if (checkUser > 0) { - thMarginVO.setPkCreator(userId); - } - startPage(); - List thSupplierApplyList = iThMarginService.queryThMarginList(thMarginVO); - return getDataTable(thSupplierApplyList); - } - - /** - * 添加保证金缴纳 - **/ - @PostMapping("/save") - public AjaxResult save(@RequestBody ThMarginVO thMarginVO) { - int pkCountry = SecurityUtils.getPkCountry(); - // 验证必填信息 - if (StringUtils.isNull(thMarginVO.getMargin())) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.TH_MARGIN_MARGIN)); - } - thMarginVO.setPkCountry(pkCountry); - thMarginVO.setPkCreator(SecurityUtils.getUserId()); - thMarginVO.setCreationTime(new Date()); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("PK_SUPPLIER", thMarginVO.getPkSupplier()); - List thList = iThMarginService.list(queryWrapper); - if (CollectionUtil.isNotEmpty(thList)) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.TH_MARGIN_REPEAT)); - } - iThMarginService.saveThMargin(thMarginVO); - return AjaxResult.success(); - } - - /** - * 修改保证金缴纳 - **/ - @PostMapping("/update") - public AjaxResult update(@RequestBody ThMarginVO thMarginVO) { - int pkCountry = SecurityUtils.getPkCountry(); - // 验证必填信息 - if (StringUtils.isNull(thMarginVO.getMargin())) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.TH_MARGIN_MARGIN)); - } - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("PK_SUPPLIER", thMarginVO.getPkSupplier()); - queryWrapper.ne("PK_ID", thMarginVO.getPkId()); - List thList = iThMarginService.list(queryWrapper); - if (CollectionUtil.isNotEmpty(thList)) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.TH_MARGIN_REPEAT)); - } - thMarginVO.setPkCountry(pkCountry); - thMarginVO.setPkCreator(SecurityUtils.getUserId()); - thMarginVO.setCreationTime(new Date()); - iThMarginService.updateThMargin(thMarginVO); - return AjaxResult.success(); - } - - /** - * 查询保证金缴纳 - **/ - @GetMapping("/getOne/{pkId}") - public AjaxResult getOne(@PathVariable Long pkId) { - ThMargin tsa = iThMarginService.getById(pkId); - return AjaxResult.success(tsa); - } - - /** - * 删除保证金缴纳 - **/ - @DeleteMapping("/{pkId}") - public AjaxResult delete(@PathVariable Long pkId) { - return AjaxResult.success(iThMarginService.delThMargin(pkId)); - } - -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/margin/mapper/ThMarginMapper.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/margin/mapper/ThMarginMapper.java deleted file mode 100644 index fdb7be0c..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/margin/mapper/ThMarginMapper.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.hzs.ground.margin.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.ground.margin.ThMargin; -import com.hzs.ground.margin.vo.ThMarginVO; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 保证金缴纳 Mapper 接口 - */ -public interface ThMarginMapper extends BaseMapper { - - /** - * 保证金缴纳列表 - **/ - List queryThMarginList(ThMarginVO thMarginVO); - - /** - * 保证金缴纳审批查看 - **/ - List queryThMarginByCode(@Param("businessCode") String businessCode, - @Param("pkCountry") Integer pkCountry); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/margin/service/IThMarginService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/margin/service/IThMarginService.java deleted file mode 100644 index 782a78c4..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/margin/service/IThMarginService.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.hzs.ground.margin.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.ground.margin.ThMargin; -import com.hzs.ground.margin.vo.ThMarginVO; - -import java.util.List; - -/** - * 保证金缴纳 服务类 - */ -public interface IThMarginService extends IService { - - /** - * 保证金缴纳列表 - **/ - List queryThMarginList(ThMarginVO thMarginVO); - - /** - * 添加保证金缴纳 - **/ - boolean saveThMargin(ThMarginVO thMarginVO); - - /** - * 修改保证金缴纳 - **/ - boolean updateThMargin(ThMarginVO thMarginVO); - - /** - * 删除保证金缴纳 - **/ - boolean delThMargin(Long pkId); - -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/margin/service/impl/ThMarginServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/margin/service/impl/ThMarginServiceImpl.java deleted file mode 100644 index c8e7df06..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/margin/service/impl/ThMarginServiceImpl.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.hzs.ground.margin.service.impl; - -import cn.hutool.core.bean.BeanUtil; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.enums.*; -import com.hzs.common.domain.ground.margin.ThMargin; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.ground.margin.mapper.ThMarginMapper; -import com.hzs.ground.margin.service.IThMarginService; -import com.hzs.ground.margin.vo.ThMarginVO; -import com.hzs.ground.product.service.IThApprovalLogService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.*; - -/** - * 保证金缴纳 服务实现类 - */ -@Service -public class ThMarginServiceImpl extends ServiceImpl implements IThMarginService { - - @Autowired - IThApprovalLogService iThApprovalLogService; - - @Override - public List queryThMarginList(ThMarginVO thMarginVO) { - return baseMapper.queryThMarginList(thMarginVO); - } - - @Override - public boolean saveThMargin(ThMarginVO thMarginVO) { - ThMargin tm = BeanUtil.copyProperties(thMarginVO, ThMargin.class); - baseMapper.insert(tm); - return true; - } - - @Override - public boolean updateThMargin(ThMarginVO thMarginVO) { - ThMargin tm = BeanUtil.copyProperties(thMarginVO, ThMargin.class); - baseMapper.updateById(tm); - return true; - } - - @Override - public boolean delThMargin(Long pkId) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("PK_ID", pkId); - updateWrapper.set("PK_MODIFIED", SecurityUtils.getUserId()); - updateWrapper.set("MODIFIED_TIME", new Date()); - updateWrapper.set("DEL_FLAG", EDelFlag.DELETE.getValue()); - baseMapper.update(null, updateWrapper); - return true; - } - -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/margin/vo/ThMarginVO.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/margin/vo/ThMarginVO.java deleted file mode 100644 index bca60efa..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/margin/vo/ThMarginVO.java +++ /dev/null @@ -1,205 +0,0 @@ -package com.hzs.ground.margin.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Excel; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import com.hzs.common.core.web.domain.BaseApprovalEntity; -import com.hzs.system.sys.dto.LoginUser; -import lombok.Data; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -/** - *

- * 保证金缴纳VO - *

- * - * @author hzs - * @since 2024-03-21 - */ -@Data -public class ThMarginVO extends BaseApprovalEntity { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private Integer pkId; - private String pkIdListStr; - private List pkIdList; - /** - * 会员编号 - */ - private String memberCode; - /** - * 会员名称 - */ - private String memberName; - /** - * 客商编号 - */ - private String custCode; - /** - * 客商名称 - */ - private String custName; - /** - * 供应商类型 - */ - private Integer custType; - - /** - * 供应商简称 - */ - private String shortName; - - /** - * 法人 - */ - private String legalBody; - - /** - * 联系人 - */ - private String linkMan; - - /** - * 纳税人登记号 - */ - private String taxpayerid; - - /** - * 省 - */ - private Integer province; - /** - * 省 - */ - private String provinceName; - - /** - * 市 - */ - private Integer city; - /** - * 市 - */ - private String cityName; - - /** - * 区 - */ - private Integer county; - /** - * 区 - */ - private String countyName; - - /** - * 地址 - */ - private String address; - /** - * 经营范围 - */ - private String tradeScope; - /** - * 会员id - */ - private Long pkMember; - - - - - /** - * 缴纳供应商 - */ - private Integer pkSupplier; - - /** - * 缴纳日期 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date billDate; - - /** - * 销售类型 引用现在销售大类 来源枚举 ESaleType - */ - @Transaction(transactionKey = EnumsPrefixConstants.E_SALE_TYPE) - private Integer saleType; - /** - * 销售类型 引用现在销售大类 来源枚举 ESaleType - */ - private String saleTypeVal; - - /** - * 销售范围 - */ - private Integer saleScope; - - /** - * 联系电话 - */ - private String phone; - - - /** - * 保证金金额 - */ - private BigDecimal margin; - - /** - * 创建人ID - */ - private Long pkCreator; - - /** - * 创建时间 - */ - @Excel(name = "创建时间",dateFormat = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date creationTime; - - /** - * 逻辑删除 (0=未删除，1已删除) - */ - private Integer delFlag; - - /** - * 国家 - */ - private Integer pkCountry; - /** - * 登录用户信息 - */ - private LoginUser loginUser; - /** - * 审批业务类型 来源枚举 EApprovalBusiness - */ - private Integer editType; - - /** - * 审核状态 来源枚举 EApproveStatus - */ - @Transaction(transactionKey = EnumsPrefixConstants.APPROVE_STATUS) - private Integer approveStatus; - /** - * 审核状态 来源枚举 EApproveStatus - */ - private String approveStatusVal; - - /** - * 修改记录单号 - */ - private String thBusinessCode; - /** - * 保证金缴纳集合 - */ - private List thMarginVOList; - - -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/order/controller/manage/SupplierOrderController.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/order/controller/manage/SupplierOrderController.java deleted file mode 100644 index 8855a92a..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/order/controller/manage/SupplierOrderController.java +++ /dev/null @@ -1,221 +0,0 @@ -package com.hzs.ground.order.controller.manage; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; -import com.hzs.common.core.annotation.Log; -import com.hzs.common.core.constant.msg.ScmMsgConstants; -import com.hzs.common.core.domain.R; -import com.hzs.common.core.enums.*; -import com.hzs.common.core.utils.poi.ExcelUtil; -import com.hzs.common.core.web.controller.BaseController; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.ground.order.ext.SaOrderSettleExt; -import com.hzs.common.domain.sale.ext.SaOrderExt; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.ground.order.param.OrderItemsParam; -import com.hzs.ground.order.param.OrderQueryParam; -import com.hzs.ground.order.service.ISaOrderSettleService; -import com.hzs.ground.order.service.ISupplierOrderService; -import com.hzs.ground.order.vo.SaOrderSettleVo; -import com.hzs.system.base.ISystemConfigServiceApi; -import com.hzs.system.base.dto.BdCubasdocDTO; -import lombok.extern.slf4j.Slf4j; -import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -/** - * 订单控制类 - * - * @author: sui q - * @time: 2022/8/27 16:20 - * @description: - * @classname: OrderController - * @package_name: com.hzs.sale.order.controller - */ -@RestController -@RequestMapping("/manage/order") -@Slf4j -public class SupplierOrderController extends BaseController { - - @DubboReference - private ISystemConfigServiceApi systemConfigServiceApi; - - @Autowired - private ISupplierOrderService supplierOrderService; - - @Autowired - private ISaOrderSettleService saOrderSettleService; - - /** - * 查询列表 - * - * @return cubasdocParam 入参 - */ - @PostMapping("/list") - public TableDataInfo listSupplierOrder(@RequestBody OrderQueryParam orderQueryParam) { - // 根据登录人获取供应商，根据登录账号查找绑定的供应商，查询供应商表 - R bdCubasdocDate = systemConfigServiceApi.queryBdCubasdocByUser(SecurityUtils.getUserId()); - if (!bdCubasdocDate.isSuccess() || bdCubasdocDate.getData() == null) { - return getDataTable(Collections.emptyList()); - } - orderQueryParam.setPkSupplier(bdCubasdocDate.getData().getPkSupplier()); - // 根据供应商查询可以查询到的订单 - startPage(); - orderQueryParam.setPkCountry(SecurityUtils.getPkCountry()); - List orderList = supplierOrderService.querySaOrderByCondition(orderQueryParam); - for (SaOrderExt saOrderExt : orderList) { - for (EOrderStatus value : EOrderStatus.values()) { - if (value.getValue() == saOrderExt.getOrderStatus()) { - saOrderExt.setOrderStatusVal(value.getLabel()); - break; - } - } - } - return getDataTable(orderList); - } - - @PostMapping("/send") - public AjaxResult sendGood(@RequestBody List orderItemsParamList) { - // 验证是否有该产品的权限，验证订单是否已经发货 - R bdCubasdocDate = systemConfigServiceApi.queryBdCubasdocByUser(SecurityUtils.getUserId()); - if (!bdCubasdocDate.isSuccess() || bdCubasdocDate.getData() == null) { - return AjaxResult.error("该账号没有绑定供应商"); - } - for (OrderItemsParam orderItemsParam : orderItemsParamList) { - if (orderItemsParam.getLogisticsCode() == null || orderItemsParam.getLogisticsCompany() == null) { - return AjaxResult.error("请输入物流单号，物流公司"); - } - } - OrderQueryParam orderQueryParam = new OrderQueryParam(); - orderQueryParam.setPkSupplier(bdCubasdocDate.getData().getPkSupplier()); - orderQueryParam.setOrderItemsParamList(orderItemsParamList); - orderQueryParam.setPkCountry(SecurityUtils.getPkCountry()); - orderQueryParam.setPkCreator(SecurityUtils.getUserId()); - List orderList = supplierOrderService.querySaOrderByCondition(orderQueryParam); - if (orderList == null) { - return AjaxResult.error("存在不属于该用户的产品，不能发货"); - } - int size = 0; - for (SaOrderExt saOrderExt : orderList) { - size += saOrderExt.getOrderItemsExtList().size(); - } - if (size < orderItemsParamList.size()) { - return AjaxResult.error("存在不属于该用户的产品，不能发货"); - } - supplierOrderService.sendGood(orderQueryParam, orderItemsParamList, orderList); - return AjaxResult.success(); - } - - /** - * 查询列表 - * - * @return cubasdocParam 入参 - */ - @PostMapping("/list-settle") - @Log(module = EOperationModule.SUPPLIER_SETTLE_ORDER, business = EOperationBusiness.SUPPLIER_SETTLE_ORDER, method = EOperationMethod.SELECT) - public TableDataInfo listSettleOrder(@RequestBody OrderQueryParam orderQueryParam) { - // 根据登录人获取供应商，根据登录账号查找绑定的供应商，查询供应商表 - R bdCubasdocDate = systemConfigServiceApi.queryBdCubasdocByUser(SecurityUtils.getUserId()); - if (bdCubasdocDate != null && bdCubasdocDate.getData() != null) { - orderQueryParam.setPkSupplier(bdCubasdocDate.getData().getPkSupplier()); - } - // 根据供应商查询可以查询到的订单 - startPage(); - orderQueryParam.setPkCountry(SecurityUtils.getPkCountry()); - List orderSettleExtList = saOrderSettleService.querySaOrderSettle(orderQueryParam); - return getDataTable(orderSettleExtList); - } - - /** - * 分页查询会员某个时间段内的奖金汇总 - */ - @PostMapping("/export-list") - @Log(module = EOperationModule.SUPPLIER_SETTLE_ORDER, business = EOperationBusiness.SUPPLIER_SETTLE_ORDER, method = EOperationMethod.EXPORT) - public void exportSettleOrder(HttpServletResponse response, OrderQueryParam orderQueryParam){ - // 根据登录人获取供应商，根据登录账号查找绑定的供应商，查询供应商表 - R bdCubasdocDate = systemConfigServiceApi.queryBdCubasdocByUser(SecurityUtils.getUserId()); - if (bdCubasdocDate != null && bdCubasdocDate.getData() != null) { - orderQueryParam.setPkSupplier(bdCubasdocDate.getData().getPkSupplier()); - } - // 根据供应商查询可以查询到的订单 - orderQueryParam.setPkCountry(SecurityUtils.getPkCountry()); - List orderSettleExtList = saOrderSettleService.querySaOrderSettle(orderQueryParam); - List saOrderSettleVoList = packageScmExportVo(orderSettleExtList); - ExcelUtil util = new ExcelUtil<>(SaOrderSettleVo.class); - util.exportExcel(response, saOrderSettleVoList, "订单结算导出"); - } - - private List packageScmExportVo(List orderSettleExtList) { - List saOrderSettleVoList = new ArrayList<>(); - for (SaOrderSettleExt saOrderSettleExt : orderSettleExtList) { - SaOrderSettleVo saOrderSettleVo = BeanUtil.copyProperties(saOrderSettleExt, SaOrderSettleVo.class); - if(EDealerYesNo.YES.getValue() == saOrderSettleExt.getSettleStatus()){ - saOrderSettleVo.setSettleStatusVal(EDealerYesNo.YES.getLabel()); - }else{ - saOrderSettleVo.setSettleStatusVal(EDealerYesNo.NO.getLabel()); - } - saOrderSettleVoList.add(saOrderSettleVo); - } - return saOrderSettleVoList; - } - - /** - * 结算订单 - * - * @return cubasdocParam 入参 - */ - @PostMapping("/settle-order") - @Log(module = EOperationModule.SUPPLIER_SETTLE_ORDER, business = EOperationBusiness.SUPPLIER_SETTLE_ORDER, method = EOperationMethod.SETTLE) - public AjaxResult settleOrder(@RequestBody OrderQueryParam orderQueryParam) { - orderQueryParam.setPkCountry(SecurityUtils.getPkCountry()); - List orderSettleExtList = saOrderSettleService.querySaOrderSettle(orderQueryParam); - if (CollectionUtil.isEmpty(orderSettleExtList)) { - return AjaxResult.error(ScmMsgConstants.SETTLE_ORDER_NOT_EXISTS); - } - // 分为线上线下2部分 - for (SaOrderSettleExt saOrderSettleExt : orderSettleExtList) { - // 验证状态 - if (EYesNo.YES.getIntValue() == saOrderSettleExt.getSettleStatus()) { - return AjaxResult.error(ScmMsgConstants.SETTLE_ORDER_HAS_SETTLE); - } - } - saOrderSettleService.updateSaOrderSettle(orderSettleExtList); - return AjaxResult.success(); - } - -// /** -// * 撤销订单并入库（走签呈），签呈页面点击确定按钮 -// * -// * @param scmApproveParam 参数 -// */ -// @PostMapping("/submit") -// @Log(module = EOperationModule.SUPPLIER_SETTLE_ORDER, business = EOperationBusiness.SUPPLIER_SETTLE_ORDER, method = EOperationMethod.UPDATE) -// public AjaxResult submitSettleOrder(@RequestBody ScmApproveParam scmApproveParam) { -// scmApproveParam.setPkCountry(SecurityUtils.getPkCountry()); -// if(scmApproveParam.getPkId() == null){ -// return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.IC_GENERAL_IN_NOT_EXIST)); -// } -// IcGeneralInHExt generalInhExt = generalInhService.queryGeneralInById(scmApproveParam.getPkId(), EScmOrderStatus.SAVE.getValue()); -// if (generalInhExt == null) { -// return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.IC_GENERAL_IN_NOT_EXIST)); -// } -// // 验证该订单是否存在签呈，存在待审核的签呈不能再次发起 -// List scmOrderApproveLogs = scmOrderApproveLogService.queryScmOrderApproveLogByCondition(scmApproveParam.getPkId(), EApprovalBusiness.IC_GENERAL_IN_APPROVE.getValue(), null); -// if(CollectionUtil.isNotEmpty(scmOrderApproveLogs)){ -// return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.PURCHASE_EXISTS_AGENT)); -// } -// generalInhService.auditGeneralInByApproveParamSubmit(scmApproveParam, userTokenService.getLoginUser()); -// return AjaxResult.success(); -// } - -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/order/mapper/SaOrderSettleMapper.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/order/mapper/SaOrderSettleMapper.java deleted file mode 100644 index 529e4b2d..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/order/mapper/SaOrderSettleMapper.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.hzs.ground.order.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.ground.order.SaOrderSettle; -import com.hzs.common.domain.ground.order.ext.SaOrderSettleExt; -import com.hzs.ground.order.param.OrderQueryParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - *

- * 销售订单-三方结算表 Mapper 接口 - *

- * - * @author hzs - * @since 2024-04-15 - */ -public interface SaOrderSettleMapper extends BaseMapper { - - /* - * @description: - * @author: sui q - * @date: 2024/4/15 15:37 - * @param: null null - **/ - List querySaOrderSettle(@Param("queryParam") OrderQueryParam queryParam); - - /* - * @description: 结算操作 - * @author: sui q - * @date: 2024/4/16 10:23 - * @param: null null - **/ - void updateSaOrderSettle(@Param("orderSettleExtList") List orderSettleExtList); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/order/mapper/SupplierOrderMapper.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/order/mapper/SupplierOrderMapper.java deleted file mode 100644 index a5432037..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/order/mapper/SupplierOrderMapper.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.hzs.ground.order.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.sale.ext.SaOrderExt; -import com.hzs.common.domain.sale.order.SaOrderItems; -import com.hzs.ground.order.param.OrderQueryParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @description: 供应商查询顶顶那 - * @author: sui q - * @time: 2024/3/23 14:01 - * @classname: SupplierOrdeMapper - * @package_name: com.hzs.ground.order.mapper - * version 1.0.0 - */ -public interface SupplierOrderMapper extends BaseMapper { - - /* - * @description: 供应商查询订单 - * @author: sui q - * @date: 2024/3/23 14:32 - * @param: null null - **/ - List querySaOrderByCondition(@Param("orderQueryParam") OrderQueryParam orderQueryParam); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/order/param/OrderItemsParam.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/order/param/OrderItemsParam.java deleted file mode 100644 index 02285d5c..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/order/param/OrderItemsParam.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.hzs.ground.order.param; - -import com.baomidou.mybatisplus.annotation.FieldStrategy; -import com.baomidou.mybatisplus.annotation.TableField; -import lombok.Data; -import org.apache.ibatis.type.JdbcType; - -import java.io.Serializable; - -/** - * @description: 发货信息 - * @author: sui q - * @time: 2024/3/23 15:18 - * @classname: OrderItemsParam - * @package_name: com.hzs.ground.order.param - * version 1.0.0 - */ -@Data -public class OrderItemsParam implements Serializable { - - /** - * 子表主键 - */ - private Long pkId; - - /** - * 物流单号 - */ - private String logisticsCode; - - /** - * 物流公司 - */ - private String logisticsCompany; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/order/param/OrderQueryParam.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/order/param/OrderQueryParam.java deleted file mode 100644 index 41e2f5ed..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/order/param/OrderQueryParam.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.hzs.ground.order.param; - -import com.baomidou.mybatisplus.annotation.TableField; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.util.Date; -import java.util.List; - -/** - * @Description: 订单查询参数 - * @Author: sui q - * @Time: 2022/10/19 16:49 - * @Classname: OrderQueryParam - * @PackageName: com.hzs.sale.order.param - */ -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class OrderQueryParam implements Serializable { - - /** - * 收货人 - */ - private String recName; - - /** - * 收货电话 - */ - private String recPhone; - - /** - * 开始支付时间 - */ - private Date startTime; - - /** - * 结束支付时间 - */ - private Date endTime; - - /** - * 订单编号 - */ - private String orderCode; - - /** - * 国家 - */ - private Integer pkCountry; - - private Long pkCreator; - - /** - * 供应商 - */ - private Integer pkSupplier; - - /** - * 产品编号 - */ - private String productCode; - - /** - * 产品名称 - */ - private String productName; - - /** - * 发货渠道 1 总仓发货 2 一件代发 - */ - private Integer shippingChannel; - - /** - * 订单状态 (0=待支付,1=已支付) - */ - private Integer orderStatus; - - private List idList; - - private List orderItemsParamList; - -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/order/service/ISaOrderSettleService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/order/service/ISaOrderSettleService.java deleted file mode 100644 index ecb03d8f..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/order/service/ISaOrderSettleService.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.hzs.ground.order.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.ground.order.SaOrderSettle; -import com.hzs.common.domain.ground.order.ext.SaOrderSettleExt; -import com.hzs.common.domain.sale.ext.SaOrderExt; -import com.hzs.ground.order.param.OrderQueryParam; - -import java.util.List; - -/** - *

- * 销售订单-三方结算表 服务类 - *

- * - * @author hzs - * @since 2024-04-15 - */ -public interface ISaOrderSettleService extends IService { - - /* - * @description: 保存结算单，发货完成后生成订单结算单 - * @author: sui q - * @date: 2024/4/15 14:12 - * @param: null null - **/ - void saveOrderSettleByOrder(OrderQueryParam orderQueryParam, List orderList); - - /* - * @description: - * @author: sui q - * @date: 2024/4/15 15:37 - * @param: null null - **/ - List querySaOrderSettle(OrderQueryParam queryParam); - - /* - * @description: 结算操作 - * @author: sui q - * @date: 2024/4/16 10:23 - * @param: null null - **/ - void updateSaOrderSettle(List orderSettleExtList); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/order/service/ISupplierOrderService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/order/service/ISupplierOrderService.java deleted file mode 100644 index 4b9e159b..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/order/service/ISupplierOrderService.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.hzs.ground.order.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.sale.ext.SaOrderExt; -import com.hzs.common.domain.sale.order.SaOrder; -import com.hzs.common.domain.sale.order.SaOrderItems; -import com.hzs.ground.order.param.OrderItemsParam; -import com.hzs.ground.order.param.OrderQueryParam; - -import java.util.List; - -/** - * @description: 用于查询供应商订单，发货 - * @author: sui q - * @time: 2024/3/23 13:59 - * @classname: SupplierOrderService - * @package_name: com.hzs.ground.order.service - * version 1.0.0 - */ -public interface ISupplierOrderService extends IService { - - /* - * @description: 供应商查询订单 - * @author: sui q - * @date: 2024/3/23 14:32 - * @param: null null - **/ - List querySaOrderByCondition(OrderQueryParam orderQueryParam); - - /* - * @description: 发货 - * @author: sui q - * @date: 2024/3/23 15:36 - * @param: null null - **/ - void sendGood(OrderQueryParam orderQueryParam, List orderItemsParamList, List orderList); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/order/service/impl/SaOrderSettleServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/order/service/impl/SaOrderSettleServiceImpl.java deleted file mode 100644 index 95847c6f..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/order/service/impl/SaOrderSettleServiceImpl.java +++ /dev/null @@ -1,105 +0,0 @@ -package com.hzs.ground.order.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.enums.ESettleType; -import com.hzs.common.core.enums.EYesNo; -import com.hzs.common.core.utils.ComputeUtil; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.domain.ground.order.SaOrderSettle; -import com.hzs.common.domain.ground.order.ext.SaOrderSettleExt; -import com.hzs.common.domain.sale.ext.SaOrderExt; -import com.hzs.common.domain.sale.ext.SaOrderItemsExt; -import com.hzs.common.domain.scm.postage.ext.ThSupplierPostageExt; -import com.hzs.ground.order.mapper.SaOrderSettleMapper; -import com.hzs.ground.order.param.OrderQueryParam; -import com.hzs.ground.order.service.ISaOrderSettleService; -import com.hzs.ground.postage.service.IThSupplierPostageService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.math.BigDecimal; -import java.time.temporal.ChronoUnit; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - *

- * 销售订单-三方结算表 服务实现类 - *

- * - * @author hzs - * @since 2024-04-15 - */ -@Service -public class SaOrderSettleServiceImpl extends ServiceImpl implements ISaOrderSettleService { - - @Autowired - private IThSupplierPostageService supplierPostageService; - - @Override - @Transactional(rollbackFor = Exception.class) - public void saveOrderSettleByOrder(OrderQueryParam orderQueryParam, List orderList) { - List saOrderSettleList = new ArrayList<>(); - List orderItemsExtList = new ArrayList<>(); - for (SaOrderExt saOrderExt : orderList) { - for (SaOrderItemsExt saOrderItems : saOrderExt.getOrderItemsExtList()) { - SaOrderSettle saOrderSettle = SaOrderSettle.builder() - .pkOrder(saOrderExt.getPkId()) - .pkOrderItems(saOrderItems.getPkId()) - .settleStatus(EYesNo.NO.getIntValue()) - .price(saOrderItems.getSupplyPrice()) - .quantity(saOrderItems.getQuantity()) - .pkSupplier(orderQueryParam.getPkSupplier()) - .postage(BigDecimal.ZERO) - .totalPrice(ComputeUtil.computeMultiply(saOrderItems.getSupplyPrice(), saOrderItems.getQuantity())) - .build(); - saOrderSettle.setPkCountry(orderQueryParam.getPkCountry()); - saOrderSettle.setPkCreator(orderQueryParam.getPkCreator()); - saOrderSettleList.add(saOrderSettle); - saOrderItems.setPkSupplier(orderQueryParam.getPkSupplier()); - orderItemsExtList.add(saOrderItems); - } - } - List thSupplierPostageExtList = supplierPostageService.querySupplierPostageByOrder(orderItemsExtList); - if (saOrderSettleList.size() > 0) { - Map supplierPostageExtMap = new HashMap<>(); - if(thSupplierPostageExtList.size()>0){ - thSupplierPostageExtList.forEach(thSupplierPostageExt -> supplierPostageExtMap.put(thSupplierPostageExt.getPkOrder(), thSupplierPostageExt)); - } - for (SaOrderSettle saOrderSettle : saOrderSettleList) { - if(supplierPostageExtMap.containsKey(saOrderSettle.getPkOrder())){ - saOrderSettle.setPostage(supplierPostageExtMap.get(saOrderSettle.getPkOrder()).getPostage()); - saOrderSettle.setTotalPrice(ComputeUtil.computeAdd(saOrderSettle.getTotalPrice(), saOrderSettle.getPostage())); - supplierPostageExtMap.remove(saOrderSettle.getPkOrder()); - } - } - saveBatch(saOrderSettleList); - } - } - - @Override - public List querySaOrderSettle(OrderQueryParam queryParam) { - if (queryParam.getEndTime() != null) { - queryParam.setEndTime(DateUtils.afterDate(1, ChronoUnit.DAYS, queryParam.getEndTime())); - } - return baseMapper.querySaOrderSettle(queryParam); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void updateSaOrderSettle(List orderSettleExtList) { - // 分为线上线下2部分 - List onlineSaOrderSettleList = new ArrayList<>(); - for (SaOrderSettleExt saOrderSettleExt : orderSettleExtList) { - if(ESettleType.ONLINE.getValue() == saOrderSettleExt.getSettleType()){ - onlineSaOrderSettleList.add(saOrderSettleExt); - } - } - // 批量更新结算状态 - baseMapper.updateSaOrderSettle(orderSettleExtList); - // 为账号发放结算金额，这个可能会发2份，待确认 - } -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/order/service/impl/SupplierOrderServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/order/service/impl/SupplierOrderServiceImpl.java deleted file mode 100644 index 4b12bdbd..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/order/service/impl/SupplierOrderServiceImpl.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.hzs.ground.order.service.impl; - -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.constant.SaOrderFieldConstants; -import com.hzs.common.core.constant.SystemFieldConstants; -import com.hzs.common.core.enums.EOrderStatus; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.domain.sale.ext.SaOrderExt; -import com.hzs.common.domain.sale.order.SaOrder; -import com.hzs.common.domain.sale.order.SaOrderItems; -import com.hzs.ground.order.mapper.SupplierOrderMapper; -import com.hzs.ground.order.param.OrderItemsParam; -import com.hzs.ground.order.param.OrderQueryParam; -import com.hzs.ground.order.service.ISaOrderSettleService; -import com.hzs.ground.order.service.ISupplierOrderService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.time.temporal.ChronoUnit; -import java.util.List; - -/** - * @description: 供应商查询订单 - * @author: sui q - * @time: 2024/3/23 13:59 - * @classname: SupplierOrderServiceImpl - * @package_name: com.hzs.ground.order.service.impl - * version 1.0.0 - */ -@Service -public class SupplierOrderServiceImpl extends ServiceImpl implements ISupplierOrderService { - - @Autowired - private ISaOrderSettleService saOrderSettleService; - - @Override - public List querySaOrderByCondition(OrderQueryParam orderQueryParam) { - if (orderQueryParam.getEndTime() != null) { - orderQueryParam.setEndTime(DateUtils.afterDate(1, ChronoUnit.DAYS, orderQueryParam.getEndTime())); - } - return baseMapper.querySaOrderByCondition(orderQueryParam); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void sendGood(OrderQueryParam orderQueryParam , List orderItemsParamList, List orderList) { - for (OrderItemsParam orderItemsParam : orderItemsParamList) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq(SystemFieldConstants.PK_ID, orderItemsParam.getPkId()); - updateWrapper.eq(SaOrderFieldConstants.ORDER_STATUS, EOrderStatus.PAY.getValue()); - updateWrapper.set("LOGISTICS_CODE", orderItemsParam.getLogisticsCode()); - updateWrapper.set("LOGISTICS_COMPANY", orderItemsParam.getLogisticsCompany()); - updateWrapper.set(SaOrderFieldConstants.ORDER_STATUS, EOrderStatus.DELIVERED.getValue()); - update(updateWrapper); - } - // 发货完成自动生成待结算单据 - saOrderSettleService.saveOrderSettleByOrder(orderQueryParam, orderList); - } -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/order/vo/SaOrderSettleVo.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/order/vo/SaOrderSettleVo.java deleted file mode 100644 index 6cedb364..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/order/vo/SaOrderSettleVo.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.hzs.ground.order.vo; - -import com.hzs.common.core.annotation.Excel; -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -/** - * @description: 订单结算vo - * @author: sui q - * @time: 2024/5/8 11:04 - * @classname: SaOrderSettleVo - * @package_name: com.hzs.ground.order.vo - * version 1.0.0 - */ -@Data -public class SaOrderSettleVo implements Serializable { - - @Excel(name = "订单编号") - private String orderCode; - - /** - * 产品编号 - */ - @Excel(name = "产品编号") - private String productCode; - - /** - * 产品名称 - */ - @Excel(name = "产品名称") - private String productName; - - /** - * 数量 - */ - @Excel(name = "数量") - private Integer quantity; - - /** - * 价格 - */ - @Excel(name = "结算单价",scale = 2) - private BigDecimal price; - - @Excel(name = "结算状态") - private String settleStatusVal; - - /** - * 供应商名称 - */ - @Excel(name = "供应商") - private String supplyName; - - /** - * 创建时间 - */ - @Excel(name = "创建时间",dateFormat = "yyyy-MM-dd HH:mm:ss") - private Date creationTime; - - - /** - * 支付时间 - */ - @Excel(name = "支付时间",dateFormat = "yyyy-MM-dd HH:mm:ss") - private Date payTime; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/postage/controller/manage/SupplierPostageController.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/postage/controller/manage/SupplierPostageController.java deleted file mode 100644 index 466148e5..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/postage/controller/manage/SupplierPostageController.java +++ /dev/null @@ -1,124 +0,0 @@ -package com.hzs.ground.postage.controller.manage; - -import cn.hutool.core.bean.BeanUtil; -import com.hzs.common.core.constant.HttpStatus; -import com.hzs.common.core.domain.R; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.core.utils.poi.ExcelUtil; -import com.hzs.common.core.web.controller.BaseController; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.scm.postage.ThSupplierPostage; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.ground.postage.param.SupplierPostageParam; -import com.hzs.ground.postage.service.IThSupplierPostageService; -import com.hzs.ground.postage.vo.SupplierPostageVo; -import com.hzs.system.base.ISystemConfigServiceApi; -import com.hzs.system.base.dto.BdCubasdocDTO; -import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.List; - -@RestController -@RequestMapping("/manage/supplier-postage") -public class SupplierPostageController extends BaseController { - @Autowired - private IThSupplierPostageService supplierPostageService; - @DubboReference - private ISystemConfigServiceApi systemConfigServiceApi; - - /** - * 查询列表 - * @return - */ - @GetMapping("list") - public TableDataInfo list(SupplierPostageParam supplierPostageParam){ - startPage(); - - // 下面代码需要使用 坐等随工提交此方法 取消注释 - R bdCubasdocDate = systemConfigServiceApi.queryBdCubasdocByUser(SecurityUtils.getUserId()); - Integer pkSupplier = null; - if(bdCubasdocDate.getCode() == HttpStatus.SUCCESS){ - BdCubasdocDTO bdCubasdoc = bdCubasdocDate.getData(); - if(bdCubasdoc == null){ - pkSupplier = 1; - }else { - pkSupplier = bdCubasdoc.getPkSupplier(); - } - } - supplierPostageParam.setPkCubasdoc(pkSupplier); - List list = supplierPostageService.selectByQueryList(supplierPostageParam); - return getDataTable(list); - } - /** - * 查询列表 - * @return - */ - @PostMapping("export") - public void export(SupplierPostageParam supplierPostageParam,HttpServletResponse response){ - - // 下面代码需要使用 坐等随工提交此方法 取消注释 - R bdCubasdocDate = systemConfigServiceApi.queryBdCubasdocByUser(SecurityUtils.getUserId()); - Integer pkSupplier = null; - if(bdCubasdocDate.getCode() == HttpStatus.SUCCESS){ - BdCubasdocDTO bdCubasdoc = bdCubasdocDate.getData(); - if(bdCubasdoc == null){ - pkSupplier = 1; - }else { - pkSupplier = bdCubasdoc.getPkSupplier(); - } - } - supplierPostageParam.setPkCubasdoc(pkSupplier); - List list = supplierPostageService.selectByQueryList(supplierPostageParam); - ExcelUtil util = new ExcelUtil<>(SupplierPostageVo.class); - util.exportExcel(response, list, "商品信息导出"); - } - - /** - * 新增 - * @return - */ - @PostMapping("save") - public AjaxResult save(@RequestBody ThSupplierPostage supplierPostage){ - supplierPostage.setCreationTime(DateUtils.currentDateTime()); - supplierPostage.setPkCreator(SecurityUtils.getUserId()); - supplierPostage.setPkCountry(SecurityUtils.getPkCountry()); - supplierPostageService.save(supplierPostage); - return AjaxResult.success(); - } - - - /** - * 修改 - */ - @PostMapping("update") - public AjaxResult update(@RequestBody ThSupplierPostage supplierPostage){ - supplierPostageService.updateById(supplierPostage); - return AjaxResult.success(); - } - - /** - * 查询详情 - */ - @GetMapping("detail") - public AjaxResult detail(Integer pkSupplierPostage){ - - SupplierPostageVo supplierPostageVo = supplierPostageService.selectByPkId(pkSupplierPostage); - - return AjaxResult.success(supplierPostageVo); - } - - /** - * 删除 - * @param pkSupplierPostage - * @return - */ - @GetMapping("remove") - public AjaxResult remove(Integer pkSupplierPostage){ - supplierPostageService.removeById(pkSupplierPostage); - return AjaxResult.success(); - } -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/postage/mapper/ThSupplierPostageMapper.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/postage/mapper/ThSupplierPostageMapper.java deleted file mode 100644 index 253d750e..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/postage/mapper/ThSupplierPostageMapper.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.hzs.ground.postage.mapper; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.sale.ext.SaOrderItemsExt; -import com.hzs.common.domain.scm.postage.ThSupplierPostage; -import com.hzs.common.domain.scm.postage.ext.ThSupplierPostageExt; -import com.hzs.ground.postage.param.SupplierPostageParam; -import com.hzs.ground.postage.vo.SupplierPostageVo; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - *

- * Mapper 接口 - *

- * - * @author hzs - * @since 2024-04-19 - */ -public interface ThSupplierPostageMapper extends BaseMapper { - - /* - * @description: 根据订单批量查询供应商邮费 - * @author: sui q - * @date: 2024/4/19 16:29 - * @param: null null - **/ - List querySupplierPostageByOrder(@Param("orderItemsExtList") List orderItemsExtList); - - - /** - * 查询列表 - * @return - */ - List selectByQueryList(SupplierPostageParam supplierPostageParam); - - /** - * 根据id 查询 - * @param pkSupplierPostage - * @return - */ - SupplierPostageVo selectByPkId(@Param("pkSupplierPostage") Integer pkSupplierPostage); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/postage/param/SupplierPostageParam.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/postage/param/SupplierPostageParam.java deleted file mode 100644 index b7a97de0..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/postage/param/SupplierPostageParam.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.hzs.ground.postage.param;/** - * @Description: - * @Author: yuhui - * @Time: 2024/4/28 11:09 - * @Classname: SupplierPostageParam - * @PackageName: com.hzs.ground.postage.param - */ - -import lombok.Data; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.ground.postage.param - *@Author: yh - *@CreateTime: 2024-04-28 11:09 - *@Description: TODO - *@Version: 1.0 - */ -@Data -public class SupplierPostageParam { - - /** - * 商品名称 - */ - private String waresName; - - - /** - * 供应商名称 - */ - private String custName; - - - /** - * 省名称 - */ - private String areaName; - - - /** - * 省主键 - */ - private Integer pkArea; - - /** - * 供应商主键 - */ - - private Integer pkCubasdoc; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/postage/service/IThSupplierPostageService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/postage/service/IThSupplierPostageService.java deleted file mode 100644 index 0069784b..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/postage/service/IThSupplierPostageService.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.hzs.ground.postage.service; - - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.sale.ext.SaOrderExt; -import com.hzs.common.domain.sale.ext.SaOrderItemsExt; -import com.hzs.common.domain.scm.postage.ThSupplierPostage; -import com.hzs.common.domain.scm.postage.ext.ThSupplierPostageExt; -import com.hzs.ground.postage.param.SupplierPostageParam; -import com.hzs.ground.postage.vo.SupplierPostageVo; - -import java.util.List; - -/** - *

- * 服务类 - *

- * - * @author hzs - * @since 2024-04-19 - */ -public interface IThSupplierPostageService extends IService { - - /* - * @description: 根据订单批量查询供应商邮费 - * @author: sui q - * @date: 2024/4/19 16:29 - * @param: null null - **/ - List querySupplierPostageByOrder(List orderItemsExtList); - - /** - * 查询列表 - * @return - */ - List selectByQueryList(SupplierPostageParam supplierPostageParam); - - /** - * 根据id 查询 - * @param pkSupplierPostage - * @return - */ - SupplierPostageVo selectByPkId(Integer pkSupplierPostage); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/postage/service/impl/ThSupplierPostageServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/postage/service/impl/ThSupplierPostageServiceImpl.java deleted file mode 100644 index 9dde230a..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/postage/service/impl/ThSupplierPostageServiceImpl.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.hzs.ground.postage.service.impl; - - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.domain.sale.ext.SaOrderExt; -import com.hzs.common.domain.sale.ext.SaOrderItemsExt; -import com.hzs.common.domain.scm.postage.ThSupplierPostage; -import com.hzs.common.domain.scm.postage.ext.ThSupplierPostageExt; -import com.hzs.ground.postage.mapper.ThSupplierPostageMapper; -import com.hzs.ground.postage.param.SupplierPostageParam; -import com.hzs.ground.postage.service.IThSupplierPostageService; -import com.hzs.ground.postage.vo.SupplierPostageVo; -import org.springframework.stereotype.Service; - -import java.util.Collections; -import java.util.List; - -/** - *

- * 服务实现类 - *

- * - * @author hzs - * @since 2024-04-19 - */ -@Service -public class ThSupplierPostageServiceImpl extends ServiceImpl implements IThSupplierPostageService { - - @Override - public List querySupplierPostageByOrder(List orderItemsExtList){ - return baseMapper.querySupplierPostageByOrder(orderItemsExtList); - } - /** - * 查询列表 - * @return - */ - @Override - public List selectByQueryList(SupplierPostageParam supplierPostageParam ) { - return baseMapper.selectByQueryList(supplierPostageParam); - } - - @Override - public SupplierPostageVo selectByPkId(Integer pkSupplierPostage) { - return baseMapper.selectByPkId(pkSupplierPostage); - } -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/postage/vo/SupplierPostageVo.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/postage/vo/SupplierPostageVo.java deleted file mode 100644 index df984072..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/postage/vo/SupplierPostageVo.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.hzs.ground.postage.vo; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.hzs.common.core.annotation.Excel; -import com.hzs.common.core.web.domain.BaseEntity; -import lombok.Data; - -import java.math.BigDecimal; - -@Data -public class SupplierPostageVo { - - - private Integer pkId; - /** - * 商品主键 - */ - - private Integer pkWares; - - - /** - * 商品名称 - */ - @Excel(name = "商品名称") - private String waresName; - /** - * 供应商主键 - */ - - private Integer pkCubasdoc; - - /** - * 供应商名称 - */ - @Excel(name = "供应商名称") - private String custName; - - /** - * 邮费主键 - */ - - private Integer pkPostage; - - /** - * 邮费 - */ - @Excel(name = "邮费") - private BigDecimal postage; - - /** - * 省主键 - */ - - private Integer pkArea; - - /** - * 省 名称 - */ - @Excel(name = "省") - private String areaName; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/controller/api/ApiProductController.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/controller/api/ApiProductController.java deleted file mode 100644 index 88423128..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/controller/api/ApiProductController.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.hzs.ground.product.controller.api;/** - * @Description: - * @Author: yuhui - * @Time: 2024/4/17 16:15 - * @Classname: ApiProductController - * @PackageName: com.hzs.ground.product.controller.api - */ - -import com.hzs.common.core.web.controller.BaseController; -import com.hzs.ground.product.service.IThProductService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.ground.product.controller.api - *@Author: yh - *@CreateTime: 2024-04-17 16:15 - *@Description: TODO - *@Version: 1.0 - */ -@Slf4j -@RestController -@RequestMapping("/api/th-product") -public class ApiProductController extends BaseController { - - @Autowired - private IThProductService productService; - - - - -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/controller/manage/BdProductBasController.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/controller/manage/BdProductBasController.java deleted file mode 100644 index 41128ddb..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/controller/manage/BdProductBasController.java +++ /dev/null @@ -1,415 +0,0 @@ -package com.hzs.ground.product.controller.manage; - -import cn.hutool.core.bean.BeanUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.hzs.common.core.annotation.Log; -import com.hzs.common.core.constant.msg.ProductMsgConstants; -import com.hzs.common.core.enums.*; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.core.utils.StringUtils; -import com.hzs.common.core.utils.poi.ExcelUtil; -import com.hzs.common.core.web.controller.BaseController; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.sale.product.BdProductBas; -import com.hzs.common.domain.sale.product.BdProductBasSpecs; -import com.hzs.common.domain.sale.product.ext.BdProductBasExt; -import com.hzs.common.domain.scm.th.ThProduct; -import com.hzs.common.domain.scm.th.ThProductExtend; -import com.hzs.common.domain.scm.th.ThProductSpecs; -import com.hzs.common.security.service.UserTokenService; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.common.util.TransactionUtils; -import com.hzs.ground.product.param.ProductBasParams; -import com.hzs.ground.product.service.*; -import com.hzs.ground.product.vo.ProductBasVo; -import com.hzs.sale.product.IProductServiceApi; -import com.hzs.sale.product.dto.ProductParamDTO; -import com.hzs.system.sys.dto.LoginUser; -import lombok.extern.slf4j.Slf4j; -import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - -/** - * @BelongsProject: hzs_cloud - * @BelongsPackage: com.hzs.scm.product.controller - * @Author: yh - * @CreateTime: 2023-11-27 09:29 - * @Description: TODO - * @Version: 1.0 - */ -@Slf4j -@RestController -@RequestMapping("/manage/product-bas") -public class BdProductBasController extends BaseController { - - @Autowired - private UserTokenService userTokenService; - @Autowired - private IThProductExtendService productExtendService; - @Autowired - private IThProductService thProductService; - @Autowired - private IThProductSpecsService productSpecsService; - @Autowired - private IBdProductBasService productBasService; - @Autowired - private IBdProductBasSpecsService productBasSpecsService; - - @DubboReference - IProductServiceApi productServiceApi; - - /** - * 查询列表 (分页) - * - * @return - */ - @GetMapping("/list") - public TableDataInfo list(ProductBasParams productBasParams) { - if (productBasParams.getStartCreateDate() != null) { - productBasParams.setStartCreateDate(DateUtils.getStartTime(productBasParams.getStartCreateDate())); - } - if (productBasParams.getEndCreateDate() != null) { - productBasParams.setEndCreateDate(DateUtils.getEndTime(productBasParams.getEndCreateDate())); - } - productBasParams.setSystemType(SecurityUtils.getSystemType()); - - startPage(); - List list = productBasService.selectByList(productBasParams); - for (BdProductBasExt productBas : list) { - Integer pkProduct = productBas.getPkProduct(); - if (pkProduct == null) { - productBas.setIsShowCreateButton(EYesNo.YES.getIntValue()); - } else { - productBas.setIsShowCreateButton(EYesNo.NO.getIntValue()); - } - } - return getDataTable(list); - } - - /** - * 导出 - * - * @param productBasParams - * @return - */ - @PostMapping("/export") - public void export(ProductBasParams productBasParams, HttpServletResponse response) { - LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); - qw.eq(BdProductBas::getPkCountry, SecurityUtils.getPkCountry()); - qw.eq(BdProductBas::getSystemType, SecurityUtils.getSystemType()); - if (StringUtils.isNotBlank(productBasParams.getProductCode())) { - qw.like(BdProductBas::getProductCode, productBasParams.getProductCode()); - } - if (StringUtils.isNotBlank(productBasParams.getProductName())) { - qw.like(BdProductBas::getProductName, productBasParams.getProductName()); - } - if (productBasParams.getStartCreateDate() != null && productBasParams.getEndCreateDate() != null) { - qw.between(BdProductBas::getCreationTime, DateUtils.getStartTime(productBasParams.getStartCreateDate()), DateUtils.getEndTime(productBasParams.getEndCreateDate())); - } - qw.orderByDesc(BdProductBas::getCreationTime); - List list = productBasService.list(qw); - List resultList = list.stream().map(a -> BeanUtil.copyProperties(a, ProductBasVo.class)).collect(Collectors.toList()); - ExcelUtil util = new ExcelUtil<>(ProductBasVo.class); - util.exportExcel(response, resultList, "产品基本信息导出"); - } - - /** - * 查询全部 - * - * @return - */ - @GetMapping("/find-all") - public TableDataInfo findAll(String query, Integer pkCubasdoc) { - startPage(); - List resultList = productBasService.queryProductBasList(query, SecurityUtils.getPkCountry(), pkCubasdoc, SecurityUtils.getSystemType()); - return getDataTable(resultList); - } - - /** - * 查询全部 - * - * @return - */ - @GetMapping("/find-by-bas-all") - public TableDataInfo findByBasAll(String query) { - startPage(); - List resultList = productBasService.queryProductBasAllList(query, SecurityUtils.getPkCountry(), SecurityUtils.getSystemType()); - return getDataTable(resultList); - } - - /** - * 查询全部关联商品 - * - * @param - * @return - */ - @GetMapping("/query-product-bas-relevance") - public TableDataInfo queryProductBasRelevance(String query) { - startPage(); - Integer pkCountry = SecurityUtils.getPkCountry(); - List resultList = productBasService.queryProductBasRelevanceList(query, pkCountry, SecurityUtils.getSystemType()); - return getDataTable(resultList); - } - - /** - * 新增 - * - * @param productBasParams - * @return - */ - @PostMapping("/save") - public AjaxResult save(@RequestBody ProductBasParams productBasParams) { - if (StringUtils.isBlank(productBasParams.getProductName())) { - return AjaxResult.error(TransactionUtils.getContent(ProductMsgConstants.PRODUCT_NAME_REQUIRED)); - } - // 保质期 - if (productBasParams.getShelfLife() == null) { - return AjaxResult.error(TransactionUtils.getContent(ProductMsgConstants.PRODUCT_SHELFLIFE_REQUIRED)); - } - // 单位 - if (productBasParams.getUnit() == null) { - return AjaxResult.error(TransactionUtils.getContent(ProductMsgConstants.PRODUCT_UNIT_REQUIRED)); - } - // 重量 - if (productBasParams.getWeight() == null) { - return AjaxResult.error(TransactionUtils.getContent(ProductMsgConstants.PRODUCT_WEIGHT_REQUIRED)); - } - // 产品分类 - if (productBasParams.getPkClassify() == null) { - return AjaxResult.error(TransactionUtils.getContent(ProductMsgConstants.PRODUCT_CLASSIFY_REQUIRED)); - } - // 长 - if (productBasParams.getLength() == null) { - return AjaxResult.error(TransactionUtils.getContent(ProductMsgConstants.PRODUCT_LENGTH_REQUIRED)); - } - // 宽 - if (productBasParams.getWidth() == null) { - return AjaxResult.error(TransactionUtils.getContent(ProductMsgConstants.PRODUCT_WIDTH_REQUIRED)); - } - // 高 - if (productBasParams.getHeight() == null) { - return AjaxResult.error(TransactionUtils.getContent(ProductMsgConstants.PRODUCT_HEIGHT_REQUIRED)); - } - // 产品主图 - if (StringUtils.isBlank(productBasParams.getCover())) { - return AjaxResult.error(TransactionUtils.getContent(ProductMsgConstants.PRODUCT_COVER_REQUIRED)); - } - // 产品相关规格 - if (productBasParams.getPkSpecsType().size() == 0) { - return AjaxResult.error(TransactionUtils.getContent(ProductMsgConstants.PRODUCT_SPECSTYPE_REQUIRED)); - } - productBasParams.setSystemType(SecurityUtils.getSystemType()); - // 新增商品信息 - LoginUser loginUser = userTokenService.getLoginUser(); - // 校验编号重复 - LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); - qw.eq(BdProductBas::getProductCode, productBasParams.getProductCode()); - qw.eq(BdProductBas::getSystemType, SecurityUtils.getSystemType()); - int productCount = productBasService.count(qw); - if (productCount > 0) { - return AjaxResult.error(TransactionUtils.getContent(ProductMsgConstants.PRODUCT_NUMBER_ALREADY_EXISTS)); - } - return AjaxResult.success(productBasService.saveProductBas(productBasParams, loginUser)); - } - - /** - * 查询产品详情 - * - * @return - */ - @GetMapping("/detail") - public AjaxResult detail(Integer productBasId) { - BdProductBas productBas = productBasService.getById(productBasId); - if (productBas == null) { - return AjaxResult.error(TransactionUtils.getContent(ProductMsgConstants.PRODUCT_NOT_REQUIRED)); - } - ProductBasParams productParams = BeanUtil.copyProperties(productBas, ProductBasParams.class); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(BdProductBasSpecs::getPkProductBas, productBasId); - List pkSpecsType = new ArrayList<>(); - List productSpecList = productBasSpecsService.list(queryWrapper); - for (BdProductBasSpecs productBasSpecs : productSpecList) { - pkSpecsType.add(productBasSpecs.getPkSpecsType()); - } - productParams.setPkSpecsType(pkSpecsType); - return AjaxResult.success(productParams); - } - - /** - * 修改 - * - * @param productBasParams - * @return - */ - @PostMapping("/update") - public AjaxResult update(@RequestBody ProductBasParams productBasParams) { - // 查询订单编号是否重复 - BdProductBas productBas = productBasService.getById(productBasParams.getPkId()); - if (!productBas.getProductCode().equals(productBasParams.getProductCode())) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(BdProductBas::getProductCode, productBasParams.getProductCode()); - queryWrapper.eq(BdProductBas::getSystemType, SecurityUtils.getSystemType()); - int count = productBasService.count(queryWrapper); - if (count > 0) { - return AjaxResult.error(TransactionUtils.getContent(ProductMsgConstants.PRODUCT_NUMBER_ALREADY_EXISTS)); - } - } - LoginUser loginUser = userTokenService.getLoginUser(); - // 校验编号重复 - LambdaQueryWrapper qe = new LambdaQueryWrapper<>(); - qe.eq(BdProductBas::getProductCode, productBasParams.getProductCode()); - qe.eq(BdProductBas::getSystemType, SecurityUtils.getSystemType()); - qe.notIn(BdProductBas::getPkId, productBasParams.getPkId()); - int productCount = productBasService.count(qe); - if (productCount > 0) { - return AjaxResult.error(TransactionUtils.getContent(ProductMsgConstants.PRODUCT_NUMBER_ALREADY_EXISTS)); - } - // 修改商品基本信息 - productBasService.updateProductBas(productBasParams, loginUser); - return AjaxResult.success(productBasParams.getProductCode()); - } - - - /** - * 根据商品id 删除数据 - * - * @param pkId - * @return - */ - @Log(module = EOperationModule.PRODUCT_DELETE, method = EOperationMethod.DELETE) - @DeleteMapping("/{pkId}") - public AjaxResult delete(@PathVariable Integer pkId) { - productBasService.removeProductBas(pkId); - return AjaxResult.success(); - } - - /** - * 根据产品编号查询产品信息 - * - * @param productCode - * @return - */ - @GetMapping("/get-product-info") - public AjaxResult getProductInfo(String productCode) { - return AjaxResult.success(productBasService.getByProductCodeInfo(productCode)); - } - - /** - * 生成产品 - */ - @GetMapping("/generate-product") - public AjaxResult generateProduct(Integer pkProductBas) { - // 生成产品基本信息 - LoginUser loginUser = userTokenService.getLoginUser(); - BdProductBas productBas = productBasService.getById(pkProductBas); - String productCode = productBas.getProductCode(); - ThProduct product = thProductService.getOne(new LambdaQueryWrapper().eq(ThProduct::getProductCode, productCode)); - if (product != null) { - // 商品拓展表 - ThProductExtend productExtend = productExtendService.getOne(new LambdaQueryWrapper().eq(ThProductExtend::getPkProduct, product.getPkId())); - // 商品规格表 - List productSpecsList = productSpecsService.list(new LambdaQueryWrapper().eq(ThProductSpecs::getPkProduct, product.getPkId())); - // 创建产品 - ProductParamDTO productDTO = new ProductParamDTO(); - productDTO.setProductCode(product.getProductCode()); - productDTO.setProductName(product.getProductName()); - productDTO.setPkClassify(product.getPkClassify()); - productDTO.setShippingChannel(product.getShippingChannel()); - productDTO.setUnit(product.getUnit()); - productDTO.setWeight(product.getWeight()); - productDTO.setWidth(product.getWidth()); - productDTO.setPostageWeight(BigDecimal.ZERO); - productDTO.setHeight(product.getHeight()); - productDTO.setLength(product.getLength()); - productDTO.setRetailPrice(product.getRetailPrice()); - productDTO.setCover(product.getCover()); - productDTO.setShelfLife(product.getShelfLife()); - productDTO.setCreationTime(DateUtils.currentDateTime()); - productDTO.setPkCreator(SecurityUtils.getUserId()); - productDTO.setPkCountry(SecurityUtils.getPkCountry()); - productDTO.setPkProductBas(productBas.getPkId()); - productDTO.setPkSupplier(product.getPkSupplier()); - List pkSpecsType = new ArrayList<>(); - for (ThProductSpecs productSpecs : productSpecsList) { - pkSpecsType.add(productSpecs.getPkSpecsType()); - } - productDTO.setPkSpecsType(pkSpecsType); - productDTO.setIsPickUp(productExtend.getIsPickUp()); - productDTO.setIsBarCode(productExtend.getIsBarCode()); - productDTO.setIsMerge(productExtend.getIsMerge()); - productDTO.setIsGift(productExtend.getIsGift()); - productDTO.setIsLandTrans(productExtend.getIsLandTrans()); - productDTO.setIsAirTrans(productExtend.getIsAirTrans()); - productDTO.setIsOceanTrans(productExtend.getIsOceanTrans()); - productDTO.setSort(productExtend.getSort()); - productDTO.setRepurchaseType(productExtend.getRepurchaseType()); - productDTO.setIsFresh(EYesNo.NO.getIntValue()); - productDTO.setPkCubasdoc(product.getPkCubasdoc()); - productServiceApi.saveProduct(productDTO, loginUser); - } else { - List productSpecsList = productBasSpecsService.list(new QueryWrapper().eq("PK_PRODUCT_BAS", productBas.getPkId())); - // 创建产品 - ProductParamDTO productDTO = new ProductParamDTO(); - productDTO.setProductCode(productBas.getProductCode()); - productDTO.setProductName(productBas.getProductName()); - productDTO.setPkClassify(productBas.getPkClassify()); - productDTO.setShippingChannel(EShippingChannel.A_PIECE.getValue()); - productDTO.setUnit(productBas.getUnit()); - productDTO.setWeight(productBas.getWeight()); - productDTO.setWidth(productBas.getWidth()); - productDTO.setPostageWeight(BigDecimal.ZERO); - productDTO.setHeight(productBas.getHeight()); - productDTO.setLength(productBas.getLength()); - productDTO.setRetailPrice(BigDecimal.ZERO); - productDTO.setCover(productBas.getCover()); - productDTO.setShelfLife(productBas.getShelfLife()); - productDTO.setCreationTime(DateUtils.currentDateTime()); - productDTO.setPkCreator(SecurityUtils.getUserId()); - productDTO.setPkCountry(SecurityUtils.getPkCountry()); - productDTO.setPkProductBas(productBas.getPkId()); - List pkSpecsType = new ArrayList<>(); - for (BdProductBasSpecs productBasSpecs : productSpecsList) { - pkSpecsType.add(productBasSpecs.getPkSpecsType()); - } - productDTO.setPkSpecsType(pkSpecsType); - productDTO.setIsPickUp(EYesNo.NO.getIntValue()); - productDTO.setIsBarCode(EYesNo.NO.getIntValue()); - productDTO.setIsMerge(EYesNo.NO.getIntValue()); - productDTO.setIsGift(EYesNo.NO.getIntValue()); - productDTO.setIsLandTrans(EYesNo.NO.getIntValue()); - productDTO.setIsAirTrans(EYesNo.NO.getIntValue()); - productDTO.setIsOceanTrans(EYesNo.NO.getIntValue()); - productDTO.setSort(EYesNo.NO.getIntValue()); - productDTO.setRepurchaseType(EYesNo.NO.getIntValue()); - productDTO.setIsFresh(EYesNo.NO.getIntValue()); - productServiceApi.saveProduct(productDTO, loginUser); - } - return AjaxResult.success(); - } - - /** - * 查询供应商产品 - */ - @GetMapping("/get-supplier-product") - public AjaxResult getSupplierProduct(Integer pkSupplier) { - List productBasList; - if (pkSupplier != null) { - productBasList = productBasService.selectbypkSupplierList(pkSupplier); - } else { - productBasList = productBasService.selectbyNotSupplierList(); - } - for (ProductBasVo productBasVo : productBasList) { - productBasVo.setUnitStr(EUnit.getEnumByValue(productBasVo.getUnit()).getLabel()); - } - return AjaxResult.success(productBasList); - } -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/controller/manage/ThProductController.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/controller/manage/ThProductController.java deleted file mode 100644 index 3bef450f..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/controller/manage/ThProductController.java +++ /dev/null @@ -1,122 +0,0 @@ -package com.hzs.ground.product.controller.manage; - -import cn.hutool.core.bean.BeanUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.hzs.common.core.constant.msg.ProductMsgConstants; -import com.hzs.common.core.domain.R; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.core.utils.poi.ExcelUtil; -import com.hzs.common.core.web.controller.BaseController; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.scm.th.ThProductExtend; -import com.hzs.common.domain.scm.th.ThProductSpecs; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.common.util.TransactionUtils; -import com.hzs.ground.product.param.ProductInfoParam; -import com.hzs.ground.product.service.IThProductExtendService; -import com.hzs.ground.product.service.IThProductService; -import com.hzs.ground.product.service.IThProductSpecsService; -import com.hzs.ground.product.vo.ProductVo; -import com.hzs.system.base.ISystemConfigServiceApi; -import com.hzs.system.base.dto.BdCubasdocDTO; -import lombok.extern.slf4j.Slf4j; -import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.List; - -@Slf4j -@RestController -@RequestMapping("/manage/th-product") -public class ThProductController extends BaseController { - - @Autowired - private IThProductService iThProductService; - @Autowired - private IThProductSpecsService iThProductSpecsService; - @Autowired - private IThProductExtendService iThProductExtendService; - - @DubboReference - ISystemConfigServiceApi iSystemConfigServiceApi; - - /** - * 供应商 数据 - */ - @GetMapping("list") - public TableDataInfo list(ProductInfoParam productInfoParam) { - startPage(); - if (productInfoParam.getStartCreateDate() != null) { - productInfoParam.setStartCreateDate(DateUtils.getStartTime(productInfoParam.getStartCreateDate())); - } - if (productInfoParam.getEndCreateDate() != null) { - productInfoParam.setEndCreateDate(DateUtils.getEndTime(productInfoParam.getEndCreateDate())); - } - // 根据登录人获取供应商，根据登录账号查找绑定的供应商，查询供应商表 - R bdCubasdocDate = iSystemConfigServiceApi.queryBdCubasdocByUser(SecurityUtils.getUserId()); - if (!bdCubasdocDate.isSuccess() || bdCubasdocDate.getData() == null) { - return getDataTable(new ArrayList<>()); - } - productInfoParam.setPkSupplier(bdCubasdocDate.getData().getPkSupplier()); - - List list = iThProductService.queryByList(productInfoParam); - return getDataTable(list); - } - - /** - * 导出 - */ - @PostMapping("export") - public void export(HttpServletResponse response, ProductInfoParam productInfoParam) { - if (productInfoParam.getStartCreateDate() != null) { - productInfoParam.setStartCreateDate(DateUtils.getStartTime(productInfoParam.getStartCreateDate())); - } - if (productInfoParam.getEndCreateDate() != null) { - productInfoParam.setEndCreateDate(DateUtils.getEndTime(productInfoParam.getEndCreateDate())); - } - List list = iThProductService.queryByList(productInfoParam); - ExcelUtil util = new ExcelUtil<>(ProductVo.class); - util.exportExcel(response, list, "供应商产品导出"); - } - - /** - * 查询产品详情 - */ - @GetMapping("detail") - public AjaxResult detail(Integer productId) { - ProductVo product = iThProductService.getProductInfoById(productId); - if (product == null) { - return AjaxResult.error(TransactionUtils.getContent(ProductMsgConstants.PRODUCT_NOT_REQUIRED)); - } - ProductInfoParam productParams = BeanUtil.copyProperties(product, ProductInfoParam.class); - - ThProductExtend productExtend = iThProductExtendService.getOne(new QueryWrapper().eq("PK_PRODUCT", productId)); - productParams.setIsPickUp(productExtend.getIsPickUp()); - productParams.setIsPrize(productExtend.getIsPrize()); - productParams.setIsBarCode(productExtend.getIsBarCode()); - productParams.setRepurchaseType(productExtend.getRepurchaseType()); - productParams.setIsMerge(productExtend.getIsMerge()); - productParams.setIsGift(productExtend.getIsGift()); - productParams.setIsLandTrans(productExtend.getIsLandTrans()); - productParams.setIsAirTrans(productExtend.getIsAirTrans()); - productParams.setIsOceanTrans(productExtend.getIsOceanTrans()); - productParams.setSort(productExtend.getSort()); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(ThProductSpecs::getPkProduct, productId); - List pkSpecsType = new ArrayList<>(); - List productSpecList = iThProductSpecsService.list(queryWrapper); - for (ThProductSpecs productSpecs : productSpecList) { - pkSpecsType.add(productSpecs.getPkSpecsType()); - } - productParams.setPkSpecsType(pkSpecsType); - productParams.setSupplierName(product.getSupplierName()); - return AjaxResult.success(productParams); - } - - -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/mapper/BdProductBasMapper.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/mapper/BdProductBasMapper.java deleted file mode 100644 index 5c36c1fb..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/mapper/BdProductBasMapper.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.hzs.ground.product.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.sale.product.BdProductBas; -import com.hzs.common.domain.sale.product.BdProductSpecs; -import com.hzs.common.domain.sale.product.ext.BdProductBasExt; -import com.hzs.ground.product.param.ProductBasParams; -import com.hzs.ground.product.vo.ProductBasVo; -import org.apache.ibatis.annotations.Param; - -import java.util.List; -import java.util.Set; - -/** - * 产品基本设置 Mapper 接口 - * - * @author hzs - * @since 2023-11-21 - */ -public interface BdProductBasMapper extends BaseMapper { - - /* - * @description: 查询产品id，顺道查询出国家对应的产品id - * @author: sui q - * @date: 2023/11/24 11:41 - * @param: null null - **/ - List queryProductBasByIds(@Param("idList") Set idList, @Param("pkCountry") Integer pkCountry); - - /** - * 查询列表 - * - * @param query - * @param pkCubasdoc - * @return - */ - List queryProductBasList(@Param("query") String query, - @Param("pkCountry") Integer pkCountry, - @Param("pkCubasdoc") Integer pkCubasdoc, - @Param("systemType") Integer systemType); - - /** - * 根据产品编号查询 - * - * @param productCode - * @return - */ - ProductBasVo findByProductCode(@Param("productCode") String productCode); - - /* - * @description: 根据规格、主键查询产品 - * @author: sui q - * @date: 2023/11/27 15:52 - * @param: null null - **/ - List queryProductExtBySpecsId(@Param("productSpecsList") List productSpecsList, @Param("pkCountry") Integer pkCountry); - - /** - * 查询全部已关联产品 - * - * @param query - * @return - */ - List queryProductBasRelevanceList(@Param("query") String query, @Param("pkCountry") Integer pkCountry, @Param("systemType") Integer systemType); - - /** - * 查询列表 - * - * @param productBasParams - * @return - */ - List selectByList(ProductBasParams productBasParams); - - /** - * 根据供应商查询产品基本信息 - * - * @param pkSupplier - * @return - */ - List selectbypkSupplierList(@Param("pkSupplier") Integer pkSupplier); - - - /** - * 查询无供应商的产品基本信息 - * - * @return - */ - List selectbyNotSupplierList(); - - /** - * 查询全部 - * - * @param query - * @param pkCountry - * @return - */ - List queryProductBasAllList(@Param("query") String query, @Param("pkCountry") Integer pkCountry, @Param("systemType") Integer systemType); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/mapper/BdProductBasSpecsMapper.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/mapper/BdProductBasSpecsMapper.java deleted file mode 100644 index 1431ed0f..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/mapper/BdProductBasSpecsMapper.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.hzs.ground.product.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.sale.product.BdProductBasSpecs; -import com.hzs.ground.product.vo.BdProductBasSpecsVo; -import com.hzs.ground.product.vo.SpecsVo; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 规格明细表 Mapper 接口 - */ -public interface BdProductBasSpecsMapper extends BaseMapper { - - /** - * 根据主键查询 产品规格信息 - * - * @param pkProductBas - * @return - */ - List queryListByProductBasCode(@Param("pkProductBas") Integer pkProductBas); - - /** - * 查询规格（规格类型条件） - * - * @param pkSpecsType - * @return - */ - List findByPkSpecsType(@Param("pkSpecsType") Integer pkSpecsType); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/mapper/ThApprovalLogMapper.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/mapper/ThApprovalLogMapper.java deleted file mode 100644 index 93409c8d..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/mapper/ThApprovalLogMapper.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.hzs.ground.product.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.scm.th.ThApprovalLog; - -/** - * 供应商产品日志 Mapper 接口 - */ -public interface ThApprovalLogMapper extends BaseMapper { - -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/mapper/ThProductExtendMapper.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/mapper/ThProductExtendMapper.java deleted file mode 100644 index 4ce3230b..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/mapper/ThProductExtendMapper.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.hzs.ground.product.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.scm.th.ThProductExtend; - -/** - * thProduct商品拓展表 Mapper 接口 - */ -public interface ThProductExtendMapper extends BaseMapper { - -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/mapper/ThProductMapper.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/mapper/ThProductMapper.java deleted file mode 100644 index 06ce49df..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/mapper/ThProductMapper.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.hzs.ground.product.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.scm.th.ThProduct; -import com.hzs.ground.product.param.ProductInfoParam; -import com.hzs.ground.product.vo.ProductVo; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface ThProductMapper extends BaseMapper { - - /** - * 查询列表 - * @param productInfoParam - * @return - */ - List queryByList(ProductInfoParam productInfoParam); - - /** - * 根据id 查询详情 - * @param productId - * @return - */ - ProductVo getProductInfoById(@Param("productId") Integer productId); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/mapper/ThProductSpecsMapper.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/mapper/ThProductSpecsMapper.java deleted file mode 100644 index ddd14c1e..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/mapper/ThProductSpecsMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.hzs.ground.product.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.scm.th.ThProductSpecs; - -/** - * thPorduct规格明细表 Mapper 接口 - * - */ -public interface ThProductSpecsMapper extends BaseMapper { - -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/param/ProductBasParams.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/param/ProductBasParams.java deleted file mode 100644 index 10c84697..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/param/ProductBasParams.java +++ /dev/null @@ -1,148 +0,0 @@ -package com.hzs.ground.product.param; - -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -/** - * @BelongsProject: hzs_cloud - * @BelongsPackage: com.hzs.scm.product.param - * @Author: yh - * @CreateTime: 2023-11-28 15:04 - * @Description: TODO - * @Version: 1.0 - */ -@Data -public class ProductBasParams implements Serializable { - - /** - * 商品主键 - */ - private Integer pkId; - /** - * 产品编号 - */ - private String productCode; - - /** - * 产品名称 - */ - private String productName; - - - /** - * 规格分类 - */ - private Integer pkClassify; - - /** - * 单位 来源于枚举：单位 - */ - private Integer unit; - - /** - * 重量 以千克作为单位 - */ - private BigDecimal weight; - - /** - * 长 以厘米作为单位 - */ - private BigDecimal length; - - /** - * 宽 以厘米作为单位 - */ - private BigDecimal width; - - /** - * 高 以厘米作为单位 - */ - private BigDecimal height; - - - /** - * 封面图 - */ - private String cover; - - /** - * 保质期 - */ - private Integer shelfLife; - - - /** - * 产品规格类型列表 - */ - private List pkSpecsType; - - /** - * 排序值 - */ - - private Integer sort; - - /** - * 发货渠道 1 总仓发货 2 一件代发 - */ - - private Integer shippingChannel; - - - /** - * 产品主键id列表 - */ - List productIds; - - /** - * 海陆空运输方式筛选 - */ - private Integer shippingType; - - /** - * 开始创建时间 - */ - private Date startCreateDate; - /** - * 结束创建时间 - */ - private Date endCreateDate; - - - /** - * 产品编号 - */ - List productCodes; - - private Integer pkCountry; - - /** - * 复购类型 - */ - private Integer repurchaseType; - - /** - * 是否存在规格 - */ - private Integer isExistSpecs; - - /** - * 查询产品信息 - */ - private String queryInfo; - - /** - * 产品基础档案主键 - */ - private Integer pkProductBas; - - /** - * 系统类型（2=新零售，3=美业） - */ - private Integer systemType; - -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/param/ProductInfoParam.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/param/ProductInfoParam.java deleted file mode 100644 index 7899e1b3..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/param/ProductInfoParam.java +++ /dev/null @@ -1,268 +0,0 @@ -package com.hzs.ground.product.param;/** - * @Description: - * @Author: yuhui - * @Time: 2024/3/25 11:12 - * @Classname: ProductInfoParam - * @PackageName: com.hzs.scm.product.param - */ - -import com.hzs.system.sys.dto.LoginUser; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.scm.product.param - *@Author: yh - *@CreateTime: 2024-03-25 11:12 - *@Description: TODO - *@Version: 1.0 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -public class ProductInfoParam implements Serializable { - /** - * 登录用户信息 - */ - private LoginUser loginUser; - /** - * 商品主键 - */ - private Integer pkId; - /** - * 产品编号 - */ - private String productCode; - - /** - * 产品名称 - */ - private String productName; - - /** - * 翻译key - */ - private Integer transactionKey; - - /** - * 规格分类 - */ - private Integer pkClassify; - - /** - * 单位 来源于枚举：单位 - */ - private Integer unit; - - /** - * 重量 以千克作为单位 - */ - private BigDecimal weight; - - /** - * 长 以厘米作为单位 - */ - private BigDecimal length; - - /** - * 宽 以厘米作为单位 - */ - private BigDecimal width; - - /** - * 高 以厘米作为单位 - */ - private BigDecimal height; - - /** - * 邮费重量 以千克作为单位 - */ - private BigDecimal postageWeight; - - /** - * 建议零售价 - */ - private BigDecimal retailPrice; - - /** - * 启用状态 来源于枚举：是否，默认是 - */ - private Integer enableState; - - /** - * 封面图 - */ - private String cover; - - /** - * 保质期 - */ - private Integer shelfLife; - - /** - * 是否冷链 - */ - private Integer isFresh; - - - /** - * 是否提货 来源于枚举：是否，默认否 - */ - private Integer isPickUp; - - /** - * 是否抽奖奖品 来源于枚举：是否，默认否 - */ - private Integer isPrize; - - /** - * 是否条码管理 来源于枚举：是否，默认否 - */ - private Integer isBarCode; - - /** - * 能否合并发货 来源于枚举：是否，默认是 - */ - private Integer isMerge; - - /** - * 来源于枚举：是否，默认是 - */ - private Integer isGift; - - /** - * 库存预警数量 - */ - // private Long warningQuantity; - - /** - * 是否陆运 - */ - private Integer isLandTrans; - - /** - * 是否空运 - */ - private Integer isAirTrans; - - /** - * 是否海运 - */ - private Integer isOceanTrans; - - /** - * 产品属性 枚举：商品属性,1=实物商品、2=虚拟商品 - */ - private Integer productAttr; - - /** - * 产品规格类型列表 - */ - private List pkSpecsType; - - /** - * 排序值 - */ - - private Integer sort; - - /** - * 发货渠道 1 总仓发货 2 一件代发 - */ - private Integer shippingChannel; - - /** - * 产品主键id列表 - */ - List productIds; - - /** - * 海陆空运输方式筛选 - */ - private Integer shippingType; - - /** - * 开始创建时间 - */ - private Date startCreateDate; - /** - * 结束创建时间 - */ - private Date endCreateDate; - - - /** - * 产品编号 - */ - List productCodes; - - private Integer pkCountry; - - /** - * 复购类型 - */ - - private Integer repurchaseType; - - /** - * 是否存在规格 - */ - private Integer isExistSpecs; - - /** - * 查询产品信息 - */ - private String queryInfo; - - /** - * 产品基础档案主键 - */ - private Integer pkProductBas; - - /** - * 数量 - */ - private Integer quantity; - - /** - * 供货价格 - */ - - private BigDecimal supplyPrice; - - - - /** - * 供货数量 - */ - - private Integer supplyQuantity; - - /** - * 销售模式 - */ - - private Integer saleModel; - - /** - * 供应商 - */ - private Integer pkSupplier; - /** - * 供应商名称 - */ - private String supplierName; - - - /** - * 供应商主键 - */ - private Integer pkCubasdoc; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/provider/IBdProductBasSpecsServiceProvider.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/provider/IBdProductBasSpecsServiceProvider.java deleted file mode 100644 index d4926d73..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/provider/IBdProductBasSpecsServiceProvider.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.hzs.ground.product.provider;/** - * @Description: - * @Author: yuhui - * @Time: 2023/11/23 18:27 - * @Classname: IBdProductBasSpecsServiceProvider - * @PackageName: com.hzs.scm.product.provider - */ - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.hzs.common.core.domain.R; -import com.hzs.common.domain.sale.product.BdProductBasSpecs; -import com.hzs.ground.product.service.IBdProductBasSpecsService; -import com.hzs.scm.product.IBdProductBasSpecsServiceApi; -import lombok.extern.slf4j.Slf4j; -import org.apache.dubbo.config.annotation.DubboService; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.List; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.scm.product.provider - *@Author: yh - *@CreateTime: 2023-11-23 18:27 - *@Description: TODO - *@Version: 1.0 - */ -@Slf4j -@DubboService -public class IBdProductBasSpecsServiceProvider implements IBdProductBasSpecsServiceApi { - - @Autowired - private IBdProductBasSpecsService productBasSpecsService; - - /** - * 新增 - * @param productBasSpecsList - * @return - */ - @Override - public R saveAll(List productBasSpecsList) { - return R.ok(productBasSpecsService.saveBatch(productBasSpecsList)); - } - /** - * 删除 （根据pkProductBas删除） - * @param pkProductBasList - * @return - */ - @Override - public R removeByPkProductBasList(List pkProductBasList) { - return R.ok(productBasSpecsService.remove(new QueryWrapper().in("PK_PRODUCT_BAS",pkProductBasList))); - } -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/provider/IProductBasServiceProvider.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/provider/IProductBasServiceProvider.java deleted file mode 100644 index a1df2086..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/provider/IProductBasServiceProvider.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.hzs.ground.product.provider;/** - * @Description: - * @Author: yuhui - * @Time: 2023/11/23 18:00 - * @Classname: IProductBasServiceProvider - * @PackageName: com.hzs.scm.product.provider - */ - -import cn.hutool.core.bean.BeanUtil; -import com.hzs.common.core.constant.CacheConstants; -import com.hzs.common.core.domain.R; -import com.hzs.common.core.service.RedisService; -import com.hzs.common.domain.sale.product.BdProductBas; -import com.hzs.ground.product.service.IBdProductBasService; -import com.hzs.scm.product.IProductBasServiceApi; -import com.hzs.scm.product.dto.ProductBasDTO; -import lombok.extern.slf4j.Slf4j; -import org.apache.dubbo.config.annotation.DubboService; -import org.springframework.beans.factory.annotation.Autowired; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.scm.product.provider - *@Author: yh - *@CreateTime: 2023-11-23 18:00 - *@Description: TODO - *@Version: 1.0 - */ -@Slf4j -@DubboService -public class IProductBasServiceProvider implements IProductBasServiceApi { - - @Autowired - private IBdProductBasService productBasService; - @Autowired - private RedisService redisService; - - /** - * 批量新增 - * @param productBas - * @return - */ - public R save(BdProductBas productBas){ - boolean isSave = productBasService.save(productBas); - if (isSave){ - return R.ok(productBas); - }else { - return R.fail(); - } - } - /** - * 根据id 修改 - */ - @Override - public R updateById(BdProductBas productBas) { - productBasService.updateById(productBas); - redisService.deleteObject(CacheConstants.BD_PRODUCT_BAS + productBas.getPkId()); - redisService.deleteObject(CacheConstants.BD_PRODUCT_BAS + productBas.getProductCode()); - return R.ok(); - } - /** - * 根据id 查询 - * @return - */ - @Override - public R getProductBasById(Integer pkId) { - BdProductBas productBas = productBasService.getProductBasById(pkId); - return R.ok(BeanUtil.copyProperties(productBas, ProductBasDTO.class)); - } - - /** - * 根据产品编号 查询 - * @return - */ - @Override - public R getProductBasByProductCode(String productCode) { - BdProductBas productBas = productBasService.getProductBasByProductCode(productCode); - return R.ok(BeanUtil.copyProperties(productBas, ProductBasDTO.class)); - } - - -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/IBdProductBasService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/IBdProductBasService.java deleted file mode 100644 index 7e416f6b..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/IBdProductBasService.java +++ /dev/null @@ -1,130 +0,0 @@ -package com.hzs.ground.product.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.sale.product.BdProductBas; -import com.hzs.common.domain.sale.product.BdProductSpecs; -import com.hzs.common.domain.sale.product.ext.BdProductBasExt; -import com.hzs.ground.product.param.ProductBasParams; -import com.hzs.ground.product.vo.ProductBasVo; -import com.hzs.ground.product.vo.ProductInfoVo; -import com.hzs.system.sys.dto.LoginUser; - -import java.util.List; -import java.util.Set; - -/** - * 产品基本设置 服务类 - */ -public interface IBdProductBasService extends IService { - - /** - * 根据id查询 - * - * @param productBasId - * @return - */ - BdProductBas getProductBasById(Integer productBasId); - - /** - * 根据产品编号 查询 - * - * @return - */ - BdProductBas getProductBasByProductCode(String productCode); - - /* - * 查询产品id，顺道查询出国家对应的产品id - **/ - List queryProductBasByIds(Set idList, Integer pkCountry); - - /** - * 新增 - * - * @param productBasParams - * @return - */ - String saveProductBas(ProductBasParams productBasParams, LoginUser loginUser); - - /** - * 修改 - * - * @param productBasParams - * @param loginUser - */ - void updateProductBas(ProductBasParams productBasParams, LoginUser loginUser); - - /** - * 删除 - * - * @param productBasId - */ - void removeProductBas(Integer productBasId); - - /** - * 根据产品编号查询信息 - * - * @param productCode - */ - ProductInfoVo getByProductCodeInfo(String productCode); - - /** - * 查询列表 - * - * @param query - * @return - */ - List queryProductBasList(String query, Integer pkCountry, Integer pkCubasdoc, Integer systemType); - - /** - * 根据产品编号查询 - * - * @param productCode - * @return - */ - ProductBasVo findByProductCode(String productCode); - - /** - * 根据规格、主键查询产品 - */ - List queryProductExtBySpecsId(List productSpecsList, Integer pkCountry); - - /** - * 查询全部已关联查询 - * - * @param query - * @return - */ - List queryProductBasRelevanceList(String query, Integer pkCountry, Integer systemType); - - /** - * 查询列表 - * - * @param productBasParams - * @return - */ - List selectByList(ProductBasParams productBasParams); - - /** - * 根据供应商查询产品基本信息 - * - * @param pkSupplier - * @return - */ - List selectbypkSupplierList(Integer pkSupplier); - - /** - * 查询无供应商的产品基本信息 - * - * @return - */ - List selectbyNotSupplierList(); - - /** - * 查询全部 - * - * @param query - * @param pkCountry - * @return - */ - List queryProductBasAllList(String query, Integer pkCountry, Integer systemType); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/IBdProductBasSpecsService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/IBdProductBasSpecsService.java deleted file mode 100644 index 5b3c2412..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/IBdProductBasSpecsService.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.hzs.ground.product.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.sale.product.BdProductBasSpecs; -import com.hzs.ground.product.vo.BdProductBasSpecsVo; -import com.hzs.ground.product.vo.SpecsVo; - -import java.util.List; - -/** - * 规格明细表 服务类 - */ -public interface IBdProductBasSpecsService extends IService { - - /** - * 根据主键查询 产品规格信息 - * - * @param pkProductBas - * @return - */ - List queryListByProductBasCode(Integer pkProductBas); - - /** - * 查询规格（规格类型条件） - * - * @param pkSpecsType - * @return - */ - List findByPkSpecsType(Integer pkSpecsType); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/IThApprovalLogService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/IThApprovalLogService.java deleted file mode 100644 index 6b70215b..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/IThApprovalLogService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.hzs.ground.product.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.scm.th.ThApprovalLog; - -/** - * 供应商产品日志 服务类 - */ -public interface IThApprovalLogService extends IService { - -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/IThProductExtendService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/IThProductExtendService.java deleted file mode 100644 index ebd244bc..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/IThProductExtendService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.hzs.ground.product.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.scm.th.ThProductExtend; - -/** - * thProduct商品拓展表 服务类 - */ -public interface IThProductExtendService extends IService { - -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/IThProductService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/IThProductService.java deleted file mode 100644 index ee89ce03..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/IThProductService.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.hzs.ground.product.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.scm.th.ThProduct; -import com.hzs.ground.product.param.ProductInfoParam; -import com.hzs.ground.product.vo.ProductVo; - -import java.util.List; - -/** - * 服务类 - */ -public interface IThProductService extends IService { - - /** - * 查询列表 - * - * @param productInfoParam - * @return - */ - List queryByList(ProductInfoParam productInfoParam); - - /** - * 根据id 查询详情 - * - * @param productId - * @return - */ - ProductVo getProductInfoById(Integer productId); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/IThProductSpecsService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/IThProductSpecsService.java deleted file mode 100644 index 6cbe898e..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/IThProductSpecsService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.hzs.ground.product.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.scm.th.ThProductSpecs; - -/** - * thPorduct规格明细表 服务类 - */ -public interface IThProductSpecsService extends IService { - -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/impl/BdProductBasServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/impl/BdProductBasServiceImpl.java deleted file mode 100644 index a3b5c5bb..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/impl/BdProductBasServiceImpl.java +++ /dev/null @@ -1,190 +0,0 @@ -package com.hzs.ground.product.service.impl; - -import cn.hutool.core.bean.BeanUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.constant.CacheConstants; -import com.hzs.common.core.enums.EDelFlag; -import com.hzs.common.core.service.RedisService; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.domain.sale.product.BdProductBas; -import com.hzs.common.domain.sale.product.BdProductBasSpecs; -import com.hzs.common.domain.sale.product.BdProductSpecs; -import com.hzs.common.domain.sale.product.ext.BdProductBasExt; -import com.hzs.ground.product.mapper.BdProductBasMapper; -import com.hzs.ground.product.param.ProductBasParams; -import com.hzs.ground.product.service.IBdProductBasService; -import com.hzs.ground.product.service.IBdProductBasSpecsService; -import com.hzs.ground.product.vo.BdProductBasSpecsVo; -import com.hzs.ground.product.vo.ProductBasVo; -import com.hzs.ground.product.vo.ProductInfoVo; -import com.hzs.ground.product.vo.SpecsVo; -import com.hzs.system.sys.dto.LoginUser; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Date; -import java.util.List; -import java.util.Set; - -/** - * 产品基本设置 服务实现类 - */ -@Service -public class BdProductBasServiceImpl extends ServiceImpl implements IBdProductBasService { - - @Autowired - private IBdProductBasService productBasService; - @Autowired - private IBdProductBasSpecsService productBasSpecsService; - @Autowired - private RedisService redisService; - - @Override - public BdProductBas getProductBasById(Integer productBasId) { - BdProductBas bdProductBas = redisService.getCacheObject(CacheConstants.BD_PRODUCT_BAS + productBasId); - if (bdProductBas == null) { - bdProductBas = baseMapper.selectById(productBasId); - if (bdProductBas != null) { - redisService.setCacheObject(CacheConstants.BD_PRODUCT_BAS + bdProductBas.getPkId(), bdProductBas); - } - } - return bdProductBas; - } - - @Override - public BdProductBas getProductBasByProductCode(String productCode) { - BdProductBas bdProductBas = redisService.getCacheObject(CacheConstants.BD_PRODUCT_BAS + productCode); - if (bdProductBas == null) { - bdProductBas = baseMapper.selectOne(new LambdaQueryWrapper().eq(BdProductBas::getProductCode, productCode)); - if (bdProductBas != null) { - redisService.setCacheObject(CacheConstants.BD_PRODUCT_BAS + productCode, bdProductBas); - } - } - return bdProductBas; - } - - @Override - public List queryProductBasByIds(Set idList, Integer pkCountry) { - return baseMapper.queryProductBasByIds(idList, pkCountry); - } - - @Override - public String saveProductBas(ProductBasParams productBasParams, LoginUser loginUser) { - String productCode = productBasParams.getProductCode(); - BdProductBas productBas = BeanUtil.copyProperties(productBasParams, BdProductBas.class); - productBas.setProductCode(productCode); - productBas.setPkCreator(loginUser.getUserId()); - productBas.setCreationTime(DateUtils.currentDateTime()); - productBas.setPkCreator(loginUser.getUserId()); - productBas.setPkCountry(loginUser.getDataCountry()); - // 删除状态 审核完毕 修改为未删除状态 - productBas.setDelFlag(EDelFlag.UN_DELETE.getValue()); - productBasService.save(productBas); - // 生成规格明细 - if (productBasParams.getPkSpecsType() != null) { - for (Integer id : productBasParams.getPkSpecsType()) { - BdProductBasSpecs productBasSpecs = new BdProductBasSpecs(); - productBasSpecs.setPkProductBas(productBas.getPkId()); - productBasSpecs.setPkSpecsType(id); - productBasSpecs.setPkCountry(loginUser.getDataCountry()); - productBasSpecs.setPkCreator(loginUser.getUserId()); - productBasSpecs.setCreationTime(DateUtils.currentDateTime()); - productBasSpecsService.save(productBasSpecs); - } - } - return productCode; - } - - @Override - public void updateProductBas(ProductBasParams productBasParams, LoginUser loginUser) { - BdProductBas productBas = BeanUtil.copyProperties(productBasParams, BdProductBas.class); - productBas.setPkId(productBasParams.getPkId()); - productBas.setPkModified(loginUser.getUserId()); - productBas.setModifiedTime(new Date()); - productBasService.updateById(productBas); - // 生成规格明细 - if (productBasParams.getPkSpecsType() != null) { - LambdaQueryWrapper removeWrapper = new LambdaQueryWrapper<>(); - removeWrapper.eq(BdProductBasSpecs::getPkProductBas, productBasParams.getPkId()); - productBasSpecsService.remove(removeWrapper); - for (Integer id : productBasParams.getPkSpecsType()) { - BdProductBasSpecs productBasSpecs = new BdProductBasSpecs(); - productBasSpecs.setPkProductBas(productBasParams.getPkId()); - productBasSpecs.setPkSpecsType(id); - productBasSpecs.setPkCountry(loginUser.getDataCountry()); - productBasSpecs.setPkCreator(loginUser.getUserId()); - productBasSpecs.setCreationTime(new Date()); - productBasSpecsService.save(productBasSpecs); - } - } - } - - @Override - public void removeProductBas(Integer productBasId) { - productBasService.removeById(productBasId); - productBasSpecsService.remove(new LambdaQueryWrapper().eq(BdProductBasSpecs::getPkProductBas, productBasId)); - } - - @Override - public ProductInfoVo getByProductCodeInfo(String productCode) { - ProductBasVo productBas = productBasService.findByProductCode(productCode); - ProductInfoVo productInfoVo = new ProductInfoVo(); - if (productBas != null) { - List bdProductBasSpecsVos = productBasSpecsService.queryListByProductBasCode(productBas.getPkId()); - for (BdProductBasSpecsVo bdProductBasSpecsVo : bdProductBasSpecsVos) { - List specsList = productBasSpecsService.findByPkSpecsType(bdProductBasSpecsVo.getPkSpecsType()); - bdProductBasSpecsVo.setSpecsList(specsList); - } - productInfoVo.setProductBasSpecsList(bdProductBasSpecsVos); - productInfoVo.setPkId(productBas.getPkId()); - productInfoVo.setProductCode(productBas.getProductCode()); - productInfoVo.setProductName(productBas.getProductName()); - // 单位 - productInfoVo.setUnit(productBas.getUnit()); - productInfoVo.setUnitStr(productBas.getUnitStr()); - } - return productInfoVo; - } - - @Override - public List queryProductBasList(String query, Integer pkCountry, Integer pkCubasdoc, Integer systemType) { - return baseMapper.queryProductBasList(query, pkCountry, pkCubasdoc, systemType); - } - - @Override - public ProductBasVo findByProductCode(String productCode) { - return baseMapper.findByProductCode(productCode); - } - - @Override - public List queryProductExtBySpecsId(List productSpecsList, Integer pkCountry) { - return baseMapper.queryProductExtBySpecsId(productSpecsList, pkCountry); - } - - @Override - public List queryProductBasRelevanceList(String query, Integer pkCountry, Integer systemType) { - return baseMapper.queryProductBasRelevanceList(query, pkCountry, systemType); - } - - @Override - public List selectByList(ProductBasParams productBasParams) { - return baseMapper.selectByList(productBasParams); - } - - @Override - public List selectbypkSupplierList(Integer pkSupplier) { - return baseMapper.selectbypkSupplierList(pkSupplier); - } - - @Override - public List selectbyNotSupplierList() { - return baseMapper.selectbyNotSupplierList(); - } - - @Override - public List queryProductBasAllList(String query, Integer pkCountry, Integer systemType) { - return baseMapper.queryProductBasAllList(query, pkCountry, systemType); - } - -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/impl/BdProductBasSpecsServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/impl/BdProductBasSpecsServiceImpl.java deleted file mode 100644 index 02bd33f2..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/impl/BdProductBasSpecsServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.hzs.ground.product.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.domain.sale.product.BdProductBasSpecs; -import com.hzs.ground.product.mapper.BdProductBasSpecsMapper; -import com.hzs.ground.product.service.IBdProductBasSpecsService; -import com.hzs.ground.product.vo.BdProductBasSpecsVo; -import com.hzs.ground.product.vo.SpecsVo; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 规格明细表 服务实现类 - */ -@Service -public class BdProductBasSpecsServiceImpl extends ServiceImpl implements IBdProductBasSpecsService { - - - @Override - public List queryListByProductBasCode(Integer pkProductBas) { - return baseMapper.queryListByProductBasCode(pkProductBas); - } - - @Override - public List findByPkSpecsType(Integer pkSpecsType) { - return baseMapper.findByPkSpecsType(pkSpecsType); - } -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/impl/ThApprovalLogServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/impl/ThApprovalLogServiceImpl.java deleted file mode 100644 index 56e1ae42..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/impl/ThApprovalLogServiceImpl.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.hzs.ground.product.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.domain.scm.th.ThApprovalLog; -import com.hzs.ground.product.mapper.ThApprovalLogMapper; -import com.hzs.ground.product.service.IThApprovalLogService; -import org.springframework.stereotype.Service; - -/** - * 供应商产品日志 服务实现类 - */ -@Service -public class ThApprovalLogServiceImpl extends ServiceImpl implements IThApprovalLogService { - -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/impl/ThProductExtendServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/impl/ThProductExtendServiceImpl.java deleted file mode 100644 index fd2376ad..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/impl/ThProductExtendServiceImpl.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.hzs.ground.product.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.domain.scm.th.ThProductExtend; -import com.hzs.ground.product.mapper.ThProductExtendMapper; -import com.hzs.ground.product.service.IThProductExtendService; -import org.springframework.stereotype.Service; - -/** - * thProduct商品拓展表 服务实现类 - */ -@Service -public class ThProductExtendServiceImpl extends ServiceImpl implements IThProductExtendService { - -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/impl/ThProductServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/impl/ThProductServiceImpl.java deleted file mode 100644 index 3f69f103..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/impl/ThProductServiceImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.hzs.ground.product.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.domain.scm.th.ThProduct; -import com.hzs.ground.product.mapper.ThProductMapper; -import com.hzs.ground.product.param.ProductInfoParam; - -import com.hzs.ground.product.service.*; -import com.hzs.ground.product.vo.ProductVo; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 服务实现类 - */ -@Service -public class ThProductServiceImpl extends ServiceImpl implements IThProductService { - - @Override - public List queryByList(ProductInfoParam productInfoParam) { - return baseMapper.queryByList(productInfoParam); - } - - @Override - public ProductVo getProductInfoById(Integer productId) { - return baseMapper.getProductInfoById(productId); - } - -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/impl/ThProductSpecsServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/impl/ThProductSpecsServiceImpl.java deleted file mode 100644 index 7c6e15ab..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/service/impl/ThProductSpecsServiceImpl.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.hzs.ground.product.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.domain.scm.th.ThProductSpecs; -import com.hzs.ground.product.mapper.ThProductSpecsMapper; -import com.hzs.ground.product.service.IThProductSpecsService; -import org.springframework.stereotype.Service; - -/** - * thPorduct规格明细表 服务实现类 - */ -@Service -public class ThProductSpecsServiceImpl extends ServiceImpl implements IThProductSpecsService { - -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/vo/BdProductBasSpecsVo.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/vo/BdProductBasSpecsVo.java deleted file mode 100644 index e866b79d..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/vo/BdProductBasSpecsVo.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.hzs.ground.product.vo;/** - * @Description: - * @Author: yuhui - * @Time: 2023/12/5 17:18 - * @Classname: BdProductBasSpecsVo - * @PackageName: com.hzs.scm.product.vo - */ - -import lombok.Data; - -import java.util.List; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.scm.product.vo - *@Author: yh - *@CreateTime: 2023-12-05 17:18 - *@Description: TODO - *@Version: 1.0 - */ -@Data -public class BdProductBasSpecsVo { - /** - * 主键 - */ - - private Integer pkId; - - /** - * 产品主键 - */ - - private Integer pkProductBas; - - /** - * 规格类型 - */ - - private Integer pkSpecsType; - - /** - * 规格类型名称 - */ - private String specsTypeName; - - /** - * 产品规格表 - */ - private List specsList; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/vo/ProductBasVo.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/vo/ProductBasVo.java deleted file mode 100644 index 58a4f846..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/vo/ProductBasVo.java +++ /dev/null @@ -1,121 +0,0 @@ -package com.hzs.ground.product.vo;/** - * @Description: - * @Author: yuhui - * @Time: 2023/11/29 11:33 - * @Classname: ProductBasVo - * @PackageName: com.hzs.scm.product.vo - */ - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Excel; -import lombok.Data; - -import java.math.BigDecimal; -import java.util.Date; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.scm.product.vo - *@Author: yh - *@CreateTime: 2023-11-29 11:33 - *@Description: TODO - *@Version: 1.0 - */ -@Data -public class ProductBasVo { - - private Integer pkProduct; - - /** - * 主键 - */ - - private Integer pkId; - - /** - * 产品编号 - */ - - @Excel(name = "产品编号") - private String productCode; - - /** - * 产品名称 - */ - - @Excel(name = "产品名称") - private String productName; - - /** - * 规格分类 - */ - - private Integer pkClassify; - - /** - * 单位 来源于枚举：单位 - */ - - private Integer unit; - - /** - * 单位 来源于枚举：单位 - */ - - private String unitStr; - - - /** - * 长 以厘米作为单位 - */ - - @Excel(name = "长(CM)") - private BigDecimal length; - - /** - * 宽 以厘米作为单位 - */ - - @Excel(name = "宽(CM)") - private BigDecimal width; - - /** - * 高 以厘米作为单位 - */ - - @Excel(name = "高(CM)") - private BigDecimal height; - - /** - * 重量 以千克作为单位 - */ - - @Excel(name = "重量(KG)") - private BigDecimal weight; - - /** - * 封面图 - */ - - private String cover; - - /** - * 保质期 - */ - - @Excel(name = "保质期(天)") - private Integer shelfLife; - - - /** - * 创建时间 - */ - @Excel(name = "创建时间",dateFormat = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date creationTime; - - /** - * 供应商主键 - */ - private Integer pkCubasdoc; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/vo/ProductInfoVo.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/vo/ProductInfoVo.java deleted file mode 100644 index f4d9578f..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/vo/ProductInfoVo.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.hzs.ground.product.vo;/** - * @Description: - * @Author: yuhui - * @Time: 2023/12/5 17:13 - * @Classname: ProductInfoVo - * @PackageName: com.hzs.scm.product.vo - */ - -import lombok.Data; - -import java.util.List; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.scm.product.vo - *@Author: yh - *@CreateTime: 2023-12-05 17:13 - *@Description: TODO - *@Version: 1.0 - */ -@Data -public class ProductInfoVo { - - /** - * 主键 - */ - - private Integer pkId; - - /** - * 产品编号 - */ - - private String productCode; - - /** - * 产品名称 - */ - - private String productName; - - - /** - * 单位 - */ - private Integer unit; - /** - * 单位字符 - */ - private String unitStr; - - /** - * 产品规格明细 - */ - private List productBasSpecsList; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/vo/ProductVo.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/vo/ProductVo.java deleted file mode 100644 index edc4a4f8..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/vo/ProductVo.java +++ /dev/null @@ -1,192 +0,0 @@ -package com.hzs.ground.product.vo;/** - * @Description: - * @Author: yuhui - * @Time: 2024/4/19 11:25 - * @Classname: ProductVo - * @PackageName: com.hzs.ground.product.vo - */ - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.hzs.common.core.annotation.Excel; -import lombok.Data; - -import java.math.BigDecimal; -import java.util.Date; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.ground.product.vo - *@Author: yh - *@CreateTime: 2024-04-19 11:25 - *@Description: TODO - *@Version: 1.0 - */ -@Data -public class ProductVo { - - - /** - * 创建人ID - */ - - private Long pkCreator; - - - - /** - * 修改人ID - */ - - private Long pkModified; - - /** - * 修改时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - - private Date modifiedTime; - - /** - * 逻辑删除 (0=未删除，1已删除) - */ - @JsonIgnore - @TableLogic - - private Integer delFlag; - - /** - * 国家 - */ - - private Integer pkCountry; - - - private Integer pkId; - - - /** - * 产品名称 - */ - @Excel(name = "产品名称") - private String productName; - /** - * 产品编号 - */ - @Excel(name = "产品编号") - private String productCode; - - - - /** - * 规格分类 - */ - - private Integer pkClassify; - - - - - /** - * 长 以厘米作为单位 - */ - @Excel(name = "长(CM)") - private BigDecimal length; - - /** - * 宽 以厘米作为单位 - */ - @Excel(name = "宽(CM)") - private BigDecimal width; - - /** - * 高 以厘米作为单位 - */ - @Excel(name = "高(CM)") - private BigDecimal height; - /** - * 重量 以千克作为单位 - */ - @Excel(name = "重量") - private BigDecimal weight; - /** - * 单位名 - */ - @Excel(name = "单位") - private String unitVal; - /** - * 单位 来源于枚举：单位 - */ - - private Integer unit; - /** - * 零售价格 - */ - @Excel(name = "零售价") - private BigDecimal retailPrice; - - /** - * 保质期 - */ - @Excel(name = "保质期(天)") - private Integer shelfLife; - - /** - * 产品规格 - */ - @Excel(name = "产品规格") - private String productSpecType; - - - /** - * 创建时间 - */ - - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "创建时间",dateFormat = "yyyy-MM-dd HH:mm:ss") - private Date creationTime; - /** - * 封面图 - */ - - private String cover; - - - /** - * 供应商 - */ - - private Integer pkSupplier; - - /** - * 供货价格 - */ - - private BigDecimal supplyPrice; - - - - /** - * 供货数量 - */ - - private Integer supplyQuantity; - - /** - * 销售模式 - */ - - private Integer saleModel; - - - /** - * 供应商名称 - */ - private String supplierName; - - - -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/vo/SpecsVo.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/vo/SpecsVo.java deleted file mode 100644 index a53a8cfe..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/product/vo/SpecsVo.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.hzs.ground.product.vo;/** - * @Description: - * @Author: yuhui - * @Time: 2023/12/6 14:42 - * @Classname: SpecsVo - * @PackageName: com.hzs.scm.product.vo - */ - -import lombok.Data; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.scm.product.vo - *@Author: yh - *@CreateTime: 2023-12-06 14:42 - *@Description: TODO - *@Version: 1.0 - */ -@Data -public class SpecsVo { - - /** - * 规格主键 - */ - private String pkSpecs; - - /** - * 规格名称 - */ - private String name; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/supplier/controller/ThSupplierApplyController.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/supplier/controller/ThSupplierApplyController.java deleted file mode 100644 index f63b9e46..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/supplier/controller/ThSupplierApplyController.java +++ /dev/null @@ -1,138 +0,0 @@ -package com.hzs.ground.supplier.controller; - -import com.hzs.common.core.annotation.Log; -import com.hzs.common.core.constant.msg.ConfigMsgConstants; -import com.hzs.common.core.constant.msg.ScmMsgConstants; -import com.hzs.common.core.domain.R; -import com.hzs.common.core.enums.*; -import com.hzs.common.core.utils.StringUtils; -import com.hzs.common.core.web.controller.BaseController; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.ground.supplier.ThSupplierApply; -import com.hzs.common.domain.member.ext.CuMemberExt; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.common.util.TransactionUtils; -import com.hzs.ground.supplier.service.IThSupplierApplyService; -import com.hzs.ground.supplier.vo.ThSupplierApplyVO; -import com.hzs.member.base.IMemberServiceApi; -import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.Date; -import java.util.List; - -/** - * 供应商申请申请 前端控制器 - */ -@RestController -@RequestMapping("/manage/th-supplier-apply") -public class ThSupplierApplyController extends BaseController { - - @Autowired - private IThSupplierApplyService iThSupplierApplyService; - - @DubboReference - IMemberServiceApi iMemberServiceApi; - - /** - * 供应商申请列表 - **/ - @GetMapping("/list") - @Log(module = EOperationModule.TH_SUPPLIER_APPLY, business = EOperationBusiness.TH_SUPPLIER_APPLY, method = EOperationMethod.SELECT) - public TableDataInfo listGeneralIn(ThSupplierApplyVO thSupplierApplyVO) { - Long userId = SecurityUtils.getUserId(); - thSupplierApplyVO.setPkCountry(SecurityUtils.getPkCountry()); - Integer checkUser = iThSupplierApplyService.queryThSupplierApplyUserList(userId); - if (checkUser > 0) { - thSupplierApplyVO.setPkCreator(userId); - } - startPage(); - List thSupplierApplyList = iThSupplierApplyService.queryThSupplierApplyList(thSupplierApplyVO); - return getDataTable(thSupplierApplyList); - } - - /** - * 添加供应商申请信息 - **/ - @PostMapping("/save") - public AjaxResult save(@RequestBody ThSupplierApplyVO thSupplierApplyVO) { - int pkCountry = SecurityUtils.getPkCountry(); - // 验证必填信息 - if (StringUtils.isEmpty(thSupplierApplyVO.getName())) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.TH_SUPPLIER_APPLY_NAME)); - } - if (StringUtils.isEmpty(thSupplierApplyVO.getShortName())) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.TH_SUPPLIER_APPLY_SHORT_NAME)); - } - if (StringUtils.isEmpty(thSupplierApplyVO.getLegalBody())) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.TH_SUPPLIER_APPLY_LEGAL_BODY)); - } - if (thSupplierApplyVO.getSettleType() == ESettleType.ONLINE.getValue()) { - if (StringUtils.isEmpty(thSupplierApplyVO.getMemberCode())) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_CODE_NOT_NULL)); - } - R member = iMemberServiceApi.getMemberByCode(thSupplierApplyVO.getMemberCode()); - thSupplierApplyVO.setPkMember(member.getData().getPkId()); - } - //默认线下 - thSupplierApplyVO.setSettleType(ESettleType.OFFLINE.getValue()); - thSupplierApplyVO.setPkCountry(pkCountry); - thSupplierApplyVO.setPkCreator(SecurityUtils.getUserId()); - thSupplierApplyVO.setCreationTime(new Date()); - iThSupplierApplyService.saveThSupplierApply(thSupplierApplyVO); - return AjaxResult.success(); - } - - /** - * 修改供应商申请信息 - **/ - @PostMapping("/update") - public AjaxResult update(@RequestBody ThSupplierApplyVO thSupplierApplyVO) { - int pkCountry = SecurityUtils.getPkCountry(); - // 验证必填信息 - if (StringUtils.isEmpty(thSupplierApplyVO.getName())) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.TH_SUPPLIER_APPLY_NAME)); - } - if (StringUtils.isEmpty(thSupplierApplyVO.getShortName())) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.TH_SUPPLIER_APPLY_SHORT_NAME)); - } - if (StringUtils.isEmpty(thSupplierApplyVO.getLegalBody())) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.TH_SUPPLIER_APPLY_LEGAL_BODY)); - } - if (thSupplierApplyVO.getSettleType() == ESettleType.ONLINE.getValue()) { - if (StringUtils.isEmpty(thSupplierApplyVO.getMemberCode())) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_CODE_NOT_NULL)); - } - R member = iMemberServiceApi.getMemberByCode(thSupplierApplyVO.getMemberCode()); - thSupplierApplyVO.setPkMember(member.getData().getPkId()); - } - //默认线下 - thSupplierApplyVO.setSettleType(ESettleType.OFFLINE.getValue()); - thSupplierApplyVO.setPkCountry(pkCountry); - thSupplierApplyVO.setPkCreator(SecurityUtils.getUserId()); - thSupplierApplyVO.setCreationTime(new Date()); - iThSupplierApplyService.updateThSupplierApply(thSupplierApplyVO); - return AjaxResult.success(); - } - - /** - * 查询供应商申请信息 - **/ - @GetMapping("/getOne/{pkId}") - public AjaxResult getOne(@PathVariable Long pkId) { - ThSupplierApply tsa = iThSupplierApplyService.getById(pkId); - return AjaxResult.success(tsa); - } - - /** - * 删除供应商申请信息 - **/ - @DeleteMapping("/{pkId}") - public AjaxResult delete(@PathVariable Long pkId) { - return AjaxResult.success(iThSupplierApplyService.delThSupplierApply(pkId)); - } - - -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/supplier/mapper/ThSupplierApplyMapper.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/supplier/mapper/ThSupplierApplyMapper.java deleted file mode 100644 index efc7822f..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/supplier/mapper/ThSupplierApplyMapper.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.hzs.ground.supplier.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.ground.supplier.ThSupplierApply; -import com.hzs.ground.supplier.vo.ThSupplierApplyVO; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 供应商申请申请 Mapper 接口 - */ -public interface ThSupplierApplyMapper extends BaseMapper { - - /** - * 供应商申请列表 - **/ - List queryThSupplierApplyList(ThSupplierApplyVO thSupplierApplyVO); - - /** - * 查询登录管理员是否为供应商 - **/ - Integer queryThSupplierApplyUserList(@Param("useId") Long userId); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/supplier/service/IThSupplierApplyService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/supplier/service/IThSupplierApplyService.java deleted file mode 100644 index e9a09a83..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/supplier/service/IThSupplierApplyService.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.hzs.ground.supplier.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.ground.supplier.ThSupplierApply; -import com.hzs.ground.supplier.vo.ThSupplierApplyVO; - -import java.util.List; - -/** - * 供应商申请 服务类 - */ -public interface IThSupplierApplyService extends IService { - - /** - * 供应商列表 - **/ - List queryThSupplierApplyList(ThSupplierApplyVO thSupplierApplyVO); - - /** - * 查询登录管理员是否为供应商 - **/ - Integer queryThSupplierApplyUserList(Long userId); - - /** - * 添加供应商申请 - **/ - boolean saveThSupplierApply(ThSupplierApplyVO thSupplierApplyVO); - - /** - * 修改供应商申请 - **/ - boolean updateThSupplierApply(ThSupplierApplyVO thSupplierApplyVO); - - /** - * 删除供应商申请 - **/ - boolean delThSupplierApply(Long pkId); - -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/supplier/service/impl/ThSupplierApplyServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/supplier/service/impl/ThSupplierApplyServiceImpl.java deleted file mode 100644 index d7e1ed8a..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/supplier/service/impl/ThSupplierApplyServiceImpl.java +++ /dev/null @@ -1,121 +0,0 @@ -package com.hzs.ground.supplier.service.impl; - -import cn.hutool.core.bean.BeanUtil; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.enums.*; -import com.hzs.common.domain.ground.supplier.ThSupplierApply; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.ground.supplier.mapper.ThSupplierApplyMapper; -import com.hzs.ground.supplier.service.IThSupplierApplyService; -import com.hzs.ground.supplier.vo.ThSupplierApplyVO; -import org.springframework.stereotype.Service; - -import java.util.*; - -/** - * 供应商申请 服务实现类 - */ -@Service -public class ThSupplierApplyServiceImpl extends ServiceImpl implements IThSupplierApplyService { - - @Override - public List queryThSupplierApplyList(ThSupplierApplyVO thSupplierApplyVO) { - return baseMapper.queryThSupplierApplyList(thSupplierApplyVO); - } - - @Override - public Integer queryThSupplierApplyUserList(Long userId) { - return baseMapper.queryThSupplierApplyUserList(userId); - } - - @Override - public boolean saveThSupplierApply(ThSupplierApplyVO thSupplierApplyVO) { - ThSupplierApply tsa = BeanUtil.copyProperties(thSupplierApplyVO, ThSupplierApply.class); - List fileList = thSupplierApplyVO.getFileList(); - int maxAptitudeCount = Math.min(fileList.size(), 8); - for (int i = 0; i < maxAptitudeCount; i++) { - switch (i) { - case 0: - tsa.setAptitude1(fileList.get(0)); - break; - case 1: - tsa.setAptitude2(fileList.get(1)); - break; - case 2: - tsa.setAptitude3(fileList.get(2)); - break; - case 3: - tsa.setAptitude4(fileList.get(3)); - break; - case 4: - tsa.setAptitude5(fileList.get(4)); - break; - case 5: - tsa.setAptitude6(fileList.get(5)); - break; - case 6: - tsa.setAptitude7(fileList.get(6)); - break; - case 7: - tsa.setAptitude8(fileList.get(7)); - break; - default: - break; - } - } - baseMapper.insert(tsa); - return true; - } - - @Override - public boolean updateThSupplierApply(ThSupplierApplyVO thSupplierApplyVO) { - ThSupplierApply tsa = BeanUtil.copyProperties(thSupplierApplyVO, ThSupplierApply.class); - List fileList = thSupplierApplyVO.getFileList(); - int maxAptitudeCount = Math.min(fileList.size(), 8); - for (int i = 0; i < maxAptitudeCount; i++) { - switch (i) { - case 0: - tsa.setAptitude1(fileList.get(0)); - break; - case 1: - tsa.setAptitude2(fileList.get(1)); - break; - case 2: - tsa.setAptitude3(fileList.get(2)); - break; - case 3: - tsa.setAptitude4(fileList.get(3)); - break; - case 4: - tsa.setAptitude5(fileList.get(4)); - break; - case 5: - tsa.setAptitude6(fileList.get(5)); - break; - case 6: - tsa.setAptitude7(fileList.get(6)); - break; - case 7: - tsa.setAptitude8(fileList.get(7)); - break; - default: - break; - } - } - baseMapper.updateById(tsa); - return true; - } - - @Override - public boolean delThSupplierApply(Long pkId) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("PK_ID", pkId); - updateWrapper.set("PK_MODIFIED", SecurityUtils.getUserId()); - updateWrapper.set("MODIFIED_TIME", new Date()); - updateWrapper.set("DEL_FLAG", EDelFlag.DELETE.getValue()); - baseMapper.update(null, updateWrapper); - return true; - } - -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/supplier/vo/ThSupplierApplyVO.java b/bd-business/bd-business-scm/src/main/java/com/hzs/ground/supplier/vo/ThSupplierApplyVO.java deleted file mode 100644 index 5f3d076a..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/ground/supplier/vo/ThSupplierApplyVO.java +++ /dev/null @@ -1,230 +0,0 @@ -package com.hzs.ground.supplier.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Excel; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import com.hzs.common.core.web.domain.BaseApprovalEntity; -import com.hzs.system.sys.dto.LoginUser; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; -import java.util.List; - -/** - * 供应商申请VO - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class ThSupplierApplyVO extends BaseApprovalEntity { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private Integer pkId; - - /** - * 供应商名称 - */ - private String name; - - /** - * 供应商简称 - */ - private String shortName; - - /** - * 法人 - */ - private String legalBody; - - /** - * 联系人 - */ - private String linkMan; - - /** - * 纳税人登记号 - */ - private String taxpayerid; - - /** - * 省 - */ - private Integer province; - /** - * 省 - */ - private String provinceName; - - /** - * 市 - */ - private Integer city; - /** - * 市 - */ - private String cityName; - - /** - * 区 - */ - private Integer county; - /** - * 区 - */ - private String countyName; - - /** - * 地址 - */ - private String address; - - /** - * 资质1 - */ - private String aptitude1; - - /** - * 资质2 - */ - private String aptitude2; - - /** - * 资质3 - */ - private String aptitude3; - - /** - * 资质4 - */ - private String aptitude4; - - /** - * 资质5 - */ - private String aptitude5; - - /** - * 资质6 - */ - private String aptitude6; - - /** - * 资质7 - */ - private String aptitude7; - - /** - * 资质8 - */ - private String aptitude8; - /** - * 错误信息 - */ - private String errMsg; - - /** - * 有效期 - */ - @Excel(name = "有效时间", dateFormat = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date validPeriod; - - /** - * 结算方式 1=线上 2=线下 ESettleType - */ - @Transaction(transactionKey = EnumsPrefixConstants.SETTLE_TYPE) - private Integer settleType; - /** - * 结算方式 1=线上 2=线下 ESettleType - */ - private String settleTypeVal; - - /** - * 会员主键 - */ - private Long pkMember; - /** - * 会员编号 - */ - private String memberCode; - - /** - * 证书 - */ - private String certificate; - - /** - * 经营范围 - */ - private String tradeScope; - - /** - * 创建人ID - */ - private Long pkCreator; - - /** - * 创建时间 - */ - @Excel(name = "创建时间", dateFormat = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date creationTime; - - /** - * 逻辑删除 (0=未删除，1已删除) - */ - private Integer delFlag; - - /** - * 国家 - */ - private Integer pkCountry; - - /** - * 登录用户信息 - */ - private LoginUser loginUser; - - /** - * 审批业务类型 来源枚举 EApprovalBusiness - */ - private Integer editType; - - /** - * 审核状态 来源枚举 EApproveStatus - */ - @Transaction(transactionKey = EnumsPrefixConstants.APPROVE_STATUS) - private Integer approveStatus; - /** - * 审核状态 来源枚举 EApproveStatus - */ - private String approveStatusVal; - - /** - * 修改记录单号 - */ - private String thBusinessCode; - - private String pkIdListStr; - /** - * 供应商申请id集合 - */ - private List pkIdList; - /** - * 供应商申请集合 - */ - @Transaction - private List petitionList; - - /** - * 附件集合 - */ - private List fileList; - - -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/controller/IcGeneralController.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/controller/IcGeneralController.java deleted file mode 100644 index c7ade6c4..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/controller/IcGeneralController.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.hzs.scm.general.controller; - -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.ObjectUtil; -import com.hzs.common.core.constant.msg.MemberMsgConstants; -import com.hzs.common.domain.sale.classify.BdSpecs; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.scm.general.param.GeneralBParam; -import com.hzs.scm.general.param.GeneralParam; -import com.hzs.scm.pub.controller.ScmController; - -import java.util.*; - -/** - * @description: 出入库公共的controller - * @author: sui q - * @time: 2023/11/29 11:05 - * @classname: IcGeneralController - * @package_name: com.hzs.scm.general.controller - * version 1.0.0 - */ -public abstract class IcGeneralController extends ScmController { - - protected String validateGeneralParam(GeneralParam generalParam) { - if (validateGeneralFieldParam(generalParam)) { - return MemberMsgConstants.REQUIRED_NOT_EMPTY; - } - generalParam.setPkCountry(SecurityUtils.getPkCountry()); - Map specsMap = new HashMap<>(); - String message = validateProduct(generalParam.getGeneralbParamList(), specsMap); - if(ObjectUtil.isNotEmpty(message)){ - return message; - } - // 验证供应商 - String msg = validateCuBasDoc(generalParam.getPkCubasdoc(), generalParam.getPkCountry()); - if(ObjectUtil.isNotEmpty(msg)){ - return msg; - } - // 验证客户 - msg = validateCustomer(generalParam.getPkCustomer(), generalParam.getPkCountry()); - if(ObjectUtil.isNotEmpty(msg)){ - return msg; - } - // 验证采购组织 - msg = validateSysCorp(generalParam.getPkCorp(), generalParam.getPkCountry()); - if(ObjectUtil.isNotEmpty(msg)){ - return msg; - } - // 验证批次号 - return validateProductBatchCode(generalParam.getGeneralbParamList(), specsMap); - } - - protected Boolean validateGeneralFieldParam(GeneralParam generalParam) { - if (generalParam == null || generalParam.getOrderDate() == null || generalParam.getPkWarehouse() == null || - generalParam.getPkCorp() == null || CollectionUtil.isEmpty(generalParam.getGeneralbParamList())) { - return Boolean.TRUE; - } - // 验证 采购订单明细字段不能为空 - for (GeneralBParam generalbParam : generalParam.getGeneralbParamList()) { - if (generalbParam.getPkUnit() == null || generalbParam.getPkProduct() == null || - generalbParam.getBizDate() == null || generalbParam.getNnum() == null || - generalbParam.getPkStorehouse() == null || CollectionUtil.isEmpty(generalbParam.getScmItemSpecsList())) { - return Boolean.TRUE; - } - } - return Boolean.FALSE; - } -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/controller/manage/IcGeneralInHController.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/controller/manage/IcGeneralInHController.java deleted file mode 100644 index ff1cfcfa..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/controller/manage/IcGeneralInHController.java +++ /dev/null @@ -1,217 +0,0 @@ -package com.hzs.scm.general.controller.manage; - - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.ObjectUtil; -import com.hzs.common.core.annotation.Log; -import com.hzs.common.core.constant.msg.ScmMsgConstants; -import com.hzs.common.core.enums.*; -import com.hzs.common.core.utils.poi.ExcelUtil; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.scm.general.ext.IcGeneralInBExt; -import com.hzs.common.domain.scm.general.ext.IcGeneralInHExt; -import com.hzs.common.domain.scm.pub.ScmOrderApproveLog; -import com.hzs.common.security.service.UserTokenService; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.common.util.TransactionUtils; -import com.hzs.scm.general.controller.IcGeneralController; -import com.hzs.scm.general.param.GeneralParam; -import com.hzs.scm.general.service.IIcGeneralInBService; -import com.hzs.scm.general.service.IIcGeneralInHService; -import com.hzs.scm.general.vo.IcGeneralInBVO; -import com.hzs.scm.general.vo.IcGeneralInExcelVO; -import com.hzs.scm.general.vo.IcGeneralInVO; -import com.hzs.scm.pub.param.ScmApproveParam; -import com.hzs.scm.pub.service.IScmOrderApproveLogService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.List; - -/** - *

- * 其他入库表头 前端控制器 - *

- * - * @author hzs - * @since 2023-11-27 - */ -@RestController -@RequestMapping("/manage/general-in") -@Slf4j -public class IcGeneralInHController extends IcGeneralController { - - @Autowired - private IIcGeneralInHService generalInhService; - - @Autowired - private IIcGeneralInBService generalInBiService; - - @Autowired - private IScmOrderApproveLogService scmOrderApproveLogService; - - @Autowired - private UserTokenService userTokenService; - - /** - * 查询列表 - * - * @return cubasdocParam 入参 - */ - @PostMapping("/list") - @Log(module = EOperationModule.GENERAL_IN, business = EOperationBusiness.GENERAL_IN, method = EOperationMethod.SELECT) - public TableDataInfo listGeneralIn(@RequestBody GeneralParam generalParam) { - startPage(); - generalParam.setPkCountry(SecurityUtils.getPkCountry()); - List generalInExtList = generalInhService.queryDisGeneralInExtByCondition(generalParam); - return packageTableDataInfo(generalInExtList, packageScmReturnVo(generalInExtList)); - } - - private List packageScmReturnVo(List generalInExtList) { - List generalInList = new ArrayList<>(); - for (IcGeneralInHExt generalInExt : generalInExtList) { - IcGeneralInVO icGeneralInVO = BeanUtil.copyProperties(generalInExt, IcGeneralInVO.class); - List generalInbExtList = generalInExt.getGeneralInbExtList(); - if(CollectionUtil.isNotEmpty(generalInbExtList)) { - List returnbVoList = BeanUtil.copyToList(generalInbExtList, IcGeneralInBVO.class); - icGeneralInVO.setGeneralInbExtList(returnbVoList); - } - generalInList.add(icGeneralInVO); - } - return generalInList; - } - - /** - * 查询待入库订单的明细 - * - * @return cubasdocParam 入参 - */ - @GetMapping("/list-detail/{pkId}") - public TableDataInfo queryGeneralInDetail(@PathVariable Long pkId) { - List generalInBiExtList = generalInBiService.queryGeneralInbByPk(SecurityUtils.getPkCountry(), pkId); - List scmReturnVoList = new ArrayList<>(); - for (IcGeneralInBExt generalInExt : generalInBiExtList) { - scmReturnVoList.add(BeanUtil.copyProperties(generalInExt, IcGeneralInBVO.class)); - } - return packageTableDataInfo(generalInBiExtList, scmReturnVoList); - } - - /** - * 分页查询会员某个时间段内的奖金汇总 - */ - @PostMapping("/export-list-total") - @Log(module = EOperationModule.GENERAL_IN, business = EOperationBusiness.GENERAL_IN, method = EOperationMethod.EXPORT) - public void exportListTransInTotal(HttpServletResponse response, GeneralParam generalParam){ - generalParam.setPkCountry(SecurityUtils.getPkCountry()); - List generalInExtList = generalInhService.queryDisGeneralInExtByCondition(generalParam); - List generalInExcelVoList = packageScmExportVo(generalInExtList); - ExcelUtil util = new ExcelUtil<>(IcGeneralInExcelVO.class); - util.exportExcel(response, generalInExcelVoList, "其他入库导出"); - } - - private List packageScmExportVo(List generalInExtList) { - List generalInExcelVoList = new ArrayList<>(); - for (IcGeneralInHExt generalInExt : generalInExtList) { - List generalInbExtList = generalInExt.getGeneralInbExtList(); - for (IcGeneralInBExt generalInBiExt : generalInbExtList) { - IcGeneralInExcelVO generalInExcelVo = BeanUtil.copyProperties(generalInExt, IcGeneralInExcelVO.class); - setScmItemsGeneralExcel(generalInBiExt, generalInExcelVo); - generalInExcelVo.setBizDate(generalInBiExt.getBizDate()); - generalInExcelVo.setNcostprice(generalInBiExt.getNcostprice()); - generalInExcelVo.setNcostmny(generalInBiExt.getNcostmny()); - generalInExcelVoList.add(generalInExcelVo); - } - } - return generalInExcelVoList; - } - - /** - * 新增其他入库 - * - * @param generalParam 入参 - */ - @PostMapping("/insert") - @Log(module = EOperationModule.GENERAL_IN, business = EOperationBusiness.GENERAL_IN, method = EOperationMethod.INSERT) - public AjaxResult saveGeneralIn(@RequestBody GeneralParam generalParam) { - String message = validateGeneralParam(generalParam); - if (ObjectUtil.isNotEmpty(message)) { - return AjaxResult.error(TransactionUtils.getContent(message)); - } - generalInhService.insertGeneralInByGeneralParam(generalParam, SecurityUtils.getUserId()); - // 审核通过后需要关闭采购订单 回写采购订单累计入库数量 - return AjaxResult.success(); - } - - /** - * 修改其他入库 - * - * @param generalParam 入参 - */ - @PostMapping("/update") - @Log(module = EOperationModule.GENERAL_IN, business = EOperationBusiness.GENERAL_IN, method = EOperationMethod.UPDATE) - public AjaxResult updatePoOrder(@RequestBody GeneralParam generalParam) { - if (generalParam.getPkId() == null) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.IC_GENERAL_IN_NOT_EXIST)); - } - String message = validateGeneralParam(generalParam); - if (ObjectUtil.isNotEmpty(message)) { - return AjaxResult.error(TransactionUtils.getContent(message)); - } - // 查询是否存在其他入库单 - IcGeneralInHExt generalInhExt = generalInhService.queryGeneralInById(generalParam.getPkId(), EScmOrderStatus.SAVE.getValue()); - if (generalInhExt == null) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.IC_GENERAL_IN_NOT_EXIST)); - } - generalInhService.updateGeneralInByGeneralParam(generalInhExt, generalParam, SecurityUtils.getUserId()); - return AjaxResult.success(); - } - - /** - * 删除其他入库 - * - * @param pkId 主键 - */ - @DeleteMapping("/{pkId}") - @Log(module = EOperationModule.GENERAL_IN, business = EOperationBusiness.GENERAL_IN, method = EOperationMethod.DELETE) - public AjaxResult delete(@PathVariable Long pkId) { - if (pkId == null) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.IC_GENERAL_IN_NOT_EXIST)); - } - IcGeneralInHExt generalInhExt = generalInhService.queryGeneralInById(pkId, EScmOrderStatus.SAVE.getValue()); - if (generalInhExt == null) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.IC_GENERAL_IN_NOT_EXIST)); - } - generalInhService.deleteGeneralIn(pkId, SecurityUtils.getUserId()); - return AjaxResult.success(); - } - - /** - * 撤销订单并入库（走签呈），签呈页面点击确定按钮 - * - * @param scmApproveParam 参数 - */ - @PostMapping("/submit") - @Log(module = EOperationModule.GENERAL_IN, business = EOperationBusiness.GENERAL_IN, method = EOperationMethod.UPDATE) - public AjaxResult submitPurchase(@RequestBody ScmApproveParam scmApproveParam) { - scmApproveParam.setPkCountry(SecurityUtils.getPkCountry()); - if(scmApproveParam.getPkId() == null){ - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.IC_GENERAL_IN_NOT_EXIST)); - } - IcGeneralInHExt generalInhExt = generalInhService.queryGeneralInById(scmApproveParam.getPkId(), EScmOrderStatus.SAVE.getValue()); - if (generalInhExt == null) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.IC_GENERAL_IN_NOT_EXIST)); - } - // 验证该订单是否存在签呈，存在待审核的签呈不能再次发起 - List scmOrderApproveLogs = scmOrderApproveLogService.queryScmOrderApproveLogByCondition(scmApproveParam.getPkId(), EApprovalBusiness.IC_GENERAL_IN_APPROVE.getValue(), null); - if(CollectionUtil.isNotEmpty(scmOrderApproveLogs)){ - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.PURCHASE_EXISTS_AGENT)); - } - generalInhService.auditGeneralInByApproveParamSubmit(scmApproveParam, userTokenService.getLoginUser()); - return AjaxResult.success(); - } -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/controller/manage/IcGeneralOutHController.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/controller/manage/IcGeneralOutHController.java deleted file mode 100644 index 0442ee60..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/controller/manage/IcGeneralOutHController.java +++ /dev/null @@ -1,220 +0,0 @@ -package com.hzs.scm.general.controller.manage; - - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.ObjectUtil; -import com.hzs.common.core.annotation.Log; -import com.hzs.common.core.constant.msg.ScmMsgConstants; -import com.hzs.common.core.enums.*; -import com.hzs.common.core.utils.poi.ExcelUtil; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.scm.general.ext.IcGeneralOutBExt; -import com.hzs.common.domain.scm.general.ext.IcGeneralOutHExt; -import com.hzs.common.domain.scm.pub.ScmOrderApproveLog; -import com.hzs.common.security.service.UserTokenService; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.common.util.TransactionUtils; -import com.hzs.scm.general.controller.IcGeneralController; -import com.hzs.scm.general.param.GeneralParam; -import com.hzs.scm.general.service.IIcGeneralOutBService; -import com.hzs.scm.general.service.IIcGeneralOutHService; -import com.hzs.scm.general.vo.IcGeneralOutBVO; -import com.hzs.scm.general.vo.IcGeneralOutExcelVO; -import com.hzs.scm.general.vo.IcGeneralOutVO; -import com.hzs.scm.pub.param.ScmApproveParam; -import com.hzs.scm.pub.service.IScmOrderApproveLogService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.List; - -/** - *

- * 其他出库单表头 前端控制器 - *

- * - * @author hzs - * @since 2023-11-27 - */ -@RestController -@RequestMapping("/manage/general-out") -@Slf4j -public class IcGeneralOutHController extends IcGeneralController { - - @Autowired - private IIcGeneralOutHService generalOutService; - - @Autowired - private IScmOrderApproveLogService scmOrderApproveLogService; - - @Autowired - private UserTokenService userTokenService; - - @Autowired - private IIcGeneralOutBService generalOutBiService; - - /** - * 查询列表 - * - * @return cubasdocParam 入参 - */ - @PostMapping("/list") - @Log(module = EOperationModule.GENERAL_OUT, business = EOperationBusiness.GENERAL_OUT, method = EOperationMethod.SELECT) - public TableDataInfo listGeneralOut(@RequestBody GeneralParam generalParam) { - startPage(); - generalParam.setPkCountry(SecurityUtils.getPkCountry()); - List generalOutExtList = generalOutService.queryDisGeneralOutExtCondition(generalParam); - return packageTableDataInfo(generalOutExtList, packageScmReturnVo(generalOutExtList)); - } - - /** - * 查询待入库订单的明细 - * - * @return cubasdocParam 入参 - */ - @GetMapping("/list-detail/{pkId}") - public TableDataInfo queryGeneralOutDetail(@PathVariable Long pkId) { - List generalOutBiExtList = generalOutBiService.queryGeneralOutBiByPK(SecurityUtils.getPkCountry(), pkId); - List scmReturnVoList = new ArrayList<>(); - for (IcGeneralOutBExt generalOutBiExt : generalOutBiExtList) { - scmReturnVoList.add(BeanUtil.copyProperties(generalOutBiExt, IcGeneralOutBVO.class)); - } - return packageTableDataInfo(generalOutBiExtList, scmReturnVoList); - } - - private List packageScmReturnVo(List generalOutExtList) { - List generalOutList = new ArrayList<>(); - for (IcGeneralOutHExt generalOutExt : generalOutExtList) { - IcGeneralOutVO generalOutVO = BeanUtil.copyProperties(generalOutExt, IcGeneralOutVO.class); - List generalOutbExtList = generalOutExt.getGeneralOutbExtList(); - if(CollectionUtil.isNotEmpty(generalOutbExtList)) { - List returnbVoList = BeanUtil.copyToList(generalOutbExtList, IcGeneralOutBVO.class); - generalOutVO.setGeneralOutbExtList(returnbVoList); - } - generalOutList.add(generalOutVO); - } - return generalOutList; - } - - /** - * 分页查询会员某个时间段内的奖金汇总 - */ - @PostMapping("/export-list-total") - @Log(module = EOperationModule.GENERAL_IN, business = EOperationBusiness.GENERAL_IN, method = EOperationMethod.EXPORT) - public void exportListTransInTotal(HttpServletResponse response, GeneralParam generalParam){ - generalParam.setPkCountry(SecurityUtils.getPkCountry()); - List generalOutExtList = generalOutService.queryDisGeneralOutExtCondition(generalParam); - List generalOutExcelVoList = packageScmExportVo(generalOutExtList); - ExcelUtil util = new ExcelUtil<>(IcGeneralOutExcelVO.class); - util.exportExcel(response, generalOutExcelVoList, "其他出库导出"); - } - - private List packageScmExportVo(List generalOutExtList) { - List generalOutExcelVoList = new ArrayList<>(); - for (IcGeneralOutHExt generalOutExt : generalOutExtList) { - List generalOutbExtList = generalOutExt.getGeneralOutbExtList(); - for (IcGeneralOutBExt generalOutBiExt : generalOutbExtList) { - IcGeneralOutExcelVO generalOutExcelVo = BeanUtil.copyProperties(generalOutExt, IcGeneralOutExcelVO.class); - setScmItemsGeneralExcel(generalOutBiExt, generalOutExcelVo); - generalOutExcelVo.setBizDate(generalOutBiExt.getBizDate()); - generalOutExcelVo.setNcostprice(generalOutBiExt.getNcostprice()); - generalOutExcelVo.setNcostmny(generalOutBiExt.getNcostmny()); - generalOutExcelVoList.add(generalOutExcelVo); - } - } - return generalOutExcelVoList; - } - - /** - * 新增其他入库 - * - * @param generalParam 入参 - */ - @PostMapping("/insert") - @Log(module = EOperationModule.GENERAL_OUT, business = EOperationBusiness.GENERAL_OUT, method = EOperationMethod.INSERT) - public AjaxResult saveGeneralOut(@RequestBody GeneralParam generalParam) { - String message = validateGeneralParam(generalParam); - if (ObjectUtil.isNotEmpty(message)) { - return AjaxResult.error(TransactionUtils.getContent(message)); - } - generalOutService.insertGeneralOutByGeneralParam(generalParam, SecurityUtils.getUserId()); - return AjaxResult.success(); - } - - /** - * 修改其他入库 - * - * @param generalParam 入参 - */ - @PostMapping("/update") - @Log(module = EOperationModule.GENERAL_OUT, business = EOperationBusiness.GENERAL_OUT, method = EOperationMethod.UPDATE) - public AjaxResult updatePoOrder(@RequestBody GeneralParam generalParam) { - if (generalParam.getPkId() == null) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.IC_GENERAL_OUT_NOT_EXIST)); - } - String message = validateGeneralParam(generalParam); - if (ObjectUtil.isNotEmpty(message)) { - return AjaxResult.error(TransactionUtils.getContent(message)); - } - if (generalParam.getPkId() == null) { - generalOutService.insertGeneralOutByGeneralParam(generalParam, SecurityUtils.getUserId()); - } else { - // 查询是否存在其他入库单 - IcGeneralOutHExt generalOutExt = generalOutService.queryGeneralOutById(generalParam.getPkId(), EScmOrderStatus.SAVE.getValue()); - if (generalOutExt == null) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.IC_GENERAL_OUT_NOT_EXIST)); - } - generalOutService.updateGeneralOutByGeneralParam(generalOutExt, generalParam, SecurityUtils.getUserId()); - } - return AjaxResult.success(); - } - - /** - * 删除其他入库 - * - * @param pkId 主键 - */ - @DeleteMapping("/{pkId}") - @Log(module = EOperationModule.GENERAL_OUT, business = EOperationBusiness.GENERAL_OUT, method = EOperationMethod.DELETE) - public AjaxResult delete(@PathVariable Long pkId) { - if (pkId == null) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.IC_GENERAL_OUT_NOT_EXIST)); - } - IcGeneralOutHExt generalOutExt = generalOutService.queryGeneralOutById(pkId, EScmOrderStatus.SAVE.getValue()); - if (generalOutExt == null) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.IC_GENERAL_OUT_NOT_EXIST)); - } - generalOutService.deleteGeneralOut(pkId, SecurityUtils.getUserId()); - return AjaxResult.success(); - } - - /** - * 撤销订单并入库（走签呈），签呈页面点击确定按钮 - * - * @param scmApproveParam 参数 - */ - @PostMapping("/submit") - @Log(module = EOperationModule.GENERAL_OUT, business = EOperationBusiness.GENERAL_OUT, method = EOperationMethod.UPDATE) - public AjaxResult submitPurchase(@RequestBody ScmApproveParam scmApproveParam) { - scmApproveParam.setPkCountry(SecurityUtils.getPkCountry()); - if(scmApproveParam.getPkId() == null){ - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.IC_GENERAL_OUT_NOT_EXIST)); - } - IcGeneralOutHExt generalOutExt = generalOutService.queryGeneralOutById(scmApproveParam.getPkId(), EScmOrderStatus.SAVE.getValue()); - if (generalOutExt == null) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.IC_GENERAL_OUT_NOT_EXIST)); - } - // 验证该订单是否存在签呈，存在待审核的签呈不能再次发起 - List scmOrderApproveLogs = scmOrderApproveLogService.queryScmOrderApproveLogByCondition(scmApproveParam.getPkId(), EApprovalBusiness.IC_GENERAL_OUT_APPROVE.getValue(), null); - if(CollectionUtil.isNotEmpty(scmOrderApproveLogs)){ - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.PURCHASE_EXISTS_AGENT)); - } - generalOutService.auditGeneralOutByApproveParamSubmit(generalOutExt, scmApproveParam, userTokenService.getLoginUser()); - return AjaxResult.success(); - } -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/mapper/IcGeneralInBMapper.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/mapper/IcGeneralInBMapper.java deleted file mode 100644 index fda23cc0..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/mapper/IcGeneralInBMapper.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.hzs.scm.general.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.scm.general.IcGeneralInB; -import com.hzs.common.domain.scm.general.ext.IcGeneralInBExt; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - *

- * 其他入库单明细 Mapper 接口 - *

- * - * @author hzs - * @since 2023-11-27 - */ -public interface IcGeneralInBMapper extends BaseMapper { - - /* - * @description: 根据主表主键查询其他入库单明细 - * @author: sui q - * @date: 2023/11/25 15:02 - * @param: null null - **/ - List queryGeneralInbByList(@Param("orderType") Integer orderType, @Param("icGeneralInbExtList") List icGeneralInbExtList); - - /* - * @description: 查询采购订单明细 - * @author: sui q - * @date: 2023/11/23 14:17 - * @param: null null - **/ - List queryGeneralInbByPk(@Param("pkCountry") Integer pkCountry, @Param("pkOrder") Long pkOrder); - - /* - * @description: 删除其他入库单明细 - * @author: sui q - * @date: 2023/11/21 14:23 - * @param: null null - **/ - void deleteGeneralItemsByList(@Param("icGeneralInbList") List icGeneralInbList, @Param("pkMember") Long pkMember); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/mapper/IcGeneralInHMapper.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/mapper/IcGeneralInHMapper.java deleted file mode 100644 index f63768d9..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/mapper/IcGeneralInHMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.hzs.scm.general.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.scm.general.IcGeneralInH; -import com.hzs.common.domain.scm.general.ext.IcGeneralInHExt; -import com.hzs.common.domain.scm.po.ext.PoOrderExt; -import com.hzs.scm.general.param.GeneralParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - *

- * 其他入库表头 Mapper 接口 - *

- * - * @author hzs - * @since 2023-11-27 - */ -public interface IcGeneralInHMapper extends BaseMapper { - - /* - * @description: 根据主键查询其他入库、其他入库明细 - * @author: sui q - * @date: 2023/11/21 10:49 - * @param: null null - **/ - IcGeneralInHExt queryGeneralInById(@Param("pkId") Long pkId, @Param("orderStatus") Integer orderStatus); - - /* - * @description: 查询会员端显示的采购入库单 - * @author: sui q - * @date: 2023/11/25 9:55 - * @param: null null - **/ - List queryDisGeneralInExtByCondition(GeneralParam generalParam); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/mapper/IcGeneralOutBMapper.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/mapper/IcGeneralOutBMapper.java deleted file mode 100644 index 243ef7f4..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/mapper/IcGeneralOutBMapper.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.hzs.scm.general.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.scm.general.IcGeneralOutB; -import com.hzs.common.domain.scm.general.ext.IcGeneralOutBExt; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - *

- * 其他入库单明细 Mapper 接口 - *

- * - * @author hzs - * @since 2023-11-27 - */ -public interface IcGeneralOutBMapper extends BaseMapper { - - /* - * @description: 根据主表主键查询采购入库单明细 - * @author: sui q - * @date: 2023/11/25 15:02 - * @param: null null - **/ - List queryGeneralOutBiByPk(@Param("orderType") Integer orderType, @Param("icGeneralOutbExtList") List icGeneralOutbExtList); - - /* - * @description: 根据主表主键查询采购入库单明细 - * @author: sui q - * @date: 2023/11/25 15:02 - * @param: null null - **/ - List queryGeneralOutBiByPK(@Param("pkCountry") Integer pkCountry, @Param("pkOrder") Long pkOrder); - - /* - * @description: 删除其他入库单明细 - * @author: sui q - * @date: 2023/11/21 14:23 - * @param: null null - **/ - void deleteGeneralItemsByList(@Param("icGeneralOutBList") List icGeneralOutbList, @Param("pkMember") Long pkMember); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/mapper/IcGeneralOutHMapper.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/mapper/IcGeneralOutHMapper.java deleted file mode 100644 index f1e53a09..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/mapper/IcGeneralOutHMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.hzs.scm.general.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.scm.general.IcGeneralOutH; -import com.hzs.common.domain.scm.general.ext.IcGeneralInHExt; -import com.hzs.common.domain.scm.general.ext.IcGeneralOutHExt; -import com.hzs.scm.general.param.GeneralParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - *

- * 其他出库单表头 Mapper 接口 - *

- * - * @author hzs - * @since 2023-11-27 - */ -public interface IcGeneralOutHMapper extends BaseMapper { - - /* - * @description: 根据主键查询其他入库、其他入库明细 - * @author: sui q - * @date: 2023/11/21 10:49 - * @param: null null - **/ - IcGeneralOutHExt queryGeneralInById(@Param("pkId") Long pkId, @Param("orderStatus") Integer orderStatus); - - /* - * @description: 查询会员端显示的采购入库单 - * @author: sui q - * @date: 2023/11/25 9:55 - * @param: null null - **/ - List queryDisGeneralOutExtByCondition(GeneralParam generalParam); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/param/GeneralBParam.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/param/GeneralBParam.java deleted file mode 100644 index 2ffd7040..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/param/GeneralBParam.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.hzs.scm.general.param; - -import com.hzs.scm.pub.param.ItemSpecsParam; -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -/** - * @description: 明细参数 - * @author: sui q - * @time: 2023/11/27 15:03 - * @classname: GeneralBParam - * @package_name: com.hzs.scm.general.param - * version 1.0.0 - */ -@Data -public class GeneralBParam implements Serializable { - - /** - * 主键 - */ - private Long pkId; - - /** - * 单位 - */ - private Integer pkUnit; - - /** - * 货位 - */ - private Integer pkClocation; - - /** - * 产品信息主键 - */ - private Integer pkProduct; - - /** - * 入库日期 - */ - private Date bizDate; - - /** - * 仓库 - */ - private Integer pkStorehouse; - - /** - * 数量 - */ - private BigDecimal nnum; - - /** - * 单价 - */ - private BigDecimal ncostprice; - - - /** - * 批次主键 - */ - private Long pkBatchCode; - - /** - * 明细表规格明细 - */ - private List scmItemSpecsList; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/param/GeneralParam.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/param/GeneralParam.java deleted file mode 100644 index b0ee0bc4..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/param/GeneralParam.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.hzs.scm.general.param; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.hzs.scm.pub.param.ScmPubParam; -import lombok.*; - -import java.io.Serializable; -import java.util.Date; -import java.util.List; - -/** - * @description: 其他出入库参数 - * @author: sui q - * @time: 2023/11/27 15:00 - * @classname: GeneralParam - * @package_name: com.hzs.scm.general.param - * version 1.0.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class GeneralParam extends ScmPubParam { - - /** - * 出库公司 - */ - private Integer pkOutCorp; - - /** - * 入库公司 - */ - private Integer pkInCorp; - - /** - * 供应商 - */ - private Integer pkCubasdoc; - - /** - * 客户 - */ - private Integer pkCustomer; - - /** - * 仓库 - */ - private Integer pkWarehouse; - - /** - * 出库仓库 - */ - private Integer pkOutWarehouse; - - /** - * 入库仓库 - */ - private Integer pkInWarehouse; - - /** - * 明细 - */ - private List generalbParamList; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/service/IIcGeneralInBService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/service/IIcGeneralInBService.java deleted file mode 100644 index 25c5b3d8..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/service/IIcGeneralInBService.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.hzs.scm.general.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.scm.general.IcGeneralInB; -import com.hzs.common.domain.scm.general.ext.IcGeneralInBExt; -import com.hzs.common.domain.scm.po.ext.PoOrderItemsExt; - -import java.util.List; - -/** - *

- * 其他入库单明细 服务类 - *

- * - * @author hzs - * @since 2023-11-27 - */ -public interface IIcGeneralInBService extends IService { - - /* - * @description: 根据主表主键查询采购入库单明细 - * @author: sui q - * @date: 2023/11/25 15:02 - * @param: null null - **/ - List queryGeneralInbByPk(Integer orderType, List icGeneralInbExtList); - - - /* - * @description: 查询其他入库单明细 - * @author: sui q - * @date: 2023/11/23 14:17 - * @param: null null - **/ - List queryGeneralInbByPk(Integer pkCountry, Long pkOrder); - - /* - * @description: 删除订单明细 - * @author: sui q - * @date: 2023/11/21 14:23 - * @param: null null - **/ - void deleteGeneralItemsByList(List icGeneralInbList, Long pkMember); - - /* - * @description: 删除采购入库单明细，根据订单主键 - * @author: sui q - * @date: 2023/11/21 14:55 - * @param: null null - **/ - void deleteGeneralItemsByPkGeneral(Long pkGeneral, Long pkMember); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/service/IIcGeneralInHService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/service/IIcGeneralInHService.java deleted file mode 100644 index c05d9ec8..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/service/IIcGeneralInHService.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.hzs.scm.general.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.scm.general.IcGeneralInH; -import com.hzs.common.domain.scm.general.ext.IcGeneralInHExt; -import com.hzs.scm.general.param.GeneralParam; -import com.hzs.scm.pub.param.ScmApproveParam; -import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; -import com.hzs.system.sys.dto.LoginUser; - -import java.util.List; - -/** - *

- * 其他入库表头 服务类 - *

- * - * @author hzs - * @since 2023-11-27 - */ -public interface IIcGeneralInHService extends IService { - - /* - * @description: 保存其他入库 - * @author: sui q - * @date: 2023/11/20 15:54 - * @param: null null - **/ - void insertGeneralInByGeneralParam(GeneralParam generalParam, Long pkMember); - - /* - * @description: 修改保存其他入库 - * @author: sui q - * @date: 2023/11/21 11:51 - * @param: null null - **/ - void updateGeneralInByGeneralParam(IcGeneralInHExt generalInhExt, GeneralParam poOrderParam, Long pkMember); - - /* - * @description: 根据订单主键查询其他入库 - * @author: sui q - * @date: 2023/11/21 10:47 - * @param: null null - **/ - IcGeneralInHExt queryGeneralInById(Long pkId, Integer orderStatus); - - /* - * @description: 查询会员端显示的采购入库单 - * @author: sui q - * @date: 2023/11/25 9:55 - * @param: null null - **/ - IcGeneralInHExt queryDisGeneralInExtById(Long pkId, Integer orderStatus); - - /* - * @description: 查询会员端显示的采购入库单 - * @author: sui q - * @date: 2023/11/25 9:55 - * @param: null null - **/ - List queryDisGeneralInExtByCondition(GeneralParam generalParam); - - /* - * @description: 删除采购订单 - * @author: sui q - * @date: 2023/11/21 14:54 - * @param: null null - **/ - void deleteGeneralIn(Long pkId, Long pkMember); - - /* - * @description: 提交采购订单（走审批） - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - void auditGeneralInByApproveParamSubmit(ScmApproveParam scmApproveParam, LoginUser loginUser); - - /* - * @description: 审核通过采购订单 - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - String auditGeneralInByApproveParamAgree(ApprovalBusinessResultDTO approvalBusinessResultDTO); - - /* - * @description: 审核驳回采购订单 - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - String auditGeneralInByApproveParamReject(ApprovalBusinessResultDTO approvalBusinessResultDTO); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/service/IIcGeneralOutBService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/service/IIcGeneralOutBService.java deleted file mode 100644 index b0650765..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/service/IIcGeneralOutBService.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.hzs.scm.general.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.scm.general.IcGeneralOutB; -import com.hzs.common.domain.scm.general.ext.IcGeneralOutBExt; - -import java.util.List; - -/** - *

- * 其他入库单明细 服务类 - *

- * - * @author hzs - * @since 2023-11-27 - */ -public interface IIcGeneralOutBService extends IService { - - /* - * @description: 根据主表主键查询采购入库单明细 - * @author: sui q - * @date: 2023/11/25 15:02 - * @param: null null - **/ - List queryGeneralOutBiByList(Integer orderType, List icGeneralOutbExtList); - - /* - * @description: 根据主表主键查询采购入库单明细 - * @author: sui q - * @date: 2023/11/25 15:02 - * @param: null null - **/ - List queryGeneralOutBiByPK(Integer pkCountry, Long pkOrder); - - /* - * @description: 删除订单明细 - * @author: sui q - * @date: 2023/11/21 14:23 - * @param: null null - **/ - void deleteGeneralItemsByList(List icGeneralOutbList, Long pkMember); - - /* - * @description: 删除采购入库单明细，根据订单主键 - * @author: sui q - * @date: 2023/11/21 14:55 - * @param: null null - **/ - void deleteGeneralItemsByPkGeneral(Long pkGeneral, Long pkMember); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/service/IIcGeneralOutHService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/service/IIcGeneralOutHService.java deleted file mode 100644 index 9c046700..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/service/IIcGeneralOutHService.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.hzs.scm.general.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.scm.general.IcGeneralOutH; -import com.hzs.common.domain.scm.general.ext.IcGeneralOutHExt; -import com.hzs.scm.general.param.GeneralParam; -import com.hzs.scm.pub.param.ScmApproveParam; -import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; -import com.hzs.system.sys.dto.LoginUser; - -import java.util.List; - -/** - *

- * 其他出库单表头 服务类 - *

- * - * @author hzs - * @since 2023-11-27 - */ -public interface IIcGeneralOutHService extends IService { - - /* - * @description: 保存其他入库 - * @author: sui q - * @date: 2023/11/20 15:54 - * @param: null null - **/ - void insertGeneralOutByGeneralParam(GeneralParam generalParam, Long pkMember); - - /* - * @description: 修改保存其他入库 - * @author: sui q - * @date: 2023/11/21 11:51 - * @param: null null - **/ - void updateGeneralOutByGeneralParam(IcGeneralOutHExt generalOutExt, GeneralParam poOrderParam, Long pkMember); - - /* - * @description: 根据订单主键查询其他入库 - * @author: sui q - * @date: 2023/11/21 10:47 - * @param: null null - **/ - IcGeneralOutHExt queryGeneralOutById(Long pkId, Integer orderStatus); - - /* - * @description: 查询会员端显示的其他入库 - * @author: sui q - * @date: 2023/11/25 9:55 - * @param: null null - **/ - IcGeneralOutHExt queryDisGeneralOutExtById(Long pkId, Integer orderStatus); - - /* - * @description: 查询会员端显示的其他入库 - * @author: sui q - * @date: 2023/11/25 9:55 - * @param: null null - **/ - List queryDisGeneralOutExtCondition(GeneralParam generalParam); - - /* - * @description: 删除采购订单 - * @author: sui q - * @date: 2023/11/21 14:54 - * @param: null null - **/ - void deleteGeneralOut(Long pkId, Long pkMember); - - /* - * @description: 提交采购订单（走审批） - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - void auditGeneralOutByApproveParamSubmit(IcGeneralOutHExt generalOutExt, ScmApproveParam scmApproveParam, LoginUser loginUser); - - /* - * @description: 审核通过采购订单 - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - String auditGeneralOutByApproveParamAgree(ApprovalBusinessResultDTO approvalBusinessResultDTO); - - /* - * @description: 审核驳回采购订单 - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - String auditGeneralOutByApproveParamReject(ApprovalBusinessResultDTO approvalBusinessResultDTO); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/service/impl/IcGeneralInBServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/service/impl/IcGeneralInBServiceImpl.java deleted file mode 100644 index 81aa5ce3..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/service/impl/IcGeneralInBServiceImpl.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.hzs.scm.general.service.impl; - -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.constant.ScmFieldConstants; -import com.hzs.common.core.constant.SystemFieldConstants; -import com.hzs.common.core.enums.EYesNo; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.domain.scm.general.IcGeneralInB; -import com.hzs.common.domain.scm.general.ext.IcGeneralInBExt; -import com.hzs.scm.general.mapper.IcGeneralInBMapper; -import com.hzs.scm.general.service.IIcGeneralInBService; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - *

- * 其他入库单明细 服务实现类 - *

- * - * @author hzs - * @since 2023-11-27 - */ -@Service -public class IcGeneralInBServiceImpl extends ServiceImpl implements IIcGeneralInBService { - - @Override - public List queryGeneralInbByPk(Integer orderType, List icGeneralInbExtList) { - return baseMapper.queryGeneralInbByList(orderType, icGeneralInbExtList); - } - - @Override - public List queryGeneralInbByPk(Integer pkCountry, Long pkOrder) { - return baseMapper.queryGeneralInbByPk(pkCountry, pkOrder); - } - - @Override - public void deleteGeneralItemsByList(List icGeneralInbList, Long pkMember) { - baseMapper.deleteGeneralItemsByList(icGeneralInbList, pkMember); - } - - @Override - public void deleteGeneralItemsByPkGeneral(Long pkGeneral, Long pkMember) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.set(SystemFieldConstants.DEL_FLAG, EYesNo.NO.getIntValue()); - updateWrapper.set(SystemFieldConstants.PK_MODIFIED, pkMember); - updateWrapper.set(SystemFieldConstants.MODIFIED_TIME, DateUtils.currentDateTime()); - updateWrapper.eq(ScmFieldConstants.PK_GENERAL, pkGeneral); - update(updateWrapper); - } -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/service/impl/IcGeneralInHServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/service/impl/IcGeneralInHServiceImpl.java deleted file mode 100644 index 7a6a36c7..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/service/impl/IcGeneralInHServiceImpl.java +++ /dev/null @@ -1,321 +0,0 @@ -package com.hzs.scm.general.service.impl; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.constant.CacheConstants; -import com.hzs.common.core.constant.SaOrderFieldConstants; -import com.hzs.common.core.constant.SystemFieldConstants; -import com.hzs.common.core.constant.msg.DocumentMsgConstants; -import com.hzs.common.core.constant.msg.ScmMsgConstants; -import com.hzs.common.core.enums.*; -import com.hzs.common.core.service.RedisService; -import com.hzs.common.core.utils.ComputeUtil; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.domain.scm.general.IcGeneralInB; -import com.hzs.common.domain.scm.general.IcGeneralInH; -import com.hzs.common.domain.scm.general.ext.IcGeneralInBExt; -import com.hzs.common.domain.scm.general.ext.IcGeneralInHExt; -import com.hzs.common.domain.scm.pub.ScmItemSpecs; -import com.hzs.common.domain.scm.pub.ScmOrderApproveLog; -import com.hzs.common.domain.scm.purchase.ext.IcPurchaseInBExt; -import com.hzs.common.domain.system.sys.SysUser; -import com.hzs.common.util.TransactionUtils; -import com.hzs.scm.general.mapper.IcGeneralInHMapper; -import com.hzs.scm.general.param.GeneralBParam; -import com.hzs.scm.general.param.GeneralParam; -import com.hzs.scm.general.service.IIcGeneralInBService; -import com.hzs.scm.general.service.IIcGeneralInHService; -import com.hzs.scm.ic.service.IIcOnHandNumService; -import com.hzs.scm.no.service.IScmBillNoService; -import com.hzs.scm.pub.component.ScmPubUtilTool; -import com.hzs.scm.pub.param.ItemSpecsParam; -import com.hzs.scm.pub.param.ScmApproveParam; -import com.hzs.scm.pub.service.IScmItemSpecsService; -import com.hzs.scm.pub.service.IScmOrderApproveLogService; -import com.hzs.system.base.ICurrencyServiceApi; -import com.hzs.system.base.dto.CurrencyDTO; -import com.hzs.system.sys.IUserServiceApi; -import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; -import com.hzs.system.sys.dto.LoginUser; -import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.math.BigDecimal; -import java.time.temporal.ChronoUnit; -import java.util.*; -import java.util.stream.Collectors; - -/** - *

- * 其他入库表头 服务实现类 - *

- * - * @author hzs - * @since 2023-11-27 - */ -@Service -public class IcGeneralInHServiceImpl extends ServiceImpl implements IIcGeneralInHService { - - @DubboReference - private ICurrencyServiceApi currencyServiceApi; - - @DubboReference - private IUserServiceApi userServiceApi; - - @Autowired - private IScmBillNoService scmBillNoService;; - - @Autowired - private IScmItemSpecsService scmItemSpecsService; - - @Autowired - private IIcGeneralInBService generalInbService; - - @Autowired - private RedisService redisService; - - @Autowired - private IScmOrderApproveLogService scmOrderApproveLogService; - - @Autowired - private IIcOnHandNumService icOnHandNumService; - - @Override - @Transactional(rollbackFor = Exception.class) - public void insertGeneralInByGeneralParam(GeneralParam generalParam, Long pkMember) { - saveGeneralByParam(generalParam, pkMember); - } - - @Override - public void updateGeneralInByGeneralParam(IcGeneralInHExt generalInhExt, GeneralParam generalParam, Long pkMember) { - // 更新规格明细表，先删除在新增 根据主表主键删除 - scmItemSpecsService.deleteItemSpecsById(EScmOrderType.GENERAL_IN.getValue(), generalInhExt.getPkId(), pkMember); - generalInhExt.setPkCorp(generalParam.getPkCorp()); - generalInhExt.setPkOutCorp(generalParam.getPkOutCorp()); - generalInhExt.setPkCubasdoc(generalParam.getPkCubasdoc()); - generalInhExt.setPkWarehouse(generalParam.getPkWarehouse()); - generalInhExt.setPkOutWarehouse(generalParam.getPkOutWarehouse()); - generalInhExt.setOrderDate(generalParam.getOrderDate()); - generalInhExt.setRemark(generalParam.getRemark()); - // 更新订单明细表 分为3部分 删除的 新增的 修改的 - List generalInbList = getGeneralItems(generalParam, pkMember, generalInhExt); - // 重新处理订单明细，将订单明细分为 删除的、新增的、修改的 - List icGeneralInbExtList = generalInhExt.getGeneralInbExtList(); - // 剩余的就是需要删除的 - Map generalInbExtMap = icGeneralInbExtList.stream().collect(Collectors.toMap(IcGeneralInBExt::getPkId, generalInb->generalInb)); - List insertGeneralItems = new ArrayList<>(); - List updateGeneralItems = new ArrayList<>(); - List saveScmItemSpecsList = new ArrayList<>(); - for (IcGeneralInB generalInB : generalInbList) { - if (generalInB.getPkId() != null && generalInbExtMap.containsKey(generalInB.getPkId())) { - // 修改的 - generalInB.setPkCreator(generalInbExtMap.get(generalInB.getPkId()).getPkCreator()); - updateGeneralItems.add(generalInB); - saveScmItemSpecsList.addAll(generalInB.getScmItemSpecsList()); - generalInbExtMap.remove(generalInB.getPkId()); - } else { - // 新增的 - generalInB.setPkGeneral(generalInhExt.getPkId()); - insertGeneralItems.add(generalInB); - } - } - String generalLockKey = CacheConstants.IC_GENERAL_IN_LOCK + generalInhExt.getPkId(); - try { - if (!redisService.lockKeyOnce(generalLockKey)) { - throw new RuntimeException(ScmMsgConstants.BILL_NOT_OPERATION); - } - if (insertGeneralItems.size() > 0) { - // 保存订单明细 新增的 - generalInbService.saveBatch(insertGeneralItems); - List scmItemSpecsList = scmItemSpecsService.packageOrderItemsSpecs(insertGeneralItems, generalInhExt.getPkId()); - if (scmItemSpecsList.size() > 0) { - saveScmItemSpecsList.addAll(scmItemSpecsList); - } - } - if (updateGeneralItems.size() > 0) { - // 修改订单明细 修改的 - updateGeneralItems.forEach(updateItems -> - generalInbService.updateById(updateItems)); - - } - if (generalInbExtMap.size() > 0) { - // 删除订单明细 删除的 - List delGeneralItems = new ArrayList<>(); - generalInbExtMap.forEach((key, value) -> delGeneralItems.add(value)); - generalInbService.deleteGeneralItemsByList(delGeneralItems, pkMember); - } - // 保存订单明细规格 - if (saveScmItemSpecsList.size() > 0) { - scmItemSpecsService.saveBatch(saveScmItemSpecsList); - } - // 更新订单表 - updateById(generalInhExt); - } finally { - redisService.unlock(generalLockKey); - } - } - - @Override - public IcGeneralInHExt queryGeneralInById(Long pkId, Integer orderStatus) { - return baseMapper.queryGeneralInById(pkId, orderStatus); - } - - @Override - public IcGeneralInHExt queryDisGeneralInExtById(Long pkId, Integer orderStatus) { - GeneralParam generalParam = new GeneralParam(); - generalParam.setPkId(pkId); - generalParam.setOrderStatus(orderStatus); - List generalExtList = baseMapper.queryDisGeneralInExtByCondition(generalParam); - if(CollectionUtil.isNotEmpty(generalExtList)){ - return generalExtList.get(0); - } - return null; - } - - @Override - public List queryDisGeneralInExtByCondition(GeneralParam generalParam) { - if (generalParam.getEndDate() != null) { - generalParam.setEndDate(DateUtils.afterDate(1, ChronoUnit.DAYS, generalParam.getEndDate())); - } - return baseMapper.queryDisGeneralInExtByCondition(generalParam); - } - - @Override - public void deleteGeneralIn(Long pkId, Long pkMember) { - String generalInLock = CacheConstants.IC_GENERAL_IN_LOCK + pkId; - if (!redisService.lockKeyOnce(generalInLock)) { - throw new RuntimeException(ScmMsgConstants.BILL_NOT_OPERATION); - } - // 删除规格明细表 - scmItemSpecsService.deleteItemSpecsById(EScmOrderType.GENERAL_IN.getValue(), pkId, pkMember); - generalInbService.deleteGeneralItemsByPkGeneral(pkId, pkMember); - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.set(SystemFieldConstants.DEL_FLAG, EYesNo.NO.getIntValue()); - updateWrapper.set(SystemFieldConstants.PK_MODIFIED, pkMember); - updateWrapper.set(SystemFieldConstants.MODIFIED_TIME, DateUtils.currentDateTime()); - updateWrapper.eq(SystemFieldConstants.PK_ID, pkId); - update(updateWrapper); - redisService.unlock(generalInLock); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void auditGeneralInByApproveParamSubmit(ScmApproveParam scmApproveParam, LoginUser loginUser) { - // 更新单据状态 - updateGeneralStatus(scmApproveParam.getPkId(), loginUser, EScmOrderStatus.SUBMIT.getValue()); - scmOrderApproveLogService.submitOrder(scmApproveParam, EApprovalBusiness.IC_GENERAL_IN_APPROVE, EOrderPrefix.IC_GENERAL_IN_CODE, loginUser); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public String auditGeneralInByApproveParamAgree(ApprovalBusinessResultDTO approvalBusinessResultDTO) { - return approveGeneralByStatus(approvalBusinessResultDTO, EScmOrderStatus.APPROVE.getValue(), EAgentApprovalStatus.APPROVED.getValue()); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public String auditGeneralInByApproveParamReject(ApprovalBusinessResultDTO approvalBusinessResultDTO) { - return approveGeneralByStatus(approvalBusinessResultDTO, EScmOrderStatus.SAVE.getValue(), EAgentApprovalStatus.REFUSE.getValue()); - } - - /* - * @description: 将采购订单的参数转换为能保存的订单 - * @author: sui q - * @date: 2023/11/20 15:53 - * @param: null null - **/ - private void saveGeneralByParam(GeneralParam generalParam, Long pkMember) { - IcGeneralInH icGeneralInH = BeanUtil.copyProperties(generalParam, IcGeneralInH.class); - List generalItemList = getGeneralItems(generalParam, pkMember, icGeneralInH); - // 生成单据号 - icGeneralInH.setOrderCode(scmBillNoService.createScmBillNoByOrderType(EScmOrderType.GENERAL_IN.getValue())); - // 保存主表 - save(icGeneralInH); - for (IcGeneralInB generalInB : generalItemList) { - generalInB.setPkGeneral(icGeneralInH.getPkId()); - } - // 保存子表 - generalInbService.saveBatch(generalItemList); - List saveScmItemSpecsList = scmItemSpecsService.packageOrderItemsSpecs(generalItemList, icGeneralInH.getPkId()); - if (saveScmItemSpecsList.size() > 0) { - scmItemSpecsService.saveBatch(saveScmItemSpecsList); - } - } - - private List getGeneralItems(GeneralParam generalParam, Long pkMember, IcGeneralInH icGeneralInH) { - // 根据国家获得汇率 - CurrencyDTO currencyDTO = currencyServiceApi.getCurrency(generalParam.getPkCountry()).getData(); - SysUser sysUser = userServiceApi.selectUserById(pkMember).getData(); - // 根据登录账号获得部门 - icGeneralInH.setOrderType(EScmOrderType.GENERAL_IN.getValue()); - icGeneralInH.setPkDept(sysUser.getPkDept().intValue()); - icGeneralInH.setPkWhsmanager(pkMember); - // 计算累计数量 累计价税合计 - // 总数量 - BigDecimal totalNum = BigDecimal.ZERO; - List icGeneralInbList = new ArrayList<>(); - Date date = DateUtils.currentDateTime(); - for (GeneralBParam generalbParam : generalParam.getGeneralbParamList()) { - IcGeneralInB generalInB = BeanUtil.copyProperties(generalbParam, IcGeneralInB.class); - // 金额 - generalInB.setNcostmny(ComputeUtil.computeMultiply(generalInB.getNcostprice(), generalInB.getNnum())); - generalInB.setPkRate(currencyDTO.getPkId()); - totalNum = ComputeUtil.computeAdd(totalNum, generalInB.getNnum()); - List itemSpecsParamList = generalbParam.getScmItemSpecsList(); - scmItemSpecsService.packageScmItemByParam(itemSpecsParamList, generalInB, generalParam.getPkCountry(), pkMember, - icGeneralInH.getPkId(), generalInB.getPkId(), EScmOrderType.GENERAL_IN.getValue()); - icGeneralInbList.add(generalInB); - } - icGeneralInH.setPkCountry(generalParam.getPkCountry()); - if (generalParam.getPkId() == null) { - icGeneralInH.setPkCreator(pkMember); - } else { - icGeneralInH.setPkModified(pkMember); - icGeneralInH.setModifiedTime(date); - } - icGeneralInH.setTotalNum(totalNum); - return icGeneralInbList; - } - - private String approveGeneralByStatus(ApprovalBusinessResultDTO approvalBusinessResultDTO, Integer scmOrderStatus, Integer approveStatus){ - // 查询订单日志表 - List scmOrderApproveLogList = scmOrderApproveLogService.queryScmOrderApproveLogByCondition(null, approvalBusinessResultDTO.getEApprovalBusiness().getValue(), approvalBusinessResultDTO.getBusinessCode()); - if (scmOrderApproveLogList == null || scmOrderApproveLogList.size() == 0) { - return TransactionUtils.getContent(DocumentMsgConstants.DOCUMENT_NOT_EXISTS); - } - ScmOrderApproveLog scmOrderApproveLog = scmOrderApproveLogList.get(0); - // 查询其他入库单 - IcGeneralInHExt generalInhExt = queryGeneralInById(scmOrderApproveLog.getPkOrder(), EScmOrderStatus.SUBMIT.getValue()); - if (generalInhExt == null) { - return TransactionUtils.getContent(DocumentMsgConstants.DOCUMENT_HAS_HANDLE); - } - // 更新采购入库单状态 - updateGeneralStatus(generalInhExt.getPkId(), approvalBusinessResultDTO.getLoginUser(), scmOrderStatus); - // 更新前程日志表状态 - scmOrderApproveLogService.updateScmOrderApproveStatus(scmOrderApproveLog.getPkId(), approvalBusinessResultDTO.getLoginUser().getUserId(), approveStatus); - if(EAgentApprovalStatus.APPROVED.getValue() == approveStatus){ - // 查询其他入库单明细表 - List generalInbExtList = generalInbService.queryGeneralInbByPk(EScmOrderType.GENERAL_IN.getValue(), generalInhExt.getGeneralInbExtList()); - if(generalInbExtList != null && generalInbExtList.size() >0){ - generalInhExt.setGeneralInbExtList(generalInbExtList); - } - // 更新现存量 // 更新采购订单累计入库数量 - icOnHandNumService.mergeIcOnHandNumByGeneralIn(generalInhExt, generalInhExt.getGeneralInbExtList(), EScmOrderType.GENERAL_IN.getValue(), approvalBusinessResultDTO.getLoginUser().getUserId()); - } - return null; - } - - private void updateGeneralStatus(Long pkId, LoginUser loginUser, Integer orderStatus) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.set(SaOrderFieldConstants.ORDER_STATUS, orderStatus); - updateWrapper.set(SystemFieldConstants.PK_MODIFIED, loginUser.getUserId()); - updateWrapper.set(SystemFieldConstants.MODIFIED_TIME, DateUtils.currentDateTime()); - updateWrapper.eq(SystemFieldConstants.PK_ID, pkId); - update(updateWrapper); - } - -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/service/impl/IcGeneralOutBServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/service/impl/IcGeneralOutBServiceImpl.java deleted file mode 100644 index 8a8e60e6..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/service/impl/IcGeneralOutBServiceImpl.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.hzs.scm.general.service.impl; - -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.constant.ScmFieldConstants; -import com.hzs.common.core.constant.SystemFieldConstants; -import com.hzs.common.core.enums.EYesNo; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.domain.scm.general.IcGeneralOutB; -import com.hzs.common.domain.scm.general.ext.IcGeneralOutBExt; -import com.hzs.scm.general.mapper.IcGeneralOutBMapper; -import com.hzs.scm.general.service.IIcGeneralOutBService; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - *

- * 其他入库单明细 服务实现类 - *

- * - * @author hzs - * @since 2023-11-27 - */ -@Service -public class IcGeneralOutBServiceImpl extends ServiceImpl implements IIcGeneralOutBService { - - @Override - public List queryGeneralOutBiByList(Integer orderType, List icGeneralOutbExtList) { - return baseMapper.queryGeneralOutBiByPk(orderType, icGeneralOutbExtList); - } - - @Override - public List queryGeneralOutBiByPK(Integer pkCountry, Long pkOrder) { - return baseMapper.queryGeneralOutBiByPK(pkCountry, pkOrder); - } - - @Override - public void deleteGeneralItemsByList(List icGeneralOutbList, Long pkMember) { - baseMapper.deleteGeneralItemsByList(icGeneralOutbList, pkMember); - } - - @Override - public void deleteGeneralItemsByPkGeneral(Long pkGeneral, Long pkMember) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.set(SystemFieldConstants.DEL_FLAG, EYesNo.NO.getIntValue()); - updateWrapper.set(SystemFieldConstants.PK_MODIFIED, pkMember); - updateWrapper.set(SystemFieldConstants.MODIFIED_TIME, DateUtils.currentDateTime()); - updateWrapper.eq(ScmFieldConstants.PK_GENERAL, pkGeneral); - update(updateWrapper); - } -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/service/impl/IcGeneralOutHServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/service/impl/IcGeneralOutHServiceImpl.java deleted file mode 100644 index 103d3cd7..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/service/impl/IcGeneralOutHServiceImpl.java +++ /dev/null @@ -1,329 +0,0 @@ -package com.hzs.scm.general.service.impl; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.constant.CacheConstants; -import com.hzs.common.core.constant.SaOrderFieldConstants; -import com.hzs.common.core.constant.SystemFieldConstants; -import com.hzs.common.core.constant.msg.DocumentMsgConstants; -import com.hzs.common.core.constant.msg.ScmMsgConstants; -import com.hzs.common.core.enums.*; -import com.hzs.common.core.service.RedisService; -import com.hzs.common.core.utils.ComputeUtil; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.domain.scm.general.IcGeneralOutB; -import com.hzs.common.domain.scm.general.IcGeneralOutH; -import com.hzs.common.domain.scm.general.ext.IcGeneralOutBExt; -import com.hzs.common.domain.scm.general.ext.IcGeneralOutHExt; -import com.hzs.common.domain.scm.pub.ScmItemSpecs; -import com.hzs.common.domain.scm.pub.ScmOrderApproveLog; -import com.hzs.common.domain.system.sys.SysUser; -import com.hzs.common.util.TransactionUtils; -import com.hzs.scm.general.mapper.IcGeneralOutHMapper; -import com.hzs.scm.general.param.GeneralBParam; -import com.hzs.scm.general.param.GeneralParam; -import com.hzs.scm.general.service.IIcGeneralOutBService; -import com.hzs.scm.general.service.IIcGeneralOutHService; -import com.hzs.scm.ic.service.IIcOnHandNumService; -import com.hzs.scm.no.service.IScmBillNoService; -import com.hzs.scm.pub.component.ScmPubUtilTool; -import com.hzs.scm.pub.param.ItemSpecsParam; -import com.hzs.scm.pub.param.ScmApproveParam; -import com.hzs.scm.pub.service.IScmItemSpecsService; -import com.hzs.scm.pub.service.IScmOrderApproveLogService; -import com.hzs.system.base.ICurrencyServiceApi; -import com.hzs.system.base.dto.CurrencyDTO; -import com.hzs.system.sys.IUserServiceApi; -import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; -import com.hzs.system.sys.dto.LoginUser; -import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.math.BigDecimal; -import java.time.temporal.ChronoUnit; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -/** - *

- * 其他出库单表头 服务实现类 - *

- * - * @author hzs - * @since 2023-11-27 - */ -@Service -public class IcGeneralOutHServiceImpl extends ServiceImpl implements IIcGeneralOutHService { - - @DubboReference - private ICurrencyServiceApi currencyServiceApi; - - @DubboReference - private IUserServiceApi userServiceApi; - - @Autowired - private IScmBillNoService scmBillNoService;; - - @Autowired - private IScmItemSpecsService scmItemSpecsService; - - @Autowired - private IIcGeneralOutBService generalOutBiService; - - @Autowired - private RedisService redisService; - - @Autowired - private IScmOrderApproveLogService scmOrderApproveLogService; - - @Autowired - private IIcOnHandNumService onHandNumService; - - @Override - @Transactional(rollbackFor = Exception.class) - public void insertGeneralOutByGeneralParam(GeneralParam generalParam, Long pkMember) { - saveGeneralByParam(generalParam, pkMember); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void updateGeneralOutByGeneralParam(IcGeneralOutHExt generalOutExt, GeneralParam generalParam, Long pkMember) { - // 更新规格明细表，先删除在新增 根据主表主键删除 - scmItemSpecsService.deleteItemSpecsById(EScmOrderType.GENERAL_OUT.getValue(), generalOutExt.getPkId(), pkMember); - generalOutExt.setPkCorp(generalParam.getPkCorp()); - generalOutExt.setPkInCorp(generalParam.getPkInCorp()); - generalOutExt.setPkCustomer(generalParam.getPkCustomer()); - generalOutExt.setPkInWarehouse(generalParam.getPkInWarehouse()); - generalOutExt.setPkWarehouse(generalParam.getPkWarehouse()); - generalOutExt.setOrderDate(generalParam.getOrderDate()); - generalOutExt.setRemark(generalParam.getRemark()); - // 更新订单明细表 分为3部分 删除的 新增的 修改的 - List generalOutbList = getGeneralItems(generalParam, pkMember, generalOutExt); - // 重新处理订单明细，将订单明细分为 删除的、新增的、修改的 - List icGeneralOutbExtList = generalOutExt.getGeneralOutbExtList(); - // 剩余的就是需要删除的 - Map generalOutbExtMap = icGeneralOutbExtList.stream().collect(Collectors.toMap(IcGeneralOutBExt::getPkId, generalOut->generalOut)); - List insertGeneralItems = new ArrayList<>(); - List updateGeneralItems = new ArrayList<>(); - List saveScmItemSpecsList = new ArrayList<>(); - for (IcGeneralOutB generalOutB : generalOutbList) { - if (generalOutB.getPkId() != null && generalOutbExtMap.containsKey(generalOutB.getPkId())) { - // 修改的 - generalOutB.setPkCreator(generalOutbExtMap.get(generalOutB.getPkId()).getPkCreator()); - updateGeneralItems.add(generalOutB); - saveScmItemSpecsList.addAll(generalOutB.getScmItemSpecsList()); - generalOutbExtMap.remove(generalOutB.getPkId()); - } else { - // 新增的 - generalOutB.setPkGeneral(generalOutExt.getPkId()); - insertGeneralItems.add(generalOutB); - } - } - String generalLockKey = CacheConstants.IC_GENERAL_OUT_LOCK + generalOutExt.getPkId(); - try { - if (!redisService.lockKeyOnce(generalLockKey)) { - throw new RuntimeException(ScmMsgConstants.BILL_NOT_OPERATION); - } - if (insertGeneralItems.size() > 0) { - // 保存订单明细 新增的 - generalOutBiService.saveBatch(insertGeneralItems); - List scmItemSpecsList = scmItemSpecsService.packageOrderItemsSpecs(insertGeneralItems, generalOutExt.getPkId()); - if (scmItemSpecsList.size() > 0) { - saveScmItemSpecsList.addAll(scmItemSpecsList); - } - } - if (updateGeneralItems.size() > 0) { - // 修改订单明细 修改的 - updateGeneralItems.forEach(updateItems -> - generalOutBiService.updateById(updateItems)); - - } - if (generalOutbExtMap.size() > 0) { - // 删除订单明细 删除的 - List delGeneralItems = new ArrayList<>(); - generalOutbExtMap.forEach((key, value) -> delGeneralItems.add(value)); - generalOutBiService.deleteGeneralItemsByList(delGeneralItems, pkMember); - } - // 保存订单明细规格 - if (saveScmItemSpecsList.size() > 0) { - scmItemSpecsService.saveBatch(saveScmItemSpecsList); - } - // 更新订单表 - updateById(generalOutExt); - } finally { - redisService.unlock(generalLockKey); - } - } - - @Override - public IcGeneralOutHExt queryGeneralOutById(Long pkId, Integer orderStatus) { - return baseMapper.queryGeneralInById(pkId, orderStatus); - } - - @Override - public IcGeneralOutHExt queryDisGeneralOutExtById(Long pkId, Integer orderStatus) { - GeneralParam generalParam = new GeneralParam(); - generalParam.setPkId(pkId); - generalParam.setOrderStatus(orderStatus); - List generalExtList = baseMapper.queryDisGeneralOutExtByCondition(generalParam); - if(CollectionUtil.isNotEmpty(generalExtList)){ - return generalExtList.get(0); - } - return null; - } - - @Override - public List queryDisGeneralOutExtCondition(GeneralParam generalParam) { - if (generalParam.getEndDate() != null) { - generalParam.setEndDate(DateUtils.afterDate(1, ChronoUnit.DAYS, generalParam.getEndDate())); - } - return baseMapper.queryDisGeneralOutExtByCondition(generalParam); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteGeneralOut(Long pkId, Long pkMember) { - String generalOutLock = CacheConstants.IC_GENERAL_OUT_LOCK + pkId; - if (!redisService.lockKeyOnce(generalOutLock)) { - throw new RuntimeException(ScmMsgConstants.BILL_NOT_OPERATION); - } - // 删除规格明细表 - scmItemSpecsService.deleteItemSpecsById(EScmOrderType.GENERAL_OUT.getValue(), pkId, pkMember); - generalOutBiService.deleteGeneralItemsByPkGeneral(pkId, pkMember); - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.set(SystemFieldConstants.DEL_FLAG, EYesNo.NO.getIntValue()); - updateWrapper.set(SystemFieldConstants.PK_MODIFIED, pkMember); - updateWrapper.set(SystemFieldConstants.MODIFIED_TIME, DateUtils.currentDateTime()); - updateWrapper.eq(SystemFieldConstants.PK_ID, pkId); - update(updateWrapper); - redisService.unlock(generalOutLock); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void auditGeneralOutByApproveParamSubmit(IcGeneralOutHExt generalOutExt, ScmApproveParam scmApproveParam, LoginUser loginUser) { - // 更新单据状态 - updateGeneralStatus(scmApproveParam.getPkId(), loginUser, EScmOrderStatus.SUBMIT.getValue()); - List icGeneralOutbExtList = generalOutBiService.queryGeneralOutBiByList(EScmOrderType.GENERAL_OUT.getValue(), generalOutExt.getGeneralOutbExtList()); - if(icGeneralOutbExtList != null && icGeneralOutbExtList.size() >0){ - generalOutExt.setGeneralOutbExtList(icGeneralOutbExtList); - } - // 更新存货现存量表，更新库存 - onHandNumService.mergeIcOnHandNumByGeneralOut(generalOutExt, generalOutExt.getGeneralOutbExtList(), EScmOrderType.GENERAL_OUT.getValue(), loginUser.getUserId()); - scmOrderApproveLogService.submitOrder(scmApproveParam, EApprovalBusiness.IC_GENERAL_OUT_APPROVE, EOrderPrefix.IC_GENERAL_OUT_CODE, loginUser); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public String auditGeneralOutByApproveParamAgree(ApprovalBusinessResultDTO approvalBusinessResultDTO) { - return approveGeneralByStatus(approvalBusinessResultDTO, EScmOrderStatus.APPROVE.getValue(), EAgentApprovalStatus.APPROVED.getValue()); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public String auditGeneralOutByApproveParamReject(ApprovalBusinessResultDTO approvalBusinessResultDTO) { - return approveGeneralByStatus(approvalBusinessResultDTO, EScmOrderStatus.SAVE.getValue(), EAgentApprovalStatus.REFUSE.getValue()); - } - - /* - * @description: 将采购订单的参数转换为能保存的订单 - * @author: sui q - * @date: 2023/11/20 15:53 - * @param: null null - **/ - private void saveGeneralByParam(GeneralParam generalParam, Long pkMember) { - IcGeneralOutH icGeneralOutH = BeanUtil.copyProperties(generalParam, IcGeneralOutH.class); - List generalItemList = getGeneralItems(generalParam, pkMember, icGeneralOutH); - // 生成单据号 - icGeneralOutH.setOrderCode(scmBillNoService.createScmBillNoByOrderType(EScmOrderType.GENERAL_OUT.getValue())); - // 保存主表 - save(icGeneralOutH); - for (IcGeneralOutB generalOutB : generalItemList) { - generalOutB.setPkGeneral(icGeneralOutH.getPkId()); - } - // 保存子表 - generalOutBiService.saveBatch(generalItemList); - List saveScmItemSpecsList = scmItemSpecsService.packageOrderItemsSpecs(generalItemList, icGeneralOutH.getPkId()); - if (saveScmItemSpecsList.size() > 0) { - scmItemSpecsService.saveBatch(saveScmItemSpecsList); - } - } - - private List getGeneralItems(GeneralParam generalParam, Long pkMember, IcGeneralOutH icGeneralOutH) { - // 根据国家获得汇率 - CurrencyDTO currencyDTO = currencyServiceApi.getCurrency(generalParam.getPkCountry()).getData(); - SysUser sysUser = userServiceApi.selectUserById(pkMember).getData(); - // 根据登录账号获得部门 - icGeneralOutH.setPkDept(sysUser.getPkDept().intValue()); - icGeneralOutH.setPkWhsmanager(pkMember); - icGeneralOutH.setOrderType(EScmOrderType.GENERAL_OUT.getValue()); - // 计算累计数量 累计价税合计 - // 总数量 - BigDecimal totalNum = BigDecimal.ZERO; - List generalOutbList = new ArrayList<>(); - Date date = DateUtils.currentDateTime(); - for (GeneralBParam generalbParam : generalParam.getGeneralbParamList()) { - IcGeneralOutB generalOutB = BeanUtil.copyProperties(generalbParam, IcGeneralOutB.class); - // 金额 - generalOutB.setNcostmny(ComputeUtil.computeMultiply(generalOutB.getNcostprice(), generalOutB.getNnum())); - generalOutB.setPkRate(currencyDTO.getPkId()); - totalNum = ComputeUtil.computeAdd(totalNum, generalOutB.getNnum()); - List itemSpecsParamList = generalbParam.getScmItemSpecsList(); - scmItemSpecsService.packageScmItemByParam(itemSpecsParamList, generalOutB, generalParam.getPkCountry(), pkMember, - icGeneralOutH.getPkId(), generalOutB.getPkId(), EScmOrderType.GENERAL_OUT.getValue()); - generalOutbList.add(generalOutB); - } - icGeneralOutH.setPkCountry(generalParam.getPkCountry()); - if (generalParam.getPkId() == null) { - icGeneralOutH.setPkCreator(pkMember); - } else { - icGeneralOutH.setPkModified(pkMember); - icGeneralOutH.setModifiedTime(date); - } - icGeneralOutH.setTotalNum(totalNum); - return generalOutbList; - } - - private String approveGeneralByStatus(ApprovalBusinessResultDTO approvalBusinessResultDTO, Integer scmOrderStatus, Integer approveStatus){ - // 查询订单日志表 - List scmOrderApproveLogList = scmOrderApproveLogService.queryScmOrderApproveLogByCondition(null, approvalBusinessResultDTO.getEApprovalBusiness().getValue(), approvalBusinessResultDTO.getBusinessCode()); - if (scmOrderApproveLogList == null || scmOrderApproveLogList.size() == 0) { - return TransactionUtils.getContent(DocumentMsgConstants.DOCUMENT_NOT_EXISTS); - } - ScmOrderApproveLog scmOrderApproveLog = scmOrderApproveLogList.get(0); - // 查询采购入库 - IcGeneralOutHExt generalOutExt = queryGeneralOutById(scmOrderApproveLog.getPkOrder(), EScmOrderStatus.SUBMIT.getValue()); - if (generalOutExt == null) { - return TransactionUtils.getContent(DocumentMsgConstants.DOCUMENT_HAS_HANDLE); - } - // 更新采购入库单状态 - updateGeneralStatus(generalOutExt.getPkId(), approvalBusinessResultDTO.getLoginUser(), scmOrderStatus); - // 更新前程日志表状态 - scmOrderApproveLogService.updateScmOrderApproveStatus(scmOrderApproveLog.getPkId(), approvalBusinessResultDTO.getLoginUser().getUserId(), approveStatus); - // 弃审的时候回退批次数量 - if(EAgentApprovalStatus.REFUSE.getValue() == approveStatus){ - List icGeneralOutbExtList = generalOutBiService.queryGeneralOutBiByList(EScmOrderType.GENERAL_OUT.getValue(), generalOutExt.getGeneralOutbExtList()); - if(icGeneralOutbExtList != null && icGeneralOutbExtList.size() >0){ - generalOutExt.setGeneralOutbExtList(icGeneralOutbExtList); - } - onHandNumService.backIcOnHandNumByGeneralOut(generalOutExt, generalOutExt.getGeneralOutbExtList(), EScmOrderType.GENERAL_OUT.getValue(), approvalBusinessResultDTO.getLoginUser().getUserId()); - } - return null; - } - - private void updateGeneralStatus(Long pkId, LoginUser loginUser, Integer orderStatus) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.set(SaOrderFieldConstants.ORDER_STATUS, orderStatus); - updateWrapper.set(SystemFieldConstants.PK_MODIFIED, loginUser.getUserId()); - updateWrapper.set(SystemFieldConstants.MODIFIED_TIME, DateUtils.currentDateTime()); - updateWrapper.eq(SystemFieldConstants.PK_ID, pkId); - update(updateWrapper); - } -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/vo/IcGeneralInBVO.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/vo/IcGeneralInBVO.java deleted file mode 100644 index 883a950d..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/vo/IcGeneralInBVO.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.hzs.scm.general.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.scm.pub.vo.ScmSpecsVO; -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -/** - * @description: 其他入库单明细表 - * @author: sui q - * @time: 2024/1/5 11:59 - * @classname: IcGeneralInBVO - * @package_name: com.hzs.scm.general.vo - * version 1.0.0 - */ -@Data -public class IcGeneralInBVO implements Serializable { - - - /** - * 产品信息主键 - */ - private Integer pkProductBas; - - /** - * 生产日期 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date productDate; - - /** - * 失效日期 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date expireDate; - - /** - * 单位名称 - */ - private String unitName; - - /** - * 货位名称 - */ - private String clocationName; - - /** - * 仓库名称 - */ - private String storehouseName; - - - private String batchCode; - - /** - * 产品编号 - */ - private String productCode; - - /** - * 产品名称 - */ - private String productName; - - /** - * 规格名称 - */ - private String specsName; - - /** - * 主键 - */ - private Long pkId; - - /** - * 单位 - */ - private Integer pkUnit; - - /** - * 主表主键 - */ - private Long pkGeneral; - - /** - * 货位 - */ - private Integer pkClocation; - - /** - * 产品信息主键 - */ - private Integer pkProduct; - - /** - * 出入口类型 1=入库 2=出库 - */ - private Integer transType; - - /** - * 入库日期 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date bizDate; - - /** - * 仓库 - */ - private Integer pkStorehouse; - - /** - * 汇率 - */ - private Integer pkRate; - - /** - * 数量 - */ - private BigDecimal nnum; - - /** - * 单价 - */ - private BigDecimal ncostprice; - - /** - * 金额 - */ - private BigDecimal ncostmny; - - /** - * 批次主键 - */ - private Long pkBatchCode; - - - private List scmItemSpecsList; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/vo/IcGeneralInExcelVO.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/vo/IcGeneralInExcelVO.java deleted file mode 100644 index c31022f4..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/vo/IcGeneralInExcelVO.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.hzs.scm.general.vo; - -import com.hzs.common.core.annotation.Excel; -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -/** - * @description: 其他入库单导出数据 - * @author: sui q - * @time: 2024/3/8 14:13 - * @classname: IcGeneralInExcelVO - * @package_name: com.hzs.scm.general.vo - * version 1.0.0 - */ -@Data -public class IcGeneralInExcelVO implements Serializable { - - /** - * 订单编号 - */ - @Excel(name = "入库编号") - private String orderCode; - - /** - * 部门名称 - */ - @Excel(name = "部门") - private String deptName; - - /** - * 管理员名称 - */ - @Excel(name = "库管员") - private String managerName; - - /** - * 采购组织名称 - */ - @Excel(name = "库存公司") - private String corpName; - -// /** -// * 出库公司 -// */ -// @Excel(name = "出库公司") -// private String outCorpName; - - @Excel(name = "订单状态", readConverterExp = "1=已保存,2=已提交,3=已审核,4=已收货,5=已关闭,6=已退货") - private Integer orderStatus; - - /** - * 备注 - */ - @Excel(name = "备注") - private String remark; - - /** - * 订单日期 2023-10 - */ - @Excel(name = "入库日期", dateFormat = "yyyy-MM-dd") - private Date orderDate; - - /** - * 产品编号 - */ - @Excel(name = "产品编号") - private String productCode; - - /** - * 产品名称 - */ - @Excel(name = "产品名称") - private String productName; - - /** - * 规格名称 - */ - @Excel(name = "产品规格") - private String specsName; - - /** - * 单位名称 - */ - @Excel(name = "单位") - private String unitName; - - /** - * 仓库名称 - */ - @Excel(name = "入库仓库") - private String storehouseName; - - /** - * 数量 - */ - @Excel(name = "数量") - private BigDecimal nnum; - - /** - * 单价 - */ - @Excel(name = "单价") - private BigDecimal ncostprice; - - /** - * 金额 - */ - @Excel(name = "金额") - private BigDecimal ncostmny; - - /** - * 批次号 - */ - @Excel(name = "批次号") - private String batchCode; - - /** - * 入库日期 - */ - @Excel(name = "入库日期", dateFormat = "yyyy-MM-dd") - private Date bizDate; - -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/vo/IcGeneralInVO.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/vo/IcGeneralInVO.java deleted file mode 100644 index d4db2e71..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/vo/IcGeneralInVO.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.hzs.scm.general.vo; - -import com.hzs.scm.pub.vo.ScmReturnVo; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.List; - -/** - * @description: 其他入库单 - * @author: sui q - * @time: 2024/1/5 11:56 - * @classname: IcGeneralInVO - * @package_name: com.hzs.scm.general.vo - * version 1.0.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class IcGeneralInVO extends ScmReturnVo { - - /** - * 出库公司 - */ - private String outCorpName; - - /** - * 供应商名称 - */ - private String cubasdocName; - - /** - * 仓库名称 - */ - private String storehouseName; - - /** - * 出库公司 - */ - private Integer pkOutCorp; - - /** - * 供应商 取bd_cubasdoc 类型为1 2的 - */ - private Integer pkCubasdoc; - - /** - * 仓库管理员 - */ - private Long pkWhsmanager; - - /** - * 仓库 - */ - private Integer pkWarehouse; - - /** - * 出库仓库 - */ - private Integer pkOutWarehouse; - - - /** - * 明细 - */ - private List generalInbExtList; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/vo/IcGeneralOutBVO.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/vo/IcGeneralOutBVO.java deleted file mode 100644 index 67d98e78..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/vo/IcGeneralOutBVO.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.hzs.scm.general.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.scm.pub.vo.ScmSpecsVO; -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -/** - * @description: 其他入库单明细表 - * @author: sui q - * @time: 2024/1/5 11:59 - * @classname: IcGeneralInBVO - * @package_name: com.hzs.scm.general.vo - * version 1.0.0 - */ -@Data -public class IcGeneralOutBVO implements Serializable { - - /** - * 单位名称 - */ - private String unitName; - - /** - * 货位名称 - */ - private String clocationName; - - /** - * 仓库名称 - */ - private String storehouseName; - - - private String batchCode; - - /** - * 产品编号 - */ - private String productCode; - - /** - * 产品名称 - */ - private String productName; - - /** - * 规格名称 - */ - private String specsName; - - /** - * 主键 - */ - private Long pkId; - - /** - * 单位 - */ - private Integer pkUnit; - - /** - * 主表主键 - */ - private Long pkGeneral; - - /** - * 货位 - */ - private Integer pkClocation; - - /** - * 产品信息主键 - */ - private Integer pkProduct; - - /** - * 出入库类型 1=入库 2=出库 - */ - private Integer transType; - - /** - * 入库日期 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date bizDate; - - /** - * 仓库 - */ - private Integer pkStorehouse; - - /** - * 汇率 - */ - private Integer pkRate; - - /** - * 数量 - */ - private BigDecimal nnum; - - /** - * 单价 - */ - private BigDecimal ncostprice; - - /** - * 金额 - */ - private BigDecimal ncostmny; - - /** - * 批次主键 - */ - private Long pkBatchCode; - - private List scmItemSpecsList; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/vo/IcGeneralOutExcelVO.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/vo/IcGeneralOutExcelVO.java deleted file mode 100644 index ad599f59..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/vo/IcGeneralOutExcelVO.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.hzs.scm.general.vo; - -import com.hzs.common.core.annotation.Excel; -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -/** - * @description: 其他出库单导出数据 - * @author: sui q - * @time: 2024/3/8 14:13 - * @classname: IcGeneralInExcelVO - * @package_name: com.hzs.scm.general.vo - * version 1.0.0 - */ -@Data -public class IcGeneralOutExcelVO implements Serializable { - - /** - * 订单编号 - */ - @Excel(name = "出库编号") - private String orderCode; - - /** - * 部门名称 - */ - @Excel(name = "部门") - private String deptName; - - /** - * 管理员名称 - */ - @Excel(name = "库管员") - private String managerName; - - /** - * 采购组织名称 - */ - @Excel(name = "库存公司") - private String corpName; -// -// @Excel(name = "入库公司") -// private String countryInName; - - @Excel(name = "订单状态", readConverterExp = "1=已保存,2=已提交,3=已审核,4=已收货,5=已关闭,6=已退货") - private Integer orderStatus; - - /** - * 备注 - */ - @Excel(name = "备注") - private String remark; - - /** - * 订单日期 2023-10 - */ - @Excel(name = "出库日期", dateFormat = "yyyy-MM-dd") - private Date orderDate; - - - /** - * 产品编号 - */ - @Excel(name = "产品编号") - private String productCode; - - /** - * 产品名称 - */ - @Excel(name = "产品名称") - private String productName; - - /** - * 规格名称 - */ - @Excel(name = "产品规格") - private String specsName; - - /** - * 单位名称 - */ - @Excel(name = "单位") - private String unitName; - - /** - * 仓库名称 - */ - @Excel(name = "出库仓库") - private String storehouseName; - - /** - * 入库日期 - */ - @Excel(name = "出库日期", dateFormat = "yyyy-MM-dd") - private Date bizDate; - - /** - * 数量 - */ - @Excel(name = "数量") - private BigDecimal nnum; - - /** - * 单价 - */ - @Excel(name = "单价") - private BigDecimal ncostprice; - - /** - * 金额 - */ - @Excel(name = "金额") - private BigDecimal ncostmny; - - /** - * 批次号 - */ - @Excel(name = "批次号") - private String batchCode; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/vo/IcGeneralOutVO.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/vo/IcGeneralOutVO.java deleted file mode 100644 index 042f7114..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/vo/IcGeneralOutVO.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.hzs.scm.general.vo; - -import com.hzs.scm.pub.vo.ScmReturnVo; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.List; - -/** - * @description: 其他出库扩展表 - * @author: sui q - * @time: 2024/1/5 12:29 - * @classname: IcGeneralOutVO - * @package_name: com.hzs.scm.general.vo - * version 1.0.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class IcGeneralOutVO extends ScmReturnVo { - - /** - * 供应商名称 - */ - private String cubasdocName; - - /** - * 仓库名称 - */ - private String storehouseName; - - /** - * 入库公司 - */ - private Integer pkInCorp; - - /** - * 客户 - */ - private Integer pkCustomer; - - /** - * 仓库管理员 - */ - private Long pkWhsmanager; - - /** - * 入库仓库 - */ - private Integer pkInWarehouse; - - /** - * 仓库 - */ - private Integer pkWarehouse; - - private List generalOutbExtList; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/controller/manage/IcAvailableNumController.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/controller/manage/IcAvailableNumController.java deleted file mode 100644 index a4573da6..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/controller/manage/IcAvailableNumController.java +++ /dev/null @@ -1,173 +0,0 @@ -package com.hzs.scm.ic.controller.manage; - - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.ObjectUtil; -import com.hzs.common.core.annotation.Log; -import com.hzs.common.core.constant.msg.MemberMsgConstants; -import com.hzs.common.core.constant.msg.ScmMsgConstants; -import com.hzs.common.core.enums.EOperationBusiness; -import com.hzs.common.core.enums.EOperationMethod; -import com.hzs.common.core.enums.EOperationModule; -import com.hzs.common.core.utils.poi.ExcelUtil; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.sale.classify.BdSpecs; -import com.hzs.common.domain.scm.ic.IcAvailableNum; -import com.hzs.common.domain.scm.ic.ext.IcAvailableNumExt; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.common.util.TransactionUtils; -import com.hzs.scm.ic.param.AvailableNum; -import com.hzs.scm.ic.service.IIcAvailableNumService; -import com.hzs.scm.ic.vo.IcAvailableNumVo; -import com.hzs.scm.pub.controller.ScmController; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletResponse; -import java.util.*; - -/** - *

- * 可用量 前端控制器 - *

- * - * @author hzs - * @since 2023-12-09 - */ -@RestController -@RequestMapping("/manage/available") -public class IcAvailableNumController extends ScmController { - - @Autowired - private IIcAvailableNumService availableNumService; - - /** - * 查询列表 - * - * @return cubasdocParam 入参 - */ - @PostMapping("/list") - @Log(module = EOperationModule.AVAILABLE_NUM, business = EOperationBusiness.AVAILABLE_NUM, method = EOperationMethod.SELECT) - public TableDataInfo listAvailableNum(@RequestBody AvailableNum availableNum) { - startPage(); - availableNum.setPkCountry(SecurityUtils.getPkCountry()); - List availableNumList = availableNumService.queryAvailableNumByCondition(availableNum); - return getDataTable(availableNumList); - } - - /** - * 分页查询会员某个时间段内的奖金汇总 - */ - @PostMapping("/export-list") - @Log(module = EOperationModule.AVAILABLE_NUM, business = EOperationBusiness.AVAILABLE_NUM, method = EOperationMethod.EXPORT) - public void exportListAvailableNum(HttpServletResponse response, AvailableNum availableNum){ - availableNum.setPkCountry(SecurityUtils.getPkCountry()); - List availableNumList = availableNumService.queryAvailableNumByCondition(availableNum); - List availableNumVoList = packageScmExportVo(availableNumList); - ExcelUtil util = new ExcelUtil<>(IcAvailableNumVo.class); - util.exportExcel(response, availableNumVoList, "可用量导出"); - } - - private List packageScmExportVo(List availableNumList) { - List availableNumVoList = new ArrayList<>(); - for (IcAvailableNumExt availableNumExt : availableNumList) { - IcAvailableNumVo availableNumVo = BeanUtil.copyProperties(availableNumExt, IcAvailableNumVo.class); - availableNumVoList.add(availableNumVo); - } - return availableNumVoList; - } - - /** - * 新增可用量 - * - * @param availableNum 入参 - */ - @PostMapping("/insert") - @Log(module = EOperationModule.AVAILABLE_NUM, business = EOperationBusiness.AVAILABLE_NUM, method = EOperationMethod.INSERT) - public AjaxResult savePoOrder(@RequestBody AvailableNum availableNum) { - int pkCountry = SecurityUtils.getPkCountry(); - // 验证供应商 - String msg = validateAvailableMsg(availableNum, pkCountry); - if (ObjectUtil.isNotEmpty(msg)) { - return AjaxResult.error(msg); - } - // 计算价税合计、总数量 - availableNum.setPkCountry(pkCountry); - availableNumService.insertIcAvailableNumByParam(availableNum, SecurityUtils.getUserId()); - return AjaxResult.success(); - } - - /* - * @description: 验证订单相关信息 - * @author: sui q - * @date: 2023/11/21 11:43 - * @param: null null - **/ - private String validateAvailableMsg(AvailableNum availableNum, int pkCountry) { - Set storehouseIdSet = new HashSet<>(); - if (availableNum.getPkCorp() == null || availableNum.getAvailableNum() == null || - availableNum.getPkProduct() == null || availableNum.getPkProductBas() == null || - availableNum.getPkStorehouse() == null || - CollectionUtil.isEmpty(availableNum.getScmItemSpecsList())) { - return MemberMsgConstants.REQUIRED_NOT_EMPTY; - } - // 验证供应商 - String msg = validateCuBasDoc(availableNum.getPkCubasdoc(), pkCountry); - if(ObjectUtil.isNotEmpty(msg)){ - return msg; - } - // 验证采购组织 - msg = validateSysCorp(availableNum.getPkCorp(), pkCountry); - if(ObjectUtil.isNotEmpty(msg)){ - return msg; - } - storehouseIdSet.add(availableNum.getPkStorehouse()); - // 验证仓库，根据采购组织验证 - msg = validateStorehouse(storehouseIdSet, pkCountry, availableNum.getPkCorp()); - if(ObjectUtil.isNotEmpty(msg)){ - return msg; - } - // 验证产品，根据产品 - // 验证规格、规格分类 需要根据产品查询 处理specsName - Map specsMap = new HashMap<>(); - String message = validateProduct(Collections.singletonList(availableNum), specsMap); - if(ObjectUtil.isNotEmpty(message)){ - return message; - } - // 可用量 同规格同产品同库存组织同仓库只能有一条 - List availableNumList = availableNumService.queryAvailableNumByCondition(availableNum); - if(CollectionUtil.isNotEmpty(availableNumList)){ - return ScmMsgConstants.AVAILABLE_NUM_EXIST; - } - return null; - } - - /** - * 修改可用量 - * - * @param availableNum 可用量 - */ - @PostMapping("/update") - @Log(module = EOperationModule.AVAILABLE_NUM, business = EOperationBusiness.AVAILABLE_NUM, method = EOperationMethod.UPDATE) - public AjaxResult updateAvailableNum(@RequestBody AvailableNum availableNum) { - if (availableNum.getPkId() == null) { - return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.REQUIRED_NOT_EMPTY)); - } - IcAvailableNum icAvailableNum= availableNumService.getById(availableNum.getPkId()); - if(icAvailableNum == null){ - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.AVAILABLE_NUM_NOT_EXIST)); - } - icAvailableNum.setAvailableNum(availableNum.getAvailableNum()); - icAvailableNum.setPkStorehouse(availableNum.getPkStorehouse()); - icAvailableNum.setPkCubasdoc(availableNum.getPkCubasdoc()); - icAvailableNum.setPkCorp(availableNum.getPkCorp()); - availableNumService.updateDeductIcAvailableNumByGeneralOut(icAvailableNum, SecurityUtils.getUserId()); - return AjaxResult.success(); - } - -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/controller/manage/IcBatchCodeController.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/controller/manage/IcBatchCodeController.java deleted file mode 100644 index d1249b08..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/controller/manage/IcBatchCodeController.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.hzs.scm.ic.controller.manage; - - -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.ObjectUtil; -import com.hzs.common.core.annotation.Log; -import com.hzs.common.core.constant.msg.MemberMsgConstants; -import com.hzs.common.core.constant.msg.ScmMsgConstants; -import com.hzs.common.core.enums.EOperationBusiness; -import com.hzs.common.core.enums.EOperationMethod; -import com.hzs.common.core.enums.EOperationModule; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.scm.ic.IcBatchCode; -import com.hzs.common.domain.scm.ic.ext.IcBatchCodeExt; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.common.util.TransactionUtils; -import com.hzs.sale.product.IProductServiceApi; -import com.hzs.sale.product.dto.ProductDTO; -import com.hzs.scm.ic.param.BatchCodeParam; -import com.hzs.scm.ic.service.IIcBatchCodeService; -import com.hzs.scm.pub.controller.ScmController; -import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.ArrayList; -import java.util.List; - -/** - *

- * 批次号 前端控制器 - *

- * - * @author hzs - * @since 2023-11-23 - */ -@RestController -@RequestMapping("/manage/batch-code") -public class IcBatchCodeController extends ScmController { - - @Autowired - private IIcBatchCodeService batchCodeService; - - @DubboReference - private IProductServiceApi productServiceApi; - - /** - * 查询列表 - * - * @return cubasdocParam 入参 - */ - @PostMapping("/list") - @Log(module = EOperationModule.BATCH_CODE, business = EOperationBusiness.BATCH_CODE, method = EOperationMethod.SELECT) - public TableDataInfo listBatchCode(@RequestBody BatchCodeParam batchCodeParam) { - startPage(); - batchCodeParam.setPkCountry(SecurityUtils.getPkCountry()); - List batchCodeList = batchCodeService.queryBatchCodeByCondition(batchCodeParam); - return getDataTable(batchCodeList); - } - - /** - * 查询列表 - * - * @return cubasdocParam 入参 - */ - @PostMapping("/refer") - @Log(module = EOperationModule.BATCH_CODE, business = EOperationBusiness.BATCH_CODE, method = EOperationMethod.SELECT) - public TableDataInfo referBatchCode(@RequestBody BatchCodeParam batchCodeParam) { - if(batchCodeParam.getPkProduct() == null && batchCodeParam.getBatchCode() == null){ - return getDataTable(new ArrayList<>()); - } - batchCodeParam.setPkCountry(SecurityUtils.getPkCountry()); - List batchCodeList = batchCodeService.queryBatchCodeByCondition(batchCodeParam); - return getDataTable(batchCodeList); - } - - /** - * 新增采购入库 - * - * @param batchCodeParam 批次号 - */ - @PostMapping("/insert") - @Log(module = EOperationModule.BATCH_CODE, business = EOperationBusiness.BATCH_CODE, method = EOperationMethod.INSERT) - public AjaxResult savePoOrder(@RequestBody BatchCodeParam batchCodeParam) { - batchCodeParam.setPkCountry(SecurityUtils.getPkCountry()); - String msg = validateBatchCodeMsg(batchCodeParam); - if (ObjectUtil.isNotEmpty(msg)) { - return AjaxResult.error(msg); - } - batchCodeService.insertBatchCode(batchCodeParam, SecurityUtils.getUserId()); - return AjaxResult.success(); - } - - /* - * @description: 验证订单相关信息 - * @author: sui q - * @date: 2023/11/21 11:43 - * @param: null null - **/ - private String validateBatchCodeMsg(BatchCodeParam batchCodeParam) { - if (batchCodeParam.getPkProduct() == null || batchCodeParam.getBatchCode() == null || - batchCodeParam.getProductDate() == null|| batchCodeParam.getExpireDate() == null) { - return MemberMsgConstants.REQUIRED_NOT_EMPTY; - } - // 验证产品，根据产品 - ProductDTO productDTO = productServiceApi.getProduct(batchCodeParam.getPkProduct()).getData(); - if(productDTO == null){ - return ScmMsgConstants.PRODUCT_NOT_EXIST; - } - // 验证批次号，批次号唯一 - List batchCodeList = batchCodeService.queryBatchCodeByCondition(batchCodeParam); - if(CollectionUtil.isNotEmpty(batchCodeList)){ - if(batchCodeParam.getPkId() == null || !batchCodeParam.getPkId().equals(batchCodeList.get(0).getPkId())){ - return ScmMsgConstants.BATCH_CODE_HAS_EXIST; - } - } - // 计算有效期 - long validPeriod = DateUtils.betweenSecond(batchCodeParam.getProductDate(), batchCodeParam.getExpireDate())/24/60/60; - batchCodeParam.setValidPeriod((int) validPeriod); - return null; - } - - /** - * 修改批次号 - * - * @param batchCodeParam 批次号 - */ - @PostMapping("/update") - @Log(module = EOperationModule.BATCH_CODE, business = EOperationBusiness.BATCH_CODE, method = EOperationMethod.UPDATE) - public AjaxResult updateAvailableNum(@RequestBody BatchCodeParam batchCodeParam) { - if (batchCodeParam.getPkId() == null) { - return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.REQUIRED_NOT_EMPTY)); - } - IcBatchCode batchCode= batchCodeService.getById(batchCodeParam.getPkId()); - if(batchCode == null){ - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.SELECT_BATCH_CODE_NOT_EXIST)); - } - String msg = validateBatchCodeMsg(batchCodeParam); - if (ObjectUtil.isNotEmpty(msg)) { - return AjaxResult.error(msg); - } - batchCodeService.updateBatchCode(batchCode, batchCodeParam, SecurityUtils.getUserId()); - return AjaxResult.success(); - } - - /** - * 删除批次号 - * - * @param pkId 主键 - */ - @DeleteMapping("/{pkId}") - @Log(module = EOperationModule.PO_ORDER, business = EOperationBusiness.PO_ORDER, method = EOperationMethod.DELETE) - public AjaxResult delete(@PathVariable Long pkId) { - // 验证是否存在订单，订单状态是否是保存状态 - if (pkId == null) { - return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.REQUIRED_NOT_EMPTY)); - } - IcBatchCode batchCode= batchCodeService.getById(pkId); - if(batchCode == null){ - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.SELECT_BATCH_CODE_NOT_EXIST)); - } - batchCodeService.deleteBatchCode(pkId, SecurityUtils.getUserId()); - return AjaxResult.success(); - } -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/controller/manage/IcOnHandNumController.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/controller/manage/IcOnHandNumController.java deleted file mode 100644 index e197e42d..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/controller/manage/IcOnHandNumController.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.hzs.scm.ic.controller.manage; - -import cn.hutool.core.bean.BeanUtil; -import com.hzs.common.core.annotation.Log; -import com.hzs.common.core.enums.EOperationBusiness; -import com.hzs.common.core.enums.EOperationMethod; -import com.hzs.common.core.enums.EOperationModule; -import com.hzs.common.core.enums.EShippingChannel; -import com.hzs.common.core.utils.poi.ExcelUtil; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.scm.ic.ext.IcAvailableNumExt; -import com.hzs.common.domain.scm.ic.ext.IcOnHandNumExt; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.scm.ic.param.AvailableNum; -import com.hzs.scm.ic.param.OnHandNumParam; -import com.hzs.scm.ic.service.IIcOnHandNumService; -import com.hzs.scm.ic.vo.IcAvailableNumVo; -import com.hzs.scm.ic.vo.IcOnHandNumVo; -import com.hzs.scm.pub.controller.ScmController; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.List; - -/** - * @description: 现存量控制器 - * @author: sui q - * @time: 2023/12/20 14:09 - * @classname: IcOnHandNumController - * @package_name: com.hzs.scm.ic.controller.manage - * version 1.0.0 - */ -@RestController -@RequestMapping("/manage/hand-num") -public class IcOnHandNumController extends ScmController { - - @Autowired - private IIcOnHandNumService onHandNumService; - - /** - * 查询列表 - * - * @return cubasdocParam 入参 - */ - @PostMapping("/list") - @Log(module = EOperationModule.ON_HAND_NUM, business = EOperationBusiness.ON_HAND_NUM, method = EOperationMethod.SELECT) - public TableDataInfo listOnHandNum(@RequestBody OnHandNumParam onHandNumParam) { - startPage(); - onHandNumParam.setPkCountry(SecurityUtils.getPkCountry()); - List onHandNumExtList = onHandNumService.queryInventoryProductByParam(onHandNumParam); - return getDataTable(onHandNumExtList); - } - - /** - * 分页查询会员某个时间段内的奖金汇总 - */ - @PostMapping("/export-list") - @Log(module = EOperationModule.ON_HAND_NUM, business = EOperationBusiness.ON_HAND_NUM, method = EOperationMethod.EXPORT) - public void exportListOnHandNum(HttpServletResponse response, OnHandNumParam onHandNumParam){ - onHandNumParam.setPkCountry(SecurityUtils.getPkCountry()); - List onHandNumExtList = onHandNumService.queryInventoryProductByParam(onHandNumParam); - List onhandNumList = packageScmExportVo(onHandNumExtList); - ExcelUtil util = new ExcelUtil<>(IcOnHandNumVo.class); - util.exportExcel(response, onhandNumList, "现存量导出"); - } - - private List packageScmExportVo(List onHandNumExtList) { - List onhandNumList = new ArrayList<>(); - for (IcOnHandNumExt onHandNumExt : onHandNumExtList) { - IcOnHandNumVo onHandNumVo = BeanUtil.copyProperties(onHandNumExt, IcOnHandNumVo.class); - for (EShippingChannel value : EShippingChannel.values()) { - if(value.getValue().equals(onHandNumExt.getShippingChannel())){ - onHandNumVo.setShippingChannelVal(value.getLabel()); - break; - } - } - onhandNumList.add(onHandNumVo); - } - return onhandNumList; - } -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/mapper/IcAvailableNumMapper.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/mapper/IcAvailableNumMapper.java deleted file mode 100644 index f47b4caa..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/mapper/IcAvailableNumMapper.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.hzs.scm.ic.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.sale.ext.SaOrderExt; -import com.hzs.common.domain.scm.ic.IcAvailableNum; -import com.hzs.common.domain.scm.ic.ext.IcAvailableNumExt; -import com.hzs.common.domain.scm.ic.ext.IcOnHandNumExt; -import com.hzs.common.domain.scm.pub.ScmItemSpecs; -import com.hzs.scm.ic.param.AvailableNum; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 可用量 Mapper 接口 - */ -public interface IcAvailableNumMapper extends BaseMapper { - - /* - * 出入口的时候更新原来现存量的数量 - **/ - Integer updateAvailableNumByNum(IcAvailableNum availableNum); - - /* - * 入库单是新增或修改 可用量表 - **/ - void mergeIcAvailableNumByIcOnHandNum(@Param("availableNumList") List availableNumList); - - /* - * 查询产品是否存在现存量表 - **/ - List queryIcAvailableNumByCondition(@Param("icOnHandNum") IcOnHandNumExt icOnHandNum, @Param("scmItemSpecsList") List scmItemSpecsList); - - /* - * 下单时验证可用量 - **/ - List queryAvailableNumByAvaliable(@Param("availableNumExt") IcAvailableNumExt availableNumExt); - - /* - * 根据查询条件查询可用量 - **/ - List queryAvailableNumByCondition(AvailableNum availableNum); - - /* - * 根据销售订单查询可用量，封装数据 - **/ - List queryAvailableNumByOrder(@Param("saOrderExt") SaOrderExt saOrderExt); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/mapper/IcAvailableSpecsMapper.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/mapper/IcAvailableSpecsMapper.java deleted file mode 100644 index e5dd8f74..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/mapper/IcAvailableSpecsMapper.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.hzs.scm.ic.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.scm.ic.IcAvailableSpecs; -import com.hzs.common.domain.scm.pub.ScmItemSpecs; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - *

- * 可用量规格明细 Mapper 接口 - *

- * - * @author hzs - * @since 2023-12-11 - */ -public interface IcAvailableSpecsMapper extends BaseMapper { - - /* - * @description: 不存在的保存现存量明细 - * @author: sui q - * @date: 2023/11/22 16:52 - * @param: null null - **/ - void mergeIcAvailableSpecsByList(@Param("availableSpecsList") List availableSpecsList); - - /* - * @description:查询产品规格 - * @author: sui q - * @date: 2024/4/17 11:47 - * @param: null null - **/ - List queryAvailableSpecs(@Param("specsIsArr") int[] specsIsArr); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/mapper/IcBatchCodeMapper.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/mapper/IcBatchCodeMapper.java deleted file mode 100644 index 6eb7f1fa..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/mapper/IcBatchCodeMapper.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.hzs.scm.ic.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.scm.ic.IcBatchCode; -import com.hzs.common.domain.scm.ic.ext.IcBatchCodeExt; -import com.hzs.scm.ic.param.BatchCodeParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - *

- * 采购订单明细 Mapper 接口 - *

- * - * @author hzs - * @since 2023-11-23 - */ -public interface IcBatchCodeMapper extends BaseMapper { - - /* - * @description: 根据条件查询批次号 - * @author: sui q - * @date: 2023/12/19 14:25 - * @param: null null - **/ - List queryBatchCodeByCondition(BatchCodeParam batchCodeParam); - - /* - * @description: 查询批次号 - * @author: sui q - * @date: 2023/11/23 17:20 - * @param: null null - **/ - List queryBatchCodeByProduct(@Param("batchCodeParamList") List batchCodeParamList); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/mapper/IcOnHandNumBMapper.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/mapper/IcOnHandNumBMapper.java deleted file mode 100644 index 41df1def..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/mapper/IcOnHandNumBMapper.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.hzs.scm.ic.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.scm.ic.IcOnHandNumB; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - *

- * 现存量明细表 Mapper 接口 - *

- * - * @author hzs - * @since 2023-11-21 - */ -public interface IcOnHandNumBMapper extends BaseMapper { - - /* - * @description: 新增现存量明细流水 - * @author: sui q - * @date: 2023/11/22 16:15 - * @param: null null - **/ - void insertIcOnHandNumbByList(@Param("onHandNumbList") List onHandNumbList); - - /* - * @description: 根据明细表数据，回退批次数量，用于签呈驳回 - * @author: sui q - * @date: 2023/11/29 9:39 - * @param: null null - **/ - List queryOnHandNumByHandNumbList(@Param("icOnHandNumbList") List icOnHandNumbList); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/mapper/IcOnHandNumMapper.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/mapper/IcOnHandNumMapper.java deleted file mode 100644 index ec4400b7..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/mapper/IcOnHandNumMapper.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.hzs.scm.ic.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.scm.ic.IcOnHandNum; -import com.hzs.common.domain.scm.ic.IcOnHandNumB; -import com.hzs.common.domain.scm.ic.ext.IcOnHandNumExt; -import com.hzs.scm.ic.param.OnHandNumParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - *

- * 现存量 Mapper 接口 - *

- * - * @author hzs - * @since 2023-11-21 - */ -public interface IcOnHandNumMapper extends BaseMapper { - - /** - * 获取会员主键 - * - * @return: Integer - * @Author: sui q - * @Date: 2022/9/30 17:38 - */ - Long createIcOnHandNumId(); - - /* - * @description: 查询产品是否存在现存量表 - * @author: sui q - * @date: 2023/11/22 15:04 - * @param: null null - **/ - List queryIcOnHandNumByCondition(@Param("icOnHandNum") IcOnHandNum icOnHandNum, @Param("pkSpecs") String pkSpecs); - - - /* - * @description: 查询产品是否存在现存量表 - * @author: sui q - * @date: 2023/11/22 15:04 - * @param: null null - **/ - List queryOnHandNumByCondition(@Param("icOnHandNum") IcOnHandNum icOnHandNum); - - /* - * @description: 出入口的时候更新原来现存量的数量 - * @author: sui q - * @date: 2023/11/22 17:04 - * @param: null null - **/ - Integer updateOnHandNumByNum(IcOnHandNum icOnHandNum); - - /* - * @description: 批量更新库存数量，用于签呈提交 - * @author: sui q - * @date: 2023/11/29 9:13 - * @param: null null - **/ - Integer mergeUpdateOnHandNumByNum(@Param("icOnHandNumList") List icOnHandNumList); - - /* - * @description: 根据明细表数据，回退批次数量，用于签呈驳回 - * @author: sui q - * @date: 2023/11/29 9:39 - * @param: null null - **/ - Integer mergeUpdateBackOnHandNumByNum(@Param("icOnHandNumbList") List icOnHandNumbList, @Param("pkMember") Long pkMember); - - /* - * @description: 查询现存量，用于现存量查询，盘点参照使用 - * @author: sui q - * @date: 2023/12/20 13:50 - * @param: null null - **/ - List queryInventoryProductByParam(OnHandNumParam onHandNumParam); - - /* - * @description: 根据主键批量查询现存量 - * @author: sui q - * @date: 2023/12/21 10:18 - * @param: null null - **/ - List queryOnHandNumByList(@Param("idList") List idList); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/mapper/IcOnHandSpecsMapper.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/mapper/IcOnHandSpecsMapper.java deleted file mode 100644 index 35493de6..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/mapper/IcOnHandSpecsMapper.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.hzs.scm.ic.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.scm.ic.IcOnHandSpecs; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - *

- * 现存量规格明细 Mapper 接口 - *

- * - * @author hzs - * @since 2023-11-21 - */ -public interface IcOnHandSpecsMapper extends BaseMapper { - - /* - * @description: 不存在的保存现存量明细 - * @author: sui q - * @date: 2023/11/22 16:52 - * @param: null null - **/ - void mergeIcOnHandSpecsByList(@Param("icOnHandSpecsList") List icOnHandSpecsList); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/param/AvailableNum.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/param/AvailableNum.java deleted file mode 100644 index 569b07a2..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/param/AvailableNum.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.hzs.scm.ic.param; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.hzs.scm.pub.param.ItemSpecsParam; -import com.hzs.scm.pub.param.ScmPubParam; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.List; - -/** - * @description: 可用量修改 - * @author: sui q - * @time: 2023/12/11 09:46 - * @classname: AvailableNum - * @package_name: com.hzs.scm.ic.param - * version 1.0.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class AvailableNum extends ScmPubParam { - - /** - * 库存组织 - */ - private Integer pkCorp; - - /** - * 供应商 - */ - private Integer pkCubasdoc; - - /** - * 产品基础信息主键 - */ - private Integer pkProductBas; - - /** - * 产品信息主键 - */ - private Integer pkProduct; - - /** - * 单位 - */ - private Integer pkUnit; - - /** - * 仓库 - */ - private Integer pkStorehouse; - - /** - * 可用数量 - */ - private BigDecimal availableNum; - - /** - * 产品编号 - */ - private String productCode; - - /** - * 产品名称 - */ - private String productName; - - /** - * 明细表规格明细 - */ - private List scmItemSpecsList; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/param/BatchCodeParam.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/param/BatchCodeParam.java deleted file mode 100644 index ec5849b8..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/param/BatchCodeParam.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.hzs.scm.ic.param; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.util.Date; - -/** - * @description: 批次号参数 - * @author: sui q - * @time: 2023/11/27 18:13 - * @classname: BatchCodeParam - * @package_name: com.hzs.scm.ic - * version 1.0.0 - */ -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class BatchCodeParam implements Serializable { - - /** - * 产品信息主键 - */ - private Integer pkProduct; - - /** - * 批次主键 - */ - private Long pkBatchCode; - - /** - * 主键 - */ - private Long pkId; - - /** - * 首次入库日期 - */ - private Date bizDate; - - /** - * 生产日期 - */ - private Date productDate; - - /** - * 失效日期 - */ - private Date expireDate; - - /** - * 批次号 - */ - private String batchCode; - - /** - * 国家 - */ - private Integer pkCountry; - - /** - * 产品编号 - */ - private String productCode; - - /** - * 产品名称 - */ - private String productName; - - /** - * 有效期 - */ - private Integer validPeriod; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/param/OnHandNumParam.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/param/OnHandNumParam.java deleted file mode 100644 index 956ff996..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/param/OnHandNumParam.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.hzs.scm.ic.param; - -import com.hzs.scm.pub.param.ScmPubParam; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.math.BigDecimal; - -/** - * @description: 查询现存量参数 - * @author: sui q - * @time: 2023/12/20 13:47 - * @classname: OnHandNumParam - * @package_name: com.hzs.scm.ic.param - * version 1.0.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class OnHandNumParam extends ScmPubParam { - - /** - * 库存组织 - */ - private Integer pkCorp; - - /** - * 供应商 - */ - private Integer pkCubasdoc; - - /** - * 产品编号 - */ - private String productCode; - - /** - * 产品名称 - */ - private String productName; - - /** - * 仓库 - */ - private Integer pkStorehouse; - - /** - * 仓库 - */ - private Integer pkWarehouse; - - /** - * 批次主键 - */ - private String batchCode; - - /** - * 现存数量 只能盘点数量大于0的库存 - */ - private BigDecimal nonhandnum; - - /** - * 发货渠道 - */ - private Integer shippingChannel; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/IIcAvailableNumService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/IIcAvailableNumService.java deleted file mode 100644 index 98916649..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/IIcAvailableNumService.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.hzs.scm.ic.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.sale.ext.SaOrderExt; -import com.hzs.common.domain.scm.ic.IcAvailableNum; -import com.hzs.common.domain.scm.ic.ext.IcAvailableNumExt; -import com.hzs.common.domain.scm.ic.ext.IcOnHandNumExt; -import com.hzs.scm.ic.param.AvailableNum; - -import java.util.List; - -/** - * 可用量 服务类 - */ -public interface IIcAvailableNumService extends IService { - - /* - * 可用量表是新增或修改 可用量表 - **/ - void mergeIcAvailableNumByIcOnHandNum(List onHandNumList, Long pkMember); - - /* - * 可用量表是新增或修改 撤销订单，退单时回退可用量 - **/ - void mergeIcAvailableNumByOrder(SaOrderExt saOrderExt); - - /* - * 插入新的可用量 - **/ - void insertIcAvailableNumByParam(AvailableNum availableNum, Long pkMember); - - /* - * 出库扣减 可用量表 - **/ - void updateDeductIcAvailableNumByGeneralOut(IcAvailableNum availableNum, Long pkMember); - - /* - * 更新可用量 - **/ - void updateDeductIcAvailableNumByList(List availableNumList); - - /* - * 根据查询条件查询可用量 - **/ - List queryAvailableNumByCondition(AvailableNum availableNum); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/IIcAvailableSpecsService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/IIcAvailableSpecsService.java deleted file mode 100644 index 991660c2..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/IIcAvailableSpecsService.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.hzs.scm.ic.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.scm.ic.IcAvailableSpecs; -import com.hzs.common.domain.scm.ic.IcOnHandSpecs; - -import java.util.List; - -/** - *

- * 可用量规格明细 服务类 - *

- * - * @author hzs - * @since 2023-12-11 - */ -public interface IIcAvailableSpecsService extends IService { - - /* - * @description: 不存在的保存现存量明细 - * @author: sui q - * @date: 2023/11/22 16:52 - * @param: null null - **/ - void mergeIcAvailableSpecsByList(List availableSpecsList); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/IIcBatchCodeService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/IIcBatchCodeService.java deleted file mode 100644 index 937bd4e4..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/IIcBatchCodeService.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.hzs.scm.ic.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.scm.ic.IcBatchCode; -import com.hzs.common.domain.scm.ic.ext.IcBatchCodeExt; -import com.hzs.scm.ic.param.BatchCodeParam; - -import java.util.List; - -/** - *

- * 采购订单明细 服务类 - *

- * - * @author hzs - * @since 2023-11-23 - */ -public interface IIcBatchCodeService extends IService { - - /* - * @description: 根据条件查询批次号 - * @author: sui q - * @date: 2023/12/19 14:25 - * @param: null null - **/ - List queryBatchCodeByCondition(BatchCodeParam batchCodeParam); - - /* - * @description: 查询批次号 - * @author: sui q - * @date: 2023/11/23 17:20 - * @param: null null - **/ - List queryBatchCodeByProduct(List batchCodeParamList); - - /* - * @description: 插入批次号 - * @author: sui q - * @date: 2023/12/19 14:06 - * @param: null null - **/ - void insertBatchCode(BatchCodeParam batchCodeParam, Long pkMember); - - /* - * @description: 修改批次号 - * @author: sui q - * @date: 2023/12/19 14:06 - * @param: null null - **/ - void updateBatchCode(IcBatchCode icBatchCode, BatchCodeParam batchCodeParam, Long pkMember); - - /* - * @description: 删除采购订单 - * @author: sui q - * @date: 2023/11/21 14:54 - * @param: null null - **/ - void deleteBatchCode(Long pkBatchCode, Long pkMember); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/IIcOnHandNumBService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/IIcOnHandNumBService.java deleted file mode 100644 index 07264a5e..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/IIcOnHandNumBService.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.hzs.scm.ic.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.scm.ic.IcOnHandNumB; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - *

- * 现存量明细表 服务类 - *

- * - * @author hzs - * @since 2023-11-21 - */ -public interface IIcOnHandNumBService extends IService { - - /* - * @description: 新增现存量明细流水 - * @author: sui q - * @date: 2023/11/22 16:15 - * @param: null null - **/ - void insertIcOnHandNumbByList(List onHandNumbList); - - /* - * @description: 根据明细表数据，回退批次数量，用于签呈驳回 - * @author: sui q - * @date: 2023/11/29 9:39 - * @param: null null - **/ - List queryOnHandNumByHandNumbList(List icOnHandNumbList); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/IIcOnHandNumService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/IIcOnHandNumService.java deleted file mode 100644 index f9cd3d12..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/IIcOnHandNumService.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.hzs.scm.ic.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.scm.ic.IcOnHandNum; -import com.hzs.common.domain.scm.ic.ext.IcOnHandNumExt; -import com.hzs.common.domain.scm.sale.ext.IcSaleoutHExt; -import com.hzs.scm.ic.param.OnHandNumParam; - -import java.util.List; - -/** - *

- * 现存量 服务类 - *

- * - * @author hzs - * @since 2023-11-21 - */ -public interface IIcOnHandNumService extends IService { - - /* - * @description: 入库单生成新的现存量记录，入库类，新增 - * @author: sui q - * @date: 2023/11/21 16:19 - * @param: null null - **/ - void mergeIcOnHandNumByGeneralIn(Object generalHvo, List generalBvoList, Integer orderType, Long pkMember); - - /* - * @description: 出库单生成新的现存量记录，出口类，按照先进先出进行扣减,出库是提交签呈进行扣减，驳回回退库存 - * @author: sui q - * @date: 2023/11/21 16:19 - * @param: null null - **/ - void mergeIcOnHandNumByGeneralOut(Object generalHvo, List generalBvoList, Integer orderType, Long pkMember); - - /* - * @description: 出库单签呈驳回，回复数量 - * @author: sui q - * @date: 2023/11/29 9:51 - * @param: null null - **/ - void backIcOnHandNumByGeneralOut(Object generalHvo, List generalBvoList, Integer orderType, Long pkMember); - - /* - * @description: 销售出库单出库按照先进先出的模式自动出库 - * @author: sui q - * @date: 2023/11/21 16:19 - * @param: null null - **/ - void mergeIcOnHandNumByGeneralOut(IcSaleoutHExt icSaleOutExt, Integer orderType, Long pkMember); - - /* - * @description: 查询现存量，用于现存量查询，盘点参照使用 - * @author: sui q - * @date: 2023/12/20 13:50 - * @param: null null - **/ - List queryInventoryProductByParam(OnHandNumParam onHandNumParam); - - /* - * @description: 根据主键批量查询现存量 - * @author: sui q - * @date: 2023/12/21 10:18 - * @param: null null - **/ - List queryOnHandNumByList(List idList); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/IIcOnHandSpecsService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/IIcOnHandSpecsService.java deleted file mode 100644 index f6559fcf..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/IIcOnHandSpecsService.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.hzs.scm.ic.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.scm.ic.IcOnHandSpecs; - -import java.util.List; - -/** - *

- * 现存量规格明细 服务类 - *

- * - * @author hzs - * @since 2023-11-21 - */ -public interface IIcOnHandSpecsService extends IService { - - /* - * @description: 不存在的保存现存量明细 - * @author: sui q - * @date: 2023/11/22 16:52 - * @param: null null - **/ - void mergeIcOnHandSpecsByList(List icOnHandSpecsList); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/impl/IcAvailableNumServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/impl/IcAvailableNumServiceImpl.java deleted file mode 100644 index ab738406..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/impl/IcAvailableNumServiceImpl.java +++ /dev/null @@ -1,331 +0,0 @@ -package com.hzs.scm.ic.service.impl; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.json.JSONUtil; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.constant.CacheConstants; -import com.hzs.common.core.constant.ScmFieldConstants; -import com.hzs.common.core.constant.msg.ScmMsgConstants; -import com.hzs.common.core.enums.EPresaleStatus; -import com.hzs.common.core.enums.EYesNo; -import com.hzs.common.core.service.RedisService; -import com.hzs.common.core.utils.ComputeUtil; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.core.utils.reflect.ReflectUtils; -import com.hzs.common.domain.sale.ext.SaOrderExt; -import com.hzs.common.domain.scm.ic.IcAvailableNum; -import com.hzs.common.domain.scm.ic.IcAvailableSpecs; -import com.hzs.common.domain.scm.ic.ext.IcAvailableNumExt; -import com.hzs.common.domain.scm.ic.ext.IcOnHandNumExt; -import com.hzs.common.domain.scm.pub.ScmItemSpecs; -import com.hzs.common.domain.scm.sale.IcDelSaleLog; -import com.hzs.sale.product.IProductServiceApi; -import com.hzs.sale.product.dto.ProductDTO; -import com.hzs.scm.ic.mapper.IcAvailableNumMapper; -import com.hzs.scm.ic.mapper.IcAvailableSpecsMapper; -import com.hzs.scm.ic.param.AvailableNum; -import com.hzs.scm.ic.service.IIcAvailableNumService; -import com.hzs.scm.ic.service.IIcAvailableSpecsService; -import com.hzs.scm.sale.service.IIcDelSaleLogService; -import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.*; - -/** - * 可用量 服务实现类 - */ -@Service -public class IcAvailableNumServiceImpl extends ServiceImpl implements IIcAvailableNumService { - - @Autowired - private RedisService redisService; - @Autowired - private IIcAvailableSpecsService availableSpecsService; - @Autowired - private IIcDelSaleLogService delSaleLogService; - @Autowired - private IcAvailableSpecsMapper availableSpecsMapper; - - @DubboReference - IProductServiceApi productServiceApi; - - @Override - @Transactional(rollbackFor = Exception.class) - public void mergeIcAvailableNumByIcOnHandNum(List onHandNumList, Long pkMember) { - try { - List saveAvailableSpecsList = new ArrayList<>(); - for (IcOnHandNumExt icOnHandNum : onHandNumList) { - IcAvailableNum icAvailableNum = IcAvailableNum.builder() - .pkCorp(icOnHandNum.getPkCorp()) - .pkCubasdoc(icOnHandNum.getPkCubasdoc()) - .pkProductBas(icOnHandNum.getPkProductBas()) - .pkProduct(icOnHandNum.getPkProduct()) - .pkUnit(icOnHandNum.getPkUnit()) - .pkStorehouse(icOnHandNum.getPkStorehouse()) - .availableNum(icOnHandNum.getNonhandnum()) - .build(); - icAvailableNum.setPkCountry(icOnHandNum.getPkCountry()); - icAvailableNum.setPkCreator(pkMember); - // 查询现存量表，是否存在现存量 - List availableNumList = baseMapper.queryIcAvailableNumByCondition(icOnHandNum, icOnHandNum.getScmItemSpecsList()); - // 可用量量流水 - List availableSpecsList = packageIcOnHandItemList(pkMember, icOnHandNum.getScmItemSpecsList(), icAvailableNum); - updateOrInsertAvailableNum(availableNumList, icAvailableNum, availableSpecsList); - for (IcAvailableSpecs availableSpecs : availableSpecsList) { - availableSpecs.setPkAvailableNum(icAvailableNum.getPkId()); - } - if (availableSpecsList.size() > 0) { - saveAvailableSpecsList.addAll(availableSpecsList); - } - } - if (saveAvailableSpecsList.size() > 0) { - // 更新保存 - availableSpecsService.mergeIcAvailableSpecsByList(saveAvailableSpecsList); - } - } catch (Exception e) { - e.printStackTrace(); - throw new RuntimeException(e); - } - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void mergeIcAvailableNumByOrder(SaOrderExt saOrderExt) { - // 根据订单回退可用量 - // 根据仓库查询公司、查询产品基本信息 - // 根据订单封装现存量参数，使用统一方法 - List onHandNumExtList = baseMapper.queryAvailableNumByOrder(saOrderExt); - List updateHandNumList = new ArrayList<>(); - for (IcOnHandNumExt onHandNumExt : onHandNumExtList) { - if (onHandNumExt.getPkProductBas() == null) { - continue; - } - if (saOrderExt.getDeductFlag() != null && saOrderExt.getDeductFlag()) { - onHandNumExt.setNonhandnum(onHandNumExt.getNonhandnum().negate()); - } - String[] specsIsArr = onHandNumExt.getSpecsNameId().split(","); - // 查询规格 - int[] pkSpecsArr = Arrays.stream(specsIsArr).mapToInt(Integer::parseInt).toArray(); - List availableSpecsList = availableSpecsMapper.queryAvailableSpecs(pkSpecsArr); - onHandNumExt.setScmItemSpecsList(availableSpecsList); - updateHandNumList.add(onHandNumExt); - } - mergeIcAvailableNumByIcOnHandNum(updateHandNumList, saOrderExt.getPkModified()); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void insertIcAvailableNumByParam(AvailableNum availableNum, Long pkMember) { - try { - IcAvailableNum icAvailableNum = BeanUtil.copyProperties(availableNum, IcAvailableNum.class); - icAvailableNum.setPkCreator(pkMember); - save(icAvailableNum); - List availableSpecsList = packageIcOnHandItemList(pkMember, availableNum.getScmItemSpecsList(), icAvailableNum); - if (availableSpecsList.size() > 0) { - // 更新保存 - availableSpecsService.mergeIcAvailableSpecsByList(availableSpecsList); - } - } catch (Exception e) { - e.printStackTrace(); - throw new RuntimeException(e); - } - } - - private List packageIcOnHandItemList(Long pkMember, List scmItemSpecsList, IcAvailableNum availableNum) { - // 现存量流水 - List availableSpecsList = new ArrayList<>(); - // 现存量规格表 - if (CollectionUtil.isNotEmpty(scmItemSpecsList)) { - for (Object scmItemSpecs : scmItemSpecsList) { - IcAvailableSpecs icOnHandSpecs = IcAvailableSpecs.builder() - .pkAvailableNum(availableNum.getPkId()) - .pkSpecsType(ReflectUtils.invokeGetter(scmItemSpecs, ScmFieldConstants.PK_SPECS_TYPE)) - .pkSpecs(ReflectUtils.invokeGetter(scmItemSpecs, ScmFieldConstants.PK_SPECS)) - .specsName(ReflectUtils.invokeGetter(scmItemSpecs, ScmFieldConstants.SPECS_NAME)) - .build(); - icOnHandSpecs.setPkCountry(availableNum.getPkCountry()); - icOnHandSpecs.setPkCreator(pkMember); - availableSpecsList.add(icOnHandSpecs); - } - } - return availableSpecsList; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void updateDeductIcAvailableNumByGeneralOut(IcAvailableNum availableNum, Long pkMember) { - String availableNumLock = CacheConstants.IC_AVAILABLE_NUM_LOCK + availableNum.getPkId(); - try { - availableNum.setModifiedTime(DateUtils.currentDateTime()); - availableNum.setPkModified(pkMember); - if (!redisService.lockKeyOnce(availableNumLock)) { - throw new RuntimeException(ScmMsgConstants.BILL_NOT_OPERATION); - } - // 更新订单表 - updateById(availableNum); - } catch (Exception e) { - e.printStackTrace(); - throw new RuntimeException(e); - } - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void updateDeductIcAvailableNumByList(List availableNumList) { - List availableKeyList = new ArrayList<>(); - IcDelSaleLog icDelSaleLog = IcDelSaleLog.builder() - .acceptParam(JSONUtil.toJsonStr(availableNumList)) - .successStatus(EYesNo.YES.getIntValue()) - .sourceCode(availableNumList.get(0).getOrderCode()) - .billType(2) - .build(); - icDelSaleLog.setPkCreator(availableNumList.get(0).getPkModified()); - icDelSaleLog.setPkCountry(availableNumList.get(0).getPkCountry()); - for (IcAvailableNum availableNum : availableNumList) { - availableKeyList.add(CacheConstants.IC_AVAILABLE_NUM_LOCK + availableNum.getPkId()); - } - try { - redisService.lockKeyByList(availableKeyList); - // 拆分 拆为预售和非预售 验证预售品是否存在现存量 - List updateAvailableNumList = new ArrayList<>(); - // 新增可用量List - List inserAvailableNumList = new ArrayList<>(); - List updateWaresList = new ArrayList<>(); - for (IcAvailableNumExt availableNumExt : availableNumList) { - List icAvailableNumExtList = baseMapper.queryAvailableNumByAvaliable(availableNumExt); - if (icAvailableNumExtList != null && icAvailableNumExtList.size() > 0) { - availableNumExt.setPkId(icAvailableNumExtList.get(0).getPkId()); - updateAvailableNumList.add(availableNumExt); - if (ComputeUtil.compareValue(availableNumExt.getAvailableNum(), icAvailableNumExtList.get(0).getAvailableNum())) { - updateWaresList.add(availableNumExt); - } - } else if (EPresaleStatus.PRESALE.getValue() == availableNumExt.getPreSaleStatus()) { - inserAvailableNumList.add(availableNumExt); - } else { - // 非预售产品可用量不足更新产品为下架或者预售 - updateWaresList.add(availableNumExt); - } - } - if (updateAvailableNumList.size() > 0) { - baseMapper.mergeIcAvailableNumByIcOnHandNum(updateAvailableNumList); - } - if (inserAvailableNumList.size() > 0) { - for (IcAvailableNumExt availableNumExt : inserAvailableNumList) { - IcAvailableNum icAvailableNum = IcAvailableNum.builder() - .pkCorp(availableNumExt.getPkCorp()) - .pkCubasdoc(availableNumExt.getPkCubasdoc()) - .pkProductBas(availableNumExt.getPkProductBas()) - .pkProduct(availableNumExt.getPkProduct()) - .pkUnit(availableNumExt.getPkUnit()) - .pkStorehouse(availableNumExt.getPkStorehouse()) - .availableNum(availableNumExt.getAvailableNum().negate()) - .build(); - // 根据产品id查询产品基本主键 - icAvailableNum.setPkCountry(availableNumExt.getPkCountry()); - icAvailableNum.setPkCreator(availableNumExt.getPkModified()); - List availableSpecsList = packageIcOnHandItemList(availableNumExt.getPkModified(), availableNumExt.getScmItemSpecsList(), icAvailableNum); - save(icAvailableNum); - for (IcAvailableSpecs availableSpecs : availableSpecsList) { - availableSpecs.setPkAvailableNum(icAvailableNum.getPkId()); - availableSpecs.setPkCreator(icAvailableNum.getPkCreator()); - availableSpecs.setPkCountry(icAvailableNum.getPkCountry()); - } - if (availableSpecsList.size() > 0) { - // 更新保存 - availableSpecsService.mergeIcAvailableSpecsByList(availableSpecsList); - } - } - } - if (updateWaresList.size() > 0) { - try { - // 更新状态 - List productDtoList = new ArrayList<>(); - for (IcAvailableNumExt availableNumExt : updateWaresList) { - if (availableNumExt.getPkProduct() != null) { - ProductDTO productDTO = new ProductDTO(); - productDTO.setProductId(availableNumExt.getPkProduct()); - productDtoList.add(productDTO); - } - } - if (productDtoList.size() > 0) { - productServiceApi.updateWaresPreSaleStatus(productDtoList); - } - } catch (Exception e) { - e.printStackTrace(); - } - } - } catch (Exception e) { - e.printStackTrace(); - icDelSaleLog.setErrorMsg(e.getMessage()); - icDelSaleLog.setSuccessStatus(EYesNo.NO.getIntValue()); - throw new RuntimeException(e); - } finally { - // 记录日志 - try { - delSaleLogService.save(icDelSaleLog); - } catch (Exception e) { - e.printStackTrace(); - } - redisService.unlockByList(availableKeyList); - } - } - - @Override - public List queryAvailableNumByCondition(AvailableNum availableNum) { - return baseMapper.queryAvailableNumByCondition(availableNum); - } - - /* - * 更新或修改现存量表 - **/ - private void updateOrInsertAvailableNum(List availableNumList, IcAvailableNum availableNum, List availableSpecsList) { - Map availableNumMap = new HashMap<>(); - if (availableNumList != null && availableNumList.size() > 0) { - for (IcAvailableNumExt icAvailableNumExt : availableNumList) { - availableNumMap.put(icAvailableNumExt.getSpecsName(), icAvailableNumExt); - } - } - StringBuilder key = new StringBuilder(); - if (availableSpecsList.size() > 0) { - for (int i = 0; i < availableSpecsList.size(); i++) { - IcAvailableSpecs scmItemSpecs = availableSpecsList.get(i); - key.append(scmItemSpecs.getPkSpecs()); - if (i < availableSpecsList.size() - 1) { - key.append(","); - } - } - } else { - key.append("x123"); - } - if (availableNumMap.containsKey(key.toString())) { - updateAvailableNum(availableNumMap.get(key.toString()), availableNum); - } else { - save(availableNum); - } - } - - private void updateAvailableNum(IcAvailableNum oldAvailableNum, IcAvailableNum availableNum) { - String key = CacheConstants.IC_AVAILABLE_NUM_LOCK + availableNum.getPkId(); - try { - if (!redisService.lockKeyOnce(key)) { - throw new RuntimeException(ScmMsgConstants.BILL_NOT_OPERATION); - } - if (availableNum.getPkCubasdoc() != null) { - oldAvailableNum.setPkCubasdoc(availableNum.getPkCubasdoc()); - } - oldAvailableNum.setAvailableNum(availableNum.getAvailableNum()); - oldAvailableNum.setPkModified(availableNum.getPkCreator()); - oldAvailableNum.setModifiedTime(DateUtils.currentDateTime()); - if (baseMapper.updateAvailableNumByNum(oldAvailableNum) <= 0) { - throw new RuntimeException(ScmMsgConstants.IC_AVAILABLE_NUM_NOT_EMPTY); - } - availableNum.setPkId(oldAvailableNum.getPkId()); - } finally { - redisService.unlock(key); - } - } -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/impl/IcAvailableSpecsServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/impl/IcAvailableSpecsServiceImpl.java deleted file mode 100644 index b698ca2a..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/impl/IcAvailableSpecsServiceImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.hzs.scm.ic.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.domain.scm.ic.IcAvailableSpecs; -import com.hzs.common.domain.scm.ic.IcOnHandSpecs; -import com.hzs.scm.ic.mapper.IcAvailableSpecsMapper; -import com.hzs.scm.ic.service.IIcAvailableSpecsService; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - *

- * 可用量规格明细 服务实现类 - *

- * - * @author hzs - * @since 2023-12-11 - */ -@Service -public class IcAvailableSpecsServiceImpl extends ServiceImpl implements IIcAvailableSpecsService { - - @Override - public void mergeIcAvailableSpecsByList(List availableSpecsList) { - baseMapper.mergeIcAvailableSpecsByList(availableSpecsList); - } -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/impl/IcBatchCodeServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/impl/IcBatchCodeServiceImpl.java deleted file mode 100644 index dddae3a7..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/impl/IcBatchCodeServiceImpl.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.hzs.scm.ic.service.impl; - -import cn.hutool.core.bean.BeanUtil; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.constant.CacheConstants; -import com.hzs.common.core.constant.SystemFieldConstants; -import com.hzs.common.core.constant.msg.ScmMsgConstants; -import com.hzs.common.core.enums.EYesNo; -import com.hzs.common.core.service.RedisService; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.domain.scm.ic.IcBatchCode; -import com.hzs.common.domain.scm.ic.ext.IcBatchCodeExt; -import com.hzs.scm.ic.mapper.IcBatchCodeMapper; -import com.hzs.scm.ic.param.BatchCodeParam; -import com.hzs.scm.ic.service.IIcBatchCodeService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; - -/** - *

- * 采购订单明细 服务实现类 - *

- * - * @author hzs - * @since 2023-11-23 - */ -@Service -public class IcBatchCodeServiceImpl extends ServiceImpl implements IIcBatchCodeService { - - @Autowired - private RedisService redisService; - - @Override - public List queryBatchCodeByCondition(BatchCodeParam batchCodeParam) { - return baseMapper.queryBatchCodeByCondition(batchCodeParam); - } - - @Override - public List queryBatchCodeByProduct(List batchCodeParamList) { - return baseMapper.queryBatchCodeByProduct(batchCodeParamList); - } - - @Override - public void insertBatchCode(BatchCodeParam batchCodeParam, Long pkMember) { - IcBatchCode icBatchCode = BeanUtil.copyProperties(batchCodeParam, IcBatchCode.class); - icBatchCode.setPkCreator(pkMember); - baseMapper.insert(icBatchCode); - } - - @Override - public void updateBatchCode(IcBatchCode icBatchCode, BatchCodeParam batchCodeParam, Long pkMember) { - IcBatchCode saveBatchCode = BeanUtil.copyProperties(batchCodeParam, IcBatchCode.class); - saveBatchCode.setPkId(icBatchCode.getPkId()); - saveBatchCode.setModifiedTime(DateUtils.currentDateTime()); - saveBatchCode.setPkModified(pkMember); - updateById(saveBatchCode); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteBatchCode(Long pkBatchCode, Long pkMember) { - String batchCode = CacheConstants.BATCH_CODE + pkBatchCode; - if (!redisService.lockKeyOnce(batchCode)) { - throw new RuntimeException(ScmMsgConstants.BILL_NOT_OPERATION); - } - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.set(SystemFieldConstants.DEL_FLAG, EYesNo.NO.getIntValue()); - updateWrapper.set(SystemFieldConstants.PK_MODIFIED, pkMember); - updateWrapper.set(SystemFieldConstants.MODIFIED_TIME, DateUtils.currentDateTime()); - updateWrapper.eq(SystemFieldConstants.PK_ID, pkBatchCode); - update(updateWrapper); - redisService.unlock(batchCode); - } -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/impl/IcOnHandNumBServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/impl/IcOnHandNumBServiceImpl.java deleted file mode 100644 index 25db26d9..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/impl/IcOnHandNumBServiceImpl.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.hzs.scm.ic.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.domain.scm.ic.IcOnHandNumB; -import com.hzs.scm.ic.mapper.IcOnHandNumBMapper; -import com.hzs.scm.ic.service.IIcOnHandNumBService; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - *

- * 现存量明细表 服务实现类 - *

- * - * @author hzs - * @since 2023-11-21 - */ -@Service -public class IcOnHandNumBServiceImpl extends ServiceImpl implements IIcOnHandNumBService { - - @Override - public void insertIcOnHandNumbByList(List onHandNumbList) { - baseMapper.insertIcOnHandNumbByList(onHandNumbList); - } - - @Override - public List queryOnHandNumByHandNumbList(List icOnHandNumbList) { - return baseMapper.queryOnHandNumByHandNumbList(icOnHandNumbList); - } -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/impl/IcOnHandNumServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/impl/IcOnHandNumServiceImpl.java deleted file mode 100644 index 758cca56..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/impl/IcOnHandNumServiceImpl.java +++ /dev/null @@ -1,479 +0,0 @@ -package com.hzs.scm.ic.service.impl; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.constant.CacheConstants; -import com.hzs.common.core.constant.ScmFieldConstants; -import com.hzs.common.core.constant.SystemFieldConstants; -import com.hzs.common.core.constant.msg.ScmMsgConstants; -import com.hzs.common.core.enums.EScmOrderType; -import com.hzs.common.core.enums.EYesNo; -import com.hzs.common.core.service.RedisService; -import com.hzs.common.core.utils.ComputeUtil; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.core.utils.StringUtils; -import com.hzs.common.core.utils.reflect.ReflectUtils; -import com.hzs.common.domain.scm.ic.IcOnHandNum; -import com.hzs.common.domain.scm.ic.IcOnHandNumB; -import com.hzs.common.domain.scm.ic.IcOnHandSpecs; -import com.hzs.common.domain.scm.ic.ext.IcOnHandNumExt; -import com.hzs.common.domain.scm.pub.ScmItemSpecs; -import com.hzs.common.domain.scm.sale.ext.IcSaleoutBExt; -import com.hzs.common.domain.scm.sale.ext.IcSaleoutHExt; -import com.hzs.common.domain.scm.warn.ext.IcWarnConfigExt; -import com.hzs.scm.ic.mapper.IcOnHandNumMapper; -import com.hzs.scm.ic.param.OnHandNumParam; -import com.hzs.scm.ic.service.IIcAvailableNumService; -import com.hzs.scm.ic.service.IIcOnHandNumBService; -import com.hzs.scm.ic.service.IIcOnHandNumService; -import com.hzs.scm.ic.service.IIcOnHandSpecsService; -import com.hzs.scm.warn.service.IIcWarnConfigService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.math.BigDecimal; -import java.util.*; - -/** - *

- * 现存量 服务实现类 - *

- * - * @author hzs - * @since 2023-11-21 - */ -@Service -public class IcOnHandNumServiceImpl extends ServiceImpl implements IIcOnHandNumService { - - @Autowired - private IIcOnHandNumBService icOnHandNumbService; - - @Autowired - private IIcOnHandSpecsService icOnHandSpecsService; - - @Autowired - private RedisService redisService; - - @Autowired - private IIcAvailableNumService availableNumService; - - @Autowired - private IIcWarnConfigService warnConfigService; - - @Override - @Transactional(rollbackFor = Exception.class) - public synchronized void mergeIcOnHandNumByGeneralIn(Object generalHvo, List generalBvoList, Integer orderType, Long pkMember) { - try { - // 获得对应条数的主键 - // 更新现存量表 一个批次一条数据 使用merge进行更新 - List saveOnHandNumbList = new ArrayList<>(); - List saveOnHandSpecsList = new ArrayList<>(); - List icOnHandNumList = new ArrayList<>(); - for (Object generalBvo : generalBvoList) { - // 根据仓库 产品id 规格 批次号查询是否已经存在，存在的话对数量进行修改 - // 现存量规格表 - List scmItemSpecsList = ReflectUtils.invokeGetter(generalBvo, ScmFieldConstants.SCM_ITEM_SPECS_LIST); - // 现存量表 - Integer pkProductBas = ReflectUtils.invokeGetter(generalBvo, ScmFieldConstants.PK_PRODUCT_BAS); - if(pkProductBas == null){ - throw new RuntimeException("产品没有绑定产品基本信息，不能进行出入库操作"); - } - IcOnHandNumExt icOnHandNum = new IcOnHandNumExt(); - icOnHandNum.setPkCorp(ReflectUtils.invokeGetter(generalHvo, ScmFieldConstants.PK_CORP)); - icOnHandNum.setPkCubasdoc(ReflectUtils.invokeGetter(generalHvo, ScmFieldConstants.PK_CUBASDOC)); - icOnHandNum.setPkProductBas(pkProductBas); - icOnHandNum.setPkProduct(ReflectUtils.invokeGetter(generalBvo, ScmFieldConstants.PK_PRODUCT)); - icOnHandNum.setPkUnit(ReflectUtils.invokeGetter(generalBvo, ScmFieldConstants.PK_UNIT)); - icOnHandNum.setPkStorehouse(ReflectUtils.invokeGetter(generalBvo, ScmFieldConstants.PK_STOREHOUSE)); - icOnHandNum.setNonhandnum(ReflectUtils.invokeGetter(generalBvo, ScmFieldConstants.N_NUM)); - icOnHandNum.setPkBatchCode(ReflectUtils.invokeGetter(generalBvo, ScmFieldConstants.PK_BATCH_CODE)); - icOnHandNum.setProductDate(ReflectUtils.invokeGetter(generalBvo, ScmFieldConstants.PRODUCT_DATE)); - icOnHandNum.setExpireDate(ReflectUtils.invokeGetter(generalBvo, ScmFieldConstants.EXPIRE_DATE)); - Integer pkCubasdoc = ReflectUtils.invokeGetter(generalBvo, ScmFieldConstants.PK_CUBASDOC); - if(pkCubasdoc != null){ - icOnHandNum.setPkCubasdoc(pkCubasdoc); - } - icOnHandNum.setPkCountry(ReflectUtils.invokeGetter(generalHvo, SystemFieldConstants.PK_COUNTRY_VALUE)); - icOnHandNum.setPkCreator(pkMember); - // 查询现存量表，是否存在现存量 - List oldOnHandNumList = baseMapper.queryOnHandNumByCondition(icOnHandNum); - List onhandNumBiList = new ArrayList<>(); - List icOnHandSpecsList = packageIcOnHandItemList(generalHvo, orderType, pkMember, onhandNumBiList, generalBvo, scmItemSpecsList, icOnHandNum); - // 用于更新可用量 - icOnHandNum.setScmItemSpecsList(scmItemSpecsList); - updateOrInsertOnHandNum(oldOnHandNumList, icOnHandNum); - for (IcOnHandSpecs icOnHandSpecs : icOnHandSpecsList) { - icOnHandSpecs.setPkOnhandnum(icOnHandNum.getPkId()); - } - saveOnHandSpecsList.addAll(icOnHandSpecsList); - for(IcOnHandNumB onHandNumB : onhandNumBiList){ - onHandNumB.setPkOnhandnum(icOnHandNum.getPkId()); - } - saveOnHandNumbList.addAll(onhandNumBiList); - // 现存量流水 - icOnHandNumList.add(icOnHandNum); - } - // 撤单退单时更新可用量，销售订单，销售退货时不更新可用量，可用量撤单时更新 - if (EScmOrderType.SALE_OUT.getValue() != orderType && icOnHandNumList.size() > 0) { - // 更新可用量 - availableNumService.mergeIcAvailableNumByIcOnHandNum(icOnHandNumList, pkMember); - } - if (saveOnHandNumbList.size() > 0) { - // 保存 - icOnHandNumbService.insertIcOnHandNumbByList(saveOnHandNumbList); - } - if (saveOnHandSpecsList.size() > 0) { - // 更新保存 - icOnHandSpecsService.mergeIcOnHandSpecsByList(saveOnHandSpecsList); - } - }catch (Exception e){ - e.printStackTrace(); - throw new RuntimeException(e); - } - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void mergeIcOnHandNumByGeneralOut(Object generalHvo, List generalBvoList, Integer orderType, Long pkMember) { - // 根据明细表查询出产品、仓库内所有的批次信息，按照倒叙排列 - // 需要按照先进先出进行扣减，当前批次不够扣减下一个批次 - // 加锁 - List icOnHandNumbList = new ArrayList<>(); - for (Object generalBvo : generalBvoList) { - // 根据仓库 产品id 规格 批次号查询是否已经存在，存在的话对数量进行修改 - // 现存量规格表 - // 现存量表 - IcOnHandNum icOnHandNum = IcOnHandNum.builder() - .pkProduct(ReflectUtils.invokeGetter(generalBvo, ScmFieldConstants.PK_PRODUCT)) - .pkStorehouse(ReflectUtils.invokeGetter(generalBvo, ScmFieldConstants.PK_STOREHOUSE)) - .pkBatchCode(ReflectUtils.invokeGetter(generalBvo, ScmFieldConstants.PK_BATCH_CODE)) - .build(); - icOnHandNum.setPkCountry(ReflectUtils.invokeGetter(generalHvo, SystemFieldConstants.PK_COUNTRY_VALUE)); - // 查询现存量表，是否存在现存量 - String handKey = getStringKey(ReflectUtils.invokeGetter(generalBvo, ScmFieldConstants.SCM_ITEM_SPECS_LIST)); - List oldOnHandNumList = baseMapper.queryIcOnHandNumByCondition(icOnHandNum, handKey); - // 待扣减库存 - BigDecimal nNum = ReflectUtils.invokeGetter(generalBvo, ScmFieldConstants.N_NUM); - List deductOnHandNumList = new ArrayList<>(); - Date date = DateUtils.currentDateTime(); - for (IcOnHandNum onHandNum : oldOnHandNumList) { - onHandNum.setPkModified(pkMember); - onHandNum.setModifiedTime(date); - if(ComputeUtil.compareValue(onHandNum.getNonhandnum(), nNum)){ - onHandNum.setNonhandnum(nNum.negate()); - deductOnHandNumList.add(onHandNum); - nNum = BigDecimal.ZERO; - break; - }else { - nNum = ComputeUtil.computeSubtract(nNum, onHandNum.getNonhandnum()); - onHandNum.setNonhandnum(onHandNum.getNonhandnum().negate()); - deductOnHandNumList.add(onHandNum); - } - } - if(ComputeUtil.compareValue(nNum)){ - throw new RuntimeException(ScmMsgConstants.IC_ON_HAND_NUM_NOT_EMPTY); - } - // 一行行更新，防止不同行用同一个批次 - updateOrInsertOnHandNum(deductOnHandNumList); - for (IcOnHandNum icOnHand : deductOnHandNumList) { - packageIcOnHandBiList(generalHvo, orderType, pkMember, icOnHandNumbList, generalBvo, icOnHand); - } - // 非销售出库单出库时需要更新可用量 - if (EScmOrderType.SALE_OUT.getValue() != orderType && deductOnHandNumList.size() > 0) { - List onHandNumList = new ArrayList<>(); - for (IcOnHandNum onHandNum : deductOnHandNumList) { - IcOnHandNumExt icOnHandNumExt = BeanUtil.copyProperties(onHandNum, IcOnHandNumExt.class); - icOnHandNumExt.setScmItemSpecsList(BeanUtil.copyToList(onHandNum.getScmItemSpecsList(), ScmItemSpecs.class)); - onHandNumList.add(icOnHandNumExt); - } - // 更新可用量 - availableNumService.mergeIcAvailableNumByIcOnHandNum(onHandNumList, pkMember); - } - } - if (icOnHandNumbList.size() > 0) { - // 保存 - icOnHandNumbService.insertIcOnHandNumbByList(icOnHandNumbList); - } - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void backIcOnHandNumByGeneralOut(Object generalHvo, List generalBvoList, Integer orderType, Long pkMember) { - // 根据明细表查询出产品、仓库内所有的批次信息，按照倒叙排列 - // 需要按照先进先出进行扣减，当前批次不够扣减下一个批次 - // 加锁 - List icOnHandNumbList = new ArrayList<>(); - for (Object generalBvo : generalBvoList) { - // 现存量流水 - IcOnHandNumB icOnHandNumB = IcOnHandNumB.builder() - .orderType(orderType) - .pkGeneralH(ReflectUtils.invokeGetter(generalHvo, SystemFieldConstants.PK_ID_VALUE)) - .pkGeneralB(ReflectUtils.invokeGetter(generalBvo, SystemFieldConstants.PK_ID_VALUE)) - .build(); - icOnHandNumbList.add(icOnHandNumB); - } - // 根据参数查询库存流水，验证数量 - List onHandNumbList = icOnHandNumbService.queryOnHandNumByHandNumbList(icOnHandNumbList); - Map handNumbMap = new HashMap<>(); - for (IcOnHandNumB icOnHandNumB : onHandNumbList) { - String key = icOnHandNumB.getOrderType() + "_" + icOnHandNumB.getPkGeneralH() + "_" + icOnHandNumB.getPkGeneralB(); - if(handNumbMap.containsKey(key)) { - IcOnHandNumB onHandNumB = handNumbMap.get(key); - onHandNumB.setNnum(ComputeUtil.computeAdd(onHandNumB.getNnum(), icOnHandNumB.getNnum())); - }else { - handNumbMap.put(key, icOnHandNumB); - } - } - // 验证数量 - for (Object generalBvo : generalBvoList) { - String key = orderType + "_" + ReflectUtils.invokeGetter(generalHvo, SystemFieldConstants.PK_ID_VALUE) + "_" - + ReflectUtils.invokeGetter(generalBvo, SystemFieldConstants.PK_ID_VALUE); - if(!handNumbMap.containsKey(key)){ - throw new RuntimeException(ScmMsgConstants.IC_ON_HAND_NUM_B_NOT_EXIST); - } - IcOnHandNumB icOnHandNumB = handNumbMap.get(key); - // 扣减的数量要跟出库单数量一致，否则有问题不能操作 - if(!ComputeUtil.compareEqual(ComputeUtil.computeAdd(icOnHandNumB.getNnum(), - ReflectUtils.invokeGetter(generalBvo, ScmFieldConstants.N_NUM)), BigDecimal.ZERO)){ - throw new RuntimeException(ScmMsgConstants.IC_ON_HAND_NUM_B_NOT_EXIST); - } - } - // 封装流水明细表 - List insertHandNumbList= new ArrayList<>(); - for (IcOnHandNumB icOnHandNumB : onHandNumbList) { - // 现存量流水 - IcOnHandNumB onHandNumB = BeanUtil.copyProperties(icOnHandNumB, IcOnHandNumB.class); - onHandNumB.setNnum(icOnHandNumB.getNnum().negate()); - onHandNumB.setPkCountry(ReflectUtils.invokeGetter(generalHvo, SystemFieldConstants.PK_COUNTRY_VALUE)); - onHandNumB.setPkCreator(pkMember); - insertHandNumbList.add(onHandNumB); - } - baseMapper.mergeUpdateBackOnHandNumByNum(insertHandNumbList, pkMember); - if (insertHandNumbList.size() > 0) { - // 保存 - icOnHandNumbService.insertIcOnHandNumbByList(insertHandNumbList); - } - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void mergeIcOnHandNumByGeneralOut(IcSaleoutHExt icSaleOutExt, Integer orderType, Long pkMember) { - // 根据明细表查询出产品、仓库内所有的批次信息，按照倒叙排列 - // 需要按照先进先出进行扣减，当前批次不够扣减下一个批次 - // 加锁 - List icOnHandNumbList = new ArrayList<>(); - List saleoutbExtList = new ArrayList<>(); - for (IcSaleoutBExt saleOutB : icSaleOutExt.getSaleoutbExtList()) { - // 根据仓库 产品id 规格 批次号查询是否已经存在，存在的话对数量进行修改 - // 现存量规格表 - // 现存量表 - IcOnHandNum icOnHandNum = IcOnHandNum.builder() - .pkProduct(saleOutB.getPkProduct()) - .pkStorehouse(saleOutB.getPkStorehouse()) - .build(); - icOnHandNum.setPkCountry(saleOutB.getPkCountry()); - // 查询现存量表，是否存在现存量 - String handKey = getStringKey(saleOutB.getScmItemSpecsList()); - List oldOnHandNumList = baseMapper.queryIcOnHandNumByCondition(icOnHandNum, handKey); - // 待扣减库存 - BigDecimal nNum = saleOutB.getNnum(); - List deductOnHandNumList = new ArrayList<>(); - Date date = DateUtils.currentDateTime(); - for (IcOnHandNum onHandNum : oldOnHandNumList) { - onHandNum.setPkModified(pkMember); - onHandNum.setModifiedTime(date); - if(ComputeUtil.compareValue(onHandNum.getNonhandnum(), nNum)){ - saleOutB.setPkBatchCode(onHandNum.getPkBatchCode()); - saleoutbExtList.add(saleOutB); - onHandNum.setNonhandnum(nNum.negate()); - deductOnHandNumList.add(onHandNum); - nNum = BigDecimal.ZERO; - break; - }else { - IcSaleoutBExt copySaleoutB = BeanUtil.copyProperties(saleOutB, IcSaleoutBExt.class); - // 获取id - copySaleoutB.setPkBatchCode(onHandNum.getPkBatchCode()); - copySaleoutB.setNnum(onHandNum.getNonhandnum()); - saleoutbExtList.add(copySaleoutB); - nNum = ComputeUtil.computeSubtract(nNum, onHandNum.getNonhandnum()); - onHandNum.setNonhandnum(onHandNum.getNonhandnum().negate()); - deductOnHandNumList.add(onHandNum); - saleOutB.setNnum(nNum); - } - } - if(ComputeUtil.compareValue(nNum)){ - throw new RuntimeException(ScmMsgConstants.IC_ON_HAND_NUM_NOT_EMPTY); - } - // 一行行更新，防止不同行用同一个批次 - updateOrInsertOnHandNum(deductOnHandNumList); - for (IcOnHandNum icOnHand : deductOnHandNumList) { - packageIcOnHandBiList(icSaleOutExt, orderType, pkMember, icOnHandNumbList, saleOutB, icOnHand); - } - } - icSaleOutExt.setSaleoutbExtList(saleoutbExtList); - if (icOnHandNumbList.size() > 0) { - // 保存 - icOnHandNumbService.insertIcOnHandNumbByList(icOnHandNumbList); - } - } - - @Override - public List queryInventoryProductByParam(OnHandNumParam onHandNumParam) { - List onHandNumExtList = baseMapper.queryInventoryProductByParam(onHandNumParam); - List configExtList = warnConfigService.queryWarnConfigInventory(); - Map warnConfigExtMap = new HashMap<>(); - configExtList.forEach(warnConfig-> - warnConfigExtMap.put(warnConfig.getPkStoreHouse() +"_"+warnConfig.getProductCode()+"_"+ warnConfig.getSpecsName(), warnConfig)); - for (IcOnHandNumExt icOnHandNumExt : onHandNumExtList) { - if(EYesNo.YES.getIntValue() == icOnHandNumExt.getDisplayRed()){ - icOnHandNumExt.setWarnMsg(ScmMsgConstants.IC_ON_HAND_NUM_VALID_PERIOD); - } - String key = icOnHandNumExt.getPkStorehouse() + "_" + icOnHandNumExt.getProductCode() + "_" + icOnHandNumExt.getSpecsName(); - if(warnConfigExtMap.containsKey(key)){ - icOnHandNumExt.setDisplayRed(EYesNo.YES.getIntValue()); - if(StringUtils.isNotEmpty(icOnHandNumExt.getWarnMsg())) { - icOnHandNumExt.setWarnMsg(icOnHandNumExt.getWarnMsg() + ScmMsgConstants.IC_ON_HAND_NUM_NOT_EMPTY_WARN); - }else{ - icOnHandNumExt.setWarnMsg(ScmMsgConstants.IC_ON_HAND_NUM_NOT_EMPTY_WARN); - } - }else{ - icOnHandNumExt.setDisplayRed(EYesNo.NO.getIntValue()); - } - } - return onHandNumExtList; - } - - @Override - public List queryOnHandNumByList(List idList) { - return baseMapper.queryOnHandNumByList(idList); - } - - private List packageIcOnHandItemList(Object generalHvo, Integer orderType, Long pkMember, List icOnHandNumbList, Object generalBvo, List scmItemSpecsList, IcOnHandNum icOnHandNum) { - List icOnHandSpecsList = new ArrayList<>(); - packageIcOnHandBiList(generalHvo, orderType, pkMember, icOnHandNumbList, generalBvo, icOnHandNum); - // 现存量规格表 - if (CollectionUtil.isNotEmpty(scmItemSpecsList)) { - for (ScmItemSpecs scmItemSpecs : scmItemSpecsList) { - IcOnHandSpecs icOnHandSpecs = IcOnHandSpecs.builder() - .pkOnhandnum(icOnHandNum.getPkId()) - .pkSpecsType(scmItemSpecs.getPkSpecsType()) - .pkSpecs(scmItemSpecs.getPkSpecs()) - .specsName(scmItemSpecs.getSpecsName()) - .build(); - icOnHandSpecs.setPkCountry(ReflectUtils.invokeGetter(generalHvo, SystemFieldConstants.PK_COUNTRY_VALUE)); - icOnHandSpecs.setPkCreator(pkMember); - icOnHandSpecsList.add(icOnHandSpecs); - } - } - return icOnHandSpecsList; - } - - private void packageIcOnHandBiList(Object generalHvo, Integer orderType, Long pkMember, List icOnHandNumbList, Object generalBvo, IcOnHandNum icOnHandNum) { - // 现存量流水 - IcOnHandNumB icOnHandNumB = IcOnHandNumB.builder() - .pkOnhandnum(icOnHandNum.getPkId()) - .orderType(orderType) - .pkGeneralH(ReflectUtils.invokeGetter(generalHvo, SystemFieldConstants.PK_ID_VALUE)) - .pkGeneralB(ReflectUtils.invokeGetter(generalBvo, SystemFieldConstants.PK_ID_VALUE)) - .nnum(icOnHandNum.getNonhandnum()) - .build(); - icOnHandNumB.setPkCountry(ReflectUtils.invokeGetter(generalHvo, SystemFieldConstants.PK_COUNTRY_VALUE)); - icOnHandNumB.setPkCreator(pkMember); - icOnHandNumbList.add(icOnHandNumB); - } - - private List queryIcOnHandNumByCondition(IcOnHandNum icOnHandNum) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(SystemFieldConstants.PK_COUNTRY, icOnHandNum.getPkCountry()); - queryWrapper.eq(ScmFieldConstants.PK_PRODUCT_FIELD, icOnHandNum.getPkProduct()); - queryWrapper.eq(ScmFieldConstants.PK_STOREHOUSE_FIELD, icOnHandNum.getPkStorehouse()); - if (icOnHandNum.getPkBatchCode() != null) { - queryWrapper.eq(ScmFieldConstants.PK_BATCH_CODE_FIELD, icOnHandNum.getPkBatchCode()); - } - return baseMapper.selectList(queryWrapper); - } - - /* - * @description: 更新或修改现存量表 - * @author: sui q - * @date: 2023/11/22 15:29 - * @param: null null - **/ - private void updateOrInsertOnHandNum(List oldOnHandNumList, IcOnHandNum icOnHandNum) { - Map onHandNumMap = new HashMap<>(); - if (oldOnHandNumList != null && oldOnHandNumList.size() > 0) { - for (IcOnHandNumExt onHandNum : oldOnHandNumList) { - onHandNumMap.put(onHandNum.getSpecsName(), onHandNum); - } - } - String handKey = getStringKey(icOnHandNum.getScmItemSpecsList()); - // 存在修改 - if (onHandNumMap.containsKey(handKey)) { - // 加锁 - IcOnHandNum oldOnHandNum = onHandNumMap.get(handKey); - icOnHandNum.setPkId(oldOnHandNum.getPkId()); - String key = CacheConstants.IC_ON_HAND_NUM_LOCK + icOnHandNum.getPkId(); - try { - if (!redisService.lockKeyOnce(key)) { - throw new RuntimeException(ScmMsgConstants.BILL_NOT_OPERATION); - } - oldOnHandNum.setProductDate(icOnHandNum.getProductDate()); - oldOnHandNum.setExpireDate(icOnHandNum.getExpireDate()); - oldOnHandNum.setPkCubasdoc(icOnHandNum.getPkCubasdoc()); - oldOnHandNum.setNonhandnum(icOnHandNum.getNonhandnum()); - oldOnHandNum.setPkModified(icOnHandNum.getPkCreator()); - oldOnHandNum.setModifiedTime(DateUtils.currentDateTime()); - if (baseMapper.updateOnHandNumByNum(oldOnHandNum) <= 0) { - throw new RuntimeException(ScmMsgConstants.IC_ON_HAND_NUM_NOT_EMPTY); - } - }finally { - redisService.unlock(key); - } - } else { - save(icOnHandNum); - } - } - - private String getStringKey(List scmItemSpecsList) { - if(scmItemSpecsList == null || scmItemSpecsList.size() == 0){ - return "x123"; - } - StringBuilder handKey = new StringBuilder(); - for (int i = 0; i < scmItemSpecsList.size(); i++) { - ScmItemSpecs scmItemSpecs = scmItemSpecsList.get(i); - handKey.append(scmItemSpecs.getPkSpecs()); - if(i < scmItemSpecsList.size() - 1){ - handKey.append(","); - } - } - return handKey.toString(); - } - - /* - * @description: 更新或修改现存量表 - * @author: sui q - * @date: 2023/11/22 15:29 - * @param: null null - **/ - private void updateOrInsertOnHandNum(List updOnHandNumList) { - // 加锁 - List keyList = new ArrayList<>(); - for (IcOnHandNum icOnHandNum : updOnHandNumList) { - String key = CacheConstants.IC_ON_HAND_NUM_LOCK + icOnHandNum.getPkId(); - keyList.add(key); - } - try { - if (!redisService.lockKeyByList(keyList)) { - throw new RuntimeException(ScmMsgConstants.BILL_NOT_OPERATION); - } - if (baseMapper.mergeUpdateOnHandNumByNum(updOnHandNumList) < updOnHandNumList.size()) { - throw new RuntimeException(ScmMsgConstants.IC_ON_HAND_NUM_NOT_EMPTY); - } - }finally { - redisService.unlockByList(keyList); - } - } -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/impl/IcOnHandSpecsServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/impl/IcOnHandSpecsServiceImpl.java deleted file mode 100644 index 96bb86c5..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/impl/IcOnHandSpecsServiceImpl.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.hzs.scm.ic.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.domain.scm.ic.IcOnHandSpecs; -import com.hzs.scm.ic.mapper.IcOnHandSpecsMapper; -import com.hzs.scm.ic.service.IIcOnHandSpecsService; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - *

- * 现存量规格明细 服务实现类 - *

- * - * @author hzs - * @since 2023-11-21 - */ -@Service -public class IcOnHandSpecsServiceImpl extends ServiceImpl implements IIcOnHandSpecsService { - - @Override - public void mergeIcOnHandSpecsByList(List icOnHandSpecsList) { - baseMapper.mergeIcOnHandSpecsByList(icOnHandSpecsList); - } -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/vo/IcAvailableNumVo.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/vo/IcAvailableNumVo.java deleted file mode 100644 index d6731e42..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/vo/IcAvailableNumVo.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.hzs.scm.ic.vo; - -import com.hzs.common.core.annotation.Excel; -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; - -/** - * @description: 可用数量 - * @author: sui q - * @time: 2024/5/8 09:30 - * @classname: IcAvailableNumVo - * @package_name: com.hzs.scm.ic.vo - * version 1.0.0 - */ -@Data -public class IcAvailableNumVo implements Serializable { - /** - * 产品编号 - */ - @Excel(name = "产品编号") - private String productCode; - - /** - * 产品名称 - */ - @Excel(name = "产品名称") - private String productName; - - /** - * 规格名称 - */ - @Excel(name = "产品规格") - private String specsName; - - /** - * 单位名称 - */ - @Excel(name = "单位") - private String unitName; - - /** - * 公司 - */ - @Excel(name = "库存公司") - private String corpName; - - /** - * 仓库名称 - */ - @Excel(name = "仓库名称") - private String storehouseName; - - /** - * 现存数量 - */ - @Excel(name = "可用数量", scale = 2) - private BigDecimal availableNum; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/vo/IcOnHandNumVo.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/vo/IcOnHandNumVo.java deleted file mode 100644 index 5cd1e3ed..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/vo/IcOnHandNumVo.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.hzs.scm.ic.vo; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Excel; -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -/** - * @description: 现存量 - * @author: sui q - * @time: 2024/5/8 10:06 - * @classname: IcOnHandNumVo - * @package_name: com.hzs.scm.ic.vo - * version 1.0.0 - */ -@Data -public class IcOnHandNumVo implements Serializable { - - /** - * 产品编号 - */ - @Excel(name = "产品编号") - private String productCode; - - /** - * 产品名称 - */ - @Excel(name = "产品名称") - private String productName; - - @Excel(name = "发货渠道") - private String shippingChannelVal; - - /** - * 规格名称 - */ - @Excel(name = "产品规格") - private String specsName; - - /** - * 单位名称 - */ - @Excel(name = "单位") - private String unitName; - - /** - * 公司 - */ - @Excel(name = "库存公司") - private String corpName; - - /** - * 仓库名称 - */ - @Excel(name = "仓库名称") - private String storehouseName; - - /** - * 供应商名称 - */ - @Excel(name = "供应商名称") - private String cubasdocName; - - /** - * 现存数量 - */ - @Excel(name = "现存数量", scale = 2) - private BigDecimal nonhandnum; - - - /** - * 批次号 - */ - @Excel(name = "批次号") - private String batchCode; - - /** - * 有效期(天) - */ - @Excel(name = "有效期(天)") - private Integer validPeriod; - - /** - * 生产日期 - */ - @Excel(name = "生产日期", dateFormat = "yyyy-MM-dd") - private Date productDate; - - /** - * 失效日期 - */ - @Excel(name = "失效日期", dateFormat = "yyyy-MM-dd") - private Date expireDate; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/inventory/controller/manage/IcInventoryHController.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/inventory/controller/manage/IcInventoryHController.java deleted file mode 100644 index bf4bba76..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/inventory/controller/manage/IcInventoryHController.java +++ /dev/null @@ -1,310 +0,0 @@ -package com.hzs.scm.inventory.controller.manage; - - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.ObjectUtil; -import com.hzs.common.core.annotation.Log; -import com.hzs.common.core.constant.msg.MemberMsgConstants; -import com.hzs.common.core.constant.msg.ScmMsgConstants; -import com.hzs.common.core.enums.*; -import com.hzs.common.core.utils.ComputeUtil; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.sale.classify.BdSpecs; -import com.hzs.common.domain.scm.general.ext.IcGeneralOutBExt; -import com.hzs.common.domain.scm.ic.IcOnHandNum; -import com.hzs.common.domain.scm.ic.ext.IcOnHandNumExt; -import com.hzs.common.domain.scm.inventory.ext.IcInventoryBExt; -import com.hzs.common.domain.scm.inventory.ext.IcInventoryHExt; -import com.hzs.common.domain.scm.po.ext.PoOrderExt; -import com.hzs.common.domain.scm.po.ext.PoOrderItemsExt; -import com.hzs.common.domain.scm.pub.ScmOrderApproveLog; -import com.hzs.common.domain.system.sys.SysUser; -import com.hzs.common.security.service.UserTokenService; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.common.util.TransactionUtils; -import com.hzs.scm.general.vo.IcGeneralOutBVO; -import com.hzs.scm.ic.service.IIcOnHandNumService; -import com.hzs.scm.inventory.param.InventoryBParam; -import com.hzs.scm.inventory.param.InventoryParam; -import com.hzs.scm.inventory.service.IIcInventoryBService; -import com.hzs.scm.inventory.service.IIcInventoryHService; -import com.hzs.scm.inventory.vo.InventoryBVO; -import com.hzs.scm.inventory.vo.InventoryVO; -import com.hzs.scm.po.vo.PoOrderBVo; -import com.hzs.scm.po.vo.PoOrderVo; -import com.hzs.scm.pub.controller.ScmController; -import com.hzs.scm.pub.param.ItemSpecsParam; -import com.hzs.scm.pub.param.ScmApproveParam; -import com.hzs.scm.pub.service.IScmOrderApproveLogService; -import com.hzs.system.sys.IUserServiceApi; -import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.math.BigDecimal; -import java.util.*; -import java.util.stream.Collectors; - -/** - *

- * 库存盘点单表头 前端控制器 - *

- * - * @author hzs - * @since 2023-12-20 - */ -@RestController -@RequestMapping("/manage/inventory") -public class IcInventoryHController extends ScmController { - - @Autowired - private IIcInventoryHService inventoryService; - - @DubboReference - private IUserServiceApi userServiceApi; - - @Autowired - private IIcOnHandNumService onHandNumService; - - @Autowired - private IScmOrderApproveLogService scmOrderApproveLogService; - - @Autowired - private UserTokenService userTokenService; - - @Autowired - private IIcInventoryBService inventoryBiService; - - /** - * 查询列表 - * - * @return cubasdocParam 入参 - */ - @PostMapping("/list") - @Log(module = EOperationModule.INVENTORY_ORDER, business = EOperationBusiness.INVENTORY_ORDER, method = EOperationMethod.SELECT) - public TableDataInfo listInventory(@RequestBody InventoryParam inventoryParam) { - startPage(); - inventoryParam.setPkCountry(SecurityUtils.getPkCountry()); - List inventoryExtList = inventoryService.queryDisInventoryExtByCondition(inventoryParam); - return packageTableDataInfo(inventoryExtList, packageScmReturnVo(inventoryExtList)); - } - - private List packageScmReturnVo(List inventoryExtList) { - List inventoryVoList = new ArrayList<>(); - for (IcInventoryHExt inventoryExt : inventoryExtList) { - InventoryVO inventoryVO = BeanUtil.copyProperties(inventoryExt, InventoryVO.class); - List inventoryBiExtList = inventoryExt.getInventoryBiExtList(); - if(CollectionUtil.isNotEmpty(inventoryBiExtList)) { - List returnbVoList = BeanUtil.copyToList(inventoryBiExtList, InventoryBVO.class); - inventoryVO.setInventoryBiExtList(returnbVoList); - } - inventoryVoList.add(inventoryVO); - } - return inventoryVoList; - } - - /** - * 查询待入库订单的明细 - * - * @return cubasdocParam 入参 - */ - @GetMapping("/list-detail/{pkId}") - public TableDataInfo queryToStorePoOrder(@PathVariable Long pkId) { - List inventoryBiExtList = inventoryBiService.queryInventoryBiByPk(SecurityUtils.getPkCountry(), pkId); - List scmReturnVoList = new ArrayList<>(); - for (IcInventoryBExt icInventoryBiExt : inventoryBiExtList) { - scmReturnVoList.add(BeanUtil.copyProperties(icInventoryBiExt, InventoryBVO.class)); - } - return packageTableDataInfo(inventoryBiExtList, scmReturnVoList); - } - - /** - * 新增库存盘点 - * - * @param inventoryParam 入参 - */ - @PostMapping("/insert") - @Log(module = EOperationModule.INVENTORY_ORDER, business = EOperationBusiness.INVENTORY_ORDER, method = EOperationMethod.INSERT) - public AjaxResult saveInventory(@RequestBody InventoryParam inventoryParam) { - String message = validateInventoryParam(inventoryParam); - if (ObjectUtil.isNotEmpty(message)) { - return AjaxResult.error(TransactionUtils.getContent(message)); - } - inventoryService.insertInventoryByInventoryParam(inventoryParam, SecurityUtils.getUserId()); - return AjaxResult.success(); - } - - /** - * 修改库存盘点 - * - * @param inventoryParam 入参 - */ - @PostMapping("/update") - @Log(module = EOperationModule.INVENTORY_ORDER, business = EOperationBusiness.INVENTORY_ORDER, method = EOperationMethod.UPDATE) - public AjaxResult updatePoOrder(@RequestBody InventoryParam inventoryParam) { - if (inventoryParam.getPkId() == null) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.INVENTORY_ORDER_NOT_EXIST)); - } - String message = validateInventoryParam(inventoryParam); - if (ObjectUtil.isNotEmpty(message)) { - return AjaxResult.error(TransactionUtils.getContent(message)); - } - // 查询是否存在库存盘点单 - IcInventoryHExt inventoryExt = inventoryService.queryInventoryById(inventoryParam.getPkId(), EScmOrderStatus.SAVE.getValue()); - if (inventoryExt == null) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.INVENTORY_ORDER_NOT_EXIST)); - } - inventoryService.updateInventoryByInventoryParam(inventoryExt, inventoryParam, SecurityUtils.getUserId()); - return AjaxResult.success(); - } - - /** - * 删除库存盘点 - * - * @param pkId 主键 - */ - @DeleteMapping("/{pkId}") - @Log(module = EOperationModule.INVENTORY_ORDER, business = EOperationBusiness.INVENTORY_ORDER, method = EOperationMethod.DELETE) - public AjaxResult delete(@PathVariable Long pkId) { - if (pkId == null) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.INVENTORY_ORDER_NOT_EXIST)); - } - IcInventoryHExt inventoryExt = inventoryService.queryInventoryById(pkId, EScmOrderStatus.SAVE.getValue()); - if (inventoryExt == null) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.INVENTORY_ORDER_NOT_EXIST)); - } - inventoryService.deleteInventory(pkId, SecurityUtils.getUserId()); - return AjaxResult.success(); - } - - /** - * 撤销订单并入库（走签呈），签呈页面点击确定按钮 - * - * @param scmApproveParam 参数 - */ - @PostMapping("/submit") - @Log(module = EOperationModule.INVENTORY_ORDER, business = EOperationBusiness.INVENTORY_ORDER, method = EOperationMethod.UPDATE) - public AjaxResult submitPurchase(@RequestBody ScmApproveParam scmApproveParam) { - scmApproveParam.setPkCountry(SecurityUtils.getPkCountry()); - if (scmApproveParam.getPkId() == null) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.INVENTORY_ORDER_NOT_EXIST)); - } - IcInventoryHExt inventoryExt = inventoryService.queryInventoryById(scmApproveParam.getPkId(), EScmOrderStatus.SAVE.getValue()); - if (inventoryExt == null) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.INVENTORY_ORDER_NOT_EXIST)); - } - // 验证该订单是否存在签呈，存在待审核的签呈不能再次发起 - List scmOrderApproveLogs = scmOrderApproveLogService.queryScmOrderApproveLogByCondition(scmApproveParam.getPkId(), EApprovalBusiness.INVENTORY_ORDER_APPROVE.getValue(), null); - if (CollectionUtil.isNotEmpty(scmOrderApproveLogs)) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.INVENTORY_ORDER_EXISTS_AGENT)); - } - inventoryService.auditInventoryByApproveParamSubmit(inventoryExt, scmApproveParam, userTokenService.getLoginUser()); - return AjaxResult.success(); - } - - protected String validateInventoryParam(InventoryParam inventoryParam) { - if (validateInventoryFieldParam(inventoryParam)) { - return MemberMsgConstants.REQUIRED_NOT_EMPTY; - } - inventoryParam.setPkCountry(SecurityUtils.getPkCountry()); - // 验证仓库管理员，调整人 - SysUser sysUser = userServiceApi.selectUserById(inventoryParam.getPkAdjustor()).getData(); - if (sysUser == null) { - return MemberMsgConstants.REQUIRED_NOT_EMPTY; - } - // 根据登录账号获得部门 - inventoryParam.setPkDept(sysUser.getPkDept().intValue()); - sysUser = userServiceApi.selectUserById(inventoryParam.getPkWhsmanager()).getData(); - if (sysUser == null) { - return MemberMsgConstants.REQUIRED_NOT_EMPTY; - } - // 验证采购组织 - String msg = validateSysCorp(inventoryParam.getPkCorp(), inventoryParam.getPkCountry()); - if (ObjectUtil.isNotEmpty(msg)) { - return msg; - } - Set storeSet = new HashSet<>(); - storeSet.add(inventoryParam.getPkWarehouse()); - validateStorehouse(storeSet, inventoryParam.getPkCountry(), inventoryParam.getPkCorp()); - // 明细表分为2类，一类来源于现存量，一类来源于新增 - List idList = new ArrayList<>(); - List addInventoryBiList = new ArrayList<>(); - for (InventoryBParam inventoryBiParam : inventoryParam.getInventoryBiParamList()) { - if (inventoryBiParam.getPkOnhandnum() == null) { - inventoryBiParam.setNdiffastnum(ComputeUtil.computeSubtract(inventoryBiParam.getNonhandnum(), inventoryBiParam.getNdiffastnum()).abs()); - addInventoryBiList.add(inventoryBiParam); - } else { - idList.add(inventoryBiParam.getPkOnhandnum()); - } - } - // 根据现存量查询数据 - if (idList.size() > 0) { - List icOnHandNumList = onHandNumService.queryOnHandNumByList(idList); - Map onHandNumMap = icOnHandNumList.stream().collect(Collectors.toMap(IcOnHandNum::getPkId, icOnHandNum -> icOnHandNum)); - for (InventoryBParam inventoryBiParam : inventoryParam.getInventoryBiParamList()) { - if (onHandNumMap.containsKey(inventoryBiParam.getPkOnhandnum())) { - IcOnHandNum icOnHandNum = onHandNumMap.get(inventoryBiParam.getPkOnhandnum()); - inventoryBiParam.setPkUnit(icOnHandNum.getPkUnit()); - inventoryBiParam.setPkProduct(icOnHandNum.getPkProduct()); - inventoryBiParam.setPkCubasdoc(icOnHandNum.getPkCubasdoc()); - inventoryBiParam.setProductDate(icOnHandNum.getProductDate()); - inventoryBiParam.setExpireDate(icOnHandNum.getExpireDate()); - inventoryBiParam.setNonhandnum(icOnHandNum.getNonhandnum()); - inventoryBiParam.setPkBatchCode(icOnHandNum.getPkBatchCode()); - inventoryBiParam.setNdiffastnum(ComputeUtil.computeSubtract(icOnHandNum.getNonhandnum(), inventoryBiParam.getNadjustnum()).abs()); - inventoryBiParam.setScmItemSpecsList(BeanUtil.copyToList(icOnHandNum.getScmItemSpecsList(), ItemSpecsParam.class)); - } - if(EInventoryType.INVENTORY_OUT.getValue() == inventoryParam.getInvType()){ - if(ComputeUtil.compareValue(inventoryBiParam.getNadjustnum(), inventoryBiParam.getNonhandnum())){ - return ScmMsgConstants.INVENTORY_OUT; - } - }else{ - if(ComputeUtil.compareValue(inventoryBiParam.getNonhandnum(), inventoryBiParam.getNadjustnum())){ - return ScmMsgConstants.INVENTORY_IN; - } - } - } - } - if (addInventoryBiList.size() > 0) { - Map specsMap = new HashMap<>(); - String message = validateProduct(addInventoryBiList, specsMap); - if (ObjectUtil.isNotEmpty(message)) { - return message; - } - // 验证批次号 - return validateProductBatchCode(addInventoryBiList, specsMap); - } - return null; - } - - protected Boolean validateInventoryFieldParam(InventoryParam inventoryParam) { - if (inventoryParam == null || inventoryParam.getPkWhsmanager() == null || inventoryParam.getPkAdjustor() == null || - inventoryParam.getOrderDate() == null || inventoryParam.getPkWarehouse() == null || - inventoryParam.getInvType() == null || - inventoryParam.getPkCorp() == null || CollectionUtil.isEmpty(inventoryParam.getInventoryBiParamList())) { - return Boolean.TRUE; - } - // 验证 必输字段不能为空 存在2种情况 1种来源于现存量，一种是没有的新增的 - for (InventoryBParam inventoryBiParam : inventoryParam.getInventoryBiParamList()) { - if (inventoryBiParam.getPkOnhandnum() == null) { - if (inventoryBiParam.getPkUnit() == null || inventoryBiParam.getPkProduct() == null || - inventoryBiParam.getPkCubasdoc() == null || inventoryBiParam.getProductDate() == null || - inventoryBiParam.getExpireDate() == null || inventoryBiParam.getNonhandnum() == null || - inventoryBiParam.getNadjustnum() == null || inventoryBiParam.getNdiffastnum() == null || - inventoryBiParam.getNdiffastnum().equals(BigDecimal.ZERO) || - inventoryBiParam.getPkBatchCode() == null || CollectionUtil.isEmpty(inventoryBiParam.getScmItemSpecsList())) { - return Boolean.TRUE; - } - } else { - if (inventoryBiParam.getNdiffastnum() == null || inventoryBiParam.getNadjustnum() == null || - inventoryBiParam.getNdiffastnum().equals(BigDecimal.ZERO)) { - return Boolean.TRUE; - } - } - } - return Boolean.FALSE; - } -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/inventory/mapper/IcInventoryBMapper.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/inventory/mapper/IcInventoryBMapper.java deleted file mode 100644 index 21d6d5b3..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/inventory/mapper/IcInventoryBMapper.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.hzs.scm.inventory.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.scm.general.ext.IcGeneralOutBExt; -import com.hzs.common.domain.scm.inventory.IcInventoryB; -import com.hzs.common.domain.scm.inventory.ext.IcInventoryBExt; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - *

- * 库存盘点单明细 Mapper 接口 - *

- * - * @author hzs - * @since 2023-12-20 - */ -public interface IcInventoryBMapper extends BaseMapper { - - - /* - * @description: 根据主表主键查询采购入库单明细 - * @author: sui q - * @date: 2023/11/25 15:02 - * @param: null null - **/ - List queryInventoryBiByPk(@Param("orderType") Integer orderType, @Param("inventoryBiExtList") List inventoryBiExtList); - - /* - * @description: 根据主表主键查询采购入库单明细 - * @author: sui q - * @date: 2023/11/25 15:02 - * @param: null null - **/ - List queryInventoryBiByPkId(@Param("pkCountry") Integer pkCountry, @Param("pkOrder") Long pkOrder); - - /* - * @description: 删除其他入库单明细 - * @author: sui q - * @date: 2023/11/21 14:23 - * @param: null null - **/ - void deleteInventoryBiByList(@Param("inventoryBiList") List inventoryBiList, @Param("pkMember") Long pkMember); - -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/inventory/mapper/IcInventoryHMapper.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/inventory/mapper/IcInventoryHMapper.java deleted file mode 100644 index 75d187a1..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/inventory/mapper/IcInventoryHMapper.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.hzs.scm.inventory.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.scm.general.ext.IcGeneralOutHExt; -import com.hzs.common.domain.scm.inventory.IcInventoryH; -import com.hzs.common.domain.scm.inventory.ext.IcInventoryHExt; -import com.hzs.scm.general.param.GeneralParam; -import com.hzs.scm.inventory.param.InventoryParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - *

- * 库存盘点单表头 Mapper 接口 - *

- * - * @author hzs - * @since 2023-12-20 - */ -public interface IcInventoryHMapper extends BaseMapper { - - /* - * @description: 根据主键查询其他入库、其他入库明细 - * @author: sui q - * @date: 2023/11/21 10:49 - * @param: null null - **/ - IcInventoryHExt queryIcInventoryById(@Param("pkId") Long pkId, @Param("orderStatus") Integer orderStatus); - - /* - * @description: 查询会员端显示的采购入库单 - * @author: sui q - * @date: 2023/11/25 9:55 - * @param: null null - **/ - List queryDisIcInventoryExtByCondition(InventoryParam generalParam); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/inventory/param/InventoryBParam.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/inventory/param/InventoryBParam.java deleted file mode 100644 index e9760847..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/inventory/param/InventoryBParam.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.hzs.scm.inventory.param; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.hzs.scm.pub.param.ItemSpecsParam; -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -/** - * @description: 盘点子表参数 - * @author: sui q - * @time: 2023/12/20 14:38 - * @classname: InventoryBParam - * @package_name: com.hzs.scm.inventory.param - * version 1.0.0 - */ -@Data -public class InventoryBParam implements Serializable { - - /** - * 主键 - */ - private Long pkId; - - private Long pkOnhandnum; - - /** - * 单位 - */ - private Integer pkUnit; - - /** - * 产品信息主键 - */ - private Integer pkProduct; - - /** - * 货位 - */ - private Integer pkClocation; - - /** - * 供应商 - */ - private Integer pkCubasdoc; - - /** - * 生产日期 - */ - private Date productDate; - - /** - * 失效日期 - */ - private Date expireDate; - - /** - * 账面数量 - */ - private BigDecimal nonhandnum; - - /** - * 调整数量 - */ - private BigDecimal nadjustnum; - - /** - * 差异数量 - */ - private BigDecimal ndiffastnum; - - /** - * 批次主键 - */ - private Long pkBatchCode; - - /** - * 明细表规格明细 - */ - private List scmItemSpecsList; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/inventory/param/InventoryParam.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/inventory/param/InventoryParam.java deleted file mode 100644 index a289048f..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/inventory/param/InventoryParam.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.hzs.scm.inventory.param; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.hzs.scm.pub.param.ScmPubParam; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; -import java.util.List; - -/** - * @description: 盘点单参数 - * @author: sui q - * @time: 2023/12/20 14:27 - * @classname: InventoryParam - * @package_name: com.hzs.scm.inventory.param - * version 1.0.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class InventoryParam extends ScmPubParam { - - /** - * 主键 - */ - private Long pkId; - - /** - * 库存公司 - */ - private Integer pkCorp; - - /** - * 所属部门 - */ - private Integer pkDept; - - /** - * 仓库管理员 - */ - private Long pkWhsmanager; - - /** - * 调整人 - */ - private Long pkAdjustor; - - /** - * 仓库 - */ - private Integer pkWarehouse; - - /** - * 盘点类型 1=盘亏 2=盘盈 - */ - private Integer invType; - - /** - * 订单日期 2023-10 - */ - private Date orderDate; - - /** - * 备注 - */ - private String remark; - - private List inventoryBiParamList; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/inventory/service/IIcInventoryBService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/inventory/service/IIcInventoryBService.java deleted file mode 100644 index f579a18c..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/inventory/service/IIcInventoryBService.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.hzs.scm.inventory.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.scm.general.ext.IcGeneralOutBExt; -import com.hzs.common.domain.scm.inventory.IcInventoryB; -import com.hzs.common.domain.scm.inventory.ext.IcInventoryBExt; - -import java.util.List; - -/** - *

- * 库存盘点单明细 服务类 - *

- * - * @author hzs - * @since 2023-12-20 - */ -public interface IIcInventoryBService extends IService { - - /* - * @description: 根据主表主键查询库存盘点明细 - * @author: sui q - * @date: 2023/11/25 15:02 - * @param: null null - **/ - List queryInventoryBiByPk(Integer orderType, List icInventoryBiExtList); - - /* - * @description: 根据主表主键查询采购入库单明细 - * @author: sui q - * @date: 2023/11/25 15:02 - * @param: null null - **/ - List queryInventoryBiByPk(Integer pkCountry, Long pkOrder); - - /* - * @description: 删除订单明细 - * @author: sui q - * @date: 2023/11/21 14:23 - * @param: null null - **/ - void deleteInventoryBiByList(List icInventorybList, Long pkMember); - - /* - * @description: 删除库存盘点明细，根据订单主键 - * @author: sui q - * @date: 2023/11/21 14:55 - * @param: null null - **/ - void deleteInventoryBiByPkInventory(Long pkInventory, Long pkMember); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/inventory/service/IIcInventoryHService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/inventory/service/IIcInventoryHService.java deleted file mode 100644 index 6d5b2e1f..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/inventory/service/IIcInventoryHService.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.hzs.scm.inventory.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.scm.inventory.IcInventoryH; -import com.hzs.common.domain.scm.inventory.ext.IcInventoryHExt; -import com.hzs.scm.inventory.param.InventoryParam; -import com.hzs.scm.pub.param.ScmApproveParam; -import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; -import com.hzs.system.sys.dto.LoginUser; - -import java.util.List; - -/** - *

- * 库存盘点单表头 服务类 - *

- * - * @author hzs - * @since 2023-12-20 - */ -public interface IIcInventoryHService extends IService { - - /* - * @description: 保存盘点单 - * @author: sui q - * @date: 2023/11/20 15:54 - * @param: null null - **/ - void insertInventoryByInventoryParam(InventoryParam inventoryParam, Long pkMember); - - /* - * @description: 修改保存盘点单 - * @author: sui q - * @date: 2023/11/21 11:51 - * @param: null null - **/ - void updateInventoryByInventoryParam(IcInventoryHExt inventoryExt, InventoryParam inventoryParam, Long pkMember); - - /* - * @description: 根据订单主键查询盘点单 - * @author: sui q - * @date: 2023/11/21 10:47 - * @param: null null - **/ - IcInventoryHExt queryInventoryById(Long pkId, Integer orderStatus); - - /* - * @description: 查询会员端显示的盘点 - * @author: sui q - * @date: 2023/11/25 9:55 - * @param: null null - **/ - IcInventoryHExt queryDisInventoryExtById(Long pkId, Integer orderStatus); - - /* - * @description: 查询会员端显示的盘点 - * @author: sui q - * @date: 2023/11/25 9:55 - * @param: null null - **/ - List queryDisInventoryExtByCondition(InventoryParam inventoryParam); - - /* - * @description: 删除采购订单 - * @author: sui q - * @date: 2023/11/21 14:54 - * @param: null null - **/ - void deleteInventory(Long pkId, Long pkMember); - - /* - * @description: 提交采购订单（走审批） - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - void auditInventoryByApproveParamSubmit(IcInventoryHExt inventoryExt, ScmApproveParam scmApproveParam, LoginUser loginUser); - - /* - * @description: 审核通过采购订单 - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - String auditInventoryByApproveParamAgree(ApprovalBusinessResultDTO approvalBusinessResultDTO); - - /* - * @description: 审核驳回采购订单 - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - String auditInventoryByApproveParamReject(ApprovalBusinessResultDTO approvalBusinessResultDTO); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/inventory/service/impl/IcInventoryBServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/inventory/service/impl/IcInventoryBServiceImpl.java deleted file mode 100644 index c470b5f7..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/inventory/service/impl/IcInventoryBServiceImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.hzs.scm.inventory.service.impl; - -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.constant.ScmFieldConstants; -import com.hzs.common.core.constant.SystemFieldConstants; -import com.hzs.common.core.enums.EYesNo; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.domain.scm.general.IcGeneralOutB; -import com.hzs.common.domain.scm.general.ext.IcGeneralOutBExt; -import com.hzs.common.domain.scm.inventory.IcInventoryB; -import com.hzs.common.domain.scm.inventory.ext.IcInventoryBExt; -import com.hzs.scm.inventory.mapper.IcInventoryBMapper; -import com.hzs.scm.inventory.service.IIcInventoryBService; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - *

- * 库存盘点单明细 服务实现类 - *

- * - * @author hzs - * @since 2023-12-20 - */ -@Service -public class IcInventoryBServiceImpl extends ServiceImpl implements IIcInventoryBService { - - @Override - public List queryInventoryBiByPk(Integer orderType, List icInventoryBiExtList) { - return baseMapper.queryInventoryBiByPk(orderType, icInventoryBiExtList); - } - - @Override - public List queryInventoryBiByPk(Integer pkCountry, Long pkOrder) { - return baseMapper.queryInventoryBiByPkId(pkCountry, pkOrder); - } - - @Override - public void deleteInventoryBiByList(List icInventorybList, Long pkMember) { - baseMapper.deleteInventoryBiByList(icInventorybList, pkMember); - } - - @Override - public void deleteInventoryBiByPkInventory(Long pkInventory, Long pkMember) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.set(SystemFieldConstants.DEL_FLAG, EYesNo.NO.getIntValue()); - updateWrapper.set(SystemFieldConstants.PK_MODIFIED, pkMember); - updateWrapper.set(SystemFieldConstants.MODIFIED_TIME, DateUtils.currentDateTime()); - updateWrapper.eq(ScmFieldConstants.PK_INVENTORY, pkInventory); - update(updateWrapper); - } -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/inventory/service/impl/IcInventoryHServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/inventory/service/impl/IcInventoryHServiceImpl.java deleted file mode 100644 index b839bf60..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/inventory/service/impl/IcInventoryHServiceImpl.java +++ /dev/null @@ -1,338 +0,0 @@ -package com.hzs.scm.inventory.service.impl; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.constant.CacheConstants; -import com.hzs.common.core.constant.SaOrderFieldConstants; -import com.hzs.common.core.constant.SystemFieldConstants; -import com.hzs.common.core.constant.msg.DocumentMsgConstants; -import com.hzs.common.core.constant.msg.ScmMsgConstants; -import com.hzs.common.core.enums.*; -import com.hzs.common.core.service.RedisService; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.domain.scm.inventory.IcInventoryB; -import com.hzs.common.domain.scm.inventory.IcInventoryH; -import com.hzs.common.domain.scm.inventory.ext.IcInventoryBExt; -import com.hzs.common.domain.scm.inventory.ext.IcInventoryHExt; -import com.hzs.common.domain.scm.pub.ScmItemSpecs; -import com.hzs.common.domain.scm.pub.ScmOrderApproveLog; -import com.hzs.common.util.TransactionUtils; -import com.hzs.scm.ic.service.IIcOnHandNumService; -import com.hzs.scm.inventory.mapper.IcInventoryHMapper; -import com.hzs.scm.inventory.param.InventoryBParam; -import com.hzs.scm.inventory.param.InventoryParam; -import com.hzs.scm.inventory.service.IIcInventoryBService; -import com.hzs.scm.inventory.service.IIcInventoryHService; -import com.hzs.scm.no.service.IScmBillNoService; -import com.hzs.scm.pub.component.ScmPubUtilTool; -import com.hzs.scm.pub.param.ItemSpecsParam; -import com.hzs.scm.pub.param.ScmApproveParam; -import com.hzs.scm.pub.service.IScmItemSpecsService; -import com.hzs.scm.pub.service.IScmOrderApproveLogService; -import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; -import com.hzs.system.sys.dto.LoginUser; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.time.temporal.ChronoUnit; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -/** - *

- * 库存盘点单表头 服务实现类 - *

- * - * @author hzs - * @since 2023-12-20 - */ -@Service -public class IcInventoryHServiceImpl extends ServiceImpl implements IIcInventoryHService { - - @Autowired - private IScmItemSpecsService scmItemSpecsService; - - @Autowired - private IScmBillNoService scmBillNoService; - - @Autowired - private IScmOrderApproveLogService scmOrderApproveLogService; - - @Autowired - private IIcInventoryBService inventoryBiService; - - @Autowired - private RedisService redisService; - - @Autowired - private IIcOnHandNumService onHandNumService; - - @Override - @Transactional(rollbackFor = Exception.class) - public void insertInventoryByInventoryParam(InventoryParam inventoryParam, Long pkMember) { - saveInventoryByParam(inventoryParam, pkMember); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void updateInventoryByInventoryParam(IcInventoryHExt inventoryExt, InventoryParam inventoryParam, Long pkMember) { - // 更新规格明细表，先删除在新增 根据主表主键删除 - scmItemSpecsService.deleteItemSpecsById(EScmOrderType.INVENTORY_ORDER.getValue(), inventoryExt.getPkId(), pkMember); - inventoryExt.setOrderDate(inventoryParam.getOrderDate()); - inventoryExt.setInvType(inventoryParam.getInvType()); - inventoryExt.setRemark(inventoryParam.getRemark()); - inventoryExt.setPkWarehouse(inventoryParam.getPkWarehouse()); - inventoryExt.setPkAdjustor(inventoryParam.getPkAdjustor()); - inventoryExt.setPkWhsmanager(inventoryParam.getPkWhsmanager()); - inventoryExt.setPkCorp(inventoryParam.getPkCorp()); - // 更新订单明细表 分为3部分 删除的 新增的 修改的 - List inventoryBiList = getInventoryB(inventoryParam, pkMember, inventoryExt); - // 重新处理订单明细，将订单明细分为 删除的、新增的、修改的 - List inventoryBiExtList = inventoryExt.getInventoryBiExtList(); - // 剩余的就是需要删除的 - Map inventoryBiExtMap = inventoryBiExtList.stream().collect(Collectors.toMap(IcInventoryBExt::getPkId, inventoryB->inventoryB)); - List insertIcInventoryB = new ArrayList<>(); - List updateIcInventoryB = new ArrayList<>(); - List saveScmItemSpecsList = new ArrayList<>(); - for (IcInventoryB icInventoryB : inventoryBiList) { - if (icInventoryB.getPkId() != null && inventoryBiExtMap.containsKey(icInventoryB.getPkId())) { - // 修改的 - icInventoryB.setPkCreator(inventoryBiExtMap.get(icInventoryB.getPkId()).getPkCreator()); - updateIcInventoryB.add(icInventoryB); - saveScmItemSpecsList.addAll(icInventoryB.getScmItemSpecsList()); - inventoryBiExtMap.remove(icInventoryB.getPkId()); - } else { - // 新增的 - icInventoryB.setPkInventory(inventoryExt.getPkId()); - insertIcInventoryB.add(icInventoryB); - } - } - String inventoryLockKey = CacheConstants.INVENTORY_ORDER_LOCK + inventoryExt.getPkId(); - try { - if (!redisService.lockKeyOnce(inventoryLockKey)) { - throw new RuntimeException(ScmMsgConstants.BILL_NOT_OPERATION); - } - if (insertIcInventoryB.size() > 0) { - // 保存订单明细 新增的 - inventoryBiService.saveBatch(insertIcInventoryB); - List scmItemSpecsList = scmItemSpecsService.packageOrderItemsSpecs(insertIcInventoryB, inventoryExt.getPkId()); - if (scmItemSpecsList.size() > 0) { - saveScmItemSpecsList.addAll(scmItemSpecsList); - } - } - if (updateIcInventoryB.size() > 0) { - // 修改订单明细 修改的 - updateIcInventoryB.forEach(updateItems -> - inventoryBiService.updateById(updateItems)); - - } - if (inventoryBiExtMap.size() > 0) { - // 删除订单明细 删除的 - List delIcInventoryB = new ArrayList<>(); - inventoryBiExtMap.forEach((key, value) -> delIcInventoryB.add(value)); - inventoryBiService.deleteInventoryBiByList(delIcInventoryB, pkMember); - } - // 保存订单明细规格 - if (saveScmItemSpecsList.size() > 0) { - scmItemSpecsService.saveBatch(saveScmItemSpecsList); - } - // 更新订单表 - updateById(inventoryExt); - } finally { - redisService.unlock(inventoryLockKey); - } - } - - @Override - public IcInventoryHExt queryInventoryById(Long pkId, Integer orderStatus) { - return baseMapper.queryIcInventoryById(pkId, orderStatus); - } - - @Override - public IcInventoryHExt queryDisInventoryExtById(Long pkId, Integer orderStatus) { - InventoryParam inventoryParam = new InventoryParam(); - inventoryParam.setPkId(pkId); - inventoryParam.setOrderStatus(orderStatus); - List inventoryExtList = baseMapper.queryDisIcInventoryExtByCondition(inventoryParam); - if(CollectionUtil.isNotEmpty(inventoryExtList)){ - return inventoryExtList.get(0); - } - return null; - } - - @Override - public List queryDisInventoryExtByCondition(InventoryParam inventoryParam) { - if (inventoryParam.getEndDate() != null) { - inventoryParam.setEndDate(DateUtils.afterDate(1, ChronoUnit.DAYS, inventoryParam.getEndDate())); - } - return baseMapper.queryDisIcInventoryExtByCondition(inventoryParam); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteInventory(Long pkId, Long pkMember) { - String inventoryLock = CacheConstants.INVENTORY_ORDER_LOCK + pkId; - if (!redisService.lockKeyOnce(inventoryLock)) { - throw new RuntimeException(ScmMsgConstants.BILL_NOT_OPERATION); - } - // 删除规格明细表 - scmItemSpecsService.deleteItemSpecsById(EScmOrderType.INVENTORY_ORDER.getValue(), pkId, pkMember); - inventoryBiService.deleteInventoryBiByPkInventory(pkId, pkMember); - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.set(SystemFieldConstants.DEL_FLAG, EYesNo.NO.getIntValue()); - updateWrapper.set(SystemFieldConstants.PK_MODIFIED, pkMember); - updateWrapper.set(SystemFieldConstants.MODIFIED_TIME, DateUtils.currentDateTime()); - updateWrapper.eq(SystemFieldConstants.PK_ID, pkId); - update(updateWrapper); - redisService.unlock(inventoryLock); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void auditInventoryByApproveParamSubmit(IcInventoryHExt inventoryExt, ScmApproveParam scmApproveParam, LoginUser loginUser) { - // 更新单据状态 - updateInventoryStatus(scmApproveParam.getPkId(), loginUser, EScmOrderStatus.SUBMIT.getValue()); - // 判断类型，盘亏 出库 盘盈入库 - if(EInventoryType.INVENTORY_OUT.getValue() == inventoryExt.getInvType()){ - // 出库 - List inventoryBiList = inventoryBiService.queryInventoryBiByPk(EScmOrderType.INVENTORY_ORDER.getValue(), inventoryExt.getInventoryBiExtList()); - if(inventoryBiList != null && inventoryBiList.size() >0){ - inventoryExt.setInventoryBiExtList(inventoryBiList); - } - for (IcInventoryBExt inventoryBiExt : inventoryExt.getInventoryBiExtList()) { - inventoryBiExt.setPkStorehouse(inventoryExt.getPkWarehouse()); - inventoryBiExt.setNnum(inventoryBiExt.getNdiffastnum()); - } - // 更新存货现存量表，更新库存 - // 转换数据，封装为可以出库的数据 - onHandNumService.mergeIcOnHandNumByGeneralOut(inventoryExt, inventoryExt.getInventoryBiExtList(), EScmOrderType.INVENTORY_ORDER.getValue(), loginUser.getUserId()); - } - scmOrderApproveLogService.submitOrder(scmApproveParam, EApprovalBusiness.INVENTORY_ORDER_APPROVE, EOrderPrefix.INVENTORY_CODE, loginUser); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public String auditInventoryByApproveParamAgree(ApprovalBusinessResultDTO approvalBusinessResultDTO) { - return approveInventoryByStatus(approvalBusinessResultDTO, EScmOrderStatus.APPROVE.getValue(), EAgentApprovalStatus.APPROVED.getValue()); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public String auditInventoryByApproveParamReject(ApprovalBusinessResultDTO approvalBusinessResultDTO) { - return approveInventoryByStatus(approvalBusinessResultDTO, EScmOrderStatus.SAVE.getValue(), EAgentApprovalStatus.REFUSE.getValue()); - } - - /* - * @description: 将采购订单的参数转换为能保存的订单 - * @author: sui q - * @date: 2023/11/20 15:53 - * @param: null null - **/ - private void saveInventoryByParam(InventoryParam inventoryParam, Long pkMember) { - IcInventoryH inventoryH = BeanUtil.copyProperties(inventoryParam, IcInventoryH.class); - List inventoryBiList = getInventoryB(inventoryParam, pkMember, inventoryH); - // 生成单据号 - inventoryH.setOrderCode(scmBillNoService.createScmBillNoByOrderType(EScmOrderType.INVENTORY_ORDER.getValue())); - // 保存主表 - save(inventoryH); - for (IcInventoryB icInventoryB : inventoryBiList) { - icInventoryB.setPkInventory(inventoryH.getPkId()); - } - // 保存子表 - inventoryBiService.saveBatch(inventoryBiList); - List saveScmItemSpecsList = scmItemSpecsService.packageOrderItemsSpecs(inventoryBiList, inventoryH.getPkId()); - if (saveScmItemSpecsList.size() > 0) { - scmItemSpecsService.saveBatch(saveScmItemSpecsList); - } - } - - private List getInventoryB(InventoryParam inventoryParam, Long pkMember, IcInventoryH inventoryH) { - inventoryH.setPkDept(inventoryParam.getPkDept()); - List inventoryBiList = new ArrayList<>(); - Date date = DateUtils.currentDateTime(); - for (InventoryBParam inventoryBiParam : inventoryParam.getInventoryBiParamList()) { - IcInventoryB icInventoryB = BeanUtil.copyProperties(inventoryBiParam, IcInventoryB.class); - icInventoryB.setPkOnhandnum(inventoryBiParam.getPkOnhandnum()); - // 金额 - List itemSpecsParamList = inventoryBiParam.getScmItemSpecsList(); - scmItemSpecsService.packageScmItemByParam(itemSpecsParamList, icInventoryB, inventoryParam.getPkCountry(), pkMember, - inventoryH.getPkId(), icInventoryB.getPkId(), EScmOrderType.INVENTORY_ORDER.getValue()); - inventoryBiList.add(icInventoryB); - } - inventoryH.setPkCountry(inventoryParam.getPkCountry()); - if (inventoryParam.getPkId() == null) { - inventoryH.setPkCreator(pkMember); - } else { - inventoryH.setPkModified(pkMember); - inventoryH.setModifiedTime(date); - } - return inventoryBiList; - } - - private void updateInventoryStatus(Long pkId, LoginUser loginUser, Integer orderStatus) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.set(SaOrderFieldConstants.ORDER_STATUS, orderStatus); - updateWrapper.set(SystemFieldConstants.PK_MODIFIED, loginUser.getUserId()); - updateWrapper.set(SystemFieldConstants.MODIFIED_TIME, DateUtils.currentDateTime()); - updateWrapper.eq(SystemFieldConstants.PK_ID, pkId); - update(updateWrapper); - } - - private String approveInventoryByStatus(ApprovalBusinessResultDTO approvalBusinessResultDTO, Integer scmOrderStatus, Integer approveStatus){ - try { - // 查询订单日志表 - List scmOrderApproveLogList = scmOrderApproveLogService.queryScmOrderApproveLogByCondition(null, approvalBusinessResultDTO.getEApprovalBusiness().getValue(), approvalBusinessResultDTO.getBusinessCode()); - if (scmOrderApproveLogList == null || scmOrderApproveLogList.size() == 0) { - return TransactionUtils.getContent(DocumentMsgConstants.DOCUMENT_NOT_EXISTS); - } - ScmOrderApproveLog scmOrderApproveLog = scmOrderApproveLogList.get(0); - // 查询库存盘点单 - IcInventoryHExt inventoryExt = queryDisInventoryExtById(scmOrderApproveLog.getPkOrder(), EScmOrderStatus.SUBMIT.getValue()); - if (inventoryExt == null) { - return TransactionUtils.getContent(DocumentMsgConstants.DOCUMENT_HAS_HANDLE); - } - // 更新库存盘点单状态 - updateInventoryStatus(inventoryExt.getPkId(), approvalBusinessResultDTO.getLoginUser(), scmOrderStatus); - // 更新前程日志表状态 - scmOrderApproveLogService.updateScmOrderApproveStatus(scmOrderApproveLog.getPkId(), approvalBusinessResultDTO.getLoginUser().getUserId(), approveStatus); - if (EInventoryType.INVENTORY_IN.getValue() == inventoryExt.getInvType()) { - // 盘盈审核通过更新现存量 - if (EAgentApprovalStatus.APPROVED.getValue() == approveStatus) { - // 查询库存盘点单明细表 - packageInventoryBiList(inventoryExt); - // 转换封装数据，将数据更新成可以入库的数据 - // 更新现存量 // 更新采购订单累计入库数量 - onHandNumService.mergeIcOnHandNumByGeneralIn(inventoryExt, inventoryExt.getInventoryBiExtList(), EScmOrderType.INVENTORY_ORDER.getValue(), approvalBusinessResultDTO.getLoginUser().getUserId()); - } - } else { - // 盘亏驳回退回数量 - // 弃审的时候回退批次数量 - if (EAgentApprovalStatus.REFUSE.getValue() == approveStatus) { - packageInventoryBiList(inventoryExt); - onHandNumService.backIcOnHandNumByGeneralOut(inventoryExt, inventoryExt.getInventoryBiExtList(), EScmOrderType.INVENTORY_ORDER.getValue(), approvalBusinessResultDTO.getLoginUser().getUserId()); - } - } - }catch (Exception e){ - e.printStackTrace(); - throw new RuntimeException(e); - } - return null; - } - - private void packageInventoryBiList(IcInventoryHExt inventoryExt) { - List inventoryBiExtList = inventoryBiService.queryInventoryBiByPk(EScmOrderType.INVENTORY_ORDER.getValue(), inventoryExt.getInventoryBiExtList()); - if (inventoryBiExtList != null && inventoryBiExtList.size() > 0) { - for (IcInventoryBExt inventoryBiExt : inventoryBiExtList) { - inventoryBiExt.setPkStorehouse(inventoryExt.getPkWarehouse()); - inventoryBiExt.setNnum(inventoryBiExt.getNdiffastnum()); - } - inventoryExt.setInventoryBiExtList(inventoryBiExtList); - } - } -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/inventory/vo/InventoryBVO.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/inventory/vo/InventoryBVO.java deleted file mode 100644 index 9b894126..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/inventory/vo/InventoryBVO.java +++ /dev/null @@ -1,118 +0,0 @@ -package com.hzs.scm.inventory.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.scm.pub.vo.ScmReturnBVo; -import com.hzs.scm.pub.vo.ScmSpecsVO; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -/** - * @description: 库存盘点明细表 - * @author: sui q - * @time: 2024/1/5 14:06 - * @classname: InventoryBVO - * @package_name: com.hzs.scm.inventory.vo - * version 1.0.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class InventoryBVO extends ScmReturnBVo { - - /** - * 供应商名称 - */ - private String cubasdocName; - - /** - * 单位名称 - */ - private String unitName; - - /** - * 货位名称 - */ - private String clocationName; - - - private String batchCode; - - /** - * 产品编号 - */ - private String productCode; - - /** - * 产品名称 - */ - private String productName; - - /** - * 规格名称 - */ - private String specsName; - - /** - * 仓库 - */ - private Integer pkStorehouse; - - /** - * 数量 - */ - private BigDecimal nnum; - - private Integer pkProductBas; - - /** - * 现存量主键 - */ - private Long pkOnhandnum; - - /** - * 货位 - */ - private Integer pkClocation; - - /** - * 供应商 - */ - private Integer pkCubasdoc; - - /** - * 生产日期 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date productDate; - - /** - * 失效日期 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date expireDate; - - /** - * 账面数量 - */ - private BigDecimal nonhandnum; - - /** - * 调整数量 - */ - private BigDecimal nadjustnum; - - /** - * 差异数量 - */ - private BigDecimal ndiffastnum; - - /** - * 批次主键 - */ - private Long pkBatchCode; - - private List scmItemSpecsList; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/inventory/vo/InventoryVO.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/inventory/vo/InventoryVO.java deleted file mode 100644 index 49208c14..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/inventory/vo/InventoryVO.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.hzs.scm.inventory.vo; - -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import com.hzs.scm.pub.vo.ScmReturnVo; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.List; - -/** - * @description: 库存盘点主表 - * @author: sui q - * @time: 2024/1/5 14:02 - * @classname: InventoryVO - * @package_name: com.hzs.scm.inventory.vo - * version 1.0.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class InventoryVO extends ScmReturnVo { - - /** - * 管理员名称 - */ - private String managerName; - - /** - * 仓库名称 - */ - private String storehouseName; - - /** - * 调整人 - */ - private String adjustorName; - - /** - * 仓库管理员 - */ - private Long pkWhsmanager; - - /** - * 调整人 - */ - private Long pkAdjustor; - - /** - * 仓库 - */ - private Integer pkWarehouse; - - /** - * 盘点类型 1=盘亏 2=盘盈 - */ - @Transaction(transactionKey= EnumsPrefixConstants.INVENTORY_TYPE) - private Integer invType; - - /** - * 盘点类型 1=盘亏 2=盘盈 - */ - private String invTypeVal; - - - private List inventoryBiExtList; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/io/controller/manage/IoOrderController.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/io/controller/manage/IoOrderController.java deleted file mode 100644 index 53319300..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/io/controller/manage/IoOrderController.java +++ /dev/null @@ -1,256 +0,0 @@ -package com.hzs.scm.io.controller.manage; - - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.ObjectUtil; -import com.hzs.common.core.annotation.Log; -import com.hzs.common.core.constant.msg.MemberMsgConstants; -import com.hzs.common.core.constant.msg.ScmMsgConstants; -import com.hzs.common.core.enums.*; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.scm.io.ext.IoOrderExt; -import com.hzs.common.domain.scm.io.ext.IoOrderItemsExt; -import com.hzs.common.domain.scm.pub.ScmOrderApproveLog; -import com.hzs.common.security.service.UserTokenService; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.common.util.TransactionUtils; -import com.hzs.scm.io.param.IoOrderItemsParam; -import com.hzs.scm.io.param.IoOrderParam; -import com.hzs.scm.io.service.IIoOrderItemsService; -import com.hzs.scm.io.service.IIoOrderService; -import com.hzs.scm.io.vo.IoOrderBVo; -import com.hzs.scm.io.vo.IoOrderVo; -import com.hzs.scm.pub.controller.ScmController; -import com.hzs.scm.pub.param.ScmApproveParam; -import com.hzs.scm.pub.service.IScmOrderApproveLogService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -/** - *

- * 业务领用订单表头 前端控制器 - *

- * - * @author hzs - * @since 2024-04-22 - */ -@RestController -@RequestMapping("/manage/io") -public class IoOrderController extends ScmController { - - @Autowired - private IIoOrderService orderService; - - @Autowired - private IIoOrderItemsService orderItemsService; - - @Autowired - private IScmOrderApproveLogService scmOrderApproveLogService; - - @Autowired - private UserTokenService userTokenService; - - /** - * 查询列表 - * - * @return cubasdocParam 入参 - */ - @PostMapping("/list") - @Log(module = EOperationModule.IO_ORDER, business = EOperationBusiness.IO_ORDER, method = EOperationMethod.SELECT) - public TableDataInfo listIoOrder(@RequestBody IoOrderParam ioOrderParam) { - startPage(); - ioOrderParam.setPkCountry(SecurityUtils.getPkCountry()); - List ioOrderExtList = orderService.queryIoOrderByCondition(ioOrderParam); - List orderVoList = packageScmReturnVo(ioOrderExtList); - return packageTableDataInfo(ioOrderExtList, orderVoList); - } - - private List packageScmReturnVo(List orderExtList) { - List ioOrderVoList = new ArrayList<>(); - for (IoOrderExt ioOrderExt : orderExtList) { - IoOrderVo ioOrderVo = BeanUtil.copyProperties(ioOrderExt, IoOrderVo.class); - List orderItemsExtList = ioOrderExt.getOrderItemsExtList(); - if(CollectionUtil.isNotEmpty(orderItemsExtList)) { - List returnbVoList = BeanUtil.copyToList(orderItemsExtList, IoOrderBVo.class); - ioOrderVo.setScmReturnbVoList(returnbVoList); - } - ioOrderVoList.add(ioOrderVo); - } - return ioOrderVoList; - } - - /** - * 查询订单的明细 - * - * @return cubasdocParam 入参 - */ - @GetMapping("/list-detail/{pkId}") - public TableDataInfo queryToIoOrderItems(@PathVariable Long pkId) { - List orderItemsExtList = orderItemsService.queryListIoOrderItemsByPk(SecurityUtils.getPkCountry(), pkId); - List scmReturnVoList = new ArrayList<>(); - for (IoOrderItemsExt orderItemsExt : orderItemsExtList) { - scmReturnVoList.add(BeanUtil.copyProperties(orderItemsExt, IoOrderBVo.class)); - } - return packageTableDataInfo(orderItemsExtList, scmReturnVoList); - } - - - /** - * 新增采购入库 - * - * @param ioOrderParam 入参 - */ - @PostMapping("/insert") - @Log(module = EOperationModule.IO_ORDER, business = EOperationBusiness.IO_ORDER, method = EOperationMethod.INSERT) - public AjaxResult saveIoOrder(@RequestBody IoOrderParam ioOrderParam) { - int pkCountry = SecurityUtils.getPkCountry(); - // 验证供应商 - String msg = validateIoOrderMsg(ioOrderParam, pkCountry); - if (ObjectUtil.isNotEmpty(msg)) { - return AjaxResult.error(TransactionUtils.getContent(msg)); - } - // 计算价税合计、总数量 - ioOrderParam.setPkCountry(pkCountry); - orderService.insertSaveIoOrderByOrderParam(ioOrderParam, SecurityUtils.getUserId()); - return AjaxResult.success(); - } - - /** - * 修改采购入库 - * - * @param ioOrderParam 入参 - */ - @PostMapping("/update") - @Log(module = EOperationModule.IO_ORDER, business = EOperationBusiness.IO_ORDER, method = EOperationMethod.UPDATE) - public AjaxResult updateIoOrder(@RequestBody IoOrderParam ioOrderParam) { - if (ioOrderParam.getPkId() == null) { - return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.REQUIRED_NOT_EMPTY)); - } - int pkCountry = SecurityUtils.getPkCountry(); - // 验证订单状态 只有保存状态的采购订单可以进行修改 - IoOrderExt ioOrderExt = orderService.queryIoOrderById(ioOrderParam.getPkId(), EScmOrderStatus.SAVE.getValue()); - if (ioOrderExt == null) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.IO_ORDER_NOT_EXIST)); - } - String msg = validateIoOrderMsg(ioOrderParam, pkCountry); - if (ObjectUtil.isNotEmpty(msg)) { - return AjaxResult.error(TransactionUtils.getContent(msg)); - } - // 计算价税合计、总数量 - ioOrderParam.setPkCountry(pkCountry); - orderService.updateIoOrderByOrderParam(ioOrderExt, ioOrderParam, SecurityUtils.getUserId()); - return AjaxResult.success(); - } - - /* - * @description: 验证订单相关信息 - * @author: sui q - * @date: 2023/11/21 11:43 - * @param: null null - **/ - private String validateIoOrderMsg(IoOrderParam ioOrderParam, int pkCountry) { - Set storehouseIdSet = new HashSet<>(); - if (validateIoOrderParam(ioOrderParam, storehouseIdSet)) { - return MemberMsgConstants.REQUIRED_NOT_EMPTY; - } - // 验证供应商 - if(ioOrderParam.getPkCubasdoc() != null) { - String msg = validateCuBasDoc(ioOrderParam.getPkCubasdoc(), pkCountry); - if (ObjectUtil.isNotEmpty(msg)) { - return msg; - } - } - // 验证采购组织 - String msg = validateSysCorp(ioOrderParam.getPkCorp(), pkCountry); - if(ObjectUtil.isNotEmpty(msg)){ - return msg; - } - if(storehouseIdSet.size() >0) { - // 验证仓库，根据采购组织验证 - msg = validateStorehouse(storehouseIdSet, pkCountry, ioOrderParam.getPkCorp()); - if (ObjectUtil.isNotEmpty(msg)) { - return msg; - } - } - // 验证产品，根据产品 - // 验证规格、规格分类 需要根据产品查询 处理specsName - String message = validateProductBas(ioOrderParam.getOrderItemsParamList()); - if(ObjectUtil.isNotEmpty(message)){ - return message; - } - return null; - } - - private Boolean validateIoOrderParam(IoOrderParam ioOrderParam, Set storehouseIdSet) { - // 验证 供应商、采购组织不能为空 - if (ioOrderParam.getPkPurpose() == null || - ioOrderParam.getPkCorp() == null || CollectionUtil.isEmpty(ioOrderParam.getOrderItemsParamList())) { - return Boolean.TRUE; - } - // 验证 采购订单明细字段不能为空 - for (IoOrderItemsParam orderItemsParam : ioOrderParam.getOrderItemsParamList()) { - if (orderItemsParam.getPkProductBas() == null || orderItemsParam.getPkUnit() == null || orderItemsParam.getNnum() == null || - CollectionUtil.isEmpty(orderItemsParam.getScmItemSpecsList())) { - return Boolean.TRUE; - } - // 验证产品id 仓库id - if(orderItemsParam.getPkStorehouse() != null) { - storehouseIdSet.add(orderItemsParam.getPkStorehouse()); - } - } - return Boolean.FALSE; - } - - /** - * 删除采购入库 - * - * @param pkId 主键 - */ - @DeleteMapping("/{pkId}") - @Log(module = EOperationModule.IO_ORDER, business = EOperationBusiness.IO_ORDER, method = EOperationMethod.DELETE) - public AjaxResult delete(@PathVariable Long pkId) { - // 验证是否存在订单，订单状态是否是保存状态 - if (pkId == null) { - return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.REQUIRED_NOT_EMPTY)); - } - // 验证订单状态 只有保存状态的采购订单可以进行修改 - IoOrderExt ioOrderExt = orderService.queryIoOrderById(pkId, EScmOrderStatus.SAVE.getValue()); - if (ioOrderExt == null) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.IO_ORDER_NOT_EXIST)); - } - orderService.deleteIoOrder(pkId, SecurityUtils.getUserId()); - return AjaxResult.success(); - } - - /** - * 撤销订单并入库（走签呈），签呈页面点击确定按钮 - * - * @param scmApproveParam 参数 - */ - @PostMapping("/submit") - @Log(module = EOperationModule.IO_ORDER, business = EOperationBusiness.IO_ORDER, method = EOperationMethod.UPDATE) - public AjaxResult submitIoOrder(@RequestBody ScmApproveParam scmApproveParam) { - scmApproveParam.setPkCountry(SecurityUtils.getPkCountry()); - if(scmApproveParam.getPkId() == null){ - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.IO_ORDER_NOT_EXIST)); - } - IoOrderExt ioOrderExt = orderService.queryIoOrderById(scmApproveParam.getPkId(), EScmOrderStatus.SAVE.getValue()); - if (ioOrderExt == null) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.IO_ORDER_NOT_EXIST)); - } - // 验证该订单是否存在签呈，存在待审核的签呈不能再次发起 - List scmOrderApproveLogs = scmOrderApproveLogService.queryScmOrderApproveLogByCondition(scmApproveParam.getPkId(), EApprovalBusiness.IO_ORDER_APPROVE.getValue(), null); - if(CollectionUtil.isNotEmpty(scmOrderApproveLogs)){ - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.IO_ORDER_EXISTS_AGENT)); - } - orderService.auditIoOrderByIoOrderSubmit(scmApproveParam, userTokenService.getLoginUser()); - return AjaxResult.success(); - } -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/io/mapper/IoOrderItemsMapper.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/io/mapper/IoOrderItemsMapper.java deleted file mode 100644 index 66391b1c..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/io/mapper/IoOrderItemsMapper.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.hzs.scm.io.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.scm.io.IoOrderItems; -import com.hzs.common.domain.scm.io.ext.IoOrderItemsExt; -import com.hzs.common.domain.scm.po.PoOrderItems; -import com.hzs.common.domain.scm.po.ext.PoOrderItemsExt; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - *

- * 业务领用订单明细 Mapper 接口 - *

- * - * @author hzs - * @since 2024-04-22 - */ -public interface IoOrderItemsMapper extends BaseMapper { - /* - * @description: 删除订单明细 - * @author: sui q - * @date: 2023/11/21 14:23 - * @param: null null - **/ - void deleteOrderItemsService(@Param("ioOrderItemsList") List ioOrderItemsList, @Param("pkMember") Long pkMember); - - /* - * @description: 查询订单明细 - * @author: sui q - * @date: 2023/11/23 14:17 - * @param: null null - **/ - List queryListIoOrderItemsByPk(@Param("pkCountry") Integer pkCountry, @Param("pkOrder") Long pkOrder); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/io/mapper/IoOrderMapper.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/io/mapper/IoOrderMapper.java deleted file mode 100644 index 455dbf41..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/io/mapper/IoOrderMapper.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.hzs.scm.io.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.scm.io.IoOrder; -import com.hzs.common.domain.scm.io.ext.IoOrderExt; -import com.hzs.common.domain.scm.po.ext.PoOrderExt; -import com.hzs.scm.io.param.IoOrderItemsParam; -import com.hzs.scm.io.param.IoOrderParam; -import com.hzs.scm.po.param.PoOrderItemsParam; -import com.hzs.scm.po.param.PoOrderParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - *

- * 业务领用订单表头 Mapper 接口 - *

- * - * @author hzs - * @since 2024-04-22 - */ -public interface IoOrderMapper extends BaseMapper { - - /* - * @description: 根据主键查询采购订单、采购订单明细 - * @author: sui q - * @date: 2023/11/21 10:49 - * @param: null null - **/ - IoOrderExt queryIoOrderById(@Param("pkOrder") Long pkOrder, @Param("orderStatus") Integer orderStatus); - - /* - * @description: 根据查询条件查询采购订单 - * @author: sui q - * @date: 2023/11/21 15:01 - * @param: null null - **/ - List queryIoOrderByCondition(IoOrderParam ioOrderParam); - -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/io/param/IoOrderItemsParam.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/io/param/IoOrderItemsParam.java deleted file mode 100644 index 49bf4be1..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/io/param/IoOrderItemsParam.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.hzs.scm.io.param; - -import com.hzs.scm.pub.param.ItemSpecsParam; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -/** - * @description: 业务领用订单明细表参数 - * @author: sui q - * @time: 2024/4/22 11:01 - * @classname: IoOrderItemParam - * @package_name: com.hzs.scm.io.param - * version 1.0.0 - */ -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class IoOrderItemsParam implements Serializable { - - /** - * 主键 - */ - private Long pkId; - - private Long pkOrder; - - /** - * 产品基础信息 - */ - private Integer pkProductBas; - - /** - * 仓库 - */ - private Integer pkStorehouse; - - - /** - * 单位 - */ - private Integer pkUnit; - - /** - * 数量 - */ - private BigDecimal nnum; - - /** - * 明细表规格明细 - */ - private List scmItemSpecsList; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/io/param/IoOrderParam.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/io/param/IoOrderParam.java deleted file mode 100644 index 9b9364c6..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/io/param/IoOrderParam.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.hzs.scm.io.param; - -import com.hzs.scm.pub.param.ScmPubParam; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.List; - -/** - * @description: 业务领用订单参数 - * @author: sui q - * @time: 2024/4/22 10:58 - * @classname: IoOrderParam - * @package_name: com.hzs.scm.po.mapper - * version 1.0.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class IoOrderParam extends ScmPubParam { - - /** - * 主键 - */ - private Long pkId; - - /** - * 供应商 取bd_cubasdoc 类型为1 2的 - */ - private Integer pkCubasdoc; - - /** - * 用途 - */ - private Integer pkPurpose; - - /** - * 收货人 - */ - private String recName; - - /** - * 收货电话 - */ - private String recPhone; - - /** - * 省 - */ - private Integer recProvince; - - /** - * 市 - */ - private Integer recCity; - - /** - * 县 - */ - private Integer recCounty; - - /** - * 收货地址 - */ - private String recAddress; - - /** - * 备注 - */ - private String remark; - - /** - * 业务领用订单明细 - */ - private List orderItemsParamList; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/io/service/IIoOrderItemsService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/io/service/IIoOrderItemsService.java deleted file mode 100644 index 7819ec88..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/io/service/IIoOrderItemsService.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.hzs.scm.io.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.scm.io.IoOrderItems; -import com.hzs.common.domain.scm.io.ext.IoOrderItemsExt; - -import java.util.List; - -/** - *

- * 业务领用订单明细 服务类 - *

- * - * @author hzs - * @since 2024-04-22 - */ -public interface IIoOrderItemsService extends IService { - /* - * @description: 删除订单明细 - * @author: sui q - * @date: 2023/11/21 14:23 - * @param: null null - **/ - void deleteOrderItemsService(List ioOrderItemsList, Long pkMember); - - /* - * @description: 删除订单明细，根据订单主键 - * @author: sui q - * @date: 2023/11/21 14:55 - * @param: null null - **/ - void deleteOrderItemsByPkOrder(Long pkOrder, Long pkMember); - - /* - * @description: 查询业务领用明细 - * @author: sui q - * @date: 2023/11/23 14:17 - * @param: null null - **/ - List queryListIoOrderItemsByPk(Integer pkCountry, Long pkOrder); - - /* - * @description: 查询明细表明细 - * @author: sui q - * @date: 2023/11/25 17:39 - * @param: null null - **/ - List queryIoOrderItemsByList(List idList); - -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/io/service/IIoOrderService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/io/service/IIoOrderService.java deleted file mode 100644 index 7ecdbb87..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/io/service/IIoOrderService.java +++ /dev/null @@ -1,101 +0,0 @@ -package com.hzs.scm.io.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.scm.io.IoOrder; -import com.hzs.common.domain.scm.io.ext.IoOrderExt; -import com.hzs.common.domain.scm.po.ext.PoOrderExt; -import com.hzs.common.domain.scm.purchase.ext.IcPurchaseInBExt; -import com.hzs.scm.io.param.IoOrderItemsParam; -import com.hzs.scm.io.param.IoOrderParam; -import com.hzs.scm.po.param.PoOrderItemsParam; -import com.hzs.scm.po.param.PoOrderParam; -import com.hzs.scm.pub.param.ScmApproveParam; -import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; -import com.hzs.system.sys.dto.LoginUser; - -import java.util.List; - -/** - *

- * 业务领用订单表头 服务类 - *

- * - * @author hzs - * @since 2024-04-22 - */ -public interface IIoOrderService extends IService { - - /* - * @description: 保存业务领用 - * @author: sui q - * @date: 2023/11/20 15:54 - * @param: null null - **/ - void insertSaveIoOrderByOrderParam(IoOrderParam ioOrderParam, Long pkMember); - - /* - * @description: 修改保存业务领用订单 - * @author: sui q - * @date: 2023/11/21 11:51 - * @param: null null - **/ - void updateIoOrderByOrderParam(IoOrderExt ioOrderExt, IoOrderParam ioOrderParam, Long pkMember); - - /* - * @description: 根据订单主键查询业务领用 - * @author: sui q - * @date: 2023/11/21 10:47 - * @param: null null - **/ - IoOrderExt queryIoOrderById(Long pkOrder, Integer orderStatus); - - /* - * @description: 查询签呈显示的业务领用 - * @author: sui q - * @date: 2023/11/28 15:00 - * @param: null null - **/ - IoOrderExt queryDisIoOrderById(Long pkOrder, Integer orderStatus); - - /* - * @description: 根据查询条件查询业务领用 - * @author: sui q - * @date: 2023/11/21 15:01 - * @param: null null - **/ - List queryIoOrderByCondition(IoOrderParam ioOrderParam); - - /* - * @description: 删除业务领用 - * @author: sui q - * @date: 2023/11/21 14:54 - * @param: null null - **/ - void deleteIoOrder(Long pkOrder, Long pkMember); - - - /* - * @description: 提交业务领用（走审批） - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - void auditIoOrderByIoOrderSubmit(ScmApproveParam scmApproveParam, LoginUser loginUser); - - /* - * @description: 审核通过业务领用 - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - String auditIoOrderByIoOrderAgree(ApprovalBusinessResultDTO approvalBusinessResultDTO); - - /* - * @description: 审核驳回业务领用 - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - String auditIoOrderByIoOrderReject(ApprovalBusinessResultDTO approvalBusinessResultDTO); - -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/io/service/impl/IoOrderItemsServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/io/service/impl/IoOrderItemsServiceImpl.java deleted file mode 100644 index 10f88ca0..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/io/service/impl/IoOrderItemsServiceImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.hzs.scm.io.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.constant.SaOrderFieldConstants; -import com.hzs.common.core.constant.SystemFieldConstants; -import com.hzs.common.core.enums.EYesNo; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.domain.scm.io.IoOrderItems; -import com.hzs.common.domain.scm.io.ext.IoOrderItemsExt; -import com.hzs.common.domain.scm.po.PoOrderItems; -import com.hzs.scm.io.mapper.IoOrderItemsMapper; -import com.hzs.scm.io.service.IIoOrderItemsService; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - *

- * 业务领用订单明细 服务实现类 - *

- * - * @author hzs - * @since 2024-04-22 - */ -@Service -public class IoOrderItemsServiceImpl extends ServiceImpl implements IIoOrderItemsService { - - @Override - public void deleteOrderItemsService(List ioOrderItemsList, Long pkMember) { - baseMapper.deleteOrderItemsService(ioOrderItemsList, pkMember); - } - - @Override - public void deleteOrderItemsByPkOrder(Long pkOrder, Long pkMember) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.set(SystemFieldConstants.DEL_FLAG, EYesNo.NO.getIntValue()); - updateWrapper.set(SystemFieldConstants.PK_MODIFIED, pkMember); - updateWrapper.set(SystemFieldConstants.MODIFIED_TIME, DateUtils.currentDateTime()); - updateWrapper.eq(SaOrderFieldConstants.PK_ORDER, pkOrder); - update(updateWrapper); - } - - @Override - public List queryListIoOrderItemsByPk(Integer pkCountry, Long pkOrder) { - return baseMapper.queryListIoOrderItemsByPk(pkCountry, pkOrder); - } - - @Override - public List queryIoOrderItemsByList(List idList) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in(SystemFieldConstants.PK_ID, idList); - return baseMapper.selectList(queryWrapper); - } -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/io/service/impl/IoOrderServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/io/service/impl/IoOrderServiceImpl.java deleted file mode 100644 index 15a89df3..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/io/service/impl/IoOrderServiceImpl.java +++ /dev/null @@ -1,462 +0,0 @@ -package com.hzs.scm.io.service.impl; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.constant.*; -import com.hzs.common.core.constant.msg.DocumentMsgConstants; -import com.hzs.common.core.constant.msg.ScmMsgConstants; -import com.hzs.common.core.enums.*; -import com.hzs.common.core.service.RedisService; -import com.hzs.common.core.utils.CommonUtil; -import com.hzs.common.core.utils.ComputeUtil; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.domain.member.base.CuMember; -import com.hzs.common.domain.sale.ext.SaOrderExt; -import com.hzs.common.domain.sale.order.SaOrderItems; -import com.hzs.common.domain.scm.general.IcGeneralOutB; -import com.hzs.common.domain.scm.general.IcGeneralOutH; -import com.hzs.common.domain.scm.io.IoOrder; -import com.hzs.common.domain.scm.io.IoOrderItems; -import com.hzs.common.domain.scm.io.ext.IoOrderExt; -import com.hzs.common.domain.scm.io.ext.IoOrderItemsExt; -import com.hzs.common.domain.scm.pub.ScmItemSpecs; -import com.hzs.common.domain.scm.pub.ScmOrderApproveLog; -import com.hzs.common.domain.system.sys.SysUser; -import com.hzs.common.util.TransactionUtils; -import com.hzs.member.base.IMemberServiceApi; -import com.hzs.sale.order.ISaOrderServiceApi; -import com.hzs.scm.general.service.IIcGeneralOutBService; -import com.hzs.scm.general.service.IIcGeneralOutHService; -import com.hzs.scm.io.mapper.IoOrderMapper; -import com.hzs.scm.io.param.IoOrderItemsParam; -import com.hzs.scm.io.param.IoOrderParam; -import com.hzs.scm.io.service.IIoOrderItemsService; -import com.hzs.scm.io.service.IIoOrderService; -import com.hzs.scm.no.service.IScmBillNoService; -import com.hzs.scm.pub.param.ItemSpecsParam; -import com.hzs.scm.pub.param.ScmApproveParam; -import com.hzs.scm.pub.service.IScmItemSpecsService; -import com.hzs.scm.pub.service.IScmOrderApproveLogService; -import com.hzs.system.base.ICurrencyServiceApi; -import com.hzs.system.base.dto.CurrencyDTO; -import com.hzs.system.sys.IApprovalServiceApi; -import com.hzs.system.sys.IUserServiceApi; -import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; -import com.hzs.system.sys.dto.LoginUser; -import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.math.BigDecimal; -import java.time.temporal.ChronoUnit; -import java.util.*; - -/** - *

- * 业务领用订单表头 服务实现类 - *

- * - * @author hzs - * @since 2024-04-22 - */ -@Service -public class IoOrderServiceImpl extends ServiceImpl implements IIoOrderService { - - @DubboReference - private ICurrencyServiceApi currencyServiceApi; - - @DubboReference - private IApprovalServiceApi iApprovalServiceApi; - - @DubboReference - private IUserServiceApi userServiceApi; - - @Autowired - private IScmBillNoService scmBillNoService; - - @Autowired - private IIoOrderItemsService ioOrderItemsService; - - @Autowired - private IScmItemSpecsService scmItemSpecsService; - - @Autowired - private RedisService redisService; - - @Autowired - private IScmOrderApproveLogService scmOrderApproveLogService; - - @Autowired - private IIoOrderItemsService orderItemsService; - - @Autowired - private IIcGeneralOutHService generalOutService; - - @Autowired - private IIcGeneralOutBService generalOutBiService; - - @DubboReference - private IMemberServiceApi memberServiceApi; - - @DubboReference - private ISaOrderServiceApi saOrderServiceApi; - - @Override - public void insertSaveIoOrderByOrderParam(IoOrderParam ioOrderParam, Long pkMember) { - packageIoOrderByParam(ioOrderParam, pkMember); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void updateIoOrderByOrderParam(IoOrderExt ioOrderExt, IoOrderParam ioOrderParam, Long pkMember) { - // 更新规格明细表，先删除在新增 根据主表主键删除 - scmItemSpecsService.deleteItemSpecsById(EScmOrderType.IO_ORDER.getValue(), ioOrderExt.getPkId(), pkMember); - ioOrderExt.setPkCorp(ioOrderParam.getPkCorp()); - ioOrderExt.setPkCubasdoc(ioOrderParam.getPkCubasdoc()); - ioOrderExt.setOrderDate(ioOrderParam.getOrderDate()); - ioOrderExt.setPkPurpose(ioOrderParam.getPkPurpose()); - ioOrderExt.setRemark(ioOrderParam.getRemark()); - // 更新订单明细表 分为3部分 删除的 新增的 修改的 - List orderItemsList = getIoOrderItems(ioOrderParam, pkMember, ioOrderExt); - // 重新处理订单明细，将订单明细分为 删除的、新增的、修改的 - List orderItemsExtList = ioOrderExt.getOrderItemsExtList(); - // 剩余的就是需要删除的 - Map orderItemsExtHashMap = new HashMap<>(); - orderItemsExtList.forEach(poOrderItemsExt -> - orderItemsExtHashMap.put(poOrderItemsExt.getPkId(), poOrderItemsExt)); - List insertOrderItems = new ArrayList<>(); - List updateOrderItems = new ArrayList<>(); - List saveScmItemSpecsList = new ArrayList<>(); - for (IoOrderItems orderItemsExt : orderItemsList) { - if (orderItemsExt.getPkId() != null && orderItemsExtHashMap.containsKey(orderItemsExt.getPkId())) { - // 修改的 - orderItemsExt.setPkCreator(orderItemsExtHashMap.get(orderItemsExt.getPkId()).getPkCreator()); - updateOrderItems.add(orderItemsExt); - saveScmItemSpecsList.addAll(orderItemsExt.getScmItemSpecsList()); - orderItemsExtHashMap.remove(orderItemsExt.getPkId()); - } else { - // 新增的 - orderItemsExt.setPkOrder(ioOrderExt.getPkId()); - insertOrderItems.add(orderItemsExt); - } - } - String purchaseLockKey = CacheConstants.IO_ORDER_LOCK + ioOrderExt.getPkId(); - try { - if (!redisService.lockKeyOnce(purchaseLockKey)) { - throw new RuntimeException(ScmMsgConstants.BILL_NOT_OPERATION); - } - if (insertOrderItems.size() > 0) { - // 保存订单明细 新增的 - ioOrderItemsService.saveBatch(insertOrderItems); - List scmItemSpecsList = scmItemSpecsService.packageOrderItemsSpecs(insertOrderItems, ioOrderExt.getPkId()); - if (scmItemSpecsList.size() > 0) { - saveScmItemSpecsList.addAll(scmItemSpecsList); - } - } - if (updateOrderItems.size() > 0) { - // 修改订单明细 修改的 - updateOrderItems.forEach(updateItems -> - ioOrderItemsService.updateById(updateItems)); - - } - if (orderItemsExtHashMap.size() > 0) { - // 删除订单明细 删除的 - List delOrderItems = new ArrayList<>(); - orderItemsExtHashMap.forEach((key, value) -> delOrderItems.add(value)); - ioOrderItemsService.deleteOrderItemsService(delOrderItems, pkMember); - } - // 保存订单明细规格 - if (saveScmItemSpecsList.size() > 0) { - scmItemSpecsService.saveBatch(saveScmItemSpecsList); - } - // 更新订单表 - updateById(ioOrderExt); - } finally { - redisService.unlock(purchaseLockKey); - } - } - - @Override - public IoOrderExt queryIoOrderById(Long pkOrder, Integer orderStatus) { - return baseMapper.queryIoOrderById(pkOrder, orderStatus); - } - - @Override - public IoOrderExt queryDisIoOrderById(Long pkOrder, Integer orderStatus) { - IoOrderParam orderParam = new IoOrderParam(); - orderParam.setPkId(pkOrder); - orderParam.setOrderStatus(orderStatus); - List orderExtList = baseMapper.queryIoOrderByCondition(orderParam); - if (CollectionUtil.isNotEmpty(orderExtList)) { - return orderExtList.get(0); - } - return null; - } - - @Override - public List queryIoOrderByCondition(IoOrderParam ioOrderParam) { - if (ioOrderParam.getEndDate() != null) { - ioOrderParam.setEndDate(DateUtils.afterDate(1, ChronoUnit.DAYS, ioOrderParam.getEndDate())); - } - return baseMapper.queryIoOrderByCondition(ioOrderParam); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteIoOrder(Long pkOrder, Long pkMember) { - String orderLockKey = CacheConstants.IO_ORDER_LOCK + pkOrder; - if (!redisService.lockKeyOnce(orderLockKey)) { - throw new RuntimeException(ScmMsgConstants.BILL_NOT_OPERATION); - } - // 删除规格明细表 - scmItemSpecsService.deleteItemSpecsById(EScmOrderType.IO_ORDER.getValue(), pkOrder, pkMember); - // 删除订单明细表 - ioOrderItemsService.deleteOrderItemsByPkOrder(pkOrder, pkMember); - // 删除订单主表 - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.set(SystemFieldConstants.DEL_FLAG, EYesNo.NO.getIntValue()); - updateWrapper.set(SystemFieldConstants.PK_MODIFIED, pkMember); - updateWrapper.set(SystemFieldConstants.MODIFIED_TIME, DateUtils.currentDateTime()); - updateWrapper.eq(SystemFieldConstants.PK_ID, pkOrder); - update(updateWrapper); - redisService.unlock(orderLockKey); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void auditIoOrderByIoOrderSubmit(ScmApproveParam scmApproveParam, LoginUser loginUser) { -// 更新单据状态 - updateIoOrderStatus(scmApproveParam.getPkId(), loginUser, EScmOrderStatus.SUBMIT.getValue()); - scmOrderApproveLogService.submitOrder(scmApproveParam, EApprovalBusiness.IO_ORDER_APPROVE, EOrderPrefix.IO_ORDER_CODE, loginUser); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public String auditIoOrderByIoOrderAgree(ApprovalBusinessResultDTO approvalBusinessResultDTO) { - return approveIoOrderByStatus(approvalBusinessResultDTO, EScmOrderStatus.APPROVE.getValue(), EAgentApprovalStatus.APPROVED.getValue()); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public String auditIoOrderByIoOrderReject(ApprovalBusinessResultDTO approvalBusinessResultDTO) { - return approveIoOrderByStatus(approvalBusinessResultDTO, EScmOrderStatus.SAVE.getValue(), EAgentApprovalStatus.REFUSE.getValue()); - } - - private String approveIoOrderByStatus(ApprovalBusinessResultDTO approvalBusinessResultDTO, Integer scmOrderStatus, Integer approveStatus) { - // 查询订单日志表 - List scmOrderApproveLogList = scmOrderApproveLogService.queryScmOrderApproveLogByCondition(null, approvalBusinessResultDTO.getEApprovalBusiness().getValue(), approvalBusinessResultDTO.getBusinessCode()); - if (scmOrderApproveLogList == null || scmOrderApproveLogList.size() == 0) { - return TransactionUtils.getContent(DocumentMsgConstants.DOCUMENT_NOT_EXISTS); - } - ScmOrderApproveLog scmOrderApproveLog = scmOrderApproveLogList.get(0); - // 查询采购订单 - IoOrderExt ioOrderExt = queryIoOrderById(scmOrderApproveLog.getPkOrder(), EScmOrderStatus.SUBMIT.getValue()); - if (ioOrderExt == null) { - log.error("订单撤单同意处理失败: 签呈已处理!"); - return TransactionUtils.getContent(DocumentMsgConstants.DOCUMENT_HAS_HANDLE); - } - // 更新采购入库单状态 - updateIoOrderStatus(ioOrderExt.getPkId(), approvalBusinessResultDTO.getLoginUser(), scmOrderStatus); - // 更新前程日志表状态 - scmOrderApproveLogService.updateScmOrderApproveStatus(scmOrderApproveLog.getPkId(), approvalBusinessResultDTO.getLoginUser().getUserId(), approveStatus); - // 审核通过，供应商的生成销售订单，仓库的生成其他出库单 - if (EAgentApprovalStatus.APPROVED.getValue() == approveStatus) { - // 查询带规格的明细 - List orderItemsExtList = orderItemsService.queryListIoOrderItemsByPk(ioOrderExt.getPkCountry(), ioOrderExt.getPkId()); - // 分为2类 - if (ioOrderExt.getPkCubasdoc() == null) { - // 生成其他出库单，其他出库单在走签呈 - IcGeneralOutH icGeneralOutH = IcGeneralOutH.builder() - .pkDept(ioOrderExt.getPkDept()) - .pkCorp(ioOrderExt.getPkCorp()) - .pkWhsmanager(ioOrderExt.getPkWhsmanager()) - .orderDate(DateUtils.currentDate()) - .orderType(EScmOrderType.GENERAL_OUT.getValue()) - .orderStatus(EScmOrderStatus.SAVE.getValue()) - .orderCode(scmBillNoService.createScmBillNoByOrderType(EScmOrderType.GENERAL_OUT.getValue())) - .remark(ioOrderExt.getOrderCode() + "业务领用单领用") - .build(); - icGeneralOutH.setPkCountry(ioOrderExt.getPkCountry()); - icGeneralOutH.setPkCreator(ioOrderExt.getPkCreator()); - List generalOutBiList = new ArrayList<>(); - BigDecimal totalNum = BigDecimal.ZERO; - for (IoOrderItemsExt orderItemsExt : orderItemsExtList) { - icGeneralOutH.setPkWarehouse(orderItemsExt.getPkStorehouse()); - IcGeneralOutB generalOutB = IcGeneralOutB.builder() - .pkUnit(orderItemsExt.getPkUnit()) - .pkProduct(orderItemsExt.getPkProduct()) - .transType(ETransType.GENERAL_OUT.getValue()) - .pkStorehouse(orderItemsExt.getPkStorehouse()) - .pkRate(orderItemsExt.getPkRate()) - .nnum(orderItemsExt.getNnum()) - .ncostprice(BigDecimal.ZERO) - .ncostmny(BigDecimal.ZERO) - .build(); - totalNum = ComputeUtil.computeAdd(totalNum, generalOutB.getNnum()); - List scmItemSpecsList = orderItemsExt.getScmItemSpecsList(); - scmItemSpecsService.packageScmItemByParam(scmItemSpecsList, generalOutB, icGeneralOutH.getPkCountry(), icGeneralOutH.getPkCreator(), - icGeneralOutH.getPkId(), generalOutB.getPkId(), EScmOrderType.GENERAL_OUT.getValue()); - generalOutBiList.add(generalOutB); - } - icGeneralOutH.setTotalNum(totalNum); - // 保存主表 - generalOutService.save(icGeneralOutH); - for (IcGeneralOutB generalOutB : generalOutBiList) { - generalOutB.setPkGeneral(icGeneralOutH.getPkId()); - } - // 保存子表 - generalOutBiService.saveBatch(generalOutBiList); - List saveScmItemSpecsList = scmItemSpecsService.packageOrderItemsSpecs(generalOutBiList, icGeneralOutH.getPkId()); - if (saveScmItemSpecsList.size() > 0) { - scmItemSpecsService.saveBatch(saveScmItemSpecsList); - } - } else { - // 生成销售订单 - // 获取201账户，目前订单先挂在201下 - SaOrderExt saOrderExt = new SaOrderExt(); - CuMember cuMember = memberServiceApi.getMember(VertexConstants.GJ30720200CODE).getData(); - saOrderExt.setOrderCode(CommonUtil.createSerialNumber(EOrderPrefix.ORDER_CODE.getValue())); - saOrderExt.setOrderAmount(BigDecimal.ZERO); - saOrderExt.setOrderAchieve(BigDecimal.ZERO); - saOrderExt.setOrderAssAchieve(BigDecimal.ZERO); - saOrderExt.setPkMember(cuMember.getPkId()); - saOrderExt.setPkReference(cuMember.getPkParent()); - saOrderExt.setPkPlacement(cuMember.getPkPlaceParent()); - saOrderExt.setRecName(ioOrderExt.getRecName()); - saOrderExt.setRecPhone(ioOrderExt.getRecPhone()); - saOrderExt.setRecProvince(ioOrderExt.getRecProvince()); - saOrderExt.setRecCity(ioOrderExt.getRecCity()); - saOrderExt.setRecCounty(ioOrderExt.getRecCity()); - saOrderExt.setRecAddress(ioOrderExt.getRecAddress()); - saOrderExt.setRemark(ioOrderExt.getOrderCode() + "业务领用单领用"); - saOrderExt.setDeliveryWay(EDelivery.FAST_MAIL.getValue()); - // 订单状态先设置为待支付，支付的时候更新 - saOrderExt.setOrderStatus(EOrderStatus.PAY.getValue()); - saOrderExt.setPkVertex(cuMember.getPkVertex()); - saOrderExt.setPkCreator(ioOrderExt.getPkCreator()); - saOrderExt.setPkCountry(ioOrderExt.getPkCountry()); - saOrderExt.setCreationTime(DateUtils.currentDateTime()); - saOrderExt.setPayTime(DateUtils.currentDateTime()); - // 处理邮费 - List saOrderItemsList = new ArrayList<>(); - for (IoOrderItemsExt orderItemsExt : orderItemsExtList) { - SaOrderItems saOrderItems = SaOrderItems.builder() - .pkProduct(orderItemsExt.getPkProduct()) - .price(orderItemsExt.getSupplyPrice()) - .achievement(BigDecimal.ZERO) - .assAchievement(BigDecimal.ZERO) - .quantity(orderItemsExt.getNnum().intValue()) - .waresQuantity(0) - .pkRate(ioOrderExt.getPkRate()) - .isGift(EYesNo.NO.getIntValue()) - .specsName(orderItemsExt.getSpecsName()) - .specsNameId(orderItemsExt.getSpecsNameId()) - .isMakerGift(EYesNo.NO.getIntValue()) - .shippingChannel(orderItemsExt.getShippingChannel()) - .pkSupplier(orderItemsExt.getPkSupplier()) - .orderStatus(EOrderStatus.PAY.getValue()) - .skuCode(CommonUtil.createSkuCode(orderItemsExt.getProductCode(), orderItemsExt.getSpecsNameId())) - .build(); - if (saOrderItems.getIsGift() != null && EYesNo.YES.getIntValue() == saOrderItems.getIsGift()) { - saOrderItems.setPrice(BigDecimal.ZERO); - } - saOrderItems.setShippingChannel(saOrderItems.getShippingChannel()); - saOrderItems.setPkCreator(saOrderExt.getPkCreator()); - saOrderItems.setCreationTime(saOrderExt.getCreationTime()); - saOrderItems.setPkCountry(saOrderExt.getPkCountry()); - saOrderItems.setPkGrade(cuMember.getPkSettleGrade()); - saOrderItems.setPkAwards(cuMember.getPkAwards()); - saOrderItemsList.add(saOrderItems); - } - saOrderExt.setOrderItemsList(saOrderItemsList); - // 第二次封装订单，根据明细表计算订单主表金额、业绩 - saOrderExt.getOrderItemsList().forEach(saOrderItems -> { - saOrderExt.setPkRate(saOrderItems.getPkRate()); - if (EYesNo.YES.getIntValue() == saOrderItems.getIsGift()) { - return; - } - // 总价; - saOrderExt.setOrderAmount(ComputeUtil.computeAddMultiply(saOrderExt.getOrderAmount(), saOrderItems.getPrice(), saOrderItems.getQuantity())); - // 总业绩 - saOrderExt.setOrderAchieve(ComputeUtil.computeAddMultiply(saOrderExt.getOrderAchieve(), saOrderItems.getAchievement(), saOrderItems.getQuantity())); - // 总考核业绩 - saOrderExt.setOrderAssAchieve(ComputeUtil.computeAddMultiply(saOrderExt.getOrderAssAchieve(), saOrderItems.getAssAchievement(), saOrderItems.getQuantity())); - }); - saOrderExt.setUploadAchieve(saOrderExt.getOrderAchieve()); - if (!saOrderServiceApi.saveOrder(saOrderExt).isSuccess()) { - throw new RuntimeException("保存订单失败"); - } - } - } - return null; - } - - /* - * @description: 将采购订单的参数转换为能保存的订单 - * @author: sui q - * @date: 2023/11/20 15:53 - * @param: null null - **/ - private void packageIoOrderByParam(IoOrderParam ioOrderParam, Long pkMember) { - IoOrder ioOrder = BeanUtil.copyProperties(ioOrderParam, IoOrder.class); - List orderItemsList = getIoOrderItems(ioOrderParam, pkMember, ioOrder); - // 生成单据号 - ioOrder.setOrderCode(scmBillNoService.createScmBillNoByOrderType(EScmOrderType.IO_ORDER.getValue())); - // 保存主表 - save(ioOrder); - for (IoOrderItems ioOrderItems : orderItemsList) { - ioOrderItems.setPkOrder(ioOrder.getPkId()); - } - // 保存子表 - ioOrderItemsService.saveBatch(orderItemsList); - List saveScmItemSpecsList = scmItemSpecsService.packageOrderItemsSpecs(orderItemsList, ioOrder.getPkId()); - if (saveScmItemSpecsList.size() > 0) { - scmItemSpecsService.saveBatch(saveScmItemSpecsList); - } - } - - private List getIoOrderItems(IoOrderParam ioOrderParam, Long pkMember, IoOrder ioOrder) { - // 根据国家获得汇率 - CurrencyDTO currencyDTO = currencyServiceApi.getCurrency(ioOrderParam.getPkCountry()).getData(); - ioOrder.setPkRate(currencyDTO.getPkId()); - SysUser sysUser = userServiceApi.selectUserById(pkMember).getData(); - // 根据登录账号获得部门 - ioOrder.setPkDept(sysUser.getPkDept().intValue()); - ioOrder.setPkWhsmanager(pkMember); - // 计算累计数量 累计价税合计 - // 总数量 - BigDecimal totalNum = BigDecimal.ZERO; - List orderItemsList = new ArrayList<>(); - Date date = DateUtils.currentDateTime(); - for (IoOrderItemsParam orderItemsParam : ioOrderParam.getOrderItemsParamList()) { - IoOrderItems orderItems = BeanUtil.copyProperties(orderItemsParam, IoOrderItems.class); - orderItems.setPkRate(currencyDTO.getPkId()); - totalNum = ComputeUtil.computeAdd(totalNum, orderItems.getNnum()); - List itemSpecsParamList = orderItemsParam.getScmItemSpecsList(); - scmItemSpecsService.packageScmItemByParam(itemSpecsParamList, orderItems, ioOrderParam.getPkCountry(), pkMember, - ioOrderParam.getPkId(), orderItems.getPkId(), EScmOrderType.IO_ORDER.getValue()); - orderItemsList.add(orderItems); - } - ioOrder.setPkCountry(ioOrderParam.getPkCountry()); - if (ioOrderParam.getPkId() == null) { - ioOrder.setPkCreator(pkMember); - } else { - ioOrder.setPkModified(pkMember); - ioOrder.setModifiedTime(date); - } - ioOrder.setTotalNum(totalNum); - return orderItemsList; - } - - private void updateIoOrderStatus(Long pkId, LoginUser loginUser, Integer orderStatus) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.set(SaOrderFieldConstants.ORDER_STATUS, orderStatus); - updateWrapper.set(SystemFieldConstants.PK_MODIFIED, loginUser.getUserId()); - updateWrapper.set(SystemFieldConstants.MODIFIED_TIME, DateUtils.currentDateTime()); - updateWrapper.eq(SystemFieldConstants.PK_ID, pkId); - update(updateWrapper); - } -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/io/vo/IoOrderBVo.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/io/vo/IoOrderBVo.java deleted file mode 100644 index 1939e3b0..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/io/vo/IoOrderBVo.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.hzs.scm.io.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.scm.pub.vo.ScmReturnBVo; -import com.hzs.scm.pub.vo.ScmSpecsVO; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -/** - * @description: 供应链返回到会员端明细vo - * @author: sui q - * @time: 2023/12/7 16:38 - * @classname: PoOrderItemsVO - * @package_name: com.hzs.scm.po.vo - * version 1.0.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class IoOrderBVo extends ScmReturnBVo { - - private List scmItemSpecsList; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/io/vo/IoOrderVo.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/io/vo/IoOrderVo.java deleted file mode 100644 index 2ce1b248..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/io/vo/IoOrderVo.java +++ /dev/null @@ -1,166 +0,0 @@ -package com.hzs.scm.io.vo; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -/** - * @description: 供应链返回到会员端vo - * @author: sui q - * @time: 2023/12/7 16:38 - * @classname: PoOrderVo - * @package_name: com.hzs.scm.po.vo - * version 1.0.0 - */ -@Data -public class IoOrderVo implements Serializable { - - /** - * 主键 - */ - private Long pkId; - - /** - * 供应商名称 - */ - private String cubasdocName; - - /** - * 供应商 取bd_cubasdoc 类型为1 2的 - */ - private Integer pkCubasdoc; - - /** - * 采购公司 - */ - private Integer pkCorp; - - /** - * 部门名称 - */ - private String deptName; - - /** - * 管理员名称 - */ - private String managerName; - - /** - * 采购组织名称 - */ - private String corpName; - - /** - * 供应链订单状态 - */ - @Transaction(transactionKey = EnumsPrefixConstants.SCM_ORDER_STATUS) - private Integer orderStatus; - - private String orderStatusVal; - - /** - * 打印状态 - */ - @Transaction(transactionKey = EnumsPrefixConstants.DEALER_YES_NO) - private Integer printStatus; - - private String printStatusVal; - - /** - * 订单日期 2023-10 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date orderDate; - - /** - * 采购部门 - */ - private Integer pkDept; - - /** - * 采购人 - */ - private Long pkWhsmanager; - - /** - * 汇率 - */ - private Integer pkRate; - - /** - * 总数量 - */ - private BigDecimal totalNum; - - /** - * 订单编号 - */ - private String orderCode; - - /** - * 备注 - */ - private String remark; - - /** - * 用途 - */ - private Integer pkPurpose; - - private String purpose; - - /** - * 收货人 - */ - private String recName; - - /** - * 收货电话 - */ - private String recPhone; - - /** - * 省 - */ - private Integer recProvince; - - /** - * 市 - */ - private Integer recCity; - - /** - * 县 - */ - private Integer recCounty; - - /** - * 省 - */ - private String recProvinceName; - - /** - * 市 - */ - private String recCityName; - - /** - * 县 - */ - private String recCountyName; - - /** - * 收货地址 - */ - private String recAddress; - - @Transaction - private List scmReturnbVoList; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/listener/ScmDeliverListener.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/listener/ScmDeliverListener.java deleted file mode 100644 index 7a0d1a8b..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/listener/ScmDeliverListener.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.hzs.scm.listener; - -import cn.hutool.json.JSONUtil; -import com.hzs.common.core.constant.RabbitMqConstants; -import com.hzs.common.core.domain.R; -import com.hzs.common.core.enums.EYesNo; -import com.hzs.common.domain.sale.ext.SaDeliverExt; -import com.hzs.common.domain.scm.sale.IcDelSaleLog; -import com.hzs.sale.deliver.ISaDeliverServiceApi; -import com.hzs.scm.pub.dto.DeliverDTO; -import com.hzs.scm.sale.service.IIcDelSaleLogService; -import com.hzs.scm.sale.service.IIcSaleoutHService; -import com.hzs.system.sys.dto.LoginUser; -import com.rabbitmq.client.Channel; -import lombok.extern.slf4j.Slf4j; -import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.amqp.rabbit.annotation.*; -import org.springframework.amqp.support.AmqpHeaders; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.messaging.Message; -import org.springframework.stereotype.Component; - -import java.util.List; - -/** - * @Description: 进销存发货处理监听 - * @Author: jiang chao - * @Time: 2023/12/19 14:24 - * @Classname: ScmDeliverListener - * @PackageName: com.hzs.third.mqcall.listener - */ -@Slf4j -@Component -public class ScmDeliverListener { - - @DubboReference - private ISaDeliverServiceApi iSaDeliverServiceApi; - - @Autowired - private IIcSaleoutHService saleOutService; - - @Autowired - private IIcDelSaleLogService delSaleLogService; - - @RabbitListener(bindings = @QueueBinding( - exchange = @Exchange(value = RabbitMqConstants.SCM_DELIVER_EXCHANGE, type = "topic"), - value = @Queue(value = RabbitMqConstants.SCM_DELIVER_QUEUE, durable = "true", autoDelete = "false"), - key = RabbitMqConstants.SCM_DELIVER_KEY)) - @RabbitHandler - public void onMessage(Message message, Channel channel) throws Exception { - // 手动应答 - Long deliveryTag = (Long) message.getHeaders().get(AmqpHeaders.DELIVERY_TAG); - channel.basicAck(deliveryTag, false); - // 根据传入的ID获取翻译内容 - DeliverDTO deliverDTO = message.getPayload(); - log.info("进销存发货处理数据：{}", deliverDTO); - LoginUser loginUser = deliverDTO.getLoginUser(); - // 查询发货单及明细数据 - R> r = iSaDeliverServiceApi.queryDeliverList(deliverDTO.getDeliverIdList(), loginUser.getDataCountry()); - if (r.isSuccess()) { - List saDeliverExtList = r.getData(); - for (SaDeliverExt deliverExt : saDeliverExtList) { - IcDelSaleLog icDelSaleLog = IcDelSaleLog.builder() - .acceptParam(JSONUtil.toJsonStr(deliverExt)) - .sourceCode(deliverExt.getDeliverCode()) - .successStatus(EYesNo.YES.getIntValue()) - .build(); - icDelSaleLog.setPkCreator(deliverExt.getPkCreator()); - icDelSaleLog.setPkCountry(deliverExt.getPkCountry()); - try { - saleOutService.executeDeliverTransSaleOutByParam(deliverExt); - } catch (Exception e) { - icDelSaleLog.setErrorMsg(e.getMessage()); - icDelSaleLog.setSuccessStatus(EYesNo.NO.getIntValue()); - } finally { - // 记录日志 - delSaleLogService.save(icDelSaleLog); - } - } - return; - } - log.error("查询发货单及明细数据失败：{}", r.getMsg()); - } - -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/no/controller/manage/ScmBillNoController.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/no/controller/manage/ScmBillNoController.java deleted file mode 100644 index 8576a560..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/no/controller/manage/ScmBillNoController.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.hzs.scm.no.controller.manage; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 订单编号规则设置 前端控制器 - *

- * - * @author hzs - * @since 2024-02-21 - */ -@RestController -@RequestMapping("/com.hzs.common.domain/scm-bill-no") -public class ScmBillNoController { - -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/no/mapper/ScmBillNoMapper.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/no/mapper/ScmBillNoMapper.java deleted file mode 100644 index 21c5894a..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/no/mapper/ScmBillNoMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.hzs.scm.no.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.scm.no.ScmBillNo; - -/** - * 订单编号规则设置 Mapper 接口 - */ -public interface ScmBillNoMapper extends BaseMapper { - - /** - * 更新尾号 - */ - void updateScmBillNo(ScmBillNo scmBillNo); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/no/service/IScmBillNoService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/no/service/IScmBillNoService.java deleted file mode 100644 index dd0f1660..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/no/service/IScmBillNoService.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.hzs.scm.no.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.scm.no.ScmBillNo; - -/** - * 订单编号规则设置 服务类 - */ -public interface IScmBillNoService extends IService { - - /* - * 根据订单类型查询供应链单据编号规则 - **/ - ScmBillNo queryScmBillNoByOrderType(Integer orderType); - - /* - * 根据订单类型获得单据号 - **/ - String createScmBillNoByOrderType(Integer orderType); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/no/service/impl/ScmBillNoServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/no/service/impl/ScmBillNoServiceImpl.java deleted file mode 100644 index bbbf165e..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/no/service/impl/ScmBillNoServiceImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.hzs.scm.no.service.impl; - -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.enums.EYesNo; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.domain.scm.no.ScmBillNo; -import com.hzs.scm.no.mapper.ScmBillNoMapper; -import com.hzs.scm.no.service.IScmBillNoService; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; - -/** - * 订单编号规则设置 服务实现类 - */ -@Service -public class ScmBillNoServiceImpl extends ServiceImpl implements IScmBillNoService { - - @Override - public ScmBillNo queryScmBillNoByOrderType(Integer orderType) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("ORDER_TYPE", orderType); - List scmBillNoList = baseMapper.selectList(queryWrapper); - if (CollectionUtil.isNotEmpty(scmBillNoList)) { - return scmBillNoList.get(0); - } - return null; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public synchronized String createScmBillNoByOrderType(Integer orderType) { - ScmBillNo scmBillNo = queryScmBillNoByOrderType(orderType); - if (scmBillNo == null) { - throw new RuntimeException("未配置订单编号规则，请配置订单编号规则！"); - } - StringBuilder billNo = new StringBuilder(scmBillNo.getPrefixCode()); - if (EYesNo.YES.getIntValue() == scmBillNo.getContainYear()) { - billNo.append(DateUtils.currentYear()); - } - if (EYesNo.YES.getIntValue() == scmBillNo.getContainYear()) { - billNo.append(String.format("%02d", DateUtils.currentMonth())); - } - if (EYesNo.YES.getIntValue() == scmBillNo.getContainYear()) { - billNo.append(String.format("%02d", DateUtils.currentDay())); - } - billNo.append(String.format("%0" + scmBillNo.getEndDigit() + "d", scmBillNo.getNextValue())); - baseMapper.updateScmBillNo(scmBillNo); - // 位数+1 - return billNo.toString(); - } - -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/po/controller/manage/PoOrderController.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/po/controller/manage/PoOrderController.java deleted file mode 100644 index c983c633..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/po/controller/manage/PoOrderController.java +++ /dev/null @@ -1,283 +0,0 @@ -package com.hzs.scm.po.controller.manage; - - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.ObjectUtil; -import com.hzs.common.core.annotation.Log; -import com.hzs.common.core.constant.msg.MemberMsgConstants; -import com.hzs.common.core.constant.msg.ScmMsgConstants; -import com.hzs.common.core.enums.*; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.scm.po.ext.PoOrderExt; -import com.hzs.common.domain.scm.po.ext.PoOrderItemsExt; -import com.hzs.common.domain.scm.pub.ScmOrderApproveLog; -import com.hzs.common.security.service.UserTokenService; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.common.util.TransactionUtils; -import com.hzs.scm.po.param.PoOrderItemsParam; -import com.hzs.scm.po.param.PoOrderParam; -import com.hzs.scm.po.service.IPoOrderItemsService; -import com.hzs.scm.po.service.IPoOrderService; -import com.hzs.scm.pub.controller.ScmController; -import com.hzs.scm.pub.param.ScmApproveParam; -import com.hzs.scm.pub.service.IScmOrderApproveLogService; -import com.hzs.scm.po.vo.PoOrderBVo; -import com.hzs.scm.po.vo.PoOrderVo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.math.BigDecimal; -import java.util.*; - -/** - *

- * 采购订单表头 前端控制器 - *

- * - * @author hzs - * @since 2023-11-17 - */ -@RestController -@RequestMapping("/manage/po") -public class PoOrderController extends ScmController { - - @Autowired - private IPoOrderService poOrderService; - - @Autowired - private IPoOrderItemsService poOrderItemsService; - - @Autowired - private IScmOrderApproveLogService scmOrderApproveLogService; - - @Autowired - private UserTokenService userTokenService; - - /** - * 查询列表 - * - * @return cubasdocParam 入参 - */ - @PostMapping("/list") - @Log(module = EOperationModule.PO_ORDER, business = EOperationBusiness.PO_ORDER, method = EOperationMethod.SELECT) - public TableDataInfo listPoOrder(@RequestBody PoOrderParam poOrderParam) { - startPage(); - poOrderParam.setPkCountry(SecurityUtils.getPkCountry()); - List poOrderExtList = poOrderService.queryPoOrderByCondition(poOrderParam); - List poOrderVoList = packageScmReturnVo(poOrderExtList); - return packageTableDataInfo(poOrderExtList, poOrderVoList); - } - - private List packageScmReturnVo(List poOrderExtList) { - List poOrderVoList = new ArrayList<>(); - for (PoOrderExt poOrderExt : poOrderExtList) { - PoOrderVo poOrderVo = BeanUtil.copyProperties(poOrderExt, PoOrderVo.class); - List poOrderItemsExtList = poOrderExt.getPoOrderItemsExtList(); - if(CollectionUtil.isNotEmpty(poOrderItemsExtList)) { - List returnbVoList = BeanUtil.copyToList(poOrderItemsExtList, PoOrderBVo.class); - poOrderVo.setScmReturnbVoList(returnbVoList); - } - poOrderVoList.add(poOrderVo); - } - return poOrderVoList; - } - - /** - * 查询待入库订单 - * - * @return cubasdocParam 入参 - */ - @PostMapping("/store-list") - public TableDataInfo queryToStorePoOrder(@RequestBody PoOrderParam poOrderParam) { - startPage(); - poOrderParam.setPkCountry(SecurityUtils.getPkCountry()); - List poOrderExtList = poOrderService.queryPoOrderToStoreByCondition(poOrderParam); - List poOrderVoList = packageScmReturnVo(poOrderExtList); - return packageTableDataInfo(poOrderExtList, poOrderVoList); - } - - /** - * 查询待入库订单的明细 - * - * @return cubasdocParam 入参 - */ - @GetMapping("/list-detail/{pkId}") - public TableDataInfo queryToPoOrderItems(@PathVariable Long pkId) { - List poOrderItemsExtList = poOrderItemsService.queryListPoOrderItemsByPk(SecurityUtils.getPkCountry(), pkId); - List scmReturnVoList = new ArrayList<>(); - for (PoOrderItemsExt poOrderItemsExt : poOrderItemsExtList) { - scmReturnVoList.add(BeanUtil.copyProperties(poOrderItemsExt, PoOrderBVo.class)); - } - return packageTableDataInfo(poOrderItemsExtList, scmReturnVoList); - } - - /** - * 查询待入库订单的明细 - * - * @return cubasdocParam 入参 - */ - @GetMapping("/store-list-detail/{pkId}") - public TableDataInfo queryToStorePoOrder(@PathVariable Long pkId) { - List poOrderItemsExtList = poOrderItemsService.queryPoOrderItemsByPk(SecurityUtils.getPkCountry(), pkId); - List scmReturnVoList = new ArrayList<>(); - for (PoOrderItemsExt poOrderItemsExt : poOrderItemsExtList) { - scmReturnVoList.add(BeanUtil.copyProperties(poOrderItemsExt, PoOrderBVo.class)); - } - return packageTableDataInfo(poOrderItemsExtList, scmReturnVoList); - } - - /** - * 新增采购入库 - * - * @param poOrderParam 入参 - */ - @PostMapping("/insert") - @Log(module = EOperationModule.PO_ORDER, business = EOperationBusiness.PO_ORDER, method = EOperationMethod.INSERT) - public AjaxResult savePoOrder(@RequestBody PoOrderParam poOrderParam) { - int pkCountry = SecurityUtils.getPkCountry(); - // 验证供应商 - String msg = validatePoOrderMsg(poOrderParam, pkCountry); - if (ObjectUtil.isNotEmpty(msg)) { - return AjaxResult.error(TransactionUtils.getContent(msg)); - } - // 计算价税合计、总数量 - poOrderParam.setPkCountry(pkCountry); - poOrderService.insertSavePoOrderByOrderParam(poOrderParam, SecurityUtils.getUserId()); - return AjaxResult.success(); - } - - /** - * 修改采购入库 - * - * @param poOrderParam 入参 - */ - @PostMapping("/update") - @Log(module = EOperationModule.PO_ORDER, business = EOperationBusiness.PO_ORDER, method = EOperationMethod.UPDATE) - public AjaxResult updatePoOrder(@RequestBody PoOrderParam poOrderParam) { - if (poOrderParam.getPkId() == null) { - return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.REQUIRED_NOT_EMPTY)); - } - int pkCountry = SecurityUtils.getPkCountry(); - // 验证订单状态 只有保存状态的采购订单可以进行修改 - PoOrderExt poOrderExt = poOrderService.queryPoOrderById(poOrderParam.getPkId(), EScmOrderStatus.SAVE.getValue()); - if (poOrderExt == null) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.PO_ORDER_NOT_EXIST)); - } - String msg = validatePoOrderMsg(poOrderParam, pkCountry); - if (ObjectUtil.isNotEmpty(msg)) { - return AjaxResult.error(TransactionUtils.getContent(msg)); - } - // 计算价税合计、总数量 - poOrderParam.setPkCountry(pkCountry); - poOrderService.updatePorOrderByOrderParam(poOrderExt, poOrderParam, SecurityUtils.getUserId()); - return AjaxResult.success(); - } - - /* - * @description: 验证订单相关信息 - * @author: sui q - * @date: 2023/11/21 11:43 - * @param: null null - **/ - private String validatePoOrderMsg(PoOrderParam poOrderParam, int pkCountry) { - Set storehouseIdSet = new HashSet<>(); - if (validatePoOrderParam(poOrderParam, storehouseIdSet)) { - return MemberMsgConstants.REQUIRED_NOT_EMPTY; - } - // 验证供应商 - String msg = validateCuBasDoc(poOrderParam.getPkCubasdoc(), pkCountry); - if(ObjectUtil.isNotEmpty(msg)){ - return msg; - } - // 验证采购组织 - msg = validateSysCorp(poOrderParam.getPkCorp(), pkCountry); - if(ObjectUtil.isNotEmpty(msg)){ - return msg; - } - // 验证仓库，根据采购组织验证 - msg = validateStorehouse(storehouseIdSet, pkCountry, poOrderParam.getPkCorp()); - if(ObjectUtil.isNotEmpty(msg)){ - return msg; - } - // 验证产品，根据产品 - // 验证规格、规格分类 需要根据产品查询 处理specsName - String message = validateProductBas(poOrderParam.getPoOrderItemsParamList()); - if(ObjectUtil.isNotEmpty(message)){ - return message; - } - return null; - } - - private Boolean validatePoOrderParam(PoOrderParam poOrderParam, Set storehouseIdSet) { - // 验证 供应商、采购组织不能为空 - if (poOrderParam.getPkCubasdoc() == null || poOrderParam.getPkCorp() == null || CollectionUtil.isEmpty(poOrderParam.getPoOrderItemsParamList())) { - return Boolean.TRUE; - } - // 验证 采购订单明细字段不能为空 - for (PoOrderItemsParam poOrderItemsParam : poOrderParam.getPoOrderItemsParamList()) { - if (poOrderItemsParam.getPkProductBas() == null || poOrderItemsParam.getPkStorehouse() == null || - poOrderItemsParam.getPkUnit() == null || - poOrderItemsParam.getNnum() == null || poOrderItemsParam.getNorigprice() == null || - CollectionUtil.isEmpty(poOrderItemsParam.getScmItemSpecsList())) { - return Boolean.TRUE; - } - // 验证产品id 仓库id - storehouseIdSet.add(poOrderItemsParam.getPkStorehouse()); - if (poOrderItemsParam.getNtaxrate() == null) { - poOrderItemsParam.setNtaxrate(BigDecimal.ZERO); - } - if (poOrderItemsParam.getIsGift() == null) { - poOrderItemsParam.setIsGift(EYesNo.NO.getIntValue()); - } - } - return Boolean.FALSE; - } - - /** - * 删除采购入库 - * - * @param pkId 主键 - */ - @DeleteMapping("/{pkId}") - @Log(module = EOperationModule.PO_ORDER, business = EOperationBusiness.PO_ORDER, method = EOperationMethod.DELETE) - public AjaxResult delete(@PathVariable Long pkId) { - // 验证是否存在订单，订单状态是否是保存状态 - if (pkId == null) { - return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.REQUIRED_NOT_EMPTY)); - } - // 验证订单状态 只有保存状态的采购订单可以进行修改 - PoOrderExt poOrderExt = poOrderService.queryPoOrderById(pkId, EScmOrderStatus.SAVE.getValue()); - if (poOrderExt == null) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.PO_ORDER_NOT_EXIST)); - } - poOrderService.deletePoOrder(pkId, SecurityUtils.getUserId()); - return AjaxResult.success(); - } - - /** - * 撤销订单并入库（走签呈），签呈页面点击确定按钮 - * - * @param scmApproveParam 参数 - */ - @PostMapping("/submit") - @Log(module = EOperationModule.PO_ORDER, business = EOperationBusiness.PO_ORDER, method = EOperationMethod.UPDATE) - public AjaxResult submitPoOrder(@RequestBody ScmApproveParam scmApproveParam) { - scmApproveParam.setPkCountry(SecurityUtils.getPkCountry()); - if(scmApproveParam.getPkId() == null){ - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.PO_ORDER_NOT_EXIST)); - } - PoOrderExt poOrderExt = poOrderService.queryPoOrderById(scmApproveParam.getPkId(), EScmOrderStatus.SAVE.getValue()); - if (poOrderExt == null) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.PO_ORDER_NOT_EXIST)); - } - // 验证该订单是否存在签呈，存在待审核的签呈不能再次发起 - List scmOrderApproveLogs = scmOrderApproveLogService.queryScmOrderApproveLogByCondition(scmApproveParam.getPkId(), EApprovalBusiness.PO_ORDER_APPROVE.getValue(), null); - if(CollectionUtil.isNotEmpty(scmOrderApproveLogs)){ - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.PURCHASE_EXISTS_AGENT)); - } - poOrderService.auditPoOrderByPoOrderSubmit(scmApproveParam, userTokenService.getLoginUser()); - return AjaxResult.success(); - } -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/po/mapper/PoOrderItemsMapper.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/po/mapper/PoOrderItemsMapper.java deleted file mode 100644 index 119e780b..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/po/mapper/PoOrderItemsMapper.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.hzs.scm.po.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.scm.po.PoOrderItems; -import com.hzs.common.domain.scm.po.ext.PoOrderItemsExt; -import com.hzs.common.domain.scm.purchase.ext.IcPurchaseInBExt; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - *

- * 采购订单明细 Mapper 接口 - *

- * - * @author hzs - * @since 2023-11-17 - */ -public interface PoOrderItemsMapper extends BaseMapper { - - /* - * @description: 删除订单明细 - * @author: sui q - * @date: 2023/11/21 14:23 - * @param: null null - **/ - void deleteOrderItemsService(@Param("poOrderItemsList") List poOrderItemsList, @Param("pkMember") Long pkMember); - - /* - * @description: 查询采购订单明细 - * @author: sui q - * @date: 2023/11/23 14:17 - * @param: null null - **/ - List queryPoOrderItemsByPk(@Param("pkCountry") Integer pkCountry, @Param("pkOrder") Long pkOrder); - - /* - * @description: 查询采购订单明细 - * @author: sui q - * @date: 2023/11/23 14:17 - * @param: null null - **/ - List queryListPoOrderItemsByPk(@Param("pkCountry") Integer pkCountry, @Param("pkOrder") Long pkOrder); - - /* - * @description: 根据入库数量更新累计入库数量 - * @author: sui q - * @date: 2023/11/25 17:23 - * @param: null null - **/ - void updatePoOrderItemsTotalNum(@Param("icPurchaseInbList") List icPurchaseInbList, Long pkMember); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/po/mapper/PoOrderMapper.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/po/mapper/PoOrderMapper.java deleted file mode 100644 index da4c5d82..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/po/mapper/PoOrderMapper.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.hzs.scm.po.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.scm.po.PoOrder; -import com.hzs.common.domain.scm.po.ext.PoOrderExt; -import com.hzs.common.domain.scm.purchase.ext.IcPurchaseInBExt; -import com.hzs.scm.po.param.PoOrderItemsParam; -import com.hzs.scm.po.param.PoOrderParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - *

- * 采购订单表头 Mapper 接口 - *

- * - * @author hzs - * @since 2023-11-17 - */ -public interface PoOrderMapper extends BaseMapper { - - /* - * @description: 根据主键查询采购订单、采购订单明细 - * @author: sui q - * @date: 2023/11/21 10:49 - * @param: null null - **/ - PoOrderExt queryPoOrderById(@Param("pkOrder") Long pkOrder,@Param("orderStatus") Integer orderStatus); - - /* - * @description: 根据查询条件查询采购订单 - * @author: sui q - * @date: 2023/11/21 15:01 - * @param: null null - **/ - List queryPoOrderByCondition(PoOrderParam poOrderParam); - - /* - * @description: 参照生成采购入库单，可能存在多个采购订单生成一个入库单，支持1对多 多对1 - * @author: sui q - * @date: 2023/11/21 17:47 - * @param: null null - **/ - List queryPoOrderByOrderItems(@Param("orderItemsParamList") List orderItemsParamList); - - /* - * @description: 查询待入库的采购订单 - * @author: sui q - * @date: 2023/11/23 13:53 - * @param: null null - **/ - List queryPoOrderToStoreByCondition(PoOrderParam poOrderParam); - - /* - * @description: 采购入库时回写采购订单主表状态 - * @author: sui q - * @date: 2023/11/27 13:39 - * @param: null null - **/ - void updatePoOrderStatusByPurchase(@Param("purchaseInbExtList") List purchaseInbExtList, @Param("pkMember") Long pkMember, - @Param("orderStatus") Integer orderStatus); - -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/po/param/PoOrderItemsParam.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/po/param/PoOrderItemsParam.java deleted file mode 100644 index 513134e8..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/po/param/PoOrderItemsParam.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.hzs.scm.po.param; - -import com.hzs.scm.pub.param.ItemSpecsParam; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -/** - * @description: 采购订单明细 - * @author: sui q - * @time: 2023/11/20 15:15 - * @classname: PoOrderItemsParam - * @package_name: com.hzs.scm.po.param - * version 1.0.0 - */ -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class PoOrderItemsParam implements Serializable { - - /** - * 主键 - */ - private Long pkId; - - private Long pkOrder; - - /** - * 产品基础信息 - */ - private Integer pkProductBas; - - /** - * 仓库 - */ - private Integer pkStorehouse; - - /** - * 计划到货时间 - */ - private Date planDate; - - /** - * 单位 - */ - private Integer pkUnit; - - /** - * 数量 - */ - private BigDecimal nnum; - - /** - * 无税单价 - */ - private BigDecimal norigprice; - - /** - * 税率 - */ - private BigDecimal ntaxrate; - - /** - * 是否赠品 - */ - private Integer isGift; - - /** - * 明细表规格明细 - */ - private List scmItemSpecsList; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/po/param/PoOrderParam.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/po/param/PoOrderParam.java deleted file mode 100644 index 0f156985..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/po/param/PoOrderParam.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.hzs.scm.po.param; - -import com.hzs.scm.pub.param.ScmPubParam; -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; -import java.util.List; - -/** - * @description: 采购订单参数 - * @author: sui q - * @time: 2023/11/20 15:13 - * @classname: PoOrderParam - * @package_name: com.hzs.scm.po.param - * version 1.0.0 - */ -@Data -public class PoOrderParam extends ScmPubParam { - - /** - * 主键 - */ - private Long pkId; - - /** - * 供应商 取bd_cubasdoc 类型为1 2的 - */ - private Integer pkCubasdoc; - - /** - * 合同编号 - */ - private String contractCode; - - /** - * 备注 - */ - private String remark; - - /** - * 国家 - */ - private Integer pkCountry; - - /** - * 采购订单明细 - */ - private List poOrderItemsParamList; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/po/service/IPoOrderItemsService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/po/service/IPoOrderItemsService.java deleted file mode 100644 index 76e2e987..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/po/service/IPoOrderItemsService.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.hzs.scm.po.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.scm.po.PoOrderItems; -import com.hzs.common.domain.scm.po.ext.PoOrderItemsExt; -import com.hzs.common.domain.scm.purchase.ext.IcPurchaseInBExt; - -import java.util.List; - -/** - *

- * 采购订单明细 服务类 - *

- * - * @author hzs - * @since 2023-11-17 - */ -public interface IPoOrderItemsService extends IService { - - /* - * @description: 删除订单明细 - * @author: sui q - * @date: 2023/11/21 14:23 - * @param: null null - **/ - void deleteOrderItemsService(List poOrderItemsList, Long pkMember); - - /* - * @description: 删除订单明细，根据订单主键 - * @author: sui q - * @date: 2023/11/21 14:55 - * @param: null null - **/ - void deleteOrderItemsByPkOrder(Long pkOrder, Long pkMember); - - /* - * @description: 查询采购订单明细 - * @author: sui q - * @date: 2023/11/23 14:17 - * @param: null null - **/ - List queryPoOrderItemsByPk(Integer pkCountry, Long pkOrder); - - /* - * @description: 查询采购订单明细 - * @author: sui q - * @date: 2023/11/23 14:17 - * @param: null null - **/ - List queryListPoOrderItemsByPk(Integer pkCountry, Long pkOrder); - - /* - * @description: 查询明细表明细 - * @author: sui q - * @date: 2023/11/25 17:39 - * @param: null null - **/ - List queryPoOrderItemsByList(List idList); - - /* - * @description: 根据入库数量更新累计入库数量 - * @author: sui q - * @date: 2023/11/25 17:23 - * @param: null null - **/ - void updatePoOrderItemsTotalNum(List icPurchaseInbList, Long pkMember); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/po/service/IPoOrderService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/po/service/IPoOrderService.java deleted file mode 100644 index eb35382f..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/po/service/IPoOrderService.java +++ /dev/null @@ -1,121 +0,0 @@ -package com.hzs.scm.po.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.scm.po.PoOrder; -import com.hzs.common.domain.scm.po.ext.PoOrderExt; -import com.hzs.common.domain.scm.purchase.ext.IcPurchaseInBExt; -import com.hzs.scm.po.param.PoOrderItemsParam; -import com.hzs.scm.po.param.PoOrderParam; -import com.hzs.scm.pub.param.ScmApproveParam; -import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; -import com.hzs.system.sys.dto.LoginUser; - -import java.util.List; - -/** - *

- * 采购订单表头 服务类 - *

- * - * @author hzs - * @since 2023-11-17 - */ -public interface IPoOrderService extends IService { - - /* - * @description: 保存采购订单 - * @author: sui q - * @date: 2023/11/20 15:54 - * @param: null null - **/ - void insertSavePoOrderByOrderParam(PoOrderParam poOrderParam, Long pkMember); - - /* - * @description: 修改保存采购订单 - * @author: sui q - * @date: 2023/11/21 11:51 - * @param: null null - **/ - void updatePorOrderByOrderParam(PoOrderExt poOrderExt, PoOrderParam poOrderParam, Long pkMember); - - /* - * @description: 根据订单主键查询采购订单 - * @author: sui q - * @date: 2023/11/21 10:47 - * @param: null null - **/ - PoOrderExt queryPoOrderById(Long pkOrder, Integer orderStatus); - - /* - * @description: 查询签呈显示的采购订单 - * @author: sui q - * @date: 2023/11/28 15:00 - * @param: null null - **/ - PoOrderExt queryDisPoOrderById(Long pkOrder, Integer orderStatus); - - /* - * @description: 根据查询条件查询采购订单 - * @author: sui q - * @date: 2023/11/21 15:01 - * @param: null null - **/ - List queryPoOrderByCondition(PoOrderParam poOrderParam); - - /* - * @description: 删除采购订单 - * @author: sui q - * @date: 2023/11/21 14:54 - * @param: null null - **/ - void deletePoOrder(Long pkOrder, Long pkMember); - - /* - * @description: 参照生成采购入库单，可能存在多个采购订单生成一个入库单，支持1对多 多对1 - * @author: sui q - * @date: 2023/11/21 17:47 - * @param: null null - **/ - List queryPoOrderByOrderItems(List orderItemsParamList); - - /* - * @description: 查询待入库的采购订单,第一条带明细表，其他的没有明细表 - * @author: sui q - * @date: 2023/11/23 13:53 - * @param: null null - **/ - List queryPoOrderToStoreByCondition(PoOrderParam poOrderParam); - - /* - * @description: 提交采购订单（走审批） - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - void auditPoOrderByPoOrderSubmit(ScmApproveParam scmApproveParam, LoginUser loginUser); - - /* - * @description: 审核通过采购订单 - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - String auditPoOrderByPoOrderAgree(ApprovalBusinessResultDTO approvalBusinessResultDTO); - - /* - * @description: 审核驳回采购订单 - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - String auditPoOrderByPoOrderReject(ApprovalBusinessResultDTO approvalBusinessResultDTO); - - - /* - * @description: 根据入库数量更新累计入库数量 - * @author: sui q - * @date: 2023/11/25 17:23 - * @param: null null - **/ - void updatePoOrderItemsTotalNum(List icPurchaseInbList, Long pkMember); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/po/service/impl/PoOrderItemsServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/po/service/impl/PoOrderItemsServiceImpl.java deleted file mode 100644 index e83bd8b7..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/po/service/impl/PoOrderItemsServiceImpl.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.hzs.scm.po.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.constant.SaOrderFieldConstants; -import com.hzs.common.core.constant.SystemFieldConstants; -import com.hzs.common.core.enums.EYesNo; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.domain.scm.po.PoOrderItems; -import com.hzs.common.domain.scm.po.ext.PoOrderItemsExt; -import com.hzs.common.domain.scm.purchase.ext.IcPurchaseInBExt; -import com.hzs.scm.po.mapper.PoOrderItemsMapper; -import com.hzs.scm.po.service.IPoOrderItemsService; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - *

- * 采购订单明细 服务实现类 - *

- * - * @author hzs - * @since 2023-11-17 - */ -@Service -public class PoOrderItemsServiceImpl extends ServiceImpl implements IPoOrderItemsService { - - @Override - public void deleteOrderItemsService(List poOrderItemsList, Long pkMember) { - baseMapper.deleteOrderItemsService(poOrderItemsList, pkMember); - } - - @Override - public void deleteOrderItemsByPkOrder(Long pkOrder, Long pkMember) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.set(SystemFieldConstants.DEL_FLAG, EYesNo.NO.getIntValue()); - updateWrapper.set(SystemFieldConstants.PK_MODIFIED, pkMember); - updateWrapper.set(SystemFieldConstants.MODIFIED_TIME, DateUtils.currentDateTime()); - updateWrapper.eq(SaOrderFieldConstants.PK_ORDER, pkOrder); - update(updateWrapper); - } - - @Override - public List queryPoOrderItemsByPk(Integer pkCountry, Long pkOrder) { - return baseMapper.queryPoOrderItemsByPk(pkCountry, pkOrder); - } - - @Override - public List queryListPoOrderItemsByPk(Integer pkCountry, Long pkOrder) { - return baseMapper.queryListPoOrderItemsByPk(pkCountry, pkOrder); - } - - @Override - public List queryPoOrderItemsByList(List idList) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in(SystemFieldConstants.PK_ID, idList); - return baseMapper.selectList(queryWrapper); - } - - @Override - public void updatePoOrderItemsTotalNum(List icPurchaseInbList, Long pkMember) { - baseMapper.updatePoOrderItemsTotalNum(icPurchaseInbList, pkMember); - } -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/po/service/impl/PoOrderServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/po/service/impl/PoOrderServiceImpl.java deleted file mode 100644 index 8d394563..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/po/service/impl/PoOrderServiceImpl.java +++ /dev/null @@ -1,362 +0,0 @@ -package com.hzs.scm.po.service.impl; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.constant.CacheConstants; -import com.hzs.common.core.constant.SaOrderFieldConstants; -import com.hzs.common.core.constant.SystemFieldConstants; -import com.hzs.common.core.constant.msg.DocumentMsgConstants; -import com.hzs.common.core.constant.msg.ScmMsgConstants; -import com.hzs.common.core.enums.*; -import com.hzs.common.core.service.RedisService; -import com.hzs.common.core.utils.ComputeUtil; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.domain.scm.po.PoOrder; -import com.hzs.common.domain.scm.po.PoOrderItems; -import com.hzs.common.domain.scm.po.ext.PoOrderExt; -import com.hzs.common.domain.scm.po.ext.PoOrderItemsExt; -import com.hzs.common.domain.scm.pub.ScmItemSpecs; -import com.hzs.common.domain.scm.pub.ScmOrderApproveLog; -import com.hzs.common.domain.scm.purchase.ext.IcPurchaseInBExt; -import com.hzs.common.domain.system.sys.SysUser; -import com.hzs.common.util.TransactionUtils; -import com.hzs.scm.no.service.IScmBillNoService; -import com.hzs.scm.po.mapper.PoOrderMapper; -import com.hzs.scm.po.param.PoOrderItemsParam; -import com.hzs.scm.po.param.PoOrderParam; -import com.hzs.scm.po.service.IPoOrderItemsService; -import com.hzs.scm.po.service.IPoOrderService; -import com.hzs.scm.pub.param.ItemSpecsParam; -import com.hzs.scm.pub.param.ScmApproveParam; -import com.hzs.scm.pub.service.IScmItemSpecsService; -import com.hzs.scm.pub.service.IScmOrderApproveLogService; -import com.hzs.system.base.ICurrencyServiceApi; -import com.hzs.system.base.dto.CurrencyDTO; -import com.hzs.system.sys.IApprovalServiceApi; -import com.hzs.system.sys.IUserServiceApi; -import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; -import com.hzs.system.sys.dto.LoginUser; -import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.math.BigDecimal; -import java.time.temporal.ChronoUnit; -import java.util.*; - -/** - *

- * 采购订单表头 服务实现类 - *

- * - * @author hzs - * @since 2023-11-17 - */ -@Service -public class PoOrderServiceImpl extends ServiceImpl implements IPoOrderService { - - - @DubboReference - private ICurrencyServiceApi currencyServiceApi; - - @DubboReference - private IUserServiceApi userServiceApi; - - @Autowired - private IScmBillNoService scmBillNoService; - - @Autowired - private IPoOrderItemsService poOrderItemsService; - - @Autowired - private IScmItemSpecsService scmItemSpecsService; - - @Autowired - private RedisService redisService; - - @Autowired - private IScmOrderApproveLogService scmOrderApproveLogService; - - - @Override - @Transactional(rollbackFor = Exception.class) - public void insertSavePoOrderByOrderParam(PoOrderParam poOrderParam, Long pkMember) { - packagePoOrderByParam(poOrderParam, pkMember); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void updatePorOrderByOrderParam(PoOrderExt poOrderExt, PoOrderParam poOrderParam, Long pkMember) { - // 更新规格明细表，先删除在新增 根据主表主键删除 - scmItemSpecsService.deleteItemSpecsById(EScmOrderType.PO_ORDER.getValue(), poOrderExt.getPkId(), pkMember); - poOrderExt.setPkCorp(poOrderParam.getPkCorp()); - poOrderExt.setPkCubasdoc(poOrderParam.getPkCubasdoc()); - poOrderExt.setOrderDate(poOrderParam.getOrderDate()); - poOrderExt.setContractCode(poOrderParam.getContractCode()); - poOrderExt.setRemark(poOrderParam.getRemark()); - // 更新订单明细表 分为3部分 删除的 新增的 修改的 - List poOrderItemsList = getPoOrderItems(poOrderParam, pkMember, poOrderExt); - // 重新处理订单明细，将订单明细分为 删除的、新增的、修改的 - List poOrderItemsExtList = poOrderExt.getPoOrderItemsExtList(); - // 剩余的就是需要删除的 - Map poOrderItemsExtMap = new HashMap<>(); - poOrderItemsExtList.forEach(poOrderItemsExt -> - poOrderItemsExtMap.put(poOrderItemsExt.getPkId(), poOrderItemsExt)); - List insertOrderItems = new ArrayList<>(); - List updateOrderItems = new ArrayList<>(); - List saveScmItemSpecsList = new ArrayList<>(); - for (PoOrderItems poOrderItems : poOrderItemsList) { - if (poOrderItems.getPkId() != null && poOrderItemsExtMap.containsKey(poOrderItems.getPkId())) { - // 修改的 - poOrderItems.setPkCreator(poOrderItemsExtMap.get(poOrderItems.getPkId()).getPkCreator()); - updateOrderItems.add(poOrderItems); - saveScmItemSpecsList.addAll(poOrderItems.getScmItemSpecsList()); - poOrderItemsExtMap.remove(poOrderItems.getPkId()); - } else { - // 新增的 - poOrderItems.setPkOrder(poOrderExt.getPkId()); - insertOrderItems.add(poOrderItems); - } - } - String purchaseLockKey = CacheConstants.IC_PURCHASE_IN_LOCK + poOrderExt.getPkId(); - try { - if (!redisService.lockKeyOnce(purchaseLockKey)) { - throw new RuntimeException(ScmMsgConstants.BILL_NOT_OPERATION); - } - if (insertOrderItems.size() > 0) { - // 保存订单明细 新增的 - poOrderItemsService.saveBatch(insertOrderItems); - List scmItemSpecsList = scmItemSpecsService.packageOrderItemsSpecs(insertOrderItems, poOrderExt.getPkId()); - if (scmItemSpecsList.size() > 0) { - saveScmItemSpecsList.addAll(scmItemSpecsList); - } - } - if (updateOrderItems.size() > 0) { - // 修改订单明细 修改的 - updateOrderItems.forEach(updateItems -> - poOrderItemsService.updateById(updateItems)); - - } - if (poOrderItemsExtMap.size() > 0) { - // 删除订单明细 删除的 - List delOrderItems = new ArrayList<>(); - poOrderItemsExtMap.forEach((key, value) -> delOrderItems.add(value)); - poOrderItemsService.deleteOrderItemsService(delOrderItems, pkMember); - } - // 保存订单明细规格 - if (saveScmItemSpecsList.size() > 0) { - scmItemSpecsService.saveBatch(saveScmItemSpecsList); - } - // 更新订单表 - updateById(poOrderExt); - } finally { - redisService.unlock(purchaseLockKey); - } - } - - @Override - public PoOrderExt queryPoOrderById(Long pkOrder, Integer orderStatus) { - return baseMapper.queryPoOrderById(pkOrder, orderStatus); - } - - @Override - public PoOrderExt queryDisPoOrderById(Long pkOrder, Integer orderStatus) { - PoOrderParam poOrderParam = new PoOrderParam(); - poOrderParam.setPkId(pkOrder); - poOrderParam.setOrderStatus(orderStatus); - List poOrderExtList = baseMapper.queryPoOrderByCondition(poOrderParam); - if(CollectionUtil.isNotEmpty(poOrderExtList)){ - return poOrderExtList.get(0); - } - return null; - } - - @Override - public List queryPoOrderByCondition(PoOrderParam poOrderParam) { - if (poOrderParam.getEndDate() != null) { - poOrderParam.setEndDate(DateUtils.afterDate(1, ChronoUnit.DAYS, poOrderParam.getEndDate())); - } - return baseMapper.queryPoOrderByCondition(poOrderParam); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void deletePoOrder(Long pkOrder, Long pkMember) { - String poOrderLockKey = CacheConstants.PO_ORDER_LOCK + pkOrder; - if (!redisService.lockKeyOnce(poOrderLockKey)) { - throw new RuntimeException(ScmMsgConstants.BILL_NOT_OPERATION); - } - // 删除规格明细表 - scmItemSpecsService.deleteItemSpecsById(EScmOrderType.PO_ORDER.getValue(), pkOrder, pkMember); - // 删除订单明细表 - poOrderItemsService.deleteOrderItemsByPkOrder(pkOrder, pkMember); - // 删除订单主表 - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.set(SystemFieldConstants.DEL_FLAG, EYesNo.NO.getIntValue()); - updateWrapper.set(SystemFieldConstants.PK_MODIFIED, pkMember); - updateWrapper.set(SystemFieldConstants.MODIFIED_TIME, DateUtils.currentDateTime()); - updateWrapper.eq(SystemFieldConstants.PK_ID, pkOrder); - update(updateWrapper); - redisService.unlock(poOrderLockKey); - } - - @Override - public List queryPoOrderByOrderItems(List orderItemsParamList) { - return baseMapper.queryPoOrderByOrderItems(orderItemsParamList); - } - - @Override - public List queryPoOrderToStoreByCondition(PoOrderParam poOrderParam) { - // if (CollectionUtil.isNotEmpty(poOrderExtList)) { -// // 查询第一条的明细 -// poOrderExtList.get(0).setPoOrderItemsExtList(poOrderItemsService.queryPoOrderItemsByPk(poOrderParam.getPkCountry(), poOrderExtList.get(0).getPkId())); -// } - return baseMapper.queryPoOrderToStoreByCondition(poOrderParam); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void auditPoOrderByPoOrderSubmit(ScmApproveParam scmApproveParam, LoginUser loginUser) { - // 更新单据状态 - updatePoOrderStatus(scmApproveParam.getPkId(), loginUser, EScmOrderStatus.SUBMIT.getValue()); - scmOrderApproveLogService.submitOrder(scmApproveParam, EApprovalBusiness.PO_ORDER_APPROVE, EOrderPrefix.PO_ORDER_CODE, loginUser); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public String auditPoOrderByPoOrderAgree(ApprovalBusinessResultDTO approvalBusinessResultDTO) { - return approvePoOrderByStatus(approvalBusinessResultDTO, EScmOrderStatus.APPROVE.getValue(), EAgentApprovalStatus.APPROVED.getValue()); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public String auditPoOrderByPoOrderReject(ApprovalBusinessResultDTO approvalBusinessResultDTO) { - return approvePoOrderByStatus(approvalBusinessResultDTO, EScmOrderStatus.SAVE.getValue(), EAgentApprovalStatus.REFUSE.getValue()); - } - - - @Override - @Transactional(rollbackFor = Exception.class) - public void updatePoOrderItemsTotalNum(List icPurchaseInbList, Long pkMember) { - // 更新订单明细累计入库数量 - poOrderItemsService.updatePoOrderItemsTotalNum(icPurchaseInbList, pkMember); - // 更新订单主表 - baseMapper.updatePoOrderStatusByPurchase(icPurchaseInbList, pkMember, EScmOrderStatus.DELIVERY.getValue()); - } - - private String approvePoOrderByStatus(ApprovalBusinessResultDTO approvalBusinessResultDTO, Integer scmOrderStatus, Integer approveStatus) { - // 查询订单日志表 - List scmOrderApproveLogList = scmOrderApproveLogService.queryScmOrderApproveLogByCondition(null, approvalBusinessResultDTO.getEApprovalBusiness().getValue(), approvalBusinessResultDTO.getBusinessCode()); - if (scmOrderApproveLogList == null || scmOrderApproveLogList.size() == 0) { - return TransactionUtils.getContent(DocumentMsgConstants.DOCUMENT_NOT_EXISTS); - } - ScmOrderApproveLog scmOrderApproveLog = scmOrderApproveLogList.get(0); - // 查询采购订单 - PoOrderExt poOrderExt = queryPoOrderById(scmOrderApproveLog.getPkOrder(), EScmOrderStatus.SUBMIT.getValue()); - if (poOrderExt == null) { - log.error("订单撤单同意处理失败: 签呈已处理!"); - return TransactionUtils.getContent(DocumentMsgConstants.DOCUMENT_HAS_HANDLE); - } - // 更新采购入库单状态 - updatePoOrderStatus(poOrderExt.getPkId(), approvalBusinessResultDTO.getLoginUser(), scmOrderStatus); - // 更新前程日志表状态 - scmOrderApproveLogService.updateScmOrderApproveStatus(scmOrderApproveLog.getPkId(), approvalBusinessResultDTO.getLoginUser().getUserId(), approveStatus); - return null; - } - - /* - * @description: 将采购订单的参数转换为能保存的订单 - * @author: sui q - * @date: 2023/11/20 15:53 - * @param: null null - **/ - private void packagePoOrderByParam(PoOrderParam poOrderParam, Long pkMember) { - PoOrder poOrder = BeanUtil.copyProperties(poOrderParam, PoOrder.class); - List poOrderItemsList = getPoOrderItems(poOrderParam, pkMember, poOrder); - // 生成单据号 - poOrder.setOrderCode(scmBillNoService.createScmBillNoByOrderType(EScmOrderType.PO_ORDER.getValue())); - // 保存主表 - save(poOrder); - for (PoOrderItems poOrderItems : poOrderItemsList) { - poOrderItems.setPkOrder(poOrder.getPkId()); - } - // 保存子表 - poOrderItemsService.saveBatch(poOrderItemsList); - List saveScmItemSpecsList = scmItemSpecsService.packageOrderItemsSpecs(poOrderItemsList, poOrder.getPkId()); - if (saveScmItemSpecsList.size() > 0) { - scmItemSpecsService.saveBatch(saveScmItemSpecsList); - } - } - - private List getPoOrderItems(PoOrderParam poOrderParam, Long pkMember, PoOrder poOrder) { - // 根据国家获得汇率 - CurrencyDTO currencyDTO = currencyServiceApi.getCurrency(poOrderParam.getPkCountry()).getData(); - poOrder.setPkRate(currencyDTO.getPkId()); - SysUser sysUser = userServiceApi.selectUserById(pkMember).getData(); - // 根据登录账号获得部门 - poOrder.setPkDept(sysUser.getPkDept().intValue()); - poOrder.setPkSalesman(pkMember); - // 计算累计数量 累计价税合计 - // 总数量 - BigDecimal totalNum = BigDecimal.ZERO; - // 价税合计 - BigDecimal totalOrigmny = BigDecimal.ZERO; - List poOrderItemsList = new ArrayList<>(); - Date date = DateUtils.currentDateTime(); - for (PoOrderItemsParam poOrderItemsParam : poOrderParam.getPoOrderItemsParamList()) { - PoOrderItems poOrderItems = BeanUtil.copyProperties(poOrderItemsParam, PoOrderItems.class); - if (EYesNo.YES.getIntValue() == poOrderItemsParam.getIsGift()) { - poOrderItems.setNorigprice(BigDecimal.ZERO); - poOrderItems.setNtaxrate(BigDecimal.ZERO); - // 含税单价 = 无税单价*（1+税率） - poOrderItems.setNorigtaxprice(BigDecimal.ZERO); - // 无税金额 = 无税单价*数量 - poOrderItems.setNorigmny(BigDecimal.ZERO); - // 税额 =无税单价*数量 - poOrderItems.setNtax(BigDecimal.ZERO); - // 价税合计=含税单价*数量 - poOrderItems.setNorigtaxmny(BigDecimal.ZERO); - } else { - // 含税单价 = 无税单价*（1+税率） - poOrderItems.setNorigtaxprice(ComputeUtil.computeMultiply(poOrderItems.getNorigprice(), - ComputeUtil.computeAdd(BigDecimal.ONE, ComputeUtil.computeMultiply(poOrderItems.getNtaxrate(), BigDecimal.valueOf(0.01))))); - // 无税金额 = 无税单价*数量 - poOrderItems.setNorigmny(ComputeUtil.computeMultiply(poOrderItems.getNorigprice(), poOrderItems.getNnum())); - // 税额 =无税单价*税率*数量 - poOrderItems.setNtax(ComputeUtil.computeMultiply(ComputeUtil.computeBonusMultiply(poOrderItems.getNorigprice(), poOrderItems.getNtaxrate()), poOrderItems.getNnum())); - // 价税合计 含税单价*数量 - poOrderItems.setNorigtaxmny(ComputeUtil.computeMultiply(poOrderItems.getNorigtaxprice(), poOrderItems.getNnum())); - } - poOrderItems.setPkRate(currencyDTO.getPkId()); - totalNum = ComputeUtil.computeAdd(totalNum, poOrderItems.getNnum()); - totalOrigmny = ComputeUtil.computeAdd(totalOrigmny, poOrderItems.getNorigtaxmny()); - List itemSpecsParamList = poOrderItemsParam.getScmItemSpecsList(); - scmItemSpecsService.packageScmItemByParam(itemSpecsParamList, poOrderItems, poOrderParam.getPkCountry(), pkMember, - poOrderParam.getPkId(), poOrderItems.getPkId(), EScmOrderType.PO_ORDER.getValue()); - poOrderItemsList.add(poOrderItems); - } - poOrder.setPkCountry(poOrderParam.getPkCountry()); - if (poOrderParam.getPkId() == null) { - poOrder.setPkCreator(pkMember); - } else { - poOrder.setPkModified(pkMember); - poOrder.setModifiedTime(date); - } - poOrder.setTotalNum(totalNum); - poOrder.setTotalOrigmny(totalOrigmny); - return poOrderItemsList; - } - - private void updatePoOrderStatus(Long pkId, LoginUser loginUser, Integer orderStatus) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.set(SaOrderFieldConstants.ORDER_STATUS, orderStatus); - updateWrapper.set(SystemFieldConstants.PK_MODIFIED, loginUser.getUserId()); - updateWrapper.set(SystemFieldConstants.MODIFIED_TIME, DateUtils.currentDateTime()); - updateWrapper.eq(SystemFieldConstants.PK_ID, pkId); - update(updateWrapper); - } - -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/po/vo/PoOrderBVo.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/po/vo/PoOrderBVo.java deleted file mode 100644 index 6e2129ae..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/po/vo/PoOrderBVo.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.hzs.scm.po.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import com.hzs.scm.pub.vo.ScmReturnBVo; -import com.hzs.scm.pub.vo.ScmSpecsVO; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -/** - * @description: 供应链返回到会员端明细vo - * @author: sui q - * @time: 2023/12/7 16:38 - * @classname: PoOrderItemsVO - * @package_name: com.hzs.scm.po.vo - * version 1.0.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class PoOrderBVo extends ScmReturnBVo { - - /** - * 关闭时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date closeDate; - - /** - * 计划到货时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date planDate; - - /** - * 累计入库数量 - */ - private BigDecimal naccumstorenum; - - /** - * 累计退货数量 - */ - private BigDecimal nbackarrvnum; - - private List scmItemSpecsList; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/po/vo/PoOrderVo.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/po/vo/PoOrderVo.java deleted file mode 100644 index 190b406a..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/po/vo/PoOrderVo.java +++ /dev/null @@ -1,134 +0,0 @@ -package com.hzs.scm.po.vo; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.Data; -import org.springframework.transaction.annotation.Transactional; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -/** - * @description: 供应链返回到会员端vo - * @author: sui q - * @time: 2023/12/7 16:38 - * @classname: PoOrderVo - * @package_name: com.hzs.scm.po.vo - * version 1.0.0 - */ -@Data -public class PoOrderVo implements Serializable { - - /** - * 主键 - */ - private Long pkId; - - /** - * 供应商名称 - */ - private String cubasdocName; - - /** - * 供应商 取bd_cubasdoc 类型为1 2的 - */ - private Integer pkCubasdoc; - - /** - * 采购公司 - */ - private Integer pkCorp; - - /** - * 部门名称 - */ - private String deptName; - - /** - * 管理员名称 - */ - private String managerName; - - /** - * 采购组织名称 - */ - private String corpName; - - /** - * 退货状态 0=是 1=否 - */ - @Transaction(transactionKey = EnumsPrefixConstants.DEALER_YES_NO) - private Integer returnStatus; - - private String returnStatusVal; - - /** - * 供应链订单状态 - */ - @Transaction(transactionKey = EnumsPrefixConstants.SCM_ORDER_STATUS) - private Integer orderStatus; - - private String orderStatusVal; - - /** - * 打印状态 - */ - @Transaction(transactionKey = EnumsPrefixConstants.DEALER_YES_NO) - private Integer printStatus; - - private String printStatusVal; - - /** - * 合同编号 - */ - private String contractCode; - - /** - * 订单日期 2023-10 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date orderDate; - - /** - * 采购部门 - */ - private Integer pkDept; - - /** - * 采购人 - */ - private Long pkSalesman; - - /** - * 汇率 - */ - private Integer pkRate; - - /** - * 总数量 - */ - private BigDecimal totalNum; - - /** - * 价税合计 - */ - private BigDecimal totalOrigmny; - - /** - * 订单编号 - */ - private String orderCode; - - /** - * 备注 - */ - private String remark; - - @Transaction - private List scmReturnbVoList; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/component/ScmPubUtilTool.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/component/ScmPubUtilTool.java deleted file mode 100644 index 9f44279f..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/component/ScmPubUtilTool.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.hzs.scm.pub.component; - -import com.hzs.common.core.constant.MagicNumberConstants; -import com.hzs.common.core.constant.msg.MemberMsgConstants; -import com.hzs.common.core.service.RedisService; -import com.hzs.common.core.utils.CommonUtil; -import com.hzs.common.util.TransactionUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * @description: 供应链公共的组件工具库 - * @author: sui q - * @time: 2023/11/22 10:40 - * @classname: PubUtilTool - * @package_name: com.hzs.scm.pub.component - * version 1.0.0 - */ -@Component -public class ScmPubUtilTool { - - @Autowired - private RedisService redisService; - - /** - * @param orderPrefix 订单前缀 - * @return 订单号 - */ -// public String createOrderCode(String orderPrefix) { -// for (int i = 0; i < MagicNumberConstants.RETRY_COUNT; i++) { -// String orderCode = CommonUtil.createSerialNumber(orderPrefix); -// if (redisService.lockKeyOnce(orderCode)) { -// return orderCode; -// } -// } -// throw new RuntimeException(TransactionUtils.getContent(MemberMsgConstants.MEMBER_IS_OPERATION)); -// } -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/controller/ScmController.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/controller/ScmController.java deleted file mode 100644 index 8e880411..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/controller/ScmController.java +++ /dev/null @@ -1,350 +0,0 @@ -package com.hzs.scm.pub.controller; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; -import com.hzs.common.core.constant.ScmFieldConstants; -import com.hzs.common.core.constant.msg.ScmMsgConstants; -import com.hzs.common.core.utils.reflect.ReflectUtils; -import com.hzs.common.core.web.controller.BaseController; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.sale.classify.BdSpecs; -import com.hzs.common.domain.sale.ext.BdProductExt; -import com.hzs.common.domain.sale.product.BdProductSpecs; -import com.hzs.common.domain.sale.product.ext.BdProductBasExt; -import com.hzs.common.domain.system.base.BdCubasdoc; -import com.hzs.common.domain.system.base.BdStorehouse; -import com.hzs.common.domain.system.sys.SysCorp; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.ground.product.service.IBdProductBasService; -import com.hzs.sale.product.IProductServiceApi; -import com.hzs.scm.ic.param.BatchCodeParam; -import com.hzs.scm.ic.service.IIcBatchCodeService; -import com.hzs.scm.pub.param.ItemSpecsParam; -import com.hzs.scm.trans.param.QueryStoreParam; -import com.hzs.scm.trans.param.TransferItemParam; -import com.hzs.scm.trans.param.TransferParam; -import com.hzs.system.base.ICurrencyServiceApi; -import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.*; -import java.util.stream.Collectors; - -/** - * @description: 供应链模块公共的控制类，用于存放公共的校验规则 - * @author: sui q - * @time: 2023/11/29 11:35 - * @classname: ScmController - * @package_name: com.hzs.scm.pub.controller - * version 1.0.0 - */ -public abstract class ScmController extends BaseController { - - @DubboReference - private IProductServiceApi productServiceApi; - - @DubboReference - private ICurrencyServiceApi currencyServiceApi; - - @Autowired - private IIcBatchCodeService batchCodeService; - - @Autowired - private IBdProductBasService productBasService; - - protected TableDataInfo packageTableDataInfo(List oldExtList, List newExtList){ - TableDataInfo dataTable = getDataTable(oldExtList); - dataTable.setRows(newExtList); - dataTable.setTotal(newExtList.size()); - return dataTable; - } - - /* - * @description: 验证产品信息 - * @author: sui q - * @date: 2023/11/29 11:37 - * @param: null null - **/ - protected String validateProduct(List generalbParamList, Map specsMap){ - // 验证产品,验证规格分类是否是在规格里面 - List productSpecsList = getBdProductSpecs(generalbParamList); - List productExtList = productServiceApi.queryProductDtoById(productSpecsList, SecurityUtils.getPkCountry()).getData(); - // 验证产品数量，产品数量不一样，需要重新选择 - if(productExtList == null || productExtList.size() == 0){ - return ScmMsgConstants.PRODUCT_NOT_EXIST; - } - // 封装规格名称 - for (BdProductExt productExt : productExtList) { - for (BdSpecs bdSpecs : productExt.getSpecsList()) { - String key = productExt.getPkId() + "_" + bdSpecs.getPkId() + "_" + bdSpecs.getPkSpecsType(); - specsMap.put(key, bdSpecs); - } - } - for (Object itemParam : generalbParamList) { - packageSpecsParam(specsMap, itemParam); - } - return null; - } - - /* - * @description: 验证产品基本信息 - * @author: sui q - * @date: 2023/11/29 11:37 - * @param: null null - **/ - protected String validateProductBas(List generalbParamList){ - Map specsMap = new HashMap<>(); - // 验证产品,验证规格分类是否是在规格里面 - List productSpecsList = getBdProductSpecs(generalbParamList); - List productBasExtList = productBasService.queryProductExtBySpecsId(productSpecsList, SecurityUtils.getPkCountry()); - // 验证产品数量，产品数量不一样，需要重新选择 - if(productBasExtList == null || productBasExtList.size() == 0){ - return ScmMsgConstants.PRODUCT_NOT_EXIST; - } - // 封装规格名称 - for (BdProductBasExt productExt : productBasExtList) { - for (BdSpecs bdSpecs : productExt.getSpecsList()) { - String key = productExt.getPkId() + "_" + bdSpecs.getPkId() + "_" + bdSpecs.getPkSpecsType(); - specsMap.put(key, bdSpecs); - } - } - for (Object generalB: generalbParamList) { - List scmItemSpecsList = ReflectUtils.invokeGetter(generalB, ScmFieldConstants.SCM_ITEM_SPECS_LIST); - Integer pkProductBas = ReflectUtils.invokeGetter(generalB, ScmFieldConstants.PK_PRODUCT_BAS); - for (ItemSpecsParam itemSpecsParam : scmItemSpecsList) { - String key = pkProductBas + "_" + itemSpecsParam.getPkSpecs() + "_" + itemSpecsParam.getPkSpecsType(); - if (specsMap.containsKey(key)) { - itemSpecsParam.setSpecsName(specsMap.get(key).getSpecsName()); - } - } - } - return null; - } - - private List getBdProductSpecs(List generalbParamList) { - List productSpecsList = new ArrayList<>(); - for (Object generalB: generalbParamList) { - List itemSpecsParamList= ReflectUtils.invokeGetter(generalB, ScmFieldConstants.SCM_ITEM_SPECS_LIST); - for (ItemSpecsParam itemSpecsParam : itemSpecsParamList) { - BdProductSpecs bdProductSpecs = BdProductSpecs.builder() - .pkProductBas(ReflectUtils.invokeGetter(generalB, ScmFieldConstants.PK_PRODUCT_BAS)) - .pkProduct(ReflectUtils.invokeGetter(generalB, ScmFieldConstants.PK_PRODUCT)) - .pkSpecsType(itemSpecsParam.getPkSpecsType()) - .pkId(itemSpecsParam.getPkSpecs()) - .build(); - productSpecsList.add(bdProductSpecs); - } - } - return productSpecsList; - } - - /* - * @description: 验证产品批次号 - * @author: sui q - * @date: 2023/12/6 16:44 - * @param: null null - **/ - protected String validateProductBatchCode(List itemParamList, Map specsMap) { - if(itemParamList.size() == 0){ - return null; - } - Set batchCodeSet = new HashSet<>(); - List batchCodeParamList = new ArrayList<>(); - for (Object itemParam : itemParamList) { - Integer pkProduct = packageSpecsParam(specsMap, itemParam); - Long pkBatchCode = ReflectUtils.invokeGetter(itemParam, ScmFieldConstants.PK_BATCH_CODE); - if (pkBatchCode != null) { - BatchCodeParam batchCodeParam = BatchCodeParam.builder() - .pkProduct(pkProduct) - .pkBatchCode(pkBatchCode) - .build(); - batchCodeParamList.add(batchCodeParam); - batchCodeSet.add(pkBatchCode); - } - } - // 判断是否有批次，有批次需要验证批次 - if (batchCodeParamList.size() > 0) { - List batchCodeList = batchCodeService.queryBatchCodeByProduct(batchCodeParamList); - for (Long batchCode : batchCodeSet) { - if (!batchCodeList.contains(batchCode)) { - return ScmMsgConstants.BATCH_CODE_NOT_EXIST; - } - } - } - return null; - } - - private Integer packageSpecsParam(Map specsMap, Object itemParam) { - List scmItemSpecsList = ReflectUtils.invokeGetter(itemParam, ScmFieldConstants.SCM_ITEM_SPECS_LIST); - Integer pkProduct = ReflectUtils.invokeGetter(itemParam, ScmFieldConstants.PK_PRODUCT); - for (ItemSpecsParam itemSpecsParam : scmItemSpecsList) { - String key = pkProduct + "_" + itemSpecsParam.getPkSpecs() + "_" + itemSpecsParam.getPkSpecsType(); - if(specsMap.containsKey(key)){ - itemSpecsParam.setSpecsName(specsMap.get(key).getSpecsName()); - } - } - return pkProduct; - } - - /* - * @description: 验证供应商 - * @author: sui q - * @date: 2023/11/29 11:58 - * @param: null null - **/ - protected String validateCuBasDoc(Integer pkCuBasDoc, Integer pkCountry){ - if(pkCuBasDoc != null) { - // 验证供应商 - BdCubasdoc bdCubasdoc = currencyServiceApi.queryBdCubasdocById(pkCuBasDoc, pkCountry).getData(); - if (bdCubasdoc == null || !Objects.equals(bdCubasdoc.getPkId(), pkCuBasDoc)) { - return ScmMsgConstants.SUPPLIER_NOT_QUERY; - } - } - return null; - } - - /* - * @description: 验证客户 - * @author: sui q - * @date: 2023/11/29 11:58 - * @param: null null - **/ - protected String validateCustomer(Integer pkCustomer, Integer pkCountry){ - if(pkCustomer != null) { - // 验证供应商 - BdCubasdoc bdCubasdoc = currencyServiceApi.queryBdCustomerById(pkCustomer, pkCountry).getData(); - if (bdCubasdoc == null || !Objects.equals(bdCubasdoc.getPkId(), pkCustomer)) { - return ScmMsgConstants.CUSTOMER_NOT_QUERY; - } - } - return null; - } - - /* - * @description: 验证库存公司 - * @author: sui q - * @date: 2023/11/29 11:58 - * @param: null null - **/ - protected String validateSysCorp(Integer pkCorp, Integer pkCountry){ - if(pkCorp != null) { - SysCorp sysCorp = currencyServiceApi.querySysCorp(pkCorp, pkCountry).getData(); - if (sysCorp == null || !Objects.equals(sysCorp.getPkId(), pkCorp)) { - return ScmMsgConstants.CORP_NOT_QUERY; - } - } - return null; - } - - /* - * @description: 验证仓库 - * @author: sui q - * @date: 2023/11/29 11:59 - * @param: null null - **/ - protected String validateStorehouse(Set storehouseIdSet, Integer pkCountry, Integer pkCorp){ - // 验证仓库，根据采购组织验证 - List bdStorehouseList = currencyServiceApi.queryStorehouseByIds(storehouseIdSet, pkCountry, pkCorp).getData(); - if (CollectionUtil.isEmpty(bdStorehouseList) || bdStorehouseList.size() != storehouseIdSet.size()) { - return ScmMsgConstants.STOREHOUSE_NOT_QUERY; - } - return null; - } - - /* - * @description: 验证仓库 - * @author: sui q - * @date: 2023/11/29 11:59 - * @param: null null - **/ - protected String validateStorehouse(Map> storehouseIdMap){ - // 验证仓库，根据采购组织验证 - for(Integer pkCountry :storehouseIdMap.keySet()) { - List queryStoreParamList =storehouseIdMap.get(pkCountry); - for (QueryStoreParam queryStoreParam : queryStoreParamList) { - Integer pkCorp = queryStoreParam.getPkCorp(); - Set storehouseIdSet = new HashSet<>(); - storehouseIdSet.add(queryStoreParam.getPkStorehouse()); - List bdStorehouseList = currencyServiceApi.queryStorehouseByIds(storehouseIdSet, pkCountry, pkCorp).getData(); - if (CollectionUtil.isEmpty(bdStorehouseList) || bdStorehouseList.size() != storehouseIdSet.size()) { - return ScmMsgConstants.STOREHOUSE_NOT_QUERY; - } - } - - } - return null; - } - - - /* - * @description: 封装验证产品基本信息的 - * @author: sui q - * @date: 2023/12/8 15:13 - * @param: null null - **/ - protected Map getBdProductBasExtMap(Set idList) { - List bdProductBasExtList = productBasService.queryProductBasByIds(idList, SecurityUtils.getPkCountry()); - if (bdProductBasExtList == null || bdProductBasExtList.size() ==0) { - return null; - } - for (BdProductBasExt bdProductBasExt : bdProductBasExtList) { - if(bdProductBasExt.getPkProduct() == null){ - return null; - } - } - return bdProductBasExtList.stream().collect(Collectors.toMap(BdProductBasExt::getPkId, product -> product)); - } - - /* - * @description: 验证有关调拨订单、调拨入库的批次号 - * @author: sui q - * @date: 2023/12/9 10:22 - * @param: null null - **/ - protected boolean validateBatchCodeByTransParam(TransferParam transferParam, Map bdProductBasExtMap) { - List batchCodeParamList = new ArrayList<>(); - Set batchCodeSet = new HashSet<>(); - for (TransferItemParam transferItemParam : transferParam.getTransferItemParamList()) { - if (transferItemParam.getPkBatchCode() != null) { - if(bdProductBasExtMap.containsKey(transferItemParam.getPkProductBas())){ - transferItemParam.setPkProduct(bdProductBasExtMap.get(transferItemParam.getPkProductBas()).getPkProduct()); - } - BatchCodeParam batchCodeParam = BatchCodeParam.builder() - .pkProduct(transferItemParam.getPkProduct()) - .pkBatchCode(transferItemParam.getPkBatchCode()) - .build(); - batchCodeParamList.add(batchCodeParam); - batchCodeSet.add(transferItemParam.getPkBatchCode()); - } - } - if (batchCodeParamList.size() > 0) { - List batchCodeList = batchCodeService.queryBatchCodeByProduct(batchCodeParamList); - for (Long batchCode : batchCodeSet) { - if (!batchCodeList.contains(batchCode)) { - return true; - } - } - } - return false; - } - - protected void setScmItemsExcel(Object sourceVo, Object targetVo){ - setScmItemsGeneralExcel(sourceVo, targetVo); - ReflectUtils.invokeSetter(targetVo, "norigprice", ReflectUtils.invokeGetter(sourceVo, "norigprice")); - ReflectUtils.invokeSetter(targetVo, "ntaxrate", ReflectUtils.invokeGetter(sourceVo, "ntaxrate")); - ReflectUtils.invokeSetter(targetVo, "norigtaxprice", ReflectUtils.invokeGetter(sourceVo, "norigtaxprice")); - ReflectUtils.invokeSetter(targetVo, "norigmny", ReflectUtils.invokeGetter(sourceVo, "norigmny")); - ReflectUtils.invokeSetter(targetVo, "ntax", ReflectUtils.invokeGetter(sourceVo, "ntax")); - ReflectUtils.invokeSetter(targetVo, "norigtaxmny", ReflectUtils.invokeGetter(sourceVo, "norigtaxmny")); - } - - protected void setScmItemsGeneralExcel(Object sourceVo, Object targetVo){ - ReflectUtils.invokeSetter(targetVo, "productCode", ReflectUtils.invokeGetter(sourceVo, "productCode")); - ReflectUtils.invokeSetter(targetVo, "productName", ReflectUtils.invokeGetter(sourceVo, "productName")); - ReflectUtils.invokeSetter(targetVo, "specsName", ReflectUtils.invokeGetter(sourceVo, "specsName")); - ReflectUtils.invokeSetter(targetVo, "unitName", ReflectUtils.invokeGetter(sourceVo, "unitName")); - ReflectUtils.invokeSetter(targetVo, "storehouseName", ReflectUtils.invokeGetter(sourceVo, "storehouseName")); - ReflectUtils.invokeSetter(targetVo, "batchCode", ReflectUtils.invokeGetter(sourceVo, "batchCode")); - ReflectUtils.invokeSetter(targetVo, "nnum", ReflectUtils.invokeGetter(sourceVo, "nnum")); - } -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/mapper/ScmItemSpecsMapper.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/mapper/ScmItemSpecsMapper.java deleted file mode 100644 index 8fe2f39e..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/mapper/ScmItemSpecsMapper.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.hzs.scm.pub.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.scm.pub.ScmItemSpecs; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - *

- * 订单规格明细 Mapper 接口 - *

- * - * @author hzs - * @since 2023-11-21 - */ -public interface ScmItemSpecsMapper extends BaseMapper { - - /* - * @description: 根据主表主键，子表主键 单据类型查询规格List - * @author: sui q - * @date: 2023/11/24 10:34 - * @param: null null - **/ - List queryScmItemSpecsByCondition(@Param("orderType") Integer orderType, @Param("scmItemSpecsList") List scmItemSpecsList); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/mapper/ScmOrderApproveLogMapper.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/mapper/ScmOrderApproveLogMapper.java deleted file mode 100644 index 805da33a..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/mapper/ScmOrderApproveLogMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.hzs.scm.pub.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.scm.pub.ScmOrderApproveLog; - -/** - *

- * 供应链单据审批记录 Mapper 接口 - *

- * - * @author hzs - * @since 2023-11-24 - */ -public interface ScmOrderApproveLogMapper extends BaseMapper { - -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/param/ItemSpecsParam.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/param/ItemSpecsParam.java deleted file mode 100644 index 2d7d8f4d..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/param/ItemSpecsParam.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.hzs.scm.pub.param; - -import lombok.Data; - -import java.io.Serializable; - -/** - * @description: 订单明细参数 - * @author: sui q - * @time: 2023/11/21 10:10 - * @classname: ItemSpecsParam - * @package_name: com.hzs.scm.po.param - * version 1.0.0 - */ -@Data -public class ItemSpecsParam implements Serializable { - - /** - * 规格类型主键 - */ - private Integer pkSpecsType; - - /** - * 规格主键 - */ - private Integer pkSpecs; - - /** - * 规格名称 验证的时候进行回填值 - */ - private String specsName; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/param/ScmApproveParam.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/param/ScmApproveParam.java deleted file mode 100644 index ba3e4cfe..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/param/ScmApproveParam.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.hzs.scm.pub.param; - -import com.hzs.common.core.web.domain.BaseApprovalEntity; -import lombok.*; - -import java.util.List; - -/** - * @description: TODO - * @author: sui q - * @time: 2023/11/24 17:05 - * @classname: ScmApproveParam - * @package_name: com.hzs.scm.pub - * version 1.0.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class ScmApproveParam extends BaseApprovalEntity { - - /** - * 提交途径 0=正常 1=免签 2=免付 3=全免 - */ - private Integer cancelRoad; - - /** - * 主键 - */ - private Long pkId; - - /** - * 国家 - */ - private Integer pkCountry; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/param/ScmPubParam.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/param/ScmPubParam.java deleted file mode 100644 index 270adc3d..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/param/ScmPubParam.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.hzs.scm.pub.param; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.util.Date; - -/** - * @description: 供应链公共的参数字段 - * @author: sui q - * @time: 2023/11/28 15:34 - * @classname: ScmPubParam - * @package_name: com.hzs.scm.pub.param - * version 1.0.0 - */ -@Data -public class ScmPubParam implements Serializable { - /** - * 主键 - */ - private Long pkId; - - /** - * 订单编号 - */ - private String orderCode; - - /** - * 库存公司 - */ - private Integer pkCorp; - - /** - * 订单日期 2023-10 - */ - private Date orderDate; - - /** - * 备注 - */ - private String remark; - - /** - * 国家 - */ - private Integer pkCountry; - - /** - * 开始日期 查询 - */ - private Date startDate; - - /** - * 订单状态 查询 - */ - private Integer orderStatus; - - /** - * 结束日期 查询 - */ - private Date endDate; - - /** - * 产品名称 - */ - private String productName; - - /** - * 产品编号 - */ - private String productCode; - - /** - * 规格 - */ - private String specsName; - - /** - * 用于查询报表 - */ - private Integer orderState; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/provider/ScmBillServiceProvider.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/provider/ScmBillServiceProvider.java deleted file mode 100644 index 95107694..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/provider/ScmBillServiceProvider.java +++ /dev/null @@ -1,331 +0,0 @@ -package com.hzs.scm.pub.provider; - -import cn.hutool.core.bean.BeanUtil; -import com.hzs.common.core.domain.R; -import com.hzs.common.core.enums.EApprovalBusiness; -import com.hzs.common.core.enums.EApproveStatus; -import com.hzs.common.core.enums.EScmOrderStatus; -import com.hzs.common.core.exception.base.BaseException; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.core.utils.StringUtils; -import com.hzs.common.domain.sale.ext.SaOrderExt; -import com.hzs.common.domain.scm.general.ext.IcGeneralInHExt; -import com.hzs.common.domain.scm.general.ext.IcGeneralOutHExt; -import com.hzs.common.domain.scm.ic.ext.IcAvailableNumExt; -import com.hzs.common.domain.scm.inventory.ext.IcInventoryHExt; -import com.hzs.common.domain.scm.io.ext.IoOrderExt; -import com.hzs.common.domain.scm.po.ext.PoOrderExt; -import com.hzs.common.domain.scm.pub.ScmOrderApproveLog; -import com.hzs.common.domain.scm.purchase.ext.IcPurchaseInHExt; -import com.hzs.common.domain.scm.sale.ext.IcSaleoutHExt; -import com.hzs.common.domain.scm.trans.ext.IcTransInHExt; -import com.hzs.common.domain.scm.trans.ext.IcTransOutHExt; -import com.hzs.common.domain.scm.trans.ext.TransferOrderExt; -import com.hzs.scm.general.service.IIcGeneralInHService; -import com.hzs.scm.general.service.IIcGeneralOutHService; -import com.hzs.scm.ic.service.IIcAvailableNumService; -import com.hzs.scm.inventory.service.IIcInventoryHService; -import com.hzs.scm.io.service.IIoOrderService; -import com.hzs.scm.po.service.IPoOrderService; -import com.hzs.scm.pub.IScmBillServiceApi; -import com.hzs.scm.pub.dto.BillDTO; -import com.hzs.scm.pub.dto.BillItemDTO; -import com.hzs.scm.pub.service.IScmOrderApproveLogService; -import com.hzs.scm.purchase.service.IIcPurchaseInHService; -import com.hzs.scm.sale.service.IIcSaleoutHService; -import com.hzs.scm.trans.service.IIcTransInHService; -import com.hzs.scm.trans.service.IIcTransOutHService; -import com.hzs.scm.trans.service.ITransferOrderService; -import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; -import org.apache.dubbo.config.annotation.DubboService; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.ArrayList; -import java.util.List; - -/** - * 供应链单据对外接口发布 - */ -@DubboService -public class ScmBillServiceProvider implements IScmBillServiceApi { - - @Autowired - private IScmOrderApproveLogService scmOrderApproveLogService; - - @Autowired - private IPoOrderService poOrderService; - - @Autowired - private IIcPurchaseInHService purchaseInhService; - - @Autowired - private IIcGeneralInHService generalInhService; - @Autowired - private IIcGeneralOutHService generalOutService; - - @Autowired - private ITransferOrderService transferOrderService; - - @Autowired - private IIcTransOutHService transOutService; - - @Autowired - private IIcTransInHService transInService; - - @Autowired - private IIcAvailableNumService availableNumService; - - @Autowired - private IIcInventoryHService inventoryService; - - @Autowired - private IIcSaleoutHService saleOutService; - - @Autowired - private IIoOrderService ioOrderService; - - @Override - public R approvalCallback(ApprovalBusinessResultDTO approvalBusinessResultDTO) { - try { - // 返回内容 - String str = null; - if (EApproveStatus.FINISH.getValue() == approvalBusinessResultDTO.getEApproveStatus().getValue()) { - // 通过处理 - switch (approvalBusinessResultDTO.getEApprovalBusiness()) { - case PO_ORDER_APPROVE: - // 采购订单 - str = poOrderService.auditPoOrderByPoOrderAgree(approvalBusinessResultDTO); - break; - case IC_PURCHASE_APPROVE: - // 采购入库 - str = purchaseInhService.auditPurchaseByPoOrderAgree(approvalBusinessResultDTO); - break; - case IC_GENERAL_IN_APPROVE: - // 其他入库 - str = generalInhService.auditGeneralInByApproveParamAgree(approvalBusinessResultDTO); - break; - case IC_GENERAL_OUT_APPROVE: - // 其他出库 - str = generalOutService.auditGeneralOutByApproveParamAgree(approvalBusinessResultDTO); - break; - case TRANSFER_ORDER_APPROVE: - // 调拨订单 - str = transferOrderService.auditTransferOrderTransferOrderAgree(approvalBusinessResultDTO); - break; - case TRANSFER_OUT_APPROVE: - // 调拨出库 - str = transOutService.auditTransferOutByApproveParamAgree(approvalBusinessResultDTO); - break; - case TRANSFER_IN_APPROVE: - // 调拨入库 - str = transInService.auditTransferInByPoOrderAgree(approvalBusinessResultDTO); - break; - case INVENTORY_ORDER_APPROVE: - // 库存盘点单 - str = inventoryService.auditInventoryByApproveParamAgree(approvalBusinessResultDTO); - break; - case BACK_SALE_OUT_APPROVE: - // 销售退货单 - str = saleOutService.auditBackSaleOutAgree(approvalBusinessResultDTO); - break; - case BACK_PURCHASE_APPROVE: - // 采购退货单 - str = purchaseInhService.auditPurchaseOutByPoOrderAgree(approvalBusinessResultDTO); - break; - case IO_ORDER_APPROVE: - // 业务领用订单 - str = ioOrderService.auditIoOrderByIoOrderAgree(approvalBusinessResultDTO); - break; - } - } else { - // 驳回处理 - switch (approvalBusinessResultDTO.getEApprovalBusiness()) { - case PO_ORDER_APPROVE: - // 采购订单 - str = poOrderService.auditPoOrderByPoOrderReject(approvalBusinessResultDTO); - break; - case IC_PURCHASE_APPROVE: - // 采购入库 - str = purchaseInhService.auditPurchaseByPoOrderReject(approvalBusinessResultDTO); - break; - case IC_GENERAL_IN_APPROVE: - // 其他入库 - str = generalInhService.auditGeneralInByApproveParamReject(approvalBusinessResultDTO); - break; - case IC_GENERAL_OUT_APPROVE: - // 其他出库 - str = generalOutService.auditGeneralOutByApproveParamReject(approvalBusinessResultDTO); - break; - case TRANSFER_ORDER_APPROVE: - // 调拨订单 - str = transferOrderService.auditTransferOrderByTransferOrderReject(approvalBusinessResultDTO); - break; - case TRANSFER_OUT_APPROVE: - // 调拨出库 - str = transOutService.auditTransferOutByApproveParamReject(approvalBusinessResultDTO); - break; - case TRANSFER_IN_APPROVE: - // 调拨入库 - str = transInService.auditTransferInByPoOrderReject(approvalBusinessResultDTO); - break; - case INVENTORY_ORDER_APPROVE: - // 库存盘点单 - str = inventoryService.auditInventoryByApproveParamReject(approvalBusinessResultDTO); - break; - case BACK_SALE_OUT_APPROVE: - // 销售退货单 - str = saleOutService.auditBackSaleOutReject(approvalBusinessResultDTO); - break; - case BACK_PURCHASE_APPROVE: - // 采购退货单 - str = purchaseInhService.auditPurchaseOutByPoOrderReject(approvalBusinessResultDTO); - break; - case IO_ORDER_APPROVE: - // 业务领用订单 - str = ioOrderService.auditIoOrderByIoOrderReject(approvalBusinessResultDTO); - break; - } - } - if (StringUtils.isNotEmpty(str)) { - // 返回有信息，说明有问题，抛出异常 - throw new BaseException(str); - } - } catch (Exception e) { - return R.fail(e.getMessage()); - } - return R.ok(); - } - - @Override - public R> queryBillDtoByCondition(EApprovalBusiness eApprovalBusiness, String businessCode) { - List scmOrderApproveLogList = scmOrderApproveLogService.queryScmOrderApproveLogByCondition(null, eApprovalBusiness.getValue(), businessCode); - if (scmOrderApproveLogList == null || scmOrderApproveLogList.size() == 0) { - return R.fail("没有查找到对应的签呈"); - } - List billDtoList = new ArrayList<>(); - switch (eApprovalBusiness) { - case PO_ORDER_APPROVE: - PoOrderExt poOrderExt = poOrderService.queryDisPoOrderById(scmOrderApproveLogList.get(0).getPkOrder(), EScmOrderStatus.SUBMIT.getValue()); - if (poOrderExt != null) { - BillDTO billDTO = BeanUtil.copyProperties(poOrderExt, BillDTO.class, "billDtoList"); - billDTO.setOrderDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, poOrderExt.getOrderDate())); - List billItemDtoList = BeanUtil.copyToList(poOrderExt.getPoOrderItemsExtList(), BillItemDTO.class); - billDTO.setBillDtoList(billItemDtoList); - billDtoList.add(billDTO); - } - case IC_PURCHASE_APPROVE: - case BACK_PURCHASE_APPROVE: - IcPurchaseInHExt icPurchaseInhExt = purchaseInhService.queryDisPurchaseInhExtById(scmOrderApproveLogList.get(0).getPkOrder(), EScmOrderStatus.SUBMIT.getValue()); - if (icPurchaseInhExt != null) { - BillDTO billDTO = BeanUtil.copyProperties(icPurchaseInhExt, BillDTO.class, "billDtoList"); - billDTO.setOrderDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, icPurchaseInhExt.getOrderDate())); - List billItemDtoList = BeanUtil.copyToList(icPurchaseInhExt.getIcPurchaseInbList(), BillItemDTO.class); - billDTO.setBillDtoList(billItemDtoList); - billDtoList.add(billDTO); - } - break; - case IC_GENERAL_IN_APPROVE: - IcGeneralInHExt generalInExt = generalInhService.queryDisGeneralInExtById(scmOrderApproveLogList.get(0).getPkOrder(), EScmOrderStatus.SUBMIT.getValue()); - if (generalInExt != null) { - BillDTO billDTO = BeanUtil.copyProperties(generalInExt, BillDTO.class, "billDtoList"); - billDTO.setOrderDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, generalInExt.getOrderDate())); - List billItemDtoList = BeanUtil.copyToList(generalInExt.getGeneralInbExtList(), BillItemDTO.class); - billDTO.setBillDtoList(billItemDtoList); - billDtoList.add(billDTO); - } - break; - case IC_GENERAL_OUT_APPROVE: - IcGeneralOutHExt generalOutExt = generalOutService.queryDisGeneralOutExtById(scmOrderApproveLogList.get(0).getPkOrder(), EScmOrderStatus.SUBMIT.getValue()); - if (generalOutExt != null) { - BillDTO billDTO = BeanUtil.copyProperties(generalOutExt, BillDTO.class, "billDtoList"); - billDTO.setOrderDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, generalOutExt.getOrderDate())); - List billItemDtoList = BeanUtil.copyToList(generalOutExt.getGeneralOutbExtList(), BillItemDTO.class); - billDTO.setBillDtoList(billItemDtoList); - billDtoList.add(billDTO); - } - break; - case TRANSFER_ORDER_APPROVE: - TransferOrderExt transferOrderExt = transferOrderService.queryDisTransferOrderById(scmOrderApproveLogList.get(0).getPkOrder(), EScmOrderStatus.SUBMIT.getValue()); - if (transferOrderExt != null) { - BillDTO billDTO = BeanUtil.copyProperties(transferOrderExt, BillDTO.class, "billDtoList"); - billDTO.setOrderDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, transferOrderExt.getOrderDate())); - List billItemDtoList = BeanUtil.copyToList(transferOrderExt.getTransferOrderItemsList(), BillItemDTO.class); - billDTO.setBillDtoList(billItemDtoList); - billDtoList.add(billDTO); - } - break; - case TRANSFER_IN_APPROVE: - IcTransInHExt transInExt = transInService.queryDisTransferInInhExtById(scmOrderApproveLogList.get(0).getPkOrder(), EScmOrderStatus.SUBMIT.getValue()); - if (transInExt != null) { - BillDTO billDTO = BeanUtil.copyProperties(transInExt, BillDTO.class, "billDtoList"); - billDTO.setOrderDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, transInExt.getOrderDate())); - List billItemDtoList = BeanUtil.copyToList(transInExt.getTransInbExtList(), BillItemDTO.class); - billDTO.setBillDtoList(billItemDtoList); - billDtoList.add(billDTO); - } - break; - case TRANSFER_OUT_APPROVE: - IcTransOutHExt transOutExt = transOutService.queryDisTransferOutExtById(scmOrderApproveLogList.get(0).getPkOrder(), EScmOrderStatus.SUBMIT.getValue()); - if (transOutExt != null) { - BillDTO billDTO = BeanUtil.copyProperties(transOutExt, BillDTO.class, "billDtoList"); - billDTO.setOrderDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, transOutExt.getOrderDate())); - List billItemDtoList = BeanUtil.copyToList(transOutExt.getTransOutbExtList(), BillItemDTO.class); - billDTO.setBillDtoList(billItemDtoList); - billDtoList.add(billDTO); - } - break; - case INVENTORY_ORDER_APPROVE: - IcInventoryHExt inventoryExt = inventoryService.queryDisInventoryExtById(scmOrderApproveLogList.get(0).getPkOrder(), EScmOrderStatus.SUBMIT.getValue()); - if (inventoryExt != null) { - BillDTO billDTO = BeanUtil.copyProperties(inventoryExt, BillDTO.class, "billDtoList"); - billDTO.setOrderDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, inventoryExt.getOrderDate())); - List billItemDtoList = BeanUtil.copyToList(inventoryExt.getInventoryBiExtList(), BillItemDTO.class); - billDTO.setBillDtoList(billItemDtoList); - billDtoList.add(billDTO); - } - break; - case BACK_SALE_OUT_APPROVE: - IcSaleoutHExt saleOutExt = saleOutService.queryDisSaleOutExtById(scmOrderApproveLogList.get(0).getPkOrder(), EScmOrderStatus.SUBMIT.getValue()); - if (saleOutExt != null) { - BillDTO billDTO = BeanUtil.copyProperties(saleOutExt, BillDTO.class, "billDtoList"); - billDTO.setOrderDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, saleOutExt.getOrderDate())); - List billItemDtoList = BeanUtil.copyToList(saleOutExt.getSaleoutbExtList(), BillItemDTO.class); - billDTO.setBillDtoList(billItemDtoList); - billDtoList.add(billDTO); - } - break; - case IO_ORDER_APPROVE: - IoOrderExt ioOrderExt = ioOrderService.queryDisIoOrderById(scmOrderApproveLogList.get(0).getPkOrder(), EScmOrderStatus.SUBMIT.getValue()); - if (ioOrderExt != null) { - BillDTO billDTO = BeanUtil.copyProperties(ioOrderExt, BillDTO.class, "billDtoList"); - billDTO.setOrderDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, ioOrderExt.getOrderDate())); - List billItemDtoList = BeanUtil.copyToList(ioOrderExt.getOrderItemsExtList(), BillItemDTO.class); - billDTO.setBillDtoList(billItemDtoList); - billDtoList.add(billDTO); - } - break; - } - return R.ok(billDtoList); - } - - @Override - public R updateDeductIcAvailableNumByList(List availableNumList) { - try { - availableNumService.updateDeductIcAvailableNumByList(availableNumList); - } catch (Exception e) { - return R.fail(); - } - return R.ok(Boolean.TRUE); - } - - @Override - public R backSaOrderAvailable(SaOrderExt saOrderExt) { - try { - availableNumService.mergeIcAvailableNumByOrder(saOrderExt); - } catch (Exception e) { - e.printStackTrace(); - return R.fail(); - } - return R.ok(Boolean.TRUE); - } -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/service/IScmItemSpecsService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/service/IScmItemSpecsService.java deleted file mode 100644 index 74440608..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/service/IScmItemSpecsService.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.hzs.scm.pub.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.scm.pub.ScmItemSpecs; - -import java.util.List; -import java.util.Map; - -/** - *

- * 订单规格明细 服务类 - *

- * - * @author hzs - * @since 2023-11-21 - */ -public interface IScmItemSpecsService extends IService { - - /* - * @description: 根据主表主键删除数据 - * @author: sui q - * @date: 2023/11/21 13:44 - * @param: null null - **/ - void deleteItemSpecsById(Integer orderType, Long pkId, Long pkMember); - - /* - * @description: 封装多规格 - * @author: sui q - * @date: 2023/11/22 11:19 - * @param: null null - **/ - void packageScmItemByParam(List itemSpecsParamList, Object obj, Integer pkCountry, Long pkMember, - Long pkOrder, Long pkOrderItems, Integer orderType); - - /* - * @description: 封装规格明细，根据上游单价 - * @author: sui q - * @date: 2023/11/24 11:08 - * @param: null null - **/ - void packageScmItemSpecsList(List scmItemSpecList, Long pkMember, - Long pkOrder, Long pkOrderItems, Integer orderType); - - /* - * @description: 保存完主表跟明细表后，根据主键回写规格表 - * @author: sui q - * @date: 2023/11/22 13:59 - * @param: null null - **/ - List packageOrderItemsSpecs(List itemsList, Long pkMasterId); - - /* - * @description: 根据主表主键，子表主键 单据类型查询规格List - * @author: sui q - * @date: 2023/11/24 10:34 - * @param: null null - **/ - Map> queryScmItemSpecsByCondition(Integer orderType, List scmItemSpecsList); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/service/IScmOrderApproveLogService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/service/IScmOrderApproveLogService.java deleted file mode 100644 index eddd642c..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/service/IScmOrderApproveLogService.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.hzs.scm.pub.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.core.enums.EApprovalBusiness; -import com.hzs.common.core.enums.EOrderPrefix; -import com.hzs.common.domain.scm.pub.ScmOrderApproveLog; -import com.hzs.scm.pub.param.ScmApproveParam; -import com.hzs.system.sys.dto.LoginUser; - -import java.util.List; - -/** - *

- * 供应链单据审批记录 服务类 - *

- * - * @author hzs - * @since 2023-11-24 - */ -public interface IScmOrderApproveLogService extends IService { - - void submitOrder(ScmApproveParam scmApproveParam, EApprovalBusiness approvalBusiness, EOrderPrefix orderPrefix, LoginUser loginUser); - - - /* - * @description: 查询签呈 - * @author: sui q - * @date: 2023/11/25 9:07 - * @param: null null - **/ - List queryScmOrderApproveLogByCondition(Long pkId, Integer auditType, String businessCode); - - /* - * @description: 更新订单状态 - * @author: sui q - * @date: 2023/11/25 16:28 - * @param: null null - **/ - void updateScmOrderApproveStatus(Long pkId, Long pkMember, Integer approvalStatus); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/service/impl/ScmItemSpecsServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/service/impl/ScmItemSpecsServiceImpl.java deleted file mode 100644 index 9cefd33c..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/service/impl/ScmItemSpecsServiceImpl.java +++ /dev/null @@ -1,117 +0,0 @@ -package com.hzs.scm.pub.service.impl; - -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.constant.SaOrderFieldConstants; -import com.hzs.common.core.constant.ScmFieldConstants; -import com.hzs.common.core.constant.SystemFieldConstants; -import com.hzs.common.core.enums.EYesNo; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.core.utils.reflect.ReflectUtils; -import com.hzs.common.domain.scm.pub.ScmItemSpecs; -import com.hzs.scm.pub.mapper.ScmItemSpecsMapper; -import com.hzs.scm.pub.service.IScmItemSpecsService; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - *

- * 订单规格明细 服务实现类 - *

- * - * @author hzs - * @since 2023-11-21 - */ -@Service -public class ScmItemSpecsServiceImpl extends ServiceImpl implements IScmItemSpecsService { - - @Override - public void deleteItemSpecsById(Integer orderType, Long pkId, Long pkMember) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.set(SystemFieldConstants.DEL_FLAG, EYesNo.NO.getIntValue()); - updateWrapper.set(SystemFieldConstants.PK_MODIFIED, pkMember); - updateWrapper.set(SystemFieldConstants.MODIFIED_TIME, DateUtils.currentDateTime()); - updateWrapper.eq(SaOrderFieldConstants.ORDER_TYPE, orderType); - updateWrapper.eq(SaOrderFieldConstants.PK_ORDER, pkId); - update(updateWrapper); - } - - @Override - public void packageScmItemByParam(List itemSpecsParamList, Object obj, Integer pkCountry, Long pkMember, - Long pkOrder, Long pkOrderItems, Integer orderType) { - List scmItemSpecsList = new ArrayList<>(); - if(CollectionUtil.isNotEmpty(itemSpecsParamList)){ - for (Object itemSpecsParam : itemSpecsParamList) { - ScmItemSpecs scmItemSpecs = ScmItemSpecs.builder() - .orderType(orderType) - .pkSpecsType(ReflectUtils.invokeGetter(itemSpecsParam, "pkSpecsType")) - .pkSpecs(ReflectUtils.invokeGetter(itemSpecsParam, "pkSpecs")) - .specsName(ReflectUtils.invokeGetter(itemSpecsParam, "specsName")) - .build(); - scmItemSpecs.setPkCreator(pkMember); - scmItemSpecs.setPkCountry(pkCountry); - scmItemSpecs.setPkOrder(pkOrder); - scmItemSpecs.setPkOrderItems(pkOrderItems); - scmItemSpecsList.add(scmItemSpecs); - } - } - if (scmItemSpecsList.size() > 0) { - ReflectUtils.invokeSetter(obj, ScmFieldConstants.SCM_ITEM_SPECS_LIST, scmItemSpecsList); - } - ReflectUtils.invokeSetter(obj, SystemFieldConstants.PK_COUNTRY_VALUE, pkCountry); - if (ReflectUtils.invokeGetter(obj, SystemFieldConstants.PK_ID_VALUE) == null) { - ReflectUtils.invokeSetter(obj, ScmFieldConstants.PK_CREATOR_FIELD, pkMember); - } else { - ReflectUtils.invokeSetter(obj, ScmFieldConstants.PK_MODIFIED_FIELD, pkMember); - ReflectUtils.invokeSetter(obj, ScmFieldConstants.MODIFIED_TIME_FIELD, DateUtils.currentDateTime()); - } - } - - @Override - public void packageScmItemSpecsList(List scmItemSpecList, Long pkMember, Long pkOrder, Long pkOrderItems, Integer orderType) { - scmItemSpecList.forEach(scmItemSpecs -> { - scmItemSpecs.setOrderType(orderType); - scmItemSpecs.setPkOrder(pkOrder); - scmItemSpecs.setPkOrderItems(pkOrderItems); - scmItemSpecs.setPkCreator(pkMember); - scmItemSpecs.setCreationTime(null); - }); - } - - @Override - public List packageOrderItemsSpecs(List itemsList, Long pkMasterId) { - List saveScmItemSpecsList = new ArrayList<>(); - for (Object items : itemsList) { - List scmItemSpecsList = ReflectUtils.invokeGetter(items, ScmFieldConstants.SCM_ITEM_SPECS_LIST); - if(CollectionUtil.isNotEmpty(scmItemSpecsList)){ - for (ScmItemSpecs scmItemSpecs : scmItemSpecsList) { - scmItemSpecs.setPkOrder(pkMasterId); - scmItemSpecs.setPkOrderItems(ReflectUtils.invokeGetter(items, SystemFieldConstants.PK_ID_VALUE)); - } - saveScmItemSpecsList.addAll(scmItemSpecsList); - } - } - return saveScmItemSpecsList; - } - - @Override - public Map> queryScmItemSpecsByCondition(Integer orderType, List queryScmList) { - Map> scmItemSpecsMap = new HashMap<>(); - List scmItemSpecsList = baseMapper.queryScmItemSpecsByCondition(orderType, queryScmList); - scmItemSpecsList.forEach(scmItemSpecs -> { - if(scmItemSpecsMap.containsKey(scmItemSpecs.getPkOrderItems())){ - scmItemSpecsMap.get(scmItemSpecs.getPkOrderItems()).add(scmItemSpecs); - }else{ - List itemSpecsList = new ArrayList<>(); - itemSpecsList.add(scmItemSpecs); - scmItemSpecsMap.put(scmItemSpecs.getPkOrderItems(), itemSpecsList); - } - }); - return scmItemSpecsMap; - } -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/service/impl/ScmOrderApproveLogServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/service/impl/ScmOrderApproveLogServiceImpl.java deleted file mode 100644 index 77df085f..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/service/impl/ScmOrderApproveLogServiceImpl.java +++ /dev/null @@ -1,122 +0,0 @@ -package com.hzs.scm.pub.service.impl; - -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.constant.SaOrderFieldConstants; -import com.hzs.common.core.constant.ScmFieldConstants; -import com.hzs.common.core.constant.SystemFieldConstants; -import com.hzs.common.core.constant.msg.CommonMsgConstants; -import com.hzs.common.core.domain.R; -import com.hzs.common.core.enums.*; -import com.hzs.common.core.exception.base.BaseException; -import com.hzs.common.core.utils.CommonUtil; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.core.utils.reflect.ReflectUtils; -import com.hzs.common.domain.scm.pub.ScmOrderApproveLog; -import com.hzs.common.domain.scm.purchase.IcPurchaseInH; -import com.hzs.common.util.TransactionUtils; -import com.hzs.scm.pub.mapper.ScmOrderApproveLogMapper; -import com.hzs.scm.pub.param.ScmApproveParam; -import com.hzs.scm.pub.service.IScmOrderApproveLogService; -import com.hzs.system.sys.IApprovalServiceApi; -import com.hzs.system.sys.dto.ApprovalSubmitDTO; -import com.hzs.system.sys.dto.LoginUser; -import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - *

- * 供应链单据审批记录 服务实现类 - *

- * - * @author hzs - * @since 2023-11-24 - */ -@Service -public class ScmOrderApproveLogServiceImpl extends ServiceImpl implements IScmOrderApproveLogService { - - @DubboReference - private IApprovalServiceApi iApprovalServiceApi; - - @Override - public void submitOrder(ScmApproveParam scmApproveParam, EApprovalBusiness approvalBusiness, EOrderPrefix orderPrefix, LoginUser loginUser) { - // 本批订单修改记录编号 - String businessCode = CommonUtil.createSerialNumber(orderPrefix); - ScmOrderApproveLog scmOrderApproveLog = packageScmOrderApproveLog(loginUser.getUserId(), - approvalBusiness.getValue(), businessCode, scmApproveParam, EAgentApprovalStatus.UNAPPROVED.getValue()); - if (save(scmOrderApproveLog)) { - R resultR = iApprovalServiceApi.submitOrder( - ApprovalSubmitDTO.builder() - .eApprovalBusiness(approvalBusiness) - .businessCode(businessCode) - .signType(ESignType.getEnumByValue(scmApproveParam.getSignType())) - .userIdList(scmApproveParam.getUserIdList()) - .sendIdList(scmApproveParam.getSendIdList()) - .remark(scmApproveParam.getRemark()) - .fileList(scmApproveParam.getFileList()) - .signSource(ESignSource.MANAGE) - .build(), - loginUser, - null - ); - if (resultR.isSuccess()) { - return; - } - throw new BaseException(TransactionUtils.getContent(CommonMsgConstants.OPERATION_FAILED) + "：" + resultR.getMsg()); - } - } - - @Override - public List queryScmOrderApproveLogByCondition(Long pkId, Integer auditType, String businessCode) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - if(pkId != null) { - queryWrapper.eq(SaOrderFieldConstants.PK_ORDER, pkId); - } - if(ObjectUtil.isNotEmpty(businessCode)){ - queryWrapper.eq(ScmFieldConstants.BUSINESS_CODE, businessCode); - } - queryWrapper.eq(SaOrderFieldConstants.ORDER_TYPE, auditType); - queryWrapper.eq(ScmFieldConstants.APPROVAL_STATUS, EAgentApprovalStatus.UNAPPROVED.getValue()); - return baseMapper.selectList(queryWrapper); - } - - @Override - public void updateScmOrderApproveStatus(Long pkId, Long pkMember, Integer approvalStatus) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.set(ScmFieldConstants.APPROVAL_STATUS, approvalStatus); - updateWrapper.set(SystemFieldConstants.PK_MODIFIED, pkMember); - updateWrapper.set(SystemFieldConstants.MODIFIED_TIME, DateUtils.currentDateTime()); - updateWrapper.eq(SystemFieldConstants.PK_ID, pkId); - update(updateWrapper); - } - - /** - * 封装订单修改记录 - * - * @param userId 用户ID - * @param orderType 修改类型 - * @param businessCode 修改记录单号 - * @param billVo 订单 - * @param approvalStatus 审核状态 - * @return ScmOrderApproveLog - */ - private ScmOrderApproveLog packageScmOrderApproveLog(Long userId, Integer orderType, String businessCode, - Object billVo, Integer approvalStatus) { - ScmOrderApproveLog scmOrderApproveLog = new ScmOrderApproveLog(); - scmOrderApproveLog.setPkOrder(ReflectUtils.invokeGetter(billVo, SystemFieldConstants.PK_ID_VALUE)); - scmOrderApproveLog.setOrderType(orderType); - scmOrderApproveLog.setPkCreator(userId); - scmOrderApproveLog.setCreationTime(DateUtils.currentDateTime()); - scmOrderApproveLog.setPkModified(scmOrderApproveLog.getPkCreator()); - scmOrderApproveLog.setModifiedTime(scmOrderApproveLog.getCreationTime()); - scmOrderApproveLog.setPkCountry(ReflectUtils.invokeGetter(billVo, SystemFieldConstants.PK_COUNTRY_VALUE)); - scmOrderApproveLog.setApprovalStatus(approvalStatus); - scmOrderApproveLog.setBusinessCode(businessCode); - return scmOrderApproveLog; - } -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/vo/ScmReturnBVo.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/vo/ScmReturnBVo.java deleted file mode 100644 index 8e2a91a6..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/vo/ScmReturnBVo.java +++ /dev/null @@ -1,114 +0,0 @@ -package com.hzs.scm.pub.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -/** - * @description: 供应链返回到会员端明细vo - * @author: sui q - * @time: 2023/12/7 16:38 - * @classname: PoOrderItemsVO - * @package_name: com.hzs.scm.po.vo - * version 1.0.0 - */ -@Data -public class ScmReturnBVo implements Serializable { - - private Integer pkProduct; - - /** - * 产品编号 - */ - private String productCode; - - /** - * 产品名称 - */ - private String productName; - - /** - * 规格名称 - */ - private String specsName; - - /** - * 单位名称 - */ - private String unitName; - - /** - * 主键 - */ - private Long pkId; - - /** - * 产品基础信息 - */ - private Integer pkProductBas; - - /** - * 仓库 - */ - private Integer pkStorehouse; - - /** - * 仓库名称 - */ - private String storehouseName; - - - /** - * 单位 - */ - private Integer pkUnit; - - /** - * 数量 - */ - private BigDecimal nnum; - - /** - * 无税单价 - */ - private BigDecimal norigprice; - - /** - * 税率 - */ - private BigDecimal ntaxrate; - - /** - * 含税单价 = 无税单价*（1+税率） - */ - private BigDecimal norigtaxprice; - - /** - * 无税金额 = 无税单价*数量 - */ - private BigDecimal norigmny; - - /** - * 税额 =无税单价*数量 - */ - private BigDecimal ntax; - - /** - * 价税合计 含税单价*数量 - */ - private BigDecimal norigtaxmny; - - /** - * 是否赠品 - */ - @Transaction(transactionKey = EnumsPrefixConstants.DEALER_YES_NO) - private Integer isGift; - - private String isGiftVal; - -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/vo/ScmReturnVo.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/vo/ScmReturnVo.java deleted file mode 100644 index 1040518e..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/vo/ScmReturnVo.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.hzs.scm.pub.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -/** - * @description: 供应链返回到会员端vo - * @author: sui q - * @time: 2023/12/7 16:38 - * @classname: PoOrderVo - * @package_name: com.hzs.scm.po.vo - * version 1.0.0 - */ -@Data -public class ScmReturnVo implements Serializable { - - /** - * 部门名称 - */ - private String deptName; - - /** - * 管理员名称 - */ - private String managerName; - - /** - * 公司名称 - */ - private String corpName; - - /** - * 主键 - */ - private Long pkId; - - /** - * 部门 - */ - private Integer pkDept; - - /** - * 订单状态 EScmOrderStatus 1=已保存 2=已提交 3=已审核 4=已收货 5=已关闭 - */ - @Transaction(transactionKey = EnumsPrefixConstants.SCM_ORDER_STATUS) - private Integer orderStatus; - - private String orderStatusVal; - - /** - * 打印状态 - */ - @Transaction(transactionKey = EnumsPrefixConstants.DEALER_YES_NO) - private Integer printStatus; - - private String printStatusVal; - - /** - * 采购公司 - */ - private Integer pkCorp; - - /** - * 总数量 - */ - private BigDecimal totalNum; - - /** - * 价税合计 - */ - private BigDecimal totalOrigmny; - - /** - * 订单编号 - */ - private String orderCode; - - /** - * 订单日期 2023-10 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date orderDate; - - /** - * 备注 - */ - private String remark; - - @Transaction(transactionKey = EnumsPrefixConstants.KEY_COUNTRY) - private Integer pkCountry; - - private String pkCountryVal; - -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/vo/ScmSpecsVO.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/vo/ScmSpecsVO.java deleted file mode 100644 index c7ddc969..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/vo/ScmSpecsVO.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.hzs.scm.pub.vo; - -import lombok.Data; - -import java.io.Serializable; - -/** - * @description: 规格 - * @author: sui q - * @time: 2023/12/25 10:44 - * @classname: ScmSpecsVO - * @package_name: com.hzs.scm.pub.vo - * version 1.0.0 - */ -@Data -public class ScmSpecsVO implements Serializable { - - - /** - * 规格类型主键 - */ - private Integer pkSpecsType; - - /** - * 规格主键 - */ - private Integer pkSpecs; - - /** - * 规格名称 - */ - private String specsName; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/controller/manage/IcPurchaseInHController.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/controller/manage/IcPurchaseInHController.java deleted file mode 100644 index bfba21d5..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/controller/manage/IcPurchaseInHController.java +++ /dev/null @@ -1,416 +0,0 @@ -package com.hzs.scm.purchase.controller.manage; - - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.ObjectUtil; -import com.hzs.common.core.annotation.Log; -import com.hzs.common.core.constant.msg.MemberMsgConstants; -import com.hzs.common.core.constant.msg.ScmMsgConstants; -import com.hzs.common.core.enums.*; -import com.hzs.common.core.utils.poi.ExcelUtil; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.member.ext.CuMemberBonusExt; -import com.hzs.common.domain.sale.product.ext.BdProductBasExt; -import com.hzs.common.domain.scm.po.ext.PoOrderExt; -import com.hzs.common.domain.scm.pub.ScmOrderApproveLog; -import com.hzs.common.domain.scm.purchase.ext.IcPurchaseInBExt; -import com.hzs.common.domain.scm.purchase.ext.IcPurchaseInHExt; -import com.hzs.common.security.service.UserTokenService; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.common.util.TransactionUtils; -import com.hzs.scm.ic.param.BatchCodeParam; -import com.hzs.scm.ic.service.IIcBatchCodeService; -import com.hzs.scm.po.param.PoOrderItemsParam; -import com.hzs.scm.po.service.IPoOrderService; -import com.hzs.scm.pub.controller.ScmController; -import com.hzs.scm.pub.param.ScmApproveParam; -import com.hzs.scm.pub.service.IScmOrderApproveLogService; -import com.hzs.scm.purchase.param.PurchaseInBParam; -import com.hzs.scm.purchase.param.PurchaseInParam; -import com.hzs.scm.purchase.service.IIcPurchaseInHService; -import com.hzs.scm.purchase.vo.PurchaseExcelVO; -import com.hzs.scm.purchase.vo.PurchaseInBVo; -import com.hzs.scm.purchase.vo.PurchaseInVo; -import com.hzs.scm.purchase.vo.PurchaseOutExcelVO; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.*; -import java.util.stream.Collectors; - -/** - *

- * 采购入库表头 前端控制器 - *

- * - * @author hzs - * @since 2023-11-17 - */ -@RestController -@RequestMapping("/manage/purchase") -public class IcPurchaseInHController extends ScmController { - - @Autowired - private IPoOrderService poOrderService; - - @Autowired - private IIcPurchaseInHService icPurchaseInhService; - - @Autowired - private IIcBatchCodeService batchCodeService; - - @Autowired - private UserTokenService userTokenService; - - @Autowired - private IScmOrderApproveLogService scmOrderApproveLogService; - - /** - * 查询列表 - * - * @return cubasdocParam 入参 - */ - @PostMapping("/list") - @Log(module = EOperationModule.PO_PURCHASE, business = EOperationBusiness.PO_PURCHASE, method = EOperationMethod.SELECT) - public TableDataInfo listPurchaseIn(@RequestBody PurchaseInParam purchaseInParam) { - startPage(); - purchaseInParam.setPkCountry(SecurityUtils.getPkCountry()); - purchaseInParam.setReturnStatus(EYesNo.NO.getIntValue()); - List icPurchaseInExtList = icPurchaseInhService.queryDisPurchaseInExtByCondition(purchaseInParam); - return packageTableDataInfo(icPurchaseInExtList, packageScmReturnVo(icPurchaseInExtList)); - } - - /** - * 查询列表 - * - * @return cubasdocParam 入参 - */ - @PostMapping("/list-out") - @Log(module = EOperationModule.PO_PURCHASE_OUT, business = EOperationBusiness.PO_PURCHASE_OUT, method = EOperationMethod.SELECT) - public TableDataInfo listPurchaseOut(@RequestBody PurchaseInParam purchaseInParam) { - startPage(); - purchaseInParam.setPkCountry(SecurityUtils.getPkCountry()); - purchaseInParam.setReturnStatus(EDealerYesNo.YES.getValue()); - List icPurchaseInExtList = icPurchaseInhService.queryDisPurchaseInExtByCondition(purchaseInParam); - return packageTableDataInfo(icPurchaseInExtList, packageScmReturnVo(icPurchaseInExtList)); - } - - /** - * 查询列表 - * - * @return cubasdocParam 入参 - */ - @PostMapping("/list-total") - public TableDataInfo listPurchaseInTotal(@RequestBody PurchaseInParam purchaseInParam) { - purchaseInParam.setPkCountry(SecurityUtils.getPkCountry()); - startPage(); - List icPurchaseInExtList = icPurchaseInhService.queryTotalPurchaseInhExtByCondition(purchaseInParam); - return packageTableDataInfo(icPurchaseInExtList, packageScmReturnVo(icPurchaseInExtList)); - } - - /** - * 分页查询会员某个时间段内的奖金汇总 - */ - @PostMapping("/export-list-total") - @Log(module = EOperationModule.PO_PURCHASE, business = EOperationBusiness.PO_PURCHASE, method = EOperationMethod.EXPORT) - public void exportListPurchaseInTotal(HttpServletResponse response, PurchaseInParam purchaseInParam){ - purchaseInParam.setPkCountry(SecurityUtils.getPkCountry()); - purchaseInParam.setReturnStatus(EDealerYesNo.NO.getValue()); - List icPurchaseInExtList = icPurchaseInhService.queryTotalPurchaseInhExtByCondition(purchaseInParam); - List purchaseInVoList = packageScmExportVo(icPurchaseInExtList); - ExcelUtil util = new ExcelUtil<>(PurchaseExcelVO.class); - util.exportExcel(response, purchaseInVoList, "采购入库导出"); - } - - private List packageScmReturnVo(List purchaseInExtList) { - List purchaseInVoList = new ArrayList<>(); - for (IcPurchaseInHExt purchaseInExt : purchaseInExtList) { - PurchaseInVo purchaseInVo = BeanUtil.copyProperties(purchaseInExt, PurchaseInVo.class); - List purchaseInbiList= purchaseInExt.getIcPurchaseInbList(); - if (CollectionUtil.isNotEmpty(purchaseInbiList)) { - List returnbVoList = BeanUtil.copyToList(purchaseInbiList, PurchaseInBVo.class); - purchaseInVo.setIcPurchaseInbList(returnbVoList); - } - purchaseInVoList.add(purchaseInVo); - } - return purchaseInVoList; - } - - private List packageScmExportVo(List purchaseInExtList) { - List purchaseInVoList = new ArrayList<>(); - for (IcPurchaseInHExt purchaseInExt : purchaseInExtList) { - List purchaseInbiList= purchaseInExt.getIcPurchaseInbList(); - for (IcPurchaseInBExt icPurchaseInBiExt : purchaseInbiList) { - PurchaseExcelVO purchaseExcelVo = BeanUtil.copyProperties(purchaseInExt, PurchaseExcelVO.class); - setScmItemsExcel(icPurchaseInBiExt, purchaseExcelVo); - purchaseExcelVo.setIsGift(icPurchaseInBiExt.getIsGift()); - purchaseInVoList.add(purchaseExcelVo); - } - } - return purchaseInVoList; - } - - /** - * 分页查询会员某个时间段内的奖金汇总 - */ - @PostMapping("/export-back-total") - @Log(module = EOperationModule.PO_PURCHASE, business = EOperationBusiness.PO_PURCHASE, method = EOperationMethod.EXPORT) - public void exportListPurchaseInBackTotal(HttpServletResponse response, PurchaseInParam purchaseInParam){ - purchaseInParam.setPkCountry(SecurityUtils.getPkCountry()); - purchaseInParam.setReturnStatus(EDealerYesNo.YES.getValue()); - List icPurchaseInExtList = icPurchaseInhService.queryTotalPurchaseInhExtByCondition(purchaseInParam); - List purchaseInVoList = packageBackScmExportVo(icPurchaseInExtList); - ExcelUtil util = new ExcelUtil<>(PurchaseOutExcelVO.class); - util.exportExcel(response, purchaseInVoList, "采购退货导出"); - } - - private List packageBackScmExportVo(List purchaseInExtList) { - List purchaseInVoList = new ArrayList<>(); - for (IcPurchaseInHExt purchaseInExt : purchaseInExtList) { - List purchaseInbiList= purchaseInExt.getIcPurchaseInbList(); - for (IcPurchaseInBExt icPurchaseInBiExt : purchaseInbiList) { - PurchaseOutExcelVO purchaseExcelVo = BeanUtil.copyProperties(purchaseInExt, PurchaseOutExcelVO.class); - setScmItemsExcel(icPurchaseInBiExt, purchaseExcelVo); - purchaseExcelVo.setIsGift(icPurchaseInBiExt.getIsGift()); - purchaseInVoList.add(purchaseExcelVo); - } - } - return purchaseInVoList; - } - - /** - * 新增采购入库 - * - * @param purchaseInhParam 入参 - */ - @PostMapping("/insert") - @Log(module = EOperationModule.PO_PURCHASE, business = EOperationBusiness.PO_PURCHASE, method = EOperationMethod.INSERT) - public AjaxResult savePurchaseIn(@RequestBody PurchaseInParam purchaseInhParam) { - String message = validatePurchaseParam(purchaseInhParam); - if (ObjectUtil.isNotEmpty(message)) { - return AjaxResult.error(TransactionUtils.getContent(message)); - } - // 审核通过后需要关闭采购订单 回写采购订单累计入库数量 - return AjaxResult.success(); - } - - /** - * 退货 - * @param purchaseInhParam 入参 - */ - @PostMapping("/out-back") - @Log(module = EOperationModule.PO_PURCHASE_OUT, business = EOperationBusiness.PO_PURCHASE_OUT, method = EOperationMethod.BACK) - public AjaxResult backPurchaseIn(@RequestBody PurchaseInParam purchaseInhParam) { - if(purchaseInhParam.getPkId() == null){ - return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.REQUIRED_NOT_EMPTY)); - } - // 验证是否存在采购入库单 - IcPurchaseInHExt purchaseInExt = icPurchaseInhService.queryPurchaseInExtById(purchaseInhParam.getPkId(), null, SecurityUtils.getPkCountry()); - if(purchaseInExt == null || purchaseInExt.getOrderStatus() < EScmOrderStatus.APPROVE.getValue()){ - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.IC_PURCHASE_NOT_EXIST)); - } - icPurchaseInhService.insertSavePurchaseBack(purchaseInExt, purchaseInhParam); - return AjaxResult.success(); - } - - /** - * 撤销订单并入库（走签呈），签呈页面点击确定按钮 - * - * @param scmApproveParam 参数 - */ - @PostMapping("/out-submit") - @Log(module = EOperationModule.SALE_OUT, business = EOperationBusiness.SALE_OUT, method = EOperationMethod.SUBMIT) - public AjaxResult submitBackPurchase(@RequestBody ScmApproveParam scmApproveParam) { - scmApproveParam.setPkCountry(SecurityUtils.getPkCountry()); - if(scmApproveParam.getPkId() == null){ - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.BACK_SALE_OUT_NOT_EXIST)); - } - IcPurchaseInHExt purchaseInExt = icPurchaseInhService.queryPurchaseInExtById(scmApproveParam.getPkId(), EScmOrderStatus.SAVE.getValue(), SecurityUtils.getPkCountry()); - if(purchaseInExt == null){ - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.IC_PURCHASE_OUT_NOT_EXIST)); - } - // 查询原始订单是否已经退货 - for (IcPurchaseInBExt purchaseInBiExt : purchaseInExt.getIcPurchaseInbList()) { - if(purchaseInBiExt.getPkSource() == null){ - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.IC_PURCHASE_NOT_EXIST)); - } - IcPurchaseInHExt oldPurchaseInExt = icPurchaseInhService.queryPurchaseInExtById(purchaseInBiExt.getPkSource(), null, null); - if (oldPurchaseInExt == null || oldPurchaseInExt.getOrderStatus() < EScmOrderStatus.APPROVE.getValue()) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.IC_PURCHASE_NOT_EXIST)); - } - } - // 验证该订单是否存在签呈，存在待审核的签呈不能再次发起 - List scmOrderApproveLogs = scmOrderApproveLogService.queryScmOrderApproveLogByCondition(scmApproveParam.getPkId(), EApprovalBusiness.BACK_SALE_OUT_APPROVE.getValue(), null); - if(CollectionUtil.isNotEmpty(scmOrderApproveLogs)){ - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.PURCHASE_EXISTS_AGENT)); - } - icPurchaseInhService.auditPurchaseOutByPoOrderSubmit(purchaseInExt, scmApproveParam, userTokenService.getLoginUser()); - return AjaxResult.success(); - } - - private String validatePurchaseParam(PurchaseInParam purchaseInhParam) { - List orderItemsParamList = new ArrayList<>(); - if (validatePurchaseIn(purchaseInhParam, orderItemsParamList)) { - return MemberMsgConstants.REQUIRED_NOT_EMPTY; - } - purchaseInhParam.setPkCountry(SecurityUtils.getPkCountry()); - // 验证是否存在采购订单,根据采购订单生成表头 表体信息 - List poOrderExtList = poOrderService.queryPoOrderByOrderItems(orderItemsParamList); - if (validateCuBasdoc(poOrderExtList, orderItemsParamList)) { - return ScmMsgConstants.PURCHASE_BODY_NOT_EMPTY; - } - // 验证产品 - Set idList = purchaseInhParam.getPurchaseInBParamList().stream().map(PurchaseInBParam::getPkProductBas).collect(Collectors.toSet()); - Map bdProductBasExtMap = getBdProductBasExtMap(idList); - if (bdProductBasExtMap == null){ - return ScmMsgConstants.PRODUCT_NOT_EXIST; - } - // 判断是否有批次，有批次需要验证批次 - PoOrderExt poOrderExt = poOrderExtList.get(0); - purchaseInhParam.setPkCorp(poOrderExt.getPkCorp()); - purchaseInhParam.setPkCubasdoc(poOrderExt.getPkCubasdoc()); - List batchCodeParamList = new ArrayList<>(); - Set batchCodeSet = new HashSet<>(); - for (PurchaseInBParam purchaseInbParam : purchaseInhParam.getPurchaseInBParamList()) { - if (purchaseInbParam.getPkBatchCode() != null) { - if(bdProductBasExtMap.containsKey(purchaseInbParam.getPkProductBas())){ - purchaseInbParam.setPkProduct(bdProductBasExtMap.get(purchaseInbParam.getPkProductBas()).getPkProduct()); - } - BatchCodeParam batchCodeParam = BatchCodeParam.builder() - .pkProduct(purchaseInbParam.getPkProduct()) - .pkBatchCode(purchaseInbParam.getPkBatchCode()) - .build(); - batchCodeParamList.add(batchCodeParam); - batchCodeSet.add(purchaseInbParam.getPkBatchCode()); - } - } - if (batchCodeParamList.size() > 0) { - List batchCodeList = batchCodeService.queryBatchCodeByProduct(batchCodeParamList); - for (Long batchCode : batchCodeSet) { - if (!batchCodeList.contains(batchCode)) { - return ScmMsgConstants.BATCH_CODE_NOT_EXIST; - } - } - } - if (purchaseInhParam.getPkId() == null) { - icPurchaseInhService.insertSavePurchaseByPoOrder(poOrderExtList, purchaseInhParam, SecurityUtils.getUserId()); - } else { - // 查询是否存在采购入库单 - IcPurchaseInHExt purchaseInhExt = icPurchaseInhService.queryPurchaseInhExtById(purchaseInhParam.getPkId(), EScmOrderStatus.SAVE.getValue(), SecurityUtils.getPkCountry()); - if (purchaseInhExt == null) { - return ScmMsgConstants.IC_PURCHASE_NOT_EXIST; - } - icPurchaseInhService.updateSavePurchaseByPoOrder(poOrderExtList, purchaseInhExt, purchaseInhParam, SecurityUtils.getUserId()); - } - return null; - } - - private Boolean validateCuBasdoc(List poOrderExtList, List orderItemsParamList) { - if (poOrderExtList == null || poOrderExtList.size() == 0) { - return Boolean.TRUE; - } - int size = 0; - // 供应商 - Integer pkCubasdoc = poOrderExtList.get(0).getPkCubasdoc(); - for (PoOrderExt poOrderExt : poOrderExtList) { - size += poOrderExt.getPoOrderItemsExtList().size(); - if (!Objects.equals(pkCubasdoc, poOrderExt.getPkCubasdoc())) { - return Boolean.TRUE; - } - } - if (size != orderItemsParamList.size()) { - return Boolean.TRUE; - } - // 采购订单合并只能是同一个供应商的 - return Boolean.FALSE; - } - - private Boolean validatePurchaseIn(PurchaseInParam purchaseInhParam, List orderItemsParamList) { - if (purchaseInhParam == null || CollectionUtil.isEmpty(purchaseInhParam.getPurchaseInBParamList())) { - return Boolean.TRUE; - } - // 验证 采购订单明细字段不能为空 - for (PurchaseInBParam purchaseInbParam : purchaseInhParam.getPurchaseInBParamList()) { - if (purchaseInbParam.getPkPoOrderItems() == null || purchaseInbParam.getPkPoOrder() == null || - purchaseInbParam.getBizDate() == null || purchaseInbParam.getNnum() == null || - purchaseInbParam.getPkStorehouse() == null) { - return Boolean.TRUE; - } - PoOrderItemsParam poOrderItemsParam = PoOrderItemsParam.builder() - .pkOrder(purchaseInbParam.getPkPoOrder()) - .pkId(purchaseInbParam.getPkPoOrderItems()) - .pkProductBas(purchaseInbParam.getPkProductBas()) - .nnum(purchaseInbParam.getNnum()) - .build(); - orderItemsParamList.add(poOrderItemsParam); - } - return Boolean.FALSE; - } - - - /** - * 修改采购入库 - * - * @param purchaseInhParam 入参 - */ - @PostMapping("/update") - @Log(module = EOperationModule.PO_PURCHASE, business = EOperationBusiness.PO_PURCHASE, method = EOperationMethod.UPDATE) - public AjaxResult updatePurchaseIn(@RequestBody PurchaseInParam purchaseInhParam) { - if (purchaseInhParam.getPkId() == null) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.IC_PURCHASE_NOT_EXIST)); - } - String message = validatePurchaseParam(purchaseInhParam); - if (ObjectUtil.isNotEmpty(message)) { - return AjaxResult.error(TransactionUtils.getContent(message)); - } - // 审核通过后需要关闭采购订单 回写采购订单累计入库数量 - return AjaxResult.success(); - } - - /** - * 删除采购订单 - * - * @param pkId 主键 - */ - @DeleteMapping("/{pkId}") - @Log(module = EOperationModule.PO_PURCHASE, business = EOperationBusiness.PO_PURCHASE, method = EOperationMethod.DELETE) - public AjaxResult delete(@PathVariable Long pkId) { - if (pkId == null) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.IC_PURCHASE_NOT_EXIST)); - } - IcPurchaseInHExt purchaseInhExt = icPurchaseInhService.queryPurchaseInhExtById(pkId, EScmOrderStatus.SAVE.getValue(), SecurityUtils.getPkCountry()); - if (purchaseInhExt == null) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.IC_PURCHASE_NOT_EXIST)); - } - icPurchaseInhService.deletePurchaseByPk(pkId, SecurityUtils.getUserId()); - return AjaxResult.success(); - } - - /** - * 撤销订单并入库（走签呈），签呈页面点击确定按钮 - * - * @param scmApproveParam 参数 - */ - @PostMapping("/submit") - @Log(module = EOperationModule.PO_PURCHASE, business = EOperationBusiness.PO_PURCHASE, method = EOperationMethod.UPDATE) - public AjaxResult submitPurchaseIn(@RequestBody ScmApproveParam scmApproveParam) { - scmApproveParam.setPkCountry(SecurityUtils.getPkCountry()); - if(scmApproveParam.getPkId() == null){ - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.IC_PURCHASE_NOT_EXIST)); - } - IcPurchaseInHExt purchaseInhExt = icPurchaseInhService.queryPurchaseInhExtById(scmApproveParam.getPkId(), EScmOrderStatus.SAVE.getValue(), SecurityUtils.getPkCountry()); - if (purchaseInhExt == null) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.IC_PURCHASE_NOT_EXIST)); - } - // 验证该订单是否存在签呈，存在待审核的签呈不能再次发起 - List scmOrderApproveLogs = scmOrderApproveLogService.queryScmOrderApproveLogByCondition(scmApproveParam.getPkId(), EApprovalBusiness.IC_PURCHASE_APPROVE.getValue(), null); - if(CollectionUtil.isNotEmpty(scmOrderApproveLogs)){ - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.PURCHASE_EXISTS_AGENT)); - } - icPurchaseInhService.auditPurchaseByPoOrderSubmit(scmApproveParam, userTokenService.getLoginUser()); - return AjaxResult.success(); - } -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/mapper/IcPurchaseInBMapper.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/mapper/IcPurchaseInBMapper.java deleted file mode 100644 index ee54bb10..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/mapper/IcPurchaseInBMapper.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.hzs.scm.purchase.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.scm.purchase.IcPurchaseInB; -import com.hzs.common.domain.scm.purchase.ext.IcPurchaseInBExt; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - *

- * 采购订单明细 Mapper 接口 - *

- * - * @author hzs - * @since 2023-11-17 - */ -public interface IcPurchaseInBMapper extends BaseMapper { - - /* - * @description: 根据主表主键查询采购入库单明细 - * @author: sui q - * @date: 2023/11/25 15:02 - * @param: null null - **/ - List queryPurchaseInbByPk(@Param("icPurchaseInbList") List icPurchaseInbList); - - /* - * @description: 审核通过，更新累计入库数量，用于分批退货 - * @author: sui q - * @date: 2024/4/10 16:19 - * @param: null null - **/ - void updatePurchaseInbByPk(@Param("icPurchaseInbList") List icPurchaseInbList); - - /* - * @description: - * @author: sui q - * @date: 2024/4/10 16:43 - * @param: null null - **/ - void mergePurchaseInBiByPurchaseBack(@Param("icPurchaseInbList") List icPurchaseInbList); - - /* - * @description: 删除入库单子表明细 - * @author: sui q - * @date: 2023/11/23 10:38 - * @param: null null - **/ - void deletePurchaseInbByList(@Param("purchaseInbList") List purchaseInbList); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/mapper/IcPurchaseInHMapper.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/mapper/IcPurchaseInHMapper.java deleted file mode 100644 index 25fa478f..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/mapper/IcPurchaseInHMapper.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.hzs.scm.purchase.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.scm.purchase.IcPurchaseInH; -import com.hzs.common.domain.scm.purchase.ext.IcPurchaseInBExt; -import com.hzs.common.domain.scm.purchase.ext.IcPurchaseInHExt; -import com.hzs.scm.purchase.param.PurchaseInParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - *

- * 采购订单表头 Mapper 接口 - *

- * - * @author hzs - * @since 2023-11-17 - */ -public interface IcPurchaseInHMapper extends BaseMapper { - - /* - * @description: 根据主键查询入库单 - * @author: sui q - * @date: 2023/11/24 13:52 - * @param: null null - **/ - IcPurchaseInHExt queryPurchaseInhExtById(@Param("pkId") Long pkId, @Param("orderStatus") Integer orderStatus, @Param("pkCountry") Integer pkCountry); - - /* - * @description: 查询会员端显示的采购入库单 - * @author: sui q - * @date: 2023/11/25 9:55 - * @param: null null - **/ - List queryDisPurchaseInhExtByCondition(PurchaseInParam purchaseInParam); - - /* - * @description: 查询统计报表，采购入库单汇总 - * @author: sui q - * @date: 2024/2/22 14:42 - * @param: null null - **/ - List queryTotalPurchaseInhExtByCondition(PurchaseInParam purchaseInParam); - - /* - * @description: 退货更新采购入库单，更新为部分退货或退货 - * @author: sui q - * @date: 2024/4/12 9:47 - * @param: null null - **/ - void mergePurchaseInExt(@Param("icPurchaseInbList") List icPurchaseInbList, @Param("userId") Long userId); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/param/PurchaseInBParam.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/param/PurchaseInBParam.java deleted file mode 100644 index d49892da..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/param/PurchaseInBParam.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.hzs.scm.purchase.param; - -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -/** - * @description: 采购入库单表体参数 - * @author: sui q - * @time: 2023/11/21 16:46 - * @classname: PurchaseInHParam - * @package_name: com.hzs.scm.purchase.param - * version 1.0.0 - */ -@Data -public class PurchaseInBParam implements Serializable { - - /** - * 主键 - */ - private Long pkId; - - /** - * 单位 - */ - private Integer pkUnit; - - /** - * 采购订单主键 - */ - private Long pkPoOrder; - - /** - * 采购订单明细主键 - */ - private Long pkPoOrderItems; - - /** - * 货位 - */ - private Integer pkClocation; - - /** - * 产品基础信息主键 - */ - private Integer pkProductBas; - - /** - * 产品信息主键 - */ - private Integer pkProduct; - - /** - * 入库日期 - */ - private Date bizDate; - - /** - * 仓库 - */ - private Integer pkStorehouse; - - /** - * 数量 - */ - private BigDecimal nnum; - - /** - * 无税单价 - */ - private BigDecimal norigprice; - - /** - * 税率 - */ - private BigDecimal ntaxrate; - - /** - * 批次主键 - */ - private Long pkBatchCode; - - /** - * 是否赠品 - */ - private Integer isGift; - -// /** -// * 明细表规格明细 -// */ -// private List itemSpecsParamList; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/param/PurchaseInParam.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/param/PurchaseInParam.java deleted file mode 100644 index 48205219..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/param/PurchaseInParam.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.hzs.scm.purchase.param; - -import com.hzs.scm.pub.param.ScmPubParam; -import lombok.*; - -import java.util.List; - -/** - * @description: 采购入库单表头参数 - * @author: sui q - * @time: 2023/11/21 16:46 - * @classname: PurchaseInHParam - * @package_name: com.hzs.scm.purchase.param - * version 1.0.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data - -public class PurchaseInParam extends ScmPubParam { - - /** - * 供应商 取bd_cubasdoc 类型为1 2的 - */ - private Integer pkCubasdoc; - - /** - * 是否赠品 - */ - private Integer isGift; - - /** - * 仓库 - */ - private Integer pkStorehouse; - - /** - * 退货状态 - */ - private Integer returnStatus; - - /** - * 退货理由 - */ - private String returnReason; - - /** - * 采购单号 - */ - private String saOrderCode; - - /** - * 明细详情 - */ - private List purchaseInBParamList; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/service/IIcPurchaseInBService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/service/IIcPurchaseInBService.java deleted file mode 100644 index 64b576af..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/service/IIcPurchaseInBService.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.hzs.scm.purchase.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.scm.purchase.IcPurchaseInB; -import com.hzs.common.domain.scm.purchase.ext.IcPurchaseInBExt; - -import java.util.List; - -/** - *

- * 采购订单明细 服务类 - *

- * - * @author hzs - * @since 2023-11-17 - */ -public interface IIcPurchaseInBService extends IService { - - /* - * @description: 根据主表主键查询采购入库单明细 - * @author: sui q - * @date: 2023/11/25 15:02 - * @param: null null - **/ - List queryPurchaseInbByPk(List icPurchaseInbList); - - /* - * @description: 审核通过，更新累计入库数量，用于分批退货 - * @author: sui q - * @date: 2024/4/10 16:19 - * @param: null null - **/ - void updatePurchaseInbByPk(List icPurchaseInbList); - - /* - * @description: - * @author: sui q - * @date: 2024/4/10 16:43 - * @param: null null - **/ - void mergePurchaseInBiByPurchaseBack(List icPurchaseInbList); - - /* - * @description: 删除入库单子表明细 - * @author: sui q - * @date: 2023/11/23 10:38 - * @param: null null - **/ - void deletePurchaseInbByList(List purchaseInbList); - - /* - * @description: 删除入库单子表明细 - * @author: sui q - * @date: 2023/11/23 10:38 - * @param: null null - **/ - void deletePurchaseInbByPkPurchase(Long pkPurchase, Long pkMember); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/service/IIcPurchaseInHService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/service/IIcPurchaseInHService.java deleted file mode 100644 index e44bcece..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/service/IIcPurchaseInHService.java +++ /dev/null @@ -1,144 +0,0 @@ -package com.hzs.scm.purchase.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.scm.po.ext.PoOrderExt; -import com.hzs.common.domain.scm.purchase.IcPurchaseInH; -import com.hzs.common.domain.scm.purchase.ext.IcPurchaseInHExt; -import com.hzs.scm.pub.param.ScmApproveParam; -import com.hzs.scm.purchase.param.PurchaseInParam; -import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; -import com.hzs.system.sys.dto.LoginUser; - -import java.util.List; - -/** - *

- * 采购订单表头 服务类 - *

- * - * @author hzs - * @since 2023-11-17 - */ -public interface IIcPurchaseInHService extends IService { - - /* - * @description: 新增保存采购入库单 - * @author: sui q - * @date: 2023/11/22 9:56 - * @param: null null - **/ - void insertSavePurchaseByPoOrder(List poOrderList, PurchaseInParam purchaseInhParam, Long pkMember); - - /* - * @description: 新增保存采购退货单 - * @author: sui q - * @date: 2023/11/22 9:56 - * @param: null null - **/ - void insertSavePurchaseBack(IcPurchaseInHExt purchaseInExt, PurchaseInParam purchaseInhParam); - - /* - * @description: 修改保存采购入库单 - * @author: sui q - * @date: 2023/11/23 9:10 - * @param: null null - **/ - void updateSavePurchaseByPoOrder(List poOrderList, IcPurchaseInHExt purchaseInhExt, - PurchaseInParam purchaseInhParam, Long pkMember); - - /* - * @description: 根据主键删除采购入库单，只有保存的可以删除 - * @author: sui q - * @date: 2023/11/23 11:22 - * @param: null null - **/ - void deletePurchaseByPk(Long pkPurchase, Long pkMember); - - /* - * @description: 提交采购入库单（走审批） - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - void auditPurchaseByPoOrderSubmit(ScmApproveParam scmApproveParam, LoginUser loginUser); - - /* - * @description: 审核通过采购入库单 - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - String auditPurchaseByPoOrderAgree(ApprovalBusinessResultDTO approvalBusinessResultDTO); - - /* - * @description: 审核驳回采购入库单 - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - String auditPurchaseByPoOrderReject(ApprovalBusinessResultDTO approvalBusinessResultDTO); - - /* - * @description: 根据主键查询销售出库单 - * @author: sui q - * @date: 2023/11/24 13:52 - * @param: null null - **/ - IcPurchaseInHExt queryPurchaseInExtById(Long pkId, Integer orderStatus, Integer pkCountry); - - /* - * @description: 根据主键查询入库单 - * @author: sui q - * @date: 2023/11/24 13:52 - * @param: null null - **/ - IcPurchaseInHExt queryPurchaseInhExtById(Long pkId, Integer orderStatus, Integer pkCountry); - - /* - * @description: 查询会员端显示的采购入库单 - * @author: sui q - * @date: 2023/11/25 9:55 - * @param: null null - **/ - IcPurchaseInHExt queryDisPurchaseInhExtById(Long pkId, Integer orderStatus); - - /* - * @description: 查询列表 - * @author: sui q - * @date: 2023/11/28 15:48 - * @param: null null - **/ - List queryDisPurchaseInExtByCondition(PurchaseInParam purchaseInParam); - - /* - * @description: 查询统计报表，采购入库单汇总 - * @author: sui q - * @date: 2024/2/22 14:42 - * @param: null null - **/ - List queryTotalPurchaseInhExtByCondition(PurchaseInParam purchaseInParam); - - /* - * @description: 提交采购退货单（走审批） - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - void auditPurchaseOutByPoOrderSubmit(IcPurchaseInHExt purchaseInExt, ScmApproveParam scmApproveParam, LoginUser loginUser); - - /* - * @description: 审核通过采购退货单 - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - String auditPurchaseOutByPoOrderAgree(ApprovalBusinessResultDTO approvalBusinessResultDTO); - - /* - * @description: 审核驳回采购退货单 - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - String auditPurchaseOutByPoOrderReject(ApprovalBusinessResultDTO approvalBusinessResultDTO); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/service/impl/IcPurchaseInBServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/service/impl/IcPurchaseInBServiceImpl.java deleted file mode 100644 index 57546d5f..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/service/impl/IcPurchaseInBServiceImpl.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.hzs.scm.purchase.service.impl; - -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.constant.ScmFieldConstants; -import com.hzs.common.core.constant.SystemFieldConstants; -import com.hzs.common.core.enums.EYesNo; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.domain.scm.purchase.IcPurchaseInB; -import com.hzs.common.domain.scm.purchase.ext.IcPurchaseInBExt; -import com.hzs.scm.purchase.mapper.IcPurchaseInBMapper; -import com.hzs.scm.purchase.service.IIcPurchaseInBService; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - *

- * 采购订单明细 服务实现类 - *

- * - * @author hzs - * @since 2023-11-17 - */ -@Service -public class IcPurchaseInBServiceImpl extends ServiceImpl implements IIcPurchaseInBService { - - @Override - public List queryPurchaseInbByPk(List icPurchaseInbList) { - return baseMapper.queryPurchaseInbByPk(icPurchaseInbList); - } - - @Override - public void updatePurchaseInbByPk(List icPurchaseInbList) { - baseMapper.updatePurchaseInbByPk(icPurchaseInbList); - } - - @Override - public void mergePurchaseInBiByPurchaseBack(List icPurchaseInbList) { - baseMapper.mergePurchaseInBiByPurchaseBack(icPurchaseInbList); - } - - @Override - public void deletePurchaseInbByList(List purchaseInbList) { - baseMapper.deletePurchaseInbByList(purchaseInbList); - } - - @Override - public void deletePurchaseInbByPkPurchase(Long pkPurchase, Long pkMember) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.set(SystemFieldConstants.DEL_FLAG, EYesNo.NO.getIntValue()); - updateWrapper.set(SystemFieldConstants.PK_MODIFIED, pkMember); - updateWrapper.set(SystemFieldConstants.MODIFIED_TIME, DateUtils.currentDateTime()); - updateWrapper.eq(ScmFieldConstants.PK_PURCHASE, pkPurchase); - update(updateWrapper); - } -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/service/impl/IcPurchaseinHServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/service/impl/IcPurchaseinHServiceImpl.java deleted file mode 100644 index e77ee74c..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/service/impl/IcPurchaseinHServiceImpl.java +++ /dev/null @@ -1,552 +0,0 @@ -package com.hzs.scm.purchase.service.impl; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.constant.CacheConstants; -import com.hzs.common.core.constant.SaOrderFieldConstants; -import com.hzs.common.core.constant.SystemFieldConstants; -import com.hzs.common.core.constant.msg.DocumentMsgConstants; -import com.hzs.common.core.constant.msg.ScmMsgConstants; -import com.hzs.common.core.enums.*; -import com.hzs.common.core.service.RedisService; -import com.hzs.common.core.utils.ComputeUtil; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.domain.scm.po.PoOrder; -import com.hzs.common.domain.scm.po.ext.PoOrderExt; -import com.hzs.common.domain.scm.po.ext.PoOrderItemsExt; -import com.hzs.common.domain.scm.pub.ScmItemSpecs; -import com.hzs.common.domain.scm.pub.ScmOrderApproveLog; -import com.hzs.common.domain.scm.purchase.IcPurchaseInB; -import com.hzs.common.domain.scm.purchase.IcPurchaseInH; -import com.hzs.common.domain.scm.purchase.ext.IcPurchaseInBExt; -import com.hzs.common.domain.scm.purchase.ext.IcPurchaseInHExt; -import com.hzs.common.domain.system.sys.SysUser; -import com.hzs.common.util.TransactionUtils; -import com.hzs.scm.ic.service.IIcOnHandNumService; -import com.hzs.scm.no.service.IScmBillNoService; -import com.hzs.scm.po.service.IPoOrderService; -import com.hzs.scm.pub.param.ScmApproveParam; -import com.hzs.scm.pub.service.IScmItemSpecsService; -import com.hzs.scm.pub.service.IScmOrderApproveLogService; -import com.hzs.scm.purchase.mapper.IcPurchaseInHMapper; -import com.hzs.scm.purchase.param.PurchaseInBParam; -import com.hzs.scm.purchase.param.PurchaseInParam; -import com.hzs.scm.purchase.service.IIcPurchaseInBService; -import com.hzs.scm.purchase.service.IIcPurchaseInHService; -import com.hzs.system.base.ICurrencyServiceApi; -import com.hzs.system.base.dto.CurrencyDTO; -import com.hzs.system.sys.IUserServiceApi; -import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; -import com.hzs.system.sys.dto.LoginUser; -import lombok.extern.slf4j.Slf4j; -import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.math.BigDecimal; -import java.time.temporal.ChronoUnit; -import java.util.*; - -/** - *

- * 采购订单表头 服务实现类 - *

- * - * @author hzs - * @since 2023-11-17 - */ -@Service -@Slf4j -public class IcPurchaseinHServiceImpl extends ServiceImpl implements IIcPurchaseInHService { - - @DubboReference - private ICurrencyServiceApi currencyServiceApi; - - @DubboReference - private IUserServiceApi userServiceApi; - - @Autowired - private RedisService redisService; - - @Autowired - private IScmBillNoService scmBillNoService; - - @Autowired - private IScmItemSpecsService scmItemSpecsService; - - @Autowired - private IIcPurchaseInBService purchaseInbService; - - @Autowired - private IIcOnHandNumService onHandNumService; - - @Autowired - private IScmOrderApproveLogService scmOrderApproveLogService; - - @Autowired - private IPoOrderService poOrderService; - - @Override - @Transactional(rollbackFor = Exception.class) - public void insertSavePurchaseByPoOrder(List poOrderList, PurchaseInParam purchaseInhParam, Long pkMember) { - // 根据采购订单封装采购入库单 - // 入库单表头 - Date date = DateUtils.currentDateTime(); - // 入库单表头 - IcPurchaseInH icPurchaseInH = packagePurchaseInH(poOrderList.get(0), purchaseInhParam, date, pkMember); - // 入库单表体 - List icPurchaseInbList = packagePurchaseInB(icPurchaseInH, purchaseInhParam, date, pkMember); - icPurchaseInH.setPkStorehouse(icPurchaseInbList.get(0).getPkStorehouse()); - // 保存主表 - save(icPurchaseInH); - // 保存明细表 - for (IcPurchaseInB icPurchaseInB : icPurchaseInbList) { - icPurchaseInB.setPkPurchase(icPurchaseInH.getPkId()); - } - purchaseInbService.saveBatch(icPurchaseInbList); - saveScmItemSpecs(pkMember, icPurchaseInH, icPurchaseInbList, poOrderList); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void insertSavePurchaseBack(IcPurchaseInHExt oldPurchaseInExt, PurchaseInParam purchaseInhParam) { - // 复制 - IcPurchaseInHExt purchaseInExt = BeanUtil.copyProperties(oldPurchaseInExt, IcPurchaseInHExt.class); - purchaseInExt.setReturnStatus(EYesNo.YES.getIntValue()); - purchaseInExt.setReturnReason(purchaseInhParam.getReturnReason()); - List purchaseInBiExtList = BeanUtil.copyToList(oldPurchaseInExt.getIcPurchaseInbList(), IcPurchaseInBExt.class); - Long pkSource = oldPurchaseInExt.getPkId(); - purchaseInExt.setPkId(null); - Date currentDate = DateUtils.currentDateTime(); - purchaseInExt.setOrderCode(scmBillNoService.createScmBillNoByOrderType(EScmOrderType.PURCHASE_IN.getValue())); - purchaseInExt.setOrderDate(purchaseInhParam.getOrderDate()); - purchaseInExt.setRemark(purchaseInhParam.getRemark()); - purchaseInExt.setCreationTime(currentDate); - purchaseInExt.setOrderStatus(EScmOrderStatus.SAVE.getValue()); - Map purchaseBiMap = new HashMap<>(); - for (PurchaseInBParam purchaseInBiParam : purchaseInhParam.getPurchaseInBParamList()) { - purchaseBiMap.put(purchaseInBiParam.getPkId(), purchaseInBiParam); - } - List savePurchaseInBiExtList = new ArrayList<>(); - BigDecimal totalNum = BigDecimal.ZERO; - for (IcPurchaseInBExt purchaseInBiExt : purchaseInBiExtList) { - Long pkSourceB = purchaseInBiExt.getPkId(); - if(purchaseBiMap.containsKey(pkSourceB)){ - PurchaseInBParam purchaseInBiParam = purchaseBiMap.get(pkSourceB); - purchaseInBiExt.setPkSource(pkSource); - purchaseInBiExt.setPkSourceB(pkSourceB); - purchaseInBiExt.setPkId(null); - purchaseInBiExt.setBizDate(purchaseInBiParam.getBizDate()); - if(!ComputeUtil.compareValue(purchaseInBiExt.getNassistnum(), purchaseInBiParam.getNnum())){ - throw new RuntimeException("退货数量不能大于采购入库数量！"); - } - purchaseInBiExt.setNnum(purchaseInBiParam.getNnum()); - // 无税金额 = 无税单价*数量 - purchaseInBiExt.setNorigmny(ComputeUtil.computeMultiply(purchaseInBiExt.getNorigprice(), purchaseInBiExt.getNnum())); - // 含税单价 = 无税单价*（1+税率） - purchaseInBiExt.setNorigtaxprice(ComputeUtil.computeMultiply(purchaseInBiExt.getNorigprice(), - ComputeUtil.computeAdd(BigDecimal.ONE, ComputeUtil.computeMultiply(purchaseInBiExt.getNtaxrate(), BigDecimal.valueOf(0.01))))); - // 税额 =无税单价*税率*数量 - purchaseInBiExt.setNtax(ComputeUtil.computeMultiply(ComputeUtil.computeBonusMultiply(purchaseInBiExt.getNorigprice(), purchaseInBiExt.getNtaxrate()), purchaseInBiExt.getNnum())); - // 价税合计 含税单价*数量 - purchaseInBiExt.setNorigtaxmny(ComputeUtil.computeMultiply(purchaseInBiExt.getNorigtaxprice(), purchaseInBiExt.getNnum())); - purchaseInBiExt.setCreationTime(currentDate); - purchaseInBiExt.setTransType(ETransType.GENERAL_OUT.getValue()); - - savePurchaseInBiExtList.add(purchaseInBiExt); - totalNum = ComputeUtil.computeAdd(totalNum, purchaseInBiExt.getNnum()); - } - } - purchaseInExt.setTotalNum(totalNum); - baseMapper.insert(purchaseInExt); - if(savePurchaseInBiExtList.size() >0) { - savePurchaseInBiExtList.forEach(purchaseInBiExt-> - purchaseInBiExt.setPkPurchase(purchaseInExt.getPkId())); - purchaseInbService.saveBatch(savePurchaseInBiExtList); - List saveScmItemSpecsList = scmItemSpecsService.packageOrderItemsSpecs(savePurchaseInBiExtList, purchaseInExt.getPkId()); - if (saveScmItemSpecsList.size() > 0) { - scmItemSpecsService.saveBatch(saveScmItemSpecsList); - } - } - } - - /* - * @description: 采购订单对应的规格 - * @author: sui q - * @date: 2023/11/24 11:21 - * @param: null null - **/ - private Map> packageItemSpecsMap(List poOrderList) { - List scmItemSpecsList = new ArrayList<>(); - for (PoOrderExt poOrderExt : poOrderList) { - for (PoOrderItemsExt poOrderItemsExt : poOrderExt.getPoOrderItemsExtList()) { - ScmItemSpecs scmItemSpecs = ScmItemSpecs.builder() - .pkOrder(poOrderExt.getPkId()) - .pkOrderItems(poOrderItemsExt.getPkId()) - .build(); - scmItemSpecsList.add(scmItemSpecs); - } - } - return scmItemSpecsService.queryScmItemSpecsByCondition(EScmOrderType.PO_ORDER.getValue(), scmItemSpecsList); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void updateSavePurchaseByPoOrder(List poOrderList, IcPurchaseInHExt purchaseInhExt, - PurchaseInParam purchaseInhParam, Long pkMember) { - // 更新规格明细表，先删除在新增 根据主表主键删除 - scmItemSpecsService.deleteItemSpecsById(EScmOrderType.PURCHASE_IN.getValue(), purchaseInhParam.getPkId(), pkMember); - Date date = DateUtils.currentDateTime(); - // 入库单表头 -// IcPurchaseInH icPurchaseInH = packagePurchaseInH(poOrderList.get(0), purchaseInhParam, date, pkMember); - purchaseInhExt.setOrderDate(purchaseInhParam.getOrderDate()); - purchaseInhExt.setRemark(purchaseInhParam.getRemark()); - // 入库单表体 - List icPurchaseInbList = packagePurchaseInB(purchaseInhExt, purchaseInhParam, date, pkMember); - // merge 对入库单表体进行 icPurchaseInbList 修改或新增 查询出删除的、 - List insertPurchaseInbList = new ArrayList<>(); - List updatePurchaseInbList = new ArrayList<>(); - List updateIdList = new ArrayList<>(); - icPurchaseInbList.forEach(purchaseInb -> { - if (purchaseInb.getPkId() != null) { - updateIdList.add(purchaseInb.getPkId()); - updatePurchaseInbList.add(purchaseInb); - } else { - purchaseInb.setPkPurchase(purchaseInhExt.getPkId()); - insertPurchaseInbList.add(purchaseInb); - } - }); - List delPurchaseInb = new ArrayList<>(); - for (IcPurchaseInB icPurchaseInB : purchaseInhExt.getIcPurchaseInbList()) { - if (!updateIdList.contains(icPurchaseInB.getPkId())) { - icPurchaseInB.setPkModified(pkMember); - delPurchaseInb.add(icPurchaseInB); - } - } - List poOrderKeyList = new ArrayList<>(); - String purchaseLockKey = CacheConstants.IC_PURCHASE_IN_LOCK + purchaseInhExt.getPkId(); - try { - // 加锁 采购订单加锁，采购入库单加锁，采购订单同时只能被一个人操作 - for (PoOrderExt poOrderExt : poOrderList) { - poOrderKeyList.add(CacheConstants.PO_ORDER_LOCK + poOrderExt.getPkId()); - } - if (!redisService.lockKeyByList(poOrderKeyList)) { - throw new RuntimeException(ScmMsgConstants.BILL_NOT_OPERATION); - } - if (!redisService.lockKeyOnce(purchaseLockKey)) { - throw new RuntimeException(ScmMsgConstants.BILL_NOT_OPERATION); - } - // 删除明细 - if (delPurchaseInb.size() > 0) { - purchaseInbService.deletePurchaseInbByList(delPurchaseInb); - } - if (insertPurchaseInbList.size() > 0) { - purchaseInbService.saveBatch(insertPurchaseInbList); - } - if (updatePurchaseInbList.size() > 0) { - updatePurchaseInbList.forEach(purchaseInb -> - purchaseInbService.updateById(purchaseInb)); - } - saveScmItemSpecs(pkMember, purchaseInhExt, icPurchaseInbList, poOrderList); - // 更新入库单表 - updateById(purchaseInhExt); - } finally { - redisService.unlockByList(poOrderKeyList); - redisService.unlock(purchaseLockKey); - } - } - - private void saveScmItemSpecs(Long pkMember, IcPurchaseInH icPurchaseInH, List icPurchaseInbList, List poOrderList) { - // 封装明细表对应的规格 - Map> itemSpecsMap = packageItemSpecsMap(poOrderList); - List saveScmItemSpecsList = new ArrayList<>(); - for (IcPurchaseInB icPurchaseInB : icPurchaseInbList) { - if (itemSpecsMap.containsKey(icPurchaseInB.getPkPoOrderItems())) { - List itemSpecsList = itemSpecsMap.get(icPurchaseInB.getPkPoOrderItems()); - scmItemSpecsService.packageScmItemSpecsList(itemSpecsList, pkMember, - icPurchaseInH.getPkId(), icPurchaseInB.getPkId(), EScmOrderType.PURCHASE_IN.getValue()); - saveScmItemSpecsList.addAll(itemSpecsList); - } - } - // 保存订单明细规格 - if (saveScmItemSpecsList.size() > 0) { - scmItemSpecsService.saveBatch(saveScmItemSpecsList); - } - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void deletePurchaseByPk(Long pkPurchase, Long pkMember) { - String purchaseLockKey = CacheConstants.IC_PURCHASE_IN_LOCK + pkPurchase; - if (!redisService.lockKeyOnce(purchaseLockKey)) { - throw new RuntimeException(ScmMsgConstants.BILL_NOT_OPERATION); - } - // 删除规格明细表 - scmItemSpecsService.deleteItemSpecsById(EScmOrderType.PURCHASE_IN.getValue(), pkPurchase, pkMember); - // 删除订单明细表 - purchaseInbService.deletePurchaseInbByPkPurchase(pkPurchase, pkMember); - // 删除订单主表 - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.set(SystemFieldConstants.DEL_FLAG, EYesNo.NO.getIntValue()); - updateWrapper.set(SystemFieldConstants.PK_MODIFIED, pkMember); - updateWrapper.set(SystemFieldConstants.MODIFIED_TIME, DateUtils.currentDateTime()); - updateWrapper.eq(SystemFieldConstants.PK_ID, pkPurchase); - update(updateWrapper); - redisService.unlock(purchaseLockKey); - } - - - @Override - @Transactional(rollbackFor = Exception.class) - public void auditPurchaseByPoOrderSubmit(ScmApproveParam scmApproveParam, LoginUser loginUser) { - // 更新单据状态 - updatePurchaseStatus(scmApproveParam.getPkId(), loginUser, EScmOrderStatus.SUBMIT.getValue()); - scmOrderApproveLogService.submitOrder(scmApproveParam, EApprovalBusiness.IC_PURCHASE_APPROVE, EOrderPrefix.IC_PURCHASE_CODE, loginUser); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public String auditPurchaseByPoOrderAgree(ApprovalBusinessResultDTO approvalBusinessResultDTO) { - return approvePurchaseByStatus(approvalBusinessResultDTO, EScmOrderStatus.APPROVE.getValue(), EAgentApprovalStatus.APPROVED.getValue()); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public String auditPurchaseByPoOrderReject(ApprovalBusinessResultDTO approvalBusinessResultDTO) { - return approvePurchaseByStatus(approvalBusinessResultDTO, EScmOrderStatus.SAVE.getValue(), EAgentApprovalStatus.REFUSE.getValue()); - } - - @Override - public IcPurchaseInHExt queryPurchaseInExtById(Long pkId, Integer orderStatus, Integer pkCountry) { - IcPurchaseInHExt purchaseInExt = baseMapper.queryPurchaseInhExtById(pkId, orderStatus, pkCountry); - if(purchaseInExt == null){ - return null; - } - // 查询明细表，需要携带规格 - List purchaseInBiExtList = purchaseInbService.queryPurchaseInbByPk(purchaseInExt.getIcPurchaseInbList()); - purchaseInExt.setIcPurchaseInbList(purchaseInBiExtList); - return purchaseInExt; - } - - @Override - public IcPurchaseInHExt queryPurchaseInhExtById(Long pkId, Integer orderStatus, Integer pkCountry) { - return baseMapper.queryPurchaseInhExtById(pkId, orderStatus, pkCountry); - } - - @Override - public IcPurchaseInHExt queryDisPurchaseInhExtById(Long pkId, Integer orderStatus) { - PurchaseInParam purchaseInParam = new PurchaseInParam(); - purchaseInParam.setPkId(pkId); - purchaseInParam.setOrderStatus(orderStatus); - List purchaseInExtList = baseMapper.queryDisPurchaseInhExtByCondition(purchaseInParam); - if(CollectionUtil.isNotEmpty(purchaseInExtList)){ - return purchaseInExtList.get(0); - } - return null; - } - - - @Override - public List queryDisPurchaseInExtByCondition(PurchaseInParam purchaseInParam) { - if (purchaseInParam.getEndDate() != null) { - purchaseInParam.setEndDate(DateUtils.afterDate(1, ChronoUnit.DAYS, purchaseInParam.getEndDate())); - } - return baseMapper.queryDisPurchaseInhExtByCondition(purchaseInParam); - } - - @Override - public List queryTotalPurchaseInhExtByCondition(PurchaseInParam purchaseInParam) { - if (purchaseInParam.getEndDate() != null) { - purchaseInParam.setEndDate(DateUtils.afterDate(1, ChronoUnit.DAYS, purchaseInParam.getEndDate())); - } - return baseMapper.queryTotalPurchaseInhExtByCondition(purchaseInParam); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void auditPurchaseOutByPoOrderSubmit(IcPurchaseInHExt purchaseInExt, ScmApproveParam scmApproveParam, LoginUser loginUser) { - // 更新单据状态 - updatePurchaseStatus(scmApproveParam.getPkId(), loginUser, EScmOrderStatus.SUBMIT.getValue()); - // 更新存货现存量表，更新库存 - onHandNumService.mergeIcOnHandNumByGeneralOut(purchaseInExt, purchaseInExt.getIcPurchaseInbList(), EScmOrderType.PURCHASE_IN.getValue(), loginUser.getUserId()); - scmOrderApproveLogService.submitOrder(scmApproveParam, EApprovalBusiness.BACK_PURCHASE_APPROVE, EOrderPrefix.IC_PURCHASE_CODE, loginUser); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public String auditPurchaseOutByPoOrderAgree(ApprovalBusinessResultDTO approvalBusinessResultDTO) { - return approvePurchaseOutByStatus(approvalBusinessResultDTO, EScmOrderStatus.APPROVE.getValue(), EAgentApprovalStatus.APPROVED.getValue()); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public String auditPurchaseOutByPoOrderReject(ApprovalBusinessResultDTO approvalBusinessResultDTO) { - return approvePurchaseOutByStatus(approvalBusinessResultDTO, EScmOrderStatus.SAVE.getValue(), EAgentApprovalStatus.REFUSE.getValue()); - } - - /* - * @description: 审核采购退货单 - * @author: sui q - * @date: 2024/3/6 11:48 - * @param: null null - **/ - private String approvePurchaseOutByStatus(ApprovalBusinessResultDTO approvalBusinessResultDTO, Integer scmOrderStatus, Integer approveStatus){ - // 查询订单日志表 - List scmOrderApproveLogList = scmOrderApproveLogService.queryScmOrderApproveLogByCondition(null, approvalBusinessResultDTO.getEApprovalBusiness().getValue(), approvalBusinessResultDTO.getBusinessCode()); - if (scmOrderApproveLogList == null || scmOrderApproveLogList.size() == 0) { - return TransactionUtils.getContent(DocumentMsgConstants.DOCUMENT_NOT_EXISTS); - } - ScmOrderApproveLog scmOrderApproveLog = scmOrderApproveLogList.get(0); - // 查询采购退货单 - IcPurchaseInHExt purchaseInExt = queryPurchaseInExtById(scmOrderApproveLog.getPkOrder(), EScmOrderStatus.SUBMIT.getValue(), null); - if (purchaseInExt == null) { - return TransactionUtils.getContent(DocumentMsgConstants.DOCUMENT_HAS_HANDLE); - } - // 更新采购入库单状态 - updatePurchaseStatus(purchaseInExt.getPkId(), approvalBusinessResultDTO.getLoginUser(), scmOrderStatus); - // 更新前程日志表状态 - scmOrderApproveLogService.updateScmOrderApproveStatus(scmOrderApproveLog.getPkId(), approvalBusinessResultDTO.getLoginUser().getUserId(), approveStatus); - // 弃审的时候回退批次数量 - if(EAgentApprovalStatus.REFUSE.getValue() == approveStatus){ - onHandNumService.backIcOnHandNumByGeneralOut(purchaseInExt, purchaseInExt.getIcPurchaseInbList(), EScmOrderType.PURCHASE_IN.getValue(), approvalBusinessResultDTO.getLoginUser().getUserId()); - }else { - // 审核通过回写采购入库单、明细，先回写明细 - purchaseInbService.mergePurchaseInBiByPurchaseBack(purchaseInExt.getIcPurchaseInbList()); - baseMapper.mergePurchaseInExt(purchaseInExt.getIcPurchaseInbList(), approvalBusinessResultDTO.getLoginUser().getUserId()); -// Set sourceIdSet = new HashSet<>(); -// for (IcPurchaseInBExt purchaseInBiExt : purchaseInExt.getIcPurchaseInbList()) { -// sourceIdSet.add(purchaseInBiExt.getPkSource()); -// } -// // 退货单回写原订单累计出库数量 -// // 原订单累计出库数量为0后需要回写主订单为已退货 -// for (Long aLong : sourceIdSet) { -// updatePurchaseStatus(aLong, approvalBusinessResultDTO.getLoginUser(), EScmOrderStatus.BACK.getValue()); -// } - } - return null; - } - - private String approvePurchaseByStatus(ApprovalBusinessResultDTO approvalBusinessResultDTO, Integer scmOrderStatus, Integer approveStatus){ - // 查询订单日志表 - List scmOrderApproveLogList = scmOrderApproveLogService.queryScmOrderApproveLogByCondition(null, approvalBusinessResultDTO.getEApprovalBusiness().getValue(), approvalBusinessResultDTO.getBusinessCode()); - if (scmOrderApproveLogList == null || scmOrderApproveLogList.size() == 0) { - return TransactionUtils.getContent(DocumentMsgConstants.DOCUMENT_NOT_EXISTS); - } - ScmOrderApproveLog scmOrderApproveLog = scmOrderApproveLogList.get(0); - // 查询采购入库单 - IcPurchaseInHExt icPurchaseInhExt = queryPurchaseInhExtById(scmOrderApproveLog.getPkOrder(), EScmOrderStatus.SUBMIT.getValue(), approvalBusinessResultDTO.getLoginUser().getDataCountry()); - if (icPurchaseInhExt == null) { - return TransactionUtils.getContent(DocumentMsgConstants.DOCUMENT_HAS_HANDLE); - } - // 更新采购入库单状态 - updatePurchaseStatus(icPurchaseInhExt.getPkId(), approvalBusinessResultDTO.getLoginUser(), scmOrderStatus); - // 更新前程日志表状态 - scmOrderApproveLogService.updateScmOrderApproveStatus(scmOrderApproveLog.getPkId(), approvalBusinessResultDTO.getLoginUser().getUserId(), approveStatus); - if(EAgentApprovalStatus.APPROVED.getValue() == approveStatus){ - // 查询采购入库单明细表 - List icPurchaseInbList = purchaseInbService.queryPurchaseInbByPk(icPurchaseInhExt.getIcPurchaseInbList()); - if(icPurchaseInbList != null && icPurchaseInbList.size() >0){ - icPurchaseInhExt.setIcPurchaseInbList(icPurchaseInbList); - } - // 更新累计入库数量 - purchaseInbService.updatePurchaseInbByPk(icPurchaseInhExt.getIcPurchaseInbList()); - // 更新现存量 - onHandNumService.mergeIcOnHandNumByGeneralIn(icPurchaseInhExt, icPurchaseInhExt.getIcPurchaseInbList(), EScmOrderType.PURCHASE_IN.getValue(), approvalBusinessResultDTO.getLoginUser().getUserId()); - // 更新采购订单累计入库数量 - poOrderService.updatePoOrderItemsTotalNum(icPurchaseInhExt.getIcPurchaseInbList(), approvalBusinessResultDTO.getLoginUser().getUserId()); - } - return null; - } - - private void updatePurchaseStatus(Long pkId, LoginUser loginUser, Integer orderStatus) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.set(SaOrderFieldConstants.ORDER_STATUS, orderStatus); - updateWrapper.set(SystemFieldConstants.PK_MODIFIED, loginUser.getUserId()); - updateWrapper.set(SystemFieldConstants.MODIFIED_TIME, DateUtils.currentDateTime()); - updateWrapper.eq(SystemFieldConstants.PK_ID, pkId); - update(updateWrapper); - } - - private IcPurchaseInH packagePurchaseInH(PoOrder poOrder, PurchaseInParam purchaseInhParam, Date date, Long pkMember) { - SysUser sysUser = userServiceApi.selectUserById(pkMember).getData(); - // 根据登录账号获得部门 - IcPurchaseInH purchaseInh = IcPurchaseInH.builder() - .pkDept(sysUser.getPkDept().intValue()) - .pkWhsmanager(pkMember) - .pkCubasdoc(poOrder.getPkCubasdoc()) - .orderCode(scmBillNoService.createScmBillNoByOrderType(EScmOrderType.PURCHASE_IN.getValue())) - .pkStorehouse(purchaseInhParam.getPkStorehouse()) - .orderDate(purchaseInhParam.getOrderDate()) - .pkCorp(poOrder.getPkCorp()) - .orderStatus(EScmOrderStatus.SAVE.getValue()) - .remark(purchaseInhParam.getRemark()) - .build(); - if (purchaseInhParam.getPkId() == null) { - purchaseInh.setPkCreator(pkMember); - } else { - purchaseInh.setPkId(purchaseInhParam.getPkId()); - purchaseInh.setModifiedTime(date); - purchaseInh.setPkModified(pkMember); - } - purchaseInh.setPkCountry(purchaseInhParam.getPkCountry()); - return purchaseInh; - } - - private List packagePurchaseInB(IcPurchaseInH icPurchaseInH, PurchaseInParam purchaseInhParam, Date date, Long pkMember) { - List icPurchaseInbList = new ArrayList<>(); - // 根据国家获得汇率 - CurrencyDTO currencyDTO = currencyServiceApi.getCurrency(purchaseInhParam.getPkCountry()).getData(); - BigDecimal totalNum = BigDecimal.ZERO; - for (PurchaseInBParam purchaseInbParam : purchaseInhParam.getPurchaseInBParamList()) { - IcPurchaseInB icPurchaseInB = BeanUtil.copyProperties(purchaseInbParam, IcPurchaseInB.class); - icPurchaseInB.setPkPoOrder(purchaseInbParam.getPkPoOrder()); - icPurchaseInB.setPkPoOrderItems(purchaseInbParam.getPkPoOrderItems()); - icPurchaseInB.setPkPurchase(purchaseInhParam.getPkId()); - if (EYesNo.YES.getIntValue() == purchaseInbParam.getIsGift()) { - icPurchaseInB.setNtaxrate(BigDecimal.ZERO); - icPurchaseInB.setNorigprice(BigDecimal.ZERO); - // 含税单价 = 无税单价*（1+税率） - icPurchaseInB.setNorigtaxprice(BigDecimal.ZERO); - // 无税金额 = 无税单价*数量 - icPurchaseInB.setNorigmny(BigDecimal.ZERO); - // 税额 =无税单价*数量 - icPurchaseInB.setNtax(BigDecimal.ZERO); - // 价税合计=含税单价*数量 - icPurchaseInB.setNorigtaxmny(BigDecimal.ZERO); - } else { - // 无税金额 = 无税单价*数量 - icPurchaseInB.setNorigmny(ComputeUtil.computeMultiply(purchaseInbParam.getNorigprice(), purchaseInbParam.getNnum())); - // 含税单价 = 无税单价*（1+税率） - icPurchaseInB.setNorigtaxprice(ComputeUtil.computeMultiply(purchaseInbParam.getNorigprice(), - ComputeUtil.computeAdd(BigDecimal.ONE, ComputeUtil.computeMultiply(purchaseInbParam.getNtaxrate(), BigDecimal.valueOf(0.01))))); - // 税额 =无税单价*税率*数量 - icPurchaseInB.setNtax(ComputeUtil.computeMultiply(ComputeUtil.computeBonusMultiply(purchaseInbParam.getNorigprice(), purchaseInbParam.getNtaxrate()), purchaseInbParam.getNnum())); - // 价税合计 含税单价*数量 - icPurchaseInB.setNorigtaxmny(ComputeUtil.computeMultiply(icPurchaseInB.getNorigtaxprice(), purchaseInbParam.getNnum())); - } - icPurchaseInB.setPkRate(currencyDTO.getPkId()); - totalNum = ComputeUtil.computeAdd(totalNum, icPurchaseInB.getNnum()); -// List itemSpecsParamList = purchaseInbParam.getItemSpecsParamList(); -// List scmItemSpecsList = scmItemSpecsService.packageScmItemByParam(itemSpecsParamList, purchaseInhParam.getPkCountry(), pkMember, -// icPurchaseInB.getPkPurchase(), icPurchaseInB.getPkId(), EScmOrderType.PURCHASE_IN.getValue()); -// if (scmItemSpecsList.size() > 0) { -// icPurchaseInB.setScmItemSpecsList(scmItemSpecsList); -// } - icPurchaseInB.setTransType(ETransType.GENERAL_IN.getValue()); - if (icPurchaseInB.getPkId() == null) { - icPurchaseInB.setPkCreator(pkMember); - } else { - icPurchaseInB.setModifiedTime(date); - icPurchaseInB.setPkModified(pkMember); - } - icPurchaseInB.setPkBatchCode(purchaseInbParam.getPkBatchCode()); - icPurchaseInB.setPkCountry(purchaseInhParam.getPkCountry()); - icPurchaseInbList.add(icPurchaseInB); - } - icPurchaseInH.setTotalNum(totalNum); - return icPurchaseInbList; - } -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/vo/PurchaseExcelVO.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/vo/PurchaseExcelVO.java deleted file mode 100644 index 46d06a5a..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/vo/PurchaseExcelVO.java +++ /dev/null @@ -1,149 +0,0 @@ -package com.hzs.scm.purchase.vo; - -import com.hzs.common.core.annotation.Excel; -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -/** - * @description: 采购入库导出vo - * @author: sui q - * @time: 2024/3/6 15:32 - * @classname: PurchaseExcelVO - * @package_name: com.hzs.scm.purchase.vo - * version 1.0.0 - */ -@Data -public class PurchaseExcelVO implements Serializable { - - /** - * 订单编号 - */ - @Excel(name = "入库编号") - private String orderCode; - - /** - * 管理员名称 - */ - @Excel(name = "库管员") - private String managerName; - - /** - * 供应商名称 - */ - @Excel(name = "供应商") - private String cubasdocName; - - /** - * 采购组织名称 - */ - @Excel(name = "采购公司") - private String corpName; - - /** - * 部门名称 - */ - @Excel(name = "采购部门") - private String deptName; - - @Excel(name = "订单状态", readConverterExp = "1=已保存,2=已提交,3=已审核,4=已收货,5=已关闭,6=已退货") - private Integer orderStatus; - - /** - * 备注 - */ - @Excel(name = "备注") - private String remark; - - /** - * 订单日期 2023-10 - */ - @Excel(name = "入库日期", dateFormat = "yyyy-MM-dd") - private Date orderDate; - - /** - * 产品编号 - */ - @Excel(name = "产品编号") - private String productCode; - - /** - * 产品名称 - */ - @Excel(name = "产品名称") - private String productName; - - /** - * 规格名称 - */ - @Excel(name = "产品规格") - private String specsName; - - /** - * 单位名称 - */ - @Excel(name = "单位") - private String unitName; - - /** - * 仓库名称 - */ - @Excel(name = "仓库") - private String storehouseName; - - /** - * 数量 - */ - @Excel(name = "数量") - private BigDecimal nnum; - /** - * 无税单价 - */ - @Excel(name = "无税单价") - private BigDecimal norigprice; - - /** - * 税率 - */ - @Excel(name = "税率") - private BigDecimal ntaxrate; - - /** - * 含税单价 = 无税单价*（1+税率） - */ - @Excel(name = "含税单价") - private BigDecimal norigtaxprice; - - /** - * 无税金额 = 无税单价*数量 - */ - @Excel(name = "无税金额") - private BigDecimal norigmny; - - /** - * 税额 =无税单价*数量 - */ - @Excel(name = "税额") - private BigDecimal ntax; - - /** - * 价税合计 含税单价*数量 - */ - @Excel(name = "价税合计") - private BigDecimal norigtaxmny; - - /** - * 批次号 - */ - @Excel(name = "批次号") - private String batchCode; - - - /** - * 是否赠品 - */ - @Excel(name = "赠品", readConverterExp = "0=是,1=否") - private Integer isGift; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/vo/PurchaseInBVo.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/vo/PurchaseInBVo.java deleted file mode 100644 index 00e5eca6..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/vo/PurchaseInBVo.java +++ /dev/null @@ -1,168 +0,0 @@ -package com.hzs.scm.purchase.vo; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -/** - * @description: 采购入库明细 - * @author: sui q - * @time: 2024/1/3 15:20 - * @classname: PurchaseInBVo - * @package_name: com.hzs.scm.purchase.vo - * version 1.0.0 - */ -@Data -public class PurchaseInBVo implements Serializable { - /** - * 单位名称 - */ - private String unitName; - - /** - * 生产日期 - */ - private Date productDate; - - /** - * 失效日期 - */ - private Date expireDate; - - /** - * 货位名称 - */ - private String clocationName; - - /** - * 仓库名称 - */ - private String storehouseName; - - - private String batchCode; - - /** - * 产品编号 - */ - private String productCode; - - /** - * 产品名称 - */ - private String productName; - - /** - * 规格名称 - */ - private String specsName; - - /** - * 主键 - */ - private Long pkId; - - /** - * 单位 - */ - private Integer pkUnit; - - /** - * 货位 - */ - private Integer pkClocation; - - /** - * 产品基础信息主键 - */ - private Integer pkProductBas; - - /** - * 产品信息主键 - */ - private Integer pkProduct; - - /** - * 入库日期 - */ - private Date bizDate; - - /** - * 出入口类型 1=入库 2=出库 - */ - private Integer transType; - - /** - * 仓库 - */ - private Integer pkStorehouse; - - /** - * 汇率 - */ - private Integer pkRate; - - /** - * 数量 - */ - private BigDecimal nnum; - - /** - * 无税单价 - */ - private BigDecimal norigprice; - - /** - * 税率 - */ - private BigDecimal ntaxrate; - - /** - * 含税单价 = 无税单价*（1+税率） - */ - private BigDecimal norigtaxprice; - - /** - * 无税金额 = 无税单价*数量 - */ - private BigDecimal norigmny; - - /** - * 税额 =无税单价*数量 - */ - private BigDecimal ntax; - - /** - * 价税合计 含税单价*数量 - */ - private BigDecimal norigtaxmny; - - /** - * 批次主键 - */ - private Long pkBatchCode; - - /** - * 采购订单主键 - */ - private Long pkPoOrder; - - /** - * 采购订单明细主键 - */ - private Long pkPoOrderItems; - - /** - * 是否赠品 - */ - @Transaction(transactionKey = EnumsPrefixConstants.DEALER_YES_NO) - private Integer isGift; - - private String isGiftVal; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/vo/PurchaseInVo.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/vo/PurchaseInVo.java deleted file mode 100644 index 337ee76f..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/vo/PurchaseInVo.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.hzs.scm.purchase.vo; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import com.hzs.common.domain.scm.purchase.ext.IcPurchaseInBExt; -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -/** - * @description: 采购入库 - * @author: sui q - * @time: 2024/1/3 15:20 - * @classname: PurchaseInVo - * @package_name: com.hzs.scm.purchase - * version 1.0.0 - */ -@Data -public class PurchaseInVo implements Serializable { - /** - * 部门名称 - */ - private String deptName; - - /** - * 管理员名称 - */ - private String managerName; - - /** - * 供应商名称 - */ - private String cubasdocName; - - /** - * 仓库名称 - */ - private String storehouseName; - - /** - * 采购组织名称 - */ - private String corpName; - - /** - * 主键 - */ - private Long pkId; - - /** - * 采购部门 - */ - private Integer pkDept; - - /** - * 仓库管理员 - */ - private Long pkWhsmanager; - - /** - * 供应商 取bd_cubasdoc 类型为1 2的 - */ - private Integer pkCubasdoc; - - /** - * 仓库 - */ - private Integer pkStorehouse; - - /** - * 订单日期 2023-10 - */ - @TableField("ORDER_DATE") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date orderDate; - - /** - * 订单状态 EScmOrderStatus 1=已保存 2=已提交 3=已审核 4=已收货 5=已关闭 - */ - @Transaction(transactionKey = EnumsPrefixConstants.SCM_ORDER_STATUS) - private Integer orderStatus; - - private String orderStatusVal; - - /** - * 打印状态 - */ - @Transaction(transactionKey = EnumsPrefixConstants.DEALER_YES_NO) - private Integer printStatus; - - private String printStatusVal; - - /** - * 采购组织 - */ - private Integer pkCorp; - - /** - * 总数量 - */ - private BigDecimal totalNum; - - /** - * 订单编号 - */ - private String orderCode; - - /** - * 退货理由 - */ - private String returnReason; - - /** - * 备注 - */ - private String remark; - - @Transaction - private List icPurchaseInbList; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/vo/PurchaseOutExcelVO.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/vo/PurchaseOutExcelVO.java deleted file mode 100644 index b52a3cc0..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/vo/PurchaseOutExcelVO.java +++ /dev/null @@ -1,148 +0,0 @@ -package com.hzs.scm.purchase.vo; - -import com.hzs.common.core.annotation.Excel; -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -/** - * @description: 采购入库导出vo - * @author: sui q - * @time: 2024/3/6 15:32 - * @classname: PurchaseExcelVO - * @package_name: com.hzs.scm.purchase.vo - * version 1.0.0 - */ -@Data -public class PurchaseOutExcelVO implements Serializable { - - /** - * 订单编号 - */ - @Excel(name = "出库编号") - private String orderCode; - - /** - * 管理员名称 - */ - @Excel(name = "库管员") - private String managerName; - - /** - * 部门名称 - */ - @Excel(name = "库存部门") - private String deptName; - - /** - * 供应商名称 - */ - @Excel(name = "供应商") - private String cubasdocName; - - /** - * 采购组织名称 - */ - @Excel(name = "库存公司") - private String corpName; - - /** - * 订单日期 2023-10 - */ - @Excel(name = "出库日期", dateFormat = "yyyy-MM-dd") - private Date orderDate; - - @Excel(name = "订单状态", readConverterExp = "1=已保存,2=已提交,3=已审核,4=已收货,5=已关闭,6=已退货") - private Integer orderStatus; - - /** - * 备注 - */ - @Excel(name = "备注") - private String remark; - - /** - * 产品编号 - */ - @Excel(name = "产品编号") - private String productCode; - - /** - * 产品名称 - */ - @Excel(name = "产品名称") - private String productName; - - /** - * 规格名称 - */ - @Excel(name = "规格名称") - private String specsName; - - /** - * 单位名称 - */ - @Excel(name = "单位") - private String unitName; - - /** - * 仓库名称 - */ - @Excel(name = "仓库") - private String storehouseName; - - /** - * 批次号 - */ - @Excel(name = "批次号") - private String batchCode; - - /** - * 数量 - */ - @Excel(name = "数量") - private BigDecimal nnum; - /** - * 无税单价 - */ - @Excel(name = "无税单价") - private BigDecimal norigprice; - - /** - * 税率 - */ - @Excel(name = "税率") - private BigDecimal ntaxrate; - - /** - * 含税单价 = 无税单价*（1+税率） - */ - @Excel(name = "含税单价") - private BigDecimal norigtaxprice; - - /** - * 无税金额 = 无税单价*数量 - */ - @Excel(name = "无税金额") - private BigDecimal norigmny; - - /** - * 税额 =无税单价*数量 - */ - @Excel(name = "税额") - private BigDecimal ntax; - - /** - * 价税合计 含税单价*数量 - */ - @Excel(name = "价税合计") - private BigDecimal norigtaxmny; - - /** - * 是否赠品 - */ - @Excel(name = "是否赠品", readConverterExp = "0=是,1=否") - private Integer isGift; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/controller/manage/IcSaleoutHController.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/controller/manage/IcSaleoutHController.java deleted file mode 100644 index ba57a66e..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/controller/manage/IcSaleoutHController.java +++ /dev/null @@ -1,271 +0,0 @@ -package com.hzs.scm.sale.controller.manage; - - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.json.JSONUtil; -import com.hzs.common.core.annotation.Log; -import com.hzs.common.core.constant.msg.MemberMsgConstants; -import com.hzs.common.core.constant.msg.ScmMsgConstants; -import com.hzs.common.core.domain.R; -import com.hzs.common.core.enums.*; -import com.hzs.common.core.utils.poi.ExcelUtil; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.sale.ext.SaDeliverExt; -import com.hzs.common.domain.scm.pub.ScmOrderApproveLog; -import com.hzs.common.domain.scm.sale.IcDelSaleLog; -import com.hzs.common.domain.scm.sale.ext.IcSaleoutBExt; -import com.hzs.common.domain.scm.sale.ext.IcSaleoutHExt; -import com.hzs.common.security.service.UserTokenService; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.common.util.TransactionUtils; -import com.hzs.sale.deliver.ISaDeliverServiceApi; -import com.hzs.scm.pub.controller.ScmController; -import com.hzs.scm.pub.dto.DeliverDTO; -import com.hzs.scm.pub.param.ScmApproveParam; -import com.hzs.scm.pub.service.IScmOrderApproveLogService; -import com.hzs.scm.sale.param.SaleOutParam; -import com.hzs.scm.sale.service.IIcDelSaleLogService; -import com.hzs.scm.sale.service.IIcSaleoutHService; -import com.hzs.scm.sale.vo.SaleOutBVO; -import com.hzs.scm.sale.vo.SaleOutBackExcelVO; -import com.hzs.scm.sale.vo.SaleOutExcelVO; -import com.hzs.scm.sale.vo.SaleOutHVO; -import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.List; - -/** - *

- * 销售出库单表头 前端控制器 - *

- * - * @author hzs - * @since 2023-11-29 - */ -@RestController -@RequestMapping("/manage/sale-out") -public class IcSaleoutHController extends ScmController { - - @Autowired - private IIcSaleoutHService saleOutService; - - @Autowired - private UserTokenService userTokenService; - - @Autowired - private IScmOrderApproveLogService scmOrderApproveLogService; - - @DubboReference - private ISaDeliverServiceApi iSaDeliverServiceApi; - - @Autowired - private IIcDelSaleLogService delSaleLogService; - - /** - * 查询列表 - * - * @return cubasdocParam 入参 - */ - @PostMapping("/list") - @Log(module = EOperationModule.SALE_OUT, business = EOperationBusiness.SALE_OUT, method = EOperationMethod.SELECT) - public TableDataInfo listSaleOut(@RequestBody SaleOutParam saleOutParam) { - startPage(); - saleOutParam.setPkCountry(SecurityUtils.getPkCountry()); - saleOutParam.setReturnStatus(EDealerYesNo.NO.getValue()); - List saleOutHiList = saleOutService.queryDisSaleOutExtCondition(saleOutParam); - return packageTableDataInfo(saleOutHiList, packageScmReturnVo(saleOutHiList)); - } - - /** - * 查询列表 - * - * @return cubasdocParam 入参 - */ - @PostMapping("/list-back") - @Log(module = EOperationModule.SALE_OUT, business = EOperationBusiness.SALE_OUT, method = EOperationMethod.SELECT) - public TableDataInfo listBackSaleOut(@RequestBody SaleOutParam saleOutParam) { - startPage(); - saleOutParam.setPkCountry(SecurityUtils.getPkCountry()); - saleOutParam.setReturnStatus(EDealerYesNo.YES.getValue()); - List saleOutHiList = saleOutService.queryDisSaleOutExtCondition(saleOutParam); - return packageTableDataInfo(saleOutHiList, packageScmReturnVo(saleOutHiList)); - } - - private List packageScmReturnVo(List saleOutHiList) { - List saleOutHiVOList = new ArrayList<>(); - for (IcSaleoutHExt saleOutHiExt : saleOutHiList) { - SaleOutHVO saleOutHiVo = BeanUtil.copyProperties(saleOutHiExt, SaleOutHVO.class); - List saleoutbExtList = saleOutHiExt.getSaleoutbExtList(); - if(CollectionUtil.isNotEmpty(saleoutbExtList)) { - List returnbVoList = BeanUtil.copyToList(saleoutbExtList, SaleOutBVO.class); - saleOutHiVo.setSaleOutBiVoList(returnbVoList); - } - saleOutHiVOList.add(saleOutHiVo); - } - return saleOutHiVOList; - } - - /** - * 分页查询会员某个时间段内的奖金汇总 - */ - @PostMapping("/export-list-total") - @Log(module = EOperationModule.SALE_OUT, business = EOperationBusiness.SALE_OUT, method = EOperationMethod.EXPORT) - public void exportListSaleOutTotal(HttpServletResponse response, SaleOutParam saleOutParam){ - saleOutParam.setPkCountry(SecurityUtils.getPkCountry()); - saleOutParam.setReturnStatus(EDealerYesNo.NO.getValue()); - List saleOutHiList = saleOutService.queryDisSaleOutExtCondition(saleOutParam); - List saleOutExcelVoList = packageScmExportVo(saleOutHiList); - ExcelUtil util = new ExcelUtil<>(SaleOutExcelVO.class); - util.exportExcel(response, saleOutExcelVoList, "销售出库导出"); - } - - private List packageScmExportVo(List saleOutHiList) { - List saleOutExcelVoList = new ArrayList<>(); - for (IcSaleoutHExt saleOutExt : saleOutHiList) { - List saleOutBiExtList = saleOutExt.getSaleoutbExtList(); - for (IcSaleoutBExt saleOutBiExt : saleOutBiExtList) { - SaleOutExcelVO saleOutExcelVo = BeanUtil.copyProperties(saleOutExt, SaleOutExcelVO.class); - setScmItemsExcel(saleOutBiExt, saleOutExcelVo); - saleOutExcelVoList.add(saleOutExcelVo); - } - } - return saleOutExcelVoList; - } - - /** - * 分页查询会员某个时间段内的奖金汇总 - */ - @PostMapping("/export-back-total") - @Log(module = EOperationModule.SALE_OUT, business = EOperationBusiness.SALE_OUT, method = EOperationMethod.EXPORT) - public void exportListBackSaleOutTotal(HttpServletResponse response, SaleOutParam saleOutParam){ - saleOutParam.setPkCountry(SecurityUtils.getPkCountry()); - saleOutParam.setReturnStatus(EDealerYesNo.YES.getValue()); - List saleOutHiList = saleOutService.queryDisSaleOutExtCondition(saleOutParam); - List saleOutExcelVoList = packageBackScmExportVo(saleOutHiList); - ExcelUtil util = new ExcelUtil<>(SaleOutBackExcelVO.class); - util.exportExcel(response, saleOutExcelVoList, "销售退货导出"); - } - - private List packageBackScmExportVo(List saleOutHiList) { - List saleOutExcelVoList = new ArrayList<>(); - for (IcSaleoutHExt saleOutExt : saleOutHiList) { - List saleOutBiExtList = saleOutExt.getSaleoutbExtList(); - for (IcSaleoutBExt saleOutBiExt : saleOutBiExtList) { - SaleOutBackExcelVO saleOutExcelVo = BeanUtil.copyProperties(saleOutExt, SaleOutBackExcelVO.class); - setScmItemsExcel(saleOutBiExt, saleOutExcelVo); - saleOutExcelVoList.add(saleOutExcelVo); - } - } - return saleOutExcelVoList; - } - - /** - * 新增销售出库单，用于测试 - * - * @param deliverExt 入参 - */ - @PostMapping("/insert") - public AjaxResult saveSaleOut(@RequestBody SaDeliverExt deliverExt) { - saleOutService.saveSaleOutBySaDeliver(deliverExt); - return AjaxResult.success(); - } - - /** - * 发货单生成销售出库单，用于重新发货 - * - * @param deliverDTO - */ - @PostMapping("/send") - public AjaxResult sendDeliver(@RequestBody DeliverDTO deliverDTO) { - // 查询发货单及明细数据 - R> r = iSaDeliverServiceApi.queryDeliverList(deliverDTO.getDeliverIdList(), SecurityUtils.getPkCountry()); - if (r.isSuccess()) { - List saDeliverExtList = r.getData(); - for (SaDeliverExt deliverExt : saDeliverExtList) { - IcDelSaleLog icDelSaleLog = IcDelSaleLog.builder() - .acceptParam(JSONUtil.toJsonStr(deliverExt)) - .sourceCode(deliverExt.getDeliverCode()) - .successStatus(EYesNo.YES.getIntValue()) - .build(); - icDelSaleLog.setPkCreator(deliverExt.getPkCreator()); - icDelSaleLog.setPkCountry(deliverExt.getPkCountry()); - try{ - saleOutService.executeDeliverTransSaleOutByParam(deliverExt); - }catch (Exception e){ - icDelSaleLog.setErrorMsg(e.getMessage()); - icDelSaleLog.setSuccessStatus(EYesNo.NO.getIntValue()); -// throw new RuntimeException(e); - }finally { - // 记录日志 - delSaleLogService.save(icDelSaleLog); - } - } - } - return AjaxResult.success(); - } - - /** - * 退货 - * @param saleOutParam 入参 - */ - @PostMapping("/back") - @Log(module = EOperationModule.SALE_OUT, business = EOperationBusiness.SALE_OUT, method = EOperationMethod.BACK) - public AjaxResult backSaleOut(@RequestBody SaleOutParam saleOutParam) { - if(saleOutParam.getPkId() == null){ - return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.REQUIRED_NOT_EMPTY)); - } - // 验证是否存在销售出库单 - saleOutParam.setPkCountry(SecurityUtils.getPkCountry()); - saleOutParam.setOrderStatus(EScmOrderStatus.CLOSE.getValue()); - IcSaleoutHExt saleOutExt = saleOutService.querySaleOutExtById(saleOutParam); - if(saleOutExt == null){ - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.SALE_OUT_NOT_EXIST)); - } - saleOutService.saveBackSaleOutByParam(saleOutExt, saleOutParam); - return AjaxResult.success(); - } - - /** - * 撤销订单并入库（走签呈），签呈页面点击确定按钮 - * - * @param scmApproveParam 参数 - */ - @PostMapping("/submit") - @Log(module = EOperationModule.SALE_OUT, business = EOperationBusiness.SALE_OUT, method = EOperationMethod.SUBMIT) - public AjaxResult submitBackSaleOut(@RequestBody ScmApproveParam scmApproveParam) { - scmApproveParam.setPkCountry(SecurityUtils.getPkCountry()); - if(scmApproveParam.getPkId() == null){ - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.BACK_SALE_OUT_NOT_EXIST)); - } - IcSaleoutHExt saleOutExt = saleOutService.querySaleOutExtId(scmApproveParam.getPkId(), EScmOrderStatus.SAVE.getValue()); - if (saleOutExt == null) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.BACK_SALE_OUT_NOT_EXIST)); - } - // 查询原始订单是否已经退货 - for (IcSaleoutBExt saleOutBiExt : saleOutExt.getSaleoutbExtList()) { - if(saleOutBiExt.getPkSource() == null){ - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.SALE_OUT_NOT_EXIST)); - } - IcSaleoutHExt oldSaleOutExt = saleOutService.querySaleOutExtId(saleOutBiExt.getPkSource(), EScmOrderStatus.CLOSE.getValue()); - if (oldSaleOutExt == null) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.SALE_OUT_NOT_EXIST)); - } - } - // 验证该订单是否存在签呈，存在待审核的签呈不能再次发起 - List scmOrderApproveLogs = scmOrderApproveLogService.queryScmOrderApproveLogByCondition(scmApproveParam.getPkId(), EApprovalBusiness.BACK_SALE_OUT_APPROVE.getValue(), null); - if(CollectionUtil.isNotEmpty(scmOrderApproveLogs)){ - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.BACK_SALE_OUT_EXISTS_AGENT)); - } - saleOutService.auditBackSaleOutSubmit(scmApproveParam, userTokenService.getLoginUser()); - return AjaxResult.success(); - } -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/mapper/IcDelSaleLogMapper.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/mapper/IcDelSaleLogMapper.java deleted file mode 100644 index 06eddd82..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/mapper/IcDelSaleLogMapper.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.hzs.scm.sale.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.scm.sale.IcDelSaleLog; - -/** - * 发货单生成销售出库日志 Mapper 接口 - */ -public interface IcDelSaleLogMapper extends BaseMapper { - -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/mapper/IcSaleoutBMapper.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/mapper/IcSaleoutBMapper.java deleted file mode 100644 index 524f34a0..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/mapper/IcSaleoutBMapper.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.hzs.scm.sale.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.scm.sale.IcSaleoutB; -import com.hzs.common.domain.scm.sale.ext.IcSaleoutBExt; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - *

- * 销售出库明细 Mapper 接口 - *

- * - * @author hzs - * @since 2023-11-29 - */ -public interface IcSaleoutBMapper extends BaseMapper { - - /* - * @description: 根据主表主键查询采购入库单明细 - * @author: sui q - * @date: 2023/11/25 15:02 - * @param: null null - **/ - List queryBackSaleOutBiByPk(@Param("orderType") Integer orderType, @Param("saleOutBiExtList") List saleOutBiExtList); - - /* - * @description: 获取明细表 seq - * @author: sui q - * @date: 2023/11/30 16:22 - * @param: null null - **/ - List querySaleOutBiSql(Integer size); - - /* - * @description: 批量保存销售出库根据list - * @author: sui q - * @date: 2023/11/30 17:27 - * @param: null null - **/ - void insertSaleOutBiByList(@Param ("saleOutBiExtList") List saleoutBiExtList); - - /* - * @description: 查询销售出库单 - * @author: sui q - * @date: 2024/3/4 11:38 - * @param: null null - **/ - List querySaleOutBiExtByPk(@Param("pkCountry") Integer pkCountry, @Param("pkSaleOut") Long pkSaleOut); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/mapper/IcSaleoutHMapper.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/mapper/IcSaleoutHMapper.java deleted file mode 100644 index cd7ca10a..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/mapper/IcSaleoutHMapper.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.hzs.scm.sale.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.scm.sale.IcSaleoutH; -import com.hzs.common.domain.scm.sale.ext.IcSaleoutHExt; -import com.hzs.scm.sale.param.SaleOutParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 销售出库单表头 Mapper 接口 - */ -public interface IcSaleoutHMapper extends BaseMapper { - - /* - * @description: 获取明细表 seq - * @author: sui q - * @date: 2023/11/30 16:22 - * @param: null null - **/ - List querySaleOutSql(Integer size); - - /* - * @description: 批量保存销售出库根据list - * @author: sui q - * @date: 2023/11/30 17:27 - * @param: null null - **/ - void insertSaleOutByList(@Param("saleOutExtList") List saleOutExtList); - - /* - * @description: 查询会员端显示的采购入库单 - * @author: sui q - * @date: 2023/11/25 9:55 - * @param: null null - **/ - List queryDisSaleOutExtCondition(SaleOutParam saleOutParam); - - /* - * @description: 根据订单主键查询其他入库 - * @author: sui q - * @date: 2023/11/21 10:47 - * @param: null null - **/ - IcSaleoutHExt querySaleOutExtId(@Param("pkId") Long pkId, @Param("orderStatus") Integer orderStatus); - -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/param/SaleOutParam.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/param/SaleOutParam.java deleted file mode 100644 index 748dd965..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/param/SaleOutParam.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.hzs.scm.sale.param; - -import com.hzs.scm.pub.param.ScmPubParam; -import lombok.*; - -/** - * @description: 销售出库参数 - * @author: sui q - * @time: 2023/12/1 14:21 - * @classname: SaleOutParam - * @package_name: com.hzs.scm.sale.param - * version 1.0.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor - public class SaleOutParam extends ScmPubParam { - - /** - * 客户 - */ - private Integer pkCustomer; - - /** - * 退货状态 - */ - private Integer returnStatus; - - /** - * 退货理由 - */ - private String returnReason; - - /** - * 销售订单编号 - */ - private String saOrderCode; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/service/IIcDelSaleLogService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/service/IIcDelSaleLogService.java deleted file mode 100644 index fb449d6d..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/service/IIcDelSaleLogService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.hzs.scm.sale.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.scm.sale.IcDelSaleLog; - -/** - * 发货单生成销售出库日志 服务类 - */ -public interface IIcDelSaleLogService extends IService { - -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/service/IIcSaleoutBService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/service/IIcSaleoutBService.java deleted file mode 100644 index 2ae43a72..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/service/IIcSaleoutBService.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.hzs.scm.sale.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.scm.sale.IcSaleoutB; -import com.hzs.common.domain.scm.sale.ext.IcSaleoutBExt; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - *

- * 销售出库明细 服务类 - *

- * - * @author hzs - * @since 2023-11-29 - */ -public interface IIcSaleoutBService extends IService { - - /* - * @description: 根据主表主键查询采购入库单明细 - * @author: sui q - * @date: 2023/11/25 15:02 - * @param: null null - **/ - List queryBackSaleOutBiByPk(Integer orderType, List saleOutBiExtList); - - /* - * @description: 获取明细表 seq - * @author: sui q - * @date: 2023/11/30 16:22 - * @param: null null - **/ - List querySaleOutBiSql(Integer size); - - /* - * @description: 批量保存销售出库根据list - * @author: sui q - * @date: 2023/11/30 17:27 - * @param: null null - **/ - void insertSaleOutBiByList(List saleOutBiExtList); - - /* - * @description: 查询销售出库单 - * @author: sui q - * @date: 2024/3/4 11:38 - * @param: null null - **/ - List querySaleOutBiExtByPk(@Param("pkCountry") Integer pkCountry, @Param("pkSaleOut") Long pkSaleOut); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/service/IIcSaleoutHService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/service/IIcSaleoutHService.java deleted file mode 100644 index 372aac4d..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/service/IIcSaleoutHService.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.hzs.scm.sale.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.sale.ext.SaDeliverExt; -import com.hzs.common.domain.scm.sale.IcSaleoutH; -import com.hzs.common.domain.scm.sale.ext.IcSaleoutHExt; -import com.hzs.scm.pub.param.ScmApproveParam; -import com.hzs.scm.sale.param.SaleOutParam; -import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; -import com.hzs.system.sys.dto.LoginUser; - -import java.util.List; - -/** - * 销售出库单表头 服务类 - */ -public interface IIcSaleoutHService extends IService { - - /* - * 将接受到的收货单参数转换为销售出库单 - **/ - void executeDeliverTransSaleOutByParam(SaDeliverExt deliverExt); - - /* - * 保存销售出库单 - **/ - void saveSaleOutBySaDeliver(SaDeliverExt deliverExt); - - /* - * 退货保存销售退货单 - **/ - void saveBackSaleOutByParam(IcSaleoutHExt saleOutExt, SaleOutParam saleOutParam); - - /* - * 查询会员端显示的采购入库单 - **/ - List queryDisSaleOutExtCondition(SaleOutParam saleOutParam); - - /* - * 根据主键查询销售出库单 - **/ - IcSaleoutHExt querySaleOutExtById(SaleOutParam saleOutParam); - - /* - * 根据订单主键查询销售出库单 - **/ - IcSaleoutHExt querySaleOutExtId(Long pkId, Integer orderStatus); - - /* - * 查询会员端显示的盘点 - **/ - IcSaleoutHExt queryDisSaleOutExtById(Long pkId, Integer orderStatus); - - /* - * 提交销售退货单（走审批） - **/ - void auditBackSaleOutSubmit(ScmApproveParam scmApproveParam, LoginUser loginUser); - - /* - * 审核通过销售退货单 - **/ - String auditBackSaleOutAgree(ApprovalBusinessResultDTO approvalBusinessResultDTO); - - /* - * 审核驳回销售退货单 - **/ - String auditBackSaleOutReject(ApprovalBusinessResultDTO approvalBusinessResultDTO); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/service/impl/IcDelSaleLogServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/service/impl/IcDelSaleLogServiceImpl.java deleted file mode 100644 index 9edf673a..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/service/impl/IcDelSaleLogServiceImpl.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.hzs.scm.sale.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.domain.scm.sale.IcDelSaleLog; -import com.hzs.scm.sale.mapper.IcDelSaleLogMapper; -import com.hzs.scm.sale.service.IIcDelSaleLogService; -import org.springframework.stereotype.Service; - -/** - * 发货单生成销售出库日志 服务实现类 - */ -@Service -public class IcDelSaleLogServiceImpl extends ServiceImpl implements IIcDelSaleLogService { - -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/service/impl/IcSaleoutBServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/service/impl/IcSaleoutBServiceImpl.java deleted file mode 100644 index 3461cc9d..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/service/impl/IcSaleoutBServiceImpl.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.hzs.scm.sale.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.domain.scm.sale.IcSaleoutB; -import com.hzs.common.domain.scm.sale.ext.IcSaleoutBExt; -import com.hzs.scm.sale.mapper.IcSaleoutBMapper; -import com.hzs.scm.sale.service.IIcSaleoutBService; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - *

- * 销售出库明细 服务实现类 - *

- * - * @author hzs - * @since 2023-11-29 - */ -@Service -public class IcSaleoutBServiceImpl extends ServiceImpl implements IIcSaleoutBService { - - @Override - public List queryBackSaleOutBiByPk(Integer orderType, List saleoutBiExtList) { - return baseMapper.queryBackSaleOutBiByPk(orderType, saleoutBiExtList); - } - - @Override - public List querySaleOutBiSql(Integer size) { - return baseMapper.querySaleOutBiSql(size); - } - - @Override - public void insertSaleOutBiByList(List saleOutBiExtList) { - baseMapper.insertSaleOutBiByList(saleOutBiExtList); - } - - @Override - public List querySaleOutBiExtByPk(Integer pkCountry, Long pkSaleOut) { - return baseMapper.querySaleOutBiExtByPk(pkCountry, pkSaleOut); - } -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/service/impl/IcSaleoutHServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/service/impl/IcSaleoutHServiceImpl.java deleted file mode 100644 index 55ffc1f9..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/service/impl/IcSaleoutHServiceImpl.java +++ /dev/null @@ -1,408 +0,0 @@ -package com.hzs.scm.sale.service.impl; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.constant.SaOrderFieldConstants; -import com.hzs.common.core.constant.SystemFieldConstants; -import com.hzs.common.core.constant.msg.DocumentMsgConstants; -import com.hzs.common.core.constant.msg.ScmMsgConstants; -import com.hzs.common.core.enums.*; -import com.hzs.common.core.utils.ComputeUtil; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.domain.sale.classify.BdSpecs; -import com.hzs.common.domain.sale.ext.SaDeliverExt; -import com.hzs.common.domain.sale.ext.SaDeliverItemsExt; -import com.hzs.common.domain.sale.ext.SaOrderExt; -import com.hzs.common.domain.sale.ext.SaOrderItemsExt; -import com.hzs.common.domain.sale.order.SaOrder; -import com.hzs.common.domain.scm.pub.ScmItemSpecs; -import com.hzs.common.domain.scm.pub.ScmOrderApproveLog; -import com.hzs.common.domain.scm.sale.IcSaleoutB; -import com.hzs.common.domain.scm.sale.IcSaleoutH; -import com.hzs.common.domain.scm.sale.ext.IcSaleoutBExt; -import com.hzs.common.domain.scm.sale.ext.IcSaleoutHExt; -import com.hzs.common.domain.system.base.BdStorehouse; -import com.hzs.common.domain.system.sys.SysUser; -import com.hzs.common.util.TransactionUtils; -import com.hzs.sale.order.ISaOrderItemsServiceApi; -import com.hzs.sale.order.ISaOrderServiceApi; -import com.hzs.sale.product.IProductServiceApi; -import com.hzs.scm.ic.service.IIcOnHandNumService; -import com.hzs.scm.no.service.IScmBillNoService; -import com.hzs.scm.pub.param.ScmApproveParam; -import com.hzs.scm.pub.service.IScmItemSpecsService; -import com.hzs.scm.pub.service.IScmOrderApproveLogService; -import com.hzs.scm.sale.mapper.IcSaleoutHMapper; -import com.hzs.scm.sale.param.SaleOutParam; -import com.hzs.scm.sale.service.IIcSaleoutBService; -import com.hzs.scm.sale.service.IIcSaleoutHService; -import com.hzs.system.base.ICurrencyServiceApi; -import com.hzs.system.sys.IUserServiceApi; -import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; -import com.hzs.system.sys.dto.LoginUser; -import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.math.BigDecimal; -import java.time.temporal.ChronoUnit; -import java.util.*; -import java.util.stream.Collectors; - -/** - * 销售出库单表头 服务实现类 - */ -@Service -public class IcSaleoutHServiceImpl extends ServiceImpl implements IIcSaleoutHService { - - @Autowired - private IScmBillNoService scmBillNoService; - @Autowired - private IIcSaleoutBService saleOutBiService; - @Autowired - private IIcOnHandNumService onHandNumService; - @Autowired - private IScmItemSpecsService scmItemSpecsService; - @Autowired - private IScmOrderApproveLogService scmOrderApproveLogService; - @Autowired - private IIcOnHandNumService icOnHandNumService; - - @DubboReference - IUserServiceApi userServiceApi; - @DubboReference - ISaOrderServiceApi saOrderServiceApi; - @DubboReference - IProductServiceApi productServiceApi; - @DubboReference - ICurrencyServiceApi currencyServiceApi; - @DubboReference - ISaOrderItemsServiceApi saOrderItemsServiceApi; - - - @Override - @Transactional(rollbackFor = Exception.class) - public void executeDeliverTransSaleOutByParam(SaDeliverExt deliverExt) { - saveSaleOutBySaDeliver(deliverExt); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void saveSaleOutBySaDeliver(SaDeliverExt deliverExt) { - // 根据发货单生成销售出库单 - if (deliverExt == null || CollectionUtil.isEmpty(deliverExt.getSaDeliverItemsExtList())) { - return; - } - Long pkCreator = deliverExt.getPkCreator(); - SysUser sysUser = userServiceApi.selectUserById(pkCreator).getData(); - // 查询销售订单 - List saOrderExtList = saOrderServiceApi.querySaOrderByDeliverList(deliverExt.getSaDeliverItemsExtList()).getData(); - if (CollectionUtil.isEmpty(saOrderExtList)) { - throw new RuntimeException(ScmMsgConstants.SO_ORDER_NOT_EXIST); - } - Map saOrderExtMap = new HashMap<>(); - Map saOrderItemsExtMap = new HashMap<>(); - for (SaOrderExt saOrderExt : saOrderExtList) { - saOrderExtMap.put(saOrderExt.getPkId(), saOrderExt); - for (SaOrderItemsExt saOrderItemsExt : saOrderExt.getOrderItemsExtList()) { - saOrderItemsExtMap.put(saOrderItemsExt.getPkId(), saOrderItemsExt); - } - } - // 查询规格 - List querySpeceIdList = new ArrayList<>(); - for (SaDeliverItemsExt deliverItemsExt : deliverExt.getSaDeliverItemsExtList()) { - String[] specsId = deliverItemsExt.getSpecsNameId().split(","); - querySpeceIdList.addAll(Arrays.stream(specsId).map(Integer::valueOf).collect(Collectors.toList())); - } - List specsList = productServiceApi.queryBdSpecsByIdList(querySpeceIdList).getData(); - Map specsMap = specsList.stream().collect(Collectors.toMap(BdSpecs::getPkId, bdSpecs -> bdSpecs)); - Map saleoutExtMap = new HashMap<>(); - for (SaDeliverItemsExt deliverItemsExt : deliverExt.getSaDeliverItemsExtList()) { - // 根据订单获得仓库，公司 - if (saOrderExtMap.containsKey(deliverItemsExt.getPkOrder())) { - // 销售订单 - SaOrderExt orderExt = saOrderExtMap.get(deliverItemsExt.getPkOrder()); - Long pkMember = orderExt.getPkMember(); - IcSaleoutHExt saleOutH; - if (saleoutExtMap.containsKey(pkMember)) { - saleOutH = saleoutExtMap.get(pkMember); - } else { - saleOutH = new IcSaleoutHExt(); - saleOutH.setPkDept(sysUser.getPkDept().intValue()); - saleOutH.setCustomerType(ESupplierType.MEMBER_CUSTOMER.getValue()); - saleOutH.setPkCustomer(pkMember); - saleOutH.setPkWhsmanager(sysUser.getUserId()); - saleOutH.setPkStorehouse(orderExt.getPkStorehouse()); - saleOutH.setPkCorp(orderExt.getPkCorp()); - saleOutH.setOrderDate(DateUtils.parseStringToDate(DateUtils.parseDateToFormat(DateUtils.YYYY_MM_DD, deliverExt.getDeliverTime()))); - saleOutH.setOrderStatus(EScmOrderStatus.CLOSE.getValue()); - saleOutH.setOrderCode(scmBillNoService.createScmBillNoByOrderType(EScmOrderType.SALE_OUT.getValue())); - saleOutH.setPrintStatus(EYesNo.NO.getIntValue()); - saleOutH.setTotalNum(BigDecimal.ZERO); - saleOutH.setPkCreator(pkCreator); - saleOutH.setPkCountry(deliverExt.getPkCountry()); - saleoutExtMap.put(pkMember, saleOutH); - } - IcSaleoutBExt saleOutB = new IcSaleoutBExt(); - if (saOrderItemsExtMap.containsKey(deliverItemsExt.getPkOrderItems())) { - SaOrderItemsExt orderItemsExt = saOrderItemsExtMap.get(deliverItemsExt.getPkOrderItems()); - saleOutB.setPkUnit(orderItemsExt.getPkUnit()); - saleOutB.setPkSaOrder(deliverItemsExt.getPkOrder()); - saleOutB.setPkSaOrderItems(deliverItemsExt.getPkOrderItems()); - saleOutB.setPkDelivery(deliverExt.getPkId()); - saleOutB.setPkDeliverItems(deliverItemsExt.getPkId()); - saleOutB.setPkProduct(deliverItemsExt.getPkProduct()); - saleOutB.setBizDate(saleOutH.getOrderDate()); - saleOutB.setPkStorehouse(orderItemsExt.getPkStorehouse() == null ? orderExt.getPkStorehouse() : orderItemsExt.getPkStorehouse()); - saleOutB.setPkRate(orderExt.getPkRate()); - saleOutB.setNnum(BigDecimal.valueOf(deliverItemsExt.getQuantity())); - saleOutB.setNorigprice(orderItemsExt.getPrice()); - saleOutB.setNtaxrate(BigDecimal.ZERO); - // 无税金额 = 无税单价*数量 - saleOutB.setNorigmny(ComputeUtil.computeMultiply(saleOutB.getNorigprice(), saleOutB.getNnum())); - // 含税单价 = 无税单价*（1+税率） - saleOutB.setNorigtaxprice(ComputeUtil.computeMultiply(saleOutB.getNorigprice(), - ComputeUtil.computeAdd(BigDecimal.ONE, ComputeUtil.computeMultiply(saleOutB.getNtaxrate(), BigDecimal.valueOf(0.01))))); - // 税额 =无税单价*税率*数量 - saleOutB.setNtax(ComputeUtil.computeMultiply(ComputeUtil.computeBonusMultiply(saleOutB.getNorigprice(), saleOutB.getNtaxrate()), saleOutB.getNnum())); - // 价税合计 含税单价*数量 - saleOutB.setNorigtaxmny(ComputeUtil.computeMultiply(saleOutB.getNorigtaxprice(), saleOutB.getNnum())); - saleOutB.setIsGift(orderItemsExt.getIsGift()); - saleOutB.setPkCreator(pkCreator); - saleOutB.setPkCountry(deliverExt.getPkCountry()); - saleOutH.setTotalNum(ComputeUtil.computeAdd(saleOutH.getTotalNum(), saleOutB.getNnum())); - // 封装明细表 - String[] specsIdArray = deliverItemsExt.getSpecsNameId().split(","); - List speceIdList = Arrays.stream(specsIdArray).map(Integer::valueOf).collect(Collectors.toList()); - List scmItemSpecsList = new ArrayList<>(); - for (Integer specsId : speceIdList) { - if (specsMap.containsKey(specsId)) { - BdSpecs bdSpecs = specsMap.get(specsId); - ScmItemSpecs scmItemSpecs = ScmItemSpecs.builder() - .orderType(EScmOrderType.SALE_OUT.getValue()) - .pkSpecs(bdSpecs.getPkId()) - .pkSpecsType(bdSpecs.getPkSpecsType()) - .specsName(bdSpecs.getSpecsName()) - .build(); - scmItemSpecs.setPkCreator(pkCreator); - scmItemSpecs.setPkCountry(deliverExt.getPkCountry()); - scmItemSpecsList.add(scmItemSpecs); - } - } - saleOutB.setScmItemSpecsList(scmItemSpecsList); - if (saleOutH.getSaleoutbExtList() == null) { - List saleoutbList = new ArrayList<>(); - saleoutbList.add(saleOutB); - saleOutH.setSaleoutbExtList(saleoutbList); - } else { - saleOutH.getSaleoutbExtList().add(saleOutB); - } - } - } - } - List saleOutIdList = baseMapper.querySaleOutSql(saleoutExtMap.size()); - int i = 0; - for (Long pkMember : saleoutExtMap.keySet()) { - IcSaleoutHExt icSaleOutExt = saleoutExtMap.get(pkMember); - icSaleOutExt.setPkId(saleOutIdList.get(i)); - for (IcSaleoutBExt saleOutB : icSaleOutExt.getSaleoutbExtList()) { - saleOutB.setPkSaleout(icSaleOutExt.getPkId()); - } - i++; - } - List saleoutBiExtList = new ArrayList<>(); - List saleOutExtList = new ArrayList<>(); - saleoutExtMap.forEach((key, saleOutExt) -> { - // 扣减库存 - saleOutExtList.add(saleOutExt); - saleoutBiExtList.addAll(saleOutExt.getSaleoutbExtList()); - }); - List saleOutBiIdList = saleOutBiService.querySaleOutBiSql(saleoutBiExtList.size()); - for (int j = 0; j < saleoutBiExtList.size(); j++) { - IcSaleoutBExt saleOutB = saleoutBiExtList.get(j); - saleOutB.setPkId(saleOutBiIdList.get(j)); - } - saleoutExtMap.forEach((key, saleOutExt) -> { - // 扣减库存 - onHandNumService.mergeIcOnHandNumByGeneralOut(saleOutExt, EScmOrderType.SALE_OUT.getValue(), pkCreator); - }); - - // 保存销售出库 - baseMapper.insertSaleOutByList(saleOutExtList); - // 保存销售出库明细 - saleOutBiService.insertSaleOutBiByList(saleoutBiExtList); - // 保存销售出库规格 - saleOutExtList.forEach(saleOutExt -> { - List saveScmItemSpecsList = scmItemSpecsService.packageOrderItemsSpecs(saleOutExt.getSaleoutbExtList(), saleOutExt.getPkId()); - if (saveScmItemSpecsList.size() > 0) { - scmItemSpecsService.saveBatch(saveScmItemSpecsList); - } - }); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void saveBackSaleOutByParam(IcSaleoutHExt saleOutExt, SaleOutParam saleOutParam) { - // 复制 - IcSaleoutH icSaleoutH = BeanUtil.copyProperties(saleOutExt, IcSaleoutH.class); - icSaleoutH.setReturnStatus(EYesNo.YES.getIntValue()); - icSaleoutH.setReturnReason(saleOutParam.getReturnReason()); - List saleoutBiList = BeanUtil.copyToList(saleOutExt.getSaleoutbExtList(), IcSaleoutB.class); - Long pkSource = icSaleoutH.getPkId(); - icSaleoutH.setPkId(null); - Date currentDate = DateUtils.currentDateTime(); - icSaleoutH.setOrderCode(scmBillNoService.createScmBillNoByOrderType(EScmOrderType.SALE_OUT.getValue())); - icSaleoutH.setOrderStatus(EScmOrderStatus.SAVE.getValue()); - icSaleoutH.setOrderDate(currentDate); - icSaleoutH.setCreationTime(currentDate); - baseMapper.insert(icSaleoutH); - for (IcSaleoutB saleOutB : saleoutBiList) { - Long pkSourceB = saleOutB.getPkId(); - saleOutB.setPkSource(pkSource); - saleOutB.setPkSourceB(pkSourceB); - saleOutB.setPkId(null); - saleOutB.setBizDate(currentDate); - saleOutB.setCreationTime(currentDate); - saleOutB.setTransType(ETransType.GENERAL_IN.getValue()); - saleOutB.setPkSaleout(icSaleoutH.getPkId()); - saleOutBiService.save(saleOutB); - } - List saveScmItemSpecsList = scmItemSpecsService.packageOrderItemsSpecs(saleoutBiList, icSaleoutH.getPkId()); - if (saveScmItemSpecsList.size() > 0) { - scmItemSpecsService.saveBatch(saveScmItemSpecsList); - } - } - - @Override - public List queryDisSaleOutExtCondition(SaleOutParam saleOutParam) { - if (saleOutParam.getEndDate() != null) { - saleOutParam.setEndDate(DateUtils.afterDate(1, ChronoUnit.DAYS, saleOutParam.getEndDate())); - } - return baseMapper.queryDisSaleOutExtCondition(saleOutParam); - } - - @Override - public IcSaleoutHExt querySaleOutExtById(SaleOutParam saleOutParam) { - List saleOutExtList = baseMapper.queryDisSaleOutExtCondition(saleOutParam); - if (saleOutExtList == null) { - return null; - } - // 查询明细表，需要携带规格 - IcSaleoutHExt saleOutExt = saleOutExtList.get(0); - List icSaleoutBiExtList = saleOutBiService.querySaleOutBiExtByPk(saleOutParam.getPkCountry(), saleOutExt.getPkId()); - saleOutExt.setSaleoutbExtList(icSaleoutBiExtList); - return saleOutExt; - } - - @Override - public IcSaleoutHExt querySaleOutExtId(Long pkId, Integer orderStatus) { - return baseMapper.querySaleOutExtId(pkId, orderStatus); - } - - @Override - public IcSaleoutHExt queryDisSaleOutExtById(Long pkId, Integer orderStatus) { - SaleOutParam saleOutParam = new SaleOutParam(); - saleOutParam.setPkId(pkId); - saleOutParam.setOrderStatus(orderStatus); - List saleOutExtList = baseMapper.queryDisSaleOutExtCondition(saleOutParam); - if (CollectionUtil.isNotEmpty(saleOutExtList)) { - return saleOutExtList.get(0); - } - return null; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void auditBackSaleOutSubmit(ScmApproveParam scmApproveParam, LoginUser loginUser) { - // 更新单据状态 - updateBackSaleOutStatus(scmApproveParam.getPkId(), loginUser, EScmOrderStatus.SUBMIT.getValue()); - scmOrderApproveLogService.submitOrder(scmApproveParam, EApprovalBusiness.BACK_SALE_OUT_APPROVE, EOrderPrefix.IC_SALE_OUT_CODE, loginUser); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public String auditBackSaleOutAgree(ApprovalBusinessResultDTO approvalBusinessResultDTO) { - return approveBackSaleOutByStatus(approvalBusinessResultDTO, EScmOrderStatus.APPROVE.getValue(), EAgentApprovalStatus.APPROVED.getValue()); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public String auditBackSaleOutReject(ApprovalBusinessResultDTO approvalBusinessResultDTO) { - return approveBackSaleOutByStatus(approvalBusinessResultDTO, EScmOrderStatus.SAVE.getValue(), EAgentApprovalStatus.REFUSE.getValue()); - } - - private void updateBackSaleOutStatus(Long pkId, LoginUser loginUser, Integer orderStatus) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.set(SaOrderFieldConstants.ORDER_STATUS, orderStatus); - updateWrapper.set(SystemFieldConstants.PK_MODIFIED, loginUser.getUserId()); - updateWrapper.set(SystemFieldConstants.MODIFIED_TIME, DateUtils.currentDateTime()); - updateWrapper.eq(SystemFieldConstants.PK_ID, pkId); - update(updateWrapper); - } - - private String approveBackSaleOutByStatus(ApprovalBusinessResultDTO approvalBusinessResultDTO, Integer scmOrderStatus, Integer approveStatus) { - // 查询订单日志表 - List scmOrderApproveLogList = scmOrderApproveLogService.queryScmOrderApproveLogByCondition(null, approvalBusinessResultDTO.getEApprovalBusiness().getValue(), approvalBusinessResultDTO.getBusinessCode()); - if (scmOrderApproveLogList == null || scmOrderApproveLogList.size() == 0) { - return TransactionUtils.getContent(DocumentMsgConstants.DOCUMENT_NOT_EXISTS); - } - // 查询销售退货单 - ScmOrderApproveLog scmOrderApproveLog = scmOrderApproveLogList.get(0); - IcSaleoutHExt saleOutExt = querySaleOutExtId(scmOrderApproveLog.getPkOrder(), EScmOrderStatus.SUBMIT.getValue()); - if (saleOutExt == null) { - return TransactionUtils.getContent(DocumentMsgConstants.DOCUMENT_HAS_HANDLE); - } - // 查询销售出库单，状态为已完成 - for (IcSaleoutBExt saleOutBiExt : saleOutExt.getSaleoutbExtList()) { - if (saleOutBiExt.getPkSource() == null) { - return TransactionUtils.getContent(ScmMsgConstants.SALE_OUT_NOT_EXIST); - } - IcSaleoutHExt oldSaleOutExt = querySaleOutExtId(saleOutBiExt.getPkSource(), EScmOrderStatus.CLOSE.getValue()); - if (oldSaleOutExt == null) { - return TransactionUtils.getContent(ScmMsgConstants.SALE_OUT_NOT_EXIST); - } - } - // 更新采购入库单状态 - updateBackSaleOutStatus(saleOutExt.getPkId(), approvalBusinessResultDTO.getLoginUser(), scmOrderStatus); - // 更新前程日志表状态 - scmOrderApproveLogService.updateScmOrderApproveStatus(scmOrderApproveLog.getPkId(), approvalBusinessResultDTO.getLoginUser().getUserId(), approveStatus); - if (EAgentApprovalStatus.APPROVED.getValue() == approveStatus) { - // 查询其他入库单明细表 - List saleOutBiExtList = saleOutBiService.queryBackSaleOutBiByPk(EScmOrderType.SALE_OUT.getValue(), saleOutExt.getSaleoutbExtList()); - if (saleOutBiExtList != null && saleOutBiExtList.size() > 0) { - saleOutExt.setSaleoutbExtList(saleOutBiExtList); - } - // 退货入不良品仓 - // 根据销售订单查找对应的不良品仓 - // 查找销售订单 - for (IcSaleoutBExt saleOutBiExt : saleOutExt.getSaleoutbExtList()) { - SaOrder saOrder = saOrderServiceApi.querySaOrderExtByPkId(saleOutBiExt.getPkSaOrder()).getData(); - BdStorehouse bdStorehouse = currencyServiceApi.queryBdStorehouseByProvince(saOrder.getRecProvince(), 2).getData(); - if (bdStorehouse == null) { - continue; - } - saleOutBiExt.setPkStorehouse(bdStorehouse.getPkId()); - } - // 更新现存量 // 更新采购订单累计入库数量 - icOnHandNumService.mergeIcOnHandNumByGeneralIn(saleOutExt, saleOutExt.getSaleoutbExtList(), EScmOrderType.SALE_OUT.getValue(), approvalBusinessResultDTO.getLoginUser().getUserId()); - // 回写原销售出库单，状态更新为已退货 - Set sourceIdSet = new HashSet<>(); - List orderItemsIdList = new ArrayList<>(); - for (IcSaleoutBExt saleOutBiExt : saleOutExt.getSaleoutbExtList()) { - sourceIdSet.add(saleOutBiExt.getPkSource()); - orderItemsIdList.add(saleOutBiExt.getPkSaOrderItems()); - } - for (Long aLong : sourceIdSet) { - updateBackSaleOutStatus(aLong, approvalBusinessResultDTO.getLoginUser(), EScmOrderStatus.BACK.getValue()); - } - // 回写销售订单 - if (!saOrderItemsServiceApi.orderItemsReturn(orderItemsIdList, approvalBusinessResultDTO.getLoginUser().getUserId(), saleOutExt.getPkCountry()).isSuccess()) { - throw new RuntimeException("回写销售订单失败！"); - } - } - return null; - } -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/vo/SaleOutBVO.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/vo/SaleOutBVO.java deleted file mode 100644 index f128c30c..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/vo/SaleOutBVO.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.hzs.scm.sale.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.scm.pub.vo.ScmReturnBVo; -import com.hzs.scm.pub.vo.ScmSpecsVO; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; -import java.util.List; - -/** - * @description: 销售出库明细表 - * @author: sui q - * @time: 2024/2/27 13:56 - * @classname: SaleOutBVO - * @package_name: com.hzs.scm.sale.vo - * version 1.0.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class SaleOutBVO extends ScmReturnBVo { - - /** - * 销售订单主键 - */ - private Long pkSaOrder; - - /** - * 销售订单明细主键 - */ - private Long pkSaOrderItems; - - /** - * 发货单主键 - */ - private Long pkDelivery; - - /** - * 发货单明细主键 - */ - private Long pkDeliverItems; - - /** - * 主表主键 - */ - private Long pkSaleout; - - /** - * 货位 - */ - private Integer pkClocation; - - /** - * 入库日期 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date bizDate; - - private String batchCode; - - /** - * 批次主键 - */ - private Long pkBatchCode; - - private List scmItemSpecsList; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/vo/SaleOutBackExcelVO.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/vo/SaleOutBackExcelVO.java deleted file mode 100644 index dd8b1eba..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/vo/SaleOutBackExcelVO.java +++ /dev/null @@ -1,143 +0,0 @@ -package com.hzs.scm.sale.vo; - -import com.hzs.common.core.annotation.Excel; -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -/** - * @description: 销售退货单导出数据 - * @author: sui q - * @time: 2024/3/8 14:13 - * @classname: IcGeneralInExcelVO - * @package_name: com.hzs.scm.general.vo - * version 1.0.0 - */ -@Data -public class SaleOutBackExcelVO implements Serializable { - - /** - * 订单编号 - */ - @Excel(name = "入库编号") - private String orderCode; - - /** - * 管理员名称 - */ - @Excel(name = "库管员") - private String managerName; - - /** - * 部门名称 - */ - @Excel(name = "库存部门") - private String deptName; - - /** - * 采购组织名称 - */ - @Excel(name = "库存公司") - private String corpName; - - /** - * 订单日期 2023-10 - */ - @Excel(name = "入库日期", dateFormat = "yyyy-MM-dd") - private Date orderDate; - - @Excel(name = "订单状态", readConverterExp = "1=已保存,2=已提交,3=已审核,4=已收货,5=已关闭,6=已退货") - private Integer orderStatus; - - /** - * 备注 - */ - @Excel(name = "备注") - private String remark; - - /** - * 产品编号 - */ - @Excel(name = "产品编号") - private String productCode; - - /** - * 产品名称 - */ - @Excel(name = "产品名称") - private String productName; - - /** - * 规格名称 - */ - @Excel(name = "规格名称") - private String specsName; - - /** - * 单位名称 - */ - @Excel(name = "单位") - private String unitName; - - /** - * 仓库名称 - */ - @Excel(name = "入库仓库") - private String storehouseName; - - /** - * 批次号 - */ - @Excel(name = "批次号") - private String batchCode; - - /** - * 入库日期 - */ - @Excel(name = "入库日期", dateFormat = "yyyy-MM-dd") - private Date bizDate; - - /** - * 数量 - */ - @Excel(name = "数量") - private BigDecimal nnum; - /** - * 无税单价 - */ - @Excel(name = "无税单价") - private BigDecimal norigprice; - - /** - * 税率 - */ - @Excel(name = "税率") - private BigDecimal ntaxrate; - - /** - * 含税单价 = 无税单价*（1+税率） - */ - @Excel(name = "含税单价") - private BigDecimal norigtaxprice; - - /** - * 无税金额 = 无税单价*数量 - */ - @Excel(name = "无税金额") - private BigDecimal norigmny; - - /** - * 税额 =无税单价*数量 - */ - @Excel(name = "税额") - private BigDecimal ntax; - - /** - * 价税合计 含税单价*数量 - */ - @Excel(name = "价税合计") - private BigDecimal norigtaxmny; - -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/vo/SaleOutExcelVO.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/vo/SaleOutExcelVO.java deleted file mode 100644 index 21de6362..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/vo/SaleOutExcelVO.java +++ /dev/null @@ -1,143 +0,0 @@ -package com.hzs.scm.sale.vo; - -import com.hzs.common.core.annotation.Excel; -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -/** - * @description: 销售出库单导出数据 - * @author: sui q - * @time: 2024/3/8 14:13 - * @classname: IcGeneralInExcelVO - * @package_name: com.hzs.scm.general.vo - * version 1.0.0 - */ -@Data -public class SaleOutExcelVO implements Serializable { - - /** - * 订单编号 - */ - @Excel(name = "出库编号") - private String orderCode; - - /** - * 部门名称 - */ - @Excel(name = "部门") - private String deptName; - - /** - * 管理员名称 - */ - @Excel(name = "库管员") - private String managerName; - - /** - * 采购组织名称 - */ - @Excel(name = "库存公司") - private String corpName; - - @Excel(name = "订单状态", readConverterExp = "1=已保存,2=已提交,3=已审核,4=已收货,5=已关闭,6=已退货") - private Integer orderStatus; - - /** - * 备注 - */ - @Excel(name = "备注") - private String remark; - - /** - * 订单日期 2023-10 - */ - @Excel(name = "出库日期", dateFormat = "yyyy-MM-dd") - private Date orderDate; - - /** - * 产品编号 - */ - @Excel(name = "产品编号") - private String productCode; - - /** - * 产品名称 - */ - @Excel(name = "产品名称") - private String productName; - - /** - * 规格名称 - */ - @Excel(name = "产品规格") - private String specsName; - - /** - * 单位名称 - */ - @Excel(name = "单位") - private String unitName; - - /** - * 仓库名称 - */ - @Excel(name = "出库仓库") - private String storehouseName; - - - /** - * 数量 - */ - @Excel(name = "数量") - private BigDecimal nnum; - /** - * 无税单价 - */ - @Excel(name = "无税单价") - private BigDecimal norigprice; - - /** - * 税率 - */ - @Excel(name = "税率") - private BigDecimal ntaxrate; - - /** - * 含税单价 = 无税单价*（1+税率） - */ - @Excel(name = "含税单价") - private BigDecimal norigtaxprice; - - /** - * 无税金额 = 无税单价*数量 - */ - @Excel(name = "无税金额") - private BigDecimal norigmny; - - /** - * 税额 =无税单价*数量 - */ - @Excel(name = "税额") - private BigDecimal ntax; - - /** - * 价税合计 含税单价*数量 - */ - @Excel(name = "价税合计") - private BigDecimal norigtaxmny; - - /** - * 出库日期 - */ - @Excel(name = "出库日期", dateFormat = "yyyy-MM-dd") - private Date bizDate; - - /** - * 批次号 - */ - @Excel(name = "批次号") - private String batchCode; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/vo/SaleOutHVO.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/vo/SaleOutHVO.java deleted file mode 100644 index 790b9e19..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/vo/SaleOutHVO.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.hzs.scm.sale.vo; - -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import com.hzs.scm.pub.vo.ScmReturnVo; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.List; - -/** - * @description: 销售出库vo - * @author: sui q - * @time: 2024/2/27 13:53 - * @classname: SaleOutHVO - * @package_name: com.hzs.scm.sale.vo - * version 1.0.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class SaleOutHVO extends ScmReturnVo { - - /** - * 客户名称 - */ - private String customerName; - - /** - * 仓库名称 - */ - private String storehouseName; - - /** - * 仓库管理员 - */ - private Long pkWhsmanager; - - /** - * 客户（取bd_cubasdoc 类型为5的） - */ - private Long pkCustomer; - - /** - * 仓库 - */ - private Integer pkStorehouse; - - /** - * 退货状态 0=是 1=否 - */ - @Transaction(transactionKey = EnumsPrefixConstants.DEALER_YES_NO) - private Integer returnStatus; - - private String returnStatusVal; - - /** - * 退货理由 - */ - private String returnReason; - - /** - * 销售出库明细表 - */ - private List saleOutBiVoList; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/controller/manage/IcTransInHController.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/controller/manage/IcTransInHController.java deleted file mode 100644 index d07e47c9..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/controller/manage/IcTransInHController.java +++ /dev/null @@ -1,271 +0,0 @@ -package com.hzs.scm.trans.controller.manage; - - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.ObjectUtil; -import com.hzs.common.core.annotation.Log; -import com.hzs.common.core.constant.msg.MemberMsgConstants; -import com.hzs.common.core.constant.msg.ScmMsgConstants; -import com.hzs.common.core.enums.*; -import com.hzs.common.core.utils.poi.ExcelUtil; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.sale.product.ext.BdProductBasExt; -import com.hzs.common.domain.scm.pub.ScmOrderApproveLog; -import com.hzs.common.domain.scm.purchase.ext.IcPurchaseInBExt; -import com.hzs.common.domain.scm.purchase.ext.IcPurchaseInHExt; -import com.hzs.common.domain.scm.trans.ext.IcTransInBExt; -import com.hzs.common.domain.scm.trans.ext.IcTransInHExt; -import com.hzs.common.domain.scm.trans.ext.IcTransOutBExt; -import com.hzs.common.domain.scm.trans.ext.IcTransOutHExt; -import com.hzs.common.security.service.UserTokenService; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.common.util.TransactionUtils; -import com.hzs.scm.pub.controller.ScmController; -import com.hzs.scm.pub.param.ScmApproveParam; -import com.hzs.scm.pub.service.IScmOrderApproveLogService; -import com.hzs.scm.purchase.param.PurchaseInParam; -import com.hzs.scm.purchase.vo.PurchaseExcelVO; -import com.hzs.scm.trans.param.TransferItemParam; -import com.hzs.scm.trans.param.TransferParam; -import com.hzs.scm.trans.service.IIcTransInHService; -import com.hzs.scm.trans.service.IIcTransOutHService; -import com.hzs.scm.trans.vo.*; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.*; -import java.util.stream.Collectors; - -/** - *

- * 调拨入库单表头 前端控制器 - *

- * - * @author hzs - * @since 2023-12-04 - */ -@RestController -@RequestMapping("/manage/trans-in") -public class IcTransInHController extends ScmController { - - @Autowired - private IIcTransOutHService transOutService; - - @Autowired - private IIcTransInHService transInService; - - @Autowired - private UserTokenService userTokenService; - - @Autowired - private IScmOrderApproveLogService scmOrderApproveLogService; - - /** - * 查询列表 - * - * @return transferParam 入参 - */ - @PostMapping("/list") - @Log(module = EOperationModule.TRANSFER_IN, business = EOperationBusiness.TRANSFER_IN, method = EOperationMethod.SELECT) - public TableDataInfo listTransIn(@RequestBody TransferParam transferParam) { - transferParam.setPkCountry(SecurityUtils.getPkCountry()); - startPage(); - List transInExtList = transInService.queryDisTransferInInExtByCondition(transferParam); - return packageTableDataInfo(transInExtList, packageScmReturnVo(transInExtList)); - } - - /** - * 查询列表 - * - * @return cubasdocParam 入参 - */ - @PostMapping("/list-total") - public TableDataInfo listTransInTotal(@RequestBody TransferParam transferParam) { - transferParam.setPkCountry(SecurityUtils.getPkCountry()); - startPage(); - transferParam.setOrderState(EScmOrderStatus.APPROVE.getValue()); - List transInExtList = transInService.queryDisTransferInInExtByCondition(transferParam); - return packageTableDataInfo(transInExtList, packageScmReturnVo(transInExtList)); - } - - private List packageScmReturnVo(List transInExtList) { - List transferInList = new ArrayList<>(); - for (IcTransInHExt transInExt : transInExtList) { - TransferInVo transferInVo = BeanUtil.copyProperties(transInExt, TransferInVo.class); - List transInbiExtList= transInExt.getTransInbExtList(); - if (CollectionUtil.isNotEmpty(transInbiExtList)) { - List returnbVoList = BeanUtil.copyToList(transInbiExtList, TransferInBVo.class); - transferInVo.setScmReturnbVoList(returnbVoList); - } - transferInList.add(transferInVo); - } - return transferInList; - } - - - /** - * 分页查询会员某个时间段内的奖金汇总 - */ - @PostMapping("/export-list-total") - @Log(module = EOperationModule.TRANSFER_IN, business = EOperationBusiness.TRANSFER_IN, method = EOperationMethod.EXPORT) - public void exportListTransInTotal(HttpServletResponse response, TransferParam transferParam){ - transferParam.setPkCountry(SecurityUtils.getPkCountry()); - transferParam.setOrderState(EScmOrderStatus.APPROVE.getValue()); - List transInExtList = transInService.queryDisTransferInInExtByCondition(transferParam); - List transferExcelVoList = packageScmExportVo(transInExtList); - ExcelUtil util = new ExcelUtil<>(TransferExcelVO.class); - util.exportExcel(response, transferExcelVoList, "调拨入库导出"); - } - - private List packageScmExportVo(List transInExtList) { - List transferExcelVoList = new ArrayList<>(); - for (IcTransInHExt transInExt : transInExtList) { - List transInbExtList= transInExt.getTransInbExtList(); - for (IcTransInBExt transInBiExt : transInbExtList) { - TransferExcelVO transferExcelVO = BeanUtil.copyProperties(transInExt, TransferExcelVO.class); - setScmItemsExcel(transInBiExt, transferExcelVO); - transferExcelVO.setBizDate(transInBiExt.getBizDate()); - transferExcelVO.setOutStorehouseName(transInBiExt.getOutStorehouseName()); - transferExcelVoList.add(transferExcelVO); - } - } - return transferExcelVoList; - } - - /** - * 新增调拨入库 - * - * @param transferParam 入参 - */ - @PostMapping("/insert") - @Log(module = EOperationModule.TRANSFER_IN, business = EOperationBusiness.TRANSFER_IN, method = EOperationMethod.INSERT) - public AjaxResult saveTransIn(@RequestBody TransferParam transferParam) { - String message = validateTransferParam(transferParam); - if (ObjectUtil.isNotEmpty(message)) { - return AjaxResult.error(TransactionUtils.getContent(message)); - } - // 审核通过后需要关闭调拨订单 回写调拨订单累计入库数量 - return AjaxResult.success(); - } - - private String validateTransferParam(TransferParam transferParam) { - List transferItemParams = new ArrayList<>(); - if (validateTransferInParam(transferParam, transferItemParams)) { - return MemberMsgConstants.REQUIRED_NOT_EMPTY; - } - transferParam.setPkCountry(SecurityUtils.getPkCountry()); - // 验证是否存在调拨出库单,根据调拨出库单生成表头 表体信息 - List transOutExtList = transOutService.queryTransferOutByOrderItems(transferItemParams); - if (transOutExtList == null || transOutExtList.size() == 0) { - return ScmMsgConstants.TRANSFER_OUT_NOT_EXIST; - } - // 验证产品 - Set idList = transferParam.getTransferItemParamList().stream().map(TransferItemParam::getPkProductBas).collect(Collectors.toSet()); - Map bdProductBasExtMap = getBdProductBasExtMap(idList); - if (bdProductBasExtMap == null){ - return ScmMsgConstants.PRODUCT_NOT_EXIST; - } - // 判断是否有批次，有批次需要验证批次 - IcTransOutHExt transOutExt = transOutExtList.get(0); - transferParam.setPkCorp(transOutExt.getPkCorp()); - if (validateBatchCodeByTransParam(transferParam, bdProductBasExtMap)){ - return ScmMsgConstants.BATCH_CODE_NOT_EXIST; - } - if (transferParam.getPkId() == null) { - transInService.insertSaveTransferInByTransferOrder(transOutExtList, transferParam, SecurityUtils.getUserId()); - } else { - // 查询是否存在调拨入库单 - IcTransInHExt transInExt = transInService.queryTransferInInhExtById(transferParam.getPkId(), EScmOrderStatus.SAVE.getValue(), SecurityUtils.getPkCountry()); - if (transInExt == null) { - return ScmMsgConstants.TRANSFER_IN_NOT_EXIST; - } - transInService.updateSaveTransferInByPoOrder(transOutExtList, transInExt, transferParam, SecurityUtils.getUserId()); - } - return null; - } - - private Boolean validateTransferInParam(TransferParam transferParam, List transferItemParams) { - if (transferParam == null || CollectionUtil.isEmpty(transferParam.getTransferItemParamList())) { - return Boolean.TRUE; - } - // 验证 调拨订单明细字段不能为空 - for (TransferItemParam transferItemParam : transferParam.getTransferItemParamList()) { - if (transferItemParam.getPkUnit() == null || transferItemParam.getPkProductBas() == null || - transferItemParam.getPkTransferOut() == null || transferItemParam.getPkTransferOutB() == null || - transferItemParam.getBizDate() == null || transferItemParam.getNnum() == null || - transferItemParam.getPkStorehouse() == null || transferItemParam.getPkOutStorehouse() == null) { - return Boolean.TRUE; - } - transferItemParams.add(transferItemParam); - } - return Boolean.FALSE; - } - - - /** - * 修改调拨入库 - * - * @param transferParam 入参 - */ - @PostMapping("/update") - @Log(module = EOperationModule.TRANSFER_IN, business = EOperationBusiness.TRANSFER_IN, method = EOperationMethod.UPDATE) - public AjaxResult updateTransferIn(@RequestBody TransferParam transferParam) { - if (transferParam.getPkId() == null) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.TRANSFER_IN_NOT_EXIST)); - } - String message = validateTransferParam(transferParam); - if (ObjectUtil.isNotEmpty(message)) { - return AjaxResult.error(TransactionUtils.getContent(message)); - } - // 审核通过后需要关闭调拨订单 回写调拨订单累计入库数量 - return AjaxResult.success(); - } - - /** - * 删除调拨订单 - * - * @param pkId 主键 - */ - @DeleteMapping("/{pkId}") - @Log(module = EOperationModule.TRANSFER_IN, business = EOperationBusiness.TRANSFER_IN, method = EOperationMethod.DELETE) - public AjaxResult delete(@PathVariable Long pkId) { - if (pkId == null) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.TRANSFER_IN_NOT_EXIST)); - } - IcTransInHExt transInExt = transInService.queryTransferInInhExtById(pkId, EScmOrderStatus.SAVE.getValue(), SecurityUtils.getPkCountry()); - if (transInExt == null) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.TRANSFER_IN_NOT_EXIST)); - } - transInService.deleteTransferInByPk(pkId, SecurityUtils.getUserId()); - return AjaxResult.success(); - } - - /** - * 撤销订单并入库（走签呈），签呈页面点击确定按钮 - * - * @param scmApproveParam 参数 - */ - @PostMapping("/submit") - @Log(module = EOperationModule.TRANSFER_IN, business = EOperationBusiness.TRANSFER_IN, method = EOperationMethod.UPDATE) - public AjaxResult submitTransferIn(@RequestBody ScmApproveParam scmApproveParam) { - scmApproveParam.setPkCountry(SecurityUtils.getPkCountry()); - if(scmApproveParam.getPkId() == null){ - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.TRANSFER_IN_NOT_EXIST)); - } - IcTransInHExt transInExt = transInService.queryTransferInInhExtById(scmApproveParam.getPkId(), EScmOrderStatus.SAVE.getValue(), SecurityUtils.getPkCountry()); - if (transInExt == null) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.TRANSFER_IN_NOT_EXIST)); - } - // 验证该订单是否存在签呈，存在待审核的签呈不能再次发起 - List scmOrderApproveLogs = scmOrderApproveLogService.queryScmOrderApproveLogByCondition(scmApproveParam.getPkId(), EApprovalBusiness.TRANSFER_IN_APPROVE.getValue(), null); - if(CollectionUtil.isNotEmpty(scmOrderApproveLogs)){ - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.TRANSFER_IN_EXISTS_AGENT)); - } - transInService.auditTransferInByPoOrderSubmit(scmApproveParam, userTokenService.getLoginUser()); - return AjaxResult.success(); - } - -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/controller/manage/IcTransOutHController.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/controller/manage/IcTransOutHController.java deleted file mode 100644 index 6977d54c..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/controller/manage/IcTransOutHController.java +++ /dev/null @@ -1,281 +0,0 @@ -package com.hzs.scm.trans.controller.manage; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.ObjectUtil; -import com.hzs.common.core.annotation.Log; -import com.hzs.common.core.constant.msg.MemberMsgConstants; -import com.hzs.common.core.constant.msg.ScmMsgConstants; -import com.hzs.common.core.enums.*; -import com.hzs.common.core.utils.poi.ExcelUtil; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.sale.product.ext.BdProductBasExt; -import com.hzs.common.domain.scm.pub.ScmOrderApproveLog; -import com.hzs.common.domain.scm.trans.ext.IcTransOutBExt; -import com.hzs.common.domain.scm.trans.ext.IcTransOutHExt; -import com.hzs.common.domain.scm.trans.ext.TransferOrderExt; -import com.hzs.common.security.service.UserTokenService; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.common.util.TransactionUtils; -import com.hzs.scm.pub.controller.ScmController; -import com.hzs.scm.pub.param.ScmApproveParam; -import com.hzs.scm.pub.service.IScmOrderApproveLogService; -import com.hzs.scm.trans.param.TransferItemParam; -import com.hzs.scm.trans.param.TransferParam; -import com.hzs.scm.trans.service.IIcTransOutHService; -import com.hzs.scm.trans.service.ITransferOrderService; -import com.hzs.scm.trans.vo.TransferOutBVo; -import com.hzs.scm.trans.vo.TransferOutExcelVO; -import com.hzs.scm.trans.vo.TransferOutVo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; - -/** - *

- * 调拨出库单表头 前端控制器 - *

- * - * @author hzs - * @since 2023-12-04 - */ -@RestController -@RequestMapping("/manage/trans-out") -public class IcTransOutHController extends ScmController { - - @Autowired - private IIcTransOutHService transOutService; - - @Autowired - private ITransferOrderService transferOrderService; - - @Autowired - private IScmOrderApproveLogService scmOrderApproveLogService; - - @Autowired - private UserTokenService userTokenService; - - /** - * 查询列表 - * - * @return cubasdocParam 入参 - */ - @PostMapping("/list") - @Log(module = EOperationModule.TRANSFER_OUT, business = EOperationBusiness.TRANSFER_OUT, method = EOperationMethod.SELECT) - public TableDataInfo listGeneralOut(@RequestBody TransferParam transferParam) { - startPage(); - transferParam.setPkCountry(SecurityUtils.getPkCountry()); - List transOutExtList = transOutService.queryDisTransferOutExtCondition(transferParam); - return packageTableDataInfo(transOutExtList, packageScmReturnVo(transOutExtList)); - } - - /** - * 新增调拨入库 - * - * @param transferParam 入参 - */ - @PostMapping("/insert") - @Log(module = EOperationModule.TRANSFER_OUT, business = EOperationBusiness.TRANSFER_OUT, method = EOperationMethod.INSERT) - public AjaxResult saveGeneralOut(@RequestBody TransferParam transferParam) { - String message = validateTransferOutParam(transferParam); - if (ObjectUtil.isNotEmpty(message)) { - return AjaxResult.error(TransactionUtils.getContent(message)); - } - return AjaxResult.success(); - } - - /** - * 修改调拨入库 - * - * @param transferParam 入参 - */ - @PostMapping("/update") - @Log(module = EOperationModule.TRANSFER_OUT, business = EOperationBusiness.TRANSFER_OUT, method = EOperationMethod.UPDATE) - public AjaxResult updatePoOrder(@RequestBody TransferParam transferParam) { - if (transferParam.getPkId() == null) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.TRANSFER_OUT_NOT_EXIST)); - } - String message = validateTransferOutParam(transferParam); - if (ObjectUtil.isNotEmpty(message)) { - return AjaxResult.error(TransactionUtils.getContent(message)); - } - return AjaxResult.success(); - } - - /** - * 查询待出库的调拨订单 - * - * @return cubasdocParam 入参 - */ - @PostMapping("/trans-out-list") - public TableDataInfo queryToStorePoOrder(@RequestBody TransferParam transferParam) { - startPage(); - transferParam.setPkCountry(SecurityUtils.getPkCountry()); - List transoutExtList = transOutService.queryTransferOutToStoreByCondition(transferParam); - return packageTableDataInfo(transoutExtList, packageScmReturnVo(transoutExtList)); - } - - private List packageScmReturnVo(List transoutExtList) { - List transferOrderList = new ArrayList<>(); - for (IcTransOutHExt transOutExt : transoutExtList) { - TransferOutVo transferOutVo = BeanUtil.copyProperties(transOutExt, TransferOutVo.class); - List transOutbExtList= transOutExt.getTransOutbExtList(); - if (CollectionUtil.isNotEmpty(transOutbExtList)) { - List returnbVoList = BeanUtil.copyToList(transOutbExtList, TransferOutBVo.class); - transferOutVo.setScmReturnbVoList(returnbVoList); - } - transferOrderList.add(transferOutVo); - } - return transferOrderList; - } - - /** - * 分页查询会员某个时间段内的奖金汇总 - */ - @PostMapping("/export-list-total") - @Log(module = EOperationModule.TRANSFER_OUT, business = EOperationBusiness.TRANSFER_OUT, method = EOperationMethod.EXPORT) - public void exportListTransInTotal(HttpServletResponse response, TransferParam transferParam){ - transferParam.setPkCountry(SecurityUtils.getPkCountry()); - transferParam.setOrderState(EScmOrderStatus.APPROVE.getValue()); - List transoutExtList = transOutService.queryTransferOutToStoreByCondition(transferParam); - List transferExcelVoList = packageScmExportVo(transoutExtList); - ExcelUtil util = new ExcelUtil<>(TransferOutExcelVO.class); - util.exportExcel(response, transferExcelVoList, "调拨出库导出"); - } - - private List packageScmExportVo(List transInExtList) { - List transferExcelVoList = new ArrayList<>(); - for (IcTransOutHExt transOutExt : transInExtList) { - List transOutbExtList= transOutExt.getTransOutbExtList(); - for (IcTransOutBExt transOutBiExt : transOutbExtList) { - TransferOutExcelVO transferExcelVO = BeanUtil.copyProperties(transOutExt, TransferOutExcelVO.class); - setScmItemsExcel(transOutBiExt, transferExcelVO); - transferExcelVO.setInStorehouseName(transOutBiExt.getInStorehouseName()); - transferExcelVoList.add(transferExcelVO); - } - } - return transferExcelVoList; - } - - /** - * 删除调拨入库 - * - * @param pkId 主键 - */ - @DeleteMapping("/{pkId}") - @Log(module = EOperationModule.TRANSFER_OUT, business = EOperationBusiness.TRANSFER_OUT, method = EOperationMethod.DELETE) - public AjaxResult delete(@PathVariable Long pkId) { - if (pkId == null) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.TRANSFER_OUT_NOT_EXIST)); - } - IcTransOutHExt transOutExt = transOutService.queryDisTransferOutExtById(pkId, EScmOrderStatus.SAVE.getValue()); - if (transOutExt == null) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.TRANSFER_OUT_NOT_EXIST)); - } - transOutService.deleteTransferOut(pkId, SecurityUtils.getUserId()); - return AjaxResult.success(); - } - - /** - * 撤销订单并入库（走签呈），签呈页面点击确定按钮 - * - * @param scmApproveParam 参数 - */ - @PostMapping("/submit") - @Log(module = EOperationModule.TRANSFER_OUT, business = EOperationBusiness.TRANSFER_OUT, method = EOperationMethod.UPDATE) - public AjaxResult submitPurchase(@RequestBody ScmApproveParam scmApproveParam) { - scmApproveParam.setPkCountry(SecurityUtils.getPkCountry()); - if (scmApproveParam.getPkId() == null) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.IC_GENERAL_OUT_NOT_EXIST)); - } - IcTransOutHExt transOutExt = transOutService.queryDisTransferOutExtById(scmApproveParam.getPkId(), EScmOrderStatus.SAVE.getValue()); - if (transOutExt == null) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.IC_GENERAL_OUT_NOT_EXIST)); - } - // 验证该订单是否存在签呈，存在待审核的签呈不能再次发起 - List scmOrderApproveLogs = scmOrderApproveLogService.queryScmOrderApproveLogByCondition(scmApproveParam.getPkId(), EApprovalBusiness.TRANSFER_OUT_APPROVE.getValue(), null); - if (CollectionUtil.isNotEmpty(scmOrderApproveLogs)) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.TRANSFER_OUT_EXISTS_AGENT)); - } - transOutService.auditTransferOutByApproveParamSubmit(transOutExt, scmApproveParam, userTokenService.getLoginUser()); - return AjaxResult.success(); - } - - private String validateTransferOutParam(TransferParam transferParam) { - List orderItemsParamList = new ArrayList<>(); - if (validateTransferOutFieldParam(transferParam, orderItemsParamList)) { - return MemberMsgConstants.REQUIRED_NOT_EMPTY; - } - // 验证是否存在调拨订单, 调拨出库只能基于一个调拨订单进行调拨 - List transferOrderExtList = transferOrderService.queryTransferOrderByOrderItems(orderItemsParamList); - if (transferOrderExtList == null) { - return ScmMsgConstants.TRANSFER_ORDER_NOT_EXIST; - } - int size = 0; - for (TransferOrderExt transferOrderExt : transferOrderExtList) { - if (transferOrderExt.getTransferOrderItemsList() == null) { - return ScmMsgConstants.TRANSFER_ORDER_NOT_EXIST; - } - size += transferOrderExt.getTransferOrderItemsList().size(); - } - if(size != orderItemsParamList.size()){ - return ScmMsgConstants.TRANSFER_ORDER_NOT_EXIST; - } - transferParam.setPkCountry(SecurityUtils.getPkCountry()); - // 验证采购组织 - String msg = validateSysCorp(transferParam.getPkCorp(), transferParam.getPkCountry()); - if (ObjectUtil.isNotEmpty(msg)) { - return msg; - } - // 验证调入采购组织 - msg = validateSysCorp(transferParam.getPkInCorp(), transferParam.getPkInCountry()); - if (ObjectUtil.isNotEmpty(msg)) { - return msg; - } - // 验证产品 - Set idList = transferParam.getTransferItemParamList().stream().map(TransferItemParam::getPkProductBas).collect(Collectors.toSet()); - Map bdProductBasExtMap = getBdProductBasExtMap(idList); - if (bdProductBasExtMap == null) { - return ScmMsgConstants.PRODUCT_NOT_EXIST; - } - if (validateBatchCodeByTransParam(transferParam, bdProductBasExtMap)) { - return ScmMsgConstants.BATCH_CODE_NOT_EXIST; - } - if (transferParam.getPkId() == null) { - transOutService.insertTransferOutByTransferParam(transferOrderExtList, transferParam, SecurityUtils.getUserId()); - } else { - // 查询是否存在调拨出库 - IcTransOutHExt transOutExt = transOutService.queryDisTransferOutExtById(transferParam.getPkId(), EScmOrderStatus.SAVE.getValue()); - if (transOutExt == null) { - return ScmMsgConstants.TRANSFER_OUT_NOT_EXIST; - } - transOutService.updateTransferOutByTransferParam(transferOrderExtList, transOutExt, transferParam, SecurityUtils.getUserId()); - } - return null; - } - - private Boolean validateTransferOutFieldParam(TransferParam transferParam, List orderItemsParamList) { - if (transferParam == null || transferParam.getOrderDate() == null || - CollectionUtil.isEmpty(transferParam.getTransferItemParamList())) { - return Boolean.TRUE; - } - // 验证 采购订单明细字段不能为空 - for (TransferItemParam transferItemParam : transferParam.getTransferItemParamList()) { - if (transferItemParam.getPkUnit() == null || transferItemParam.getPkProductBas() == null || - transferItemParam.getPkTransfer() == null || transferItemParam.getPkTransferItems() == null || - transferItemParam.getBizDate() == null || transferItemParam.getNnum() == null || - transferItemParam.getPkStorehouse() == null || transferItemParam.getPkInStorehouse() == null) { - return Boolean.TRUE; - } - orderItemsParamList.add(transferItemParam); - } - return Boolean.FALSE; - } -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/controller/manage/TransferOrderController.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/controller/manage/TransferOrderController.java deleted file mode 100644 index da8acd63..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/controller/manage/TransferOrderController.java +++ /dev/null @@ -1,283 +0,0 @@ -package com.hzs.scm.trans.controller.manage; - - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.ObjectUtil; -import com.hzs.common.core.annotation.Log; -import com.hzs.common.core.constant.msg.MemberMsgConstants; -import com.hzs.common.core.constant.msg.ScmMsgConstants; -import com.hzs.common.core.enums.*; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.scm.pub.ScmOrderApproveLog; -import com.hzs.common.domain.scm.trans.TransferOrderItems; -import com.hzs.common.domain.scm.trans.ext.TransferOrderExt; -import com.hzs.common.security.service.UserTokenService; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.common.util.TransactionUtils; -import com.hzs.scm.pub.controller.ScmController; -import com.hzs.scm.trans.param.QueryStoreParam; -import com.hzs.scm.pub.param.ScmApproveParam; -import com.hzs.scm.pub.service.IScmOrderApproveLogService; -import com.hzs.scm.trans.param.TransferItemParam; -import com.hzs.scm.trans.param.TransferParam; -import com.hzs.scm.trans.service.ITransferOrderItemsService; -import com.hzs.scm.trans.service.ITransferOrderService; -import com.hzs.scm.trans.vo.TransferOrderBVo; -import com.hzs.scm.trans.vo.TransferOrderVo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.math.BigDecimal; -import java.util.*; - -/** - *

- * 调拨订单表头 前端控制器 - *

- * - * @author hzs - * @since 2023-12-04 - */ -@RestController -@RequestMapping("/manage/trans-order") -public class TransferOrderController extends ScmController { - - @Autowired - private ITransferOrderService transferOrderService; - - @Autowired - private ITransferOrderItemsService transferOrderItemsService; - - @Autowired - private IScmOrderApproveLogService scmOrderApproveLogService; - - @Autowired - private UserTokenService userTokenService; - - /** - * 查询列表 - * - * @return cubasdocParam 入参 - */ - @PostMapping("/list") - @Log(module = EOperationModule.TRANSFER_ORDER, business = EOperationBusiness.TRANSFER_ORDER, method = EOperationMethod.SELECT) - public TableDataInfo listTransferOrder(@RequestBody TransferParam transferParam) { - startPage(); - transferParam.setPkCountry(SecurityUtils.getPkCountry()); - List transferOrderExtList = transferOrderService.queryTransferOrderByCondition(transferParam); - return packageTableDataInfo(transferOrderExtList, packageScmReturnVo(transferOrderExtList)); - } - - private List packageScmReturnVo(List transferOrderExtList) { - List transferOrderList = new ArrayList<>(); - for (TransferOrderExt transferOrderExt : transferOrderExtList) { - TransferOrderVo transferOrderVo = BeanUtil.copyProperties(transferOrderExt, TransferOrderVo.class); - List transferOrderItemsList = transferOrderExt.getTransferOrderItemsList(); - if (CollectionUtil.isNotEmpty(transferOrderItemsList)) { - List returnbVoList = BeanUtil.copyToList(transferOrderItemsList, TransferOrderBVo.class); - transferOrderVo.setScmReturnbVoList(returnbVoList); - } - transferOrderList.add(transferOrderVo); - } - return transferOrderList; - } - - /** - * 查询待出库的调拨订单 - * - * @return cubasdocParam 入参 - */ - @PostMapping("/trans-list") - public TableDataInfo queryToStoreTransferOrder(@RequestBody TransferParam transferParam) { - startPage(); - transferParam.setPkCountry(SecurityUtils.getPkCountry()); - List transferOrderExtList = transferOrderService.queryTransferOrderToStoreByCondition(transferParam); - return packageTableDataInfo(transferOrderExtList, packageScmReturnVo(transferOrderExtList)); - } - - /** - * 查询待入库订单的明细 - * - * @return cubasdocParam 入参 - */ - @GetMapping("/trans-list-detail/{pkId}") - public TableDataInfo queryToStoreDetailTransferOrder(@PathVariable Long pkId) { - List transferOrderItemsList = transferOrderItemsService.queryTransferOrderItemsByPk(SecurityUtils.getPkCountry(), pkId); - List scmReturnVoList = new ArrayList<>(); - for (TransferOrderItems transferOrderItems : transferOrderItemsList) { - scmReturnVoList.add(BeanUtil.copyProperties(transferOrderItems, TransferOrderBVo.class)); - } - return packageTableDataInfo(transferOrderItemsList, scmReturnVoList); - } - - /** - * 新增采购入库 - * - * @param transferParam 入参 - */ - @PostMapping("/insert") - @Log(module = EOperationModule.TRANSFER_ORDER, business = EOperationBusiness.TRANSFER_ORDER, method = EOperationMethod.INSERT) - public AjaxResult saveTransferOrder(@RequestBody TransferParam transferParam) { - // 验证供应商 - // 计算价税合计、总数量 - String msg = validateTransferOrderMsg(transferParam); - if (ObjectUtil.isNotEmpty(msg)) { - return AjaxResult.error(msg); - } - transferOrderService.insertSaveTransferOrderByOrderParam(transferParam, SecurityUtils.getUserId()); - return AjaxResult.success(); - } - - /** - * 修改采购入库 - * - * @param transferParam 入参 - */ - @PostMapping("/update") - @Log(module = EOperationModule.TRANSFER_ORDER, business = EOperationBusiness.TRANSFER_ORDER, method = EOperationMethod.UPDATE) - public AjaxResult updateTransferOrder(@RequestBody TransferParam transferParam) { - if (transferParam.getPkId() == null) { - return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.REQUIRED_NOT_EMPTY)); - } - // 验证订单状态 只有保存状态的采购订单可以进行修改 - TransferOrderExt transferOrderExt = transferOrderService.queryTransferOrderById(transferParam.getPkId(), EScmOrderStatus.SAVE.getValue()); - if (transferOrderExt == null) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.TRANSFER_ORDER_NOT_EXIST)); - } - // 计算价税合计、总数量 - String msg = validateTransferOrderMsg(transferParam); - if (ObjectUtil.isNotEmpty(msg)) { - return AjaxResult.error(msg); - } - transferOrderService.updateTransferOrderByOrderParam(transferOrderExt, transferParam, SecurityUtils.getUserId()); - return AjaxResult.success(); - } - - /* - * @description: 验证订单相关信息 - * @author: sui q - * @date: 2023/11/21 11:43 - * @param: null null - **/ - private String validateTransferOrderMsg(TransferParam transferParam) { - transferParam.setPkCountry(SecurityUtils.getPkCountry()); - Map> storehouseIdMap = new HashMap<>(); - if (validateTransferOrderParam(transferParam, storehouseIdMap)) { - return MemberMsgConstants.REQUIRED_NOT_EMPTY; - } - // 验证采购组织 - String msg = validateSysCorp(transferParam.getPkCorp(), transferParam.getPkCountry()); - if (ObjectUtil.isNotEmpty(msg)) { - return msg; - } - // 验证仓库，根据采购组织验证 - msg = validateStorehouse(storehouseIdMap); - if (ObjectUtil.isNotEmpty(msg)) { - return msg; - } - // 验证产品，根据产品 - // 验证规格、规格分类 需要根据产品查询 处理specsName - String message = validateProductBas(transferParam.getTransferItemParamList()); - if (ObjectUtil.isNotEmpty(message)) { - return message; - } - return null; - } - - private Boolean validateTransferOrderParam(TransferParam transferParam, Map> storehouseIdMap) { - // 验证 供应商、采购组织不能为空 - if (transferParam.getPkCorp() == null || transferParam.getPkInCorp() == null || transferParam.getPkInCountry() == null || - transferParam.getTransType() == null) { - return Boolean.TRUE; - } - // 验证 采购订单明细字段不能为空 - for (TransferItemParam transferItemParam : transferParam.getTransferItemParamList()) { - if (transferItemParam.getPkStorehouse() == null || - transferItemParam.getPkUnit() == null || - transferItemParam.getNnum() == null || transferItemParam.getNorigprice() == null || - CollectionUtil.isEmpty(transferItemParam.getScmItemSpecsList())) { - return Boolean.TRUE; - } - if(storehouseIdMap.containsKey(transferParam.getPkCountry())){ - List storehouseIdSet = storehouseIdMap.get(transferParam.getPkCountry()); - QueryStoreParam queryStoreParam = new QueryStoreParam(); - queryStoreParam.setPkCorp(transferParam.getPkCorp()); - queryStoreParam.setPkStorehouse(transferItemParam.getPkStorehouse()); - storehouseIdSet.add(queryStoreParam); - }else{ - List queryStoreParamList = new ArrayList<>(); - QueryStoreParam queryStoreParam = new QueryStoreParam(); - queryStoreParam.setPkCorp(transferParam.getPkCorp()); - queryStoreParam.setPkStorehouse(transferItemParam.getPkStorehouse()); - queryStoreParamList.add(queryStoreParam); - storehouseIdMap.put(transferParam.getPkCountry(), queryStoreParamList); - } - if(storehouseIdMap.containsKey(transferParam.getPkInCountry())){ - List storehouseIdSet = storehouseIdMap.get(transferParam.getPkInCountry()); - QueryStoreParam queryStoreParam = new QueryStoreParam(); - queryStoreParam.setPkCorp(transferParam.getPkInCorp()); - queryStoreParam.setPkStorehouse(transferItemParam.getPkInStorehouse()); - storehouseIdSet.add(queryStoreParam); - }else { - List queryStoreParamList = new ArrayList<>(); - QueryStoreParam queryStoreParam = new QueryStoreParam(); - queryStoreParam.setPkCorp(transferParam.getPkInCorp()); - queryStoreParam.setPkStorehouse(transferItemParam.getPkInStorehouse()); - queryStoreParamList.add(queryStoreParam); - storehouseIdMap.put(transferParam.getPkInCountry(), queryStoreParamList); - } - if (transferItemParam.getNtaxrate() == null) { - transferItemParam.setNtaxrate(BigDecimal.ZERO); - } - } - return Boolean.FALSE; - } - - /** - * 删除采购入库 - * - * @param pkId 主键 - */ - @DeleteMapping("/{pkId}") - @Log(module = EOperationModule.TRANSFER_ORDER, business = EOperationBusiness.TRANSFER_ORDER, method = EOperationMethod.DELETE) - public AjaxResult delete(@PathVariable Long pkId) { - // 验证是否存在订单，订单状态是否是保存状态 - if (pkId == null) { - return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.REQUIRED_NOT_EMPTY)); - } - // 验证订单状态 只有保存状态的采购订单可以进行修改 - TransferOrderExt transferOrderExt = transferOrderService.queryDisTransferOrderById(pkId, EScmOrderStatus.SAVE.getValue()); - if (transferOrderExt == null) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.TRANSFER_ORDER_NOT_EXIST)); - } - transferOrderService.deleteTransferOrder(pkId, SecurityUtils.getUserId()); - return AjaxResult.success(); - } - - /** - * 撤销订单并入库（走签呈），签呈页面点击确定按钮 - * - * @param scmApproveParam 参数 - */ - @PostMapping("/submit") - @Log(module = EOperationModule.TRANSFER_ORDER, business = EOperationBusiness.TRANSFER_ORDER, method = EOperationMethod.UPDATE) - public AjaxResult submitTransferOrder(@RequestBody ScmApproveParam scmApproveParam) { - scmApproveParam.setPkCountry(SecurityUtils.getPkCountry()); - if (scmApproveParam.getPkId() == null) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.TRANSFER_ORDER_NOT_EXIST)); - } - TransferOrderExt transferOrderExt = transferOrderService.queryDisTransferOrderById(scmApproveParam.getPkId(), EScmOrderStatus.SAVE.getValue()); - if (transferOrderExt == null) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.TRANSFER_ORDER_NOT_EXIST)); - } - // 验证该订单是否存在签呈，存在待审核的签呈不能再次发起 - List scmOrderApproveLogs = scmOrderApproveLogService.queryScmOrderApproveLogByCondition(scmApproveParam.getPkId(), EApprovalBusiness.TRANSFER_ORDER_APPROVE.getValue(), null); - if (CollectionUtil.isNotEmpty(scmOrderApproveLogs)) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.TRANSFER_ORDER_EXISTS_AGENT)); - } - transferOrderService.auditTransferOrderTransferOrderSubmit(scmApproveParam, userTokenService.getLoginUser()); - return AjaxResult.success(); - } -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/mapper/IcTransInBMapper.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/mapper/IcTransInBMapper.java deleted file mode 100644 index ef3bb426..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/mapper/IcTransInBMapper.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.hzs.scm.trans.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.scm.trans.IcTransInB; -import com.hzs.common.domain.scm.trans.ext.IcTransInBExt; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - *

- * 采购订单明细 Mapper 接口 - *

- * - * @author hzs - * @since 2023-12-04 - */ -public interface IcTransInBMapper extends BaseMapper { - - /* - * @description: 根据主表主键查询采购入库单明细 - * @author: sui q - * @date: 2023/11/25 15:02 - * @param: null null - **/ - List queryTransferInbByPk(@Param("orderType") Integer orderType, @Param("transInbList") List transInbList); - - /* - * @description: 删除入库单子表明细 - * @author: sui q - * @date: 2023/11/23 10:38 - * @param: null null - **/ - void deletePurchaseInbByList(@Param("transInbList") List transInbList); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/mapper/IcTransInHMapper.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/mapper/IcTransInHMapper.java deleted file mode 100644 index b16d1bb2..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/mapper/IcTransInHMapper.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.hzs.scm.trans.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.scm.trans.IcTransInH; -import com.hzs.common.domain.scm.trans.ext.IcTransInHExt; -import com.hzs.common.domain.scm.trans.ext.IcTransOutHExt; -import com.hzs.scm.trans.param.TransferItemParam; -import com.hzs.scm.trans.param.TransferParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - *

- * 调拨入库单表头 Mapper 接口 - *

- * - * @author hzs - * @since 2023-12-04 - */ -public interface IcTransInHMapper extends BaseMapper { - - /* - * @description: 根据主键查询其他入库、其他入库明细 - * @author: sui q - * @date: 2023/11/21 10:49 - * @param: null null - **/ - IcTransInHExt queryTransInById(@Param("pkId") Long pkId, @Param("orderStatus") Integer orderStatus); - - /* - * @description: 查询会员端显示的采购入库单 - * @author: sui q - * @date: 2023/11/25 9:55 - * @param: null null - **/ - List queryDisTransInExtByCondition(TransferParam transferParam); - - /* - * @description: 参照生成采购入库单，可能存在多个调拨订单生成一个入库单，支持1对多 多对1 - * @author: sui q - * @date: 2023/11/21 17:47 - * @param: null null - **/ - List queryTransInByOrderItems(@Param("orderItemsParamList") List orderItemsParamList); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/mapper/IcTransOutBMapper.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/mapper/IcTransOutBMapper.java deleted file mode 100644 index 933437af..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/mapper/IcTransOutBMapper.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.hzs.scm.trans.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.scm.trans.IcTransOutB; -import com.hzs.common.domain.scm.trans.ext.IcTransOutBExt; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - *

- * 调拨入库明细 Mapper 接口 - *

- * - * @author hzs - * @since 2023-12-04 - */ -public interface IcTransOutBMapper extends BaseMapper { - - /* - * @description: 根据主表主键查询采购入库单明细 - * @author: sui q - * @date: 2023/11/25 15:02 - * @param: null null - **/ - List queryTransferOutBiByPk(@Param("orderType") Integer orderType, @Param("transferOutBiExtList") List icTransferOutbExtList); - - /* - * @description: 删除订单明细 - * @author: sui q - * @date: 2023/11/21 14:23 - * @param: null null - **/ - void deleteTransferItemsByList(@Param("transferOutBiList") List icTransferOutbList, @Param("pkMember") Long pkMember); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/mapper/IcTransOutHMapper.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/mapper/IcTransOutHMapper.java deleted file mode 100644 index df4ee327..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/mapper/IcTransOutHMapper.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.hzs.scm.trans.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.scm.trans.IcTransOutH; -import com.hzs.common.domain.scm.trans.ext.IcTransOutHExt; -import com.hzs.common.domain.scm.trans.ext.TransferOrderExt; -import com.hzs.scm.trans.param.TransferItemParam; -import com.hzs.scm.trans.param.TransferParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - *

- * 调拨出库单表头 Mapper 接口 - *

- * - * @author hzs - * @since 2023-12-04 - */ -public interface IcTransOutHMapper extends BaseMapper { - - /* - * @description: 根据主键查询其他入库、其他入库明细 - * @author: sui q - * @date: 2023/11/21 10:49 - * @param: null null - **/ - IcTransOutHExt queryTransOutById(@Param("pkId") Long pkId, @Param("orderStatus") Integer orderStatus); - - /* - * @description: 查询待入库的调拨订单,第一条带明细表，其他的没有明细表 - * @author: sui q - * @date: 2023/11/23 13:53 - * @param: null null - **/ - List queryTransferOutToStoreByCondition(TransferParam transferParam); - - /* - * @description: 查询会员端显示的采购入库单 - * @author: sui q - * @date: 2023/11/25 9:55 - * @param: null null - **/ - List queryDisTransOutExtByCondition(TransferParam transferParam); - - /* - * @description: 参照生成采购入库单，可能存在多个调拨订单生成一个入库单，支持1对多 多对1 - * @author: sui q - * @date: 2023/11/21 17:47 - * @param: null null - **/ - List queryTransferOutByOrderItems(@Param("orderItemsParamList") List orderItemsParamList); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/mapper/TransferOrderItemsMapper.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/mapper/TransferOrderItemsMapper.java deleted file mode 100644 index 5abee752..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/mapper/TransferOrderItemsMapper.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.hzs.scm.trans.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.scm.po.PoOrderItems; -import com.hzs.common.domain.scm.purchase.ext.IcPurchaseInBExt; -import com.hzs.common.domain.scm.trans.TransferOrderItems; -import com.hzs.common.domain.scm.trans.ext.IcTransInBExt; -import com.hzs.common.domain.scm.trans.ext.IcTransOutBExt; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - *

- * 采购入库明细 Mapper 接口 - *

- * - * @author hzs - * @since 2023-12-04 - */ -public interface TransferOrderItemsMapper extends BaseMapper { - - /* - * @description: 查询采购订单明细 - * @author: sui q - * @date: 2023/11/23 14:17 - * @param: null null - **/ - List queryTransferOrderItemsByPk(@Param("pkCountry") Integer pkCountry, @Param("pkTransfer") Long pkTransfer); - - /* - * @description: 删除订单明细 - * @author: sui q - * @date: 2023/11/21 14:23 - * @param: null null - **/ - void deleteOrderItemsService(@Param("transferOrderItemsList") List transferOrderItemsList, @Param("pkMember") Long pkMember); - - /* - * @description: 根据入库数量更新累计入库数量 - * @author: sui q - * @date: 2023/11/25 17:23 - * @param: null null - **/ - void updateTransferOrderItemsTotalInNum(@Param("transferInbList") List transferInbList, @Param("pkMember") Long pkMember); - - /* - * @description: 根据入库数量更新累计入库数量 - * @author: sui q - * @date: 2023/11/25 17:23 - * @param: null null - **/ - void updateTransferOrderItemsTotalOutNum(@Param("transferOutBiList") List transferOutbList, @Param("pkMember") Long pkMember); - - /* - * @description: 根据入库数量更新累计入库数量 - * @author: sui q - * @date: 2023/11/25 17:23 - * @param: null null - **/ - void updateTransferOrderItemsTotalOutEnd(@Param("transferOutBiList") List transferOutbList); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/mapper/TransferOrderMapper.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/mapper/TransferOrderMapper.java deleted file mode 100644 index 993e6a3b..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/mapper/TransferOrderMapper.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.hzs.scm.trans.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.scm.po.ext.PoOrderExt; -import com.hzs.common.domain.scm.purchase.ext.IcPurchaseInBExt; -import com.hzs.common.domain.scm.trans.IcTransInB; -import com.hzs.common.domain.scm.trans.TransferOrder; -import com.hzs.common.domain.scm.trans.TransferOrderItems; -import com.hzs.common.domain.scm.trans.ext.IcTransInBExt; -import com.hzs.common.domain.scm.trans.ext.TransferOrderExt; -import com.hzs.scm.po.param.PoOrderItemsParam; -import com.hzs.scm.po.param.PoOrderParam; -import com.hzs.scm.trans.param.TransferItemParam; -import com.hzs.scm.trans.param.TransferParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - *

- * 调拨订单表头 Mapper 接口 - *

- * - * @author hzs - * @since 2023-12-04 - */ -public interface TransferOrderMapper extends BaseMapper { - - /* - * @description: 根据主键查询调拨订单、调拨订单明细 - * @author: sui q - * @date: 2023/11/21 10:49 - * @param: null null - **/ - TransferOrderExt queryTransferOrderById(@Param("pkTransfer") Long pkTransfer, @Param("orderStatus") Integer orderStatus); - - /* - * @description: 根据查询条件查询调拨订单 - * @author: sui q - * @date: 2023/11/21 15:01 - * @param: null null - **/ - List queryTransferOrderByCondition(TransferParam transferParam); - - /* - * @description: 参照生成调拨入库单，可能存在多个调拨订单生成一个入库单，支持1对多 多对1 - * @author: sui q - * @date: 2023/11/21 17:47 - * @param: null null - **/ - List queryTransferOrderByOrderItems(@Param("orderItemsParamList") List orderItemsParamList); - - /* - * @description: 查询待入库的调拨订单 - * @author: sui q - * @date: 2023/11/23 13:53 - * @param: null null - **/ - List queryTransferOrderToStoreByCondition(TransferParam transferParam); - - /* - * @description: 采购入库时回写采购订单主表状态 - * @author: sui q - * @date: 2023/11/27 13:39 - * @param: null null - **/ - void updateTransferOrderStatusByTrans(@Param("transferInbList") List transferInbList, @Param("pkMember") Long pkMember, - @Param("orderStatus") Integer orderStatus); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/param/QueryStoreParam.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/param/QueryStoreParam.java deleted file mode 100644 index 2eb4893c..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/param/QueryStoreParam.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.hzs.scm.trans.param; - -import lombok.Data; - -import java.io.Serializable; - -/** - * @description: 验证仓库 - * @author: sui q - * @time: 2024/1/9 11:43 - * @classname: QueryStoreParam - * @package_name: com.hzs.scm.pub.param - * version 1.0.0 - */ -@Data -public class QueryStoreParam implements Serializable { - - /** - * 库存公司 - */ - private Integer pkCorp; - - /** - * 仓库主键 - */ - private Integer pkStorehouse; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/param/TransferItemParam.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/param/TransferItemParam.java deleted file mode 100644 index af680548..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/param/TransferItemParam.java +++ /dev/null @@ -1,152 +0,0 @@ -package com.hzs.scm.trans.param; - -import com.hzs.scm.pub.param.ItemSpecsParam; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -/** - * @description: 调拨单明细 - * @author: sui q - * @time: 2023/12/4 11:42 - * @classname: TransferItemParam - * @package_name: com.hzs.scm.trans.param - * version 1.0.0 - */ -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class TransferItemParam implements Serializable { - - /** - * 主键 - */ - private Long pkId; - - /** - * 调拨订单主表主键 - */ - private Long pkTransfer; - - /** - * 调拨订单明细主键 - */ - private Long pkTransferItems; - - /** - * 调拨出库主键 - */ - private Long pkTransferOut; - - /** - * 调拨出库明细主键 - */ - private Long pkTransferOutB; - - /** - * 产品基础信息主键 - */ - private Integer pkProductBas; - - /** - * 入库日期 - */ - private Date bizDate; - - /** - * 单位 - */ - private Integer pkUnit; - - /** - * 计划出库日期 - */ - private Date planDate; - - /** - * 仓库 - */ - private Integer pkStorehouse; - - /** - * 调入仓库 - */ - private Integer pkInStorehouse; - - /** - * 调出仓库 - */ - private Integer pkOutStorehouse; - - /** - * 供应商 - */ - private Integer pkCubasdoc; - - /** - * 客户 - */ - private Integer pkCustomer; - - /** - * 数量 - */ - private BigDecimal nnum; - - /** - * 无税单价 - */ - private BigDecimal norigprice; - - /** - * 税率 - */ - private BigDecimal ntaxrate; - - /** - * 批次主键 - */ - private Long pkBatchCode; - - /** - * 货位 - */ - private Integer pkClocation; - - /** - * 产品信息主键 - */ - private Integer pkProduct; - - /** - * 计划到货日期 - */ - private Date planArriveDate; - - /** - * 调入公司 - */ - private Integer pkInCorp; - - /** - * 库存公司 - */ - private Integer pkCorp; - - /** - * 调入国家 - */ - private Integer pkInCountry; - - /** - * 明细表规格明细 - */ - private List scmItemSpecsList; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/param/TransferParam.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/param/TransferParam.java deleted file mode 100644 index 57c9ae7d..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/param/TransferParam.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.hzs.scm.trans.param; - -import com.hzs.scm.pub.param.ScmPubParam; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.List; - -/** - * @description: 调拨单参数 - * @author: sui q - * @time: 2023/12/4 11:02 - * @classname: TransferParam - * @package_name: com.hzs.scm.trans.param - * version 1.0.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class TransferParam extends ScmPubParam { - - /** - * 调入公司 - */ - private Integer pkInCorp; - - /** - * 调出公司 - */ - private Integer pkOutCorp; - - /** - * 调入国家 - */ - private Integer pkInCountry; - - /** - * 调出国家 - */ - private Integer pkOutCountry; - - /** - * 调拨方式 1=公司内调拨 2=公司间调拨 3=国家间调拨 - */ - private Integer transType; - - - private List transferItemParamList; - -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/IIcTransInBService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/IIcTransInBService.java deleted file mode 100644 index 7cd20d0b..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/IIcTransInBService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.hzs.scm.trans.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.scm.trans.IcTransInB; -import com.hzs.common.domain.scm.trans.ext.IcTransInBExt; - -import java.util.List; - -/** - *

- * 采购订单明细 服务类 - *

- * - * @author hzs - * @since 2023-12-04 - */ -public interface IIcTransInBService extends IService { - - /* - * @description: 根据主表主键查询采购入库单明细 - * @author: sui q - * @date: 2023/11/25 15:02 - * @param: null null - **/ - List queryTransferInbByPk(Integer orderType, List transInbList); - - /* - * @description: 删除入库单子表明细 - * @author: sui q - * @date: 2023/11/23 10:38 - * @param: null null - **/ - void deleteTransferInbByList(List transInbList); - - /* - * @description: 删除入库单子表明细 - * @author: sui q - * @date: 2023/11/23 10:38 - * @param: null null - **/ - void deleteTransferInbByPkPurchase(Long pkTransfer, Long pkMember); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/IIcTransInHService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/IIcTransInHService.java deleted file mode 100644 index 4f0bf471..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/IIcTransInHService.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.hzs.scm.trans.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.scm.trans.IcTransInH; -import com.hzs.common.domain.scm.trans.ext.IcTransInHExt; -import com.hzs.common.domain.scm.trans.ext.IcTransOutHExt; -import com.hzs.common.domain.scm.trans.ext.TransferOrderExt; -import com.hzs.scm.pub.param.ScmApproveParam; -import com.hzs.scm.trans.param.TransferParam; -import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; -import com.hzs.system.sys.dto.LoginUser; - -import java.util.List; - -/** - *

- * 调拨入库单表头 服务类 - *

- * - * @author hzs - * @since 2023-12-04 - */ -public interface IIcTransInHService extends IService { - - /* - * @description: 新增保存采购入库单 - * @author: sui q - * @date: 2023/11/22 9:56 - * @param: null null - **/ - void insertSaveTransferInByTransferOrder(List transOutExtList, TransferParam transferParam, Long pkMember); - - /* - * @description: 修改保存采购入库单 - * @author: sui q - * @date: 2023/11/23 9:10 - * @param: null null - **/ - void updateSaveTransferInByPoOrder(List transOutExtList, IcTransInHExt transInExt, - TransferParam transferParam, Long pkMember); - - /* - * @description: 根据主键删除采购入库单，只有保存的可以删除 - * @author: sui q - * @date: 2023/11/23 11:22 - * @param: null null - **/ - void deleteTransferInByPk(Long pkTransferIn, Long pkMember); - - /* - * @description: 提交采购入库单（走审批） - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - void auditTransferInByPoOrderSubmit(ScmApproveParam scmApproveParam, LoginUser loginUser); - - /* - * @description: 审核通过采购入库单 - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - String auditTransferInByPoOrderAgree(ApprovalBusinessResultDTO approvalBusinessResultDTO); - - /* - * @description: 审核驳回采购入库单 - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - String auditTransferInByPoOrderReject(ApprovalBusinessResultDTO approvalBusinessResultDTO); - - /* - * @description: 根据主键查询入库单 - * @author: sui q - * @date: 2023/11/24 13:52 - * @param: null null - **/ - IcTransInHExt queryTransferInInhExtById(Long pkId, Integer orderStatus, Integer pkCountry); - - /* - * @description: 查询会员端显示的采购入库单 - * @author: sui q - * @date: 2023/11/25 9:55 - * @param: null null - **/ - IcTransInHExt queryDisTransferInInhExtById(Long pkId, Integer orderStatus); - - /* - * @description: 查询列表 - * @author: sui q - * @date: 2023/11/28 15:48 - * @param: null null - **/ - List queryDisTransferInInExtByCondition(TransferParam transferParam); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/IIcTransOutBService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/IIcTransOutBService.java deleted file mode 100644 index e03095a3..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/IIcTransOutBService.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.hzs.scm.trans.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.scm.trans.IcTransOutB; -import com.hzs.common.domain.scm.trans.ext.IcTransOutBExt; - -import java.util.List; - -/** - *

- * 调拨入库明细 服务类 - *

- * - * @author hzs - * @since 2023-12-04 - */ -public interface IIcTransOutBService extends IService { - /* - * @description: 根据主表主键查询采购入库单明细 - * @author: sui q - * @date: 2023/11/25 15:02 - * @param: null null - **/ - List queryTransferOutBiByPk(Integer orderType, List icTransferOutbExtList); - - /* - * @description: 删除订单明细 - * @author: sui q - * @date: 2023/11/21 14:23 - * @param: null null - **/ - void deleteTransferItemsByList(List icTransferOutbList, Long pkMember); - - /* - * @description: 删除采购入库单明细，根据订单主键 - * @author: sui q - * @date: 2023/11/21 14:55 - * @param: null null - **/ - void deleteTransferItemsByPkTransfer(Long pkTransfer, Long pkMember); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/IIcTransOutHService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/IIcTransOutHService.java deleted file mode 100644 index 7bc77688..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/IIcTransOutHService.java +++ /dev/null @@ -1,112 +0,0 @@ -package com.hzs.scm.trans.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.scm.trans.IcTransOutH; -import com.hzs.common.domain.scm.trans.ext.IcTransOutHExt; -import com.hzs.common.domain.scm.trans.ext.TransferOrderExt; -import com.hzs.scm.pub.param.ScmApproveParam; -import com.hzs.scm.trans.param.TransferItemParam; -import com.hzs.scm.trans.param.TransferParam; -import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; -import com.hzs.system.sys.dto.LoginUser; - -import java.util.List; - -/** - *

- * 调拨出库单表头 服务类 - *

- * - * @author hzs - * @since 2023-12-04 - */ -public interface IIcTransOutHService extends IService { - /* - * @description: 保存其他入库 - * @author: sui q - * @date: 2023/11/20 15:54 - * @param: null null - **/ - void insertTransferOutByTransferParam(List transferOrderList, TransferParam transferParam, Long pkMember); - - /* - * @description: 修改保存其他入库 - * @author: sui q - * @date: 2023/11/21 11:51 - * @param: null null - **/ - void updateTransferOutByTransferParam(List transferOrderList, IcTransOutHExt transferOutExt, TransferParam poOrderParam, Long pkMember); - - /* - * @description: 根据订单主键查询其他入库 - * @author: sui q - * @date: 2023/11/21 10:47 - * @param: null null - **/ - IcTransOutHExt queryTransferOutById(Long pkId, Integer orderStatus); - - /* - * @description: 查询会员端显示的调拨出库单 - * @author: sui q - * @date: 2023/11/25 9:55 - * @param: null null - **/ - IcTransOutHExt queryDisTransferOutExtById(Long pkId, Integer orderStatus); - - /* - * @description: 查询待入库的调拨订单,第一条带明细表，其他的没有明细表 - * @author: sui q - * @date: 2023/11/23 13:53 - * @param: null null - **/ - List queryTransferOutToStoreByCondition(TransferParam transferParam); - - /* - * @description: 查询会员端显示的调拨出库单 - * @author: sui q - * @date: 2023/11/25 9:55 - * @param: null null - **/ - List queryDisTransferOutExtCondition(TransferParam transferParam); - - /* - * @description: 删除采购订单 - * @author: sui q - * @date: 2023/11/21 14:54 - * @param: null null - **/ - void deleteTransferOut(Long pkId, Long pkMember); - - /* - * @description: 提交采购订单（走审批） - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - void auditTransferOutByApproveParamSubmit(IcTransOutHExt transOutHExt, ScmApproveParam scmApproveParam, LoginUser loginUser); - - /* - * @description: 审核通过采购订单 - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - String auditTransferOutByApproveParamAgree(ApprovalBusinessResultDTO approvalBusinessResultDTO); - - /* - * @description: 审核驳回采购订单 - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - String auditTransferOutByApproveParamReject(ApprovalBusinessResultDTO approvalBusinessResultDTO); - - - /* - * @description: 参照生成调拨出库单，可能存在多个调拨订单生成一个入库单，支持1对多 多对1 - * @author: sui q - * @date: 2023/11/21 17:47 - * @param: null null - **/ - List queryTransferOutByOrderItems(List orderItemsParamList); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/ITransferOrderItemsService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/ITransferOrderItemsService.java deleted file mode 100644 index db9ed043..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/ITransferOrderItemsService.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.hzs.scm.trans.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.scm.purchase.ext.IcPurchaseInBExt; -import com.hzs.common.domain.scm.trans.TransferOrderItems; -import com.hzs.common.domain.scm.trans.ext.IcTransInBExt; -import com.hzs.common.domain.scm.trans.ext.IcTransOutBExt; - -import java.util.List; - -/** - *

- * 采购入库明细 服务类 - *

- * - * @author hzs - * @since 2023-12-04 - */ -public interface ITransferOrderItemsService extends IService { - - /* - * @description: 删除订单明细 - * @author: sui q - * @date: 2023/11/21 14:23 - * @param: null null - **/ - void deleteTransferOrderItemsService(List transferOrderItemsList, Long pkMember); - - /* - * @description: 删除订单明细，根据订单主键 - * @author: sui q - * @date: 2023/11/21 14:55 - * @param: null null - **/ - void deleteTransferOrderItemsByPkOrder(Long pkTransfer, Long pkMember); - - /* - * @description: 查询采购订单明细 - * @author: sui q - * @date: 2023/11/23 14:17 - * @param: null null - **/ - List queryTransferOrderItemsByPk(Integer pkCountry, Long pkOrder); - - /* - * @description: 查询明细表明细 - * @author: sui q - * @date: 2023/11/25 17:39 - * @param: null null - **/ - List queryTransferOrderItemsByList(List idList); - - /* - * @description: 根据入库数量更新累计入库数量 - * @author: sui q - * @date: 2023/11/25 17:23 - * @param: null null - **/ - void updateTransferOrderItemsTotalInNum(List transferInbList, Long pkMember); - - /* - * @description: 根据入库数量更新累计入库数量 - * @author: sui q - * @date: 2023/11/25 17:23 - * @param: null null - **/ - void updateTransferOrderItemsTotalOutNum(List transferOutbList, Long pkMember); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/ITransferOrderService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/ITransferOrderService.java deleted file mode 100644 index fa15f289..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/ITransferOrderService.java +++ /dev/null @@ -1,129 +0,0 @@ -package com.hzs.scm.trans.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.scm.trans.TransferOrder; -import com.hzs.common.domain.scm.trans.ext.IcTransInBExt; -import com.hzs.common.domain.scm.trans.ext.IcTransOutBExt; -import com.hzs.common.domain.scm.trans.ext.TransferOrderExt; -import com.hzs.scm.pub.param.ScmApproveParam; -import com.hzs.scm.trans.param.TransferItemParam; -import com.hzs.scm.trans.param.TransferParam; -import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; -import com.hzs.system.sys.dto.LoginUser; - -import java.util.List; - -/** - *

- * 调拨订单表头 服务类 - *

- * - * @author hzs - * @since 2023-12-04 - */ -public interface ITransferOrderService extends IService { - - /* - * @description: 保存调拨订单 - * @author: sui q - * @date: 2023/11/20 15:54 - * @param: null null - **/ - void insertSaveTransferOrderByOrderParam(TransferParam transferParam, Long pkMember); - - /* - * @description: 修改保存调拨订单 - * @author: sui q - * @date: 2023/11/21 11:51 - * @param: null null - **/ - void updateTransferOrderByOrderParam(TransferOrderExt transferOrderExt, TransferParam transferParam, Long pkMember); - - /* - * @description: 根据订单主键查询调拨订单 - * @author: sui q - * @date: 2023/11/21 10:47 - * @param: null null - **/ - TransferOrderExt queryTransferOrderById(Long pkOrder, Integer orderStatus); - - /* - * @description: 查询签呈显示的调拨订单 - * @author: sui q - * @date: 2023/11/28 15:00 - * @param: null null - **/ - TransferOrderExt queryDisTransferOrderById(Long pkOrder, Integer orderStatus); - - /* - * @description: 根据查询条件查询调拨订单 - * @author: sui q - * @date: 2023/11/21 15:01 - * @param: null null - **/ - List queryTransferOrderByCondition(TransferParam transferParam); - - /* - * @description: 删除调拨订单 - * @author: sui q - * @date: 2023/11/21 14:54 - * @param: null null - **/ - void deleteTransferOrder(Long pkTransfer, Long pkMember); - - /* - * @description: 参照生成采购入库单，可能存在多个调拨订单生成一个入库单，支持1对多 多对1 - * @author: sui q - * @date: 2023/11/21 17:47 - * @param: null null - **/ - List queryTransferOrderByOrderItems(List orderItemsParamList); - - /* - * @description: 查询待入库的调拨订单,第一条带明细表，其他的没有明细表 - * @author: sui q - * @date: 2023/11/23 13:53 - * @param: null null - **/ - List queryTransferOrderToStoreByCondition(TransferParam transferParam); - - /* - * @description: 提交调拨订单（走审批） - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - void auditTransferOrderTransferOrderSubmit(ScmApproveParam scmApproveParam, LoginUser loginUser); - - /* - * @description: 审核通过调拨订单 - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - String auditTransferOrderTransferOrderAgree(ApprovalBusinessResultDTO approvalBusinessResultDTO); - - /* - * @description: 审核驳回调拨订单 - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - String auditTransferOrderByTransferOrderReject(ApprovalBusinessResultDTO approvalBusinessResultDTO); - - /* - * @description: 根据入库数量更新累计入库数量 - * @author: sui q - * @date: 2023/11/25 17:23 - * @param: null null - **/ - void updateTransferOrderItemsTotalInNum(List transferInbList, Long pkMember); - - /* - * @description: 根据入库数量更新累计入库数量 - * @author: sui q - * @date: 2023/11/25 17:23 - * @param: null null - **/ - void updateTransferOrderItemsTotalOutNum(List transferOutbList, Long pkMember); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/impl/IcTransInBServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/impl/IcTransInBServiceImpl.java deleted file mode 100644 index 5af0b7be..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/impl/IcTransInBServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.hzs.scm.trans.service.impl; - -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.constant.ScmFieldConstants; -import com.hzs.common.core.constant.SystemFieldConstants; -import com.hzs.common.core.enums.EYesNo; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.domain.scm.trans.IcTransInB; -import com.hzs.common.domain.scm.trans.ext.IcTransInBExt; -import com.hzs.scm.trans.mapper.IcTransInBMapper; -import com.hzs.scm.trans.service.IIcTransInBService; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - *

- * 采购订单明细 服务实现类 - *

- * - * @author hzs - * @since 2023-12-04 - */ -@Service -public class IcTransInBServiceImpl extends ServiceImpl implements IIcTransInBService { - - @Override - public List queryTransferInbByPk(Integer orderType, List transInbList) { - return baseMapper.queryTransferInbByPk(orderType, transInbList); - } - - @Override - public void deleteTransferInbByList(List transInbList) { - baseMapper.deletePurchaseInbByList(transInbList); - } - - @Override - public void deleteTransferInbByPkPurchase(Long pkTransfer, Long pkMember) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.set(SystemFieldConstants.DEL_FLAG, EYesNo.NO.getIntValue()); - updateWrapper.set(SystemFieldConstants.PK_MODIFIED, pkMember); - updateWrapper.set(SystemFieldConstants.MODIFIED_TIME, DateUtils.currentDateTime()); - updateWrapper.eq(ScmFieldConstants.PK_TRANSFER_IN, pkTransfer); - update(updateWrapper); - } -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/impl/IcTransInHServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/impl/IcTransInHServiceImpl.java deleted file mode 100644 index 36dbfef8..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/impl/IcTransInHServiceImpl.java +++ /dev/null @@ -1,391 +0,0 @@ -package com.hzs.scm.trans.service.impl; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.constant.CacheConstants; -import com.hzs.common.core.constant.SaOrderFieldConstants; -import com.hzs.common.core.constant.SystemFieldConstants; -import com.hzs.common.core.constant.msg.DocumentMsgConstants; -import com.hzs.common.core.constant.msg.ScmMsgConstants; -import com.hzs.common.core.enums.*; -import com.hzs.common.core.service.RedisService; -import com.hzs.common.core.utils.ComputeUtil; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.domain.scm.pub.ScmItemSpecs; -import com.hzs.common.domain.scm.pub.ScmOrderApproveLog; -import com.hzs.common.domain.scm.trans.IcTransInB; -import com.hzs.common.domain.scm.trans.IcTransInH; -import com.hzs.common.domain.scm.trans.TransferOrder; -import com.hzs.common.domain.scm.trans.TransferOrderItems; -import com.hzs.common.domain.scm.trans.ext.*; -import com.hzs.common.domain.system.sys.SysUser; -import com.hzs.common.util.TransactionUtils; -import com.hzs.scm.ic.service.IIcOnHandNumService; -import com.hzs.scm.no.service.IScmBillNoService; -import com.hzs.scm.pub.component.ScmPubUtilTool; -import com.hzs.scm.pub.param.ScmApproveParam; -import com.hzs.scm.pub.service.IScmItemSpecsService; -import com.hzs.scm.pub.service.IScmOrderApproveLogService; -; -import com.hzs.scm.trans.mapper.IcTransInHMapper; -import com.hzs.scm.trans.param.TransferItemParam; -import com.hzs.scm.trans.param.TransferParam; -import com.hzs.scm.trans.service.IIcTransInBService; -import com.hzs.scm.trans.service.IIcTransInHService; -import com.hzs.scm.trans.service.ITransferOrderService; -import com.hzs.system.base.ICurrencyServiceApi; -import com.hzs.system.base.dto.CurrencyDTO; -import com.hzs.system.sys.IApprovalServiceApi; -import com.hzs.system.sys.IUserServiceApi; -import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; -import com.hzs.system.sys.dto.LoginUser; -import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.math.BigDecimal; -import java.time.temporal.ChronoUnit; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; - -/** - *

- * 调拨入库单表头 服务实现类 - *

- * - * @author hzs - * @since 2023-12-04 - */ -@Service -public class IcTransInHServiceImpl extends ServiceImpl implements IIcTransInHService { - - @DubboReference - private ICurrencyServiceApi currencyServiceApi; - - @DubboReference - private IUserServiceApi userServiceApi; - - @Autowired - private RedisService redisService; - - @Autowired - private IScmBillNoService scmBillNoService; - - @Autowired - private IScmItemSpecsService scmItemSpecsService; - - @Autowired - private IIcTransInBService transInbService; - - @Autowired - private IIcOnHandNumService icOnHandNumService; - - @Autowired - private IScmOrderApproveLogService scmOrderApproveLogService; - - @Autowired - private ITransferOrderService transferOrderService; - - @Override - @Transactional(rollbackFor = Exception.class) - public void insertSaveTransferInByTransferOrder(List transOutExtList, TransferParam transferParam, Long pkMember) { - // 根据调拨订单封装调拨入库单 - // 入库单表头 - Date date = DateUtils.currentDateTime(); - // 入库单表头 - IcTransInH icTransInH = packageTransferIn(transOutExtList.get(0), transferParam, date, pkMember); - // 入库单表体 - List transInbList = packageTransferInB(transferParam, date, pkMember, icTransInH); - // 保存主表 - save(icTransInH); - // 保存明细表 - for (IcTransInB icTransInB : transInbList) { - icTransInB.setPkTransferIn(icTransInH.getPkId()); - } - transInbService.saveBatch(transInbList); - saveScmItemSpecs(pkMember, icTransInH, transInbList, transOutExtList); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void updateSaveTransferInByPoOrder(List transOutExtList, IcTransInHExt transInExt, TransferParam transferParam, Long pkMember) { - // 更新规格明细表，先删除在新增 根据主表主键删除 - scmItemSpecsService.deleteItemSpecsById(EScmOrderType.TRANS_IN.getValue(), transferParam.getPkId(), pkMember); - Date date = DateUtils.currentDateTime(); - // 入库单表头 - IcTransInH icTransInH = packageTransferIn(transOutExtList.get(0), transferParam, date, pkMember); - // 入库单表体 - List transInbList = packageTransferInB(transferParam, date, pkMember, icTransInH); - // merge 对入库单表体进行 icPurchaseInbList 修改或新增 查询出删除的、 - List insertTransInbList = new ArrayList<>(); - List updateTransInbList = new ArrayList<>(); - List updateIdList = new ArrayList<>(); - transInbList.forEach(transInB -> { - if (transInB.getPkId() != null) { - updateIdList.add(transInB.getPkId()); - updateTransInbList.add(transInB); - } else { - transInB.setPkTransferIn(transInExt.getPkId()); - insertTransInbList.add(transInB); - } - }); - List delTransInb = new ArrayList<>(); - for (IcTransInB icPurchaseInB : transInExt.getTransInbExtList()) { - if (!updateIdList.contains(icPurchaseInB.getPkId())) { - icPurchaseInB.setPkModified(pkMember); - delTransInb.add(icPurchaseInB); - } - } - List transOrderKeyList = new ArrayList<>(); - String transInKey = CacheConstants.TRANSFER_IN_LOCK + transInExt.getPkId(); - try { - // 加锁 调拨订单加锁，调拨入库单加锁，调拨订单同时只能被一个人操作 - for (IcTransOutHExt transOutExt : transOutExtList) { - transOrderKeyList.add(CacheConstants.TRANSFER_OUT_LOCK + transOutExt.getPkId()); - } - if (!redisService.lockKeyByList(transOrderKeyList)) { - throw new RuntimeException(ScmMsgConstants.BILL_NOT_OPERATION); - } - if (!redisService.lockKeyOnce(transInKey)) { - throw new RuntimeException(ScmMsgConstants.BILL_NOT_OPERATION); - } - // 删除明细 - if (delTransInb.size() > 0) { - transInbService.deleteTransferInbByList(delTransInb); - } - if (insertTransInbList.size() > 0) { - transInbService.saveBatch(insertTransInbList); - } - if (updateTransInbList.size() > 0) { - updateTransInbList.forEach(purchaseInb -> - transInbService.updateById(purchaseInb)); - } - saveScmItemSpecs(pkMember, icTransInH, transInbList, transOutExtList); - icTransInH.setPkCreator(transInExt.getPkCreator()); - // 更新入库单表 - updateById(icTransInH); - } finally { - redisService.unlockByList(transOrderKeyList); - redisService.unlock(transInKey); - } - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteTransferInByPk(Long pkTransferIn, Long pkMember) { - String transferInLock = CacheConstants.TRANSFER_IN_LOCK + pkTransferIn; - try { - if (!redisService.lockKeyOnce(transferInLock)) { - throw new RuntimeException(ScmMsgConstants.BILL_NOT_OPERATION); - } - // 删除规格明细表 - scmItemSpecsService.deleteItemSpecsById(EScmOrderType.TRANS_IN.getValue(), pkTransferIn, pkMember); - // 删除明细表 - transInbService.deleteTransferInbByPkPurchase(pkTransferIn, pkMember); - // 删除主表 - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.set(SystemFieldConstants.DEL_FLAG, EYesNo.NO.getIntValue()); - updateWrapper.set(SystemFieldConstants.PK_MODIFIED, pkMember); - updateWrapper.set(SystemFieldConstants.MODIFIED_TIME, DateUtils.currentDateTime()); - updateWrapper.eq(SystemFieldConstants.PK_ID, pkTransferIn); - update(updateWrapper); - } catch (Exception e) { - e.printStackTrace(); - } finally { - redisService.unlock(transferInLock); - } - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void auditTransferInByPoOrderSubmit(ScmApproveParam scmApproveParam, LoginUser loginUser) { - // 更新单据状态 - updateTransferInStatus(scmApproveParam.getPkId(), loginUser, EScmOrderStatus.SUBMIT.getValue()); - scmOrderApproveLogService.submitOrder(scmApproveParam, EApprovalBusiness.TRANSFER_IN_APPROVE, EOrderPrefix.TR_TRANS_IN_CODE, loginUser); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public String auditTransferInByPoOrderAgree(ApprovalBusinessResultDTO approvalBusinessResultDTO) { - return approveTransferInBytStatus(approvalBusinessResultDTO, EScmOrderStatus.APPROVE.getValue(), EAgentApprovalStatus.APPROVED.getValue()); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public String auditTransferInByPoOrderReject(ApprovalBusinessResultDTO approvalBusinessResultDTO) { - return approveTransferInBytStatus(approvalBusinessResultDTO, EScmOrderStatus.SAVE.getValue(), EAgentApprovalStatus.REFUSE.getValue()); - } - - @Override - public IcTransInHExt queryTransferInInhExtById(Long pkId, Integer orderStatus, Integer pkCountry) { - TransferParam transferParam = new TransferParam(); - transferParam.setPkId(pkId); - transferParam.setOrderStatus(orderStatus); - List transInExtList = baseMapper.queryDisTransInExtByCondition(transferParam); - if (CollectionUtil.isNotEmpty(transInExtList)) { - return transInExtList.get(0); - } - return null; - } - - @Override - public IcTransInHExt queryDisTransferInInhExtById(Long pkId, Integer orderStatus) { - return baseMapper.queryTransInById(pkId, orderStatus); - } - - @Override - public List queryDisTransferInInExtByCondition(TransferParam transferParam) { - if (transferParam.getEndDate() != null) { - transferParam.setEndDate(DateUtils.afterDate(1, ChronoUnit.DAYS, transferParam.getEndDate())); - } - return baseMapper.queryDisTransInExtByCondition(transferParam); - } - - private IcTransInH packageTransferIn(IcTransOutHExt transOutExt, TransferParam transferParam, Date date, Long pkMember) { - SysUser sysUser = userServiceApi.selectUserById(pkMember).getData(); - // 根据登录账号获得部门 - IcTransInH transInH = IcTransInH.builder() - .pkDept(sysUser.getPkDept().intValue()) - .pkWhsmanager(pkMember) - .orderCode(scmBillNoService.createScmBillNoByOrderType(EScmOrderType.TRANS_IN.getValue())) - .orderDate(transferParam.getOrderDate()) - .pkCorp(transOutExt.getPkInCorp()) - .pkOutCorp(transOutExt.getPkCorp()) - .pkOutCountry(transOutExt.getPkCountry()) - .orderStatus(EScmOrderStatus.SAVE.getValue()) - .remark(transferParam.getRemark()) - .build(); - if (transferParam.getPkId() == null) { - transInH.setPkCreator(pkMember); - } else { - transInH.setPkId(transferParam.getPkId()); - transInH.setModifiedTime(date); - transInH.setPkModified(pkMember); - } - transInH.setPkCountry(transferParam.getPkCountry()); - return transInH; - } - - private List packageTransferInB(TransferParam transferParam, Date date, Long pkMember, IcTransInH icTransInH) { - List transInbList = new ArrayList<>(); - // 根据国家获得汇率 - CurrencyDTO currencyDTO = currencyServiceApi.getCurrency(transferParam.getPkCountry()).getData(); - BigDecimal totalNum = BigDecimal.ZERO; - for (TransferItemParam transferItemParam : transferParam.getTransferItemParamList()) { - IcTransInB icTransInB = BeanUtil.copyProperties(transferItemParam, IcTransInB.class); - icTransInB.setPkTransferOut(transferItemParam.getPkTransferOut()); - icTransInB.setPkTransferOutB(transferItemParam.getPkTransferOutB()); - // 无税金额 = 无税单价*数量 - icTransInB.setNorigmny(ComputeUtil.computeMultiply(transferItemParam.getNorigprice(), transferItemParam.getNnum())); - // 含税单价 = 无税单价*（1+税率） - icTransInB.setNorigtaxprice(ComputeUtil.computeMultiply(transferItemParam.getNorigprice(), - ComputeUtil.computeAdd(BigDecimal.ONE, ComputeUtil.computeMultiply(transferItemParam.getNtaxrate(), BigDecimal.valueOf(0.01))))); - // 税额 =无税单价*税率*数量 - icTransInB.setNtax(ComputeUtil.computeMultiply(ComputeUtil.computeBonusMultiply(transferItemParam.getNorigprice(), transferItemParam.getNtaxrate()), transferItemParam.getNnum())); - // 价税合计 含税单价*数量 - icTransInB.setNorigtaxmny(ComputeUtil.computeMultiply(icTransInB.getNorigtaxprice(), transferItemParam.getNnum())); - icTransInB.setPkRate(currencyDTO.getPkId()); - totalNum = ComputeUtil.computeAdd(totalNum, icTransInB.getNnum()); - if (icTransInB.getPkId() == null) { - icTransInB.setPkCreator(pkMember); - } else { - icTransInB.setPkTransferIn(icTransInH.getPkId()); - icTransInB.setModifiedTime(date); - icTransInB.setPkModified(pkMember); - } - icTransInB.setPkBatchCode(transferItemParam.getPkBatchCode()); - icTransInB.setPkCountry(transferParam.getPkCountry()); - transInbList.add(icTransInB); - } - icTransInH.setTotalNum(totalNum); - return transInbList; - } - - private void saveScmItemSpecs(Long pkMember, IcTransInH icTransInH, List transInbList, List transOutExtList) { - // 封装明细表对应的规格 - Map> itemSpecsMap = packageItemSpecsMap(transOutExtList); - List saveScmItemSpecsList = new ArrayList<>(); - for (IcTransInB icTransInB : transInbList) { - if (itemSpecsMap.containsKey(icTransInB.getPkTransferOutB())) { - List itemSpecsList = itemSpecsMap.get(icTransInB.getPkTransferOutB()); - scmItemSpecsService.packageScmItemSpecsList(itemSpecsList, pkMember, - icTransInH.getPkId(), icTransInB.getPkId(), EScmOrderType.TRANS_IN.getValue()); - saveScmItemSpecsList.addAll(itemSpecsList); - } - } - // 保存订单明细规格 - if (saveScmItemSpecsList.size() == 0) { - throw new RuntimeException(ScmMsgConstants.SOURCE_BILL_EXIST_SPECS); - } - scmItemSpecsService.saveBatch(saveScmItemSpecsList); - } - - /* - * @description: 调拨出库单对应的规格 - * @author: sui q - * @date: 2023/11/24 11:21 - * @param: null null - **/ - private Map> packageItemSpecsMap(List transOutExtList) { - List scmItemSpecsList = new ArrayList<>(); - for (IcTransOutHExt transOutExt : transOutExtList) { - for (IcTransOutBExt transOutBiExt : transOutExt.getTransOutbExtList()) { - ScmItemSpecs scmItemSpecs = ScmItemSpecs.builder() - .pkOrder(transOutExt.getPkId()) - .pkOrderItems(transOutBiExt.getPkId()) - .build(); - scmItemSpecsList.add(scmItemSpecs); - } - } - return scmItemSpecsService.queryScmItemSpecsByCondition(EScmOrderType.TRANS_OUT.getValue(), scmItemSpecsList); - } - - private void updateTransferInStatus(Long pkId, LoginUser loginUser, Integer orderStatus) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.set(SaOrderFieldConstants.ORDER_STATUS, orderStatus); - updateWrapper.set(SystemFieldConstants.PK_MODIFIED, loginUser.getUserId()); - updateWrapper.set(SystemFieldConstants.MODIFIED_TIME, DateUtils.currentDateTime()); - updateWrapper.eq(SystemFieldConstants.PK_ID, pkId); - update(updateWrapper); - } - - private String approveTransferInBytStatus(ApprovalBusinessResultDTO approvalBusinessResultDTO, Integer scmOrderStatus, Integer approveStatus) { - try { - // 查询订单日志表 - List scmOrderApproveLogList = scmOrderApproveLogService.queryScmOrderApproveLogByCondition(null, approvalBusinessResultDTO.getEApprovalBusiness().getValue(), approvalBusinessResultDTO.getBusinessCode()); - if (scmOrderApproveLogList == null || scmOrderApproveLogList.size() == 0) { - return TransactionUtils.getContent(DocumentMsgConstants.DOCUMENT_NOT_EXISTS); - } - ScmOrderApproveLog scmOrderApproveLog = scmOrderApproveLogList.get(0); - // 查询调拨入库单 - IcTransInHExt icTransInExt = queryTransferInInhExtById(scmOrderApproveLog.getPkOrder(), EScmOrderStatus.SUBMIT.getValue(), approvalBusinessResultDTO.getLoginUser().getDataCountry()); - if (icTransInExt == null) { - return TransactionUtils.getContent(DocumentMsgConstants.DOCUMENT_HAS_HANDLE); - } - // 更新调拨入库单状态 - updateTransferInStatus(icTransInExt.getPkId(), approvalBusinessResultDTO.getLoginUser(), scmOrderStatus); - // 更新前程日志表状态 - scmOrderApproveLogService.updateScmOrderApproveStatus(scmOrderApproveLog.getPkId(), approvalBusinessResultDTO.getLoginUser().getUserId(), approveStatus); - if (EAgentApprovalStatus.APPROVED.getValue() == approveStatus) { - // 查询调拨入库单明细表 - List transferInbList = transInbService.queryTransferInbByPk(EScmOrderType.TRANS_IN.getValue(), icTransInExt.getTransInbExtList()); - if (transferInbList != null && transferInbList.size() > 0) { - icTransInExt.setTransInbExtList(transferInbList); - } - // 更新现存量 - icOnHandNumService.mergeIcOnHandNumByGeneralIn(icTransInExt, icTransInExt.getTransInbExtList(), EScmOrderType.TRANS_IN.getValue(), approvalBusinessResultDTO.getLoginUser().getUserId()); - // 更新调拨订单累计入库数量 - transferOrderService.updateTransferOrderItemsTotalInNum(icTransInExt.getTransInbExtList(), approvalBusinessResultDTO.getLoginUser().getUserId()); - } - } catch (Exception e) { - e.printStackTrace(); - throw new RuntimeException(e); - } - return null; - } -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/impl/IcTransOutBServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/impl/IcTransOutBServiceImpl.java deleted file mode 100644 index 97695720..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/impl/IcTransOutBServiceImpl.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.hzs.scm.trans.service.impl; - -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.constant.ScmFieldConstants; -import com.hzs.common.core.constant.SystemFieldConstants; -import com.hzs.common.core.enums.EYesNo; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.domain.scm.purchase.IcPurchaseInB; -import com.hzs.common.domain.scm.trans.IcTransOutB; -import com.hzs.common.domain.scm.trans.ext.IcTransOutBExt; -import com.hzs.scm.trans.mapper.IcTransOutBMapper; -import com.hzs.scm.trans.service.IIcTransOutBService; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - *

- * 调拨入库明细 服务实现类 - *

- * - * @author hzs - * @since 2023-12-04 - */ -@Service -public class IcTransOutBServiceImpl extends ServiceImpl implements IIcTransOutBService { - - @Override - public List queryTransferOutBiByPk(Integer orderType, List icTransferOutbExtList) { - return baseMapper.queryTransferOutBiByPk(orderType, icTransferOutbExtList); - } - - @Override - public void deleteTransferItemsByList(List icTransferOutbList, Long pkMember) { - baseMapper.deleteTransferItemsByList(icTransferOutbList, pkMember); - } - - @Override - public void deleteTransferItemsByPkTransfer(Long pkTransfer, Long pkMember) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.set(SystemFieldConstants.DEL_FLAG, EYesNo.NO.getIntValue()); - updateWrapper.set(SystemFieldConstants.PK_MODIFIED, pkMember); - updateWrapper.set(SystemFieldConstants.MODIFIED_TIME, DateUtils.currentDateTime()); - updateWrapper.eq(ScmFieldConstants.PK_TRANSFER_OUT, pkTransfer); - update(updateWrapper); - } -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/impl/IcTransOutHServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/impl/IcTransOutHServiceImpl.java deleted file mode 100644 index ed3d87a8..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/impl/IcTransOutHServiceImpl.java +++ /dev/null @@ -1,390 +0,0 @@ -package com.hzs.scm.trans.service.impl; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.constant.CacheConstants; -import com.hzs.common.core.constant.SaOrderFieldConstants; -import com.hzs.common.core.constant.SystemFieldConstants; -import com.hzs.common.core.constant.msg.DocumentMsgConstants; -import com.hzs.common.core.constant.msg.ScmMsgConstants; -import com.hzs.common.core.enums.*; -import com.hzs.common.core.service.RedisService; -import com.hzs.common.core.utils.ComputeUtil; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.domain.scm.pub.ScmItemSpecs; -import com.hzs.common.domain.scm.pub.ScmOrderApproveLog; -import com.hzs.common.domain.scm.trans.*; -import com.hzs.common.domain.scm.trans.ext.IcTransOutBExt; -import com.hzs.common.domain.scm.trans.ext.IcTransOutHExt; -import com.hzs.common.domain.scm.trans.ext.TransferOrderExt; -import com.hzs.common.domain.system.sys.SysUser; -import com.hzs.common.util.TransactionUtils; -import com.hzs.scm.ic.service.IIcOnHandNumService; -import com.hzs.scm.no.service.IScmBillNoService; -import com.hzs.scm.pub.component.ScmPubUtilTool; -import com.hzs.scm.pub.param.ItemSpecsParam; -import com.hzs.scm.pub.param.ScmApproveParam; -import com.hzs.scm.pub.service.IScmItemSpecsService; -import com.hzs.scm.pub.service.IScmOrderApproveLogService; -import com.hzs.scm.trans.mapper.IcTransOutHMapper; -import com.hzs.scm.trans.param.TransferItemParam; -import com.hzs.scm.trans.param.TransferParam; -import com.hzs.scm.trans.service.IIcTransOutBService; -import com.hzs.scm.trans.service.IIcTransOutHService; -import com.hzs.scm.trans.service.ITransferOrderService; -import com.hzs.system.base.ICurrencyServiceApi; -import com.hzs.system.base.dto.CurrencyDTO; -import com.hzs.system.sys.IUserServiceApi; -import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; -import com.hzs.system.sys.dto.LoginUser; -import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.math.BigDecimal; -import java.time.temporal.ChronoUnit; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -/** - *

- * 调拨出库单表头 服务实现类 - *

- * - * @author hzs - * @since 2023-12-04 - */ -@Service -public class IcTransOutHServiceImpl extends ServiceImpl implements IIcTransOutHService { - - @DubboReference - private ICurrencyServiceApi currencyServiceApi; - - @DubboReference - private IUserServiceApi userServiceApi; - - @Autowired - private IScmBillNoService scmBillNoService; - - @Autowired - private IScmItemSpecsService scmItemSpecsService; - - @Autowired - private IIcTransOutBService transOutBiService; - - @Autowired - private RedisService redisService; - - @Autowired - private IScmOrderApproveLogService scmOrderApproveLogService; - - @Autowired - private IIcOnHandNumService onHandNumService; - - @Autowired - private ITransferOrderService transferOrderService; - - @Override - @Transactional(rollbackFor = Exception.class) - public void insertTransferOutByTransferParam(List transferOrderList, TransferParam transferParam, Long pkMember) { - saveTransferByParam(transferOrderList, transferParam, pkMember); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void updateTransferOutByTransferParam(List transferOrderList, IcTransOutHExt transferOutExt, TransferParam transferParam, Long pkMember) { - // 更新规格明细表，先删除在新增 根据主表主键删除 - transferOutExt.setOrderDate(transferParam.getOrderDate()); - transferOutExt.setRemark(transferParam.getRemark()); - scmItemSpecsService.deleteItemSpecsById(EScmOrderType.TRANS_OUT.getValue(), transferOutExt.getPkId(), pkMember); - // 更新订单明细表 分为3部分 删除的 新增的 修改的 - List icTransOutbList = getTransferItems(transferParam, pkMember, transferOutExt); - // 重新处理订单明细，将订单明细分为 删除的、新增的、修改的 - List transOutbExtList = transferOutExt.getTransOutbExtList(); - // 剩余的就是需要删除的 - Map generalOutbExtMap = transOutbExtList.stream().collect(Collectors.toMap(IcTransOutBExt::getPkId, transOutbExt-> transOutbExt)); - List insertTransferItems = new ArrayList<>(); - List updateTransferItems = new ArrayList<>(); - for (IcTransOutB transOutB : icTransOutbList) { - if (transOutB.getPkId() != null && generalOutbExtMap.containsKey(transOutB.getPkId())) { - // 修改的 - transOutB.setPkCreator(generalOutbExtMap.get(transOutB.getPkId()).getPkCreator()); - updateTransferItems.add(transOutB); - generalOutbExtMap.remove(transOutB.getPkId()); - } else { - // 新增的 - transOutB.setPkTransferOut(transferOutExt.getPkId()); - insertTransferItems.add(transOutB); - } - } - String transOutLockKey = CacheConstants.TRANSFER_OUT_LOCK + transferOutExt.getPkId(); - try { - if (!redisService.lockKeyOnce(transOutLockKey)) { - throw new RuntimeException(ScmMsgConstants.BILL_NOT_OPERATION); - } - if (insertTransferItems.size() > 0) { - // 保存订单明细 新增的 - transOutBiService.saveBatch(insertTransferItems); - List scmItemSpecsList = scmItemSpecsService.packageOrderItemsSpecs(insertTransferItems, transferOutExt.getPkId()); - } - if (updateTransferItems.size() > 0) { - // 修改订单明细 修改的 - updateTransferItems.forEach(updateItems -> - transOutBiService.updateById(updateItems)); - - } - if (generalOutbExtMap.size() > 0) { - // 删除订单明细 删除的 - List delTransferItems = new ArrayList<>(); - generalOutbExtMap.forEach((key, value) -> delTransferItems.add(value)); - transOutBiService.deleteTransferItemsByList(delTransferItems, pkMember); - } - saveScmItemSpecs(pkMember, transferOutExt, icTransOutbList, transferOrderList); - // 更新订单表 - updateById(transferOutExt); - } finally { - redisService.unlock(transOutLockKey); - } - } - - @Override - public IcTransOutHExt queryTransferOutById(Long pkId, Integer orderStatus) { - return baseMapper.queryTransOutById(pkId, orderStatus); - } - - @Override - public IcTransOutHExt queryDisTransferOutExtById(Long pkId, Integer orderStatus) { - TransferParam transferParam = new TransferParam(); - transferParam.setPkId(pkId); - transferParam.setOrderStatus(orderStatus); - List transOutExtList = baseMapper.queryDisTransOutExtByCondition(transferParam); - if(CollectionUtil.isNotEmpty(transOutExtList)){ - return transOutExtList.get(0); - } - return null; - } - - @Override - public List queryTransferOutToStoreByCondition(TransferParam transferParam) { - return baseMapper.queryTransferOutToStoreByCondition(transferParam); - } - - @Override - public List queryDisTransferOutExtCondition(TransferParam transferParam) { - if (transferParam.getEndDate() != null) { - transferParam.setEndDate(DateUtils.afterDate(1, ChronoUnit.DAYS, transferParam.getEndDate())); - } - return baseMapper.queryDisTransOutExtByCondition(transferParam); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteTransferOut(Long pkId, Long pkMember) { - String transferOutLock = CacheConstants.TRANSFER_OUT_LOCK + pkId; - if (!redisService.lockKeyOnce(transferOutLock)) { - throw new RuntimeException(ScmMsgConstants.BILL_NOT_OPERATION); - } - // 删除规格明细表 - scmItemSpecsService.deleteItemSpecsById(EScmOrderType.TRANS_OUT.getValue(), pkId, pkMember); - transOutBiService.deleteTransferItemsByPkTransfer(pkId, pkMember); - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.set(SystemFieldConstants.DEL_FLAG, EYesNo.NO.getIntValue()); - updateWrapper.set(SystemFieldConstants.PK_MODIFIED, pkMember); - updateWrapper.set(SystemFieldConstants.MODIFIED_TIME, DateUtils.currentDateTime()); - updateWrapper.eq(SystemFieldConstants.PK_ID, pkId); - update(updateWrapper); - redisService.unlock(transferOutLock); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void auditTransferOutByApproveParamSubmit(IcTransOutHExt transOutExt, ScmApproveParam scmApproveParam, LoginUser loginUser) { - // 更新单据状态 - updateTransferStatus(scmApproveParam.getPkId(), loginUser, EScmOrderStatus.SUBMIT.getValue()); - List transOutBiExtList = transOutBiService.queryTransferOutBiByPk(EScmOrderType.TRANS_OUT.getValue(), transOutExt.getTransOutbExtList()); - if(transOutBiExtList != null && transOutBiExtList.size() >0){ - transOutExt.setTransOutbExtList(transOutBiExtList); - } - // 更新存货现存量表，更新数量 - onHandNumService.mergeIcOnHandNumByGeneralOut(transOutExt, transOutExt.getTransOutbExtList(), EScmOrderType.TRANS_OUT.getValue(), loginUser.getUserId()); - scmOrderApproveLogService.submitOrder(scmApproveParam, EApprovalBusiness.TRANSFER_OUT_APPROVE, EOrderPrefix.TR_TRANS_OUT_CODE, loginUser); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public String auditTransferOutByApproveParamAgree(ApprovalBusinessResultDTO approvalBusinessResultDTO) { - return approveTransferByStatus(approvalBusinessResultDTO, EScmOrderStatus.APPROVE.getValue(), EAgentApprovalStatus.APPROVED.getValue()); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public String auditTransferOutByApproveParamReject(ApprovalBusinessResultDTO approvalBusinessResultDTO) { - return approveTransferByStatus(approvalBusinessResultDTO, EScmOrderStatus.SAVE.getValue(), EAgentApprovalStatus.REFUSE.getValue()); - } - - @Override - public List queryTransferOutByOrderItems(List orderItemsParamList) { - return baseMapper.queryTransferOutByOrderItems(orderItemsParamList); - } - - /* - * @description: 将采购订单的参数转换为能保存的订单 - * @author: sui q - * @date: 2023/11/20 15:53 - * @param: null null - **/ - private void saveTransferByParam(List transferOrderList, TransferParam transferParam, Long pkMember) { - IcTransOutH icTransferOutH = packageTransOut(transferOrderList.get(0), transferParam); - List transferBiList = getTransferItems(transferParam, pkMember, icTransferOutH); - // 生成单据号 - icTransferOutH.setOrderCode(scmBillNoService.createScmBillNoByOrderType(EScmOrderType.TRANS_OUT.getValue())); - // 保存主表 - save(icTransferOutH); - for (IcTransOutB transferOutB : transferBiList) { - transferOutB.setPkTransferOut(icTransferOutH.getPkId()); - } - // 保存子表 - transOutBiService.saveBatch(transferBiList); - saveScmItemSpecs(pkMember, icTransferOutH, transferBiList, transferOrderList); - } - - /* - * @description: 封装主表 - * @author: sui q - * @date: 2023/12/9 12:00 - * @param: null null - **/ - private IcTransOutH packageTransOut(TransferOrderExt transferOrderExt, TransferParam transferParam) { - IcTransOutH icTransferOutH = BeanUtil.copyProperties(transferParam, IcTransOutH.class); - icTransferOutH.setPkInCorp(transferOrderExt.getPkInCorp()); - icTransferOutH.setPkCorp(transferOrderExt.getPkCorp()); - icTransferOutH.setPkInCountry(transferOrderExt.getPkInCountry()); - icTransferOutH.setOrderStatus(EScmOrderStatus.SAVE.getValue()); - return icTransferOutH; - } - - private void saveScmItemSpecs(Long pkMember, IcTransOutH icTransOutH, List transOutBiList, List transferOrderList) { - // 封装明细表对应的规格 - Map> itemSpecsMap = packageItemSpecsMap(transferOrderList); - List saveScmItemSpecsList = new ArrayList<>(); - for (IcTransOutB transOutB : transOutBiList) { - if (itemSpecsMap.containsKey(transOutB.getPkTransferItems())) { - List itemSpecsList = itemSpecsMap.get(transOutB.getPkTransferItems()); - scmItemSpecsService.packageScmItemSpecsList(itemSpecsList, pkMember, - icTransOutH.getPkId(), transOutB.getPkId(), EScmOrderType.TRANS_OUT.getValue()); - saveScmItemSpecsList.addAll(itemSpecsList); - } - } - // 保存订单明细规格 - if (saveScmItemSpecsList.size() == 0) { - throw new RuntimeException(ScmMsgConstants.SOURCE_BILL_EXIST_SPECS); - } - scmItemSpecsService.saveBatch(saveScmItemSpecsList); - } - - /* - * @description: 调拨入库单对应的规格 - * @author: sui q - * @date: 2023/11/24 11:21 - * @param: null null - **/ - private Map> packageItemSpecsMap(List transferOrderList) { - List scmItemSpecsList = new ArrayList<>(); - for (TransferOrderExt transferOrder : transferOrderList) { - for (TransferOrderItems transferOrderItems : transferOrder.getTransferOrderItemsList()) { - ScmItemSpecs scmItemSpecs = ScmItemSpecs.builder() - .pkOrder(transferOrder.getPkId()) - .pkOrderItems(transferOrderItems.getPkId()) - .build(); - scmItemSpecsList.add(scmItemSpecs); - } - } - return scmItemSpecsService.queryScmItemSpecsByCondition(EScmOrderType.TRANS_ORDER.getValue(), scmItemSpecsList); - } - - private List getTransferItems(TransferParam transferParam, Long pkMember, IcTransOutH icTransferOutH) { - // 根据国家获得汇率 - CurrencyDTO currencyDTO = currencyServiceApi.getCurrency(transferParam.getPkCountry()).getData(); - SysUser sysUser = userServiceApi.selectUserById(pkMember).getData(); - // 根据登录账号获得部门 - icTransferOutH.setPkDept(sysUser.getPkDept().intValue()); - icTransferOutH.setPkWhsmanager(pkMember); - // 计算累计数量 累计价税合计 - // 总数量 - BigDecimal totalNum = BigDecimal.ZERO; - List transferOutbList = new ArrayList<>(); - Date date = DateUtils.currentDateTime(); - for (TransferItemParam transferItemParam : transferParam.getTransferItemParamList()) { - IcTransOutB transOutB = BeanUtil.copyProperties(transferItemParam, IcTransOutB.class); - // 无税金额 = 无税单价*数量 - transOutB.setNorigmny(ComputeUtil.computeMultiply(transferItemParam.getNorigprice(), transferItemParam.getNnum())); - // 含税单价 = 无税单价*（1+税率） - transOutB.setNorigtaxprice(ComputeUtil.computeMultiply(transferItemParam.getNorigprice(), - ComputeUtil.computeAdd(BigDecimal.ONE, ComputeUtil.computeMultiply(transferItemParam.getNtaxrate(), BigDecimal.valueOf(0.01))))); - // 税额 =无税单价*税率*数量 - transOutB.setNtax(ComputeUtil.computeMultiply(ComputeUtil.computeBonusMultiply(transferItemParam.getNorigprice(), transferItemParam.getNtaxrate()), transferItemParam.getNnum())); - // 价税合计 含税单价*数量 - transOutB.setNorigtaxmny(ComputeUtil.computeMultiply(transOutB.getNorigtaxprice(), transferItemParam.getNnum())); - transOutB.setPkRate(currencyDTO.getPkId()); - totalNum = ComputeUtil.computeAdd(totalNum, transOutB.getNnum()); - List itemSpecsParamList = transferItemParam.getScmItemSpecsList(); - scmItemSpecsService.packageScmItemByParam(itemSpecsParamList, transOutB, transferParam.getPkCountry(), pkMember, - icTransferOutH.getPkId(), transOutB.getPkId(), EScmOrderType.TRANS_OUT.getValue()); - transferOutbList.add(transOutB); - } - icTransferOutH.setPkCountry(transferParam.getPkCountry()); - if (transferParam.getPkId() == null) { - icTransferOutH.setPkCreator(pkMember); - } else { - icTransferOutH.setPkModified(pkMember); - icTransferOutH.setModifiedTime(date); - } - icTransferOutH.setTotalNum(totalNum); - return transferOutbList; - } - - private String approveTransferByStatus(ApprovalBusinessResultDTO approvalBusinessResultDTO, Integer scmOrderStatus, Integer approveStatus){ - // 查询订单日志表 - List scmOrderApproveLogList = scmOrderApproveLogService.queryScmOrderApproveLogByCondition(null, approvalBusinessResultDTO.getEApprovalBusiness().getValue(), approvalBusinessResultDTO.getBusinessCode()); - if (scmOrderApproveLogList == null || scmOrderApproveLogList.size() == 0) { - return TransactionUtils.getContent(DocumentMsgConstants.DOCUMENT_NOT_EXISTS); - } - ScmOrderApproveLog scmOrderApproveLog = scmOrderApproveLogList.get(0); - // 查询采购入库 - IcTransOutHExt transOutExt = queryTransferOutById(scmOrderApproveLog.getPkOrder(), EScmOrderStatus.SUBMIT.getValue()); - if (transOutExt == null) { - return TransactionUtils.getContent(DocumentMsgConstants.DOCUMENT_HAS_HANDLE); - } - // 更新采购入库单状态 - updateTransferStatus(transOutExt.getPkId(), approvalBusinessResultDTO.getLoginUser(), scmOrderStatus); - // 更新前程日志表状态 - scmOrderApproveLogService.updateScmOrderApproveStatus(scmOrderApproveLog.getPkId(), approvalBusinessResultDTO.getLoginUser().getUserId(), approveStatus); - // 弃审的时候回退批次数量 - List icTransferOutbExtList = transOutBiService.queryTransferOutBiByPk(EScmOrderType.TRANS_OUT.getValue(), transOutExt.getTransOutbExtList()); - if(EAgentApprovalStatus.REFUSE.getValue() == approveStatus){ - if(icTransferOutbExtList != null && icTransferOutbExtList.size() >0){ - transOutExt.setTransOutbExtList(icTransferOutbExtList); - } - onHandNumService.backIcOnHandNumByGeneralOut(transOutExt, transOutExt.getTransOutbExtList(), EScmOrderType.TRANS_OUT.getValue(), approvalBusinessResultDTO.getLoginUser().getUserId()); - }else{ - // 审核通过回写累计出库数量 - transferOrderService.updateTransferOrderItemsTotalOutNum(icTransferOutbExtList, approvalBusinessResultDTO.getLoginUser().getUserId()); - } - return null; - } - - private void updateTransferStatus(Long pkId, LoginUser loginUser, Integer orderStatus) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.set(SaOrderFieldConstants.ORDER_STATUS, orderStatus); - updateWrapper.set(SystemFieldConstants.PK_MODIFIED, loginUser.getUserId()); - updateWrapper.set(SystemFieldConstants.MODIFIED_TIME, DateUtils.currentDateTime()); - updateWrapper.eq(SystemFieldConstants.PK_ID, pkId); - update(updateWrapper); - } -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/impl/TransferOrderItemsServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/impl/TransferOrderItemsServiceImpl.java deleted file mode 100644 index 356c2991..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/impl/TransferOrderItemsServiceImpl.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.hzs.scm.trans.service.impl; - -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.constant.SaOrderFieldConstants; -import com.hzs.common.core.constant.ScmFieldConstants; -import com.hzs.common.core.constant.SystemFieldConstants; -import com.hzs.common.core.enums.EYesNo; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.domain.scm.po.PoOrderItems; -import com.hzs.common.domain.scm.purchase.ext.IcPurchaseInBExt; -import com.hzs.common.domain.scm.trans.TransferOrderItems; -import com.hzs.common.domain.scm.trans.ext.IcTransInBExt; -import com.hzs.common.domain.scm.trans.ext.IcTransOutBExt; -import com.hzs.scm.trans.mapper.TransferOrderItemsMapper; -import com.hzs.scm.trans.service.ITransferOrderItemsService; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; - -/** - *

- * 采购入库明细 服务实现类 - *

- * - * @author hzs - * @since 2023-12-04 - */ -@Service -public class TransferOrderItemsServiceImpl extends ServiceImpl implements ITransferOrderItemsService { - - @Override - public void deleteTransferOrderItemsService(List transferOrderItemsList, Long pkMember) { - baseMapper.deleteOrderItemsService(transferOrderItemsList, pkMember); - } - - @Override - public void deleteTransferOrderItemsByPkOrder(Long pkTransfer, Long pkMember) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.set(SystemFieldConstants.DEL_FLAG, EYesNo.NO.getIntValue()); - updateWrapper.set(SystemFieldConstants.PK_MODIFIED, pkMember); - updateWrapper.set(SystemFieldConstants.MODIFIED_TIME, DateUtils.currentDateTime()); - updateWrapper.eq(ScmFieldConstants.PK_TRANSFER, pkTransfer); - update(updateWrapper); - } - - @Override - public List queryTransferOrderItemsByPk(Integer pkCountry, Long pkTransfer) { - return baseMapper.queryTransferOrderItemsByPk(pkCountry, pkTransfer); - } - - @Override - public List queryTransferOrderItemsByList(List idList) { - return null; - } - - @Override - public void updateTransferOrderItemsTotalInNum(List transferInbList, Long pkMember) { - baseMapper.updateTransferOrderItemsTotalInNum(transferInbList, pkMember); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void updateTransferOrderItemsTotalOutNum(List transferOutbList, Long pkMember) { - baseMapper.updateTransferOrderItemsTotalOutNum(transferOutbList, pkMember); - baseMapper.updateTransferOrderItemsTotalOutEnd(transferOutbList); - } -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/impl/TransferOrderServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/impl/TransferOrderServiceImpl.java deleted file mode 100644 index 2b60ab6f..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/impl/TransferOrderServiceImpl.java +++ /dev/null @@ -1,356 +0,0 @@ -package com.hzs.scm.trans.service.impl; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.constant.CacheConstants; -import com.hzs.common.core.constant.SaOrderFieldConstants; -import com.hzs.common.core.constant.SystemFieldConstants; -import com.hzs.common.core.constant.msg.DocumentMsgConstants; -import com.hzs.common.core.constant.msg.ScmMsgConstants; -import com.hzs.common.core.enums.*; -import com.hzs.common.core.service.RedisService; -import com.hzs.common.core.utils.ComputeUtil; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.domain.scm.pub.ScmItemSpecs; -import com.hzs.common.domain.scm.pub.ScmOrderApproveLog; -import com.hzs.common.domain.scm.trans.TransferOrder; -import com.hzs.common.domain.scm.trans.TransferOrderItems; -import com.hzs.common.domain.scm.trans.ext.IcTransInBExt; -import com.hzs.common.domain.scm.trans.ext.IcTransOutBExt; -import com.hzs.common.domain.scm.trans.ext.TransferOrderExt; -import com.hzs.common.domain.system.sys.SysUser; -import com.hzs.common.util.TransactionUtils; -import com.hzs.scm.no.service.IScmBillNoService; -import com.hzs.scm.pub.component.ScmPubUtilTool; -import com.hzs.scm.pub.param.ItemSpecsParam; -import com.hzs.scm.pub.param.ScmApproveParam; -import com.hzs.scm.pub.service.IScmItemSpecsService; -import com.hzs.scm.pub.service.IScmOrderApproveLogService; -import com.hzs.scm.trans.mapper.TransferOrderMapper; -import com.hzs.scm.trans.param.TransferItemParam; -import com.hzs.scm.trans.param.TransferParam; -import com.hzs.scm.trans.service.ITransferOrderItemsService; -import com.hzs.scm.trans.service.ITransferOrderService; -import com.hzs.system.base.ICurrencyServiceApi; -import com.hzs.system.base.dto.CurrencyDTO; -import com.hzs.system.sys.IUserServiceApi; -import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; -import com.hzs.system.sys.dto.LoginUser; -import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.math.BigDecimal; -import java.time.temporal.ChronoUnit; -import java.util.*; - -/** - *

- * 调拨订单表头 服务实现类 - *

- * - * @author hzs - * @since 2023-12-04 - */ -@Service -public class TransferOrderServiceImpl extends ServiceImpl implements ITransferOrderService { - - @DubboReference - private ICurrencyServiceApi currencyServiceApi; - - @DubboReference - private IUserServiceApi userServiceApi; - - @Autowired - private IScmBillNoService scmBillNoService; - - @Autowired - private ITransferOrderItemsService transferOrderItemsService; - - @Autowired - private IScmItemSpecsService scmItemSpecsService; - - @Autowired - private RedisService redisService; - - @Autowired - private IScmOrderApproveLogService scmOrderApproveLogService; - - @Override - @Transactional(rollbackFor = Exception.class) - public void insertSaveTransferOrderByOrderParam(TransferParam transferParam, Long pkMember) { - saveTransferOrderByParam(transferParam, pkMember); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void updateTransferOrderByOrderParam(TransferOrderExt transferOrderExt, TransferParam transferParam, Long pkMember) { - // 更新规格明细表，先删除在新增 根据主表主键删除 - scmItemSpecsService.deleteItemSpecsById(EScmOrderType.TRANS_ORDER.getValue(), transferOrderExt.getPkId(), pkMember); - transferOrderExt.setPkInCorp(transferParam.getPkInCorp()); - transferOrderExt.setTransType(transferParam.getTransType()); - transferOrderExt.setOrderDate(transferParam.getOrderDate()); - transferOrderExt.setPkCorp(transferParam.getPkCorp()); - transferOrderExt.setRemark(transferParam.getRemark()); - transferOrderExt.setPkInCountry(transferParam.getPkInCountry()); - // 更新订单明细表 分为3部分 删除的 新增的 修改的 - List transferOrderItemsList = getTransferOrderItems(transferParam, pkMember, transferOrderExt); - // 重新处理订单明细，将订单明细分为 删除的、新增的、修改的 - List transOrderItemsExtList = transferOrderExt.getTransferOrderItemsList(); - // 剩余的就是需要删除的 - Map transferOrderItemsMap = new HashMap<>(); - transOrderItemsExtList.forEach(transferOrderItems -> - transferOrderItemsMap.put(transferOrderItems.getPkId(), transferOrderItems)); - List insertOrderItems = new ArrayList<>(); - List updateOrderItems = new ArrayList<>(); - List saveScmItemSpecsList = new ArrayList<>(); - for (TransferOrderItems transferOrderItems : transferOrderItemsList) { - if (transferOrderItems.getPkId() != null && transferOrderItemsMap.containsKey(transferOrderItems.getPkId())) { - // 修改的 - transferOrderItems.setPkCreator(transferOrderItemsMap.get(transferOrderItems.getPkId()).getPkCreator()); - updateOrderItems.add(transferOrderItems); - saveScmItemSpecsList.addAll(transferOrderItems.getScmItemSpecsList()); - transferOrderItemsMap.remove(transferOrderItems.getPkId()); - } else { - // 新增的 - transferOrderItems.setPkTransfer(transferOrderExt.getPkId()); - insertOrderItems.add(transferOrderItems); - } - } - String purchaseLockKey = CacheConstants.TRANSFER_ORDER_LOCK + transferOrderExt.getPkId(); - try { - if (!redisService.lockKeyOnce(purchaseLockKey)) { - throw new RuntimeException(ScmMsgConstants.BILL_NOT_OPERATION); - } - if (insertOrderItems.size() > 0) { - // 保存订单明细 新增的 - transferOrderItemsService.saveBatch(insertOrderItems); - List scmItemSpecsList = scmItemSpecsService.packageOrderItemsSpecs(insertOrderItems, transferOrderExt.getPkId()); - if (scmItemSpecsList.size() > 0) { - saveScmItemSpecsList.addAll(scmItemSpecsList); - } - } - if (updateOrderItems.size() > 0) { - // 修改订单明细 修改的 - updateOrderItems.forEach(updateItems -> - transferOrderItemsService.updateById(updateItems)); - - } - if (transferOrderItemsMap.size() > 0) { - // 删除订单明细 删除的 - List delOrderItems = new ArrayList<>(); - transferOrderItemsMap.forEach((key, value) -> delOrderItems.add(value)); - transferOrderItemsService.deleteTransferOrderItemsService(delOrderItems, pkMember); - } - // 保存订单明细规格 - if (saveScmItemSpecsList.size() > 0) { - scmItemSpecsService.saveBatch(saveScmItemSpecsList); - } - // 更新订单表 - updateById(transferOrderExt); - } catch (Exception e) { - e.printStackTrace(); - throw new RuntimeException(e); - } finally { - redisService.unlock(purchaseLockKey); - } - } - - @Override - public TransferOrderExt queryTransferOrderById(Long pkOrder, Integer orderStatus) { - return baseMapper.queryTransferOrderById(pkOrder, orderStatus); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public TransferOrderExt queryDisTransferOrderById(Long pkOrder, Integer orderStatus) { - TransferParam transferParam = new TransferParam(); - transferParam.setPkId(pkOrder); - transferParam.setOrderStatus(orderStatus); - List transferOrderExtList = baseMapper.queryTransferOrderByCondition(transferParam); - if (CollectionUtil.isNotEmpty(transferOrderExtList)) { - return transferOrderExtList.get(0); - } - return null; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public List queryTransferOrderByCondition(TransferParam transferParam) { - if (transferParam.getEndDate() != null) { - transferParam.setEndDate(DateUtils.afterDate(1, ChronoUnit.DAYS, transferParam.getEndDate())); - } - return baseMapper.queryTransferOrderByCondition(transferParam); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteTransferOrder(Long pkTransfer, Long pkMember) { - String transferOrderLock = CacheConstants.TRANSFER_ORDER_LOCK + pkTransfer; - try { - if (!redisService.lockKeyOnce(transferOrderLock)) { - throw new RuntimeException(ScmMsgConstants.BILL_NOT_OPERATION); - } - // 删除规格明细表 - scmItemSpecsService.deleteItemSpecsById(EScmOrderType.TRANS_ORDER.getValue(), pkTransfer, pkMember); - // 删除订单明细表 - transferOrderItemsService.deleteTransferOrderItemsByPkOrder(pkTransfer, pkMember); - // 删除订单主表 - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.set(SystemFieldConstants.DEL_FLAG, EYesNo.NO.getIntValue()); - updateWrapper.set(SystemFieldConstants.PK_MODIFIED, pkMember); - updateWrapper.set(SystemFieldConstants.MODIFIED_TIME, DateUtils.currentDateTime()); - updateWrapper.eq(SystemFieldConstants.PK_ID, pkTransfer); - update(updateWrapper); - } catch (Exception e) { - throw new RuntimeException(e); - } finally { - redisService.unlock(transferOrderLock); - } - } - - @Override - public List queryTransferOrderByOrderItems(List orderItemsParamList) { - return baseMapper.queryTransferOrderByOrderItems(orderItemsParamList); - } - - @Override - public List queryTransferOrderToStoreByCondition(TransferParam transferParam) { - return baseMapper.queryTransferOrderToStoreByCondition(transferParam); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void auditTransferOrderTransferOrderSubmit(ScmApproveParam scmApproveParam, LoginUser loginUser) { - // 更新单据状态 - updateTransferOrderStatus(scmApproveParam.getPkId(), loginUser, EScmOrderStatus.SUBMIT.getValue()); - scmOrderApproveLogService.submitOrder(scmApproveParam, EApprovalBusiness.TRANSFER_ORDER_APPROVE, EOrderPrefix.TR_ORDER_CODE, loginUser); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public String auditTransferOrderTransferOrderAgree(ApprovalBusinessResultDTO approvalBusinessResultDTO) { - return approveTransferOrderByStatus(approvalBusinessResultDTO, EScmOrderStatus.APPROVE.getValue(), EAgentApprovalStatus.APPROVED.getValue()); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public String auditTransferOrderByTransferOrderReject(ApprovalBusinessResultDTO approvalBusinessResultDTO) { - return approveTransferOrderByStatus(approvalBusinessResultDTO, EScmOrderStatus.SAVE.getValue(), EAgentApprovalStatus.REFUSE.getValue()); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void updateTransferOrderItemsTotalInNum(List transferInbList, Long pkMember) { - transferOrderItemsService.updateTransferOrderItemsTotalInNum(transferInbList, pkMember); - baseMapper.updateTransferOrderStatusByTrans(transferInbList, pkMember, EScmOrderStatus.DELIVERY.getValue()); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void updateTransferOrderItemsTotalOutNum(List transferOutbList, Long pkMember) { - transferOrderItemsService.updateTransferOrderItemsTotalOutNum(transferOutbList, pkMember); - } - - private String approveTransferOrderByStatus(ApprovalBusinessResultDTO approvalBusinessResultDTO, Integer scmOrderStatus, Integer approveStatus) { - // 查询订单日志表 - List scmOrderApproveLogList = scmOrderApproveLogService.queryScmOrderApproveLogByCondition(null, approvalBusinessResultDTO.getEApprovalBusiness().getValue(), approvalBusinessResultDTO.getBusinessCode()); - if (scmOrderApproveLogList == null || scmOrderApproveLogList.size() == 0) { - return TransactionUtils.getContent(DocumentMsgConstants.DOCUMENT_NOT_EXISTS); - } - ScmOrderApproveLog scmOrderApproveLog = scmOrderApproveLogList.get(0); - // 查询采购订单 - TransferOrderExt transferOrderExt = queryTransferOrderById(scmOrderApproveLog.getPkOrder(), EScmOrderStatus.SUBMIT.getValue()); - if (transferOrderExt == null) { - log.error("订单撤单同意处理失败: 签呈已处理!"); - return TransactionUtils.getContent(DocumentMsgConstants.DOCUMENT_HAS_HANDLE); - } - // 更新采购入库单状态 - updateTransferOrderStatus(transferOrderExt.getPkId(), approvalBusinessResultDTO.getLoginUser(), scmOrderStatus); - // 更新前程日志表状态 - scmOrderApproveLogService.updateScmOrderApproveStatus(scmOrderApproveLog.getPkId(), approvalBusinessResultDTO.getLoginUser().getUserId(), approveStatus); - return null; - } - - /* - * @description: 将采购订单的参数转换为能保存的订单 - * @author: sui q - * @date: 2023/11/20 15:53 - * @param: null null - **/ - private void saveTransferOrderByParam(TransferParam transferParam, Long pkMember) { - TransferOrder transferOrder = BeanUtil.copyProperties(transferParam, TransferOrder.class); - List transferOrderItemsList = getTransferOrderItems(transferParam, pkMember, transferOrder); - // 生成单据号 - transferOrder.setOrderCode(scmBillNoService.createScmBillNoByOrderType(EScmOrderType.TRANS_ORDER.getValue())); - // 保存主表 - save(transferOrder); - for (TransferOrderItems transferOrderItems : transferOrderItemsList) { - transferOrderItems.setPkTransfer(transferOrder.getPkId()); - } - // 保存子表 - transferOrderItemsService.saveBatch(transferOrderItemsList); - List saveScmItemSpecsList = scmItemSpecsService.packageOrderItemsSpecs(transferOrderItemsList, transferOrder.getPkId()); - if (saveScmItemSpecsList.size() > 0) { - scmItemSpecsService.saveBatch(saveScmItemSpecsList); - } - } - - private List getTransferOrderItems(TransferParam transferParam, Long pkMember, TransferOrder transferOrder) { - // 根据国家获得汇率 - CurrencyDTO currencyDTO = currencyServiceApi.getCurrency(transferParam.getPkCountry()).getData(); - transferOrder.setPkRate(currencyDTO.getPkId()); - SysUser sysUser = userServiceApi.selectUserById(pkMember).getData(); - // 根据登录账号获得部门 - transferOrder.setPkDept(sysUser.getPkDept().intValue()); - transferOrder.setPkWhsmanager(pkMember); - // 计算累计数量 累计价税合计 - // 总数量 - BigDecimal totalNum = BigDecimal.ZERO; - // 价税合计 - BigDecimal totalOrigmny = BigDecimal.ZERO; - List transferOrderItemsList = new ArrayList<>(); - Date date = DateUtils.currentDateTime(); - for (TransferItemParam transferItemParam : transferParam.getTransferItemParamList()) { - TransferOrderItems transferOrderItems = BeanUtil.copyProperties(transferItemParam, TransferOrderItems.class); - // 含税单价 = 无税单价*（1+税率） - transferOrderItems.setNorigtaxprice(ComputeUtil.computeMultiply(transferOrderItems.getNorigprice(), - ComputeUtil.computeAdd(BigDecimal.ONE, ComputeUtil.computeMultiply(transferOrderItems.getNtaxrate(), BigDecimal.valueOf(0.01))))); - // 无税金额 = 无税单价*数量 - transferOrderItems.setNorigmny(ComputeUtil.computeMultiply(transferOrderItems.getNorigprice(), transferOrderItems.getNnum())); - // 税额 =无税单价*税率*数量 - transferOrderItems.setNtax(ComputeUtil.computeMultiply(ComputeUtil.computeBonusMultiply(transferOrderItems.getNorigprice(), transferOrderItems.getNtaxrate()), transferOrderItems.getNnum())); - // 价税合计 含税单价*数量 - transferOrderItems.setNorigtaxmny(ComputeUtil.computeMultiply(transferOrderItems.getNorigtaxprice(), transferOrderItems.getNnum())); - transferOrderItems.setPkRate(currencyDTO.getPkId()); - totalNum = ComputeUtil.computeAdd(totalNum, transferOrderItems.getNnum()); - totalOrigmny = ComputeUtil.computeAdd(totalOrigmny, transferOrderItems.getNorigtaxmny()); - List itemSpecsParamList = transferItemParam.getScmItemSpecsList(); - scmItemSpecsService.packageScmItemByParam(itemSpecsParamList, transferOrderItems, transferParam.getPkCountry(), pkMember, - transferOrder.getPkId(), transferOrderItems.getPkId(), EScmOrderType.TRANS_ORDER.getValue()); - transferOrderItemsList.add(transferOrderItems); - } - transferOrder.setPkCountry(transferParam.getPkCountry()); - if (transferOrder.getPkId() == null) { - transferOrder.setPkCreator(pkMember); - } else { - transferOrder.setPkModified(pkMember); - transferOrder.setModifiedTime(date); - } - transferOrder.setTotalNum(totalNum); - transferOrder.setTotalOrigmny(totalOrigmny); - return transferOrderItemsList; - } - - private void updateTransferOrderStatus(Long pkId, LoginUser loginUser, Integer orderStatus) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.set(SaOrderFieldConstants.ORDER_STATUS, orderStatus); - updateWrapper.set(SystemFieldConstants.PK_MODIFIED, loginUser.getUserId()); - updateWrapper.set(SystemFieldConstants.MODIFIED_TIME, DateUtils.currentDateTime()); - updateWrapper.eq(SystemFieldConstants.PK_ID, pkId); - update(updateWrapper); - } -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/vo/TransferExcelVO.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/vo/TransferExcelVO.java deleted file mode 100644 index 39fe553e..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/vo/TransferExcelVO.java +++ /dev/null @@ -1,151 +0,0 @@ -package com.hzs.scm.trans.vo; - -import com.hzs.common.core.annotation.Excel; -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -/** - * @description: 采购入库导出vo - * @author: sui q - * @time: 2024/3/6 15:32 - * @classname: PurchaseExcelVO - * @package_name: com.hzs.scm.purchase.vo - * version 1.0.0 - */ -@Data -public class TransferExcelVO implements Serializable { - - /** - * 订单编号 - */ - @Excel(name = "入库编号") - private String orderCode; - - /** - * 部门名称 - */ - @Excel(name = "部门") - private String deptName; - - /** - * 管理员名称 - */ - @Excel(name = "库管员") - private String managerName; - - /** - * 采购组织名称 - */ - @Excel(name = "库存公司") - private String corpName; - - @Excel(name = "出库公司") - private String corpOutName; - - @Excel(name = "订单状态", readConverterExp = "1=已保存,2=已提交,3=已审核,4=已收货,5=已关闭,6=已退货") - private Integer orderStatus; - - /** - * 备注 - */ - @Excel(name = "备注") - private String remark; - - /** - * 订单日期 2023-10 - */ - @Excel(name = "入库日期", dateFormat = "yyyy-MM-dd") - private Date orderDate; - - /** - * 产品编号 - */ - @Excel(name = "产品编号") - private String productCode; - - /** - * 产品名称 - */ - @Excel(name = "产品名称") - private String productName; - - /** - * 规格名称 - */ - @Excel(name = "产品规格") - private String specsName; - - /** - * 单位名称 - */ - @Excel(name = "单位") - private String unitName; - - /** - * 仓库名称 - */ - @Excel(name = "调入仓库") - private String storehouseName; - - /** - * 仓库名称 - */ - @Excel(name = "调出仓库") - private String outStorehouseName; - - /** - * 数量 - */ - @Excel(name = "数量") - private BigDecimal nnum; - /** - * 无税单价 - */ - @Excel(name = "无税单价") - private BigDecimal norigprice; - - /** - * 税率 - */ - @Excel(name = "税率") - private BigDecimal ntaxrate; - - /** - * 含税单价 = 无税单价*（1+税率） - */ - @Excel(name = "含税单价") - private BigDecimal norigtaxprice; - - /** - * 无税金额 = 无税单价*数量 - */ - @Excel(name = "无税金额") - private BigDecimal norigmny; - - /** - * 税额 =无税单价*数量 - */ - @Excel(name = "税额") - private BigDecimal ntax; - - /** - * 价税合计 含税单价*数量 - */ - @Excel(name = "价税合计") - private BigDecimal norigtaxmny; - - /** - * 入库日期 - */ - @Excel(name = "入库日期", dateFormat = "yyyy-MM-dd") - private Date bizDate; - - /** - * 批次号 - */ - @Excel(name = "批次号") - private String batchCode; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/vo/TransferInBVo.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/vo/TransferInBVo.java deleted file mode 100644 index b4cd0749..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/vo/TransferInBVo.java +++ /dev/null @@ -1,166 +0,0 @@ -package com.hzs.scm.trans.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.scm.pub.vo.ScmReturnBVo; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * @description: 调拨出库明细表 - * @author: sui q - * @time: 2023/12/25 11:22 - * @classname: TransferOutBVO - * @package_name: com.hzs.scm.trans.vo - * version 1.0.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class TransferInBVo extends ScmReturnBVo { - /** - * 单位名称 - */ - private String unitName; - - /** - * 货位名称 - */ - private String clocationName; - - /** - * 仓库名称 - */ - private String storehouseName; - - - private String batchCode; - - /** - * 产品编号 - */ - private String productCode; - - /** - * 产品名称 - */ - private String productName; - - /** - * 规格名称 - */ - private String specsName; - - /** - * 供应商名称 - */ - private String cubasdocName; - - /** - * 仓库名称 - */ - private String outStorehouseName; - - /** - * 入库日期 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date bizDate; - - /** - * 主键 - */ - private Long pkId; - - /** - * 单位 - */ - private Integer pkUnit; - - - /** - * 货位 - */ - private Integer pkClocation; - - /** - * 产品基础信息主键 - */ - private Integer pkProductBas; - - /** - * 产品信息主键 - */ - private Integer pkProduct; - - /** - * 供应商 - */ - private Integer pkCubasdoc; - - /** - * 客户 - */ - private Integer pkCustomer; - - /** - * 调出仓库 - */ - private Integer pkOutStorehouse; - - /** - * 库存仓库 - */ - private Integer pkStorehouse; - - /** - * 数量 - */ - private BigDecimal nnum; - - /** - * 无税单价 - */ - private BigDecimal norigprice; - - /** - * 税率 - */ - private BigDecimal ntaxrate; - - /** - * 含税单价 = 无税单价*（1+税率） - */ - private BigDecimal norigtaxprice; - - /** - * 无税金额 = 无税单价*数量 - */ - private BigDecimal norigmny; - - /** - * 税额 =无税单价*数量 - */ - private BigDecimal ntax; - - /** - * 价税合计 含税单价*数量 - */ - private BigDecimal norigtaxmny; - - /** - * 批次主键 - */ - private Long pkBatchCode; - - /** - * 调拨出库单主键 - */ - private Long pkTransferOut; - - /** - * 调拨出库单明细主键 - */ - private Long pkTransferOutB; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/vo/TransferInVo.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/vo/TransferInVo.java deleted file mode 100644 index bb6bdc65..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/vo/TransferInVo.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.hzs.scm.trans.vo; - -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import com.hzs.scm.pub.vo.ScmReturnVo; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.List; - -/** - * @description: 调拨入库 - * @author: sui q - * @time: 2024/1/3 14:47 - * @classname: TransferInVO - * @package_name: com.hzs.scm.trans.vo - * version 1.0.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class TransferInVo extends ScmReturnVo { - - /** - * 调出人 - */ - private Long pkWhsmanager; - - /** - * 调出公司 - */ - @Transaction(transactionKey = EnumsPrefixConstants.KEY_COUNTRY) - private Integer pkOutCorp; - - private String corpOutName; - - /** - * 调出国家 - */ - private Integer pkOutCountry; - - private String countryOutName; - - @Transaction - private List scmReturnbVoList; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/vo/TransferOrderBVo.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/vo/TransferOrderBVo.java deleted file mode 100644 index 76b7c102..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/vo/TransferOrderBVo.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.hzs.scm.trans.vo; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import com.hzs.scm.pub.vo.ScmReturnBVo; -import com.hzs.scm.pub.vo.ScmSpecsVO; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -/** - * @description: 供应链返回到会员端明细vo - * @author: sui q - * @time: 2023/12/7 16:38 - * @classname: PoOrderItemsVO - * @package_name: com.hzs.scm.po.vo - * version 1.0.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class TransferOrderBVo extends ScmReturnBVo { - - /** - * 主键 - */ - private Long pkId; - - private Integer pkInStorehouse; - - /** - * 仓库名称 - */ - private String inStorehouseName; - - private Integer pkOutStorehouse; - - /** - * 仓库名称 - */ - private String outStorehouseName; - - /** - * 计划出库日期 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date planDate; - - /** - * 供应商 - */ - private Integer pkCubasdoc; - - /** - * 供应商名称 - */ - private String cubasdocName; - - - /** - * 累计调出数量 - */ - private BigDecimal totalTransOutNum; - - /** - * 累计调入数量 - */ - private BigDecimal totalTransInNum; - - private List scmItemSpecsList; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/vo/TransferOrderVo.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/vo/TransferOrderVo.java deleted file mode 100644 index b81f9527..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/vo/TransferOrderVo.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.hzs.scm.trans.vo; - -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import com.hzs.scm.pub.vo.ScmReturnVo; -import com.hzs.scm.po.vo.PoOrderBVo; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.List; - -/** - * @description: 供应链返回到会员端vo - * @author: sui q - * @time: 2023/12/7 16:38 - * @classname: PoOrderVo - * @package_name: com.hzs.scm.po.vo - * version 1.0.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class TransferOrderVo extends ScmReturnVo { - - /** - * 调出人 - */ - private Long pkWhsmanager; - - /** - * 公司 - */ - private Integer pkCorp; - - /** - * 调出公司 - */ - private Integer pkOutCorp; - - /** - * 调入公司 - */ - private Integer pkInCorp; - - private String corpInName; - - private String countryInName; - - /** - * 调拨方式 1=公司内调拨 2=公司间调拨 3=国家间调拨 - */ - @Transaction(transactionKey = EnumsPrefixConstants.SCM_TRANSFER_TYPE) - private Integer transType; - - private String transTypeVal; - - /** - * 调入国家 - */ - @Transaction(transactionKey = EnumsPrefixConstants.KEY_COUNTRY) - private Integer pkInCountry; - - private String pkInCountryVal; - - /** - * 调出国家 - */ - @Transaction(transactionKey = EnumsPrefixConstants.KEY_COUNTRY) - private Integer pkOutCountry; - - private String pkOutCountryVal; - - @Transaction - private List scmReturnbVoList; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/vo/TransferOutBVo.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/vo/TransferOutBVo.java deleted file mode 100644 index 29198e9c..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/vo/TransferOutBVo.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.hzs.scm.trans.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.scm.pub.vo.ScmReturnBVo; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; - -/** - * @description: 调拨出库明细表 - * @author: sui q - * @time: 2023/12/25 11:22 - * @classname: TransferOutBVO - * @package_name: com.hzs.scm.trans.vo - * version 1.0.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class TransferOutBVo extends ScmReturnBVo { - /** - * 单位名称 - */ - private String unitName; - - /** - * 货位名称 - */ - private String clocationName; - - /** - * 仓库名称 - */ - private String storehouseName; - - - private String batchCode; - - /** - * 产品编号 - */ - private String productCode; - - /** - * 产品名称 - */ - private String productName; - - /** - * 规格名称 - */ - private String specsName; - - /** - * 供应商名称 - */ - private String cubasdocName; - - /** - * 仓库名称 - */ - private String inStorehouseName; - - /** - * 调入仓库 - */ - private Integer pkInStorehouse; - - - /** - * 批次主键 - */ - private Long pkBatchCode; - - /** - * 出库日期 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date bizDate; - - /** - * 计划到货日期 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date planArriveDate; - - /** - * 调拨订单主键 - */ - private Long pkTransfer; - - /** - * 调拨订单明细主键 - */ - private Long pkTransferItems; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/vo/TransferOutExcelVO.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/vo/TransferOutExcelVO.java deleted file mode 100644 index 4e8c577d..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/vo/TransferOutExcelVO.java +++ /dev/null @@ -1,152 +0,0 @@ -package com.hzs.scm.trans.vo; - -import com.hzs.common.core.annotation.Excel; -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -/** - * @description: 采购入库导出vo - * @author: sui q - * @time: 2024/3/6 15:32 - * @classname: PurchaseExcelVO - * @package_name: com.hzs.scm.purchase.vo - * version 1.0.0 - */ -@Data -public class TransferOutExcelVO implements Serializable { - - /** - * 订单编号 - */ - @Excel(name = "出库编号") - private String orderCode; - - /** - * 管理员名称 - */ - @Excel(name = "库管员") - private String managerName; - - /** - * 部门名称 - */ - @Excel(name = "出库部门") - private String deptName; - - /** - * 采购组织名称 - */ - @Excel(name = "出库公司") - private String corpName; - - @Excel(name = "入库公司") - private String countryInName; - - /** - * 订单日期 2023-10 - */ - @Excel(name = "出库日期", dateFormat = "yyyy-MM-dd") - private Date orderDate; - - @Excel(name = "订单状态", readConverterExp = "1=已保存,2=已提交,3=已审核,4=已收货,5=已关闭,6=已退货") - private Integer orderStatus; - - /** - * 备注 - */ - @Excel(name = "备注") - private String remark; - - /** - * 产品编号 - */ - @Excel(name = "产品编号") - private String productCode; - - /** - * 产品名称 - */ - @Excel(name = "产品名称") - private String productName; - - /** - * 规格名称 - */ - @Excel(name = "规格名称") - private String specsName; - - /** - * 单位名称 - */ - @Excel(name = "单位") - private String unitName; - - /** - * 仓库名称 - */ - @Excel(name = "调出仓库") - private String storehouseName; - - /** - * 仓库名称 - */ - @Excel(name = "调入仓库") - private String inStorehouseName; - - /** - * 批次号 - */ - @Excel(name = "批次号") - private String batchCode; - - /** - * 入库日期 - */ - @Excel(name = "出库日期", dateFormat = "yyyy-MM-dd") - private Date bizDate; - - /** - * 数量 - */ - @Excel(name = "数量") - private BigDecimal nnum; - /** - * 无税单价 - */ - @Excel(name = "无税单价") - private BigDecimal norigprice; - - /** - * 税率 - */ - @Excel(name = "税率") - private BigDecimal ntaxrate; - - /** - * 含税单价 = 无税单价*（1+税率） - */ - @Excel(name = "含税单价") - private BigDecimal norigtaxprice; - - /** - * 无税金额 = 无税单价*数量 - */ - @Excel(name = "无税金额") - private BigDecimal norigmny; - - /** - * 税额 =无税单价*数量 - */ - @Excel(name = "税额") - private BigDecimal ntax; - - /** - * 价税合计 含税单价*数量 - */ - @Excel(name = "价税合计") - private BigDecimal norigtaxmny; - -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/vo/TransferOutVo.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/vo/TransferOutVo.java deleted file mode 100644 index 6cbf6ffd..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/vo/TransferOutVo.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.hzs.scm.trans.vo; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import com.hzs.scm.pub.vo.ScmReturnVo; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.List; - -/** - * @description: 调拨出库单 - * @author: sui q - * @time: 2023/12/25 11:20 - * @classname: TransferOutVO - * @package_name: com.hzs.scm.trans.vo - * version 1.0.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class TransferOutVo extends ScmReturnVo { - - /** - * 调出人 - */ - private Long pkWhsmanager; - - /** - * 调入公司 - */ - @Transaction(transactionKey = EnumsPrefixConstants.KEY_COUNTRY) - private Integer pkInCorp; - - private String corpInName; - - /** - * 调入国家 - */ - private Integer pkInCountry; - - private String countryInName; - - @Transaction - private List scmReturnbVoList; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/warn/manage/controller/IcWarnConfigController.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/warn/manage/controller/IcWarnConfigController.java deleted file mode 100644 index a3eaf219..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/warn/manage/controller/IcWarnConfigController.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.hzs.scm.warn.manage.controller; - - -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.ObjectUtil; -import com.hzs.common.core.annotation.Log; -import com.hzs.common.core.constant.msg.MemberMsgConstants; -import com.hzs.common.core.constant.msg.ScmMsgConstants; -import com.hzs.common.core.enums.EOperationBusiness; -import com.hzs.common.core.enums.EOperationMethod; -import com.hzs.common.core.enums.EOperationModule; -import com.hzs.common.core.web.controller.BaseController; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.scm.warn.ext.IcWarnConfigExt; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.common.util.TransactionUtils; -import com.hzs.scm.warn.param.WarnConfigParam; -import com.hzs.scm.warn.service.IIcWarnConfigService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - *

- * 产品预警配置 前端控制器 - *

- * - * @author hzs - * @since 2024-03-26 - */ -@RestController -@RequestMapping("/manage/warn") -public class IcWarnConfigController extends BaseController { - - @Autowired - private IIcWarnConfigService warnConfigService; - - /** - * 查询列表 - * - * @return warnConfigParam 入参 - */ - @PostMapping("/list") - @Log(module = EOperationModule.SCM_WARN, business = EOperationBusiness.SCM_WARN, method = EOperationMethod.SELECT) - public TableDataInfo listPoOrder(@RequestBody WarnConfigParam warnConfigParam) { - startPage(); - warnConfigParam.setPkCountry(SecurityUtils.getPkCountry()); - return getDataTable(warnConfigService.queryWarnConfigByCondition(warnConfigParam)); - } - - /** - * 新增预警配置 - * - * @param warnConfigParam 入参 - */ - @PostMapping("/insert") - @Log(module = EOperationModule.SCM_WARN, business = EOperationBusiness.SCM_WARN, method = EOperationMethod.INSERT) - public AjaxResult insertWarnConfig(@RequestBody WarnConfigParam warnConfigParam) { - // 验证供应商 - String msg = validateWarnConfigParam(warnConfigParam); - if (ObjectUtil.isNotEmpty(msg)) { - return AjaxResult.error(TransactionUtils.getContent(msg)); - } - warnConfigService.saveWarnConfigByParam(warnConfigParam); - return AjaxResult.success(); - } - - /** - * 修改采购入库 - * - * @param warnConfigParam 入参 - */ - @PostMapping("/update") - @Log(module = EOperationModule.SCM_WARN, business = EOperationBusiness.SCM_WARN, method = EOperationMethod.UPDATE) - public AjaxResult updateWarnConfig(@RequestBody WarnConfigParam warnConfigParam) { - if (warnConfigParam.getPkId() == null) { - return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.REQUIRED_NOT_EMPTY)); - } - // 验证供应商 - String msg = validateWarnConfigParam(warnConfigParam); - if (ObjectUtil.isNotEmpty(msg)) { - return AjaxResult.error(TransactionUtils.getContent(msg)); - } - warnConfigService.saveWarnConfigByParam(warnConfigParam); - return AjaxResult.success(); - } - - private String validateWarnConfigParam(WarnConfigParam warnConfigParam){ - warnConfigParam.setPkCountry(SecurityUtils.getPkCountry()); - warnConfigParam.setPkCreator(SecurityUtils.getUserId()); - if(warnConfigParam.getPkProductBas() == null || warnConfigParam.getWarnPeriod() == null || - warnConfigParam.getWarnQuantity() == null || CollectionUtil.isEmpty(warnConfigParam.getScmItemSpecsList())){ - return MemberMsgConstants.REQUIRED_NOT_EMPTY; - } - // 验证是否存在该产品的预警 - WarnConfigParam queryParam = new WarnConfigParam(); - queryParam.setPkProductBas(warnConfigParam.getPkProductBas()); - queryParam.setPkId(warnConfigParam.getPkId()); - queryParam.setScmItemSpecsList(warnConfigParam.getScmItemSpecsList()); - List icWarnConfigExtList = warnConfigService.queryWarnConfigByCondition(queryParam); - if(CollectionUtil.isNotEmpty(icWarnConfigExtList)){ - return ScmMsgConstants.PRODUCT_HAS_EXIST; - } - return null; - } - - /** - * 删除采购入库 - * - * @param pkId 主键 - */ - @DeleteMapping("/{pkId}") - @Log(module = EOperationModule.SCM_WARN, business = EOperationBusiness.SCM_WARN, method = EOperationMethod.DELETE) - public AjaxResult delete(@PathVariable Integer pkId) { - // 验证是否存在订单，订单状态是否是保存状态 - if (pkId == null) { - return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.REQUIRED_NOT_EMPTY)); - } - warnConfigService.deleteWarnConfigById(pkId, SecurityUtils.getUserId()); - return AjaxResult.success(); - } - -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/warn/mapper/IcWarnConfigMapper.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/warn/mapper/IcWarnConfigMapper.java deleted file mode 100644 index f619e5b2..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/warn/mapper/IcWarnConfigMapper.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.hzs.scm.warn.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.scm.warn.IcWarnConfig; -import com.hzs.common.domain.scm.warn.ext.IcWarnConfigExt; -import com.hzs.scm.warn.param.WarnConfigParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - *

- * 产品预警配置 Mapper 接口 - *

- * - * @author hzs - * @since 2024-03-26 - */ -public interface IcWarnConfigMapper extends BaseMapper { - - List queryWarnConfigByCondition(@Param("warnConfigParam") WarnConfigParam warnConfigParam); - - /* - * @description: 查询库存不足的产品 - * @author: sui q - * @date: 2024/3/27 16:37 - * @param: null null - **/ - List queryWarnConfigInventory(); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/warn/mapper/IcWarnConfigSpecsMapper.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/warn/mapper/IcWarnConfigSpecsMapper.java deleted file mode 100644 index d356bf1a..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/warn/mapper/IcWarnConfigSpecsMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.hzs.scm.warn.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.scm.warn.IcWarnConfigSpecs; - -/** - *

- * 预警配置规格明细 Mapper 接口 - *

- * - * @author hzs - * @since 2024-03-27 - */ -public interface IcWarnConfigSpecsMapper extends BaseMapper { - -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/warn/param/WarnConfigParam.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/warn/param/WarnConfigParam.java deleted file mode 100644 index 74febc38..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/warn/param/WarnConfigParam.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.hzs.scm.warn.param; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.hzs.scm.pub.param.ItemSpecsParam; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -/** - * @description: 预警配置参数 - * @author: sui q - * @time: 2024/3/26 14:19 - * @classname: WarnConfigParam - * @package_name: com.hzs.scm.warn.param - * version 1.0.0 - */ -@Data -public class WarnConfigParam implements Serializable { - - /** - * 主键 - */ - private Long pkId; - - /** - * 产品基本信息 - */ - private Integer pkProductBas; - - private String productCode; - - private String productName; - - /** - * 预警数量 - */ - private Integer warnQuantity; - - /** - * 预警期间 - */ - private Integer warnPeriod; - - private Integer pkCountry; - - private Long pkCreator; - - /** - * 明细表规格明细 - */ - private List scmItemSpecsList; -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/warn/service/IIcWarnConfigService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/warn/service/IIcWarnConfigService.java deleted file mode 100644 index b5b8148c..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/warn/service/IIcWarnConfigService.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.hzs.scm.warn.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.scm.warn.IcWarnConfig; -import com.hzs.common.domain.scm.warn.ext.IcWarnConfigExt; -import com.hzs.scm.warn.param.WarnConfigParam; - -import java.util.List; - -/** - *

- * 产品预警配置 服务类 - *

- * - * @author hzs - * @since 2024-03-26 - */ -public interface IIcWarnConfigService extends IService { - - List queryWarnConfigByCondition(WarnConfigParam warnConfigParam); - - List queryWarnConfigInventory(); - - /* - * @description: 保存预警配置 - * @author: sui q - * @date: 2024/3/26 14:31 - * @param: null null - **/ - void saveWarnConfigByParam(WarnConfigParam warnConfigParam); - - /* - * @description: 删除预警配置 - * @author: sui q - * @date: 2024/3/26 14:37 - * @param: null null - **/ - void deleteWarnConfigById(Integer pkId, Long pkMember); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/warn/service/IIcWarnConfigSpecsService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/warn/service/IIcWarnConfigSpecsService.java deleted file mode 100644 index 1c998969..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/warn/service/IIcWarnConfigSpecsService.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.hzs.scm.warn.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.scm.warn.IcWarnConfigSpecs; - -/** - *

- * 预警配置规格明细 服务类 - *

- * - * @author hzs - * @since 2024-03-27 - */ -public interface IIcWarnConfigSpecsService extends IService { - - /* - * @description: 根据主键删除预警规格表 - * @author: sui q - * @date: 2024/3/27 15:15 - * @param: null null - **/ - void deleteWarnConfigSpecsById(Long pkId, Long pkMember); -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/warn/service/impl/IcWarnConfigServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/warn/service/impl/IcWarnConfigServiceImpl.java deleted file mode 100644 index e9f78e1e..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/warn/service/impl/IcWarnConfigServiceImpl.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.hzs.scm.warn.service.impl; - -import cn.hutool.core.bean.BeanUtil; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.constant.SystemFieldConstants; -import com.hzs.common.core.enums.EYesNo; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.domain.scm.pub.ScmItemSpecs; -import com.hzs.common.domain.scm.warn.IcWarnConfig; -import com.hzs.common.domain.scm.warn.IcWarnConfigSpecs; -import com.hzs.common.domain.scm.warn.ext.IcWarnConfigExt; -import com.hzs.scm.pub.param.ItemSpecsParam; -import com.hzs.scm.warn.mapper.IcWarnConfigMapper; -import com.hzs.scm.warn.param.WarnConfigParam; -import com.hzs.scm.warn.service.IIcWarnConfigService; -import com.hzs.scm.warn.service.IIcWarnConfigSpecsService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.ArrayList; -import java.util.List; - -/** - *

- * 产品预警配置 服务实现类 - *

- * - * @author hzs - * @since 2024-03-26 - */ -@Service -public class IcWarnConfigServiceImpl extends ServiceImpl implements IIcWarnConfigService { - - @Autowired - private IIcWarnConfigSpecsService warnConfigSpecsService; - - @Override - public List queryWarnConfigByCondition(WarnConfigParam warnConfigParam) { - return baseMapper.queryWarnConfigByCondition(warnConfigParam); - } - - @Override - public List queryWarnConfigInventory() { - return baseMapper.queryWarnConfigInventory(); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void saveWarnConfigByParam(WarnConfigParam warnConfigParam) { - if (warnConfigParam.getPkId() == null) { - IcWarnConfig icWarnConfig = BeanUtil.copyProperties(warnConfigParam, IcWarnConfig.class); - icWarnConfig.setPkCreator(warnConfigParam.getPkCreator()); - save(icWarnConfig); - warnConfigParam.setPkId(icWarnConfig.getPkId()); - } else { - // 删除规格 - warnConfigSpecsService.deleteWarnConfigSpecsById(warnConfigParam.getPkId(), warnConfigParam.getPkCreator()); - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.set("PK_PRODUCT_BAS", warnConfigParam.getPkProductBas()); - updateWrapper.set("WARN_QUANTITY", warnConfigParam.getWarnQuantity()); - updateWrapper.set("WARN_PERIOD", warnConfigParam.getWarnPeriod()); - updateWrapper.set("MODIFIED_TIME", DateUtils.currentDateTime()); - updateWrapper.set("PK_MODIFIED", warnConfigParam.getPkCreator()); - updateWrapper.eq(SystemFieldConstants.PK_ID, warnConfigParam.getPkId()); - update(updateWrapper); - } - List warnConfigSpecsList = new ArrayList<>(); - for (ItemSpecsParam itemSpecsParam : warnConfigParam.getScmItemSpecsList()) { - IcWarnConfigSpecs scmItemSpecs = IcWarnConfigSpecs.builder() - .pkWarnConfig(warnConfigParam.getPkId()) - .pkSpecsType(itemSpecsParam.getPkSpecsType()) - .pkSpecs(itemSpecsParam.getPkSpecs()) - .specsName(itemSpecsParam.getSpecsName()) - .build(); - scmItemSpecs.setPkCreator(warnConfigParam.getPkCreator()); - scmItemSpecs.setPkCountry(warnConfigParam.getPkCountry()); - warnConfigSpecsList.add(scmItemSpecs); - } - warnConfigSpecsService.saveBatch(warnConfigSpecsList); - } - - @Override - public void deleteWarnConfigById(Integer pkId, Long pkMember) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.set(SystemFieldConstants.DEL_FLAG, EYesNo.NO.getIntValue()); - updateWrapper.set(SystemFieldConstants.PK_MODIFIED, pkMember); - updateWrapper.set(SystemFieldConstants.MODIFIED_TIME, DateUtils.currentDateTime()); - updateWrapper.eq(SystemFieldConstants.PK_ID, pkId); - update(updateWrapper); - } -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/warn/service/impl/IcWarnConfigSpecsServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/warn/service/impl/IcWarnConfigSpecsServiceImpl.java deleted file mode 100644 index f1ec0758..00000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/warn/service/impl/IcWarnConfigSpecsServiceImpl.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.hzs.scm.warn.service.impl; - -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.constant.SaOrderFieldConstants; -import com.hzs.common.core.constant.SystemFieldConstants; -import com.hzs.common.core.enums.EYesNo; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.domain.scm.po.PoOrderItems; -import com.hzs.common.domain.scm.warn.IcWarnConfigSpecs; -import com.hzs.scm.warn.mapper.IcWarnConfigSpecsMapper; -import com.hzs.scm.warn.service.IIcWarnConfigSpecsService; -import org.springframework.stereotype.Service; - -/** - *

- * 预警配置规格明细 服务实现类 - *

- * - * @author hzs - * @since 2024-03-27 - */ -@Service -public class IcWarnConfigSpecsServiceImpl extends ServiceImpl implements IIcWarnConfigSpecsService { - - @Override - public void deleteWarnConfigSpecsById(Long pkId, Long pkMember) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.set(SystemFieldConstants.DEL_FLAG, EYesNo.NO.getIntValue()); - updateWrapper.set(SystemFieldConstants.PK_MODIFIED, pkMember); - updateWrapper.set(SystemFieldConstants.MODIFIED_TIME, DateUtils.currentDateTime()); - updateWrapper.eq("PK_WARN_CONFIG", pkId); - update(updateWrapper); - } -} diff --git a/bd-business/bd-business-scm/src/main/resources/banner.txt b/bd-business/bd-business-scm/src/main/resources/banner.txt deleted file mode 100644 index 0dd5eee9..00000000 --- a/bd-business/bd-business-scm/src/main/resources/banner.txt +++ /dev/null @@ -1,2 +0,0 @@ -Spring Boot Version: ${spring-boot.version} -Spring Application Name: ${spring.application.name} diff --git a/bd-business/bd-business-scm/src/main/resources/bootstrap.yml b/bd-business/bd-business-scm/src/main/resources/bootstrap.yml deleted file mode 100644 index 4197cae5..00000000 --- a/bd-business/bd-business-scm/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,80 +0,0 @@ -# Tomcat -server: - port: 8099 - -# Spring -spring: - application: - # 应用名称 - name: bd-scm - jackson: - # 返回数据序列化时，如果为 null 则不进行返回 - default-property-inclusion: NON_NULL - servlet: - # 文件上传 - multipart: - # 单个文件大小 - max-file-size: 50MB - # 设置总上传的文件大小 - max-request-size: 55MB - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: @config.server-addr@ - username: @config.username@ - password: @config.password@ - namespace: @config.namespace@ - config: - # 配置中心地址 - server-addr: @config.server-addr@ - username: @config.username@ - password: @config.password@ - namespace: @config.namespace@ - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - ## 业务模块依赖的公用配置（缓存、数据库、事务、mybatis-plus） - - business-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - main: - ## 当遇到同样名字的时候，是否允许覆盖注册 - allow-bean-definition-overriding: true - ## true 表示控制台不会打印循环依赖异常 - allow-circular-references: true - -dubbo: - registry: - # 使用spring-cloud注册配置 - address: spring-cloud://localhost - consumer: - # 远程服务调用超时时间（毫秒） - timeout: 10000 - # 重试次数（默认：2） - retries: 0 - # 启动时不检查dubbo服务是否启动 - check: false - # 负载策略(random：随机，roundrobin：轮询，leastactive：最少活跃调用) - loadbalance: "leastactive" - protocol: - # 设置协议为dubbo - name: dubbo - # dubbo 协议端口 （-1 表示自增端口，从20880开始） - port: -1 - cloud: - # 订阅服务 - subscribed-services: bd-system, bd-third, bd-sale, hzs-member - scan: - # dubbo 服务扫描包（开启之后才会对外提供服务） - base-packages: com.hzs - -# 日志配置 -logging: - level: - com.hzs: debug - org.springframework: warn - diff --git a/bd-business/bd-business-scm/src/main/resources/logback.xml b/bd-business/bd-business-scm/src/main/resources/logback.xml deleted file mode 100644 index 69fe54a1..00000000 --- a/bd-business/bd-business-scm/src/main/resources/logback.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - ${log.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - ERROR - - ACCEPT - - DENY - - - - - - - - - - - - - - - - - - diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/ground/margin/ThMarginMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/ground/margin/ThMarginMapper.xml deleted file mode 100644 index 2e310e17..00000000 --- a/bd-business/bd-business-scm/src/main/resources/mapper/ground/margin/ThMarginMapper.xml +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/ground/order/SaOrderSettleMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/ground/order/SaOrderSettleMapper.xml deleted file mode 100644 index 976bc61e..00000000 --- a/bd-business/bd-business-scm/src/main/resources/mapper/ground/order/SaOrderSettleMapper.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - merge into sa_order_settle st - using( - - select #{item.pkId} pk_id from dual - - ) b on (st.pk_id=b.pk_id) - when matched then - update set st.settle_status=0,modified_time=sysdate - - - - - diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/ground/order/SupplierOrderMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/ground/order/SupplierOrderMapper.xml deleted file mode 100644 index 0ff70095..00000000 --- a/bd-business/bd-business-scm/src/main/resources/mapper/ground/order/SupplierOrderMapper.xml +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/ground/postage/ThSupplierPostageMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/ground/postage/ThSupplierPostageMapper.xml deleted file mode 100644 index dcbc763a..00000000 --- a/bd-business/bd-business-scm/src/main/resources/mapper/ground/postage/ThSupplierPostageMapper.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/ground/product/BdProductBasMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/ground/product/BdProductBasMapper.xml deleted file mode 100644 index ef4ad4af..00000000 --- a/bd-business/bd-business-scm/src/main/resources/mapper/ground/product/BdProductBasMapper.xml +++ /dev/null @@ -1,209 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/ground/product/BdProductBasSpecsMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/ground/product/BdProductBasSpecsMapper.xml deleted file mode 100644 index fe27a786..00000000 --- a/bd-business/bd-business-scm/src/main/resources/mapper/ground/product/BdProductBasSpecsMapper.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/ground/product/ThApprovalLogMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/ground/product/ThApprovalLogMapper.xml deleted file mode 100644 index 8226e80c..00000000 --- a/bd-business/bd-business-scm/src/main/resources/mapper/ground/product/ThApprovalLogMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/ground/product/ThProductExtendMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/ground/product/ThProductExtendMapper.xml deleted file mode 100644 index 30c8657c..00000000 --- a/bd-business/bd-business-scm/src/main/resources/mapper/ground/product/ThProductExtendMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/ground/product/ThProductMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/ground/product/ThProductMapper.xml deleted file mode 100644 index 48852e0d..00000000 --- a/bd-business/bd-business-scm/src/main/resources/mapper/ground/product/ThProductMapper.xml +++ /dev/null @@ -1,138 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/ground/product/ThProductSpecsMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/ground/product/ThProductSpecsMapper.xml deleted file mode 100644 index 1446a67e..00000000 --- a/bd-business/bd-business-scm/src/main/resources/mapper/ground/product/ThProductSpecsMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/ground/supplier/ThSupplierApplyMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/ground/supplier/ThSupplierApplyMapper.xml deleted file mode 100644 index de0af53e..00000000 --- a/bd-business/bd-business-scm/src/main/resources/mapper/ground/supplier/ThSupplierApplyMapper.xml +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/scm/general/IcGeneralInBMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/scm/general/IcGeneralInBMapper.xml deleted file mode 100644 index 8df2718a..00000000 --- a/bd-business/bd-business-scm/src/main/resources/mapper/scm/general/IcGeneralInBMapper.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - update ic_generalin_b set del_flag = 1,pk_modified=#{pkMember},modified_time = sysdate where del_flag=0 and - pk_id in - - #{item.pkId} - - - - - - diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/scm/general/IcGeneralInHMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/scm/general/IcGeneralInHMapper.xml deleted file mode 100644 index ca99707a..00000000 --- a/bd-business/bd-business-scm/src/main/resources/mapper/scm/general/IcGeneralInHMapper.xml +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/scm/general/IcGeneralOutBMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/scm/general/IcGeneralOutBMapper.xml deleted file mode 100644 index d5d27d64..00000000 --- a/bd-business/bd-business-scm/src/main/resources/mapper/scm/general/IcGeneralOutBMapper.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - update ic_generalout_b set del_flag = 1,pk_modified=#{pkMember},modified_time = sysdate where del_flag=0 and - pk_id in - - #{item.pkId} - - - - - diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/scm/general/IcGeneralOutHMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/scm/general/IcGeneralOutHMapper.xml deleted file mode 100644 index e60a8475..00000000 --- a/bd-business/bd-business-scm/src/main/resources/mapper/scm/general/IcGeneralOutHMapper.xml +++ /dev/null @@ -1,121 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/scm/ic/IcAvailableNumMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/scm/ic/IcAvailableNumMapper.xml deleted file mode 100644 index 4d1a1ef1..00000000 --- a/bd-business/bd-business-scm/src/main/resources/mapper/scm/ic/IcAvailableNumMapper.xml +++ /dev/null @@ -1,151 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - merge into ic_available_num a - using( - - select #{item.pkId} pk_id,#{item.availableNum} available_num,#{item.pkModified} pk_modified, - #{item.modifiedTime} modified_time from dual - - ) b - on (a.pk_id=b.pk_id) - when matched then - update set a.available_num=a.available_num-b.available_num,a.pk_modified=b.pk_modified, - a.modified_time=b.modified_time - - - update ic_available_num set available_num = available_num + #{availableNum}, - - pk_cubasdoc=#{pkCubasdoc,jdbcType=INTEGER}, - - pk_modified=#{pkModified},modified_time=#{modifiedTime} - where del_flag=0 and pk_id=#{pkId} - - - - - - - - - diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/scm/ic/IcAvailableSpecsMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/scm/ic/IcAvailableSpecsMapper.xml deleted file mode 100644 index baee5417..00000000 --- a/bd-business/bd-business-scm/src/main/resources/mapper/scm/ic/IcAvailableSpecsMapper.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - - - merge into IC_AVAILABLE_SPECS ip - using ( - - select #{item.pkAvailableNum} pk_available_num,#{item.pkSpecsType} PK_SPECS_TYPE,#{item.pkSpecs} PK_SPECS, - #{item.specsName, jdbcType=VARCHAR} SPECS_NAME,#{item.pkCountry} pk_country,#{item.pkCreator} pk_creator from dual - - ) b - on (ip.pk_available_num=b.pk_available_num and ip.pk_specs=b.pk_specs) - WHEN NOT MATCHED THEN - insert (PK_ID, PK_AVAILABLE_NUM, PK_SPECS_TYPE, PK_SPECS, SPECS_NAME,PK_COUNTRY, PK_CREATOR) - values ( - IC_AVAILABLE_SPECS_SEQ.Nextval,b.pk_available_num,b.PK_SPECS_TYPE,b.PK_SPECS, - b.SPECS_NAME,b.pk_country,b.pk_creator) - - - - diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/scm/ic/IcBatchCodeMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/scm/ic/IcBatchCodeMapper.xml deleted file mode 100644 index c8017d2d..00000000 --- a/bd-business/bd-business-scm/src/main/resources/mapper/scm/ic/IcBatchCodeMapper.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/scm/ic/IcOnHandNumBMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/scm/ic/IcOnHandNumBMapper.xml deleted file mode 100644 index 3dcc8dd5..00000000 --- a/bd-business/bd-business-scm/src/main/resources/mapper/scm/ic/IcOnHandNumBMapper.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - INSERT ALL - - into IC_ON_HAND_NUM_B(PK_ONHANDNUM, ORDER_TYPE, - PK_GENERAL_H,PK_GENERAL_B,NNUM,PK_COUNTRY, PK_CREATOR) - VALUES (#{item.pkOnhandnum}, #{item.orderType}, - #{item.pkGeneralH},#{item.pkGeneralB},#{item.nnum},#{item.pkCountry}, #{item.pkCreator} - ) - - SELECT 1 FROM dual - - - - diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/scm/ic/IcOnHandNumMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/scm/ic/IcOnHandNumMapper.xml deleted file mode 100644 index 7e4b4921..00000000 --- a/bd-business/bd-business-scm/src/main/resources/mapper/scm/ic/IcOnHandNumMapper.xml +++ /dev/null @@ -1,198 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - update ic_on_hand_num set product_date=#{productDate, jdbcType=DATE}, - expire_date=#{expireDate, jdbcType=DATE},nonhandnum = nonhandnum + #{nonhandnum}, - pk_modified=#{pkModified},modified_time=#{modifiedTime} - where del_flag=0 and pk_id=#{pkId} - - - merge into ic_on_hand_num a - using( - select pk_id,sum(nonhandnum) nonhandnum,pk_modified,modified_time from( - - select #{item.pkId} pk_id,#{item.nonhandnum} nonhandnum, - #{item.pkModified} pk_modified,#{item.modifiedTime} modified_time from dual - ) - group by pk_id,pk_modified,modified_time - ) b - on (a.pk_id=b.pk_id) - when matched then - update set a.nonhandnum = a.nonhandnum + b.nonhandnum, - a.pk_modified=b.pk_modified,a.modified_time=b.modified_time - where a.del_flag=0 and a.nonhandnum + b.nonhandnum >=0 - - - merge into ic_on_hand_num a - using( - select pk_onhandnum pk_id,sum(nnum) nnum,#{pkMember} pk_modified,sysdate modified_time from ( - - select #{item.pkOnhandnum} pk_onhandnum,#{item.nnum} nnum from dual - - ) - group by pk_onhandnum - ) b - on (a.pk_id=b.pk_id) - when matched then - update set a.nonhandnum = a.nonhandnum + b.nnum, - a.pk_modified=b.pk_modified,a.modified_time=b.modified_time - - - - - - - - - - - diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/scm/ic/IcOnHandSpecsMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/scm/ic/IcOnHandSpecsMapper.xml deleted file mode 100644 index 3dc4eaf0..00000000 --- a/bd-business/bd-business-scm/src/main/resources/mapper/scm/ic/IcOnHandSpecsMapper.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - merge into IC_ON_HAND_SPECS ip - using ( - - select #{item.pkOnhandnum} pk_onhandnum,#{item.pkSpecsType} PK_SPECS_TYPE,#{item.pkSpecs} PK_SPECS, - #{item.specsName, jdbcType=VARCHAR} specs_name,#{item.pkCountry} pk_country,#{item.pkCreator} pk_creator from dual - - ) b - on (ip.pk_onhandnum=b.pk_onhandnum and ip.pk_specs=b.pk_specs) - WHEN NOT MATCHED THEN - insert (PK_ID, PK_ONHANDNUM, PK_SPECS_TYPE, PK_SPECS, SPECS_NAME,PK_COUNTRY, PK_CREATOR) - values ( - IC_ON_HAND_SPECS_SEQ.Nextval,b.pk_onhandnum,b.PK_SPECS_TYPE,b.PK_SPECS, - b.SPECS_NAME,b.pk_country,b.pk_creator) - - - diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/scm/inventory/IcInventoryBMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/scm/inventory/IcInventoryBMapper.xml deleted file mode 100644 index 80a71e6b..00000000 --- a/bd-business/bd-business-scm/src/main/resources/mapper/scm/inventory/IcInventoryBMapper.xml +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - update ic_inventory_b set del_flag = 1,pk_modified=#{pkMember},modified_time = sysdate where del_flag=0 and - pk_id in - - #{item.pkId} - - - - - - diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/scm/inventory/IcInventoryHMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/scm/inventory/IcInventoryHMapper.xml deleted file mode 100644 index 2573cdcb..00000000 --- a/bd-business/bd-business-scm/src/main/resources/mapper/scm/inventory/IcInventoryHMapper.xml +++ /dev/null @@ -1,130 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/scm/io/IoOrderItemsMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/scm/io/IoOrderItemsMapper.xml deleted file mode 100644 index 9cd83edb..00000000 --- a/bd-business/bd-business-scm/src/main/resources/mapper/scm/io/IoOrderItemsMapper.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - update io_order_items set del_flag = 1,pk_modified=#{pkMember},modified_time = sysdate where del_flag=0 and - pk_id in - - #{item.pkId} - - - - - - diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/scm/io/IoOrderMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/scm/io/IoOrderMapper.xml deleted file mode 100644 index a70f92ae..00000000 --- a/bd-business/bd-business-scm/src/main/resources/mapper/scm/io/IoOrderMapper.xml +++ /dev/null @@ -1,132 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/scm/no/ScmBillNoMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/scm/no/ScmBillNoMapper.xml deleted file mode 100644 index 04b8380f..00000000 --- a/bd-business/bd-business-scm/src/main/resources/mapper/scm/no/ScmBillNoMapper.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - update SCM_BILL_NO set MODIFIED_TIME=sysdate,NEXT_VALUE=NEXT_VALUE+1 - where pk_id=#{pkId} and del_flag=0 - - - diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/scm/po/PoOrderItemsMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/scm/po/PoOrderItemsMapper.xml deleted file mode 100644 index e2be34a2..00000000 --- a/bd-business/bd-business-scm/src/main/resources/mapper/scm/po/PoOrderItemsMapper.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select pt.pk_id,pt.pk_order,pt.pk_product_bas,pt.pk_storehouse,bh.name storehouse_name,pt.plan_date,pt.pk_unit,pt.pk_rate, - pt.nnum,pt.norigprice,pt.ntaxrate,pt.norigtaxprice,pt.norigmny,pt.ntax,pt.norigtaxmny,pt.is_gift,pt.close_date,bn.name unit_name, - bp.pk_id pk_product,bp.product_code,bp.product_name,sp.specs_name,se.pk_specs_type,se.pk_specs,se.specs_name from po_order_items pt - left join bd_product_bas bp - on pt.pk_product_bas=bp.pk_id - left join bd_product bd - on pt.pk_product_bas=bd.pk_product_bas and bd.pk_country=pt.pk_country and bd.del_flag=0 - left join bd_storehouse bh - on pt.pk_storehouse=bh.pk_id - left join bd_unit bn - on pt.pk_unit = bn.pk_id - left join scm_item_specs se - on se.pk_order_items=pt.pk_id and se.order_type=1 - left join (select pk_order_items,wm_concat(specs_name) specs_name from scm_item_specs where del_flag=0 - and order_type=1 - group by pk_order_items) sp - on sp.pk_order_items=pt.pk_id - where pt.del_flag=0 and pt.pk_country = #{pkCountry} - and pt.pk_order = #{pkOrder} - - - update po_order_items set del_flag = 1,pk_modified=#{pkMember},modified_time = sysdate where del_flag=0 and - pk_id in - - #{item.pkId} - - - - merge into po_order_items a - using( - - select #{item.pkPoOrder} pk_po_order,#{item.pkPoOrderItems} pk_po_order_items, - #{item.bizDate} biz_date,#{item.nnum} nnum - from dual - - ) b - on (a.pk_id=b.pk_po_order_items and a.pk_order=b.pk_po_order) - when matched then - update set a.naccumstorenum=a.naccumstorenum + b.nnum,a.close_date=b.biz_date - - - - - diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/scm/po/PoOrderMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/scm/po/PoOrderMapper.xml deleted file mode 100644 index fec5dae6..00000000 --- a/bd-business/bd-business-scm/src/main/resources/mapper/scm/po/PoOrderMapper.xml +++ /dev/null @@ -1,207 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - update po_order set ORDER_STATUS= #{orderStatus},MODIFIED_TIME=sysdate,PK_MODIFIED=#{pkMember} where pk_id in( - select pk_order from( - select pk_order, sum(case when NNUM>NACCUMSTORENUM then 1 else 0 end) as NACCUMSTORENUM from po_order_items - where del_flag=0 and pk_order in - - #{item.pkPoOrder} - - group by pk_order - ) - where NACCUMSTORENUM =0) - - - - - - - - diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/scm/pub/ScmItemSpecsMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/scm/pub/ScmItemSpecsMapper.xml deleted file mode 100644 index e0ea5d50..00000000 --- a/bd-business/bd-business-scm/src/main/resources/mapper/scm/pub/ScmItemSpecsMapper.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/scm/pub/ScmOrderApproveLogMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/scm/pub/ScmOrderApproveLogMapper.xml deleted file mode 100644 index d2735800..00000000 --- a/bd-business/bd-business-scm/src/main/resources/mapper/scm/pub/ScmOrderApproveLogMapper.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/scm/purchase/IcPurchaseinBMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/scm/purchase/IcPurchaseinBMapper.xml deleted file mode 100644 index 6858ec60..00000000 --- a/bd-business/bd-business-scm/src/main/resources/mapper/scm/purchase/IcPurchaseinBMapper.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - update ic_purchasein_b set del_flag=1,pk_modified=#{pkModified},modified_time=sysdate - where del_flag=0 and pk_id in - - #{item.pkId} - - - - update ic_purchasein_b set nassistnum=nnum,modified_time=sysdate - where del_flag=0 and pk_id in - - #{item.pkId} - - - - merge into ic_purchasein_b ib - using( - - select #{item.pkSourceB} pk_source_b,#{item.nnum} nnum from dual - - ) b - on (ib.pk_id=b.pk_source_b) - when matched then - update set ib.nassistnum=ib.nassistnum-b.nnum - - - diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/scm/purchase/IcPurchaseinHMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/scm/purchase/IcPurchaseinHMapper.xml deleted file mode 100644 index d7e46c3d..00000000 --- a/bd-business/bd-business-scm/src/main/resources/mapper/scm/purchase/IcPurchaseinHMapper.xml +++ /dev/null @@ -1,230 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - merge into ic_purchasein_h ib - using( - select pk_purchase,(case when sum(nassistnum)=0 then 7 else 6 end) order_status from( - - select pk_purchase,nassistnum from ic_purchasein_b - where pk_purchase = #{item.pkSource} and del_flag=0 - ) - group by pk_purchase - ) b - on (ib.pk_id=b.pk_purchase) - when matched then - update set ib.order_status=b.order_status,pk_modified=#{userId},modified_time=sysdate - - - - - - - diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/scm/sale/IcDelSaleLogMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/scm/sale/IcDelSaleLogMapper.xml deleted file mode 100644 index f92040aa..00000000 --- a/bd-business/bd-business-scm/src/main/resources/mapper/scm/sale/IcDelSaleLogMapper.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/scm/sale/IcSaleoutBMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/scm/sale/IcSaleoutBMapper.xml deleted file mode 100644 index bae23478..00000000 --- a/bd-business/bd-business-scm/src/main/resources/mapper/scm/sale/IcSaleoutBMapper.xml +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - CREATION_TIME, - MODIFIED_TIME, - DEL_FLAG, - PK_CREATOR, - PK_MODIFIED, - PK_COUNTRY, - PK_ID, PK_UNIT, PK_SA_ORDER, PK_SA_ORDER_ITEMS, PK_DELIVERY, PK_DELIVER_ITEMS, PK_SALEOUT, PK_CLOCATION, PK_PRODUCT, TRANS_TYPE, BIZ_DATE, PK_STOREHOUSE, PK_RATE, NNUM, NORIGPRICE, NTAXRATE, NORIGTAXPRICE, NORIGMNY, NTAX, NORIGTAXMNY, PK_BATCH_CODE, IS_GIFT - - - insert ALL - - into IC_SALEOUT_B(PK_ID,PK_UNIT,PK_SA_ORDER,PK_SA_ORDER_ITEMS, - PK_DELIVERY,PK_DELIVER_ITEMS,PK_SALEOUT,PK_CLOCATION, - PK_PRODUCT,BIZ_DATE,PK_STOREHOUSE,PK_RATE,NNUM, - NORIGPRICE,NTAXRATE,NORIGTAXPRICE,NORIGMNY, - NTAX,NORIGTAXMNY,PK_BATCH_CODE,IS_GIFT, - PK_CREATOR,PK_COUNTRY) - values - ( - #{item.pkId},#{item.pkUnit},#{item.pkSaOrder},#{item.pkSaOrderItems}, - #{item.pkDelivery},#{item.pkDeliverItems},#{item.pkSaleout},#{item.pkClocation,jdbcType=INTEGER}, - #{item.pkProduct},#{item.bizDate},#{item.pkStorehouse},#{item.pkRate,jdbcType=INTEGER}, - #{item.nnum},#{item.norigprice},#{item.ntaxrate},#{item.norigtaxprice}, - #{item.norigmny},#{item.ntax},#{item.norigtaxmny},#{item.pkBatchCode,jdbcType=BIGINT}, - #{item.isGift},#{item.pkCreator},#{item.pkCountry} - ) - - SELECT 1 FROM dual - - - - - - diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/scm/sale/IcSaleoutHMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/scm/sale/IcSaleoutHMapper.xml deleted file mode 100644 index f9037f8d..00000000 --- a/bd-business/bd-business-scm/src/main/resources/mapper/scm/sale/IcSaleoutHMapper.xml +++ /dev/null @@ -1,155 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - insert ALL - - into ic_saleout_h(pk_id,pk_dept,pk_whsmanager,customer_type, - pk_customer,pk_storehouse,order_date,order_status, - pk_corp,total_num,order_code,pk_creator,pk_country) - values - ( - #{item.pkId},#{item.pkDept},#{item.pkWhsmanager},#{item.customerType}, - #{item.pkCustomer},#{item.pkStorehouse},#{item.orderDate},#{item.orderStatus}, - #{item.pkCorp},#{item.totalNum},#{item.orderCode},#{item.pkCreator},#{item.pkCountry} - ) - - SELECT 1 FROM dual - - - - - diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/scm/trans/IcTransInBMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/scm/trans/IcTransInBMapper.xml deleted file mode 100644 index 284e79be..00000000 --- a/bd-business/bd-business-scm/src/main/resources/mapper/scm/trans/IcTransInBMapper.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - update ic_transin_b set del_flag=1,pk_modified=#{pkModified},modified_time=sysdate - where del_flag=0 and pk_id in - - #{item.pkId} - - - - - diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/scm/trans/IcTransInHMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/scm/trans/IcTransInHMapper.xml deleted file mode 100644 index 8d5f839f..00000000 --- a/bd-business/bd-business-scm/src/main/resources/mapper/scm/trans/IcTransInHMapper.xml +++ /dev/null @@ -1,163 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/scm/trans/IcTransOutBMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/scm/trans/IcTransOutBMapper.xml deleted file mode 100644 index 7ac337be..00000000 --- a/bd-business/bd-business-scm/src/main/resources/mapper/scm/trans/IcTransOutBMapper.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - update ic_transout_b set del_flag=1,pk_modified=#{pkModified},modified_time=sysdate - where del_flag=0 and pk_id in - - #{item.pkId} - - - - - diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/scm/trans/IcTransOutHMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/scm/trans/IcTransOutHMapper.xml deleted file mode 100644 index f214bbfa..00000000 --- a/bd-business/bd-business-scm/src/main/resources/mapper/scm/trans/IcTransOutHMapper.xml +++ /dev/null @@ -1,212 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/scm/trans/TransferOrderItemsMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/scm/trans/TransferOrderItemsMapper.xml deleted file mode 100644 index 4520dce4..00000000 --- a/bd-business/bd-business-scm/src/main/resources/mapper/scm/trans/TransferOrderItemsMapper.xml +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - merge into transfer_order_items a - using( - select tr.pk_transfer,tr.pk_transfer_items,b.nnum from ic_transout_b tr - inner join( - - select #{item.pkTransferOut} pk_transfer_out,#{item.pkTransferOutB} pk_transfer_out_b,#{item.nnum} nnum - from dual - - ) b - on tr.pk_transfer_out=b.pk_transfer_out and tr.pk_id=b.pk_transfer_out_b - ) b - on (a.pk_id=b.pk_transfer_items and a.pk_transfer=b.pk_transfer) - when matched then - update set a.total_trans_in_num=a.total_trans_in_num + b.nnum - - - merge into transfer_order_items a - using( - - select #{item.pkTransfer} pk_transfer,#{item.pkTransferItems} pk_transfer_items,#{item.nnum} nnum - from dual - - ) b - on (a.pk_id=b.pk_transfer_items and a.pk_transfer=b.pk_transfer) - when matched then - update set a.total_trans_out_num=a.total_trans_out_num + b.nnum - - - update transfer_order_items set out_end = 0 - where del_flag=0 and out_end = 1 and nnum <= total_trans_out_num and pk_id in - - #{item.pkTransferItems} - - - - update transfer_order_items set del_flag = 1,pk_modified=#{pkMember},modified_time = sysdate where del_flag=0 and - pk_id in - - #{item.pkId} - - - - - diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/scm/trans/TransferOrderMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/scm/trans/TransferOrderMapper.xml deleted file mode 100644 index 61c40546..00000000 --- a/bd-business/bd-business-scm/src/main/resources/mapper/scm/trans/TransferOrderMapper.xml +++ /dev/null @@ -1,215 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - update transfer_order set ORDER_STATUS= #{orderStatus},MODIFIED_TIME=sysdate,PK_MODIFIED=#{pkMember} where pk_id in( - select pk_transfer from( - select pk_transfer, sum(case when NNUM>total_trans_in_num then 1 else 0 end) as NACCUMSTORENUM from transfer_order_items - where del_flag=0 and pk_id in - (select pk_transfer_items from ic_transout_b where del_flag=0 and pk_id in - - #{item.pkTransferOutB} - - ) - group by pk_transfer - ) - where NACCUMSTORENUM =0) - - - - - - - diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/scm/warn/IcWarnConfigMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/scm/warn/IcWarnConfigMapper.xml deleted file mode 100644 index 86a006df..00000000 --- a/bd-business/bd-business-scm/src/main/resources/mapper/scm/warn/IcWarnConfigMapper.xml +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/scm/warn/IcWarnConfigSpecsMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/scm/warn/IcWarnConfigSpecsMapper.xml deleted file mode 100644 index 662b64c5..00000000 --- a/bd-business/bd-business-scm/src/main/resources/mapper/scm/warn/IcWarnConfigSpecsMapper.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/bd-business/bd-business-system/pom.xml b/bd-business/bd-business-system/pom.xml index 1002145a..fed62f6b 100644 --- a/bd-business/bd-business-system/pom.xml +++ b/bd-business/bd-business-system/pom.xml @@ -48,12 +48,6 @@ bd-api-report - - - com.bd - bd-api-scm - - com.bd diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/controller/manage/BdAreaController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/controller/manage/BdAreaController.java index 249057ad..22320aef 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/controller/manage/BdAreaController.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/controller/manage/BdAreaController.java @@ -4,13 +4,10 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.tree.Tree; import cn.hutool.core.lang.tree.TreeNodeConfig; import cn.hutool.core.lang.tree.TreeUtil; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.hzs.common.core.annotation.AccessPermissions; import com.hzs.common.core.constant.CacheConstants; import com.hzs.common.core.constant.msg.AreaMsgConstants; -import com.hzs.common.core.domain.R; -import com.hzs.common.core.enums.EYesNo; import com.hzs.common.core.service.RedisService; import com.hzs.common.core.utils.StringUtils; import com.hzs.common.core.utils.poi.ExcelUtil; @@ -19,14 +16,11 @@ import com.hzs.common.core.web.domain.AjaxResult; import com.hzs.common.core.web.domain.EnumEntity; import com.hzs.common.core.web.page.TableDataInfo; import com.hzs.common.domain.system.base.BdArea; -import com.hzs.common.domain.system.base.BdCountry; import com.hzs.common.domain.system.base.ext.AreaCache; import com.hzs.common.security.utils.SecurityUtils; import com.hzs.common.util.TransactionUtils; -import com.hzs.system.base.ICountryServiceApi; import com.hzs.system.base.service.IBdAreaService; import com.hzs.system.base.vo.BdAreaVo; -import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -34,13 +28,9 @@ import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.Map; /** * 行政区划 前端控制器 - * - * @author hzs - * @since 2022-08-04 */ @RestController @RequestMapping("/manage/area") @@ -51,9 +41,6 @@ public class BdAreaController extends BaseController { @Autowired private RedisService redisService; - @DubboReference - ICountryServiceApi countryServiceApi; - /** * 查询所有的地区 * @@ -329,30 +316,5 @@ public class BdAreaController extends BaseController { return AjaxResult.success(enumEntityList); } - /** - * 获取点亮地区 - * - * @return - */ - @GetMapping("get-light-area") - public AjaxResult getLightArea() { - List js = new ArrayList<>(); - R> allCountryMap = countryServiceApi.getAllCountryMap(); - for (Map.Entry country : allCountryMap.getData().entrySet()) { - JSONObject json = new JSONObject(); - json.put("name", country.getValue().getLightName()); - js.add(json); - } - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(BdArea::getIsIlluminate, EYesNo.YES.getIntValue()); - - List areaList = areaService.list(queryWrapper); - for (BdArea bdArea : areaList) { - JSONObject json = new JSONObject(); - json.put("name", bdArea.getLightName()); - js.add(json); - } - return AjaxResult.success(js); - } } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/controller/manage/BdCubasdocController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/controller/manage/BdCubasdocController.java index a65a03a2..40bf9ae5 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/controller/manage/BdCubasdocController.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/controller/manage/BdCubasdocController.java @@ -7,7 +7,6 @@ import com.hzs.common.core.enums.*; import com.hzs.common.core.web.controller.BaseController; import com.hzs.common.core.web.domain.AjaxResult; import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.system.base.BdCubasdoc; import com.hzs.common.domain.system.base.ext.BdCubasdocExt; import com.hzs.common.security.utils.SecurityUtils; import com.hzs.system.base.param.BdCubasdocParam; @@ -20,12 +19,7 @@ import java.util.ArrayList; import java.util.List; /** - *

* 供应商设置 前端控制器 - *

- * - * @author hzs - * @since 2023-11-20 */ @RestController @RequestMapping("/manage/cus") @@ -36,6 +30,7 @@ public class BdCubasdocController extends BaseController { /** * 查询列表 + * * @return cubasdocParam 入参 */ @GetMapping("/list") @@ -56,7 +51,8 @@ public class BdCubasdocController extends BaseController { /** * 新增体系配置 - * @param cubasdocParam 入参 + * + * @param cubasdocParam 入参 */ @PostMapping("/save") @Log(module = EOperationModule.CUSTOMER_CONFIG, business = EOperationBusiness.CUSTOMER_CONFIG, method = EOperationMethod.INSERT) @@ -80,13 +76,14 @@ public class BdCubasdocController extends BaseController { /** * 查询供应商 + * * @return cubasdocParam 入参 */ @GetMapping("/list-supplier") public TableDataInfo listSupplier(BdCubasdocParam cubasdocParam) { cubasdocParam.setPkCountry(SecurityUtils.getPkCountry()); - Integer checkUser= bdCubasdocService.queryThSupplierApplyUserList(SecurityUtils.getUserId()); - if(checkUser>0){ + Integer checkUser = bdCubasdocService.queryThSupplierApplyUserList(SecurityUtils.getUserId()); + if (checkUser > 0) { cubasdocParam.setPkCreator(SecurityUtils.getUserId()); } List bdCubasdocList = bdCubasdocService.querySupplierByCondition(cubasdocParam); @@ -100,13 +97,14 @@ public class BdCubasdocController extends BaseController { /** * 查询供应商(业务领用专用) + * * @return cubasdocParam 入参 */ @GetMapping("/list-supplierProduct") public TableDataInfo supplierProduct(BdCubasdocParam cubasdocParam) { cubasdocParam.setPkCountry(SecurityUtils.getPkCountry()); - Integer checkUser= bdCubasdocService.queryThSupplierApplyUserList(SecurityUtils.getUserId()); - if(checkUser>0){ + Integer checkUser = bdCubasdocService.queryThSupplierApplyUserList(SecurityUtils.getUserId()); + if (checkUser > 0) { cubasdocParam.setPkCreator(SecurityUtils.getUserId()); } List bdCubasdocList = bdCubasdocService.querySupplierByProduct(cubasdocParam); @@ -120,6 +118,7 @@ public class BdCubasdocController extends BaseController { /** * 查询客户 + * * @return cubasdocParam 入参 */ @GetMapping("/list-customer") diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/provider/CubasdocProvider.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/provider/CubasdocProvider.java index e71d1d00..23aa645d 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/provider/CubasdocProvider.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/provider/CubasdocProvider.java @@ -1,29 +1,14 @@ -package com.hzs.system.base.provider;/** - * @Description: - * @Author: yuhui - * @Time: 2024/5/8 16:09 - * @Classname: CubasdocProvider - * @PackageName: com.hzs.system.base.provider - */ +package com.hzs.system.base.provider; import cn.hutool.core.bean.BeanUtil; import com.hzs.common.core.domain.R; import com.hzs.common.domain.system.base.BdCubasdoc; -import com.hzs.system.base.ICountryServiceApi; import com.hzs.system.base.service.IBdCubasdocService; import com.hzs.system.sys.ICubasdocApi; import com.hzs.system.sys.dto.CubasdocDTO; import org.apache.dubbo.config.annotation.DubboService; import org.springframework.beans.factory.annotation.Autowired; -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.system.base.provider - *@Author: yh - *@CreateTime: 2024-05-08 16:09 - *@Description: TODO - *@Version: 1.0 - */ @DubboService public class CubasdocProvider implements ICubasdocApi { diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdTransferController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdTransferController.java index fa685362..478f66cd 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdTransferController.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdTransferController.java @@ -1,6 +1,5 @@ package com.hzs.system.config.controller.manage; - import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -33,18 +32,13 @@ import java.util.Date; import java.util.List; /** - *

- * 转账配置主表 - 前端控制器 - *

- * - * @author zhangjing - * @since 2022-09-07 + * 转账配置主表 + * 前端控制器 */ @Slf4j @RestController @RequestMapping("/manage/transfer") -public class BdTransferController extends BaseController { +public class BdTransferController extends BaseController { @Autowired private IBdTransferService transferService; @@ -58,35 +52,31 @@ public class BdTransferController extends BaseController { } /** - * @description: 查询转账配置列表 - * @author: zhang jing - * @date: 2022/8/30 10:20 - * @param: [transfer] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 查询转账配置列表 **/ - @Log(module = EOperationModule.WALLET_CONFIG,business = EOperationBusiness.TRANSFER_CONFIG,method = EOperationMethod.SELECT) + @Log(module = EOperationModule.WALLET_CONFIG, business = EOperationBusiness.TRANSFER_CONFIG, method = EOperationMethod.SELECT) @GetMapping("/list") public TableDataInfo list(BdTransfer transfer) { startPage(); QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("PK_COUNTRY", SecurityUtils.getPkCountry()); - if(StringUtils.isNotNull(transfer.getIsRounding())){ - queryWrapper.eq("IS_ROUNDING",transfer.getIsRounding()); + if (StringUtils.isNotNull(transfer.getIsRounding())) { + queryWrapper.eq("IS_ROUNDING", transfer.getIsRounding()); } - if(StringUtils.isNotNull(transfer.getIsReference())){ - queryWrapper.eq("IS_REFERENCE",transfer.getIsReference()); + if (StringUtils.isNotNull(transfer.getIsReference())) { + queryWrapper.eq("IS_REFERENCE", transfer.getIsReference()); } queryWrapper.orderByDesc("CREATION_TIME"); List list = transferService.list(queryWrapper); - List listExt=new ArrayList<>(); - if(CollectionUtil.isNotEmpty(list)){ - for(BdTransfer bt:list){ + List listExt = new ArrayList<>(); + if (CollectionUtil.isNotEmpty(list)) { + for (BdTransfer bt : list) { BdTransferExt bdTransferExt = BeanUtil.copyProperties(bt, BdTransferExt.class); - if(StringUtils.isNotNull(bt.getMinAmount())){ - bdTransferExt.setMinAmountUsa(currencyService.getDollar(bt.getMinAmount(),SecurityUtils.getPkCountry())); + if (StringUtils.isNotNull(bt.getMinAmount())) { + bdTransferExt.setMinAmountUsa(currencyService.getDollar(bt.getMinAmount(), SecurityUtils.getPkCountry())); } - if(StringUtils.isNotNull(bt.getMaxAmount())){ - bdTransferExt.setMaxAmountUsa(currencyService.getDollar(bt.getMaxAmount(),SecurityUtils.getPkCountry())); + if (StringUtils.isNotNull(bt.getMaxAmount())) { + bdTransferExt.setMaxAmountUsa(currencyService.getDollar(bt.getMaxAmount(), SecurityUtils.getPkCountry())); } listExt.add(bdTransferExt); } @@ -95,34 +85,30 @@ public class BdTransferController extends BaseController { } /** - * @description: 导出转账配置 - * @author: zhang jing - * @date: 2023/3/3 16:02 - * @param: [response, transfer] - * @return: void + * 导出转账配置 **/ - @Log(module = EOperationModule.WALLET_CONFIG,business = EOperationBusiness.TRANSFER_CONFIG,method = EOperationMethod.EXPORT) + @Log(module = EOperationModule.WALLET_CONFIG, business = EOperationBusiness.TRANSFER_CONFIG, method = EOperationMethod.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, BdTransfer transfer) { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("PK_COUNTRY", SecurityUtils.getPkCountry()); - if(StringUtils.isNotNull(transfer.getIsRounding())){ - queryWrapper.eq("IS_ROUNDING",transfer.getIsRounding()); + if (StringUtils.isNotNull(transfer.getIsRounding())) { + queryWrapper.eq("IS_ROUNDING", transfer.getIsRounding()); } - if(StringUtils.isNotNull(transfer.getIsReference())){ - queryWrapper.eq("IS_REFERENCE",transfer.getIsReference()); + if (StringUtils.isNotNull(transfer.getIsReference())) { + queryWrapper.eq("IS_REFERENCE", transfer.getIsReference()); } queryWrapper.orderByDesc("CREATION_TIME"); List list = transferService.list(queryWrapper); - List listExt=new ArrayList<>(); - if(CollectionUtil.isNotEmpty(list)){ - for(BdTransfer bt:list){ + List listExt = new ArrayList<>(); + if (CollectionUtil.isNotEmpty(list)) { + for (BdTransfer bt : list) { BdTransferExt bdTransferExt = BeanUtil.copyProperties(bt, BdTransferExt.class); - if(StringUtils.isNotNull(bt.getMinAmount())){ - bdTransferExt.setMinAmountUsa(currencyService.getDollar(bt.getMinAmount(),SecurityUtils.getPkCountry())); + if (StringUtils.isNotNull(bt.getMinAmount())) { + bdTransferExt.setMinAmountUsa(currencyService.getDollar(bt.getMinAmount(), SecurityUtils.getPkCountry())); } - if(StringUtils.isNotNull(bt.getMaxAmount())){ - bdTransferExt.setMaxAmountUsa(currencyService.getDollar(bt.getMaxAmount(),SecurityUtils.getPkCountry())); + if (StringUtils.isNotNull(bt.getMaxAmount())) { + bdTransferExt.setMaxAmountUsa(currencyService.getDollar(bt.getMaxAmount(), SecurityUtils.getPkCountry())); } listExt.add(bdTransferExt); } @@ -133,39 +119,35 @@ public class BdTransferController extends BaseController { /** - * @description: 新增转账配置 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [transfer] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 新增转账配置 **/ - @Log(module = EOperationModule.WALLET_CONFIG,business = EOperationBusiness.TRANSFER_CONFIG,method = EOperationMethod.INSERT) + @Log(module = EOperationModule.WALLET_CONFIG, business = EOperationBusiness.TRANSFER_CONFIG, method = EOperationMethod.INSERT) @PostMapping("/save") public AjaxResult save(@RequestBody BdTransfer transfer) { - if(StringUtils.isNull(transfer.getMinAmount())){ + if (StringUtils.isNull(transfer.getMinAmount())) { return AjaxResult.error(ConfigMsgConstants.MIN_AMOUNT_TRANSFER_NOT_NULL); } - if(StringUtils.isNull(transfer.getMaxAmount())){ + if (StringUtils.isNull(transfer.getMaxAmount())) { return AjaxResult.error(ConfigMsgConstants.MAX_AMOUNT_TRANSFER_NOT_NULL); } - if(StringUtils.isNull(transfer.getIsRounding())){ + if (StringUtils.isNull(transfer.getIsRounding())) { return AjaxResult.error(ConfigMsgConstants.IS_ROUNDING_NOT_NULL); } - if(StringUtils.isNull(transfer.getIsReference())){ + if (StringUtils.isNull(transfer.getIsReference())) { return AjaxResult.error(ConfigMsgConstants.BD_TRANSFER_IS_REFERENCE_NOT_NULL); } - if(StringUtils.isNull(transfer.getMultiple())){ + if (StringUtils.isNull(transfer.getMultiple())) { return AjaxResult.error(ConfigMsgConstants.MULTIPLE_NOT_NULL); } - if(StringUtils.isNull(transfer.getServiceType())){ + if (StringUtils.isNull(transfer.getServiceType())) { return AjaxResult.error(ConfigMsgConstants.SERVICE_TYPE_NOT_NULL); } - if(StringUtils.isNull(transfer.getServiceRatio())){ + if (StringUtils.isNull(transfer.getServiceRatio())) { return AjaxResult.error(ConfigMsgConstants.SERVICE_RATIO_NOT_NULL); } - if(StringUtils.isNull(transfer.getEffectiveDate())){ + if (StringUtils.isNull(transfer.getEffectiveDate())) { return AjaxResult.error(ConfigMsgConstants.EFFECTIVE_DATE_NOT_NULL); } @@ -178,39 +160,35 @@ public class BdTransferController extends BaseController { /** - * @description: 修改转账配置 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [transfer] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 修改转账配置 **/ - @Log(module = EOperationModule.WALLET_CONFIG,business = EOperationBusiness.TRANSFER_CONFIG,method = EOperationMethod.UPDATE) + @Log(module = EOperationModule.WALLET_CONFIG, business = EOperationBusiness.TRANSFER_CONFIG, method = EOperationMethod.UPDATE) @PostMapping("/update") public AjaxResult update(@RequestBody BdTransfer transfer) { - if(StringUtils.isNull(transfer.getMinAmount())){ + if (StringUtils.isNull(transfer.getMinAmount())) { return AjaxResult.error(ConfigMsgConstants.MIN_AMOUNT_TRANSFER_NOT_NULL); } - if(StringUtils.isNull(transfer.getMaxAmount())){ + if (StringUtils.isNull(transfer.getMaxAmount())) { return AjaxResult.error(ConfigMsgConstants.MAX_AMOUNT_TRANSFER_NOT_NULL); } - if(StringUtils.isNull(transfer.getIsRounding())){ + if (StringUtils.isNull(transfer.getIsRounding())) { return AjaxResult.error(ConfigMsgConstants.IS_ROUNDING_NOT_NULL); } - if(StringUtils.isNull(transfer.getIsReference())){ + if (StringUtils.isNull(transfer.getIsReference())) { return AjaxResult.error(ConfigMsgConstants.BD_TRANSFER_IS_REFERENCE_NOT_NULL); } - if(StringUtils.isNull(transfer.getMultiple())){ + if (StringUtils.isNull(transfer.getMultiple())) { return AjaxResult.error(ConfigMsgConstants.MULTIPLE_NOT_NULL); } - if(StringUtils.isNull(transfer.getServiceType())){ + if (StringUtils.isNull(transfer.getServiceType())) { return AjaxResult.error(ConfigMsgConstants.SERVICE_TYPE_NOT_NULL); } - if(StringUtils.isNull(transfer.getServiceRatio())){ + if (StringUtils.isNull(transfer.getServiceRatio())) { return AjaxResult.error(ConfigMsgConstants.SERVICE_RATIO_NOT_NULL); } - if(StringUtils.isNull(transfer.getEffectiveDate())){ + if (StringUtils.isNull(transfer.getEffectiveDate())) { return AjaxResult.error(ConfigMsgConstants.EFFECTIVE_DATE_NOT_NULL); } transfer.setPkModified(SecurityUtils.getUserId()); @@ -221,13 +199,9 @@ public class BdTransferController extends BaseController { /** - * @description: 查询单条转账配置 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [pkId] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 查询单条转账配置 **/ - @Log(module = EOperationModule.WALLET_CONFIG,business = EOperationBusiness.TRANSFER_CONFIG,method = EOperationMethod.SELECT) + @Log(module = EOperationModule.WALLET_CONFIG, business = EOperationBusiness.TRANSFER_CONFIG, method = EOperationMethod.SELECT) @GetMapping("/getOne/{pkId}") public AjaxResult getOne(@PathVariable Long pkId) { BdTransfer transfer = transferService.getById(pkId); @@ -236,20 +210,16 @@ public class BdTransferController extends BaseController { /** - * @description: 删除转账配置 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [pkId] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 删除转账配置 **/ - @Log(module = EOperationModule.WALLET_CONFIG,business = EOperationBusiness.TRANSFER_CONFIG,method = EOperationMethod.DELETE) + @Log(module = EOperationModule.WALLET_CONFIG, business = EOperationBusiness.TRANSFER_CONFIG, method = EOperationMethod.DELETE) @DeleteMapping("/{pkId}") public AjaxResult delete(@PathVariable Long pkId) { - BdTransfer transfer =new BdTransfer(); + BdTransfer transfer = new BdTransfer(); transfer.setPkCountry(SecurityUtils.getPkCountry()); - Integer count= transferService.checkTransfer(transfer); - if(count>0){ - return AjaxResult.error(ConfigMsgConstants.ENABLE_STATE_NOT_DELETE); + Integer count = transferService.checkTransfer(transfer); + if (count > 0) { + return AjaxResult.error(ConfigMsgConstants.ENABLE_STATE_NOT_DELETE); } UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("PK_ID", pkId); diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java index 9205e2e2..f8e5608b 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java @@ -2712,48 +2712,6 @@ public class EnumsController extends BaseController { return AjaxResult.success(enumEntityList); } - /** - * 调拨方式 - * - * @return - */ - @GetMapping("/transfer-type") - public AjaxResult transferType() { - List enumEntityList = new ArrayList<>(); - for (EScmTransferType value : EScmTransferType.values()) { - enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.SCM_TRANSFER_TYPE)); - } - return AjaxResult.success(enumEntityList); - } - - /** - * 供应链订单类型 - * - * @return - */ - @GetMapping("/scm-order-status") - public AjaxResult scmOrderStatus() { - List enumEntityList = new ArrayList<>(); - for (EScmOrderStatus value : EScmOrderStatus.values()) { - enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.SCM_ORDER_STATUS)); - } - return AjaxResult.success(enumEntityList); - } - - /** - * 盘点类型 - * - * @return - */ - @GetMapping("/inventory-type") - public AjaxResult inventoryType() { - List enumEntityList = new ArrayList<>(); - for (EInventoryType value : EInventoryType.values()) { - enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.INVENTORY_TYPE)); - } - return AjaxResult.success(enumEntityList); - } - /** * 客商类型 * diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsInitController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsInitController.java index 34cac8aa..d2a77a14 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsInitController.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsInitController.java @@ -651,25 +651,11 @@ public class EnumsInitController { initList.add(this.createData(value.getKey(), value.getLabel())); } - // 供应链调拨方式 - for (EScmTransferType value : EScmTransferType.values()) { - initList.add(this.createData(value.getKey(), value.getLabel())); - } - - // 供应链订单状态 - for (EScmOrderStatus value : EScmOrderStatus.values()) { - initList.add(this.createData(value.getKey(), value.getLabel())); - } // 正反查 for (EUpDown value : EUpDown.values()) { initList.add(this.createData(value.getKey(), value.getLabel())); } - // 盘点类型 - for (EInventoryType value : EInventoryType.values()) { - initList.add(this.createData(value.getKey(), value.getLabel())); - } - // 客商类型 for (ESupplierType value : ESupplierType.values()) { initList.add(this.createData(value.getKey(), value.getLabel())); diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/api/ApiHoAdvertBannerController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/api/ApiHoAdvertBannerController.java deleted file mode 100644 index 5e413263..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/api/ApiHoAdvertBannerController.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.hzs.system.home.controller.api; - - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.hzs.common.core.utils.StringUtils; -import com.hzs.common.core.web.controller.BaseController; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.system.ext.HoAdvertBannerExt; -import com.hzs.common.domain.system.home.HoAdvertBanner; -import com.hzs.system.home.service.IHoAdvertBannerService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.Date; -import java.util.List; - -/** - *

- * 广告banner 前端控制器 - *

- * - * @author hzs - * @since 2022-12-08 - */ -@RestController -@RequestMapping("/api/ho-advert-banner") -public class ApiHoAdvertBannerController extends BaseController { - - @Autowired - private IHoAdvertBannerService advertBannerService; - - /** - * @description: 查询广告banner - * @author: zhang jing - * @date: 2022/8/30 10:20 - * @param: [advertBanner] - * @return: com.hzs.common.core.web.page.TableDataInfo - **/ - @GetMapping("/list") - public TableDataInfo list(HoAdvertBannerExt advertBannerExt) { - QueryWrapper queryWrapper = new QueryWrapper(); - if(StringUtils.isNotNull(advertBannerExt.getPosition())){ - queryWrapper.eq("POSITION",advertBannerExt.getPosition()); - } - queryWrapper.lt("EFFECTIVE_DATE",new Date()); - queryWrapper.orderByAsc("SORT"); - List list = advertBannerService.list(queryWrapper); - return getDataTable(list); - } - - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/api/ApiHoBackgroundController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/api/ApiHoBackgroundController.java deleted file mode 100644 index 58c5c49a..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/api/ApiHoBackgroundController.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.hzs.system.home.controller.api; - - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.hzs.common.core.web.controller.BaseController; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.system.home.HoBackground; -import com.hzs.system.home.service.IHoBackgroundService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.Date; -import java.util.List; - -/** - *

- * 首页背景 前端控制器 - *

- * - * @author hzs - * @since 2022-11-18 - */ -@RestController -@RequestMapping("/api/ho-background") -public class ApiHoBackgroundController extends BaseController { - - @Autowired - private IHoBackgroundService backgroundService; - - /** - * @description: 查询首页背景列表 - * @author: zhang jing - * @date: 2022/8/30 10:20 - * @param: [background] - * @return: com.hzs.common.core.web.page.TableDataInfo - **/ - @GetMapping("/list") - public TableDataInfo list() { - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.lt("EFFECTIVE_DATE",new Date()); - List list = backgroundService.list(queryWrapper); - return getDataTable(list); - } - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/api/ApiHoEnterpriseMissionController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/api/ApiHoEnterpriseMissionController.java deleted file mode 100644 index 5d2bc202..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/api/ApiHoEnterpriseMissionController.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.hzs.system.home.controller.api; - - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.hzs.common.core.utils.StringUtils; -import com.hzs.common.core.web.controller.BaseController; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.system.ext.HoEnterpriseMissionExt; -import com.hzs.common.domain.system.home.HoEnterpriseMission; -import com.hzs.system.home.service.IHoEnterpriseMissionService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.Date; -import java.util.List; - -/** - *

- * 企业使命 前端控制器 - *

- * - * @author hzs - * @since 2022-11-18 - */ -@RestController -@RequestMapping("/api/ho-enterprise-mission") -public class ApiHoEnterpriseMissionController extends BaseController { - @Autowired - private IHoEnterpriseMissionService enterpriseMissionService; - - /** - * @description: 查询企业使命列表 - * @author: zhang jing - * @date: 2022/8/30 10:20 - * @param: [enterpriseMission] - * @return: com.hzs.common.core.web.page.TableDataInfo - **/ - @GetMapping("/list") - public TableDataInfo list(HoEnterpriseMissionExt enterpriseMission) { - QueryWrapper queryWrapper = new QueryWrapper(); - if(null!=enterpriseMission.getLanguageType()){ - if(enterpriseMission.getLanguageType()!=1){ - queryWrapper.ne("PK_COUNTRY",enterpriseMission.getPkCountry()); - }else{ - queryWrapper.eq("PK_COUNTRY",enterpriseMission.getPkCountry()); - } - } - queryWrapper.lt("EFFECTIVE_DATE",new Date()); - queryWrapper.orderByAsc("SORT"); - List list = enterpriseMissionService.list(queryWrapper); - return getDataTable(list); - } - - /** - * @description: 查询单条个企业使命 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [pkId] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @GetMapping("/getOne/{pkId}") - public AjaxResult getOne(@PathVariable Long pkId) { - HoEnterpriseMission enterpriseMission = enterpriseMissionService.getById(pkId); - return AjaxResult.success(enterpriseMission); - } - - - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/api/ApiHoEnterpriseNewsController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/api/ApiHoEnterpriseNewsController.java deleted file mode 100644 index 0f02e97e..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/api/ApiHoEnterpriseNewsController.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.hzs.system.home.controller.api; - - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.hzs.common.core.utils.StringUtils; -import com.hzs.common.core.web.controller.BaseController; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.system.ext.HoEnterpriseMissionExt; -import com.hzs.common.domain.system.home.HoEnterpriseNews; -import com.hzs.system.home.service.IHoEnterpriseNewsService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.Date; -import java.util.List; - -/** - *

- * 公司新闻 前端控制器 - *

- * - * @author hzs - * @since 2022-11-19 - */ -@RestController -@RequestMapping("/api/ho-enterprise-news") -public class ApiHoEnterpriseNewsController extends BaseController { - @Autowired - private IHoEnterpriseNewsService enterpriseNewsService; - - /** - * @description: 查询公司新闻列表 - * @author: zhang jing - * @date: 2022/8/30 10:20 - * @param: [enterpriseNews] - * @return: com.hzs.common.core.web.page.TableDataInfo - **/ - @GetMapping("/list") - public TableDataInfo list(HoEnterpriseMissionExt enterpriseNews) { - QueryWrapper queryWrapper = new QueryWrapper(); - if(null!=enterpriseNews.getLanguageType()){ - if(enterpriseNews.getLanguageType()!=1){ - queryWrapper.ne("PK_COUNTRY",enterpriseNews.getPkCountry()); - }else{ - queryWrapper.eq("PK_COUNTRY",enterpriseNews.getPkCountry()); - } - } - queryWrapper.lt("EFFECTIVE_DATE",new Date()); - queryWrapper.orderByAsc("SORT"); - List list = enterpriseNewsService.list(queryWrapper); - return getDataTable(list); - } - - - /** - * @description: 查询单条个公司新闻 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [pkId] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @GetMapping("/getOne/{pkId}") - public AjaxResult getOne(@PathVariable Long pkId) { - HoEnterpriseNews enterpriseNews = enterpriseNewsService.getById(pkId); - return AjaxResult.success(enterpriseNews); - } - - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/api/ApiHoEnterpriseStyleController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/api/ApiHoEnterpriseStyleController.java deleted file mode 100644 index 0fac8eac..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/api/ApiHoEnterpriseStyleController.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.hzs.system.home.controller.api; - - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.hzs.common.core.utils.StringUtils; -import com.hzs.common.core.web.controller.BaseController; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.system.ext.HoEnterpriseMissionExt; -import com.hzs.common.domain.system.home.HoEnterpriseStyle; -import com.hzs.system.home.service.IHoEnterpriseStyleService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.Date; -import java.util.List; - -/** - *

- * 公司风采 前端控制器 - *

- * - * @author hzs - * @since 2022-11-19 - */ -@RestController -@RequestMapping("/api/ho-enterprise-style") -public class ApiHoEnterpriseStyleController extends BaseController { - @Autowired - private IHoEnterpriseStyleService enterpriseStyleService; - - /** - * @description: 查询企业使命列表 - * @author: zhang jing - * @date: 2022/8/30 10:20 - * @param: [enterpriseStyle] - * @return: com.hzs.common.core.web.page.TableDataInfo - **/ - @GetMapping("/list") - public TableDataInfo list(HoEnterpriseMissionExt enterpriseStyle) { - QueryWrapper queryWrapper = new QueryWrapper(); - if(null!=enterpriseStyle.getLanguageType()){ - if(enterpriseStyle.getLanguageType()!=1){ - queryWrapper.ne("PK_COUNTRY",enterpriseStyle.getPkCountry()); - }else{ - queryWrapper.eq("PK_COUNTRY",enterpriseStyle.getPkCountry()); - } - } - queryWrapper.lt("EFFECTIVE_DATE",new Date()); - queryWrapper.orderByAsc("SORT"); - List list = enterpriseStyleService.list(queryWrapper); - return getDataTable(list); - } - - - /** - * @description: 查询单条个企业使命 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [pkId] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @GetMapping("/getOne/{pkId}") - public AjaxResult getOne(@PathVariable Long pkId) { - HoEnterpriseStyle enterpriseStyle = enterpriseStyleService.getById(pkId); - return AjaxResult.success(enterpriseStyle); - } - - - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/api/ApiHoGlobalCompanyController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/api/ApiHoGlobalCompanyController.java deleted file mode 100644 index 35deadd2..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/api/ApiHoGlobalCompanyController.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.hzs.system.home.controller.api; - - -import cn.hutool.core.collection.CollectionUtil; -import com.hzs.common.core.web.controller.BaseController; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.system.ext.HoGlobalCompanyExt; -import com.hzs.system.home.service.IHoGlobalCompanyService; -import com.hzs.system.home.vo.HoGlobalCompanyVO; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.ArrayList; -import java.util.List; - -/** - *

- * 全球分布 前端控制器 - *

- * - * @author hzs - * @since 2022-12-08 - */ -@RestController -@RequestMapping("/api/ho-global-company") -public class ApiHoGlobalCompanyController extends BaseController { - - @Autowired - private IHoGlobalCompanyService globalCompanyService; - - /** - * @description: 全球分布 - * @author: zhang jing - * @date: 2022/8/30 10:20 - * @param: [globalCompany] - * @return: com.hzs.common.core.web.page.TableDataInfo - **/ - @GetMapping("/list") - public TableDataInfo list(HoGlobalCompanyVO globalCompanyVO) { - List cttList = globalCompanyService.queryGlobalByContinent(globalCompanyVO); - List list = globalCompanyService.queryGlobalCompanyList(globalCompanyVO); - if (CollectionUtil.isNotEmpty(cttList)) { - for (HoGlobalCompanyVO ctt : cttList) { - List belowList = new ArrayList<>(); - for (HoGlobalCompanyVO li : list) { - if (li.getRegion().equals(ctt.getRegion()) ) { - belowList.add(li); - } - } - ctt.setBelowList(belowList); - } - } - return getDataTable(cttList); - } - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/api/ApiHoMemoirHonorController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/api/ApiHoMemoirHonorController.java deleted file mode 100644 index 0d77dd14..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/api/ApiHoMemoirHonorController.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.hzs.system.home.controller.api; - - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.hzs.common.core.web.controller.BaseController; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.system.home.HoMemoirHonor; -import com.hzs.system.home.service.IHoMemoirHonorService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - *

- * 大事记-资源荣誉 前端控制器 - *

- * - * @author hzs - * @since 2022-12-07 - */ -@RestController -@RequestMapping("/api/ho-memoir-honor") -public class ApiHoMemoirHonorController extends BaseController { - - @Autowired - private IHoMemoirHonorService memoirHonorService; - - /** - * @description: 查询大事记-资质荣誉列表 - * @author: zhang jing - * @date: 2022/8/30 10:20 - * @param: [memoirHonor] - * @return: com.hzs.common.core.web.page.TableDataInfo - **/ - @GetMapping("/list") - public TableDataInfo list() { - startPage(); - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.orderByAsc("SORT"); - List list = memoirHonorService.list(queryWrapper); - return getDataTable(list); - } - - - - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/api/ApiHoMemoirProcessController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/api/ApiHoMemoirProcessController.java deleted file mode 100644 index 07236fc9..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/api/ApiHoMemoirProcessController.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.hzs.system.home.controller.api; - - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.hzs.common.core.utils.StringUtils; -import com.hzs.common.core.web.controller.BaseController; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.system.ext.HoMemoirProcessExt; -import com.hzs.common.domain.system.home.HoMemoirProcess; -import com.hzs.system.home.service.IHoMemoirProcessService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.Date; -import java.util.List; - -/** - *

- * 大事记-发展历程 前端控制器 - *

- * - * @author hzs - * @since 2022-12-01 - */ -@RestController -@RequestMapping("/api/ho-memoir-process") -public class ApiHoMemoirProcessController extends BaseController { - - @Autowired - private IHoMemoirProcessService memoirProcessExtService; - - /** - * @description: 查询大事记-发展历程列表 - * @author: zhang jing - * @date: 2022/8/30 10:20 - * @param: [memoirProcessExt] - * @return: com.hzs.common.core.web.page.TableDataInfo - **/ - @GetMapping("/list") - public TableDataInfo list(HoMemoirProcessExt memoirProcessExt) { - QueryWrapper queryWrapper = new QueryWrapper(); - if(null!=memoirProcessExt.getLanguageType()){ - if(memoirProcessExt.getLanguageType()!=1){ - queryWrapper.ne("PK_COUNTRY",memoirProcessExt.getPkCountry()); - }else{ - queryWrapper.eq("PK_COUNTRY",memoirProcessExt.getPkCountry()); - } - } - queryWrapper.lt("EFFECTIVE_DATE",new Date()); - queryWrapper.orderByAsc("SORT"); - List list = memoirProcessExtService.list(queryWrapper); - return getDataTable(list); - } - - - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/api/ApiHoProductDetailsController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/api/ApiHoProductDetailsController.java deleted file mode 100644 index cd94501e..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/api/ApiHoProductDetailsController.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.hzs.system.home.controller.api; - -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.hzs.common.core.web.controller.BaseController; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.domain.system.home.HoProductDetails; -import com.hzs.system.home.param.HoProductDetailsParam; -import com.hzs.system.home.service.IHoProductDetailsService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - - -/** - *

- * 商品简介详情配置 前端控制器 - *

- * - * @author zhangjing - * @since 2022-09-14 - */ -@RestController -@RequestMapping("/api/ho-product-details") -@Slf4j -public class ApiHoProductDetailsController extends BaseController { - - @Autowired - private IHoProductDetailsService hoLeaderTitleService; - - /** - * @description: 商品简介详情配置 - * @author: zhang jing - * @date: 2022/10/8 15:09 - * @param: [type] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @GetMapping("/getHoProductDetails/{pkAreaClassify}") - public AjaxResult getHoProductDetails(@PathVariable Integer pkAreaClassify) { - HoProductDetailsParam hoProductDetailsParam = hoLeaderTitleService.queryProductDetails(pkAreaClassify); - return AjaxResult.success(hoProductDetailsParam); - } - - /** - * @description: 查询全部商品简介详情配置（H5页面专用） - * @author: zhang jing - * @date: 2023/9/10 20:54 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @GetMapping("/getHoProductDetails-move") - public AjaxResult getHoProductDetailsMove() { - HoProductDetailsParam hoProductDetails = new HoProductDetailsParam(); - List list = hoLeaderTitleService.selectBelowProductDetailsList(hoProductDetails); - if (CollectionUtil.isNotEmpty(list)) { - for (HoProductDetailsParam ho : list) { - List hoProductDetailsParam = hoLeaderTitleService.queryProductDetailsMove(ho.getPkId().intValue()); - ho.setProductDetailsList(hoProductDetailsParam); - } - } - return AjaxResult.success(list); - } - - /** - * @description: 商品展示下拉框 - * @author: zhang jing - * @date: 2023/4/4 18:17 - * @param: [hoLeaderTitle] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @GetMapping("/product-type") - public AjaxResult productType(HoProductDetailsParam hoProductDetailsParam) { - List list = hoLeaderTitleService.selectBelowProductDetailsList(hoProductDetailsParam); - return AjaxResult.success(list); - } - - /** - * @description: 商品详情 - * @author: zhang jing - * @date: 2023/6/12 14:06 - * @param: [pkId] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @GetMapping("/getHoWaresDetails/{pkId}") - public AjaxResult getHoWaresDetails(@PathVariable Integer pkId) { - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq("PK_ID", pkId); - HoProductDetails hoProductDetails = hoLeaderTitleService.getOne(queryWrapper); - return AjaxResult.success(hoProductDetails); - } - - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/api/ApiHoVrAreaController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/api/ApiHoVrAreaController.java deleted file mode 100644 index 54b227f1..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/api/ApiHoVrAreaController.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.hzs.system.home.controller.api; - - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.hzs.common.core.web.controller.BaseController; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.system.ext.HoEnterpriseMissionExt; -import com.hzs.common.domain.system.home.HoVrArea; -import com.hzs.system.home.service.IHoVrAreaService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.Date; -import java.util.List; - -/** - *

- * VR专区 前端控制器 - *

- * - * @author hzs - * @since 2022-11-19 - */ -@RestController -@RequestMapping("/api/ho-vr-area") -public class ApiHoVrAreaController extends BaseController { - @Autowired - private IHoVrAreaService vrAreaService; - - /** - * @description: 查询VR专区列表 - * @author: zhang jing - * @date: 2022/8/30 10:20 - * @param: [vrArea] - * @return: com.hzs.common.core.web.page.TableDataInfo - **/ - @GetMapping("/list") - public TableDataInfo list(HoEnterpriseMissionExt vrArea) { - QueryWrapper queryWrapper = new QueryWrapper(); - if(null!=vrArea.getLanguageType()){ - if(vrArea.getLanguageType()!=1){ - queryWrapper.ne("PK_COUNTRY",vrArea.getPkCountry()); - }else{ - queryWrapper.eq("PK_COUNTRY",vrArea.getPkCountry()); - } - } - queryWrapper.lt("EFFECTIVE_DATE",new Date()); - queryWrapper.orderByAsc("SORT"); - List list = vrAreaService.list(queryWrapper); - return getDataTable(list); - } - - - /** - * @description: 查询单条个VR专区 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [pkId] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @GetMapping("/getOne/{pkId}") - public AjaxResult getOne(@PathVariable Long pkId) { - HoVrArea vrArea = vrAreaService.getById(pkId); - return AjaxResult.success(vrArea); - } - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/api/ApiRegionDistributeController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/api/ApiRegionDistributeController.java deleted file mode 100644 index cfcb2f87..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/api/ApiRegionDistributeController.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.hzs.system.home.controller.api; - - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.hzs.common.core.utils.ip.IpLocationUtils; -import com.hzs.common.core.web.controller.BaseController; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.domain.system.home.HoRegionDistribute; -import com.hzs.common.domain.system.home.HoRegionDistributeItem; -import com.hzs.system.home.param.HoRegionDistributeParam; -import com.hzs.system.home.service.IHoRegionDistributeItemService; -import com.hzs.system.home.service.IHoRegionDistributeService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.ArrayList; -import java.util.List; - - -/** - * @Description: - * @Author: yuhui - * @Time: 2022/10/10 11:28 - * @Classname: SaRegionDistributeController - * @PackageName: com.hzs.system.home.controller.api - */ -@RestController -@RequestMapping("/api/ho-distribute") -@Slf4j -public class ApiRegionDistributeController extends BaseController { - - @Autowired - private IHoRegionDistributeService regionDistributeService; - @Autowired - private IHoRegionDistributeItemService regionDistributeItemService; - - /** - * 查询全球网络分布 - * @return - */ - @GetMapping("get-region-distribute") - public AjaxResult getRegionDistribute(){ - Integer languageType = IpLocationUtils.getIpLocation(); - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("LANGUAGE_TYPE",languageType); - List list = regionDistributeService.list(updateWrapper); - List resultList =new ArrayList<>(); - for (HoRegionDistribute distribute : list) { - HoRegionDistributeParam regionDistributeParam = new HoRegionDistributeParam(); - regionDistributeParam.setName(distribute.getName()); - regionDistributeParam.setSort(distribute.getSort()); - QueryWrapper updateWrapperDistri = new QueryWrapper(); - updateWrapperDistri.eq("REGION_DISTRIBUTE_PK",distribute.getPkId()); - updateWrapperDistri.eq("LANGUAGE_TYPE",languageType); - List regionDistributeItemList = regionDistributeItemService.list(updateWrapperDistri); - regionDistributeParam.setItemList(regionDistributeItemList); - // 查询第一条数据的展示信息 - if (regionDistributeItemList.size() > 0){ - HoRegionDistributeItem regionDistributeItem = regionDistributeItemList.get(0); - // 这个位置让转化为数据形式传递 - List firstRegionDistributeItem =new ArrayList<>(); - firstRegionDistributeItem.add(regionDistributeItem); - regionDistributeParam.setRegionDistributeItem(firstRegionDistributeItem); - } - resultList.add(regionDistributeParam); - } - return AjaxResult.success(resultList); - } - - /** - * 全球网络分布详情 - * @return - */ - @GetMapping("get-region-detail") - public AjaxResult getRegionDetail(Long pkId){ - HoRegionDistributeItem regionDistributeItem = regionDistributeItemService.getById(pkId); - return AjaxResult.success(regionDistributeItem); - } -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/manage/HoAdvertBannerController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/manage/HoAdvertBannerController.java deleted file mode 100644 index 2bc07f3a..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/manage/HoAdvertBannerController.java +++ /dev/null @@ -1,279 +0,0 @@ -package com.hzs.system.home.controller.manage; - - -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.hzs.common.core.constant.msg.ConfigMsgConstants; -import com.hzs.common.core.enums.EDelFlag; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.core.utils.StringUtils; -import com.hzs.common.core.web.controller.BaseController; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.system.ext.HoAdvertBannerExt; -import com.hzs.common.domain.system.home.HoAdvertBanner; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.common.util.TransactionUtils; -import com.hzs.system.home.service.IHoAdvertBannerService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.time.temporal.ChronoUnit; -import java.util.Date; -import java.util.List; - -/** - *

- * 广告banner 前端控制器 - *

- * - * @author hzs - * @since 2022-12-08 - */ -@RestController -@RequestMapping("/manage/ho-advert-banner") -public class HoAdvertBannerController extends BaseController { - - @Autowired - private IHoAdvertBannerService advertBannerService; - - /** - * @description: 查询广告banner - * @author: zhang jing - * @date: 2022/8/30 10:20 - * @param: [advertBanner] - * @return: com.hzs.common.core.web.page.TableDataInfo - **/ - @GetMapping("/list") - public TableDataInfo list(HoAdvertBannerExt advertBannerExt) { - startPage(); - QueryWrapper queryWrapper = new QueryWrapper(); - if(StringUtils.isNotNull(advertBannerExt.getPosition())){ - queryWrapper.eq("POSITION",advertBannerExt.getPosition()); - } - if(StringUtils.isNotNull(advertBannerExt.getStartDate()) - &&StringUtils.isNotNull(advertBannerExt.getEndDate())){ - queryWrapper.between("CREATION_TIME", advertBannerExt.getStartDate(), - DateUtils.afterDateTime(1, ChronoUnit.DAYS,advertBannerExt.getEndDate())); - } - if(StringUtils.isNotNull(advertBannerExt.getStartEffectDate()) - &&StringUtils.isNotNull(advertBannerExt.getEndEffectDate())){ - queryWrapper.between("EFFECTIVE_DATE", advertBannerExt.getStartEffectDate(), - DateUtils.afterDateTime(1, ChronoUnit.DAYS,advertBannerExt.getEndEffectDate())); - } - queryWrapper.orderByAsc("SORT"); - List list = advertBannerService.list(queryWrapper); - return getDataTable(list); - } - - - /** - * @description: 新增广告banner - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [advertBanner] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @PostMapping("/save") - public AjaxResult save(@RequestBody HoAdvertBanner advertBanner) { - - if(StringUtils.isNull(advertBanner.getPosition())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.HO_POSITION_NOT_NULL)); - } - if(StringUtils.isNull(advertBanner.getSort())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.HO_SORT_NOT_NULL)); - } - if(StringUtils.isNull(advertBanner.getEffectiveDate())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.EFFECTIVE_DATE_NOT_NULL)); - } - - if(StringUtils.isEmpty(advertBanner.getLink())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.HO_LINK_ADDRESS_NOT_NULL)); - } - if(StringUtils.isEmpty(advertBanner.getPicture())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.HO_PICTURE_NOT_NULL)); - } - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq("SORT",advertBanner.getSort()); - List list = advertBannerService.list(queryWrapper); - if(CollectionUtil.isNotEmpty(list)){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.HO_SORT_NOT_REPEAT)); - } - advertBanner.setPkCreator(SecurityUtils.getUserId()); - advertBanner.setCreationTime(new Date()); - return toAjax(advertBannerService.save(advertBanner)); - } - - - /** - * @description: 修改广告banner - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [advertBanner] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @PostMapping("/update") - public AjaxResult update(@RequestBody HoAdvertBanner advertBanner) { - if(StringUtils.isNull(advertBanner.getPosition())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.HO_POSITION_NOT_NULL)); - } - if(StringUtils.isNull(advertBanner.getSort())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.HO_SORT_NOT_NULL)); - } - if(StringUtils.isNull(advertBanner.getEffectiveDate())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.EFFECTIVE_DATE_NOT_NULL)); - } - - if(StringUtils.isEmpty(advertBanner.getLink())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.HO_LINK_ADDRESS_NOT_NULL)); - } - if(StringUtils.isEmpty(advertBanner.getPicture())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.HO_PICTURE_NOT_NULL)); - } - - advertBanner.setPkModified(SecurityUtils.getUserId()); - advertBanner.setModifiedTime(new Date()); - return toAjax(advertBannerService.updateById(advertBanner)); - } - - /** - * @description: 修改为置顶 - * @author: zhang jing - * @date: 2022/12/7 11:55 - * @param: [advertBanner] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @PostMapping("/updateTopping") - public AjaxResult updateTopping(@RequestBody HoAdvertBanner advertBanner) { - if(StringUtils.isNull(advertBanner.getPkId())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.PK_ID_NOT_NULL)); - } - - QueryWrapper queryWrapper2 = new QueryWrapper(); - queryWrapper2.eq("PK_ID",advertBanner.getPkId()); - HoAdvertBanner topping =advertBannerService.getOne(queryWrapper2); - if(StringUtils.isNull(topping)){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.HO_OBJECT_NOT_REPEAT)); - } - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.orderByAsc("SORT"); - List list = advertBannerService.list(queryWrapper); - if(CollectionUtil.isNotEmpty(list)){ - HoAdvertBanner toppingOld =list.get(0); - advertBanner.setSort(toppingOld.getSort()); - toppingOld.setSort(topping.getSort()); - toppingOld.setPkModified(SecurityUtils.getUserId()); - toppingOld.setModifiedTime(new Date()); - advertBannerService.updateById(toppingOld); - }else{ - advertBanner.setSort(1); - } - advertBanner.setPkModified(SecurityUtils.getUserId()); - advertBanner.setModifiedTime(new Date()); - return toAjax(advertBannerService.updateById(advertBanner)); - } - - /** - * @description: 上移 - * @author: zhang jing - * @date: 2022/12/7 14:24 - * @param: [advertBanner] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @PostMapping("/moveUp") - public AjaxResult moveUp(@RequestBody HoAdvertBanner advertBanner) { - if(StringUtils.isNull(advertBanner.getPkId())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.PK_ID_NOT_NULL)); - } - HoAdvertBanner advertBannerNew =advertBannerService.getById(advertBanner); - if(StringUtils.isNull(advertBannerNew)){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.HO_OBJECT_NOT_REPEAT)); - } - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.lt("SORT",advertBannerNew.getSort()); - queryWrapper.orderByDesc("SORT"); - List list = advertBannerService.list(queryWrapper); - if(CollectionUtil.isNotEmpty(list)){ - HoAdvertBanner toppingOld =list.get(0); - advertBanner.setSort(toppingOld.getSort()); - toppingOld.setSort(advertBannerNew.getSort()); - toppingOld.setPkModified(SecurityUtils.getUserId()); - toppingOld.setModifiedTime(new Date()); - advertBannerService.updateById(toppingOld); - }else{ - advertBanner.setSort(1); - } - advertBanner.setPkModified(SecurityUtils.getUserId()); - advertBanner.setModifiedTime(new Date()); - return toAjax(advertBannerService.updateById(advertBanner)); - } - - /** - * @description: 下移 - * @author: zhang jing - * @date: 2022/12/7 14:24 - * @param: [advertBanner] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @PostMapping("/moveDown") - public AjaxResult moveDown(@RequestBody HoAdvertBanner advertBanner) { - if(StringUtils.isNull(advertBanner.getPkId())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.PK_ID_NOT_NULL)); - } - HoAdvertBanner advertBannerNew =advertBannerService.getById(advertBanner); - if(StringUtils.isNull(advertBannerNew)){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.HO_OBJECT_NOT_REPEAT)); - } - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.gt("SORT",advertBannerNew.getSort()); - queryWrapper.orderByAsc("SORT"); - List list = advertBannerService.list(queryWrapper); - if(CollectionUtil.isNotEmpty(list)){ - HoAdvertBanner toppingOld =list.get(0); - advertBanner.setSort(toppingOld.getSort()); - toppingOld.setSort(advertBannerNew.getSort()); - toppingOld.setPkModified(SecurityUtils.getUserId()); - toppingOld.setModifiedTime(new Date()); - advertBannerService.updateById(toppingOld); - }else{ - advertBanner.setSort(1); - } - advertBanner.setPkModified(SecurityUtils.getUserId()); - advertBanner.setModifiedTime(new Date()); - return toAjax(advertBannerService.updateById(advertBanner)); - } - - - /** - * @description: 查询单条个广告banner - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [pkId] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @GetMapping("/getOne/{pkId}") - public AjaxResult getOne(@PathVariable Long pkId) { - HoAdvertBanner advertBanner = advertBannerService.getById(pkId); - return AjaxResult.success(advertBanner); - } - - - /** - * @description: 删除广告banner - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [pkId] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @DeleteMapping("/{pkId}") - public AjaxResult delete(@PathVariable Long pkId) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("PK_ID", pkId); - updateWrapper.set("DEL_FLAG", EDelFlag.DELETE.getValue()); - updateWrapper.set("PK_MODIFIED", SecurityUtils.getUserId()); - updateWrapper.set("MODIFIED_TIME", new Date()); - return toAjax(advertBannerService.update(updateWrapper)); - } - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/manage/HoBackgroundController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/manage/HoBackgroundController.java deleted file mode 100644 index 063a59a5..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/manage/HoBackgroundController.java +++ /dev/null @@ -1,130 +0,0 @@ -package com.hzs.system.home.controller.manage; - - -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.hzs.common.core.constant.msg.ConfigMsgConstants; -import com.hzs.common.core.enums.EDelFlag; -import com.hzs.common.core.utils.StringUtils; -import com.hzs.common.core.web.controller.BaseController; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.system.home.HoBackground; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.system.home.service.IHoBackgroundService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.Date; -import java.util.List; - -/** - *

- * 首页背景 前端控制器 - *

- * - * @author hzs - * @since 2022-11-18 - */ -@RestController -@RequestMapping("/manage/ho-background") -public class HoBackgroundController extends BaseController { - - @Autowired - private IHoBackgroundService backgroundService; - - /** - * @description: 查询首页背景列表 - * @author: zhang jing - * @date: 2022/8/30 10:20 - * @param: [background] - * @return: com.hzs.common.core.web.page.TableDataInfo - **/ - @GetMapping("/list") - public TableDataInfo list(HoBackground background) { - startPage(); - List list = backgroundService.list(); - return getDataTable(list); - } - - - /** - * @description: 新增首页背景 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [background] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @PostMapping("/save") - public AjaxResult save(@RequestBody HoBackground background) { - if(StringUtils.isNull(background.getVideoAddress())){ - return AjaxResult.error(ConfigMsgConstants.VIDEO_ADDRESS_NOT_NULL); - } - if(StringUtils.isNull(background.getCoverAddress())){ - return AjaxResult.error(ConfigMsgConstants.COVER_ADDRESS_NOT_NULL); - } - - if(StringUtils.isNull(background.getEffectiveDate())){ - return AjaxResult.error(ConfigMsgConstants.EFFECTIVE_DATE_NOT_NULL); - } - - background.setPkCreator(SecurityUtils.getUserId()); - background.setCreationTime(new Date()); - return toAjax(backgroundService.save(background)); - } - - - /** - * @description: 修改首页背景 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [background] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @PostMapping("/update") - public AjaxResult update(@RequestBody HoBackground background) { - if(StringUtils.isNull(background.getVideoAddress())){ - return AjaxResult.error(ConfigMsgConstants.VIDEO_ADDRESS_NOT_NULL); - } - if(StringUtils.isNull(background.getCoverAddress())){ - return AjaxResult.error(ConfigMsgConstants.COVER_ADDRESS_NOT_NULL); - } - if(StringUtils.isNull(background.getEffectiveDate())){ - return AjaxResult.error(ConfigMsgConstants.EFFECTIVE_DATE_NOT_NULL); - } - background.setPkModified(SecurityUtils.getUserId()); - background.setModifiedTime(new Date()); - return toAjax(backgroundService.updateById(background)); - } - - - /** - * @description: 查询单条个首页背景 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [pkId] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @GetMapping("/getOne/{pkId}") - public AjaxResult getOne(@PathVariable Long pkId) { - HoBackground background = backgroundService.getById(pkId); - return AjaxResult.success(background); - } - - - /** - * @description: 删除首页背景 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [pkId] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @DeleteMapping("/{pkId}") - public AjaxResult delete(@PathVariable Long pkId) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("PK_ID", pkId); - updateWrapper.set("DEL_FLAG", EDelFlag.DELETE.getValue()); - updateWrapper.set("PK_MODIFIED", SecurityUtils.getUserId()); - updateWrapper.set("MODIFIED_TIME", new Date()); - return toAjax(backgroundService.update(updateWrapper)); - } -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/manage/HoEnterpriseMissionController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/manage/HoEnterpriseMissionController.java deleted file mode 100644 index 60fcb2ec..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/manage/HoEnterpriseMissionController.java +++ /dev/null @@ -1,226 +0,0 @@ -package com.hzs.system.home.controller.manage; - - -import cn.hutool.core.bean.BeanUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.hzs.common.core.annotation.Log; -import com.hzs.common.core.constant.msg.ConfigMsgConstants; -import com.hzs.common.core.enums.EDelFlag; -import com.hzs.common.core.enums.EOperationBusiness; -import com.hzs.common.core.enums.EOperationMethod; -import com.hzs.common.core.enums.EOperationModule; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.core.utils.StringUtils; -import com.hzs.common.core.utils.poi.ExcelUtil; -import com.hzs.common.core.web.controller.BaseController; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.system.ext.HoEnterpriseMissionExt; -import com.hzs.common.domain.system.home.HoEnterpriseMission; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.common.util.TransactionUtils; -import com.hzs.system.home.service.IHoEnterpriseMissionService; -import com.hzs.system.home.vo.HoEnterpriseMissionVO; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.time.temporal.ChronoUnit; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -/** - *

- * 企业使命 前端控制器 - *

- * - * @author hzs - * @since 2022-11-18 - */ -@RestController -@RequestMapping("/manage/ho-enterprise-mission") -public class HoEnterpriseMissionController extends BaseController { - @Autowired - private IHoEnterpriseMissionService enterpriseMissionService; - - /** - * @description: 查询企业使命列表 - * @author: zhang jing - * @date: 2022/8/30 10:20 - * @param: [enterpriseMission] - * @return: com.hzs.common.core.web.page.TableDataInfo - **/ - @Log(module = EOperationModule.CORPORATE_MISSION,business = EOperationBusiness.CORPORATE_MISSION, method = EOperationMethod.SELECT) - @GetMapping("/list") - public TableDataInfo list(HoEnterpriseMissionExt enterpriseMission) { - startPage(); - QueryWrapper queryWrapper = new QueryWrapper(); - if(StringUtils.isNotNull(enterpriseMission.getStartDate()) - &&StringUtils.isNotNull(enterpriseMission.getEndDate())){ - queryWrapper.between("CREATION_TIME", enterpriseMission.getStartDate(), - DateUtils.afterDateTime(1, ChronoUnit.DAYS,enterpriseMission.getEndDate())); - } - if(StringUtils.isNotNull(enterpriseMission.getStartEffectDate()) - &&StringUtils.isNotNull(enterpriseMission.getEndEffectDate())){ - queryWrapper.between("EFFECTIVE_DATE", enterpriseMission.getStartEffectDate(), - DateUtils.afterDateTime(1, ChronoUnit.DAYS,enterpriseMission.getEndEffectDate())); - } - if(StringUtils.isNotEmpty(enterpriseMission.getTitleName())){ - queryWrapper.like("TITLE_NAME",enterpriseMission.getTitleName()); - } - queryWrapper.orderByAsc("SORT"); - List list = enterpriseMissionService.list(queryWrapper); - return getDataTable(list); - } - - /** - * @description: 导出 - * @author: zhang jing - * @date: 2023/7/19 15:34 - * @param: [response, enterpriseMission] - * @return: void - **/ - @Log(module = EOperationModule.CORPORATE_MISSION,business = EOperationBusiness.CORPORATE_MISSION, method = EOperationMethod.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, HoEnterpriseMissionExt enterpriseMission) { - QueryWrapper queryWrapper = new QueryWrapper(); - if(StringUtils.isNotNull(enterpriseMission.getStartDate()) - &&StringUtils.isNotNull(enterpriseMission.getEndDate())){ - queryWrapper.between("CREATION_TIME", enterpriseMission.getStartDate(), - DateUtils.afterDateTime(1, ChronoUnit.DAYS,enterpriseMission.getEndDate())); - } - if(StringUtils.isNotNull(enterpriseMission.getStartEffectDate()) - &&StringUtils.isNotNull(enterpriseMission.getEndEffectDate())){ - queryWrapper.between("EFFECTIVE_DATE", enterpriseMission.getStartEffectDate(), - DateUtils.afterDateTime(1, ChronoUnit.DAYS,enterpriseMission.getEndEffectDate())); - } - if(StringUtils.isNotEmpty(enterpriseMission.getTitleName())){ - queryWrapper.like("TITLE_NAME",enterpriseMission.getTitleName()); - } - queryWrapper.orderByAsc("SORT"); - List newlist=new ArrayList<>(); - List list = enterpriseMissionService.list(queryWrapper); - list.forEach(item -> newlist.add(BeanUtil.copyProperties(item, HoEnterpriseMissionVO.class))); - ExcelUtil util = new ExcelUtil<>(HoEnterpriseMissionVO.class); - util.exportExcel(response, newlist, "企业使命"); - } - - - /** - * @description: 新增企业使命 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [enterpriseMission] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @Log(module = EOperationModule.CORPORATE_MISSION,business = EOperationBusiness.CORPORATE_MISSION, method = EOperationMethod.INSERT) - @PostMapping("/save") - public AjaxResult save(@RequestBody HoEnterpriseMission enterpriseMission) { - if(StringUtils.isEmpty(enterpriseMission.getTitleName())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.TITLE_NAME_NOT_NULL)); - } - if(StringUtils.isEmpty(enterpriseMission.getPicture())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.HO_PICTURE_NOT_NULL)); - } - if(StringUtils.isEmpty(enterpriseMission.getContent())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.HO_CONTENT_NOT_NULL)); - } - if(StringUtils.isNull(enterpriseMission.getSort())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.HO_SORT_NOT_NULL)); - } -// if(StringUtils.isNull(enterpriseMission.getLanguageType())){ -// return AjaxResult.error(ConfigMsgConstants.HO_LANGUAGE_TYPE_NOT_NULL); -// } - if(StringUtils.isNull(enterpriseMission.getEffectiveDate())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.EFFECTIVE_DATE_NOT_NULL)); - } - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq("SORT",enterpriseMission.getSort()); -// queryWrapper.eq("LANGUAGE_TYPE",enterpriseMission.getLanguageType()); - HoEnterpriseMission check =enterpriseMissionService.getOne(queryWrapper); - if(StringUtils.isNotNull(check)){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.HO_SORT_NOT_REPEAT)); - } - - enterpriseMission.setPkCreator(SecurityUtils.getUserId()); - enterpriseMission.setCreationTime(new Date()); - return toAjax(enterpriseMissionService.save(enterpriseMission)); - } - - - /** - * @description: 修改企业使命 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [enterpriseMission] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @Log(module = EOperationModule.CORPORATE_MISSION,business = EOperationBusiness.CORPORATE_MISSION, method = EOperationMethod.UPDATE) - @PostMapping("/update") - public AjaxResult update(@RequestBody HoEnterpriseMission enterpriseMission) { - if(StringUtils.isEmpty(enterpriseMission.getTitleName())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.TITLE_NAME_NOT_NULL)); - } - if(StringUtils.isEmpty(enterpriseMission.getPicture())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.HO_PICTURE_NOT_NULL)); - } - if(StringUtils.isEmpty(enterpriseMission.getContent())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.HO_CONTENT_NOT_NULL)); - } - if(StringUtils.isNull(enterpriseMission.getSort())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.HO_SORT_NOT_NULL)); - } -// if(StringUtils.isNull(enterpriseMission.getLanguageType())){ -// return AjaxResult.error(ConfigMsgConstants.HO_LANGUAGE_TYPE_NOT_NULL); -// } - if(StringUtils.isNull(enterpriseMission.getEffectiveDate())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.EFFECTIVE_DATE_NOT_NULL)); - } - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.ne("PK_ID",enterpriseMission.getPkId()); - queryWrapper.eq("SORT",enterpriseMission.getSort()); -// queryWrapper.eq("LANGUAGE_TYPE",enterpriseMission.getLanguageType()); - HoEnterpriseMission check =enterpriseMissionService.getOne(queryWrapper); - if(StringUtils.isNotNull(check)){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.HO_SORT_NOT_REPEAT)); - } - enterpriseMission.setPkModified(SecurityUtils.getUserId()); - enterpriseMission.setModifiedTime(new Date()); - return toAjax(enterpriseMissionService.updateById(enterpriseMission)); - } - - - /** - * @description: 查询单条个企业使命 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [pkId] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @GetMapping("/getOne/{pkId}") - public AjaxResult getOne(@PathVariable Long pkId) { - HoEnterpriseMission enterpriseMission = enterpriseMissionService.getById(pkId); - return AjaxResult.success(enterpriseMission); - } - - - /** - * @description: 删除企业使命 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [pkId] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @Log(module = EOperationModule.CORPORATE_MISSION,business = EOperationBusiness.CORPORATE_MISSION, method = EOperationMethod.DELETE) - @DeleteMapping("/{pkId}") - public AjaxResult delete(@PathVariable Long pkId) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("PK_ID", pkId); - updateWrapper.set("DEL_FLAG", EDelFlag.DELETE.getValue()); - updateWrapper.set("PK_MODIFIED", SecurityUtils.getUserId()); - updateWrapper.set("MODIFIED_TIME", new Date()); - return toAjax(enterpriseMissionService.update(updateWrapper)); - } -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/manage/HoEnterpriseNewsController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/manage/HoEnterpriseNewsController.java deleted file mode 100644 index a8167ca4..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/manage/HoEnterpriseNewsController.java +++ /dev/null @@ -1,226 +0,0 @@ -package com.hzs.system.home.controller.manage; - - -import cn.hutool.core.bean.BeanUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.hzs.common.core.annotation.Log; -import com.hzs.common.core.constant.msg.ConfigMsgConstants; -import com.hzs.common.core.enums.EDelFlag; -import com.hzs.common.core.enums.EOperationBusiness; -import com.hzs.common.core.enums.EOperationMethod; -import com.hzs.common.core.enums.EOperationModule; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.core.utils.StringUtils; -import com.hzs.common.core.utils.poi.ExcelUtil; -import com.hzs.common.core.web.controller.BaseController; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.system.ext.HoEnterpriseMissionExt; -import com.hzs.common.domain.system.home.HoEnterpriseMission; -import com.hzs.common.domain.system.home.HoEnterpriseNews; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.common.util.TransactionUtils; -import com.hzs.system.home.service.IHoEnterpriseNewsService; -import com.hzs.system.home.vo.HoEnterpriseMissionVO; -import com.hzs.system.home.vo.HoEnterpriseNewsVO; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.time.temporal.ChronoUnit; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -/** - *

- * 公司新闻 前端控制器 - *

- * - * @author hzs - * @since 2022-11-19 - */ -@RestController -@RequestMapping("/manage/ho-enterprise-news") -public class HoEnterpriseNewsController extends BaseController { - @Autowired - private IHoEnterpriseNewsService enterpriseNewsService; - - /** - * @description: 查询公司新闻列表 - * @author: zhang jing - * @date: 2022/8/30 10:20 - * @param: [enterpriseNews] - * @return: com.hzs.common.core.web.page.TableDataInfo - **/ - @Log(module = EOperationModule.COMPANY_NEWS,business = EOperationBusiness.COMPANY_NEWS, method = EOperationMethod.SELECT) - @GetMapping("/list") - public TableDataInfo list(HoEnterpriseMissionExt enterpriseNews) { - startPage(); - QueryWrapper queryWrapper = new QueryWrapper(); - if(StringUtils.isNotNull(enterpriseNews.getStartDate()) - &&StringUtils.isNotNull(enterpriseNews.getEndDate())){ - queryWrapper.between("CREATION_TIME", enterpriseNews.getStartDate(), - DateUtils.afterDateTime(1, ChronoUnit.DAYS,enterpriseNews.getEndDate())); - } - if(StringUtils.isNotNull(enterpriseNews.getStartEffectDate()) - &&StringUtils.isNotNull(enterpriseNews.getEndEffectDate())){ - queryWrapper.between("EFFECTIVE_DATE", enterpriseNews.getEndEffectDate(), - DateUtils.afterDateTime(1, ChronoUnit.DAYS,enterpriseNews.getEndEffectDate()) ); - } - if(StringUtils.isNotEmpty(enterpriseNews.getTitleName())){ - queryWrapper.like("TITLE_NAME",enterpriseNews.getTitleName()); - } - queryWrapper.orderByAsc("SORT"); - List list = enterpriseNewsService.list(queryWrapper); - return getDataTable(list); - } - - /** - * @description: 导出 - * @author: zhang jing - * @date: 2023/7/19 15:34 - * @param: [response, enterpriseMission] - * @return: void - **/ - @Log(module = EOperationModule.COMPANY_NEWS,business = EOperationBusiness.COMPANY_NEWS, method = EOperationMethod.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, HoEnterpriseMissionExt enterpriseNews) { - QueryWrapper queryWrapper = new QueryWrapper(); - if(StringUtils.isNotNull(enterpriseNews.getStartDate()) - &&StringUtils.isNotNull(enterpriseNews.getEndDate())){ - queryWrapper.between("CREATION_TIME", enterpriseNews.getStartDate(), enterpriseNews.getEndDate()); - } - if(StringUtils.isNotNull(enterpriseNews.getStartEffectDate()) - &&StringUtils.isNotNull(enterpriseNews.getEndEffectDate())){ - queryWrapper.between("EFFECTIVE_DATE", enterpriseNews.getStartEffectDate(), - enterpriseNews.getEndEffectDate()); - } - if(StringUtils.isNotEmpty(enterpriseNews.getTitleName())){ - queryWrapper.like("TITLE_NAME",enterpriseNews.getTitleName()); - } - queryWrapper.orderByAsc("SORT"); - List newlist =new ArrayList<>(); - List list = enterpriseNewsService.list(queryWrapper); - list.forEach(item -> newlist.add(BeanUtil.copyProperties(item, HoEnterpriseNewsVO.class))); - ExcelUtil util = new ExcelUtil<>(HoEnterpriseNewsVO.class); - util.exportExcel(response, newlist, "公司新闻"); - } - - /** - * @description: 新增公司新闻 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [enterpriseNews] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @Log(module = EOperationModule.COMPANY_NEWS,business = EOperationBusiness.COMPANY_NEWS, method = EOperationMethod.INSERT) - @PostMapping("/save") - public AjaxResult save(@RequestBody HoEnterpriseNews enterpriseNews) { - if(StringUtils.isEmpty(enterpriseNews.getTitleName())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.TITLE_NAME_NOT_NULL)); - } - if(StringUtils.isEmpty(enterpriseNews.getPicture())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.HO_PICTURE_NOT_NULL)); - } - if(StringUtils.isEmpty(enterpriseNews.getContent())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.HO_CONTENT_NOT_NULL)); - } - if(StringUtils.isNull(enterpriseNews.getSort())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.HO_SORT_NOT_NULL)); - } -// if(StringUtils.isNull(enterpriseNews.getLanguageType())){ -// return AjaxResult.error(ConfigMsgConstants.HO_LANGUAGE_TYPE_NOT_NULL); -// } - if(StringUtils.isNull(enterpriseNews.getEffectiveDate())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.EFFECTIVE_DATE_NOT_NULL)); - } - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq("SORT",enterpriseNews.getSort()); -// queryWrapper.eq("LANGUAGE_TYPE",enterpriseNews.getLanguageType()); - HoEnterpriseNews check =enterpriseNewsService.getOne(queryWrapper); - if(StringUtils.isNotNull(check)){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.HO_SORT_NOT_REPEAT)); - } - - enterpriseNews.setPkCreator(SecurityUtils.getUserId()); - enterpriseNews.setCreationTime(new Date()); - return toAjax(enterpriseNewsService.save(enterpriseNews)); - } - - - /** - * @description: 修改公司新闻 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [enterpriseNews] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @Log(module = EOperationModule.COMPANY_NEWS,business = EOperationBusiness.COMPANY_NEWS, method = EOperationMethod.UPDATE) - @PostMapping("/update") - public AjaxResult update(@RequestBody HoEnterpriseNews enterpriseNews) { - if(StringUtils.isEmpty(enterpriseNews.getTitleName())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.TITLE_NAME_NOT_NULL)); - } - if(StringUtils.isEmpty(enterpriseNews.getPicture())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.HO_PICTURE_NOT_NULL)); - } - if(StringUtils.isEmpty(enterpriseNews.getContent())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.HO_CONTENT_NOT_NULL)); - } - if(StringUtils.isNull(enterpriseNews.getSort())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.HO_SORT_NOT_NULL)); - } -// if(StringUtils.isNull(enterpriseNews.getLanguageType())){ -// return AjaxResult.error(ConfigMsgConstants.HO_LANGUAGE_TYPE_NOT_NULL); -// } - if(StringUtils.isNull(enterpriseNews.getEffectiveDate())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.EFFECTIVE_DATE_NOT_NULL)); - } - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.ne("PK_ID",enterpriseNews.getPkId()); - queryWrapper.eq("SORT",enterpriseNews.getSort()); -// queryWrapper.eq("LANGUAGE_TYPE",enterpriseNews.getLanguageType()); - HoEnterpriseNews check =enterpriseNewsService.getOne(queryWrapper); - if(StringUtils.isNotNull(check)){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.HO_SORT_NOT_REPEAT)); - } - enterpriseNews.setPkModified(SecurityUtils.getUserId()); - enterpriseNews.setModifiedTime(new Date()); - return toAjax(enterpriseNewsService.updateById(enterpriseNews)); - } - - - /** - * @description: 查询单条个公司新闻 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [pkId] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @GetMapping("/getOne/{pkId}") - public AjaxResult getOne(@PathVariable Long pkId) { - HoEnterpriseNews enterpriseNews = enterpriseNewsService.getById(pkId); - return AjaxResult.success(enterpriseNews); - } - - - /** - * @description: 删除公司新闻 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [pkId] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @Log(module = EOperationModule.COMPANY_NEWS,business = EOperationBusiness.COMPANY_NEWS, method = EOperationMethod.DELETE) - @DeleteMapping("/{pkId}") - public AjaxResult delete(@PathVariable Long pkId) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("PK_ID", pkId); - updateWrapper.set("DEL_FLAG", EDelFlag.DELETE.getValue()); - updateWrapper.set("PK_MODIFIED", SecurityUtils.getUserId()); - updateWrapper.set("MODIFIED_TIME", new Date()); - return toAjax(enterpriseNewsService.update(updateWrapper)); - } -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/manage/HoEnterpriseStyleController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/manage/HoEnterpriseStyleController.java deleted file mode 100644 index a365e5a4..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/manage/HoEnterpriseStyleController.java +++ /dev/null @@ -1,228 +0,0 @@ -package com.hzs.system.home.controller.manage; - - -import cn.hutool.core.bean.BeanUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.hzs.common.core.annotation.Log; -import com.hzs.common.core.constant.msg.ConfigMsgConstants; -import com.hzs.common.core.enums.EDelFlag; -import com.hzs.common.core.enums.EOperationBusiness; -import com.hzs.common.core.enums.EOperationMethod; -import com.hzs.common.core.enums.EOperationModule; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.core.utils.StringUtils; -import com.hzs.common.core.utils.poi.ExcelUtil; -import com.hzs.common.core.web.controller.BaseController; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.system.ext.HoEnterpriseMissionExt; -import com.hzs.common.domain.system.home.HoEnterpriseMission; -import com.hzs.common.domain.system.home.HoEnterpriseStyle; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.system.home.service.IHoEnterpriseStyleService; -import com.hzs.system.home.vo.HoEnterpriseMissionVO; -import com.hzs.system.home.vo.HoEnterpriseStyleVO; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.time.temporal.ChronoUnit; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -/** - *

- * 公司风采 前端控制器 - *

- * - * @author hzs - * @since 2022-11-19 - */ -@RestController -@RequestMapping("/manage/ho-enterprise-style") -public class HoEnterpriseStyleController extends BaseController { - @Autowired - private IHoEnterpriseStyleService enterpriseStyleService; - - /** - * @description: 查询公司风采列表 - * @author: zhang jing - * @date: 2022/8/30 10:20 - * @param: [enterpriseStyle] - * @return: com.hzs.common.core.web.page.TableDataInfo - **/ - @Log(module = EOperationModule.COMPANY_SHOW,business = EOperationBusiness.COMPANY_SHOW, method = EOperationMethod.SELECT) - @GetMapping("/list") - public TableDataInfo list(HoEnterpriseMissionExt enterpriseStyle) { - startPage(); - QueryWrapper queryWrapper = new QueryWrapper(); - if(StringUtils.isNotNull(enterpriseStyle.getStartDate()) - &&StringUtils.isNotNull(enterpriseStyle.getEndDate())){ - queryWrapper.between("CREATION_TIME", enterpriseStyle.getStartDate(), - DateUtils.afterDateTime(1, ChronoUnit.DAYS,enterpriseStyle.getEndDate())); - } - if(StringUtils.isNotNull(enterpriseStyle.getStartEffectDate()) - &&StringUtils.isNotNull(enterpriseStyle.getEndEffectDate())){ - queryWrapper.between("EFFECTIVE_DATE", enterpriseStyle.getStartEffectDate(), - DateUtils.afterDateTime(1, ChronoUnit.DAYS,enterpriseStyle.getEndEffectDate())); - - } - if(StringUtils.isNotEmpty(enterpriseStyle.getTitleName())){ - queryWrapper.like("TITLE_NAME",enterpriseStyle.getTitleName()); - } - queryWrapper.orderByAsc("SORT"); - List list = enterpriseStyleService.list(queryWrapper); - return getDataTable(list); - } - - /** - * @description: 导出 - * @author: zhang jing - * @date: 2023/7/19 15:34 - * @param: [response, enterpriseMission] - * @return: void - **/ - @Log(module = EOperationModule.COMPANY_SHOW,business = EOperationBusiness.COMPANY_SHOW, method = EOperationMethod.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, HoEnterpriseMissionExt enterpriseStyle) { - QueryWrapper queryWrapper = new QueryWrapper(); - if(StringUtils.isNotNull(enterpriseStyle.getStartDate()) - &&StringUtils.isNotNull(enterpriseStyle.getEndDate())){ - queryWrapper.between("CREATION_TIME", enterpriseStyle.getStartDate(), enterpriseStyle.getEndDate()); - } - if(StringUtils.isNotNull(enterpriseStyle.getStartEffectDate()) - &&StringUtils.isNotNull(enterpriseStyle.getEndEffectDate())){ - queryWrapper.between("EFFECTIVE_DATE", enterpriseStyle.getStartEffectDate(), - enterpriseStyle.getEndEffectDate()); - - } - if(StringUtils.isNotEmpty(enterpriseStyle.getTitleName())){ - queryWrapper.like("TITLE_NAME",enterpriseStyle.getTitleName()); - } - queryWrapper.orderByAsc("SORT"); - List newlist =new ArrayList<>(); - List list = enterpriseStyleService.list(queryWrapper); - list.forEach(item -> newlist.add(BeanUtil.copyProperties(item, HoEnterpriseStyleVO.class))); - ExcelUtil util = new ExcelUtil<>(HoEnterpriseStyleVO.class); - util.exportExcel(response, newlist, "公司风采"); - } - - - /** - * @description: 新增公司风采 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [enterpriseStyle] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @Log(module = EOperationModule.COMPANY_SHOW,business = EOperationBusiness.COMPANY_SHOW, method = EOperationMethod.INSERT) - @PostMapping("/save") - public AjaxResult save(@RequestBody HoEnterpriseStyle enterpriseStyle) { - if(StringUtils.isEmpty(enterpriseStyle.getTitleName())){ - return AjaxResult.error(ConfigMsgConstants.TITLE_NAME_NOT_NULL); - } - if(StringUtils.isEmpty(enterpriseStyle.getPicture())){ - return AjaxResult.error(ConfigMsgConstants.HO_PICTURE_NOT_NULL); - } - if(StringUtils.isEmpty(enterpriseStyle.getContent())){ - return AjaxResult.error(ConfigMsgConstants.HO_CONTENT_NOT_NULL); - } - if(StringUtils.isNull(enterpriseStyle.getSort())){ - return AjaxResult.error(ConfigMsgConstants.HO_SORT_NOT_NULL); - } -// if(StringUtils.isNull(enterpriseStyle.getLanguageType())){ -// return AjaxResult.error(ConfigMsgConstants.HO_LANGUAGE_TYPE_NOT_NULL); -// } - if(StringUtils.isNull(enterpriseStyle.getEffectiveDate())){ - return AjaxResult.error(ConfigMsgConstants.EFFECTIVE_DATE_NOT_NULL); - } - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq("SORT",enterpriseStyle.getSort()); -// queryWrapper.eq("LANGUAGE_TYPE",enterpriseStyle.getLanguageType()); - HoEnterpriseStyle check =enterpriseStyleService.getOne(queryWrapper); - if(StringUtils.isNotNull(check)){ - return AjaxResult.error(ConfigMsgConstants.HO_SORT_NOT_REPEAT); - } - - enterpriseStyle.setPkCreator(SecurityUtils.getUserId()); - enterpriseStyle.setCreationTime(new Date()); - return toAjax(enterpriseStyleService.save(enterpriseStyle)); - } - - - /** - * @description: 修改公司风采 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [enterpriseStyle] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @Log(module = EOperationModule.COMPANY_SHOW,business = EOperationBusiness.COMPANY_SHOW, method = EOperationMethod.UPDATE) - @PostMapping("/update") - public AjaxResult update(@RequestBody HoEnterpriseStyle enterpriseStyle) { - if(StringUtils.isEmpty(enterpriseStyle.getTitleName())){ - return AjaxResult.error(ConfigMsgConstants.TITLE_NAME_NOT_NULL); - } - if(StringUtils.isEmpty(enterpriseStyle.getPicture())){ - return AjaxResult.error(ConfigMsgConstants.HO_PICTURE_NOT_NULL); - } - if(StringUtils.isEmpty(enterpriseStyle.getContent())){ - return AjaxResult.error(ConfigMsgConstants.HO_CONTENT_NOT_NULL); - } - if(StringUtils.isNull(enterpriseStyle.getSort())){ - return AjaxResult.error(ConfigMsgConstants.HO_SORT_NOT_NULL); - } -// if(StringUtils.isNull(enterpriseStyle.getLanguageType())){ -// return AjaxResult.error(ConfigMsgConstants.HO_LANGUAGE_TYPE_NOT_NULL); -// } - if(StringUtils.isNull(enterpriseStyle.getEffectiveDate())){ - return AjaxResult.error(ConfigMsgConstants.EFFECTIVE_DATE_NOT_NULL); - } - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.ne("PK_ID",enterpriseStyle.getPkId()); - queryWrapper.eq("SORT",enterpriseStyle.getSort()); -// queryWrapper.eq("LANGUAGE_TYPE",enterpriseStyle.getLanguageType()); - HoEnterpriseStyle check =enterpriseStyleService.getOne(queryWrapper); - if(StringUtils.isNotNull(check)){ - return AjaxResult.error(ConfigMsgConstants.HO_SORT_NOT_REPEAT); - } - enterpriseStyle.setPkModified(SecurityUtils.getUserId()); - enterpriseStyle.setModifiedTime(new Date()); - return toAjax(enterpriseStyleService.updateById(enterpriseStyle)); - } - - - /** - * @description: 查询单条个公司风采 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [pkId] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @GetMapping("/getOne/{pkId}") - public AjaxResult getOne(@PathVariable Long pkId) { - HoEnterpriseStyle enterpriseStyle = enterpriseStyleService.getById(pkId); - return AjaxResult.success(enterpriseStyle); - } - - - /** - * @description: 删除公司风采 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [pkId] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @Log(module = EOperationModule.COMPANY_SHOW,business = EOperationBusiness.COMPANY_SHOW, method = EOperationMethod.DELETE) - @DeleteMapping("/{pkId}") - public AjaxResult delete(@PathVariable Long pkId) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("PK_ID", pkId); - updateWrapper.set("DEL_FLAG", EDelFlag.DELETE.getValue()); - updateWrapper.set("PK_MODIFIED", SecurityUtils.getUserId()); - updateWrapper.set("MODIFIED_TIME", new Date()); - return toAjax(enterpriseStyleService.update(updateWrapper)); - } -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/manage/HoGlobalCompanyController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/manage/HoGlobalCompanyController.java deleted file mode 100644 index 3f484519..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/manage/HoGlobalCompanyController.java +++ /dev/null @@ -1,205 +0,0 @@ -package com.hzs.system.home.controller.manage; - - -import cn.hutool.core.bean.BeanUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.hzs.common.core.annotation.Log; -import com.hzs.common.core.constant.msg.ConfigMsgConstants; -import com.hzs.common.core.enums.*; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.core.utils.StringUtils; -import com.hzs.common.core.utils.poi.ExcelUtil; -import com.hzs.common.core.web.controller.BaseController; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.system.config.BdContinent; -import com.hzs.common.domain.system.ext.HoEnterpriseMissionExt; -import com.hzs.common.domain.system.ext.HoGlobalCompanyExt; -import com.hzs.common.domain.system.home.HoEnterpriseMission; -import com.hzs.common.domain.system.home.HoGlobalCompany; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.common.util.TransactionUtils; -import com.hzs.system.config.service.IBdContinentService; -import com.hzs.system.home.service.IHoGlobalCompanyService; -import com.hzs.system.home.vo.HoGlobalCompanyVO; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.time.temporal.ChronoUnit; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -/** - *

- * 全球分布 前端控制器 - *

- * - * @author hzs - * @since 2022-12-08 - */ -@RestController -@RequestMapping("/manage/ho-global-company") -public class HoGlobalCompanyController extends BaseController { - - @Autowired - private IHoGlobalCompanyService globalCompanyService; - @Autowired - private IBdContinentService continentService; - - /** - * @description: 全球分布 - * @author: zhang jing - * @date: 2022/8/30 10:20 - * @param: [globalCompany] - * @return: com.hzs.common.core.web.page.TableDataInfo - **/ - @Log(module = EOperationModule.GLOBAL_DISTRIBUTION,business = EOperationBusiness.GLOBAL_DISTRIBUTION, method = EOperationMethod.SELECT) - @GetMapping("/list") - public TableDataInfo list(HoGlobalCompanyVO globalCompanyVO) { - startPage(); - List list = globalCompanyService.queryGlobalCompanyList(globalCompanyVO); - return getDataTable(list); - } - - - /** - * @description: 导出 - * @author: zhang jing - * @date: 2022/12/8 17:04 - * @param: [language, response, globalCompanyExt] - * @return: void - **/ - @Log(module = EOperationModule.GLOBAL_DISTRIBUTION,business = EOperationBusiness.GLOBAL_DISTRIBUTION, method = EOperationMethod.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response,HoGlobalCompanyVO globalCompanyVO) { - List list = globalCompanyService.queryGlobalCompanyList(globalCompanyVO); - ExcelUtil util = new ExcelUtil<>(HoGlobalCompanyVO.class); - util.exportExcel(response, list, "全球分布导出"); - } - - - /** - * @description: 新增全球分布 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [globalCompany] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @Log(module = EOperationModule.GLOBAL_DISTRIBUTION,business = EOperationBusiness.GLOBAL_DISTRIBUTION, method = EOperationMethod.INSERT) - @PostMapping("/save") - public AjaxResult save(@RequestBody HoGlobalCompany globalCompany) { - - if(StringUtils.isNull(globalCompany.getRegion())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.HO_REGION_NOT_NULL)); - } - if(StringUtils.isNull(globalCompany.getPkCountry())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.HO_PKCOUNTRY_NOT_NULL)); - } - if(StringUtils.isEmpty(globalCompany.getCompany())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.HO_COMPANY_NOT_NULL)); - } - if(StringUtils.isEmpty(globalCompany.getContacts())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.HO_CONTACTS_NOT_NULL)); - } - if(StringUtils.isEmpty(globalCompany.getPhone())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.HO_PHONE_NOT_NULL)); - } - if(StringUtils.isEmpty(globalCompany.getAddress())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.HO_ADDRESS_NOT_NULL)); - } - if(StringUtils.isNull(globalCompany.getGloProvince())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.GLO_PROVINCE_NOT_NULL)); - } - if(StringUtils.isNull(globalCompany.getGloCity())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.GLO_CITY_NOT_NULL)); - } - globalCompany.setPkCreator(SecurityUtils.getUserId()); - globalCompany.setCreationTime(new Date()); - return toAjax(globalCompanyService.saveCompany(globalCompany)); - } - - - /** - * @description: 修改全球分布 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [globalCompany] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @Log(module = EOperationModule.GLOBAL_DISTRIBUTION,business = EOperationBusiness.GLOBAL_DISTRIBUTION, method = EOperationMethod.UPDATE) - @PostMapping("/update") - public AjaxResult update(@RequestBody HoGlobalCompany globalCompany) { - if(StringUtils.isNull(globalCompany.getPkId())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.PK_ID_NOT_NULL)); - } - if(StringUtils.isNull(globalCompany.getRegion())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.HO_REGION_NOT_NULL)); - } - if(StringUtils.isNull(globalCompany.getPkCountry())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.HO_PKCOUNTRY_NOT_NULL)); - } - if(StringUtils.isEmpty(globalCompany.getCompany())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.HO_COMPANY_NOT_NULL)); - } - if(StringUtils.isEmpty(globalCompany.getContacts())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.HO_CONTACTS_NOT_NULL)); - } - if(StringUtils.isEmpty(globalCompany.getPhone())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.HO_PHONE_NOT_NULL)); - } - if(StringUtils.isEmpty(globalCompany.getAddress())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.HO_ADDRESS_NOT_NULL)); - } - if(StringUtils.isNull(globalCompany.getGloProvince())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.GLO_PROVINCE_NOT_NULL)); - } - if(StringUtils.isNull(globalCompany.getGloCity())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.GLO_CITY_NOT_NULL)); - } - globalCompany.setPkModified(SecurityUtils.getUserId()); - globalCompany.setModifiedTime(new Date()); - return toAjax(globalCompanyService.updateCompany(globalCompany)); - } - - - /** - * @description: 查询单条个全球分布 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [pkId] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @Log(module = EOperationModule.HO_GLOBAL_COMPANY, method = EOperationMethod.SELECT) - @GetMapping("/getOne/{pkId}") - public AjaxResult getOne(@PathVariable Long pkId) { - HoGlobalCompany globalCompany = globalCompanyService.getById(pkId); - HoGlobalCompanyExt gloExt=BeanUtil.copyProperties(globalCompany, HoGlobalCompanyExt.class); - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq("PK_ID", globalCompany.getRegion()); - BdContinent son = continentService.getOne(queryWrapper); - gloExt.setParentRegion(son.getPkParentId()); - return AjaxResult.success(gloExt); - } - - - /** - * @description: 删除全球分布 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [pkId] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @Log(module = EOperationModule.GLOBAL_DISTRIBUTION,business = EOperationBusiness.GLOBAL_DISTRIBUTION, method = EOperationMethod.DELETE) - @DeleteMapping("/{pkId}") - public AjaxResult delete(@PathVariable Long pkId) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("PK_ID", pkId); - updateWrapper.set("DEL_FLAG", EDelFlag.DELETE.getValue()); - updateWrapper.set("PK_MODIFIED", SecurityUtils.getUserId()); - updateWrapper.set("MODIFIED_TIME", new Date()); - return toAjax(globalCompanyService.update(updateWrapper)); - } -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/manage/HoMemoirHonorController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/manage/HoMemoirHonorController.java deleted file mode 100644 index 0c7f3fd4..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/manage/HoMemoirHonorController.java +++ /dev/null @@ -1,249 +0,0 @@ -package com.hzs.system.home.controller.manage; - - -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.hzs.common.core.constant.msg.ConfigMsgConstants; -import com.hzs.common.core.enums.EDelFlag; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.core.utils.StringUtils; -import com.hzs.common.core.web.controller.BaseController; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.system.home.HoMemoirHonor; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.system.home.service.IHoMemoirHonorService; -import com.hzs.system.home.vo.HoMemoirHonorVO; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.time.temporal.ChronoUnit; -import java.util.Date; -import java.util.List; - -/** - *

- * 大事记-资源荣誉 前端控制器 - *

- * - * @author hzs - * @since 2022-12-07 - */ -@RestController -@RequestMapping("/manage/ho-memoir-honor") -public class HoMemoirHonorController extends BaseController { - - @Autowired - private IHoMemoirHonorService memoirHonorService; - - /** - * @description: 查询大事记-资质荣誉列表 - * @author: zhang jing - * @date: 2022/8/30 10:20 - * @param: [memoirHonor] - * @return: com.hzs.common.core.web.page.TableDataInfo - **/ - @GetMapping("/list") - public TableDataInfo list(HoMemoirHonorVO hoMemoirHonorVO) { - startPage(); - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.orderByAsc("SORT"); - if(StringUtils.isNotNull(hoMemoirHonorVO.getStartDate()) - &&StringUtils.isNotNull(hoMemoirHonorVO.getEndDate())){ - queryWrapper.between("CREATION_TIME", hoMemoirHonorVO.getStartDate(), - DateUtils.afterDateTime(1, ChronoUnit.DAYS,hoMemoirHonorVO.getEndDate())); - } - List list = memoirHonorService.list(queryWrapper); - return getDataTable(list); - } - - - /** - * @description: 新增大事记-资质荣誉 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [memoirHonor] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @PostMapping("/save") - public AjaxResult save(@RequestBody HoMemoirHonor memoirHonor) { - - if(StringUtils.isEmpty(memoirHonor.getPicture())){ - return AjaxResult.error(ConfigMsgConstants.HO_PICTURE_NOT_NULL); - } - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.orderByDesc("SORT"); - List list = memoirHonorService.list(queryWrapper); - if(CollectionUtil.isNotEmpty(list)){ - memoirHonor.setSort(list.get(0).getSort()+1); - }else{ - memoirHonor.setSort(1); - } - memoirHonor.setPkCreator(SecurityUtils.getUserId()); - memoirHonor.setCreationTime(new Date()); - return toAjax(memoirHonorService.save(memoirHonor)); - } - - - /** - * @description: 修改大事记-资质荣誉 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [memoirHonor] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @PostMapping("/update") - public AjaxResult update(@RequestBody HoMemoirHonor memoirHonor) { - if(StringUtils.isNull(memoirHonor.getPkId())){ - return AjaxResult.error(ConfigMsgConstants.PK_ID_NOT_NULL); - } - if(StringUtils.isEmpty(memoirHonor.getPicture())){ - return AjaxResult.error(ConfigMsgConstants.HO_PICTURE_NOT_NULL); - } - - memoirHonor.setPkModified(SecurityUtils.getUserId()); - memoirHonor.setModifiedTime(new Date()); - return toAjax(memoirHonorService.updateById(memoirHonor)); - } - - /** - * @description: 修改为置顶 - * @author: zhang jing - * @date: 2022/12/7 11:55 - * @param: [memoirHonor] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @PostMapping("/updateTopping") - public AjaxResult updateTopping(@RequestBody HoMemoirHonor memoirHonor) { - if(StringUtils.isNull(memoirHonor.getPkId())){ - return AjaxResult.error(ConfigMsgConstants.PK_ID_NOT_NULL); - } - - QueryWrapper queryWrapper2 = new QueryWrapper(); - queryWrapper2.eq("PK_ID",memoirHonor.getPkId()); - HoMemoirHonor topping =memoirHonorService.getOne(queryWrapper2); - if(StringUtils.isNull(topping)){ - return AjaxResult.error(ConfigMsgConstants.HO_OBJECT_NOT_REPEAT); - } - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.orderByAsc("SORT"); - List list = memoirHonorService.list(queryWrapper); - if(CollectionUtil.isNotEmpty(list)){ - HoMemoirHonor toppingOld =list.get(0); - memoirHonor.setSort(toppingOld.getSort()); - toppingOld.setSort(topping.getSort()); - toppingOld.setPkModified(SecurityUtils.getUserId()); - toppingOld.setModifiedTime(new Date()); - memoirHonorService.updateById(toppingOld); - }else{ - memoirHonor.setSort(1); - } - memoirHonor.setPkModified(SecurityUtils.getUserId()); - memoirHonor.setModifiedTime(new Date()); - return toAjax(memoirHonorService.updateById(memoirHonor)); - } - - /** - * @description: 上移 - * @author: zhang jing - * @date: 2022/12/7 14:24 - * @param: [memoirHonor] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @PostMapping("/moveUp") - public AjaxResult moveUp(@RequestBody HoMemoirHonor memoirHonor) { - if(StringUtils.isNull(memoirHonor.getPkId())){ - return AjaxResult.error(ConfigMsgConstants.PK_ID_NOT_NULL); - } - HoMemoirHonor memoirHonorNew =memoirHonorService.getById(memoirHonor); - if(StringUtils.isNull(memoirHonorNew)){ - return AjaxResult.error(ConfigMsgConstants.HO_OBJECT_NOT_REPEAT); - } - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.lt("SORT",memoirHonorNew.getSort()); - queryWrapper.orderByDesc("SORT"); - List list = memoirHonorService.list(queryWrapper); - if(CollectionUtil.isNotEmpty(list)){ - HoMemoirHonor toppingOld =list.get(0); - memoirHonor.setSort(toppingOld.getSort()); - toppingOld.setSort(memoirHonorNew.getSort()); - toppingOld.setPkModified(SecurityUtils.getUserId()); - toppingOld.setModifiedTime(new Date()); - memoirHonorService.updateById(toppingOld); - }else{ - memoirHonor.setSort(1); - } - memoirHonor.setPkModified(SecurityUtils.getUserId()); - memoirHonor.setModifiedTime(new Date()); - return toAjax(memoirHonorService.updateById(memoirHonor)); - } - - /** - * @description: 下移 - * @author: zhang jing - * @date: 2022/12/7 14:24 - * @param: [memoirHonor] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @PostMapping("/moveDown") - public AjaxResult moveDown(@RequestBody HoMemoirHonor memoirHonor) { - if(StringUtils.isNull(memoirHonor.getPkId())){ - return AjaxResult.error(ConfigMsgConstants.PK_ID_NOT_NULL); - } - HoMemoirHonor memoirHonorNew =memoirHonorService.getById(memoirHonor); - if(StringUtils.isNull(memoirHonorNew)){ - return AjaxResult.error(ConfigMsgConstants.HO_OBJECT_NOT_REPEAT); - } - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.gt("SORT",memoirHonorNew.getSort()); - queryWrapper.orderByAsc("SORT"); - List list = memoirHonorService.list(queryWrapper); - if(CollectionUtil.isNotEmpty(list)){ - HoMemoirHonor toppingOld =list.get(0); - memoirHonor.setSort(toppingOld.getSort()); - toppingOld.setSort(memoirHonorNew.getSort()); - toppingOld.setPkModified(SecurityUtils.getUserId()); - toppingOld.setModifiedTime(new Date()); - memoirHonorService.updateById(toppingOld); - }else{ - memoirHonor.setSort(1); - } - memoirHonor.setPkModified(SecurityUtils.getUserId()); - memoirHonor.setModifiedTime(new Date()); - return toAjax(memoirHonorService.updateById(memoirHonor)); - } - - - /** - * @description: 查询单条个大事记-资质荣誉 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [pkId] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @GetMapping("/getOne/{pkId}") - public AjaxResult getOne(@PathVariable Long pkId) { - HoMemoirHonor memoirHonor = memoirHonorService.getById(pkId); - return AjaxResult.success(memoirHonor); - } - - - /** - * @description: 删除大事记-资质荣誉 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [pkId] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @DeleteMapping("/{pkId}") - public AjaxResult delete(@PathVariable Long pkId) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("PK_ID", pkId); - updateWrapper.set("DEL_FLAG", EDelFlag.DELETE.getValue()); - updateWrapper.set("PK_MODIFIED", SecurityUtils.getUserId()); - updateWrapper.set("MODIFIED_TIME", new Date()); - return toAjax(memoirHonorService.update(updateWrapper)); - } - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/manage/HoMemoirProcessController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/manage/HoMemoirProcessController.java deleted file mode 100644 index caf3ab08..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/manage/HoMemoirProcessController.java +++ /dev/null @@ -1,324 +0,0 @@ -package com.hzs.system.home.controller.manage; - - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.hzs.common.core.annotation.Log; -import com.hzs.common.core.constant.msg.ConfigMsgConstants; -import com.hzs.common.core.enums.EDelFlag; -import com.hzs.common.core.enums.EOperationBusiness; -import com.hzs.common.core.enums.EOperationMethod; -import com.hzs.common.core.enums.EOperationModule; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.core.utils.StringUtils; -import com.hzs.common.core.utils.poi.ExcelUtil; -import com.hzs.common.core.web.controller.BaseController; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.system.ext.HoEnterpriseMissionExt; -import com.hzs.common.domain.system.ext.HoMemoirProcessExt; -import com.hzs.common.domain.system.home.HoEnterpriseMission; -import com.hzs.common.domain.system.home.HoMemoirProcess; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.system.home.service.IHoMemoirProcessService; -import com.hzs.system.home.vo.HoEnterpriseNewsVO; -import com.hzs.system.home.vo.HoMemoirProcessVO; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.time.temporal.ChronoUnit; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -/** - *

- * 大事记-发展历程 前端控制器 - *

- * - * @author hzs - * @since 2022-12-01 - */ -@RestController -@RequestMapping("/manage/ho-memoir-process") -public class HoMemoirProcessController extends BaseController { - - @Autowired - private IHoMemoirProcessService memoirProcessExtService; - - /** - * @description: 查询大事记-发展历程列表 - * @author: zhang jing - * @date: 2022/8/30 10:20 - * @param: [memoirProcessExt] - * @return: com.hzs.common.core.web.page.TableDataInfo - **/ - @Log(module = EOperationModule.DEVELOP,business = EOperationBusiness.DEVELOP, method = EOperationMethod.SELECT) - @GetMapping("/list") - public TableDataInfo list(HoMemoirProcessExt memoirProcessExt) { - startPage(); - QueryWrapper queryWrapper = new QueryWrapper(); - if(StringUtils.isNotEmpty(memoirProcessExt.getTitleName())){ - queryWrapper.like("TITLE_NAME",memoirProcessExt.getTitleName()); - } - if(StringUtils.isNotNull(memoirProcessExt.getStartDate()) - &&StringUtils.isNotNull(memoirProcessExt.getEndDate())){ - queryWrapper.between("CREATION_TIME", memoirProcessExt.getStartDate(), - DateUtils.afterDateTime(1, ChronoUnit.DAYS,memoirProcessExt.getEndDate())); - } - if(StringUtils.isNotNull(memoirProcessExt.getStartEffectDate()) - &&StringUtils.isNotNull(memoirProcessExt.getEndEffectDate())){ - queryWrapper.between("EFFECTIVE_DATE", memoirProcessExt.getStartEffectDate(), - DateUtils.afterDateTime(1, ChronoUnit.DAYS,memoirProcessExt.getEndEffectDate())); - } - queryWrapper.orderByAsc("SORT"); - List list = memoirProcessExtService.list(queryWrapper); - return getDataTable(list); - } - - /** - * @description: 导出 - * @author: zhang jing - * @date: 2023/7/19 15:34 - * @param: [response, enterpriseMission] - * @return: void - **/ - @Log(module = EOperationModule.DEVELOP,business = EOperationBusiness.DEVELOP, method = EOperationMethod.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, HoMemoirProcessExt memoirProcessExt) { - QueryWrapper queryWrapper = new QueryWrapper(); - if(StringUtils.isNotEmpty(memoirProcessExt.getTitleName())){ - queryWrapper.like("TITLE_NAME",memoirProcessExt.getTitleName()); - } - if(StringUtils.isNotNull(memoirProcessExt.getStartEffectDate()) - &&StringUtils.isNotNull(memoirProcessExt.getEndEffectDate())){ - queryWrapper.between("EFFECTIVE_DATE", memoirProcessExt.getStartEffectDate(), - DateUtils.afterDateTime(1, ChronoUnit.DAYS,memoirProcessExt.getEndEffectDate())); - } - queryWrapper.orderByAsc("SORT"); - List newlist=new ArrayList<>(); - List list = memoirProcessExtService.list(queryWrapper); - list.forEach(item -> newlist.add(BeanUtil.copyProperties(item, HoMemoirProcessVO.class))); - ExcelUtil util = new ExcelUtil<>(HoMemoirProcessVO.class); - util.exportExcel(response, newlist, "发展历程"); - } - - - /** - * @description: 新增大事记-发展历程 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [memoirProcessExt] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @Log(module = EOperationModule.DEVELOP,business = EOperationBusiness.DEVELOP, method = EOperationMethod.INSERT) - @PostMapping("/save") - public AjaxResult save(@RequestBody HoMemoirProcess memoirProcessExt) { - if(StringUtils.isEmpty(memoirProcessExt.getTitleName())){ - return AjaxResult.error(ConfigMsgConstants.TITLE_NAME_NOT_NULL); - } - if(StringUtils.isNull(memoirProcessExt.getSetupTime())){ - return AjaxResult.error(ConfigMsgConstants.TITLE_SETUP_TIME_NOT_NULL); - } - -// if(StringUtils.isNull(memoirProcessExt.getLanguageType())){ -// return AjaxResult.error(ConfigMsgConstants.HO_LANGUAGE_TYPE_NOT_NULL); -// } - if(StringUtils.isNull(memoirProcessExt.getEffectiveDate())){ - return AjaxResult.error(ConfigMsgConstants.EFFECTIVE_DATE_NOT_NULL); - } - QueryWrapper queryWrapper = new QueryWrapper(); -// queryWrapper.eq("LANGUAGE_TYPE",memoirProcessExt.getLanguageType()); - queryWrapper.orderByDesc("SORT"); - List list = memoirProcessExtService.list(queryWrapper); - if(CollectionUtil.isNotEmpty(list)){ - memoirProcessExt.setSort(list.get(0).getSort()+1); - }else{ - memoirProcessExt.setSort(1); - } - memoirProcessExt.setPkCreator(SecurityUtils.getUserId()); - memoirProcessExt.setCreationTime(new Date()); - return toAjax(memoirProcessExtService.save(memoirProcessExt)); - } - - - /** - * @description: 修改大事记-发展历程 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [memoirProcessExt] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @Log(module = EOperationModule.DEVELOP,business = EOperationBusiness.DEVELOP, method = EOperationMethod.UPDATE) - @PostMapping("/update") - public AjaxResult update(@RequestBody HoMemoirProcess memoirProcessExt) { - if(StringUtils.isNull(memoirProcessExt.getPkId())){ - return AjaxResult.error(ConfigMsgConstants.PK_ID_NOT_NULL); - } - if(StringUtils.isEmpty(memoirProcessExt.getTitleName())){ - return AjaxResult.error(ConfigMsgConstants.TITLE_NAME_NOT_NULL); - } - if(StringUtils.isNull(memoirProcessExt.getSetupTime())){ - return AjaxResult.error(ConfigMsgConstants.TITLE_SETUP_TIME_NOT_NULL); - } - -// if(StringUtils.isNull(memoirProcessExt.getLanguageType())){ -// return AjaxResult.error(ConfigMsgConstants.HO_LANGUAGE_TYPE_NOT_NULL); -// } - if(StringUtils.isNull(memoirProcessExt.getEffectiveDate())){ - return AjaxResult.error(ConfigMsgConstants.EFFECTIVE_DATE_NOT_NULL); - } - - memoirProcessExt.setPkModified(SecurityUtils.getUserId()); - memoirProcessExt.setModifiedTime(new Date()); - return toAjax(memoirProcessExtService.updateById(memoirProcessExt)); - } - - /** - * @description: 修改为置顶 - * @author: zhang jing - * @date: 2022/12/7 11:55 - * @param: [memoirProcessExt] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @Log(module = EOperationModule.DEVELOP,business = EOperationBusiness.DEVELOP, method = EOperationMethod.TOP) - @PostMapping("/updateTopping") - public AjaxResult updateTopping(@RequestBody HoMemoirProcess memoirProcessExt) { - if(StringUtils.isNull(memoirProcessExt.getPkId())){ - return AjaxResult.error(ConfigMsgConstants.PK_ID_NOT_NULL); - } - QueryWrapper queryWrapper2 = new QueryWrapper(); - queryWrapper2.eq("PK_ID",memoirProcessExt.getPkId()); - HoMemoirProcess topping =memoirProcessExtService.getOne(queryWrapper2); - if(StringUtils.isNull(topping)){ - return AjaxResult.error(ConfigMsgConstants.HO_OBJECT_NOT_REPEAT); - } - QueryWrapper queryWrapper = new QueryWrapper(); -// queryWrapper.eq("LANGUAGE_TYPE",topping.getLanguageType()); - queryWrapper.orderByAsc("SORT"); - List list = memoirProcessExtService.list(queryWrapper); - if(CollectionUtil.isNotEmpty(list)){ - HoMemoirProcess toppingOld =list.get(0); - memoirProcessExt.setSort(toppingOld.getSort()); - toppingOld.setSort(topping.getSort()); - toppingOld.setPkModified(SecurityUtils.getUserId()); - toppingOld.setModifiedTime(new Date()); - memoirProcessExtService.updateById(toppingOld); - }else{ - memoirProcessExt.setSort(1); - } - memoirProcessExt.setPkModified(SecurityUtils.getUserId()); - memoirProcessExt.setModifiedTime(new Date()); - return toAjax(memoirProcessExtService.updateById(memoirProcessExt)); - } - - /** - * @description: 上移 - * @author: zhang jing - * @date: 2022/12/7 14:24 - * @param: [memoirProcessExt] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @Log(module = EOperationModule.DEVELOP,business = EOperationBusiness.DEVELOP, method = EOperationMethod.UP_MOVE) - @PostMapping("/moveUp") - public AjaxResult moveUp(@RequestBody HoMemoirProcess memoirProcessExt) { - if(StringUtils.isNull(memoirProcessExt.getPkId())){ - return AjaxResult.error(ConfigMsgConstants.PK_ID_NOT_NULL); - } - HoMemoirProcess memoirProcess =memoirProcessExtService.getById(memoirProcessExt); - if(StringUtils.isNull(memoirProcess)){ - return AjaxResult.error(ConfigMsgConstants.HO_OBJECT_NOT_REPEAT); - } - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.lt("SORT",memoirProcess.getSort()); -// queryWrapper.eq("LANGUAGE_TYPE",memoirProcess.getLanguageType()); - queryWrapper.orderByDesc("SORT"); - List list = memoirProcessExtService.list(queryWrapper); - if(CollectionUtil.isNotEmpty(list)){ - HoMemoirProcess toppingOld =list.get(0); - memoirProcessExt.setSort(toppingOld.getSort()); - toppingOld.setSort(memoirProcess.getSort()); - toppingOld.setPkModified(SecurityUtils.getUserId()); - toppingOld.setModifiedTime(new Date()); - memoirProcessExtService.updateById(toppingOld); - }else{ - memoirProcessExt.setSort(1); - } - memoirProcessExt.setPkModified(SecurityUtils.getUserId()); - memoirProcessExt.setModifiedTime(new Date()); - return toAjax(memoirProcessExtService.updateById(memoirProcessExt)); - } - - /** - * @description: 下移 - * @author: zhang jing - * @date: 2022/12/7 14:24 - * @param: [memoirProcessExt] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @Log(module = EOperationModule.DEVELOP,business = EOperationBusiness.DEVELOP, method = EOperationMethod.DOWN_MOVE) - @PostMapping("/moveDown") - public AjaxResult moveDown(@RequestBody HoMemoirProcess memoirProcessExt) { - if(StringUtils.isNull(memoirProcessExt.getPkId())){ - return AjaxResult.error(ConfigMsgConstants.PK_ID_NOT_NULL); - } - HoMemoirProcess memoirProcess =memoirProcessExtService.getById(memoirProcessExt); - if(StringUtils.isNull(memoirProcess)){ - return AjaxResult.error(ConfigMsgConstants.HO_OBJECT_NOT_REPEAT); - } - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.gt("SORT",memoirProcess.getSort()); -// queryWrapper.eq("LANGUAGE_TYPE",memoirProcess.getLanguageType()); - queryWrapper.orderByAsc("SORT"); - List list = memoirProcessExtService.list(queryWrapper); - if(CollectionUtil.isNotEmpty(list)){ - HoMemoirProcess toppingOld =list.get(0); - memoirProcessExt.setSort(toppingOld.getSort()); - toppingOld.setSort(memoirProcess.getSort()); - toppingOld.setPkModified(SecurityUtils.getUserId()); - toppingOld.setModifiedTime(new Date()); - memoirProcessExtService.updateById(toppingOld); - }else{ - memoirProcessExt.setSort(1); - } - memoirProcessExt.setPkModified(SecurityUtils.getUserId()); - memoirProcessExt.setModifiedTime(new Date()); - return toAjax(memoirProcessExtService.updateById(memoirProcessExt)); - } - - - /** - * @description: 查询单条个大事记-发展历程 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [pkId] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @GetMapping("/getOne/{pkId}") - public AjaxResult getOne(@PathVariable Long pkId) { - HoMemoirProcess memoirProcessExt = memoirProcessExtService.getById(pkId); - return AjaxResult.success(memoirProcessExt); - } - - - /** - * @description: 删除大事记-发展历程 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [pkId] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @Log(module = EOperationModule.DEVELOP,business = EOperationBusiness.DEVELOP, method = EOperationMethod.DELETE) - @DeleteMapping("/{pkId}") - public AjaxResult delete(@PathVariable Long pkId) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("PK_ID", pkId); - updateWrapper.set("DEL_FLAG", EDelFlag.DELETE.getValue()); - updateWrapper.set("PK_MODIFIED", SecurityUtils.getUserId()); - updateWrapper.set("MODIFIED_TIME", new Date()); - return toAjax(memoirProcessExtService.update(updateWrapper)); - } -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/manage/HoProductDetailsController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/manage/HoProductDetailsController.java deleted file mode 100644 index dd8fe1f6..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/manage/HoProductDetailsController.java +++ /dev/null @@ -1,179 +0,0 @@ -package com.hzs.system.home.controller.manage; - - -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.hzs.common.core.annotation.Log; -import com.hzs.common.core.constant.msg.ConfigMsgConstants; -import com.hzs.common.core.enums.EDelFlag; -import com.hzs.common.core.enums.EOperationBusiness; -import com.hzs.common.core.enums.EOperationMethod; -import com.hzs.common.core.enums.EOperationModule; -import com.hzs.common.core.utils.StringUtils; -import com.hzs.common.core.utils.poi.ExcelUtil; -import com.hzs.common.core.web.controller.BaseController; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.system.home.HoProductDetails; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.common.util.TransactionUtils; -import com.hzs.system.home.param.HoProductDetailsParam; -import com.hzs.system.home.service.IHoProductDetailsService; -import com.hzs.system.home.vo.HoProductDetailsVO; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.Date; -import java.util.List; - -/** - *

- * 商品展示-商品简介详情配置 前端控制器 - *

- * - * @author hzs - * @since 2022-10-12 - */ -@Slf4j -@RestController -@RequestMapping("/manage/ho-product-details") -public class HoProductDetailsController extends BaseController { - @Autowired - private IHoProductDetailsService hoProductDetailsService; - - /** - * @description: 查询商品简介详情列表 - * @author: zhang jing - * @date: 2022/8/30 10:20 - * @param: [hoProductDetails] - * @return: com.hzs.common.core.web.page.TableDataInfo - **/ - @Log(module = EOperationModule.PRODUCT_CONFIG,business = EOperationBusiness.PRODUCT_CONFIG, method = EOperationMethod.SELECT) - @GetMapping("/list") - public TableDataInfo list(HoProductDetailsParam hoProductDetails) { - startPage(); - List list = hoProductDetailsService.queryProductList(hoProductDetails); - return getDataTable(list); - } - - /** - * @description:导出 - * @author: zhang jing - * @date: 2023/7/19 16:09 - * @param: [response, hoProductDetails] - * @return: void - **/ - @Log(module = EOperationModule.PRODUCT_CONFIG,business = EOperationBusiness.PRODUCT_CONFIG, method = EOperationMethod.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, HoProductDetailsParam hoProductDetails) { - List list = hoProductDetailsService.queryProductList(hoProductDetails); - ExcelUtil util = new ExcelUtil<>(HoProductDetailsVO.class); - util.exportExcel(response, list, "商品配置"); - } - - - /** - * @description: 新增商品简介详情 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [hoProductDetails] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @Log(module = EOperationModule.PRODUCT_CONFIG,business = EOperationBusiness.PRODUCT_CONFIG, method = EOperationMethod.INSERT) - @PostMapping("/save") - public AjaxResult save(@RequestBody HoProductDetails hoProductDetails) { - hoProductDetails.setPkCountry(1); - if(StringUtils.isEmpty(hoProductDetails.getTitleName())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.TITLE_NAME_NOT_NULL)); - } - if(StringUtils.isEmpty(hoProductDetails.getTwoLevelTitle())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.TWO_TITLE_NAME_NOT_NULL)); - } - if(StringUtils.isNull(hoProductDetails.getPkAreaClassify())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.PK_HO_PRODUCT_RANGE_NOT_NULL)); - } - - if(StringUtils.isEmpty(hoProductDetails.getCoverAddress())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.COVER_ADDRESS_NOT_NULL)); - } - if(StringUtils.isEmpty(hoProductDetails.getPicture())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.HO_PICTURE_NOT_NULL)); - } - if(StringUtils.isEmpty(hoProductDetails.getContent())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.HO_CONTENT_NOT_NULL)); - } - hoProductDetails.setPkCreator(SecurityUtils.getUserId()); - hoProductDetails.setCreationTime(new Date()); - return toAjax(hoProductDetailsService.save(hoProductDetails)); - } - - - /** - * @description: 修改商品简介详情 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [hoProductDetails] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @Log(module = EOperationModule.PRODUCT_CONFIG,business = EOperationBusiness.PRODUCT_CONFIG, method = EOperationMethod.UPDATE) - @PostMapping("/update") - public AjaxResult update(@RequestBody HoProductDetails hoProductDetails) { - if(StringUtils.isEmpty(hoProductDetails.getTitleName())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.TITLE_NAME_NOT_NULL)); - } - if(StringUtils.isEmpty(hoProductDetails.getTwoLevelTitle())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.TWO_TITLE_NAME_NOT_NULL)); - } - if(StringUtils.isNull(hoProductDetails.getPkAreaClassify())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.PK_HO_PRODUCT_RANGE_NOT_NULL)); - } - - if(StringUtils.isEmpty(hoProductDetails.getCoverAddress())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.COVER_ADDRESS_NOT_NULL)); - } - if(StringUtils.isEmpty(hoProductDetails.getPicture())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.HO_PICTURE_NOT_NULL)); - } - if(StringUtils.isEmpty(hoProductDetails.getContent())){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.HO_CONTENT_NOT_NULL)); - } - hoProductDetails.setPkModified(SecurityUtils.getUserId()); - hoProductDetails.setModifiedTime(new Date()); - return toAjax(hoProductDetailsService.updateById(hoProductDetails)); - } - - - /** - * @description: 查询单条个商品简介详情 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [pkId] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @GetMapping("/getOne/{pkId}") - public AjaxResult getOne(@PathVariable Long pkId) { - HoProductDetails hoProductDetails = hoProductDetailsService.getById(pkId); - return AjaxResult.success(hoProductDetails); - } - - - /** - * @description: 删除商品简介详情 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [pkId] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @Log(module = EOperationModule.PRODUCT_CONFIG,business = EOperationBusiness.PRODUCT_CONFIG, method = EOperationMethod.DELETE) - @DeleteMapping("/{pkId}") - public AjaxResult delete(@PathVariable Long pkId) { - HoProductDetails hoProductDetails = hoProductDetailsService.getById(pkId); - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("PK_ID", pkId); - updateWrapper.set("DEL_FLAG", EDelFlag.DELETE.getValue()); - updateWrapper.set("PK_MODIFIED", SecurityUtils.getUserId()); - updateWrapper.set("MODIFIED_TIME", new Date()); - return toAjax(hoProductDetailsService.update(updateWrapper)); - } -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/manage/HoRegionDistributeController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/manage/HoRegionDistributeController.java deleted file mode 100644 index cd85f093..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/manage/HoRegionDistributeController.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.hzs.system.home.controller.manage; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.hzs.common.core.enums.EDelFlag; -import com.hzs.common.core.web.controller.BaseController; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.system.home.HoRegionDistribute; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.system.home.service.IHoRegionDistributeService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.Date; -import java.util.List; - -/** - * @Description: 全球销售网络分布 - * @Author: yuhui - * @Time: 2022/10/9 16:57 - * @Classname: SaRegionDistributeController - * @PackageName: com.hzs.system.home.controller.manage - */ -@Slf4j -@RestController -@RequestMapping("/manage/sa-region-distribute") -public class HoRegionDistributeController extends BaseController { - - @Autowired - private IHoRegionDistributeService regionDistributeService; - - - /** - * 查询列表 - * @return - */ - @GetMapping("list") - public TableDataInfo list(){ - QueryWrapper queryWrapper = new QueryWrapper(); - List list = regionDistributeService.list(queryWrapper); - return getDataTable(list); - } - - /** - * 新增全球销售网络分布 - * @return - */ - @PostMapping("save") - public AjaxResult save(@RequestBody HoRegionDistribute saRegionDistribute){ - saRegionDistribute.setCreationTime(new Date()); - saRegionDistribute.setPkCreator(SecurityUtils.getUserId()); - saRegionDistribute.setPkCountry(SecurityUtils.getPkCountry()); - regionDistributeService.save(saRegionDistribute); - return AjaxResult.success(); - } - - /** - * 修改全球销售网络分布 - * @param saRegionDistribute - * @return - */ - @PostMapping("update") - public AjaxResult update(@RequestBody HoRegionDistribute saRegionDistribute){ - saRegionDistribute.setModifiedTime(new Date()); - saRegionDistribute.setPkModified(SecurityUtils.getUserId()); - regionDistributeService.updateById(saRegionDistribute); - return AjaxResult.success(); - } - - - /** - * 删除全球销售网络分布 - * @param saRegionDistribute - * @return - */ - @PostMapping("remove") - public AjaxResult remove(@RequestBody HoRegionDistribute saRegionDistribute){ - UpdateWrapper updateWrapper = new UpdateWrapper(); - updateWrapper.eq("PK_ID",saRegionDistribute.getPkId()); - updateWrapper.set("PK_MODIFIED",SecurityUtils.getUsername()); - updateWrapper.set("MODIFIED_TIME",new Date()); - updateWrapper.set("DEL_FLAG", EDelFlag.DELETE.getValue()); - regionDistributeService.update(updateWrapper); - return AjaxResult.success(); - } - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/manage/HoRegionDistributeItemController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/manage/HoRegionDistributeItemController.java deleted file mode 100644 index db2d199e..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/manage/HoRegionDistributeItemController.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.hzs.system.home.controller.manage; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.hzs.common.core.enums.EDelFlag; -import com.hzs.common.core.web.controller.BaseController; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.system.home.HoRegionDistributeItem; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.system.home.service.IHoRegionDistributeItemService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.Date; -import java.util.List; - -/** - * @Description: - * @Author: yuhui - * @Time: 2022/10/10 10:11 - * @Classname: SaRegionDistributeItemController - * @PackageName: com.hzs.system.home.controller.manage - */ -@Slf4j -@RestController -@RequestMapping("/manage/sa-region-distribute-item") -public class HoRegionDistributeItemController extends BaseController { - - - @Autowired - private IHoRegionDistributeItemService regionDistributeItemService; - - - /** - * 查询列表 - * @return - */ - @GetMapping("list") - public TableDataInfo list(HoRegionDistributeItem regionDistributeItem){ - QueryWrapper queryWrapper = new QueryWrapper(); - if (regionDistributeItem.getRegionDistributePk() != null){ - queryWrapper.eq("REGION_DISTRIBUTE_PK",regionDistributeItem.getRegionDistributePk()); - } - List list = regionDistributeItemService.list(queryWrapper); - return getDataTable(list); - } - - /** - * 新增 - * @return - */ - @PostMapping("save") - public AjaxResult save(@RequestBody HoRegionDistributeItem regionDistributeItem){ - regionDistributeItem.setCreationTime(new Date()); - regionDistributeItem.setPkCreator(SecurityUtils.getUserId()); - regionDistributeItem.setPkCountry(SecurityUtils.getPkCountry()); - regionDistributeItemService.save(regionDistributeItem); - return AjaxResult.success(); - } - - - /** - * 修改全球销售网络分布 - * @param regionDistributeItem - * @return - */ - @PostMapping("update") - public AjaxResult update(@RequestBody HoRegionDistributeItem regionDistributeItem){ - regionDistributeItem.setModifiedTime(new Date()); - regionDistributeItem.setPkModified(SecurityUtils.getUserId()); - regionDistributeItemService.updateById(regionDistributeItem); - return AjaxResult.success(); - } - - /** - * 删除全球销售网络分布 - * @param regionDistributeItem - * @return - */ - @PostMapping("remove") - public AjaxResult remove(@RequestBody HoRegionDistributeItem regionDistributeItem){ - UpdateWrapper updateWrapper = new UpdateWrapper(); - updateWrapper.eq("PK_ID",regionDistributeItem.getPkId()); - updateWrapper.set("PK_MODIFIED",SecurityUtils.getUsername()); - updateWrapper.set("MODIFIED_TIME",new Date()); - updateWrapper.set("DEL_FLAG", EDelFlag.DELETE.getValue()); - regionDistributeItemService.update(updateWrapper); - return AjaxResult.success(); - } -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/manage/HoVrAreaController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/manage/HoVrAreaController.java deleted file mode 100644 index 6a012ac6..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/controller/manage/HoVrAreaController.java +++ /dev/null @@ -1,230 +0,0 @@ -package com.hzs.system.home.controller.manage; - - -import cn.hutool.core.bean.BeanUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.hzs.common.core.annotation.Log; -import com.hzs.common.core.constant.msg.ConfigMsgConstants; -import com.hzs.common.core.enums.EDelFlag; -import com.hzs.common.core.enums.EOperationBusiness; -import com.hzs.common.core.enums.EOperationMethod; -import com.hzs.common.core.enums.EOperationModule; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.core.utils.StringUtils; -import com.hzs.common.core.utils.poi.ExcelUtil; -import com.hzs.common.core.web.controller.BaseController; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.system.ext.HoEnterpriseMissionExt; -import com.hzs.common.domain.system.home.HoEnterpriseMission; -import com.hzs.common.domain.system.home.HoVrArea; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.system.home.service.IHoVrAreaService; -import com.hzs.system.home.vo.HoEnterpriseMissionVO; -import com.hzs.system.home.vo.HoVrAreaVO; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.time.temporal.ChronoUnit; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -/** - *

- * VR专区 前端控制器 - *

- * - * @author hzs - * @since 2022-11-19 - */ -@RestController -@RequestMapping("/manage/ho-vr-area") -public class HoVrAreaController extends BaseController { - @Autowired - private IHoVrAreaService vrAreaService; - - /** - * @description: 查询VR专区列表 - * @author: zhang jing - * @date: 2022/8/30 10:20 - * @param: [vrArea] - * @return: com.hzs.common.core.web.page.TableDataInfo - **/ - @GetMapping("/list") - @Log(module = EOperationModule.VR_ZONE,business = EOperationBusiness.VR_ZONE, method = EOperationMethod.SELECT) - public TableDataInfo list(HoEnterpriseMissionExt vrArea) { - startPage(); - QueryWrapper queryWrapper = new QueryWrapper(); - if(StringUtils.isNotNull(vrArea.getStartDate()) - &&StringUtils.isNotNull(vrArea.getEndDate())){ - queryWrapper.between("CREATION_TIME", vrArea.getStartDate(), - DateUtils.afterDateTime(1, ChronoUnit.DAYS,vrArea.getEndDate())); - } - if(StringUtils.isNotNull(vrArea.getStartEffectDate()) - &&StringUtils.isNotNull(vrArea.getEndEffectDate())){ - queryWrapper.between("EFFECTIVE_DATE", vrArea.getStartEffectDate(), - DateUtils.afterDateTime(1, ChronoUnit.DAYS,vrArea.getEndEffectDate())); - } - if(StringUtils.isNotEmpty(vrArea.getTitleName())){ - queryWrapper.like("TITLE_NAME",vrArea.getTitleName()); - } - queryWrapper.orderByAsc("SORT"); - List list = vrAreaService.list(queryWrapper); - return getDataTable(list); - } - - /** - * @description: 导出 - * @author: zhang jing - * @date: 2023/8/21 11:19 - * @param: [response, enterpriseMission] - * @return: void - **/ - @Log(module = EOperationModule.VR_ZONE,business = EOperationBusiness.VR_ZONE, method = EOperationMethod.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, HoEnterpriseMissionExt vrArea) { - QueryWrapper queryWrapper = new QueryWrapper(); - if(StringUtils.isNotNull(vrArea.getStartDate()) - &&StringUtils.isNotNull(vrArea.getEndDate())){ - queryWrapper.between("CREATION_TIME", vrArea.getStartDate(), - DateUtils.afterDateTime(1, ChronoUnit.DAYS,vrArea.getEndDate())); - } - if(StringUtils.isNotNull(vrArea.getStartEffectDate()) - &&StringUtils.isNotNull(vrArea.getEndEffectDate())){ - queryWrapper.between("EFFECTIVE_DATE", vrArea.getStartEffectDate(), - DateUtils.afterDateTime(1, ChronoUnit.DAYS,vrArea.getEndEffectDate())); - } - if(StringUtils.isNotEmpty(vrArea.getTitleName())){ - queryWrapper.like("TITLE_NAME",vrArea.getTitleName()); - } - queryWrapper.orderByAsc("SORT"); - List list = vrAreaService.list(queryWrapper); - List newlist=new ArrayList<>(); - list.forEach(item -> newlist.add(BeanUtil.copyProperties(item, HoVrAreaVO.class))); - ExcelUtil util = new ExcelUtil<>(HoVrAreaVO.class); - util.exportExcel(response, newlist, "VR专区"); - } - - - /** - * @description: 新增VR专区 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [vrArea] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @Log(module = EOperationModule.VR_ZONE,business = EOperationBusiness.VR_ZONE, method = EOperationMethod.INSERT) - @PostMapping("/save") - public AjaxResult save(@RequestBody HoVrArea vrArea) { - if(StringUtils.isEmpty(vrArea.getTitleName())){ - return AjaxResult.error(ConfigMsgConstants.TITLE_NAME_NOT_NULL); - } - if(StringUtils.isEmpty(vrArea.getPicture())){ - return AjaxResult.error(ConfigMsgConstants.HO_PICTURE_NOT_NULL); - } - if(StringUtils.isEmpty(vrArea.getLinkAddress())){ - return AjaxResult.error(ConfigMsgConstants.HO_LINK_ADDRESS_NOT_NULL); - } - - if(StringUtils.isNull(vrArea.getSort())){ - return AjaxResult.error(ConfigMsgConstants.HO_SORT_NOT_NULL); - } -// if(StringUtils.isNull(vrArea.getLanguageType())){ -// return AjaxResult.error(ConfigMsgConstants.HO_LANGUAGE_TYPE_NOT_NULL); -// } - if(StringUtils.isNull(vrArea.getEffectiveDate())){ - return AjaxResult.error(ConfigMsgConstants.EFFECTIVE_DATE_NOT_NULL); - } - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq("SORT",vrArea.getSort()); -// queryWrapper.eq("LANGUAGE_TYPE",vrArea.getLanguageType()); - HoVrArea check =vrAreaService.getOne(queryWrapper); - if(StringUtils.isNotNull(check)){ - return AjaxResult.error(ConfigMsgConstants.HO_SORT_NOT_REPEAT); - } - - vrArea.setPkCreator(SecurityUtils.getUserId()); - vrArea.setCreationTime(new Date()); - return toAjax(vrAreaService.save(vrArea)); - } - - - /** - * @description: 修改VR专区 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [vrArea] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @Log(module = EOperationModule.VR_ZONE,business = EOperationBusiness.VR_ZONE, method = EOperationMethod.UPDATE) - @PostMapping("/update") - public AjaxResult update(@RequestBody HoVrArea vrArea) { - if(StringUtils.isEmpty(vrArea.getTitleName())){ - return AjaxResult.error(ConfigMsgConstants.TITLE_NAME_NOT_NULL); - } - if(StringUtils.isEmpty(vrArea.getPicture())){ - return AjaxResult.error(ConfigMsgConstants.HO_PICTURE_NOT_NULL); - } - if(StringUtils.isEmpty(vrArea.getLinkAddress())){ - return AjaxResult.error(ConfigMsgConstants.HO_LINK_ADDRESS_NOT_NULL); - } - - if(StringUtils.isNull(vrArea.getSort())){ - return AjaxResult.error(ConfigMsgConstants.HO_SORT_NOT_NULL); - } -// if(StringUtils.isNull(vrArea.getLanguageType())){ -// return AjaxResult.error(ConfigMsgConstants.HO_LANGUAGE_TYPE_NOT_NULL); -// } - if(StringUtils.isNull(vrArea.getEffectiveDate())){ - return AjaxResult.error(ConfigMsgConstants.EFFECTIVE_DATE_NOT_NULL); - } - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.ne("PK_ID",vrArea.getPkId()); - queryWrapper.eq("SORT",vrArea.getSort()); -// queryWrapper.eq("LANGUAGE_TYPE",vrArea.getLanguageType()); - HoVrArea check =vrAreaService.getOne(queryWrapper); - if(StringUtils.isNotNull(check)){ - return AjaxResult.error(ConfigMsgConstants.HO_SORT_NOT_REPEAT); - } - vrArea.setPkModified(SecurityUtils.getUserId()); - vrArea.setModifiedTime(new Date()); - return toAjax(vrAreaService.updateById(vrArea)); - } - - - /** - * @description: 查询单条个VR专区 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [pkId] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @Log(module = EOperationModule.VR_ZONE,business = EOperationBusiness.VR_ZONE, method = EOperationMethod.SELECT) - @GetMapping("/getOne/{pkId}") - public AjaxResult getOne(@PathVariable Long pkId) { - HoVrArea vrArea = vrAreaService.getById(pkId); - return AjaxResult.success(vrArea); - } - - - /** - * @description: 删除VR专区 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [pkId] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @Log(module = EOperationModule.VR_ZONE,business = EOperationBusiness.VR_ZONE, method = EOperationMethod.DELETE) - @DeleteMapping("/{pkId}") - public AjaxResult delete(@PathVariable Long pkId) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("PK_ID", pkId); - updateWrapper.set("DEL_FLAG", EDelFlag.DELETE.getValue()); - updateWrapper.set("PK_MODIFIED", SecurityUtils.getUserId()); - updateWrapper.set("MODIFIED_TIME", new Date()); - return toAjax(vrAreaService.update(updateWrapper)); - } -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/mapper/HoAdvertBannerMapper.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/mapper/HoAdvertBannerMapper.java deleted file mode 100644 index d67b5385..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/mapper/HoAdvertBannerMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.hzs.system.home.mapper; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.system.home.HoAdvertBanner; - -/** - *

- * 广告banner Mapper 接口 - *

- * - * @author hzs - * @since 2022-12-08 - */ -public interface HoAdvertBannerMapper extends BaseMapper { - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/mapper/HoBackgroundMapper.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/mapper/HoBackgroundMapper.java deleted file mode 100644 index 618319ff..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/mapper/HoBackgroundMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.hzs.system.home.mapper; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.system.home.HoBackground; - -/** - *

- * 首页背景 Mapper 接口 - *

- * - * @author hzs - * @since 2022-11-18 - */ -public interface HoBackgroundMapper extends BaseMapper { - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/mapper/HoEnterpriseMissionMapper.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/mapper/HoEnterpriseMissionMapper.java deleted file mode 100644 index 5bf00904..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/mapper/HoEnterpriseMissionMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.hzs.system.home.mapper; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.system.home.HoEnterpriseMission; - -/** - *

- * 企业使命 Mapper 接口 - *

- * - * @author hzs - * @since 2022-11-18 - */ -public interface HoEnterpriseMissionMapper extends BaseMapper { - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/mapper/HoEnterpriseNewsMapper.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/mapper/HoEnterpriseNewsMapper.java deleted file mode 100644 index 6fb6066b..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/mapper/HoEnterpriseNewsMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.hzs.system.home.mapper; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.system.home.HoEnterpriseNews; - -/** - *

- * 公司新闻 Mapper 接口 - *

- * - * @author hzs - * @since 2022-11-19 - */ -public interface HoEnterpriseNewsMapper extends BaseMapper { - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/mapper/HoEnterpriseStyleMapper.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/mapper/HoEnterpriseStyleMapper.java deleted file mode 100644 index 730d52e0..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/mapper/HoEnterpriseStyleMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.hzs.system.home.mapper; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.system.home.HoEnterpriseStyle; - -/** - *

- * 公司风采 Mapper 接口 - *

- * - * @author hzs - * @since 2022-11-19 - */ -public interface HoEnterpriseStyleMapper extends BaseMapper { - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/mapper/HoGlobalCompanyMapper.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/mapper/HoGlobalCompanyMapper.java deleted file mode 100644 index 39333889..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/mapper/HoGlobalCompanyMapper.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.hzs.system.home.mapper; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.system.ext.HoGlobalCompanyExt; -import com.hzs.common.domain.system.home.HoGlobalCompany; -import com.hzs.system.home.vo.HoGlobalCompanyVO; - -import java.util.List; - -/** - *

- * 全球分布 Mapper 接口 - *

- * - * @author hzs - * @since 2022-12-08 - */ -public interface HoGlobalCompanyMapper extends BaseMapper { - - /** - * @description: 查询全球分布列表 - * @author: zhang jing - * @date: 2023/2/28 17:50 - * @param: [hoGlobalCompanyExt] - * @return: java.util.List - **/ - List queryGlobalCompanyList(HoGlobalCompanyVO globalCompanyVO); - - /** - * @description: 按区域查询 - * @author: zhang jing - * @date: 2023/4/6 9:39 - * @param: [hoGlobalCompanyExt] - * @return: java.util.List - **/ - List queryGlobalByContinent (HoGlobalCompanyVO globalCompanyVO); -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/mapper/HoMemoirHonorMapper.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/mapper/HoMemoirHonorMapper.java deleted file mode 100644 index ce185c19..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/mapper/HoMemoirHonorMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.hzs.system.home.mapper; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.system.home.HoMemoirHonor; - -/** - *

- * 大事记-资源荣誉 Mapper 接口 - *

- * - * @author hzs - * @since 2022-12-07 - */ -public interface HoMemoirHonorMapper extends BaseMapper { - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/mapper/HoMemoirProcessMapper.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/mapper/HoMemoirProcessMapper.java deleted file mode 100644 index 8ef9c46d..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/mapper/HoMemoirProcessMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.hzs.system.home.mapper; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.system.home.HoMemoirProcess; - -/** - *

- * 大事记-发展历程 Mapper 接口 - *

- * - * @author hzs - * @since 2022-12-01 - */ -public interface HoMemoirProcessMapper extends BaseMapper { - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/mapper/HoProductDetailsMapper.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/mapper/HoProductDetailsMapper.java deleted file mode 100644 index 1fc3a6a4..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/mapper/HoProductDetailsMapper.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.hzs.system.home.mapper; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.system.home.HoProductDetails; -import com.hzs.system.home.param.HoProductDetailsParam; -import com.hzs.system.home.vo.HoProductDetailsVO; - -import java.util.List; - -/** - *

- * 商品展示-商品简介详情配置 Mapper 接口 - *

- * - * @author hzs - * @since 2022-10-12 - */ -public interface HoProductDetailsMapper extends BaseMapper { - - /** - * @description: 查询商品展示下拉选 - * @author: zhang jing - * @date: 2023/4/4 18:13 - * @param: [hoProductDetailsParam] - * @return: java.util.List - **/ - List selectBelowProductDetailsList(HoProductDetailsParam hoProductDetailsParam); - - /** - * @description: 查询站点配置商品列表 - * @author: zhang jing - * @date: 2023/6/25 19:55 - * @param: [hoProductDetailsParam] - * @return: java.util.List - **/ - List queryProductList(HoProductDetailsParam hoProductDetailsParam); -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/mapper/HoRegionDistributeItemMapper.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/mapper/HoRegionDistributeItemMapper.java deleted file mode 100644 index a8ca49d8..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/mapper/HoRegionDistributeItemMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.hzs.system.home.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.system.home.HoRegionDistributeItem; - -/** - *

- * 首页全球分布子表 Mapper 接口 - *

- * - * @author hzs - * @since 2022-10-10 - */ -public interface HoRegionDistributeItemMapper extends BaseMapper { - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/mapper/HoRegionDistributeMapper.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/mapper/HoRegionDistributeMapper.java deleted file mode 100644 index 62afe63e..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/mapper/HoRegionDistributeMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.hzs.system.home.mapper; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.system.home.HoRegionDistribute; - -/** - *

- * 全球销售网络分布 Mapper 接口 - *

- * - * @author hzs - * @since 2022-10-10 - */ -public interface HoRegionDistributeMapper extends BaseMapper { - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/mapper/HoVrAreaMapper.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/mapper/HoVrAreaMapper.java deleted file mode 100644 index df76cfa9..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/mapper/HoVrAreaMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.hzs.system.home.mapper; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.system.home.HoVrArea; - -/** - *

- * VR专区 Mapper 接口 - *

- * - * @author hzs - * @since 2022-11-19 - */ -public interface HoVrAreaMapper extends BaseMapper { - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/param/HoArticleParam.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/param/HoArticleParam.java deleted file mode 100644 index 4732894a..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/param/HoArticleParam.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.hzs.system.home.param; - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; - -import java.util.Date; - -@Data -public class HoArticleParam { - private Integer pkId; - /** - * 文章标题名称 - */ - private String titleName; - - /** - * 图片 - */ - private String picture; - - /** - * 内容 - */ - private String content; - - /** - * 排序 - */ - private Integer sort; - - /** - * 时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date setupTime; - - /** - * 语言种类 - */ - private Integer languageType; - /** - * 类型 - */ - private Integer pkHoLeaderTitle; - - - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/param/HoLeaderParam.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/param/HoLeaderParam.java deleted file mode 100644 index f39ef1fe..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/param/HoLeaderParam.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.hzs.system.home.param; - -import lombok.Data; - - -@Data -public class HoLeaderParam { - - private Integer pkId; - /** - * 图片 - */ - private String picture; - - /** - * 排序 - */ - private Integer sort; - /** - * 类型 1:首页banner图 2：大事记-资源荣誉 - */ - private Integer type; - - - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/param/HoLeaderTitleParam.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/param/HoLeaderTitleParam.java deleted file mode 100644 index 05c1aa0b..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/param/HoLeaderTitleParam.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.hzs.system.home.param; - -import lombok.Data; - -@Data -public class HoLeaderTitleParam { - /** - * 标题名称 - */ - private String titleName; - - /** - * 排序 - */ - private Integer sort; - /** - * 语言种类 - */ - private Integer languageType; - /** - * 应用类型 1 关于我们相关 2：商品展示 - */ - private Integer type; - - - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/param/HoProductDetailsParam.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/param/HoProductDetailsParam.java deleted file mode 100644 index ee4d5a7b..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/param/HoProductDetailsParam.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.hzs.system.home.param; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Excel; -import lombok.Data; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -@Data -public class HoProductDetailsParam { - - private Long pkId; - /** - * 图片 - */ - private String picture; - - /** - * 标题名称 - */ - private String titleName; - /** - * 副标题 - */ - private String twoLevelTitle; - - /** - * 封面 - */ - private String coverAddress; - - /** - * 商品分类名称 - */ - private String pkAreaClassifyName; - - /** - * 排序 - */ - private Integer sort; - - /** - * 内容 - */ - private String content; - - /** - * 商品简单介绍集合 - */ - List productBriefList; - /** - * 商品详细介绍集合 - */ - List productDetailsList; - - /** - * 商品分类ID - */ - private Integer pkAreaClassify; - /** - * 国家标识 - */ - private Integer pkCountry; - - /** - * 语言种类 （用户查询语言 1 中文 2英文） - */ - private Integer languageType; - - /** - * 开始时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date startDate; - /** - * 结束时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date endDate; - - /** - * 创建时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date creationTime; - - - - - - - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/param/HoProductRangeParam.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/param/HoProductRangeParam.java deleted file mode 100644 index 489272e2..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/param/HoProductRangeParam.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.hzs.system.home.param; - -import lombok.Data; - -import java.math.BigDecimal; - -@Data -public class HoProductRangeParam { - - private BigDecimal pkId; - /** - * 图片 - */ - private String picture; - - /** - * 标题名称 - */ - private String titleName; - - /** - * 排序 - */ - private Integer sort; - /** - * 语言种类 - */ - private Integer languageType; - - - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/param/HoRegionDistributeParam.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/param/HoRegionDistributeParam.java deleted file mode 100644 index a71dd91e..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/param/HoRegionDistributeParam.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.hzs.system.home.param; - -import com.hzs.common.domain.system.home.HoRegionDistributeItem; -import lombok.Data; - -import java.util.List; - - -/** - * @Description: - * @Author: yuhui - * @Time: 2022/10/10 11:39 - * @Classname: HoRegionDistributeParam - * @PackageName: com.hzs.system.home.param - */ -@Data -public class HoRegionDistributeParam { - /** - * 名称 - */ - private String name; - - - /** - * 排序 - */ - private Integer sort; - - /** - * 地区子项 - */ - private List itemList; - /** - * 首个地区项的信息 - */ - private List regionDistributeItem; - /** - * 语言种类 0 中文 1 英文 - */ - private Integer languageType; -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/IHoAdvertBannerService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/IHoAdvertBannerService.java deleted file mode 100644 index 2b104be8..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/IHoAdvertBannerService.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.hzs.system.home.service; - - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.system.home.HoAdvertBanner; - -/** - *

- * 广告banner 服务类 - *

- * - * @author hzs - * @since 2022-12-08 - */ -public interface IHoAdvertBannerService extends IService { - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/IHoBackgroundService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/IHoBackgroundService.java deleted file mode 100644 index b0852dec..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/IHoBackgroundService.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.hzs.system.home.service; - - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.system.home.HoBackground; - -/** - *

- * 首页背景 服务类 - *

- * - * @author hzs - * @since 2022-11-18 - */ -public interface IHoBackgroundService extends IService { - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/IHoEnterpriseMissionService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/IHoEnterpriseMissionService.java deleted file mode 100644 index f7461fa1..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/IHoEnterpriseMissionService.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.hzs.system.home.service; - - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.system.home.HoEnterpriseMission; - -/** - *

- * 企业使命 服务类 - *

- * - * @author hzs - * @since 2022-11-18 - */ -public interface IHoEnterpriseMissionService extends IService { - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/IHoEnterpriseNewsService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/IHoEnterpriseNewsService.java deleted file mode 100644 index 9c290744..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/IHoEnterpriseNewsService.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.hzs.system.home.service; - - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.system.home.HoEnterpriseNews; - -/** - *

- * 公司新闻 服务类 - *

- * - * @author hzs - * @since 2022-11-19 - */ -public interface IHoEnterpriseNewsService extends IService { - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/IHoEnterpriseStyleService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/IHoEnterpriseStyleService.java deleted file mode 100644 index 4caf60a6..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/IHoEnterpriseStyleService.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.hzs.system.home.service; - - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.system.home.HoEnterpriseStyle; - -/** - *

- * 公司风采 服务类 - *

- * - * @author hzs - * @since 2022-11-19 - */ -public interface IHoEnterpriseStyleService extends IService { - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/IHoGlobalCompanyService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/IHoGlobalCompanyService.java deleted file mode 100644 index d8169434..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/IHoGlobalCompanyService.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.hzs.system.home.service; - - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.system.ext.HoGlobalCompanyExt; -import com.hzs.common.domain.system.home.HoGlobalCompany; -import com.hzs.system.home.vo.HoGlobalCompanyVO; - -import java.util.List; - -/** - *

- * 全球分布 服务类 - *

- * - * @author hzs - * @since 2022-12-08 - */ -public interface IHoGlobalCompanyService extends IService { - - /** - * @description: 查询全球分布列表 - * @author: zhang jing - * @date: 2023/2/28 17:51 - * @param: [hoGlobalCompanyExt] - * @return: java.util.List - **/ - List queryGlobalCompanyList(HoGlobalCompanyVO globalCompanyVO); - - /** - * @description: 按区域查询 - * @author: zhang jing - * @date: 2023/4/6 9:39 - * @param: [hoGlobalCompanyExt] - * @return: java.util.List - **/ - List queryGlobalByContinent (HoGlobalCompanyVO globalCompanyVO); - - /** - * @description: 新增全球发布 - * @author: zhang jing - * @date: 2023/6/27 11:20 - * @param: [hoGlobalCompany] - * @return: boolean - **/ - boolean saveCompany(HoGlobalCompany hoGlobalCompany); - - /** - * @description: 修改全球发布 - * @author: zhang jing - * @date: 2023/6/27 11:20 - * @param: [hoGlobalCompany] - * @return: boolean - **/ - boolean updateCompany(HoGlobalCompany hoGlobalCompany); -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/IHoMemoirHonorService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/IHoMemoirHonorService.java deleted file mode 100644 index 056d0ac8..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/IHoMemoirHonorService.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.hzs.system.home.service; - - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.system.home.HoMemoirHonor; - -/** - *

- * 大事记-资源荣誉 服务类 - *

- * - * @author hzs - * @since 2022-12-07 - */ -public interface IHoMemoirHonorService extends IService { - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/IHoMemoirProcessService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/IHoMemoirProcessService.java deleted file mode 100644 index 8226f8b3..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/IHoMemoirProcessService.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.hzs.system.home.service; - - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.system.home.HoMemoirProcess; - -/** - *

- * 大事记-发展历程 服务类 - *

- * - * @author hzs - * @since 2022-12-01 - */ -public interface IHoMemoirProcessService extends IService { - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/IHoProductDetailsService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/IHoProductDetailsService.java deleted file mode 100644 index 15988d99..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/IHoProductDetailsService.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.hzs.system.home.service; - - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.system.home.HoProductDetails; -import com.hzs.system.home.param.HoProductDetailsParam; -import com.hzs.system.home.vo.HoProductDetailsVO; - -import java.util.List; - -/** - *

- * 商品展示-商品简介详情配置 服务类 - *

- * - * @author hzs - * @since 2022-10-12 - */ -public interface IHoProductDetailsService extends IService { - - /** - * @description: 商品简介详情配置 - * @author: zhang jing - * @date: 2022/10/13 10:45 - * @param: [type, pkCountry] - * @return: java.util.List - **/ - HoProductDetailsParam queryProductDetails (Integer pkAreaClassify); - - /** - * @description: 查询全部商品介绍详情 - * @author: zhang jing - * @date: 2023/9/10 20:52 - * @param: [] - * @return: com.hzs.system.home.param.HoProductDetailsParam - **/ - List queryProductDetailsMove(Integer pkAreaClassify); - - /** - * @description: 查询商品展示下拉选 - * @author: zhang jing - * @date: 2023/4/4 18:13 - * @param: [hoProductDetailsParam] - * @return: java.util.List - **/ - List selectBelowProductDetailsList(HoProductDetailsParam hoProductDetailsParam); - - /** - * @description: 查询站点配置商品列表 - * @author: zhang jing - * @date: '2023/6/25' 19:54 - * @param: [hoProductDetailsParam] - * @return: java.util.List - **/ - List queryProductList(HoProductDetailsParam hoProductDetailsParam); -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/IHoRegionDistributeItemService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/IHoRegionDistributeItemService.java deleted file mode 100644 index 87f9bd04..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/IHoRegionDistributeItemService.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.hzs.system.home.service; - - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.system.home.HoRegionDistributeItem; - -/** - *

- * 首页全球分布子表 服务类 - *

- * - * @author hzs - * @since 2022-10-10 - */ -public interface IHoRegionDistributeItemService extends IService { - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/IHoRegionDistributeService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/IHoRegionDistributeService.java deleted file mode 100644 index c9bd5f9e..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/IHoRegionDistributeService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.hzs.system.home.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.system.home.HoRegionDistribute; - -/** - *

- * 全球销售网络分布 服务类 - *

- * - * @author hzs - * @since 2022-10-10 - */ -public interface IHoRegionDistributeService extends IService { - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/IHoVrAreaService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/IHoVrAreaService.java deleted file mode 100644 index c214e08b..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/IHoVrAreaService.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.hzs.system.home.service; - - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.system.home.HoVrArea; - -/** - *

- * VR专区 服务类 - *

- * - * @author hzs - * @since 2022-11-19 - */ -public interface IHoVrAreaService extends IService { - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/impl/HoAdvertBannerServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/impl/HoAdvertBannerServiceImpl.java deleted file mode 100644 index cac9809b..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/impl/HoAdvertBannerServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.hzs.system.home.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.domain.system.home.HoAdvertBanner; -import com.hzs.system.home.mapper.HoAdvertBannerMapper; -import com.hzs.system.home.service.IHoAdvertBannerService; -import org.springframework.stereotype.Service; - -/** - *

- * 广告banner 服务实现类 - *

- * - * @author hzs - * @since 2022-12-08 - */ -@Service -public class HoAdvertBannerServiceImpl extends ServiceImpl implements IHoAdvertBannerService { - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/impl/HoBackgroundServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/impl/HoBackgroundServiceImpl.java deleted file mode 100644 index c42e4873..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/impl/HoBackgroundServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.hzs.system.home.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.domain.system.home.HoBackground; -import com.hzs.system.home.mapper.HoBackgroundMapper; -import com.hzs.system.home.service.IHoBackgroundService; -import org.springframework.stereotype.Service; - -/** - *

- * 首页背景 服务实现类 - *

- * - * @author hzs - * @since 2022-11-18 - */ -@Service -public class HoBackgroundServiceImpl extends ServiceImpl implements IHoBackgroundService { - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/impl/HoEnterpriseMissionServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/impl/HoEnterpriseMissionServiceImpl.java deleted file mode 100644 index f2efc00a..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/impl/HoEnterpriseMissionServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.hzs.system.home.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.domain.system.home.HoEnterpriseMission; -import com.hzs.system.home.mapper.HoEnterpriseMissionMapper; -import com.hzs.system.home.service.IHoEnterpriseMissionService; -import org.springframework.stereotype.Service; - -/** - *

- * 企业使命 服务实现类 - *

- * - * @author hzs - * @since 2022-11-18 - */ -@Service -public class HoEnterpriseMissionServiceImpl extends ServiceImpl implements IHoEnterpriseMissionService { - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/impl/HoEnterpriseNewsServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/impl/HoEnterpriseNewsServiceImpl.java deleted file mode 100644 index a326efd0..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/impl/HoEnterpriseNewsServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.hzs.system.home.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.domain.system.home.HoEnterpriseNews; -import com.hzs.system.home.mapper.HoEnterpriseNewsMapper; -import com.hzs.system.home.service.IHoEnterpriseNewsService; -import org.springframework.stereotype.Service; - -/** - *

- * 公司新闻 服务实现类 - *

- * - * @author hzs - * @since 2022-11-19 - */ -@Service -public class HoEnterpriseNewsServiceImpl extends ServiceImpl implements IHoEnterpriseNewsService { - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/impl/HoEnterpriseStyleServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/impl/HoEnterpriseStyleServiceImpl.java deleted file mode 100644 index 0070bdef..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/impl/HoEnterpriseStyleServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.hzs.system.home.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.domain.system.home.HoEnterpriseStyle; -import com.hzs.system.home.mapper.HoEnterpriseStyleMapper; -import com.hzs.system.home.service.IHoEnterpriseStyleService; -import org.springframework.stereotype.Service; - -/** - *

- * 公司风采 服务实现类 - *

- * - * @author hzs - * @since 2022-11-19 - */ -@Service -public class HoEnterpriseStyleServiceImpl extends ServiceImpl implements IHoEnterpriseStyleService { - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/impl/HoGlobalCompanyServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/impl/HoGlobalCompanyServiceImpl.java deleted file mode 100644 index 7c705f55..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/impl/HoGlobalCompanyServiceImpl.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.hzs.system.home.service.impl; - -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.domain.system.base.BdArea; -import com.hzs.common.domain.system.ext.HoGlobalCompanyExt; -import com.hzs.common.domain.system.home.HoGlobalCompany; -import com.hzs.system.base.service.IBdAreaService; -import com.hzs.system.home.mapper.HoGlobalCompanyMapper; -import com.hzs.system.home.service.IHoGlobalCompanyService; -import com.hzs.system.home.vo.HoGlobalCompanyVO; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.time.temporal.ChronoUnit; -import java.util.List; - -/** - *

- * 全球分布 服务实现类 - *

- * - * @author hzs - * @since 2022-12-08 - */ -@Service -public class HoGlobalCompanyServiceImpl extends ServiceImpl implements IHoGlobalCompanyService { - - @Autowired - private IBdAreaService iBdAreaService; - /** - * @description: 查询全球分布列表 - * @author: zhang jing - * @date: 2023/2/28 17:51 - * @param: [hoGlobalCompanyExt] - * @return: java.util.List - **/ - @Override - public List queryGlobalCompanyList(HoGlobalCompanyVO globalCompanyVO) { - if(globalCompanyVO.getEndDate() != null){ - globalCompanyVO.setEndDate(DateUtils.afterDate(1, ChronoUnit.DAYS, globalCompanyVO.getEndDate())); - } - return baseMapper.queryGlobalCompanyList(globalCompanyVO); - } - - /** - * @description: 按区域查询 - * @author: zhang jing - * @date: 2023/4/6 9:39 - * @param: [hoGlobalCompanyExt] - * @return: java.util.List - **/ - @Override - public List queryGlobalByContinent(HoGlobalCompanyVO globalCompanyVO) { - return baseMapper.queryGlobalByContinent(globalCompanyVO); - } - - - /** - * @description: 新增全球分布 - * @author: zhang jing - * @date: 2023/6/27 11:12 - * @param: [hoGlobalCompany] - * @return: boolean - **/ - @Transactional(rollbackFor = Exception.class) - @Override - public boolean saveCompany(HoGlobalCompany hoGlobalCompany) { - baseMapper.insert(hoGlobalCompany); - UpdateWrapper updateWrapper=new UpdateWrapper(); - updateWrapper.eq("PK_ID",hoGlobalCompany.getGloProvince()); - updateWrapper.set("IS_ILLUMINATE",0); - return iBdAreaService.update(updateWrapper); - } - - /** - * @description:修改全球分布 - * @author: zhang jing - * @date: 2023/6/27 11:28 - * @param: [hoGlobalCompany] - * @return: boolean - **/ - @Override - public boolean updateCompany(HoGlobalCompany hoGlobalCompany) { - HoGlobalCompany old= baseMapper.selectById(hoGlobalCompany.getPkId()); - QueryWrapper queryWrapper=new QueryWrapper(); - queryWrapper.eq("GLO_PROVINCE",old.getGloProvince()); - List list= baseMapper.selectList(queryWrapper); - - UpdateWrapper updateWrapper=new UpdateWrapper(); - if(CollectionUtil.isEmpty(list)){ - updateWrapper.eq("PK_ID",old.getGloProvince()); - updateWrapper.set("IS_ILLUMINATE",1); - iBdAreaService.update(updateWrapper); - } - updateWrapper.eq("PK_ID",hoGlobalCompany.getGloProvince()); - updateWrapper.set("IS_ILLUMINATE",0); - iBdAreaService.update(updateWrapper); - - baseMapper.updateById(hoGlobalCompany); - return true; - } -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/impl/HoMemoirHonorServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/impl/HoMemoirHonorServiceImpl.java deleted file mode 100644 index e1e71577..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/impl/HoMemoirHonorServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.hzs.system.home.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.domain.system.home.HoMemoirHonor; -import com.hzs.system.home.mapper.HoMemoirHonorMapper; -import com.hzs.system.home.service.IHoMemoirHonorService; -import org.springframework.stereotype.Service; - -/** - *

- * 大事记-资源荣誉 服务实现类 - *

- * - * @author hzs - * @since 2022-12-07 - */ -@Service -public class HoMemoirHonorServiceImpl extends ServiceImpl implements IHoMemoirHonorService { - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/impl/HoMemoirProcessServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/impl/HoMemoirProcessServiceImpl.java deleted file mode 100644 index e26956c2..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/impl/HoMemoirProcessServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.hzs.system.home.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.domain.system.home.HoMemoirProcess; -import com.hzs.system.home.mapper.HoMemoirProcessMapper; -import com.hzs.system.home.service.IHoMemoirProcessService; -import org.springframework.stereotype.Service; - -/** - *

- * 大事记-发展历程 服务实现类 - *

- * - * @author hzs - * @since 2022-12-01 - */ -@Service -public class HoMemoirProcessServiceImpl extends ServiceImpl implements IHoMemoirProcessService { - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/impl/HoProductDetailsServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/impl/HoProductDetailsServiceImpl.java deleted file mode 100644 index 86dc8754..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/impl/HoProductDetailsServiceImpl.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.hzs.system.home.service.impl; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.core.utils.StringUtils; -import com.hzs.common.core.utils.ip.IpLocationUtils; -import com.hzs.common.domain.system.home.HoProductDetails; -import com.hzs.system.home.mapper.HoProductDetailsMapper; -import com.hzs.system.home.param.HoProductDetailsParam; -import com.hzs.system.home.service.IHoProductDetailsService; -import com.hzs.system.home.vo.HoProductDetailsVO; -import org.springframework.stereotype.Service; - -import java.time.temporal.ChronoUnit; -import java.util.ArrayList; -import java.util.List; - -/** - *

- * 商品展示-商品简介详情配置 服务实现类 - *

- * - * @author hzs - * @since 2022-10-12 - */ -@Service -public class HoProductDetailsServiceImpl extends ServiceImpl implements IHoProductDetailsService { - - @Override - public HoProductDetailsParam queryProductDetails(Integer pkAreaClassify) { - Integer languageType = IpLocationUtils.getIpLocation(); - if(StringUtils.isNull(pkAreaClassify)){ - //首页默认展示第一个系列 - pkAreaClassify=1; - } - List productBriefList=new ArrayList<>(); - HoProductDetailsParam hoProductDetailsParam=new HoProductDetailsParam(); - QueryWrapper queryWrapper=new QueryWrapper(); - queryWrapper.eq("PK_AREA_CLASSIFY",pkAreaClassify); - List hoProductDetails=baseMapper.selectList(queryWrapper); - if(CollectionUtil.isNotEmpty(hoProductDetails)){ - hoProductDetails.forEach(item -> productBriefList.add(BeanUtil.copyProperties(item, HoProductDetailsParam.class))); - } - hoProductDetailsParam.setProductBriefList(productBriefList); - hoProductDetailsParam.setProductDetailsList(productBriefList); - return hoProductDetailsParam; - } - - /** - * @description: 查询全部商品介绍详情 - * @author: zhang jing - * @date: 2023/9/10 20:53 - * @param: [] - * @return: com.hzs.system.home.param.HoProductDetailsParam - **/ - @Override - public List queryProductDetailsMove(Integer pkAreaClassify) { - Integer languageType = IpLocationUtils.getIpLocation(); - List productBriefList=new ArrayList<>(); - HoProductDetailsParam hoProductDetailsParam=new HoProductDetailsParam(); - QueryWrapper queryWrapper=new QueryWrapper(); - queryWrapper.eq("PK_AREA_CLASSIFY",pkAreaClassify); - List hoProductDetails=baseMapper.selectList(queryWrapper); - if(CollectionUtil.isNotEmpty(hoProductDetails)){ - hoProductDetails.forEach(item -> productBriefList.add(BeanUtil.copyProperties(item, HoProductDetailsParam.class))); - } - return productBriefList; - } - - - /** - * @description: 查询商品展示下拉选 - * @author: zhang jing - * @date: 2023/4/4 18:13 - * @param: [hoProductDetailsParam] - * @return: java.util.List - **/ - @Override - public List selectBelowProductDetailsList(HoProductDetailsParam hoProductDetailsParam) { - return baseMapper.selectBelowProductDetailsList(hoProductDetailsParam); - } - - /** - * @description: 查询站点配置商品列表 - * @author: zhang jing - * @date: 2023/6/25 19:55 - * @param: [hoProductDetailsParam] - * @return: java.util.List - **/ - @Override - public List queryProductList(HoProductDetailsParam hoProductDetailsParam) { - if(null!=hoProductDetailsParam.getStartDate()&&null!=hoProductDetailsParam.getEndDate()){ - hoProductDetailsParam.setEndDate(DateUtils.afterDateTime(1, ChronoUnit.DAYS,hoProductDetailsParam.getEndDate())); - } - return baseMapper.queryProductList(hoProductDetailsParam); - } -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/impl/HoRegionDistributeItemServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/impl/HoRegionDistributeItemServiceImpl.java deleted file mode 100644 index ce300c05..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/impl/HoRegionDistributeItemServiceImpl.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.hzs.system.home.service.impl; - - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.domain.system.home.HoRegionDistributeItem; -import com.hzs.system.home.mapper.HoRegionDistributeItemMapper; -import com.hzs.system.home.service.IHoRegionDistributeItemService; -import org.springframework.stereotype.Service; - -/** - *

- * 首页全球分布子表 服务实现类 - *

- * - * @author hzs - * @since 2022-10-10 - */ -@Service -public class HoRegionDistributeItemServiceImpl extends ServiceImpl implements IHoRegionDistributeItemService { - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/impl/HoRegionDistributeServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/impl/HoRegionDistributeServiceImpl.java deleted file mode 100644 index aa322877..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/impl/HoRegionDistributeServiceImpl.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.hzs.system.home.service.impl; - - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.domain.system.home.HoRegionDistribute; -import com.hzs.system.home.mapper.HoRegionDistributeMapper; -import com.hzs.system.home.service.IHoRegionDistributeService; -import org.springframework.stereotype.Service; - -/** - *

- * 全球销售网络分布 服务实现类 - *

- * - * @author hzs - * @since 2022-10-10 - */ -@Service -public class HoRegionDistributeServiceImpl extends ServiceImpl implements IHoRegionDistributeService { - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/impl/HoVrAreaServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/impl/HoVrAreaServiceImpl.java deleted file mode 100644 index 786c960b..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/service/impl/HoVrAreaServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.hzs.system.home.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.domain.system.home.HoVrArea; -import com.hzs.system.home.mapper.HoVrAreaMapper; -import com.hzs.system.home.service.IHoVrAreaService; -import org.springframework.stereotype.Service; - -/** - *

- * VR专区 服务实现类 - *

- * - * @author hzs - * @since 2022-11-19 - */ -@Service -public class HoVrAreaServiceImpl extends ServiceImpl implements IHoVrAreaService { - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/vo/HoEnterpriseMissionVO.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/vo/HoEnterpriseMissionVO.java deleted file mode 100644 index 301a9d0d..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/vo/HoEnterpriseMissionVO.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.hzs.system.home.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Excel; -import lombok.Data; - -import java.util.Date; - -/** - *

- * 企业使命VO - *

- * - * @author hzs - * @since 2022-11-18 - */ -@Data -public class HoEnterpriseMissionVO { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private Long pkId; - - /** - * 标题名称 - */ - @Excel(name = "标题名称") - private String titleName; - /** - * 摘要 - */ - private String summary; - - /** - * 图片 - */ - private String picture; - - /** - * 内容 - */ - private String content; - - /** - * 排序 - */ - private Integer sort; - - /** - * 类型 （用户查询语言 1 中文 2英文） - */ - private Integer languageType; - - /** - * 创建日期 - */ - @Excel(name = "创建日期",dateFormat = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date creationTime; - /** - * 生效日期 - */ - @Excel(name = "生效日期",dateFormat = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date effectiveDate; - - - - - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/vo/HoEnterpriseNewsVO.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/vo/HoEnterpriseNewsVO.java deleted file mode 100644 index 5e1163ce..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/vo/HoEnterpriseNewsVO.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.hzs.system.home.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Excel; -import lombok.Data; - -import java.util.Date; - -/** - *

- * 公司新闻VO - *

- * - * @author hzs - * @since 2022-11-19 - */ -@Data -public class HoEnterpriseNewsVO { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private Integer pkId; - - /** - * 文章标题名称 - */ - @Excel(name = "标题名称") - private String titleName; - - /** - * 图片 - */ - private String picture; - - /** - * 内容 - */ - private String content; - - /** - * 排序 - */ - private Integer sort; - - /** - * 文章内容摘要 - */ - private String summary; - - /** - * 0 中文 1 英文 - */ - private Integer languageType; - - /** - * 创建日期 - */ - @Excel(name = "创建日期",dateFormat = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date creationTime; - /** - * 生效时间 - */ - @Excel(name = "生效日期",dateFormat = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date effectiveDate; - - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/vo/HoEnterpriseStyleVO.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/vo/HoEnterpriseStyleVO.java deleted file mode 100644 index cd523aa0..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/vo/HoEnterpriseStyleVO.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.hzs.system.home.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Excel; -import lombok.Data; - -import java.util.Date; - -/** - *

- * 公司风采VO - *

- * - * @author hzs - * @since 2022-11-19 - */ -@Data -public class HoEnterpriseStyleVO { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private Integer pkId; - - /** - * 文章标题名称 - */ - @Excel(name = "标题名称") - private String titleName; - - /** - * 图片 - */ - private String picture; - - /** - * 内容 - */ - private String content; - - /** - * 排序 - */ - private Integer sort; - - /** - * 文章内容摘要 - */ -// @Excel(name = "摘要",sort = 2) - private String summary; - - /** - * 0 中文 1 英文 - */ - private Integer languageType; - /** - * 创建时间 - */ - @Excel(name = "创建日期",dateFormat = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date creationTime; - /** - * 生效时间 - */ - @Excel(name = "生效日期",dateFormat = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date effectiveDate; - - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/vo/HoGlobalCompanyVO.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/vo/HoGlobalCompanyVO.java deleted file mode 100644 index b5fc6b0f..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/vo/HoGlobalCompanyVO.java +++ /dev/null @@ -1,178 +0,0 @@ -package com.hzs.system.home.vo; - -import com.baomidou.mybatisplus.annotation.*; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.hzs.common.core.annotation.Excel; -import com.hzs.common.core.web.domain.BaseEntity; -import com.hzs.common.domain.system.ext.HoGlobalCompanyExt; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.util.Date; -import java.util.List; - -/** - *

- * 全球分布 - *

- * - * @author hzs - * @since 2022-12-08 - */ -@Data -public class HoGlobalCompanyVO { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private Integer pkId; - - /** - * 区域 - */ - private Integer region; - - /** - * 省 - */ - private Integer gloProvince; - - /** - * 市 - */ - private Integer gloCity; - - /** - * 县 - */ - private Integer gloCounty; - - /** - * 分公司 - */ - @Excel(name = "分公司",sort = 2) - private String company; - - /** - * 联系人 - */ - @Excel(name = "联系人",sort = 3) - private String contacts; - - /** - * 联系方式 - */ - @Excel(name = "联系方式",sort = 4) - private String phone; - - /** - * 邮箱 - */ - @Excel(name = "邮箱",sort = 5) - private String email; - - /** - * 地址 - */ - @Excel(name = "地址",sort = 9) - private String address; - - /** - * 0 中文 1 英文 - */ - private Integer languageType; - - /** - * 图片 - */ - private String image; - - /** - * 创建人ID - */ - private Long pkCreator; - - /** - * 创建开始时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date startDate; - /** - * 创建结束时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date endDate; - - /** - * 区域 - */ - private String regionName; - /** - * 国家 - */ - @Excel(name = "国家",sort = 1) - private String shortName; - /** - * 省 - */ - @Excel(name = "省/州",sort = 6) - private String provinceName; - /** - * 市 - */ - @Excel(name = "市",sort = 7) - private String cityName; - /** - * 区/县 - */ - @Excel(name = "区/县",sort = 8) - private String countyName; - /** - * 全球分布下拉框 - */ - List belowList; - - /** - * 父级区域 - */ - private Integer parentRegion; - - - /** - * 创建日期 - */ - @Excel(name = "创建日期",dateFormat = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date creationTime; - - /** - * 修改人ID - */ - @TableField("PK_MODIFIED") - private Long pkModified; - - /** - * 修改时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date modifiedTime; - - /** - * 逻辑删除 (0=未删除，1已删除) - */ - @JsonIgnore - private Integer delFlag; - - /** - * 国家 - */ - private Integer pkCountry; - - - - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/vo/HoMemoirHonorVO.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/vo/HoMemoirHonorVO.java deleted file mode 100644 index 62a34fda..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/vo/HoMemoirHonorVO.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.hzs.system.home.vo; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.web.domain.BaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.util.Date; - -/** - *

- * 大事记-资源荣誉 - *

- * - * @author hzs - * @since 2022-12-07 - */ -@Data -public class HoMemoirHonorVO { - - - /** - * 创建开始时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date startDate; - /** - * 创建结束时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date endDate; - - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/vo/HoMemoirProcessVO.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/vo/HoMemoirProcessVO.java deleted file mode 100644 index b10a74c7..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/vo/HoMemoirProcessVO.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.hzs.system.home.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Excel; -import lombok.Data; - -import java.util.Date; - -/** - *

- * 大事记-发展历程VO - *

- * - * @author hzs - * @since 2022-12-01 - */ -@Data -public class HoMemoirProcessVO { - - private static final long serialVersionUID = 1L; - - private Integer pkId; - - /** - * 标题名称 - */ - @Excel(name = "标题名称") - private String titleName; - - /** - * 排序 - */ - private Integer sort; - - /** - * 时间 - */ - @Excel(name = "时间",dateFormat = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date setupTime; - - /** - * 创建时间 - */ - @Excel(name = "创建日期",dateFormat = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date creationTime; - - /** - * 生效日期 - */ - @Excel(name = "生效日期",dateFormat = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date effectiveDate; - - /** - * 类型 0 中文 1 英文 - */ - private Integer languageType; - /** - * 国家 - */ - private Integer pkCountry; - - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/vo/HoProductDetailsVO.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/vo/HoProductDetailsVO.java deleted file mode 100644 index d01cd023..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/vo/HoProductDetailsVO.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.hzs.system.home.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Excel; -import lombok.Data; - -import java.util.Date; - -/** - *

- * 商品展示-商品简介详情配置VO - *

- * - * @author hzs - * @since 2022-10-12 - */ -@Data -public class HoProductDetailsVO { - - private static final long serialVersionUID = 1L; - - private Integer pkId; - - /** - * 图片 - */ - private String picture; - /** - * 封面 - */ - private String coverAddress; - - /** - * 标题名称 - */ - @Excel(name = "标题",sort = 1) - private String titleName; - /** - * 副标题名称 - */ - @Excel(name = "副标题",sort = 2) - private String twoLevelTitle; - - /** - * 商品分类名称 - */ - private String pkAreaClassifyName; - - /** - * 内容 - */ - @Excel(name = "商品介绍",sort = 3) - private String content; - - /** - * 商品分类 - */ - private Integer pkAreaClassify; - - /** - * 排序 - */ - private Integer sort; - - /** - * 语言种类 - */ - private Integer languageType; - - /** - * 创建时间 - */ - @Excel(name = "创建日期",dateFormat ="yyyy-MM-dd HH:mm:ss" ,sort = 4) - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date creationTime; - - /** - * 国家 - */ - private Integer pkCountry; - - - - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/vo/HoVrAreaVO.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/home/vo/HoVrAreaVO.java deleted file mode 100644 index 6bcd8cce..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/home/vo/HoVrAreaVO.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.hzs.system.home.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Excel; -import lombok.Data; - -import java.util.Date; - -/** - *

- * VR专区 VO - *

- * - * @author hzs - * @since 2022-11-19 - */ -@Data -public class HoVrAreaVO { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private Integer pkId; - - /** - * 标题名称 - */ - private String titleName; - - /** - * 图片 - */ - private String picture; - - /** - * 链接地址 - */ - private String linkAddress; - - /** - * 排序 - */ - private String sort; - /** - * 创建时间 - */ - @Excel(name = "创建日期",dateFormat = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date creationTime; - - /** - * 生效日期 - */ - @Excel(name = "生效日期",dateFormat = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date effectiveDate; - - /** - * 类型 0 中文 1 英文 - */ - private String languageType; - - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/index/controller/IndexController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/index/controller/IndexController.java index 77bfb95a..4ebf31de 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/index/controller/IndexController.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/index/controller/IndexController.java @@ -41,11 +41,7 @@ import java.util.*; import java.util.stream.Collectors; /** - * @Description: 后台首页控制器 - * @Author: jiang chao - * @Time: 2022/11/11 19:03 - * @Classname: IndexController - * @PackageName: com.hzs.system.index.controller + * 后台首页控制器 */ @RestController @RequestMapping("/manage/index") diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/controller/manage/SysApprovalBusinessController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/controller/manage/SysApprovalBusinessController.java index cad4eff1..d53cc47e 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/controller/manage/SysApprovalBusinessController.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/controller/manage/SysApprovalBusinessController.java @@ -36,8 +36,6 @@ import com.hzs.member.self.ICuSelfServiceServiceApi; import com.hzs.member.self.dto.SelfServiceDataDTO; import com.hzs.sale.pub.ISaleApprovalServiceApi; import com.hzs.system.index.vo.IndexApprovalDetailVO; -import com.hzs.scm.pub.IScmBillServiceApi; -import com.hzs.scm.pub.dto.BillDTO; import com.hzs.system.sys.param.ApprovalBusinessParam; import com.hzs.system.sys.param.ApprovalCustomParam; import com.hzs.system.sys.param.ApprovalCustomQueryParam; @@ -46,7 +44,6 @@ import com.hzs.system.sys.vo.ApprovalBusinessDetailVO; import com.hzs.system.sys.vo.ApprovalBusinessSendVO; import com.hzs.system.sys.vo.ApprovalBusinessVO; import com.hzs.system.sys.vo.ApprovalCustomVO; -import com.hzs.third.pay.IOnlineServiceApi; import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.i18n.LocaleContextHolder; @@ -90,8 +87,6 @@ public class SysApprovalBusinessController extends BaseController { @DubboReference ICuMemberAchieveLogServiceApi achieveLogServiceApi; @DubboReference - IOnlineServiceApi iOnlineServiceApi; - @DubboReference ICuSelfServiceServiceApi cuSelfServiceServiceApi; @DubboReference IActivityApprovalServiceApi iActivityApprovalServiceApi; @@ -99,8 +94,6 @@ public class SysApprovalBusinessController extends BaseController { IUpPolicyCurrencyServiceApi upPolicyCurrencyServiceApi; @DubboReference IMemberServiceApi iMemberServiceApi; - @DubboReference - IScmBillServiceApi scmBillServiceApi; /** * 获取审批详情 @@ -255,15 +248,6 @@ public class SysApprovalBusinessController extends BaseController { } } break; - case THIRD_BUSINESS: - // 三方服务信息处理 - R thirdR = iOnlineServiceApi.queryApprovalData(EApprovalBusiness.getEnumByValue(approvalBusinessExt.getApprovalBusiness()), approvalBusinessExt.getBusinessCode()); - if (thirdR.isSuccess()) { - if (null != thirdR.getData()) { - approvalBusinessVO.setBusinessData(JSONUtil.toJsonStr(thirdR.getData())); - } - } - break; case FINANCE_BUSINESS: case NOTICE_BUSINESS: // 财务相关、公告站内信（直接取冗余在审批中的信息） @@ -284,14 +268,6 @@ public class SysApprovalBusinessController extends BaseController { } } break; - case SCM_BUSINESS: - R> billVo = scmBillServiceApi.queryBillDtoByCondition(EApprovalBusiness.getEnumByValue(approvalBusinessExt.getApprovalBusiness()), approvalBusinessExt.getBusinessCode()); - if (billVo.isSuccess()) { - if (CollectionUtil.isNotEmpty(billVo.getData())) { - approvalBusinessVO.setBusinessData(JSONUtil.toJsonStr(billVo.getData())); - } - } - break; default: } return AjaxResult.success(approvalBusinessVO); diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/impl/ApprovalServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/impl/ApprovalServiceImpl.java index 73ea2fb7..4ee3dedb 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/impl/ApprovalServiceImpl.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/impl/ApprovalServiceImpl.java @@ -19,7 +19,6 @@ import com.hzs.member.account.dto.BusinessCommissionDTO; import com.hzs.member.handlebusiness.ICuHandleBusinessServiceApi; import com.hzs.member.self.ICuSelfServiceServiceApi; import com.hzs.sale.pub.ISaleApprovalServiceApi; -import com.hzs.scm.pub.IScmBillServiceApi; import com.hzs.system.base.IApprovalPushInfo; import com.hzs.system.base.INoticeAuditServiceApi; import com.hzs.system.base.dto.ApprovalPushInfoDTO; @@ -28,7 +27,6 @@ import com.hzs.system.sys.dto.ApprovalSubmitDTO; import com.hzs.system.sys.dto.LoginUser; import com.hzs.system.sys.param.ApprovalCustomParam; import com.hzs.system.sys.service.*; -import com.hzs.third.pay.IOnlineServiceApi; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.beans.factory.annotation.Autowired; @@ -75,15 +73,11 @@ public class ApprovalServiceImpl implements IApprovalService { @DubboReference INoticeAuditServiceApi iNoticeAuditServiceApi; @DubboReference - IOnlineServiceApi iOnlineServiceApi; - @DubboReference IActivityApprovalServiceApi iActivityApprovalServiceApi; @DubboReference IApprovalPushInfo iApprovalPushInfo; @DubboReference ICuSelfServiceServiceApi cuSelfServiceServiceApi; - @DubboReference - IScmBillServiceApi scmBillServiceApi; @Transactional(rollbackFor = Exception.class) @Override @@ -468,10 +462,6 @@ public class ApprovalServiceImpl implements IApprovalService { // 公告、站内信相关 resultR = iNoticeAuditServiceApi.noticeAuditProcess(approvalBusinessResultDTO); break; - case THIRD_BUSINESS: - // 三方信息处理 - resultR = iOnlineServiceApi.approvalCallback(approvalBusinessResultDTO); - break; case ACTIVITY_BUSINESS: // 活动相关处理 resultR = iActivityApprovalServiceApi.approvalCallback(approvalBusinessResultDTO); @@ -479,10 +469,6 @@ public class ApprovalServiceImpl implements IApprovalService { case CUSTOM_BUSINESS: // 自定义签呈不需要进行后续业务操作 return null; - case SCM_BUSINESS: - // 供应链相关处理 - resultR = scmBillServiceApi.approvalCallback(approvalBusinessResultDTO); - break; default: } diff --git a/bd-business/bd-business-system/src/main/resources/bootstrap.yml b/bd-business/bd-business-system/src/main/resources/bootstrap.yml index 93002c63..d96ed844 100644 --- a/bd-business/bd-business-system/src/main/resources/bootstrap.yml +++ b/bd-business/bd-business-system/src/main/resources/bootstrap.yml @@ -67,7 +67,7 @@ dubbo: port: -1 cloud: # 订阅服务 - subscribed-services: bd-system, bd-third, bd-member, bd-sale, bd-scm, bd-report + subscribed-services: bd-system, bd-third, bd-member, bd-sale, bd-report scan: # dubbo 服务扫描包（开启之后才会对外提供服务） base-packages: com.hzs.system diff --git a/bd-business/bd-business-system/src/main/resources/mapper/system/home/HoAdvertBannerMapper.xml b/bd-business/bd-business-system/src/main/resources/mapper/system/home/HoAdvertBannerMapper.xml deleted file mode 100644 index 5dfc32a0..00000000 --- a/bd-business/bd-business-system/src/main/resources/mapper/system/home/HoAdvertBannerMapper.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - DEL_FLAG, - PK_COUNTRY, - CREATION_TIME, - MODIFIED_TIME, - PK_CREATOR, - PK_MODIFIED, - PK_ID, POSITION, EFFECTIVE_DATE, SORT, PICTURE - - - diff --git a/bd-business/bd-business-system/src/main/resources/mapper/system/home/HoBackgroundMapper.xml b/bd-business/bd-business-system/src/main/resources/mapper/system/home/HoBackgroundMapper.xml deleted file mode 100644 index a6bd5a17..00000000 --- a/bd-business/bd-business-system/src/main/resources/mapper/system/home/HoBackgroundMapper.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - DEL_FLAG, - PK_COUNTRY, - CREATION_TIME, - MODIFIED_TIME, - PK_CREATOR, - PK_MODIFIED, - PK_ID, VIDEO_ADDRESS, EFFECTIVE_DATE - - - diff --git a/bd-business/bd-business-system/src/main/resources/mapper/system/home/HoEnterpriseMissionMapper.xml b/bd-business/bd-business-system/src/main/resources/mapper/system/home/HoEnterpriseMissionMapper.xml deleted file mode 100644 index 4e201e84..00000000 --- a/bd-business/bd-business-system/src/main/resources/mapper/system/home/HoEnterpriseMissionMapper.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - DEL_FLAG, - PK_COUNTRY, - CREATION_TIME, - MODIFIED_TIME, - PK_CREATOR, - PK_MODIFIED, - PK_ID, TITLE_NAME, PICTURE, CONTENT, SORT, LANGUAGE_TYPE, EFFECTIVE_DATE, SUMMARY - - - diff --git a/bd-business/bd-business-system/src/main/resources/mapper/system/home/HoEnterpriseNewsMapper.xml b/bd-business/bd-business-system/src/main/resources/mapper/system/home/HoEnterpriseNewsMapper.xml deleted file mode 100644 index d5d47f2d..00000000 --- a/bd-business/bd-business-system/src/main/resources/mapper/system/home/HoEnterpriseNewsMapper.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - DEL_FLAG, - PK_COUNTRY, - CREATION_TIME, - MODIFIED_TIME, - PK_CREATOR, - PK_MODIFIED, - PK_ID, TITLE_NAME, PICTURE, CONTENT, SORT, SUMMARY, LANGUAGE_TYPE, EFFECTIVE_DATE - - - diff --git a/bd-business/bd-business-system/src/main/resources/mapper/system/home/HoEnterpriseStyleMapper.xml b/bd-business/bd-business-system/src/main/resources/mapper/system/home/HoEnterpriseStyleMapper.xml deleted file mode 100644 index 29e059b3..00000000 --- a/bd-business/bd-business-system/src/main/resources/mapper/system/home/HoEnterpriseStyleMapper.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - DEL_FLAG, - PK_COUNTRY, - CREATION_TIME, - MODIFIED_TIME, - PK_CREATOR, - PK_MODIFIED, - PK_ID, TITLE_NAME, PICTURE, CONTENT, SORT, SUMMARY, LANGUAGE_TYPE, EFFECTIVE_DATE - - - diff --git a/bd-business/bd-business-system/src/main/resources/mapper/system/home/HoGlobalCompanyMapper.xml b/bd-business/bd-business-system/src/main/resources/mapper/system/home/HoGlobalCompanyMapper.xml deleted file mode 100644 index 4336f170..00000000 --- a/bd-business/bd-business-system/src/main/resources/mapper/system/home/HoGlobalCompanyMapper.xml +++ /dev/null @@ -1,125 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - DEL_FLAG, - PK_COUNTRY, - CREATION_TIME, - MODIFIED_TIME, - PK_CREATOR, - PK_MODIFIED, - PK_ID, REGION, GLO_PROVINCE, GLO_CITY, GLO_COUNTY, COMPANY, CONTACTS, PHONE, EMAIL, ADDRESS, LANGUAGE_TYPE - - - - - - - - - - diff --git a/bd-business/bd-business-system/src/main/resources/mapper/system/home/HoMemoirHonorMapper.xml b/bd-business/bd-business-system/src/main/resources/mapper/system/home/HoMemoirHonorMapper.xml deleted file mode 100644 index 6bd8dda1..00000000 --- a/bd-business/bd-business-system/src/main/resources/mapper/system/home/HoMemoirHonorMapper.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - DEL_FLAG, - PK_COUNTRY, - CREATION_TIME, - MODIFIED_TIME, - PK_CREATOR, - PK_MODIFIED, - PK_ID, PICTURE, SORT - - - diff --git a/bd-business/bd-business-system/src/main/resources/mapper/system/home/HoMemoirProcessMapper.xml b/bd-business/bd-business-system/src/main/resources/mapper/system/home/HoMemoirProcessMapper.xml deleted file mode 100644 index 98811ced..00000000 --- a/bd-business/bd-business-system/src/main/resources/mapper/system/home/HoMemoirProcessMapper.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - DEL_FLAG, - PK_COUNTRY, - CREATION_TIME, - MODIFIED_TIME, - PK_CREATOR, - PK_MODIFIED, - PK_ID, TITLE_NAME, SORT, SETUP_TIME, EFFECTIVE_DATE, LANGUAGE_TYPE - - - diff --git a/bd-business/bd-business-system/src/main/resources/mapper/system/home/HoProductDetailsMapper.xml b/bd-business/bd-business-system/src/main/resources/mapper/system/home/HoProductDetailsMapper.xml deleted file mode 100644 index 9562f1a7..00000000 --- a/bd-business/bd-business-system/src/main/resources/mapper/system/home/HoProductDetailsMapper.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - DEL_FLAG, - PK_COUNTRY, - CREATION_TIME, - MODIFIED_TIME, - PK_CREATOR, - PK_MODIFIED, - PK_ID, PICTURE, TITLE_NAME, CONTENT, PK_HO_PRODUCT_RANGE, SORT, TYPE - - - - - - - - - - diff --git a/bd-business/bd-business-system/src/main/resources/mapper/system/home/HoRegionDistributeItemMapper.xml b/bd-business/bd-business-system/src/main/resources/mapper/system/home/HoRegionDistributeItemMapper.xml deleted file mode 100644 index b887429e..00000000 --- a/bd-business/bd-business-system/src/main/resources/mapper/system/home/HoRegionDistributeItemMapper.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - DEL_FLAG, - CREATION_TIME, - MODIFIED_TIME, - PK_COUNTRY, - PK_CREATOR, - PK_MODIFIED, - PK_ID, TITLE, SHOW_PIC, NAME, CONTACT, EMAIL, ADDRESS, REGION_DISTRIBUTE_PK - - - diff --git a/bd-business/bd-business-system/src/main/resources/mapper/system/home/HoRegionDistributeMapper.xml b/bd-business/bd-business-system/src/main/resources/mapper/system/home/HoRegionDistributeMapper.xml deleted file mode 100644 index 0d90636c..00000000 --- a/bd-business/bd-business-system/src/main/resources/mapper/system/home/HoRegionDistributeMapper.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - DEL_FLAG, - CREATION_TIME, - MODIFIED_TIME, - PK_COUNTRY, - PK_CREATOR, - PK_MODIFIED, - PK_ID, NAME, SORT - - - diff --git a/bd-business/bd-business-system/src/main/resources/mapper/system/home/HoVrAreaMapper.xml b/bd-business/bd-business-system/src/main/resources/mapper/system/home/HoVrAreaMapper.xml deleted file mode 100644 index 8529abe4..00000000 --- a/bd-business/bd-business-system/src/main/resources/mapper/system/home/HoVrAreaMapper.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - DEL_FLAG, - PK_COUNTRY, - CREATION_TIME, - MODIFIED_TIME, - PK_CREATOR, - PK_MODIFIED, - PK_ID, TITLE_NAME, PICTURE, LINK_ADDRESS, SORT, EFFECTIVE_DATE, LANGUAGE_TYPE - - - diff --git a/bd-business/pom.xml b/bd-business/pom.xml index e308c457..8f58a011 100644 --- a/bd-business/pom.xml +++ b/bd-business/pom.xml @@ -76,14 +76,12 @@ - bd-business-bonus bd-business-member bd-business-report bd-business-sale bd-business-system bd-business-common - bd-business-scm diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/CacheConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/CacheConstants.java index f1414a4b..ffd9fd59 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/CacheConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/CacheConstants.java @@ -2,8 +2,6 @@ package com.hzs.common.core.constant; /** * 缓存的统一key 常量 - * - * @author hzs */ public class CacheConstants { @@ -283,7 +281,6 @@ public class CacheConstants { */ public final static String MEMBER_DEFAULT_DISPLAY = CACHE_PREFIX + "member:display:"; - /** * 交易配置 */ @@ -294,71 +291,6 @@ public class CacheConstants { */ public final static String TRADE_CONFIG_WHITE = CACHE_PREFIX + "trade:config:white"; - /** - * 采购订单锁 - */ - public static final String PO_ORDER_LOCK = CACHE_PREFIX + "lock:po:order:"; - - /** - * 采购入库单锁 - */ - public static final String IC_PURCHASE_IN_LOCK = CACHE_PREFIX + "lock:ic:purchase:"; - - /** - * 其他入库单锁 - */ - public static final String IC_GENERAL_IN_LOCK = CACHE_PREFIX + "lock:ic:general-in:"; - - /** - * 其他出库单锁 - */ - public static final String IC_GENERAL_OUT_LOCK = CACHE_PREFIX + "lock:ic:general-out:"; - - /** - * 调拨订单单锁 - */ - public static final String TRANSFER_ORDER_LOCK = CACHE_PREFIX + "lock:ic:transfer-order:"; - - /** - * 调拨入库单锁 - */ - public static final String TRANSFER_IN_LOCK = CACHE_PREFIX + "lock:ic:transfer-in:"; - - /** - * 调拨出库单锁 - */ - public static final String TRANSFER_OUT_LOCK = CACHE_PREFIX + "lock:ic:transfer-out:"; - - /** - * 库存盘点单锁 - */ - public static final String INVENTORY_ORDER_LOCK = CACHE_PREFIX + "lock:ic:inventory:"; - - /** - * 业务领用订单 - */ - public static final String IO_ORDER_LOCK = CACHE_PREFIX + "lock:io:order:"; - - /** - * 现存量 - */ - public static final String IC_ON_HAND_NUM_LOCK = CACHE_PREFIX + "lock:ic:hand:"; - - /** - * 可用量 - */ - public static final String IC_AVAILABLE_NUM_LOCK = CACHE_PREFIX + "lock:ic:available:"; - - /** - * 批次号 - */ - public static final String BATCH_CODE = CACHE_PREFIX + "lock:ic:batch-code:"; - - /** - * 产品bas - */ - public static final String BD_PRODUCT_BAS = "product:bas:"; - /** * 后台管理员，数据访问权限缓存key */ diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/EnumsPrefixConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/EnumsPrefixConstants.java index 2c0ab31c..3edf0039 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/EnumsPrefixConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/EnumsPrefixConstants.java @@ -286,16 +286,6 @@ public class EnumsPrefixConstants { */ public static final String ORDER_STATUS = "ENU_ORDER_S_"; - /** - * 供应链订单状态 - */ - public static final String SCM_ORDER_STATUS = "ENU_SCM_S_"; - - /** - * 调拨方式 - */ - public static final String SCM_TRANSFER_TYPE = "ENU_SCM_T_"; - /** * 订单来源 */ @@ -315,18 +305,11 @@ public class EnumsPrefixConstants { */ public static final String MEMBER_ASSESS_STATUS = "ENU_MEMBER_ASSESS_S_"; - /** * 订单类型枚举类 */ public static final String ORDER_TYPE = "ENU_ORDER_T_"; - /** - * 盘点类型 - */ - public static final String INVENTORY_TYPE = "ENU_INV_T_"; - - /** * 客商类型 */ @@ -337,7 +320,6 @@ public class EnumsPrefixConstants { */ public static final String SALE_MODEL = "ENU_SALE_MODEL_T_"; - /** * 伞下新增直推业绩订单类型 */ @@ -478,11 +460,6 @@ public class EnumsPrefixConstants { */ public static final String BATCH_TYPE = "ENU_BATCH_TY_"; - /** - * 奖衔类型 - */ - public static final String AWARDS_TYPE = "ENU_AWA_T"; - /** * 转账特殊设置枚举 */ diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/RabbitMqConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/RabbitMqConstants.java index 4b4b0993..4d2303e4 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/RabbitMqConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/RabbitMqConstants.java @@ -2,8 +2,6 @@ package com.hzs.common.core.constant; /** * RabbitMq 静态变量 - * - * @author hzs **/ public class RabbitMqConstants { @@ -37,8 +35,6 @@ public class RabbitMqConstants { */ public static final String ORDER_SECOND_KEY = PREFIX + "order.second.key"; - - /** * 奖金秒接-激活补偿 exchange */ @@ -110,45 +106,6 @@ public class RabbitMqConstants { */ public static final String BUSINESS_LOG_KEY = PREFIX + "business.log.key"; - /** - * 可用量 exchange - */ - public static final String AVAILABLE_NMU_EXCHANGE = PREFIX + "available.exchange"; - /** - * 可用量 queue - */ - public static final String AVAILABLE_NMU_QUEUE = PREFIX + "available.queue"; - /** - * 可用量 key - */ - public static final String AVAILABLE_NMU_KEY = PREFIX + "available.key"; - - /** - * 可用量回退 exchange - */ - public static final String AVAILABLE_NMU_BACK_EXCHANGE = PREFIX + "available.back.exchange"; - /** - * 可用量回退 queue - */ - public static final String AVAILABLE_NMU_BACK_QUEUE = PREFIX + "available.back.queue"; - /** - * 可用量回退 key - */ - public static final String AVAILABLE_NMU_BACK_KEY = PREFIX + "available.back.key"; - - /** - * 进销存发货同步 exchange - */ - public static final String SCM_DELIVER_EXCHANGE = PREFIX + "scm.deliver.exchange"; - /** - * 进销存发货同步 queue - */ - public static final String SCM_DELIVER_QUEUE = PREFIX + "scm.deliver.queue"; - /** - * 进销存发货同步 key - */ - public static final String SCM_DELIVER_KEY = PREFIX + "scm.deliver.key"; - ////////////////////////////// 会员首购统一推送 EXCHANGE 和 KEY ////////////////////////////// /** * 会员首购 exchange diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/ScmFieldConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/ScmFieldConstants.java deleted file mode 100644 index e9250f41..00000000 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/ScmFieldConstants.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.hzs.common.core.constant; - -/** - * 供应链模块的反射字段 - */ -public class ScmFieldConstants { - - public static final String SCM_ITEM_SPECS_LIST = "scmItemSpecsList"; - - public static final String PK_CORP = "pkCorp"; - public static final String PK_CUBASDOC = "pkCubasdoc"; - - public static final String PK_PRODUCT_BAS = "pkProductBas"; - - public static final String PK_PRODUCT = "pkProduct"; - public static final String PK_UNIT = "pkUnit"; - - public static final String PK_STOREHOUSE = "pkStorehouse"; - - public static final String N_NUM = "nnum"; - - public static final String PK_BATCH_CODE = "pkBatchCode"; - - public static final String PK_PRODUCT_FIELD = "pk_product"; - - public static final String PK_STOREHOUSE_FIELD = "pk_storehouse"; - - public static final String PK_BATCH_CODE_FIELD = "pk_batch_code"; - - /** - * 生产日期 - */ - public static final String PRODUCT_DATE = "productDate"; - - /** - * 失效日期 - */ - public static final String EXPIRE_DATE = "expireDate"; - - public static final String TRANS_TYPE = "transType"; - - /** - * 订单主键 - */ - public static final String PK_PURCHASE = "pk_purchase"; - - /** - * 签呈中间表审核状态 - */ - public static final String APPROVAL_STATUS = "approval_status"; - - public static final String BUSINESS_CODE = "business_code"; - - /** - * 其他出入库单主键 - */ - public static final String PK_GENERAL = "pk_general"; - - /** - * 库存盘点单主键 - */ - public static final String PK_INVENTORY = "pk_inventory"; - - public static final String PK_CREATOR_FIELD = "pkCreator"; - - /** - * 更新人 - */ - public static final String PK_MODIFIED_FIELD = "pkModified"; - - /** - * 更新时间 - */ - public static final String MODIFIED_TIME_FIELD = "modifiedTime"; - - public static final String PK_TRANSFER = "pk_transfer"; - - public static final String PK_TRANSFER_IN = "pk_transfer_in"; - - public static final String PK_TRANSFER_OUT = "pk_transfer_out"; - - public static final String PK_SPECS_TYPE = "pkSpecsType"; - - public static final String PK_SPECS = "pkSpecs"; - - public static final String SPECS_NAME = "specsName"; -} diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ScmMsgConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ScmMsgConstants.java deleted file mode 100644 index 2ed5fdd1..00000000 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ScmMsgConstants.java +++ /dev/null @@ -1,101 +0,0 @@ -package com.hzs.common.core.constant.msg; - -/** - * 供应链模块后台返回到前台的提示语 - */ -public class ScmMsgConstants { - - public static final String PO_ORDER_NOT_EXIST = "没有查询到采购订单，不能操作！"; - - public static final String SO_ORDER_NOT_EXIST = "没有查询到销售订单，不能操作！"; - - public static final String IO_ORDER_NOT_EXIST = "没有查询到业务领用订单，不能操作！"; - - public static final String SUPPLIER_NOT_QUERY = "没有查询到供应商，请重新选择供应商！"; - - public static final String CUSTOMER_NOT_QUERY = "没有查询到客户，请重新选择客户！"; - - public static final String CORP_NOT_QUERY = "没有查询到库存公司，请重新选择库存公司！"; - - public static final String STOREHOUSE_NOT_QUERY = "没有查询到选择的仓库，请重新选择仓库！"; - - public static final String PURCHASE_BODY_NOT_EMPTY = "采购入库单明细没有选择来源于同供应商采购订单明细，请重新选择！"; - - public static final String BATCH_CODE_NOT_EXIST = "产品选择的批次号不存在，请重新选择！"; - - public static final String PRODUCT_NOT_EXIST = "选择的产品不存在，请重新选择！"; - - public static final String PRODUCT_HAS_EXIST = "选择的产品已经存在，请重新选择！"; - - public static final String IC_PURCHASE_NOT_EXIST = "没有查询到采购入库单，不能操作！"; - - public static final String IC_PURCHASE_OUT_NOT_EXIST = "没有查询到采购退货单，不能操作！"; - - public static final String PURCHASE_EXISTS_AGENT = "该采购入库单存在已经提交的签呈，不能再次发起签呈！"; - - public static final String IO_ORDER_EXISTS_AGENT = "该业务领用订单存在已经提交的签呈，不能再次发起签呈！"; - - public static final String IC_GENERAL_IN_NOT_EXIST = "没有查询到其他入库单，不能操作！"; - - public static final String IC_GENERAL_OUT_NOT_EXIST = "没有查询到其他出库单，不能操作！"; - - public static final String TRANSFER_ORDER_NOT_EXIST = "没有查询到调拨订单，不能操作！"; - - public static final String TRANSFER_ORDER_EXISTS_AGENT = "该调拨订单存在已经提交的签呈，不能再次发起签呈！"; - - public static final String TRANSFER_IN_NOT_EXIST = "没有查询到调拨入库单，不能操作！"; - - public static final String TRANSFER_OUT_NOT_EXIST = "没有查询到调拨出库单，不能操作！"; - - public static final String INVENTORY_ORDER_NOT_EXIST = "没有查询到库存盘点单，不能操作！"; - - public static final String TRANSFER_IN_EXISTS_AGENT = "该调拨入库单存在已经提交的签呈，不能再次发起签呈！"; - - public static final String TRANSFER_OUT_EXISTS_AGENT = "该调拨出库单存在已经提交的签呈，不能再次发起签呈！"; - - public static final String BILL_NOT_OPERATION = "该单据正在被其他人操作，请稍后重试！"; - - public static final String IC_ON_HAND_NUM_NOT_EMPTY = "产品现存量不足，不能扣减库存，不能出库！"; - - public static final String IC_AVAILABLE_NUM_NOT_EMPTY = "产品可用量不足，不能扣减库存，不能出库！"; - - public static final String AVAILABLE_NUM_NOT_EXIST = "没有查询到该仓库该产品的可用量，不能操作！"; - - public static final String SELECT_BATCH_CODE_NOT_EXIST = "没有查询到批次号，不能操作！"; - - public static final String BATCH_CODE_HAS_EXIST = "批次号已经存在，请修改批次号！"; - - public static final String AVAILABLE_NUM_EXIST = "已经存在该仓库该产品的可用量，不能新增！"; - - public static final String IC_ON_HAND_NUM_B_NOT_EXIST = "产品现存量流水有问题，不能回退库存，不能驳回！"; - - public static final String SOURCE_BILL_EXIST_SPECS = "来源单据必须存在规格明细！"; - - public static final String INVENTORY_ORDER_EXISTS_AGENT = "该库存盘点单存在已经提交的签呈，不能再次发起签呈！"; - - public static final String INVENTORY_OUT = "盘亏账面数量必须大于调整数量！"; - - public static final String INVENTORY_IN = "盘盈账面数量必须小于调整数量！"; - - public static final String SALE_OUT_NOT_EXIST = "没有查询到销售出库单，不能操作！"; - - public static final String BACK_SALE_OUT_NOT_EXIST = "没有查询到销售退货单，不能操作！"; - - public static final String BACK_SALE_OUT_EXISTS_AGENT = "该销售退货单存在已经提交的签呈，不能再次发起签呈！"; - - public static final String TH_SUPPLIER_APPLY_NAME = "客商名称不能为空"; - - public static final String TH_SUPPLIER_APPLY_SHORT_NAME = "客商简称不能为空"; - - public static final String TH_SUPPLIER_APPLY_LEGAL_BODY = "法人不能为空"; - - public static final String TH_MARGIN_MARGIN = "保证金金额不能为空"; - public static final String TH_MARGIN_REPEAT = "该供应商保证金缴纳已添加"; - - public static final String IC_ON_HAND_NUM_VALID_PERIOD = "产品快到有效期，及时清理库存！"; - public static final String IC_ON_HAND_NUM_NOT_EMPTY_WARN = "产品现存量不足预警值，及时补充库存！"; - - public static final String SETTLE_ORDER_NOT_EXISTS = "结算单不存在，不能结算！"; - - public static final String SETTLE_ORDER_HAS_SETTLE = "结算单已经结算，不能重复结算！"; -} diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EApprovalBusiness.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EApprovalBusiness.java index ecdbbc68..62fa06d8 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EApprovalBusiness.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EApprovalBusiness.java @@ -69,11 +69,6 @@ public enum EApprovalBusiness { * 修改结算等级 */ CHANGE_SETTLEMENT_GRADE(113, "修改结算等级", EnumsPrefixConstants.APPROVAL_BUSINESS + "113"), - - /** - * k值风控管理 - */ - MEMBER_RISK_CONTROL(114, "k值风控管理", EnumsPrefixConstants.APPROVAL_BUSINESS + "114"), /** * 修改自然国 */ @@ -152,25 +147,6 @@ public enum EApprovalBusiness { */ CHANGE_MAX_AWARDS(166, "修改历史最高奖衔", EnumsPrefixConstants.APPROVAL_BUSINESS + "166"), - /** - * 赠送注册权限 - */ - REGISTER_GIVE(170, "赠送注册权限", EnumsPrefixConstants.APPROVAL_BUSINESS + "170"), - - /** - * K值风控设置添加 - */ - MEMBER_RISK_ADD(171, "K值风控设置添加", EnumsPrefixConstants.APPROVAL_BUSINESS + "171"), - - /** - * K值风控设置修改 - */ - MEMBER_RISK_UPDATE(172, "K值风控设置修改", EnumsPrefixConstants.APPROVAL_BUSINESS + "172"), - - /** - * K值风控设置删除 - */ - MEMBER_RISK_REMOVE(173, "K值风控设置删除", EnumsPrefixConstants.APPROVAL_BUSINESS + "173"), /** * 空单注册 */ @@ -334,61 +310,6 @@ public enum EApprovalBusiness { */ REPURCHASE_SHAR(722, "复购均分", EnumsPrefixConstants.APPROVAL_BUSINESS + "722"), - /** - * 有关供应链的放在8 开头的 采购订单审核 - */ - PO_ORDER_APPROVE(800, "采购订单审核", EnumsPrefixConstants.APPROVAL_BUSINESS + "800"), - - /** - * 采购入库审核 - */ - IC_PURCHASE_APPROVE(801, "采购入库审核", EnumsPrefixConstants.APPROVAL_BUSINESS + "801"), - - /** - * 其他入库审核 - */ - IC_GENERAL_IN_APPROVE(802, "其他入库审核", EnumsPrefixConstants.APPROVAL_BUSINESS + "802"), - - /** - * 其他出库审核 - */ - IC_GENERAL_OUT_APPROVE(803, "其他出库审核", EnumsPrefixConstants.APPROVAL_BUSINESS + "803"), - - /** - * 调拨订单 - */ - TRANSFER_ORDER_APPROVE(804, "调拨订单", EnumsPrefixConstants.APPROVAL_BUSINESS + "804"), - - /** - * 调拨入库 - */ - TRANSFER_IN_APPROVE(805, "调拨入库审核", EnumsPrefixConstants.APPROVAL_BUSINESS + "805"), - - /** - * 调拨出库 - */ - TRANSFER_OUT_APPROVE(806, "调拨出库审核", EnumsPrefixConstants.APPROVAL_BUSINESS + "806"), - - /** - * 库存盘点 - */ - INVENTORY_ORDER_APPROVE(807, "库存盘点单审核", EnumsPrefixConstants.APPROVAL_BUSINESS + "807"), - - /** - * 销售退货单 - */ - BACK_SALE_OUT_APPROVE(808, "销售退货单审核", EnumsPrefixConstants.APPROVAL_BUSINESS + "808"), - - /** - * 采购退货单 - */ - BACK_PURCHASE_APPROVE(809, "采购退货单审核", EnumsPrefixConstants.APPROVAL_BUSINESS + "809"), - - /** - * 业务领用订单 - */ - IO_ORDER_APPROVE(810, "业务领用订单审核", EnumsPrefixConstants.APPROVAL_BUSINESS + "810"), - /** * 商品赠送添加 */ diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EApprovalType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EApprovalType.java index 8ca64db8..80a982dd 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EApprovalType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EApprovalType.java @@ -40,21 +40,11 @@ public enum EApprovalType { */ NOTICE_BUSINESS(5, "公告站内信"), - /** - * 三方信息处理 - */ - THIRD_BUSINESS(6, "三方信息处理"), - /** * 活动相关处理 */ ACTIVITY_BUSINESS(7, "活动相关处理"), - /** - * 供应链相关处理 - */ - SCM_BUSINESS(8, "供应链相关处理"), - ; /** diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EGrade.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EGrade.java index 106d4772..dda1d84a 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EGrade.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EGrade.java @@ -25,28 +25,26 @@ public enum EGrade { */ LOGGED_OUT(-2, 0, "已注销", 1, EnumsPrefixConstants.ENU_CAT + 2, MemberFrameworkConstants.LOG_OFF), + /** * 会员 */ START_UP(1, 20, "V0", 0, EnumsPrefixConstants.GRADE + "20", MemberFrameworkConstants.START_UP), - /** * VIP */ HAI_FAN(2, 30, "V1", 0, EnumsPrefixConstants.GRADE + "30", MemberFrameworkConstants.Hi_Pink), - /** - * SVIP + * 合伙人 */ YOU_KE(3, 40, "V2", 0, EnumsPrefixConstants.GRADE + "40", MemberFrameworkConstants.YOU_KE), /** - * 卓越 + * 博羚店主 */ MAKER(4, 50, "V3", 0, EnumsPrefixConstants.GRADE + "50", MemberFrameworkConstants.MAKER), - /** - * 店长 + * 高级店主 */ VIP(5, 60, "V4", 0, EnumsPrefixConstants.GRADE + "60", MemberFrameworkConstants.VIP), @@ -56,7 +54,7 @@ public enum EGrade { S_VIP(6, 70, "V5", 0, EnumsPrefixConstants.GRADE + "70", MemberFrameworkConstants.S_VIP), /** - * 公司 + * 总公司 */ COMPANY(7, 80, "V6", 0, EnumsPrefixConstants.GRADE + "70", MemberFrameworkConstants.COUNTY_AGENT), diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EInventoryType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EInventoryType.java deleted file mode 100644 index 0a55c521..00000000 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EInventoryType.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.hzs.common.core.enums; - -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.AllArgsConstructor; -import lombok.Getter; - -/** - * @description: 盘点类型 - * @author: sui q - * @time: 2023/12/20 10:16 - * @classname: EInventoryType - * @package_name: com.hzs.common.core.enums - * version 1.0.0 - */ -@AllArgsConstructor -@Getter -public enum EInventoryType { - - /** - * 1=盘亏 2=盘盈 - */ - INVENTORY_OUT(1, "盘亏", 0, EnumsPrefixConstants.INVENTORY_TYPE + 1), - - /** - * 盘盈 - */ - INVENTORY_IN(2, "盘盈", 0, EnumsPrefixConstants.INVENTORY_TYPE + 2), - - ; - - /** - * 实际值 - */ - private final int value; - /** - * 显示标签 - */ - private final String label; - /** - * 是否启用（0=是,1=否） -- 来源EYesNo - */ - private final int enable; - /** - * 国际化翻译key值 - */ - private final String key; -} diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationBusiness.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationBusiness.java index d5e19fc5..8e2c89c4 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationBusiness.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationBusiness.java @@ -136,41 +136,6 @@ public enum EOperationBusiness { POSTAGE_CONFIG("邮费配置"), - //////////////////// 供应链管理 //////////////////// - BATCH_CODE("批次号"), - - PO_ORDER("采购订单"), - - PO_PURCHASE("采购入库"), - - PO_PURCHASE_OUT("采购退货"), - - GENERAL_IN("其他入库单"), - - GENERAL_OUT("其他出库单"), - - SALE_OUT("销售出库单"), - - TRANSFER_ORDER("调拨订单"), - - TRANSFER_IN("调拨入库单"), - - TRANSFER_OUT("调拨出库单"), - - INVENTORY_ORDER("库存盘点单"), - - IO_ORDER("业务领用订单"), - - AVAILABLE_NUM("可用量"), - - ON_HAND_NUM("现存量"), - TH_SUPPLIER_APPLY("供应商管理"), - - SCM_WARN("预警设置"), - - SUPPLIER_ORDER("订单查询"), - SUPPLIER_SETTLE_ORDER("结算订单"), - //////////////////// 物流管理 //////////////////// PRODUCT_ORDER("商品订单"), @@ -342,8 +307,7 @@ public enum EOperationBusiness { TICKET_GIVE("门票活动"), RETAIL_PICK_PRODUCT("会员提货产品"), RETAIL_PICK_PRODUCT_GIVE("提货赠送活动"), - //////////////////// 设备配置 //////////////////// - DEVICE_INSTALL("设备配置"), + //////////////////// 系统配置 //////////////////// REGISTER_QUANTITY("注册次数"), @@ -463,7 +427,6 @@ public enum EOperationBusiness { PARENT_PEG("推荐反查"), PRODUCT_DETAIL_QUERY_LIST("产品明细查询"), MONTHLY_JOB_LEVEL("月度职级名单查询"), - MEMBER_RISK_CONTROL("K值风控设置"), MEMBER_RETAIL_STAT("收益区域数据"), ; diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java index 50af7683..5dd93026 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java @@ -78,41 +78,6 @@ public enum EOperationModule { POSTAGE_CONFIG("邮费配置"), - //////////////////// 供应链管理 //////////////////// - BATCH_CODE("批次号"), - - PO_ORDER("采购订单"), - - PO_PURCHASE("采购入库"), - - PO_PURCHASE_OUT("采购退货"), - - GENERAL_IN("其他入库单"), - - GENERAL_OUT("其他出库单"), - - SALE_OUT("销售出库单"), - - TRANSFER_ORDER("调拨订单"), - - TRANSFER_IN("调拨入库单"), - - TRANSFER_OUT("调拨出库单"), - - INVENTORY_ORDER("库存盘点单"), - - IO_ORDER("业务领用订单"), - - AVAILABLE_NUM("可用量"), - - ON_HAND_NUM("现存量"), - - SUPPLIER_ORDER("订单查询"), - SUPPLIER_SETTLE_ORDER("结算订单"), - - TH_SUPPLIER_APPLY("供应商管理"), - - SCM_WARN("预警设置"), //////////////////// 物流管理 //////////////////// @@ -463,13 +428,6 @@ public enum EOperationModule { ///////////////////////////统计分析//////////////////////////// STATISTIC_ANALYSIS("统计分析"), - - PLANTING_PUBLIC_WELFARE("种植公益配置"), - - - MEMBER_RISK_CONTROL("K值风控设置"), - - SUPPLIER_GOODS("供应商商品"), ; diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderPrefix.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderPrefix.java index 2264d890..98ac0e2c 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderPrefix.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderPrefix.java @@ -20,56 +20,6 @@ public enum EOrderPrefix { */ ORDER_CODE("BLSO", "销售订单"), - /** - * 采购订单 - */ - PO_ORDER_CODE("PO", "采购订单"), - - /** - * 采购入库 - */ - IC_PURCHASE_CODE("PI", "采购入库"), - - /** - * 其他入库 - */ - IC_GENERAL_IN_CODE("OI", "其他入库"), - - /** - * 其他出库 - */ - IC_GENERAL_OUT_CODE("OD", "其他出库"), - - /** - * 销售出库 - */ - IC_SALE_OUT_CODE("SD", "销售出库"), - - /** - * 调拨订单 - */ - TR_ORDER_CODE("TO", "调拨订单"), - - /** - * 调拨入库 - */ - TR_TRANS_IN_CODE("TI", "调拨入库"), - - /** - * 调拨出库 - */ - TR_TRANS_OUT_CODE("TD", "调拨出库"), - - /** - * 盘点 - */ - INVENTORY_CODE("IO", "库存盘点"), - - /** - * 采购订单 - */ - IO_ORDER_CODE("BO", "业务领用订单"), - /** * 发货单 */ @@ -174,16 +124,6 @@ public enum EOrderPrefix { */ PRODUCT_CODE("PC", "产品编号"), - /** - * 供应商相关 - */ - SUPPLIER("SR", "供应商相关"), - - /** - * K值风控 - */ - RISK_CONTROL("KZ", "K值风控"), - /** * 产品相关 */ diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EScmGeneralOutStatus.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EScmGeneralOutStatus.java deleted file mode 100644 index 8329f22b..00000000 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EScmGeneralOutStatus.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.hzs.common.core.enums; - -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.AllArgsConstructor; -import lombok.Getter; - -/** - * @Description: 进销存出库单状态 - * @Author: sui q - * @Time: 2022/8/31 9:14 - * @Classname: EOrderStatus - * @PackageName: com.hzs.common.core.enums - */ -@AllArgsConstructor -@Getter -public enum EScmGeneralOutStatus { - - /** - * 1=已保存 - */ - SAVE(1, "已保存", 0, EnumsPrefixConstants.ORDER_STATUS + "1"), - - /** - * 2=已提交 - */ - SUBMIT(2, "已提交", 0, EnumsPrefixConstants.ORDER_STATUS + "2"), - - /** - * 3=已审核 - */ - APPROVE(3, "已审核", 0, EnumsPrefixConstants.ORDER_STATUS + "3"), - - /** - * 4=已出库 所有入库完成后变为已出库 - */ - DELIVERY(4, "已出库", 0, EnumsPrefixConstants.ORDER_STATUS + "4"), - - /** - * 5=已关闭 收货完成后7天变为已关闭，已关闭后不能退货 - */ - CLOSE(5, "已关闭", 0, EnumsPrefixConstants.ORDER_STATUS + "5"), - ; - - /** - * 实际值 - */ - private final int value; - /** - * 显示标签 - */ - private final String label; - /** - * 是否启用（0=是,1=否） -- 来源EYesNo - */ - private final int enable; - /** - * 国际化翻译key值 - */ - private final String key; - -} diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EScmOrderStatus.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EScmOrderStatus.java deleted file mode 100644 index 699ee061..00000000 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EScmOrderStatus.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.hzs.common.core.enums; - -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.AllArgsConstructor; -import lombok.Getter; - -/** - * @Description: 进销存订单、入库单状态 - * @Author: sui q - * @Time: 2022/8/31 9:14 - * @Classname: EOrderStatus - * @PackageName: com.hzs.common.core.enums - */ -@AllArgsConstructor -@Getter -public enum EScmOrderStatus { - - /** - * 1=已保存 - */ - SAVE(1, "已保存", 0, EnumsPrefixConstants.SCM_ORDER_STATUS + "1"), - - /** - * 2=已提交 - */ - SUBMIT(2, "已提交", 0, EnumsPrefixConstants.SCM_ORDER_STATUS + "2"), - - /** - * 3=已审核 - */ - APPROVE(3, "已审核", 0, EnumsPrefixConstants.SCM_ORDER_STATUS + "3"), - - /** - * 4=已收货 所有入库完成后代表已收货 出库完成代表已发货 - */ - DELIVERY(4, "已完成", 0, EnumsPrefixConstants.SCM_ORDER_STATUS + "4"), - - /** - * 5=已关闭 收货完成后7天变为已关闭，已关闭后不能退货 - */ - CLOSE(5, "已关闭", 0, EnumsPrefixConstants.SCM_ORDER_STATUS + "5"), - - /** - * 6=已退货 - */ - PART_BACK(6, "部分退货", 0, EnumsPrefixConstants.SCM_ORDER_STATUS + "6"), - - /** - * 6=已退货 - */ - BACK(7, "已退货", 0, EnumsPrefixConstants.SCM_ORDER_STATUS + "7"), - ; - - /** - * 实际值 - */ - private final int value; - /** - * 显示标签 - */ - private final String label; - /** - * 是否启用（0=是,1=否） -- 来源EYesNo - */ - private final int enable; - /** - * 国际化翻译key值 - */ - private final String key; - -} diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EScmOrderType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EScmOrderType.java deleted file mode 100644 index 862edd59..00000000 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EScmOrderType.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.hzs.common.core.enums; - -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.AllArgsConstructor; -import lombok.Getter; - -/** - * @description: 进销存订单类型 - * @author: sui q - * @time: 2023/11/17 15:34 - * @classname: EScmOrderType - * @package_name: com.hzs.common.core.enums - * version 1.0.0 - */ -@AllArgsConstructor -@Getter -public enum EScmOrderType { - /** - * 1=采购订单 - */ - PO_ORDER(1, "采购订单", 0, EnumsPrefixConstants.ORDER_STATUS + "1"), - - /** - * 2=采购入库单 - */ - PURCHASE_IN(2, "采购入库单", 0, EnumsPrefixConstants.ORDER_STATUS + "2"), - - /** - * 3=其他入库单 - */ - GENERAL_IN(3, "其他入库单", 0, EnumsPrefixConstants.ORDER_STATUS + "3"), - - /** - * 4=其他出库单 - */ - GENERAL_OUT(4, "其他出库单", 0, EnumsPrefixConstants.ORDER_STATUS + "4"), - - /** - * 6=销售出库单 - */ - SALE_OUT(6, "销售出库单", 0, EnumsPrefixConstants.ORDER_STATUS + "6"), - - /** - * 7=调拨订单 - */ - TRANS_ORDER(7, "调拨订单", 0, EnumsPrefixConstants.ORDER_STATUS + "7"), - - /** - * 8=调拨入库单 - */ - TRANS_IN(8, "调拨入库单", 0, EnumsPrefixConstants.ORDER_STATUS + "8"), - - /** - * 9=调拨出库单 - */ - TRANS_OUT(9, "调拨出库单", 0, EnumsPrefixConstants.ORDER_STATUS + "9"), - - /** - * 10=库存盘点单 - */ - INVENTORY_ORDER(10, "库存盘点单", 0, EnumsPrefixConstants.ORDER_STATUS + "10"), - - /** - * 11=业务领用订单 - */ - IO_ORDER(11, "业务领用订单", 0, EnumsPrefixConstants.ORDER_STATUS + "11"), - ; - - /** - * 实际值 - */ - private final int value; - /** - * 显示标签 - */ - private final String label; - /** - * 是否启用（0=是,1=否） -- 来源EYesNo - */ - private final int enable; - /** - * 国际化翻译key值 - */ - private final String key; -} diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EScmTransferType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EScmTransferType.java deleted file mode 100644 index 5a46efac..00000000 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EScmTransferType.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.hzs.common.core.enums; - -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.AllArgsConstructor; -import lombok.Getter; - -/** - * @description: 调拨方式 - * @author: sui q - * @time: 2023/12/8 10:12 - * @classname: EScmTransferType - * @package_name: com.hzs.common.core.enums - * version 1.0.0 - */ -@AllArgsConstructor -@Getter -public enum EScmTransferType { - - /** - * 调拨方式 1=公司内调拨 2=公司间调拨 3=国家间调拨 - */ - SAVE(1, "公司内调拨", 0, EnumsPrefixConstants.SCM_TRANSFER_TYPE + "1"), - - /** - * 2=已提交 - */ - SUBMIT(2, "公司间调拨", 0, EnumsPrefixConstants.SCM_TRANSFER_TYPE + "2"), - - /** - * 3=已审核 - */ - APPROVE(3, "国家间调拨", 0, EnumsPrefixConstants.SCM_TRANSFER_TYPE + "3"), - - ; - - /** - * 实际值 - */ - private final int value; - /** - * 显示标签 - */ - private final String label; - /** - * 是否启用（0=是,1=否） -- 来源EYesNo - */ - private final int enable; - /** - * 国际化翻译key值 - */ - private final String key; -} diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETradeClassify.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETradeClassify.java index f65bf5a1..9e6bda3c 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETradeClassify.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETradeClassify.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @Description: 交易分类 - * @Author: sui q - * @Time: 2022/9/1 16:30 - * @Classname: ETradeCalssify - * @PackageName: com.hzs.common.core.enums + * 交易分类 */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETradeStatus.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETradeStatus.java index 0625c256..d43c41ae 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETradeStatus.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETradeStatus.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @Description: 交易状态 - * @Author: sui q - * @Time: 2022/9/1 16:27 - * @Classname: ETradeStatus - * @PackageName: com.hzs.common.core.enums + * 交易状态 */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETransferStatus.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETransferStatus.java index 27b75454..260f9e5d 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETransferStatus.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETransferStatus.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @Description: 转账状态 - * @Author: sui q - * @Time: 2022/11/4 11:24 - * @Classname: ETransferStatus - * @PackageName: com.hzs.common.core.enums + * 转账状态 */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETransferType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETransferType.java index da82c1a3..d8618c1b 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETransferType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETransferType.java @@ -4,11 +4,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @Description: 转账类型 - * @Author: ljc - * @Time: 2022/9/26 10:33 - * @Classname: ETransferType - * @Package_name: com.hzs.common.core.enums + * 转账类型 */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EUpDown.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EUpDown.java index 0d15998d..1485291e 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EUpDown.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EUpDown.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @Description: 正反查 - * @Author: jiang chao - * @Time: 2023/11/20 16:59 - * @Classname: EUpDown - * @PackageName: com.hzs.common.core.enums + * 正反查 */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EYesNoUpLoads.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EYesNoUpLoads.java index 94f2e4d7..e9f94564 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EYesNoUpLoads.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EYesNoUpLoads.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @Description: 是否上传 - * @Author: sui q - * @Time: 2022/10/28 15:20 - * @Classname: EYesNoBusLicense - * @PackageName: com.hzs.common.core.enums + * 是否上传 */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaOrderChargeLog.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaOrderChargeLog.java index e4b5cc9f..b80976e1 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaOrderChargeLog.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaOrderChargeLog.java @@ -9,9 +9,6 @@ import lombok.experimental.Accessors; /** * 订单修改记录 - * - * @author hzs - * @since 2023-02-01 */ @Data @EqualsAndHashCode(callSuper = false) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaOrderItemsRevoke.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaOrderItemsRevoke.java index b841df44..9a4faa45 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaOrderItemsRevoke.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaOrderItemsRevoke.java @@ -9,12 +9,7 @@ import lombok.*; import lombok.experimental.Accessors; /** - *

* 撤销订单明细表 - *

- * - * @author hzs - * @since 2022-10-19 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaOrderRelation.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaOrderRelation.java index 1c0cc47d..2e6a5ece 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaOrderRelation.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaOrderRelation.java @@ -11,12 +11,7 @@ import lombok.*; import lombok.experimental.Accessors; /** - *

* 订单与虚拟订单关联表 - *

- * - * @author hzs - * @since 2023-03-17 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaOrderRelationItems.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaOrderRelationItems.java deleted file mode 100644 index 93a1e6ed..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaOrderRelationItems.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.hzs.common.domain.sale.order; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableField; -import com.hzs.common.core.web.domain.BaseEntity; -import lombok.*; -import lombok.experimental.Accessors; - -/** - *

- * - *

- * - * @author hzs - * @since 2023-03-17 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@KeySequence("SA_ORDER_RELATION_ITEMS_SEQ") -@TableName("SA_ORDER_RELATION_ITEMS") -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class SaOrderRelationItems extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId("PK_ID") - private Long pkId; - - /** - * 订单主键 - */ - @TableField("PK_ORDER") - private Long pkOrder; - - /** - * 关系主键 - */ - @TableField("PK_ORDER_RELATION") - private Long pkOrderRelation; - -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaOrderSelfLog.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaOrderSelfLog.java index 47c43260..4da43f29 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaOrderSelfLog.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaOrderSelfLog.java @@ -11,12 +11,7 @@ import lombok.*; import lombok.experimental.Accessors; /** - *

* 订单自提申请记录 - *

- * - * @author hzs - * @since 2023-04-19 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaOrderShareTmp.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaOrderShareTmp.java index 44f6a0ab..1370c9c7 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaOrderShareTmp.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaOrderShareTmp.java @@ -2,9 +2,12 @@ package com.hzs.common.domain.sale.order; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableName; + import java.util.Date; + import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableField; + import java.io.Serializable; import lombok.*; @@ -12,9 +15,6 @@ import lombok.experimental.Accessors; /** * 分享注册会员订单数据 - * - * @author hzs - * @since 2023-09-08 */ @NoArgsConstructor @AllArgsConstructor diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaOrderTemp.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaOrderTemp.java index 50d9fd18..52a8f3fe 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaOrderTemp.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaOrderTemp.java @@ -13,9 +13,6 @@ import lombok.experimental.Accessors; /** * 订单缓存数据临时表 - * - * @author hzs - * @since 2025-02-25 */ @Builder @AllArgsConstructor diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaOrderWaresLimit.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaOrderWaresLimit.java index 25aa9282..f45a086e 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaOrderWaresLimit.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaOrderWaresLimit.java @@ -10,9 +10,6 @@ import lombok.experimental.Accessors; /** * 会员商品限购 - * - * @author hzs - * @since 2025-03-11 */ @Builder @AllArgsConstructor diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaRefund.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaRefund.java index bc539f85..0fa5b19c 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaRefund.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaRefund.java @@ -13,9 +13,6 @@ import lombok.experimental.Accessors; /** * 退款表 - * - * @author hzs - * @since 2023-08-25 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaRefundItems.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaRefundItems.java index 525a34c6..9285535f 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaRefundItems.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaRefundItems.java @@ -13,9 +13,6 @@ import lombok.experimental.Accessors; /** * 退款明细表 - * - * @author hzs - * @since 2023-08-25 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/general/IcGeneralInB.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/general/IcGeneralInB.java deleted file mode 100644 index 1d65f174..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/general/IcGeneralInB.java +++ /dev/null @@ -1,117 +0,0 @@ -package com.hzs.common.domain.scm.general; - -import java.math.BigDecimal; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableName; -import java.util.Date; -import java.util.List; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableField; -import com.hzs.common.core.web.domain.BaseEntity; -import com.hzs.common.domain.scm.pub.ScmItemSpecs; -import lombok.*; -import lombok.experimental.Accessors; - -/** - *

- * 其他入库单明细 - *

- * - * @author hzs - * @since 2023-11-27 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@KeySequence("IC_GENERALIN_B_SEQ") -@TableName("IC_GENERALIN_B") -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class IcGeneralInB extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId("PK_ID") - private Long pkId; - - /** - * 单位 - */ - @TableField("PK_UNIT") - private Integer pkUnit; - - /** - * 主表主键 - */ - @TableField("PK_GENERAL") - private Long pkGeneral; - - /** - * 货位 - */ - @TableField("PK_CLOCATION") - private Integer pkClocation; - - /** - * 产品信息主键 - */ - @TableField("PK_PRODUCT") - private Integer pkProduct; - - /** - * 出入口类型 1=入库 2=出库 - */ - @TableField("TRANS_TYPE") - private Integer transType; - - /** - * 入库日期 - */ - @TableField("BIZ_DATE") - private Date bizDate; - - /** - * 仓库 - */ - @TableField("PK_STOREHOUSE") - private Integer pkStorehouse; - - /** - * 汇率 - */ - @TableField("PK_RATE") - private Integer pkRate; - - /** - * 数量 - */ - @TableField("NNUM") - private BigDecimal nnum; - - /** - * 单价 - */ - @TableField("NCOSTPRICE") - private BigDecimal ncostprice; - - /** - * 金额 - */ - @TableField("NCOSTMNY") - private BigDecimal ncostmny; - - /** - * 批次主键 - */ - @TableField("PK_BATCH_CODE") - private Long pkBatchCode; - - @TableField(exist=false) - private List scmItemSpecsList; -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/general/IcGeneralInH.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/general/IcGeneralInH.java deleted file mode 100644 index 1d5c6148..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/general/IcGeneralInH.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.hzs.common.domain.scm.general; - -import java.math.BigDecimal; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableName; -import java.util.Date; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableField; -import com.hzs.common.core.web.domain.BaseEntity; -import lombok.*; -import lombok.experimental.Accessors; - -/** - *

- * 其他入库表头 - *

- * - * @author hzs - * @since 2023-11-27 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@KeySequence("IC_GENERALIN_H_SEQ") -@TableName("IC_GENERALIN_H") -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class IcGeneralInH extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId("PK_ID") - private Long pkId; - - /** - * 部门 - */ - @TableField("PK_DEPT") - private Integer pkDept; - - /** - * 库存公司 - */ - @TableField("PK_CORP") - private Integer pkCorp; - - /** - * 出库公司 - */ - @TableField("PK_OUT_CORP") - private Integer pkOutCorp; - - /** - * 供应商 取bd_cubasdoc 类型为1 2的 - */ - @TableField("PK_CUBASDOC") - private Integer pkCubasdoc; - - /** - * 仓库管理员 - */ - @TableField("PK_WHSMANAGER") - private Long pkWhsmanager; - - /** - * 仓库 - */ - @TableField("PK_WAREHOUSE") - private Integer pkWarehouse; - - /** - * 出库仓库 - */ - @TableField("PK_OUT_WAREHOUSE") - private Integer pkOutWarehouse; - - /** - * 订单日期 2023-10 - */ - @TableField("ORDER_DATE") - private Date orderDate; - - /** - * 订单类型 EScmOrderType - */ - @TableField("ORDER_TYPE") - private Integer orderType; - - /** - * 订单状态 EScmOrderStatus 1=已保存 2=已提交 3=已审核 4=已收货 5=已关闭 - */ - @TableField("ORDER_STATUS") - private Integer orderStatus; - - /** - * 打印状态 - */ - @TableField("PRINT_STATUS") - private Integer printStatus; - - /** - * 总数量 - */ - @TableField("TOTAL_NUM") - private BigDecimal totalNum; - - /** - * 订单编号 - */ - @TableField("ORDER_CODE") - private String orderCode; - - /** - * 备注 - */ - @TableField("REMARK") - private String remark; - - -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/general/IcGeneralOutB.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/general/IcGeneralOutB.java deleted file mode 100644 index 365f9bd3..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/general/IcGeneralOutB.java +++ /dev/null @@ -1,117 +0,0 @@ -package com.hzs.common.domain.scm.general; - -import java.math.BigDecimal; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableName; -import java.util.Date; -import java.util.List; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableField; -import com.hzs.common.core.web.domain.BaseEntity; -import com.hzs.common.domain.scm.pub.ScmItemSpecs; -import lombok.*; -import lombok.experimental.Accessors; - -/** - *

- * 其他入库单明细 - *

- * - * @author hzs - * @since 2023-11-27 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@KeySequence("IC_GENERALOUT_B_SEQ") -@TableName("IC_GENERALOUT_B") -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class IcGeneralOutB extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId("PK_ID") - private Long pkId; - - /** - * 单位 - */ - @TableField("PK_UNIT") - private Integer pkUnit; - - /** - * 主表主键 - */ - @TableField("PK_GENERAL") - private Long pkGeneral; - - /** - * 货位 - */ - @TableField("PK_CLOCATION") - private Integer pkClocation; - - /** - * 产品信息主键 - */ - @TableField("PK_PRODUCT") - private Integer pkProduct; - - /** - * 出入库类型 1=入库 2=出库 - */ - @TableField("TRANS_TYPE") - private Integer transType; - - /** - * 入库日期 - */ - @TableField("BIZ_DATE") - private Date bizDate; - - /** - * 仓库 - */ - @TableField("PK_STOREHOUSE") - private Integer pkStorehouse; - - /** - * 汇率 - */ - @TableField("PK_RATE") - private Integer pkRate; - - /** - * 数量 - */ - @TableField("NNUM") - private BigDecimal nnum; - - /** - * 单价 - */ - @TableField("NCOSTPRICE") - private BigDecimal ncostprice; - - /** - * 金额 - */ - @TableField("NCOSTMNY") - private BigDecimal ncostmny; - - /** - * 批次主键 - */ - @TableField("PK_BATCH_CODE") - private Long pkBatchCode; - - @TableField(exist=false) - private List scmItemSpecsList; -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/general/IcGeneralOutH.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/general/IcGeneralOutH.java deleted file mode 100644 index d922e6ce..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/general/IcGeneralOutH.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.hzs.common.domain.scm.general; - -import java.math.BigDecimal; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableName; -import java.util.Date; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableField; -import com.hzs.common.core.web.domain.BaseEntity; -import lombok.*; -import lombok.experimental.Accessors; - -/** - *

- * 其他出库单表头 - *

- * - * @author hzs - * @since 2023-11-27 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@KeySequence("IC_GENERALOUT_H_SEQ") -@TableName("IC_GENERALOUT_H") -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class IcGeneralOutH extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId("PK_ID") - private Long pkId; - - /** - * 部门 - */ - @TableField("PK_DEPT") - private Integer pkDept; - - /** - * 库存公司 - */ - @TableField("PK_CORP") - private Integer pkCorp; - - /** - * 入库公司 - */ - @TableField("PK_IN_CORP") - private Integer pkInCorp; - - /** - * 客户 - */ - @TableField("PK_CUSTOMER") - private Integer pkCustomer; - - /** - * 仓库管理员 - */ - @TableField("PK_WHSMANAGER") - private Long pkWhsmanager; - - /** - * 入库仓库 - */ - @TableField("PK_IN_WAREHOUSE") - private Integer pkInWarehouse; - - /** - * 仓库 - */ - @TableField("PK_WAREHOUSE") - private Integer pkWarehouse; - - /** - * 订单日期 2023-10 - */ - @TableField("ORDER_DATE") - private Date orderDate; - - /** - * 订单类型 EScmOrderType - */ - @TableField("ORDER_TYPE") - private Integer orderType; - - /** - * 订单状态 EScmOrderStatus 1=已保存 2=已提交 3=已审核 4=已收货 5=已关闭 - */ - @TableField("ORDER_STATUS") - private Integer orderStatus; - - /** - * 打印状态 - */ - @TableField("PRINT_STATUS") - private Integer printStatus; - - /** - * 总数量 - */ - @TableField("TOTAL_NUM") - private BigDecimal totalNum; - - /** - * 订单编号 - */ - @TableField("ORDER_CODE") - private String orderCode; - - /** - * 备注 - */ - @TableField("REMARK") - private String remark; - - -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/general/ext/IcGeneralInBExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/general/ext/IcGeneralInBExt.java deleted file mode 100644 index 691ca981..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/general/ext/IcGeneralInBExt.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.hzs.common.domain.scm.general.ext; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.hzs.common.domain.scm.general.IcGeneralInB; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; - -/** - * @description: 采购入库明细扩展表 - * @author: sui q - * @time: 2023/11/27 19:34 - * @classname: IcGeneralInBExt - * @package_name: com.hzs.common.domain.scm.general.ext - * version 1.0.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class IcGeneralInBExt extends IcGeneralInB { - - /** - * 产品信息主键 - */ - private Integer pkProductBas; - - /** - * 生产日期 - */ - private Date productDate; - - /** - * 失效日期 - */ - private Date expireDate; - - /** - * 单位名称 - */ - private String unitName; - - /** - * 货位名称 - */ - private String clocationName; - - /** - * 仓库名称 - */ - private String storehouseName; - - - private String batchCode; - - /** - * 产品编号 - */ - private String productCode; - - /** - * 产品名称 - */ - private String productName; - - /** - * 规格名称 - */ - private String specsName; -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/general/ext/IcGeneralInHExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/general/ext/IcGeneralInHExt.java deleted file mode 100644 index e7aa8141..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/general/ext/IcGeneralInHExt.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.hzs.common.domain.scm.general.ext; - -import com.hzs.common.domain.scm.general.IcGeneralInH; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.List; - -/** - * @description: 其他入库单扩展表 - * @author: sui q - * @time: 2023/11/27 19:33 - * @classname: IcGeneralInHExt - * @package_name: com.hzs.common.domain.scm.general.ext - * version 1.0.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class IcGeneralInHExt extends IcGeneralInH { - - /** - * 部门名称 - */ - private String deptName; - - /** - * 管理员名称 - */ - private String managerName; - - /** - * 供应商名称 - */ - private String cubasdocName; - - /** - * 仓库名称 - */ - private String storehouseName; - - /** - * 采购组织名称 - */ - private String corpName; - - /** - * 出库公司 - */ - private String outCorpName; - - /** - * 明细 - */ - private List generalInbExtList; -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/general/ext/IcGeneralOutBExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/general/ext/IcGeneralOutBExt.java deleted file mode 100644 index c94ced93..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/general/ext/IcGeneralOutBExt.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.hzs.common.domain.scm.general.ext; - -import com.hzs.common.domain.scm.general.IcGeneralOutB; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * @description: 其他出库扩展表 - * @author: sui q - * @time: 2023/11/28 11:02 - * @classname: IcGeneralOutBExt - * @package_name: com.hzs.common.domain.scm.general.ext - * version 1.0.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class IcGeneralOutBExt extends IcGeneralOutB { - /** - * 单位名称 - */ - private String unitName; - - /** - * 货位名称 - */ - private String clocationName; - - /** - * 仓库名称 - */ - private String storehouseName; - - - private String batchCode; - - /** - * 产品编号 - */ - private String productCode; - - /** - * 产品名称 - */ - private String productName; - - /** - * 规格名称 - */ - private String specsName; -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/general/ext/IcGeneralOutHExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/general/ext/IcGeneralOutHExt.java deleted file mode 100644 index 2acecadf..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/general/ext/IcGeneralOutHExt.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.hzs.common.domain.scm.general.ext; - -import com.hzs.common.domain.scm.general.IcGeneralOutH; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.List; - -/** - * @description: 其他出库扩展表 - * @author: sui q - * @time: 2023/11/28 11:01 - * @classname: IcGeneralOutHExt - * @package_name: com.hzs.common.domain.scm.general.ext - * version 1.0.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class IcGeneralOutHExt extends IcGeneralOutH { - /** - * 部门名称 - */ - private String deptName; - - /** - * 管理员名称 - */ - private String managerName; - - /** - * 供应商名称 - */ - private String cubasdocName; - - /** - * 仓库名称 - */ - private String storehouseName; - - /** - * 采购组织名称 - */ - private String corpName; - - private List generalOutbExtList; -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/IcAvailableNum.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/IcAvailableNum.java deleted file mode 100644 index 66751e49..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/IcAvailableNum.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.hzs.common.domain.scm.ic; - -import java.math.BigDecimal; -import java.util.List; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableField; -import com.hzs.common.core.web.domain.BaseEntity; -import com.hzs.common.domain.scm.pub.ScmItemSpecs; -import lombok.*; -import lombok.experimental.Accessors; - -/** - * 可用量 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@KeySequence("IC_AVAILABLE_NUM_SEQ") -@TableName("IC_AVAILABLE_NUM") -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class IcAvailableNum extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId("PK_ID") - private Long pkId; - - /** - * 库存组织 - */ - @TableField("PK_CORP") - private Integer pkCorp; - - /** - * 供应商 - */ - @TableField("PK_CUBASDOC") - private Integer pkCubasdoc; - - /** - * 产品基础信息主键 - */ - @TableField("PK_PRODUCT_BAS") - private Integer pkProductBas; - - /** - * 产品信息主键 - */ - @TableField("PK_PRODUCT") - private Integer pkProduct; - - /** - * 单位 - */ - @TableField("PK_UNIT") - private Integer pkUnit; - - /** - * 仓库 - */ - @TableField("PK_STOREHOUSE") - private Integer pkStorehouse; - - /** - * 可用数量 - */ - @TableField("AVAILABLE_NUM") - private BigDecimal availableNum; - - @TableField(exist = false) - private List scmItemSpecsList; - - /** - * 预售状态 - */ - @TableField(exist = false) - private Integer preSaleStatus; -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/IcAvailableSpecs.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/IcAvailableSpecs.java deleted file mode 100644 index 2005120e..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/IcAvailableSpecs.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.hzs.common.domain.scm.ic; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableField; -import com.hzs.common.core.web.domain.BaseEntity; -import lombok.*; -import lombok.experimental.Accessors; - -/** - *

- * 可用量规格明细 - *

- * - * @author hzs - * @since 2023-12-11 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@KeySequence("IC_AVAILABLE_SPECS_SEQ") -@TableName("IC_AVAILABLE_SPECS") -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class IcAvailableSpecs extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId("PK_ID") - private Long pkId; - - /** - * 可用量主键 - */ - @TableField("PK_AVAILABLE_NUM") - private Long pkAvailableNum; - - /** - * 规格类型主键 - */ - @TableField("PK_SPECS_TYPE") - private Integer pkSpecsType; - - /** - * 规格主键 - */ - @TableField("PK_SPECS") - private Integer pkSpecs; - - /** - * 规格名称 - */ - @TableField("SPECS_NAME") - private String specsName; - - -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/IcBatchCode.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/IcBatchCode.java deleted file mode 100644 index 171a96b3..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/IcBatchCode.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.hzs.common.domain.scm.ic; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableName; -import java.util.Date; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableField; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Excel; -import com.hzs.common.core.web.domain.BaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - *

- * 采购订单明细 - *

- * - * @author hzs - * @since 2023-11-23 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@KeySequence("IC_BATCH_CODE_SEQ") -@TableName("IC_BATCH_CODE") -public class IcBatchCode extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId("PK_ID") - private Long pkId; - - /** - * 产品信息主键 - */ - @TableField("PK_PRODUCT") - private Integer pkProduct; - - /** - * 首次入库日期 - */ - @TableField("BIZ_DATE") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date bizDate; - - /** - * 生产日期 - */ - @TableField("PRODUCT_DATE") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date productDate; - - /** - * 失效日期 - */ - @TableField("EXPIRE_DATE") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date expireDate; - - /** - * 批次号 - */ - @TableField("BATCH_CODE") - private String batchCode; - - /** - * 有效期 - */ - @TableField("VALID_PERIOD") - private Integer validPeriod; -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/IcOnHandNum.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/IcOnHandNum.java deleted file mode 100644 index 87b3b215..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/IcOnHandNum.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.hzs.common.domain.scm.ic; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.web.domain.BaseEntity; -import com.hzs.common.domain.scm.pub.ScmItemSpecs; -import lombok.*; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -/** - *

- * 现存量 - *

- * - * @author hzs - * @since 2023-11-21 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@KeySequence("IC_ON_HAND_NUM_SEQ") -@TableName("IC_ON_HAND_NUM") -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class IcOnHandNum extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId("PK_ID") - private Long pkId; - - /** - * 库存组织 - */ - @TableField("PK_CORP") - private Integer pkCorp; - - /** - * 供应商 - */ - @TableField("PK_CUBASDOC") - private Integer pkCubasdoc; - - /** - * 产品基础信息主键 - */ - @TableField("PK_PRODUCT_BAS") - private Integer pkProductBas; - - /** - * 产品信息主键 - */ - @TableField("PK_PRODUCT") - private Integer pkProduct; - - /** - * 生产日期 - */ - @TableField("PRODUCT_DATE") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date productDate; - - /** - * 失效日期 - */ - @TableField("EXPIRE_DATE") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date expireDate; - - /** - * 单位 - */ - @TableField("PK_UNIT") - private Integer pkUnit; - - /** - * 仓库 - */ - @TableField("PK_STOREHOUSE") - private Integer pkStorehouse; - - /** - * 现存数量 - */ - @TableField("NONHANDNUM") - private BigDecimal nonhandnum; - - /** - * 批次主键 - */ - @TableField("PK_BATCH_CODE") - private Long pkBatchCode; - - @TableField(exist=false) - private List scmItemSpecsList; -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/IcOnHandNumB.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/IcOnHandNumB.java deleted file mode 100644 index afa4e412..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/IcOnHandNumB.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.hzs.common.domain.scm.ic; - -import java.math.BigDecimal; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableField; -import com.hzs.common.core.web.domain.BaseEntity; -import lombok.*; -import lombok.experimental.Accessors; - -/** - *

- * 现存量明细表 - *

- * - * @author hzs - * @since 2023-11-21 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@KeySequence("IC_ON_HAND_NUM_B_SEQ") -@TableName("IC_ON_HAND_NUM_B") -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class IcOnHandNumB extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId("PK_ID") - private Long pkId; - - /** - * 主表主键 - */ - @TableField("PK_ONHANDNUM") - private Long pkOnhandnum; - - /** - * 供应链订单类型 EScmOrderType - */ - @TableField("ORDER_TYPE") - private Integer orderType; - - /** - * 出入库单主表 - */ - @TableField("PK_GENERAL_H") - private Long pkGeneralH; - - /** - * 出入库单子表 - */ - @TableField("PK_GENERAL_B") - private Long pkGeneralB; - - /** - * 数量 正负 - */ - @TableField("NNUM") - private BigDecimal nnum; - -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/IcOnHandSpecs.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/IcOnHandSpecs.java deleted file mode 100644 index 50269900..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/IcOnHandSpecs.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.hzs.common.domain.scm.ic; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableField; -import com.hzs.common.core.web.domain.BaseEntity; -import lombok.*; -import lombok.experimental.Accessors; - -/** - *

- * 现存量规格明细 - *

- * - * @author hzs - * @since 2023-11-21 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@KeySequence("IC_ON_HAND_SPECS_SEQ") -@TableName("IC_ON_HAND_SPECS") -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class IcOnHandSpecs extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId("PK_ID") - private Long pkId; - - /** - * 现存量主键 - */ - @TableField("PK_ONHANDNUM") - private Long pkOnhandnum; - - /** - * 规格类型主键 - */ - @TableField("PK_SPECS_TYPE") - private Integer pkSpecsType; - - /** - * 规格主键 - */ - @TableField("PK_SPECS") - private Integer pkSpecs; - - /** - * 规格名称 - */ - @TableField("SPECS_NAME") - private String specsName; - - -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/ext/IcAvailableNumExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/ext/IcAvailableNumExt.java deleted file mode 100644 index eb823a35..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/ext/IcAvailableNumExt.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.hzs.common.domain.scm.ic.ext; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.hzs.common.domain.scm.ic.IcAvailableNum; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.math.BigDecimal; - -/** - * @description: 可用量扩展表 - * @author: sui q - * @time: 2023/12/18 15:11 - * @classname: IcAvailableNumExt - * @package_name: com.hzs.common.domain.scm.ic.ext - * version 1.0.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class IcAvailableNumExt extends IcAvailableNum { - /** - * 产品编号 - */ - private String productCode; - - /** - * 产品名称 - */ - private String productName; - - /** - * 规格名称 - */ - private String specsName; - - /** - * 单位名称 - */ - private String unitName; - - /** - * 仓库名称 - */ - private String storehouseName; - - /** - * 公司 - */ - private String corpName; - - /** - * 供应商名称 - */ - private String cubasdocName; - - private String orderCode; - - /** - * 现存数量 - */ - private BigDecimal nonhandnum; - -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/ext/IcBatchCodeExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/ext/IcBatchCodeExt.java deleted file mode 100644 index 6d44e2c2..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/ext/IcBatchCodeExt.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.hzs.common.domain.scm.ic.ext; - -import com.hzs.common.domain.scm.ic.IcBatchCode; -import lombok.Data; - -/** - * @description: 批次扩展表 - * @author: sui q - * @time: 2023/12/19 16:01 - * @classname: IcBatchCodeExt - * @package_name: com.hzs.common.domain.scm.ic.ext - * version 1.0.0 - */ -@Data -public class IcBatchCodeExt extends IcBatchCode { - /** - * 产品编号 - */ - private String productCode; - - /** - * 产品名称 - */ - private String productName; -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/ext/IcOnHandNumExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/ext/IcOnHandNumExt.java deleted file mode 100644 index 31195ef9..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/ext/IcOnHandNumExt.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.hzs.common.domain.scm.ic.ext; - -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import com.hzs.common.domain.scm.ic.IcOnHandNum; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * @description: 现存量扩展表 - * @author: sui q - * @time: 2023/11/21 16:17 - * @classname: IcOnHandNumExt - * @package_name: com.hzs.common.domain.scm.ic.ext - * version 1.0.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class IcOnHandNumExt extends IcOnHandNum { - - /** - * 产品编号 - */ - private String productCode; - - /** - * 产品名称 - */ - private String productName; - - /** - * 规格名称 - */ - private String specsName; - - /** - * 规格名称主键 - */ - private String specsNameId; - - - /** - * 单位名称 - */ - private String unitName; - - /** - * 供应商名称 - */ - private String cubasdocName; - - /** - * 仓库名称 - */ - private String storehouseName; - - /** - * 公司 - */ - private String corpName; - - /** - * 有效期 - */ - private Integer validPeriod; - - /** - * 批次号 - */ - private String batchCode; - - /** - * 展示红色 - */ - private Integer displayRed; - - private String warnMsg; - - @Transaction(transactionKey = EnumsPrefixConstants.E_SHIPPING_CHANNEL) - private Integer shippingChannel; - - private String shippingChannelVal; -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/inventory/IcInventoryB.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/inventory/IcInventoryB.java deleted file mode 100644 index 7d27adaa..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/inventory/IcInventoryB.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.hzs.common.domain.scm.inventory; - -import java.math.BigDecimal; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableName; -import java.util.Date; -import java.util.List; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableField; -import com.hzs.common.core.web.domain.BaseEntity; -import com.hzs.common.domain.scm.pub.ScmItemSpecs; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - *

- * 库存盘点单明细 - *

- * - * @author hzs - * @since 2023-12-20 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@KeySequence("IC_INVENTORY_B_SEQ") -@TableName("IC_INVENTORY_B") -public class IcInventoryB extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId("PK_ID") - private Long pkId; - - /** - * 单位 - */ - @TableField("PK_UNIT") - private Integer pkUnit; - - /** - * 现存量主键 - */ - @TableField("PK_ONHANDNUM") - private Long pkOnhandnum; - - /** - * 主表主键 - */ - @TableField("PK_INVENTORY") - private Long pkInventory; - - /** - * 产品信息主键 - */ - @TableField("PK_PRODUCT") - private Integer pkProduct; - - /** - * 货位 - */ - @TableField("PK_CLOCATION") - private Integer pkClocation; - - /** - * 供应商 - */ - @TableField("PK_CUBASDOC") - private Integer pkCubasdoc; - - /** - * 生产日期 - */ - @TableField("PRODUCT_DATE") - private Date productDate; - - /** - * 失效日期 - */ - @TableField("EXPIRE_DATE") - private Date expireDate; - - /** - * 账面数量 - */ - @TableField("NONHANDNUM") - private BigDecimal nonhandnum; - - /** - * 调整数量 - */ - @TableField("NADJUSTNUM") - private BigDecimal nadjustnum; - - /** - * 差异数量 - */ - @TableField("NDIFFASTNUM") - private BigDecimal ndiffastnum; - - /** - * 批次主键 - */ - @TableField("PK_BATCH_CODE") - private Long pkBatchCode; - - @TableField(exist=false) - private List scmItemSpecsList; -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/inventory/IcInventoryH.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/inventory/IcInventoryH.java deleted file mode 100644 index 4cd6fd70..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/inventory/IcInventoryH.java +++ /dev/null @@ -1,112 +0,0 @@ -package com.hzs.common.domain.scm.inventory; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableName; -import java.util.Date; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableField; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsKeyConstants; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import com.hzs.common.core.web.domain.BaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - *

- * 库存盘点单表头 - *

- * - * @author hzs - * @since 2023-12-20 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@KeySequence("IC_INVENTORY_H_SEQ") -@TableName("IC_INVENTORY_H") -public class IcInventoryH extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId("PK_ID") - private Long pkId; - - /** - * 部门 - */ - @TableField("PK_DEPT") - private Integer pkDept; - - /** - * 库存公司 - */ - @TableField("PK_CORP") - private Integer pkCorp; - - /** - * 仓库管理员 - */ - @TableField("PK_WHSMANAGER") - private Long pkWhsmanager; - - /** - * 调整人 - */ - @TableField("PK_ADJUSTOR") - private Long pkAdjustor; - - /** - * 仓库 - */ - @TableField("PK_WAREHOUSE") - private Integer pkWarehouse; - - /** - * 盘点类型 1=盘亏 2=盘盈 - */ - @TableField("INV_TYPE") - private Integer invType; - - /** - * 出入库类型 1=入库 2=出库 - */ - @TableField("TRANS_TYPE") - private Integer transType; - - /** - * 订单日期 2023-10 - */ - @TableField("ORDER_DATE") - private Date orderDate; - - /** - * 订单状态 EScmOrderStatus 1=已保存 2=已提交 3=已审核 4=已收货 5=已关闭 - */ - @TableField("ORDER_STATUS") - private Integer orderStatus; - - /** - * 打印状态 - */ - @TableField("PRINT_STATUS") - private Integer printStatus; - - /** - * 订单编号 - */ - @TableField("ORDER_CODE") - private String orderCode; - - /** - * 备注 - */ - @TableField("REMARK") - private String remark; - - -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/inventory/ext/IcInventoryBExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/inventory/ext/IcInventoryBExt.java deleted file mode 100644 index 54b32bc5..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/inventory/ext/IcInventoryBExt.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.hzs.common.domain.scm.inventory.ext; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.hzs.common.domain.scm.inventory.IcInventoryB; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.math.BigDecimal; - -/** - * @description: 盘点单子表扩展表 - * @author: sui q - * @time: 2023/12/20 14:29 - * @classname: IcInventoryBExt - * @package_name: com.hzs.common.domain.scm.inventory.ext - * version 1.0.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class IcInventoryBExt extends IcInventoryB { - /** - * 供应商名称 - */ - private String cubasdocName; - - /** - * 单位名称 - */ - private String unitName; - - /** - * 货位名称 - */ - private String clocationName; - - - private String batchCode; - - /** - * 产品编号 - */ - private String productCode; - - /** - * 产品名称 - */ - private String productName; - - /** - * 规格名称 - */ - private String specsName; - - /** - * 仓库 - */ - private Integer pkStorehouse; - - /** - * 数量 - */ - private BigDecimal nnum; - - private Integer pkProductBas; -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/inventory/ext/IcInventoryHExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/inventory/ext/IcInventoryHExt.java deleted file mode 100644 index 6ce67040..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/inventory/ext/IcInventoryHExt.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.hzs.common.domain.scm.inventory.ext; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.hzs.common.domain.scm.inventory.IcInventoryB; -import com.hzs.common.domain.scm.inventory.IcInventoryH; -import com.hzs.common.domain.scm.po.ext.PoOrderItemsExt; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.List; - -/** - * @description: 盘点单扩展表 - * @author: sui q - * @time: 2023/12/20 14:29 - * @classname: IcInventoryHExt - * @package_name: com.hzs.common.domain.scm.inventory.ext - * version 1.0.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class IcInventoryHExt extends IcInventoryH { - - /** - * 部门名称 - */ - private String deptName; - - /** - * 管理员名称 - */ - private String managerName; - - /** - * 调整人 - */ - private String adjustorName; - - /** - * 仓库名称 - */ - private String storehouseName; - - /** - * 采购组织名称 - */ - private String corpName; - - private List inventoryBiExtList; -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/io/IoOrder.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/io/IoOrder.java deleted file mode 100644 index afa3f03d..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/io/IoOrder.java +++ /dev/null @@ -1,145 +0,0 @@ -package com.hzs.common.domain.scm.io; - -import java.math.BigDecimal; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableName; -import java.util.Date; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableField; -import com.hzs.common.core.web.domain.BaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - *

- * 业务领用订单表头 - *

- * - * @author hzs - * @since 2024-04-22 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@KeySequence("IO_ORDER_SEQ") -@TableName("IO_ORDER") -public class IoOrder extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId("PK_ID") - private Long pkId; - - /** - * 领用部门 - */ - @TableField("PK_DEPT") - private Integer pkDept; - - /** - * 领用人 - */ - @TableField("PK_WHSMANAGER") - private Long pkWhsmanager; - - /** - * 汇率 - */ - @TableField("PK_RATE") - private Integer pkRate; - - /** - * 订单状态 EScmOrderStatus 1=已保存 2=已提交 3=已审核 4=已收货 5=已关闭 - */ - @TableField("ORDER_STATUS") - private Integer orderStatus; - - /** - * 打印状态 - */ - @TableField("PRINT_STATUS") - private Integer printStatus; - - /** - * 供应商 取bd_cubasdoc 类型为1 2的 - */ - @TableField("PK_CUBASDOC") - private Integer pkCubasdoc; - - /** - * 采购组织 - */ - @TableField("PK_CORP") - private Integer pkCorp; - - /** - * 总数量 - */ - @TableField("TOTAL_NUM") - private BigDecimal totalNum; - - /** - * 订单编号 - */ - @TableField("ORDER_CODE") - private String orderCode; - - /** - * 订单日期 2023-10 - */ - @TableField("ORDER_DATE") - private Date orderDate; - - /** - * 用途 - */ - @TableField("PK_PURPOSE") - private Integer pkPurpose; - - /** - * 备注 - */ - @TableField("REMARK") - private String remark; - - /** - * 收货人 - */ - @TableField("REC_NAME") - private String recName; - - /** - * 收货电话 - */ - @TableField("REC_PHONE") - private String recPhone; - - /** - * 省 - */ - @TableField("REC_PROVINCE") - private Integer recProvince; - - /** - * 市 - */ - @TableField("REC_CITY") - private Integer recCity; - - /** - * 县 - */ - @TableField("REC_COUNTY") - private Integer recCounty; - - /** - * 收货地址 - */ - @TableField("REC_ADDRESS") - private String recAddress; -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/io/IoOrderItems.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/io/IoOrderItems.java deleted file mode 100644 index c84031d6..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/io/IoOrderItems.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.hzs.common.domain.scm.io; - -import java.math.BigDecimal; -import java.util.List; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableField; -import com.hzs.common.core.web.domain.BaseEntity; -import com.hzs.common.domain.scm.pub.ScmItemSpecs; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - *

- * 业务领用订单明细 - *

- * - * @author hzs - * @since 2024-04-22 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@KeySequence("IO_ORDER_ITEMS_SEQ") -@TableName("IO_ORDER_ITEMS") -public class IoOrderItems extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId("PK_ID") - private Long pkId; - - /** - * 主表主键 - */ - @TableField("PK_ORDER") - private Long pkOrder; - - /** - * 产品基础信息 - */ - @TableField("PK_PRODUCT_BAS") - private Integer pkProductBas; - - /** - * 仓库 - */ - @TableField("PK_STOREHOUSE") - private Integer pkStorehouse; - - /** - * 单位 - */ - @TableField("PK_UNIT") - private Integer pkUnit; - - /** - * 汇率 - */ - @TableField("PK_RATE") - private Integer pkRate; - - /** - * 数量 - */ - @TableField("NNUM") - private BigDecimal nnum; - - @TableField(exist=false) - private List scmItemSpecsList; -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/io/ext/IoOrderExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/io/ext/IoOrderExt.java deleted file mode 100644 index 8a971b4c..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/io/ext/IoOrderExt.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.hzs.common.domain.scm.io.ext; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.hzs.common.domain.scm.io.IoOrder; -import com.hzs.common.domain.scm.po.ext.PoOrderItemsExt; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.List; - -/** - * @description: 扩展表 - * @author: sui q - * @time: 2024/4/22 11:06 - * @classname: IoOrderExt - * @package_name: com.hzs.common.domain.scm.io.ext - * version 1.0.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class IoOrderExt extends IoOrder { - - /** - * 部门名称 - */ - private String deptName; - - /** - * 管理员名称 - */ - private String managerName; - - /** - * 供应商名称 - */ - private String cubasdocName; - - /** - * 采购组织名称 - */ - private String corpName; - - private String purpose; - - /** - * 省 - */ - private String recProvinceName; - - /** - * 市 - */ - private String recCityName; - - /** - * 县 - */ - private String recCountyName; - - @TableField(exist = false) - private List orderItemsExtList; -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/io/ext/IoOrderItemsExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/io/ext/IoOrderItemsExt.java deleted file mode 100644 index ca687eef..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/io/ext/IoOrderItemsExt.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.hzs.common.domain.scm.io.ext; - -import com.hzs.common.domain.scm.io.IoOrderItems; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.math.BigDecimal; - -/** - * @description: 订单明细扩展表 - * @author: sui q - * @time: 2024/4/22 11:11 - * @classname: IoOrderItemsExt - * @package_name: com.hzs.common.domain.scm.io.ext - * version 1.0.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class IoOrderItemsExt extends IoOrderItems { - - private Integer pkProduct; - - /** - * 供应商 - */ - private Integer pkSupplier; - - /** - * 供货价格 - */ - - private BigDecimal supplyPrice; - - /** - * 产品规格id（冗余） - */ - private String specsNameId; - - /** - * 发货类型 - */ - private Integer shippingChannel; - - /** - * 产品编号 - */ - private String productCode; - - /** - * 产品名称 - */ - private String productName; - - /** - * 规格名称 - */ - private String specsName; - - /** - * 单位名称 - */ - private String unitName; - - /** - * 仓库名称 - */ - private String storehouseName; - -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/no/ScmBillNo.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/no/ScmBillNo.java deleted file mode 100644 index 1ab00c9d..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/no/ScmBillNo.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.hzs.common.domain.scm.no; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableField; -import com.hzs.common.core.web.domain.BaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * 订单编号规则设置 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@TableName("SCM_BILL_NO") -@KeySequence("SCM_BILL_NO_SEQ") -public class ScmBillNo extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId("PK_ID") - private Integer pkId; - - /** - * 前缀编号 - */ - @TableField("PREFIX_CODE") - private String prefixCode; - - /** - * 单据名称 - */ - @TableField("BILL_NAME") - private String billName; - - /** - * 供应链订单类型 scm_bill_no - */ - @TableField("ORDER_TYPE") - private Integer orderType; - - /** - * 包含年 - */ - @TableField("CONTAIN_YEAR") - private Integer containYear; - - /** - * 包含月 - */ - @TableField("CONTAIN_MONTH") - private Integer containMonth; - - /** - * 包含日 - */ - @TableField("CONTAIN_DAY") - private Integer containDay; - - /** - * 结束位数 - */ - @TableField("END_DIGIT") - private Integer endDigit; - - /** - * 重置方式，0=按照日 1=按照月 2=按照年 - */ - @TableField("RESET_TYPE") - private Integer resetType; - - /** - * 每次初始化尾号是多少 - */ - @TableField("INITIAL_VALUE") - private Integer initialValue; - - /** - * 当前单据号尾号是多少 - */ - @TableField("NEXT_VALUE") - private Integer nextValue; - - -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/po/PoOrder.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/po/PoOrder.java deleted file mode 100644 index b7320dd6..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/po/PoOrder.java +++ /dev/null @@ -1,124 +0,0 @@ -package com.hzs.common.domain.scm.po; - -import java.math.BigDecimal; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableName; -import java.util.Date; -import java.util.List; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableField; -import com.hzs.common.core.web.domain.BaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - *

- * 采购订单表头 - *

- * - * @author hzs - * @since 2023-11-17 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@KeySequence("PO_ORDER_SEQ") -@TableName("PO_ORDER") -public class PoOrder extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId("PK_ID") - private Long pkId; - - /** - * 采购部门 - */ - @TableField("PK_DEPT") - private Integer pkDept; - - /** - * 采购人 - */ - @TableField("PK_SALESMAN") - private Long pkSalesman; - - /** - * 汇率 - */ - @TableField("PK_RATE") - private Integer pkRate; - - /** - * 订单状态 EScmOrderStatus 1=已保存 2=已提交 3=已审核 4=已收货 5=已关闭 - */ - @TableField("ORDER_STATUS") - private Integer orderStatus; - - /** - * 打印状态 - */ - @TableField("PRINT_STATUS") - private Integer printStatus; - - /** - * 供应商 取bd_cubasdoc 类型为1 2的 - */ - @TableField("PK_CUBASDOC") - private Integer pkCubasdoc; - - /** - * 采购组织 - */ - @TableField("PK_CORP") - private Integer pkCorp; - - /** - * 总数量 - */ - @TableField("TOTAL_NUM") - private BigDecimal totalNum; - - /** - * 价税合计 - */ - @TableField("TOTAL_ORIGMNY") - private BigDecimal totalOrigmny; - - /** - * 订单编号 - */ - @TableField("ORDER_CODE") - private String orderCode; - - /** - * 退货状态 0=是 1=否 - */ - @TableField("RETURN_STATUS") - private Integer returnStatus; - - /** - * 订单日期 2023-10 - */ - @TableField("ORDER_DATE") - private Date orderDate; - - /** - * 合同编号 - */ - @TableField("CONTRACT_CODE") - private String contractCode; - - /** - * 备注 - */ - @TableField("REMARK") - private String remark; - -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/po/PoOrderItems.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/po/PoOrderItems.java deleted file mode 100644 index 416994a3..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/po/PoOrderItems.java +++ /dev/null @@ -1,145 +0,0 @@ -package com.hzs.common.domain.scm.po; - -import java.math.BigDecimal; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableName; -import java.util.Date; -import java.util.List; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableField; -import com.hzs.common.core.web.domain.BaseEntity; -import com.hzs.common.domain.scm.pub.ScmItemSpecs; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - *

- * 采购订单明细 - *

- * - * @author hzs - * @since 2023-11-17 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@KeySequence("PO_ORDER_ITEMS_SEQ") -@TableName("PO_ORDER_ITEMS") -public class PoOrderItems extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId("PK_ID") - private Long pkId; - - /** - * 主表主键 - */ - @TableField("PK_ORDER") - private Long pkOrder; - - /** - * 产品基础信息 - */ - @TableField("PK_PRODUCT_BAS") - private Integer pkProductBas; - - /** - * 仓库 - */ - @TableField("PK_STOREHOUSE") - private Integer pkStorehouse; - - /** - * 关闭时间 - */ - @TableField("CLOSE_DATE") - private Date closeDate; - - /** - * 计划到货时间 - */ - @TableField("PLAN_DATE") - private Date planDate; - - /** - * 单位 - */ - @TableField("PK_UNIT") - private Integer pkUnit; - - /** - * 汇率 - */ - @TableField("PK_RATE") - private Integer pkRate; - - /** - * 数量 - */ - @TableField("NNUM") - private BigDecimal nnum; - - /** - * 无税单价 - */ - @TableField("NORIGPRICE") - private BigDecimal norigprice; - - /** - * 税率 - */ - @TableField("NTAXRATE") - private BigDecimal ntaxrate; - - /** - * 含税单价 = 无税单价*（1+税率） - */ - @TableField("NORIGTAXPRICE") - private BigDecimal norigtaxprice; - - /** - * 无税金额 = 无税单价*数量 - */ - @TableField("NORIGMNY") - private BigDecimal norigmny; - - /** - * 税额 =无税单价*数量 - */ - @TableField("NTAX") - private BigDecimal ntax; - - /** - * 价税合计 含税单价*数量 - */ - @TableField("NORIGTAXMNY") - private BigDecimal norigtaxmny; - - /** - * 累计入库数量 - */ - @TableField("NACCUMSTORENUM") - private BigDecimal naccumstorenum; - - /** - * 累计退货数量 - */ - @TableField("NBACKARRVNUM") - private BigDecimal nbackarrvnum; - - /** - * 是否赠品 - */ - @TableField("IS_GIFT") - private Integer isGift; - - @TableField(exist=false) - private List scmItemSpecsList; -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/po/ext/PoOrderExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/po/ext/PoOrderExt.java deleted file mode 100644 index 532ea2d0..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/po/ext/PoOrderExt.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.hzs.common.domain.scm.po.ext; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.hzs.common.domain.scm.po.PoOrder; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; -import java.util.List; - -/** - * @description: 采购订单扩展表 - * @author: sui q - * @time: 2023/11/20 15:43 - * @classname: PoOrderExt - * @package_name: com.hzs.common.domain.scm.po.ext - * version 1.0.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class PoOrderExt extends PoOrder { - - /** - * 部门名称 - */ - private String deptName; - - /** - * 管理员名称 - */ - private String managerName; - - /** - * 供应商名称 - */ - private String cubasdocName; - - /** - * 采购组织名称 - */ - private String corpName; - - @TableField(exist = false) - private List poOrderItemsExtList; -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/po/ext/PoOrderItemsExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/po/ext/PoOrderItemsExt.java deleted file mode 100644 index cc266502..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/po/ext/PoOrderItemsExt.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.hzs.common.domain.scm.po.ext; - -import com.hzs.common.core.annotation.Excel; -import com.hzs.common.domain.scm.po.PoOrderItems; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * @description: 采购订单明细扩展表 - * @author: sui q - * @time: 2023/11/20 15:44 - * @classname: PoOrderItemsExt - * @package_name: com.hzs.common.domain.scm.po.ext - * version 1.0.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class PoOrderItemsExt extends PoOrderItems { - - private Integer pkProduct; - - /** - * 产品编号 - */ - private String productCode; - - /** - * 产品名称 - */ - private String productName; - - /** - * 规格名称 - */ - private String specsName; - - /** - * 单位名称 - */ - private String unitName; - - /** - * 仓库名称 - */ - private String storehouseName; - -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/postage/ThSupplierPostage.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/postage/ThSupplierPostage.java deleted file mode 100644 index 228e3a10..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/postage/ThSupplierPostage.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.hzs.common.domain.scm.postage; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableField; -import com.hzs.common.core.web.domain.BaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; - -/** - *

- * - *

- * - * @author hzs - * @since 2024-04-19 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@TableName("TH_SUPPLIER_POSTAGE") -@KeySequence("TH_SUPPLIER_POSTAGE_SEQ") -public class ThSupplierPostage extends BaseEntity { - - private static final long serialVersionUID = 1L; - - @TableId("PK_ID") - private Integer pkId; - - /** - * 商品主键 - */ - @TableField("PK_WARES") - private Integer pkWares; - - /** - * 供应商主键 - */ - @TableField("PK_CUBASDOC") - private Integer pkCubasdoc; - - - - /** - * 邮费 - */ - @TableField("POSTAGE") - private BigDecimal postage; - - /** - * 省主键 - */ - @TableField("PK_AREA") - private Integer pkArea; - - -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/postage/ext/ThSupplierPostageExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/postage/ext/ThSupplierPostageExt.java deleted file mode 100644 index 0ee7c2dd..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/postage/ext/ThSupplierPostageExt.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.hzs.common.domain.scm.postage.ext; - -import com.hzs.common.domain.scm.postage.ThSupplierPostage; -import lombok.Data; - -/** - * @description: 供应商邮费 - * @author: sui q - * @time: 2024/4/19 16:35 - * @classname: ThSupplierPostageExt - * @package_name: com.hzs.common.domain.scm.postage.ext - * version 1.0.0 - */ -@Data -public class ThSupplierPostageExt extends ThSupplierPostage { - - /** - * 销售订单主表 - */ - private Long pkOrder; -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/pub/ScmItemSpecs.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/pub/ScmItemSpecs.java deleted file mode 100644 index db4b04d6..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/pub/ScmItemSpecs.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.hzs.common.domain.scm.pub; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableField; -import com.hzs.common.core.web.domain.BaseEntity; -import lombok.*; -import lombok.experimental.Accessors; - -/** - *

- * 订单规格明细 - *

- * - * @author hzs - * @since 2023-11-21 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@KeySequence("SCM_ITEM_SPECS_SEQ") -@TableName("SCM_ITEM_SPECS") -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class ScmItemSpecs extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId("PK_ID") - private Long pkId; - - /** - * 订单类型 EScmOrderType - */ - @TableField("ORDER_TYPE") - private Integer orderType; - - /** - * 主表主键 - */ - @TableField("PK_ORDER") - private Long pkOrder; - - /** - * 明细表主键 - */ - @TableField("PK_ORDER_ITEMS") - private Long pkOrderItems; - - /** - * 规格类型主键 - */ - @TableField("PK_SPECS_TYPE") - private Integer pkSpecsType; - - /** - * 规格主键 - */ - @TableField("PK_SPECS") - private Integer pkSpecs; - - /** - * 规格名称 - */ - @TableField("SPECS_NAME") - private String specsName; -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/pub/ScmOrderApproveLog.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/pub/ScmOrderApproveLog.java deleted file mode 100644 index f6465a38..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/pub/ScmOrderApproveLog.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.hzs.common.domain.scm.pub; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableField; -import com.hzs.common.core.web.domain.BaseEntity; -import lombok.*; -import lombok.experimental.Accessors; - -/** - *

- * 供应链单据审批记录 - *

- * - * @author hzs - * @since 2023-11-24 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@KeySequence("SCM_ORDER_APPROVE_LOG_SEQ") -@TableName("SCM_ORDER_APPROVE_LOG") -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class ScmOrderApproveLog extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId("PK_ID") - private Long pkId; - - /** - * 单据主键 - */ - @TableField("PK_ORDER") - private Long pkOrder; - - /** - * 单据类型 - */ - @TableField("ORDER_TYPE") - private Integer orderType; - - /** - * 审核状态（1=未审核,2=审核通过,3=审核驳回） - */ - @TableField("APPROVAL_STATUS") - private Integer approvalStatus; - - /** - * 修改记录单号 - */ - @TableField("BUSINESS_CODE") - private String businessCode; - - /** - * 备注（审核意见） - */ - @TableField("REMARK") - private String remark; - - -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/pub/ext/ScmItemSpecsExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/pub/ext/ScmItemSpecsExt.java deleted file mode 100644 index be022f58..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/pub/ext/ScmItemSpecsExt.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.hzs.common.domain.scm.pub.ext; - -import com.hzs.common.domain.scm.pub.ScmItemSpecs; - -/** - * @description: 规格明细扩展表 - * @author: sui q - * @time: 2023/11/21 10:53 - * @classname: ScmItemSpecsExt - * @package_name: com.hzs.common.domain.scm.specs.ext - * version 1.0.0 - */ -public class ScmItemSpecsExt extends ScmItemSpecs { -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/purchase/IcPurchaseInB.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/purchase/IcPurchaseInB.java deleted file mode 100644 index b04ae16b..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/purchase/IcPurchaseInB.java +++ /dev/null @@ -1,183 +0,0 @@ -package com.hzs.common.domain.scm.purchase; - -import java.math.BigDecimal; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableName; -import java.util.Date; -import java.util.List; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableField; -import com.hzs.common.core.web.domain.BaseEntity; -import com.hzs.common.domain.scm.pub.ScmItemSpecs; -import lombok.*; -import lombok.experimental.Accessors; - -/** - *

- * 采购入库明细 - *

- * - * @author hzs - * @since 2023-11-17 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@KeySequence("IC_PURCHASEIN_B_SEQ") -@TableName("IC_PURCHASEIN_B") -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class IcPurchaseInB extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId("PK_ID") - private Long pkId; - - /** - * 单位 - */ - @TableField("PK_UNIT") - private Integer pkUnit; - - /** - * 采购订单主键 - */ - @TableField("PK_PO_ORDER") - private Long pkPoOrder; - - /** - * 采购订单明细主键 - */ - @TableField("PK_PO_ORDER_ITEMS") - private Long pkPoOrderItems; - - /** - * 采购入库主表 用于退货 - */ - @TableField("PK_SOURCE") - private Long pkSource; - - /** - * 购入库明细表 用于退货 - */ - @TableField("PK_SOURCE_B") - private Long pkSourceB; - - /** - * 主表主键 - */ - @TableField("PK_PURCHASE") - private Long pkPurchase; - - /** - * 货位 - */ - @TableField("PK_CLOCATION") - private Integer pkClocation; - - /** - * 产品基础信息主键 - */ - @TableField("PK_PRODUCT_BAS") - private Integer pkProductBas; - - /** - * 产品信息主键 - */ - @TableField("PK_PRODUCT") - private Integer pkProduct; - - /** - * 入库日期 - */ - @TableField("BIZ_DATE") - private Date bizDate; - - /** - * 出入口类型 1=入库 2=出库 - */ - @TableField("TRANS_TYPE") - private Integer transType; - - /** - * 仓库 - */ - @TableField("PK_STOREHOUSE") - private Integer pkStorehouse; - - /** - * 汇率 - */ - @TableField("PK_RATE") - private Integer pkRate; - - /** - * 数量 - */ - @TableField("NNUM") - private BigDecimal nnum; - - /** - * 累计入库数量 - */ - @TableField("NASSISTNUM") - private BigDecimal nassistnum; - - /** - * 无税单价 - */ - @TableField("NORIGPRICE") - private BigDecimal norigprice; - - /** - * 税率 - */ - @TableField("NTAXRATE") - private BigDecimal ntaxrate; - - /** - * 含税单价 = 无税单价*（1+税率） - */ - @TableField("NORIGTAXPRICE") - private BigDecimal norigtaxprice; - - /** - * 无税金额 = 无税单价*数量 - */ - @TableField("NORIGMNY") - private BigDecimal norigmny; - - /** - * 税额 =无税单价*数量 - */ - @TableField("NTAX") - private BigDecimal ntax; - - /** - * 价税合计 含税单价*数量 - */ - @TableField("NORIGTAXMNY") - private BigDecimal norigtaxmny; - - /** - * 批次主键 - */ - @TableField("PK_BATCH_CODE") - private Long pkBatchCode; - - /** - * 是否赠品 - */ - @TableField("IS_GIFT") - private Integer isGift; - - @TableField(exist=false) - private List scmItemSpecsList; -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/purchase/IcPurchaseInH.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/purchase/IcPurchaseInH.java deleted file mode 100644 index 59e2e3bc..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/purchase/IcPurchaseInH.java +++ /dev/null @@ -1,121 +0,0 @@ -package com.hzs.common.domain.scm.purchase; - -import java.math.BigDecimal; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableName; -import java.util.Date; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableField; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.web.domain.BaseEntity; -import lombok.*; -import lombok.experimental.Accessors; - -/** - *

- * 采购入库表头 - *

- * - * @author hzs - * @since 2023-11-17 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@KeySequence("IC_PURCHASEIN_H_SEQ") -@TableName("IC_PURCHASEIN_H") -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class IcPurchaseInH extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId("PK_ID") - private Long pkId; - - /** - * 采购部门 - */ - @TableField("PK_DEPT") - private Integer pkDept; - - /** - * 仓库管理员 - */ - @TableField("PK_WHSMANAGER") - private Long pkWhsmanager; - - /** - * 供应商 取bd_cubasdoc 类型为1 2的 - */ - @TableField("PK_CUBASDOC") - private Integer pkCubasdoc; - - /** - * 仓库 - */ - @TableField("PK_STOREHOUSE") - private Integer pkStorehouse; - - /** - * 订单日期 2023-10 - */ - @TableField("ORDER_DATE") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date orderDate; - - /** - * 订单状态 EPoOrderStatus 1=已保存 2=已提交 3=已审核 4=已收货 5=已关闭 - */ - @TableField("ORDER_STATUS") - private Integer orderStatus; - - /** - * 退货状态 0=是 1=否 - */ - @TableField("RETURN_STATUS") - private Integer returnStatus; - - /** - * 打印状态 - */ - @TableField("PRINT_STATUS") - private Integer printStatus; - - /** - * 采购组织 - */ - @TableField("PK_CORP") - private Integer pkCorp; - - /** - * 总数量 - */ - @TableField("TOTAL_NUM") - private BigDecimal totalNum; - - /** - * 订单编号 - */ - @TableField("ORDER_CODE") - private String orderCode; - - /** - * 退货理由 - */ - @TableField("RETURN_REASON") - private String returnReason; - - /** - * 备注 - */ - @TableField("REMARK") - private String remark; - - -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/purchase/ext/IcPurchaseInBExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/purchase/ext/IcPurchaseInBExt.java deleted file mode 100644 index c625e75d..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/purchase/ext/IcPurchaseInBExt.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.hzs.common.domain.scm.purchase.ext; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.hzs.common.domain.scm.purchase.IcPurchaseInB; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * @description: 入库单明细扩展表 - * @author: sui q - * @time: 2023/11/24 13:57 - * @classname: IcPurchaseInBExt - * @package_name: com.hzs.common.domain.scm.purchase.ext - * version 1.0.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class IcPurchaseInBExt extends IcPurchaseInB { - - /** - * 单位名称 - */ - private String unitName; - - /** - * 生产日期 - */ - private Date productDate; - - /** - * 失效日期 - */ - private Date expireDate; - - /** - * 货位名称 - */ - private String clocationName; - - /** - * 仓库名称 - */ - private String storehouseName; - - - private String batchCode; - - /** - * 产品编号 - */ - private String productCode; - - /** - * 产品名称 - */ - private String productName; - - /** - * 规格名称 - */ - private String specsName; - -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/purchase/ext/IcPurchaseInHExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/purchase/ext/IcPurchaseInHExt.java deleted file mode 100644 index 804f1cbb..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/purchase/ext/IcPurchaseInHExt.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.hzs.common.domain.scm.purchase.ext; - -import com.hzs.common.domain.scm.purchase.IcPurchaseInB; -import com.hzs.common.domain.scm.purchase.IcPurchaseInH; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; -import java.util.List; - -/** - * @description: 采购入库扩展表 - * @author: sui q - * @time: 2023/11/22 14:15 - * @classname: IcPurchaseInHExt - * @package_name: com.hzs.common.domain.scm.purchase.ext - * version 1.0.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class IcPurchaseInHExt extends IcPurchaseInH { - - /** - * 部门名称 - */ - private String deptName; - - /** - * 管理员名称 - */ - private String managerName; - - /** - * 供应商名称 - */ - private String cubasdocName; - - /** - * 仓库名称 - */ - private String storehouseName; - - /** - * 采购组织名称 - */ - private String corpName; - - private List icPurchaseInbList; -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/sale/IcDelSaleLog.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/sale/IcDelSaleLog.java deleted file mode 100644 index 878a5204..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/sale/IcDelSaleLog.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.hzs.common.domain.scm.sale; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableField; -import com.hzs.common.core.web.domain.BaseEntity; -import lombok.*; -import lombok.experimental.Accessors; - -/** - * 发货单生成销售出库日志 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@KeySequence("IC_DEL_SALE_LOG_SEQ") -@TableName("IC_DEL_SALE_LOG") -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class IcDelSaleLog extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId("PK_ID") - private Long pkId; - - /** - * 状态 是否 0=是 1=否 - */ - @TableField("SUCCESS_STATUS") - private Integer successStatus; - - /** - * 来源单号 - */ - @TableField("SOURCE_CODE") - private String sourceCode; - - /** - * 接受参数 - */ - @TableField("ACCEPT_PARAM") - private String acceptParam; - - /** - * 单据类型 1=销售出库（现存量） 2=销售订单 （可用量） - */ - @TableField("BILL_TYPE") - private Integer billType; - - /** - * 错误日志 - */ - @TableField("ERROR_MSG") - private String errorMsg; - - -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/sale/IcSaleoutB.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/sale/IcSaleoutB.java deleted file mode 100644 index 7169d374..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/sale/IcSaleoutB.java +++ /dev/null @@ -1,181 +0,0 @@ -package com.hzs.common.domain.scm.sale; - -import java.math.BigDecimal; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableName; -import java.util.Date; -import java.util.List; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableField; -import com.hzs.common.core.web.domain.BaseEntity; -import com.hzs.common.domain.scm.pub.ScmItemSpecs; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - *

- * 销售出库明细 - *

- * - * @author hzs - * @since 2023-11-29 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@KeySequence("IC_SALEOUT_B_SEQ") -@TableName("IC_SALEOUT_B") -public class IcSaleoutB extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId("PK_ID") - private Long pkId; - - /** - * 单位 - */ - @TableField("PK_UNIT") - private Integer pkUnit; - - /** - * 销售订单主键 - */ - @TableField("PK_SA_ORDER") - private Long pkSaOrder; - - /** - * 销售订单明细主键 - */ - @TableField("PK_SA_ORDER_ITEMS") - private Long pkSaOrderItems; - - /** - * 发货单主键 - */ - @TableField("PK_DELIVERY") - private Long pkDelivery; - - /** - * 发货单明细主键 - */ - @TableField("PK_DELIVER_ITEMS") - private Long pkDeliverItems; - - /** - * 销售出库主表 - */ - @TableField("PK_SOURCE") - private Long pkSource; - - /** - * 销售出库明细表 - */ - @TableField("PK_SOURCE_B") - private Long pkSourceB; - - /** - * 主表主键 - */ - @TableField("PK_SALEOUT") - private Long pkSaleout; - - /** - * 货位 - */ - @TableField("PK_CLOCATION") - private Integer pkClocation; - - /** - * 产品信息主键 - */ - @TableField("PK_PRODUCT") - private Integer pkProduct; - - /** - * 出入口类型 1=入库 2=出库 - */ - @TableField("TRANS_TYPE") - private Integer transType; - - /** - * 入库日期 - */ - @TableField("BIZ_DATE") - private Date bizDate; - - /** - * 仓库 - */ - @TableField("PK_STOREHOUSE") - private Integer pkStorehouse; - - /** - * 汇率 - */ - @TableField("PK_RATE") - private Integer pkRate; - - /** - * 数量 - */ - @TableField("NNUM") - private BigDecimal nnum; - - /** - * 无税单价 - */ - @TableField("NORIGPRICE") - private BigDecimal norigprice; - - /** - * 税率 - */ - @TableField("NTAXRATE") - private BigDecimal ntaxrate; - - /** - * 含税单价 = 无税单价*（1+税率） - */ - @TableField("NORIGTAXPRICE") - private BigDecimal norigtaxprice; - - /** - * 无税金额 = 无税单价*数量 - */ - @TableField("NORIGMNY") - private BigDecimal norigmny; - - /** - * 税额 =无税单价*数量 - */ - @TableField("NTAX") - private BigDecimal ntax; - - /** - * 价税合计 含税单价*数量 - */ - @TableField("NORIGTAXMNY") - private BigDecimal norigtaxmny; - - /** - * 批次主键 - */ - @TableField("PK_BATCH_CODE") - private Long pkBatchCode; - - /** - * 是否赠品 - */ - @TableField("IS_GIFT") - private Integer isGift; - - @TableField(exist=false) - private List scmItemSpecsList; -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/sale/IcSaleoutH.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/sale/IcSaleoutH.java deleted file mode 100644 index 16d4d300..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/sale/IcSaleoutH.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.hzs.common.domain.scm.sale; - -import java.math.BigDecimal; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableName; -import java.util.Date; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableField; -import com.hzs.common.core.web.domain.BaseEntity; -import lombok.*; -import lombok.experimental.Accessors; - -/** - *

- * 销售出库单表头 - *

- * - * @author hzs - * @since 2023-11-29 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@KeySequence("IC_SALEOUT_H_SEQ") -@TableName("IC_SALEOUT_H") -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class IcSaleoutH extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId("PK_ID") - private Long pkId; - - /** - * 销售部门 - */ - @TableField("PK_DEPT") - private Integer pkDept; - - /** - * 仓库管理员 - */ - @TableField("PK_WHSMANAGER") - private Long pkWhsmanager; - - /** - * 客户类型 ESupplierType - */ - @TableField("CUSTOMER_TYPE") - private Integer customerType; - - /** - * 客户（取bd_cubasdoc 类型为5的） - */ - @TableField("PK_CUSTOMER") - private Long pkCustomer; - - /** - * 仓库 - */ - @TableField("PK_STOREHOUSE") - private Integer pkStorehouse; - - /** - * 订单日期 2023-10 - */ - @TableField("ORDER_DATE") - private Date orderDate; - - /** - * 订单状态 EScmGeneralOutStatus 1=已保存 2=已提交 3=已审核 4=已出库 5=已关闭 - */ - @TableField("ORDER_STATUS") - private Integer orderStatus; - - /** - * 退货状态 0=是 1=否 - */ - @TableField("RETURN_STATUS") - private Integer returnStatus; - - /** - * 打印状态 - */ - @TableField("PRINT_STATUS") - private Integer printStatus; - - /** - * 库存公司 - */ - @TableField("PK_CORP") - private Integer pkCorp; - - /** - * 总数量 - */ - @TableField("TOTAL_NUM") - private BigDecimal totalNum; - - /** - * 订单编号 - */ - @TableField("ORDER_CODE") - private String orderCode; - - /** - * 退货理由 - */ - @TableField("RETURN_REASON") - private String returnReason; - - /** - * 备注 - */ - @TableField("REMARK") - private String remark; - - -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/sale/ext/IcSaleoutBExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/sale/ext/IcSaleoutBExt.java deleted file mode 100644 index f7e6aac0..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/sale/ext/IcSaleoutBExt.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.hzs.common.domain.scm.sale.ext; - -import com.hzs.common.domain.scm.sale.IcSaleoutB; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; - -/** - * @description: 销售出库明细扩展表 - * @author: sui q - * @time: 2023/11/30 10:49 - * @classname: IcSaleoutBExt - * @package_name: com.hzs.common.domain.scm.sale.ext.ext - * version 1.0.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class IcSaleoutBExt extends IcSaleoutB { - /** - * 仓库名称 - */ - private String storehouseName; - - /** - * 单位名称 - */ - private String unitName; - - /** - * 货位名称 - */ - private String clocationName; - - private String batchCode; - - /** - * 产品基本信息 - */ - private Integer pkProductBas; - - /** - * 产品编号 - */ - private String productCode; - - /** - * 产品名称 - */ - private String productName; - - /** - * 规格名称 - */ - private String specsName; - - /** - * 生产日期 - */ - private Date productDate; - - /** - * 失效日期 - */ - private Date expireDate; -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/sale/ext/IcSaleoutHExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/sale/ext/IcSaleoutHExt.java deleted file mode 100644 index 34fd657c..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/sale/ext/IcSaleoutHExt.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.hzs.common.domain.scm.sale.ext; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.domain.scm.sale.IcSaleoutH; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; -import java.util.List; - -/** - * @description: 销售出库扩展表 - * @author: sui q - * @time: 2023/11/30 10:48 - * @classname: IcSaleoutHExt - * @package_name: com.hzs.common.domain.scm.sale.ext - * version 1.0.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class IcSaleoutHExt extends IcSaleoutH { - - /** - * 部门名称 - */ - private String deptName; - - /** - * 管理员名称 - */ - private String managerName; - - /** - * 客户名称 - */ - private String customerName; - - /** - * 仓库名称 - */ - private String storehouseName; - - /** - * 采购组织名称 - */ - private String corpName; - - private String sourceOrderCode; - - /** - * 支付时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date payTime; - - /** - * 销售出库明细表 - */ - private List saleoutbExtList; -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/th/ThApprovalLog.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/th/ThApprovalLog.java deleted file mode 100644 index 850c3ec3..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/th/ThApprovalLog.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.hzs.common.domain.scm.th; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableField; -import com.hzs.common.core.web.domain.BaseEntity; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -/** - * 供应商产品日志 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@TableName("TH_APPROVAL_LOG") -@KeySequence("TH_APPROVAL_LOG_SEQ") -@Builder -public class ThApprovalLog extends BaseEntity implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId("PK_ID") - private Long pkId; - - /** - * 业务ID - */ - @TableField("PK_BUSINESS") - private Long pkBusiness; - - /** - * 审批类型（700=提货） - */ - @TableField("APPROVAL_TYPE") - private Integer approvalType; - - /** - * 审核状态（1=未审核,2=审核通过,3=审核驳回） - */ - @TableField("APPROVAL_STATUS") - private Integer approvalStatus; - - /** - * 审核意见 - */ - @TableField("APPROVAL_REMARK") - private String approvalRemark; - - /** - * 修改记录单号 - */ - @TableField("BUSINESS_CODE") - private String businessCode; - - /** - * 操作类型（1=新增,2=修改,3=删除） - */ - @TableField("CONTROLTYPE") - private Integer controltype; - - /** - * 修改前数据 - */ - @TableField("BEFORE_DATA") - private String beforeData; - - /** - * 修改后数据 - */ - @TableField("AFTER_DATA") - private String afterData; - - -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/th/ThProduct.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/th/ThProduct.java deleted file mode 100644 index f37efbb2..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/th/ThProduct.java +++ /dev/null @@ -1,134 +0,0 @@ -package com.hzs.common.domain.scm.th; - -import java.math.BigDecimal; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableField; -import com.hzs.common.core.annotation.Excel; -import com.hzs.common.core.web.domain.BaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@TableName("TH_PRODUCT") -@KeySequence("TH_PRODUCT_SEQ") -public class ThProduct extends BaseEntity { - - private static final long serialVersionUID = 1L; - - @TableId("PK_ID") - private Integer pkId; - - /** - * 产品名称 - */ - @Excel(name = "产品名称") - @TableField("PRODUCT_NAME") - private String productName; - /** - * 产品编号 - */ - @Excel(name = "产品编号") - @TableField("PRODUCT_CODE") - private String productCode; - - /** - * 规格分类 - */ - @TableField("PK_CLASSIFY") - private Integer pkClassify; - - /** - * 长 以厘米作为单位 - */ - @Excel(name = "长(CM)") - @TableField("LENGTH") - private BigDecimal length; - - /** - * 宽 以厘米作为单位 - */ - @Excel(name = "宽(CM)") - @TableField("WIDTH") - private BigDecimal width; - - /** - * 高 以厘米作为单位 - */ - @Excel(name = "高(CM)") - @TableField("HEIGHT") - private BigDecimal height; - /** - * 重量 以千克作为单位 - */ - @Excel(name = "重量") - @TableField("WEIGHT") - private BigDecimal weight; - /** - * 单位 来源于枚举：单位 - */ - @Excel(name = "单位") - @TableField("UNIT") - private Integer unit; - /** - * 零售价格 - */ - @Excel(name = "零售价") - @TableField("RETAIL_PRICE") - private BigDecimal retailPrice; - - /** - * 保质期 - */ - @Excel(name = "保质期(天)") - @TableField("SHELF_LIFE") - private Integer shelfLife; - - /** - * 封面图 - */ - @TableField("COVER") - private String cover; - - /** - * 供应商 - */ - @TableField("PK_SUPPLIER") - private Integer pkSupplier; - - /** - * 供货价格 - */ - @TableField("SUPPLY_PRICE") - private BigDecimal supplyPrice; - - /** - * 供货数量 - */ - @TableField("SUPPLY_QUANTITY") - private Integer supplyQuantity; - - /** - * 销售模式 - */ - @TableField("SALE_MODEL") - private Integer saleModel; - - /** - * 发货渠道 - */ - @TableField("SHIPPING_CHANNEL") - private Integer shippingChannel; - - /** - * 供应商主键 - */ - - @TableField("PK_CUBASDOC") - private Integer pkCubasdoc; -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/th/ThProductExtend.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/th/ThProductExtend.java deleted file mode 100644 index 9f700dbd..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/th/ThProductExtend.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.hzs.common.domain.scm.th; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableField; -import com.hzs.common.core.web.domain.BaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * thProduct商品拓展表 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@TableName("TH_PRODUCT_EXTEND") -@KeySequence("TH_PRODUCT_EXTEND_SEQ") -public class ThProductExtend extends BaseEntity { - - private static final long serialVersionUID = 1L; - - @TableId("PK_ID") - private Integer pkId; - - /** - * 产品主键 - */ - @TableField("PK_PRODUCT") - private Integer pkProduct; - - /** - * 是否提货 来源于枚举：是否，默认否 - */ - @TableField("IS_PICK_UP") - private Integer isPickUp; - - /** - * 是否抽奖奖品 来源于枚举：是否，默认否 - */ - @TableField("IS_PRIZE") - private Integer isPrize; - - /** - * 是否条码管理 来源于枚举：是否，默认否 - */ - @TableField("IS_BAR_CODE") - private Integer isBarCode; - - /** - * 能否合并发货 来源于枚举：是否，默认否 - */ - @TableField("IS_MERGE") - private Integer isMerge; - - /** - * 是否礼包(特惠礼包) 来源于枚举：是否，默认否 - */ - @TableField("IS_GIFT") - private Integer isGift; - - /** - * 库存预警数量 - */ - @TableField("WARNING_QUANTITY") - private Long warningQuantity; - - /** - * 是否陆运 来源于枚举：是否,默认是 - */ - @TableField("IS_LAND_TRANS") - private Integer isLandTrans; - - /** - * 是否空运 来源于枚举：是否,默认否 - */ - @TableField("IS_AIR_TRANS") - private Integer isAirTrans; - - /** - * 是否海运 来源于枚举：是否,默认否 - */ - @TableField("IS_OCEAN_TRANS") - private Integer isOceanTrans; - - /** - * 排序 - */ - @TableField("SORT") - private Integer sort; - - /** - * 复购类型 ERepurchaseType枚举 1=直销 2=乐学注册 3=乐学复购 - */ - @TableField("REPURCHASE_TYPE") - private Integer repurchaseType; - - -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/th/ThProductSpecs.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/th/ThProductSpecs.java deleted file mode 100644 index cb69a570..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/th/ThProductSpecs.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.hzs.common.domain.scm.th; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableField; -import com.hzs.common.core.web.domain.BaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * thPorduct规格明细表 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@TableName("TH_PRODUCT_SPECS") -@KeySequence("TH_PRODUCT_SPECS_SEQ") -public class ThProductSpecs extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId("PK_ID") - private Integer pkId; - - /** - * 产品主键 - */ - @TableField("PK_PRODUCT") - private Integer pkProduct; - - /** - * 规格类型 - */ - @TableField("PK_SPECS_TYPE") - private Integer pkSpecsType; - - -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/trans/IcTransInB.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/trans/IcTransInB.java deleted file mode 100644 index 1dc0739c..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/trans/IcTransInB.java +++ /dev/null @@ -1,175 +0,0 @@ -package com.hzs.common.domain.scm.trans; - -import java.math.BigDecimal; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableName; -import java.util.Date; -import java.util.List; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableField; -import com.hzs.common.core.web.domain.BaseEntity; -import com.hzs.common.domain.scm.pub.ScmItemSpecs; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - *

- * 采购订单明细 - *

- * - * @author hzs - * @since 2023-12-04 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@KeySequence("IC_TRANSIN_B_SEQ") -@TableName("IC_TRANSIN_B") -public class IcTransInB extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId("PK_ID") - private Long pkId; - - /** - * 单位 - */ - @TableField("PK_UNIT") - private Integer pkUnit; - - /** - * 调拨出库单主键 - */ - @TableField("PK_TRANSFER_OUT") - private Long pkTransferOut; - - /** - * 调拨出库单明细主键 - */ - @TableField("PK_TRANSFER_OUT_B") - private Long pkTransferOutB; - - /** - * 主表主键 - */ - @TableField("PK_TRANSFER_IN") - private Long pkTransferIn; - - /** - * 货位 - */ - @TableField("PK_CLOCATION") - private Integer pkClocation; - - /** - * 产品基础信息主键 - */ - @TableField("PK_PRODUCT_BAS") - private Integer pkProductBas; - - /** - * 产品信息主键 - */ - @TableField("PK_PRODUCT") - private Integer pkProduct; - - /** - * 出入口类型 1=入库 2=出库 - */ - @TableField("TRANS_TYPE") - private Integer transType; - - /** - * 入库日期 - */ - @TableField("BIZ_DATE") - private Date bizDate; - - /** - * 供应商 - */ - @TableField("PK_CUBASDOC") - private Integer pkCubasdoc; - - /** - * 客户 - */ - @TableField("PK_CUSTOMER") - private Integer pkCustomer; - - /** - * 调出仓库 - */ - @TableField("PK_OUT_STOREHOUSE") - private Integer pkOutStorehouse; - - /** - * 库存仓库 - */ - @TableField("PK_STOREHOUSE") - private Integer pkStorehouse; - - /** - * 汇率 - */ - @TableField("PK_RATE") - private Integer pkRate; - - /** - * 数量 - */ - @TableField("NNUM") - private BigDecimal nnum; - - /** - * 无税单价 - */ - @TableField("NORIGPRICE") - private BigDecimal norigprice; - - /** - * 税率 - */ - @TableField("NTAXRATE") - private BigDecimal ntaxrate; - - /** - * 含税单价 = 无税单价*（1+税率） - */ - @TableField("NORIGTAXPRICE") - private BigDecimal norigtaxprice; - - /** - * 无税金额 = 无税单价*数量 - */ - @TableField("NORIGMNY") - private BigDecimal norigmny; - - /** - * 税额 =无税单价*数量 - */ - @TableField("NTAX") - private BigDecimal ntax; - - /** - * 价税合计 含税单价*数量 - */ - @TableField("NORIGTAXMNY") - private BigDecimal norigtaxmny; - - /** - * 批次主键 - */ - @TableField("PK_BATCH_CODE") - private Long pkBatchCode; - - @TableField(exist=false) - private List scmItemSpecsList; -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/trans/IcTransInH.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/trans/IcTransInH.java deleted file mode 100644 index bec1e5d8..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/trans/IcTransInH.java +++ /dev/null @@ -1,110 +0,0 @@ -package com.hzs.common.domain.scm.trans; - -import java.math.BigDecimal; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableName; -import java.util.Date; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableField; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.web.domain.BaseEntity; -import lombok.*; -import lombok.experimental.Accessors; - -/** - *

- * 调拨入库单表头 - *

- * - * @author hzs - * @since 2023-12-04 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@KeySequence("IC_TRANSIN_H_SEQ") -@TableName("IC_TRANSIN_H") -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class IcTransInH extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId("PK_ID") - private Long pkId; - - /** - * 调入部门 - */ - @TableField("PK_DEPT") - private Integer pkDept; - - /** - * 仓库管理员 - */ - @TableField("PK_WHSMANAGER") - private Long pkWhsmanager; - - - /** - * 订单日期 2023-10 - */ - @TableField("ORDER_DATE") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date orderDate; - - /** - * 订单状态 EScmOrderStatus 1=已保存 2=已提交 3=已审核 4=已收货 5=已关闭 - */ - @TableField("ORDER_STATUS") - private Integer orderStatus; - - /** - * 打印状态 - */ - @TableField("PRINT_STATUS") - private Integer printStatus; - - /** - * 调出公司 - */ - @TableField("PK_OUT_CORP") - private Integer pkOutCorp; - - /** - * 调入公司 - */ - @TableField("PK_CORP") - private Integer pkCorp; - - /** - * 总数量 - */ - @TableField("TOTAL_NUM") - private BigDecimal totalNum; - - /** - * 订单编号 - */ - @TableField("ORDER_CODE") - private String orderCode; - - /** - * 备注 - */ - @TableField("REMARK") - private String remark; - - /** - * 调出国家 - */ - @TableField("PK_OUT_COUNTRY") - private Integer pkOutCountry; - - -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/trans/IcTransOutB.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/trans/IcTransOutB.java deleted file mode 100644 index e92ecacc..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/trans/IcTransOutB.java +++ /dev/null @@ -1,181 +0,0 @@ -package com.hzs.common.domain.scm.trans; - -import java.math.BigDecimal; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableName; -import java.util.Date; -import java.util.List; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableField; -import com.hzs.common.core.web.domain.BaseEntity; -import com.hzs.common.domain.scm.pub.ScmItemSpecs; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - *

- * 调拨入库明细 - *

- * - * @author hzs - * @since 2023-12-04 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@KeySequence("IC_TRANSOUT_B_SEQ") -@TableName("IC_TRANSOUT_B") -public class IcTransOutB extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId("PK_ID") - private Long pkId; - - /** - * 单位 - */ - @TableField("PK_UNIT") - private Integer pkUnit; - - /** - * 调拨订单主键 - */ - @TableField("PK_TRANSFER") - private Long pkTransfer; - - /** - * 调拨订单明细主键 - */ - @TableField("PK_TRANSFER_ITEMS") - private Long pkTransferItems; - - /** - * 主表主键 - */ - @TableField("PK_TRANSFER_OUT") - private Long pkTransferOut; - - /** - * 货位 - */ - @TableField("PK_CLOCATION") - private Integer pkClocation; - - /** - * 产品基础信息主键 - */ - @TableField("PK_PRODUCT_BAS") - private Integer pkProductBas; - - /** - * 产品信息主键 - */ - @TableField("PK_PRODUCT") - private Integer pkProduct; - - /** - * 出入口类型 1=入库 2=出库 - */ - @TableField("TRANS_TYPE") - private Integer transType; - - /** - * 出库日期 - */ - @TableField("BIZ_DATE") - private Date bizDate; - - /** - * 计划到货日期 - */ - @TableField("PLAN_ARRIVE_DATE") - private Date planArriveDate; - - /** - * 供应商 - */ - @TableField("PK_CUBASDOC") - private Integer pkCubasdoc; - - /** - * 客户 - */ - @TableField("PK_CUSTOMER") - private Integer pkCustomer; - - /** - * 调入仓库 - */ - @TableField("PK_IN_STOREHOUSE") - private Integer pkInStorehouse; - - /** - * 库存仓库 - */ - @TableField("PK_STOREHOUSE") - private Integer pkStorehouse; - - /** - * 汇率 - */ - @TableField("PK_RATE") - private Integer pkRate; - - /** - * 数量 - */ - @TableField("NNUM") - private BigDecimal nnum; - - /** - * 无税单价 - */ - @TableField("NORIGPRICE") - private BigDecimal norigprice; - - /** - * 税率 - */ - @TableField("NTAXRATE") - private BigDecimal ntaxrate; - - /** - * 含税单价 = 无税单价*（1+税率） - */ - @TableField("NORIGTAXPRICE") - private BigDecimal norigtaxprice; - - /** - * 无税金额 = 无税单价*数量 - */ - @TableField("NORIGMNY") - private BigDecimal norigmny; - - /** - * 税额 =无税单价*数量 - */ - @TableField("NTAX") - private BigDecimal ntax; - - /** - * 价税合计 含税单价*数量 - */ - @TableField("NORIGTAXMNY") - private BigDecimal norigtaxmny; - - /** - * 批次主键 - */ - @TableField("PK_BATCH_CODE") - private Long pkBatchCode; - - @TableField(exist=false) - private List scmItemSpecsList; -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/trans/IcTransOutH.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/trans/IcTransOutH.java deleted file mode 100644 index 43aeb2ad..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/trans/IcTransOutH.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.hzs.common.domain.scm.trans; - -import java.math.BigDecimal; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableName; -import java.util.Date; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableField; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.web.domain.BaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - *

- * 调拨出库单表头 - *

- * - * @author hzs - * @since 2023-12-04 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@KeySequence("IC_TRANSOUT_H_SEQ") -@TableName("IC_TRANSOUT_H") -public class IcTransOutH extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId("PK_ID") - private Long pkId; - - /** - * 调出部门 - */ - @TableField("PK_DEPT") - private Integer pkDept; - - /** - * 仓库管理员 - */ - @TableField("PK_WHSMANAGER") - private Long pkWhsmanager; - - /** - * 订单日期 2023-10 - */ - @TableField("ORDER_DATE") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date orderDate; - - /** - * 订单状态 EScmOrderStatus 1=已保存 2=已提交 3=已审核 4=已收货 5=已关闭 - */ - @TableField("ORDER_STATUS") - private Integer orderStatus; - - /** - * 打印状态 - */ - @TableField("PRINT_STATUS") - private Integer printStatus; - - /** - * 调入公司 - */ - @TableField("PK_IN_CORP") - private Integer pkInCorp; - - /** - * 调出公司 - */ - @TableField("PK_CORP") - private Integer pkCorp; - - /** - * 总数量 - */ - @TableField("TOTAL_NUM") - private BigDecimal totalNum; - - /** - * 订单编号 - */ - @TableField("ORDER_CODE") - private String orderCode; - - /** - * 备注 - */ - @TableField("REMARK") - private String remark; - - /** - * 调入国家 - */ - @TableField("PK_IN_COUNTRY") - private Integer pkInCountry; - - -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/trans/TransferOrder.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/trans/TransferOrder.java deleted file mode 100644 index 6c20ec09..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/trans/TransferOrder.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.hzs.common.domain.scm.trans; - -import java.math.BigDecimal; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableName; -import java.util.Date; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableField; -import com.hzs.common.core.web.domain.BaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - *

- * 调拨订单表头 - *

- * - * @author hzs - * @since 2023-12-04 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@KeySequence("TRANSFER_ORDER_SEQ") -@TableName("TRANSFER_ORDER") -public class TransferOrder extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId("PK_ID") - private Long pkId; - - /** - * 调出部门 - */ - @TableField("PK_DEPT") - private Integer pkDept; - - /** - * 调出业务员 - */ - @TableField("PK_WHSMANAGER") - private Long pkWhsmanager; - - /** - * 调出公司 - */ - @TableField("PK_CORP") - private Integer pkCorp; - - /** - * 调入公司 - */ - @TableField("PK_IN_CORP") - private Integer pkInCorp; - - /** - * 汇率 - */ - @TableField("PK_RATE") - private Integer pkRate; - - /** - * 订单状态 EScmOrderStatus 1=已保存 2=已提交 3=已审核 4=已收货 5=已关闭 - */ - @TableField("ORDER_STATUS") - private Integer orderStatus; - - /** - * 打印状态 - */ - @TableField("PRINT_STATUS") - private Integer printStatus; - - /** - * 调拨方式 1=公司内调拨 2=公司间调拨 3=国家间调拨 - */ - @TableField("TRANS_TYPE") - private Integer transType; - - /** - * 总数量 - */ - @TableField("TOTAL_NUM") - private BigDecimal totalNum; - - /** - * 价税合计 - */ - @TableField("TOTAL_ORIGMNY") - private BigDecimal totalOrigmny; - - /** - * 订单编号 - */ - @TableField("ORDER_CODE") - private String orderCode; - - /** - * 订单日期 2023-10 - */ - @TableField("ORDER_DATE") - private Date orderDate; - - /** - * 备注 - */ - @TableField("REMARK") - private String remark; - - /** - * 调出国家 - */ - @TableField("PK_IN_COUNTRY") - private Integer pkInCountry; - - -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/trans/TransferOrderItems.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/trans/TransferOrderItems.java deleted file mode 100644 index 54fce314..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/trans/TransferOrderItems.java +++ /dev/null @@ -1,157 +0,0 @@ -package com.hzs.common.domain.scm.trans; - -import java.math.BigDecimal; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableName; -import java.util.Date; -import java.util.List; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableField; -import com.hzs.common.core.web.domain.BaseEntity; -import com.hzs.common.domain.scm.pub.ScmItemSpecs; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - *

- * 采购入库明细 - *

- * - * @author hzs - * @since 2023-12-04 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@KeySequence("TRANSFER_ORDER_ITEMS_SEQ") -@TableName("TRANSFER_ORDER_ITEMS") -public class TransferOrderItems extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId("PK_ID") - private Long pkId; - - /** - * 主表主键 - */ - @TableField("PK_TRANSFER") - private Long pkTransfer; - - /** - * 产品基础信息主键 - */ - @TableField("PK_PRODUCT_BAS") - private Integer pkProductBas; - - /** - * 单位 - */ - @TableField("PK_UNIT") - private Integer pkUnit; - - /** - * 计划出库日期 - */ - @TableField("PLAN_DATE") - private Date planDate; - - /** - * 仓库 - */ - @TableField("PK_STOREHOUSE") - private Integer pkStorehouse; - - /** - * 调入仓库 - */ - @TableField("PK_IN_STOREHOUSE") - private Integer pkInStorehouse; - - /** - * 供应商 - */ - @TableField("PK_CUBASDOC") - private Integer pkCubasdoc; - - /** - * 客户 - */ - @TableField("PK_CUSTOMER") - private Integer pkCustomer; - - /** - * 汇率 - */ - @TableField("PK_RATE") - private Integer pkRate; - - /** - * 数量 - */ - @TableField("NNUM") - private BigDecimal nnum; - - /** - * 无税单价 - */ - @TableField("NORIGPRICE") - private BigDecimal norigprice; - - /** - * 税率 - */ - @TableField("NTAXRATE") - private BigDecimal ntaxrate; - - /** - * 含税单价 = 无税单价*（1+税率） - */ - @TableField("NORIGTAXPRICE") - private BigDecimal norigtaxprice; - - /** - * 无税金额 = 无税单价*数量 - */ - @TableField("NORIGMNY") - private BigDecimal norigmny; - - /** - * 税额 =无税单价*数量 - */ - @TableField("NTAX") - private BigDecimal ntax; - - /** - * 价税合计 含税单价*数量 - */ - @TableField("NORIGTAXMNY") - private BigDecimal norigtaxmny; - - /** - * 累计调出数量 - */ - @TableField("TOTAL_TRANS_OUT_NUM") - private BigDecimal totalTransOutNum; - - /** - * 累计调入数量 - */ - @TableField("TOTAL_TRANS_IN_NUM") - private BigDecimal totalTransInNum; - - /** - * 是否出库完成 - */ - @TableField("OUT_END") - private Integer outEnd; - - @TableField(exist=false) - private List scmItemSpecsList; -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/trans/ext/IcTransInBExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/trans/ext/IcTransInBExt.java deleted file mode 100644 index 5b22606e..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/trans/ext/IcTransInBExt.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.hzs.common.domain.scm.trans.ext; - -import com.hzs.common.domain.scm.trans.IcTransInB; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; - -/** - * @description: 调拨入库单明细扩展表 - * @author: sui q - * @time: 2023/12/5 16:57 - * @classname: IcTransInBExt - * @package_name: com.hzs.common.domain.scm.trans.ext - * version 1.0.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class IcTransInBExt extends IcTransInB { - /** - * 单位名称 - */ - private String unitName; - - /** - * 货位名称 - */ - private String clocationName; - - /** - * 仓库名称 - */ - private String storehouseName; - - private String outStorehouseName; - - - private String batchCode; - - /** - * 产品编号 - */ - private String productCode; - - /** - * 产品名称 - */ - private String productName; - - /** - * 规格名称 - */ - private String specsName; - - /** - * 供应商名称 - */ - private String cubasdocName; - - /** - * 生产日期 - */ - private Date productDate; - - /** - * 失效日期 - */ - private Date expireDate; -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/trans/ext/IcTransInHExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/trans/ext/IcTransInHExt.java deleted file mode 100644 index 7bfe7b58..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/trans/ext/IcTransInHExt.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.hzs.common.domain.scm.trans.ext; - -import com.hzs.common.domain.scm.trans.IcTransInH; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.List; - -/** - * @description: 调拨入库扩展表 - * @author: sui q - * @time: 2023/12/5 16:56 - * @classname: IcTransInHExt - * @package_name: com.hzs.common.domain.scm.trans.ext - * version 1.0.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class IcTransInHExt extends IcTransInH { - - /** - * 部门名称 - */ - private String deptName; - - /** - * 管理员名称 - */ - private String managerName; - - /** - * 库存公司名称 - */ - private String corpName; - - private String corpOutName; - - private String countryOutName; - - private List transInbExtList; -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/trans/ext/IcTransOutBExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/trans/ext/IcTransOutBExt.java deleted file mode 100644 index b43acc66..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/trans/ext/IcTransOutBExt.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.hzs.common.domain.scm.trans.ext; - -import com.hzs.common.domain.scm.trans.IcTransOutB; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * @description: 扩展表 - * @author: sui q - * @time: 2023/12/6 13:52 - * @classname: IcTransOutB - * @package_name: com.hzs.common.domain.scm.trans.ext - * version 1.0.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class IcTransOutBExt extends IcTransOutB { - - /** - * 单位名称 - */ - private String unitName; - - /** - * 货位名称 - */ - private String clocationName; - - /** - * 仓库名称 - */ - private String storehouseName; - - - private String batchCode; - - /** - * 产品编号 - */ - private String productCode; - - /** - * 产品名称 - */ - private String productName; - - /** - * 规格名称 - */ - private String specsName; - - /** - * 供应商名称 - */ - private String cubasdocName; - - /** - * 仓库名称 - */ - private String inStorehouseName; -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/trans/ext/IcTransOutHExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/trans/ext/IcTransOutHExt.java deleted file mode 100644 index 5063bbb8..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/trans/ext/IcTransOutHExt.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.hzs.common.domain.scm.trans.ext; - -import com.hzs.common.domain.scm.trans.IcTransOutH; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.List; - -/** - * @description: 扩展表 - * @author: sui q - * @time: 2023/12/6 13:52 - * @classname: IcTransOutHExt - * @package_name: com.hzs.common.domain.scm.trans.ext - * version 1.0.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class IcTransOutHExt extends IcTransOutH { - - /** - * 部门名称 - */ - private String deptName; - - /** - * 管理员名称 - */ - private String managerName; - - /** - * 采购组织名称 - */ - private String corpName; - - private String corpInName; - - private String countryInName; - - private List transOutbExtList; -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/trans/ext/TransferOrderExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/trans/ext/TransferOrderExt.java deleted file mode 100644 index e4d562fc..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/trans/ext/TransferOrderExt.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.hzs.common.domain.scm.trans.ext; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.hzs.common.domain.scm.trans.TransferOrder; -import com.hzs.common.domain.scm.trans.TransferOrderItems; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.List; - -/** - * @description: 调拨订单扩展表 - * @author: sui q - * @time: 2023/12/4 14:11 - * @classname: TransferOrderExt - * @package_name: com.hzs.common.domain.scm.trans.ext - * version 1.0.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class TransferOrderExt extends TransferOrder { - - /** - * 部门名称 - */ - private String deptName; - - /** - * 管理员名称 - */ - private String managerName; - - /** - * 采购组织名称 - */ - private String corpName; - - private String corpInName; - - private String countryInName; - - @TableField(exist = false) - private List transferOrderItemsList; -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/trans/ext/TransferOrderItemsExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/trans/ext/TransferOrderItemsExt.java deleted file mode 100644 index 61e0bb6e..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/trans/ext/TransferOrderItemsExt.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.hzs.common.domain.scm.trans.ext; - -import com.hzs.common.domain.scm.trans.TransferOrder; -import com.hzs.common.domain.scm.trans.TransferOrderItems; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * @description: 调拨订单明细扩展表 - * @author: sui q - * @time: 2023/12/4 14:11 - * @classname: TransferOrderItemsExt - * @package_name: com.hzs.common.domain.scm.trans.ext - * version 1.0.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class TransferOrderItemsExt extends TransferOrderItems { - - private Integer pkProduct; - - /** - * 产品编号 - */ - private String productCode; - - /** - * 产品名称 - */ - private String productName; - - /** - * 规格名称 - */ - private String specsName; - - /** - * 单位名称 - */ - private String unitName; - - /** - * 供应商名称 - */ - private String cubasdocName; - - /** - * 仓库名称 - */ - private String storehouseName; - - /** - * 仓库名称 - */ - private String inStorehouseName; -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/warn/IcWarnConfig.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/warn/IcWarnConfig.java deleted file mode 100644 index 6bd29069..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/warn/IcWarnConfig.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.hzs.common.domain.scm.warn; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableField; -import com.hzs.common.core.web.domain.BaseEntity; -import com.hzs.common.domain.scm.pub.ScmItemSpecs; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.util.List; - -/** - *

- * 产品预警配置 - *

- * - * @author hzs - * @since 2024-03-26 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@KeySequence("IC_WARN_CONFIG_SEQ") -@TableName("IC_WARN_CONFIG") -public class IcWarnConfig extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId("PK_ID") - private Long pkId; - - /** - * 产品基本信息 - */ - @TableField("PK_PRODUCT_BAS") - private Integer pkProductBas; - - /** - * 预警数量 - */ - @TableField("WARN_QUANTITY") - private Integer warnQuantity; - - /** - * 预警期间 - */ - @TableField("WARN_PERIOD") - private Integer warnPeriod; - - @TableField(exist=false) - private List scmItemSpecsList; -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/warn/IcWarnConfigSpecs.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/warn/IcWarnConfigSpecs.java deleted file mode 100644 index 0ae57114..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/warn/IcWarnConfigSpecs.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.hzs.common.domain.scm.warn; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableField; -import com.hzs.common.core.web.domain.BaseEntity; -import lombok.*; -import lombok.experimental.Accessors; - -/** - *

- * 预警配置规格明细 - *

- * - * @author hzs - * @since 2024-03-27 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@KeySequence("IC_WARN_CONFIG_SPECS_SEQ") -@TableName("IC_WARN_CONFIG_SPECS") -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class IcWarnConfigSpecs extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId("PK_ID") - private Long pkId; - - /** - * 预警配置主表主键 - */ - @TableField("PK_WARN_CONFIG") - private Long pkWarnConfig; - - /** - * 规格类型主键 - */ - @TableField("PK_SPECS_TYPE") - private Integer pkSpecsType; - - /** - * 规格主键 - */ - @TableField("PK_SPECS") - private Integer pkSpecs; - - /** - * 规格名称 - */ - @TableField("SPECS_NAME") - private String specsName; - - -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/warn/ext/IcWarnConfigExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/warn/ext/IcWarnConfigExt.java deleted file mode 100644 index 31d320a8..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/warn/ext/IcWarnConfigExt.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.hzs.common.domain.scm.warn.ext; - -import com.hzs.common.domain.scm.warn.IcWarnConfig; -import com.hzs.common.domain.scm.warn.IcWarnConfigSpecs; -import lombok.Data; - -import java.util.List; - -/** - * @description: 预警配置扩展表 - * @author: sui q - * @time: 2024/3/26 14:45 - * @classname: IcWarnConfigExt - * @package_name: com.hzs.common.domain.scm.warn.ext - * version 1.0.0 - */ -@Data -public class IcWarnConfigExt extends IcWarnConfig { - - private String productCode; - - private String productName; - - /** - * 仓库名称 - */ - private String storeName; - - /** - * 仓库主键 - */ - private Integer pkStoreHouse; - - /** - * 规格名称 - */ - private String specsName; - - private List warnConfigSpecsList; -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdAgreement.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdAgreement.java index 38201874..adf0c33b 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdAgreement.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdAgreement.java @@ -14,12 +14,7 @@ import lombok.experimental.Accessors; import java.util.Date; /** - *

* 协议配置表 - *

- * - * @author zhangjing - * @since 2022-09-14 */ @Data @EqualsAndHashCode(callSuper = true) @@ -36,21 +31,21 @@ public class BdAgreement extends BaseEntity { /** * 协议标题 */ - @Excel(name = "标题",sort=1) + @Excel(name = "标题", sort = 1) @TableField("TITLE") private String title; /** * 协议内容 */ - @Excel(name = "内容",sort=2) + @Excel(name = "内容", sort = 2) @TableField("CONTENT") private String content; /** * 生效日期 */ - @Excel(name = "内容",sort=3,dateFormat = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "内容", sort = 3, dateFormat = "yyyy-MM-dd HH:mm:ss") @TableField("EFFECTIVE_DATE") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date effectiveDate; diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/ext/AreaCurrencyExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/ext/AreaCurrencyExt.java index f15e6c53..89386087 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/ext/AreaCurrencyExt.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/ext/AreaCurrencyExt.java @@ -7,11 +7,7 @@ import lombok.EqualsAndHashCode; import java.math.BigDecimal; /** - * @Description: 专区币种配置 - * @Author: sui q - * @Time: 2022/9/6 10:57 - * @Classname: AreaCurrencyExt - * @PackageName: com.hzs.common.domain.system.base.ext + * 专区币种配置 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/ext/BdAgreementExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/ext/BdAgreementExt.java index 8445e2fb..8891da6c 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/ext/BdAgreementExt.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/ext/BdAgreementExt.java @@ -5,12 +5,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; /** - *

* 协议配置表 - *

- * - * @author zhangjing - * @since 2022-09-14 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/ext/BdGradeScopeExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/ext/BdGradeScopeExt.java index e75989e4..15163ccf 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/ext/BdGradeScopeExt.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/ext/BdGradeScopeExt.java @@ -7,22 +7,17 @@ import lombok.Data; import lombok.EqualsAndHashCode; /** - *

* 等级范围 - *

- * - * @author zhangjing - * @since 2022-10-24 */ @EqualsAndHashCode(callSuper = true) @Data public class BdGradeScopeExt extends BdGradeScope { + private static final long serialVersionUID = 1L; /** * 等级名称 */ - private String pkScopeVal; - + private String pkScopeVal; } diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/ext/BdLabelExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/ext/BdLabelExt.java index f0a4b159..1f4e0d14 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/ext/BdLabelExt.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/ext/BdLabelExt.java @@ -1,23 +1,10 @@ -package com.hzs.common.domain.system.ext;/** - * @Description: - * @Author: yuhui - * @Time: 2023/5/26 14:55 - * @Classname: BdLabelExt - * @PackageName: com.hzs.common.domain.system.ext - */ +package com.hzs.common.domain.system.ext; -import com.baomidou.mybatisplus.annotation.TableField; import com.hzs.common.domain.system.config.BdLabel; import lombok.Data; +import lombok.EqualsAndHashCode; -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.common.domain.system.ext - *@Author: yh - *@CreateTime: 2023-05-26 14:55 - *@Description: TODO - *@Version: 1.0 - */ +@EqualsAndHashCode(callSuper = true) @Data public class BdLabelExt extends BdLabel { diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/ext/BdNoticeExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/ext/BdNoticeExt.java index 04d9f9a1..061b5fec 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/ext/BdNoticeExt.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/ext/BdNoticeExt.java @@ -6,12 +6,6 @@ import lombok.EqualsAndHashCode; /** * 公告扩展类 - * - * @Description: - * @Author: ljc - * @Time: 2023/4/25 16:01 - * @Classname: BdNoticeExt - * @Package_name: com.hzs.common.domain.system.ext */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/ext/BdPlatformMessageDetailExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/ext/BdPlatformMessageDetailExt.java index ac86b03b..2dba59cd 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/ext/BdPlatformMessageDetailExt.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/ext/BdPlatformMessageDetailExt.java @@ -8,11 +8,7 @@ import lombok.NoArgsConstructor; import lombok.experimental.Accessors; /** - * @Description:站内信详情扩展 - * @Author: ljc - * @Time: 2023/4/6 10:24 - * @Classname: BdPlatformMessageDetailExt - * @Package_name: com.hzs.common.domain.system.ext + * 站内信详情扩展 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/ext/HoAdvertBannerExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/ext/HoAdvertBannerExt.java deleted file mode 100644 index 8a2b274f..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/ext/HoAdvertBannerExt.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.hzs.common.domain.system.ext; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.domain.system.home.HoAdvertBanner; -import lombok.Data; - -import java.util.Date; - -/** - *

- * 广告banner - *

- * - * @author hzs - * @since 2022-12-08 - */ -@Data -public class HoAdvertBannerExt extends HoAdvertBanner { - - private static final long serialVersionUID = 1L; - - /** - * 创建开始时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date startDate; - /** - * 创建结束时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date endDate; - /** - * 生效开始时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date startEffectDate; - /** - * 生效结束时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date endEffectDate; - - -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/ext/HoEnterpriseMissionExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/ext/HoEnterpriseMissionExt.java deleted file mode 100644 index ab168c61..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/ext/HoEnterpriseMissionExt.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.hzs.common.domain.system.ext; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.domain.system.home.HoEnterpriseMission; -import lombok.Data; -import java.util.Date; - -/** - *

- * 企业使命 - *

- * - * @author hzs - * @since 2022-11-18 - */ -@Data -public class HoEnterpriseMissionExt extends HoEnterpriseMission { - - private static final long serialVersionUID = 1L; - - /** - * 创建开始时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date startDate; - /** - * 创建结束时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date endDate; - /** - * 生效开始时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date startEffectDate; - /** - * 生效结束时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date endEffectDate; - - - - -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/ext/HoGlobalCompanyExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/ext/HoGlobalCompanyExt.java deleted file mode 100644 index 3bae7280..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/ext/HoGlobalCompanyExt.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.hzs.common.domain.system.ext; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Excel; -import com.hzs.common.domain.system.home.HoGlobalCompany; -import lombok.Data; - -import java.util.Date; -import java.util.List; - -/** - *

- * 全球分布 - *

- * - * @author hzs - * @since 2022-12-08 - */ -@Data -public class HoGlobalCompanyExt extends HoGlobalCompany { - - /** - * 创建开始时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date startDate; - /** - * 创建结束时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date endDate; - - /** - * 区域 - */ - private String regionName; - /** - * 国家 - */ - @Excel(name = "国家",sort = 1) - private String shortName; - /** - * 省 - */ - @Excel(name = "省/州",sort = 6) - private String provinceName; - /** - * 市 - */ - @Excel(name = "市",sort = 7) - private String cityName; - /** - * 区/县 - */ - @Excel(name = "区/县",sort = 8) - private String countyName; - /** - * 全球分布下拉框 - */ - List belowList; - - /** - * 父级区域 - */ - private Integer parentRegion; - - - -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/ext/HoMemoirProcessExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/ext/HoMemoirProcessExt.java deleted file mode 100644 index 11e54c99..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/ext/HoMemoirProcessExt.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.hzs.common.domain.system.ext; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.domain.system.home.HoMemoirProcess; -import lombok.Data; - -import java.util.Date; - -/** - *

- * 大事记-发展历程 - *

- * - * @author hzs - * @since 2022-12-01 - */ -@Data -public class HoMemoirProcessExt extends HoMemoirProcess { - - private static final long serialVersionUID = 1L; - - /** - * 创建开始时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date startDate; - /** - * 创建结束时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date endDate; - /** - * 生效开始时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date startEffectDate; - /** - * 生效结束时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date endEffectDate; - - - -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/home/HoAdvertBanner.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/home/HoAdvertBanner.java deleted file mode 100644 index 70873bf2..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/home/HoAdvertBanner.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.hzs.common.domain.system.home; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import com.hzs.common.core.web.domain.BaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; -import java.util.Date; - -/** - *

- * 广告banner - *

- * - * @author hzs - * @since 2022-12-08 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@TableName("HO_ADVERT_BANNER") -@KeySequence("HO_ADVERT_BANNER_SEQ") -public class HoAdvertBanner extends BaseEntity { - - private static final long serialVersionUID = 1L; - - @TableId("PK_ID") - private Long pkId; - - /** - * 发布位置 EPosition - */ - @Transaction(transactionKey = EnumsPrefixConstants.POSITION) - @TableField("POSITION") - private Integer position; - - /** - * 发布位置 - */ - @TableField(exist = false) - private String positionVal; - - /** - * 生效日期 - */ - @TableField("EFFECTIVE_DATE") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date effectiveDate; - - /** - * 排序 - */ - @TableField("SORT") - private Integer sort; - - /** - * 图片 - */ - @TableField("PICTURE") - private String picture; - - /** - * 链接 - */ - @TableField("LINK") - private String link; - - - - -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/home/HoBackground.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/home/HoBackground.java deleted file mode 100644 index b1f75c21..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/home/HoBackground.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.hzs.common.domain.system.home; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.web.domain.BaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; -import java.util.Date; - -/** - *

- * 首页背景 - *

- * - * @author hzs - * @since 2022-11-18 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@TableName("HO_BACKGROUND") -@KeySequence("HO_BACKGROUND_SEQ") -public class HoBackground extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId("PK_ID") - private Long pkId; - - /** - * 上传视频 - */ - @TableField("VIDEO_ADDRESS") - private String videoAddress; - /** - * 图片 - */ - @TableField("COVER_ADDRESS") - private String coverAddress; - - /** - * 生效日期 - */ - @TableField("EFFECTIVE_DATE") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date effectiveDate; - - -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/home/HoEnterpriseMission.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/home/HoEnterpriseMission.java deleted file mode 100644 index 7e27066c..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/home/HoEnterpriseMission.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.hzs.common.domain.system.home; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Excel; -import com.hzs.common.core.web.domain.BaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; -import java.util.Date; - -/** - *

- * 企业使命 - *

- * - * @author hzs - * @since 2022-11-18 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@TableName("HO_ENTERPRISE_MISSION") -@KeySequence("HO_ENTERPRISE_MISSION_SEQ") -public class HoEnterpriseMission extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId("PK_ID") - private Long pkId; - - /** - * 标题名称 - */ - @Excel(name = "标题名称",sort = 1) - @TableField("TITLE_NAME") - private String titleName; - /** - * 摘要 - */ - @TableField("SUMMARY") - private String summary; - - /** - * 图片 - */ - @TableField("PICTURE") - private String picture; - - /** - * 内容 - */ - @TableField("CONTENT") - private String content; - - /** - * 排序 - */ - @TableField("SORT") - private Integer sort; - - /** - * 类型 （用户查询语言 1 中文 2英文） - */ - @TableField("LANGUAGE_TYPE") - private Integer languageType; - - /** - * 生效日期 - */ - @Excel(name = "生效日期",dateFormat = "yyyy-MM-dd HH:mm:ss",sort = 2) - @TableField("EFFECTIVE_DATE") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date effectiveDate; - - - - -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/home/HoEnterpriseNews.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/home/HoEnterpriseNews.java deleted file mode 100644 index aae6d784..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/home/HoEnterpriseNews.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.hzs.common.domain.system.home; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Excel; -import com.hzs.common.core.web.domain.BaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.util.Date; - -/** - *

- * 公司新闻 - *

- * - * @author hzs - * @since 2022-11-19 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@TableName("HO_ENTERPRISE_NEWS") -@KeySequence("HO_ENTERPRISE_MISSION_SEQ") -public class HoEnterpriseNews extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId("PK_ID") - private Integer pkId; - - /** - * 文章标题名称 - */ - @Excel(name = "标题名称",sort = 1) - @TableField("TITLE_NAME") - private String titleName; - - /** - * 图片 - */ - @TableField("PICTURE") - private String picture; - - /** - * 内容 - */ - @TableField("CONTENT") - private String content; - - /** - * 排序 - */ - @TableField("SORT") - private Integer sort; - - /** - * 文章内容摘要 - */ - @TableField("SUMMARY") - private String summary; - - /** - * 0 中文 1 英文 - */ - @TableField("LANGUAGE_TYPE") - private Integer languageType; - - /** - * 生效时间 - */ - @Excel(name = "生效日期",dateFormat = "yyyy-MM-dd HH:mm:ss",sort = 2) - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @TableField("EFFECTIVE_DATE") - private Date effectiveDate; - - -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/home/HoEnterpriseStyle.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/home/HoEnterpriseStyle.java deleted file mode 100644 index 85f91b23..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/home/HoEnterpriseStyle.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.hzs.common.domain.system.home; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Excel; -import com.hzs.common.core.web.domain.BaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.util.Date; - -/** - *

- * 公司风采 - *

- * - * @author hzs - * @since 2022-11-19 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@TableName("HO_ENTERPRISE_STYLE") -@KeySequence("HO_ENTERPRISE_MISSION_SEQ") -public class HoEnterpriseStyle extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId("PK_ID") - private Integer pkId; - - /** - * 文章标题名称 - */ - @Excel(name = "标题名称",sort = 1) - @TableField("TITLE_NAME") - private String titleName; - - /** - * 图片 - */ - @TableField("PICTURE") - private String picture; - - /** - * 内容 - */ - @TableField("CONTENT") - private String content; - - /** - * 排序 - */ - @TableField("SORT") - private Integer sort; - - /** - * 文章内容摘要 - */ - @Excel(name = "摘要",sort = 2) - @TableField("SUMMARY") - private String summary; - - /** - * 0 中文 1 英文 - */ - @TableField("LANGUAGE_TYPE") - private Integer languageType; - - /** - * 生效时间 - */ - @Excel(name = "生效日期",dateFormat = "yyyy-MM-dd HH:mm:ss",sort = 3) - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @TableField("EFFECTIVE_DATE") - private Date effectiveDate; - - -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/home/HoGlobalCompany.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/home/HoGlobalCompany.java deleted file mode 100644 index 83d2225f..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/home/HoGlobalCompany.java +++ /dev/null @@ -1,110 +0,0 @@ -package com.hzs.common.domain.system.home; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.hzs.common.core.annotation.Excel; -import com.hzs.common.core.web.domain.BaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - *

- * 全球分布 - *

- * - * @author hzs - * @since 2022-12-08 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@TableName("HO_GLOBAL_COMPANY") -@KeySequence("HO_GLOBAL_COMPANY_SEQ") -public class HoGlobalCompany extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId("PK_ID") - private Integer pkId; - - /** - * 区域 - */ - @TableField("REGION") - private Integer region; - - /** - * 省 - */ - @TableField("GLO_PROVINCE") - private Integer gloProvince; - - /** - * 市 - */ - @TableField("GLO_CITY") - private Integer gloCity; - - /** - * 县 - */ - @TableField("GLO_COUNTY") - private Integer gloCounty; - - /** - * 分公司 - */ - @Excel(name = "分公司",sort = 2) - @TableField("COMPANY") - private String company; - - /** - * 联系人 - */ - @Excel(name = "联系人",sort = 3) - @TableField("CONTACTS") - private String contacts; - - /** - * 联系方式 - */ - @Excel(name = "联系方式",sort = 4) - @TableField("PHONE") - private String phone; - - /** - * 邮箱 - */ - @Excel(name = "邮箱",sort = 5) - @TableField("EMAIL") - private String email; - - /** - * 地址 - */ - @Excel(name = "地址",sort = 9) - @TableField("ADDRESS") - private String address; - - /** - * 0 中文 1 英文 - */ - @TableField("LANGUAGE_TYPE") - private Integer languageType; - - /** - * 图片 - */ - @TableField("IMAGE") - private String image; - - - - -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/home/HoMemoirHonor.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/home/HoMemoirHonor.java deleted file mode 100644 index c13301de..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/home/HoMemoirHonor.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.hzs.common.domain.system.home; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.web.domain.BaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.util.Date; - -/** - *

- * 大事记-资源荣誉 - *

- * - * @author hzs - * @since 2022-12-07 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@TableName("HO_MEMOIR_HONOR") -@KeySequence("HO_MEMOIR_HONOR_SEQ") -public class HoMemoirHonor extends BaseEntity { - - private static final long serialVersionUID = 1L; - - @TableId("PK_ID") - private Integer pkId; - - /** - * 图片 - */ - @TableField("PICTURE") - private String picture; - - /** - * 排序 - */ - @TableField("SORT") - private Integer sort; - /** - * 生效日期 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @TableField("EFFECTIVE_DATE") - private Date effectiveDate; - - - -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/home/HoMemoirProcess.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/home/HoMemoirProcess.java deleted file mode 100644 index 8c78cbd3..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/home/HoMemoirProcess.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.hzs.common.domain.system.home; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Excel; -import com.hzs.common.core.web.domain.BaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.util.Date; - -/** - *

- * 大事记-发展历程 - *

- * - * @author hzs - * @since 2022-12-01 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@TableName("HO_MEMOIR_PROCESS") -@KeySequence("HO_MEMOIR_PROCESS_SEQ") -public class HoMemoirProcess extends BaseEntity { - - private static final long serialVersionUID = 1L; - - @TableId("PK_ID") - private Integer pkId; - - /** - * 标题名称 - */ - @Excel(name = "标题名称",sort = 1) - @TableField("TITLE_NAME") - private String titleName; - - /** - * 排序 - */ - @TableField("SORT") - private Integer sort; - - /** - * 时间 - */ - @Excel(name = "时间",dateFormat = "yyyy-MM-dd",sort = 2) - @JsonFormat(pattern = "yyyy-MM-dd") - @TableField("SETUP_TIME") - private Date setupTime; - - /** - * 生效日期 - */ - @Excel(name = "生效时间",dateFormat = "yyyy-MM-dd HH:mm:ss",sort = 3) - @TableField("EFFECTIVE_DATE") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date effectiveDate; - - /** - * 类型 0 中文 1 英文 - */ - @TableField("LANGUAGE_TYPE") - private Integer languageType; - - -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/home/HoProductDetails.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/home/HoProductDetails.java deleted file mode 100644 index a9413344..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/home/HoProductDetails.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.hzs.common.domain.system.home; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.hzs.common.core.web.domain.BaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - *

- * 商品展示-商品简介详情配置 - *

- * - * @author hzs - * @since 2022-10-12 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@TableName("HO_PRODUCT_DETAILS") -@KeySequence("HO_PRODUCT_DETAILS_SEQ") -public class HoProductDetails extends BaseEntity { - - private static final long serialVersionUID = 1L; - - @TableId("PK_ID") - private Integer pkId; - - /** - * 图片 - */ - @TableField("PICTURE") - private String picture; - /** - * 封面 - */ - @TableField("COVER_ADDRESS") - private String coverAddress; - - /** - * 标题名称 - */ - @TableField("TITLE_NAME") - private String titleName; - /** - * 副标题名称 - */ - @TableField("TWO_LEVEL_TITLE") - private String twoLevelTitle; - - - /** - * 商品分类名称 - */ - @TableField(exist = false) - private String pkAreaClassifyName; - - /** - * 内容 - */ - @TableField("CONTENT") - private String content; - - /** - * 商品分类 - */ - @TableField("PK_AREA_CLASSIFY") - private Integer pkAreaClassify; - - /** - * 排序 - */ - @TableField("SORT") - private Integer sort; - - /** - * 语言种类 - */ - @TableField("LANGUAGE_TYPE") - private Integer languageType; - - -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/home/HoRegionDistribute.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/home/HoRegionDistribute.java deleted file mode 100644 index 923cca8f..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/home/HoRegionDistribute.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.hzs.common.domain.system.home; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableField; -import com.hzs.common.core.web.domain.BaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - *

- * 全球销售网络分布 - *

- * - * @author hzs - * @since 2022-10-10 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@TableName("HO_REGION_DISTRIBUTE") -@KeySequence("HO_REGION_DISTRIBUTE_SEQ") -public class HoRegionDistribute extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId("PK_ID") - private Integer pkId; - - /** - * 销售地区 - */ - @TableField("NAME") - private String name; - - /** - * 排序 - */ - @TableField("SORT") - private Integer sort; - - /** - * 语言种类 0 中文 1 英文 - */ - @TableField("LANGUAGE_TYPE") - private Integer languageType; - - -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/home/HoRegionDistributeItem.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/home/HoRegionDistributeItem.java deleted file mode 100644 index ff0dd0b7..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/home/HoRegionDistributeItem.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.hzs.common.domain.system.home; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableField; -import com.hzs.common.core.web.domain.BaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - *

- * 首页全球分布子表 - *

- * - * @author hzs - * @since 2022-10-10 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@TableName("HO_REGION_DISTRIBUTE_ITEM") -@KeySequence("HO_REGION_DISTRIBUTE_ITEM_SEQ") -public class HoRegionDistributeItem extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId("PK_ID") - private Integer pkId; - - /** - * 标题 - */ - @TableField("TITLE") - private String title; - - /** - * 展示图片 - */ - @TableField("SHOW_PIC") - private String showPic; - - /** - * 名称 - */ - @TableField("NAME") - private String name; - - /** - * 联系电话 - */ - @TableField("CONTACT") - private String contact; - - /** - * 邮箱 - */ - @TableField("EMAIL") - private String email; - - /** - * 详细地址 - */ - @TableField("ADDRESS") - private String address; - - /** - * 全球销售网络分布外键 - */ - @TableField("REGION_DISTRIBUTE_PK") - private Integer regionDistributePk; - - /** - * 语言种类 0 中文 1 英文 - */ - @TableField("LANGUAGE_TYPE") - private Integer languageType; - - -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/home/HoVrArea.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/home/HoVrArea.java deleted file mode 100644 index 90a9c282..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/home/HoVrArea.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.hzs.common.domain.system.home; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.web.domain.BaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.util.Date; - -/** - *

- * VR专区 - *

- * - * @author hzs - * @since 2022-11-19 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@TableName("HO_VR_AREA") -@KeySequence("HO_VR_AREA_SEQ") -public class HoVrArea extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId("PK_ID") - private Integer pkId; - - /** - * 标题名称 - */ - @TableField("TITLE_NAME") - private String titleName; - - /** - * 图片 - */ - @TableField("PICTURE") - private String picture; - - /** - * 链接地址 - */ - @TableField("LINK_ADDRESS") - private String linkAddress; - - /** - * 排序 - */ - @TableField("SORT") - private String sort; - - /** - * 生效日期 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @TableField("EFFECTIVE_DATE") - private Date effectiveDate; - - /** - * 类型 0 中文 1 英文 - */ - @TableField("LANGUAGE_TYPE") - private String languageType; - - -} diff --git a/bd-gateway/src/main/java/com/hzs/GatewayApplication.java b/bd-gateway/src/main/java/com/hzs/GatewayApplication.java index 74630f15..18dd411f 100644 --- a/bd-gateway/src/main/java/com/hzs/GatewayApplication.java +++ b/bd-gateway/src/main/java/com/hzs/GatewayApplication.java @@ -6,8 +6,6 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; /** * 网关启动程序 - * - * @author hzs */ @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}) public class GatewayApplication { diff --git a/bd-gateway/src/main/resources/bootstrap.yml b/bd-gateway/src/main/resources/bootstrap.yml index e1868346..48f970fa 100644 --- a/bd-gateway/src/main/resources/bootstrap.yml +++ b/bd-gateway/src/main/resources/bootstrap.yml @@ -89,7 +89,7 @@ spring: - id: bd-third uri: lb://bd-third predicates: - - Path=/pay/**, /sms/**, /third/**, /energy/** + - Path=/pay/**, /sms/** filters: - StripPrefix=1 # 销售模块 @@ -113,13 +113,6 @@ spring: - Path=/bonus/** filters: - StripPrefix=1 - # 供应链模块 - - id: bd-scm - uri: lb://bd-scm - predicates: - - Path=/scm/** - filters: - - StripPrefix=1 # 安全配置 security: @@ -134,15 +127,6 @@ security: - /system/manage/notice/* - /sale/manage/wares/* - /system/manage/feedback/* - - /system/manage/ho-enterprise-mission - - /system/manage/ho-enterprise-news - - /system/manage/ho-enterprise-style - - /system/manage/ho-product-details - - /member/manage/dealer/reject - - /sale/manage/appletConfig/save - - /sale/manage/appletConfig/update - - /sale/manage/appletConfig/detail - - /sale/api/appletConfig/detail - /member/manage/change-domicile/domicile-change-reject - /member/manager/business/license/reject - /member/manage/self-modify-address/reject @@ -154,9 +138,6 @@ security: - /report/manager/member-awards/petition - /member/manager/member-achieve-log/petition - /member/manager/updatecode/petition - - /member/manage/awards-control/save-petition - - /member/manage/awards-control/up-petition - - /member/manage/awards-control/del-petition - /member/manage/update-settle-country/petition - /member/manage/update-policy-currency/petition - /member/manage/update-place-parent/petition @@ -164,16 +145,6 @@ security: - /member/manage/handle-business/online-petition-confirm - /member/manage/member-empty/submit - /member/manager/zeroRevoke/petition - - /activity/manage/gift-benefits/save-petition - - /activity/manage/gift-benefits/up-petition - - /activity/manage/gift-benefits/del-petition - - /activity/manage/new-people/save-petition - - /activity/manage/new-people/up-petition - - /activity/manage/new-people/del-petition - - /activity/manage/ac-bean-rule-config/save-petition - - /activity/manage/ac-bean-rule-config/up-petition - - /activity/manage/ac-bean-rule-config/del-petition - - /activity/manage/tourism/online-petition - /activity/manage/wares-rule-config/save-activity - /activity/manage/wares-rule-config/update - /activity/manage/consume-rule-config/consumption-gift @@ -199,8 +170,6 @@ security: - /member/api/share/find-share-code/* - /member/api/share/share-sms-code - /member/api/share/share-register - # 获取点亮区域 - - /system/manage/area/get-light-area # 新零售白名单 - /retail-member/api/retail-auth/* diff --git a/bd-third/pom.xml b/bd-third/pom.xml index 106a4601..99746578 100644 --- a/bd-third/pom.xml +++ b/bd-third/pom.xml @@ -124,11 +124,6 @@ dysmsapi20170525 - - com.bd - bd-api-scm - - com.huifu.bspay.sdk diff --git a/bd-third/src/main/java/com/hzs/third/mqcall/listener/IcAvailableNumBackListener.java b/bd-third/src/main/java/com/hzs/third/mqcall/listener/IcAvailableNumBackListener.java deleted file mode 100644 index 0eab1a32..00000000 --- a/bd-third/src/main/java/com/hzs/third/mqcall/listener/IcAvailableNumBackListener.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.hzs.third.mqcall.listener; - -import cn.hutool.json.JSONUtil; -import com.hzs.common.core.constant.RabbitMqConstants; -import com.hzs.common.domain.sale.ext.SaOrderExt; -import com.hzs.scm.pub.IScmBillServiceApi; -import com.rabbitmq.client.Channel; -import lombok.extern.slf4j.Slf4j; -import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.amqp.rabbit.annotation.*; -import org.springframework.amqp.support.AmqpHeaders; -import org.springframework.messaging.Message; -import org.springframework.stereotype.Component; - -/** - * 更新可用量,回退可用量 - */ -@Slf4j -@Component -public class IcAvailableNumBackListener { - - @DubboReference - IScmBillServiceApi scmBillServiceApi; - - @RabbitListener(bindings = @QueueBinding( - exchange = @Exchange(value = RabbitMqConstants.AVAILABLE_NMU_BACK_EXCHANGE, type = "topic"), - value = @Queue(value = RabbitMqConstants.AVAILABLE_NMU_BACK_QUEUE, durable = "true", autoDelete = "false"), - key = RabbitMqConstants.AVAILABLE_NMU_BACK_KEY)) - @RabbitHandler - public void onMessage(Message message, Channel channel) throws Exception { - SaOrderExt saOrderExt = message.getPayload(); - log.info("开始更新可用量，接收到的参数：{}", JSONUtil.toJsonStr(saOrderExt)); - try { - Thread.sleep(1000); - Long deliveryTag = (Long) message.getHeaders().get(AmqpHeaders.DELIVERY_TAG); - channel.basicAck(deliveryTag, false); - scmBillServiceApi.backSaOrderAvailable(saOrderExt); - } catch (Exception e) { - log.error(e.getMessage()); - e.printStackTrace(); - } - } -} diff --git a/bd-third/src/main/java/com/hzs/third/mqcall/listener/IcAvailableNumListener.java b/bd-third/src/main/java/com/hzs/third/mqcall/listener/IcAvailableNumListener.java deleted file mode 100644 index 69643a00..00000000 --- a/bd-third/src/main/java/com/hzs/third/mqcall/listener/IcAvailableNumListener.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.hzs.third.mqcall.listener; - -import cn.hutool.json.JSONUtil; -import com.hzs.common.core.constant.RabbitMqConstants; -import com.hzs.common.domain.scm.ic.IcAvailableNum; -import com.hzs.common.domain.scm.ic.ext.IcAvailableNumExt; -import com.hzs.scm.pub.IScmBillServiceApi; -import com.rabbitmq.client.Channel; -import lombok.extern.slf4j.Slf4j; -import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.amqp.rabbit.annotation.*; -import org.springframework.amqp.support.AmqpHeaders; -import org.springframework.messaging.Message; -import org.springframework.stereotype.Component; - -import java.util.List; - -/** - * 更新可用量 - */ -@Slf4j -@Component -public class IcAvailableNumListener { - - @DubboReference - IScmBillServiceApi scmBillServiceApi; - - @RabbitListener(bindings = @QueueBinding( - exchange = @Exchange(value = RabbitMqConstants.AVAILABLE_NMU_EXCHANGE, type = "topic"), - value = @Queue(value = RabbitMqConstants.AVAILABLE_NMU_QUEUE, durable = "true", autoDelete = "false"), - key = RabbitMqConstants.AVAILABLE_NMU_KEY)) - @RabbitHandler - public void onMessage(Message> message, Channel channel) throws Exception { - List availableNumList = message.getPayload(); - log.info("开始更新可用量，接收到的参数：{}", JSONUtil.toJsonStr(availableNumList)); - try { - Thread.sleep(1000); - Long deliveryTag = (Long) message.getHeaders().get(AmqpHeaders.DELIVERY_TAG); - channel.basicAck(deliveryTag, false); - scmBillServiceApi.updateDeductIcAvailableNumByList(availableNumList); - } catch (Exception e) { - log.error(e.getMessage()); - e.printStackTrace(); - } - } -} diff --git a/bd-third/src/main/java/com/hzs/third/sms/util/SmsUtil.java b/bd-third/src/main/java/com/hzs/third/sms/util/SmsUtil.java index 3c679612..26f770e1 100644 --- a/bd-third/src/main/java/com/hzs/third/sms/util/SmsUtil.java +++ b/bd-third/src/main/java/com/hzs/third/sms/util/SmsUtil.java @@ -22,12 +22,7 @@ import java.util.List; import java.util.Map; /** - * Description: 发送短信工具类 - * - * @author: jiang chao - * Time: 2022/9/24 9:58 - * Classname: SmsUtil - * PackageName: com.hzs.common.utils + * 发送短信工具类 */ @Slf4j @Component diff --git a/bd-third/src/main/java/com/hzs/third/translate/service/ITranslateService.java b/bd-third/src/main/java/com/hzs/third/translate/service/ITranslateService.java index a894f5f1..1df4e900 100644 --- a/bd-third/src/main/java/com/hzs/third/translate/service/ITranslateService.java +++ b/bd-third/src/main/java/com/hzs/third/translate/service/ITranslateService.java @@ -4,13 +4,6 @@ import com.hzs.third.translate.dto.TranslateParam; import java.util.Map; -/** - * @Description: - * @Author: jiang chao - * @Time: 2023/3/7 18:42 - * @Classname: ITranslateService - * @PackageName: com.hzs.third.translate.service - */ public interface ITranslateService { /** diff --git a/bd-third/src/main/resources/bootstrap.yml b/bd-third/src/main/resources/bootstrap.yml index af87b459..bf0e0108 100644 --- a/bd-third/src/main/resources/bootstrap.yml +++ b/bd-third/src/main/resources/bootstrap.yml @@ -62,7 +62,7 @@ dubbo: port: -1 cloud: ## 订阅服务 - subscribed-services: bd-third, bd-system, bd-member, bd-sale, bd-bonus, bd-scm, bd-report + subscribed-services: bd-third, bd-system, bd-member, bd-sale, bd-bonus, bd-report scan: # dubbo 服务扫描包（开启之后才会对外提供服务） base-packages: com.hzs.third diff --git a/pom.xml b/pom.xml index 18e0ce9c..2da6fb6b 100644 --- a/pom.xml +++ b/pom.xml @@ -228,12 +228,6 @@ bd-api-bonus ${bd.version} - - - com.bd - bd-api-scm - ${bd.version} - com.bd