From ed5e0da99b344f8925a890ba0a5a9efb037fa383 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Thu, 6 Jun 2024 16:31:57 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiadmin/WarehouseAnsBillDetailsRest.java | 56 ++++++++ ...seAreaRest.java => WarehouseAreaRest.java} | 18 +-- ...peRest.java => WarehouseAreaTypeRest.java} | 20 +-- ...tendRest.java => WarehouseExtendRest.java} | 14 +- ...seInfoRest.java => WarehouseInfoRest.java} | 20 +-- ...houseInventoryAllocatebillDetailRest.java} | 22 ++-- ...> WarehouseInventoryAllocatebillRest.java} | 18 +-- ....java => WarehouseInventoryBatchRest.java} | 12 +- ...arehouseInventoryCheckbillDetailRest.java} | 16 +-- ...a => WarehouseInventoryCheckbillRest.java} | 18 +-- ...rehouseInventorySettlebillDetailRest.java} | 22 ++-- ... => WarehouseInventorySettlebillRest.java} | 26 ++-- ...seRackRest.java => WarehouseRackRest.java} | 20 +-- .../apiadmin/WarehouseReportLoseOperRest.java | 55 ++++++++ ...Rest.java => WarehouseReportLoseRest.java} | 22 ++-- .../WarehouseAnsBillDetailDto.java | 1 + .../WarehouseAnsBillDetailMapper.java | 10 +- .../WarehouseAnsBillDetailMapper.xml | 15 +++ .../WarehouseAnsBillDetailQuery.java | 13 ++ .../WarehouseAnsBillDetailService.java | 110 ++++++++++++++++ .../WarehouseArea.java} | 4 +- .../WarehouseAreaAllVo.java} | 4 +- .../WarehouseAreaDto.java} | 4 +- .../WarehouseAreaMapper.java} | 10 +- .../WarehouseAreaMapper.xml} | 20 +-- .../WarehouseAreaQuery.java} | 4 +- .../WarehouseAreaService.java} | 38 +++--- .../WarehouseAreaVo.java} | 4 +- .../WarehouseAreaType.java} | 4 +- .../WarehouseAreaTypeDto.java} | 4 +- .../WarehouseAreaTypeMapper.java} | 8 +- .../WarehouseAreaTypeMapper.xml} | 12 +- .../WarehouseAreaTypeQuery.java} | 4 +- .../WarehouseAreaTypeService.java} | 36 ++--- .../WarehouseAreaTypeVo.java} | 4 +- .../WarehouseExtend.java} | 4 +- .../WarehouseExtendDto.java} | 4 +- .../WarehouseExtendMapper.java} | 4 +- .../WarehouseExtendMapper.xml} | 6 +- .../WarehouseExtendQuery.java} | 4 +- .../WarehouseExtendService.java} | 16 +-- .../WarehouseExtendVo.java} | 4 +- .../WarehouseInventoryAllocatebill.java} | 4 +- ...useInventoryAllocatebillDetailsVoNew.java} | 8 +- .../WarehouseInventoryAllocatebillDto.java} | 4 +- ...WarehouseInventoryAllocatebillDtoNew.java} | 8 +- .../WarehouseInventoryAllocatebillMapper.java | 20 +++ .../WarehouseInventoryAllocatebillMapper.xml | 26 ++++ .../WarehouseInventoryAllocatebillQuery.java} | 4 +- ...rehouseInventoryAllocatebillQueryNew.java} | 4 +- ...arehouseInventoryAllocatebillService.java} | 80 +++++------ .../WarehouseInventoryAllocatebillVo.java} | 4 +- .../WarehouseInventoryAllocatebillVoNew.java} | 4 +- ...WarehouseInventoryAllocatebillDetail.java} | 4 +- ...entoryAllocatebillDetailDetailsVoNew.java} | 4 +- ...ehouseInventoryAllocatebillDetailDto.java} | 4 +- ...useInventoryAllocatebillDetailDtoNew.java} | 4 +- ...useInventoryAllocatebillDetailMapper.java} | 10 +- ...houseInventoryAllocatebillDetailMapper.xml | 36 +++++ ...houseInventoryAllocatebillDetailQuery.java | 13 ++ ...seInventoryAllocatebillDetailService.java} | 55 ++++---- ...rehouseInventoryAllocatebillDetailVo.java} | 4 +- .../WarehouseInventoryBatch.java} | 4 +- .../WarehouseInventoryBatchDetailsVo.java} | 4 +- .../WarehouseInventoryBatchDto.java} | 4 +- .../WarehouseInventoryBatchMapper.java} | 10 +- .../WarehouseInventoryBatchMapper.xml | 13 ++ .../WarehouseInventoryBatchQuery.java} | 4 +- .../WarehouseInventoryBatchService.java} | 32 ++--- .../WarehouseInventoryBatchVo.java} | 4 +- .../WarehouseInventoryCheckBill.java} | 4 +- ...WarehouseInventoryCheckBillDetailsVo.java} | 8 +- .../WarehouseInventoryCheckBillDto.java} | 8 +- .../WarehouseInventoryCheckBillMapper.java} | 10 +- .../WarehouseInventoryCheckBillMapper.xml} | 6 +- .../WarehouseInventoryCheckBillQuery.java} | 4 +- .../WarehouseInventoryCheckBillService.java} | 56 ++++---- .../WarehouseInventoryCheckBillVo.java} | 4 +- .../WarehouseInventoryCheckbillDetail.java} | 4 +- ...useInventoryCheckbillDetailDetailsVo.java} | 4 +- ...WarehouseInventoryCheckbillDetailDto.java} | 4 +- ...ehouseInventoryCheckbillDetailMapper.java} | 12 +- ...arehouseInventoryCheckbillDetailMapper.xml | 28 ++++ ...rehouseInventoryCheckbillDetailQuery.java} | 4 +- ...houseInventoryCheckbillDetailService.java} | 34 ++--- .../WarehouseInventoryCheckbillDetailVo.java} | 4 +- .../WarehouseInventorySettleRecordQuery.java} | 4 +- .../WarehouseInventorySettleRecordVo.java} | 4 +- .../WarehouseInventorySettlebill.java} | 4 +- ...arehouseInventorySettlebillDetailsVo.java} | 4 +- .../WarehouseInventorySettlebillDto.java} | 4 +- .../WarehouseInventorySettlebillMapper.java} | 12 +- .../WarehouseInventorySettlebillMapper.xml} | 20 +-- .../WarehouseInventorySettlebillQuery.java} | 4 +- .../WarehouseInventorySettlebillService.java} | 61 +++++---- .../WarehouseInventorySettlebillVo.java} | 4 +- .../WarehouseInventorySettlebillDetail.java} | 4 +- ...seInventorySettlebillDetailDetailsVo.java} | 4 +- ...arehouseInventorySettlebillDetailDto.java} | 4 +- ...houseInventorySettlebillDetailMapper.java} | 12 +- ...ehouseInventorySettlebillDetailMapper.xml} | 16 +-- ...ehouseInventorySettlebillDetailQuery.java} | 4 +- ...ouseInventorySettlebillDetailService.java} | 44 +++---- ...WarehouseInventorySettlebillDetailVo.java} | 4 +- ...WarehouseInventorySettlebillExportVo.java} | 4 +- .../warehouseregion/WarehouseRegionDto.java | 4 +- .../WarehouseRegionMapper.java | 4 +- .../warehouseregion/WarehouseRegionMapper.xml | 4 +- .../WarehouseRegionService.java | 22 ++-- .../warehouseregion/WarehouseRegionVo.java | 4 +- .../WarehouseReportLose.java} | 4 +- .../WarehouseReportLoseDto.java} | 4 +- .../WarehouseReportLoseMapper.java} | 10 +- .../WarehouseReportLoseMapper.xml | 22 ++++ .../WarehouseReportLoseQuery.java} | 4 +- .../WarehouseReportLoseService.java} | 49 ++++--- .../WarehouseReportLoseVo.java} | 4 +- .../WarehouseReportLoseOper.java | 37 ++++++ .../WarehouseReportLoseOperDto.java | 42 ++++++ .../WarehouseReportLoseOperMapper.java | 25 ++++ .../WarehouseReportLoseOperMapper.xml | 22 ++++ .../WarehouseReportLoseOperQuery.java} | 4 +- .../WarehouseReportLoseOperService.java | 124 ++++++++++++++++++ .../WarehouseReportLoseOperVo.java | 48 +++++++ .../WarehouseInfo.java} | 4 +- .../WarehouseInfoAllVo.java} | 4 +- .../WarehouseInfoDto.java} | 8 +- .../WarehouseInfoMapper.java} | 10 +- .../WarehouseInfoMapper.xml} | 8 +- .../WarehouseInfoQuery.java} | 4 +- .../WarehouseInfoService.java} | 58 ++++---- .../WarehouseInfoVo.java} | 8 +- .../WarehouseRack.java} | 4 +- .../WarehouseRackDto.java} | 4 +- .../WarehouseRackMapper.java} | 8 +- .../WarehouseRackMapper.xml} | 20 +-- .../WarehouseRackQuery.java} | 4 +- .../WarehouseRackService.java} | 36 ++--- .../WarehouseRackVo.java} | 4 +- .../WmsInventoryAllocateBillMapper.java | 20 --- .../WmsInventoryAllocateBillMapper.xml | 28 ---- .../WmsInventoryAllocateBillDetailMapper.xml | 38 ------ .../WmsInventoryBatchMapper.xml | 13 -- .../WmsInventoryCheckbillDetailMapper.xml | 28 ---- .../biz/wmsreportlose/WmsReportLoseMapper.xml | 38 ------ 145 files changed, 1410 insertions(+), 872 deletions(-) create mode 100644 src/main/java/com/yxt/warehouse/apiadmin/WarehouseAnsBillDetailsRest.java rename src/main/java/com/yxt/warehouse/apiadmin/{WmsWarehouseAreaRest.java => WarehouseAreaRest.java} (75%) rename src/main/java/com/yxt/warehouse/apiadmin/{WmsWarehouseAreaTypeRest.java => WarehouseAreaTypeRest.java} (70%) rename src/main/java/com/yxt/warehouse/apiadmin/{WmsWarehouseExtendRest.java => WarehouseExtendRest.java} (60%) rename src/main/java/com/yxt/warehouse/apiadmin/{WmsWarehouseInfoRest.java => WarehouseInfoRest.java} (73%) rename src/main/java/com/yxt/warehouse/apiadmin/{WmsInventoryAllocatebillDetailRest.java => WarehouseInventoryAllocatebillDetailRest.java} (74%) rename src/main/java/com/yxt/warehouse/apiadmin/{WmsInventoryAllocatebillRest.java => WarehouseInventoryAllocatebillRest.java} (80%) rename src/main/java/com/yxt/warehouse/apiadmin/{WmsInventoryBatchRest.java => WarehouseInventoryBatchRest.java} (72%) rename src/main/java/com/yxt/warehouse/apiadmin/{WmsInventoryCheckbillDetailRest.java => WarehouseInventoryCheckbillDetailRest.java} (80%) rename src/main/java/com/yxt/warehouse/apiadmin/{WmsInventoryCheckbillRest.java => WarehouseInventoryCheckbillRest.java} (81%) rename src/main/java/com/yxt/warehouse/apiadmin/{WmsInventorySettlebillDetailRest.java => WarehouseInventorySettlebillDetailRest.java} (77%) rename src/main/java/com/yxt/warehouse/apiadmin/{WmsInventorySettlebillRest.java => WarehouseInventorySettlebillRest.java} (74%) rename src/main/java/com/yxt/warehouse/apiadmin/{WmsWarehouseRackRest.java => WarehouseRackRest.java} (71%) create mode 100644 src/main/java/com/yxt/warehouse/apiadmin/WarehouseReportLoseOperRest.java rename src/main/java/com/yxt/warehouse/apiadmin/{WmsReportLoseRest.java => WarehouseReportLoseRest.java} (62%) create mode 100644 src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailQuery.java rename src/main/java/com/yxt/warehouse/biz/{wmswarehousearea/WmsWarehouseArea.java => warehousearea/WarehouseArea.java} (86%) rename src/main/java/com/yxt/warehouse/biz/{wmswarehousearea/WmsWarehouseAreaAllVo.java => warehousearea/WarehouseAreaAllVo.java} (95%) rename src/main/java/com/yxt/warehouse/biz/{wmswarehousearea/WmsWarehouseAreaDto.java => warehousearea/WarehouseAreaDto.java} (87%) rename src/main/java/com/yxt/warehouse/biz/{wmswarehousearea/WmsWarehouseAreaMapper.java => warehousearea/WarehouseAreaMapper.java} (60%) rename src/main/java/com/yxt/warehouse/biz/{wmswarehousearea/WmsWarehouseAreaMapper.xml => warehousearea/WarehouseAreaMapper.xml} (58%) rename src/main/java/com/yxt/warehouse/biz/{wmswarehouserack/WmsWarehouseRackQuery.java => warehousearea/WarehouseAreaQuery.java} (73%) rename src/main/java/com/yxt/warehouse/biz/{wmswarehousearea/WmsWarehouseAreaService.java => warehousearea/WarehouseAreaService.java} (68%) rename src/main/java/com/yxt/warehouse/biz/{wmswarehousearea/WmsWarehouseAreaVo.java => warehousearea/WarehouseAreaVo.java} (90%) rename src/main/java/com/yxt/warehouse/biz/{wmswarehouseareatype/WmsWarehouseAreaType.java => warehouseareatype/WarehouseAreaType.java} (73%) rename src/main/java/com/yxt/warehouse/biz/{wmswarehouseareatype/WmsWarehouseAreaTypeDto.java => warehouseareatype/WarehouseAreaTypeDto.java} (84%) rename src/main/java/com/yxt/warehouse/biz/{wmswarehouseareatype/WmsWarehouseAreaTypeMapper.java => warehouseareatype/WarehouseAreaTypeMapper.java} (56%) rename src/main/java/com/yxt/warehouse/biz/{wmswarehouseareatype/WmsWarehouseAreaTypeMapper.xml => warehouseareatype/WarehouseAreaTypeMapper.xml} (65%) rename src/main/java/com/yxt/warehouse/biz/{wmswarehouseextend/WmsWarehouseExtendQuery.java => warehouseareatype/WarehouseAreaTypeQuery.java} (58%) rename src/main/java/com/yxt/warehouse/biz/{wmswarehouseareatype/WmsWarehouseAreaTypeService.java => warehouseareatype/WarehouseAreaTypeService.java} (64%) rename src/main/java/com/yxt/warehouse/biz/{wmswarehouseareatype/WmsWarehouseAreaTypeVo.java => warehouseareatype/WarehouseAreaTypeVo.java} (87%) rename src/main/java/com/yxt/warehouse/biz/{wmswarehouseextend/WmsWarehouseExtend.java => warehouseextend/WarehouseExtend.java} (79%) rename src/main/java/com/yxt/warehouse/biz/{wmswarehouseextend/WmsWarehouseExtendDto.java => warehouseextend/WarehouseExtendDto.java} (86%) rename src/main/java/com/yxt/warehouse/biz/{wmswarehouseextend/WmsWarehouseExtendMapper.java => warehouseextend/WarehouseExtendMapper.java} (56%) rename src/main/java/com/yxt/warehouse/biz/{wmswarehouseextend/WmsWarehouseExtendMapper.xml => warehouseextend/WarehouseExtendMapper.xml} (59%) rename src/main/java/com/yxt/warehouse/biz/{wmsreportlose/WmsReportLoseQuery.java => warehouseextend/WarehouseExtendQuery.java} (60%) rename src/main/java/com/yxt/warehouse/biz/{wmswarehouseextend/WmsWarehouseExtendService.java => warehouseextend/WarehouseExtendService.java} (73%) rename src/main/java/com/yxt/warehouse/biz/{wmswarehouseextend/WmsWarehouseExtendVo.java => warehouseextend/WarehouseExtendVo.java} (89%) rename src/main/java/com/yxt/warehouse/biz/{wmsinventoryallocatebill/WmsInventoryAllocateBill.java => warehouseinventoryallocatebill/WarehouseInventoryAllocatebill.java} (87%) rename src/main/java/com/yxt/warehouse/biz/{wmsinventoryallocatebill/WmsInventoryAllocateBillDetailsVoNew.java => warehouseinventoryallocatebill/WarehouseInventoryAllocatebillDetailsVoNew.java} (90%) rename src/main/java/com/yxt/warehouse/biz/{wmsinventoryallocatebilldetail/WmsInventoryAllocateBillDetailDto.java => warehouseinventoryallocatebill/WarehouseInventoryAllocatebillDto.java} (92%) rename src/main/java/com/yxt/warehouse/biz/{wmsinventoryallocatebill/WmsInventoryAllocateBillDtoNew.java => warehouseinventoryallocatebill/WarehouseInventoryAllocatebillDtoNew.java} (81%) create mode 100644 src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebill/WarehouseInventoryAllocatebillMapper.java create mode 100644 src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebill/WarehouseInventoryAllocatebillMapper.xml rename src/main/java/com/yxt/warehouse/biz/{wmsinventoryallocatebilldetail/WmsInventoryAllocateBillDetailQuery.java => warehouseinventoryallocatebill/WarehouseInventoryAllocatebillQuery.java} (55%) rename src/main/java/com/yxt/warehouse/biz/{wmsinventoryallocatebill/WmsInventoryAllocateBillQueryNew.java => warehouseinventoryallocatebill/WarehouseInventoryAllocatebillQueryNew.java} (81%) rename src/main/java/com/yxt/warehouse/biz/{wmsinventoryallocatebill/WmsInventoryAllocateBillService.java => warehouseinventoryallocatebill/WarehouseInventoryAllocatebillService.java} (56%) rename src/main/java/com/yxt/warehouse/biz/{wmsinventoryallocatebill/WmsInventoryAllocateBillVo.java => warehouseinventoryallocatebill/WarehouseInventoryAllocatebillVo.java} (93%) rename src/main/java/com/yxt/warehouse/biz/{wmsinventoryallocatebill/WmsInventoryAllocateBillVoNew.java => warehouseinventoryallocatebill/WarehouseInventoryAllocatebillVoNew.java} (92%) rename src/main/java/com/yxt/warehouse/biz/{wmsinventoryallocatebilldetail/WmsInventoryAllocateBillDetail.java => warehouseinventoryallocatebilldetail/WarehouseInventoryAllocatebillDetail.java} (89%) rename src/main/java/com/yxt/warehouse/biz/{wmsinventoryallocatebilldetail/WmsInventoryAllocatebillDetailDetailsVoNew.java => warehouseinventoryallocatebilldetail/WarehouseInventoryAllocatebillDetailDetailsVoNew.java} (96%) rename src/main/java/com/yxt/warehouse/biz/{wmsinventoryallocatebill/WmsInventoryAllocateBillDto.java => warehouseinventoryallocatebilldetail/WarehouseInventoryAllocatebillDetailDto.java} (92%) rename src/main/java/com/yxt/warehouse/biz/{wmsinventoryallocatebilldetail/WmsInventoryAllocateBillDetailDtoNew.java => warehouseinventoryallocatebilldetail/WarehouseInventoryAllocatebillDetailDtoNew.java} (92%) rename src/main/java/com/yxt/warehouse/biz/{wmsinventoryallocatebilldetail/WmsInventoryAllocateBillDetailMapper.java => warehouseinventoryallocatebilldetail/WarehouseInventoryAllocatebillDetailMapper.java} (51%) create mode 100644 src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebilldetail/WarehouseInventoryAllocatebillDetailMapper.xml create mode 100644 src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebilldetail/WarehouseInventoryAllocatebillDetailQuery.java rename src/main/java/com/yxt/warehouse/biz/{wmsinventoryallocatebilldetail/WmsInventoryAllocateBillDetailService.java => warehouseinventoryallocatebilldetail/WarehouseInventoryAllocatebillDetailService.java} (56%) rename src/main/java/com/yxt/warehouse/biz/{wmsinventoryallocatebilldetail/WmsInventoryAllocateBillDetailVo.java => warehouseinventoryallocatebilldetail/WarehouseInventoryAllocatebillDetailVo.java} (93%) rename src/main/java/com/yxt/warehouse/biz/{wmsinventorybatch/WmsInventoryBatch.java => warehouseinventorybatch/WarehouseInventoryBatch.java} (97%) rename src/main/java/com/yxt/warehouse/biz/{wmsinventorybatch/WmsInventoryBatchDetailsVo.java => warehouseinventorybatch/WarehouseInventoryBatchDetailsVo.java} (97%) rename src/main/java/com/yxt/warehouse/biz/{wmsinventorybatch/WmsInventoryBatchDto.java => warehouseinventorybatch/WarehouseInventoryBatchDto.java} (97%) rename src/main/java/com/yxt/warehouse/biz/{wmsinventorybatch/WmsInventoryBatchMapper.java => warehouseinventorybatch/WarehouseInventoryBatchMapper.java} (83%) create mode 100644 src/main/java/com/yxt/warehouse/biz/warehouseinventorybatch/WarehouseInventoryBatchMapper.xml rename src/main/java/com/yxt/warehouse/biz/{wmsinventorybatch/WmsInventoryBatchQuery.java => warehouseinventorybatch/WarehouseInventoryBatchQuery.java} (97%) rename src/main/java/com/yxt/warehouse/biz/{wmsinventorybatch/WmsInventoryBatchService.java => warehouseinventorybatch/WarehouseInventoryBatchService.java} (71%) rename src/main/java/com/yxt/warehouse/biz/{wmsinventorybatch/WmsInventoryBatchVo.java => warehouseinventorybatch/WarehouseInventoryBatchVo.java} (97%) rename src/main/java/com/yxt/warehouse/biz/{wmsinventorycheckbill/WmsInventoryCheckbill.java => warehouseinventorycheckbill/WarehouseInventoryCheckBill.java} (96%) rename src/main/java/com/yxt/warehouse/biz/{wmsinventorycheckbill/WmsInventoryCheckbillDetailsVo.java => warehouseinventorycheckbill/WarehouseInventoryCheckBillDetailsVo.java} (90%) rename src/main/java/com/yxt/warehouse/biz/{wmsinventorycheckbill/WmsInventoryCheckbillDto.java => warehouseinventorycheckbill/WarehouseInventoryCheckBillDto.java} (90%) rename src/main/java/com/yxt/warehouse/biz/{wmsinventorycheckbill/WmsInventoryCheckbillMapper.java => warehouseinventorycheckbill/WarehouseInventoryCheckBillMapper.java} (82%) rename src/main/java/com/yxt/warehouse/biz/{wmsinventorycheckbill/WmsInventoryCheckbillMapper.xml => warehouseinventorycheckbill/WarehouseInventoryCheckBillMapper.xml} (61%) rename src/main/java/com/yxt/warehouse/biz/{wmsinventorycheckbill/WmsInventoryCheckbillQuery.java => warehouseinventorycheckbill/WarehouseInventoryCheckBillQuery.java} (95%) rename src/main/java/com/yxt/warehouse/biz/{wmsinventorycheckbill/WmsInventoryCheckbillService.java => warehouseinventorycheckbill/WarehouseInventoryCheckBillService.java} (62%) rename src/main/java/com/yxt/warehouse/biz/{wmsinventorycheckbill/WmsInventoryCheckbillVo.java => warehouseinventorycheckbill/WarehouseInventoryCheckBillVo.java} (96%) rename src/main/java/com/yxt/warehouse/biz/{wmsinventorycheckbilldetail/WmsInventoryCheckbillDetail.java => warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetail.java} (95%) rename src/main/java/com/yxt/warehouse/biz/{wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailDetailsVo.java => warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailDetailsVo.java} (96%) rename src/main/java/com/yxt/warehouse/biz/{wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailDto.java => warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailDto.java} (96%) rename src/main/java/com/yxt/warehouse/biz/{wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.java => warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailMapper.java} (79%) create mode 100644 src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailMapper.xml rename src/main/java/com/yxt/warehouse/biz/{wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailQuery.java => warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailQuery.java} (94%) rename src/main/java/com/yxt/warehouse/biz/{wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailService.java => warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailService.java} (68%) rename src/main/java/com/yxt/warehouse/biz/{wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailVo.java => warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailVo.java} (94%) rename src/main/java/com/yxt/warehouse/biz/{wmsinventorysettlebill/WmsInventorySettleRecordQuery.java => warehouseinventorysettlebill/WarehouseInventorySettleRecordQuery.java} (66%) rename src/main/java/com/yxt/warehouse/biz/{wmsinventorysettlebill/WmsInventorySettleRecordVo.java => warehouseinventorysettlebill/WarehouseInventorySettleRecordVo.java} (75%) rename src/main/java/com/yxt/warehouse/biz/{wmsinventorysettlebill/WmsInventorySettlebill.java => warehouseinventorysettlebill/WarehouseInventorySettlebill.java} (96%) rename src/main/java/com/yxt/warehouse/biz/{wmsinventorysettlebill/WmsInventorySettlebillDetailsVo.java => warehouseinventorysettlebill/WarehouseInventorySettlebillDetailsVo.java} (96%) rename src/main/java/com/yxt/warehouse/biz/{wmsinventorysettlebill/WmsInventorySettlebillDto.java => warehouseinventorysettlebill/WarehouseInventorySettlebillDto.java} (96%) rename src/main/java/com/yxt/warehouse/biz/{wmsinventorysettlebill/WmsInventorySettlebillMapper.java => warehouseinventorysettlebill/WarehouseInventorySettlebillMapper.java} (80%) rename src/main/java/com/yxt/warehouse/biz/{wmsinventorysettlebill/WmsInventorySettlebillMapper.xml => warehouseinventorysettlebill/WarehouseInventorySettlebillMapper.xml} (64%) rename src/main/java/com/yxt/warehouse/biz/{wmsinventorysettlebill/WmsInventorySettlebillQuery.java => warehouseinventorysettlebill/WarehouseInventorySettlebillQuery.java} (96%) rename src/main/java/com/yxt/warehouse/biz/{wmsinventorysettlebill/WmsInventorySettlebillService.java => warehouseinventorysettlebill/WarehouseInventorySettlebillService.java} (67%) rename src/main/java/com/yxt/warehouse/biz/{wmsinventorysettlebill/WmsInventorySettlebillVo.java => warehouseinventorysettlebill/WarehouseInventorySettlebillVo.java} (96%) rename src/main/java/com/yxt/warehouse/biz/{wmsinventorysettlebilldetail/WmsInventorySettlebillDetail.java => warehouseinventorysettlebilldetail/WarehouseInventorySettlebillDetail.java} (96%) rename src/main/java/com/yxt/warehouse/biz/{wmsinventorysettlebilldetail/WmsInventorySettlebillDetailDetailsVo.java => warehouseinventorysettlebilldetail/WarehouseInventorySettlebillDetailDetailsVo.java} (96%) rename src/main/java/com/yxt/warehouse/biz/{wmsinventorysettlebilldetail/WmsInventorySettlebillDetailDto.java => warehouseinventorysettlebilldetail/WarehouseInventorySettlebillDetailDto.java} (96%) rename src/main/java/com/yxt/warehouse/biz/{wmsinventorysettlebilldetail/WmsInventorySettlebillDetailMapper.java => warehouseinventorysettlebilldetail/WarehouseInventorySettlebillDetailMapper.java} (80%) rename src/main/java/com/yxt/warehouse/biz/{wmsinventorysettlebilldetail/WmsInventorySettlebillDetailMapper.xml => warehouseinventorysettlebilldetail/WarehouseInventorySettlebillDetailMapper.xml} (66%) rename src/main/java/com/yxt/warehouse/biz/{wmsinventorysettlebilldetail/WmsInventorySettlebillDetailQuery.java => warehouseinventorysettlebilldetail/WarehouseInventorySettlebillDetailQuery.java} (94%) rename src/main/java/com/yxt/warehouse/biz/{wmsinventorysettlebilldetail/WmsInventorySettlebillDetailService.java => warehouseinventorysettlebilldetail/WarehouseInventorySettlebillDetailService.java} (70%) rename src/main/java/com/yxt/warehouse/biz/{wmsinventorysettlebilldetail/WmsInventorySettlebillDetailVo.java => warehouseinventorysettlebilldetail/WarehouseInventorySettlebillDetailVo.java} (95%) rename src/main/java/com/yxt/warehouse/biz/{wmsinventorysettlebilldetail/WmsInventorySettlebillExportVo.java => warehouseinventorysettlebilldetail/WarehouseInventorySettlebillExportVo.java} (92%) rename src/main/java/com/yxt/warehouse/biz/{wmsreportlose/WmsReportLose.java => warehousereportlose/WarehouseReportLose.java} (92%) rename src/main/java/com/yxt/warehouse/biz/{wmsreportlose/WmsReportLoseDto.java => warehousereportlose/WarehouseReportLoseDto.java} (93%) rename src/main/java/com/yxt/warehouse/biz/{wmsreportlose/WmsReportLoseMapper.java => warehousereportlose/WarehouseReportLoseMapper.java} (60%) create mode 100644 src/main/java/com/yxt/warehouse/biz/warehousereportlose/WarehouseReportLoseMapper.xml rename src/main/java/com/yxt/warehouse/biz/{wmswarehouseareatype/WmsWarehouseAreaTypeQuery.java => warehousereportlose/WarehouseReportLoseQuery.java} (57%) rename src/main/java/com/yxt/warehouse/biz/{wmsreportlose/WmsReportLoseService.java => warehousereportlose/WarehouseReportLoseService.java} (62%) rename src/main/java/com/yxt/warehouse/biz/{wmsreportlose/WmsReportLoseVo.java => warehousereportlose/WarehouseReportLoseVo.java} (94%) create mode 100644 src/main/java/com/yxt/warehouse/biz/warehousereportloseoper/WarehouseReportLoseOper.java create mode 100644 src/main/java/com/yxt/warehouse/biz/warehousereportloseoper/WarehouseReportLoseOperDto.java create mode 100644 src/main/java/com/yxt/warehouse/biz/warehousereportloseoper/WarehouseReportLoseOperMapper.java create mode 100644 src/main/java/com/yxt/warehouse/biz/warehousereportloseoper/WarehouseReportLoseOperMapper.xml rename src/main/java/com/yxt/warehouse/biz/{wmsinventoryallocatebill/WmsInventoryAllocateBillQuery.java => warehousereportloseoper/WarehouseReportLoseOperQuery.java} (56%) create mode 100644 src/main/java/com/yxt/warehouse/biz/warehousereportloseoper/WarehouseReportLoseOperService.java create mode 100644 src/main/java/com/yxt/warehouse/biz/warehousereportloseoper/WarehouseReportLoseOperVo.java rename src/main/java/com/yxt/warehouse/biz/{wmswarehouseinfo/WmsWarehouseInfo.java => warehousewarehouseinfo/WarehouseInfo.java} (89%) rename src/main/java/com/yxt/warehouse/biz/{wmswarehouseinfo/WmsWarehouseInfoAllVo.java => warehousewarehouseinfo/WarehouseInfoAllVo.java} (95%) rename src/main/java/com/yxt/warehouse/biz/{wmswarehouseinfo/WmsWarehouseInfoDto.java => warehousewarehouseinfo/WarehouseInfoDto.java} (84%) rename src/main/java/com/yxt/warehouse/biz/{wmswarehouseinfo/WmsWarehouseInfoMapper.java => warehousewarehouseinfo/WarehouseInfoMapper.java} (59%) rename src/main/java/com/yxt/warehouse/biz/{wmswarehouseinfo/WmsWarehouseInfoMapper.xml => warehousewarehouseinfo/WarehouseInfoMapper.xml} (67%) rename src/main/java/com/yxt/warehouse/biz/{wmswarehouseinfo/WmsWarehouseInfoQuery.java => warehousewarehouseinfo/WarehouseInfoQuery.java} (66%) rename src/main/java/com/yxt/warehouse/biz/{wmswarehouseinfo/WmsWarehouseInfoService.java => warehousewarehouseinfo/WarehouseInfoService.java} (66%) rename src/main/java/com/yxt/warehouse/biz/{wmswarehouseinfo/WmsWarehouseInfoVo.java => warehousewarehouseinfo/WarehouseInfoVo.java} (85%) rename src/main/java/com/yxt/warehouse/biz/{wmswarehouserack/WmsWarehouseRack.java => warehousewarehouserack/WarehouseRack.java} (84%) rename src/main/java/com/yxt/warehouse/biz/{wmswarehouserack/WmsWarehouseRackDto.java => warehousewarehouserack/WarehouseRackDto.java} (85%) rename src/main/java/com/yxt/warehouse/biz/{wmswarehouserack/WmsWarehouseRackMapper.java => warehousewarehouserack/WarehouseRackMapper.java} (58%) rename src/main/java/com/yxt/warehouse/biz/{wmswarehouserack/WmsWarehouseRackMapper.xml => warehousewarehouserack/WarehouseRackMapper.xml} (55%) rename src/main/java/com/yxt/warehouse/biz/{wmswarehousearea/WmsWarehouseAreaQuery.java => warehousewarehouserack/WarehouseRackQuery.java} (72%) rename src/main/java/com/yxt/warehouse/biz/{wmswarehouserack/WmsWarehouseRackService.java => warehousewarehouserack/WarehouseRackService.java} (68%) rename src/main/java/com/yxt/warehouse/biz/{wmswarehouserack/WmsWarehouseRackVo.java => warehousewarehouserack/WarehouseRackVo.java} (89%) delete mode 100644 src/main/java/com/yxt/warehouse/biz/wmsinventoryallocatebill/WmsInventoryAllocateBillMapper.java delete mode 100644 src/main/java/com/yxt/warehouse/biz/wmsinventoryallocatebill/WmsInventoryAllocateBillMapper.xml delete mode 100644 src/main/java/com/yxt/warehouse/biz/wmsinventoryallocatebilldetail/WmsInventoryAllocateBillDetailMapper.xml delete mode 100644 src/main/java/com/yxt/warehouse/biz/wmsinventorybatch/WmsInventoryBatchMapper.xml delete mode 100644 src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.xml delete mode 100644 src/main/java/com/yxt/warehouse/biz/wmsreportlose/WmsReportLoseMapper.xml diff --git a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseAnsBillDetailsRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseAnsBillDetailsRest.java new file mode 100644 index 0000000..eb1e0cf --- /dev/null +++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseAnsBillDetailsRest.java @@ -0,0 +1,56 @@ +package com.yxt.warehouse.apiadmin; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.warehouse.biz.warehouseansbilldetail.WarehouseAnsBillDetailDto; +import com.yxt.warehouse.biz.warehouseansbilldetail.WarehouseAnsBillDetailQuery; +import com.yxt.warehouse.biz.warehouseansbilldetail.WarehouseAnsBillDetailService; +import com.yxt.warehouse.biz.warehouseansbilldetail.WarehouseAnsBillDetailVo; +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/6/6 15:04 + */ +@Api(tags = "预期到货通知单明细") +@RestController +@RequestMapping("/apiadmin/wmsansbilldetails") +public class WarehouseAnsBillDetailsRest { + + @Autowired + private WarehouseAnsBillDetailService warehouseAnsBillDetailService; + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + return warehouseAnsBillDetailService.listPage(pq); + } + + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody WarehouseAnsBillDetailDto dto){ + ResultBean rb = ResultBean.fireFail(); + warehouseAnsBillDetailService.saveOrUpdateDto(dto); + return rb.success(); + } + + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + warehouseAnsBillDetailService.delAll(sids); + return rb.success(); + } + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + WarehouseAnsBillDetailVo vo = warehouseAnsBillDetailService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } +} diff --git a/src/main/java/com/yxt/warehouse/apiadmin/WmsWarehouseAreaRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseAreaRest.java similarity index 75% rename from src/main/java/com/yxt/warehouse/apiadmin/WmsWarehouseAreaRest.java rename to src/main/java/com/yxt/warehouse/apiadmin/WarehouseAreaRest.java index af02542..dcf6169 100644 --- a/src/main/java/com/yxt/warehouse/apiadmin/WmsWarehouseAreaRest.java +++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseAreaRest.java @@ -3,7 +3,7 @@ package com.yxt.warehouse.apiadmin; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.warehouse.biz.wmswarehousearea.*; +import com.yxt.warehouse.biz.warehousearea.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -18,31 +18,31 @@ import java.util.List; @Api(tags = "库区信息") @RestController @RequestMapping("/apiadmin/base/wmswarehousearea") -public class WmsWarehouseAreaRest { +public class WarehouseAreaRest { @Autowired - WmsWarehouseAreaService wmsWarehouseAreaService; + WarehouseAreaService wmsWarehouseAreaService; @ApiOperation("分页列表") @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq) { + public ResultBean> listPage(@RequestBody PagerQuery pq) { return wmsWarehouseAreaService.listPage(pq); } @ApiOperation("查询所有的库区") @GetMapping("/listAll") - public ResultBean listAll() { + public ResultBean listAll() { return wmsWarehouseAreaService.getAllType(); } @ApiOperation("保存修改") @PostMapping("/saveOrUpdate") - public ResultBean saveOrUpdate(@RequestBody WmsWarehouseAreaDto dto) { + public ResultBean saveOrUpdate(@RequestBody WarehouseAreaDto dto) { return wmsWarehouseAreaService.saveOrUpdate(dto); } @ApiOperation("初始化") @GetMapping("/initialization/{sid}") - public ResultBean initialization(@PathVariable("sid") String sid) { + public ResultBean initialization(@PathVariable("sid") String sid) { return wmsWarehouseAreaService.initialization(sid); } @@ -67,9 +67,9 @@ public class WmsWarehouseAreaRest { @ApiOperation("根据仓库sid查询所有库位") @GetMapping("/selectAll") - public ResultBean> selectAll(@RequestParam("ckSid") String ckSid){ + public ResultBean> selectAll(@RequestParam("ckSid") String ckSid){ ResultBean rb = ResultBean.fireFail(); - List vo = wmsWarehouseAreaService.selectAll(ckSid); + List vo = wmsWarehouseAreaService.selectAll(ckSid); return rb.success().setData(vo); } } diff --git a/src/main/java/com/yxt/warehouse/apiadmin/WmsWarehouseAreaTypeRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseAreaTypeRest.java similarity index 70% rename from src/main/java/com/yxt/warehouse/apiadmin/WmsWarehouseAreaTypeRest.java rename to src/main/java/com/yxt/warehouse/apiadmin/WarehouseAreaTypeRest.java index 7caba89..df4cf7a 100644 --- a/src/main/java/com/yxt/warehouse/apiadmin/WmsWarehouseAreaTypeRest.java +++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseAreaTypeRest.java @@ -3,10 +3,10 @@ package com.yxt.warehouse.apiadmin; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.warehouse.biz.wmswarehouseareatype.WmsWarehouseAreaTypeDto; -import com.yxt.warehouse.biz.wmswarehouseareatype.WmsWarehouseAreaTypeQuery; -import com.yxt.warehouse.biz.wmswarehouseareatype.WmsWarehouseAreaTypeService; -import com.yxt.warehouse.biz.wmswarehouseareatype.WmsWarehouseAreaTypeVo; +import com.yxt.warehouse.biz.warehouseareatype.WarehouseAreaTypeDto; +import com.yxt.warehouse.biz.warehouseareatype.WarehouseAreaTypeQuery; +import com.yxt.warehouse.biz.warehouseareatype.WarehouseAreaTypeService; +import com.yxt.warehouse.biz.warehouseareatype.WarehouseAreaTypeVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -19,31 +19,31 @@ import org.springframework.web.bind.annotation.*; @Api(tags = "库区类型信息") @RestController @RequestMapping("/apiadmin/base/wmswarehouseareatype") -public class WmsWarehouseAreaTypeRest { +public class WarehouseAreaTypeRest { @Autowired - WmsWarehouseAreaTypeService wmsWarehouseAreaTypeService; + WarehouseAreaTypeService wmsWarehouseAreaTypeService; @ApiOperation("分页列表") @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq) { + public ResultBean> listPage(@RequestBody PagerQuery pq) { return wmsWarehouseAreaTypeService.listPage(pq); } @ApiOperation("查询所有的") @GetMapping("/listAll") - public ResultBean listAll() { + public ResultBean listAll() { return wmsWarehouseAreaTypeService.listAll(); } @ApiOperation("保存修改") @PostMapping("/saveOrUpdate") - public ResultBean saveOrUpdate(@RequestBody WmsWarehouseAreaTypeDto dto) { + public ResultBean saveOrUpdate(@RequestBody WarehouseAreaTypeDto dto) { return wmsWarehouseAreaTypeService.saveOrUpdate(dto); } @ApiOperation("初始化") @GetMapping("/initialization/{sid}") - public ResultBean initialization(@PathVariable("sid") String sid) { + public ResultBean initialization(@PathVariable("sid") String sid) { return wmsWarehouseAreaTypeService.initialization(sid); } diff --git a/src/main/java/com/yxt/warehouse/apiadmin/WmsWarehouseExtendRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseExtendRest.java similarity index 60% rename from src/main/java/com/yxt/warehouse/apiadmin/WmsWarehouseExtendRest.java rename to src/main/java/com/yxt/warehouse/apiadmin/WarehouseExtendRest.java index c5f3405..d26cf74 100644 --- a/src/main/java/com/yxt/warehouse/apiadmin/WmsWarehouseExtendRest.java +++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseExtendRest.java @@ -1,9 +1,9 @@ package com.yxt.warehouse.apiadmin; import com.yxt.common.core.result.ResultBean; -import com.yxt.warehouse.biz.wmswarehouseextend.WmsWarehouseExtendDto; -import com.yxt.warehouse.biz.wmswarehouseextend.WmsWarehouseExtendService; -import com.yxt.warehouse.biz.wmswarehouseextend.WmsWarehouseExtendVo; +import com.yxt.warehouse.biz.warehouseextend.WarehouseExtendDto; +import com.yxt.warehouse.biz.warehouseextend.WarehouseExtendService; +import com.yxt.warehouse.biz.warehouseextend.WarehouseExtendVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -16,21 +16,21 @@ import org.springframework.web.bind.annotation.*; @Api(tags = "库区信息") @RestController @RequestMapping("/apiadmin/base/wmswarehouseextend") -public class WmsWarehouseExtendRest { +public class WarehouseExtendRest { @Autowired - WmsWarehouseExtendService wmsWarehouseExtendService; + WarehouseExtendService wmsWarehouseExtendService; @ApiOperation("保存修改") @PostMapping("/saveOrUpdate") - public ResultBean saveOrUpdate(@RequestBody WmsWarehouseExtendDto dto) { + public ResultBean saveOrUpdate(@RequestBody WarehouseExtendDto dto) { return wmsWarehouseExtendService.saveOrUpdate(dto); } @ApiOperation("初始化") @GetMapping("/initialization/{sid}") - public ResultBean initialization(@PathVariable("sid") String sid) { + public ResultBean initialization(@PathVariable("sid") String sid) { return wmsWarehouseExtendService.initialization(sid); } diff --git a/src/main/java/com/yxt/warehouse/apiadmin/WmsWarehouseInfoRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInfoRest.java similarity index 73% rename from src/main/java/com/yxt/warehouse/apiadmin/WmsWarehouseInfoRest.java rename to src/main/java/com/yxt/warehouse/apiadmin/WarehouseInfoRest.java index c9167c3..29a36a0 100644 --- a/src/main/java/com/yxt/warehouse/apiadmin/WmsWarehouseInfoRest.java +++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInfoRest.java @@ -3,8 +3,8 @@ package com.yxt.warehouse.apiadmin; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.warehouse.biz.wmswarehousearea.WmsWarehouseAreaAllVo; -import com.yxt.warehouse.biz.wmswarehouseinfo.*; +import com.yxt.warehouse.biz.warehousearea.WarehouseAreaAllVo; +import com.yxt.warehouse.biz.warehousewarehouseinfo.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -19,31 +19,31 @@ import java.util.List; @Api(tags = "仓库信息") @RestController @RequestMapping("/apiadmin/base/wmswarehouseinfo") -public class WmsWarehouseInfoRest { +public class WarehouseInfoRest { @Autowired - WmsWarehouseInfoService wmsWarehouseService; + WarehouseInfoService wmsWarehouseService; @ApiOperation("分页列表") @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq) { + public ResultBean> listPage(@RequestBody PagerQuery pq) { return wmsWarehouseService.listPage(pq); } @ApiOperation("查询所有的仓库") @GetMapping("/listAll") - public ResultBean listAll() { + public ResultBean listAll() { return wmsWarehouseService.listAll(); } @ApiOperation("保存修改") @PostMapping("/saveOrUpdate") - public ResultBean saveOrUpdate(@RequestBody WmsWarehouseInfoDto dto) { + public ResultBean saveOrUpdate(@RequestBody WarehouseInfoDto dto) { return wmsWarehouseService.saveOrUpdate(dto); } @ApiOperation("初始化") @GetMapping("/initialization/{sid}") - public ResultBean initialization(@PathVariable("sid") String sid) { + public ResultBean initialization(@PathVariable("sid") String sid) { return wmsWarehouseService.initialization(sid); } @@ -68,9 +68,9 @@ public class WmsWarehouseInfoRest { @ApiOperation("查询所有仓库") @GetMapping("/selectAll") - public ResultBean> selectAll(){ + public ResultBean> selectAll(){ ResultBean rb = ResultBean.fireFail(); - List wmsWarehouseAreaAllVos = wmsWarehouseService.selectAll(); + List wmsWarehouseAreaAllVos = wmsWarehouseService.selectAll(); return rb.success().setData(wmsWarehouseAreaAllVos); } } diff --git a/src/main/java/com/yxt/warehouse/apiadmin/WmsInventoryAllocatebillDetailRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryAllocatebillDetailRest.java similarity index 74% rename from src/main/java/com/yxt/warehouse/apiadmin/WmsInventoryAllocatebillDetailRest.java rename to src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryAllocatebillDetailRest.java index 3c4086c..e96cab7 100644 --- a/src/main/java/com/yxt/warehouse/apiadmin/WmsInventoryAllocatebillDetailRest.java +++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryAllocatebillDetailRest.java @@ -28,11 +28,11 @@ package com.yxt.warehouse.apiadmin; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.warehouse.biz.wmsinventoryallocatebill.*; -import com.yxt.warehouse.biz.wmsinventoryallocatebilldetail.WmsInventoryAllocateBillDetailDtoNew; -import com.yxt.warehouse.biz.wmsinventoryallocatebilldetail.WmsInventoryAllocateBillDetailQuery; -import com.yxt.warehouse.biz.wmsinventoryallocatebilldetail.WmsInventoryAllocateBillDetailService; -import com.yxt.warehouse.biz.wmsinventoryallocatebilldetail.WmsInventoryAllocateBillDetailVo; +import com.yxt.warehouse.biz.warehouseinventoryallocatebill.*; +import com.yxt.warehouse.biz.warehouseinventoryallocatebilldetail.WarehouseInventoryAllocatebillDetailDtoNew; +import com.yxt.warehouse.biz.warehouseinventoryallocatebilldetail.WarehouseInventoryAllocatebillDetailQuery; +import com.yxt.warehouse.biz.warehouseinventoryallocatebilldetail.WarehouseInventoryAllocatebillDetailService; +import com.yxt.warehouse.biz.warehouseinventoryallocatebilldetail.WarehouseInventoryAllocatebillDetailVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -54,22 +54,22 @@ import org.springframework.web.bind.annotation.*; @Api(tags = "(调拨单-明细)") @RestController @RequestMapping("v1/wmsinventoryallocatebilldetail") -public class WmsInventoryAllocatebillDetailRest { +public class WarehouseInventoryAllocatebillDetailRest { @Autowired - private WmsInventoryAllocateBillDetailService wmsInventoryAllocateBillDetailService; + private WarehouseInventoryAllocatebillDetailService wmsInventoryAllocateBillDetailService; @ApiOperation("根据条件分页查询数据的列表") @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ + public ResultBean> listPage(@RequestBody PagerQuery pq){ return wmsInventoryAllocateBillDetailService.listPage(pq); } @ApiOperation("新增或修改") @PostMapping("/save") - public ResultBean save(@RequestBody WmsInventoryAllocateBillDetailDtoNew dto){ + public ResultBean save(@RequestBody WarehouseInventoryAllocatebillDetailDtoNew dto){ ResultBean rb = ResultBean.fireFail(); wmsInventoryAllocateBillDetailService.saveOrUpdateDto(dto); return rb.success(); @@ -85,9 +85,9 @@ public class WmsInventoryAllocatebillDetailRest { @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ ResultBean rb = ResultBean.fireFail(); - WmsInventoryAllocateBillDetailsVoNew vo = wmsInventoryAllocateBillDetailService.fetchDetailsVoBySid(sid); + WarehouseInventoryAllocatebillDetailsVoNew vo = wmsInventoryAllocateBillDetailService.fetchDetailsVoBySid(sid); return rb.success().setData(vo); } diff --git a/src/main/java/com/yxt/warehouse/apiadmin/WmsInventoryAllocatebillRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryAllocatebillRest.java similarity index 80% rename from src/main/java/com/yxt/warehouse/apiadmin/WmsInventoryAllocatebillRest.java rename to src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryAllocatebillRest.java index 3c23895..c420cdc 100644 --- a/src/main/java/com/yxt/warehouse/apiadmin/WmsInventoryAllocatebillRest.java +++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryAllocatebillRest.java @@ -28,7 +28,7 @@ package com.yxt.warehouse.apiadmin; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.warehouse.biz.wmsinventoryallocatebill.*; +import com.yxt.warehouse.biz.warehouseinventoryallocatebill.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -50,22 +50,22 @@ import org.springframework.web.bind.annotation.*; @Api(tags = "(调拨单)-调出方操作") @RestController @RequestMapping("/apiadmin/inventory/wmsinventoryallocatebill") -public class WmsInventoryAllocatebillRest { +public class WarehouseInventoryAllocatebillRest { @Autowired - private WmsInventoryAllocateBillService wmsInventoryAllocateBillService; + private WarehouseInventoryAllocatebillService wmsInventoryAllocateBillService; @ApiOperation("根据条件分页查询数据的列表") @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ + public ResultBean> listPage(@RequestBody PagerQuery pq){ ResultBean rb = ResultBean.fireFail(); - PagerVo pv = wmsInventoryAllocateBillService.listPageVo(pq); + PagerVo pv = wmsInventoryAllocateBillService.listPageVo(pq); return rb.success().setData(pv); } @ApiOperation("新增或修改") @PostMapping("/save") - public ResultBean save(@RequestBody WmsInventoryAllocateBillDtoNew dto){ + public ResultBean save(@RequestBody WarehouseInventoryAllocatebillDtoNew dto){ ResultBean rb = ResultBean.fireFail(); wmsInventoryAllocateBillService.saveOrUpdateDto(dto); return rb.success(); @@ -81,15 +81,15 @@ public class WmsInventoryAllocatebillRest { @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ ResultBean rb = ResultBean.fireFail(); - WmsInventoryAllocateBillDetailsVoNew vo = wmsInventoryAllocateBillService.fetchDetailsVoBySid(sid); + WarehouseInventoryAllocatebillDetailsVoNew vo = wmsInventoryAllocateBillService.fetchDetailsVoBySid(sid); return rb.success().setData(vo); } @ApiOperation("调拨") @PostMapping("/allocation") - public ResultBean allocation(@RequestBody WmsInventoryAllocateBillDtoNew dto){ + public ResultBean allocation(@RequestBody WarehouseInventoryAllocatebillDtoNew dto){ ResultBean rb = ResultBean.fireFail(); wmsInventoryAllocateBillService.allocation(dto); return rb.success(); diff --git a/src/main/java/com/yxt/warehouse/apiadmin/WmsInventoryBatchRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryBatchRest.java similarity index 72% rename from src/main/java/com/yxt/warehouse/apiadmin/WmsInventoryBatchRest.java rename to src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryBatchRest.java index af750d1..273e456 100644 --- a/src/main/java/com/yxt/warehouse/apiadmin/WmsInventoryBatchRest.java +++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryBatchRest.java @@ -3,7 +3,7 @@ package com.yxt.warehouse.apiadmin; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.warehouse.biz.wmsinventorybatch.*; +import com.yxt.warehouse.biz.warehouseinventorybatch.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -16,28 +16,28 @@ import org.springframework.web.bind.annotation.*; @Api(tags = "(商品库存-批次属性)") @RestController @RequestMapping("/apiadmin/base/inventorybatch") -public class WmsInventoryBatchRest { +public class WarehouseInventoryBatchRest { @Autowired - WmsInventoryBatchService wmsInventoryBatchService; + WarehouseInventoryBatchService wmsInventoryBatchService; @ApiOperation("分页列表") @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq) { + public ResultBean> listPage(@RequestBody PagerQuery pq) { return new ResultBean(wmsInventoryBatchService.listPageVo(pq)); } @ApiOperation("保存修改") @PostMapping("/saveOrUpdate") - public void saveOrUpdate(@RequestBody WmsInventoryBatchDto dto) { + public void saveOrUpdate(@RequestBody WarehouseInventoryBatchDto dto) { wmsInventoryBatchService.saveOrUpdateDto(dto); } @ApiOperation("初始化") @GetMapping("/initialization/{sid}") - public ResultBean initialization(@PathVariable("sid") String sid) { + public ResultBean initialization(@PathVariable("sid") String sid) { return new ResultBean<>(wmsInventoryBatchService.fetchDetailsVoBySid(sid)); } diff --git a/src/main/java/com/yxt/warehouse/apiadmin/WmsInventoryCheckbillDetailRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryCheckbillDetailRest.java similarity index 80% rename from src/main/java/com/yxt/warehouse/apiadmin/WmsInventoryCheckbillDetailRest.java rename to src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryCheckbillDetailRest.java index 72b0c80..29dc5cf 100644 --- a/src/main/java/com/yxt/warehouse/apiadmin/WmsInventoryCheckbillDetailRest.java +++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryCheckbillDetailRest.java @@ -28,7 +28,7 @@ package com.yxt.warehouse.apiadmin; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.warehouse.biz.wmsinventorycheckbilldetail.*; +import com.yxt.warehouse.biz.warehouseinventorycheckbilldetail.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -50,22 +50,22 @@ import org.springframework.web.bind.annotation.*; @Api(tags = "库存盘点-明细") @RestController @RequestMapping("wmsinventorycheckbilldetail") -public class WmsInventoryCheckbillDetailRest { +public class WarehouseInventoryCheckbillDetailRest { @Autowired - private WmsInventoryCheckbillDetailService wmsInventoryCheckbillDetailService; + private WarehouseInventoryCheckbillDetailService wmsInventoryCheckbillDetailService; @ApiOperation("根据条件分页查询数据的列表") @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ + public ResultBean> listPage(@RequestBody PagerQuery pq){ ResultBean rb = ResultBean.fireFail(); - PagerVo pv = wmsInventoryCheckbillDetailService.listPageVo(pq); + PagerVo pv = wmsInventoryCheckbillDetailService.listPageVo(pq); return rb.success().setData(pv); } @ApiOperation("新增或修改") @PostMapping("/save") - public ResultBean save(@RequestBody WmsInventoryCheckbillDetailDto dto){ + public ResultBean save(@RequestBody WarehouseInventoryCheckbillDetailDto dto){ ResultBean rb = ResultBean.fireFail(); wmsInventoryCheckbillDetailService.saveOrUpdateDto(dto); return rb.success(); @@ -81,9 +81,9 @@ public class WmsInventoryCheckbillDetailRest { @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ ResultBean rb = ResultBean.fireFail(); - WmsInventoryCheckbillDetailDetailsVo vo = wmsInventoryCheckbillDetailService.fetchDetailsVoBySid(sid); + WarehouseInventoryCheckbillDetailDetailsVo vo = wmsInventoryCheckbillDetailService.fetchDetailsVoBySid(sid); return rb.success().setData(vo); } } diff --git a/src/main/java/com/yxt/warehouse/apiadmin/WmsInventoryCheckbillRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryCheckbillRest.java similarity index 81% rename from src/main/java/com/yxt/warehouse/apiadmin/WmsInventoryCheckbillRest.java rename to src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryCheckbillRest.java index 38c52ea..61d8685 100644 --- a/src/main/java/com/yxt/warehouse/apiadmin/WmsInventoryCheckbillRest.java +++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryCheckbillRest.java @@ -28,7 +28,7 @@ package com.yxt.warehouse.apiadmin; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.warehouse.biz.wmsinventorycheckbill.*; +import com.yxt.warehouse.biz.warehouseinventorycheckbill.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -50,22 +50,22 @@ import org.springframework.web.bind.annotation.*; @Api(tags = "库存盘点") @RestController @RequestMapping("v1/wmsinventorycheckbill") -public class WmsInventoryCheckbillRest { +public class WarehouseInventoryCheckbillRest { @Autowired - private WmsInventoryCheckbillService wmsInventoryCheckbillService; + private WarehouseInventoryCheckBillService wmsInventoryCheckbillService; @ApiOperation("根据条件分页查询数据的列表") @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ + public ResultBean> listPage(@RequestBody PagerQuery pq){ ResultBean rb = ResultBean.fireFail(); - PagerVo pv = wmsInventoryCheckbillService.listPageVo(pq); + PagerVo pv = wmsInventoryCheckbillService.listPageVo(pq); return rb.success().setData(pv); } @ApiOperation("新增或修改") @PostMapping("/save") - public ResultBean save(@RequestBody WmsInventoryCheckbillDto dto){ + public ResultBean save(@RequestBody WarehouseInventoryCheckBillDto dto){ ResultBean rb = ResultBean.fireFail(); wmsInventoryCheckbillService.saveOrUpdateDto(dto); return rb.success(); @@ -81,15 +81,15 @@ public class WmsInventoryCheckbillRest { @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ ResultBean rb = ResultBean.fireFail(); - WmsInventoryCheckbillDetailsVo vo = wmsInventoryCheckbillService.fetchDetailsVoBySid(sid); + WarehouseInventoryCheckBillDetailsVo vo = wmsInventoryCheckbillService.fetchDetailsVoBySid(sid); return rb.success().setData(vo); } @ApiOperation("盘点") @PostMapping("/inven") - public ResultBean inven(@RequestBody WmsInventoryCheckbillDto dto){ + public ResultBean inven(@RequestBody WarehouseInventoryCheckBillDto dto){ ResultBean rb = ResultBean.fireFail(); wmsInventoryCheckbillService.inven(dto); return rb.success(); diff --git a/src/main/java/com/yxt/warehouse/apiadmin/WmsInventorySettlebillDetailRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventorySettlebillDetailRest.java similarity index 77% rename from src/main/java/com/yxt/warehouse/apiadmin/WmsInventorySettlebillDetailRest.java rename to src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventorySettlebillDetailRest.java index 46cb2c2..cc08d5c 100644 --- a/src/main/java/com/yxt/warehouse/apiadmin/WmsInventorySettlebillDetailRest.java +++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventorySettlebillDetailRest.java @@ -29,7 +29,7 @@ import com.yxt.common.base.utils.ExportExcelUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.warehouse.biz.wmsinventorysettlebilldetail.*; +import com.yxt.warehouse.biz.warehouseinventorysettlebilldetail.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -56,18 +56,18 @@ import java.util.List; @Api(tags = "库存结算明细") @RestController @RequestMapping("/apiadmin/inventory/wmsinventorysettlebilldetail") -public class WmsInventorySettlebillDetailRest{ +public class WarehouseInventorySettlebillDetailRest { @Autowired - private WmsInventorySettlebillDetailService wmsInventorySettlebillDetailService; + private WarehouseInventorySettlebillDetailService wmsInventorySettlebillDetailService; @Autowired HttpServletResponse response; @PostMapping("/exportExcel") @ApiOperation(value = "导出") - public void exportExcel(@RequestBody WmsInventorySettlebillDetailQuery query) { + public void exportExcel(@RequestBody WarehouseInventorySettlebillDetailQuery query) { //得到所有要导出的数据 - List exportVoList = wmsInventorySettlebillDetailService.listExcel(query); + List exportVoList = wmsInventorySettlebillDetailService.listExcel(query); //定义导出的excel名字 String excelName = "结转库存列表"; String fileNameURL = ""; @@ -76,22 +76,22 @@ public class WmsInventorySettlebillDetailRest{ } catch (UnsupportedEncodingException e) { e.printStackTrace(); } - ExportExcelUtils.export(fileNameURL, exportVoList, WmsInventorySettlebillExportVo.class, response); + ExportExcelUtils.export(fileNameURL, exportVoList, WarehouseInventorySettlebillExportVo.class, response); } @ApiOperation("根据条件分页查询数据的列表") @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ + public ResultBean> listPage(@RequestBody PagerQuery pq){ ResultBean rb = ResultBean.fireFail(); - PagerVo pv = wmsInventorySettlebillDetailService.listPageVo(pq); + PagerVo pv = wmsInventorySettlebillDetailService.listPageVo(pq); return rb.success().setData(pv); } @ApiOperation("新增或修改") @PostMapping("/save") - public ResultBean save(@RequestBody WmsInventorySettlebillDetailDto dto){ + public ResultBean save(@RequestBody WarehouseInventorySettlebillDetailDto dto){ ResultBean rb = ResultBean.fireFail(); wmsInventorySettlebillDetailService.saveOrUpdateDto(dto); return rb.success(); @@ -109,9 +109,9 @@ public class WmsInventorySettlebillDetailRest{ @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ ResultBean rb = ResultBean.fireFail(); - WmsInventorySettlebillDetailDetailsVo vo = wmsInventorySettlebillDetailService.fetchDetailsVoBySid(sid); + WarehouseInventorySettlebillDetailDetailsVo vo = wmsInventorySettlebillDetailService.fetchDetailsVoBySid(sid); return rb.success().setData(vo); } } diff --git a/src/main/java/com/yxt/warehouse/apiadmin/WmsInventorySettlebillRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventorySettlebillRest.java similarity index 74% rename from src/main/java/com/yxt/warehouse/apiadmin/WmsInventorySettlebillRest.java rename to src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventorySettlebillRest.java index 654fb6e..77cb7c9 100644 --- a/src/main/java/com/yxt/warehouse/apiadmin/WmsInventorySettlebillRest.java +++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventorySettlebillRest.java @@ -28,8 +28,8 @@ package com.yxt.warehouse.apiadmin; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.warehouse.biz.wmsinventorysettlebill.*; -import com.yxt.warehouse.biz.wmsinventorysettlebilldetail.WmsInventorySettlebillDetailService; +import com.yxt.warehouse.biz.warehouseinventorysettlebill.*; +import com.yxt.warehouse.biz.warehouseinventorysettlebilldetail.WarehouseInventorySettlebillDetailService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -51,16 +51,16 @@ import org.springframework.web.bind.annotation.*; @Api(tags = "库存结算单") @RestController @RequestMapping("/apiadmin/inventory/wmsinventorysettlebill") -public class WmsInventorySettlebillRest { +public class WarehouseInventorySettlebillRest { @Autowired - private WmsInventorySettlebillService wmsInventorySettlebillService; + private WarehouseInventorySettlebillService wmsInventorySettlebillService; @Autowired - private WmsInventorySettlebillDetailService wmsInventorySettlebillDetailService; + private WarehouseInventorySettlebillDetailService wmsInventorySettlebillDetailService; @ApiOperation("库存结转") @PostMapping("/saveSettlebill") - public ResultBean saveSettlebill(@RequestBody WmsInventorySettlebillDto dto){ + public ResultBean saveSettlebill(@RequestBody WarehouseInventorySettlebillDto dto){ ResultBean rb = ResultBean.fireFail(); wmsInventorySettlebillService.saveSettlebill(dto); return rb.success(); @@ -68,24 +68,24 @@ public class WmsInventorySettlebillRest { @ApiOperation("结转记录查询") @PostMapping("/carryForwardList") - public ResultBean> carryForwardList(@RequestBody PagerQuery pq){ + public ResultBean> carryForwardList(@RequestBody PagerQuery pq){ ResultBean rb = ResultBean.fireFail(); - PagerVo pv = wmsInventorySettlebillService.carryForwardList(pq); + PagerVo pv = wmsInventorySettlebillService.carryForwardList(pq); return rb.success().setData(pv); } @ApiOperation("根据条件分页查询数据的列表") @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ + public ResultBean> listPage(@RequestBody PagerQuery pq){ ResultBean rb = ResultBean.fireFail(); - PagerVo pv = wmsInventorySettlebillService.listPageVo(pq); + PagerVo pv = wmsInventorySettlebillService.listPageVo(pq); return rb.success().setData(pv); } @ApiOperation("新增或修改") @PostMapping("/save") - public ResultBean save(@RequestBody WmsInventorySettlebillDto dto){ + public ResultBean save(@RequestBody WarehouseInventorySettlebillDto dto){ ResultBean rb = ResultBean.fireFail(); wmsInventorySettlebillService.saveOrUpdateDto(dto); return rb.success(); @@ -106,9 +106,9 @@ public class WmsInventorySettlebillRest { @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ ResultBean rb = ResultBean.fireFail(); - WmsInventorySettlebillDetailsVo vo = wmsInventorySettlebillService.fetchDetailsVoBySid(sid); + WarehouseInventorySettlebillDetailsVo vo = wmsInventorySettlebillService.fetchDetailsVoBySid(sid); return rb.success().setData(vo); } diff --git a/src/main/java/com/yxt/warehouse/apiadmin/WmsWarehouseRackRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseRackRest.java similarity index 71% rename from src/main/java/com/yxt/warehouse/apiadmin/WmsWarehouseRackRest.java rename to src/main/java/com/yxt/warehouse/apiadmin/WarehouseRackRest.java index c7cdda4..203e86b 100644 --- a/src/main/java/com/yxt/warehouse/apiadmin/WmsWarehouseRackRest.java +++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseRackRest.java @@ -3,10 +3,10 @@ package com.yxt.warehouse.apiadmin; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.warehouse.biz.wmswarehouserack.WmsWarehouseRackDto; -import com.yxt.warehouse.biz.wmswarehouserack.WmsWarehouseRackQuery; -import com.yxt.warehouse.biz.wmswarehouserack.WmsWarehouseRackService; -import com.yxt.warehouse.biz.wmswarehouserack.WmsWarehouseRackVo; +import com.yxt.warehouse.biz.warehousewarehouserack.WarehouseRackDto; +import com.yxt.warehouse.biz.warehousewarehouserack.WarehouseRackQuery; +import com.yxt.warehouse.biz.warehousewarehouserack.WarehouseRackService; +import com.yxt.warehouse.biz.warehousewarehouserack.WarehouseRackVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -19,31 +19,31 @@ import org.springframework.web.bind.annotation.*; @Api(tags = "货架信息") @RestController @RequestMapping("/apiadmin/base/wmswarehouserack") -public class WmsWarehouseRackRest { +public class WarehouseRackRest { @Autowired - WmsWarehouseRackService wmsWarehouseRackService; + WarehouseRackService wmsWarehouseRackService; @ApiOperation("分页列表") @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq) { + public ResultBean> listPage(@RequestBody PagerQuery pq) { return wmsWarehouseRackService.listPage(pq); } @ApiOperation("查询所有的库区") @GetMapping("/getAllType") - public ResultBean getAllType() { + public ResultBean getAllType() { return wmsWarehouseRackService.getAllType(); } @ApiOperation("保存修改") @PostMapping("/saveOrUpdate") - public ResultBean saveOrUpdate(@RequestBody WmsWarehouseRackDto dto) { + public ResultBean saveOrUpdate(@RequestBody WarehouseRackDto dto) { return wmsWarehouseRackService.saveOrUpdate(dto); } @ApiOperation("初始化") @GetMapping("/initialization/{sid}") - public ResultBean initialization(@PathVariable("sid") String sid) { + public ResultBean initialization(@PathVariable("sid") String sid) { return wmsWarehouseRackService.initialization(sid); } diff --git a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseReportLoseOperRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseReportLoseOperRest.java new file mode 100644 index 0000000..0839a25 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseReportLoseOperRest.java @@ -0,0 +1,55 @@ +package com.yxt.warehouse.apiadmin; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.warehouse.biz.warehousereportloseoper.WarehouseReportLoseOperDto; +import com.yxt.warehouse.biz.warehousereportloseoper.WarehouseReportLoseOperQuery; +import com.yxt.warehouse.biz.warehousereportloseoper.WarehouseReportLoseOperService; +import com.yxt.warehouse.biz.warehousereportloseoper.WarehouseReportLoseOperVo; +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/6/6 10:30 + */ +@Api(tags = "报损处理表") +@RestController +@RequestMapping("/apiadmin/inventory/wmsreportloseoper") +public class WarehouseReportLoseOperRest { + @Autowired + private WarehouseReportLoseOperService wmsReportLoseOperService; + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + return wmsReportLoseOperService.listPage(pq); + } + + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody WarehouseReportLoseOperDto dto){ + ResultBean rb = ResultBean.fireFail(); + wmsReportLoseOperService.saveOrUpdateDto(dto); + return rb.success(); + } + + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + wmsReportLoseOperService.delAll(sids); + return rb.success(); + } + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + WarehouseReportLoseOperVo vo = wmsReportLoseOperService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } +} diff --git a/src/main/java/com/yxt/warehouse/apiadmin/WmsReportLoseRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseReportLoseRest.java similarity index 62% rename from src/main/java/com/yxt/warehouse/apiadmin/WmsReportLoseRest.java rename to src/main/java/com/yxt/warehouse/apiadmin/WarehouseReportLoseRest.java index 5571f1d..ca4b453 100644 --- a/src/main/java/com/yxt/warehouse/apiadmin/WmsReportLoseRest.java +++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseReportLoseRest.java @@ -3,10 +3,10 @@ package com.yxt.warehouse.apiadmin; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.warehouse.biz.wmsreportlose.WmsReportLoseDto; -import com.yxt.warehouse.biz.wmsreportlose.WmsReportLoseQuery; -import com.yxt.warehouse.biz.wmsreportlose.WmsReportLoseService; -import com.yxt.warehouse.biz.wmsreportlose.WmsReportLoseVo; +import com.yxt.warehouse.biz.warehousereportlose.WarehouseReportLoseDto; +import com.yxt.warehouse.biz.warehousereportlose.WarehouseReportLoseQuery; +import com.yxt.warehouse.biz.warehousereportlose.WarehouseReportLoseService; +import com.yxt.warehouse.biz.warehousereportlose.WarehouseReportLoseVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -16,22 +16,22 @@ import org.springframework.web.bind.annotation.*; * @author wangpengfei * @date 2024/6/5 16:48 */ -@Api(tags = "库存结算单") +@Api(tags = "报损表") @RestController @RequestMapping("/apiadmin/inventory/wmsreportlose") -public class WmsReportLoseRest { +public class WarehouseReportLoseRest { @Autowired - private WmsReportLoseService wmsReportLoseService; + private WarehouseReportLoseService wmsReportLoseService; @ApiOperation("根据条件分页查询数据的列表") @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ + public ResultBean> listPage(@RequestBody PagerQuery pq){ return wmsReportLoseService.listPage(pq); } @ApiOperation("新增或修改") @PostMapping("/save") - public ResultBean save(@RequestBody WmsReportLoseDto dto){ + public ResultBean save(@RequestBody WarehouseReportLoseDto dto){ ResultBean rb = ResultBean.fireFail(); wmsReportLoseService.saveOrUpdateDto(dto); return rb.success(); @@ -47,9 +47,9 @@ public class WmsReportLoseRest { @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ ResultBean rb = ResultBean.fireFail(); - WmsReportLoseVo vo = wmsReportLoseService.fetchDetailsVoBySid(sid); + WarehouseReportLoseVo vo = wmsReportLoseService.fetchDetailsVoBySid(sid); return rb.success().setData(vo); } } diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailDto.java b/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailDto.java index 717b46c..0f0eb48 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailDto.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailDto.java @@ -10,6 +10,7 @@ import lombok.Data; **/ @Data public class WarehouseAnsBillDetailDto { + private String sid; @ApiModelProperty("商品基础信息sid") private String goodSpuSid; diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailMapper.java b/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailMapper.java index a2e94a2..df1f8db 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailMapper.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailMapper.java @@ -1,7 +1,12 @@ package com.yxt.warehouse.biz.warehouseansbilldetail; +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.Delete; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -12,7 +17,10 @@ import java.util.List; **/ @Mapper public interface WarehouseAnsBillDetailMapper extends BaseMapper { + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + WarehouseAnsBillDetailVo initialization (@Param("sid") String sid); int deleteDetails(String sid); - + @Delete("delete from wms_ans_bill_details where sid = #{sid}") + void delByMainSid(String billSid); List selectByBillSid(String sid); } diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailMapper.xml index 756731f..ae2f6a9 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailMapper.xml +++ b/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailMapper.xml @@ -22,4 +22,19 @@ from warehouse_ans_bill_detail wd where billSid = #{sid} + + + \ No newline at end of file diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailQuery.java b/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailQuery.java new file mode 100644 index 0000000..8090642 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailQuery.java @@ -0,0 +1,13 @@ +package com.yxt.warehouse.biz.warehouseansbilldetail; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/6/6 15:10 + */ +@Data +public class WarehouseAnsBillDetailQuery implements Query { + private String name; +} diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailService.java b/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailService.java index f3b9cbc..4026ae6 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailService.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailService.java @@ -1,7 +1,16 @@ package com.yxt.warehouse.biz.warehouseansbilldetail; 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.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.stereotype.Service; import java.util.List; @@ -26,4 +35,105 @@ public class WarehouseAnsBillDetailService extends MybatisBaseService selectByBillSid(String sid) { return baseMapper.selectByBillSid(sid); } + + + public ResultBean> listPage(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + WarehouseAnsBillDetailQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getName())) { + qw.like("rackName", query.getName()); + } + + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + List records = pagging.getRecords(); + return rb.success().setData(p); + } + + + + + + public ResultBean saveOrUpdate(WarehouseAnsBillDetailDto dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = ""; + if (StringUtils.isNotBlank(dto.getSid())) { + sid = dto.getSid(); + WarehouseAnsBillDetail wmsWarehouseRack = fetchBySid(dto.getSid()); + BeanUtil.copyProperties(dto, wmsWarehouseRack, "id", "sid"); + baseMapper.updateById(wmsWarehouseRack); + } else { + WarehouseAnsBillDetail wmsWarehouseRack = new WarehouseAnsBillDetail(); + sid = wmsWarehouseRack.getSid(); + BeanUtil.copyProperties(dto, wmsWarehouseRack, "id", "sid"); + wmsWarehouseRack.setCreateTime(new DateTime()); + baseMapper.insert(wmsWarehouseRack); + } + return rb.success().setMsg("成功"); + } + + public ResultBean initialization(String sid) { + ResultBean rb = ResultBean.fireFail(); + WarehouseAnsBillDetailVo vo = baseMapper.initialization(sid); + return rb.success().setData(vo); + } + public void delAll(String[] sids) { + delBySids(sids); + } + + public ResultBean delete(String sid) { + ResultBean rb = ResultBean.fireFail(); + WarehouseAnsBillDetail wmsWarehouseRack = fetchBySid(sid); + if (null != wmsWarehouseRack) { + baseMapper.deleteById(wmsWarehouseRack.getId()); + } + return rb.success(); + } + + public ResultBean updateIsEnable(String sid, String isEnable) { + ResultBean rb = ResultBean.fireFail(); + WarehouseAnsBillDetail wmsWarehouseRack = fetchBySid(sid); + if (null != wmsWarehouseRack) { + wmsWarehouseRack.setIsEnable(Integer.parseInt(isEnable)); + baseMapper.updateById(wmsWarehouseRack); + } + return rb.success().setMsg("成功"); + } + + public void delByMainSid(String billSid) { + baseMapper.delByMainSid(billSid); + } + + + + public void saveOrUpdateDto(WarehouseAnsBillDetailDto dto) { + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + this.insertByDto(dto); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(WarehouseAnsBillDetailDto dto) { + WarehouseAnsBillDetail entity = new WarehouseAnsBillDetail(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(WarehouseAnsBillDetailDto dto) { + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + } + public WarehouseAnsBillDetailVo fetchDetailsVoBySid(String sid) { + WarehouseAnsBillDetail entity = fetchBySid(sid); + WarehouseAnsBillDetailVo vo = new WarehouseAnsBillDetailVo(); + BeanUtil.copyProperties(entity, vo); + + return vo; + } } diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseArea.java b/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseArea.java similarity index 86% rename from src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseArea.java rename to src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseArea.java index 3073780..2ce3b7b 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseArea.java +++ b/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseArea.java @@ -1,4 +1,4 @@ -package com.yxt.warehouse.biz.wmswarehousearea; +package com.yxt.warehouse.biz.warehousearea; import com.yxt.common.core.domain.BaseEntity; import lombok.Data; @@ -8,7 +8,7 @@ import lombok.Data; * @date 2024/2/28 8:38 */ @Data -public class WmsWarehouseArea extends BaseEntity { +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") diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseAreaAllVo.java b/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaAllVo.java similarity index 95% rename from src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseAreaAllVo.java rename to src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaAllVo.java index 29eb0bb..5d620bc 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseAreaAllVo.java +++ b/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaAllVo.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.warehouse.biz.wmswarehousearea; +package com.yxt.warehouse.biz.warehousearea; import com.yxt.common.core.vo.Vo; @@ -46,7 +46,7 @@ import lombok.Data; */ @Data @ApiModel(value = "库区 视图数据详情", description = "库区 视图数据详情") -public class WmsWarehouseAreaAllVo implements Vo { +public class WarehouseAreaAllVo implements Vo { private String sid; @ApiModelProperty("库位名称") diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseAreaDto.java b/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaDto.java similarity index 87% rename from src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseAreaDto.java rename to src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaDto.java index 54232e1..f20a3a0 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseAreaDto.java +++ b/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaDto.java @@ -1,4 +1,4 @@ -package com.yxt.warehouse.biz.wmswarehousearea; +package com.yxt.warehouse.biz.warehousearea; import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.dto.Dto; @@ -11,7 +11,7 @@ import java.util.Date; * @date 2024/2/26 13:38 */ @Data -public class WmsWarehouseAreaDto implements Dto { +public class WarehouseAreaDto implements Dto { private String id; private String sid; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseAreaMapper.java b/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaMapper.java similarity index 60% rename from src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseAreaMapper.java rename to src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaMapper.java index 136fbf5..b89acdf 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseAreaMapper.java +++ b/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaMapper.java @@ -1,4 +1,4 @@ -package com.yxt.warehouse.biz.wmswarehousearea; +package com.yxt.warehouse.biz.warehousearea; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -15,10 +15,10 @@ import java.util.List; * @date 2024/2/26 13:40 */ @Mapper -public interface WmsWarehouseAreaMapper extends BaseMapper { - IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - WmsWarehouseAreaVo initialization (@Param("sid") String sid); +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 wms_warehouse_area where warehouseSid = #{ckSid}") - List selectAll(String ckSid); + List selectAll(String ckSid); } diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseAreaMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaMapper.xml similarity index 58% rename from src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseAreaMapper.xml rename to src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaMapper.xml index 7782bee..5b09a5b 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseAreaMapper.xml +++ b/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaMapper.xml @@ -1,30 +1,30 @@ - + - select a.*,b.warehouseName as warehouseName,c.warehouseAreaTypeName as areaTypeName - from wms_warehouse_area a - left join wms_warehouse_info b on b.sid=a.warehouseSid - left join wms_warehouse_area_type c on c.sid =a.areaTypeSid + from warehouse_area a + left join warehouse_info b on b.sid=a.warehouseSid + left join warehouse_area_type c on c.sid =a.areaTypeSid ${ew.sqlSegment} - select a.*,b.warehouseName as warehouseName,c.warehouseAreaTypeName as areaTypeName - from wms_warehouse_area a - left join wms_warehouse_info b on b.sid=a.warehouseSid - left join wms_warehouse_area_type c on c.sid =a.areaTypeSid + from warehouse_area a + left join warehouse_info b on b.sid=a.warehouseSid + left join warehouse_area_type c on c.sid =a.areaTypeSid where a.sid =#{sid} - UPDATE wms_warehouse_area + UPDATE warehouse_area SET isDelete=1 where sid in diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehouserack/WmsWarehouseRackQuery.java b/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaQuery.java similarity index 73% rename from src/main/java/com/yxt/warehouse/biz/wmswarehouserack/WmsWarehouseRackQuery.java rename to src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaQuery.java index 7d9566e..357d594 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmswarehouserack/WmsWarehouseRackQuery.java +++ b/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaQuery.java @@ -1,4 +1,4 @@ -package com.yxt.warehouse.biz.wmswarehouserack; +package com.yxt.warehouse.biz.warehousearea; import com.yxt.common.core.query.Query; import lombok.Data; @@ -8,7 +8,7 @@ import lombok.Data; * @date 2024/2/26 13:37 */ @Data -public class WmsWarehouseRackQuery implements Query { +public class WarehouseAreaQuery implements Query { private String name;//名字 private String code;//编码 private String warehouseSid;//仓库 diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseAreaService.java b/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaService.java similarity index 68% rename from src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseAreaService.java rename to src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaService.java index 5e84cd3..bf97b0e 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseAreaService.java +++ b/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaService.java @@ -1,4 +1,4 @@ -package com.yxt.warehouse.biz.wmswarehousearea; +package com.yxt.warehouse.biz.warehousearea; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateTime; @@ -22,13 +22,13 @@ import java.util.stream.Collectors; * @date 2024/2/26 13:40 */ @Service -public class WmsWarehouseAreaService extends MybatisBaseService { +public class WarehouseAreaService extends MybatisBaseService { - public ResultBean> listPage(PagerQuery pq) { + public ResultBean> listPage(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); - WmsWarehouseAreaQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); + WarehouseAreaQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); if(StringUtils.isNotBlank(query.getName())){ qw.like("areaName",query.getName()); } @@ -42,30 +42,30 @@ public class WmsWarehouseAreaService extends MybatisBaseService page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.listPage(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - List records = pagging.getRecords(); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + List records = pagging.getRecords(); return rb.success().setData(p); } - public ResultBean getAllType() { + public ResultBean getAllType() { ResultBean rb = ResultBean.fireFail(); - List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1) + List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1) .ne("isDelete","1")); return rb.success().setData(pagging); } - public ResultBean saveOrUpdate(WmsWarehouseAreaDto dto) { + public ResultBean saveOrUpdate(WarehouseAreaDto dto) { ResultBean rb = ResultBean.fireFail(); String sid = ""; if (StringUtils.isNotBlank(dto.getSid())) { sid = dto.getSid(); - WmsWarehouseArea wmsWarehouseArea = fetchBySid(dto.getSid()); + WarehouseArea wmsWarehouseArea = fetchBySid(dto.getSid()); BeanUtil.copyProperties(dto, wmsWarehouseArea, "id", "sid"); wmsWarehouseArea.setModifyTime(new Date()); baseMapper.updateById(wmsWarehouseArea); } else { - WmsWarehouseArea wmsWarehouseArea = new WmsWarehouseArea(); + WarehouseArea wmsWarehouseArea = new WarehouseArea(); sid = wmsWarehouseArea.getSid(); BeanUtil.copyProperties(dto, wmsWarehouseArea, "id", "sid"); wmsWarehouseArea.setCreateTime(new DateTime()); @@ -74,16 +74,16 @@ public class WmsWarehouseAreaService extends MybatisBaseService initialization(String sid) { + public ResultBean initialization(String sid) { ResultBean rb = ResultBean.fireFail(); - WmsWarehouseAreaVo vo = baseMapper.initialization(sid); + WarehouseAreaVo vo = baseMapper.initialization(sid); return rb.success().setData(vo); } public ResultBean delete(String sid) { ResultBean rb = ResultBean.fireFail(); - WmsWarehouseArea wmsWarehouseArea = fetchBySid(sid); + WarehouseArea wmsWarehouseArea = fetchBySid(sid); if (null != wmsWarehouseArea) { baseMapper.deleteById(wmsWarehouseArea.getId()); } @@ -96,7 +96,7 @@ public class WmsWarehouseAreaService extends MybatisBaseService selectAll(String ckSid) { + public List selectAll(String ckSid) { return baseMapper.selectAll(ckSid); } } diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseAreaVo.java b/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaVo.java similarity index 90% rename from src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseAreaVo.java rename to src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaVo.java index 3d0945d..c0d506f 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseAreaVo.java +++ b/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaVo.java @@ -1,4 +1,4 @@ -package com.yxt.warehouse.biz.wmswarehousearea; +package com.yxt.warehouse.biz.warehousearea; import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.vo.Vo; @@ -11,7 +11,7 @@ import java.util.Date; * @date 2024/2/26 13:37 */ @Data -public class WmsWarehouseAreaVo implements Vo { +public class WarehouseAreaVo implements Vo { private String id; private String sid; private String lockVersion; diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehouseareatype/WmsWarehouseAreaType.java b/src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaType.java similarity index 73% rename from src/main/java/com/yxt/warehouse/biz/wmswarehouseareatype/WmsWarehouseAreaType.java rename to src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaType.java index 4a848bd..d90df3e 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmswarehouseareatype/WmsWarehouseAreaType.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaType.java @@ -1,4 +1,4 @@ -package com.yxt.warehouse.biz.wmswarehouseareatype; +package com.yxt.warehouse.biz.warehouseareatype; import com.yxt.common.core.domain.BaseEntity; import lombok.Data; @@ -8,7 +8,7 @@ import lombok.Data; * @date 2024/2/28 8:38 */ @Data -public class WmsWarehouseAreaType extends BaseEntity { +public class WarehouseAreaType extends BaseEntity { private String warehouseAreaTypeName;//库位类型名称 private String useOrgSid;//使用组织sid diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehouseareatype/WmsWarehouseAreaTypeDto.java b/src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaTypeDto.java similarity index 84% rename from src/main/java/com/yxt/warehouse/biz/wmswarehouseareatype/WmsWarehouseAreaTypeDto.java rename to src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaTypeDto.java index cca3275..a68389f 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmswarehouseareatype/WmsWarehouseAreaTypeDto.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaTypeDto.java @@ -1,4 +1,4 @@ -package com.yxt.warehouse.biz.wmswarehouseareatype; +package com.yxt.warehouse.biz.warehouseareatype; import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.dto.Dto; @@ -11,7 +11,7 @@ import java.util.Date; * @date 2024/2/26 13:38 */ @Data -public class WmsWarehouseAreaTypeDto implements Dto { +public class WarehouseAreaTypeDto implements Dto { private String id; private String sid; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehouseareatype/WmsWarehouseAreaTypeMapper.java b/src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaTypeMapper.java similarity index 56% rename from src/main/java/com/yxt/warehouse/biz/wmswarehouseareatype/WmsWarehouseAreaTypeMapper.java rename to src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaTypeMapper.java index 071e0cf..9b8872f 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmswarehouseareatype/WmsWarehouseAreaTypeMapper.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaTypeMapper.java @@ -1,4 +1,4 @@ -package com.yxt.warehouse.biz.wmswarehouseareatype; +package com.yxt.warehouse.biz.warehouseareatype; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -14,8 +14,8 @@ import java.util.List; * @date 2024/2/26 13:40 */ @Mapper -public interface WmsWarehouseAreaTypeMapper extends BaseMapper { - IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - WmsWarehouseAreaTypeVo initialization (@Param("sid") String sid); +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/src/main/java/com/yxt/warehouse/biz/wmswarehouseareatype/WmsWarehouseAreaTypeMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaTypeMapper.xml similarity index 65% rename from src/main/java/com/yxt/warehouse/biz/wmswarehouseareatype/WmsWarehouseAreaTypeMapper.xml rename to src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaTypeMapper.xml index 73bc7f6..83a69e4 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmswarehouseareatype/WmsWarehouseAreaTypeMapper.xml +++ b/src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaTypeMapper.xml @@ -1,25 +1,25 @@ - + - select a.* - from wms_warehouse_area_type a + from warehouse_area_type a ${ew.sqlSegment} - select a.* - from wms_warehouse_area_type a + from warehouse_area_type a where a.sid =#{sid} - UPDATE wms_warehouse_area_type + UPDATE warehouse_area_type SET isDelete=1 where sid in diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehouseextend/WmsWarehouseExtendQuery.java b/src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaTypeQuery.java similarity index 58% rename from src/main/java/com/yxt/warehouse/biz/wmswarehouseextend/WmsWarehouseExtendQuery.java rename to src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaTypeQuery.java index b0d4d84..21308e3 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmswarehouseextend/WmsWarehouseExtendQuery.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaTypeQuery.java @@ -1,4 +1,4 @@ -package com.yxt.warehouse.biz.wmswarehouseextend; +package com.yxt.warehouse.biz.warehouseareatype; import com.yxt.common.core.query.Query; import lombok.Data; @@ -8,6 +8,6 @@ import lombok.Data; * @date 2024/2/26 13:37 */ @Data -public class WmsWarehouseExtendQuery implements Query { +public class WarehouseAreaTypeQuery implements Query { private String name; } diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehouseareatype/WmsWarehouseAreaTypeService.java b/src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaTypeService.java similarity index 64% rename from src/main/java/com/yxt/warehouse/biz/wmswarehouseareatype/WmsWarehouseAreaTypeService.java rename to src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaTypeService.java index c4aa106..8f9ae77 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmswarehouseareatype/WmsWarehouseAreaTypeService.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaTypeService.java @@ -1,4 +1,4 @@ -package com.yxt.warehouse.biz.wmswarehouseareatype; +package com.yxt.warehouse.biz.warehouseareatype; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateTime; @@ -22,41 +22,41 @@ import java.util.stream.Collectors; * @date 2024/2/26 13:40 */ @Service -public class WmsWarehouseAreaTypeService extends MybatisBaseService { +public class WarehouseAreaTypeService extends MybatisBaseService { - public ResultBean> listPage(PagerQuery pq) { + public ResultBean> listPage(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); - WmsWarehouseAreaTypeQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); + WarehouseAreaTypeQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); if(StringUtils.isNotBlank(query.getName())){ qw.like("warehouseAreaTypeName",query.getName()); } qw.ne("isDelete","1"); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.listPage(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - List records = pagging.getRecords(); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + List records = pagging.getRecords(); return rb.success().setData(p); } - public ResultBean listAll() { + public ResultBean listAll() { ResultBean rb = ResultBean.fireFail(); - List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1) + List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1) .ne("isDelete","1")); return rb.success().setData(pagging); } - public ResultBean saveOrUpdate(WmsWarehouseAreaTypeDto dto) { + public ResultBean saveOrUpdate(WarehouseAreaTypeDto dto) { ResultBean rb = ResultBean.fireFail(); String sid = ""; if (StringUtils.isNotBlank(dto.getSid())) { sid = dto.getSid(); - WmsWarehouseAreaType wmsWarehouseArea = fetchBySid(dto.getSid()); + WarehouseAreaType wmsWarehouseArea = fetchBySid(dto.getSid()); BeanUtil.copyProperties(dto, wmsWarehouseArea, "id", "sid"); wmsWarehouseArea.setModifyTime(new Date()); baseMapper.updateById(wmsWarehouseArea); } else { - WmsWarehouseAreaType wmsWarehouseArea = new WmsWarehouseAreaType(); + WarehouseAreaType wmsWarehouseArea = new WarehouseAreaType(); sid = wmsWarehouseArea.getSid(); BeanUtil.copyProperties(dto, wmsWarehouseArea, "id", "sid"); wmsWarehouseArea.setCreateTime(new DateTime()); @@ -65,16 +65,16 @@ public class WmsWarehouseAreaTypeService extends MybatisBaseService initialization(String sid) { + public ResultBean initialization(String sid) { ResultBean rb = ResultBean.fireFail(); - WmsWarehouseAreaTypeVo vo = baseMapper.initialization(sid); + WarehouseAreaTypeVo vo = baseMapper.initialization(sid); return rb.success().setData(vo); } public ResultBean delete(String sid) { ResultBean rb = ResultBean.fireFail(); - WmsWarehouseAreaType wmsWarehouseArea = fetchBySid(sid); + WarehouseAreaType wmsWarehouseArea = fetchBySid(sid); if (null != wmsWarehouseArea) { baseMapper.deleteById(wmsWarehouseArea.getId()); } @@ -85,7 +85,7 @@ public class WmsWarehouseAreaTypeService extends MybatisBaseService { +public interface WarehouseExtendMapper extends BaseMapper { } diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehouseextend/WmsWarehouseExtendMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehouseextend/WarehouseExtendMapper.xml similarity index 59% rename from src/main/java/com/yxt/warehouse/biz/wmswarehouseextend/WmsWarehouseExtendMapper.xml rename to src/main/java/com/yxt/warehouse/biz/warehouseextend/WarehouseExtendMapper.xml index aaae295..8f6a7c5 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmswarehouseextend/WmsWarehouseExtendMapper.xml +++ b/src/main/java/com/yxt/warehouse/biz/warehouseextend/WarehouseExtendMapper.xml @@ -1,13 +1,13 @@ - + - select * - from wms_warehouse_extend + from warehouse_extend ${ew.sqlSegment} diff --git a/src/main/java/com/yxt/warehouse/biz/wmsreportlose/WmsReportLoseQuery.java b/src/main/java/com/yxt/warehouse/biz/warehouseextend/WarehouseExtendQuery.java similarity index 60% rename from src/main/java/com/yxt/warehouse/biz/wmsreportlose/WmsReportLoseQuery.java rename to src/main/java/com/yxt/warehouse/biz/warehouseextend/WarehouseExtendQuery.java index cfd2f4c..63cfdf3 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmsreportlose/WmsReportLoseQuery.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseextend/WarehouseExtendQuery.java @@ -1,4 +1,4 @@ -package com.yxt.warehouse.biz.wmsreportlose; +package com.yxt.warehouse.biz.warehouseextend; import com.yxt.common.core.query.Query; import lombok.Data; @@ -8,6 +8,6 @@ import lombok.Data; * @date 2024/2/26 13:37 */ @Data -public class WmsReportLoseQuery implements Query { +public class WarehouseExtendQuery implements Query { private String name; } diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehouseextend/WmsWarehouseExtendService.java b/src/main/java/com/yxt/warehouse/biz/warehouseextend/WarehouseExtendService.java similarity index 73% rename from src/main/java/com/yxt/warehouse/biz/wmswarehouseextend/WmsWarehouseExtendService.java rename to src/main/java/com/yxt/warehouse/biz/warehouseextend/WarehouseExtendService.java index 4b8235d..72fca5c 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmswarehouseextend/WmsWarehouseExtendService.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseextend/WarehouseExtendService.java @@ -1,4 +1,4 @@ -package com.yxt.warehouse.biz.wmswarehouseextend; +package com.yxt.warehouse.biz.warehouseextend; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateTime; @@ -15,21 +15,21 @@ import java.util.Date; * @date 2024/2/26 13:40 */ @Service -public class WmsWarehouseExtendService extends MybatisBaseService { +public class WarehouseExtendService extends MybatisBaseService { - public ResultBean saveOrUpdate(WmsWarehouseExtendDto dto) { + public ResultBean saveOrUpdate(WarehouseExtendDto dto) { ResultBean rb = ResultBean.fireFail(); String sid = ""; // for (WmsWarehouseExtendDto dto : dtos) { if (StringUtils.isNotBlank(dto.getSid())) { sid = dto.getSid(); - WmsWarehouseExtend wmsWarehouse = fetchBySid(dto.getSid()); + WarehouseExtend wmsWarehouse = fetchBySid(dto.getSid()); BeanUtil.copyProperties(dto, wmsWarehouse, "id", "sid"); wmsWarehouse.setModifyTime(new Date()); baseMapper.updateById(wmsWarehouse); } else { - WmsWarehouseExtend wmsWarehouse = new WmsWarehouseExtend(); + WarehouseExtend wmsWarehouse = new WarehouseExtend(); sid = wmsWarehouse.getSid(); BeanUtil.copyProperties(dto, wmsWarehouse, "id", "sid"); wmsWarehouse.setCreateTime(new DateTime()); @@ -40,10 +40,10 @@ public class WmsWarehouseExtendService extends MybatisBaseService initialization(String sid) { + public ResultBean initialization(String sid) { ResultBean rb = ResultBean.fireFail(); - WmsWarehouseExtendVo vo = new WmsWarehouseExtendVo(); - WmsWarehouseExtend wmsWarehouse = fetchBySid(sid); + WarehouseExtendVo vo = new WarehouseExtendVo(); + WarehouseExtend wmsWarehouse = fetchBySid(sid); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); if (null != wmsWarehouse) { BeanUtil.copyProperties(wmsWarehouse, vo); diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehouseextend/WmsWarehouseExtendVo.java b/src/main/java/com/yxt/warehouse/biz/warehouseextend/WarehouseExtendVo.java similarity index 89% rename from src/main/java/com/yxt/warehouse/biz/wmswarehouseextend/WmsWarehouseExtendVo.java rename to src/main/java/com/yxt/warehouse/biz/warehouseextend/WarehouseExtendVo.java index 36cfecd..a5ce0c5 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmswarehouseextend/WmsWarehouseExtendVo.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseextend/WarehouseExtendVo.java @@ -1,4 +1,4 @@ -package com.yxt.warehouse.biz.wmswarehouseextend; +package com.yxt.warehouse.biz.warehouseextend; import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.vo.Vo; @@ -11,7 +11,7 @@ import java.util.Date; * @date 2024/2/26 13:37 */ @Data -public class WmsWarehouseExtendVo implements Vo { +public class WarehouseExtendVo implements Vo { private String id; private String sid; private String lockVersion; diff --git a/src/main/java/com/yxt/warehouse/biz/wmsinventoryallocatebill/WmsInventoryAllocateBill.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebill/WarehouseInventoryAllocatebill.java similarity index 87% rename from src/main/java/com/yxt/warehouse/biz/wmsinventoryallocatebill/WmsInventoryAllocateBill.java rename to src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebill/WarehouseInventoryAllocatebill.java index cf3f456..b652d45 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmsinventoryallocatebill/WmsInventoryAllocateBill.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebill/WarehouseInventoryAllocatebill.java @@ -1,4 +1,4 @@ -package com.yxt.warehouse.biz.wmsinventoryallocatebill; +package com.yxt.warehouse.biz.warehouseinventoryallocatebill; import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.domain.BaseEntity; @@ -11,7 +11,7 @@ import java.util.Date; * @date 2024/2/28 8:38 */ @Data -public class WmsInventoryAllocateBill extends BaseEntity { +public class WarehouseInventoryAllocatebill extends BaseEntity { private String billNo;//单据编号 private String createDate;//制单日期 diff --git a/src/main/java/com/yxt/warehouse/biz/wmsinventoryallocatebill/WmsInventoryAllocateBillDetailsVoNew.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebill/WarehouseInventoryAllocatebillDetailsVoNew.java similarity index 90% rename from src/main/java/com/yxt/warehouse/biz/wmsinventoryallocatebill/WmsInventoryAllocateBillDetailsVoNew.java rename to src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebill/WarehouseInventoryAllocatebillDetailsVoNew.java index 3cb4ae2..383c895 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmsinventoryallocatebill/WmsInventoryAllocateBillDetailsVoNew.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebill/WarehouseInventoryAllocatebillDetailsVoNew.java @@ -23,12 +23,12 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.warehouse.biz.wmsinventoryallocatebill; +package com.yxt.warehouse.biz.warehouseinventoryallocatebill; import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.vo.Vo; -import com.yxt.warehouse.biz.wmsinventoryallocatebilldetail.WmsInventoryAllocatebillDetailDetailsVoNew; +import com.yxt.warehouse.biz.warehouseinventoryallocatebilldetail.WarehouseInventoryAllocatebillDetailDetailsVoNew; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -52,7 +52,7 @@ import java.util.List; */ @Data @ApiModel(value = "(调拨单)-调出方操作 视图数据详情", description = "(调拨单)-调出方操作 视图数据详情") -public class WmsInventoryAllocateBillDetailsVoNew implements Vo { +public class WarehouseInventoryAllocatebillDetailsVoNew implements Vo { private String sid; @@ -84,7 +84,7 @@ public class WmsInventoryAllocateBillDetailsVoNew implements Vo { @ApiModelProperty("创建组织sid") private String createOrgSid; @ApiModelProperty("调拨单商品明细") - private List wmsInventoryAllocateBillDetailNewList; + private List wmsInventoryAllocateBillDetailNewList; /* * 页面展示 diff --git a/src/main/java/com/yxt/warehouse/biz/wmsinventoryallocatebilldetail/WmsInventoryAllocateBillDetailDto.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebill/WarehouseInventoryAllocatebillDto.java similarity index 92% rename from src/main/java/com/yxt/warehouse/biz/wmsinventoryallocatebilldetail/WmsInventoryAllocateBillDetailDto.java rename to src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebill/WarehouseInventoryAllocatebillDto.java index 3ba2567..d3e1e56 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmsinventoryallocatebilldetail/WmsInventoryAllocateBillDetailDto.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebill/WarehouseInventoryAllocatebillDto.java @@ -1,4 +1,4 @@ -package com.yxt.warehouse.biz.wmsinventoryallocatebilldetail; +package com.yxt.warehouse.biz.warehouseinventoryallocatebill; import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.dto.Dto; @@ -11,7 +11,7 @@ import java.util.Date; * @date 2024/2/26 13:38 */ @Data -public class WmsInventoryAllocateBillDetailDto implements Dto { +public class WarehouseInventoryAllocatebillDto implements Dto { private String id; private String sid; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") diff --git a/src/main/java/com/yxt/warehouse/biz/wmsinventoryallocatebill/WmsInventoryAllocateBillDtoNew.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebill/WarehouseInventoryAllocatebillDtoNew.java similarity index 81% rename from src/main/java/com/yxt/warehouse/biz/wmsinventoryallocatebill/WmsInventoryAllocateBillDtoNew.java rename to src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebill/WarehouseInventoryAllocatebillDtoNew.java index 9984b0d..4a1d571 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmsinventoryallocatebill/WmsInventoryAllocateBillDtoNew.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebill/WarehouseInventoryAllocatebillDtoNew.java @@ -1,8 +1,8 @@ -package com.yxt.warehouse.biz.wmsinventoryallocatebill; +package com.yxt.warehouse.biz.warehouseinventoryallocatebill; import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.dto.Dto; -import com.yxt.warehouse.biz.wmsinventoryallocatebilldetail.WmsInventoryAllocateBillDetailDtoNew; +import com.yxt.warehouse.biz.warehouseinventoryallocatebilldetail.WarehouseInventoryAllocatebillDetailDtoNew; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -15,7 +15,7 @@ import java.util.List; * @date 2024/2/26 13:38 */ @Data -public class WmsInventoryAllocateBillDtoNew implements Dto { +public class WarehouseInventoryAllocatebillDtoNew implements Dto { private String sid; @@ -47,7 +47,7 @@ public class WmsInventoryAllocateBillDtoNew implements Dto { @ApiModelProperty("创建组织sid") private String createOrgSid; @ApiModelProperty("调拨单商品明细") - private List wmsInventoryAllocateBillDetailNewList; + private List wmsInventoryAllocateBillDetailNewList; /* * 页面展示 diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebill/WarehouseInventoryAllocatebillMapper.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebill/WarehouseInventoryAllocatebillMapper.java new file mode 100644 index 0000000..d85ccfb --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebill/WarehouseInventoryAllocatebillMapper.java @@ -0,0 +1,20 @@ +package com.yxt.warehouse.biz.warehouseinventoryallocatebill; + +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 WarehouseInventoryAllocatebillMapper extends BaseMapper { + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + WarehouseInventoryAllocatebillVo initialization (@Param("sid") String sid); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); +} diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebill/WarehouseInventoryAllocatebillMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebill/WarehouseInventoryAllocatebillMapper.xml new file mode 100644 index 0000000..6484177 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebill/WarehouseInventoryAllocatebillMapper.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/yxt/warehouse/biz/wmsinventoryallocatebilldetail/WmsInventoryAllocateBillDetailQuery.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebill/WarehouseInventoryAllocatebillQuery.java similarity index 55% rename from src/main/java/com/yxt/warehouse/biz/wmsinventoryallocatebilldetail/WmsInventoryAllocateBillDetailQuery.java rename to src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebill/WarehouseInventoryAllocatebillQuery.java index 370cb90..256f20e 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmsinventoryallocatebilldetail/WmsInventoryAllocateBillDetailQuery.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebill/WarehouseInventoryAllocatebillQuery.java @@ -1,4 +1,4 @@ -package com.yxt.warehouse.biz.wmsinventoryallocatebilldetail; +package com.yxt.warehouse.biz.warehouseinventoryallocatebill; import com.yxt.common.core.query.Query; import lombok.Data; @@ -8,6 +8,6 @@ import lombok.Data; * @date 2024/2/26 13:37 */ @Data -public class WmsInventoryAllocateBillDetailQuery implements Query { +public class WarehouseInventoryAllocatebillQuery implements Query { private String name; } diff --git a/src/main/java/com/yxt/warehouse/biz/wmsinventoryallocatebill/WmsInventoryAllocateBillQueryNew.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebill/WarehouseInventoryAllocatebillQueryNew.java similarity index 81% rename from src/main/java/com/yxt/warehouse/biz/wmsinventoryallocatebill/WmsInventoryAllocateBillQueryNew.java rename to src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebill/WarehouseInventoryAllocatebillQueryNew.java index 6ac38fc..065961a 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmsinventoryallocatebill/WmsInventoryAllocateBillQueryNew.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebill/WarehouseInventoryAllocatebillQueryNew.java @@ -1,4 +1,4 @@ -package com.yxt.warehouse.biz.wmsinventoryallocatebill; +package com.yxt.warehouse.biz.warehouseinventoryallocatebill; import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModelProperty; @@ -9,7 +9,7 @@ import lombok.Data; * @date 2024/2/26 13:37 */ @Data -public class WmsInventoryAllocateBillQueryNew implements Query { +public class WarehouseInventoryAllocatebillQueryNew implements Query { @ApiModelProperty("创建开始日期") private String createStartTime; diff --git a/src/main/java/com/yxt/warehouse/biz/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebill/WarehouseInventoryAllocatebillService.java similarity index 56% rename from src/main/java/com/yxt/warehouse/biz/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java rename to src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebill/WarehouseInventoryAllocatebillService.java index aca0fa8..14fa453 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebill/WarehouseInventoryAllocatebillService.java @@ -1,4 +1,4 @@ -package com.yxt.warehouse.biz.wmsinventoryallocatebill; +package com.yxt.warehouse.biz.warehouseinventoryallocatebill; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateTime; @@ -10,9 +10,9 @@ 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.warehouse.biz.wmsinventoryallocatebilldetail.WmsInventoryAllocateBillDetailDtoNew; -import com.yxt.warehouse.biz.wmsinventoryallocatebilldetail.WmsInventoryAllocateBillDetailService; -import com.yxt.warehouse.biz.wmsinventoryallocatebilldetail.WmsInventoryAllocatebillDetailDetailsVoNew; +import com.yxt.warehouse.biz.warehouseinventoryallocatebilldetail.WarehouseInventoryAllocatebillDetailDtoNew; +import com.yxt.warehouse.biz.warehouseinventoryallocatebilldetail.WarehouseInventoryAllocatebillDetailService; +import com.yxt.warehouse.biz.warehouseinventoryallocatebilldetail.WarehouseInventoryAllocatebillDetailDetailsVoNew; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -23,33 +23,33 @@ import java.util.List; * @date 2024/2/26 13:40 */ @Service -public class WmsInventoryAllocateBillService extends MybatisBaseService { +public class WarehouseInventoryAllocatebillService extends MybatisBaseService { @Autowired - private WmsInventoryAllocateBillDetailService wmsInventoryAllocateBillDetailService; + private WarehouseInventoryAllocatebillDetailService wmsInventoryAllocateBillDetailService; - public ResultBean> listPage(PagerQuery pq) { + public ResultBean> listPage(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); - WmsInventoryAllocateBillQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); + WarehouseInventoryAllocatebillQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); if (StringUtils.isNotBlank(query.getName())) { qw.like("rackName", query.getName()); } - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.listPage(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - List records = pagging.getRecords(); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + List records = pagging.getRecords(); return rb.success().setData(p); } - public PagerVo listPageVo(PagerQuery pq) { - WmsInventoryAllocateBillQueryNew query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); + public PagerVo listPageVo(PagerQuery pq) { + WarehouseInventoryAllocatebillQueryNew query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } @@ -80,9 +80,9 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService outWarehousing(WmsInventoryAllocateBillDto dto) { + public ResultBean outWarehousing(WarehouseInventoryAllocatebillDto dto) { ResultBean rb = ResultBean.fireFail(); - WmsInventoryAllocateBill wmsInventory = baseMapper.selectOne(new QueryWrapper().eq("goodsSid", dto.getGoodsSid()).eq("warehouseSid", dto.getWarehouseSid())); + WarehouseInventoryAllocatebill wmsInventory = baseMapper.selectOne(new QueryWrapper().eq("goodsSid", dto.getGoodsSid()).eq("warehouseSid", dto.getWarehouseSid())); double exisInventory = Double.valueOf(wmsInventory.getCount()); double out = Double.valueOf(dto.getCount()); if (null == wmsInventory) { @@ -96,16 +96,16 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService saveOrUpdate(WmsInventoryAllocateBillDto dto) { + public ResultBean saveOrUpdate(WarehouseInventoryAllocatebillDto dto) { ResultBean rb = ResultBean.fireFail(); String sid = ""; if (StringUtils.isNotBlank(dto.getSid())) { sid = dto.getSid(); - WmsInventoryAllocateBill wmsWarehouseRack = fetchBySid(dto.getSid()); + WarehouseInventoryAllocatebill wmsWarehouseRack = fetchBySid(dto.getSid()); BeanUtil.copyProperties(dto, wmsWarehouseRack, "id", "sid"); baseMapper.updateById(wmsWarehouseRack); } else { - WmsInventoryAllocateBill wmsWarehouseRack = new WmsInventoryAllocateBill(); + WarehouseInventoryAllocatebill wmsWarehouseRack = new WarehouseInventoryAllocatebill(); sid = wmsWarehouseRack.getSid(); BeanUtil.copyProperties(dto, wmsWarehouseRack, "id", "sid"); wmsWarehouseRack.setCreateTime(new DateTime()); @@ -114,16 +114,16 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService initialization(String sid) { + public ResultBean initialization(String sid) { ResultBean rb = ResultBean.fireFail(); - WmsInventoryAllocateBillVo vo = baseMapper.initialization(sid); + WarehouseInventoryAllocatebillVo vo = baseMapper.initialization(sid); return rb.success().setData(vo); } public ResultBean delete(String sid) { ResultBean rb = ResultBean.fireFail(); - WmsInventoryAllocateBill wmsWarehouseRack = fetchBySid(sid); + WarehouseInventoryAllocatebill wmsWarehouseRack = fetchBySid(sid); if (null != wmsWarehouseRack) { baseMapper.deleteById(wmsWarehouseRack.getId()); } @@ -132,7 +132,7 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService wmsInventoryAllocatebillDetailDetailsVoNews = wmsInventoryAllocateBillDetailService.selByMainSid(sid); + List wmsInventoryAllocatebillDetailDetailsVoNews = wmsInventoryAllocateBillDetailService.selByMainSid(sid); vo.setWmsInventoryAllocateBillDetailNewList(wmsInventoryAllocatebillDetailDetailsVoNews); return vo; } @@ -156,12 +156,12 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService wmsInventoryAllocateBillDetailNewList = dto.getWmsInventoryAllocateBillDetailNewList(); + List wmsInventoryAllocateBillDetailNewList = dto.getWmsInventoryAllocateBillDetailNewList(); if (StringUtils.isBlank(dtoSid)) { String sid = this.insertByDto(dto); - for (WmsInventoryAllocateBillDetailDtoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocateBillDetailNewList) { + for (WarehouseInventoryAllocatebillDetailDtoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocateBillDetailNewList) { wmsInventoryAllocateBillDetailDtoNew.setBillSid(sid); wmsInventoryAllocateBillDetailService.saveOrUpdateDto(wmsInventoryAllocateBillDetailDtoNew); } @@ -169,27 +169,27 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService { - IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - WmsInventoryAllocateBillDetailVo initialization (@Param("sid") String sid); +public interface WarehouseInventoryAllocatebillDetailMapper extends BaseMapper { + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + WarehouseInventoryAllocatebillDetailVo initialization (@Param("sid") String sid); @Delete("delete from wms_inventory_allocatebill_detail where billSid = #{billSid}") void delByMainSid(String billSid); - List selByMainSid(String billSid); + List selByMainSid(String billSid); } diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebilldetail/WarehouseInventoryAllocatebillDetailMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebilldetail/WarehouseInventoryAllocatebillDetailMapper.xml new file mode 100644 index 0000000..9a8d067 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebilldetail/WarehouseInventoryAllocatebillDetailMapper.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebilldetail/WarehouseInventoryAllocatebillDetailQuery.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebilldetail/WarehouseInventoryAllocatebillDetailQuery.java new file mode 100644 index 0000000..2bf47e1 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebilldetail/WarehouseInventoryAllocatebillDetailQuery.java @@ -0,0 +1,13 @@ +package com.yxt.warehouse.biz.warehouseinventoryallocatebilldetail; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/2/26 13:37 + */ +@Data +public class WarehouseInventoryAllocatebillDetailQuery implements Query { + private String name; +} diff --git a/src/main/java/com/yxt/warehouse/biz/wmsinventoryallocatebilldetail/WmsInventoryAllocateBillDetailService.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebilldetail/WarehouseInventoryAllocatebillDetailService.java similarity index 56% rename from src/main/java/com/yxt/warehouse/biz/wmsinventoryallocatebilldetail/WmsInventoryAllocateBillDetailService.java rename to src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebilldetail/WarehouseInventoryAllocatebillDetailService.java index a8709d8..f533537 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmsinventoryallocatebilldetail/WmsInventoryAllocateBillDetailService.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebilldetail/WarehouseInventoryAllocatebillDetailService.java @@ -1,4 +1,4 @@ -package com.yxt.warehouse.biz.wmsinventoryallocatebilldetail; +package com.yxt.warehouse.biz.warehouseinventoryallocatebilldetail; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateTime; @@ -10,8 +10,7 @@ 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.warehouse.biz.wmsinventoryallocatebill.WmsInventoryAllocateBill; -import com.yxt.warehouse.biz.wmsinventoryallocatebill.WmsInventoryAllocateBillDetailsVoNew; +import com.yxt.warehouse.biz.warehouseinventoryallocatebill.WarehouseInventoryAllocatebillDetailsVoNew; import org.springframework.stereotype.Service; import java.util.List; @@ -21,21 +20,21 @@ import java.util.List; * @date 2024/2/26 13:40 */ @Service -public class WmsInventoryAllocateBillDetailService extends MybatisBaseService { +public class WarehouseInventoryAllocatebillDetailService extends MybatisBaseService { - public ResultBean> listPage(PagerQuery pq) { + public ResultBean> listPage(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); - WmsInventoryAllocateBillDetailQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); + WarehouseInventoryAllocatebillDetailQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); if (StringUtils.isNotBlank(query.getName())) { qw.like("rackName", query.getName()); } - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.listPage(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - List records = pagging.getRecords(); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + List records = pagging.getRecords(); return rb.success().setData(p); } @@ -47,9 +46,9 @@ public class WmsInventoryAllocateBillDetailService extends MybatisBaseService outWarehousing(WmsInventoryAllocateBillDetailDto dto) { + public ResultBean outWarehousing(WarehouseInventoryAllocatebillDetailDto dto) { ResultBean rb = ResultBean.fireFail(); - WmsInventoryAllocateBillDetail wmsInventory = baseMapper.selectOne(new QueryWrapper().eq("goodsSid", dto.getGoodsSid()).eq("warehouseSid", dto.getWarehouseSid())); + WarehouseInventoryAllocatebillDetail wmsInventory = baseMapper.selectOne(new QueryWrapper().eq("goodsSid", dto.getGoodsSid()).eq("warehouseSid", dto.getWarehouseSid())); double exisInventory = Double.valueOf(wmsInventory.getCount()); double out = Double.valueOf(dto.getCount()); if (null == wmsInventory) { @@ -63,16 +62,16 @@ public class WmsInventoryAllocateBillDetailService extends MybatisBaseService saveOrUpdate(WmsInventoryAllocateBillDetailDto dto) { + public ResultBean saveOrUpdate(WarehouseInventoryAllocatebillDetailDto dto) { ResultBean rb = ResultBean.fireFail(); String sid = ""; if (StringUtils.isNotBlank(dto.getSid())) { sid = dto.getSid(); - WmsInventoryAllocateBillDetail wmsWarehouseRack = fetchBySid(dto.getSid()); + WarehouseInventoryAllocatebillDetail wmsWarehouseRack = fetchBySid(dto.getSid()); BeanUtil.copyProperties(dto, wmsWarehouseRack, "id", "sid"); baseMapper.updateById(wmsWarehouseRack); } else { - WmsInventoryAllocateBillDetail wmsWarehouseRack = new WmsInventoryAllocateBillDetail(); + WarehouseInventoryAllocatebillDetail wmsWarehouseRack = new WarehouseInventoryAllocatebillDetail(); sid = wmsWarehouseRack.getSid(); BeanUtil.copyProperties(dto, wmsWarehouseRack, "id", "sid"); wmsWarehouseRack.setCreateTime(new DateTime()); @@ -81,9 +80,9 @@ public class WmsInventoryAllocateBillDetailService extends MybatisBaseService initialization(String sid) { + public ResultBean initialization(String sid) { ResultBean rb = ResultBean.fireFail(); - WmsInventoryAllocateBillDetailVo vo = baseMapper.initialization(sid); + WarehouseInventoryAllocatebillDetailVo vo = baseMapper.initialization(sid); return rb.success().setData(vo); } public void delAll(String[] sids) { @@ -92,7 +91,7 @@ public class WmsInventoryAllocateBillDetailService extends MybatisBaseService selByMainSid(String billSid) { + public List selByMainSid(String billSid) { return baseMapper.selByMainSid(billSid); } - public void saveOrUpdateDto(WmsInventoryAllocateBillDetailDtoNew dto) { + public void saveOrUpdateDto(WarehouseInventoryAllocatebillDetailDtoNew dto) { String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { this.insertByDto(dto); @@ -126,21 +125,21 @@ public class WmsInventoryAllocateBillDetailService extends MybatisBaseService { +public interface WarehouseInventoryBatchMapper extends BaseMapper { - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); @Select("select * from wms_inventory_batch") - List selectListVo(); + List selectListVo(); } \ No newline at end of file diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinventorybatch/WarehouseInventoryBatchMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehouseinventorybatch/WarehouseInventoryBatchMapper.xml new file mode 100644 index 0000000..9d90e31 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventorybatch/WarehouseInventoryBatchMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/yxt/warehouse/biz/wmsinventorybatch/WmsInventoryBatchQuery.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventorybatch/WarehouseInventoryBatchQuery.java similarity index 97% rename from src/main/java/com/yxt/warehouse/biz/wmsinventorybatch/WmsInventoryBatchQuery.java rename to src/main/java/com/yxt/warehouse/biz/warehouseinventorybatch/WarehouseInventoryBatchQuery.java index 8f04cd6..0548cb8 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmsinventorybatch/WmsInventoryBatchQuery.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventorybatch/WarehouseInventoryBatchQuery.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.warehouse.biz.wmsinventorybatch; +package com.yxt.warehouse.biz.warehouseinventorybatch; import com.fasterxml.jackson.annotation.JsonFormat; @@ -49,7 +49,7 @@ import java.util.Date; */ @Data @ApiModel(value = "商品库存-批次属性 查询条件", description = "商品库存-批次属性 查询条件") -public class WmsInventoryBatchQuery implements Query { +public class WarehouseInventoryBatchQuery implements Query { @ApiModelProperty("批次号（入库日期+生产日期，如240320-240109）") private String batchNumber; // 批次号（入库日期+生产日期，如240320-240109） diff --git a/src/main/java/com/yxt/warehouse/biz/wmsinventorybatch/WmsInventoryBatchService.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventorybatch/WarehouseInventoryBatchService.java similarity index 71% rename from src/main/java/com/yxt/warehouse/biz/wmsinventorybatch/WmsInventoryBatchService.java rename to src/main/java/com/yxt/warehouse/biz/warehouseinventorybatch/WarehouseInventoryBatchService.java index bbe6502..1061922 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmsinventorybatch/WmsInventoryBatchService.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventorybatch/WarehouseInventoryBatchService.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.warehouse.biz.wmsinventorybatch; +package com.yxt.warehouse.biz.warehouseinventorybatch; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -49,18 +49,18 @@ import org.springframework.stereotype.Service; * @since 1.0 */ @Service -public class WmsInventoryBatchService extends MybatisBaseService { +public class WarehouseInventoryBatchService extends MybatisBaseService { - public PagerVo listPageVo(PagerQuery pq) { - WmsInventoryBatchQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); + public PagerVo listPageVo(PagerQuery pq) { + WarehouseInventoryBatchQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } - public void saveOrUpdateDto(WmsInventoryBatchDto dto){ + public void saveOrUpdateDto(WarehouseInventoryBatchDto dto){ String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { this.insertByDto(dto); @@ -69,25 +69,25 @@ public class WmsInventoryBatchService extends MybatisBaseService wmsInventoryCheckbillDetailList; + private List wmsInventoryCheckbillDetailList; } \ No newline at end of file diff --git a/src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbill/WmsInventoryCheckbillDto.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbill/WarehouseInventoryCheckBillDto.java similarity index 90% rename from src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbill/WmsInventoryCheckbillDto.java rename to src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbill/WarehouseInventoryCheckBillDto.java index b597f0d..0bc87dc 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbill/WmsInventoryCheckbillDto.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbill/WarehouseInventoryCheckBillDto.java @@ -23,11 +23,11 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.warehouse.biz.wmsinventorycheckbill; +package com.yxt.warehouse.biz.warehouseinventorycheckbill; import com.yxt.common.core.dto.Dto; -import com.yxt.warehouse.biz.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailDto; +import com.yxt.warehouse.biz.warehouseinventorycheckbilldetail.WarehouseInventoryCheckbillDetailDto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -50,7 +50,7 @@ import java.util.List; */ @Data @ApiModel(value = "库存盘点 数据传输对象", description = "库存盘点 数据传输对象") -public class WmsInventoryCheckbillDto implements Dto { +public class WarehouseInventoryCheckBillDto implements Dto { private String sid; @@ -79,5 +79,5 @@ public class WmsInventoryCheckbillDto implements Dto { @ApiModelProperty("创建组织sid") private String createOrgSid; @ApiModelProperty("盘库明细") - private List wmsInventoryCheckbillDetailList; + private List wmsInventoryCheckbillDetailList; } \ No newline at end of file diff --git a/src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbill/WmsInventoryCheckbillMapper.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbill/WarehouseInventoryCheckBillMapper.java similarity index 82% rename from src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbill/WmsInventoryCheckbillMapper.java rename to src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbill/WarehouseInventoryCheckBillMapper.java index 390a300..dc00278 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbill/WmsInventoryCheckbillMapper.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbill/WarehouseInventoryCheckBillMapper.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.warehouse.biz.wmsinventorycheckbill; +package com.yxt.warehouse.biz.warehouseinventorycheckbill; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -49,12 +49,12 @@ import java.util.List; * @since 1.0 */ @Mapper -public interface WmsInventoryCheckbillMapper extends BaseMapper { +public interface WarehouseInventoryCheckBillMapper extends BaseMapper { - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); @Select("select * from wms_inventory_checkbill") - List selectListVo(); + List selectListVo(); } \ No newline at end of file diff --git a/src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbill/WmsInventoryCheckbillMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbill/WarehouseInventoryCheckBillMapper.xml similarity index 61% rename from src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbill/WmsInventoryCheckbillMapper.xml rename to src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbill/WarehouseInventoryCheckBillMapper.xml index c2ca9e2..ab8f305 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbill/WmsInventoryCheckbillMapper.xml +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbill/WarehouseInventoryCheckBillMapper.xml @@ -1,13 +1,13 @@ - + - SELECT * FROM wms_inventory_checkbill ${ew.sqlSegment} - SELECT * FROM wms_inventory_checkbill ${ew.sqlSegment} \ No newline at end of file diff --git a/src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbill/WmsInventoryCheckbillQuery.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbill/WarehouseInventoryCheckBillQuery.java similarity index 95% rename from src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbill/WmsInventoryCheckbillQuery.java rename to src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbill/WarehouseInventoryCheckBillQuery.java index 76320d7..6b2071d 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbill/WmsInventoryCheckbillQuery.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbill/WarehouseInventoryCheckBillQuery.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.warehouse.biz.wmsinventorycheckbill; +package com.yxt.warehouse.biz.warehouseinventorycheckbill; import com.yxt.common.core.query.Query; @@ -46,7 +46,7 @@ import lombok.Data; */ @Data @ApiModel(value = "库存盘点 查询条件", description = "库存盘点 查询条件") -public class WmsInventoryCheckbillQuery implements Query { +public class WarehouseInventoryCheckBillQuery implements Query { @ApiModelProperty("创建开始日期") private String createStartTime; diff --git a/src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbill/WmsInventoryCheckbillService.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbill/WarehouseInventoryCheckBillService.java similarity index 62% rename from src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbill/WmsInventoryCheckbillService.java rename to src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbill/WarehouseInventoryCheckBillService.java index 3b3de91..edc490e 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbill/WmsInventoryCheckbillService.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbill/WarehouseInventoryCheckBillService.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.warehouse.biz.wmsinventorycheckbill; +package com.yxt.warehouse.biz.warehouseinventorycheckbill; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -32,9 +32,9 @@ 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.vo.PagerVo; -import com.yxt.warehouse.biz.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailDetailsVo; -import com.yxt.warehouse.biz.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailDto; -import com.yxt.warehouse.biz.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailService; +import com.yxt.warehouse.biz.warehouseinventorycheckbilldetail.WarehouseInventoryCheckbillDetailDetailsVo; +import com.yxt.warehouse.biz.warehouseinventorycheckbilldetail.WarehouseInventoryCheckbillDetailDto; +import com.yxt.warehouse.biz.warehouseinventorycheckbilldetail.WarehouseInventoryCheckbillDetailService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -55,14 +55,14 @@ import java.util.List; * @since 1.0 */ @Service -public class WmsInventoryCheckbillService extends MybatisBaseService { +public class WarehouseInventoryCheckBillService extends MybatisBaseService { @Autowired - private WmsInventoryCheckbillDetailService wmsInventoryCheckbillDetailService; + private WarehouseInventoryCheckbillDetailService wmsInventoryCheckbillDetailService; - public PagerVo listPageVo(PagerQuery pq) { - WmsInventoryCheckbillQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); + public PagerVo listPageVo(PagerQuery pq) { + WarehouseInventoryCheckBillQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); if (StringUtils.isNotBlank(query.getOtherQuery())){ qw.and(wrapper -> wrapper.like("pb.billNo", query.getOtherQuery())); } @@ -71,9 +71,9 @@ public class WmsInventoryCheckbillService extends MybatisBaseService= date_format('" + createStartTime + "','%Y-%m-%d')"). apply(StringUtils.isNotEmpty(createEndTime), "date_format (pb.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" ); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - for (WmsInventoryCheckbillVo record : pagging.getRecords()) { + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + for (WarehouseInventoryCheckBillVo record : pagging.getRecords()) { Integer checkState = record.getCheckState(); if (checkState == 1){ record.setCheckStateName("盘点中"); @@ -81,16 +81,16 @@ public class WmsInventoryCheckbillService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); + PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } - public void saveOrUpdateDto(WmsInventoryCheckbillDto dto){ + public void saveOrUpdateDto(WarehouseInventoryCheckBillDto dto){ String dtoSid = dto.getSid(); - List wmsInventoryCheckbillDetailList = dto.getWmsInventoryCheckbillDetailList(); + List wmsInventoryCheckbillDetailList = dto.getWmsInventoryCheckbillDetailList(); if (StringUtils.isBlank(dtoSid)) { String sid = this.insertByDto(dto); - for (WmsInventoryCheckbillDetailDto wmsInventoryCheckbillDetailDto : wmsInventoryCheckbillDetailList) { + for (WarehouseInventoryCheckbillDetailDto wmsInventoryCheckbillDetailDto : wmsInventoryCheckbillDetailList) { wmsInventoryCheckbillDetailDto.setBillSid(sid); wmsInventoryCheckbillDetailService.saveOrUpdateDto(wmsInventoryCheckbillDetailDto); } @@ -98,42 +98,42 @@ public class WmsInventoryCheckbillService extends MybatisBaseService wmsInventoryCheckbillDetailDetailsVos = wmsInventoryCheckbillDetailService.selByMainSid(sid); + List wmsInventoryCheckbillDetailDetailsVos = wmsInventoryCheckbillDetailService.selByMainSid(sid); vo.setWmsInventoryCheckbillDetailList(wmsInventoryCheckbillDetailDetailsVos); return vo; } - public void inven(WmsInventoryCheckbillDto dto) { + public void inven(WarehouseInventoryCheckBillDto dto) { saveOrUpdateDto(dto); - List wmsInventoryCheckbillDetailList = dto.getWmsInventoryCheckbillDetailList(); - for (WmsInventoryCheckbillDetailDto wmsInventoryCheckbillDetailDto : wmsInventoryCheckbillDetailList) { + List wmsInventoryCheckbillDetailList = dto.getWmsInventoryCheckbillDetailList(); + for (WarehouseInventoryCheckbillDetailDto wmsInventoryCheckbillDetailDto : wmsInventoryCheckbillDetailList) { } } diff --git a/src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbill/WmsInventoryCheckbillVo.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbill/WarehouseInventoryCheckBillVo.java similarity index 96% rename from src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbill/WmsInventoryCheckbillVo.java rename to src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbill/WarehouseInventoryCheckBillVo.java index eb4f59e..b61a293 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbill/WmsInventoryCheckbillVo.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbill/WarehouseInventoryCheckBillVo.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.warehouse.biz.wmsinventorycheckbill; +package com.yxt.warehouse.biz.warehouseinventorycheckbill; import com.yxt.common.core.vo.Vo; @@ -48,7 +48,7 @@ import java.math.BigDecimal; */ @Data @ApiModel(value = "库存盘点 视图数据对象", description = "库存盘点 视图数据对象") -public class WmsInventoryCheckbillVo implements Vo { +public class WarehouseInventoryCheckBillVo implements Vo { private String sid; diff --git a/src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetail.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetail.java similarity index 95% rename from src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetail.java rename to src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetail.java index 3bf9098..eff4921 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetail.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetail.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.warehouse.biz.wmsinventorycheckbilldetail; +package com.yxt.warehouse.biz.warehouseinventorycheckbilldetail; import com.baomidou.mybatisplus.annotation.TableName; import com.yxt.common.core.domain.BaseEntity; @@ -49,7 +49,7 @@ import java.math.BigDecimal; @Data @ApiModel(value = "库存盘点-明细", description = "库存盘点-明细") @TableName("wms_inventory_checkbill_detail") -public class WmsInventoryCheckbillDetail extends BaseEntity { +public class WarehouseInventoryCheckbillDetail extends BaseEntity { private static final long serialVersionUID = 1L; @ApiModelProperty("盘点单sid") diff --git a/src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailDetailsVo.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailDetailsVo.java similarity index 96% rename from src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailDetailsVo.java rename to src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailDetailsVo.java index 38da957..9bee4d4 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailDetailsVo.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailDetailsVo.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.warehouse.biz.wmsinventorycheckbilldetail; +package com.yxt.warehouse.biz.warehouseinventorycheckbilldetail; import com.yxt.common.core.vo.Vo; @@ -50,7 +50,7 @@ import java.util.List; */ @Data @ApiModel(value = "库存盘点-明细 视图数据详情", description = "库存盘点-明细 视图数据详情") -public class WmsInventoryCheckbillDetailDetailsVo implements Vo { +public class WarehouseInventoryCheckbillDetailDetailsVo implements Vo { private String sid; diff --git a/src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailDto.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailDto.java similarity index 96% rename from src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailDto.java rename to src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailDto.java index 7c8b162..e816830 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailDto.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailDto.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.warehouse.biz.wmsinventorycheckbilldetail; +package com.yxt.warehouse.biz.warehouseinventorycheckbilldetail; import com.yxt.common.core.dto.Dto; @@ -50,7 +50,7 @@ import java.util.List; */ @Data @ApiModel(value = "库存盘点-明细 数据传输对象", description = "库存盘点-明细 数据传输对象") -public class WmsInventoryCheckbillDetailDto implements Dto { +public class WarehouseInventoryCheckbillDetailDto implements Dto { private String sid; diff --git a/src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailMapper.java similarity index 79% rename from src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.java rename to src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailMapper.java index 2cc670c..4dacda3 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailMapper.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.warehouse.biz.wmsinventorycheckbilldetail; +package com.yxt.warehouse.biz.warehouseinventorycheckbilldetail; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -50,17 +50,17 @@ import java.util.List; * @since 1.0 */ @Mapper -public interface WmsInventoryCheckbillDetailMapper extends BaseMapper { +public interface WarehouseInventoryCheckbillDetailMapper extends BaseMapper { - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); @Select("select * from wms_inventory_checkbill_detail") - List selectListVo(); + List selectListVo(); @Delete("delete from wms_inventory_checkbill_detail where billSid = #{dtoSid}") void delByMainSid(String dtoSid); - List selByMainSid(String billSid); + List selByMainSid(String billSid); } \ No newline at end of file diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailMapper.xml new file mode 100644 index 0000000..1fd75b2 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailQuery.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailQuery.java similarity index 94% rename from src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailQuery.java rename to src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailQuery.java index 7f6b088..6e208b8 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailQuery.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailQuery.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.warehouse.biz.wmsinventorycheckbilldetail; +package com.yxt.warehouse.biz.warehouseinventorycheckbilldetail; import com.yxt.common.core.query.Query; @@ -45,6 +45,6 @@ import lombok.Data; */ @Data @ApiModel(value = "库存盘点-明细 查询条件", description = "库存盘点-明细 查询条件") -public class WmsInventoryCheckbillDetailQuery implements Query { +public class WarehouseInventoryCheckbillDetailQuery implements Query { } diff --git a/src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailService.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailService.java similarity index 68% rename from src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailService.java rename to src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailService.java index 6a88dec..14f7895 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailService.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailService.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.warehouse.biz.wmsinventorycheckbilldetail; +package com.yxt.warehouse.biz.warehouseinventorycheckbilldetail; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -51,18 +51,18 @@ import java.util.List; * @since 1.0 */ @Service -public class WmsInventoryCheckbillDetailService extends MybatisBaseService { +public class WarehouseInventoryCheckbillDetailService extends MybatisBaseService { - public PagerVo listPageVo(PagerQuery pq) { - WmsInventoryCheckbillDetailQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); + public PagerVo listPageVo(PagerQuery pq) { + WarehouseInventoryCheckbillDetailQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } - public void saveOrUpdateDto(WmsInventoryCheckbillDetailDto dto){ + public void saveOrUpdateDto(WarehouseInventoryCheckbillDetailDto dto){ String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { this.insertByDto(dto); @@ -71,25 +71,25 @@ public class WmsInventoryCheckbillDetailService extends MybatisBaseService selByMainSid(String billSid) { + public List selByMainSid(String billSid) { return baseMapper.selByMainSid(billSid); } } \ No newline at end of file diff --git a/src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailVo.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailVo.java similarity index 94% rename from src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailVo.java rename to src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailVo.java index 7500283..fc002ec 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailVo.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailVo.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.warehouse.biz.wmsinventorycheckbilldetail; +package com.yxt.warehouse.biz.warehouseinventorycheckbilldetail; import com.yxt.common.core.vo.Vo; @@ -45,6 +45,6 @@ import lombok.Data; */ @Data @ApiModel(value = "库存盘点-明细 视图数据对象", description = "库存盘点-明细 视图数据对象") -public class WmsInventoryCheckbillDetailVo implements Vo { +public class WarehouseInventoryCheckbillDetailVo implements Vo { } diff --git a/src/main/java/com/yxt/warehouse/biz/wmsinventorysettlebill/WmsInventorySettleRecordQuery.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventorysettlebill/WarehouseInventorySettleRecordQuery.java similarity index 66% rename from src/main/java/com/yxt/warehouse/biz/wmsinventorysettlebill/WmsInventorySettleRecordQuery.java rename to src/main/java/com/yxt/warehouse/biz/warehouseinventorysettlebill/WarehouseInventorySettleRecordQuery.java index ebb07aa..163bc01 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmsinventorysettlebill/WmsInventorySettleRecordQuery.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventorysettlebill/WarehouseInventorySettleRecordQuery.java @@ -1,4 +1,4 @@ -package com.yxt.warehouse.biz.wmsinventorysettlebill; +package com.yxt.warehouse.biz.warehouseinventorysettlebill; import com.yxt.common.core.query.Query; import lombok.Data; @@ -9,7 +9,7 @@ import lombok.Data; * @date 2024/4/1 16:20 */ @Data -public class WmsInventorySettleRecordQuery implements Query { +public class WarehouseInventorySettleRecordQuery implements Query { private String startDate; private String endDate; diff --git a/src/main/java/com/yxt/warehouse/biz/wmsinventorysettlebill/WmsInventorySettleRecordVo.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventorysettlebill/WarehouseInventorySettleRecordVo.java similarity index 75% rename from src/main/java/com/yxt/warehouse/biz/wmsinventorysettlebill/WmsInventorySettleRecordVo.java rename to src/main/java/com/yxt/warehouse/biz/warehouseinventorysettlebill/WarehouseInventorySettleRecordVo.java index 79b9d16..7431b4f 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmsinventorysettlebill/WmsInventorySettleRecordVo.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventorysettlebill/WarehouseInventorySettleRecordVo.java @@ -1,4 +1,4 @@ -package com.yxt.warehouse.biz.wmsinventorysettlebill; +package com.yxt.warehouse.biz.warehouseinventorysettlebill; import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.vo.Vo; @@ -12,7 +12,7 @@ import java.util.Date; * @date 2024/4/1 16:19 */ @Data -public class WmsInventorySettleRecordVo implements Vo { +public class WarehouseInventorySettleRecordVo implements Vo { private String sid; private String createByName; diff --git a/src/main/java/com/yxt/warehouse/biz/wmsinventorysettlebill/WmsInventorySettlebill.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventorysettlebill/WarehouseInventorySettlebill.java similarity index 96% rename from src/main/java/com/yxt/warehouse/biz/wmsinventorysettlebill/WmsInventorySettlebill.java rename to src/main/java/com/yxt/warehouse/biz/warehouseinventorysettlebill/WarehouseInventorySettlebill.java index cf605d0..be1425c 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmsinventorysettlebill/WmsInventorySettlebill.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventorysettlebill/WarehouseInventorySettlebill.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.warehouse.biz.wmsinventorysettlebill; +package com.yxt.warehouse.biz.warehouseinventorysettlebill; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; @@ -50,7 +50,7 @@ import java.util.Date; @Data @ApiModel(value = "库存结算单", description = "库存结算单") @TableName("wms_inventory_settlebill") -public class WmsInventorySettlebill extends BaseEntity { +public class WarehouseInventorySettlebill extends BaseEntity { private static final long serialVersionUID = 1L; @ApiModelProperty("结算单编号") diff --git a/src/main/java/com/yxt/warehouse/biz/wmsinventorysettlebill/WmsInventorySettlebillDetailsVo.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventorysettlebill/WarehouseInventorySettlebillDetailsVo.java similarity index 96% rename from src/main/java/com/yxt/warehouse/biz/wmsinventorysettlebill/WmsInventorySettlebillDetailsVo.java rename to src/main/java/com/yxt/warehouse/biz/warehouseinventorysettlebill/WarehouseInventorySettlebillDetailsVo.java index 312ede5..eb76c12 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmsinventorysettlebill/WmsInventorySettlebillDetailsVo.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventorysettlebill/WarehouseInventorySettlebillDetailsVo.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.warehouse.biz.wmsinventorysettlebill; +package com.yxt.warehouse.biz.warehouseinventorysettlebill; import com.fasterxml.jackson.annotation.JsonFormat; @@ -49,7 +49,7 @@ import java.util.Date; */ @Data @ApiModel(value = "库存结算单 视图数据详情", description = "库存结算单 视图数据详情") -public class WmsInventorySettlebillDetailsVo implements Vo { +public class WarehouseInventorySettlebillDetailsVo implements Vo { private String sid; // sid diff --git a/src/main/java/com/yxt/warehouse/biz/wmsinventorysettlebill/WmsInventorySettlebillDto.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventorysettlebill/WarehouseInventorySettlebillDto.java similarity index 96% rename from src/main/java/com/yxt/warehouse/biz/wmsinventorysettlebill/WmsInventorySettlebillDto.java rename to src/main/java/com/yxt/warehouse/biz/warehouseinventorysettlebill/WarehouseInventorySettlebillDto.java index ae45416..a063ceb 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmsinventorysettlebill/WmsInventorySettlebillDto.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventorysettlebill/WarehouseInventorySettlebillDto.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.warehouse.biz.wmsinventorysettlebill; +package com.yxt.warehouse.biz.warehouseinventorysettlebill; import com.yxt.common.core.dto.Dto; @@ -46,7 +46,7 @@ import lombok.Data; */ @Data @ApiModel(value = "库存结算单 数据传输对象", description = "库存结算单 数据传输对象") -public class WmsInventorySettlebillDto implements Dto { +public class WarehouseInventorySettlebillDto implements Dto { private String sid; @ApiModelProperty("制单日期") diff --git a/src/main/java/com/yxt/warehouse/biz/wmsinventorysettlebill/WmsInventorySettlebillMapper.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventorysettlebill/WarehouseInventorySettlebillMapper.java similarity index 80% rename from src/main/java/com/yxt/warehouse/biz/wmsinventorysettlebill/WmsInventorySettlebillMapper.java rename to src/main/java/com/yxt/warehouse/biz/warehouseinventorysettlebill/WarehouseInventorySettlebillMapper.java index ab42fb3..4ea5f51 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmsinventorysettlebill/WmsInventorySettlebillMapper.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventorysettlebill/WarehouseInventorySettlebillMapper.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.warehouse.biz.wmsinventorysettlebill; +package com.yxt.warehouse.biz.warehouseinventorysettlebill; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -51,21 +51,21 @@ import java.util.List; * @since 1.0 */ @Mapper -public interface WmsInventorySettlebillMapper extends BaseMapper { +public interface WarehouseInventorySettlebillMapper extends BaseMapper { //@Update("update wms_inventory_settlebill set name=#{msg} where id=#{id}") //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); @Select("select * from wms_inventory_settlebill") - List selectListVo(); + List selectListVo(); List selInventoryForStettleBill(@Param("useOrgSid") String useOrgSid); String selLastNum(@Param("inventorySid") String inventorySid); - IPage carryForwardList(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); + IPage carryForwardList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); } \ No newline at end of file diff --git a/src/main/java/com/yxt/warehouse/biz/wmsinventorysettlebill/WmsInventorySettlebillMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehouseinventorysettlebill/WarehouseInventorySettlebillMapper.xml similarity index 64% rename from src/main/java/com/yxt/warehouse/biz/wmsinventorysettlebill/WmsInventorySettlebillMapper.xml rename to src/main/java/com/yxt/warehouse/biz/warehouseinventorysettlebill/WarehouseInventorySettlebillMapper.xml index a9ba17a..e19597c 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmsinventorysettlebill/WmsInventorySettlebillMapper.xml +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventorysettlebill/WarehouseInventorySettlebillMapper.xml @@ -1,19 +1,19 @@ - + - + SELECT * FROM warehouse_inventory_settlebill ${ew.sqlSegment} - + SELECT * FROM warehouse_inventory_settlebill ${ew.sqlSegment} + resultType="com.yxt.warehouse.biz.warehouseinventorysettlebilldetail.WarehouseInventorySettlebillDetailVo"> SELECT d.sid, date_format (s.createTime,'%Y-%m-%d') as createTime, @@ -18,18 +18,18 @@ d.warehouseName, d.warehouseRackCode FROM - wms_inventory_settlebill_detail AS d + warehouse_inventory_settlebill_detail AS d LEFT JOIN wms_inventory_settlebill AS s ON d.billSid = s.sid ${ew.sqlSegment} diff --git a/src/main/java/com/yxt/warehouse/biz/wmsinventorysettlebilldetail/WmsInventorySettlebillDetailQuery.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventorysettlebilldetail/WarehouseInventorySettlebillDetailQuery.java similarity index 94% rename from src/main/java/com/yxt/warehouse/biz/wmsinventorysettlebilldetail/WmsInventorySettlebillDetailQuery.java rename to src/main/java/com/yxt/warehouse/biz/warehouseinventorysettlebilldetail/WarehouseInventorySettlebillDetailQuery.java index f3e336f..2b90854 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmsinventorysettlebilldetail/WmsInventorySettlebillDetailQuery.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventorysettlebilldetail/WarehouseInventorySettlebillDetailQuery.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.warehouse.biz.wmsinventorysettlebilldetail; +package com.yxt.warehouse.biz.warehouseinventorysettlebilldetail; import com.yxt.common.core.query.Query; @@ -45,7 +45,7 @@ import lombok.Data; */ @Data @ApiModel(value = "库存结算明细 查询条件", description = "库存结算明细 查询条件") -public class WmsInventorySettlebillDetailQuery implements Query { +public class WarehouseInventorySettlebillDetailQuery implements Query { private String goodsSpuName;//商品名称 private String goodsSkuCode;//商品编码（图号） diff --git a/src/main/java/com/yxt/warehouse/biz/wmsinventorysettlebilldetail/WmsInventorySettlebillDetailService.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventorysettlebilldetail/WarehouseInventorySettlebillDetailService.java similarity index 70% rename from src/main/java/com/yxt/warehouse/biz/wmsinventorysettlebilldetail/WmsInventorySettlebillDetailService.java rename to src/main/java/com/yxt/warehouse/biz/warehouseinventorysettlebilldetail/WarehouseInventorySettlebillDetailService.java index 167f1b7..436f87b 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmsinventorysettlebilldetail/WmsInventorySettlebillDetailService.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventorysettlebilldetail/WarehouseInventorySettlebillDetailService.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.warehouse.biz.wmsinventorysettlebilldetail; +package com.yxt.warehouse.biz.warehouseinventorysettlebilldetail; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -31,10 +31,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; 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 org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -53,13 +51,13 @@ import java.util.List; * @since 1.0 */ @Service -public class WmsInventorySettlebillDetailService extends MybatisBaseService { +public class WarehouseInventorySettlebillDetailService extends MybatisBaseService { - private QueryWrapper createQueryWrapper(WmsInventorySettlebillDetailQuery query) { + private QueryWrapper createQueryWrapper(WarehouseInventorySettlebillDetailQuery query) { // todo: 这里根据具体业务调整查询条件 // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); - QueryWrapper qw = new QueryWrapper<>(); + QueryWrapper qw = new QueryWrapper<>(); // if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getOrgPath())) { // String orgPath = query.getOrgPath(); // ResultBean orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(orgPath); @@ -84,16 +82,16 @@ public class WmsInventorySettlebillDetailService extends MybatisBaseService listPageVo(PagerQuery pq) { - WmsInventorySettlebillDetailQuery query = pq.getParams(); - QueryWrapper qw = createQueryWrapper(query); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); + public PagerVo listPageVo(PagerQuery pq) { + WarehouseInventorySettlebillDetailQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } - public void saveOrUpdateDto(WmsInventorySettlebillDetailDto dto) { + public void saveOrUpdateDto(WarehouseInventorySettlebillDetailDto dto) { String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { this.insertByDto(dto); @@ -102,25 +100,25 @@ public class WmsInventorySettlebillDetailService extends MybatisBaseService listExcel(WmsInventorySettlebillDetailQuery query) { - QueryWrapper qw = createQueryWrapper(query); - List list = baseMapper.listExcel(qw); + public List listExcel(WarehouseInventorySettlebillDetailQuery query) { + QueryWrapper qw = createQueryWrapper(query); + List list = baseMapper.listExcel(qw); return list; } } diff --git a/src/main/java/com/yxt/warehouse/biz/wmsinventorysettlebilldetail/WmsInventorySettlebillDetailVo.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventorysettlebilldetail/WarehouseInventorySettlebillDetailVo.java similarity index 95% rename from src/main/java/com/yxt/warehouse/biz/wmsinventorysettlebilldetail/WmsInventorySettlebillDetailVo.java rename to src/main/java/com/yxt/warehouse/biz/warehouseinventorysettlebilldetail/WarehouseInventorySettlebillDetailVo.java index 8e735af..357ce74 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmsinventorysettlebilldetail/WmsInventorySettlebillDetailVo.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventorysettlebilldetail/WarehouseInventorySettlebillDetailVo.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.warehouse.biz.wmsinventorysettlebilldetail; +package com.yxt.warehouse.biz.warehouseinventorysettlebilldetail; import com.yxt.common.core.vo.Vo; @@ -46,7 +46,7 @@ import lombok.Data; */ @Data @ApiModel(value = "库存结算明细 视图数据对象", description = "库存结算明细 视图数据对象") -public class WmsInventorySettlebillDetailVo implements Vo { +public class WarehouseInventorySettlebillDetailVo implements Vo { private String sid; // sid private String createTime; //结转日期 diff --git a/src/main/java/com/yxt/warehouse/biz/wmsinventorysettlebilldetail/WmsInventorySettlebillExportVo.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventorysettlebilldetail/WarehouseInventorySettlebillExportVo.java similarity index 92% rename from src/main/java/com/yxt/warehouse/biz/wmsinventorysettlebilldetail/WmsInventorySettlebillExportVo.java rename to src/main/java/com/yxt/warehouse/biz/warehouseinventorysettlebilldetail/WarehouseInventorySettlebillExportVo.java index c1c5986..c4cf099 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmsinventorysettlebilldetail/WmsInventorySettlebillExportVo.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventorysettlebilldetail/WarehouseInventorySettlebillExportVo.java @@ -1,4 +1,4 @@ -package com.yxt.warehouse.biz.wmsinventorysettlebilldetail; +package com.yxt.warehouse.biz.warehouseinventorysettlebilldetail; import com.yxt.common.core.utils.ExportEntityMap; import lombok.Data; @@ -9,7 +9,7 @@ import lombok.Data; * @date 2024/4/1 16:42 */ @Data -public class WmsInventorySettlebillExportVo { +public class WarehouseInventorySettlebillExportVo { @ExportEntityMap(CnName = "序号", EnName = "rankNo") private Integer rankNo; @ExportEntityMap(CnName = "结转日期", EnName = "createTime") diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionDto.java b/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionDto.java index 7d85156..f8e30ca 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionDto.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionDto.java @@ -2,7 +2,7 @@ package com.yxt.warehouse.biz.warehouseregion; import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.dto.Dto; -import com.yxt.warehouse.biz.wmswarehouseextend.WmsWarehouseExtendDto; +import com.yxt.warehouse.biz.warehouseextend.WarehouseExtendDto; import lombok.Data; import java.util.Date; @@ -33,5 +33,5 @@ public class WarehouseRegionDto implements Dto { private String useOrgSid;//创建组织sid private String createOrgSid;//创建组织sid // private List wmsWarehouseExtendDtos; - private WmsWarehouseExtendDto wmsWarehouseExtendDto; + private WarehouseExtendDto wmsWarehouseExtendDto; } diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionMapper.java b/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionMapper.java index 092323a..0097d49 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionMapper.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionMapper.java @@ -4,7 +4,7 @@ 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.warehouse.biz.wmswarehousearea.WmsWarehouseAreaAllVo; +import com.yxt.warehouse.biz.warehousearea.WarehouseAreaAllVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -21,5 +21,5 @@ public interface WarehouseRegionMapper extends BaseMapper { int updateBySidIsDelete(List list); @Select("select * from wms_warehouse_info") - List selectAll(); + List selectAll(); } diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionMapper.xml index 57540cd..3ab7457 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionMapper.xml +++ b/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionMapper.xml @@ -7,13 +7,13 @@ - UPDATE wms_warehouse_info + UPDATE warehouse_region SET isDelete=1 where sid in diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionService.java b/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionService.java index 3eb4ee0..6198be1 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionService.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionService.java @@ -10,12 +10,10 @@ 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.warehouse.biz.wmswarehousearea.WmsWarehouseArea; -import com.yxt.warehouse.biz.wmswarehousearea.WmsWarehouseAreaAllVo; -import com.yxt.warehouse.biz.wmswarehousearea.WmsWarehouseAreaVo; -import com.yxt.warehouse.biz.wmswarehouseextend.WmsWarehouseExtend; -import com.yxt.warehouse.biz.wmswarehouseextend.WmsWarehouseExtendService; -import com.yxt.warehouse.biz.wmswarehouseextend.WmsWarehouseExtendVo; +import com.yxt.warehouse.biz.warehousearea.WarehouseAreaAllVo; +import com.yxt.warehouse.biz.warehouseextend.WarehouseExtend; +import com.yxt.warehouse.biz.warehouseextend.WarehouseExtendService; +import com.yxt.warehouse.biz.warehouseextend.WarehouseExtendVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -34,7 +32,7 @@ import java.util.stream.Collectors; public class WarehouseRegionService extends MybatisBaseService { @Autowired - WmsWarehouseExtendService wmsWarehouseExtendService; + WarehouseExtendService wmsWarehouseExtendService; public ResultBean> listPage(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); @@ -104,10 +102,10 @@ public class WarehouseRegionService extends MybatisBaseService list=wmsWarehouseExtendService.list(new QueryWrapper().eq("warehouseSid",vo.getSid())); - List list1=new ArrayList<>(); - for (WmsWarehouseExtend wmsWarehouseExtend : list) { - WmsWarehouseExtendVo vo1= new WmsWarehouseExtendVo(); + List list=wmsWarehouseExtendService.list(new QueryWrapper().eq("warehouseSid",vo.getSid())); + List list1=new ArrayList<>(); + for (WarehouseExtend wmsWarehouseExtend : list) { + WarehouseExtendVo vo1= new WarehouseExtendVo(); BeanUtil.copyProperties(wmsWarehouseExtend, vo1); list1.add(vo1); } @@ -139,7 +137,7 @@ public class WarehouseRegionService extends MybatisBaseService selectAll() { + public List selectAll() { return baseMapper.selectAll(); } diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionVo.java b/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionVo.java index 92181eb..7819d77 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionVo.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionVo.java @@ -2,7 +2,7 @@ package com.yxt.warehouse.biz.warehouseregion; import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.vo.Vo; -import com.yxt.warehouse.biz.wmswarehouseextend.WmsWarehouseExtendVo; +import com.yxt.warehouse.biz.warehouseextend.WarehouseExtendVo; import lombok.Data; import java.util.Date; @@ -38,5 +38,5 @@ public class WarehouseRegionVo implements Vo { private String sortNo;//排序 private String useOrgSid;//创建组织sid private String createOrgSid;//创建组织sid - private List wmsWarehouseExtendVos; + private List wmsWarehouseExtendVos; } diff --git a/src/main/java/com/yxt/warehouse/biz/wmsreportlose/WmsReportLose.java b/src/main/java/com/yxt/warehouse/biz/warehousereportlose/WarehouseReportLose.java similarity index 92% rename from src/main/java/com/yxt/warehouse/biz/wmsreportlose/WmsReportLose.java rename to src/main/java/com/yxt/warehouse/biz/warehousereportlose/WarehouseReportLose.java index 8f20b26..e493f77 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmsreportlose/WmsReportLose.java +++ b/src/main/java/com/yxt/warehouse/biz/warehousereportlose/WarehouseReportLose.java @@ -1,4 +1,4 @@ -package com.yxt.warehouse.biz.wmsreportlose; +package com.yxt.warehouse.biz.warehousereportlose; import com.yxt.common.core.domain.BaseEntity; import lombok.Data; @@ -8,7 +8,7 @@ import lombok.Data; * @date 2024/2/28 8:38 */ @Data -public class WmsReportLose extends BaseEntity { +public class WarehouseReportLose extends BaseEntity { private String inventorySid;//商品库存sid diff --git a/src/main/java/com/yxt/warehouse/biz/wmsreportlose/WmsReportLoseDto.java b/src/main/java/com/yxt/warehouse/biz/warehousereportlose/WarehouseReportLoseDto.java similarity index 93% rename from src/main/java/com/yxt/warehouse/biz/wmsreportlose/WmsReportLoseDto.java rename to src/main/java/com/yxt/warehouse/biz/warehousereportlose/WarehouseReportLoseDto.java index 709021a..834ec41 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmsreportlose/WmsReportLoseDto.java +++ b/src/main/java/com/yxt/warehouse/biz/warehousereportlose/WarehouseReportLoseDto.java @@ -1,4 +1,4 @@ -package com.yxt.warehouse.biz.wmsreportlose; +package com.yxt.warehouse.biz.warehousereportlose; import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.dto.Dto; @@ -11,7 +11,7 @@ import java.util.Date; * @date 2024/2/26 13:38 */ @Data -public class WmsReportLoseDto implements Dto { +public class WarehouseReportLoseDto implements Dto { private String id; private String sid; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") diff --git a/src/main/java/com/yxt/warehouse/biz/wmsreportlose/WmsReportLoseMapper.java b/src/main/java/com/yxt/warehouse/biz/warehousereportlose/WarehouseReportLoseMapper.java similarity index 60% rename from src/main/java/com/yxt/warehouse/biz/wmsreportlose/WmsReportLoseMapper.java rename to src/main/java/com/yxt/warehouse/biz/warehousereportlose/WarehouseReportLoseMapper.java index 0ca69e5..150dfa8 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmsreportlose/WmsReportLoseMapper.java +++ b/src/main/java/com/yxt/warehouse/biz/warehousereportlose/WarehouseReportLoseMapper.java @@ -1,4 +1,4 @@ -package com.yxt.warehouse.biz.wmsreportlose; +package com.yxt.warehouse.biz.warehousereportlose; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -15,12 +15,10 @@ import java.util.List; * @date 2024/2/26 13:40 */ @Mapper -public interface WmsReportLoseMapper extends BaseMapper { - IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - WmsReportLoseVo initialization (@Param("sid") String sid); +public interface WarehouseReportLoseMapper extends BaseMapper { + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + WarehouseReportLoseVo initialization (@Param("sid") String sid); @Delete("delete from wms_reportlose where sid = #{sid}") void delByMainSid(String billSid); - - List selByMainSid(String billSid); } diff --git a/src/main/java/com/yxt/warehouse/biz/warehousereportlose/WarehouseReportLoseMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehousereportlose/WarehouseReportLoseMapper.xml new file mode 100644 index 0000000..f2c3232 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehousereportlose/WarehouseReportLoseMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehouseareatype/WmsWarehouseAreaTypeQuery.java b/src/main/java/com/yxt/warehouse/biz/warehousereportlose/WarehouseReportLoseQuery.java similarity index 57% rename from src/main/java/com/yxt/warehouse/biz/wmswarehouseareatype/WmsWarehouseAreaTypeQuery.java rename to src/main/java/com/yxt/warehouse/biz/warehousereportlose/WarehouseReportLoseQuery.java index b5b768b..2f9b816 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmswarehouseareatype/WmsWarehouseAreaTypeQuery.java +++ b/src/main/java/com/yxt/warehouse/biz/warehousereportlose/WarehouseReportLoseQuery.java @@ -1,4 +1,4 @@ -package com.yxt.warehouse.biz.wmswarehouseareatype; +package com.yxt.warehouse.biz.warehousereportlose; import com.yxt.common.core.query.Query; import lombok.Data; @@ -8,6 +8,6 @@ import lombok.Data; * @date 2024/2/26 13:37 */ @Data -public class WmsWarehouseAreaTypeQuery implements Query { +public class WarehouseReportLoseQuery implements Query { private String name; } diff --git a/src/main/java/com/yxt/warehouse/biz/wmsreportlose/WmsReportLoseService.java b/src/main/java/com/yxt/warehouse/biz/warehousereportlose/WarehouseReportLoseService.java similarity index 62% rename from src/main/java/com/yxt/warehouse/biz/wmsreportlose/WmsReportLoseService.java rename to src/main/java/com/yxt/warehouse/biz/warehousereportlose/WarehouseReportLoseService.java index 6974e4c..dcfa4da 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmsreportlose/WmsReportLoseService.java +++ b/src/main/java/com/yxt/warehouse/biz/warehousereportlose/WarehouseReportLoseService.java @@ -1,4 +1,4 @@ -package com.yxt.warehouse.biz.wmsreportlose; +package com.yxt.warehouse.biz.warehousereportlose; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateTime; @@ -19,21 +19,21 @@ import java.util.List; * @date 2024/2/26 13:40 */ @Service -public class WmsReportLoseService extends MybatisBaseService { +public class WarehouseReportLoseService extends MybatisBaseService { - public ResultBean> listPage(PagerQuery pq) { + public ResultBean> listPage(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); - WmsReportLoseQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); + WarehouseReportLoseQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); if (StringUtils.isNotBlank(query.getName())) { qw.like("rackName", query.getName()); } - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.listPage(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - List records = pagging.getRecords(); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + List records = pagging.getRecords(); return rb.success().setData(p); } @@ -41,16 +41,16 @@ public class WmsReportLoseService extends MybatisBaseService saveOrUpdate(WmsReportLoseDto dto) { + public ResultBean saveOrUpdate(WarehouseReportLoseDto dto) { ResultBean rb = ResultBean.fireFail(); String sid = ""; if (StringUtils.isNotBlank(dto.getSid())) { sid = dto.getSid(); - WmsReportLose wmsWarehouseRack = fetchBySid(dto.getSid()); + WarehouseReportLose wmsWarehouseRack = fetchBySid(dto.getSid()); BeanUtil.copyProperties(dto, wmsWarehouseRack, "id", "sid"); baseMapper.updateById(wmsWarehouseRack); } else { - WmsReportLose wmsWarehouseRack = new WmsReportLose(); + WarehouseReportLose wmsWarehouseRack = new WarehouseReportLose(); sid = wmsWarehouseRack.getSid(); BeanUtil.copyProperties(dto, wmsWarehouseRack, "id", "sid"); wmsWarehouseRack.setCreateTime(new DateTime()); @@ -59,9 +59,9 @@ public class WmsReportLoseService extends MybatisBaseService initialization(String sid) { + public ResultBean initialization(String sid) { ResultBean rb = ResultBean.fireFail(); - WmsReportLoseVo vo = baseMapper.initialization(sid); + WarehouseReportLoseVo vo = baseMapper.initialization(sid); return rb.success().setData(vo); } public void delAll(String[] sids) { @@ -70,7 +70,7 @@ public class WmsReportLoseService extends MybatisBaseService selByMainSid(String billSid) { - return baseMapper.selByMainSid(billSid); - } - public void saveOrUpdateDto(WmsReportLoseDto dto) { + public void saveOrUpdateDto(WarehouseReportLoseDto dto) { String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { this.insertByDto(dto); @@ -104,21 +101,21 @@ public class WmsReportLoseService extends MybatisBaseService { + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + WarehouseReportLoseOperVo initialization (@Param("sid") String sid); + + @Delete("delete from wms_reportlose where sid = #{sid}") + void delByMainSid(String billSid); + +} diff --git a/src/main/java/com/yxt/warehouse/biz/warehousereportloseoper/WarehouseReportLoseOperMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehousereportloseoper/WarehouseReportLoseOperMapper.xml new file mode 100644 index 0000000..3e9cef3 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehousereportloseoper/WarehouseReportLoseOperMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/yxt/warehouse/biz/wmsinventoryallocatebill/WmsInventoryAllocateBillQuery.java b/src/main/java/com/yxt/warehouse/biz/warehousereportloseoper/WarehouseReportLoseOperQuery.java similarity index 56% rename from src/main/java/com/yxt/warehouse/biz/wmsinventoryallocatebill/WmsInventoryAllocateBillQuery.java rename to src/main/java/com/yxt/warehouse/biz/warehousereportloseoper/WarehouseReportLoseOperQuery.java index da921d2..23be5fd 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmsinventoryallocatebill/WmsInventoryAllocateBillQuery.java +++ b/src/main/java/com/yxt/warehouse/biz/warehousereportloseoper/WarehouseReportLoseOperQuery.java @@ -1,4 +1,4 @@ -package com.yxt.warehouse.biz.wmsinventoryallocatebill; +package com.yxt.warehouse.biz.warehousereportloseoper; import com.yxt.common.core.query.Query; import lombok.Data; @@ -8,6 +8,6 @@ import lombok.Data; * @date 2024/2/26 13:37 */ @Data -public class WmsInventoryAllocateBillQuery implements Query { +public class WarehouseReportLoseOperQuery implements Query { private String name; } diff --git a/src/main/java/com/yxt/warehouse/biz/warehousereportloseoper/WarehouseReportLoseOperService.java b/src/main/java/com/yxt/warehouse/biz/warehousereportloseoper/WarehouseReportLoseOperService.java new file mode 100644 index 0000000..fa7d314 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehousereportloseoper/WarehouseReportLoseOperService.java @@ -0,0 +1,124 @@ +package com.yxt.warehouse.biz.warehousereportloseoper; + +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.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.stereotype.Service; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/2/26 13:40 + */ +@Service +public class WarehouseReportLoseOperService extends MybatisBaseService { + + + public ResultBean> listPage(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + WarehouseReportLoseOperQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getName())) { + qw.like("rackName", query.getName()); + } + + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + List records = pagging.getRecords(); + return rb.success().setData(p); + } + + + + + + public ResultBean saveOrUpdate(WarehouseReportLoseOperDto dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = ""; + if (StringUtils.isNotBlank(dto.getSid())) { + sid = dto.getSid(); + WarehouseReportLoseOper wmsWarehouseRack = fetchBySid(dto.getSid()); + BeanUtil.copyProperties(dto, wmsWarehouseRack, "id", "sid"); + baseMapper.updateById(wmsWarehouseRack); + } else { + WarehouseReportLoseOper wmsWarehouseRack = new WarehouseReportLoseOper(); + sid = wmsWarehouseRack.getSid(); + BeanUtil.copyProperties(dto, wmsWarehouseRack, "id", "sid"); + wmsWarehouseRack.setCreateTime(new DateTime()); + baseMapper.insert(wmsWarehouseRack); + } + return rb.success().setMsg("成功"); + } + + public ResultBean initialization(String sid) { + ResultBean rb = ResultBean.fireFail(); + WarehouseReportLoseOperVo vo = baseMapper.initialization(sid); + return rb.success().setData(vo); + } + public void delAll(String[] sids) { + delBySids(sids); + } + + public ResultBean delete(String sid) { + ResultBean rb = ResultBean.fireFail(); + WarehouseReportLoseOper wmsWarehouseRack = fetchBySid(sid); + if (null != wmsWarehouseRack) { + baseMapper.deleteById(wmsWarehouseRack.getId()); + } + return rb.success(); + } + + public ResultBean updateIsEnable(String sid, String isEnable) { + ResultBean rb = ResultBean.fireFail(); + WarehouseReportLoseOper wmsWarehouseRack = fetchBySid(sid); + if (null != wmsWarehouseRack) { + wmsWarehouseRack.setIsEnable(Integer.parseInt(isEnable)); + baseMapper.updateById(wmsWarehouseRack); + } + return rb.success().setMsg("成功"); + } + + public void delByMainSid(String billSid) { + baseMapper.delByMainSid(billSid); + } + + + + public void saveOrUpdateDto(WarehouseReportLoseOperDto dto) { + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + this.insertByDto(dto); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(WarehouseReportLoseOperDto dto) { + WarehouseReportLoseOper entity = new WarehouseReportLoseOper(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(WarehouseReportLoseOperDto dto) { + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + } + public WarehouseReportLoseOperVo fetchDetailsVoBySid(String sid) { + WarehouseReportLoseOper entity = fetchBySid(sid); + WarehouseReportLoseOperVo vo = new WarehouseReportLoseOperVo(); + BeanUtil.copyProperties(entity, vo); + + return vo; + } +} diff --git a/src/main/java/com/yxt/warehouse/biz/warehousereportloseoper/WarehouseReportLoseOperVo.java b/src/main/java/com/yxt/warehouse/biz/warehousereportloseoper/WarehouseReportLoseOperVo.java new file mode 100644 index 0000000..5d44b89 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehousereportloseoper/WarehouseReportLoseOperVo.java @@ -0,0 +1,48 @@ +package com.yxt.warehouse.biz.warehousereportloseoper; + +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 WarehouseReportLoseOperVo 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 inventorySid;//商品库存sid + private String goodsID;//商品ID（唯一编码，入库时生成，生成规则为商品编码+YYMMdd+4位流水） + private String goodSpuSid;//商品基础信息Sid + private String goodsSpuName;//商品名称 + private String goodsSkuSid;//、、商品Skusid + private String goodsSkuTitle;//商品Sku名称 + private String goodsSkuCode;//商品编码（图号） + private String goodsSkuOwnSpec;//规格型号 + private String unit;//计量单位 + private String count;//数量 + private String warehouseSid;//仓库sid + private String warehouseName;//仓库名称 + private String warehouseRackSid;//、库位sid + private String warehouseRackCode;//库位编码 + private String loseCount;//损费量 + private String reportTime;//上报时间 + private String reportUserSid;//上报人 + private String picUrl;//现场拍照，多个照片用逗号分隔 + private String isSyncInventory;//是否同步到系统库存 + private String confirmUserSid;//损废确认人 + private String confirmTime;//损废确认时间 + +} diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehouseinfo/WmsWarehouseInfo.java b/src/main/java/com/yxt/warehouse/biz/warehousewarehouseinfo/WarehouseInfo.java similarity index 89% rename from src/main/java/com/yxt/warehouse/biz/wmswarehouseinfo/WmsWarehouseInfo.java rename to src/main/java/com/yxt/warehouse/biz/warehousewarehouseinfo/WarehouseInfo.java index 38b4116..e00ffb3 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmswarehouseinfo/WmsWarehouseInfo.java +++ b/src/main/java/com/yxt/warehouse/biz/warehousewarehouseinfo/WarehouseInfo.java @@ -1,4 +1,4 @@ -package com.yxt.warehouse.biz.wmswarehouseinfo; +package com.yxt.warehouse.biz.warehousewarehouseinfo; import com.yxt.common.core.domain.BaseEntity; import lombok.Data; @@ -8,7 +8,7 @@ import lombok.Data; * @date 2024/2/26 13:36 */ @Data -public class WmsWarehouseInfo extends BaseEntity { +public class WarehouseInfo extends BaseEntity { private String warehouseName;//仓库名称 private String warehouseCode;//仓库编码 diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehouseinfo/WmsWarehouseInfoAllVo.java b/src/main/java/com/yxt/warehouse/biz/warehousewarehouseinfo/WarehouseInfoAllVo.java similarity index 95% rename from src/main/java/com/yxt/warehouse/biz/wmswarehouseinfo/WmsWarehouseInfoAllVo.java rename to src/main/java/com/yxt/warehouse/biz/warehousewarehouseinfo/WarehouseInfoAllVo.java index 6041570..4fb32fc 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmswarehouseinfo/WmsWarehouseInfoAllVo.java +++ b/src/main/java/com/yxt/warehouse/biz/warehousewarehouseinfo/WarehouseInfoAllVo.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.warehouse.biz.wmswarehouseinfo; +package com.yxt.warehouse.biz.warehousewarehouseinfo; import com.yxt.common.core.vo.Vo; @@ -46,7 +46,7 @@ import lombok.Data; */ @Data @ApiModel(value = "仓库 视图数据详情", description = "仓库 视图数据详情") -public class WmsWarehouseInfoAllVo implements Vo { +public class WarehouseInfoAllVo implements Vo { private String sid; @ApiModelProperty("仓库名称") diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehouseinfo/WmsWarehouseInfoDto.java b/src/main/java/com/yxt/warehouse/biz/warehousewarehouseinfo/WarehouseInfoDto.java similarity index 84% rename from src/main/java/com/yxt/warehouse/biz/wmswarehouseinfo/WmsWarehouseInfoDto.java rename to src/main/java/com/yxt/warehouse/biz/warehousewarehouseinfo/WarehouseInfoDto.java index 4d1361b..b96ba55 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmswarehouseinfo/WmsWarehouseInfoDto.java +++ b/src/main/java/com/yxt/warehouse/biz/warehousewarehouseinfo/WarehouseInfoDto.java @@ -1,8 +1,8 @@ -package com.yxt.warehouse.biz.wmswarehouseinfo; +package com.yxt.warehouse.biz.warehousewarehouseinfo; import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.dto.Dto; -import com.yxt.warehouse.biz.wmswarehouseextend.WmsWarehouseExtendDto; +import com.yxt.warehouse.biz.warehouseextend.WarehouseExtendDto; import lombok.Data; import java.util.Date; @@ -12,7 +12,7 @@ import java.util.Date; * @date 2024/2/26 13:38 */ @Data -public class WmsWarehouseInfoDto implements Dto { +public class WarehouseInfoDto implements Dto { private String id; private String sid; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @@ -37,5 +37,5 @@ public class WmsWarehouseInfoDto implements Dto { private String useOrgSid;//创建组织sid private String createOrgSid;//创建组织sid // private List wmsWarehouseExtendDtos; - private WmsWarehouseExtendDto wmsWarehouseExtendDto; + private WarehouseExtendDto wmsWarehouseExtendDto; } diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehouseinfo/WmsWarehouseInfoMapper.java b/src/main/java/com/yxt/warehouse/biz/warehousewarehouseinfo/WarehouseInfoMapper.java similarity index 59% rename from src/main/java/com/yxt/warehouse/biz/wmswarehouseinfo/WmsWarehouseInfoMapper.java rename to src/main/java/com/yxt/warehouse/biz/warehousewarehouseinfo/WarehouseInfoMapper.java index 5385011..ebda3b7 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmswarehouseinfo/WmsWarehouseInfoMapper.java +++ b/src/main/java/com/yxt/warehouse/biz/warehousewarehouseinfo/WarehouseInfoMapper.java @@ -1,10 +1,10 @@ -package com.yxt.warehouse.biz.wmswarehouseinfo; +package com.yxt.warehouse.biz.warehousewarehouseinfo; 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.warehouse.biz.wmswarehousearea.WmsWarehouseAreaAllVo; +import com.yxt.warehouse.biz.warehousearea.WarehouseAreaAllVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -16,10 +16,10 @@ import java.util.List; * @date 2024/2/26 13:40 */ @Mapper -public interface WmsWarehouseInfoMapper extends BaseMapper { - IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); +public interface WarehouseInfoMapper extends BaseMapper { + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); int updateBySidIsDelete(List list); @Select("select * from wms_warehouse_info") - List selectAll(); + List selectAll(); } diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehouseinfo/WmsWarehouseInfoMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehousewarehouseinfo/WarehouseInfoMapper.xml similarity index 67% rename from src/main/java/com/yxt/warehouse/biz/wmswarehouseinfo/WmsWarehouseInfoMapper.xml rename to src/main/java/com/yxt/warehouse/biz/warehousewarehouseinfo/WarehouseInfoMapper.xml index d30e322..84102a9 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmswarehouseinfo/WmsWarehouseInfoMapper.xml +++ b/src/main/java/com/yxt/warehouse/biz/warehousewarehouseinfo/WarehouseInfoMapper.xml @@ -1,19 +1,19 @@ - + - select * - from wms_warehouse_info + from warehouse_warehouse_info ${ew.sqlSegment} - UPDATE wms_warehouse_info + UPDATE warehouse_warehouse_info SET isDelete=1 where sid in diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehouseinfo/WmsWarehouseInfoQuery.java b/src/main/java/com/yxt/warehouse/biz/warehousewarehouseinfo/WarehouseInfoQuery.java similarity index 66% rename from src/main/java/com/yxt/warehouse/biz/wmswarehouseinfo/WmsWarehouseInfoQuery.java rename to src/main/java/com/yxt/warehouse/biz/warehousewarehouseinfo/WarehouseInfoQuery.java index 4873c37..845b877 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmswarehouseinfo/WmsWarehouseInfoQuery.java +++ b/src/main/java/com/yxt/warehouse/biz/warehousewarehouseinfo/WarehouseInfoQuery.java @@ -1,4 +1,4 @@ -package com.yxt.warehouse.biz.wmswarehouseinfo; +package com.yxt.warehouse.biz.warehousewarehouseinfo; import com.yxt.common.core.query.Query; import lombok.Data; @@ -8,7 +8,7 @@ import lombok.Data; * @date 2024/2/26 13:37 */ @Data -public class WmsWarehouseInfoQuery implements Query { +public class WarehouseInfoQuery implements Query { private String name; private String code; private String address; diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehouseinfo/WmsWarehouseInfoService.java b/src/main/java/com/yxt/warehouse/biz/warehousewarehouseinfo/WarehouseInfoService.java similarity index 66% rename from src/main/java/com/yxt/warehouse/biz/wmswarehouseinfo/WmsWarehouseInfoService.java rename to src/main/java/com/yxt/warehouse/biz/warehousewarehouseinfo/WarehouseInfoService.java index 0d5fd15..27d89ef 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmswarehouseinfo/WmsWarehouseInfoService.java +++ b/src/main/java/com/yxt/warehouse/biz/warehousewarehouseinfo/WarehouseInfoService.java @@ -1,4 +1,4 @@ -package com.yxt.warehouse.biz.wmswarehouseinfo; +package com.yxt.warehouse.biz.warehousewarehouseinfo; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateTime; @@ -10,10 +10,10 @@ 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.warehouse.biz.wmswarehousearea.WmsWarehouseAreaAllVo; -import com.yxt.warehouse.biz.wmswarehouseextend.WmsWarehouseExtend; -import com.yxt.warehouse.biz.wmswarehouseextend.WmsWarehouseExtendService; -import com.yxt.warehouse.biz.wmswarehouseextend.WmsWarehouseExtendVo; +import com.yxt.warehouse.biz.warehousearea.WarehouseAreaAllVo; +import com.yxt.warehouse.biz.warehouseextend.WarehouseExtend; +import com.yxt.warehouse.biz.warehouseextend.WarehouseExtendService; +import com.yxt.warehouse.biz.warehouseextend.WarehouseExtendVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -29,15 +29,15 @@ import java.util.stream.Collectors; * @date 2024/2/26 13:40 */ @Service -public class WmsWarehouseInfoService extends MybatisBaseService { +public class WarehouseInfoService extends MybatisBaseService { @Autowired - WmsWarehouseExtendService wmsWarehouseExtendService; + WarehouseExtendService wmsWarehouseExtendService; - public ResultBean> listPage(PagerQuery pq) { + public ResultBean> listPage(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); - WmsWarehouseInfoQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); + WarehouseInfoQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); if(StringUtils.isNotBlank(query.getName())){ qw.like("warehouseName",query.getName()); } @@ -49,24 +49,24 @@ public class WmsWarehouseInfoService extends MybatisBaseService page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.listPage(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - List records = pagging.getRecords(); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + List records = pagging.getRecords(); return rb.success().setData(p); } - public ResultBean listAll() { + public ResultBean listAll() { ResultBean rb = ResultBean.fireFail(); - List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1)); + List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1)); return rb.success().setData(pagging); } - public ResultBean saveOrUpdate(WmsWarehouseInfoDto dto) { + public ResultBean saveOrUpdate(WarehouseInfoDto dto) { ResultBean rb = ResultBean.fireFail(); String sid = ""; if (StringUtils.isNotBlank(dto.getSid())) { sid = dto.getSid(); - WmsWarehouseInfo wmsWarehouse = fetchBySid(dto.getSid()); + WarehouseInfo wmsWarehouse = fetchBySid(dto.getSid()); BeanUtil.copyProperties(dto, wmsWarehouse, "id", "sid"); wmsWarehouse.setModifyTime(new Date()); baseMapper.updateById(wmsWarehouse); @@ -78,7 +78,7 @@ public class WmsWarehouseInfoService extends MybatisBaseService initialization(String sid) { + public ResultBean initialization(String sid) { ResultBean rb = ResultBean.fireFail(); - WmsWarehouseInfoVo vo = new WmsWarehouseInfoVo(); - WmsWarehouseInfo wmsWarehouse = fetchBySid(sid); + WarehouseInfoVo vo = new WarehouseInfoVo(); + WarehouseInfo wmsWarehouse = fetchBySid(sid); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); BeanUtil.copyProperties(wmsWarehouse, vo); - List list=wmsWarehouseExtendService.list(new QueryWrapper().eq("warehouseSid",vo.getSid())); - List list1=new ArrayList<>(); - for (WmsWarehouseExtend wmsWarehouseExtend : list) { - WmsWarehouseExtendVo vo1= new WmsWarehouseExtendVo(); + List list=wmsWarehouseExtendService.list(new QueryWrapper().eq("warehouseSid",vo.getSid())); + List list1=new ArrayList<>(); + for (WarehouseExtend wmsWarehouseExtend : list) { + WarehouseExtendVo vo1= new WarehouseExtendVo(); BeanUtil.copyProperties(wmsWarehouseExtend, vo1); list1.add(vo1); } @@ -117,7 +117,7 @@ public class WmsWarehouseInfoService extends MybatisBaseService selectAll() { + public List selectAll() { return baseMapper.selectAll(); } } diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehouseinfo/WmsWarehouseInfoVo.java b/src/main/java/com/yxt/warehouse/biz/warehousewarehouseinfo/WarehouseInfoVo.java similarity index 85% rename from src/main/java/com/yxt/warehouse/biz/wmswarehouseinfo/WmsWarehouseInfoVo.java rename to src/main/java/com/yxt/warehouse/biz/warehousewarehouseinfo/WarehouseInfoVo.java index 7731230..bc089e3 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmswarehouseinfo/WmsWarehouseInfoVo.java +++ b/src/main/java/com/yxt/warehouse/biz/warehousewarehouseinfo/WarehouseInfoVo.java @@ -1,8 +1,8 @@ -package com.yxt.warehouse.biz.wmswarehouseinfo; +package com.yxt.warehouse.biz.warehousewarehouseinfo; import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.vo.Vo; -import com.yxt.warehouse.biz.wmswarehouseextend.WmsWarehouseExtendVo; +import com.yxt.warehouse.biz.warehouseextend.WarehouseExtendVo; import lombok.Data; import java.util.Date; @@ -13,7 +13,7 @@ import java.util.List; * @date 2024/2/26 13:37 */ @Data -public class WmsWarehouseInfoVo implements Vo { +public class WarehouseInfoVo implements Vo { private String id; private String sid; private String lockVersion; @@ -42,5 +42,5 @@ public class WmsWarehouseInfoVo implements Vo { private String sortNo;//创建组织sid private String useOrgSid;//创建组织sid private String createOrgSid;//创建组织sid - private List wmsWarehouseExtendVos; + private List wmsWarehouseExtendVos; } diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehouserack/WmsWarehouseRack.java b/src/main/java/com/yxt/warehouse/biz/warehousewarehouserack/WarehouseRack.java similarity index 84% rename from src/main/java/com/yxt/warehouse/biz/wmswarehouserack/WmsWarehouseRack.java rename to src/main/java/com/yxt/warehouse/biz/warehousewarehouserack/WarehouseRack.java index b4dc8de..d02fce4 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmswarehouserack/WmsWarehouseRack.java +++ b/src/main/java/com/yxt/warehouse/biz/warehousewarehouserack/WarehouseRack.java @@ -1,4 +1,4 @@ -package com.yxt.warehouse.biz.wmswarehouserack; +package com.yxt.warehouse.biz.warehousewarehouserack; import com.yxt.common.core.domain.BaseEntity; import lombok.Data; @@ -8,7 +8,7 @@ import lombok.Data; * @date 2024/2/28 8:38 */ @Data -public class WmsWarehouseRack extends BaseEntity { +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") diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehouserack/WmsWarehouseRackDto.java b/src/main/java/com/yxt/warehouse/biz/warehousewarehouserack/WarehouseRackDto.java similarity index 85% rename from src/main/java/com/yxt/warehouse/biz/wmswarehouserack/WmsWarehouseRackDto.java rename to src/main/java/com/yxt/warehouse/biz/warehousewarehouserack/WarehouseRackDto.java index 70aa32f..dea2711 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmswarehouserack/WmsWarehouseRackDto.java +++ b/src/main/java/com/yxt/warehouse/biz/warehousewarehouserack/WarehouseRackDto.java @@ -1,4 +1,4 @@ -package com.yxt.warehouse.biz.wmswarehouserack; +package com.yxt.warehouse.biz.warehousewarehouserack; import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.dto.Dto; @@ -11,7 +11,7 @@ import java.util.Date; * @date 2024/2/26 13:38 */ @Data -public class WmsWarehouseRackDto implements Dto { +public class WarehouseRackDto implements Dto { private String id; private String sid; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehouserack/WmsWarehouseRackMapper.java b/src/main/java/com/yxt/warehouse/biz/warehousewarehouserack/WarehouseRackMapper.java similarity index 58% rename from src/main/java/com/yxt/warehouse/biz/wmswarehouserack/WmsWarehouseRackMapper.java rename to src/main/java/com/yxt/warehouse/biz/warehousewarehouserack/WarehouseRackMapper.java index c1a81d1..19a5dcf 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmswarehouserack/WmsWarehouseRackMapper.java +++ b/src/main/java/com/yxt/warehouse/biz/warehousewarehouserack/WarehouseRackMapper.java @@ -1,4 +1,4 @@ -package com.yxt.warehouse.biz.wmswarehouserack; +package com.yxt.warehouse.biz.warehousewarehouserack; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -14,8 +14,8 @@ import java.util.List; * @date 2024/2/26 13:40 */ @Mapper -public interface WmsWarehouseRackMapper extends BaseMapper { - IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - WmsWarehouseRackVo initialization (@Param("sid") String sid); +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/src/main/java/com/yxt/warehouse/biz/wmswarehouserack/WmsWarehouseRackMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehousewarehouserack/WarehouseRackMapper.xml similarity index 55% rename from src/main/java/com/yxt/warehouse/biz/wmswarehouserack/WmsWarehouseRackMapper.xml rename to src/main/java/com/yxt/warehouse/biz/warehousewarehouserack/WarehouseRackMapper.xml index eab8d6d..b96898e 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmswarehouserack/WmsWarehouseRackMapper.xml +++ b/src/main/java/com/yxt/warehouse/biz/warehousewarehouserack/WarehouseRackMapper.xml @@ -1,29 +1,29 @@ - + - select a.*,b.areaName as locationName ,c.warehouseName as warehouseName - from wms_warehouse_rack a - left join wms_warehouse_area b on b.sid =a.locationSid - left join wms_warehouse_info c on c.sid = a.warehouseSid + from warehouse_warehouse_rack a + left join warehouse_warehouse_area b on b.sid =a.locationSid + left join warehouse_warehouse_info c on c.sid = a.warehouseSid ${ew.sqlSegment} - select a.*,b.areaName as locationName ,c.warehouseName as warehouseName - from wms_warehouse_rack a - left join wms_warehouse_area b on b.sid =a.locationSid - left join wms_warehouse_info c on c.sid = a.warehouseSid + from warehouse_warehouse_rack a + left join warehouse_warehouse_area b on b.sid =a.locationSid + left join warehouse_warehouse_info c on c.sid = a.warehouseSid where a.sid =#{sid} - UPDATE wms_warehouse_rack + UPDATE warehouse_warehouse_rack SET isDelete=1 where sid in diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseAreaQuery.java b/src/main/java/com/yxt/warehouse/biz/warehousewarehouserack/WarehouseRackQuery.java similarity index 72% rename from src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseAreaQuery.java rename to src/main/java/com/yxt/warehouse/biz/warehousewarehouserack/WarehouseRackQuery.java index 4a3287b..aec4d83 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseAreaQuery.java +++ b/src/main/java/com/yxt/warehouse/biz/warehousewarehouserack/WarehouseRackQuery.java @@ -1,4 +1,4 @@ -package com.yxt.warehouse.biz.wmswarehousearea; +package com.yxt.warehouse.biz.warehousewarehouserack; import com.yxt.common.core.query.Query; import lombok.Data; @@ -8,7 +8,7 @@ import lombok.Data; * @date 2024/2/26 13:37 */ @Data -public class WmsWarehouseAreaQuery implements Query { +public class WarehouseRackQuery implements Query { private String name;//名字 private String code;//编码 private String warehouseSid;//仓库 diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehouserack/WmsWarehouseRackService.java b/src/main/java/com/yxt/warehouse/biz/warehousewarehouserack/WarehouseRackService.java similarity index 68% rename from src/main/java/com/yxt/warehouse/biz/wmswarehouserack/WmsWarehouseRackService.java rename to src/main/java/com/yxt/warehouse/biz/warehousewarehouserack/WarehouseRackService.java index 9401c6a..8020c38 100644 --- a/src/main/java/com/yxt/warehouse/biz/wmswarehouserack/WmsWarehouseRackService.java +++ b/src/main/java/com/yxt/warehouse/biz/warehousewarehouserack/WarehouseRackService.java @@ -1,4 +1,4 @@ -package com.yxt.warehouse.biz.wmswarehouserack; +package com.yxt.warehouse.biz.warehousewarehouserack; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateTime; @@ -22,13 +22,13 @@ import java.util.stream.Collectors; * @date 2024/2/26 13:40 */ @Service -public class WmsWarehouseRackService extends MybatisBaseService { +public class WarehouseRackService extends MybatisBaseService { - public ResultBean> listPage(PagerQuery pq) { + public ResultBean> listPage(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); - WmsWarehouseRackQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); + WarehouseRackQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); if(StringUtils.isNotBlank(query.getName())){ qw.like("rackName",query.getName()); } @@ -42,30 +42,30 @@ public class WmsWarehouseRackService extends MybatisBaseService page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.listPage(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - List records = pagging.getRecords(); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + List records = pagging.getRecords(); return rb.success().setData(p); } - public ResultBean getAllType() { + public ResultBean getAllType() { ResultBean rb = ResultBean.fireFail(); - List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1) + List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1) .ne("isDelete","1")); return rb.success().setData(pagging); } - public ResultBean saveOrUpdate(WmsWarehouseRackDto dto) { + public ResultBean saveOrUpdate(WarehouseRackDto dto) { ResultBean rb = ResultBean.fireFail(); String sid = ""; if (StringUtils.isNotBlank(dto.getSid())) { sid = dto.getSid(); - WmsWarehouseRack wmsWarehouseRack = fetchBySid(dto.getSid()); + WarehouseRack wmsWarehouseRack = fetchBySid(dto.getSid()); BeanUtil.copyProperties(dto, wmsWarehouseRack, "id", "sid"); wmsWarehouseRack.setModifyTime(new Date()); baseMapper.updateById(wmsWarehouseRack); } else { - WmsWarehouseRack wmsWarehouseRack = new WmsWarehouseRack(); + WarehouseRack wmsWarehouseRack = new WarehouseRack(); sid = wmsWarehouseRack.getSid(); BeanUtil.copyProperties(dto, wmsWarehouseRack, "id", "sid"); wmsWarehouseRack.setCreateTime(new DateTime()); @@ -74,16 +74,16 @@ public class WmsWarehouseRackService extends MybatisBaseService initialization(String sid) { + public ResultBean initialization(String sid) { ResultBean rb = ResultBean.fireFail(); - WmsWarehouseRackVo vo = baseMapper.initialization(sid); + WarehouseRackVo vo = baseMapper.initialization(sid); return rb.success().setData(vo); } public ResultBean delete(String sid) { ResultBean rb = ResultBean.fireFail(); - WmsWarehouseRack wmsWarehouseRack = fetchBySid(sid); + WarehouseRack wmsWarehouseRack = fetchBySid(sid); if (null != wmsWarehouseRack) { baseMapper.deleteById(wmsWarehouseRack.getId()); } @@ -95,7 +95,7 @@ public class WmsWarehouseRackService extends MybatisBaseService { - IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - WmsInventoryAllocateBillVo initialization (@Param("sid") String sid); - - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); -} diff --git a/src/main/java/com/yxt/warehouse/biz/wmsinventoryallocatebill/WmsInventoryAllocateBillMapper.xml b/src/main/java/com/yxt/warehouse/biz/wmsinventoryallocatebill/WmsInventoryAllocateBillMapper.xml deleted file mode 100644 index 488b0d1..0000000 --- a/src/main/java/com/yxt/warehouse/biz/wmsinventoryallocatebill/WmsInventoryAllocateBillMapper.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/yxt/warehouse/biz/wmsinventoryallocatebilldetail/WmsInventoryAllocateBillDetailMapper.xml b/src/main/java/com/yxt/warehouse/biz/wmsinventoryallocatebilldetail/WmsInventoryAllocateBillDetailMapper.xml deleted file mode 100644 index 8298849..0000000 --- a/src/main/java/com/yxt/warehouse/biz/wmsinventoryallocatebilldetail/WmsInventoryAllocateBillDetailMapper.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/yxt/warehouse/biz/wmsinventorybatch/WmsInventoryBatchMapper.xml b/src/main/java/com/yxt/warehouse/biz/wmsinventorybatch/WmsInventoryBatchMapper.xml deleted file mode 100644 index 4cf3897..0000000 --- a/src/main/java/com/yxt/warehouse/biz/wmsinventorybatch/WmsInventoryBatchMapper.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.xml b/src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.xml deleted file mode 100644 index ff613ff..0000000 --- a/src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/yxt/warehouse/biz/wmsreportlose/WmsReportLoseMapper.xml b/src/main/java/com/yxt/warehouse/biz/wmsreportlose/WmsReportLoseMapper.xml deleted file mode 100644 index 8bbb109..0000000 --- a/src/main/java/com/yxt/warehouse/biz/wmsreportlose/WmsReportLoseMapper.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - \ No newline at end of file