From 5f165bf6976cf3e7785a80b07a48728dcec0cf37 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Fri, 9 Aug 2024 16:53:16 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- oms/README.md | 4 +- .../com/yxt/oms/apiadmin/AdminHomeRest.java | 2 +- .../aggregation/BaseGoodsBrandRest.java | 70 ++++ .../aggregation/BaseGoodsSpuRest.java | 84 ++++ .../aggregation/BaseGoodsTypeRest.java | 73 ++++ .../aggregation/BaseGoodsUnitRest.java | 66 +++ .../aggregation/BaseManufacturerRest.java | 76 ++++ .../aggregation/SupplierBankRest.java | 85 ++++ .../aggregation/SupplierFileRest.java | 85 ++++ .../aggregation/SupplierInfoRest.java | 37 +- .../aggregation/SupplierTypeRest.java | 96 +++++ .../aggregation/SysStaffinfoRest.java | 6 +- .../aggregation/WarehouseAreaRest.java | 74 ++++ .../aggregation/WarehouseAreaTypeRest.java | 68 +++ .../aggregation/WarehouseExtendRest.java | 37 ++ .../aggregation/WarehouseInfoRest.java | 54 ++- .../aggregation/WarehouseRackRest.java | 76 ++++ .../java/com/yxt/oms/apiwx/WxHomeRest.java | 2 +- .../biz/func/basebrandinfo/BaseBrandInfo.java | 21 + .../func/basebrandinfo/BaseBrandInfoDto.java | 29 ++ .../basebrandinfo/BaseBrandInfoMapper.java | 18 + .../basebrandinfo/BaseBrandInfoMapper.xml | 15 + .../basebrandinfo/BaseBrandInfoQuery.java | 22 + .../basebrandinfo/BaseBrandInfoService.java | 82 ++++ .../func/basebrandinfo/BaseBrandInfoVo.java | 32 ++ .../biz/func/basegoodssku/BaseGoodsSku.java | 21 + .../basegoodssku/BaseGoodsSkuDetailsVo.java | 69 ++++ .../func/basegoodssku/BaseGoodsSkuDto.java | 31 ++ .../func/basegoodssku/BaseGoodsSkuMapper.java | 26 ++ .../func/basegoodssku/BaseGoodsSkuMapper.xml | 64 +++ .../BaseGoodsSkuPurSelectList.java | 35 ++ .../BaseGoodsSkuPurSelectQuery.java | 30 ++ .../func/basegoodssku/BaseGoodsSkuQuery.java | 13 + .../basegoodssku/BaseGoodsSkuSelectList.java | 36 ++ .../basegoodssku/BaseGoodsSkuSelectQuery.java | 15 + .../BaseGoodsSkuExtend.java | 34 ++ .../BaseGoodsSkuExtendDto.java | 46 +++ .../BaseGoodsSkuExtendMapper.java | 20 + .../BaseGoodsSkuExtendMapper.xml | 28 ++ .../BaseGoodsSkuExtendQuery.java | 13 + .../BaseGoodsSkuExtendService.java | 135 ++++++ .../biz/func/basegoodsspu/BaseGoodsSpu.java | 32 ++ .../func/basegoodsspu/BaseGoodsSpuDto.java | 49 +++ .../func/basegoodsspu/BaseGoodsSpuMapper.java | 19 + .../func/basegoodsspu/BaseGoodsSpuMapper.xml | 27 ++ .../func/basegoodsspu/BaseGoodsSpuQuery.java | 22 + .../basegoodsspu/BaseGoodsSpuService.java | 390 ++++++++++++++++++ .../biz/func/basegoodsspu/BaseGoodsSpuVo.java | 54 +++ .../BaseGoodsSpuDetail.java | 20 + .../BaseGoodsSpuDetailDto.java | 29 ++ .../BaseGoodsSpuDetailMapper.java | 20 + .../BaseGoodsSpuDetailMapper.xml | 24 ++ .../BaseGoodsSpuDetailQuery.java | 13 + .../BaseGoodsSpuDetailService.java | 102 +++++ .../BaseGoodsSpuDetailVo.java | 35 ++ .../biz/func/basegoodstype/BaseGoodsType.java | 23 ++ .../func/basegoodstype/BaseGoodsTypeDto.java | 37 ++ .../basegoodstype/BaseGoodsTypeMapper.java | 17 + .../basegoodstype/BaseGoodsTypeMapper.xml | 15 + .../basegoodstype/BaseGoodsTypeQuery.java | 25 ++ .../basegoodstype/BaseGoodsTypeService.java | 90 ++++ .../func/basegoodstype/BaseGoodsTypeVo.java | 42 ++ .../biz/func/basegoodsunit/BaseGoodsUnit.java | 16 + .../func/basegoodsunit/BaseGoodsUnitDto.java | 31 ++ .../basegoodsunit/BaseGoodsUnitMapper.java | 17 + .../basegoodsunit/BaseGoodsUnitMapper.xml | 15 + .../basegoodsunit/BaseGoodsUnitQuery.java | 22 + .../basegoodsunit/BaseGoodsUnitService.java | 67 +++ .../func/basegoodsunit/BaseGoodsUnitVo.java | 29 ++ .../basemanufacturer/BaseManufacturer.java | 20 + .../basemanufacturer/BaseManufacturerDto.java | 37 ++ .../BaseManufacturerMapper.java | 21 + .../BaseManufacturerMapper.xml | 20 + .../BaseManufacturerQuery.java | 22 + .../BaseManufacturerService.java | 70 ++++ .../basemanufacturer/BaseManufacturerVo.java | 36 ++ .../biz/func/goodsspu/GoodsSpuService.java | 5 +- .../purchasebill/PurchaseBillService.java | 4 +- .../biz/func/supplierbank/SupplierBank.java | 76 ++++ .../supplierbank/SupplierBankDetailsVo.java | 76 ++++ .../func/supplierbank/SupplierBankDto.java | 76 ++++ .../func/supplierbank/SupplierBankMapper.java | 67 +++ .../func/supplierbank/SupplierBankMapper.xml | 13 + .../func/supplierbank/SupplierBankQuery.java | 74 ++++ .../supplierbank/SupplierBankService.java | 70 ++++ .../biz/func/supplierbank/SupplierBankVo.java | 76 ++++ .../biz/func/supplierfile/SupplierFile.java | 66 +++ .../supplierfile/SupplierFileDetailsVo.java | 66 +++ .../func/supplierfile/SupplierFileDto.java | 66 +++ .../func/supplierfile/SupplierFileMapper.java | 60 +++ .../func/supplierfile/SupplierFileMapper.xml | 13 + .../func/supplierfile/SupplierFileQuery.java | 64 +++ .../supplierfile/SupplierFileService.java | 68 +++ .../biz/func/supplierfile/SupplierFileVo.java | 66 +++ .../supplierinfo/SupplierInfoDetailsVo.java | 118 ++++++ .../func/supplierinfo/SupplierInfoDto.java | 121 ++++++ .../func/supplierinfo/SupplierInfoMapper.java | 67 +++ .../func/supplierinfo/SupplierInfoMapper.xml | 13 + .../func/supplierinfo/SupplierInfoQuery.java | 70 ++++ .../supplierinfo/SupplierInfoService.java | 35 ++ .../biz/func/supplierinfo/SupplierInfoVo.java | 67 +++ .../biz/func/suppliertype/SupplierType.java | 64 +++ .../suppliertype/SupplierTypeDetailsVo.java | 64 +++ .../func/suppliertype/SupplierTypeDown.java | 52 +++ .../func/suppliertype/SupplierTypeDto.java | 66 +++ .../func/suppliertype/SupplierTypeMapper.java | 66 +++ .../func/suppliertype/SupplierTypeMapper.xml | 13 + .../func/suppliertype/SupplierTypeQuery.java | 70 ++++ .../suppliertype/SupplierTypeService.java | 155 +++++++ .../biz/func/suppliertype/SupplierTypeVo.java | 64 +++ .../sysstaffinfo/SysStaffinfoService.java | 4 +- .../biz/func/warehousearea/WarehouseArea.java | 28 ++ .../warehousearea/WarehouseAreaAllVo.java | 56 +++ .../func/warehousearea/WarehouseAreaDto.java | 32 ++ .../warehousearea/WarehouseAreaMapper.java | 24 ++ .../warehousearea/WarehouseAreaMapper.xml | 34 ++ .../warehousearea/WarehouseAreaQuery.java | 26 ++ .../warehousearea/WarehouseAreaService.java | 125 ++++++ .../func/warehousearea/WarehouseAreaVo.java | 38 ++ .../warehouseareatype/WarehouseAreaType.java | 17 + .../WarehouseAreaTypeDto.java | 27 ++ .../WarehouseAreaTypeMapper.java | 21 + .../WarehouseAreaTypeMapper.xml | 29 ++ .../WarehouseAreaTypeQuery.java | 22 + .../WarehouseAreaTypeService.java | 117 ++++++ .../WarehouseAreaTypeVo.java | 29 ++ .../func/warehouseextend/WarehouseExtend.java | 20 + .../warehouseextend/WarehouseExtendDto.java | 27 ++ .../WarehouseExtendMapper.java | 13 + .../warehouseextend/WarehouseExtendMapper.xml | 15 + .../warehouseextend/WarehouseExtendQuery.java | 13 + .../WarehouseExtendService.java | 28 ++ .../warehouseextend/WarehouseExtendVo.java | 33 ++ .../warehouseinfo/WarehouseInfoAllVo.java | 54 +++ .../func/warehouseinfo/WarehouseInfoDto.java | 48 +++ .../warehouseinfo/WarehouseInfoMapper.java | 25 ++ .../warehouseinfo/WarehouseInfoMapper.xml | 24 ++ .../warehouseinfo/WarehouseInfoQuery.java | 25 ++ .../warehouseinfo/WarehouseInfoService.java | 91 +++- .../func/warehouseinfo/WarehouseInfoVo.java | 46 +++ .../biz/func/warehouserack/WarehouseRack.java | 24 ++ .../func/warehouserack/WarehouseRackDto.java | 29 ++ .../warehouserack/WarehouseRackMapper.java | 21 + .../warehouserack/WarehouseRackMapper.xml | 34 ++ .../warehouserack/WarehouseRackQuery.java | 25 ++ .../warehouserack/WarehouseRackService.java | 102 +++++ .../func/warehouserack/WarehouseRackVo.java | 37 ++ .../basebrandinfo/BaseBrandInfoFeign.java | 54 +++ .../BaseBrandInfoFeignFallback.java | 58 +++ .../goods/basegoodssku/BaseGoodsSkuFeign.java | 8 +- .../BaseGoodsSkuFeignFallback.java | 34 ++ .../goods/basegoodsspu/BaseGoodsSpuFeign.java | 62 +++ .../BaseGoodsSpuFeignFallback.java | 72 ++++ .../basegoodstype/BaseGoodsTypeFeign.java | 57 +++ .../BaseGoodsTypeFeignFallback.java | 63 +++ .../basegoodsunit/BaseGoodsUnitFeign.java | 54 +++ .../BaseGoodsUnitFeignFallback.java | 60 +++ .../BaseManufacturerFeign.java | 58 +++ .../BaseManufacturerFeignFallback.java | 64 +++ .../feign/goods/goodsSpu/GoodsSpuFeign.java | 27 -- .../oms/feign/goods/sku/GoodsSkuFeign.java | 31 -- .../sysstaffinfo/SysStaffinfoFeign.java | 4 +- .../supplierbank/SupplierBankFeign.java | 49 +++ .../SupplierBankFeignFallback.java | 46 +++ .../supplierfile/SupplierFileFeign.java | 49 +++ .../SupplierFileFeignFallback.java | 49 +++ .../supplierinfo/SupplierInfoFeign.java | 20 +- .../SupplierInfoFeignFallback.java | 54 +++ .../suppliertype/SupplierTypeFeign.java | 62 +++ .../SupplierTypeFeignFallback.java | 63 +++ .../WarehouseAnsBillFeign.java | 2 +- .../warehousearea/WarehouseAreaFeign.java | 64 +++ .../WarehouseAreaFeignFallback.java | 69 ++++ .../WarehouseAreaTypeFeign.java | 63 +++ .../WarehouseAreaTypeFeignFallback.java | 65 +++ .../warehouseextend/WarehouseExtendFeign.java | 41 ++ .../WarehouseExtendFeignFallback.java | 33 ++ .../warehouseinfo/WarehouseInfoFeign.java | 43 +- .../WarehouseInfoFeignFallback.java | 74 ++++ .../wmswarehouserack/WarehouseRackFeign.java | 67 +++ .../WarehouseRackFeignFallback.java | 71 ++++ oms/src/main/resources/logback-spring.xml | 2 +- 182 files changed, 8400 insertions(+), 104 deletions(-) create mode 100644 oms/src/main/java/com/yxt/oms/apiadmin/aggregation/BaseGoodsBrandRest.java create mode 100644 oms/src/main/java/com/yxt/oms/apiadmin/aggregation/BaseGoodsSpuRest.java create mode 100644 oms/src/main/java/com/yxt/oms/apiadmin/aggregation/BaseGoodsTypeRest.java create mode 100644 oms/src/main/java/com/yxt/oms/apiadmin/aggregation/BaseGoodsUnitRest.java create mode 100644 oms/src/main/java/com/yxt/oms/apiadmin/aggregation/BaseManufacturerRest.java create mode 100644 oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SupplierBankRest.java create mode 100644 oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SupplierFileRest.java create mode 100644 oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SupplierTypeRest.java create mode 100644 oms/src/main/java/com/yxt/oms/apiadmin/aggregation/WarehouseAreaRest.java create mode 100644 oms/src/main/java/com/yxt/oms/apiadmin/aggregation/WarehouseAreaTypeRest.java create mode 100644 oms/src/main/java/com/yxt/oms/apiadmin/aggregation/WarehouseExtendRest.java create mode 100644 oms/src/main/java/com/yxt/oms/apiadmin/aggregation/WarehouseRackRest.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basebrandinfo/BaseBrandInfo.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basebrandinfo/BaseBrandInfoDto.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basebrandinfo/BaseBrandInfoMapper.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basebrandinfo/BaseBrandInfoMapper.xml create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basebrandinfo/BaseBrandInfoQuery.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basebrandinfo/BaseBrandInfoService.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basebrandinfo/BaseBrandInfoVo.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSku.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSkuDetailsVo.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSkuDto.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSkuMapper.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSkuMapper.xml create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSkuPurSelectList.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSkuPurSelectQuery.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSkuQuery.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSkuSelectList.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSkuSelectQuery.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basegoodsskuextend/BaseGoodsSkuExtend.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basegoodsskuextend/BaseGoodsSkuExtendDto.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basegoodsskuextend/BaseGoodsSkuExtendMapper.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basegoodsskuextend/BaseGoodsSkuExtendMapper.xml create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basegoodsskuextend/BaseGoodsSkuExtendQuery.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basegoodsskuextend/BaseGoodsSkuExtendService.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basegoodsspu/BaseGoodsSpu.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basegoodsspu/BaseGoodsSpuDto.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basegoodsspu/BaseGoodsSpuMapper.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basegoodsspu/BaseGoodsSpuMapper.xml create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basegoodsspu/BaseGoodsSpuQuery.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basegoodsspu/BaseGoodsSpuService.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basegoodsspu/BaseGoodsSpuVo.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basegoodsspudetail/BaseGoodsSpuDetail.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basegoodsspudetail/BaseGoodsSpuDetailDto.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basegoodsspudetail/BaseGoodsSpuDetailMapper.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basegoodsspudetail/BaseGoodsSpuDetailMapper.xml create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basegoodsspudetail/BaseGoodsSpuDetailQuery.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basegoodsspudetail/BaseGoodsSpuDetailService.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basegoodsspudetail/BaseGoodsSpuDetailVo.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basegoodstype/BaseGoodsType.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basegoodstype/BaseGoodsTypeDto.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basegoodstype/BaseGoodsTypeMapper.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basegoodstype/BaseGoodsTypeMapper.xml create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basegoodstype/BaseGoodsTypeQuery.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basegoodstype/BaseGoodsTypeService.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basegoodstype/BaseGoodsTypeVo.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basegoodsunit/BaseGoodsUnit.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basegoodsunit/BaseGoodsUnitDto.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basegoodsunit/BaseGoodsUnitMapper.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basegoodsunit/BaseGoodsUnitMapper.xml create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basegoodsunit/BaseGoodsUnitQuery.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basegoodsunit/BaseGoodsUnitService.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basegoodsunit/BaseGoodsUnitVo.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basemanufacturer/BaseManufacturer.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basemanufacturer/BaseManufacturerDto.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basemanufacturer/BaseManufacturerMapper.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basemanufacturer/BaseManufacturerMapper.xml create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basemanufacturer/BaseManufacturerQuery.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basemanufacturer/BaseManufacturerService.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basemanufacturer/BaseManufacturerVo.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/supplierbank/SupplierBank.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/supplierbank/SupplierBankDetailsVo.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/supplierbank/SupplierBankDto.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/supplierbank/SupplierBankMapper.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/supplierbank/SupplierBankMapper.xml create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/supplierbank/SupplierBankQuery.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/supplierbank/SupplierBankService.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/supplierbank/SupplierBankVo.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/supplierfile/SupplierFile.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/supplierfile/SupplierFileDetailsVo.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/supplierfile/SupplierFileDto.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/supplierfile/SupplierFileMapper.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/supplierfile/SupplierFileMapper.xml create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/supplierfile/SupplierFileQuery.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/supplierfile/SupplierFileService.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/supplierfile/SupplierFileVo.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/supplierinfo/SupplierInfoDetailsVo.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/supplierinfo/SupplierInfoDto.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/supplierinfo/SupplierInfoMapper.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/supplierinfo/SupplierInfoMapper.xml create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/supplierinfo/SupplierInfoQuery.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/supplierinfo/SupplierInfoVo.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/suppliertype/SupplierType.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/suppliertype/SupplierTypeDetailsVo.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/suppliertype/SupplierTypeDown.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/suppliertype/SupplierTypeDto.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/suppliertype/SupplierTypeMapper.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/suppliertype/SupplierTypeMapper.xml create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/suppliertype/SupplierTypeQuery.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/suppliertype/SupplierTypeService.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/suppliertype/SupplierTypeVo.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/warehousearea/WarehouseArea.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/warehousearea/WarehouseAreaAllVo.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/warehousearea/WarehouseAreaDto.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/warehousearea/WarehouseAreaMapper.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/warehousearea/WarehouseAreaMapper.xml create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/warehousearea/WarehouseAreaQuery.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/warehousearea/WarehouseAreaService.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/warehousearea/WarehouseAreaVo.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/warehouseareatype/WarehouseAreaType.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/warehouseareatype/WarehouseAreaTypeDto.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/warehouseareatype/WarehouseAreaTypeMapper.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/warehouseareatype/WarehouseAreaTypeMapper.xml create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/warehouseareatype/WarehouseAreaTypeQuery.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/warehouseareatype/WarehouseAreaTypeService.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/warehouseareatype/WarehouseAreaTypeVo.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/warehouseextend/WarehouseExtend.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/warehouseextend/WarehouseExtendDto.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/warehouseextend/WarehouseExtendMapper.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/warehouseextend/WarehouseExtendMapper.xml create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/warehouseextend/WarehouseExtendQuery.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/warehouseextend/WarehouseExtendService.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/warehouseextend/WarehouseExtendVo.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoAllVo.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoDto.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoMapper.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoMapper.xml create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoQuery.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoVo.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/warehouserack/WarehouseRack.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/warehouserack/WarehouseRackDto.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/warehouserack/WarehouseRackMapper.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/warehouserack/WarehouseRackMapper.xml create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/warehouserack/WarehouseRackQuery.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/warehouserack/WarehouseRackService.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/warehouserack/WarehouseRackVo.java create mode 100644 oms/src/main/java/com/yxt/oms/feign/goods/basebrandinfo/BaseBrandInfoFeign.java create mode 100644 oms/src/main/java/com/yxt/oms/feign/goods/basebrandinfo/BaseBrandInfoFeignFallback.java create mode 100644 oms/src/main/java/com/yxt/oms/feign/goods/basegoodssku/BaseGoodsSkuFeignFallback.java create mode 100644 oms/src/main/java/com/yxt/oms/feign/goods/basegoodsspu/BaseGoodsSpuFeign.java create mode 100644 oms/src/main/java/com/yxt/oms/feign/goods/basegoodsspu/BaseGoodsSpuFeignFallback.java create mode 100644 oms/src/main/java/com/yxt/oms/feign/goods/basegoodstype/BaseGoodsTypeFeign.java create mode 100644 oms/src/main/java/com/yxt/oms/feign/goods/basegoodstype/BaseGoodsTypeFeignFallback.java create mode 100644 oms/src/main/java/com/yxt/oms/feign/goods/basegoodsunit/BaseGoodsUnitFeign.java create mode 100644 oms/src/main/java/com/yxt/oms/feign/goods/basegoodsunit/BaseGoodsUnitFeignFallback.java create mode 100644 oms/src/main/java/com/yxt/oms/feign/goods/basemanufacturer/BaseManufacturerFeign.java create mode 100644 oms/src/main/java/com/yxt/oms/feign/goods/basemanufacturer/BaseManufacturerFeignFallback.java delete mode 100644 oms/src/main/java/com/yxt/oms/feign/goods/goodsSpu/GoodsSpuFeign.java delete mode 100644 oms/src/main/java/com/yxt/oms/feign/goods/sku/GoodsSkuFeign.java create mode 100644 oms/src/main/java/com/yxt/oms/feign/supplier/supplierbank/SupplierBankFeign.java create mode 100644 oms/src/main/java/com/yxt/oms/feign/supplier/supplierbank/SupplierBankFeignFallback.java create mode 100644 oms/src/main/java/com/yxt/oms/feign/supplier/supplierfile/SupplierFileFeign.java create mode 100644 oms/src/main/java/com/yxt/oms/feign/supplier/supplierfile/SupplierFileFeignFallback.java create mode 100644 oms/src/main/java/com/yxt/oms/feign/supplier/supplierinfo/SupplierInfoFeignFallback.java create mode 100644 oms/src/main/java/com/yxt/oms/feign/supplier/suppliertype/SupplierTypeFeign.java create mode 100644 oms/src/main/java/com/yxt/oms/feign/supplier/suppliertype/SupplierTypeFeignFallback.java create mode 100644 oms/src/main/java/com/yxt/oms/feign/warehouse/warehousearea/WarehouseAreaFeign.java create mode 100644 oms/src/main/java/com/yxt/oms/feign/warehouse/warehousearea/WarehouseAreaFeignFallback.java create mode 100644 oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseareatype/WarehouseAreaTypeFeign.java create mode 100644 oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseareatype/WarehouseAreaTypeFeignFallback.java create mode 100644 oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseextend/WarehouseExtendFeign.java create mode 100644 oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseextend/WarehouseExtendFeignFallback.java create mode 100644 oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseinfo/WarehouseInfoFeignFallback.java create mode 100644 oms/src/main/java/com/yxt/oms/feign/warehouse/wmswarehouserack/WarehouseRackFeign.java create mode 100644 oms/src/main/java/com/yxt/oms/feign/warehouse/wmswarehouserack/WarehouseRackFeignFallback.java diff --git a/oms/README.md b/oms/README.md index 5d571fd..f810c5b 100644 --- a/oms/README.md +++ b/oms/README.md @@ -1,8 +1,8 @@ -## 商享通WMS项目结构 +## 商享通oms项目结构 ### 一、目录说明 ``` -wms-biz -- 根项目 +oms-biz -- 根项目 ├─ src -- 微服务的基础设施中心 ├─ main ├─ java diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/AdminHomeRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/AdminHomeRest.java index 228831b..2ea8d7b 100644 --- a/oms/src/main/java/com/yxt/oms/apiadmin/AdminHomeRest.java +++ b/oms/src/main/java/com/yxt/oms/apiadmin/AdminHomeRest.java @@ -3,7 +3,7 @@ package com.yxt.oms.apiadmin; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -@RestController("com.yxt.wms.apiadmin.AdminHomeRest") +@RestController("com.yxt.oms.apiadmin.AdminHomeRest") @RequestMapping("/apiadmin/home") public class AdminHomeRest { diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/BaseGoodsBrandRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/BaseGoodsBrandRest.java new file mode 100644 index 0000000..57c8e6e --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/BaseGoodsBrandRest.java @@ -0,0 +1,70 @@ +package com.yxt.oms.apiadmin.aggregation; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.basebrandinfo.*; +import com.yxt.oms.utils.OrgPathQuery; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/2/26 15:49 + */ +@Api(tags = "商品品牌") +@RestController +@RequestMapping("/apiadmin/base/basegoodsbrand") +public class BaseGoodsBrandRest { + + @Autowired + BaseBrandInfoService baseBrandInfoService; + + @ApiOperation("分页列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + return baseBrandInfoService.listPage(pq); + } + + @ApiOperation("查询所有的品牌") + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody OrgPathQuery query) { + return baseBrandInfoService.listAll(query); + } + + @ApiOperation("保存修改") + @PostMapping("/saveOrUpdate") + public ResultBean saveOrUpdate(@RequestBody BaseBrandInfoDto dto) { + return baseBrandInfoService.saveOrUpdate(dto); + } + + @ApiOperation("初始化") + @GetMapping("/initialization/{sid}") + public ResultBean initialization(@PathVariable("sid") String sid) { + return baseBrandInfoService.initialization(sid); + } + + @ApiOperation("删除") + @DeleteMapping("/delete/{sid}") + public ResultBean delete(@PathVariable("sid") String sid) { + return baseBrandInfoService.delete(sid); + } + + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + baseBrandInfoService.delAll(sids); + return rb.success(); + } + + @ApiOperation("更改可用状态") + @GetMapping("/updateIsEnable/{sid}/{isEnable}") + public ResultBean updateIsEnable(@PathVariable("sid") String sid,@PathVariable("isEnable")String isEnable) { + return baseBrandInfoService.updateIsEnable(sid,isEnable); + } +} diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/BaseGoodsSpuRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/BaseGoodsSpuRest.java new file mode 100644 index 0000000..470eb05 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/BaseGoodsSpuRest.java @@ -0,0 +1,84 @@ +package com.yxt.oms.apiadmin.aggregation; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.basegoodsspu.BaseGoodsSpuDto; +import com.yxt.oms.biz.func.basegoodsspu.BaseGoodsSpuQuery; +import com.yxt.oms.biz.func.basegoodsspu.BaseGoodsSpuService; +import com.yxt.oms.biz.func.basegoodsspu.BaseGoodsSpuVo; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +/** + * @author wangpengfei + * @date 2024/4/12 11:20 + */ +@RestController() +@RequestMapping("/apiadmin/base/basegoodsspu") +public class BaseGoodsSpuRest { + + + @Autowired + BaseGoodsSpuService baseGoodsSpuService; + + @ApiOperation("分页列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + return baseGoodsSpuService.listPage(pq); + } + + @ApiOperation("保存修改") + @PostMapping("/saveOrUpdate") + public ResultBean saveOrUpdate(@RequestBody BaseGoodsSpuDto dto) { + return baseGoodsSpuService.saveOrUpdate(dto); + } + // @ApiOperation("保存商品信息及sku") +// @PostMapping("/save") +// public ResultBean save(@RequestBody BaseGoodsSpuDto dto) { +// return baseGoodsSpuService.save(dto); +// } + @ApiOperation("初始化") + @GetMapping("/initialization/{sid}") + public ResultBean initialization(@PathVariable("sid") String sid) { + return baseGoodsSpuService.initialization(sid); + } + + @ApiOperation("删除") + @DeleteMapping("/delete/{sid}") + public ResultBean delete(@PathVariable("sid") String sid) { + return baseGoodsSpuService.delete(sid); + } + + @ApiOperation("批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids) { + return baseGoodsSpuService.delAll(sids); + } + @ApiOperation("更改可用状态") + @GetMapping("/updateIsEnable/{sid}/{isEnable}") + public ResultBean updateIsEnable(@PathVariable("sid") String sid,@PathVariable("isEnable")String isEnable) { + return baseGoodsSpuService.updateIsEnable(sid,isEnable); + } + @ApiOperation("下载模版") + @PostMapping("/download") + public void download(HttpServletRequest request, HttpServletResponse response) { + baseGoodsSpuService.download(request, response); + } + @ApiOperation("导入excel") + @PostMapping("/importExcel") + public ResultBean importExcel(@RequestParam("file")MultipartFile file) throws IOException { + return baseGoodsSpuService.importExcel(file); + } + @ApiOperation("更改可用状态") + @GetMapping("/updateIsEnablebySku/{sid}/{isEnable}") + public ResultBean updateIsEnablebySku(@PathVariable("sid") String sid,@PathVariable("isEnable")String isEnable){ + return baseGoodsSpuService.updateIsEnablebySku(sid,isEnable); + } +} diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/BaseGoodsTypeRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/BaseGoodsTypeRest.java new file mode 100644 index 0000000..8f4acfa --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/BaseGoodsTypeRest.java @@ -0,0 +1,73 @@ +package com.yxt.oms.apiadmin.aggregation; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.basegoodstype.*; +import com.yxt.oms.utils.OrgPathQuery; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/2/26 13:44 + */ +@Api(tags = "商品类型") +@RestController +@RequestMapping("/apiadmin/base/basegoodstype") +public class BaseGoodsTypeRest { + @Autowired + BaseGoodsTypeService baseGoodsTypeService; + + + @ApiOperation("分页列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + return baseGoodsTypeService.listPage(pq); + } + @ApiOperation("查询所有的类别") + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody OrgPathQuery query) { + return baseGoodsTypeService.listAll(query); + } + + @ApiOperation("保存修改") + @PostMapping("/saveOrUpdate") + public ResultBean saveOrUpdate(@RequestBody BaseGoodsTypeDto dto) { + return baseGoodsTypeService.saveOrUpdate(dto); + } + + @ApiOperation("初始化") + @GetMapping("/initialization/{sid}") + public ResultBean initialization(@PathVariable("sid") String sid) { + return baseGoodsTypeService.initialization(sid); + } + + @ApiOperation("删除") + @DeleteMapping("/delete/{sid}") + public ResultBean delete(@PathVariable("sid") String sid) { + return baseGoodsTypeService.delete(sid); + } + + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + baseGoodsTypeService.delAll(sids); + return rb.success(); + } + @ApiOperation("更改可用状态") + @GetMapping("/updateIsEnable/{sid}/{isEnable}") + public ResultBean updateIsEnable(@PathVariable("sid") String sid,@PathVariable("isEnable")String isEnable) { + return baseGoodsTypeService.updateIsEnable(sid,isEnable); + } + @ApiOperation("更改商品是否一品一码") + @GetMapping("/updateIsGoodsID/{sid}/{state}") + public ResultBean updateIsGoodsID(@PathVariable("sid") String sid,@PathVariable("state")String state){ + return baseGoodsTypeService.updateProductCode(sid, state); + } +} diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/BaseGoodsUnitRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/BaseGoodsUnitRest.java new file mode 100644 index 0000000..29542a1 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/BaseGoodsUnitRest.java @@ -0,0 +1,66 @@ +package com.yxt.oms.apiadmin.aggregation; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.basegoodsunit.*; +import com.yxt.oms.utils.OrgPathQuery; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/3/8 9:19 + */ +@Api(tags = "商品类型") +@RestController +@RequestMapping("/apiadmin/base/basegoodsunit") +public class BaseGoodsUnitRest { + @Autowired + BaseGoodsUnitService baseGoodsUnitService; + + + @ApiOperation("分页列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + return baseGoodsUnitService.listPage(pq); + } + @ApiOperation("查询所有的类别") + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody OrgPathQuery query) { + return baseGoodsUnitService.listAll(query); + } + + @ApiOperation("保存修改") + @PostMapping("/saveOrUpdate") + public ResultBean saveOrUpdate(@RequestBody BaseGoodsUnitDto dto) { + return baseGoodsUnitService.saveOrUpdate(dto); + } + + @ApiOperation("初始化") + @GetMapping("/initialization/{sid}") + public ResultBean initialization(@PathVariable("sid") String sid) { + return baseGoodsUnitService.initialization(sid); + } + + @ApiOperation("删除") + @DeleteMapping("/delete/{sid}") + public ResultBean delete(@PathVariable("sid") String sid) { + return baseGoodsUnitService.delete(sid); + } + @ApiOperation("删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids) { + return baseGoodsUnitService.delAll(sids); + } + + @ApiOperation("更改可用状态") + @GetMapping("/updateIsEnable/{sid}/{isEnable}") + public ResultBean updateIsEnable(@PathVariable("sid") String sid,@PathVariable("isEnable")String isEnable) { + return baseGoodsUnitService.updateIsEnable(sid,isEnable); + } +} diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/BaseManufacturerRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/BaseManufacturerRest.java new file mode 100644 index 0000000..19edfc6 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/BaseManufacturerRest.java @@ -0,0 +1,76 @@ +package com.yxt.oms.apiadmin.aggregation; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.basemanufacturer.*; +import com.yxt.oms.utils.OrgPathQuery; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/2/27 13:56 + */ +@Api(tags = "厂家信息") +@RestController +@RequestMapping("/apiadmin/base/basemanufacturer") +public class BaseManufacturerRest { + + @Autowired + BaseManufacturerService baseManufacturerService; + + @ApiOperation("分页列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + return baseManufacturerService.listPage(pq); + } + + @ApiOperation("查询所有的厂家") + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody OrgPathQuery query) { + return baseManufacturerService.listAll(query); + } + + @ApiOperation("保存修改") + @PostMapping("/saveOrUpdate") + public ResultBean saveOrUpdate(@RequestBody BaseManufacturerDto dto) { + return baseManufacturerService.saveOrUpdate(dto); + } + + @ApiOperation("初始化") + @GetMapping("/initialization/{sid}") + public ResultBean initialization(@PathVariable("sid") String sid) { + return baseManufacturerService.initialization(sid); + } + + @ApiOperation("删除") + @DeleteMapping("/delete/{sid}") + public ResultBean delete(@PathVariable("sid") String sid) { + return baseManufacturerService.delete(sid); + } + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + baseManufacturerService.delAll(sids); + return rb.success(); + } + + @ApiOperation("更改可用状态") + @GetMapping("/updateIsEnable/{sid}/{isEnable}") + public ResultBean updateIsEnable(@PathVariable("sid") String sid, @PathVariable("isEnable") String isEnable) { + return baseManufacturerService.updateIsEnable(sid, isEnable); + } + + @ApiOperation("查询分公司下所有的厂家") + @GetMapping("/getAllTypeByUseOrgSid") + public ResultBean> getAllTypeByUseOrgSid(@RequestParam("useOrgSid") String useOrgSid) { + return baseManufacturerService.getAllTypeByUseOrgSid(useOrgSid); + } + +} diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SupplierBankRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SupplierBankRest.java new file mode 100644 index 0000000..e2ddea9 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SupplierBankRest.java @@ -0,0 +1,85 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.apiadmin.aggregation; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.supplierbank.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * Project: yxt-(供应商管理)
+ * File: SupplierBankFeignFallback.java
+ * Class: com.yxt..biz.supplierbank.SupplierBankRest
+ * Description: 供应商开户行信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-18 13:33:13
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "供应商开户行信息") +@RestController +@RequestMapping("/apiadmin/supplierbank") +public class SupplierBankRest { + + @Autowired + private SupplierBankService supplierBankService; + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + return supplierBankService.listPageVo(pq); + } + + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody SupplierBankDto dto){ + ResultBean rb = ResultBean.fireFail(); + supplierBankService.saveOrUpdateDto(dto); + return rb.success(); + } + + @ApiOperation("根据sid批量删除") + @PostMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + supplierBankService.delAll(sids); + return rb.success(); + } + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + return supplierBankService.fetchDetailsVoBySid(sid); + } +} diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SupplierFileRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SupplierFileRest.java new file mode 100644 index 0000000..f3a8079 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SupplierFileRest.java @@ -0,0 +1,85 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.apiadmin.aggregation; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.supplierfile.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * Project: yxt-(仓储基础信息供应商)
+ * File: SupplierFileFeignFallback.java
+ * Class: com.yxt.anrui.as.biz.supplierfile.SupplierFileRest
+ * Description: 供应商附件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-13 16:51:56
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "供应商附件") +@RestController +@RequestMapping("/apiadmin/supplierfile") +public class SupplierFileRest { + + @Autowired + private SupplierFileService supplierFileService; + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + return supplierFileService.listPageVo(pq); + } + + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody SupplierFileDto dto){ + ResultBean rb = ResultBean.fireFail(); + supplierFileService.saveOrUpdateDto(dto); + return rb.success(); + } + + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + supplierFileService.delAll(sids); + return rb.success(); + } + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + return supplierFileService.fetchDetailsVoBySid(sid); + } +} diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SupplierInfoRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SupplierInfoRest.java index a6c2b5e..335fe4b 100644 --- a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SupplierInfoRest.java +++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SupplierInfoRest.java @@ -25,9 +25,10 @@ *********************************************************/ package com.yxt.oms.apiadmin.aggregation; +import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; -import com.yxt.oms.biz.func.supplierinfo.SupplierInfoChoice; -import com.yxt.oms.biz.func.supplierinfo.SupplierInfoService; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.supplierinfo.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -48,4 +49,36 @@ public class SupplierInfoRest { public ResultBean> choiceSupplierInfo(@RequestParam("createOrgSid") String createOrgSid){ return baseSupplierInfoService.choiceSupplierInfo(createOrgSid); } + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + return baseSupplierInfoService.listPageVo(pq); + } + + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody SupplierInfoDto dto){ + return baseSupplierInfoService.saveOrUpdateDto(dto); + } + + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + baseSupplierInfoService.delAll(sids); + return rb.success(); + } + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + return baseSupplierInfoService.fetchDetailsVoBySid(sid); + } + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsByBillSid/{sid}") + public ResultBean fetchDetailsByBillSid(@PathVariable("sid") String sid){ + return baseSupplierInfoService.fetchDetailsByBillSid(sid); + } + } diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SupplierTypeRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SupplierTypeRest.java new file mode 100644 index 0000000..c65011a --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SupplierTypeRest.java @@ -0,0 +1,96 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.apiadmin.aggregation; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.suppliertype.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * Project: yxt-(仓储基础信息供应商)
+ * File: SupplierTypeFeignFallback.java
+ * Class: com.yxt.anrui.as.biz.suppliertype.SupplierTypeRest
+ * Description: 供应商类型.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-13 16:51:56
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "供应商类型") +@RestController +@RequestMapping("/apiadmin/suppliertype") +public class SupplierTypeRest { + + @Autowired + private SupplierTypeService supplierTypeService; + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + return supplierTypeService.listPageVo(pq); + } + + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody SupplierTypeDto dto){ + return supplierTypeService.saveOrUpdateDto(dto); + } + + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + supplierTypeService.delAll(sids); + return rb.success(); + } + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + return supplierTypeService.fetchDetailsVoBySid(sid); + } + + @ApiOperation("获取供应商类型") + @PostMapping("/selSupplierType") + public ResultBean> selSupplierType(@RequestParam("orgPath") String orgPath){ + return supplierTypeService.selSupplierType(orgPath); + } + @ApiOperation("根据SID获取一条记录") + @GetMapping("/checkSaveCode/{supplierTypeCode}/{useOrgSid}") + public ResultBean checkSaveCode(@PathVariable("supplierTypeCode") String supplierTypeCode,@PathVariable("useOrgSid") String useOrgSid){ + return supplierTypeService.checkSaveCode(supplierTypeCode,useOrgSid); + } +} diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysStaffinfoRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysStaffinfoRest.java index 1023b97..4884630 100644 --- a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysStaffinfoRest.java +++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysStaffinfoRest.java @@ -89,9 +89,9 @@ public class SysStaffinfoRest { } @ApiOperation("员工信息编辑初始化及详情") - @GetMapping("/fetchBySid/{sid}") - public ResultBean fetchBySid(@PathVariable("sid") String sid) { - return sysStaffinfoService.selectDetailsBySid(sid); + @GetMapping("/fetchBySid/{sid}/{orgSid}") + public ResultBean fetchBySid(@PathVariable("sid") String sid,@PathVariable("orgSid") String orgSid) { + return sysStaffinfoService.selectDetailsBySid(sid,orgSid); } /** * 获取集团内全部员工姓名 diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/WarehouseAreaRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/WarehouseAreaRest.java new file mode 100644 index 0000000..e015323 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/WarehouseAreaRest.java @@ -0,0 +1,74 @@ +package com.yxt.oms.apiadmin.aggregation; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.warehousearea.*; +import com.yxt.oms.utils.OrgPathQuery; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/2/28 8:53 + */ +@Api(tags = "库区信息") +@RestController +@RequestMapping("/apiadmin/warehousearea") +public class WarehouseAreaRest { + + @Autowired + WarehouseAreaService omsWarehouseAreaService; + + @ApiOperation("分页列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + return omsWarehouseAreaService.listPage(pq); + } + @ApiOperation("查询所有的库区") + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody OrgPathQuery query) { + return omsWarehouseAreaService.getAllType(query); + } + + @ApiOperation("保存修改") + @PostMapping("/saveOrUpdate") + public ResultBean saveOrUpdate(@RequestBody WarehouseAreaDto dto) { + return omsWarehouseAreaService.saveOrUpdate(dto); + } + + @ApiOperation("初始化") + @GetMapping("/initialization/{sid}") + public ResultBean initialization(@PathVariable("sid") String sid) { + return omsWarehouseAreaService.initialization(sid); + } + + @ApiOperation("删除") + @DeleteMapping("/delete/{sid}") + public ResultBean delete(@PathVariable("sid") String sid) { + return omsWarehouseAreaService.delete(sid); + } + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + omsWarehouseAreaService.delAll(sids); + return rb.success(); + } + + @ApiOperation("更改可用状态") + @GetMapping("/updateIsEnable/{sid}/{isEnable}") + public ResultBean updateIsEnable(@PathVariable("sid") String sid,@PathVariable("isEnable")String isEnable) { + return omsWarehouseAreaService.updateIsEnable(sid,isEnable); + } + + @ApiOperation("根据仓库sid查询所有库位") + @GetMapping("/selectAll") + public ResultBean> selectAll(@RequestParam("ckSid") String ckSid){ + return omsWarehouseAreaService.selectAll(ckSid); + } +} diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/WarehouseAreaTypeRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/WarehouseAreaTypeRest.java new file mode 100644 index 0000000..bbbc223 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/WarehouseAreaTypeRest.java @@ -0,0 +1,68 @@ +package com.yxt.oms.apiadmin.aggregation; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.warehouseareatype.*; +import com.yxt.oms.utils.OrgPathQuery; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/3/18 14:57 + */ +@Api(tags = "库区类型信息") +@RestController +@RequestMapping("/apiadmin/warehouseareatype") +public class WarehouseAreaTypeRest { + + @Autowired + WarehouseAreaTypeService WarehouseAreaTypeService; + + @ApiOperation("分页列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + return WarehouseAreaTypeService.listPage(pq); + } + @ApiOperation("查询所有的") + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody OrgPathQuery query) { + return WarehouseAreaTypeService.listAll(query); + } + + @ApiOperation("保存修改") + @PostMapping("/saveOrUpdate") + public ResultBean saveOrUpdate(@RequestBody WarehouseAreaTypeDto dto) { + return WarehouseAreaTypeService.saveOrUpdate(dto); + } + + @ApiOperation("初始化") + @GetMapping("/initialization/{sid}") + public ResultBean initialization(@PathVariable("sid") String sid) { + return WarehouseAreaTypeService.initialization(sid); + } + + @ApiOperation("删除") + @DeleteMapping("/delete/{sid}") + public ResultBean delete(@PathVariable("sid") String sid) { + return WarehouseAreaTypeService.delete(sid); + } + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + WarehouseAreaTypeService.delAll(sids); + return rb.success(); + } + + @ApiOperation("更改可用状态") + @GetMapping("/updateIsEnable/{sid}/{isEnable}") + public ResultBean updateIsEnable(@PathVariable("sid") String sid,@PathVariable("isEnable")String isEnable) { + return WarehouseAreaTypeService.updateIsEnable(sid,isEnable); + } +} diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/WarehouseExtendRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/WarehouseExtendRest.java new file mode 100644 index 0000000..6aa6e8b --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/WarehouseExtendRest.java @@ -0,0 +1,37 @@ +package com.yxt.oms.apiadmin.aggregation; + +import com.yxt.common.core.result.ResultBean; +import com.yxt.oms.biz.func.warehouseextend.WarehouseExtendDto; +import com.yxt.oms.biz.func.warehouseextend.WarehouseExtendService; +import com.yxt.oms.biz.func.warehouseextend.WarehouseExtendVo; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * @author wangpengfei + * @date 2024/3/18 10:52 + */ +public class WarehouseExtendRest { + + @Autowired + WarehouseExtendService omsWarehouseExtendService; + + + @ApiOperation("保存修改") + @PostMapping("/saveOrUpdate") + public ResultBean saveOrUpdate(@RequestBody WarehouseExtendDto dto) { + return omsWarehouseExtendService.saveOrUpdate(dto); + } + + @ApiOperation("初始化") + @GetMapping("/initialization/{sid}") + public ResultBean initialization(@PathVariable("sid") String sid) { + return omsWarehouseExtendService.initialization(sid); + } + + +} diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/WarehouseInfoRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/WarehouseInfoRest.java index e714975..3e3fbe6 100644 --- a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/WarehouseInfoRest.java +++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/WarehouseInfoRest.java @@ -3,9 +3,7 @@ package com.yxt.oms.apiadmin.aggregation; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.oms.biz.func.warehouseinfo.SmsOrderHouseInfo; -import com.yxt.oms.biz.func.warehouseinfo.WarehouseInfo; -import com.yxt.oms.biz.func.warehouseinfo.WarehouseInfoService; +import com.yxt.oms.biz.func.warehouseinfo.*; import com.yxt.oms.utils.OrgPathQuery; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -24,18 +22,62 @@ import java.util.List; public class WarehouseInfoRest { @Autowired - WarehouseInfoService wmsWarehouseService; + WarehouseInfoService warehouseInfoService; @ApiOperation("订单选择仓库") @PostMapping("/getWareHouse") public ResultBean> getWareHouse(@RequestParam("createOrgSid") String createOrgSid) { - return wmsWarehouseService.getWareHouse(createOrgSid); + return warehouseInfoService.getWareHouse(createOrgSid); + } + + + @ApiOperation("分页列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + return warehouseInfoService.listPage(pq); } @ApiOperation("查询所有的仓库") @PostMapping("/listAll") public ResultBean> listAll(@RequestBody OrgPathQuery query) { - return wmsWarehouseService.listAll(query); + return warehouseInfoService.listAll(query); + } + + @ApiOperation("保存修改") + @PostMapping("/saveOrUpdate") + public ResultBean saveOrUpdate(@RequestBody WarehouseInfoDto dto) { + return warehouseInfoService.saveOrUpdate(dto); + } + + @ApiOperation("初始化") + @GetMapping("/initialization/{sid}") + public ResultBean initialization(@PathVariable("sid") String sid) { + return warehouseInfoService.initialization(sid); + } + + @ApiOperation("删除") + @DeleteMapping("/delete/{sid}") + public ResultBean delete(@PathVariable("sid") String sid) { + return warehouseInfoService.delete(sid); + } + + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + warehouseInfoService.delAll(sids); + return rb.success(); + } + @ApiOperation("更改可用状态") + @GetMapping("/updateStatus/{sid}/{state}") + public ResultBean updateIsEnable(@PathVariable("sid") String sid,@PathVariable("state")String state) { + return warehouseInfoService.updateIsEnable(sid,state); + } + + @ApiOperation("查询所有仓库") + @GetMapping("/selectAll") + public ResultBean> selectAll(){ + return warehouseInfoService.selectAll(); } } diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/WarehouseRackRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/WarehouseRackRest.java new file mode 100644 index 0000000..ca6dfbc --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/WarehouseRackRest.java @@ -0,0 +1,76 @@ +package com.yxt.oms.apiadmin.aggregation; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.warehouserack.WarehouseRackDto; +import com.yxt.oms.biz.func.warehouserack.WarehouseRackQuery; +import com.yxt.oms.biz.func.warehouserack.WarehouseRackService; +import com.yxt.oms.biz.func.warehouserack.WarehouseRackVo; +import com.yxt.oms.utils.OrgPathQuery; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/2/28 8:59 + */ +@Api(tags = "货架信息") +@RestController +@RequestMapping("/apiadmin/warehouserack") +public class WarehouseRackRest { + + @Autowired + WarehouseRackService omsWarehouseRackService; + + @ApiOperation("分页列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + return omsWarehouseRackService.listPage(pq); + } + @ApiOperation("查询所有的库区") + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody OrgPathQuery query) { + return omsWarehouseRackService.listAll(query); + } + + @ApiOperation("保存修改") + @PostMapping("/saveOrUpdate") + public ResultBean saveOrUpdate(@RequestBody WarehouseRackDto dto) { + return omsWarehouseRackService.saveOrUpdate(dto); + } + + @ApiOperation("初始化") + @GetMapping("/initialization/{sid}") + public ResultBean initialization(@PathVariable("sid") String sid) { + return omsWarehouseRackService.initialization(sid); + } + + @ApiOperation("删除") + @DeleteMapping("/delete/{sid}") + public ResultBean delete(@PathVariable("sid") String sid) { + return omsWarehouseRackService.delete(sid); + } + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + omsWarehouseRackService.delAll(sids); + return rb.success(); + } + + @ApiOperation("更改可用状态") + @GetMapping("/updateIsEnable/{sid}/{isEnable}") + public ResultBean updateIsEnable(@PathVariable("sid") String sid,@PathVariable("isEnable")String isEnable) { + return omsWarehouseRackService.updateIsEnable(sid,isEnable); + } + @ApiOperation("根据仓库sid查询所有库位") + @GetMapping("/selectAll") + public ResultBean> selectAll(@RequestParam("ckSid") String ckSid){ + return omsWarehouseRackService.selectAll(ckSid); + } +} diff --git a/oms/src/main/java/com/yxt/oms/apiwx/WxHomeRest.java b/oms/src/main/java/com/yxt/oms/apiwx/WxHomeRest.java index 97fdbf3..b776a98 100644 --- a/oms/src/main/java/com/yxt/oms/apiwx/WxHomeRest.java +++ b/oms/src/main/java/com/yxt/oms/apiwx/WxHomeRest.java @@ -3,7 +3,7 @@ package com.yxt.oms.apiwx; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -@RestController("com.yxt.wms.apiwx.WxHomeRest") +@RestController("com.yxt.oms.apiwx.WxHomeRest") @RequestMapping("/apiwx/home") public class WxHomeRest { diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basebrandinfo/BaseBrandInfo.java b/oms/src/main/java/com/yxt/oms/biz/func/basebrandinfo/BaseBrandInfo.java new file mode 100644 index 0000000..95af2f7 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basebrandinfo/BaseBrandInfo.java @@ -0,0 +1,21 @@ +package com.yxt.oms.biz.func.basebrandinfo; + +import com.yxt.common.core.domain.BaseEntity; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/2/26 13:36 + */ +@Data +public class BaseBrandInfo extends BaseEntity { + + private String brandName;//品牌代码 + private String brandCode;//品牌名称 + private String image;//品牌图片url地址 + private String letter;//品牌的首字母大写 + private String useOrgSid;//使用组织sid + private String createOrgSid;//创建组织sid + + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basebrandinfo/BaseBrandInfoDto.java b/oms/src/main/java/com/yxt/oms/biz/func/basebrandinfo/BaseBrandInfoDto.java new file mode 100644 index 0000000..33a372f --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basebrandinfo/BaseBrandInfoDto.java @@ -0,0 +1,29 @@ +package com.yxt.oms.biz.func.basebrandinfo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.dto.Dto; +import lombok.Data; + +import java.util.Date; + +/** + * @author wangpengfei + * @date 2024/2/26 13:38 + */ +@Data +public class BaseBrandInfoDto implements Dto { + private String id; + private String sid; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + private String remarks; + private String isEnable; + private String brandName;//品牌代码 + private String brandCode;//品牌名称 + private String image;//品牌图片url地址 + private String letter;//品牌的首字母大写 + private String useOrgSid;//使用组织sid + private String createOrgSid;//创建组织sid + private String userSid; + private String orgPath; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basebrandinfo/BaseBrandInfoMapper.java b/oms/src/main/java/com/yxt/oms/biz/func/basebrandinfo/BaseBrandInfoMapper.java new file mode 100644 index 0000000..ecfc95f --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basebrandinfo/BaseBrandInfoMapper.java @@ -0,0 +1,18 @@ +package com.yxt.oms.biz.func.basebrandinfo; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * @author wangpengfei + * @date 2024/2/26 13:40 + */ +@Mapper +public interface BaseBrandInfoMapper extends BaseMapper { + + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basebrandinfo/BaseBrandInfoMapper.xml b/oms/src/main/java/com/yxt/oms/biz/func/basebrandinfo/BaseBrandInfoMapper.xml new file mode 100644 index 0000000..0860773 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basebrandinfo/BaseBrandInfoMapper.xml @@ -0,0 +1,15 @@ + + + + + + + + \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basebrandinfo/BaseBrandInfoQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/basebrandinfo/BaseBrandInfoQuery.java new file mode 100644 index 0000000..55ad2b6 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basebrandinfo/BaseBrandInfoQuery.java @@ -0,0 +1,22 @@ +package com.yxt.oms.biz.func.basebrandinfo; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/2/26 13:37 + */ +@Data +public class BaseBrandInfoQuery implements Query { + private String name; + private String orgLevelKey;//权限等级 + @ApiModelProperty("菜单路由") + private String menuUrl; + @ApiModelProperty("组织全路径sid") + private String orgPath; + @ApiModelProperty("用户sid") + private String userSid; + private int index; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basebrandinfo/BaseBrandInfoService.java b/oms/src/main/java/com/yxt/oms/biz/func/basebrandinfo/BaseBrandInfoService.java new file mode 100644 index 0000000..a5fd852 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basebrandinfo/BaseBrandInfoService.java @@ -0,0 +1,82 @@ +package com.yxt.oms.biz.func.basebrandinfo; + +import com.yxt.common.base.config.component.FileUploadComponent; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.commonmethod.CommonMethod; +import com.yxt.oms.biz.func.commonmethod.DataRule; +import com.yxt.oms.feign.goods.basebrandinfo.*; +import com.yxt.oms.utils.OrgPathQuery; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/2/26 13:40 + */ +@Service +public class BaseBrandInfoService extends MybatisBaseService { + @Autowired + private FileUploadComponent fileUploadComponent; + @Autowired + BaseBrandInfoFeign baseBrandInfoFeign; + @Autowired + CommonMethod commonMethod; + + public ResultBean> listPage(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + BaseBrandInfoQuery query=pq.getParams(); + //通用组装方法 根据用户sid、菜单、组织全路径sid 获取组装参数 + DataRule dataRule=commonMethod.dataRule(query.getOrgPath(),query.getMenuUrl(),query.getUserSid()).getData(); + pq.getParams().setOrgLevelKey(dataRule.getDataRuleId()); + pq.getParams().setIndex(dataRule.getIndex()); + ResultBean> w=baseBrandInfoFeign.listPage(pq); + if(!w.getCode().equals("200")){ + return w; + } + PagerVo baseBrandInfoVos=w.getData(); + for (BaseBrandInfoVo baseBrandInfoVo : baseBrandInfoVos.getRecords()) { + baseBrandInfoVo.setImage(fileUploadComponent.getUrlPrefix() + baseBrandInfoVo.getImage()); + } + + return rb.success().success().setData(baseBrandInfoVos); + } + public ResultBean> listAll( OrgPathQuery query) { + return baseBrandInfoFeign.listAll(query); +} + public ResultBean saveOrUpdate(BaseBrandInfoDto dto) { + String urlPrefix = fileUploadComponent.getUrlPrefix(); + String path = dto.getImage().substring(urlPrefix.length()); + dto.setImage(path); + return baseBrandInfoFeign.saveOrUpdate(dto); + } + + public ResultBean initialization(String sid) { + ResultBean w=baseBrandInfoFeign.initialization(sid); + if(!w.getCode().equals("200")){ + return w; + } + BaseBrandInfoVo baseBrandInfoVo=w.getData(); + baseBrandInfoVo.setImage(fileUploadComponent.getUrlPrefix() + baseBrandInfoVo.getImage()); + return baseBrandInfoFeign.initialization(sid); + } + + + + public ResultBean delete(String sid) { + ResultBean rb = ResultBean.fireFail(); + return rb.success().setMsg("成功"); + } + public ResultBean delAll(String[] sids) { + return baseBrandInfoFeign.delBySids(sids); + } + public ResultBean updateIsEnable(String sid,String isEnable) { + ResultBean rb = ResultBean.fireFail(); + return baseBrandInfoFeign.updateIsEnable(sid,isEnable); + } + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basebrandinfo/BaseBrandInfoVo.java b/oms/src/main/java/com/yxt/oms/biz/func/basebrandinfo/BaseBrandInfoVo.java new file mode 100644 index 0000000..dc00d5d --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basebrandinfo/BaseBrandInfoVo.java @@ -0,0 +1,32 @@ +package com.yxt.oms.biz.func.basebrandinfo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +import java.util.Date; + +/** + * @author wangpengfei + * @date 2024/2/26 13:37 + */ +@Data +public class BaseBrandInfoVo implements Vo { + private String id; + private String sid; + private String lockVersion; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date modifyTime; + private String remarks; + private String isEnable; + private String state; + private String isDelete; + private String brandName;//品牌代码 + private String brandCode;//品牌名称 + private String image;//品牌图片url地址 + private String letter;//品牌的首字母大写 + private String useOrgSid;//使用组织sid + private String createOrgSid;//创建组织sid +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSku.java b/oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSku.java new file mode 100644 index 0000000..f91459a --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSku.java @@ -0,0 +1,21 @@ +package com.yxt.oms.biz.func.basegoodssku; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.yxt.common.core.domain.BaseEntity; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/2/26 13:36 + */ +@Data +public class BaseGoodsSku extends BaseEntity { + private String goodsSkuCode;//商品Sku代码 + private String title;//商品标题 + private String goodsSpuSid;//商品基础信息Sid + private String externalCode;//外部编码 + private String indexes;//特有规格属性在spu表中special_spec字段对应每个参数值数组下标的组合，如0_0_0,1_0_0，相当于SKU这条记录的编码。 + @TableField(value = "own_spec") + private String ownSpec;//sku的特有规格参数键值对，json格式，反序列化时请使用linkedHashMap，保证有序 + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSkuDetailsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSkuDetailsVo.java new file mode 100644 index 0000000..47fbeee --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSkuDetailsVo.java @@ -0,0 +1,69 @@ +package com.yxt.oms.biz.func.basegoodssku; + +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/3/19 + **/ +@Data +public class BaseGoodsSkuDetailsVo { + + @ApiModelProperty("商品代码") + private String goodsCode; + @ApiModelProperty("条形码") + private String barCode; + @ApiModelProperty("商品名称") + private String goodsName; + @ApiModelProperty("副标题") + private String subTitle; + @ApiModelProperty("拼音缩写") + private String goodsPY; + @ApiModelProperty("商品简称") + private String goodsShortName; + @ApiModelProperty("商品分类sid") + private String goodsTypeSid; + @ApiModelProperty("品牌sid") + private String brandSid; + @ApiModelProperty("厂家sid") + private String manufacturersid; + @ApiModelProperty("商品单位sid") + private String goodsUnitSid; + @ApiModelProperty("商品单位名称") + private String goodsUnitName; + + @ApiModelProperty("商品Sku代码") + private String goodsSkuCode; + @ApiModelProperty("商品标题") + private String title; + @ApiModelProperty("是否一品一码（goodID），0否，1是") + @JsonProperty("isGoodsID") + private int isGoodsID; + + //================================= + + //商品名称 + //零件号 + //拼音 + //条形码 + //计量单位 + //商品类别 + private String goodsTypeName;//商品类别名称 + //厂家 + //规格 + //品牌 + //车型 + //原厂标志 + //产地 + //锁定售价 + //备注 + //上限数量 + //下限数量 + //积分商品 + //所需积分 + + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSkuDto.java b/oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSkuDto.java new file mode 100644 index 0000000..c7520bb --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSkuDto.java @@ -0,0 +1,31 @@ +package com.yxt.oms.biz.func.basegoodssku; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.dto.Dto; +import com.yxt.oms.biz.func.basegoodsskuextend.BaseGoodsSkuExtendDto; +import lombok.Data; + +import java.util.Date; + +/** + * @author wangpengfei + * @date 2024/2/26 13:38 + */ +@Data +public class BaseGoodsSkuDto implements Dto { + private String id; + private String sid; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + private String remarks; + private String isEnable; + private String goodsSkuCode;//商品Sku代码 + private String title;//商品标题 + private String goodsSpuSid;//商品基础信息Sid + private String externalCode;//外部编码 + private String indexes;//特有规格属性在spu表中special_spec字段对应每个参数值数组下标的组合，如0_0_0,1_0_0，相当于SKU这条记录的编码。 + @TableField(value = "own_spec") + private String ownSpec;//sku的特有规格参数键值对，json格式，反序列化时请使用linkedHashMap，保证有序 + private BaseGoodsSkuExtendDto baseGoodsSkuExtend;//sku扩展 +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSkuMapper.java b/oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSkuMapper.java new file mode 100644 index 0000000..1bd3e84 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSkuMapper.java @@ -0,0 +1,26 @@ +package com.yxt.oms.biz.func.basegoodssku; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/2/26 13:40 + */ +@Mapper +public interface BaseGoodsSkuMapper extends BaseMapper { + + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + List getSkusBySpuSid(@Param("spuSid")String spuSid); + BaseGoodsSkuVo getSkuBySid(@Param("sid")String sid); + + IPage getSelectList(IPage page, @Param(Constants.WRAPPER)QueryWrapper qw); + + IPage purGoodsListPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSkuMapper.xml b/oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSkuMapper.xml new file mode 100644 index 0000000..5008203 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSkuMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSkuPurSelectList.java b/oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSkuPurSelectList.java new file mode 100644 index 0000000..b448b54 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSkuPurSelectList.java @@ -0,0 +1,35 @@ +package com.yxt.oms.biz.func.basegoodssku; + +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/3/21 + **/ +@Data +public class BaseGoodsSkuPurSelectList { + + //sid + private String sid; + //零件号 + private String goodsSkuCode; + //规格 + private String title; + //商品名称 + private String goodsName; + //商品拼音 + private String goodsPY; + //商品简称 + private String goodsShortName; + //商品类别sid + private String goodsTypeSid; + //品牌sid + private String brandSid; + //厂家sid + private String manufacturerSid; + //商品单位名称 + private String goodsUnitName; + //sku特有规格参数键值对 + private String ownSpec; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSkuPurSelectQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSkuPurSelectQuery.java new file mode 100644 index 0000000..b25d043 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSkuPurSelectQuery.java @@ -0,0 +1,30 @@ +package com.yxt.oms.biz.func.basegoodssku; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/3/21 + **/ +@Data +public class BaseGoodsSkuPurSelectQuery implements Query { + + //组织sid + private String orgSid; + //商品名称 + private String goodsName; + //商品类别sid + private String goodsTypeSid; + //商品拼音 + private String goodsPY; + //品牌sid + private String brandSid; + //零件号 + private String goodsSkuCode; + //规格 + private String title; + //其他查询条件 + private String otherQuery; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSkuQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSkuQuery.java new file mode 100644 index 0000000..4f2aeee --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSkuQuery.java @@ -0,0 +1,13 @@ +package com.yxt.oms.biz.func.basegoodssku; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/2/26 13:37 + */ +@Data +public class BaseGoodsSkuQuery implements Query { + private String name; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSkuSelectList.java b/oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSkuSelectList.java new file mode 100644 index 0000000..df14e08 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSkuSelectList.java @@ -0,0 +1,36 @@ +package com.yxt.oms.biz.func.basegoodssku; + +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/3/21 + **/ +@Data +public class BaseGoodsSkuSelectList { + + //商品名称 + private String goodsSpuSid; + private String goodsSpuName; + //商品sid + private String goodsSkuSid; + //商品编码 + private String goodsSkuCode; + //规格/型号 + private String goodsSkuTitle; + //计量单位 + private String goodsUnitSid; + private String goodsUnitName; + //仓库名称 + //货位 + //单位成本（进货价） + //数量 + //税额 + //含税价 + //金额 + //销售价1 + //销售价2 + //操作时间 + //操作人 +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSkuSelectQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSkuSelectQuery.java new file mode 100644 index 0000000..6ecc4e9 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSkuSelectQuery.java @@ -0,0 +1,15 @@ +package com.yxt.oms.biz.func.basegoodssku; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/3/21 + **/ +@Data +public class BaseGoodsSkuSelectQuery implements Query { + + private String goodsSkuCode; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basegoodsskuextend/BaseGoodsSkuExtend.java b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsskuextend/BaseGoodsSkuExtend.java new file mode 100644 index 0000000..eca033b --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsskuextend/BaseGoodsSkuExtend.java @@ -0,0 +1,34 @@ +package com.yxt.oms.biz.func.basegoodsskuextend; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.yxt.common.core.domain.BaseEntity; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/2/26 13:36 + */ +@Data +public class BaseGoodsSkuExtend extends BaseEntity { + private String goodsSkuSid;//商品Sku代码 + private String finalPurchasePrice;//最后采购价 + private String safetyStockDays;//安全库存天数 + private String isOriginalFactory;//是否原厂 + private String isInventoryAlert;//是否库存警戒 + @TableField(value = "InventoryAlertUpperLimit") + private String inventoryAlertUpperLimit;//库存警戒上线 + @TableField(value = "InventoryAlertLowerLimit") + private String inventoryAlertLowerLimit;//库存警戒下线 + private String costPrice;//成本价 + private String tagPrice;//吊牌价 + private String salesPrice;//销售单价 + private String standardPurchasePrice;//标准进价 + private String agencyPrice;//代理价 + private String discount;//折扣 + private String minimumSalesPrice;//最低零售价 + private String isLockingSalesPrice;//是否锁定销售价 + private String isIntegralExchange;//是否可以积分兑换 + private String integralAmount;//积分数量 + private String sortNo;//排序 + private String picUrl;//商品的图片，多个图片以‘,’分割 +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basegoodsskuextend/BaseGoodsSkuExtendDto.java b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsskuextend/BaseGoodsSkuExtendDto.java new file mode 100644 index 0000000..eaf68fb --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsskuextend/BaseGoodsSkuExtendDto.java @@ -0,0 +1,46 @@ +package com.yxt.oms.biz.func.basegoodsskuextend; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.dto.Dto; +import lombok.Data; + +import java.util.Date; +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/2/26 13:38 + */ +@Data +public class BaseGoodsSkuExtendDto implements Dto { + private String id; + private String sid; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + private String remarks; + private String isEnable; + private String goodsSkuSid;//商品Sku代码 + private String finalPurchasePrice;//最后采购价 + private String safetyStockDays;//安全库存天数 + private String isOriginalFactory;//是否原厂 + private String isInventoryAlert;//是否库存警戒 + @TableField(value = "InventoryAlertUpperLimit") + private String inventoryAlertUpperLimit;//库存警戒上线 + @TableField(value = "InventoryAlertLowerLimit") + private String inventoryAlertLowerLimit;//库存警戒下线 + private String costPrice;//成本价 + private String tagPrice;//吊牌价 + private String salesPrice;//销售单价 + private String standardPurchasePrice;//标准进价 + private String agencyPrice;//代理价 + private String discount;//折扣 + private String minimumSalesPrice;//最低零售价 + private String isLockingSalesPrice;//是否锁定销售价 + private String isIntegralExchange;//是否可以积分兑换 + private String integralAmount;//积分数量 + private String sortNo;//排序 + private String picUrl;//商品的图片，多个图片以‘,’分割 +// private String [] Urls={};//图片数组 + private List urls;//图片数组 +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basegoodsskuextend/BaseGoodsSkuExtendMapper.java b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsskuextend/BaseGoodsSkuExtendMapper.java new file mode 100644 index 0000000..882d8d1 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsskuextend/BaseGoodsSkuExtendMapper.java @@ -0,0 +1,20 @@ +package com.yxt.oms.biz.func.basegoodsskuextend; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * @author wangpengfei + * @date 2024/2/26 13:40 + */ +@Mapper +public interface BaseGoodsSkuExtendMapper extends BaseMapper { + + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + BaseGoodsSkuExtendVo getExtendBySkuSid(@Param("skuSid")String skuSid); + BaseGoodsSkuExtendVo getExtendBySid(@Param("sid")String sid); +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basegoodsskuextend/BaseGoodsSkuExtendMapper.xml b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsskuextend/BaseGoodsSkuExtendMapper.xml new file mode 100644 index 0000000..d383208 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsskuextend/BaseGoodsSkuExtendMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basegoodsskuextend/BaseGoodsSkuExtendQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsskuextend/BaseGoodsSkuExtendQuery.java new file mode 100644 index 0000000..b07f733 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsskuextend/BaseGoodsSkuExtendQuery.java @@ -0,0 +1,13 @@ +package com.yxt.oms.biz.func.basegoodsskuextend; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/2/26 13:37 + */ +@Data +public class BaseGoodsSkuExtendQuery implements Query { + private String name; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basegoodsskuextend/BaseGoodsSkuExtendService.java b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsskuextend/BaseGoodsSkuExtendService.java new file mode 100644 index 0000000..f0a1f38 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsskuextend/BaseGoodsSkuExtendService.java @@ -0,0 +1,135 @@ +package com.yxt.oms.biz.func.basegoodsskuextend; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateTime; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.base.config.component.FileUploadComponent; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.base.utils.StringUtils; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Collections; +import java.util.Date; +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/2/26 13:40 + */ +@Service +public class BaseGoodsSkuExtendService extends MybatisBaseService { + @Autowired + private FileUploadComponent fileUploadComponent; +// @Autowired +// private BaseBrandInfoService baseBrandInfoService; +// @Autowired +// private BaseGoodsTypeService baseGoodsTypeService; +// @Autowired +// private BaseManufacturerService baseManufacturerService; +// @Autowired +// BaseGoodsSpuDetailService baseGoodsSpuDetailService; + + public ResultBean> listPage(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + BaseGoodsSkuExtendQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if(StringUtils.isNotBlank(query.getName())){ + qw.like("goodsName",query.getName()); + } + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + List records = pagging.getRecords(); + records.removeAll(Collections.singleton(null)); +// if (!records.isEmpty()) { +// for (BaseGoodsSpuVo record : records) { +// if (StringUtils.isNotBlank(record.getPicUrl())) { +// record.setPicUrl(fileUploadComponent.getUrlPrefix() + record.getPicUrl()); +// } +// } +// } + return rb.success().setData(p); + } + @Transactional + public ResultBean saveOrUpdate(BaseGoodsSkuExtendDto dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = ""; + BaseGoodsSkuExtend extend=baseMapper.selectOne(new QueryWrapper().eq("sid",dto.getSid())); + if (null!=extend) { + sid = dto.getSid(); + BaseGoodsSkuExtend omsGoods = fetchBySid(dto.getSid()); + BeanUtil.copyProperties(dto, omsGoods); + omsGoods.setModifyTime(new Date()); + for (UrlsVo url : dto.getUrls()) { + String urlPrefix = fileUploadComponent.getUrlPrefix(); + String path = url.getUrl().substring(urlPrefix.length()); + if(StringUtils.isBlank(dto.getPicUrl())){ + omsGoods.setPicUrl(path); + }else{ + omsGoods.setPicUrl(omsGoods.getPicUrl()+","+path); + } + } + if (StringUtils.isNotBlank(dto.getPicUrl())) { + String urlPrefix = fileUploadComponent.getUrlPrefix(); + String path = dto.getPicUrl().substring(urlPrefix.length()); + omsGoods.setPicUrl(path); + } + baseMapper.updateById(omsGoods); + + } else { + BaseGoodsSkuExtend omsGoods = new BaseGoodsSkuExtend(); + sid = omsGoods.getSid(); + BeanUtil.copyProperties(dto, omsGoods); + omsGoods.setCreateTime(new DateTime()); + for (UrlsVo url : dto.getUrls()) { + String urlPrefix = fileUploadComponent.getUrlPrefix(); + String path = url.getUrl().substring(urlPrefix.length()); + if(StringUtils.isBlank(dto.getPicUrl())){ + omsGoods.setPicUrl(path); + }else{ + omsGoods.setPicUrl(omsGoods.getPicUrl()+","+path); + } + } + baseMapper.insert(omsGoods); + } + return rb.success().setMsg("成功"); + } + + public ResultBean initialization(String sid) { + ResultBean rb = ResultBean.fireFail(); + BaseGoodsSkuExtendVo vo = baseMapper.getExtendBySid(sid); + return rb.success().setData(vo); + } + + public ResultBean getExtendBySkuSid(String sid) { + ResultBean rb = ResultBean.fireFail(); + BaseGoodsSkuExtendVo vo = baseMapper.getExtendBySkuSid(sid); + return rb.success().setData(vo); + } + + public ResultBean delete(String sid) { + ResultBean rb = ResultBean.fireFail(); + BaseGoodsSkuExtend omsGoods = fetchBySid(sid); + if (null != omsGoods) { + baseMapper.deleteById(omsGoods.getId()); + } + return rb.success(); + } + + public ResultBean updateIsEnable(String sid,String isEnable) { + ResultBean rb = ResultBean.fireFail(); + BaseGoodsSkuExtend omsGoods = fetchBySid(sid); + if (null != omsGoods) { + omsGoods.setIsEnable(Integer.parseInt(isEnable)); + baseMapper.updateById(omsGoods); + } + return rb.success().setMsg("成功"); + } +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basegoodsspu/BaseGoodsSpu.java b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsspu/BaseGoodsSpu.java new file mode 100644 index 0000000..2411eb5 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsspu/BaseGoodsSpu.java @@ -0,0 +1,32 @@ +package com.yxt.oms.biz.func.basegoodsspu; + +import com.yxt.common.core.domain.BaseEntity; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/2/26 13:36 + */ +@Data +public class BaseGoodsSpu extends BaseEntity { + private String goodsCode;//商品代码 + private String barCode;//条形码 + private String goodsName;//商品名称 + private String subTitle;//商品名称 + private String goodsPY;//拼音缩写 + private String goodsShortName;//商品简称 + private String goodsTypeSid;//商品分类sid + private String brandSid;//品牌sid + private String manufacturerSid;//厂家sid + private String goodsUnitSid;//商品单位sid + private String goodsUnitName;//商品单位名称 + private String taxRate;//税率 + private String shelfLife;//保质期天 + private String nationalStandardCode;//国标码 + private String sortNo;//排序 + private String externalCode;//外部编码 + private String factoryCode;//厂家货号 + private String isListed;//是否上架 + private String useOrgSid;//使用组织sid + private String createOrgSid;//创建组织sid +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basegoodsspu/BaseGoodsSpuDto.java b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsspu/BaseGoodsSpuDto.java new file mode 100644 index 0000000..43f891c --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsspu/BaseGoodsSpuDto.java @@ -0,0 +1,49 @@ +package com.yxt.oms.biz.func.basegoodsspu; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.dto.Dto; +import com.yxt.oms.biz.func.basegoodssku.BaseGoodsSkuDto; +import com.yxt.oms.biz.func.basegoodsspudetail.BaseGoodsSpuDetailDto; +import lombok.Data; + +import java.util.Date; +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/2/26 13:38 + */ +@Data +public class BaseGoodsSpuDto implements Dto { + private String id; + private String sid; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + private String remarks; + private String isEnable; + private String goodsCode;//商品代码 + private String barCode;//条形码 + private String goodsName;//商品名称 + private String subTitle;//副标题 + private String goodsPY;//拼音缩写 + private String goodsShortName;//商品简称 + private String goodsTypeSid;//商品分类sid + private String brandSid;//品牌sid + private String manufacturerSid;//厂家sid + private String goodsUnitSid;//商品单位sid + private String goodsUnitName;//商品单位名称 + private String taxRate;//税率 + private String shelfLife;//保质期天 + private String nationalStandardCode;//国标码 + private String sortNo;//排序 + private String externalCode;//外部编码 + private String factoryCode;//厂家货号 + private String isListed;//是否上架 + private String useOrgSid;//使用组织sid + private String createOrgSid;//创建组织sid + private BaseGoodsSpuDetailDto baseGoodsSpuDetail;//商品spu详情 + private List baseGoodsSkus;//商品sku + private String userSid; + private String orgPath; + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basegoodsspu/BaseGoodsSpuMapper.java b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsspu/BaseGoodsSpuMapper.java new file mode 100644 index 0000000..5a8ac33 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsspu/BaseGoodsSpuMapper.java @@ -0,0 +1,19 @@ +package com.yxt.oms.biz.func.basegoodsspu; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * @author wangpengfei + * @date 2024/2/26 13:40 + */ +@Mapper +public interface BaseGoodsSpuMapper extends BaseMapper { + + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + BaseGoodsSpuVo initialization(@Param("sid")String sid); +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basegoodsspu/BaseGoodsSpuMapper.xml b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsspu/BaseGoodsSpuMapper.xml new file mode 100644 index 0000000..af2da16 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsspu/BaseGoodsSpuMapper.xml @@ -0,0 +1,27 @@ + + + + + + + + + \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basegoodsspu/BaseGoodsSpuQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsspu/BaseGoodsSpuQuery.java new file mode 100644 index 0000000..dea9243 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsspu/BaseGoodsSpuQuery.java @@ -0,0 +1,22 @@ +package com.yxt.oms.biz.func.basegoodsspu; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/2/26 13:37 + */ +@Data +public class BaseGoodsSpuQuery implements Query { + private String name; + private String orgLevelKey;//权限等级 + @ApiModelProperty("菜单路由") + private String menuUrl; + @ApiModelProperty("组织全路径sid") + private String orgPath; + @ApiModelProperty("用户sid") + private String userSid; + private int index; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basegoodsspu/BaseGoodsSpuService.java b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsspu/BaseGoodsSpuService.java new file mode 100644 index 0000000..0570410 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsspu/BaseGoodsSpuService.java @@ -0,0 +1,390 @@ +package com.yxt.oms.biz.func.basegoodsspu; + +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.StringUtils; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.basebrandinfo.BaseBrandInfo; +import com.yxt.oms.biz.func.basegoodssku.BaseGoodsSkuDto; +import com.yxt.oms.biz.func.basegoodsskuextend.BaseGoodsSkuExtendDto; +import com.yxt.oms.biz.func.basegoodsspudetail.BaseGoodsSpuDetailDto; +import com.yxt.oms.biz.func.basegoodstype.BaseGoodsType; +import com.yxt.oms.biz.func.basegoodsunit.BaseGoodsUnit; +import com.yxt.oms.biz.func.basemanufacturer.BaseManufacturer; +import com.yxt.oms.biz.func.commonmethod.CommonMethod; +import com.yxt.oms.biz.func.commonmethod.DataRule; +import com.yxt.oms.feign.goods.basebrandinfo.BaseBrandInfoFeign; +import com.yxt.oms.feign.goods.basegoodsspu.*; +import com.yxt.oms.feign.goods.basegoodstype.BaseGoodsTypeFeign; +import com.yxt.oms.feign.goods.basegoodsunit.BaseGoodsUnitFeign; +import com.yxt.oms.feign.goods.basemanufacturer.BaseManufacturerFeign; +import com.yxt.oms.feign.goods.basegoodsspu.BaseGoodsSpuFeign; +import com.yxt.oms.utils.ExcelUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.*; +import java.net.URLEncoder; +import java.util.*; +import java.util.concurrent.ConcurrentHashMap; +import java.util.function.Function; +import java.util.function.Predicate; +import java.util.stream.Collectors; + +/** + * @author wangpengfei + * @date 2024/2/26 13:40 + */ +@Service +public class BaseGoodsSpuService extends MybatisBaseService { + // @Autowired +// private FileUploadComponent fileUploadComponent; + @Autowired + BaseGoodsTypeFeign baseGoodsTypeFeign; + @Autowired + BaseBrandInfoFeign baseBrandInfoFeign; + @Autowired + BaseManufacturerFeign baseManufacturerFeign; + @Autowired + BaseGoodsUnitFeign baseGoodsUnitFeign; + @Value("${image.upload.path:http://127.0.0.1:8080/upload/}") + String path; + @Autowired + BaseGoodsSpuFeign baseGoodsSpuFeign; + @Autowired + CommonMethod commonMethod; + + + public ResultBean> listPage(PagerQuery pq) { + BaseGoodsSpuQuery query=pq.getParams(); + DataRule dataRule=commonMethod.dataRule(query.getOrgPath(),query.getMenuUrl(),query.getUserSid()).getData(); + pq.getParams().setOrgLevelKey(dataRule.getDataRuleId()); + pq.getParams().setIndex(dataRule.getIndex()); + return baseGoodsSpuFeign.listPage(pq); + } + + @Transactional + public ResultBean saveOrUpdate(BaseGoodsSpuDto dto) { + ResultBean rb = ResultBean.fireFail(); + return baseGoodsSpuFeign.saveOrUpdate(dto); + } + + public ResultBean initialization(String sid) { + ResultBean rb = ResultBean.fireFail(); + return baseGoodsSpuFeign.initialization(sid); + } + + + public ResultBean delete(String sid) { + ResultBean rb = ResultBean.fireFail(); + BaseGoodsSpu omsGoods = fetchBySid(sid); + if (null != omsGoods) { + baseMapper.deleteById(omsGoods.getId()); + } + return rb.success(); + } + public ResultBean delAll(String[] sids) { + return baseGoodsSpuFeign.delBySids(sids); + } + + public ResultBean updateIsEnable(String sid, String isEnable) { + ResultBean rb = ResultBean.fireFail(); + return baseGoodsSpuFeign.updateIsEnable(sid, isEnable); + } + + public void download(HttpServletRequest request, HttpServletResponse response) { + + // 指定要下载的文件路径 + String filePath = path + "商品导入模板.xls"; + String fileName = new File(filePath).getName(); + String encodedFileName = null; + try { + encodedFileName = URLEncoder.encode(fileName, "UTF-8"); + } catch (UnsupportedEncodingException e) { + throw new RuntimeException(e); + } + // 设置响应头信息 + response.setHeader("Content-Disposition", "attachment; filename=\"" + encodedFileName + "\""); + // 获取文件名 + response.setContentType("application/octet-stream"); + // 读取文件并将其写入响应输出流 + try (InputStream in = new FileInputStream(filePath); + OutputStream out = response.getOutputStream()) { + byte[] buffer = new byte[4096]; + int bytesRead; + while ((bytesRead = in.read(buffer)) != -1) { + out.write(buffer, 0, bytesRead); + } + } catch (FileNotFoundException e) { + throw new RuntimeException(e); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + public ResultBean importExcel(MultipartFile file) throws IOException { +// return baseGoodsSpuFeign.importExcel(file); + ResultBean rb=new ResultBean().fail(); + //檢查excel + ExcelUtil.checkFile(file); + //解析excel + List list = ExcelUtil.readExcel(file); + if (!list.isEmpty()) { + List tt = new ArrayList(); + List tt1 = new ArrayList(); + for (int i = 0; i < list.size(); i++) { + BaseGoodsSpuDto dto =new BaseGoodsSpuDto(); + String taxRate = StringUtils.isEmpty(list.get(i)[10]) ? null : list.get(i)[10]; + if(StringUtils.isNotBlank(taxRate)){ + if(!taxRate.contains(".")){ + return rb.setMsg("第" + (i + 1) + "行税率格式不正确！"); + } + if(taxRate.length()>4){ + return rb.setMsg("第" + (i + 1) + "行税率长度不正确！"); + } + } + + dto = this.packaging(list.get(i),dto); + if (null == dto) { + return rb.setMsg("导入失败,第" + (i + 1) + "行数据错误！"); + } else { + tt.add(dto); + } + } + tt1=a(tt); + for (BaseGoodsSpuDto baseGoodsSpuDto : tt1) { + String goodsTypeSid = StringUtils.isEmpty(baseGoodsSpuDto.getGoodsTypeSid()) ? null : baseGoodsSpuDto.getGoodsTypeSid(); + if (StringUtils.isNotBlank(goodsTypeSid)) { + BaseGoodsType baseGoodsType = baseGoodsTypeFeign.getTypeByName(goodsTypeSid).getData(); + if (null != baseGoodsType) { + baseGoodsSpuDto.setGoodsTypeSid(baseGoodsType.getSid()); + } else { + return rb.setMsg("商品分类：" + goodsTypeSid + "不存在，请先添加"); + } + } + + String brandSid = StringUtils.isEmpty(baseGoodsSpuDto.getBrandSid()) ? null : baseGoodsSpuDto.getBrandSid(); + if (StringUtils.isNotBlank(brandSid)) { + BaseBrandInfo brand = baseBrandInfoFeign.getBrandByName(brandSid).getData(); + if (null != brand) { + baseGoodsSpuDto.setBrandSid(brand.getSid()); + } else { + return rb.setMsg("商品品牌：" + brandSid + "不存在，请先添加"); + } + } + + String manufacturerSid = StringUtils.isEmpty(baseGoodsSpuDto.getManufacturerSid()) ? null : baseGoodsSpuDto.getManufacturerSid(); + if (StringUtils.isNotBlank(manufacturerSid)) { + BaseManufacturer baseManufacturer = baseManufacturerFeign.getManufacturerByName(manufacturerSid).getData(); + if (null != baseManufacturer) { + baseGoodsSpuDto.setManufacturerSid(baseManufacturer.getSid()); + } else { + return rb.setMsg("商品厂家：" + manufacturerSid + "不存在，请先添加"); + } + } + + String goodsUnitSid = StringUtils.isEmpty(baseGoodsSpuDto.getGoodsUnitName()) ? null : baseGoodsSpuDto.getGoodsUnitName(); + if (StringUtils.isNotBlank(goodsUnitSid)) { + BaseGoodsUnit baseGoodsUnit = baseGoodsUnitFeign.getUnitByName(goodsUnitSid).getData(); + if (null != baseGoodsUnit) { + baseGoodsSpuDto.setGoodsUnitSid(baseGoodsUnit.getSid()); + } else { + return rb.setMsg("商品单位：" + goodsUnitSid + "不存在，请先添加"); + } + } + } + baseGoodsSpuFeign.batchSave(tt1); + return rb.success().setMsg("导入成功"); + + } else { + return rb.setMsg("导入文件没有有效数据"); + } + } + + public List a(List dtos) { + ResultBean rb=new ResultBean().fail(); + List spus = new ArrayList<>();//spu list + int goodsCode =dtos.stream().filter(b->StringUtils.isEmpty(b.getGoodsCode())).collect(Collectors.toList()).size(); + if(goodsCode==0){ + spus = dtos.stream().filter(distinctByKey(BaseGoodsSpuDto::getGoodsCode)).collect(Collectors.toList()); + }else{ + spus = dtos.stream().filter(distinctByKey(BaseGoodsSpuDto::getGoodsName)).collect(Collectors.toList()); + } + for (BaseGoodsSpuDto baseGoodsSpuDto : spus) { + BaseGoodsSpuDetailDto spuDetail = new BaseGoodsSpuDetailDto(); + List skus = new ArrayList<>(); + String sid = UUID.randomUUID().toString(); + baseGoodsSpuDto.setSid(sid); + List dtos1=new ArrayList<>(); + if(goodsCode==0){ + dtos1 = dtos.stream().filter(d -> d.getGoodsCode().equals(baseGoodsSpuDto.getGoodsCode())).collect(Collectors.toList()); + }else{ + dtos1 = dtos.stream().filter(d -> d.getGoodsName().equals(baseGoodsSpuDto.getGoodsName())).collect(Collectors.toList()); + } + spuDetail.setGoodsExplain(dtos1.get(0).getBaseGoodsSpuDetail().getGoodsExplain()); + spuDetail.setGoodsDescription(dtos1.get(0).getBaseGoodsSpuDetail().getGoodsDescription()); + spuDetail.setSid(UUID.randomUUID().toString()); + spuDetail.setGoodSpuSid(baseGoodsSpuDto.getSid()); + for (BaseGoodsSpuDto dto : dtos1) { + BaseGoodsSkuDto sku = new BaseGoodsSkuDto(); + String skuSid = UUID.randomUUID().toString(); + sku.setGoodsSkuCode(dto.getBaseGoodsSkus().get(0).getGoodsSkuCode()); + sku.setTitle(dto.getBaseGoodsSkus().get(0).getTitle()); + sku.setExternalCode(dto.getBaseGoodsSkus().get(0).getExternalCode()); + sku.setGoodsSpuSid(sid); + sku.setSid(skuSid); + BaseGoodsSkuExtendDto skuExtend = new BaseGoodsSkuExtendDto(); + skuExtend.setSid(UUID.randomUUID().toString()); + skuExtend.setGoodsSkuSid(skuSid); + skuExtend.setSortNo("1"); + skuExtend.setFinalPurchasePrice(dto.getBaseGoodsSkus().get(0).getBaseGoodsSkuExtend().getFinalPurchasePrice()); + skuExtend.setSafetyStockDays(dto.getBaseGoodsSkus().get(0).getBaseGoodsSkuExtend().getSafetyStockDays()); + skuExtend.setIsOriginalFactory(dto.getBaseGoodsSkus().get(0).getBaseGoodsSkuExtend().getIsOriginalFactory()); + skuExtend.setIsInventoryAlert(dto.getBaseGoodsSkus().get(0).getBaseGoodsSkuExtend().getIsInventoryAlert()); + skuExtend.setInventoryAlertUpperLimit(dto.getBaseGoodsSkus().get(0).getBaseGoodsSkuExtend().getInventoryAlertUpperLimit()); + skuExtend.setInventoryAlertLowerLimit(dto.getBaseGoodsSkus().get(0).getBaseGoodsSkuExtend().getInventoryAlertLowerLimit()); + skuExtend.setCostPrice(dto.getBaseGoodsSkus().get(0).getBaseGoodsSkuExtend().getCostPrice()); + skuExtend.setTagPrice(dto.getBaseGoodsSkus().get(0).getBaseGoodsSkuExtend().getTagPrice()); + skuExtend.setSalesPrice(dto.getBaseGoodsSkus().get(0).getBaseGoodsSkuExtend().getSalesPrice()); + skuExtend.setStandardPurchasePrice(dto.getBaseGoodsSkus().get(0).getBaseGoodsSkuExtend().getStandardPurchasePrice()); + skuExtend.setAgencyPrice(dto.getBaseGoodsSkus().get(0).getBaseGoodsSkuExtend().getAgencyPrice()); + skuExtend.setDiscount(dto.getBaseGoodsSkus().get(0).getBaseGoodsSkuExtend().getDiscount()); + skuExtend.setMinimumSalesPrice(dto.getBaseGoodsSkus().get(0).getBaseGoodsSkuExtend().getMinimumSalesPrice()); + skuExtend.setIsLockingSalesPrice(dto.getBaseGoodsSkus().get(0).getBaseGoodsSkuExtend().getIsLockingSalesPrice()); + skuExtend.setIsIntegralExchange(dto.getBaseGoodsSkus().get(0).getBaseGoodsSkuExtend().getIsIntegralExchange()); + skuExtend.setIntegralAmount(dto.getBaseGoodsSkus().get(0).getBaseGoodsSkuExtend().getIntegralAmount()); + sku.setBaseGoodsSkuExtend(skuExtend); + skus.add(sku); + } + baseGoodsSpuDto.setBaseGoodsSkus(skus); + baseGoodsSpuDto.setBaseGoodsSpuDetail(spuDetail); + } + return spus; + } + + private static Predicate distinctByKey(Function keyExtractor) { + Set seen = ConcurrentHashMap.newKeySet(); + return t -> seen.add(keyExtractor.apply(t)); + } + + private BaseGoodsSpuDto packaging(String[] arr, BaseGoodsSpuDto baseGoodsSpuDto) { + Map result = new HashMap<>(); + //0四电名称1四电类别2规格3数量4单价5总价6单位7备注 +// BaseGoodsSpuDto baseGoodsSpuDto =null; + try { + String goodsCode = StringUtils.isEmpty(arr[0]) ? "" : arr[0];// + String barCode = StringUtils.isEmpty(arr[1]) ? "" : arr[1];// + String goodsName = StringUtils.isEmpty(arr[2]) ? "" : arr[2];// + String subTitle = StringUtils.isEmpty(arr[3]) ? "" : arr[3]; + String goodsPY = StringUtils.isEmpty(arr[4]) ? "": arr[4]; + String goodsShortName = StringUtils.isEmpty(arr[5]) ? "" :arr[5]; + String goodsTypeSid = StringUtils.isEmpty(arr[6]) ? "" : arr[6]; + String brandSid = StringUtils.isEmpty(arr[7]) ? "" : arr[7]; + String manufacturerSid = StringUtils.isEmpty(arr[8]) ? "" : arr[8]; +// String goodsUnitSid = StringUtils.isEmpty(arr[9]) ? null : arr[9]; + String goodsUnitName = StringUtils.isEmpty(arr[9]) ? "" : arr[9]; + String taxRate = StringUtils.isEmpty(arr[10]) ? "0" : arr[10]; + String shelfLife = StringUtils.isEmpty(arr[11]) ? "0" : arr[11]; + String nationalStandardCode = StringUtils.isEmpty(arr[12]) ? "" : arr[12]; + String externalCode = StringUtils.isEmpty(arr[13]) ? "" : arr[13]; + String factoryCode = StringUtils.isEmpty(arr[14]) ? "" : arr[14]; + String isListed = (StringUtils.isEmpty(arr[15]) ? "1" : arr[15].equals("是")? "1":"2"); + String useOrgSid = StringUtils.isEmpty(arr[16]) ? "" : arr[16]; + String createOrgSid = StringUtils.isEmpty(arr[17]) ? "" : arr[17]; + +// String goodSpuSid = StringUtils.isEmpty(arr[19]) ? null : arr[19]; + String goodsExplain = StringUtils.isEmpty(arr[18]) ? "" : arr[18]; + String goodsDescription = StringUtils.isEmpty(arr[19]) ? "" : arr[19]; + + String goodsSkuSid = ""; + String goodsSkuCode = StringUtils.isEmpty(arr[20]) ? "" : arr[20]; + String title = StringUtils.isEmpty(arr[21]) ? "" : arr[21]; + String skuExternalCode = StringUtils.isEmpty(arr[22]) ? "" : arr[22]; + + String finalPurchasePrice = StringUtils.isEmpty(arr[23]) ? "" : arr[23]; + String safetyStockDays = StringUtils.isEmpty(arr[24]) ? "" : arr[24]; + String isOriginalFactory = (StringUtils.isEmpty(arr[25]) ? "1" : arr[25].equals("是")? "1":"2"); + String isInventoryAlert = (StringUtils.isEmpty(arr[26]) ? "1" : arr[26].equals("是")? "1":"2"); + String inventoryAlertUpperLimit = StringUtils.isEmpty(arr[27]) ? "0" : arr[27]; + String inventoryAlertLowerLimit = StringUtils.isEmpty(arr[28]) ? "0" : arr[28]; + String costPrice = StringUtils.isEmpty(arr[29]) ? "0" : arr[29]; + String tagPrice = StringUtils.isEmpty(arr[30]) ? "0" : arr[30]; + String salesPrice = StringUtils.isEmpty(arr[31]) ? "0" : arr[31]; + String standardPurchasePrice = StringUtils.isEmpty(arr[32]) ? "0" : arr[32]; + String agencyPrice = StringUtils.isEmpty(arr[33]) ? "0" : arr[33]; + String discount = StringUtils.isEmpty(arr[34]) ? "0" : arr[34]; + String minimumSalesPrice = StringUtils.isEmpty(arr[35]) ? "0" : arr[35]; + String isLockingSalesPrice = (StringUtils.isEmpty(arr[36]) ? "1" : arr[36].equals("是")? "1":"2"); + String isIntegralExchange = (StringUtils.isEmpty(arr[37]) ? "1" : arr[37].equals("是")? "1":"2"); + String integralAmount = StringUtils.isEmpty(arr[38]) ? "0" : arr[38]; + + //excel表中物资类别保存的是分类编号，插入数据库时 根据分类编号查询基础数据中 物资类别表的id + + baseGoodsSpuDto.setSortNo("1"); + baseGoodsSpuDto.setGoodsCode(goodsCode); + baseGoodsSpuDto.setBarCode(barCode);//物资类别 保存物资类别表id + baseGoodsSpuDto.setGoodsName(goodsName); + baseGoodsSpuDto.setSubTitle(subTitle); + baseGoodsSpuDto.setGoodsPY(goodsPY); + baseGoodsSpuDto.setGoodsShortName(goodsShortName); + + baseGoodsSpuDto.setGoodsTypeSid(goodsTypeSid); + baseGoodsSpuDto.setBrandSid(brandSid); + baseGoodsSpuDto.setManufacturerSid(manufacturerSid); +// baseGoodsSpuDto.setGoodsUnitSid(goodsUnitSid); + baseGoodsSpuDto.setGoodsUnitName(goodsUnitName); + baseGoodsSpuDto.setTaxRate(taxRate); + baseGoodsSpuDto.setShelfLife(shelfLife); + baseGoodsSpuDto.setNationalStandardCode(nationalStandardCode); + baseGoodsSpuDto.setExternalCode(externalCode); + baseGoodsSpuDto.setFactoryCode(factoryCode); + baseGoodsSpuDto.setIsListed(isListed); + baseGoodsSpuDto.setUseOrgSid(useOrgSid); + baseGoodsSpuDto.setCreateOrgSid(createOrgSid); + BaseGoodsSpuDetailDto dto=new BaseGoodsSpuDetailDto(); + dto.setGoodsExplain(goodsExplain); + dto.setGoodsDescription(goodsDescription); + baseGoodsSpuDto.setBaseGoodsSpuDetail(dto); + List dtos=new ArrayList<>(); + BaseGoodsSkuDto dto1=new BaseGoodsSkuDto(); + dto1.setGoodsSkuCode(goodsSkuCode); + dto1.setTitle(title); + dto1.setExternalCode(skuExternalCode); + BaseGoodsSkuExtendDto dto2=new BaseGoodsSkuExtendDto(); + dto2.setSortNo("1"); + dto2.setFinalPurchasePrice(finalPurchasePrice); + dto2.setSafetyStockDays(safetyStockDays); + dto2.setIsOriginalFactory(isOriginalFactory); + dto2.setIsInventoryAlert(isInventoryAlert); + dto2.setInventoryAlertUpperLimit(inventoryAlertUpperLimit); + dto2.setInventoryAlertLowerLimit(inventoryAlertLowerLimit); + dto2.setCostPrice(costPrice); + dto2.setTagPrice(tagPrice); + dto2.setSalesPrice(salesPrice); + dto2.setStandardPurchasePrice(standardPurchasePrice); + dto2.setAgencyPrice(agencyPrice); + dto2.setDiscount(discount); + dto2.setMinimumSalesPrice(minimumSalesPrice); + dto2.setIsLockingSalesPrice(isLockingSalesPrice); + dto2.setIsIntegralExchange(isIntegralExchange); + dto2.setIntegralAmount(integralAmount); + dto1.setBaseGoodsSkuExtend(dto2); + dtos.add(dto1); + baseGoodsSpuDto.setBaseGoodsSkus(dtos); + + } catch (Exception e) { + e.printStackTrace(); + return null; + } + return baseGoodsSpuDto; + } + public ResultBean updateIsEnablebySku(String sid, String isEnable) { + return baseGoodsSpuFeign.updateIsEnablebySku(sid,isEnable); + } +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basegoodsspu/BaseGoodsSpuVo.java b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsspu/BaseGoodsSpuVo.java new file mode 100644 index 0000000..793c818 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsspu/BaseGoodsSpuVo.java @@ -0,0 +1,54 @@ +package com.yxt.oms.biz.func.basegoodsspu; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import com.yxt.oms.biz.func.basegoodssku.BaseGoodsSkuVo; +import com.yxt.oms.biz.func.basegoodsspudetail.BaseGoodsSpuDetailVo; +import lombok.Data; + +import java.util.Date; +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/2/26 13:37 + */ +@Data +public class BaseGoodsSpuVo implements Vo { + private String id; + private String sid; + private String lockVersion; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date modifyTime; + private String remarks; + private String isEnable; + private String state; + private String isDelete; + private String goodsCode;//商品代码 + private String barCode;//条形码 + private String goodsName;//商品名称 + private String subTitle;//商品名称 + private String goodsPY;//拼音缩写 + private String goodsShortName;//商品简称 + private String goodsTypeSid;//商品分类sid + private String brandSid;//品牌sid + private String manufacturerSid;//厂家sid + private String goodsUnitSid;//商品单位sid + private String goodsUnitName;//商品单位名称 + private String taxRate;//税率 + private String shelfLife;//保质期天 + private String nationalStandardCode;//国标码 + private String sortNo;//排序 + private String externalCode;//外部编码 + private String factoryCode;//厂家货号 + private String isListed;//是否上架 + private String useOrgSid;//使用组织sid + private String createOrgSid;//创建组织sid + private BaseGoodsSpuDetailVo baseGoodsSpuDetail; + private List baseGoodsSkus; + private String brandName; + private String manufacturerName; + private String typeName; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basegoodsspudetail/BaseGoodsSpuDetail.java b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsspudetail/BaseGoodsSpuDetail.java new file mode 100644 index 0000000..69743c0 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsspudetail/BaseGoodsSpuDetail.java @@ -0,0 +1,20 @@ +package com.yxt.oms.biz.func.basegoodsspudetail; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.yxt.common.core.domain.BaseEntity; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/2/26 13:36 + */ +@Data +public class BaseGoodsSpuDetail extends BaseEntity { + private String goodSpuSid;//商品基础信息Sid + private String goodsExplain;//商品详细说明 + private String goodsDescription;//商品描述 + @TableField(value = "generic_spec") + private String genericSpec;//通用规格参数及数据，json格式（规格参数id,规格参数值的键值对） + @TableField(value = "special_spec") + private String specialSpec;//特有规格参数及可选值信息，json格式（特有规格参数id,[可选参数值]） +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basegoodsspudetail/BaseGoodsSpuDetailDto.java b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsspudetail/BaseGoodsSpuDetailDto.java new file mode 100644 index 0000000..a553621 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsspudetail/BaseGoodsSpuDetailDto.java @@ -0,0 +1,29 @@ +package com.yxt.oms.biz.func.basegoodsspudetail; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.dto.Dto; +import lombok.Data; + +import java.util.Date; + +/** + * @author wangpengfei + * @date 2024/2/26 13:38 + */ +@Data +public class BaseGoodsSpuDetailDto implements Dto { + private String id; + private String sid; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + private String remarks; + private String isEnable; + private String goodSpuSid;//商品基础信息Sid + private String goodsExplain;//商品详细说明 + private String goodsDescription;//商品描述 + @TableField(value = "generic_spec") + private String genericSpec;//通用规格参数及数据，json格式（规格参数id,规格参数值的键值对） + @TableField(value = "special_spec") + private String specialSpec;//特有规格参数及可选值信息，json格式（特有规格参数id,[可选参数值]） +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basegoodsspudetail/BaseGoodsSpuDetailMapper.java b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsspudetail/BaseGoodsSpuDetailMapper.java new file mode 100644 index 0000000..0c9a0c5 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsspudetail/BaseGoodsSpuDetailMapper.java @@ -0,0 +1,20 @@ +package com.yxt.oms.biz.func.basegoodsspudetail; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * @author wangpengfei + * @date 2024/2/26 13:40 + */ +@Mapper +public interface BaseGoodsSpuDetailMapper extends BaseMapper { + + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + BaseGoodsSpuDetailVo getSpuDetailsBySpuSid (@Param("skuSid")String skuSid); +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basegoodsspudetail/BaseGoodsSpuDetailMapper.xml b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsspudetail/BaseGoodsSpuDetailMapper.xml new file mode 100644 index 0000000..09c2ecd --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsspudetail/BaseGoodsSpuDetailMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basegoodsspudetail/BaseGoodsSpuDetailQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsspudetail/BaseGoodsSpuDetailQuery.java new file mode 100644 index 0000000..8f7fb07 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsspudetail/BaseGoodsSpuDetailQuery.java @@ -0,0 +1,13 @@ +package com.yxt.oms.biz.func.basegoodsspudetail; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/2/26 13:37 + */ +@Data +public class BaseGoodsSpuDetailQuery implements Query { + private String name; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basegoodsspudetail/BaseGoodsSpuDetailService.java b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsspudetail/BaseGoodsSpuDetailService.java new file mode 100644 index 0000000..79b12a4 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsspudetail/BaseGoodsSpuDetailService.java @@ -0,0 +1,102 @@ +package com.yxt.oms.biz.func.basegoodsspudetail; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateTime; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.base.config.component.FileUploadComponent; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.base.utils.StringUtils; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.text.SimpleDateFormat; +import java.util.Date; + +/** + * @author wangpengfei + * @date 2024/2/26 13:40 + */ +@Service +public class BaseGoodsSpuDetailService extends MybatisBaseService { + @Autowired + private FileUploadComponent fileUploadComponent; +// @Autowired +// private BaseBrandInfoService baseBrandInfoService; +// @Autowired +// private BaseGoodsTypeService baseGoodsTypeService; +// @Autowired +// private BaseManufacturerService omsManufacturerService; + public ResultBean> listPage(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + BaseGoodsSpuDetailQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if(StringUtils.isNotBlank(query.getName())){ + qw.like("goodsName",query.getName()); + } + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return rb.success().setData(p); + } + + public ResultBean saveOrUpdate(BaseGoodsSpuDetailDto dto) { + ResultBean rb = ResultBean.fireFail(); + BaseGoodsSpuDetail detail=baseMapper.selectOne(new QueryWrapper().eq("sid",dto.getSid())); + String sid = ""; + if (null!=detail) { + sid = dto.getSid(); + BaseGoodsSpuDetail baseGoodsSpuDetail = fetchBySid(dto.getSid()); + BeanUtil.copyProperties(dto, baseGoodsSpuDetail); + baseGoodsSpuDetail.setModifyTime(new Date()); + baseMapper.updateById(baseGoodsSpuDetail); + } else { + + BaseGoodsSpuDetail baseGoodsSpuDetail = new BaseGoodsSpuDetail(); + sid = baseGoodsSpuDetail.getSid(); + BeanUtil.copyProperties(dto, baseGoodsSpuDetail); + baseGoodsSpuDetail.setCreateTime(new DateTime()); + + baseMapper.insert(baseGoodsSpuDetail); + } + return rb.success().setMsg("成功"); + } + + public ResultBean initialization(String sid) { + ResultBean rb = ResultBean.fireFail(); + BaseGoodsSpuDetailVo vo = new BaseGoodsSpuDetailVo(); + BaseGoodsSpuDetail omsGoods = fetchBySid(sid); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + BeanUtil.copyProperties(omsGoods, vo); + return rb.success().setData(vo); + } + public ResultBean getSpuDetailsBySpuSid(String sid) { + ResultBean rb = ResultBean.fireFail(); + BaseGoodsSpuDetailVo vo = baseMapper.getSpuDetailsBySpuSid(sid); + return rb.success().setData(vo); + } + + + public ResultBean delete(String sid) { + ResultBean rb = ResultBean.fireFail(); + BaseGoodsSpuDetail omsGoods = fetchBySid(sid); + if (null != omsGoods) { + baseMapper.deleteById(omsGoods.getId()); + } + return rb.success(); + } + + public ResultBean updateIsEnable(String sid,String isEnable) { + ResultBean rb = ResultBean.fireFail(); + BaseGoodsSpuDetail omsGoods = fetchBySid(sid); + if (null != omsGoods) { + omsGoods.setIsEnable(Integer.parseInt(isEnable)); + baseMapper.updateById(omsGoods); + } + return rb.success().setMsg("成功"); + } +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basegoodsspudetail/BaseGoodsSpuDetailVo.java b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsspudetail/BaseGoodsSpuDetailVo.java new file mode 100644 index 0000000..724449e --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsspudetail/BaseGoodsSpuDetailVo.java @@ -0,0 +1,35 @@ +package com.yxt.oms.biz.func.basegoodsspudetail; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +import java.util.Date; + +/** + * @author wangpengfei + * @date 2024/2/26 13:37 + */ +@Data +public class BaseGoodsSpuDetailVo implements Vo { + private String id; + private String sid; + private String lockVersion; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date modifyTime; + private String remarks; + private String isEnable; + private String state; + private String isDelete; + private String goodSpuSid;//商品基础信息Sid + private String goodsExplain;//商品详细说明 + private String goodsDescription;//商品描述 + @TableField(value = "generic_spec") + private String genericSpec;//通用规格参数及数据，json格式（规格参数id,规格参数值的键值对） + @TableField(value = "special_spec") + private String specialSpec;//特有规格参数及可选值信息，json格式（特有规格参数id,[可选参数值]） + private String goodsName; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basegoodstype/BaseGoodsType.java b/oms/src/main/java/com/yxt/oms/biz/func/basegoodstype/BaseGoodsType.java new file mode 100644 index 0000000..1aeac9c --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basegoodstype/BaseGoodsType.java @@ -0,0 +1,23 @@ +package com.yxt.oms.biz.func.basegoodstype; + +import com.yxt.common.core.domain.BaseEntity; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/2/26 13:36 + */ +@Data +public class BaseGoodsType extends BaseEntity { + private String goodsTypeName;//商品类别名称 + private String goodsTypeCode;//类别编码 + private String percentageRate;//提成比例 + private String percentageAmount;//提成金额 + private String pSid;//父级sid + private String isParent;//是否为父节点，0为否，1为是，0标识为叶子节点 + private String isGoodsID="1";//是否一品一码 0 否 1是 + private String sortNo;//排序 + private String useOrgSid;//使用组织sid + private String createOrgSid;//创建组织sid + private String outStockRule;//出库规则 +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basegoodstype/BaseGoodsTypeDto.java b/oms/src/main/java/com/yxt/oms/biz/func/basegoodstype/BaseGoodsTypeDto.java new file mode 100644 index 0000000..07ca2f5 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basegoodstype/BaseGoodsTypeDto.java @@ -0,0 +1,37 @@ +package com.yxt.oms.biz.func.basegoodstype; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.dto.Dto; +import lombok.Data; + +import java.util.Date; + +/** + * @author wangpengfei + * @date 2024/2/26 13:38 + */ +@Data +public class BaseGoodsTypeDto implements Dto { + private String id; + private String sid; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + private String remarks; + private String isEnable; + private String goodsTypeName;//商品类别名称 + private String goodsTypeCode;//类别编码 + private String percentageRate;//提成比例 + private String percentageAmount;//提成金额 + private String pSid;//父级sid + private String isParent;//是否为父节点，0为否，1为是，0标识为叶子节点 + private String isGoodsID;//是否一品一码 0 否 1是 + private String sortNo;//排序 + private String useOrgSid;//使用组织sid + private String createOrgSid;//创建组织sid + private String pName;//创建组织sid + private String sids;//父级sid + private String outStockRule;//出库规则 + private String userSid; + private String orgPath; + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basegoodstype/BaseGoodsTypeMapper.java b/oms/src/main/java/com/yxt/oms/biz/func/basegoodstype/BaseGoodsTypeMapper.java new file mode 100644 index 0000000..dfdeab0 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basegoodstype/BaseGoodsTypeMapper.java @@ -0,0 +1,17 @@ +package com.yxt.oms.biz.func.basegoodstype; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * @author wangpengfei + * @date 2024/2/26 13:40 + */ +@Mapper +public interface BaseGoodsTypeMapper extends BaseMapper { + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basegoodstype/BaseGoodsTypeMapper.xml b/oms/src/main/java/com/yxt/oms/biz/func/basegoodstype/BaseGoodsTypeMapper.xml new file mode 100644 index 0000000..84a81c2 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basegoodstype/BaseGoodsTypeMapper.xml @@ -0,0 +1,15 @@ + + + + + + + + \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basegoodstype/BaseGoodsTypeQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/basegoodstype/BaseGoodsTypeQuery.java new file mode 100644 index 0000000..e0ce0e2 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basegoodstype/BaseGoodsTypeQuery.java @@ -0,0 +1,25 @@ +package com.yxt.oms.biz.func.basegoodstype; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/2/26 13:37 + */ +@Data +public class BaseGoodsTypeQuery implements Query { + private String name;//名字 + private String code;//编码 + private String IsGoodID;//是否一品一码（goodID），0否，1是 + private String outStockRule;//出库规则（先进先出0、先进后出1、保质期优先2） + private String orgLevelKey;//权限等级 + @ApiModelProperty("菜单路由") + private String menuUrl; + @ApiModelProperty("组织全路径sid") + private String orgPath; + @ApiModelProperty("用户sid") + private String userSid; + private int index; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basegoodstype/BaseGoodsTypeService.java b/oms/src/main/java/com/yxt/oms/biz/func/basegoodstype/BaseGoodsTypeService.java new file mode 100644 index 0000000..4f604e8 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basegoodstype/BaseGoodsTypeService.java @@ -0,0 +1,90 @@ +package com.yxt.oms.biz.func.basegoodstype; + +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.StringUtils; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.commonmethod.CommonMethod; +import com.yxt.oms.biz.func.commonmethod.DataRule; +import com.yxt.oms.biz.func.sysorganization.SysOrganizationVo; +import com.yxt.oms.feign.goods.basegoodstype.BaseGoodsTypeFeign; +import com.yxt.oms.feign.portal.sysorganization.SysOrganizationFeign; +import com.yxt.oms.utils.OrgPathQuery; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Arrays; +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/2/26 13:40 + */ +@Service +public class BaseGoodsTypeService extends MybatisBaseService { + + @Autowired + BaseGoodsTypeFeign baseGoodsTypeFeign; + @Autowired + SysOrganizationFeign sysOrganizationFeign; + @Autowired + CommonMethod commonMethod; + + public ResultBean> listPage(PagerQuery pq) { + BaseGoodsTypeQuery query=pq.getParams(); + DataRule dataRule=commonMethod.dataRule(query.getOrgPath(),query.getMenuUrl(),query.getUserSid()).getData(); + pq.getParams().setOrgLevelKey(dataRule.getDataRuleId()); + pq.getParams().setIndex(dataRule.getIndex()); + return baseGoodsTypeFeign.listPage(pq); + } + public ResultBean> listAll(OrgPathQuery query) { + ResultBean rb = ResultBean.fireFail(); + String useOrgSid = ""; + String orgPath = query.getOrgPath(); + if (StringUtils.isNotBlank(orgPath)) { + List split = Arrays.asList(orgPath.split("/")); + if (split.size() > 1) { + //获取本级sid获取本级部门信息 + SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData(); + useOrgSid = sysOrganization1.getSid(); + } else { + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData(); + useOrgSid = sysOrganization.getSid(); + } + } + query.setUserOrgSid(useOrgSid); + return baseGoodsTypeFeign.listAll(query); + } + + public ResultBean saveOrUpdate(BaseGoodsTypeDto dto) { + ResultBean rb = ResultBean.fireFail(); + return baseGoodsTypeFeign.saveOrUpdate(dto); + } + + public ResultBean initialization(String sid) { + ResultBean rb = ResultBean.fireFail(); + return baseGoodsTypeFeign.initialization(sid); + } + + + + public ResultBean delete(String sid) { + ResultBean rb = ResultBean.fireFail(); + BaseGoodsType omsGoodsType = fetchBySid(sid); + if (null != omsGoodsType) { + baseMapper.deleteById(omsGoodsType.getId()); + } + return rb.success(); + } + public ResultBean delAll(String[] sids) { + return baseGoodsTypeFeign.delBySids(sids); + } + public ResultBean updateIsEnable(String sid,String isEnable) { + ResultBean rb = ResultBean.fireFail(); + return baseGoodsTypeFeign.updateIsEnable(sid, isEnable); + } + public ResultBean updateProductCode(String sid,String state) { + return baseGoodsTypeFeign.updateIsGoodsID(sid, state); + } +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basegoodstype/BaseGoodsTypeVo.java b/oms/src/main/java/com/yxt/oms/biz/func/basegoodstype/BaseGoodsTypeVo.java new file mode 100644 index 0000000..d33679d --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basegoodstype/BaseGoodsTypeVo.java @@ -0,0 +1,42 @@ +package com.yxt.oms.biz.func.basegoodstype; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +import java.util.Date; + +/** + * @author wangpengfei + * @date 2024/2/26 13:37 + */ +@Data +public class BaseGoodsTypeVo implements Vo { + private String id; + private String sid; + private String lockVersion; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date modifyTime; + private String remarks; + private String isEnable; + private String state; + private String isDelete; + private String goodsTypeName;//商品类别名称 + private String goodsTypeCode;//类别编码 + private String percentageRate;//提成比例 + private String percentageAmount;//提成金额 + private String pSid;//父级sid + private String pName;//父级sid + private String isParent="1";//是否为父节点，0为否，1为是，0标识为叶子节点 + private String isGoodsID="1";//是否一品一码 0 否 1是 + private String sortNo;//排序 + private String useOrgSid;//使用组织sid + private String createOrgSid;//创建组织sid + private String sids;//创建组织sid + private String outStockRule;//出库规则 + private String outStockRuleVaule;//出库规则 + private String userSid; + private String orgPath; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basegoodsunit/BaseGoodsUnit.java b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsunit/BaseGoodsUnit.java new file mode 100644 index 0000000..59a5315 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsunit/BaseGoodsUnit.java @@ -0,0 +1,16 @@ +package com.yxt.oms.biz.func.basegoodsunit; + +import com.yxt.common.core.domain.BaseEntity; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/2/26 13:36 + */ +@Data +public class BaseGoodsUnit extends BaseEntity { + + private String unitName;//单位名称 + private String useOrgSid;//使用组织sid + private String createOrgSid;//创建组织sid +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basegoodsunit/BaseGoodsUnitDto.java b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsunit/BaseGoodsUnitDto.java new file mode 100644 index 0000000..3a63cf9 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsunit/BaseGoodsUnitDto.java @@ -0,0 +1,31 @@ +package com.yxt.oms.biz.func.basegoodsunit; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.dto.Dto; +import lombok.Data; + +import java.util.Date; + +/** + * @author wangpengfei + * @date 2024/2/26 13:38 + */ +@Data +public class BaseGoodsUnitDto implements Dto { + private String id; + private String sid; + private String lockVersion; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date modifyTime; + private String remarks; + private String isEnable; + private String state; + private String isDelete; + private String unitName;//单位名称 + private String userSid; + private String orgPath; + private String useOrgSid;//使用组织sid + private String createOrgSid;//创建组织sid +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basegoodsunit/BaseGoodsUnitMapper.java b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsunit/BaseGoodsUnitMapper.java new file mode 100644 index 0000000..9ae33b5 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsunit/BaseGoodsUnitMapper.java @@ -0,0 +1,17 @@ +package com.yxt.oms.biz.func.basegoodsunit; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * @author wangpengfei + * @date 2024/2/26 13:40 + */ +@Mapper +public interface BaseGoodsUnitMapper extends BaseMapper { + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basegoodsunit/BaseGoodsUnitMapper.xml b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsunit/BaseGoodsUnitMapper.xml new file mode 100644 index 0000000..38870d4 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsunit/BaseGoodsUnitMapper.xml @@ -0,0 +1,15 @@ + + + + + + + + \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basegoodsunit/BaseGoodsUnitQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsunit/BaseGoodsUnitQuery.java new file mode 100644 index 0000000..93e5083 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsunit/BaseGoodsUnitQuery.java @@ -0,0 +1,22 @@ +package com.yxt.oms.biz.func.basegoodsunit; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/2/26 13:37 + */ +@Data +public class BaseGoodsUnitQuery implements Query { + private String name; + private String orgLevelKey;//权限等级 + @ApiModelProperty("菜单路由") + private String menuUrl; + @ApiModelProperty("组织全路径sid") + private String orgPath; + @ApiModelProperty("用户sid") + private String userSid; + private int index; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basegoodsunit/BaseGoodsUnitService.java b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsunit/BaseGoodsUnitService.java new file mode 100644 index 0000000..e4e158a --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsunit/BaseGoodsUnitService.java @@ -0,0 +1,67 @@ +package com.yxt.oms.biz.func.basegoodsunit; + +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.commonmethod.CommonMethod; +import com.yxt.oms.biz.func.commonmethod.DataRule; +import com.yxt.oms.feign.goods.basegoodsunit.BaseGoodsUnitFeign; +import com.yxt.oms.utils.OrgPathQuery; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/2/26 13:40 + */ +@Service +public class BaseGoodsUnitService extends MybatisBaseService { + + @Autowired + BaseGoodsUnitFeign baseGoodsUnitFeign; + @Autowired + CommonMethod commonMethod; + + public ResultBean> listPage(PagerQuery pq) { + BaseGoodsUnitQuery query=pq.getParams(); + DataRule dataRule=commonMethod.dataRule(query.getOrgPath(),query.getMenuUrl(),query.getUserSid()).getData(); + pq.getParams().setOrgLevelKey(dataRule.getDataRuleId()); + pq.getParams().setIndex(dataRule.getIndex()); + return baseGoodsUnitFeign.listPage(pq); + } + public ResultBean> listAll(OrgPathQuery query) { + ResultBean rb = ResultBean.fireFail(); + return baseGoodsUnitFeign.listAll(query); + } + + public ResultBean saveOrUpdate(BaseGoodsUnitDto dto) { + ResultBean rb = ResultBean.fireFail(); + return baseGoodsUnitFeign.saveOrUpdate(dto); + } + + public ResultBean initialization(String sid) { + ResultBean rb = ResultBean.fireFail(); + return baseGoodsUnitFeign.initialization(sid); + } + + + + public ResultBean delete(String sid) { + ResultBean rb = ResultBean.fireFail(); + BaseGoodsUnit omsGoodsType = fetchBySid(sid); + if (null != omsGoodsType) { + baseMapper.deleteById(omsGoodsType.getId()); + } + return rb.success(); + } + public ResultBean delAll(String[] sids) { + return baseGoodsUnitFeign.delBySids(sids); + } + public ResultBean updateIsEnable(String sid,String isEnable) { + ResultBean rb = ResultBean.fireFail(); + return baseGoodsUnitFeign.updateIsEnable(sid, isEnable); + } +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basegoodsunit/BaseGoodsUnitVo.java b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsunit/BaseGoodsUnitVo.java new file mode 100644 index 0000000..de1888a --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsunit/BaseGoodsUnitVo.java @@ -0,0 +1,29 @@ +package com.yxt.oms.biz.func.basegoodsunit; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +import java.util.Date; + +/** + * @author wangpengfei + * @date 2024/2/26 13:37 + */ +@Data +public class BaseGoodsUnitVo implements Vo { + private String id; + private String sid; + private String lockVersion; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date modifyTime; + private String remarks; + private String isEnable; + private String state; + private String isDelete; + private String unitName;//单位名称 + private String useOrgSid;//使用组织sid + private String createOrgSid;//创建组织sid +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basemanufacturer/BaseManufacturer.java b/oms/src/main/java/com/yxt/oms/biz/func/basemanufacturer/BaseManufacturer.java new file mode 100644 index 0000000..c4fae26 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basemanufacturer/BaseManufacturer.java @@ -0,0 +1,20 @@ +package com.yxt.oms.biz.func.basemanufacturer; + +import com.yxt.common.core.domain.BaseEntity; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/2/26 13:36 + */ +@Data +public class BaseManufacturer extends BaseEntity { + private String manufacturerName;//厂家名称 + private String manufacturerCode;//厂家编码 + private String address;//地址 + private String telephone;//电话 + private String contacts;//联系人 + private String sortNo;//排序 + private String useOrgSid;//使用组织sid + private String createOrgSid;//创建组织sid +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basemanufacturer/BaseManufacturerDto.java b/oms/src/main/java/com/yxt/oms/biz/func/basemanufacturer/BaseManufacturerDto.java new file mode 100644 index 0000000..93603d3 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basemanufacturer/BaseManufacturerDto.java @@ -0,0 +1,37 @@ +package com.yxt.oms.biz.func.basemanufacturer; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.dto.Dto; +import lombok.Data; + +import java.util.Date; + +/** + * @author wangpengfei + * @date 2024/2/26 13:38 + */ +@Data +public class BaseManufacturerDto implements Dto { + private String id; + private String sid; + private String lockVersion; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date modifyTime; + private String remarks; + private String isEnable; + private String state; + private String isDelete; + + private String manufacturerName;//厂家名称 + private String manufacturerCode;//厂家编码 + private String address;//地址 + private String telephone;//电话 + private String contacts;//联系人 + private String sortNo;//排序 + private String useOrgSid;//使用组织sid + private String createOrgSid;//创建组织sid + private String userSid; + private String orgPath; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basemanufacturer/BaseManufacturerMapper.java b/oms/src/main/java/com/yxt/oms/biz/func/basemanufacturer/BaseManufacturerMapper.java new file mode 100644 index 0000000..c9e3bc8 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basemanufacturer/BaseManufacturerMapper.java @@ -0,0 +1,21 @@ +package com.yxt.oms.biz.func.basemanufacturer; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/2/26 13:40 + */ +@Mapper +public interface BaseManufacturerMapper extends BaseMapper { + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + List getAllTypeByUseOrgSid(@Param("useOrgSid") String useOrgSid); +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basemanufacturer/BaseManufacturerMapper.xml b/oms/src/main/java/com/yxt/oms/biz/func/basemanufacturer/BaseManufacturerMapper.xml new file mode 100644 index 0000000..f3cdf81 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basemanufacturer/BaseManufacturerMapper.xml @@ -0,0 +1,20 @@ + + + + + + + + + \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basemanufacturer/BaseManufacturerQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/basemanufacturer/BaseManufacturerQuery.java new file mode 100644 index 0000000..94f24fc --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basemanufacturer/BaseManufacturerQuery.java @@ -0,0 +1,22 @@ +package com.yxt.oms.biz.func.basemanufacturer; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/2/26 13:37 + */ +@Data +public class BaseManufacturerQuery implements Query { + private String name; + private String orgLevelKey;//权限等级 + @ApiModelProperty("菜单路由") + private String menuUrl; + @ApiModelProperty("组织全路径sid") + private String orgPath; + @ApiModelProperty("用户sid") + private String userSid; + private int index; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basemanufacturer/BaseManufacturerService.java b/oms/src/main/java/com/yxt/oms/biz/func/basemanufacturer/BaseManufacturerService.java new file mode 100644 index 0000000..6c37f59 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basemanufacturer/BaseManufacturerService.java @@ -0,0 +1,70 @@ +package com.yxt.oms.biz.func.basemanufacturer; + +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.commonmethod.CommonMethod; +import com.yxt.oms.biz.func.commonmethod.DataRule; +import com.yxt.oms.feign.goods.basemanufacturer.BaseManufacturerFeign; +import com.yxt.oms.utils.OrgPathQuery; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/2/26 13:40 + */ +@Service +public class BaseManufacturerService extends MybatisBaseService { + @Autowired + BaseManufacturerFeign baseManufacturerFeign; + @Autowired + CommonMethod commonMethod; + + public ResultBean> listPage(PagerQuery pq) { + BaseManufacturerQuery query=pq.getParams(); + DataRule dataRule=commonMethod.dataRule(query.getOrgPath(),query.getMenuUrl(),query.getUserSid()).getData(); + pq.getParams().setOrgLevelKey(dataRule.getDataRuleId()); + pq.getParams().setIndex(dataRule.getIndex()); + return baseManufacturerFeign.listPage(pq); + } + public ResultBean> listAll( OrgPathQuery query) { + ResultBean rb = ResultBean.fireFail(); + return baseManufacturerFeign.listAll(query); + } + + public ResultBean saveOrUpdate(BaseManufacturerDto dto) { + ResultBean rb = ResultBean.fireFail(); + return baseManufacturerFeign.saveOrUpdate(dto); + } + + public ResultBean initialization(String sid) { + ResultBean rb = ResultBean.fireFail(); + return baseManufacturerFeign.initialization(sid); + } + + + + public ResultBean delete(String sid) { + ResultBean rb = ResultBean.fireFail(); + BaseManufacturer omsManufacturer = fetchBySid(sid); + if (null != omsManufacturer) { + baseMapper.deleteById(omsManufacturer.getId()); + } + return rb.success(); + } + public ResultBean updateIsEnable(String sid,String isEnable) { + ResultBean rb = ResultBean.fireFail(); + return baseManufacturerFeign.updateIsEnable(sid, isEnable); + } + public ResultBean delAll(String[] sids) { + return baseManufacturerFeign.delBySids(sids); + } + public ResultBean> getAllTypeByUseOrgSid(String useOrgSid) { + ResultBean rb = ResultBean.fireFail(); + return baseManufacturerFeign.getAllTypeByUseOrgSid(useOrgSid); + } +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basemanufacturer/BaseManufacturerVo.java b/oms/src/main/java/com/yxt/oms/biz/func/basemanufacturer/BaseManufacturerVo.java new file mode 100644 index 0000000..33b7746 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basemanufacturer/BaseManufacturerVo.java @@ -0,0 +1,36 @@ +package com.yxt.oms.biz.func.basemanufacturer; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +import java.util.Date; + +/** + * @author wangpengfei + * @date 2024/2/26 13:37 + */ +@Data +public class BaseManufacturerVo implements Vo { + private String id; + private String sid; + private String lockVersion; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date modifyTime; + private String remarks; + private String isEnable; + private String state; + private String isDelete; + private String createBySid; + private String updateBySid; + private String manufacturerName;//厂家名称 + private String manufacturerCode;//厂家编码 + private String address;//地址 + private String telephone;//电话 + private String contacts;//联系人 + private String sortNo;//排序 + private String useOrgSid;//使用组织sid + private String createOrgSid;//创建组织sid +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/GoodsSpuService.java b/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/GoodsSpuService.java index 829b20f..3e6a23d 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/GoodsSpuService.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/GoodsSpuService.java @@ -3,7 +3,8 @@ package com.yxt.oms.biz.func.goodsspu; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.oms.feign.goods.goodsSpu.GoodsSpuFeign; +import com.yxt.oms.feign.goods.basegoodsspu.BaseGoodsSpuFeign; +import com.yxt.oms.feign.goods.basegoodsspu.BaseGoodsSpuFeign; import com.yxt.oms.feign.warehouse.warehouseInventory.WarehouseInventoryFeign; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -25,7 +26,7 @@ import java.util.stream.Collectors; public class GoodsSpuService { @Autowired - private GoodsSpuFeign goodsSpuFeign; + private BaseGoodsSpuFeign goodsSpuFeign; @Autowired private WarehouseInventoryFeign warehouseInventoryFeign; diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillService.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillService.java index 317ecca..a83bc80 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillService.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillService.java @@ -39,7 +39,7 @@ import com.yxt.oms.biz.func.purchasebilldetail.PurchaseBillDetailDto; import com.yxt.oms.biz.func.sysorganization.SysOrganizationVo; import com.yxt.oms.biz.func.warehouseansbill.WarehouseAnsBillDto; import com.yxt.oms.biz.func.warehouseansbilldetail.WarehouseAnsBillDetailDto; -import com.yxt.oms.feign.goods.sku.GoodsSkuFeign; +import com.yxt.oms.feign.goods.basegoodssku.BaseGoodsSkuFeign; import com.yxt.oms.feign.portal.privilege.PrivilegeQuery; import com.yxt.oms.feign.portal.sysorganization.SysOrganizationFeign; import com.yxt.oms.feign.portal.sysstafforg.SysStaffOrgFeign; @@ -66,7 +66,7 @@ public class PurchaseBillService { @Resource private SysStaffOrgFeign sysStaffOrgFeign; @Resource - private GoodsSkuFeign goodsSkuFeign; + private BaseGoodsSkuFeign goodsSkuFeign; @Resource private WarehouseAnsBillFeign warehouseAnsBillFeign; @Autowired diff --git a/oms/src/main/java/com/yxt/oms/biz/func/supplierbank/SupplierBank.java b/oms/src/main/java/com/yxt/oms/biz/func/supplierbank/SupplierBank.java new file mode 100644 index 0000000..68a693c --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/supplierbank/SupplierBank.java @@ -0,0 +1,76 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.supplierbank; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-base(供应商管理)
+ * File: BaseSupplierBank.java
+ * Class: com.yxt.base.api.basesupplierbank.BaseSupplierBank
+ * Description: 供应商开户行信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-18 13:33:13
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "供应商开户行信息", description = "供应商开户行信息") +@TableName("base_supplier_bank") +public class SupplierBank extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("供应商sid") + private String supplierSid; // 供应商sid + @ApiModelProperty("开户行") + private String bankName; // 开户行 + @ApiModelProperty("开户行帐号") + private String bankAccount; // 开户行帐号 + @ApiModelProperty("账户名称") + private String accountName; // 账户名称 + @ApiModelProperty("账户类型key") + private String dueBankKey; // 账户类型key + @ApiModelProperty("账户类型value") + private String dueBankValue; // 账户类型value + @ApiModelProperty("银行网点") + private String bankingOutlets; // 银行网点 + @ApiModelProperty("开户行地址") + private String bankAddress; // 开户行地址 + @ApiModelProperty("联行号") + private String paymentLines; // 联行号 + @ApiModelProperty("银行代码") + private String swiftCode; // 银行代码 + @ApiModelProperty("币种") + private String currency; // 币种 + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/supplierbank/SupplierBankDetailsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/supplierbank/SupplierBankDetailsVo.java new file mode 100644 index 0000000..3794c68 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/supplierbank/SupplierBankDetailsVo.java @@ -0,0 +1,76 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.supplierbank; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-base(供应商管理)
+ * File: BaseSupplierBankVo.java
+ * Class: com.yxt.base.api.basesupplierbank.BaseSupplierBankVo
+ * Description: 供应商开户行信息 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-18 13:33:13
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "供应商开户行信息 视图数据详情", description = "供应商开户行信息 视图数据详情") +public class SupplierBankDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("供应商sid") + private String supplierSid; // 供应商sid + @ApiModelProperty("开户行") + private String bankName; // 开户行 + @ApiModelProperty("开户行帐号") + private String bankAccount; // 开户行帐号 + @ApiModelProperty("账户名称") + private String accountName; // 账户名称 + @ApiModelProperty("账户类型key") + private String dueBankKey; // 账户类型key + @ApiModelProperty("账户类型value") + private String dueBankValue; // 账户类型value + @ApiModelProperty("银行网点") + private String bankingOutlets; // 银行网点 + @ApiModelProperty("开户行地址") + private String bankAddress; // 开户行地址 + @ApiModelProperty("联行号") + private String paymentLines; // 联行号 + @ApiModelProperty("银行代码") + private String swiftCode; // 银行代码 + @ApiModelProperty("币种") + private String currency; // 币种 + +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/supplierbank/SupplierBankDto.java b/oms/src/main/java/com/yxt/oms/biz/func/supplierbank/SupplierBankDto.java new file mode 100644 index 0000000..faa035f --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/supplierbank/SupplierBankDto.java @@ -0,0 +1,76 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.supplierbank; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-base(供应商管理)
+ * File: BaseSupplierBankDto.java
+ * Class: com.yxt.base.api.basesupplierbank.BaseSupplierBankDto
+ * Description: 供应商开户行信息 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-18 13:33:13
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "供应商开户行信息 数据传输对象", description = "供应商开户行信息 数据传输对象") +public class SupplierBankDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("供应商sid") + private String supplierSid; // 供应商sid + @ApiModelProperty("开户行") + private String bankName; // 开户行 + @ApiModelProperty("开户行帐号") + private String bankAccount; // 开户行帐号 + @ApiModelProperty("账户名称") + private String accountName; // 账户名称 + @ApiModelProperty("账户类型key") + private String dueBankKey; // 账户类型key + @ApiModelProperty("账户类型value") + private String dueBankValue; // 账户类型value + @ApiModelProperty("银行网点") + private String bankingOutlets; // 银行网点 + @ApiModelProperty("开户行地址") + private String bankAddress; // 开户行地址 + @ApiModelProperty("联行号") + private String paymentLines; // 联行号 + @ApiModelProperty("银行代码") + private String swiftCode; // 银行代码 + @ApiModelProperty("币种") + private String currency; // 币种 + +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/supplierbank/SupplierBankMapper.java b/oms/src/main/java/com/yxt/oms/biz/func/supplierbank/SupplierBankMapper.java new file mode 100644 index 0000000..4dd688f --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/supplierbank/SupplierBankMapper.java @@ -0,0 +1,67 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.supplierbank; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * Project: yxt-base(供应商管理)
+ * File: BaseSupplierBankMapper.java
+ * Class: com.yxt.base.biz.basesupplierbank.BaseSupplierBankMapper
+ * Description: 供应商开户行信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-18 13:33:13
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface SupplierBankMapper extends BaseMapper { + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from base_supplier_bank") + List selectListVo(); + + @Delete("delete from base_supplier_bank where supplierSid = #{supplierSid}") + int deleteBySupplierSid(String supplierSid); + + @Select("select * from base_supplier_bank where supplierSid = #{supplierSid}") + List selectBySupplierSid(String supplierSid); +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/supplierbank/SupplierBankMapper.xml b/oms/src/main/java/com/yxt/oms/biz/func/supplierbank/SupplierBankMapper.xml new file mode 100644 index 0000000..90a8cbe --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/supplierbank/SupplierBankMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/supplierbank/SupplierBankQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/supplierbank/SupplierBankQuery.java new file mode 100644 index 0000000..a32fb93 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/supplierbank/SupplierBankQuery.java @@ -0,0 +1,74 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.supplierbank; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-base(供应商管理)
+ * File: BaseSupplierBankQuery.java
+ * Class: com.yxt.base.api.basesupplierbank.BaseSupplierBankQuery
+ * Description: 供应商开户行信息 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-18 13:33:13
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "供应商开户行信息 查询条件", description = "供应商开户行信息 查询条件") +public class SupplierBankQuery implements Query { + + @ApiModelProperty("供应商sid") + private String supplierSid; // 供应商sid + @ApiModelProperty("开户行") + private String bankName; // 开户行 + @ApiModelProperty("开户行帐号") + private String bankAccount; // 开户行帐号 + @ApiModelProperty("账户名称") + private String accountName; // 账户名称 + @ApiModelProperty("账户类型key") + private String dueBankKey; // 账户类型key + @ApiModelProperty("账户类型value") + private String dueBankValue; // 账户类型value + @ApiModelProperty("银行网点") + private String bankingOutlets; // 银行网点 + @ApiModelProperty("开户行地址") + private String bankAddress; // 开户行地址 + @ApiModelProperty("联行号") + private String paymentLines; // 联行号 + @ApiModelProperty("银行代码") + private String swiftCode; // 银行代码 + @ApiModelProperty("币种") + private String currency; // 币种 + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/supplierbank/SupplierBankService.java b/oms/src/main/java/com/yxt/oms/biz/func/supplierbank/SupplierBankService.java new file mode 100644 index 0000000..5420a98 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/supplierbank/SupplierBankService.java @@ -0,0 +1,70 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.supplierbank; + +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.feign.supplier.supplierbank.SupplierBankFeign; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * Project: yxt-base(供应商管理)
+ * File: BaseSupplierBankService.java
+ * Class: com.yxt.base.biz.basesupplierbank.BaseSupplierBankService
+ * Description: 供应商开户行信息 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-18 13:33:13
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class SupplierBankService extends MybatisBaseService { + @Autowired + SupplierBankFeign supplierBankFeign; + public ResultBean> listPageVo(PagerQuery pq) { + return supplierBankFeign.listPage(pq); + } + + public ResultBean saveOrUpdateDto(SupplierBankDto dto){ + return supplierBankFeign.save(dto); + } + + public ResultBean fetchDetailsVoBySid(String sid){ + return supplierBankFeign.fetchDetailsBySid(sid); + } + + public ResultBean delAll(String[] sids) { + return supplierBankFeign.delBySids(sids); + } + + +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/supplierbank/SupplierBankVo.java b/oms/src/main/java/com/yxt/oms/biz/func/supplierbank/SupplierBankVo.java new file mode 100644 index 0000000..a9699be --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/supplierbank/SupplierBankVo.java @@ -0,0 +1,76 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.supplierbank; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-base(供应商管理)
+ * File: BaseSupplierBankVo.java
+ * Class: com.yxt.base.api.basesupplierbank.BaseSupplierBankVo
+ * Description: 供应商开户行信息 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-18 13:33:13
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "供应商开户行信息 视图数据对象", description = "供应商开户行信息 视图数据对象") +public class SupplierBankVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("供应商sid") + private String supplierSid; // 供应商sid + @ApiModelProperty("开户行") + private String bankName; // 开户行 + @ApiModelProperty("开户行帐号") + private String bankAccount; // 开户行帐号 + @ApiModelProperty("账户名称") + private String accountName; // 账户名称 + @ApiModelProperty("账户类型key") + private String dueBankKey; // 账户类型key + @ApiModelProperty("账户类型value") + private String dueBankValue; // 账户类型value + @ApiModelProperty("银行网点") + private String bankingOutlets; // 银行网点 + @ApiModelProperty("开户行地址") + private String bankAddress; // 开户行地址 + @ApiModelProperty("联行号") + private String paymentLines; // 联行号 + @ApiModelProperty("银行代码") + private String swiftCode; // 银行代码 + @ApiModelProperty("币种") + private String currency; // 币种 + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/supplierfile/SupplierFile.java b/oms/src/main/java/com/yxt/oms/biz/func/supplierfile/SupplierFile.java new file mode 100644 index 0000000..86d8db0 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/supplierfile/SupplierFile.java @@ -0,0 +1,66 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.supplierfile; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-base(仓储基础信息供应商)
+ * File: BaseSupplierFile.java
+ * Class: com.yxt.anrui.as.api.basesupplierfile.BaseSupplierFile
+ * Description: 供应商附件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-13 16:51:56
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "供应商附件", description = "供应商附件") +@TableName("base_supplier_file") +public class SupplierFile extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("文件名") + private String fileName; // 文件名 + @ApiModelProperty("文件类型") + private String fileType; // 文件类型 + @ApiModelProperty("关联业务对象sid") + private String linkSid; // 关联业务对象sid + @ApiModelProperty("附件类型") + private String attachType; // 附件类型 + @ApiModelProperty("文件大小") + private String fileSize; // 文件大小 + @ApiModelProperty("文件的路径") + private String filePath; // 文件的路径 + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/supplierfile/SupplierFileDetailsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/supplierfile/SupplierFileDetailsVo.java new file mode 100644 index 0000000..b0d3bef --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/supplierfile/SupplierFileDetailsVo.java @@ -0,0 +1,66 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.supplierfile; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-base(仓储基础信息供应商)
+ * File: BaseSupplierFileVo.java
+ * Class: com.yxt.anrui.as.api.basesupplierfile.BaseSupplierFileVo
+ * Description: 供应商附件 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-13 16:51:56
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "供应商附件 视图数据详情", description = "供应商附件 视图数据详情") +public class SupplierFileDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("文件名") + private String fileName; // 文件名 + @ApiModelProperty("文件类型") + private String fileType; // 文件类型 + @ApiModelProperty("关联业务对象sid") + private String linkSid; // 关联业务对象sid + @ApiModelProperty("附件类型") + private String attachType; // 附件类型 + @ApiModelProperty("文件大小") + private String fileSize; // 文件大小 + @ApiModelProperty("文件的路径") + private String filePath; // 文件的路径 + +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/supplierfile/SupplierFileDto.java b/oms/src/main/java/com/yxt/oms/biz/func/supplierfile/SupplierFileDto.java new file mode 100644 index 0000000..a5d2a3a --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/supplierfile/SupplierFileDto.java @@ -0,0 +1,66 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.supplierfile; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-base(仓储基础信息供应商)
+ * File: BaseSupplierFileDto.java
+ * Class: com.yxt.anrui.as.api.basesupplierfile.BaseSupplierFileDto
+ * Description: 供应商附件 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-13 16:51:56
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "供应商附件 数据传输对象", description = "供应商附件 数据传输对象") +public class SupplierFileDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("文件名") + private String fileName; // 文件名 + @ApiModelProperty("文件类型") + private String fileType; // 文件类型 + @ApiModelProperty("关联业务对象sid") + private String linkSid; // 关联业务对象sid + @ApiModelProperty("附件类型") + private String attachType; // 附件类型 + @ApiModelProperty("文件大小") + private String fileSize; // 文件大小 + @ApiModelProperty("文件的路径") + private String filePath; // 文件的路径 + +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/supplierfile/SupplierFileMapper.java b/oms/src/main/java/com/yxt/oms/biz/func/supplierfile/SupplierFileMapper.java new file mode 100644 index 0000000..721f4bb --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/supplierfile/SupplierFileMapper.java @@ -0,0 +1,60 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.supplierfile; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * Project: yxt-base(仓储基础信息供应商)
+ * File: BaseSupplierFileMapper.java
+ * Class: com.yxt.anrui.as.biz.basesupplierfile.BaseSupplierFileMapper
+ * Description: 供应商附件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-13 16:51:56
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface SupplierFileMapper extends BaseMapper { + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from base_supplier_file") + List selectListVo(); +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/supplierfile/SupplierFileMapper.xml b/oms/src/main/java/com/yxt/oms/biz/func/supplierfile/SupplierFileMapper.xml new file mode 100644 index 0000000..42db6e4 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/supplierfile/SupplierFileMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/supplierfile/SupplierFileQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/supplierfile/SupplierFileQuery.java new file mode 100644 index 0000000..91e0f4a --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/supplierfile/SupplierFileQuery.java @@ -0,0 +1,64 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.supplierfile; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-base(仓储基础信息供应商)
+ * File: BaseSupplierFileQuery.java
+ * Class: com.yxt.anrui.as.api.basesupplierfile.BaseSupplierFileQuery
+ * Description: 供应商附件 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-13 16:51:56
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "供应商附件 查询条件", description = "供应商附件 查询条件") +public class SupplierFileQuery implements Query { + + @ApiModelProperty("文件名") + private String fileName; // 文件名 + @ApiModelProperty("文件类型") + private String fileType; // 文件类型 + @ApiModelProperty("关联业务对象sid") + private String linkSid; // 关联业务对象sid + @ApiModelProperty("附件类型") + private String attachType; // 附件类型 + @ApiModelProperty("文件大小") + private String fileSize; // 文件大小 + @ApiModelProperty("文件的路径") + private String filePath; // 文件的路径 + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/supplierfile/SupplierFileService.java b/oms/src/main/java/com/yxt/oms/biz/func/supplierfile/SupplierFileService.java new file mode 100644 index 0000000..04babf0 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/supplierfile/SupplierFileService.java @@ -0,0 +1,68 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.supplierfile; + +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.feign.supplier.supplierfile.SupplierFileFeign; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * Project: yxt-base(仓储基础信息供应商)
+ * File: BaseSupplierFileService.java
+ * Class: com.yxt.anrui.as.biz.basesupplierfile.BaseSupplierFileService
+ * Description: 供应商附件 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-13 16:51:56
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class SupplierFileService extends MybatisBaseService { + @Autowired + SupplierFileFeign supplierFileFeign; + public ResultBean> listPageVo(PagerQuery pq) { + return supplierFileFeign.listPage(pq); + } + + public ResultBean saveOrUpdateDto(SupplierFileDto dto){ + return supplierFileFeign.save(dto); + } + public ResultBean delAll(String[] sids ){ + return supplierFileFeign.delBySids(sids); + } + + public ResultBean fetchDetailsVoBySid(String sid){ + + return supplierFileFeign.fetchDetailsBySid(sid); + } +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/supplierfile/SupplierFileVo.java b/oms/src/main/java/com/yxt/oms/biz/func/supplierfile/SupplierFileVo.java new file mode 100644 index 0000000..0d23106 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/supplierfile/SupplierFileVo.java @@ -0,0 +1,66 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.supplierfile; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-base(仓储基础信息供应商)
+ * File: BaseSupplierFileVo.java
+ * Class: com.yxt.anrui.as.api.basesupplierfile.BaseSupplierFileVo
+ * Description: 供应商附件 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-13 16:51:56
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "供应商附件 视图数据对象", description = "供应商附件 视图数据对象") +public class SupplierFileVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("文件名") + private String fileName; // 文件名 + @ApiModelProperty("文件类型") + private String fileType; // 文件类型 + @ApiModelProperty("关联业务对象sid") + private String linkSid; // 关联业务对象sid + @ApiModelProperty("附件类型") + private String attachType; // 附件类型 + @ApiModelProperty("文件大小") + private String fileSize; // 文件大小 + @ApiModelProperty("文件的路径") + private String filePath; // 文件的路径 + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/supplierinfo/SupplierInfoDetailsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/supplierinfo/SupplierInfoDetailsVo.java new file mode 100644 index 0000000..d87f56e --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/supplierinfo/SupplierInfoDetailsVo.java @@ -0,0 +1,118 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.supplierinfo; + + +import com.yxt.common.core.vo.Vo; +import com.yxt.oms.biz.func.supplierbank.SupplierBankDetailsVo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * Project: yxt-base(供应商管理)
+ * File: BaseSupplierInfoVo.java
+ * Class: com.yxt.base.api.basesupplierinfo.BaseSupplierInfoVo
+ * Description: 供应商信息 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-18 13:33:13
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "供应商信息 视图数据详情", description = "供应商信息 视图数据详情") +public class SupplierInfoDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("编码") + private String supplierCode; // 编码 + @ApiModelProperty("供应商名称") + private String supplierName; // 供应商名称 + @ApiModelProperty("供应商名称拼音") + private String supplierPY; // 供应商名称拼音 + @ApiModelProperty("供应商类型sid") + private String supplierTypeSid; // 供应商类型sid + @ApiModelProperty("供应商类型") + private String supplierTypeName; // 供应商类型 + @ApiModelProperty("省sid") + private String provinceSid; // 省sid + @ApiModelProperty("province") + private String province; // + @ApiModelProperty("市sid") + private String citySid; // 市sid + @ApiModelProperty("city") + private String city; // + @ApiModelProperty("收货县区sid") + private String countySid; // 收货县区sid + @ApiModelProperty("county") + private String county; // + @ApiModelProperty("详细地址") + private String address; // 详细地址 + @ApiModelProperty("手机") + private String contactMobile; // 手机 + @ApiModelProperty("电话") + private String contactTelePhone; // 电话 + @ApiModelProperty("联系人") + private String contactName; // 联系人 + @ApiModelProperty("传真") + private String fax; // 传真 + @ApiModelProperty("邮编") + private String zipCode; // 邮编 + @ApiModelProperty("电子邮件") + private String email; // 电子邮件 + @ApiModelProperty("网址") + private String website; // 网址 + @ApiModelProperty("开票公司名称") + private String billingCompanyName; // 开票公司名称 + @ApiModelProperty("税号") + private String registNum; // 税号 + @ApiModelProperty("法人") + private String legalName; // 法人 + @ApiModelProperty("采购员") + private String purchaser; // 采购员 + @ApiModelProperty("排序") + private Integer sortNo; // 排序 + @ApiModelProperty("开票类型key") + private String billingTypeKey; // 开票类型key + @ApiModelProperty("开票类型value") + private String billingTypeValue; // 开票类型value + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + @ApiModelProperty("供应商开户行") + private List baseSupplierBankList; + private double taxRate; + private String remarks; +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/supplierinfo/SupplierInfoDto.java b/oms/src/main/java/com/yxt/oms/biz/func/supplierinfo/SupplierInfoDto.java new file mode 100644 index 0000000..ceda3cc --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/supplierinfo/SupplierInfoDto.java @@ -0,0 +1,121 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.supplierinfo; + + +import com.yxt.common.core.dto.Dto; +import com.yxt.oms.biz.func.supplierbank.SupplierBankDto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * Project: yxt-base(供应商管理)
+ * File: BaseSupplierInfoDto.java
+ * Class: com.yxt.base.api.basesupplierinfo.BaseSupplierInfoDto
+ * Description: 供应商信息 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-18 13:33:13
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "供应商信息 数据传输对象", description = "供应商信息 数据传输对象") +public class SupplierInfoDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("编码") + private String supplierCode; // 编码 + @ApiModelProperty("供应商名称") + private String supplierName; // 供应商名称 + @ApiModelProperty("供应商名称拼音") + private String supplierPY; // 供应商名称拼音 + @ApiModelProperty("供应商类型sid") + private String supplierTypeSid; // 供应商类型sid + @ApiModelProperty("供应商类型") + private String supplierTypeName; // 供应商类型 + @ApiModelProperty("省sid") + private String provinceSid; // 省sid + @ApiModelProperty("province") + private String province; // + @ApiModelProperty("市sid") + private String citySid; // 市sid + @ApiModelProperty("city") + private String city; // + @ApiModelProperty("收货县区sid") + private String countySid; // 收货县区sid + @ApiModelProperty("county") + private String county; // + @ApiModelProperty("详细地址") + private String address; // 详细地址 + @ApiModelProperty("手机") + private String contactMobile; // 手机 + @ApiModelProperty("电话") + private String contactTelePhone; // 电话 + @ApiModelProperty("联系人") + private String contactName; // 联系人 + @ApiModelProperty("传真") + private String fax; // 传真 + @ApiModelProperty("邮编") + private String zipCode; // 邮编 + @ApiModelProperty("电子邮件") + private String email; // 电子邮件 + @ApiModelProperty("网址") + private String website; // 网址 + @ApiModelProperty("开票公司名称") + private String billingCompanyName; // 开票公司名称 + @ApiModelProperty("税号") + private String registNum; // 税号 + @ApiModelProperty("法人") + private String legalName; // 法人 + @ApiModelProperty("采购员") + private String purchaser; // 采购员 + @ApiModelProperty("排序") + private Integer sortNo; // 排序 + @ApiModelProperty("开票类型key") + private String billingTypeKey; // 开票类型key + @ApiModelProperty("开票类型value") + private String billingTypeValue; // 开票类型value + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + @ApiModelProperty("开户行信息") + private List baseSupplierBankList; + private String userSid; + private String orgPath; + private double taxRate; + private String remarks; + private String orgSid; +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/supplierinfo/SupplierInfoMapper.java b/oms/src/main/java/com/yxt/oms/biz/func/supplierinfo/SupplierInfoMapper.java new file mode 100644 index 0000000..6b1ace7 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/supplierinfo/SupplierInfoMapper.java @@ -0,0 +1,67 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.supplierinfo; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Update; + +import java.util.List; + +/** + * Project: yxt-base(仓储基础信息供应商)
+ * File: BaseSupplierInfoMapper.java
+ * Class: com.yxt.anrui.as.biz.basesupplierinfo.BaseSupplierInfoMapper
+ * Description: 供应商信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-13 16:51:56
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface SupplierInfoMapper extends BaseMapper { + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from base_supplier_info") + List selectListVo(); + + @Update("update base_supplier_info set isDelete = '1' where sid = #{sid}") + int updateBySidIsDelete(String sid); + + @Select("select * from base_supplier_info") + List choiceSupplierInfo(String createOrgSid); +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/supplierinfo/SupplierInfoMapper.xml b/oms/src/main/java/com/yxt/oms/biz/func/supplierinfo/SupplierInfoMapper.xml new file mode 100644 index 0000000..90b813f --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/supplierinfo/SupplierInfoMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/supplierinfo/SupplierInfoQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/supplierinfo/SupplierInfoQuery.java new file mode 100644 index 0000000..dc716fe --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/supplierinfo/SupplierInfoQuery.java @@ -0,0 +1,70 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.supplierinfo; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-base(供应商管理)
+ * File: BaseSupplierInfoQuery.java
+ * Class: com.yxt.base.api.basesupplierinfo.BaseSupplierInfoQuery
+ * Description: 供应商信息 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-18 13:33:13
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "供应商信息 查询条件", description = "供应商信息 查询条件") +public class SupplierInfoQuery implements Query { + + @ApiModelProperty("供应商名称") + private String supplierName; + @ApiModelProperty("供应商类型") + private String supplierTypeName; + @ApiModelProperty("电话") + private String contactTelePhone; + @ApiModelProperty("联系人") + private String contactName; + + @ApiModelProperty("其他查询条件") + private String otherQuery; + private String orgLevelKey;//权限等级 + @ApiModelProperty("菜单路由") + private String menuUrl; + @ApiModelProperty("组织全路径sid") + private String orgPath; + @ApiModelProperty("用户sid") + private String userSid; + private int index; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/supplierinfo/SupplierInfoService.java b/oms/src/main/java/com/yxt/oms/biz/func/supplierinfo/SupplierInfoService.java index 3943be4..30ffe61 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/supplierinfo/SupplierInfoService.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/supplierinfo/SupplierInfoService.java @@ -25,8 +25,14 @@ *********************************************************/ package com.yxt.oms.biz.func.supplierinfo; +import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.commonmethod.CommonMethod; +import com.yxt.oms.biz.func.commonmethod.DataRule; +import com.yxt.oms.biz.func.warehouseansbill.WarehouseAnsDetailsVo; import com.yxt.oms.feign.supplier.supplierinfo.SupplierInfoFeign; +import com.yxt.oms.feign.warehouse.warehouseansbill.WarehouseAnsBillFeign; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -36,6 +42,35 @@ public class SupplierInfoService { @Autowired SupplierInfoFeign baseSupplierInfoFeign; + @Autowired + SupplierInfoFeign baseSupplierInfoFeign; + @Autowired + CommonMethod commonMethod; + @Autowired + WarehouseAnsBillFeign warehouseAnsBillFeign; + public ResultBean> listPageVo(PagerQuery pq) { + SupplierInfoQuery query = pq.getParams(); + DataRule dataRule=commonMethod.dataRule(query.getOrgPath(),query.getMenuUrl(),query.getUserSid()).getData(); + pq.getParams().setOrgLevelKey(dataRule.getDataRuleId()); + pq.getParams().setIndex(dataRule.getIndex()); + return baseSupplierInfoFeign.listPage(pq); + } + + public ResultBean saveOrUpdateDto(SupplierInfoDto dto){ + return baseSupplierInfoFeign.save(dto); + } + + public ResultBean fetchDetailsVoBySid(String sid){ + return baseSupplierInfoFeign.fetchDetailsBySid(sid); + } + public ResultBean fetchDetailsByBillSid(String sid){ + WarehouseAnsDetailsVo warehouseAnsDetailsVo=warehouseAnsBillFeign.details(sid).getData(); + return baseSupplierInfoFeign.fetchDetailsBySid(warehouseAnsDetailsVo.getSupplierSid()); + } + + public void delAll(String[] sids) { + baseSupplierInfoFeign.delBySids(sids); + } public ResultBean> choiceSupplierInfo(String createOrgSid) { return baseSupplierInfoFeign.choiceSupplierInfo(createOrgSid); diff --git a/oms/src/main/java/com/yxt/oms/biz/func/supplierinfo/SupplierInfoVo.java b/oms/src/main/java/com/yxt/oms/biz/func/supplierinfo/SupplierInfoVo.java new file mode 100644 index 0000000..1eb8267 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/supplierinfo/SupplierInfoVo.java @@ -0,0 +1,67 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.supplierinfo; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-base(供应商管理)
+ * File: BaseSupplierInfoVo.java
+ * Class: com.yxt.base.api.basesupplierinfo.BaseSupplierInfoVo
+ * Description: 供应商信息 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-18 13:33:13
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "供应商信息 视图数据对象", description = "供应商信息 视图数据对象") +public class SupplierInfoVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("供应商名称") + private String supplierName; + @ApiModelProperty("供应商类型") + private String supplierTypeName; + @ApiModelProperty("详细地址") + private String address; + @ApiModelProperty("电话") + private String contactTelePhone; + @ApiModelProperty("联系人") + private String contactName; + @ApiModelProperty("手机") + private String contactMobile; + private double taxRate; + private String remarks; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/suppliertype/SupplierType.java b/oms/src/main/java/com/yxt/oms/biz/func/suppliertype/SupplierType.java new file mode 100644 index 0000000..e758be9 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/suppliertype/SupplierType.java @@ -0,0 +1,64 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.suppliertype; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-base(仓储基础信息供应商)
+ * File: BaseSupplierType.java
+ * Class: com.yxt.anrui.as.api.basesuppliertype.BaseSupplierType
+ * Description: 供应商类型.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-13 16:51:56
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "供应商类型", description = "供应商类型") +@TableName("supplier_type") +public class SupplierType extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("供应商类型名称") + private String supplierTypeName; // 供应商类型名称 + @ApiModelProperty("供应商类型编码") + private String supplierTypeCode; + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/suppliertype/SupplierTypeDetailsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/suppliertype/SupplierTypeDetailsVo.java new file mode 100644 index 0000000..69bf8b1 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/suppliertype/SupplierTypeDetailsVo.java @@ -0,0 +1,64 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.suppliertype; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-base(仓储基础信息供应商)
+ * File: BaseSupplierTypeVo.java
+ * Class: com.yxt.anrui.as.api.basesuppliertype.BaseSupplierTypeVo
+ * Description: 供应商类型 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-13 16:51:56
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "供应商类型 视图数据详情", description = "供应商类型 视图数据详情") +public class SupplierTypeDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("供应商类型名称") + private String supplierTypeName; // 供应商类型名称 + @ApiModelProperty("供应商类型编码") + private String supplierTypeCode; + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/suppliertype/SupplierTypeDown.java b/oms/src/main/java/com/yxt/oms/biz/func/suppliertype/SupplierTypeDown.java new file mode 100644 index 0000000..998743b --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/suppliertype/SupplierTypeDown.java @@ -0,0 +1,52 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.suppliertype; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-base(仓储基础信息供应商)
+ * File: BaseSupplierTypeVo.java
+ * Class: com.yxt.anrui.as.api.pmssuppliertype.BaseSupplierTypeVo
+ * Description: 供应商类型 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-13 16:51:56
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +public class SupplierTypeDown implements Vo { + + private String sid; + @ApiModelProperty("供应商类型名称") + private String supplierTypeName; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/suppliertype/SupplierTypeDto.java b/oms/src/main/java/com/yxt/oms/biz/func/suppliertype/SupplierTypeDto.java new file mode 100644 index 0000000..df61b4d --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/suppliertype/SupplierTypeDto.java @@ -0,0 +1,66 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.suppliertype; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-base(仓储基础信息供应商)
+ * File: BaseSupplierTypeDto.java
+ * Class: com.yxt.anrui.as.api.basesuppliertype.BaseSupplierTypeDto
+ * Description: 供应商类型 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-13 16:51:56
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "供应商类型 数据传输对象", description = "供应商类型 数据传输对象") +public class SupplierTypeDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("供应商类型名称") + private String supplierTypeName; // 供应商类型名称 + @ApiModelProperty("供应商类型编码") + private String supplierTypeCode; + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + + @ApiModelProperty("组织全路径") + private String orgPath; +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/suppliertype/SupplierTypeMapper.java b/oms/src/main/java/com/yxt/oms/biz/func/suppliertype/SupplierTypeMapper.java new file mode 100644 index 0000000..b3f6537 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/suppliertype/SupplierTypeMapper.java @@ -0,0 +1,66 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.suppliertype; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * Project: yxt-base(仓储基础信息供应商)
+ * File: BaseSupplierTypeMapper.java
+ * Class: com.yxt.anrui.as.biz.basesuppliertype.BaseSupplierTypeMapper
+ * Description: 供应商类型.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-13 16:51:56
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface SupplierTypeMapper extends BaseMapper { + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from supplier_type") + List selectListVo(); + + @Select("SELECT COUNT(*) FROM supplier_type WHERE supplierTypeCode = #{supplierTypeCode} AND useOrgSid = #{useOrgSid}") + int checkSaveCode(@Param("supplierTypeCode") String supplierTypeCode,@Param("useOrgSid") String useOrgSid); + + @Select("SELECT COUNT(*) FROM supplier_type WHERE supplierTypeCode = #{supplierTypeCode} AND useOrgSid = #{useOrgSid} AND sid != #{dtoSid}") + int checkUpdateCode(@Param("supplierTypeCode") String supplierTypeCode,@Param("useOrgSid") String useOrgSid,@Param("dtoSid") String dtoSid); +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/suppliertype/SupplierTypeMapper.xml b/oms/src/main/java/com/yxt/oms/biz/func/suppliertype/SupplierTypeMapper.xml new file mode 100644 index 0000000..33f3f71 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/suppliertype/SupplierTypeMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/suppliertype/SupplierTypeQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/suppliertype/SupplierTypeQuery.java new file mode 100644 index 0000000..e4379e8 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/suppliertype/SupplierTypeQuery.java @@ -0,0 +1,70 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.suppliertype; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-base(仓储基础信息供应商)
+ * File: BaseSupplierTypeQuery.java
+ * Class: com.yxt.anrui.as.api.basesuppliertype.BaseSupplierTypeQuery
+ * Description: 供应商类型 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-13 16:51:56
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "供应商类型 查询条件", description = "供应商类型 查询条件") +public class SupplierTypeQuery implements Query { + + @ApiModelProperty("供应商类型名称") + private String supplierTypeName; // 供应商类型名称 + @ApiModelProperty("供应商类型编码") + private String supplierTypeCode; + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + private String orgLevelKey;//权限等级 + @ApiModelProperty("菜单路由") + private String menuUrl; + @ApiModelProperty("组织全路径sid") + private String orgPath; + @ApiModelProperty("用户sid") + private String userSid; + private int index; + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/suppliertype/SupplierTypeService.java b/oms/src/main/java/com/yxt/oms/biz/func/suppliertype/SupplierTypeService.java new file mode 100644 index 0000000..859f8ac --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/suppliertype/SupplierTypeService.java @@ -0,0 +1,155 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.suppliertype; + +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.commonmethod.CommonMethod; +import com.yxt.oms.biz.func.commonmethod.DataRule; +import com.yxt.oms.biz.func.sysorganization.SysOrganizationVo; +import com.yxt.oms.feign.portal.sysorganization.SysOrganizationFeign; +import com.yxt.oms.feign.portal.sysstafforg.SysStaffOrgFeign; +import com.yxt.oms.feign.portal.sysuser.SysUserFeign; +import com.yxt.oms.feign.supplier.suppliertype.SupplierTypeFeign; +import com.yxt.oms.feign.warehouse.warehousearea.WarehouseAreaFeign; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Arrays; +import java.util.List; + +/** + * Project: yxt-base(仓储基础信息供应商)
+ * File: BaseSupplierTypeService.java
+ * Class: com.yxt.anrui.as.biz.basesuppliertype.BaseSupplierTypeService
+ * Description: 供应商类型 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-13 16:51:56
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class SupplierTypeService extends MybatisBaseService { + + @Autowired + SupplierTypeFeign supplierTypeFeign; + @Autowired + WarehouseAreaFeign warehouseAreaFeign; + @Autowired + SysOrganizationFeign sysOrganizationFeign; + @Autowired + SysStaffOrgFeign sysStaffOrgFeign; + @Autowired + SysUserFeign sysUserFeign; + @Autowired + CommonMethod commonMethod; + public ResultBean> listPageVo(PagerQuery pq) { + SupplierTypeQuery query=pq.getParams(); + DataRule dataRule=commonMethod.dataRule(query.getOrgPath(),query.getMenuUrl(),query.getUserSid()).getData(); + pq.getParams().setOrgLevelKey(dataRule.getDataRuleId()); + pq.getParams().setIndex(dataRule.getIndex()); + return supplierTypeFeign.listPage(pq); + } + + public ResultBean saveOrUpdateDto(SupplierTypeDto dto){ + ResultBean rb = ResultBean.fireFail(); + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + String deptName = ""; + String deptSid = ""; + String createOrgSid = ""; + String orgPath = dto.getOrgPath(); + if (StringUtils.isNotBlank(orgPath)) { + List split = Arrays.asList(orgPath.split("/")); + if (split.size() > 1) { + //获取本级sid获取本级部门信息 + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(split.size() - 2)).getData(); + SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData(); + deptName = sysOrganization.getName() + "/" + sysOrganization1.getName(); + deptName = sysOrganization1.getName(); + deptSid = sysOrganization1.getSid(); + } else { + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData(); + deptName = sysOrganization.getName(); + deptName = sysOrganization.getName(); + deptSid = sysOrganization.getSid(); + } + dto.setUseOrgSid(deptSid); + createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + //创建组织使用组织 + ResultBean organizationResultBean = sysOrganizationFeign.fetchBySid(createOrgSid); + if (organizationResultBean.getData() != null) { + dto.setCreateOrgSid(createOrgSid); + dto.setCreateOrgName(organizationResultBean.getData().getName()); + } + } + int i = supplierTypeFeign.checkSaveCode(dto.getSupplierTypeCode(),dto.getUseOrgSid()).getData(); + if (i > 0){ + return rb.setMsg("新增编码已存在，请重新输入"); + } + return supplierTypeFeign.save(dto); + } + int i = supplierTypeFeign.checkUpdateCode(dto.getSupplierTypeCode(),dto.getUseOrgSid(),dtoSid).getData(); + if (i > 0){ + return rb.setMsg("修改编码已存在，请重新输入"); + } + return supplierTypeFeign.save(dto); + } + + public ResultBean fetchDetailsVoBySid(String sid){ + return supplierTypeFeign.fetchDetailsBySid(sid); + } + + public void delAll(String[] sids) { + supplierTypeFeign.delBySids(sids); + } + + public ResultBean> selSupplierType(String orgPath) { + String useOrgSid = ""; + if (StringUtils.isNotBlank(orgPath)) { + List split = Arrays.asList(orgPath.split("/")); + if (split.size() > 1) { + //获取本级sid获取本级部门信息 + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(split.size() - 2)).getData(); + SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData(); + useOrgSid = sysOrganization1.getSid(); + } else { + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData(); + useOrgSid = sysOrganization.getSid(); + } + } + return supplierTypeFeign.selSupplierType(useOrgSid); + } + public ResultBean checkSaveCode(String supplierTypeCode, String orgSid){ + return supplierTypeFeign.checkSaveCode(supplierTypeCode,orgSid); + } +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/suppliertype/SupplierTypeVo.java b/oms/src/main/java/com/yxt/oms/biz/func/suppliertype/SupplierTypeVo.java new file mode 100644 index 0000000..ee0cbb0 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/suppliertype/SupplierTypeVo.java @@ -0,0 +1,64 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.suppliertype; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-base(仓储基础信息供应商)
+ * File: BaseSupplierTypeVo.java
+ * Class: com.yxt.anrui.as.api.basesuppliertype.BaseSupplierTypeVo
+ * Description: 供应商类型 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-13 16:51:56
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "供应商类型 视图数据对象", description = "供应商类型 视图数据对象") +public class SupplierTypeVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("供应商类型名称") + private String supplierTypeName; // 供应商类型名称 + @ApiModelProperty("供应商类型编码") + private String supplierTypeCode; + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoService.java b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoService.java index 5d53cd3..6c9704e 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoService.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoService.java @@ -94,8 +94,8 @@ public class SysStaffinfoService extends MybatisBaseService selectDetailsBySid(String sid) { - return sysStaffinfoFeign.fetchBySid(sid); + public ResultBean selectDetailsBySid(String sid,String orgSid) { + return sysStaffinfoFeign.fetchBySid(sid,orgSid); } /** diff --git a/oms/src/main/java/com/yxt/oms/biz/func/warehousearea/WarehouseArea.java b/oms/src/main/java/com/yxt/oms/biz/func/warehousearea/WarehouseArea.java new file mode 100644 index 0000000..ee91852 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/warehousearea/WarehouseArea.java @@ -0,0 +1,28 @@ +package com.yxt.oms.biz.func.warehousearea; + +import com.yxt.common.core.domain.BaseEntity; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/2/28 8:38 + */ +@Data +public class WarehouseArea extends BaseEntity { +// private String id; +// private String sid= UUID.randomUUID().toString(); +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") +// private Date createTime; +// private String remarks; +// private String isEnable; + private String areaName;//库位名称 + private String areaCode;//库位编码 + private String warehouseSid;//仓库sid + private String volume;//库位容量 + private String unit;//计量单位 + private String areaTypeSid;//货区类型 + + private String useOrgSid;//创建组织sid + private String createOrgSid;//创建组织sid + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/warehousearea/WarehouseAreaAllVo.java b/oms/src/main/java/com/yxt/oms/biz/func/warehousearea/WarehouseAreaAllVo.java new file mode 100644 index 0000000..fce48b9 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/warehousearea/WarehouseAreaAllVo.java @@ -0,0 +1,56 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.warehousearea; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-oms(仓库)
+ * File: omsWarehouseAreaVo.java
+ * Class: com.yxt.oms.api.omswarehousearea.omsWarehouseAreaVo
+ * Description: 库区 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-09 14:35:56
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "库区 视图数据详情", description = "库区 视图数据详情") +public class WarehouseAreaAllVo implements Vo { + + private String sid; + @ApiModelProperty("库位名称") + private String areaName; + @ApiModelProperty("库位编码") + private String areaCode; +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/warehousearea/WarehouseAreaDto.java b/oms/src/main/java/com/yxt/oms/biz/func/warehousearea/WarehouseAreaDto.java new file mode 100644 index 0000000..6a0e186 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/warehousearea/WarehouseAreaDto.java @@ -0,0 +1,32 @@ +package com.yxt.oms.biz.func.warehousearea; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.dto.Dto; +import lombok.Data; + +import java.util.Date; + +/** + * @author wangpengfei + * @date 2024/2/26 13:38 + */ +@Data +public class WarehouseAreaDto implements Dto { + private String id; + private String sid; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + private String remarks; + private String isEnable; + private String areaName;//库位名称 + private String areaCode;//库位编码 + private String warehouseSid;//仓库sid + private String volume;//库位容量 + private String unit;//计量单位 + private String areaTypeSid;//货区类型 + private String useOrgSid;//创建组织sid + private String createOrgSid;//创建组织sid + private String userSid; //登录用户sid + private String orgPath; //组织全路径 + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/warehousearea/WarehouseAreaMapper.java b/oms/src/main/java/com/yxt/oms/biz/func/warehousearea/WarehouseAreaMapper.java new file mode 100644 index 0000000..b6bafc7 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/warehousearea/WarehouseAreaMapper.java @@ -0,0 +1,24 @@ +package com.yxt.oms.biz.func.warehousearea; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/2/26 13:40 + */ +@Mapper +public interface WarehouseAreaMapper extends BaseMapper { + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + WarehouseAreaVo initialization (@Param("sid") String sid); + int updateBySidIsDelete(List list); + @Select("select * from oms_warehouse_area where warehouseSid = #{ckSid}") + List selectAll(String ckSid); +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/warehousearea/WarehouseAreaMapper.xml b/oms/src/main/java/com/yxt/oms/biz/func/warehousearea/WarehouseAreaMapper.xml new file mode 100644 index 0000000..406bfb3 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/warehousearea/WarehouseAreaMapper.xml @@ -0,0 +1,34 @@ + + + + + + + + + + UPDATE warehouse_area + SET isDelete=1 + where sid in + + #{item} + + + \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/warehousearea/WarehouseAreaQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/warehousearea/WarehouseAreaQuery.java new file mode 100644 index 0000000..64c357b --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/warehousearea/WarehouseAreaQuery.java @@ -0,0 +1,26 @@ +package com.yxt.oms.biz.func.warehousearea; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/2/26 13:37 + */ +@Data +public class WarehouseAreaQuery implements Query { + private String name;//名字 + private String code;//编码 + private String warehouseSid;//仓库 + private String areaTypeSid;//库区类型 + private String orgLevelKey;//数据权限 + private int index;//下标 + + @ApiModelProperty("菜单路由") + private String menuUrl; + @ApiModelProperty("组织全路径sid") + private String orgPath; + @ApiModelProperty("用户sid") + private String userSid; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/warehousearea/WarehouseAreaService.java b/oms/src/main/java/com/yxt/oms/biz/func/warehousearea/WarehouseAreaService.java new file mode 100644 index 0000000..117563c --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/warehousearea/WarehouseAreaService.java @@ -0,0 +1,125 @@ +package com.yxt.oms.biz.func.warehousearea; + +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.StringUtils; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.commonmethod.CommonMethod; +import com.yxt.oms.biz.func.commonmethod.DataRule; +import com.yxt.oms.biz.func.sysorganization.SysOrganizationVo; +import com.yxt.oms.feign.portal.privilege.PrivilegeQuery; +import com.yxt.oms.feign.portal.sysorganization.SysOrganizationFeign; +import com.yxt.oms.feign.portal.sysstafforg.SysStaffOrgFeign; +import com.yxt.oms.feign.portal.sysuser.SysUserFeign; +import com.yxt.oms.feign.warehouse.warehousearea.WarehouseAreaFeign; +import com.yxt.oms.utils.OrgPathQuery; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Arrays; +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/2/26 13:40 + */ +@Service +public class WarehouseAreaService extends MybatisBaseService { + @Autowired + WarehouseAreaFeign warehouseAreaFeign; + @Autowired + SysOrganizationFeign sysOrganizationFeign; + @Autowired + SysStaffOrgFeign sysStaffOrgFeign; + @Autowired + SysUserFeign sysUserFeign; + @Autowired + CommonMethod commonMethod; + public ResultBean> listPage(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + WarehouseAreaQuery query = pq.getParams(); + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + //通用组装方法 根据用户sid、菜单、组织全路径sid 获取组装参数 + DataRule dataRule=commonMethod.dataRule(query.getOrgPath(),query.getMenuUrl(),query.getUserSid()).getData(); + pq.getParams().setOrgLevelKey(dataRule.getDataRuleId()); + pq.getParams().setIndex(dataRule.getIndex()); + PagerVo p = warehouseAreaFeign.listPage(pq).getData(); + return rb.success().setData(p); + } + public ResultBean> getAllType(OrgPathQuery query) { + ResultBean rb = ResultBean.fireFail(); + String useOrgSid = ""; + String orgPath = query.getOrgPath(); + if (StringUtils.isNotBlank(orgPath)) { + List split = Arrays.asList(orgPath.split("/")); + if (split.size() > 1) { + //获取本级sid获取本级部门信息 + SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData(); + useOrgSid = sysOrganization1.getSid(); + } else { + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData(); + useOrgSid = sysOrganization.getSid(); + } + } + return warehouseAreaFeign.listAll(query); + } + + public ResultBean saveOrUpdate(WarehouseAreaDto dto) { + ResultBean rb = ResultBean.fireFail(); + String orgPath = dto.getOrgPath(); + if (StringUtils.isBlank(dto.getSid())) { + String deptName = ""; + String deptSid = ""; + String createOrgSid = ""; + if (StringUtils.isNotBlank(orgPath)) { + List split = Arrays.asList(orgPath.split("/")); + if (split.size() > 1) { + //获取本级sid获取本级部门信息 + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(split.size() - 2)).getData(); + SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData(); + deptName = sysOrganization.getName() + "/" + sysOrganization1.getName(); + deptName = sysOrganization1.getName(); + deptSid = sysOrganization1.getSid(); + } else { + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData(); + deptName = sysOrganization.getName(); + deptName = sysOrganization.getName(); + deptSid = sysOrganization.getSid(); + } + dto.setUseOrgSid(deptSid); + createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + //创建组织使用组织 + ResultBean organizationResultBean = sysOrganizationFeign.fetchBySid(createOrgSid); + if (organizationResultBean.getData() != null) { + dto.setCreateOrgSid(createOrgSid); + } + } + } + return warehouseAreaFeign.saveOrUpdate(dto); + } + + public ResultBean initialization(String sid) { + + return warehouseAreaFeign.initialization(sid); + } + + + public ResultBean delete(String sid) { + return warehouseAreaFeign.delete(sid); + } + + public ResultBean delAll(String[] sids) { + return warehouseAreaFeign.delBySids(sids); + } + + public ResultBean updateIsEnable(String sid,String isEnable) { + ResultBean rb = ResultBean.fireFail(); + + return warehouseAreaFeign.updateIsEnable(sid, isEnable); + } + + public ResultBean> selectAll(String ckSid) { + return warehouseAreaFeign.selectAll(ckSid); + } +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/warehousearea/WarehouseAreaVo.java b/oms/src/main/java/com/yxt/oms/biz/func/warehousearea/WarehouseAreaVo.java new file mode 100644 index 0000000..dfa8c33 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/warehousearea/WarehouseAreaVo.java @@ -0,0 +1,38 @@ +package com.yxt.oms.biz.func.warehousearea; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +import java.util.Date; + +/** + * @author wangpengfei + * @date 2024/2/26 13:37 + */ +@Data +public class WarehouseAreaVo implements Vo { + private String id; + private String sid; + private String lockVersion; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date modifyTime; + private String remarks; + private String isEnable; + private String state; + private String isDelete; + private String areaName;//库位名称 + private String areaCode;//库位编码 + private String warehouseSid;//仓库sid + private String volume;//库位容量 + private String unit;//计量单位 + private String areaTypeSid;//货区类型 + private String warehouseName;//仓库名称 + private String areaTypeName;//货区类型名称 + private String useOrgSid;//创建组织sid + private String createOrgSid;//创建组织sid + private String userSid; //登录用户sid + private String orgPath; //组织全路径 +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/warehouseareatype/WarehouseAreaType.java b/oms/src/main/java/com/yxt/oms/biz/func/warehouseareatype/WarehouseAreaType.java new file mode 100644 index 0000000..2a1b0f2 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/warehouseareatype/WarehouseAreaType.java @@ -0,0 +1,17 @@ +package com.yxt.oms.biz.func.warehouseareatype; + +import com.yxt.common.core.domain.BaseEntity; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/2/28 8:38 + */ +@Data +public class WarehouseAreaType extends BaseEntity { + + private String warehouseAreaTypeName;//库位类型名称 + private String useOrgSid;//使用组织sid + private String createOrgSid;//创建组织sid + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/warehouseareatype/WarehouseAreaTypeDto.java b/oms/src/main/java/com/yxt/oms/biz/func/warehouseareatype/WarehouseAreaTypeDto.java new file mode 100644 index 0000000..9cd669c --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/warehouseareatype/WarehouseAreaTypeDto.java @@ -0,0 +1,27 @@ +package com.yxt.oms.biz.func.warehouseareatype; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.dto.Dto; +import lombok.Data; + +import java.util.Date; + +/** + * @author wangpengfei + * @date 2024/2/26 13:38 + */ +@Data +public class WarehouseAreaTypeDto implements Dto { + private String id; + private String sid; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + private String remarks; + private String isEnable; + private String warehouseAreaTypeName;//库位类型名称 + private String useOrgSid;//使用组织sid + private String createOrgSid;//创建组织sid + private String userSid; //登录用户sid + private String orgPath; //组织全路径 + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/warehouseareatype/WarehouseAreaTypeMapper.java b/oms/src/main/java/com/yxt/oms/biz/func/warehouseareatype/WarehouseAreaTypeMapper.java new file mode 100644 index 0000000..5deaedd --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/warehouseareatype/WarehouseAreaTypeMapper.java @@ -0,0 +1,21 @@ +package com.yxt.oms.biz.func.warehouseareatype; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/2/26 13:40 + */ +@Mapper +public interface WarehouseAreaTypeMapper extends BaseMapper { + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + WarehouseAreaTypeVo initialization (@Param("sid") String sid); + int updateBySidIsDelete(List list); +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/warehouseareatype/WarehouseAreaTypeMapper.xml b/oms/src/main/java/com/yxt/oms/biz/func/warehouseareatype/WarehouseAreaTypeMapper.xml new file mode 100644 index 0000000..f6dc8f8 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/warehouseareatype/WarehouseAreaTypeMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + + + UPDATE warehouse_area_type + SET isDelete=1 + where sid in + + #{item} + + + \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/warehouseareatype/WarehouseAreaTypeQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/warehouseareatype/WarehouseAreaTypeQuery.java new file mode 100644 index 0000000..52b508c --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/warehouseareatype/WarehouseAreaTypeQuery.java @@ -0,0 +1,22 @@ +package com.yxt.oms.biz.func.warehouseareatype; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/2/26 13:37 + */ +@Data +public class WarehouseAreaTypeQuery implements Query { + private String name; + private String orgLevelKey;//权限等级 + @ApiModelProperty("菜单路由") + private String menuUrl; + @ApiModelProperty("组织全路径sid") + private String orgPath; + @ApiModelProperty("用户sid") + private String userSid; + private int index;//下标 +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/warehouseareatype/WarehouseAreaTypeService.java b/oms/src/main/java/com/yxt/oms/biz/func/warehouseareatype/WarehouseAreaTypeService.java new file mode 100644 index 0000000..19c059e --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/warehouseareatype/WarehouseAreaTypeService.java @@ -0,0 +1,117 @@ +package com.yxt.oms.biz.func.warehouseareatype; + +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.StringUtils; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.commonmethod.CommonMethod; +import com.yxt.oms.biz.func.commonmethod.DataRule; +import com.yxt.oms.biz.func.sysorganization.SysOrganizationVo; +import com.yxt.oms.feign.portal.sysorganization.SysOrganizationFeign; +import com.yxt.oms.feign.portal.sysstafforg.SysStaffOrgFeign; +import com.yxt.oms.feign.portal.sysuser.SysUserFeign; +import com.yxt.oms.feign.warehouse.warehouseareatype.WarehouseAreaTypeFeign; +import com.yxt.oms.utils.OrgPathQuery; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Arrays; +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/2/26 13:40 + */ +@Service +public class WarehouseAreaTypeService extends MybatisBaseService { + + @Autowired + WarehouseAreaTypeFeign warehouseAreaTypeFeign; + @Autowired + SysOrganizationFeign sysOrganizationFeign; + @Autowired + SysStaffOrgFeign sysStaffOrgFeign; + @Autowired + SysUserFeign sysUserFeign; + @Autowired + CommonMethod commonMethod; + public ResultBean> listPage(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + WarehouseAreaTypeQuery query = pq.getParams(); + //通用组装方法 根据用户sid、菜单、组织全路径sid 获取组装参数 + DataRule dataRule=commonMethod.dataRule(query.getOrgPath(),query.getMenuUrl(),query.getUserSid()).getData(); + pq.getParams().setOrgLevelKey(dataRule.getDataRuleId()); + pq.getParams().setIndex(dataRule.getIndex()); + PagerVo p = warehouseAreaTypeFeign.listPage(pq).getData(); + return rb.success().setData(p); + } + public ResultBean> listAll(OrgPathQuery query) { + ResultBean rb = ResultBean.fireFail(); + String useOrgSid = ""; + String orgPath = query.getOrgPath(); + if (StringUtils.isNotBlank(orgPath)) { + List split = Arrays.asList(orgPath.split("/")); + if (split.size() > 1) { + //获取本级sid获取本级部门信息 + SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData(); + useOrgSid = sysOrganization1.getSid(); + } else { + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData(); + useOrgSid = sysOrganization.getSid(); + } + } + return warehouseAreaTypeFeign.listAll(query); + } + + public ResultBean saveOrUpdate(WarehouseAreaTypeDto dto) { + String orgPath = dto.getOrgPath(); + if (StringUtils.isBlank(dto.getSid())) { + String deptName = ""; + String deptSid = ""; + String createOrgSid = ""; + if (StringUtils.isNotBlank(orgPath)) { + List split = Arrays.asList(orgPath.split("/")); + if (split.size() > 1) { + //获取本级sid获取本级部门信息 + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(split.size() - 2)).getData(); + SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData(); + deptName = sysOrganization.getName() + "/" + sysOrganization1.getName(); + deptName = sysOrganization1.getName(); + deptSid = sysOrganization1.getSid(); + } else { + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData(); + deptName = sysOrganization.getName(); + deptName = sysOrganization.getName(); + deptSid = sysOrganization.getSid(); + } + dto.setUseOrgSid(deptSid); + createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + //创建组织使用组织 + ResultBean organizationResultBean = sysOrganizationFeign.fetchBySid(createOrgSid); + if (organizationResultBean.getData() != null) { + dto.setCreateOrgSid(createOrgSid); + } + } + } + return warehouseAreaTypeFeign.saveOrUpdate(dto); + } + + public ResultBean initialization(String sid) { + + return warehouseAreaTypeFeign.initialization(sid); + } + + + public ResultBean delete(String sid) { + + return warehouseAreaTypeFeign.delete(sid); + } + public ResultBean delAll(String[] sids) { + return warehouseAreaTypeFeign.delBySids(sids); + } + public ResultBean updateIsEnable(String sid,String isEnable) { + + return warehouseAreaTypeFeign.updateIsEnable(sid, isEnable); + } +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/warehouseareatype/WarehouseAreaTypeVo.java b/oms/src/main/java/com/yxt/oms/biz/func/warehouseareatype/WarehouseAreaTypeVo.java new file mode 100644 index 0000000..967edbe --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/warehouseareatype/WarehouseAreaTypeVo.java @@ -0,0 +1,29 @@ +package com.yxt.oms.biz.func.warehouseareatype; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +import java.util.Date; + +/** + * @author wangpengfei + * @date 2024/2/26 13:37 + */ +@Data +public class WarehouseAreaTypeVo implements Vo { + private String id; + private String sid; + private String lockVersion; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date modifyTime; + private String remarks; + private String isEnable; + private String state; + private String isDelete; + private String warehouseAreaTypeName;//库位类型名称 + private String useOrgSid;//使用组织sid + private String createOrgSid;//创建组织sid +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/warehouseextend/WarehouseExtend.java b/oms/src/main/java/com/yxt/oms/biz/func/warehouseextend/WarehouseExtend.java new file mode 100644 index 0000000..58b6ae2 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/warehouseextend/WarehouseExtend.java @@ -0,0 +1,20 @@ +package com.yxt.oms.biz.func.warehouseextend; + +import com.yxt.common.core.domain.BaseEntity; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/2/26 13:36 + */ +@Data +public class WarehouseExtend extends BaseEntity { + + private String warehouseSid;//仓库sid + private Integer markupRate1;//加价率1 + private Integer markupRate2;//加价率2 + private Integer markupRate3;//加价率3 + private Integer markupRate4;//加价率4 + private Integer markupRate5;//加价率5 + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/warehouseextend/WarehouseExtendDto.java b/oms/src/main/java/com/yxt/oms/biz/func/warehouseextend/WarehouseExtendDto.java new file mode 100644 index 0000000..02ec7bb --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/warehouseextend/WarehouseExtendDto.java @@ -0,0 +1,27 @@ +package com.yxt.oms.biz.func.warehouseextend; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.dto.Dto; +import lombok.Data; + +import java.util.Date; + +/** + * @author wangpengfei + * @date 2024/2/26 13:38 + */ +@Data +public class WarehouseExtendDto implements Dto { + private String id; + private String sid; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + private String remarks; + private String isEnable; + private String warehouseSid;//仓库sid + private Integer markupRate1;//加价率1 + private Integer markupRate2;//加价率2 + private Integer markupRate3;//加价率3 + private Integer markupRate4;//加价率4 + private Integer markupRate5;//加价率5 +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/warehouseextend/WarehouseExtendMapper.java b/oms/src/main/java/com/yxt/oms/biz/func/warehouseextend/WarehouseExtendMapper.java new file mode 100644 index 0000000..1fc3651 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/warehouseextend/WarehouseExtendMapper.java @@ -0,0 +1,13 @@ +package com.yxt.oms.biz.func.warehouseextend; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * @author wangpengfei + * @date 2024/2/26 13:40 + */ +@Mapper +public interface WarehouseExtendMapper extends BaseMapper { + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/warehouseextend/WarehouseExtendMapper.xml b/oms/src/main/java/com/yxt/oms/biz/func/warehouseextend/WarehouseExtendMapper.xml new file mode 100644 index 0000000..ec54f78 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/warehouseextend/WarehouseExtendMapper.xml @@ -0,0 +1,15 @@ + + + + + + + + \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/warehouseextend/WarehouseExtendQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/warehouseextend/WarehouseExtendQuery.java new file mode 100644 index 0000000..033d157 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/warehouseextend/WarehouseExtendQuery.java @@ -0,0 +1,13 @@ +package com.yxt.oms.biz.func.warehouseextend; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/2/26 13:37 + */ +@Data +public class WarehouseExtendQuery implements Query { + private String name; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/warehouseextend/WarehouseExtendService.java b/oms/src/main/java/com/yxt/oms/biz/func/warehouseextend/WarehouseExtendService.java new file mode 100644 index 0000000..fe0d9c2 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/warehouseextend/WarehouseExtendService.java @@ -0,0 +1,28 @@ +package com.yxt.oms.biz.func.warehouseextend; + +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.core.result.ResultBean; +import com.yxt.oms.feign.warehouse.warehouseextend.WarehouseExtendFeign; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * @author wangpengfei + * @date 2024/2/26 13:40 + */ +@Service +public class WarehouseExtendService extends MybatisBaseService { + + @Autowired + WarehouseExtendFeign omsWarehouseExtendFeign; + public ResultBean saveOrUpdate(WarehouseExtendDto dto) { + + return omsWarehouseExtendFeign.saveOrUpdate(dto); + } + + public ResultBean initialization(String sid) { + + return omsWarehouseExtendFeign.initialization(sid); + } + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/warehouseextend/WarehouseExtendVo.java b/oms/src/main/java/com/yxt/oms/biz/func/warehouseextend/WarehouseExtendVo.java new file mode 100644 index 0000000..516a9fb --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/warehouseextend/WarehouseExtendVo.java @@ -0,0 +1,33 @@ +package com.yxt.oms.biz.func.warehouseextend; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +import java.util.Date; + +/** + * @author wangpengfei + * @date 2024/2/26 13:37 + */ +@Data +public class WarehouseExtendVo implements Vo { + private String id; + private String sid; + private String lockVersion; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date modifyTime; + private String remarks; + private String isEnable; + private String state; + private String isDelete; + private String warehouseSid;//仓库sid + private String warehouseName;//仓库名称 + private Integer markupRate1;//加价率1 + private Integer markupRate2;//加价率2 + private Integer markupRate3;//加价率3 + private Integer markupRate4;//加价率4 + private Integer markupRate5;//加价率5 +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoAllVo.java b/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoAllVo.java new file mode 100644 index 0000000..14024ab --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoAllVo.java @@ -0,0 +1,54 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.warehouseinfo; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-oms(仓库)
+ * File: omsWarehouseInfoVo.java
+ * Class: com.yxt.oms.api.omswarehouseinfo.omsWarehouseInfoVo
+ * Description: 仓库 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-09 14:35:56
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "仓库 视图数据详情", description = "仓库 视图数据详情") +public class WarehouseInfoAllVo implements Vo { + + private String sid; + @ApiModelProperty("仓库名称") + private String warehouseName; +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoDto.java b/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoDto.java new file mode 100644 index 0000000..64b68c6 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoDto.java @@ -0,0 +1,48 @@ +package com.yxt.oms.biz.func.warehouseinfo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.dto.Dto; +import com.yxt.oms.biz.func.warehouseextend.WarehouseExtendDto; +import lombok.Data; + +import java.util.Date; + +/** + * @author wangpengfei + * @date 2024/2/26 13:38 + */ +@Data +public class WarehouseInfoDto implements Dto { + private String id; + private String sid; + private String lockVersion; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date modifyTime; + private String remarks; + private Integer isEnable; + private Integer state; + private Integer isDelete; + private String warehouseName;//仓库名称 + private String warehouseCode;//仓库编码 + private String contacts;//联系人 + private String mob;//手机 + private String telephone;//联系电话 + private String manager;//主管 + private String areaSid;//地区sid + private String address;//地址 + private String longitude;//经度 + private String latitude;//纬度 + private String warehouseTypeKey;//仓库类型Key + private String warehouseTypeValue;//仓库类型value + private Integer usageStatus;//使用状态,0停用 1正常 + private String squareMeter;//平方米 + private Integer sortNo;//排序 + private String useOrgSid;//创建组织sid + private String createOrgSid;//创建组织sid +// private List omsWarehouseExtendDtos; + private WarehouseExtendDto omsWarehouseExtendDto; + private String userSid; //登录用户sid + private String orgPath; //组织全路径 +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoMapper.java b/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoMapper.java new file mode 100644 index 0000000..10ddb24 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoMapper.java @@ -0,0 +1,25 @@ +package com.yxt.oms.biz.func.warehouseinfo; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.oms.biz.func.warehousearea.WarehouseAreaAllVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/2/26 13:40 + */ +@Mapper +public interface WarehouseInfoMapper extends BaseMapper { + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + int updateBySidIsDelete(List list); + @Select("select * from oms_warehouse_info") + List selectAll(); +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoMapper.xml b/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoMapper.xml new file mode 100644 index 0000000..f965d26 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + UPDATE oms_warehouse_info + SET isDelete=1 + where sid in + + #{item} + + + + \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoQuery.java new file mode 100644 index 0000000..e29f812 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoQuery.java @@ -0,0 +1,25 @@ +package com.yxt.oms.biz.func.warehouseinfo; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/2/26 13:37 + */ +@Data +public class WarehouseInfoQuery implements Query { + private String name; + private String code; + private String address; + private String orgLevelKey;//权限等级 + @ApiModelProperty("菜单路由") + private String menuUrl; + @ApiModelProperty("组织全路径sid") + private String orgPath; + @ApiModelProperty("用户sid") + private String userSid; + private int index; + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoService.java b/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoService.java index 8edb8a8..b098af2 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoService.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoService.java @@ -1,9 +1,15 @@ package com.yxt.oms.biz.func.warehouseinfo; import com.yxt.common.base.utils.StringUtils; +import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.commonmethod.CommonMethod; +import com.yxt.oms.biz.func.commonmethod.DataRule; import com.yxt.oms.biz.func.sysorganization.SysOrganizationVo; import com.yxt.oms.feign.portal.sysorganization.SysOrganizationFeign; +import com.yxt.oms.feign.portal.sysstafforg.SysStaffOrgFeign; +import com.yxt.oms.feign.portal.sysuser.SysUserFeign; import com.yxt.oms.feign.warehouse.warehouseinfo.WarehouseInfoFeign; import com.yxt.oms.utils.OrgPathQuery; import org.springframework.beans.factory.annotation.Autowired; @@ -18,16 +24,26 @@ public class WarehouseInfoService { @Autowired - private WarehouseInfoFeign warehouseInfoFeign; - - @Resource - private SysOrganizationFeign sysOrganizationFeign; - + WarehouseInfoFeign warehouseFeign; + @Autowired + SysOrganizationFeign sysOrganizationFeign; + @Autowired + SysStaffOrgFeign sysStaffOrgFeign; + @Autowired + SysUserFeign sysUserFeign; + @Autowired + CommonMethod commonMethod; - public ResultBean> getWareHouse(String createOrgSid) { - return warehouseInfoFeign.getWareHouse(createOrgSid); + public ResultBean> listPage(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + WarehouseInfoQuery query = pq.getParams(); + //通用组装方法 根据用户sid、菜单、组织全路径sid 获取组装参数 + DataRule dataRule=commonMethod.dataRule(query.getOrgPath(),query.getMenuUrl(),query.getUserSid()).getData(); + pq.getParams().setOrgLevelKey(dataRule.getDataRuleId()); + pq.getParams().setIndex(dataRule.getIndex()); + PagerVo p = warehouseFeign.listPage(pq).getData(); + return rb.success().setData(p); } - public ResultBean> listAll(OrgPathQuery query) { ResultBean rb = ResultBean.fireFail(); String useOrgSid = ""; @@ -43,7 +59,64 @@ public class WarehouseInfoService { useOrgSid = sysOrganization.getSid(); } } - List list = warehouseInfoFeign.listAll(query).getData(); + List list = warehouseFeign.listAll(query).getData(); return rb.success().setData(list); } + + public ResultBean saveOrUpdate(WarehouseInfoDto dto) { + String orgPath = dto.getOrgPath(); + if (StringUtils.isBlank(dto.getSid())) { + String deptSid = ""; + String createOrgSid = ""; + if (StringUtils.isNotBlank(orgPath)) { + List split = Arrays.asList(orgPath.split("/")); + if (split.size() > 1) { + //获取本级sid获取本级部门信息 + SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData(); + deptSid = sysOrganization1.getSid(); + } else { + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData(); + deptSid = sysOrganization.getSid(); + } + dto.setUseOrgSid(deptSid); + createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + //创建组织使用组织 + ResultBean organizationResultBean = sysOrganizationFeign.fetchBySid(createOrgSid); + if (organizationResultBean.getData() != null) { + dto.setCreateOrgSid(createOrgSid); + } + } + } + return warehouseFeign.saveOrUpdate(dto); + } + + public ResultBean initialization(String sid) { + + return warehouseFeign.initialization(sid); + } + + + + public ResultBean delete(String sid) { + + return warehouseFeign.delete(sid); + } + + public ResultBean delAll(String[] sids) { + return warehouseFeign.delBySids(sids); + } + public ResultBean updateIsEnable(String sid,String isEnable) { + + return warehouseFeign.updateIsEnable(sid, isEnable); + } + + public ResultBean> selectAll() { + return warehouseFeign.selectAll(); + } + + + public ResultBean> getWareHouse(String createOrgSid) { + return warehouseFeign.getWareHouse(createOrgSid); + } + } diff --git a/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoVo.java b/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoVo.java new file mode 100644 index 0000000..728a2e5 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoVo.java @@ -0,0 +1,46 @@ +package com.yxt.oms.biz.func.warehouseinfo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import com.yxt.oms.biz.func.warehouseextend.WarehouseExtendVo; +import lombok.Data; + +import java.util.Date; +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/2/26 13:37 + */ +@Data +public class WarehouseInfoVo implements Vo { + private String id; + private String sid; + private String lockVersion; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date modifyTime; + private String remarks; + private Integer isEnable; + private Integer state; + private Integer isDelete; + private String warehouseName;//仓库名称 + private String warehouseCode;//仓库编码 + private String contacts;//联系人 + private String mob;//手机 + private String telephone;//联系电话 + private String manager;//主管 + private String areaSid;//地区sid + private String address;//地址 + private String longitude;//经度 + private String latitude;//纬度 + private String warehouseTypeKey;//仓库类型Key + private String warehouseTypeValue;//仓库类型value + private Integer usageStatus;//使用状态,0停用 1正常 + private String squareMeter;//平方米 + private Integer sortNo;//排序 + private String useOrgSid;//创建组织sid + private String createOrgSid;//创建组织sid + private List omsWarehouseExtendVos; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/warehouserack/WarehouseRack.java b/oms/src/main/java/com/yxt/oms/biz/func/warehouserack/WarehouseRack.java new file mode 100644 index 0000000..59ff149 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/warehouserack/WarehouseRack.java @@ -0,0 +1,24 @@ +package com.yxt.oms.biz.func.warehouserack; + +import com.yxt.common.core.domain.BaseEntity; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/2/28 8:38 + */ +@Data +public class WarehouseRack extends BaseEntity { +// private String id; +// private String sid= UUID.randomUUID().toString(); +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") +// private Date createTime; +// private String remarks; +// private String isEnable; + private String rackName;//货架名称 + private String rackCode;//货架编码 + private String warehouseSid;//仓库sid + private String locationSid;//库位sid + private String useOrgSid;//创建组织sid + private String createOrgSid;//创建组织sid +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/warehouserack/WarehouseRackDto.java b/oms/src/main/java/com/yxt/oms/biz/func/warehouserack/WarehouseRackDto.java new file mode 100644 index 0000000..5d86998 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/warehouserack/WarehouseRackDto.java @@ -0,0 +1,29 @@ +package com.yxt.oms.biz.func.warehouserack; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.dto.Dto; +import lombok.Data; + +import java.util.Date; + +/** + * @author wangpengfei + * @date 2024/2/26 13:38 + */ +@Data +public class WarehouseRackDto implements Dto { + private String id; + private String sid; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + private String remarks; + private String isEnable; + private String rackName;//货架名称 + private String rackCode;//货架编码 + private String warehouseSid;//仓库sid + private String locationSid;//库位sid + private String useOrgSid;//创建组织sid + private String createOrgSid;//创建组织sid + private String userSid; //登录用户sid + private String orgPath; //组织全路径 +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/warehouserack/WarehouseRackMapper.java b/oms/src/main/java/com/yxt/oms/biz/func/warehouserack/WarehouseRackMapper.java new file mode 100644 index 0000000..d613f6b --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/warehouserack/WarehouseRackMapper.java @@ -0,0 +1,21 @@ +package com.yxt.oms.biz.func.warehouserack; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/2/26 13:40 + */ +@Mapper +public interface WarehouseRackMapper extends BaseMapper { + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + WarehouseRackVo initialization (@Param("sid") String sid); + int updateBySidIsDelete(List list); +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/warehouserack/WarehouseRackMapper.xml b/oms/src/main/java/com/yxt/oms/biz/func/warehouserack/WarehouseRackMapper.xml new file mode 100644 index 0000000..a6ef09c --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/warehouserack/WarehouseRackMapper.xml @@ -0,0 +1,34 @@ + + + + + + + + + + UPDATE oms_warehouse_rack + SET isDelete=1 + where sid in + + #{item} + + + + \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/warehouserack/WarehouseRackQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/warehouserack/WarehouseRackQuery.java new file mode 100644 index 0000000..ecadcbe --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/warehouserack/WarehouseRackQuery.java @@ -0,0 +1,25 @@ +package com.yxt.oms.biz.func.warehouserack; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/2/26 13:37 + */ +@Data +public class WarehouseRackQuery implements Query { + private String name;//名字 + private String code;//编码 + private String warehouseSid;//仓库 + private String areaTypeSid;//库区类型 + @ApiModelProperty("菜单路由") + private String menuUrl; + @ApiModelProperty("组织全路径sid") + private String orgPath; + @ApiModelProperty("用户sid") + private String userSid; + private String orgLevelKey;//权限等级 + private int index;//下标 +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/warehouserack/WarehouseRackService.java b/oms/src/main/java/com/yxt/oms/biz/func/warehouserack/WarehouseRackService.java new file mode 100644 index 0000000..819d38e --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/warehouserack/WarehouseRackService.java @@ -0,0 +1,102 @@ +package com.yxt.oms.biz.func.warehouserack; + +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.StringUtils; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.commonmethod.CommonMethod; +import com.yxt.oms.biz.func.commonmethod.DataRule; +import com.yxt.oms.biz.func.sysorganization.SysOrganizationVo; +import com.yxt.oms.feign.portal.sysorganization.SysOrganizationFeign; +import com.yxt.oms.feign.portal.sysstafforg.SysStaffOrgFeign; +import com.yxt.oms.feign.portal.sysuser.SysUserFeign; +import com.yxt.oms.feign.warehouse.wmswarehouserack.WarehouseRackFeign; +import com.yxt.oms.utils.OrgPathQuery; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Arrays; +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/2/26 13:40 + */ +@Service +public class WarehouseRackService extends MybatisBaseService { + + @Autowired + WarehouseRackFeign warehouseRackFeign; + @Autowired + SysOrganizationFeign sysOrganizationFeign; + @Autowired + SysStaffOrgFeign sysStaffOrgFeign; + @Autowired + SysUserFeign sysUserFeign; + @Autowired + CommonMethod commonMethod; + + public ResultBean> listPage(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + WarehouseRackQuery query = pq.getParams(); + //通用组装方法 根据用户sid、菜单、组织全路径sid 获取组装参数 + DataRule dataRule=commonMethod.dataRule(query.getOrgPath(),query.getMenuUrl(),query.getUserSid()).getData(); + pq.getParams().setOrgLevelKey(dataRule.getDataRuleId()); + pq.getParams().setIndex(dataRule.getIndex()); + PagerVo p = warehouseRackFeign.listPage(pq).getData(); + return rb.success().setData(p); + } + public ResultBean> listAll(OrgPathQuery query) { + return warehouseRackFeign.listAll(query); + } + + public ResultBean saveOrUpdate(WarehouseRackDto dto) { + String orgPath = dto.getOrgPath(); + if (StringUtils.isBlank(dto.getSid())) { + String deptSid = ""; + String createOrgSid = ""; + if (StringUtils.isNotBlank(orgPath)) { + List split = Arrays.asList(orgPath.split("/")); + if (split.size() > 1) { + //获取本级sid获取本级部门信息 + SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData(); + deptSid = sysOrganization1.getSid(); + } else { + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData(); + deptSid = sysOrganization.getSid(); + } + dto.setUseOrgSid(deptSid); + createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + //创建组织使用组织 + ResultBean organizationResultBean = sysOrganizationFeign.fetchBySid(createOrgSid); + if (organizationResultBean.getData() != null) { + dto.setCreateOrgSid(createOrgSid); + } + } + } + return warehouseRackFeign.saveOrUpdate(dto); + } + + public ResultBean initialization(String sid) { + + return warehouseRackFeign.initialization(sid); + } + + + public ResultBean delete(String sid) { + + return warehouseRackFeign.delete(sid); + } + public ResultBean delAll(String[] sids) { + return warehouseRackFeign.delBySids(sids); + } + + public ResultBean updateIsEnable(String sid,String isEnable) { + return warehouseRackFeign.updateIsEnable(sid, isEnable); + } + + public ResultBean> selectAll(String ckSid){ + return warehouseRackFeign.selectAll(ckSid); + } +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/warehouserack/WarehouseRackVo.java b/oms/src/main/java/com/yxt/oms/biz/func/warehouserack/WarehouseRackVo.java new file mode 100644 index 0000000..03382bb --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/warehouserack/WarehouseRackVo.java @@ -0,0 +1,37 @@ +package com.yxt.oms.biz.func.warehouserack; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +import java.util.Date; + +/** + * @author wangpengfei + * @date 2024/2/26 13:37 + */ +@Data +public class WarehouseRackVo implements Vo { + private String id; + private String sid; + private String lockVersion; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date modifyTime; + private String remarks; + private String isEnable; + private String state; + private String isDelete; + private String rackName;//货架名称 + private String rackCode;//货架编码 + private String warehouseSid;//仓库sid + private String locationSid;//库位sid + private String warehouseName;//仓库名称 + private String locationName;//库位名称 + private String useOrgSid;//创建组织sid + private String createOrgSid;//创建组织sid + private String userSid; + private String orgPath; + +} diff --git a/oms/src/main/java/com/yxt/oms/feign/goods/basebrandinfo/BaseBrandInfoFeign.java b/oms/src/main/java/com/yxt/oms/feign/goods/basebrandinfo/BaseBrandInfoFeign.java new file mode 100644 index 0000000..778e4ec --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/goods/basebrandinfo/BaseBrandInfoFeign.java @@ -0,0 +1,54 @@ +package com.yxt.oms.feign.goods.basebrandinfo; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.basebrandinfo.BaseBrandInfo; +import com.yxt.oms.biz.func.basebrandinfo.BaseBrandInfoDto; +import com.yxt.oms.biz.func.basebrandinfo.BaseBrandInfoQuery; +import com.yxt.oms.biz.func.basebrandinfo.BaseBrandInfoVo; +import com.yxt.oms.utils.OrgPathQuery; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @description: + * @author: wangpengfei + * @date: 2024/4/12 + **/ +@FeignClient( + contextId = "ss-common-goods-GoodsBrand", + name = "ss-common-goods", + path = "/apiadmin/base/basegoodsbrand", + fallback = BaseBrandInfoFeignFallback.class) +public interface BaseBrandInfoFeign { + + + @ApiOperation("分页列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("保存修改") + @PostMapping("/saveOrUpdate") + public ResultBean saveOrUpdate(@RequestBody BaseBrandInfoDto dto); + @ApiOperation("查询所有的品牌") + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody OrgPathQuery query); + @ApiOperation("初始化") + @GetMapping("/initialization/{sid}") + public ResultBean initialization(@PathVariable("sid") String sid); + + @ApiOperation("更改可用状态") + @GetMapping("/updateIsEnable/{sid}/{isEnable}") + public ResultBean updateIsEnable(@PathVariable("sid") String sid,@PathVariable("isEnable")String isEnable); + @ApiOperation("根据品牌名查询") + @GetMapping("/getBrandByName/{name}") + public ResultBean getBrandByName(@PathVariable("name") String name); + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids); + +} diff --git a/oms/src/main/java/com/yxt/oms/feign/goods/basebrandinfo/BaseBrandInfoFeignFallback.java b/oms/src/main/java/com/yxt/oms/feign/goods/basebrandinfo/BaseBrandInfoFeignFallback.java new file mode 100644 index 0000000..0ad4903 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/goods/basebrandinfo/BaseBrandInfoFeignFallback.java @@ -0,0 +1,58 @@ +package com.yxt.oms.feign.goods.basebrandinfo; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.basebrandinfo.BaseBrandInfo; +import com.yxt.oms.biz.func.basebrandinfo.BaseBrandInfoDto; +import com.yxt.oms.biz.func.basebrandinfo.BaseBrandInfoQuery; +import com.yxt.oms.biz.func.basebrandinfo.BaseBrandInfoVo; +import com.yxt.oms.utils.OrgPathQuery; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/3/20 + **/ +@Component +public class BaseBrandInfoFeignFallback implements BaseBrandInfoFeign { + + @Override + public ResultBean> listPage(PagerQuery pq) { + return null; + } + + @Override + public ResultBean saveOrUpdate(BaseBrandInfoDto dto) { + return null; + } + + @Override + public ResultBean> listAll(OrgPathQuery query) { + return null; + } + + + @Override + public ResultBean initialization(String sid) { + return null; + } + + @Override + public ResultBean updateIsEnable(String sid, String isEnable) { + return null; + } + + @Override + public ResultBean getBrandByName(String name) { + return null; + } + + @Override + public ResultBean delBySids(String[] sids) { + return null; + } +} diff --git a/oms/src/main/java/com/yxt/oms/feign/goods/basegoodssku/BaseGoodsSkuFeign.java b/oms/src/main/java/com/yxt/oms/feign/goods/basegoodssku/BaseGoodsSkuFeign.java index 408b31b..5ce97e2 100644 --- a/oms/src/main/java/com/yxt/oms/feign/goods/basegoodssku/BaseGoodsSkuFeign.java +++ b/oms/src/main/java/com/yxt/oms/feign/goods/basegoodssku/BaseGoodsSkuFeign.java @@ -1,7 +1,11 @@ package com.yxt.oms.feign.goods.basegoodssku; +import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; import com.yxt.oms.biz.func.basegoodssku.BaseGoodsSkuVo; +import com.yxt.oms.biz.func.purchasebill.GoodsSkuPurSelectList; +import com.yxt.oms.biz.func.purchasebill.GoodsSkuPurSelectQuery; import com.yxt.oms.utils.OrgPathQuery; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; @@ -24,5 +28,7 @@ public interface BaseGoodsSkuFeign { @ApiOperation("查询组织下所有商品") @PostMapping("/listAllByOrg") public ResultBean> listAllByOrg(@RequestBody OrgPathQuery query); - + @ApiOperation("采购单选择商品") + @PostMapping("/purGoodsListPage") + public ResultBean> purGoodsListPage(@RequestBody PagerQuery pq); } diff --git a/oms/src/main/java/com/yxt/oms/feign/goods/basegoodssku/BaseGoodsSkuFeignFallback.java b/oms/src/main/java/com/yxt/oms/feign/goods/basegoodssku/BaseGoodsSkuFeignFallback.java new file mode 100644 index 0000000..6416bae --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/goods/basegoodssku/BaseGoodsSkuFeignFallback.java @@ -0,0 +1,34 @@ +package com.yxt.oms.feign.goods.basegoodssku; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.basegoodssku.BaseGoodsSkuVo; +import com.yxt.oms.biz.func.purchasebill.GoodsSkuPurSelectList; +import com.yxt.oms.biz.func.purchasebill.GoodsSkuPurSelectQuery; +import com.yxt.oms.utils.OrgPathQuery; +import com.yxt.oms.biz.func.basegoodssku.BaseGoodsSkuVo; +import com.yxt.oms.utils.OrgPathQuery; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/3/20 + **/ +@Component +public class BaseGoodsSkuFeignFallback implements BaseGoodsSkuFeign{ + + + @Override + public ResultBean> purGoodsListPage(PagerQuery pq) { + return null; + } + + @Override + public ResultBean> listAllByOrg(OrgPathQuery query) { + return null; + } +} diff --git a/oms/src/main/java/com/yxt/oms/feign/goods/basegoodsspu/BaseGoodsSpuFeign.java b/oms/src/main/java/com/yxt/oms/feign/goods/basegoodsspu/BaseGoodsSpuFeign.java new file mode 100644 index 0000000..407a7b3 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/goods/basegoodsspu/BaseGoodsSpuFeign.java @@ -0,0 +1,62 @@ +package com.yxt.oms.feign.goods.basegoodsspu; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.goodsspu.SalesGoodsQuery; +import com.yxt.oms.biz.func.goodsspu.SalesGoodsVo; +import com.yxt.oms.biz.func.basegoodsspu.BaseGoodsSpuDto; +import com.yxt.oms.biz.func.basegoodsspu.BaseGoodsSpuQuery; +import com.yxt.oms.biz.func.basegoodsspu.BaseGoodsSpuVo; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.io.IOException; +import java.util.List; + +/** + * @description: + * @author: wangpengfei + * @date: 2024/4/12 + **/ +@FeignClient( + contextId = "ss-common-goods-GoodsSpu", + name = "ss-common-goods", + path = "/apiadmin/base/basegoodsspu", + fallback = BaseGoodsSpuFeignFallback.class) +public interface BaseGoodsSpuFeign { + + + @ApiOperation("分页列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("保存修改") + @PostMapping("/saveOrUpdate") + public ResultBean saveOrUpdate(@RequestBody BaseGoodsSpuDto dto); + + @ApiOperation("初始化") + @GetMapping("/initialization/{sid}") + public ResultBean initialization(@PathVariable("sid") String sid); + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids); + @ApiOperation("更改可用状态") + @GetMapping("/updateIsEnable/{sid}/{isEnable}") + public ResultBean updateIsEnable(@PathVariable("sid") String sid,@PathVariable("isEnable")String isEnable); + @ApiOperation("批量保存") + @PostMapping("/batchSave") + public ResultBean batchSave(@RequestBody List dtos); + @ApiOperation("导入excel") + @PostMapping(value ="/importExcel" ,consumes = MediaType.MULTIPART_FORM_DATA_VALUE) + public ResultBean importExcel(@RequestPart("file") MultipartFile file) throws IOException; + @ApiOperation("更改可用状态") + @GetMapping("/updateIsEnablebySku/{sid}/{isEnable}") + public ResultBean updateIsEnablebySku(@PathVariable("sid") String sid,@PathVariable("isEnable")String isEnable); + @ApiOperation("销售订单获取商品") + @PostMapping("/getGoodsForSales") + public ResultBean> getGoodsForSales(@RequestBody PagerQuery pq); +} diff --git a/oms/src/main/java/com/yxt/oms/feign/goods/basegoodsspu/BaseGoodsSpuFeignFallback.java b/oms/src/main/java/com/yxt/oms/feign/goods/basegoodsspu/BaseGoodsSpuFeignFallback.java new file mode 100644 index 0000000..a323962 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/goods/basegoodsspu/BaseGoodsSpuFeignFallback.java @@ -0,0 +1,72 @@ +package com.yxt.oms.feign.goods.basegoodsspu; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.basegoodsspu.BaseGoodsSpuDto; +import com.yxt.oms.biz.func.basegoodsspu.BaseGoodsSpuQuery; +import com.yxt.oms.biz.func.basegoodsspu.BaseGoodsSpuVo; +import com.yxt.oms.biz.func.goodsspu.SalesGoodsQuery; +import com.yxt.oms.biz.func.goodsspu.SalesGoodsVo; +import com.yxt.oms.biz.func.basegoodsspu.BaseGoodsSpuDto; +import com.yxt.oms.biz.func.basegoodsspu.BaseGoodsSpuQuery; +import com.yxt.oms.biz.func.basegoodsspu.BaseGoodsSpuVo; +import org.springframework.stereotype.Component; +import org.springframework.web.multipart.MultipartFile; + +import java.io.IOException; +import java.util.List; + +/** + * @description: + * @author: wangpengfei + * @date: 2024/4/12 + **/ +@Component +public class BaseGoodsSpuFeignFallback implements BaseGoodsSpuFeign { + + @Override + public ResultBean> listPage(PagerQuery pq) { + return null; + } + + @Override + public ResultBean saveOrUpdate(BaseGoodsSpuDto dto) { + return null; + } + + @Override + public ResultBean initialization(String sid) { + return null; + } + + @Override + public ResultBean delBySids(String[] sids) { + return null; + } + + @Override + public ResultBean updateIsEnable(String sid, String isEnable) { + return null; + } + + @Override + public ResultBean batchSave(List dtos) { + return null; + } + + @Override + public ResultBean importExcel(MultipartFile file) throws IOException { + return null; + } + + @Override + public ResultBean updateIsEnablebySku(String sid, String isEnable) { + return null; + } + + @Override + public ResultBean> getGoodsForSales(PagerQuery pq) { + return null; + } +} diff --git a/oms/src/main/java/com/yxt/oms/feign/goods/basegoodstype/BaseGoodsTypeFeign.java b/oms/src/main/java/com/yxt/oms/feign/goods/basegoodstype/BaseGoodsTypeFeign.java new file mode 100644 index 0000000..5c1988d --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/goods/basegoodstype/BaseGoodsTypeFeign.java @@ -0,0 +1,57 @@ +package com.yxt.oms.feign.goods.basegoodstype; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.basegoodstype.BaseGoodsType; +import com.yxt.oms.biz.func.basegoodstype.BaseGoodsTypeDto; +import com.yxt.oms.biz.func.basegoodstype.BaseGoodsTypeQuery; +import com.yxt.oms.biz.func.basegoodstype.BaseGoodsTypeVo; +import com.yxt.oms.utils.OrgPathQuery; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @description: + * @author: wangpengfei + * @date: 2024/4/12 + **/ +@FeignClient( + contextId = "ss-common-goods-GoodsType", + name = "ss-common-goods", + path = "/apiadmin/base/basegoodstype", + fallback = BaseGoodsTypeFeignFallback.class) +public interface BaseGoodsTypeFeign { + + + @ApiOperation("分页列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("保存修改") + @PostMapping("/saveOrUpdate") + public ResultBean saveOrUpdate(@RequestBody BaseGoodsTypeDto dto); + @ApiOperation("查询所有的品牌") + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody OrgPathQuery query); + @ApiOperation("初始化") + @GetMapping("/initialization/{sid}") + public ResultBean initialization(@PathVariable("sid") String sid); + + @ApiOperation("更改可用状态") + @GetMapping("/updateIsEnable/{sid}/{isEnable}") + public ResultBean updateIsEnable(@PathVariable("sid") String sid,@PathVariable("isEnable")String isEnable); + @ApiOperation("根据类型名查询") + @GetMapping("/getTypeByName/{name}") + public ResultBean getTypeByName(@PathVariable("name") String name); + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids); + @ApiOperation("更改商品是否一品一码") + @GetMapping("/updateIsGoodsID/{sid}/{state}") + public ResultBean updateIsGoodsID(@PathVariable("sid") String sid,@PathVariable("state")String state); + +} diff --git a/oms/src/main/java/com/yxt/oms/feign/goods/basegoodstype/BaseGoodsTypeFeignFallback.java b/oms/src/main/java/com/yxt/oms/feign/goods/basegoodstype/BaseGoodsTypeFeignFallback.java new file mode 100644 index 0000000..ef8781c --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/goods/basegoodstype/BaseGoodsTypeFeignFallback.java @@ -0,0 +1,63 @@ +package com.yxt.oms.feign.goods.basegoodstype; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.basegoodstype.BaseGoodsType; +import com.yxt.oms.biz.func.basegoodstype.BaseGoodsTypeDto; +import com.yxt.oms.biz.func.basegoodstype.BaseGoodsTypeQuery; +import com.yxt.oms.biz.func.basegoodstype.BaseGoodsTypeVo; +import com.yxt.oms.utils.OrgPathQuery; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * @description: + * @author: wangpengfei + * @date: 2024/4/12 + **/ +@Component +public class BaseGoodsTypeFeignFallback implements BaseGoodsTypeFeign { + + @Override + public ResultBean> listPage(PagerQuery pq) { + return null; + } + + @Override + public ResultBean saveOrUpdate(BaseGoodsTypeDto dto) { + return null; + } + + @Override + public ResultBean> listAll(OrgPathQuery query) { + return null; + } + + + @Override + public ResultBean initialization(String sid) { + return null; + } + + @Override + public ResultBean updateIsEnable(String sid, String isEnable) { + return null; + } + + @Override + public ResultBean getTypeByName(String name) { + return null; + } + + @Override + public ResultBean delBySids(String[] sids) { + return null; + } + + @Override + public ResultBean updateIsGoodsID(String sid, String state) { + return null; + } +} diff --git a/oms/src/main/java/com/yxt/oms/feign/goods/basegoodsunit/BaseGoodsUnitFeign.java b/oms/src/main/java/com/yxt/oms/feign/goods/basegoodsunit/BaseGoodsUnitFeign.java new file mode 100644 index 0000000..336e1e8 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/goods/basegoodsunit/BaseGoodsUnitFeign.java @@ -0,0 +1,54 @@ +package com.yxt.oms.feign.goods.basegoodsunit; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.basegoodsunit.BaseGoodsUnit; +import com.yxt.oms.biz.func.basegoodsunit.BaseGoodsUnitDto; +import com.yxt.oms.biz.func.basegoodsunit.BaseGoodsUnitQuery; +import com.yxt.oms.biz.func.basegoodsunit.BaseGoodsUnitVo; +import com.yxt.oms.utils.OrgPathQuery; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @description: + * @author: wangpengfei + * @date: 2024/4/12 + **/ +@FeignClient( + contextId = "ss-common-goods-GoodsUnit", + name = "ss-common-goods", + path = "/apiadmin/base/basegoodsunit", + fallback = BaseGoodsUnitFeignFallback.class) +public interface BaseGoodsUnitFeign { + + + @ApiOperation("分页列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("保存修改") + @PostMapping("/saveOrUpdate") + public ResultBean saveOrUpdate(@RequestBody BaseGoodsUnitDto dto); + @ApiOperation("查询所有的品牌") + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody OrgPathQuery query); + @ApiOperation("初始化") + @GetMapping("/initialization/{sid}") + public ResultBean initialization(@PathVariable("sid") String sid); + + @ApiOperation("更改可用状态") + @GetMapping("/updateIsEnable/{sid}/{isEnable}") + public ResultBean updateIsEnable(@PathVariable("sid") String sid,@PathVariable("isEnable")String isEnable); + @ApiOperation("根据单位名查询") + @GetMapping("/getUnitByName/{name}") + public ResultBean getUnitByName(@PathVariable("name") String name); + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids); + +} diff --git a/oms/src/main/java/com/yxt/oms/feign/goods/basegoodsunit/BaseGoodsUnitFeignFallback.java b/oms/src/main/java/com/yxt/oms/feign/goods/basegoodsunit/BaseGoodsUnitFeignFallback.java new file mode 100644 index 0000000..b63220f --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/goods/basegoodsunit/BaseGoodsUnitFeignFallback.java @@ -0,0 +1,60 @@ +package com.yxt.oms.feign.goods.basegoodsunit; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.basegoodsunit.BaseGoodsUnit; +import com.yxt.oms.biz.func.basegoodsunit.BaseGoodsUnitDto; +import com.yxt.oms.biz.func.basegoodsunit.BaseGoodsUnitQuery; +import com.yxt.oms.biz.func.basegoodsunit.BaseGoodsUnitVo; +import com.yxt.oms.utils.OrgPathQuery; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * @description: + * @author: wangpengfei + * @date: 2024/4/12 + **/ +@Component +public class BaseGoodsUnitFeignFallback implements BaseGoodsUnitFeign { + + + @Override + public ResultBean> listPage(PagerQuery pq) { + return null; + } + + @Override + public ResultBean saveOrUpdate(BaseGoodsUnitDto dto) { + return null; + } + + @Override + public ResultBean> listAll(OrgPathQuery query) { + return null; + } + + + + @Override + public ResultBean initialization(String sid) { + return null; + } + + @Override + public ResultBean updateIsEnable(String sid, String isEnable) { + return null; + } + + @Override + public ResultBean getUnitByName(String name) { + return null; + } + + @Override + public ResultBean delBySids(String[] sids) { + return null; + } +} diff --git a/oms/src/main/java/com/yxt/oms/feign/goods/basemanufacturer/BaseManufacturerFeign.java b/oms/src/main/java/com/yxt/oms/feign/goods/basemanufacturer/BaseManufacturerFeign.java new file mode 100644 index 0000000..24735d4 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/goods/basemanufacturer/BaseManufacturerFeign.java @@ -0,0 +1,58 @@ +package com.yxt.oms.feign.goods.basemanufacturer; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.basemanufacturer.BaseManufacturer; +import com.yxt.oms.biz.func.basemanufacturer.BaseManufacturerDto; +import com.yxt.oms.biz.func.basemanufacturer.BaseManufacturerQuery; +import com.yxt.oms.biz.func.basemanufacturer.BaseManufacturerVo; +import com.yxt.oms.utils.OrgPathQuery; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @description: + * @author: wangpengfei + * @date: 2024/4/12 + **/ +@FeignClient( + contextId = "ss-common-goods-GoodsManufacturer", + name = "ss-common-goods", + path = "/apiadmin/base/basemanufacturer", + fallback = BaseManufacturerFeignFallback.class) +public interface BaseManufacturerFeign { + + + @ApiOperation("分页列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("保存修改") + @PostMapping("/saveOrUpdate") + public ResultBean saveOrUpdate(@RequestBody BaseManufacturerDto dto); + @ApiOperation("查询所有的品牌") + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody OrgPathQuery query); + @ApiOperation("初始化") + @GetMapping("/initialization/{sid}") + public ResultBean initialization(@PathVariable("sid") String sid); + + @ApiOperation("更改可用状态") + @GetMapping("/updateIsEnable/{sid}/{isEnable}") + public ResultBean updateIsEnable(@PathVariable("sid") String sid,@PathVariable("isEnable")String isEnable); + + @ApiOperation("查询分公司下所有的厂家") + @GetMapping("/getAllTypeByUseOrgSid") + public ResultBean> getAllTypeByUseOrgSid(@RequestParam("useOrgSid") String useOrgSid); + @ApiOperation("根据厂家名查询") + @GetMapping("/getManufacturerByName/{name}") + public ResultBean getManufacturerByName(@PathVariable("name") String name); + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids); + +} diff --git a/oms/src/main/java/com/yxt/oms/feign/goods/basemanufacturer/BaseManufacturerFeignFallback.java b/oms/src/main/java/com/yxt/oms/feign/goods/basemanufacturer/BaseManufacturerFeignFallback.java new file mode 100644 index 0000000..2c96e07 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/goods/basemanufacturer/BaseManufacturerFeignFallback.java @@ -0,0 +1,64 @@ +package com.yxt.oms.feign.goods.basemanufacturer; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.basemanufacturer.BaseManufacturer; +import com.yxt.oms.biz.func.basemanufacturer.BaseManufacturerDto; +import com.yxt.oms.biz.func.basemanufacturer.BaseManufacturerQuery; +import com.yxt.oms.biz.func.basemanufacturer.BaseManufacturerVo; +import com.yxt.oms.utils.OrgPathQuery; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * @description: + * @author: wangpengfei + * @date: 2024/4/12 + **/ +@Component +public class BaseManufacturerFeignFallback implements BaseManufacturerFeign { + + + @Override + public ResultBean> listPage(PagerQuery pq) { + return null; + } + + @Override + public ResultBean saveOrUpdate(BaseManufacturerDto dto) { + return null; + } + + @Override + public ResultBean> listAll(OrgPathQuery query) { + return null; + } + + + @Override + public ResultBean initialization(String sid) { + return null; + } + + @Override + public ResultBean updateIsEnable(String sid, String isEnable) { + return null; + } + + @Override + public ResultBean> getAllTypeByUseOrgSid(String useOrgSid) { + return null; + } + + @Override + public ResultBean getManufacturerByName(String name) { + return null; + } + + @Override + public ResultBean delBySids(String[] sids) { + return null; + } +} diff --git a/oms/src/main/java/com/yxt/oms/feign/goods/goodsSpu/GoodsSpuFeign.java b/oms/src/main/java/com/yxt/oms/feign/goods/goodsSpu/GoodsSpuFeign.java deleted file mode 100644 index 5ba2975..0000000 --- a/oms/src/main/java/com/yxt/oms/feign/goods/goodsSpu/GoodsSpuFeign.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.yxt.oms.feign.goods.goodsSpu; - -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; -import com.yxt.oms.biz.func.goodsspu.SalesGoodsQuery; -import com.yxt.oms.biz.func.goodsspu.SalesGoodsVo; -import io.swagger.annotations.ApiOperation; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; - -/** - * @description: - * @author: fzz - * @date: 2024/7/4 - **/ -@FeignClient( - contextId = "ss-goods-GoodsSpu", - name = "ss-common-goods", - path = "/apiadmin/base/basegoodsspu") -public interface GoodsSpuFeign { - - @ApiOperation("销售订单获取商品") - @PostMapping("/getGoodsForSales") - public ResultBean> getGoodsForSales(@RequestBody PagerQuery pq); -} diff --git a/oms/src/main/java/com/yxt/oms/feign/goods/sku/GoodsSkuFeign.java b/oms/src/main/java/com/yxt/oms/feign/goods/sku/GoodsSkuFeign.java deleted file mode 100644 index 6b1fc7b..0000000 --- a/oms/src/main/java/com/yxt/oms/feign/goods/sku/GoodsSkuFeign.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.yxt.oms.feign.goods.sku; - -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; -import com.yxt.oms.biz.func.purchasebill.GoodsSkuPurSelectList; -import com.yxt.oms.biz.func.purchasebill.GoodsSkuPurSelectQuery; -import com.yxt.oms.biz.func.smssalesbill.SmsSalesBillDetailsVo; -import com.yxt.oms.biz.func.smssalesbill.SmsSalesBillDto; -import com.yxt.oms.biz.func.smssalesbill.SmsSalesBillQuery; -import com.yxt.oms.biz.func.smssalesbill.SmsSalesBillVo; -import com.yxt.oms.feign.sales.smssalesbill.SmsSalesBillFeignFallback; -import io.swagger.annotations.ApiOperation; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.*; - -/** - * @description: - * @author: fzz - * @date: 2024/7/4 - **/ -@FeignClient( - contextId = "ss-goods-GoodsSku", - name = "ss-common-goods", - path = "/apiadmin/base/basegoodssku") -public interface GoodsSkuFeign { - - @ApiOperation("采购单选择商品") - @PostMapping("/purGoodsListPage") - public ResultBean> purGoodsListPage(@RequestBody PagerQuery pq); -} diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysstaffinfo/SysStaffinfoFeign.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysstaffinfo/SysStaffinfoFeign.java index c6476bf..1cebd61 100644 --- a/oms/src/main/java/com/yxt/oms/feign/portal/sysstaffinfo/SysStaffinfoFeign.java +++ b/oms/src/main/java/com/yxt/oms/feign/portal/sysstaffinfo/SysStaffinfoFeign.java @@ -83,8 +83,8 @@ public interface SysStaffinfoFeign { * @return */ @ApiOperation("员工信息编辑初始化及详情") - @GetMapping("/fetchBySid/{sid}") - public ResultBean fetchBySid(@PathVariable("sid") String sid); + @GetMapping("/fetchBySid/{sid}/{orgSid}") + public ResultBean fetchBySid(@PathVariable("sid") String sid,@PathVariable("orgSid") String orgSid); /** * 获取集团内全部员工姓名 diff --git a/oms/src/main/java/com/yxt/oms/feign/supplier/supplierbank/SupplierBankFeign.java b/oms/src/main/java/com/yxt/oms/feign/supplier/supplierbank/SupplierBankFeign.java new file mode 100644 index 0000000..bcfad11 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/supplier/supplierbank/SupplierBankFeign.java @@ -0,0 +1,49 @@ +package com.yxt.oms.feign.supplier.supplierbank; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.supplierbank.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFeign.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeign
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "库区") +@FeignClient( + contextId = "ss-common-supplier-SupplierBank", + name = "ss-common-supplier", + path = "/apiadmin/supplierbank", + fallback = SupplierBankFeignFallback.class) +public interface SupplierBankFeign { + @ApiOperation("分页列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("保存修改") + @PostMapping("/save") + public ResultBean save(@RequestBody SupplierBankDto dto); + + @ApiOperation("初始化") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids); + + +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/feign/supplier/supplierbank/SupplierBankFeignFallback.java b/oms/src/main/java/com/yxt/oms/feign/supplier/supplierbank/SupplierBankFeignFallback.java new file mode 100644 index 0000000..5e28f77 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/supplier/supplierbank/SupplierBankFeignFallback.java @@ -0,0 +1,46 @@ +package com.yxt.oms.feign.supplier.supplierbank; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.supplierbank.*; +import com.yxt.oms.biz.func.warehousearea.*; +import org.springframework.stereotype.Component; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFeignFallback.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeignFallback
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class SupplierBankFeignFallback implements SupplierBankFeign { + + + @Override + public ResultBean> listPage(PagerQuery pq) { + return null; + } + + @Override + public ResultBean save(SupplierBankDto dto) { + return null; + } + + @Override + public ResultBean fetchDetailsBySid(String sid) { + return null; + } + + @Override + public ResultBean delBySids(String[] sids) { + return null; + } +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/feign/supplier/supplierfile/SupplierFileFeign.java b/oms/src/main/java/com/yxt/oms/feign/supplier/supplierfile/SupplierFileFeign.java new file mode 100644 index 0000000..faa8303 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/supplier/supplierfile/SupplierFileFeign.java @@ -0,0 +1,49 @@ +package com.yxt.oms.feign.supplier.supplierfile; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.supplierfile.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFeign.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeign
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "") +@FeignClient( + contextId = "ss-common-supplier-SupplierFile", + name = "ss-common-supplier", + path = "/apiadmin/SupplierFile", + fallback = SupplierFileFeignFallback.class) +public interface SupplierFileFeign { + @ApiOperation("分页列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); + + + @ApiOperation("保存修改") + @PostMapping("/save") + public ResultBean save(@RequestBody SupplierFileDto dto); + + @ApiOperation("初始化") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids); + +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/feign/supplier/supplierfile/SupplierFileFeignFallback.java b/oms/src/main/java/com/yxt/oms/feign/supplier/supplierfile/SupplierFileFeignFallback.java new file mode 100644 index 0000000..38a4a31 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/supplier/supplierfile/SupplierFileFeignFallback.java @@ -0,0 +1,49 @@ +package com.yxt.oms.feign.supplier.supplierfile; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.supplierfile.SupplierFileDetailsVo; +import com.yxt.oms.biz.func.supplierfile.SupplierFileDto; +import com.yxt.oms.biz.func.supplierfile.SupplierFileQuery; +import com.yxt.oms.biz.func.supplierfile.SupplierFileVo; +import com.yxt.oms.biz.func.warehousearea.*; +import org.springframework.stereotype.Component; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFeignFallback.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeignFallback
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class SupplierFileFeignFallback implements SupplierFileFeign { + + + @Override + public ResultBean> listPage(PagerQuery pq) { + return null; + } + + @Override + public ResultBean save(SupplierFileDto dto) { + return null; + } + + @Override + public ResultBean fetchDetailsBySid(String sid) { + return null; + } + + @Override + public ResultBean delBySids(String[] sids) { + return null; + } +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/feign/supplier/supplierinfo/SupplierInfoFeign.java b/oms/src/main/java/com/yxt/oms/feign/supplier/supplierinfo/SupplierInfoFeign.java index e7e67a3..a8b494d 100644 --- a/oms/src/main/java/com/yxt/oms/feign/supplier/supplierinfo/SupplierInfoFeign.java +++ b/oms/src/main/java/com/yxt/oms/feign/supplier/supplierinfo/SupplierInfoFeign.java @@ -3,7 +3,7 @@ package com.yxt.oms.feign.supplier.supplierinfo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.oms.biz.func.supplierinfo.SupplierInfoChoice; +import com.yxt.oms.biz.func.supplierinfo.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; @@ -30,7 +30,25 @@ import java.util.List; path = "/apiadmin/supplierinfo") public interface SupplierInfoFeign { + @ApiOperation("分页列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); + + + @ApiOperation("保存修改") + @PostMapping("/save") + public ResultBean save(@RequestBody SupplierInfoDto dto); + + @ApiOperation("初始化") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids); + @ApiOperation("选择供应商") @GetMapping("/choiceSupplierInfo") public ResultBean> choiceSupplierInfo(@RequestParam("createOrgSid") String createOrgSid); + } \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/feign/supplier/supplierinfo/SupplierInfoFeignFallback.java b/oms/src/main/java/com/yxt/oms/feign/supplier/supplierinfo/SupplierInfoFeignFallback.java new file mode 100644 index 0000000..4c16c94 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/supplier/supplierinfo/SupplierInfoFeignFallback.java @@ -0,0 +1,54 @@ +package com.yxt.oms.feign.supplier.supplierinfo; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.supplierinfo.*; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFeignFallback.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeignFallback
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class SupplierInfoFeignFallback implements SupplierInfoFeign { + + + @Override + public ResultBean> listPage(PagerQuery pq) { + return null; + } + + @Override + public ResultBean save(SupplierInfoDto dto) { + return null; + } + + + @Override + public ResultBean fetchDetailsBySid(String sid) { + return null; + } + + + @Override + public ResultBean delBySids(String[] sids) { + return null; + } + + @Override + public ResultBean> choiceSupplierInfo(String createOrgSid) { + return null; + } +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/feign/supplier/suppliertype/SupplierTypeFeign.java b/oms/src/main/java/com/yxt/oms/feign/supplier/suppliertype/SupplierTypeFeign.java new file mode 100644 index 0000000..52a5b93 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/supplier/suppliertype/SupplierTypeFeign.java @@ -0,0 +1,62 @@ +package com.yxt.oms.feign.supplier.suppliertype; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.suppliertype.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFeign.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeign
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "库区") +@FeignClient( + contextId = "ss-common-supplier-SupplierType", + name = "ss-common-supplier", + path = "/apiadmin/suppliertype", + fallback = SupplierTypeFeignFallback.class) +public interface SupplierTypeFeign { + @ApiOperation("分页列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("保存修改") + @PostMapping("/save") + public ResultBean save(@RequestBody SupplierTypeDto dto); + + @ApiOperation("初始化") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids); + @ApiOperation("根据SID获取一条记录") + @GetMapping("/checkSaveCode/{supplierTypeCode}/{useOrgSid}") + public ResultBean checkSaveCode(@PathVariable("supplierTypeCode") String supplierTypeCode, + @PathVariable("useOrgSid") String useOrgSid); + @ApiOperation("根据SID获取一条记录") + @GetMapping("/checkUpdateCode/{supplierTypeCode}/{useOrgSid}/{dtoSid}") + public ResultBean checkUpdateCode(@PathVariable("supplierTypeCode") String supplierTypeCode, + @PathVariable("useOrgSid") String useOrgSid, + @PathVariable("dtoSid")String dtoSid); + + @ApiOperation("获取供应商类型") + @PostMapping("/selSupplierType") + public ResultBean> selSupplierType(@RequestParam("useOrgSid") String useOrgSid); +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/feign/supplier/suppliertype/SupplierTypeFeignFallback.java b/oms/src/main/java/com/yxt/oms/feign/supplier/suppliertype/SupplierTypeFeignFallback.java new file mode 100644 index 0000000..d4b0163 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/supplier/suppliertype/SupplierTypeFeignFallback.java @@ -0,0 +1,63 @@ +package com.yxt.oms.feign.supplier.suppliertype; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.suppliertype.*; +import com.yxt.oms.biz.func.warehousearea.*; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFeignFallback.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeignFallback
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class SupplierTypeFeignFallback implements SupplierTypeFeign { + + + @Override + public ResultBean> listPage(PagerQuery pq) { + return null; + } + + @Override + public ResultBean save(SupplierTypeDto dto) { + return null; + } + + @Override + public ResultBean fetchDetailsBySid(String sid) { + return null; + } + + @Override + public ResultBean delBySids(String[] sids) { + return null; + } + + @Override + public ResultBean checkSaveCode(String supplierTypeCode, String useOrgSid) { + return null; + } + + @Override + public ResultBean checkUpdateCode(String supplierTypeCode, String useOrgSid, String dtoSid) { + return null; + } + + @Override + public ResultBean> selSupplierType(String useOrgSid) { + return null; + } +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseansbill/WarehouseAnsBillFeign.java b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseansbill/WarehouseAnsBillFeign.java index 73b1965..a24e7b6 100644 --- a/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseansbill/WarehouseAnsBillFeign.java +++ b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseansbill/WarehouseAnsBillFeign.java @@ -30,7 +30,7 @@ import org.springframework.web.bind.annotation.RequestParam; */ @Api(tags = "角色") @FeignClient( - contextId = "ss-common-warehouse-WmsAnsBill", + contextId = "ss-common-warehouse-omsAnsBill", name = "ss-common-warehouse", path = "/apiadmin/warehouseansbill", fallback = WarehouseAnsBillFeignFallback.class) diff --git a/oms/src/main/java/com/yxt/oms/feign/warehouse/warehousearea/WarehouseAreaFeign.java b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehousearea/WarehouseAreaFeign.java new file mode 100644 index 0000000..63fd19f --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehousearea/WarehouseAreaFeign.java @@ -0,0 +1,64 @@ +package com.yxt.oms.feign.warehouse.warehousearea; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.warehousearea.*; +import com.yxt.oms.utils.OrgPathQuery; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFeign.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeign
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "库区") +@FeignClient( + contextId = "ss-common-warehouse-WarehouseArea", + name = "ss-common-warehouse", + path = "/apiadmin/warehousearea", + fallback = WarehouseAreaFeignFallback.class) +public interface WarehouseAreaFeign { + @ApiOperation("分页列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery query); + @ApiOperation("查询所有的库区") + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody OrgPathQuery query); + + @ApiOperation("保存修改") + @PostMapping("/saveOrUpdate") + public ResultBean saveOrUpdate(@RequestBody WarehouseAreaDto dto); + + @ApiOperation("初始化") + @GetMapping("/initialization/{sid}") + public ResultBean initialization(@PathVariable("sid") String sid); + + @ApiOperation("删除") + @DeleteMapping("/delete/{sid}") + public ResultBean delete(@PathVariable("sid") String sid); + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids); + + @ApiOperation("更改可用状态") + @GetMapping("/updateIsEnable/{sid}/{isEnable}") + public ResultBean updateIsEnable(@PathVariable("sid") String sid,@PathVariable("isEnable")String isEnable); + + @ApiOperation("根据仓库sid查询所有库位") + @GetMapping("/selectAll") + public ResultBean> selectAll(@RequestParam("ckSid") String ckSid); +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/feign/warehouse/warehousearea/WarehouseAreaFeignFallback.java b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehousearea/WarehouseAreaFeignFallback.java new file mode 100644 index 0000000..308ec6e --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehousearea/WarehouseAreaFeignFallback.java @@ -0,0 +1,69 @@ +package com.yxt.oms.feign.warehouse.warehousearea; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.warehousearea.*; +import com.yxt.oms.utils.OrgPathQuery; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFeignFallback.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeignFallback
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class WarehouseAreaFeignFallback implements WarehouseAreaFeign { + + + @Override + public ResultBean> listPage(PagerQuery query) { + return null; + } + + @Override + public ResultBean> listAll(OrgPathQuery query) { + return null; + } + + + @Override + public ResultBean saveOrUpdate(WarehouseAreaDto dto) { + return null; + } + + @Override + public ResultBean initialization(String sid) { + return null; + } + + @Override + public ResultBean delete(String sid) { + return null; + } + + @Override + public ResultBean delBySids(String[] sids) { + return null; + } + + @Override + public ResultBean updateIsEnable(String sid, String isEnable) { + return null; + } + + @Override + public ResultBean> selectAll(String ckSid) { + return null; + } +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseareatype/WarehouseAreaTypeFeign.java b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseareatype/WarehouseAreaTypeFeign.java new file mode 100644 index 0000000..8fe3250 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseareatype/WarehouseAreaTypeFeign.java @@ -0,0 +1,63 @@ +package com.yxt.oms.feign.warehouse.warehouseareatype; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.warehouseareatype.WarehouseAreaType; +import com.yxt.oms.biz.func.warehouseareatype.WarehouseAreaTypeDto; +import com.yxt.oms.biz.func.warehouseareatype.WarehouseAreaTypeQuery; +import com.yxt.oms.biz.func.warehouseareatype.WarehouseAreaTypeVo; +import com.yxt.oms.utils.OrgPathQuery; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFeign.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeign
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "库区类型") +@FeignClient( + contextId = "ss-common-warehouse-WarehouseAreaType", + name = "ss-common-warehouse", + path = "/apiadmin/warehouseareatype", + fallback = WarehouseAreaTypeFeignFallback.class) +public interface WarehouseAreaTypeFeign { + @ApiOperation("分页列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); + @ApiOperation("查询所有的") + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody OrgPathQuery query); + + @ApiOperation("保存修改") + @PostMapping("/saveOrUpdate") + public ResultBean saveOrUpdate(@RequestBody WarehouseAreaTypeDto dto); + + @ApiOperation("初始化") + @GetMapping("/initialization/{sid}") + public ResultBean initialization(@PathVariable("sid") String sid); + + @ApiOperation("删除") + @DeleteMapping("/delete/{sid}") + public ResultBean delete(@PathVariable("sid") String sid); + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids); + + @ApiOperation("更改可用状态") + @GetMapping("/updateIsEnable/{sid}/{isEnable}") + public ResultBean updateIsEnable(@PathVariable("sid") String sid,@PathVariable("isEnable")String isEnable); +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseareatype/WarehouseAreaTypeFeignFallback.java b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseareatype/WarehouseAreaTypeFeignFallback.java new file mode 100644 index 0000000..42af682 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseareatype/WarehouseAreaTypeFeignFallback.java @@ -0,0 +1,65 @@ +package com.yxt.oms.feign.warehouse.warehouseareatype; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.warehouseareatype.WarehouseAreaType; +import com.yxt.oms.biz.func.warehouseareatype.WarehouseAreaTypeDto; +import com.yxt.oms.biz.func.warehouseareatype.WarehouseAreaTypeQuery; +import com.yxt.oms.biz.func.warehouseareatype.WarehouseAreaTypeVo; +import com.yxt.oms.utils.OrgPathQuery; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFeignFallback.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeignFallback
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class WarehouseAreaTypeFeignFallback implements WarehouseAreaTypeFeign { + + @Override + public ResultBean> listPage(PagerQuery pq) { + return null; + } + + @Override + public ResultBean> listAll(OrgPathQuery query) { + return null; + } + + @Override + public ResultBean saveOrUpdate(WarehouseAreaTypeDto dto) { + return null; + } + + @Override + public ResultBean initialization(String sid) { + return null; + } + + @Override + public ResultBean delete(String sid) { + return null; + } + + @Override + public ResultBean delBySids(String[] sids) { + return null; + } + + @Override + public ResultBean updateIsEnable(String sid, String isEnable) { + return null; + } +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseextend/WarehouseExtendFeign.java b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseextend/WarehouseExtendFeign.java new file mode 100644 index 0000000..0465fba --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseextend/WarehouseExtendFeign.java @@ -0,0 +1,41 @@ +package com.yxt.oms.feign.warehouse.warehouseextend; + +import com.yxt.common.core.result.ResultBean; +import com.yxt.oms.biz.func.warehouseextend.WarehouseExtendDto; +import com.yxt.oms.biz.func.warehouseextend.WarehouseExtendVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFeign.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeign
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "仓库扩展") +@FeignClient( + contextId = "ss-common-warehouse-WarehouseExtend", + name = "ss-common-warehouse", + path = "/apiadmin/warehouseextend", + fallback = WarehouseExtendFeignFallback.class) +public interface WarehouseExtendFeign { + @ApiOperation("保存修改") + @PostMapping("/saveOrUpdate") + public ResultBean saveOrUpdate(@RequestBody WarehouseExtendDto dto); + + @ApiOperation("初始化") + @GetMapping("/initialization/{sid}") + public ResultBean initialization(@PathVariable("sid") String sid); +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseextend/WarehouseExtendFeignFallback.java b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseextend/WarehouseExtendFeignFallback.java new file mode 100644 index 0000000..a5ce551 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseextend/WarehouseExtendFeignFallback.java @@ -0,0 +1,33 @@ +package com.yxt.oms.feign.warehouse.warehouseextend; + +import com.yxt.common.core.result.ResultBean; +import com.yxt.oms.biz.func.warehouseextend.WarehouseExtendDto; +import com.yxt.oms.biz.func.warehouseextend.WarehouseExtendVo; +import org.springframework.stereotype.Component; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFeignFallback.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeignFallback
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class WarehouseExtendFeignFallback implements WarehouseExtendFeign { + + @Override + public ResultBean saveOrUpdate(WarehouseExtendDto dto) { + return null; + } + + @Override + public ResultBean initialization(String sid) { + return null; + } +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseinfo/WarehouseInfoFeign.java b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseinfo/WarehouseInfoFeign.java index e133b39..0327892 100644 --- a/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseinfo/WarehouseInfoFeign.java +++ b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseinfo/WarehouseInfoFeign.java @@ -5,15 +5,13 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import com.yxt.oms.biz.func.warehouseinfo.SmsOrderHouseInfo; import com.yxt.oms.biz.func.warehouseinfo.WarehouseInfo; -import com.yxt.oms.feign.warehouse.warehouseansbill.WarehouseAnsBillFeignFallback; +import com.yxt.oms.utils.OrgPathQuery; +import com.yxt.oms.biz.func.warehouseinfo.*; import com.yxt.oms.utils.OrgPathQuery; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -30,13 +28,38 @@ import java.util.List; * @version 1.0 * @since 1.0 */ -@Api(tags = "仓库") +@Api(tags = "仓库信息") @FeignClient( - contextId = "ss-common-warehouse-WmsHouseInfo", + contextId = "ss-common-warehouse-WarehouseInfo", name = "ss-common-warehouse", - path = "/apiadmin/warehouseinfo" - ) + path = "/apiadmin/warehouseinfo", + fallback = WarehouseInfoFeignFallback.class) public interface WarehouseInfoFeign { + @ApiOperation("分页列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("保存修改") + @PostMapping("/saveOrUpdate") + public ResultBean saveOrUpdate(@RequestBody WarehouseInfoDto dto); + + @ApiOperation("初始化") + @GetMapping("/initialization/{sid}") + public ResultBean initialization(@PathVariable("sid") String sid); + + @ApiOperation("删除") + @DeleteMapping("/delete/{sid}") + public ResultBean delete(@PathVariable("sid") String sid); + + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids); + @ApiOperation("更改可用状态") + @GetMapping("/updateStatus/{sid}/{state}") + public ResultBean updateIsEnable(@PathVariable("sid") String sid,@PathVariable("state")String state) ; + @ApiOperation("查询所有仓库") + @GetMapping("/selectAll") + public ResultBean> selectAll(); @ApiOperation("订单选择仓库") @PostMapping("/getWareHouse") public ResultBean> getWareHouse(@RequestParam("createOrgSid") String createOrgSid); @@ -44,4 +67,4 @@ public interface WarehouseInfoFeign { @ApiOperation("查询所有的仓库") @PostMapping("/listAll") public ResultBean> listAll(@RequestBody OrgPathQuery query); -} +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseinfo/WarehouseInfoFeignFallback.java b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseinfo/WarehouseInfoFeignFallback.java new file mode 100644 index 0000000..0ed2f31 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseinfo/WarehouseInfoFeignFallback.java @@ -0,0 +1,74 @@ +package com.yxt.oms.feign.warehouse.warehouseinfo; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.warehouseinfo.*; +import com.yxt.oms.utils.OrgPathQuery; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFeignFallback.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeignFallback
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class WarehouseInfoFeignFallback implements WarehouseInfoFeign { + + + @Override + public ResultBean> listPage(PagerQuery pq) { + return null; + } + + @Override + public ResultBean> listAll(OrgPathQuery query) { + return null; + } + + + @Override + public ResultBean saveOrUpdate(WarehouseInfoDto dto) { + return null; + } + + @Override + public ResultBean initialization(String sid) { + return null; + } + + @Override + public ResultBean delete(String sid) { + return null; + } + + @Override + public ResultBean delBySids(String[] sids) { + return null; + } + + @Override + public ResultBean updateIsEnable(String sid, String state) { + return null; + } + + @Override + public ResultBean> selectAll() { + return null; + } + + @Override + public ResultBean> getWareHouse(String createOrgSid) { + return null; + } +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/feign/warehouse/wmswarehouserack/WarehouseRackFeign.java b/oms/src/main/java/com/yxt/oms/feign/warehouse/wmswarehouserack/WarehouseRackFeign.java new file mode 100644 index 0000000..472899c --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/warehouse/wmswarehouserack/WarehouseRackFeign.java @@ -0,0 +1,67 @@ +package com.yxt.oms.feign.warehouse.wmswarehouserack; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.warehouserack.WarehouseRackDto; +import com.yxt.oms.biz.func.warehouserack.WarehouseRackQuery; +import com.yxt.oms.biz.func.warehouserack.WarehouseRackVo; +import com.yxt.oms.utils.OrgPathQuery; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFeign.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeign
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "货架") +@FeignClient( + contextId = "ss-common-warehouse-WarehouseRack", + name = "ss-common-warehouse", + path = "/apiadmin/warehouserack", + fallback = WarehouseRackFeignFallback.class) +public interface WarehouseRackFeign { + + + @ApiOperation("分页列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); + @ApiOperation("查询所有的库区") + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody OrgPathQuery query); + + @ApiOperation("保存修改") + @PostMapping("/saveOrUpdate") + public ResultBean saveOrUpdate(@RequestBody WarehouseRackDto dto); + + @ApiOperation("初始化") + @GetMapping("/initialization/{sid}") + public ResultBean initialization(@PathVariable("sid") String sid); + + @ApiOperation("删除") + @DeleteMapping("/delete/{sid}") + public ResultBean delete(@PathVariable("sid") String sid); + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids); + + @ApiOperation("更改可用状态") + @GetMapping("/updateIsEnable/{sid}/{isEnable}") + public ResultBean updateIsEnable(@PathVariable("sid") String sid,@PathVariable("isEnable")String isEnable); + @ApiOperation("根据仓库sid查询所有库位") + @GetMapping("/selectAll") + public ResultBean> selectAll(@RequestParam("ckSid") String ckSid); +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/feign/warehouse/wmswarehouserack/WarehouseRackFeignFallback.java b/oms/src/main/java/com/yxt/oms/feign/warehouse/wmswarehouserack/WarehouseRackFeignFallback.java new file mode 100644 index 0000000..731eec7 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/warehouse/wmswarehouserack/WarehouseRackFeignFallback.java @@ -0,0 +1,71 @@ +package com.yxt.oms.feign.warehouse.wmswarehouserack; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.warehouserack.WarehouseRackDto; +import com.yxt.oms.biz.func.warehouserack.WarehouseRackQuery; +import com.yxt.oms.biz.func.warehouserack.WarehouseRackVo; +import com.yxt.oms.utils.OrgPathQuery; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFeignFallback.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeignFallback
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class WarehouseRackFeignFallback implements WarehouseRackFeign { + + + @Override + public ResultBean> listPage(PagerQuery pq) { + return null; + } + + @Override + public ResultBean> listAll(OrgPathQuery query) { + return null; + } + + + @Override + public ResultBean saveOrUpdate(WarehouseRackDto dto) { + return null; + } + + @Override + public ResultBean initialization(String sid) { + return null; + } + + @Override + public ResultBean delete(String sid) { + return null; + } + + @Override + public ResultBean delBySids(String[] sids) { + return null; + } + + @Override + public ResultBean updateIsEnable(String sid, String isEnable) { + return null; + } + + @Override + public ResultBean> selectAll(String ckSid) { + return null; + } +} \ No newline at end of file diff --git a/oms/src/main/resources/logback-spring.xml b/oms/src/main/resources/logback-spring.xml index 2ebaaf0..bfb4bfa 100644 --- a/oms/src/main/resources/logback-spring.xml +++ b/oms/src/main/resources/logback-spring.xml @@ -1,7 +1,7 @@ - + From 89d6c9b49dc3cfa29cd42438e4f6ed29f5a274d8 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Fri, 9 Aug 2024 17:46:35 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinfo/SupplierInfoService.java | 19 +++++++++---------- .../biz/func/sysuserrole/SysUserRoleDto.java | 2 +- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/oms/src/main/java/com/yxt/oms/biz/func/supplierinfo/SupplierInfoService.java b/oms/src/main/java/com/yxt/oms/biz/func/supplierinfo/SupplierInfoService.java index 30ffe61..ba4ca9f 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/supplierinfo/SupplierInfoService.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/supplierinfo/SupplierInfoService.java @@ -41,38 +41,37 @@ import java.util.List; public class SupplierInfoService { @Autowired - SupplierInfoFeign baseSupplierInfoFeign; + SupplierInfoFeign supplierInfoFeign; + @Autowired - SupplierInfoFeign baseSupplierInfoFeign; + WarehouseAnsBillFeign warehouseAnsBillFeign; @Autowired CommonMethod commonMethod; - @Autowired - WarehouseAnsBillFeign warehouseAnsBillFeign; public ResultBean> listPageVo(PagerQuery pq) { SupplierInfoQuery query = pq.getParams(); DataRule dataRule=commonMethod.dataRule(query.getOrgPath(),query.getMenuUrl(),query.getUserSid()).getData(); pq.getParams().setOrgLevelKey(dataRule.getDataRuleId()); pq.getParams().setIndex(dataRule.getIndex()); - return baseSupplierInfoFeign.listPage(pq); + return supplierInfoFeign.listPage(pq); } public ResultBean saveOrUpdateDto(SupplierInfoDto dto){ - return baseSupplierInfoFeign.save(dto); + return supplierInfoFeign.save(dto); } public ResultBean fetchDetailsVoBySid(String sid){ - return baseSupplierInfoFeign.fetchDetailsBySid(sid); + return supplierInfoFeign.fetchDetailsBySid(sid); } public ResultBean fetchDetailsByBillSid(String sid){ WarehouseAnsDetailsVo warehouseAnsDetailsVo=warehouseAnsBillFeign.details(sid).getData(); - return baseSupplierInfoFeign.fetchDetailsBySid(warehouseAnsDetailsVo.getSupplierSid()); + return supplierInfoFeign.fetchDetailsBySid(warehouseAnsDetailsVo.getSupplierSid()); } public void delAll(String[] sids) { - baseSupplierInfoFeign.delBySids(sids); + supplierInfoFeign.delBySids(sids); } public ResultBean> choiceSupplierInfo(String createOrgSid) { - return baseSupplierInfoFeign.choiceSupplierInfo(createOrgSid); + return supplierInfoFeign.choiceSupplierInfo(createOrgSid); } } \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleDto.java b/oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleDto.java index bce8e54..4242928 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleDto.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleDto.java @@ -22,7 +22,7 @@ import lombok.Data; @ApiModel(value = "用户与角色关联表 数据传输对象", description = "用户与角色关联表 数据传输对象") @Data public class SysUserRoleDto implements Dto { - + private String sid; @ApiModelProperty("用户sid") private String userSid; From c90c2dbb4f7623abb65dc8d4b99a808850610cfc Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Mon, 12 Aug 2024 14:23:01 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=95=86=E4=BA=AB=E9=80=9A=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiadmin/aggregation/CrmVisitRest.java | 6 ++- .../crmcustomer/CrmCustomerTempService.java | 7 +-- .../oms/biz/func/crmfile/CrmFileService.java | 12 ++++- .../smssalesbill/SmsSalesBillService.java | 54 ++++++++++++++++++- 4 files changed, 71 insertions(+), 8 deletions(-) diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/CrmVisitRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/CrmVisitRest.java index d2a40d1..7e10bd7 100644 --- a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/CrmVisitRest.java +++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/CrmVisitRest.java @@ -1,6 +1,7 @@ package com.yxt.oms.apiadmin.aggregation; import cn.hutool.core.bean.BeanUtil; +import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.utils.DateUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -45,7 +46,8 @@ public class CrmVisitRest { private CrmCustomerTempFeign crmCustomerTempFeign; @Autowired private CrmFileFeign crmFileFeign; - + @Autowired + private FileUploadComponent fileUploadComponent; /** * pc端某客户的跟进记录分页列表 @@ -85,6 +87,7 @@ public class CrmVisitRest { String sid = entity.getSid(); String staffSid = dto.getStaffSid(); BeanUtil.copyProperties(pcCrmvisitAppendixDto, pcCommonAppendixDto); + pcCommonAppendixDto.setFilePath(pcCrmvisitAppendixDto.getFilePath().replace(fileUploadComponent.getUrlPrefix(), "")); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); String createTime = simpleDateFormat.format(new Date()); if (dto.getList().size() != 0) { @@ -137,6 +140,7 @@ public class CrmVisitRest { PcCommonAppendixDto pcCommonAppendixDto = new PcCommonAppendixDto(); String staffSid = dto.getStaffSid(); BeanUtil.copyProperties(pcCrmvisitAppendixDto, pcCommonAppendixDto); + pcCommonAppendixDto.setFilePath(pcCrmvisitAppendixDto.getFilePath().replace(fileUploadComponent.getUrlPrefix(), "")); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); String createTime = simpleDateFormat.format(new Date()); if (dto.getList().size() != 0) { diff --git a/oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/CrmCustomerTempService.java b/oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/CrmCustomerTempService.java index 515f5bf..9e540f1 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/CrmCustomerTempService.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/CrmCustomerTempService.java @@ -193,6 +193,7 @@ public class CrmCustomerTempService { PcCommonAppendixDto pcCommonAppendixDto = new PcCommonAppendixDto(); PcCrmVisitAppendixDto pcCrmVisitAppendixDto = list.get(i); BeanUtils.copyProperties(pcCrmVisitAppendixDto, pcCommonAppendixDto); + pcCommonAppendixDto.setFilePath(pcCrmVisitAppendixDto.getFilePath().replace(fileUploadComponent.getUrlPrefix(), "")); pcCommonAppendixDtoList.add(pcCommonAppendixDto); } crmFileFeign.saveCommonAppendix(visitSid, pcCommonAppendixDtoList); @@ -207,7 +208,7 @@ public class CrmCustomerTempService { if (StringUtils.isNotBlank(dto.getUserSid())) { pcCommonAppendixDto.setCreateBySid(dto.getUserSid()); } - pcCommonAppendixDto.setFilePath(url.getUrl()); + pcCommonAppendixDto.setFilePath(url.getUrl().replace(fileUploadComponent.getUrlPrefix(), "")); pcCommonAppendixDtoList.add(pcCommonAppendixDto); } crmFileFeign.saveAppendix(visitSid, CommonAttachTypeEnum.CUSTOMER_FILE.getAttachType(), pcCommonAppendixDtoList); @@ -290,7 +291,7 @@ public class CrmCustomerTempService { if (StringUtils.isNotBlank(dto.getUserSid())) { pcCommonAppendixDto.setCreateBySid(dto.getUserSid()); } - pcCommonAppendixDto.setFilePath(url.getUrl()); + pcCommonAppendixDto.setFilePath(url.getUrl().replace(fileUploadComponent.getUrlPrefix(), "")); pcCommonAppendixDtoList.add(pcCommonAppendixDto); } crmFileFeign.saveAppendix(sid, CommonAttachTypeEnum.CUSTOMER_FILE.getAttachType(), pcCommonAppendixDtoList); @@ -316,7 +317,7 @@ public class CrmCustomerTempService { List list = new ArrayList<>(); for (CommonAppendixVo appendixVo : appendixVos) { FileQueryUrl queryUrl = new FileQueryUrl(); - queryUrl.setUrl(appendixVo.getFilePath()); + queryUrl.setUrl(fileUploadComponent.getUrlPrefix() + appendixVo.getFilePath()); list.add(queryUrl); } vo.setCustomerFiles(list); diff --git a/oms/src/main/java/com/yxt/oms/biz/func/crmfile/CrmFileService.java b/oms/src/main/java/com/yxt/oms/biz/func/crmfile/CrmFileService.java index 57d86eb..b3f20b3 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/crmfile/CrmFileService.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/crmfile/CrmFileService.java @@ -58,14 +58,22 @@ import java.util.List; * @since 1.0 */ @Service -public class CrmFileService { +public class CrmFileService { @Autowired private CrmFileFeign crmFileFeign; - + @Autowired + private FileUploadComponent fileUploadComponent; public ResultBean> getPcAppendix(CommonAppendixSelectQuery query) { + ResultBean rb = ResultBean.fireFail(); + List data = crmFileFeign.getPcAppendix(query).getData(); + if (!data.isEmpty()) { + for (CommonAppendixVo datum : data) { + datum.setFilePath(fileUploadComponent.getUrlPrefix() + datum.getFilePath()); + } + } return crmFileFeign.getPcAppendix(query); } } diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java index af90c80..fa2287c 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java @@ -28,13 +28,16 @@ package com.yxt.oms.biz.func.smssalesbill; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.purchaseappendix.PurchaseAppendixUrl; import com.yxt.oms.feign.sales.smssalesbill.SmsSalesBillFeign; import com.yxt.oms.feign.warehouse.warehouseInventory.WarehouseInventoryFeign; +import com.yxt.oms.utils.FileQueryUrl; import io.swagger.annotations.ApiModelProperty; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -65,6 +68,9 @@ public class SmsSalesBillService extends MybatisBaseService createQueryWrapper(SmsSalesBillQuery query) { // todo: 这里根据具体业务调整查询条件 // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); @@ -82,6 +88,28 @@ public class SmsSalesBillService extends MybatisBaseService goodsList = dto.getGoodsList(); + if (!goodsList.isEmpty() && goodsList.size() > 0) { + for (SmsSalesBillDetailDetailsVo smsSalesBillDetailDetailsVo : goodsList) { + List pic = smsSalesBillDetailDetailsVo.getPic(); + List pic2 = new ArrayList<>(); + if (!pic.isEmpty() && pic.size() > 0) { + for (String appendixUrl : pic) { + appendixUrl = appendixUrl.replace(fileUploadComponent.getUrlPrefix(), ""); + pic2.add(appendixUrl); + } + smsSalesBillDetailDetailsVo.setPic(pic2); + } + } + } + List files = dto.getFiles(); + if (!files.isEmpty() && files.size() > 0) { + for (FileQueryUrl appendixUrl : files) { + String filePath = appendixUrl.getUrl().replace(fileUploadComponent.getUrlPrefix(), ""); + appendixUrl.setUrl(filePath); + } + } + return smsSalesBillFeign.save(dto); } @@ -102,7 +130,29 @@ public class SmsSalesBillService extends MybatisBaseService fetchDetailsVoBySid(String sid) { - return smsSalesBillFeign.fetchDetailsBySid(sid); + ResultBean rb = ResultBean.fireFail(); + SmsSalesBillDetailsVo vo = smsSalesBillFeign.fetchDetailsBySid(sid).getData(); + List goods = vo.getGoodsList(); + if (!goods.isEmpty()) { + for (SmsSalesBillDetailDetailsVo detail : goods) { + List pic = detail.getPic(); + List picList = new ArrayList<>(); + if (!pic.isEmpty() && pic.size() > 0) { + for (String s : pic) { + picList.add(fileUploadComponent.getUrlPrefix() + s); + } + detail.setPic(picList); + } + } + } + List appendixList = vo.getFiles(); + if (!appendixList.isEmpty()) { + for (FileQueryUrl aseAppendixUrl : appendixList) { + String url = fileUploadComponent.getUrlPrefix() + aseAppendixUrl.getUrl(); + aseAppendixUrl.setUrl(url); + } + } + return rb.success().setData(vo); } public ResultBean> listPage(PagerQuery pq) { @@ -118,7 +168,7 @@ public class SmsSalesBillService extends MybatisBaseService reviewDetails(String sid) { - ResultBean rb = ResultBean.fireFail(); + ResultBean rb = ResultBean.fireFail(); ReviewDetailsVo data = smsSalesBillFeign.reviewDetails(sid).getData(); List goods = data.getGoods(); if (!goods.isEmpty()) { From 39f79f38ac8a25678257dfd9e1e39df1354366b5 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Tue, 13 Aug 2024 15:37:19 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BA=A7=E5=93=81=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiadmin/aggregation/BaseProductRest.java | 47 +++++++++++++++++++ .../apiadmin/aggregation/GoodsSpuRest.java | 10 ++-- .../func/baseproduct/BaseProductChildVo.java | 25 ++++++++++ .../baseproduct/BaseProductDetailsVo.java | 27 +++++++++++ .../biz/func/baseproduct/BaseProductDto.java | 27 +++++++++++ .../BaseProductMaterialDetailsVo.java | 21 +++++++++ .../func/baseproduct/BaseProductQuery.java | 33 +++++++++++++ .../func/baseproduct/BaseProductService.java | 45 ++++++++++++++++++ .../biz/func/baseproduct/BaseProductVo.java | 45 ++++++++++++++++++ .../biz/func/goodsspu/GoodsSpuService.java | 4 ++ .../biz/func/goodsspu/ProductGoodsQuery.java | 16 +++++++ .../oms/biz/func/goodsspu/ProductGoodsVo.java | 17 +++++++ .../smssalesbill/SmsSalesBillService.java | 21 +++++++++ .../goods/basegoodsspu/BaseGoodsSpuFeign.java | 5 ++ .../BaseGoodsSpuFeignFallback.java | 7 +++ .../goods/baseproduct/BaseProductFeign.java | 46 ++++++++++++++++++ 16 files changed, 392 insertions(+), 4 deletions(-) create mode 100644 oms/src/main/java/com/yxt/oms/apiadmin/aggregation/BaseProductRest.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/baseproduct/BaseProductChildVo.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/baseproduct/BaseProductDetailsVo.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/baseproduct/BaseProductDto.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/baseproduct/BaseProductMaterialDetailsVo.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/baseproduct/BaseProductQuery.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/baseproduct/BaseProductService.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/baseproduct/BaseProductVo.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/goodsspu/ProductGoodsQuery.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/goodsspu/ProductGoodsVo.java create mode 100644 oms/src/main/java/com/yxt/oms/feign/goods/baseproduct/BaseProductFeign.java diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/BaseProductRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/BaseProductRest.java new file mode 100644 index 0000000..8e35b0d --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/BaseProductRest.java @@ -0,0 +1,47 @@ +package com.yxt.oms.apiadmin.aggregation; + + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.baseproduct.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * @author wangpengfei + * @date 2024/3/7 16:58 + */ +@Api(tags = "产品管理") +@RestController +@RequestMapping("/v1/product") +public class BaseProductRest { + @Autowired + private BaseProductService baseProductService; + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + return baseProductService.listPage(pq); + } + + @ApiOperation("保存修改") + @PostMapping("/saveOrUpdate") + public ResultBean saveOrUpdate(@RequestBody BaseProductDto dto) { + return baseProductService.saveProduct(dto); + } + + @ApiOperation("编辑回显") + @GetMapping("/fetchBySid") + public ResultBean fetchBySid(@RequestParam("sid") String sid) { + return baseProductService.fetchDetailsBySid(sid); + } + + @ApiOperation("批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids) { + return baseProductService.deleteBySids(sids); + } +} diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/GoodsSpuRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/GoodsSpuRest.java index 4e7bf88..c87d264 100644 --- a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/GoodsSpuRest.java +++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/GoodsSpuRest.java @@ -3,9 +3,7 @@ package com.yxt.oms.apiadmin.aggregation; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.oms.biz.func.goodsspu.GoodsSpuService; -import com.yxt.oms.biz.func.goodsspu.SalesGoodsQuery; -import com.yxt.oms.biz.func.goodsspu.SalesGoodsVo; +import com.yxt.oms.biz.func.goodsspu.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -33,5 +31,9 @@ public class GoodsSpuRest { public ResultBean> getGoodsForSales(@RequestBody PagerQuery pq) { return goodsSpuService.getGoodsForSales(pq); } - + @ApiOperation("产品管理获取商品") + @PostMapping("/getGoodsForProduct") + public ResultBean> getGoodsForProduct(@RequestBody ProductGoodsQuery query) { + return goodsSpuService.getGoodsForProduct(query); + } } diff --git a/oms/src/main/java/com/yxt/oms/biz/func/baseproduct/BaseProductChildVo.java b/oms/src/main/java/com/yxt/oms/biz/func/baseproduct/BaseProductChildVo.java new file mode 100644 index 0000000..3d11dd4 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/baseproduct/BaseProductChildVo.java @@ -0,0 +1,25 @@ +package com.yxt.oms.biz.func.baseproduct; + +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author Fan + * @description + * @date 2024/8/13 9:34 + */ +@Data +public class BaseProductChildVo { + + private String sid; + private String cSid; + private String productCode; //产品编码 + private String productName; //产品名称 + private String rateType; //产出率/配比 0/1 + private String materialName; //原料名称 + private String materialCode;//原料编码 + private String rate;//产出比例 + private List children = new ArrayList<>(); +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/baseproduct/BaseProductDetailsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/baseproduct/BaseProductDetailsVo.java new file mode 100644 index 0000000..ea9b3f6 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/baseproduct/BaseProductDetailsVo.java @@ -0,0 +1,27 @@ +package com.yxt.oms.biz.func.baseproduct; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author Fan + * @description + * @date 2024/8/13 10:37 + */ +@Data +public class BaseProductDetailsVo implements Vo { + private String sid; + private String createBySid; + private String useOrgSid; + private String createOrgSid; + @ApiModelProperty("对应商品sid") + private String goodsSid; // 产品对应商品sid + private String productName; // 产品名称 + @ApiModelProperty("0产出率/1配比（初加工/深加工）") + private String rateType; // 0产出率/1配比（初加工/深加工） + private List list = new ArrayList<>(); //原料列表 +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/baseproduct/BaseProductDto.java b/oms/src/main/java/com/yxt/oms/biz/func/baseproduct/BaseProductDto.java new file mode 100644 index 0000000..0941a71 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/baseproduct/BaseProductDto.java @@ -0,0 +1,27 @@ +package com.yxt.oms.biz.func.baseproduct; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author Fan + * @description + * @date 2024/8/13 10:37 + */ +@Data +public class BaseProductDto implements Dto { + private String sid; + private String createBySid; + private String useOrgSid; + private String createOrgSid; + @ApiModelProperty("对应商品sid") + private String goodsSid; // 产品对应商品sid + private String productName; // 产品名称 + @ApiModelProperty("0产出率/1配比（初加工/深加工）") + private String rateType; // 0产出率/1配比（初加工/深加工） + private List list = new ArrayList<>(); //原料列表 +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/baseproduct/BaseProductMaterialDetailsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/baseproduct/BaseProductMaterialDetailsVo.java new file mode 100644 index 0000000..875c348 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/baseproduct/BaseProductMaterialDetailsVo.java @@ -0,0 +1,21 @@ +package com.yxt.oms.biz.func.baseproduct; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/8/13 10:40 + */ +@Data +public class BaseProductMaterialDetailsVo { + + + @ApiModelProperty("原料sid-对应商品sid") + private String materialSid; // 原料sid-对应商品sid + private String materialName; //原料名称 + private String materialCode;//原料编码 + private String rate;//产出比例 + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/baseproduct/BaseProductQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/baseproduct/BaseProductQuery.java new file mode 100644 index 0000000..dfee69f --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/baseproduct/BaseProductQuery.java @@ -0,0 +1,33 @@ +package com.yxt.oms.biz.func.baseproduct; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/8/13 9:30 + */ +@Data +public class BaseProductQuery implements Query { + + /** + * 产品名称 + */ + private String productName; + /** + * 比例类别 + */ + private String rateType; + + + private String orgLevelKey;//权限等级 + @ApiModelProperty("菜单路由") + private String menuUrl; + @ApiModelProperty("组织全路径sid") + private String orgPath; + @ApiModelProperty("用户sid") + private String userSid; + private int index; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/baseproduct/BaseProductService.java b/oms/src/main/java/com/yxt/oms/biz/func/baseproduct/BaseProductService.java new file mode 100644 index 0000000..140a481 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/baseproduct/BaseProductService.java @@ -0,0 +1,45 @@ +package com.yxt.oms.biz.func.baseproduct; + +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.commonmethod.CommonMethod; +import com.yxt.oms.biz.func.commonmethod.DataRule; +import com.yxt.oms.feign.goods.baseproduct.BaseProductFeign; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + + +/** + * @author wangpengfei + * @date 2024/2/26 13:40 + */ +@Service +public class BaseProductService { + @Autowired + private BaseProductFeign baseProductFeign; + @Autowired + private CommonMethod commonMethod; + + public ResultBean> listPage(PagerQuery pq) { + //通用组装方法 根据用户sid、菜单、组织全路径sid 获取组装参数 + BaseProductQuery query = pq.getParams(); + DataRule dataRule=commonMethod.dataRule(query.getOrgPath(),query.getMenuUrl(),query.getUserSid()).getData(); + pq.getParams().setOrgLevelKey(dataRule.getDataRuleId()); + pq.getParams().setIndex(dataRule.getIndex()); + return baseProductFeign.listPage(pq); + } + + public ResultBean saveProduct(BaseProductDto dto) { + return baseProductFeign.saveOrUpdate(dto); + } + + public ResultBean fetchDetailsBySid(String sid) { + return baseProductFeign.fetchBySid(sid); + } + + public ResultBean deleteBySids(String[] sids) { + return baseProductFeign.delBySids(sids); + } +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/baseproduct/BaseProductVo.java b/oms/src/main/java/com/yxt/oms/biz/func/baseproduct/BaseProductVo.java new file mode 100644 index 0000000..68e3b80 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/baseproduct/BaseProductVo.java @@ -0,0 +1,45 @@ +package com.yxt.oms.biz.func.baseproduct; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author Fan + * @description + * @date 2024/8/13 9:30 + */ +@Data +public class BaseProductVo implements Vo { + + /** + * 原料编码 + */ + private String materialCode; + /** + * 原料名称 + */ + private String materialName; + /** + * 产品编码 + */ + private String productCode; + /** + * 产品名称 + */ + private String productName; + /** + * 比例 + */ + private String rate; + /** + * 比例类别 + */ + private String rateType; + private String sid; + private String cSid; + private List children = new ArrayList<>(); + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/GoodsSpuService.java b/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/GoodsSpuService.java index 3e6a23d..9ea8ef6 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/GoodsSpuService.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/GoodsSpuService.java @@ -46,4 +46,8 @@ public class GoodsSpuService { } return goodsForSales; } + + public ResultBean> getGoodsForProduct(ProductGoodsQuery query) { + return goodsSpuFeign.getGoodsForProduct(query); + } } diff --git a/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/ProductGoodsQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/ProductGoodsQuery.java new file mode 100644 index 0000000..c0225b6 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/ProductGoodsQuery.java @@ -0,0 +1,16 @@ +package com.yxt.oms.biz.func.goodsspu; + +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/8/13 10:22 + */ +@Data +public class ProductGoodsQuery { + + private String queryName; + private String useOrgSid; + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/ProductGoodsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/ProductGoodsVo.java new file mode 100644 index 0000000..36b021c --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/ProductGoodsVo.java @@ -0,0 +1,17 @@ +package com.yxt.oms.biz.func.goodsspu; + +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/8/13 10:20 + */ +@Data +public class ProductGoodsVo { + + private String sid; + private String goodsName; + private String goodsCode; + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java index fa2287c..dd794a9 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java @@ -202,6 +202,27 @@ public class SmsSalesBillService extends MybatisBaseService goodsList = dto.getGoodsList(); + if (!goodsList.isEmpty() && goodsList.size() > 0) { + for (SmsSalesBillDetailDetailsVo smsSalesBillDetailDetailsVo : goodsList) { + List pic = smsSalesBillDetailDetailsVo.getPic(); + List pic2 = new ArrayList<>(); + if (!pic.isEmpty() && pic.size() > 0) { + for (String appendixUrl : pic) { + appendixUrl = appendixUrl.replace(fileUploadComponent.getUrlPrefix(), ""); + pic2.add(appendixUrl); + } + smsSalesBillDetailDetailsVo.setPic(pic2); + } + } + } + List files = dto.getFiles(); + if (!files.isEmpty() && files.size() > 0) { + for (FileQueryUrl appendixUrl : files) { + String filePath = appendixUrl.getUrl().replace(fileUploadComponent.getUrlPrefix(), ""); + appendixUrl.setUrl(filePath); + } + } return smsSalesBillFeign.submit(dto); } } diff --git a/oms/src/main/java/com/yxt/oms/feign/goods/basegoodsspu/BaseGoodsSpuFeign.java b/oms/src/main/java/com/yxt/oms/feign/goods/basegoodsspu/BaseGoodsSpuFeign.java index 407a7b3..2ee775b 100644 --- a/oms/src/main/java/com/yxt/oms/feign/goods/basegoodsspu/BaseGoodsSpuFeign.java +++ b/oms/src/main/java/com/yxt/oms/feign/goods/basegoodsspu/BaseGoodsSpuFeign.java @@ -3,6 +3,8 @@ package com.yxt.oms.feign.goods.basegoodsspu; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.goodsspu.ProductGoodsQuery; +import com.yxt.oms.biz.func.goodsspu.ProductGoodsVo; import com.yxt.oms.biz.func.goodsspu.SalesGoodsQuery; import com.yxt.oms.biz.func.goodsspu.SalesGoodsVo; import com.yxt.oms.biz.func.basegoodsspu.BaseGoodsSpuDto; @@ -59,4 +61,7 @@ public interface BaseGoodsSpuFeign { @ApiOperation("销售订单获取商品") @PostMapping("/getGoodsForSales") public ResultBean> getGoodsForSales(@RequestBody PagerQuery pq); + @ApiOperation("产品管理获取商品") + @PostMapping("/getGoodsForProduct") + public ResultBean> getGoodsForProduct(@RequestBody ProductGoodsQuery query); } diff --git a/oms/src/main/java/com/yxt/oms/feign/goods/basegoodsspu/BaseGoodsSpuFeignFallback.java b/oms/src/main/java/com/yxt/oms/feign/goods/basegoodsspu/BaseGoodsSpuFeignFallback.java index a323962..4c6eb34 100644 --- a/oms/src/main/java/com/yxt/oms/feign/goods/basegoodsspu/BaseGoodsSpuFeignFallback.java +++ b/oms/src/main/java/com/yxt/oms/feign/goods/basegoodsspu/BaseGoodsSpuFeignFallback.java @@ -6,6 +6,8 @@ import com.yxt.common.core.vo.PagerVo; import com.yxt.oms.biz.func.basegoodsspu.BaseGoodsSpuDto; import com.yxt.oms.biz.func.basegoodsspu.BaseGoodsSpuQuery; import com.yxt.oms.biz.func.basegoodsspu.BaseGoodsSpuVo; +import com.yxt.oms.biz.func.goodsspu.ProductGoodsQuery; +import com.yxt.oms.biz.func.goodsspu.ProductGoodsVo; import com.yxt.oms.biz.func.goodsspu.SalesGoodsQuery; import com.yxt.oms.biz.func.goodsspu.SalesGoodsVo; import com.yxt.oms.biz.func.basegoodsspu.BaseGoodsSpuDto; @@ -69,4 +71,9 @@ public class BaseGoodsSpuFeignFallback implements BaseGoodsSpuFeign { public ResultBean> getGoodsForSales(PagerQuery pq) { return null; } + + @Override + public ResultBean> getGoodsForProduct(ProductGoodsQuery query) { + return null; + } } diff --git a/oms/src/main/java/com/yxt/oms/feign/goods/baseproduct/BaseProductFeign.java b/oms/src/main/java/com/yxt/oms/feign/goods/baseproduct/BaseProductFeign.java new file mode 100644 index 0000000..9194ba0 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/goods/baseproduct/BaseProductFeign.java @@ -0,0 +1,46 @@ +package com.yxt.oms.feign.goods.baseproduct; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.basegoodssku.BaseGoodsSkuVo; +import com.yxt.oms.biz.func.baseproduct.BaseProductDetailsVo; +import com.yxt.oms.biz.func.baseproduct.BaseProductDto; +import com.yxt.oms.biz.func.baseproduct.BaseProductQuery; +import com.yxt.oms.biz.func.baseproduct.BaseProductVo; +import com.yxt.oms.biz.func.purchasebill.GoodsSkuPurSelectList; +import com.yxt.oms.biz.func.purchasebill.GoodsSkuPurSelectQuery; +import com.yxt.oms.utils.OrgPathQuery; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/3/20 + **/ +@FeignClient( + contextId = "yss-common-goods-BaseProductFeign", + name = "ss-common-goods", + path = "/v1/product") +public interface BaseProductFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("保存修改") + @PostMapping("/saveOrUpdate") + public ResultBean saveOrUpdate(@RequestBody BaseProductDto dto); + + @ApiOperation("编辑回显") + @GetMapping("/fetchBySid") + public ResultBean fetchBySid(@RequestParam("sid") String sid); + + @ApiOperation("批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids); +}