From e1126342f3b91d3426d16f7b973b8fb0aa7e09fb Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Fri, 26 Apr 2024 17:30:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9wms=E4=B8=BAstorage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...sBillRest.java => StorageAnsBillRest.java} | 16 +-- ...st.java => StorageDistributeBillRest.java} | 20 ++-- ...t.java => StorageInventoryRecordRest.java} | 26 ++--- ...oryRest.java => StorageInventoryRest.java} | 21 ++-- ...tBillRest.java => StorageOutBillRest.java} | 16 +-- ...lRest.java => StorageReceiptBillRest.java} | 20 ++-- ...illRest.java => StorageShelfBillRest.java} | 16 +-- .../StorageAnsBill.java} | 4 +- .../StorageAnsBillDto.java} | 10 +- .../storageansbill/StorageAnsBillMapper.java | 24 +++++ .../StorageAnsBillQuery.java} | 4 +- .../StorageAnsBillService.java} | 68 ++++++------- .../StorageAnsBillVo.java} | 4 +- .../StorageAnsDetailsVo.java} | 8 +- .../StorageAnsBillDetail.java} | 4 +- .../StorageAnsBillDetailDto.java} | 4 +- .../StorageAnsBillDetailMapper.java} | 6 +- .../StorageAnsBillDetailMapper.xml} | 8 +- .../StorageAnsBillDetailService.java | 29 ++++++ .../StorageAnsBillDetailVo.java} | 4 +- .../StorageAnsListDetailsVo.java} | 4 +- .../StorageDistributeBill.java} | 4 +- .../StorageDistributeBillDto.java} | 8 +- .../StorageDistributeBillInitVo.java} | 8 +- .../StorageDistributeBillMapper.java} | 4 +- .../StorageDistributeBillQuery.java} | 4 +- .../StorageDistributeBillService.java | 35 +++++++ .../StorageDistributeBillVo.java} | 4 +- .../StorageDistributeBillDetail.java} | 4 +- .../StorageDistributeBillDetailDto.java} | 4 +- .../StorageDistributeBillDetailVo.java} | 4 +- .../StorageInventory.java} | 4 +- .../StorageInventoryMapper.java} | 8 +- .../StorageInventoryMapper.xml} | 4 +- .../StorageInventoryQuery.java} | 4 +- .../StorageInventorySaveDto.java} | 4 +- .../StorageInventoryService.java} | 22 ++--- .../StorageInventoryVo.java} | 4 +- .../StorageInventoryRecord.java} | 4 +- .../StorageInventoryRecordDto.java} | 4 +- .../StorageInventoryRecordListVo.java} | 4 +- .../StorageInventoryRecordMapper.java | 16 +++ .../StorageInventoryRecordMapper.xml} | 6 +- .../StorageInventoryRecordService.java} | 24 ++--- .../StorageInventoryRecordsExcelVo.java} | 4 +- .../StorageInventoryRecordsQuery.java} | 4 +- .../StorageInventoryRecordsVo.java} | 4 +- .../StorageOutBill.java} | 4 +- .../StorageOutBillDetailsVo.java} | 8 +- .../StorageOutBillDto.java} | 8 +- .../StorageOutBillMapper.java} | 4 +- .../StorageOutBillMapper.xml} | 2 +- .../StorageOutBillQuery.java} | 4 +- .../StorageOutBillService.java} | 10 +- .../StorageOutBillVo.java} | 4 +- .../StorageOutBillDetail.java} | 4 +- .../StorageOutBillDetailDto.java} | 4 +- .../StorageReceiptBill.java} | 4 +- .../StorageReceiptBillDto2.java} | 12 +-- .../StorageReceiptBillInitVo.java} | 12 +-- .../StorageReceiptBillMapper.java} | 8 +- .../StorageReceiptBillMapper.xml} | 6 +- .../StorageReceiptBillPageVo.java} | 4 +- .../StorageReceiptBillQuery.java} | 4 +- .../StorageReceiptBillService.java} | 98 +++++++++---------- .../StorageReceiptBillVo.java} | 8 +- .../StorageReceiptBillDetail.java} | 4 +- .../StorageReceiptBillDetailDto2.java} | 4 +- .../StorageReceiptBillDetailMapper.java | 21 ++++ .../StorageReceiptBillDetailMapper.xml} | 6 +- .../StorageReceiptBillDetailService.java} | 20 ++-- .../StorageReceiptBillDetailVo.java} | 4 +- .../StorageReceiptBillDetailBatch.java} | 4 +- .../StorageReceiptBillDetailBatchDto2.java} | 4 +- .../StorageReceiptBillDetailBatchMapper.java | 21 ++++ .../StorageReceiptBillDetailBatchMapper.xml} | 6 +- ...StorageReceiptBillDetailBatchService.java} | 12 +-- .../ShelfDetailsVo.java | 4 +- .../ShelfInitVo.java | 4 +- .../StorageShelfBill.java} | 4 +- .../StorageShelfBillDto.java} | 8 +- .../StorageShelfBillMapper.java} | 6 +- .../StorageShelfBillMapper.xml} | 6 +- .../StorageShelfBillQuery.java} | 4 +- .../StorageShelfBillService.java} | 84 ++++++++-------- .../StorageShelfBillVo.java} | 4 +- .../ShelfDetailsListVo.java | 2 +- .../ShelfInitListVo.java | 2 +- .../StorageShelfBillDetail.java} | 4 +- .../StorageShelfBillDetailDto.java} | 4 +- .../StorageShelfBillDetailMapper.java} | 6 +- .../StorageShelfBillDetailMapper.xml} | 6 +- .../StorageShelfBillDetailService.java} | 10 +- .../StorageShelfBillDetailVos.java} | 4 +- .../biz/wmsansbill/WmsAnsBillMapper.java | 24 ----- .../WmsAnsBillDetailService.java | 29 ------ .../WmsDistributeBillService.java | 35 ------- .../WmsInventoryRecordMapper.java | 16 --- .../WmsReceiptBillDetailMapper.java | 21 ---- .../WmsReceiptBillDetailBatchMapper.java | 21 ---- src/main/resources/application.yml | 4 +- target/classes/application-dev.yml | 30 ++++++ target/classes/application-pro.yml | 0 target/classes/application-test.yml | 0 target/classes/application.yml | 43 ++++++++ .../storageansbill/StorageAnsBillMapper.xml | 14 +-- .../StorageAnsBillDetailMapper.xml | 25 +++++ .../StorageDistributeBillMapper.xml | 4 + .../StorageInventoryMapper.xml | 25 +++++ .../StorageInventoryRecordMapper.xml | 16 +++ .../storageoutbill/StorageOutBillMapper.xml | 2 +- .../StorageReceiptBillMapper.xml | 42 ++++++++ .../StorageReceiptBillDetailMapper.xml | 42 ++++++++ .../StorageReceiptBillDetailBatchMapper.xml | 27 +++++ .../StorageShelfBillMapper.xml | 39 ++++++++ .../StorageShelfBillDetailMapper.xml | 46 +++++++++ target/classes/logback-spring.xml | 54 ++++++++++ 117 files changed, 968 insertions(+), 582 deletions(-) rename src/main/java/com/yxt/storage/apiadmin/{WmsAnsBillRest.java => StorageAnsBillRest.java} (61%) rename src/main/java/com/yxt/storage/apiadmin/{WmsDistributeBillRest.java => StorageDistributeBillRest.java} (59%) rename src/main/java/com/yxt/storage/apiadmin/{WmsInventoryRecordRest.java => StorageInventoryRecordRest.java} (53%) rename src/main/java/com/yxt/storage/apiadmin/{WmsInventoryRest.java => StorageInventoryRest.java} (57%) rename src/main/java/com/yxt/storage/apiadmin/{WmsOutBillRest.java => StorageOutBillRest.java} (61%) rename src/main/java/com/yxt/storage/apiadmin/{WmsReceiptBillRest.java => StorageReceiptBillRest.java} (64%) rename src/main/java/com/yxt/storage/apiadmin/{WmsShelfBillRest.java => StorageShelfBillRest.java} (75%) rename src/main/java/com/yxt/storage/biz/{wmsansbill/WmsAnsBill.java => storageansbill/StorageAnsBill.java} (94%) rename src/main/java/com/yxt/storage/biz/{wmsansbill/WmsAnsBillDto.java => storageansbill/StorageAnsBillDto.java} (85%) create mode 100644 src/main/java/com/yxt/storage/biz/storageansbill/StorageAnsBillMapper.java rename src/main/java/com/yxt/storage/biz/{wmsansbill/WmsAnsBillQuery.java => storageansbill/StorageAnsBillQuery.java} (90%) rename src/main/java/com/yxt/storage/biz/{wmsansbill/WmsAnsBillService.java => storageansbill/StorageAnsBillService.java} (59%) rename src/main/java/com/yxt/storage/biz/{wmsansbill/WmsAnsBillVo.java => storageansbill/StorageAnsBillVo.java} (93%) rename src/main/java/com/yxt/storage/biz/{wmsansbill/WmsAnsDetailsVo.java => storageansbill/StorageAnsDetailsVo.java} (84%) rename src/main/java/com/yxt/storage/biz/{wmsansbilldetail/WmsAnsBillDetail.java => storageansbilldetail/StorageAnsBillDetail.java} (92%) rename src/main/java/com/yxt/storage/biz/{wmsansbilldetail/WmsAnsBillDetailDto.java => storageansbilldetail/StorageAnsBillDetailDto.java} (91%) rename src/main/java/com/yxt/storage/biz/{wmsansbilldetail/WmsAnsBillDetailMapper.java => storageansbilldetail/StorageAnsBillDetailMapper.java} (54%) rename src/main/java/com/yxt/storage/biz/{wmsansbilldetail/WmsAnsBillDetailMapper.xml => storageansbilldetail/StorageAnsBillDetailMapper.xml} (75%) create mode 100644 src/main/java/com/yxt/storage/biz/storageansbilldetail/StorageAnsBillDetailService.java rename src/main/java/com/yxt/storage/biz/{wmsansbilldetail/WmsAnsBillDetailVo.java => storageansbilldetail/StorageAnsBillDetailVo.java} (89%) rename src/main/java/com/yxt/storage/biz/{wmsansbilldetail/WmsAnsListDetailsVo.java => storageansbilldetail/StorageAnsListDetailsVo.java} (94%) rename src/main/java/com/yxt/storage/biz/{wmsdistributebill/WmsDistributeBill.java => storagedistributebill/StorageDistributeBill.java} (90%) rename src/main/java/com/yxt/storage/biz/{wmsdistributebill/WmsDistributeBillDto.java => storagedistributebill/StorageDistributeBillDto.java} (75%) rename src/main/java/com/yxt/storage/biz/{wmsdistributebill/WmsDistributeBillInitVo.java => storagedistributebill/StorageDistributeBillInitVo.java} (71%) rename src/main/java/com/yxt/storage/biz/{wmsdistributebill/WmsDistributeBillMapper.java => storagedistributebill/StorageDistributeBillMapper.java} (56%) rename src/main/java/com/yxt/storage/biz/{wmsdistributebill/WmsDistributeBillQuery.java => storagedistributebill/StorageDistributeBillQuery.java} (87%) create mode 100644 src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillService.java rename src/main/java/com/yxt/storage/biz/{wmsdistributebill/WmsDistributeBillVo.java => storagedistributebill/StorageDistributeBillVo.java} (89%) rename src/main/java/com/yxt/storage/biz/{wmsdistributebilldetail/WmsDistributeBillDetail.java => storagedistributebilldetail/StorageDistributeBillDetail.java} (92%) rename src/main/java/com/yxt/storage/biz/{wmsdistributebilldetail/WmsDistributeBillDetailVo.java => storagedistributebilldetail/StorageDistributeBillDetailDto.java} (91%) rename src/main/java/com/yxt/storage/biz/{wmsdistributebilldetail/WmsDistributeBillDetailDto.java => storagedistributebilldetail/StorageDistributeBillDetailVo.java} (91%) rename src/main/java/com/yxt/storage/biz/{wmsinventory/WmsInventory.java => storageinventory/StorageInventory.java} (94%) rename src/main/java/com/yxt/storage/biz/{wmsinventory/WmsInventoryMapper.java => storageinventory/StorageInventoryMapper.java} (60%) rename src/main/java/com/yxt/storage/biz/{wmsinventory/WmsInventoryMapper.xml => storageinventory/StorageInventoryMapper.xml} (79%) rename src/main/java/com/yxt/storage/biz/{wmsinventory/WmsInventoryQuery.java => storageinventory/StorageInventoryQuery.java} (85%) rename src/main/java/com/yxt/storage/biz/{wmsinventory/WmsInventorySaveDto.java => storageinventory/StorageInventorySaveDto.java} (95%) rename src/main/java/com/yxt/storage/biz/{wmsinventory/WmsInventoryService.java => storageinventory/StorageInventoryService.java} (72%) rename src/main/java/com/yxt/storage/biz/{wmsinventory/WmsInventoryVo.java => storageinventory/StorageInventoryVo.java} (92%) rename src/main/java/com/yxt/storage/biz/{wmsinventoryrecord/WmsInventoryRecord.java => storageinventoryrecord/StorageInventoryRecord.java} (95%) rename src/main/java/com/yxt/storage/biz/{wmsinventoryrecord/WmsInventoryRecordDto.java => storageinventoryrecord/StorageInventoryRecordDto.java} (95%) rename src/main/java/com/yxt/storage/biz/{wmsinventoryrecord/WmsInventoryRecordListVo.java => storageinventoryrecord/StorageInventoryRecordListVo.java} (88%) create mode 100644 src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordMapper.java rename src/main/java/com/yxt/storage/biz/{wmsinventoryrecord/WmsInventoryRecordMapper.xml => storageinventoryrecord/StorageInventoryRecordMapper.xml} (67%) rename src/main/java/com/yxt/storage/biz/{wmsinventoryrecord/WmsInventoryRecordService.java => storageinventoryrecord/StorageInventoryRecordService.java} (52%) rename src/main/java/com/yxt/storage/biz/{wmsinventoryrecord/WmsInventoryRecordsExcelVo.java => storageinventoryrecord/StorageInventoryRecordsExcelVo.java} (96%) rename src/main/java/com/yxt/storage/biz/{wmsinventoryrecord/WmsInventoryRecordsQuery.java => storageinventoryrecord/StorageInventoryRecordsQuery.java} (91%) rename src/main/java/com/yxt/storage/biz/{wmsinventoryrecord/WmsInventoryRecordsVo.java => storageinventoryrecord/StorageInventoryRecordsVo.java} (93%) rename src/main/java/com/yxt/storage/biz/{wmsoutbill/WmsOutBill.java => storageoutbill/StorageOutBill.java} (93%) rename src/main/java/com/yxt/storage/biz/{wmsoutbill/WmsOutBillDetailsVo.java => storageoutbill/StorageOutBillDetailsVo.java} (78%) rename src/main/java/com/yxt/storage/biz/{wmsoutbill/WmsOutBillDto.java => storageoutbill/StorageOutBillDto.java} (78%) rename src/main/java/com/yxt/storage/biz/{wmsoutbill/WmsOutBillMapper.java => storageoutbill/StorageOutBillMapper.java} (60%) rename src/main/java/com/yxt/storage/biz/{wmsoutbill/WmsOutBillMapper.xml => storageoutbill/StorageOutBillMapper.xml} (63%) rename src/main/java/com/yxt/storage/biz/{wmsoutbill/WmsOutBillQuery.java => storageoutbill/StorageOutBillQuery.java} (90%) rename src/main/java/com/yxt/storage/biz/{wmsoutbill/WmsOutBillService.java => storageoutbill/StorageOutBillService.java} (51%) rename src/main/java/com/yxt/storage/biz/{wmsoutbill/WmsOutBillVo.java => storageoutbill/StorageOutBillVo.java} (92%) rename src/main/java/com/yxt/storage/biz/{wmsoutbilldetail/WmsOutBillDetail.java => storageoutbilldetail/StorageOutBillDetail.java} (92%) rename src/main/java/com/yxt/storage/biz/{wmsoutbilldetail/WmsOutBillDetailDto.java => storageoutbilldetail/StorageOutBillDetailDto.java} (89%) rename src/main/java/com/yxt/storage/biz/{wmsreceiptbill/WmsReceiptBill.java => storagereceiptbill/StorageReceiptBill.java} (92%) rename src/main/java/com/yxt/storage/biz/{wmsreceiptbill/WmsReceiptBillDto2.java => storagereceiptbill/StorageReceiptBillDto2.java} (78%) rename src/main/java/com/yxt/storage/biz/{wmsreceiptbill/WmsReceiptBillInitVo.java => storagereceiptbill/StorageReceiptBillInitVo.java} (78%) rename src/main/java/com/yxt/storage/biz/{wmsreceiptbill/WmsReceiptBillMapper.java => storagereceiptbill/StorageReceiptBillMapper.java} (54%) rename src/main/java/com/yxt/storage/biz/{wmsreceiptbill/WmsReceiptBillMapper.xml => storagereceiptbill/StorageReceiptBillMapper.xml} (85%) rename src/main/java/com/yxt/storage/biz/{wmsreceiptbill/WmsReceiptBillPageVo.java => storagereceiptbill/StorageReceiptBillPageVo.java} (90%) rename src/main/java/com/yxt/storage/biz/{wmsreceiptbill/WmsReceiptBillQuery.java => storagereceiptbill/StorageReceiptBillQuery.java} (88%) rename src/main/java/com/yxt/storage/biz/{wmsreceiptbill/WmsReceiptBillService.java => storagereceiptbill/StorageReceiptBillService.java} (58%) rename src/main/java/com/yxt/storage/biz/{wmsreceiptbill/WmsReceiptBillVo.java => storagereceiptbill/StorageReceiptBillVo.java} (86%) rename src/main/java/com/yxt/storage/biz/{wmsreceiptbilldetail/WmsReceiptBillDetail.java => storagereceiptbilldetail/StorageReceiptBillDetail.java} (93%) rename src/main/java/com/yxt/storage/biz/{wmsreceiptbilldetail/WmsReceiptBillDetailDto2.java => storagereceiptbilldetail/StorageReceiptBillDetailDto2.java} (95%) create mode 100644 src/main/java/com/yxt/storage/biz/storagereceiptbilldetail/StorageReceiptBillDetailMapper.java rename src/main/java/com/yxt/storage/biz/{wmsreceiptbilldetail/WmsReceiptBillDetailMapper.xml => storagereceiptbilldetail/StorageReceiptBillDetailMapper.xml} (86%) rename src/main/java/com/yxt/storage/biz/{wmsreceiptbilldetail/WmsReceiptBillDetailService.java => storagereceiptbilldetail/StorageReceiptBillDetailService.java} (53%) rename src/main/java/com/yxt/storage/biz/{wmsreceiptbilldetail/WmsReceiptBillDetailVo.java => storagereceiptbilldetail/StorageReceiptBillDetailVo.java} (94%) rename src/main/java/com/yxt/storage/biz/{wmsreceiptbilldetailbatch/WmsReceiptBillDetailBatch.java => storagereceiptbilldetailbatch/StorageReceiptBillDetailBatch.java} (86%) rename src/main/java/com/yxt/storage/biz/{wmsreceiptbilldetailbatch/WmsReceiptBillDetailBatchDto2.java => storagereceiptbilldetailbatch/StorageReceiptBillDetailBatchDto2.java} (91%) create mode 100644 src/main/java/com/yxt/storage/biz/storagereceiptbilldetailbatch/StorageReceiptBillDetailBatchMapper.java rename src/main/java/com/yxt/storage/biz/{wmsreceiptbilldetailbatch/WmsReceiptBillDetailBatchMapper.xml => storagereceiptbilldetailbatch/StorageReceiptBillDetailBatchMapper.xml} (71%) rename src/main/java/com/yxt/storage/biz/{wmsreceiptbilldetailbatch/WmsReceiptBillDetailBatchService.java => storagereceiptbilldetailbatch/StorageReceiptBillDetailBatchService.java} (56%) rename src/main/java/com/yxt/storage/biz/{wmsshelfbill => storageshelfbill}/ShelfDetailsVo.java (88%) rename src/main/java/com/yxt/storage/biz/{wmsshelfbill => storageshelfbill}/ShelfInitVo.java (88%) rename src/main/java/com/yxt/storage/biz/{wmsshelfbill/WmsShelfBill.java => storageshelfbill/StorageShelfBill.java} (87%) rename src/main/java/com/yxt/storage/biz/{wmsshelfbill/WmsShelfBillDto.java => storageshelfbill/StorageShelfBillDto.java} (77%) rename src/main/java/com/yxt/storage/biz/{wmsshelfbill/WmsShelfBillMapper.java => storageshelfbill/StorageShelfBillMapper.java} (65%) rename src/main/java/com/yxt/storage/biz/{wmsshelfbill/WmsShelfBillMapper.xml => storageshelfbill/StorageShelfBillMapper.xml} (80%) rename src/main/java/com/yxt/storage/biz/{wmsshelfbill/WmsShelfBillQuery.java => storageshelfbill/StorageShelfBillQuery.java} (83%) rename src/main/java/com/yxt/storage/biz/{wmsshelfbill/WmsShelfBillService.java => storageshelfbill/StorageShelfBillService.java} (74%) rename src/main/java/com/yxt/storage/biz/{wmsshelfbill/WmsShelfBillVo.java => storageshelfbill/StorageShelfBillVo.java} (87%) rename src/main/java/com/yxt/storage/biz/{wmsshelfbilldetail => storageshelfbilldetail}/ShelfDetailsListVo.java (96%) rename src/main/java/com/yxt/storage/biz/{wmsshelfbilldetail => storageshelfbilldetail}/ShelfInitListVo.java (95%) rename src/main/java/com/yxt/storage/biz/{wmsshelfbilldetail/WmsShelfBillDetail.java => storageshelfbilldetail/StorageShelfBillDetail.java} (87%) rename src/main/java/com/yxt/storage/biz/{wmsshelfbilldetail/WmsShelfBillDetailDto.java => storageshelfbilldetail/StorageShelfBillDetailDto.java} (93%) rename src/main/java/com/yxt/storage/biz/{wmsshelfbilldetail/WmsShelfBillDetailMapper.java => storageshelfbilldetail/StorageShelfBillDetailMapper.java} (61%) rename src/main/java/com/yxt/storage/biz/{wmsshelfbilldetail/WmsShelfBillDetailMapper.xml => storageshelfbilldetail/StorageShelfBillDetailMapper.xml} (85%) rename src/main/java/com/yxt/storage/biz/{wmsshelfbilldetail/WmsShelfBillDetailService.java => storageshelfbilldetail/StorageShelfBillDetailService.java} (64%) rename src/main/java/com/yxt/storage/biz/{wmsshelfbilldetail/WmsShelfBillDetailVos.java => storageshelfbilldetail/StorageShelfBillDetailVos.java} (92%) delete mode 100644 src/main/java/com/yxt/storage/biz/wmsansbill/WmsAnsBillMapper.java delete mode 100644 src/main/java/com/yxt/storage/biz/wmsansbilldetail/WmsAnsBillDetailService.java delete mode 100644 src/main/java/com/yxt/storage/biz/wmsdistributebill/WmsDistributeBillService.java delete mode 100644 src/main/java/com/yxt/storage/biz/wmsinventoryrecord/WmsInventoryRecordMapper.java delete mode 100644 src/main/java/com/yxt/storage/biz/wmsreceiptbilldetail/WmsReceiptBillDetailMapper.java delete mode 100644 src/main/java/com/yxt/storage/biz/wmsreceiptbilldetailbatch/WmsReceiptBillDetailBatchMapper.java create mode 100644 target/classes/application-dev.yml create mode 100644 target/classes/application-pro.yml create mode 100644 target/classes/application-test.yml create mode 100644 target/classes/application.yml rename src/main/java/com/yxt/storage/biz/wmsansbill/WmsAnsBillMapper.xml => target/classes/com/yxt/storage/biz/storageansbill/StorageAnsBillMapper.xml (73%) create mode 100644 target/classes/com/yxt/storage/biz/storageansbilldetail/StorageAnsBillDetailMapper.xml create mode 100644 target/classes/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillMapper.xml create mode 100644 target/classes/com/yxt/storage/biz/storageinventory/StorageInventoryMapper.xml create mode 100644 target/classes/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordMapper.xml rename src/main/java/com/yxt/storage/biz/wmsdistributebill/WmsDistributeBillMapper.xml => target/classes/com/yxt/storage/biz/storageoutbill/StorageOutBillMapper.xml (60%) create mode 100644 target/classes/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillMapper.xml create mode 100644 target/classes/com/yxt/storage/biz/storagereceiptbilldetail/StorageReceiptBillDetailMapper.xml create mode 100644 target/classes/com/yxt/storage/biz/storagereceiptbilldetailbatch/StorageReceiptBillDetailBatchMapper.xml create mode 100644 target/classes/com/yxt/storage/biz/storageshelfbill/StorageShelfBillMapper.xml create mode 100644 target/classes/com/yxt/storage/biz/storageshelfbilldetail/StorageShelfBillDetailMapper.xml create mode 100644 target/classes/logback-spring.xml diff --git a/src/main/java/com/yxt/storage/apiadmin/WmsAnsBillRest.java b/src/main/java/com/yxt/storage/apiadmin/StorageAnsBillRest.java similarity index 61% rename from src/main/java/com/yxt/storage/apiadmin/WmsAnsBillRest.java rename to src/main/java/com/yxt/storage/apiadmin/StorageAnsBillRest.java index af8e918..d79d272 100644 --- a/src/main/java/com/yxt/storage/apiadmin/WmsAnsBillRest.java +++ b/src/main/java/com/yxt/storage/apiadmin/StorageAnsBillRest.java @@ -3,7 +3,7 @@ package com.yxt.storage.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.storage.biz.wmsansbill.*; +import com.yxt.storage.biz.storageansbill.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -17,29 +17,29 @@ import org.springframework.web.bind.annotation.*; @Api(tags = "预期到货通知单") @RestController @RequestMapping("/apiadmin/WmsAnsBill") -public class WmsAnsBillRest { +public class StorageAnsBillRest { @Autowired - private WmsAnsBillService wmsAnsBillService; + private StorageAnsBillService wmsAnsBillService; @PostMapping("saveOrUpdate") @ApiOperation("新增修改保存") - ResultBean saveOrUpdate(@RequestBody WmsAnsBillDto dto) { + ResultBean saveOrUpdate(@RequestBody StorageAnsBillDto dto) { return wmsAnsBillService.saveOrUpdateBill(dto); } @PostMapping("listPage") @ApiOperation("分页列表") - ResultBean> listPage(@RequestBody PagerQuery pagerQuery) { - ResultBean> rb = ResultBean.fireFail(); - PagerVo pv = wmsAnsBillService.listPages(pagerQuery); + ResultBean> listPage(@RequestBody PagerQuery pagerQuery) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = wmsAnsBillService.listPages(pagerQuery); return rb.success().setData(pv); } @GetMapping("details") @ApiOperation("详情") - ResultBean details(@RequestParam("sid") String sid) { + ResultBean details(@RequestParam("sid") String sid) { return wmsAnsBillService.details(sid); } diff --git a/src/main/java/com/yxt/storage/apiadmin/WmsDistributeBillRest.java b/src/main/java/com/yxt/storage/apiadmin/StorageDistributeBillRest.java similarity index 59% rename from src/main/java/com/yxt/storage/apiadmin/WmsDistributeBillRest.java rename to src/main/java/com/yxt/storage/apiadmin/StorageDistributeBillRest.java index 9f17470..a728896 100644 --- a/src/main/java/com/yxt/storage/apiadmin/WmsDistributeBillRest.java +++ b/src/main/java/com/yxt/storage/apiadmin/StorageDistributeBillRest.java @@ -3,7 +3,7 @@ package com.yxt.storage.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.storage.biz.wmsdistributebill.*; +import com.yxt.storage.biz.storagedistributebill.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -17,40 +17,40 @@ import org.springframework.web.bind.annotation.*; @Api(tags = "配货单据") @RestController @RequestMapping("/apiadmin/WmsDistributeBill") -public class WmsDistributeBillRest { +public class StorageDistributeBillRest { @Autowired - private WmsDistributeBillService wmsDistributeBillService; + private StorageDistributeBillService wmsDistributeBillService; @ApiOperation("分页列表") @PostMapping("/listPage") - ResultBean> listPage(@RequestBody PagerQuery pagerQuery) { - ResultBean> rb = ResultBean.fireFail(); - PagerVo pv = wmsDistributeBillService.listPage(pagerQuery); + ResultBean> listPage(@RequestBody PagerQuery pagerQuery) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = wmsDistributeBillService.listPage(pagerQuery); return rb.success().setData(pv); } @ApiOperation("从出库新增配货单") @GetMapping("/getInit") - ResultBean getInit(@RequestParam("sid") String sid) { + ResultBean getInit(@RequestParam("sid") String sid) { return wmsDistributeBillService.getInit(sid); } @ApiOperation("详情/编辑初始化") @GetMapping("/details") - ResultBean details(@RequestParam("sid") String sid) { + ResultBean details(@RequestParam("sid") String sid) { return wmsDistributeBillService.details(sid); } @ApiOperation("新增修改保存") @PostMapping("/saveOrUpdateBill") - ResultBean saveOrUpdateBill(@RequestBody WmsDistributeBillDto dto) { + ResultBean saveOrUpdateBill(@RequestBody StorageDistributeBillDto dto) { return wmsDistributeBillService.saveOrUpdateBill(dto); } @ApiOperation("确认") @PostMapping("/confirm") - ResultBean confirm(@RequestBody WmsDistributeBillDto dto) { + ResultBean confirm(@RequestBody StorageDistributeBillDto dto) { return wmsDistributeBillService.confirm(dto); } } diff --git a/src/main/java/com/yxt/storage/apiadmin/WmsInventoryRecordRest.java b/src/main/java/com/yxt/storage/apiadmin/StorageInventoryRecordRest.java similarity index 53% rename from src/main/java/com/yxt/storage/apiadmin/WmsInventoryRecordRest.java rename to src/main/java/com/yxt/storage/apiadmin/StorageInventoryRecordRest.java index 989c2ad..eb582ad 100644 --- a/src/main/java/com/yxt/storage/apiadmin/WmsInventoryRecordRest.java +++ b/src/main/java/com/yxt/storage/apiadmin/StorageInventoryRecordRest.java @@ -6,7 +6,7 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.storage.biz.wmsinventoryrecord.*; +import com.yxt.storage.biz.storageinventoryrecord.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -19,34 +19,34 @@ import java.util.List; @Api(tags = "库存出入库记录") @RestController -@RequestMapping("/apiadmin/inventory/wmsinventoryrecord") -public class WmsInventoryRecordRest { +@RequestMapping("/apiadmin/inventory/Storageinventoryrecord") +public class StorageInventoryRecordRest { @Autowired - private WmsInventoryRecordService wmsInventoryRecordService; + private StorageInventoryRecordService storageInventoryRecordService; @Autowired HttpServletResponse response; @ApiOperation("根据库存sid获取出入库记录") - @GetMapping("/getWmsInventoryRecordList") - ResultBean> getWmsInventoryRecordList(@RequestParam("sid") String sid) { - return wmsInventoryRecordService.getWmsInventoryRecordList(sid); + @GetMapping("/getStorageInventoryRecordList") + ResultBean> getStorageInventoryRecordList(@RequestParam("sid") String sid) { + return storageInventoryRecordService.getStorageInventoryRecordList(sid); } @ApiOperation("出入库查询") @PostMapping("/pageList") - ResultBean> pageList(@RequestBody PagerQuery pagerQuery) { - ResultBean> rb = ResultBean.fireFail(); - PagerVo pv = wmsInventoryRecordService.listPage(pagerQuery); + ResultBean> pageList(@RequestBody PagerQuery pagerQuery) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = storageInventoryRecordService.listPage(pagerQuery); return rb.success().setData(pv); } @PostMapping("/exportExcel") @ApiOperation(value = "导出") - public void exportExcel(@RequestBody WmsInventoryRecordsQuery query) { + public void exportExcel(@RequestBody StorageInventoryRecordsQuery query) { //得到所有要导出的数据 - List exportVoList = wmsInventoryRecordService.listExcel(query); + List exportVoList = storageInventoryRecordService.listExcel(query); //定义导出的excel名字 String excelName = "出入库查询"; String fileNameURL = ""; @@ -55,7 +55,7 @@ public class WmsInventoryRecordRest { } catch (UnsupportedEncodingException e) { e.printStackTrace(); } - ExportExcelUtils.export(fileNameURL, exportVoList, WmsInventoryRecordsExcelVo.class, response); + ExportExcelUtils.export(fileNameURL, exportVoList, StorageInventoryRecordsExcelVo.class, response); } } diff --git a/src/main/java/com/yxt/storage/apiadmin/WmsInventoryRest.java b/src/main/java/com/yxt/storage/apiadmin/StorageInventoryRest.java similarity index 57% rename from src/main/java/com/yxt/storage/apiadmin/WmsInventoryRest.java rename to src/main/java/com/yxt/storage/apiadmin/StorageInventoryRest.java index 2577d02..ff8adad 100644 --- a/src/main/java/com/yxt/storage/apiadmin/WmsInventoryRest.java +++ b/src/main/java/com/yxt/storage/apiadmin/StorageInventoryRest.java @@ -1,22 +1,17 @@ package com.yxt.storage.apiadmin; -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.storage.biz.wmsinventory.WmsInventory; -import com.yxt.storage.biz.wmsinventory.WmsInventoryQuery; -import com.yxt.storage.biz.wmsinventory.WmsInventoryService; -import com.yxt.storage.biz.wmsinventory.WmsInventoryVo; +import com.yxt.storage.biz.storageinventory.StorageInventoryQuery; +import com.yxt.storage.biz.storageinventory.StorageInventoryService; +import com.yxt.storage.biz.storageinventory.StorageInventoryVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; -import java.util.List; /** * @author wangpengfei @@ -25,19 +20,19 @@ import java.util.List; @Api(tags = "库存信息") @RestController @RequestMapping("/apiadmin/inventory/wmsinventory") -public class WmsInventoryRest { +public class StorageInventoryRest { @Autowired - WmsInventoryService wmsInventoryService; + StorageInventoryService wmsInventoryService; @Autowired HttpServletResponse response; @ApiOperation("分页列表") @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq) { - ResultBean> rb = ResultBean.fireFail(); - PagerVo pv = wmsInventoryService.listPage(pq); + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = wmsInventoryService.listPage(pq); return rb.success().setData(pv); } diff --git a/src/main/java/com/yxt/storage/apiadmin/WmsOutBillRest.java b/src/main/java/com/yxt/storage/apiadmin/StorageOutBillRest.java similarity index 61% rename from src/main/java/com/yxt/storage/apiadmin/WmsOutBillRest.java rename to src/main/java/com/yxt/storage/apiadmin/StorageOutBillRest.java index e64178a..0ea32d0 100644 --- a/src/main/java/com/yxt/storage/apiadmin/WmsOutBillRest.java +++ b/src/main/java/com/yxt/storage/apiadmin/StorageOutBillRest.java @@ -3,7 +3,7 @@ package com.yxt.storage.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.storage.biz.wmsoutbill.*; +import com.yxt.storage.biz.storageoutbill.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -17,28 +17,28 @@ import org.springframework.web.bind.annotation.*; @Api(tags = "出库单据") @RestController @RequestMapping("/apiadmin/WmsOutBill") -public class WmsOutBillRest { +public class StorageOutBillRest { @Autowired - private WmsOutBillService wmsOutBillService; + private StorageOutBillService wmsOutBillService; @ApiOperation("分页列表") @PostMapping("/listPage") - ResultBean> pageList(@RequestBody PagerQuery pagerQuery) { - ResultBean> rb = ResultBean.fireFail(); - PagerVo pv = wmsOutBillService.listPage(pagerQuery); + ResultBean> pageList(@RequestBody PagerQuery pagerQuery) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = wmsOutBillService.listPage(pagerQuery); return rb.success().setData(pv); } @ApiOperation("出库保存修改") @PostMapping("/saveOrUpdateOutBill") - ResultBean saveOrUpdateOutBill(@RequestBody WmsOutBillDto dto) { + ResultBean saveOrUpdateOutBill(@RequestBody StorageOutBillDto dto) { return wmsOutBillService.saveOrUpdateOutBill(dto); } @ApiOperation("详情") @GetMapping("/details") - ResultBean details(@RequestParam("sid") String sid) { + ResultBean details(@RequestParam("sid") String sid) { return wmsOutBillService.details(sid); } } diff --git a/src/main/java/com/yxt/storage/apiadmin/WmsReceiptBillRest.java b/src/main/java/com/yxt/storage/apiadmin/StorageReceiptBillRest.java similarity index 64% rename from src/main/java/com/yxt/storage/apiadmin/WmsReceiptBillRest.java rename to src/main/java/com/yxt/storage/apiadmin/StorageReceiptBillRest.java index ea416f1..29f3c3a 100644 --- a/src/main/java/com/yxt/storage/apiadmin/WmsReceiptBillRest.java +++ b/src/main/java/com/yxt/storage/apiadmin/StorageReceiptBillRest.java @@ -3,7 +3,7 @@ package com.yxt.storage.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.storage.biz.wmsreceiptbill.*; +import com.yxt.storage.biz.storagereceiptbill.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -17,40 +17,40 @@ import org.springframework.web.bind.annotation.*; @Api(tags = "收货单据") @RestController @RequestMapping("/apiadmin/inventory/WmsReceiptBill") -public class WmsReceiptBillRest { +public class StorageReceiptBillRest { @Autowired - private WmsReceiptBillService wmsReceiptBillService; + private StorageReceiptBillService wmsReceiptBillService; @ApiOperation("分页列表") @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq) { - ResultBean> rb = ResultBean.fireFail(); - PagerVo pv = wmsReceiptBillService.listPage(pq); + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = wmsReceiptBillService.listPage(pq); return rb.success().setData(pv); } @ApiOperation("新增修改保存") @PostMapping("/saveOrUpdate") - ResultBean saveOrUpdate(@RequestBody WmsReceiptBillDto2 dto) { + ResultBean saveOrUpdate(@RequestBody StorageReceiptBillDto2 dto) { return wmsReceiptBillService.saveOrUpdateBill2(dto); } @ApiOperation("通知单收货单初始化") @GetMapping("/getInitDetails") - ResultBean getInitDetails(@RequestParam("sourceSid") String sourceSid) { + ResultBean getInitDetails(@RequestParam("sourceSid") String sourceSid) { return wmsReceiptBillService.getInitDetails(sourceSid); } @ApiOperation("收货单据编辑初始化/详情") @GetMapping("/getDetailsInit") - ResultBean getDetailsInit(@RequestParam("sid") String sid) { + ResultBean getDetailsInit(@RequestParam("sid") String sid) { return wmsReceiptBillService.getDetailsInit(sid); } @ApiOperation("确认") @PostMapping("/confirm") - ResultBean confirm(@RequestBody WmsReceiptBillDto2 dto) { + ResultBean confirm(@RequestBody StorageReceiptBillDto2 dto) { return wmsReceiptBillService.confirm(dto); } diff --git a/src/main/java/com/yxt/storage/apiadmin/WmsShelfBillRest.java b/src/main/java/com/yxt/storage/apiadmin/StorageShelfBillRest.java similarity index 75% rename from src/main/java/com/yxt/storage/apiadmin/WmsShelfBillRest.java rename to src/main/java/com/yxt/storage/apiadmin/StorageShelfBillRest.java index bdd2930..3adad7f 100644 --- a/src/main/java/com/yxt/storage/apiadmin/WmsShelfBillRest.java +++ b/src/main/java/com/yxt/storage/apiadmin/StorageShelfBillRest.java @@ -3,7 +3,7 @@ package com.yxt.storage.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.storage.biz.wmsshelfbill.*; +import com.yxt.storage.biz.storageshelfbill.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -17,22 +17,22 @@ import org.springframework.web.bind.annotation.*; @Api(tags = "上货架") @RestController @RequestMapping("/apiadmin/WmsShelfBill") -public class WmsShelfBillRest { +public class StorageShelfBillRest { @Autowired - private WmsShelfBillService wmsShelfBillService; + private StorageShelfBillService wmsShelfBillService; @ApiOperation("分页列表") @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq) { - ResultBean> rb = ResultBean.fireFail(); - PagerVo pv = wmsShelfBillService.listPage(pq); + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = wmsShelfBillService.listPage(pq); return rb.success().setData(pv); } @ApiOperation("新增修改保存") @PostMapping("/saveOrUpdate") - ResultBean saveOrUpdate(@RequestBody WmsShelfBillDto dto) { + ResultBean saveOrUpdate(@RequestBody StorageShelfBillDto dto) { return wmsShelfBillService.saveOrUpdateShelf(dto); } @@ -62,7 +62,7 @@ public class WmsShelfBillRest { @ApiOperation("确认") @PostMapping("/confirm") - ResultBean confirm(@RequestBody WmsShelfBillDto dto) { + ResultBean confirm(@RequestBody StorageShelfBillDto dto) { return wmsShelfBillService.confirm(dto); } diff --git a/src/main/java/com/yxt/storage/biz/wmsansbill/WmsAnsBill.java b/src/main/java/com/yxt/storage/biz/storageansbill/StorageAnsBill.java similarity index 94% rename from src/main/java/com/yxt/storage/biz/wmsansbill/WmsAnsBill.java rename to src/main/java/com/yxt/storage/biz/storageansbill/StorageAnsBill.java index 0d7b693..cbb6d60 100644 --- a/src/main/java/com/yxt/storage/biz/wmsansbill/WmsAnsBill.java +++ b/src/main/java/com/yxt/storage/biz/storageansbill/StorageAnsBill.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.wmsansbill; +package com.yxt.storage.biz.storageansbill; import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModelProperty; @@ -12,7 +12,7 @@ import java.util.Date; * @date: 2024/4/9 **/ @Data -public class WmsAnsBill extends BaseEntity { +public class StorageAnsBill extends BaseEntity { @ApiModelProperty("外部单号（业务单据编号）") private String sourceBillNo; diff --git a/src/main/java/com/yxt/storage/biz/wmsansbill/WmsAnsBillDto.java b/src/main/java/com/yxt/storage/biz/storageansbill/StorageAnsBillDto.java similarity index 85% rename from src/main/java/com/yxt/storage/biz/wmsansbill/WmsAnsBillDto.java rename to src/main/java/com/yxt/storage/biz/storageansbill/StorageAnsBillDto.java index 9f0156a..1b93405 100644 --- a/src/main/java/com/yxt/storage/biz/wmsansbill/WmsAnsBillDto.java +++ b/src/main/java/com/yxt/storage/biz/storageansbill/StorageAnsBillDto.java @@ -1,6 +1,6 @@ -package com.yxt.storage.biz.wmsansbill; +package com.yxt.storage.biz.storageansbill; -import com.yxt.storage.biz.wmsansbilldetail.WmsAnsBillDetailDto; +import com.yxt.storage.biz.storageansbilldetail.StorageAnsBillDetailDto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -13,8 +13,8 @@ import java.util.List; * @author: dimengzhe * @date: 2024/4/9 **/ -@Data -public class WmsAnsBillDto { +@Data +public class StorageAnsBillDto { private String sid; @@ -51,5 +51,5 @@ public class WmsAnsBillDto { @ApiModelProperty("创建组织sid") private String createOrgSid; - private List wmsAnsBillDetailList = new ArrayList<>(); + private List StorageAnsBillDetailList = new ArrayList<>(); } diff --git a/src/main/java/com/yxt/storage/biz/storageansbill/StorageAnsBillMapper.java b/src/main/java/com/yxt/storage/biz/storageansbill/StorageAnsBillMapper.java new file mode 100644 index 0000000..7a2b557 --- /dev/null +++ b/src/main/java/com/yxt/storage/biz/storageansbill/StorageAnsBillMapper.java @@ -0,0 +1,24 @@ +package com.yxt.storage.biz.storageansbill; + +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.storage.biz.storageansbilldetail.StorageAnsBillDetail; +import com.yxt.storage.biz.storageansbilldetail.StorageAnsBillDetailVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/9 + **/ +@Mapper +public interface StorageAnsBillMapper extends BaseMapper { + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage listPages(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + StorageAnsDetailsVo details(String sid); +} diff --git a/src/main/java/com/yxt/storage/biz/wmsansbill/WmsAnsBillQuery.java b/src/main/java/com/yxt/storage/biz/storageansbill/StorageAnsBillQuery.java similarity index 90% rename from src/main/java/com/yxt/storage/biz/wmsansbill/WmsAnsBillQuery.java rename to src/main/java/com/yxt/storage/biz/storageansbill/StorageAnsBillQuery.java index cb80ae6..f8a4f81 100644 --- a/src/main/java/com/yxt/storage/biz/wmsansbill/WmsAnsBillQuery.java +++ b/src/main/java/com/yxt/storage/biz/storageansbill/StorageAnsBillQuery.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.wmsansbill; +package com.yxt.storage.biz.storageansbill; import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModelProperty; @@ -10,7 +10,7 @@ import lombok.Data; * @date: 2024/4/11 **/ @Data -public class WmsAnsBillQuery implements Query { +public class StorageAnsBillQuery implements Query { @ApiModelProperty("单据编号") private String billNo; diff --git a/src/main/java/com/yxt/storage/biz/wmsansbill/WmsAnsBillService.java b/src/main/java/com/yxt/storage/biz/storageansbill/StorageAnsBillService.java similarity index 59% rename from src/main/java/com/yxt/storage/biz/wmsansbill/WmsAnsBillService.java rename to src/main/java/com/yxt/storage/biz/storageansbill/StorageAnsBillService.java index a902943..f3ee3ff 100644 --- a/src/main/java/com/yxt/storage/biz/wmsansbill/WmsAnsBillService.java +++ b/src/main/java/com/yxt/storage/biz/storageansbill/StorageAnsBillService.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.wmsansbill; +package com.yxt.storage.biz.storageansbill; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -9,7 +9,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.storage.biz.wmsansbilldetail.*; +import com.yxt.storage.biz.storageansbilldetail.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -22,49 +22,49 @@ import java.util.List; * @date: 2024/4/9 **/ @Service -public class WmsAnsBillService extends MybatisBaseService { +public class StorageAnsBillService extends MybatisBaseService { @Autowired - private WmsAnsBillDetailService wmsAnsBillDetailService; + private StorageAnsBillDetailService StorageAnsBillDetailService; - public ResultBean saveOrUpdateBill(WmsAnsBillDto dto) { + public ResultBean saveOrUpdateBill(StorageAnsBillDto dto) { ResultBean rb = ResultBean.fireFail(); String sid = dto.getSid(); if (StringUtils.isBlank(sid)) { - WmsAnsBill wmsAnsBill = new WmsAnsBill(); - BeanUtil.copyProperties(dto, wmsAnsBill, "sid"); - sid = wmsAnsBill.getSid(); - List wmsAnsBillDetailList = dto.getWmsAnsBillDetailList(); - wmsAnsBillDetailList.removeAll(Collections.singleton(null)); - if (!wmsAnsBillDetailList.isEmpty()) { - wmsAnsBillDetailService.saveOrUpdateDetailsList(sid, wmsAnsBillDetailList); + StorageAnsBill StorageAnsBill = new StorageAnsBill(); + BeanUtil.copyProperties(dto, StorageAnsBill, "sid"); + sid = StorageAnsBill.getSid(); + List StorageAnsBillDetailList = dto.getStorageAnsBillDetailList(); + StorageAnsBillDetailList.removeAll(Collections.singleton(null)); + if (!StorageAnsBillDetailList.isEmpty()) { + StorageAnsBillDetailService.saveOrUpdateDetailsList(sid, StorageAnsBillDetailList); } else { return rb.setMsg("单据明细不能为空"); } - baseMapper.insert(wmsAnsBill); + baseMapper.insert(StorageAnsBill); } else { - WmsAnsBill wmsAnsBill = fetchBySid(sid); - if (wmsAnsBill == null) { + StorageAnsBill StorageAnsBill = fetchBySid(sid); + if (StorageAnsBill == null) { return rb.setMsg("该单据不存在"); } - BeanUtil.copyProperties(dto, wmsAnsBill, "sid"); - List wmsAnsBillDetailList = dto.getWmsAnsBillDetailList(); - wmsAnsBillDetailList.removeAll(Collections.singleton(null)); - if (!wmsAnsBillDetailList.isEmpty()) { - wmsAnsBillDetailService.saveOrUpdateDetailsList(sid, wmsAnsBillDetailList); + BeanUtil.copyProperties(dto, StorageAnsBill, "sid"); + List StorageAnsBillDetailList = dto.getStorageAnsBillDetailList(); + StorageAnsBillDetailList.removeAll(Collections.singleton(null)); + if (!StorageAnsBillDetailList.isEmpty()) { + StorageAnsBillDetailService.saveOrUpdateDetailsList(sid, StorageAnsBillDetailList); } else { return rb.setMsg("单据明细不能为空"); } - baseMapper.updateById(wmsAnsBill); + baseMapper.updateById(StorageAnsBill); } return rb.success().setData(sid); } - public PagerVo listPages(PagerQuery pagerQuery) { - WmsAnsBillQuery query = pagerQuery.getParams(); - QueryWrapper qw = new QueryWrapper<>(); + public PagerVo listPages(PagerQuery pagerQuery) { + StorageAnsBillQuery query = pagerQuery.getParams(); + QueryWrapper qw = new QueryWrapper<>(); //ToDo:添加查询条件 if (query != null) { //单据编号 @@ -102,24 +102,24 @@ public class WmsAnsBillService extends MybatisBaseService page = PagerUtil.queryToPage(pagerQuery); - IPage pagging = baseMapper.listPages(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); + IPage page = PagerUtil.queryToPage(pagerQuery); + IPage pagging = baseMapper.listPages(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } - public ResultBean details(String sid) { - ResultBean rb = ResultBean.fireFail(); - WmsAnsDetailsVo wmsAnsDetailsVo = baseMapper.details(sid); - if (wmsAnsDetailsVo != null) { - List list = wmsAnsBillDetailService.selectByBillSid(sid); + public ResultBean details(String sid) { + ResultBean rb = ResultBean.fireFail(); + StorageAnsDetailsVo StorageAnsDetailsVo = baseMapper.details(sid); + if (StorageAnsDetailsVo != null) { + List list = StorageAnsBillDetailService.selectByBillSid(sid); list.removeAll(Collections.singleton(null)); if (!list.isEmpty()) { - wmsAnsDetailsVo.setList(list); + StorageAnsDetailsVo.setList(list); } } else { return rb.setMsg("该单据不存在"); } - return rb.success().setData(wmsAnsDetailsVo); + return rb.success().setData(StorageAnsDetailsVo); } } diff --git a/src/main/java/com/yxt/storage/biz/wmsansbill/WmsAnsBillVo.java b/src/main/java/com/yxt/storage/biz/storageansbill/StorageAnsBillVo.java similarity index 93% rename from src/main/java/com/yxt/storage/biz/wmsansbill/WmsAnsBillVo.java rename to src/main/java/com/yxt/storage/biz/storageansbill/StorageAnsBillVo.java index 01de9e7..f0ecd11 100644 --- a/src/main/java/com/yxt/storage/biz/wmsansbill/WmsAnsBillVo.java +++ b/src/main/java/com/yxt/storage/biz/storageansbill/StorageAnsBillVo.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.wmsansbill; +package com.yxt.storage.biz.storageansbill; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,7 +9,7 @@ import lombok.Data; * @date: 2024/4/11 **/ @Data -public class WmsAnsBillVo { +public class StorageAnsBillVo { private String sid; diff --git a/src/main/java/com/yxt/storage/biz/wmsansbill/WmsAnsDetailsVo.java b/src/main/java/com/yxt/storage/biz/storageansbill/StorageAnsDetailsVo.java similarity index 84% rename from src/main/java/com/yxt/storage/biz/wmsansbill/WmsAnsDetailsVo.java rename to src/main/java/com/yxt/storage/biz/storageansbill/StorageAnsDetailsVo.java index 1127b94..be3bcfb 100644 --- a/src/main/java/com/yxt/storage/biz/wmsansbill/WmsAnsDetailsVo.java +++ b/src/main/java/com/yxt/storage/biz/storageansbill/StorageAnsDetailsVo.java @@ -1,6 +1,6 @@ -package com.yxt.storage.biz.wmsansbill; +package com.yxt.storage.biz.storageansbill; -import com.yxt.storage.biz.wmsansbilldetail.WmsAnsListDetailsVo; +import com.yxt.storage.biz.storageansbilldetail.StorageAnsListDetailsVo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -13,7 +13,7 @@ import java.util.List; * @date: 2024/4/12 **/ @Data -public class WmsAnsDetailsVo { +public class StorageAnsDetailsVo { private String billNo; @ApiModelProperty("制单人姓名") private String createByName; @@ -40,5 +40,5 @@ public class WmsAnsDetailsVo { @ApiModelProperty("拒绝原因") private String refuseReason; - private List list = new ArrayList<>(); + private List list = new ArrayList<>(); } diff --git a/src/main/java/com/yxt/storage/biz/wmsansbilldetail/WmsAnsBillDetail.java b/src/main/java/com/yxt/storage/biz/storageansbilldetail/StorageAnsBillDetail.java similarity index 92% rename from src/main/java/com/yxt/storage/biz/wmsansbilldetail/WmsAnsBillDetail.java rename to src/main/java/com/yxt/storage/biz/storageansbilldetail/StorageAnsBillDetail.java index e0c76dc..022c094 100644 --- a/src/main/java/com/yxt/storage/biz/wmsansbilldetail/WmsAnsBillDetail.java +++ b/src/main/java/com/yxt/storage/biz/storageansbilldetail/StorageAnsBillDetail.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.wmsansbilldetail; +package com.yxt.storage.biz.storageansbilldetail; import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModelProperty; @@ -12,7 +12,7 @@ import java.math.BigDecimal; * @date: 2024/4/9 **/ @Data -public class WmsAnsBillDetail extends BaseEntity { +public class StorageAnsBillDetail extends BaseEntity { @ApiModelProperty("单据sid") private String billSid; diff --git a/src/main/java/com/yxt/storage/biz/wmsansbilldetail/WmsAnsBillDetailDto.java b/src/main/java/com/yxt/storage/biz/storageansbilldetail/StorageAnsBillDetailDto.java similarity index 91% rename from src/main/java/com/yxt/storage/biz/wmsansbilldetail/WmsAnsBillDetailDto.java rename to src/main/java/com/yxt/storage/biz/storageansbilldetail/StorageAnsBillDetailDto.java index 5e6117a..0e42e87 100644 --- a/src/main/java/com/yxt/storage/biz/wmsansbilldetail/WmsAnsBillDetailDto.java +++ b/src/main/java/com/yxt/storage/biz/storageansbilldetail/StorageAnsBillDetailDto.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.wmsansbilldetail; +package com.yxt.storage.biz.storageansbilldetail; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,7 +9,7 @@ import lombok.Data; * @date: 2024/4/9 **/ @Data -public class WmsAnsBillDetailDto { +public class StorageAnsBillDetailDto { @ApiModelProperty("商品基础信息sid") private String goodSpuSid; diff --git a/src/main/java/com/yxt/storage/biz/wmsansbilldetail/WmsAnsBillDetailMapper.java b/src/main/java/com/yxt/storage/biz/storageansbilldetail/StorageAnsBillDetailMapper.java similarity index 54% rename from src/main/java/com/yxt/storage/biz/wmsansbilldetail/WmsAnsBillDetailMapper.java rename to src/main/java/com/yxt/storage/biz/storageansbilldetail/StorageAnsBillDetailMapper.java index ef77939..7216ded 100644 --- a/src/main/java/com/yxt/storage/biz/wmsansbilldetail/WmsAnsBillDetailMapper.java +++ b/src/main/java/com/yxt/storage/biz/storageansbilldetail/StorageAnsBillDetailMapper.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.wmsansbilldetail; +package com.yxt.storage.biz.storageansbilldetail; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -11,8 +11,8 @@ import java.util.List; * @date: 2024/4/9 **/ @Mapper -public interface WmsAnsBillDetailMapper extends BaseMapper { +public interface StorageAnsBillDetailMapper extends BaseMapper { int deleteDetails(String sid); - List selectByBillSid(String sid); + List selectByBillSid(String sid); } diff --git a/src/main/java/com/yxt/storage/biz/wmsansbilldetail/WmsAnsBillDetailMapper.xml b/src/main/java/com/yxt/storage/biz/storageansbilldetail/StorageAnsBillDetailMapper.xml similarity index 75% rename from src/main/java/com/yxt/storage/biz/wmsansbilldetail/WmsAnsBillDetailMapper.xml rename to src/main/java/com/yxt/storage/biz/storageansbilldetail/StorageAnsBillDetailMapper.xml index b968cd9..57b8972 100644 --- a/src/main/java/com/yxt/storage/biz/wmsansbilldetail/WmsAnsBillDetailMapper.xml +++ b/src/main/java/com/yxt/storage/biz/storageansbilldetail/StorageAnsBillDetailMapper.xml @@ -1,13 +1,13 @@ - + delete - from wms_ans_bill_detail + from storage_ans_bill_detail where billSid = #{sid} - select wd.goodsSkuTitle, wd.goodsSkuCode, wd.goodsSkuOwnSpec, @@ -19,7 +19,7 @@ wd.taxAmount, wd.taxPrice, wd.amount - from wms_ans_bill_detail wd + from storage_ans_bill_detail wd where billSid = #{sid} \ No newline at end of file diff --git a/src/main/java/com/yxt/storage/biz/storageansbilldetail/StorageAnsBillDetailService.java b/src/main/java/com/yxt/storage/biz/storageansbilldetail/StorageAnsBillDetailService.java new file mode 100644 index 0000000..155c699 --- /dev/null +++ b/src/main/java/com/yxt/storage/biz/storageansbilldetail/StorageAnsBillDetailService.java @@ -0,0 +1,29 @@ +package com.yxt.storage.biz.storageansbilldetail; + +import cn.hutool.core.bean.BeanUtil; +import com.yxt.common.base.service.MybatisBaseService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/9 + **/ +@Service +public class StorageAnsBillDetailService extends MybatisBaseService { + public void saveOrUpdateDetailsList(String sid, List StorageAnsBillDetailList) { + baseMapper.deleteDetails(sid); + StorageAnsBillDetailList.forEach(v->{ + StorageAnsBillDetail StorageAnsBillDetail = new StorageAnsBillDetail(); + BeanUtil.copyProperties(v,StorageAnsBillDetail,"sid"); + StorageAnsBillDetail.setBillSid(sid); + baseMapper.insert(StorageAnsBillDetail); + }); + } + + public List selectByBillSid(String sid) { + return baseMapper.selectByBillSid(sid); + } +} diff --git a/src/main/java/com/yxt/storage/biz/wmsansbilldetail/WmsAnsBillDetailVo.java b/src/main/java/com/yxt/storage/biz/storageansbilldetail/StorageAnsBillDetailVo.java similarity index 89% rename from src/main/java/com/yxt/storage/biz/wmsansbilldetail/WmsAnsBillDetailVo.java rename to src/main/java/com/yxt/storage/biz/storageansbilldetail/StorageAnsBillDetailVo.java index dd6b6c3..d0c2659 100644 --- a/src/main/java/com/yxt/storage/biz/wmsansbilldetail/WmsAnsBillDetailVo.java +++ b/src/main/java/com/yxt/storage/biz/storageansbilldetail/StorageAnsBillDetailVo.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.wmsansbilldetail; +package com.yxt.storage.biz.storageansbilldetail; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,7 +9,7 @@ import lombok.Data; * @date: 2024/4/10 **/ @Data -public class WmsAnsBillDetailVo { +public class StorageAnsBillDetailVo { @ApiModelProperty("来源单sid") private String sourceBillSid; diff --git a/src/main/java/com/yxt/storage/biz/wmsansbilldetail/WmsAnsListDetailsVo.java b/src/main/java/com/yxt/storage/biz/storageansbilldetail/StorageAnsListDetailsVo.java similarity index 94% rename from src/main/java/com/yxt/storage/biz/wmsansbilldetail/WmsAnsListDetailsVo.java rename to src/main/java/com/yxt/storage/biz/storageansbilldetail/StorageAnsListDetailsVo.java index 3629fd3..5b6da0e 100644 --- a/src/main/java/com/yxt/storage/biz/wmsansbilldetail/WmsAnsListDetailsVo.java +++ b/src/main/java/com/yxt/storage/biz/storageansbilldetail/StorageAnsListDetailsVo.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.wmsansbilldetail; +package com.yxt.storage.biz.storageansbilldetail; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,7 +9,7 @@ import lombok.Data; * @date: 2024/4/11 **/ @Data -public class WmsAnsListDetailsVo { +public class StorageAnsListDetailsVo { @ApiModelProperty("商品名称") private String goodsSkuTitle; @ApiModelProperty("商品编码（图号）") diff --git a/src/main/java/com/yxt/storage/biz/wmsdistributebill/WmsDistributeBill.java b/src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBill.java similarity index 90% rename from src/main/java/com/yxt/storage/biz/wmsdistributebill/WmsDistributeBill.java rename to src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBill.java index e2e3184..8684ff1 100644 --- a/src/main/java/com/yxt/storage/biz/wmsdistributebill/WmsDistributeBill.java +++ b/src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBill.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.wmsdistributebill; +package com.yxt.storage.biz.storagedistributebill; import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModelProperty; @@ -12,7 +12,7 @@ import java.util.Date; * @date: 2024/4/24 **/ @Data -public class WmsDistributeBill extends BaseEntity { +public class StorageDistributeBill extends BaseEntity { @ApiModelProperty("出库单sid") private String sourceBillSid; diff --git a/src/main/java/com/yxt/storage/biz/wmsdistributebill/WmsDistributeBillDto.java b/src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillDto.java similarity index 75% rename from src/main/java/com/yxt/storage/biz/wmsdistributebill/WmsDistributeBillDto.java rename to src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillDto.java index 64dd3d8..a5001f0 100644 --- a/src/main/java/com/yxt/storage/biz/wmsdistributebill/WmsDistributeBillDto.java +++ b/src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillDto.java @@ -1,6 +1,6 @@ -package com.yxt.storage.biz.wmsdistributebill; +package com.yxt.storage.biz.storagedistributebill; -import com.yxt.wms.biz.inventory.wmsdistributebilldetail.WmsDistributeBillDetailDto; +import com.yxt.storage.biz.storagedistributebilldetail.StorageDistributeBillDetailDto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -13,7 +13,7 @@ import java.util.List; * @date: 2024/4/24 **/ @Data -public class WmsDistributeBillDto { +public class StorageDistributeBillDto { @ApiModelProperty("出库单sid") private String sourceBillSid; @@ -33,5 +33,5 @@ public class WmsDistributeBillDto { @ApiModelProperty("使用组织sid") private String useOrgSid; - private List detailList = new ArrayList<>(); + private List detailList = new ArrayList<>(); } diff --git a/src/main/java/com/yxt/storage/biz/wmsdistributebill/WmsDistributeBillInitVo.java b/src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillInitVo.java similarity index 71% rename from src/main/java/com/yxt/storage/biz/wmsdistributebill/WmsDistributeBillInitVo.java rename to src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillInitVo.java index 0018655..dde82ed 100644 --- a/src/main/java/com/yxt/storage/biz/wmsdistributebill/WmsDistributeBillInitVo.java +++ b/src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillInitVo.java @@ -1,6 +1,6 @@ -package com.yxt.storage.biz.wmsdistributebill; +package com.yxt.storage.biz.storagedistributebill; -import com.yxt.storage.biz.wmsdistributebilldetail.WmsDistributeBillDetailVo; +import com.yxt.storage.biz.storagedistributebilldetail.StorageDistributeBillDetailVo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -13,7 +13,7 @@ import java.util.List; * @date: 2024/4/24 **/ @Data -public class WmsDistributeBillInitVo { +public class StorageDistributeBillInitVo { //单据编号 private String billNo; @@ -37,6 +37,6 @@ public class WmsDistributeBillInitVo { //备注 private String remarks; - private List detailsList = new ArrayList<>(); + private List detailsList = new ArrayList<>(); } diff --git a/src/main/java/com/yxt/storage/biz/wmsdistributebill/WmsDistributeBillMapper.java b/src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillMapper.java similarity index 56% rename from src/main/java/com/yxt/storage/biz/wmsdistributebill/WmsDistributeBillMapper.java rename to src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillMapper.java index 5f3c79b..d4dcc5c 100644 --- a/src/main/java/com/yxt/storage/biz/wmsdistributebill/WmsDistributeBillMapper.java +++ b/src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillMapper.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.wmsdistributebill; +package com.yxt.storage.biz.storagedistributebill; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -9,5 +9,5 @@ import org.apache.ibatis.annotations.Mapper; * @date: 2024/4/24 **/ @Mapper -public interface WmsDistributeBillMapper extends BaseMapper { +public interface StorageDistributeBillMapper extends BaseMapper { } diff --git a/src/main/java/com/yxt/storage/biz/wmsdistributebill/WmsDistributeBillQuery.java b/src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillQuery.java similarity index 87% rename from src/main/java/com/yxt/storage/biz/wmsdistributebill/WmsDistributeBillQuery.java rename to src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillQuery.java index a4bf23c..d341af1 100644 --- a/src/main/java/com/yxt/storage/biz/wmsdistributebill/WmsDistributeBillQuery.java +++ b/src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillQuery.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.wmsdistributebill; +package com.yxt.storage.biz.storagedistributebill; import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModelProperty; @@ -10,7 +10,7 @@ import lombok.Data; * @date: 2024/4/24 **/ @Data -public class WmsDistributeBillQuery implements Query { +public class StorageDistributeBillQuery implements Query { //单据编号 @ApiModelProperty("单据编号") diff --git a/src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillService.java b/src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillService.java new file mode 100644 index 0000000..c002f37 --- /dev/null +++ b/src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillService.java @@ -0,0 +1,35 @@ +package com.yxt.storage.biz.storagedistributebill; + +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.stereotype.Service; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/24 + **/ +@Service +public class StorageDistributeBillService extends MybatisBaseService { + public PagerVo listPage(PagerQuery pagerQuery) { + return null; + } + + public ResultBean getInit(String sid) { + return null; + } + + public ResultBean details(String sid) { + return null; + } + + public ResultBean saveOrUpdateBill(StorageDistributeBillDto dto) { + return null; + } + + public ResultBean confirm(StorageDistributeBillDto dto) { + return null; + } +} diff --git a/src/main/java/com/yxt/storage/biz/wmsdistributebill/WmsDistributeBillVo.java b/src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillVo.java similarity index 89% rename from src/main/java/com/yxt/storage/biz/wmsdistributebill/WmsDistributeBillVo.java rename to src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillVo.java index e77579c..2ae32f4 100644 --- a/src/main/java/com/yxt/storage/biz/wmsdistributebill/WmsDistributeBillVo.java +++ b/src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillVo.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.wmsdistributebill; +package com.yxt.storage.biz.storagedistributebill; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,7 +9,7 @@ import lombok.Data; * @date: 2024/4/24 **/ @Data -public class WmsDistributeBillVo { +public class StorageDistributeBillVo { private String sid; @ApiModelProperty("单据日期") diff --git a/src/main/java/com/yxt/storage/biz/wmsdistributebilldetail/WmsDistributeBillDetail.java b/src/main/java/com/yxt/storage/biz/storagedistributebilldetail/StorageDistributeBillDetail.java similarity index 92% rename from src/main/java/com/yxt/storage/biz/wmsdistributebilldetail/WmsDistributeBillDetail.java rename to src/main/java/com/yxt/storage/biz/storagedistributebilldetail/StorageDistributeBillDetail.java index b7ab290..7d2c1cf 100644 --- a/src/main/java/com/yxt/storage/biz/wmsdistributebilldetail/WmsDistributeBillDetail.java +++ b/src/main/java/com/yxt/storage/biz/storagedistributebilldetail/StorageDistributeBillDetail.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.wmsdistributebilldetail; +package com.yxt.storage.biz.storagedistributebilldetail; import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModelProperty; @@ -12,7 +12,7 @@ import java.math.BigDecimal; * @date: 2024/4/24 **/ @Data -public class WmsDistributeBillDetail extends BaseEntity { +public class StorageDistributeBillDetail extends BaseEntity { @ApiModelProperty("出库单明细sid") private String outBillDetailSid; @ApiModelProperty("单据sid") diff --git a/src/main/java/com/yxt/storage/biz/wmsdistributebilldetail/WmsDistributeBillDetailVo.java b/src/main/java/com/yxt/storage/biz/storagedistributebilldetail/StorageDistributeBillDetailDto.java similarity index 91% rename from src/main/java/com/yxt/storage/biz/wmsdistributebilldetail/WmsDistributeBillDetailVo.java rename to src/main/java/com/yxt/storage/biz/storagedistributebilldetail/StorageDistributeBillDetailDto.java index dbf6bf9..659fa09 100644 --- a/src/main/java/com/yxt/storage/biz/wmsdistributebilldetail/WmsDistributeBillDetailVo.java +++ b/src/main/java/com/yxt/storage/biz/storagedistributebilldetail/StorageDistributeBillDetailDto.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.wmsdistributebilldetail; +package com.yxt.storage.biz.storagedistributebilldetail; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,7 +9,7 @@ import lombok.Data; * @date: 2024/4/24 **/ @Data -public class WmsDistributeBillDetailVo { +public class StorageDistributeBillDetailDto { @ApiModelProperty("出库单明细sid") private String outBillDetailSid; diff --git a/src/main/java/com/yxt/storage/biz/wmsdistributebilldetail/WmsDistributeBillDetailDto.java b/src/main/java/com/yxt/storage/biz/storagedistributebilldetail/StorageDistributeBillDetailVo.java similarity index 91% rename from src/main/java/com/yxt/storage/biz/wmsdistributebilldetail/WmsDistributeBillDetailDto.java rename to src/main/java/com/yxt/storage/biz/storagedistributebilldetail/StorageDistributeBillDetailVo.java index 226ecb1..b125888 100644 --- a/src/main/java/com/yxt/storage/biz/wmsdistributebilldetail/WmsDistributeBillDetailDto.java +++ b/src/main/java/com/yxt/storage/biz/storagedistributebilldetail/StorageDistributeBillDetailVo.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.wmsdistributebilldetail; +package com.yxt.storage.biz.storagedistributebilldetail; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,7 +9,7 @@ import lombok.Data; * @date: 2024/4/24 **/ @Data -public class WmsDistributeBillDetailDto { +public class StorageDistributeBillDetailVo { @ApiModelProperty("出库单明细sid") private String outBillDetailSid; diff --git a/src/main/java/com/yxt/storage/biz/wmsinventory/WmsInventory.java b/src/main/java/com/yxt/storage/biz/storageinventory/StorageInventory.java similarity index 94% rename from src/main/java/com/yxt/storage/biz/wmsinventory/WmsInventory.java rename to src/main/java/com/yxt/storage/biz/storageinventory/StorageInventory.java index f5b9657..8c18184 100644 --- a/src/main/java/com/yxt/storage/biz/wmsinventory/WmsInventory.java +++ b/src/main/java/com/yxt/storage/biz/storageinventory/StorageInventory.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.wmsinventory; +package com.yxt.storage.biz.storageinventory; import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModelProperty; @@ -12,7 +12,7 @@ import java.util.Date; * @date 2024/2/28 8:38 */ @Data -public class WmsInventory extends BaseEntity { +public class StorageInventory extends BaseEntity { @ApiModelProperty("批次号") private String batchNumber; diff --git a/src/main/java/com/yxt/storage/biz/wmsinventory/WmsInventoryMapper.java b/src/main/java/com/yxt/storage/biz/storageinventory/StorageInventoryMapper.java similarity index 60% rename from src/main/java/com/yxt/storage/biz/wmsinventory/WmsInventoryMapper.java rename to src/main/java/com/yxt/storage/biz/storageinventory/StorageInventoryMapper.java index 9916caa..5109e34 100644 --- a/src/main/java/com/yxt/storage/biz/wmsinventory/WmsInventoryMapper.java +++ b/src/main/java/com/yxt/storage/biz/storageinventory/StorageInventoryMapper.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.wmsinventory; +package com.yxt.storage.biz.storageinventory; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -7,15 +7,13 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import java.util.List; - /** * @author wangpengfei * @date 2024/2/26 13:40 */ @Mapper -public interface WmsInventoryMapper extends BaseMapper { +public interface StorageInventoryMapper extends BaseMapper { - IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); } diff --git a/src/main/java/com/yxt/storage/biz/wmsinventory/WmsInventoryMapper.xml b/src/main/java/com/yxt/storage/biz/storageinventory/StorageInventoryMapper.xml similarity index 79% rename from src/main/java/com/yxt/storage/biz/wmsinventory/WmsInventoryMapper.xml rename to src/main/java/com/yxt/storage/biz/storageinventory/StorageInventoryMapper.xml index 885ceae..c55663b 100644 --- a/src/main/java/com/yxt/storage/biz/wmsinventory/WmsInventoryMapper.xml +++ b/src/main/java/com/yxt/storage/biz/storageinventory/StorageInventoryMapper.xml @@ -1,10 +1,10 @@ - + - select a.goodsID, a.sid, a.goodsSpuName, diff --git a/src/main/java/com/yxt/storage/biz/wmsinventory/WmsInventoryQuery.java b/src/main/java/com/yxt/storage/biz/storageinventory/StorageInventoryQuery.java similarity index 85% rename from src/main/java/com/yxt/storage/biz/wmsinventory/WmsInventoryQuery.java rename to src/main/java/com/yxt/storage/biz/storageinventory/StorageInventoryQuery.java index bd9b45b..0b086e9 100644 --- a/src/main/java/com/yxt/storage/biz/wmsinventory/WmsInventoryQuery.java +++ b/src/main/java/com/yxt/storage/biz/storageinventory/StorageInventoryQuery.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.wmsinventory; +package com.yxt.storage.biz.storageinventory; 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 WmsInventoryQuery implements Query { +public class StorageInventoryQuery implements Query { @ApiModelProperty("goodsID") private String goodsID; diff --git a/src/main/java/com/yxt/storage/biz/wmsinventory/WmsInventorySaveDto.java b/src/main/java/com/yxt/storage/biz/storageinventory/StorageInventorySaveDto.java similarity index 95% rename from src/main/java/com/yxt/storage/biz/wmsinventory/WmsInventorySaveDto.java rename to src/main/java/com/yxt/storage/biz/storageinventory/StorageInventorySaveDto.java index 911de89..e877375 100644 --- a/src/main/java/com/yxt/storage/biz/wmsinventory/WmsInventorySaveDto.java +++ b/src/main/java/com/yxt/storage/biz/storageinventory/StorageInventorySaveDto.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.wmsinventory; +package com.yxt.storage.biz.storageinventory; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,7 +9,7 @@ import lombok.Data; * @date: 2024/4/19 **/ @Data -public class WmsInventorySaveDto { +public class StorageInventorySaveDto { private String sid; @ApiModelProperty("创建者sid") diff --git a/src/main/java/com/yxt/storage/biz/wmsinventory/WmsInventoryService.java b/src/main/java/com/yxt/storage/biz/storageinventory/StorageInventoryService.java similarity index 72% rename from src/main/java/com/yxt/storage/biz/wmsinventory/WmsInventoryService.java rename to src/main/java/com/yxt/storage/biz/storageinventory/StorageInventoryService.java index a8c401f..66ba108 100644 --- a/src/main/java/com/yxt/storage/biz/wmsinventory/WmsInventoryService.java +++ b/src/main/java/com/yxt/storage/biz/storageinventory/StorageInventoryService.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.wmsinventory; +package com.yxt.storage.biz.storageinventory; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,10 +19,10 @@ import java.util.List; * @date 2024/2/26 13:40 */ @Service -public class WmsInventoryService extends MybatisBaseService { - public PagerVo listPage(PagerQuery pq) { - WmsInventoryQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); +public class StorageInventoryService extends MybatisBaseService { + public PagerVo listPage(PagerQuery pq) { + StorageInventoryQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); if (StringUtils.isNotBlank(query.getGoodsID())) { qw.like("a.goodsID", query.getGoodsID()); } @@ -39,22 +39,22 @@ public class WmsInventoryService extends MybatisBaseService page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.listPage(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } - public ResultBean saveWmsInventory(WmsInventorySaveDto dto) { + public ResultBean saveWmsInventory(StorageInventorySaveDto dto) { ResultBean rb = ResultBean.fireFail(); String sid = dto.getSid(); if (StringUtils.isBlank(sid)) { - WmsInventory wmsInventory = new WmsInventory(); + StorageInventory wmsInventory = new StorageInventory(); BeanUtil.copyProperties(dto, wmsInventory, "sid"); sid = wmsInventory.getSid(); baseMapper.insert(wmsInventory); } else { - WmsInventory wmsInventory = fetchBySid(sid); + StorageInventory wmsInventory = fetchBySid(sid); if (wmsInventory == null) { return rb.setMsg("该商品库存不存在"); } diff --git a/src/main/java/com/yxt/storage/biz/wmsinventory/WmsInventoryVo.java b/src/main/java/com/yxt/storage/biz/storageinventory/StorageInventoryVo.java similarity index 92% rename from src/main/java/com/yxt/storage/biz/wmsinventory/WmsInventoryVo.java rename to src/main/java/com/yxt/storage/biz/storageinventory/StorageInventoryVo.java index 1946089..6a9ec87 100644 --- a/src/main/java/com/yxt/storage/biz/wmsinventory/WmsInventoryVo.java +++ b/src/main/java/com/yxt/storage/biz/storageinventory/StorageInventoryVo.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.wmsinventory; +package com.yxt.storage.biz.storageinventory; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; @@ -9,7 +9,7 @@ import lombok.Data; * @date 2024/2/26 13:37 */ @Data -public class WmsInventoryVo implements Vo { +public class StorageInventoryVo implements Vo { private String sid; @ApiModelProperty("商品ID") diff --git a/src/main/java/com/yxt/storage/biz/wmsinventoryrecord/WmsInventoryRecord.java b/src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecord.java similarity index 95% rename from src/main/java/com/yxt/storage/biz/wmsinventoryrecord/WmsInventoryRecord.java rename to src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecord.java index a886181..286f5d0 100644 --- a/src/main/java/com/yxt/storage/biz/wmsinventoryrecord/WmsInventoryRecord.java +++ b/src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecord.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.wmsinventoryrecord; +package com.yxt.storage.biz.storageinventoryrecord; import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModelProperty; @@ -12,7 +12,7 @@ import java.math.BigDecimal; * @date: 2024/4/24 **/ @Data -public class WmsInventoryRecord extends BaseEntity { +public class StorageInventoryRecord extends BaseEntity { @ApiModelProperty("库存sid") private String inventorySid; diff --git a/src/main/java/com/yxt/storage/biz/wmsinventoryrecord/WmsInventoryRecordDto.java b/src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordDto.java similarity index 95% rename from src/main/java/com/yxt/storage/biz/wmsinventoryrecord/WmsInventoryRecordDto.java rename to src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordDto.java index d874207..0f478a1 100644 --- a/src/main/java/com/yxt/storage/biz/wmsinventoryrecord/WmsInventoryRecordDto.java +++ b/src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordDto.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.wmsinventoryrecord; +package com.yxt.storage.biz.storageinventoryrecord; import com.yxt.common.core.dto.Dto; @@ -10,7 +10,7 @@ import java.math.BigDecimal; @Data @ApiModel(value = "库存出入库记录 数据传输对象", description = "库存出入库记录 数据传输对象") -public class WmsInventoryRecordDto implements Dto { +public class StorageInventoryRecordDto implements Dto { private String sid; @ApiModelProperty("库存sid") diff --git a/src/main/java/com/yxt/storage/biz/wmsinventoryrecord/WmsInventoryRecordListVo.java b/src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordListVo.java similarity index 88% rename from src/main/java/com/yxt/storage/biz/wmsinventoryrecord/WmsInventoryRecordListVo.java rename to src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordListVo.java index f86be59..c4f9b36 100644 --- a/src/main/java/com/yxt/storage/biz/wmsinventoryrecord/WmsInventoryRecordListVo.java +++ b/src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordListVo.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.wmsinventoryrecord; +package com.yxt.storage.biz.storageinventoryrecord; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,7 +9,7 @@ import lombok.Data; * @date: 2024/4/24 **/ @Data -public class WmsInventoryRecordListVo { +public class StorageInventoryRecordListVo { @ApiModelProperty("来源单编号") private String billNo; diff --git a/src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordMapper.java b/src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordMapper.java new file mode 100644 index 0000000..72faef5 --- /dev/null +++ b/src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordMapper.java @@ -0,0 +1,16 @@ +package com.yxt.storage.biz.storageinventoryrecord; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/24 + **/ +@Mapper +public interface StorageInventoryRecordMapper extends BaseMapper { + List getStorageInventoryRecordList(String sid); +} diff --git a/src/main/java/com/yxt/storage/biz/wmsinventoryrecord/WmsInventoryRecordMapper.xml b/src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordMapper.xml similarity index 67% rename from src/main/java/com/yxt/storage/biz/wmsinventoryrecord/WmsInventoryRecordMapper.xml rename to src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordMapper.xml index deafc23..c7f6fb1 100644 --- a/src/main/java/com/yxt/storage/biz/wmsinventoryrecord/WmsInventoryRecordMapper.xml +++ b/src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordMapper.xml @@ -1,7 +1,7 @@ - - select wir.billNo, case wir.billType when 1 then '入库' when 0 then '出库' end as billType, DATE_FORMAT(wir.createTime, '%Y-%m-%d') as createTime, @@ -9,7 +9,7 @@ wir.billObjName, wir.count, wir.currentCount - from wms_inventory_record wir + from storage_inventory_record wir where wir.inventorySid = #{sid} order by wir.createTime desc diff --git a/src/main/java/com/yxt/storage/biz/wmsinventoryrecord/WmsInventoryRecordService.java b/src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordService.java similarity index 52% rename from src/main/java/com/yxt/storage/biz/wmsinventoryrecord/WmsInventoryRecordService.java rename to src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordService.java index 015f8d8..a1c066c 100644 --- a/src/main/java/com/yxt/storage/biz/wmsinventoryrecord/WmsInventoryRecordService.java +++ b/src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordService.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.wmsinventoryrecord; +package com.yxt.storage.biz.storageinventoryrecord; import cn.hutool.core.bean.BeanUtil; import com.yxt.common.base.service.MybatisBaseService; @@ -17,15 +17,15 @@ import java.util.List; * @date: 2024/4/24 **/ @Service -public class WmsInventoryRecordService extends MybatisBaseService { - public ResultBean> getWmsInventoryRecordList(String sid) { - ResultBean> rb = ResultBean.fireFail(); - List list = baseMapper.getWmsInventoryRecordList(sid); +public class StorageInventoryRecordService extends MybatisBaseService { + public ResultBean> getStorageInventoryRecordList(String sid) { + ResultBean> rb = ResultBean.fireFail(); + List list = baseMapper.getStorageInventoryRecordList(sid); list.removeAll(Collections.singleton(null)); return rb.success().setData(list); } - public void saveOrUpdateDto(WmsInventoryRecordDto dto) { + public void saveOrUpdateDto(StorageInventoryRecordDto dto) { String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { this.insertByDto(dto); @@ -34,27 +34,27 @@ public class WmsInventoryRecordService extends MybatisBaseService listPage(PagerQuery pagerQuery) { + public PagerVo listPage(PagerQuery pagerQuery) { return null; } - public List listExcel(WmsInventoryRecordsQuery query) { + public List listExcel(StorageInventoryRecordsQuery query) { return null; } } diff --git a/src/main/java/com/yxt/storage/biz/wmsinventoryrecord/WmsInventoryRecordsExcelVo.java b/src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordsExcelVo.java similarity index 96% rename from src/main/java/com/yxt/storage/biz/wmsinventoryrecord/WmsInventoryRecordsExcelVo.java rename to src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordsExcelVo.java index db8623d..b946cc1 100644 --- a/src/main/java/com/yxt/storage/biz/wmsinventoryrecord/WmsInventoryRecordsExcelVo.java +++ b/src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordsExcelVo.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.wmsinventoryrecord; +package com.yxt.storage.biz.storageinventoryrecord; import com.yxt.common.core.utils.ExportEntityMap; import io.swagger.annotations.ApiModelProperty; @@ -10,7 +10,7 @@ import lombok.Data; * @date: 2024/4/24 **/ @Data -public class WmsInventoryRecordsExcelVo { +public class StorageInventoryRecordsExcelVo { @ExportEntityMap(CnName = "序号", EnName = "rankNo") diff --git a/src/main/java/com/yxt/storage/biz/wmsinventoryrecord/WmsInventoryRecordsQuery.java b/src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordsQuery.java similarity index 91% rename from src/main/java/com/yxt/storage/biz/wmsinventoryrecord/WmsInventoryRecordsQuery.java rename to src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordsQuery.java index 03a6e3e..991c3e1 100644 --- a/src/main/java/com/yxt/storage/biz/wmsinventoryrecord/WmsInventoryRecordsQuery.java +++ b/src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordsQuery.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.wmsinventoryrecord; +package com.yxt.storage.biz.storageinventoryrecord; import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModelProperty; @@ -10,7 +10,7 @@ import lombok.Data; * @date: 2024/4/24 **/ @Data -public class WmsInventoryRecordsQuery implements Query { +public class StorageInventoryRecordsQuery implements Query { @ApiModelProperty("商品ID") private String goodsID; diff --git a/src/main/java/com/yxt/storage/biz/wmsinventoryrecord/WmsInventoryRecordsVo.java b/src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordsVo.java similarity index 93% rename from src/main/java/com/yxt/storage/biz/wmsinventoryrecord/WmsInventoryRecordsVo.java rename to src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordsVo.java index f4526cc..227989f 100644 --- a/src/main/java/com/yxt/storage/biz/wmsinventoryrecord/WmsInventoryRecordsVo.java +++ b/src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordsVo.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.wmsinventoryrecord; +package com.yxt.storage.biz.storageinventoryrecord; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,7 +9,7 @@ import lombok.Data; * @date: 2024/4/24 **/ @Data -public class WmsInventoryRecordsVo { +public class StorageInventoryRecordsVo { @ApiModelProperty("商品ID") private String goodsID; diff --git a/src/main/java/com/yxt/storage/biz/wmsoutbill/WmsOutBill.java b/src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBill.java similarity index 93% rename from src/main/java/com/yxt/storage/biz/wmsoutbill/WmsOutBill.java rename to src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBill.java index 7ca008e..28a3d08 100644 --- a/src/main/java/com/yxt/storage/biz/wmsoutbill/WmsOutBill.java +++ b/src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBill.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.wmsoutbill; +package com.yxt.storage.biz.storageoutbill; import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModelProperty; @@ -12,7 +12,7 @@ import java.util.Date; * @date: 2024/4/24 **/ @Data -public class WmsOutBill extends BaseEntity { +public class StorageOutBill extends BaseEntity { @ApiModelProperty("单据编号") private String billNo; diff --git a/src/main/java/com/yxt/storage/biz/wmsoutbill/WmsOutBillDetailsVo.java b/src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBillDetailsVo.java similarity index 78% rename from src/main/java/com/yxt/storage/biz/wmsoutbill/WmsOutBillDetailsVo.java rename to src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBillDetailsVo.java index fefb4a2..81fbc93 100644 --- a/src/main/java/com/yxt/storage/biz/wmsoutbill/WmsOutBillDetailsVo.java +++ b/src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBillDetailsVo.java @@ -1,6 +1,6 @@ -package com.yxt.storage.biz.wmsoutbill; +package com.yxt.storage.biz.storageoutbill; -import com.yxt.wms.biz.inventory.wmsoutbilldetail.WmsOutBillDetailDto; +import com.yxt.storage.biz.storageoutbilldetail.StorageOutBillDetailDto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -13,7 +13,7 @@ import java.util.List; * @date: 2024/4/24 **/ @Data -public class WmsOutBillDetailsVo { +public class StorageOutBillDetailsVo { private String sid; @ApiModelProperty("创建人sid") @@ -35,5 +35,5 @@ public class WmsOutBillDetailsVo { @ApiModelProperty("备注") private String remarks; - private List detailsList = new ArrayList<>(); + private List detailsList = new ArrayList<>(); } diff --git a/src/main/java/com/yxt/storage/biz/wmsoutbill/WmsOutBillDto.java b/src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBillDto.java similarity index 78% rename from src/main/java/com/yxt/storage/biz/wmsoutbill/WmsOutBillDto.java rename to src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBillDto.java index 5589e19..b53e89d 100644 --- a/src/main/java/com/yxt/storage/biz/wmsoutbill/WmsOutBillDto.java +++ b/src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBillDto.java @@ -1,6 +1,6 @@ -package com.yxt.storage.biz.wmsoutbill; +package com.yxt.storage.biz.storageoutbill; -import com.yxt.wms.biz.inventory.wmsoutbilldetail.WmsOutBillDetailDto; +import com.yxt.storage.biz.storageoutbilldetail.StorageOutBillDetailDto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -13,7 +13,7 @@ import java.util.List; * @date: 2024/4/24 **/ @Data -public class WmsOutBillDto { +public class StorageOutBillDto { private String sid; @ApiModelProperty("创建人sid") @@ -35,7 +35,7 @@ public class WmsOutBillDto { @ApiModelProperty("备注") private String remarks; - private List detailsList = new ArrayList<>(); + private List detailsList = new ArrayList<>(); } diff --git a/src/main/java/com/yxt/storage/biz/wmsoutbill/WmsOutBillMapper.java b/src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBillMapper.java similarity index 60% rename from src/main/java/com/yxt/storage/biz/wmsoutbill/WmsOutBillMapper.java rename to src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBillMapper.java index 62015bd..31a21c8 100644 --- a/src/main/java/com/yxt/storage/biz/wmsoutbill/WmsOutBillMapper.java +++ b/src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBillMapper.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.wmsoutbill; +package com.yxt.storage.biz.storageoutbill; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -9,5 +9,5 @@ import org.apache.ibatis.annotations.Mapper; * @date: 2024/4/24 **/ @Mapper -public interface WmsOutBillMapper extends BaseMapper { +public interface StorageOutBillMapper extends BaseMapper { } diff --git a/src/main/java/com/yxt/storage/biz/wmsoutbill/WmsOutBillMapper.xml b/src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBillMapper.xml similarity index 63% rename from src/main/java/com/yxt/storage/biz/wmsoutbill/WmsOutBillMapper.xml rename to src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBillMapper.xml index e14a6cf..cdf61a6 100644 --- a/src/main/java/com/yxt/storage/biz/wmsoutbill/WmsOutBillMapper.xml +++ b/src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBillMapper.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/src/main/java/com/yxt/storage/biz/wmsoutbill/WmsOutBillQuery.java b/src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBillQuery.java similarity index 90% rename from src/main/java/com/yxt/storage/biz/wmsoutbill/WmsOutBillQuery.java rename to src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBillQuery.java index 0223ca1..bf184d3 100644 --- a/src/main/java/com/yxt/storage/biz/wmsoutbill/WmsOutBillQuery.java +++ b/src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBillQuery.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.wmsoutbill; +package com.yxt.storage.biz.storageoutbill; import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModelProperty; @@ -10,7 +10,7 @@ import lombok.Data; * @date: 2024/4/24 **/ @Data -public class WmsOutBillQuery implements Query { +public class StorageOutBillQuery implements Query { //单据编号 @ApiModelProperty("单据编号") diff --git a/src/main/java/com/yxt/storage/biz/wmsoutbill/WmsOutBillService.java b/src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBillService.java similarity index 51% rename from src/main/java/com/yxt/storage/biz/wmsoutbill/WmsOutBillService.java rename to src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBillService.java index c972e4a..bab3a1e 100644 --- a/src/main/java/com/yxt/storage/biz/wmsoutbill/WmsOutBillService.java +++ b/src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBillService.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.wmsoutbill; +package com.yxt.storage.biz.storageoutbill; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.core.query.PagerQuery; @@ -12,16 +12,16 @@ import org.springframework.stereotype.Service; * @date: 2024/4/24 **/ @Service -public class WmsOutBillService extends MybatisBaseService { - public PagerVo listPage(PagerQuery pagerQuery) { +public class StorageOutBillService extends MybatisBaseService { + public PagerVo listPage(PagerQuery pagerQuery) { return null; } - public ResultBean saveOrUpdateOutBill(WmsOutBillDto dto) { + public ResultBean saveOrUpdateOutBill(StorageOutBillDto dto) { return null; } - public ResultBean details(String sid) { + public ResultBean details(String sid) { return null; } } diff --git a/src/main/java/com/yxt/storage/biz/wmsoutbill/WmsOutBillVo.java b/src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBillVo.java similarity index 92% rename from src/main/java/com/yxt/storage/biz/wmsoutbill/WmsOutBillVo.java rename to src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBillVo.java index 244f2fc..8818d58 100644 --- a/src/main/java/com/yxt/storage/biz/wmsoutbill/WmsOutBillVo.java +++ b/src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBillVo.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.wmsoutbill; +package com.yxt.storage.biz.storageoutbill; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,7 +9,7 @@ import lombok.Data; * @date: 2024/4/24 **/ @Data -public class WmsOutBillVo { +public class StorageOutBillVo { private String sid; diff --git a/src/main/java/com/yxt/storage/biz/wmsoutbilldetail/WmsOutBillDetail.java b/src/main/java/com/yxt/storage/biz/storageoutbilldetail/StorageOutBillDetail.java similarity index 92% rename from src/main/java/com/yxt/storage/biz/wmsoutbilldetail/WmsOutBillDetail.java rename to src/main/java/com/yxt/storage/biz/storageoutbilldetail/StorageOutBillDetail.java index 0d7c062..0eff094 100644 --- a/src/main/java/com/yxt/storage/biz/wmsoutbilldetail/WmsOutBillDetail.java +++ b/src/main/java/com/yxt/storage/biz/storageoutbilldetail/StorageOutBillDetail.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.wmsoutbilldetail; +package com.yxt.storage.biz.storageoutbilldetail; import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModelProperty; @@ -13,7 +13,7 @@ import java.util.Date; * @date: 2024/4/24 **/ @Data -public class WmsOutBillDetail extends BaseEntity { +public class StorageOutBillDetail extends BaseEntity { @ApiModelProperty("单据sid") private String billSid; @ApiModelProperty("商品基础信息Sid") diff --git a/src/main/java/com/yxt/storage/biz/wmsoutbilldetail/WmsOutBillDetailDto.java b/src/main/java/com/yxt/storage/biz/storageoutbilldetail/StorageOutBillDetailDto.java similarity index 89% rename from src/main/java/com/yxt/storage/biz/wmsoutbilldetail/WmsOutBillDetailDto.java rename to src/main/java/com/yxt/storage/biz/storageoutbilldetail/StorageOutBillDetailDto.java index 1a3a91c..103394c 100644 --- a/src/main/java/com/yxt/storage/biz/wmsoutbilldetail/WmsOutBillDetailDto.java +++ b/src/main/java/com/yxt/storage/biz/storageoutbilldetail/StorageOutBillDetailDto.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.wmsoutbilldetail; +package com.yxt.storage.biz.storageoutbilldetail; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,7 +9,7 @@ import lombok.Data; * @date: 2024/4/24 **/ @Data -public class WmsOutBillDetailDto { +public class StorageOutBillDetailDto { @ApiModelProperty("商品基础信息Sid") private String goodSpuSid; diff --git a/src/main/java/com/yxt/storage/biz/wmsreceiptbill/WmsReceiptBill.java b/src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBill.java similarity index 92% rename from src/main/java/com/yxt/storage/biz/wmsreceiptbill/WmsReceiptBill.java rename to src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBill.java index d29f1a6..085c9bd 100644 --- a/src/main/java/com/yxt/storage/biz/wmsreceiptbill/WmsReceiptBill.java +++ b/src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBill.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.wmsreceiptbill; +package com.yxt.storage.biz.storagereceiptbill; import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModelProperty; @@ -12,7 +12,7 @@ import java.util.Date; * @date: 2024/4/3 **/ @Data -public class WmsReceiptBill extends BaseEntity { +public class StorageReceiptBill extends BaseEntity { @ApiModelProperty("来源单sid（asn单sid）") private String sourceBillSid; diff --git a/src/main/java/com/yxt/storage/biz/wmsreceiptbill/WmsReceiptBillDto2.java b/src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillDto2.java similarity index 78% rename from src/main/java/com/yxt/storage/biz/wmsreceiptbill/WmsReceiptBillDto2.java rename to src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillDto2.java index b0b748f..d0c53d9 100644 --- a/src/main/java/com/yxt/storage/biz/wmsreceiptbill/WmsReceiptBillDto2.java +++ b/src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillDto2.java @@ -1,7 +1,7 @@ -package com.yxt.storage.biz.wmsreceiptbill; +package com.yxt.storage.biz.storagereceiptbill; -import com.yxt.storage.biz.wmsreceiptbilldetail.WmsReceiptBillDetailDto2; -import com.yxt.storage.biz.wmsreceiptbilldetailbatch.WmsReceiptBillDetailBatchDto2; +import com.yxt.storage.biz.storagereceiptbilldetail.StorageReceiptBillDetailDto2; +import com.yxt.storage.biz.storagereceiptbilldetailbatch.StorageReceiptBillDetailBatchDto2; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -14,7 +14,7 @@ import java.util.List; * @date: 2024/4/15 **/ @Data -public class WmsReceiptBillDto2 { +public class StorageReceiptBillDto2 { private String sid; @ApiModelProperty("来源单sid（asn单sid）") @@ -47,7 +47,7 @@ public class WmsReceiptBillDto2 { @ApiModelProperty("创建组织sid") private String createOrgSid; @ApiModelProperty("商品列表") - private List list = new ArrayList<>(); + private List list = new ArrayList<>(); @ApiModelProperty("批次列表") - private List pcList = new ArrayList<>(); + private List pcList = new ArrayList<>(); } diff --git a/src/main/java/com/yxt/storage/biz/wmsreceiptbill/WmsReceiptBillInitVo.java b/src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillInitVo.java similarity index 78% rename from src/main/java/com/yxt/storage/biz/wmsreceiptbill/WmsReceiptBillInitVo.java rename to src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillInitVo.java index df11e16..b953f73 100644 --- a/src/main/java/com/yxt/storage/biz/wmsreceiptbill/WmsReceiptBillInitVo.java +++ b/src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillInitVo.java @@ -1,7 +1,7 @@ -package com.yxt.storage.biz.wmsreceiptbill; +package com.yxt.storage.biz.storagereceiptbill; -import com.yxt.storage.biz.wmsreceiptbilldetail.WmsReceiptBillDetailDto2; -import com.yxt.storage.biz.wmsreceiptbilldetailbatch.WmsReceiptBillDetailBatchDto2; +import com.yxt.storage.biz.storagereceiptbilldetail.StorageReceiptBillDetailDto2; +import com.yxt.storage.biz.storagereceiptbilldetailbatch.StorageReceiptBillDetailBatchDto2; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -14,7 +14,7 @@ import java.util.List; * @date: 2024/4/15 **/ @Data -public class WmsReceiptBillInitVo { +public class StorageReceiptBillInitVo { private String sid; @ApiModelProperty("单据编号") @@ -49,7 +49,7 @@ public class WmsReceiptBillInitVo { @ApiModelProperty("创建组织sid") private String createOrgSid; @ApiModelProperty("商品列表") - private List list = new ArrayList<>(); + private List list = new ArrayList<>(); @ApiModelProperty("批次列表") - private List pcList = new ArrayList<>(); + private List pcList = new ArrayList<>(); } diff --git a/src/main/java/com/yxt/storage/biz/wmsreceiptbill/WmsReceiptBillMapper.java b/src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillMapper.java similarity index 54% rename from src/main/java/com/yxt/storage/biz/wmsreceiptbill/WmsReceiptBillMapper.java rename to src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillMapper.java index 0ec561e..1390a6c 100644 --- a/src/main/java/com/yxt/storage/biz/wmsreceiptbill/WmsReceiptBillMapper.java +++ b/src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillMapper.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.wmsreceiptbill; +package com.yxt.storage.biz.storagereceiptbill; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -13,8 +13,8 @@ import org.apache.ibatis.annotations.Param; * @date: 2024/4/3 **/ @Mapper -public interface WmsReceiptBillMapper extends BaseMapper { - IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); +public interface StorageReceiptBillMapper extends BaseMapper { + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - WmsReceiptBillInitVo getDetailsInit(String sid); + StorageReceiptBillInitVo getDetailsInit(String sid); } diff --git a/src/main/java/com/yxt/storage/biz/wmsreceiptbill/WmsReceiptBillMapper.xml b/src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillMapper.xml similarity index 85% rename from src/main/java/com/yxt/storage/biz/wmsreceiptbill/WmsReceiptBillMapper.xml rename to src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillMapper.xml index f4f6cba..19fcf7e 100644 --- a/src/main/java/com/yxt/storage/biz/wmsreceiptbill/WmsReceiptBillMapper.xml +++ b/src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillMapper.xml @@ -1,7 +1,7 @@ - - select wrb.sid, wrb.billNo, wrb.createByName, @@ -18,7 +18,7 @@ order by wrb.id desc - select wrb.sid, wrb.billNo, wrb.sourceBillSid, diff --git a/src/main/java/com/yxt/storage/biz/wmsreceiptbill/WmsReceiptBillPageVo.java b/src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillPageVo.java similarity index 90% rename from src/main/java/com/yxt/storage/biz/wmsreceiptbill/WmsReceiptBillPageVo.java rename to src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillPageVo.java index 1ee10ad..12cb18e 100644 --- a/src/main/java/com/yxt/storage/biz/wmsreceiptbill/WmsReceiptBillPageVo.java +++ b/src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillPageVo.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.wmsreceiptbill; +package com.yxt.storage.biz.storagereceiptbill; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,7 +9,7 @@ import lombok.Data; * @date: 2024/4/12 **/ @Data -public class WmsReceiptBillPageVo { +public class StorageReceiptBillPageVo { private String sid; @ApiModelProperty("单据编号") diff --git a/src/main/java/com/yxt/storage/biz/wmsreceiptbill/WmsReceiptBillQuery.java b/src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillQuery.java similarity index 88% rename from src/main/java/com/yxt/storage/biz/wmsreceiptbill/WmsReceiptBillQuery.java rename to src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillQuery.java index db81612..bec90ca 100644 --- a/src/main/java/com/yxt/storage/biz/wmsreceiptbill/WmsReceiptBillQuery.java +++ b/src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillQuery.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.wmsreceiptbill; +package com.yxt.storage.biz.storagereceiptbill; import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModelProperty; @@ -10,7 +10,7 @@ import lombok.Data; * @date: 2024/4/3 **/ @Data -public class WmsReceiptBillQuery implements Query { +public class StorageReceiptBillQuery implements Query { @ApiModelProperty("单据编号") private String billNo; diff --git a/src/main/java/com/yxt/storage/biz/wmsreceiptbill/WmsReceiptBillService.java b/src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillService.java similarity index 58% rename from src/main/java/com/yxt/storage/biz/wmsreceiptbill/WmsReceiptBillService.java rename to src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillService.java index 19a8081..d6b8028 100644 --- a/src/main/java/com/yxt/storage/biz/wmsreceiptbill/WmsReceiptBillService.java +++ b/src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillService.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.wmsreceiptbill; +package com.yxt.storage.biz.storagereceiptbill; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; @@ -11,17 +11,17 @@ 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.storage.biz.wmsansbill.WmsAnsBill; -import com.yxt.storage.biz.wmsansbill.WmsAnsBillService; -import com.yxt.storage.biz.wmsansbilldetail.WmsAnsBillDetailService; -import com.yxt.storage.biz.wmsansbilldetail.WmsAnsListDetailsVo; -import com.yxt.storage.biz.wmsreceiptbilldetail.WmsReceiptBillDetailDto2; -import com.yxt.storage.biz.wmsreceiptbilldetail.WmsReceiptBillDetailMapper; -import com.yxt.storage.biz.wmsreceiptbilldetail.WmsReceiptBillDetailService; -import com.yxt.storage.biz.wmsreceiptbilldetail.WmsReceiptBillDetailVo; -import com.yxt.storage.biz.wmsreceiptbilldetailbatch.WmsReceiptBillDetailBatchDto2; -import com.yxt.storage.biz.wmsreceiptbilldetailbatch.WmsReceiptBillDetailBatchMapper; -import com.yxt.storage.biz.wmsreceiptbilldetailbatch.WmsReceiptBillDetailBatchService; +import com.yxt.storage.biz.storageansbill.StorageAnsBill; +import com.yxt.storage.biz.storageansbill.StorageAnsBillService; +import com.yxt.storage.biz.storageansbilldetail.StorageAnsBillDetailService; +import com.yxt.storage.biz.storageansbilldetail.StorageAnsListDetailsVo; +import com.yxt.storage.biz.storagereceiptbilldetail.StorageReceiptBillDetailDto2; +import com.yxt.storage.biz.storagereceiptbilldetail.StorageReceiptBillDetailMapper; +import com.yxt.storage.biz.storagereceiptbilldetail.StorageReceiptBillDetailService; +import com.yxt.storage.biz.storagereceiptbilldetail.StorageReceiptBillDetailVo; +import com.yxt.storage.biz.storagereceiptbilldetailbatch.StorageReceiptBillDetailBatchDto2; +import com.yxt.storage.biz.storagereceiptbilldetailbatch.StorageReceiptBillDetailBatchMapper; +import com.yxt.storage.biz.storagereceiptbilldetailbatch.StorageReceiptBillDetailBatchService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -34,24 +34,24 @@ import java.util.stream.Collectors; * @date: 2024/4/3 **/ @Service -public class WmsReceiptBillService extends MybatisBaseService { +public class StorageReceiptBillService extends MybatisBaseService { @Autowired - private WmsReceiptBillDetailService wmsReceiptBillDetailService; + private StorageReceiptBillDetailService wmsReceiptBillDetailService; @Autowired - private WmsAnsBillService wmsAnsBillService; + private StorageAnsBillService wmsAnsBillService; @Autowired - private WmsAnsBillDetailService wmsAnsBillDetailService; + private StorageAnsBillDetailService wmsAnsBillDetailService; @Autowired - private WmsReceiptBillDetailBatchService wmsReceiptBillDetailBatchService; + private StorageReceiptBillDetailBatchService wmsReceiptBillDetailBatchService; @Autowired - private WmsReceiptBillDetailMapper wmsReceiptBillDetailMapper; + private StorageReceiptBillDetailMapper wmsReceiptBillDetailMapper; @Autowired - private WmsReceiptBillDetailBatchMapper wmsReceiptBillDetailBatchMapper; + private StorageReceiptBillDetailBatchMapper wmsReceiptBillDetailBatchMapper; - public PagerVo listPage(PagerQuery pq) { - WmsReceiptBillQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); + public PagerVo listPage(PagerQuery pq) { + StorageReceiptBillQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); //ToDo:添加查询条件 if (StringUtils.isNotBlank(query.getBillNo())) { qw.like("wrb.billNo", query.getBillNo()); @@ -72,22 +72,22 @@ public class WmsReceiptBillService extends MybatisBaseService page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.listPage(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } - public ResultBean saveOrUpdateBill2(WmsReceiptBillDto2 dto) { + public ResultBean saveOrUpdateBill2(StorageReceiptBillDto2 dto) { ResultBean rb = ResultBean.fireFail(); String sid = dto.getSid(); if (StringUtils.isBlank(sid)) { - WmsReceiptBill wmsReceiptBill = new WmsReceiptBill(); + StorageReceiptBill wmsReceiptBill = new StorageReceiptBill(); sid = wmsReceiptBill.getSid(); BeanUtil.copyProperties(dto, wmsReceiptBill, "sid"); - List list = dto.getList(); + List list = dto.getList(); list.removeAll(Collections.singleton(null)); - List pcList = dto.getPcList(); + List pcList = dto.getPcList(); pcList.removeAll(Collections.singleton(null)); if (!list.isEmpty()) { wmsReceiptBillDetailService.saveOrUpdateDetailsList2(sid, list, pcList); @@ -95,14 +95,14 @@ public class WmsReceiptBillService extends MybatisBaseService list = dto.getList(); + List list = dto.getList(); list.removeAll(Collections.singleton(null)); - List pcList = dto.getPcList(); + List pcList = dto.getPcList(); pcList.removeAll(Collections.singleton(null)); if (!list.isEmpty()) { wmsReceiptBillDetailService.saveOrUpdateDetailsList2(sid, list, pcList); @@ -112,41 +112,41 @@ public class WmsReceiptBillService extends MybatisBaseService getInitDetails(String sourceSid) { - ResultBean rb = ResultBean.fireFail(); - WmsReceiptBillVo wmsReceiptBillVo = new WmsReceiptBillVo(); - WmsAnsBill wmsAnsBill = wmsAnsBillService.fetchBySid(sourceSid); + public ResultBean getInitDetails(String sourceSid) { + ResultBean rb = ResultBean.fireFail(); + StorageReceiptBillVo wmsReceiptBillVo = new StorageReceiptBillVo(); + StorageAnsBill wmsAnsBill = wmsAnsBillService.fetchBySid(sourceSid); BeanUtil.copyProperties(wmsAnsBill, wmsReceiptBillVo, "sid"); wmsReceiptBillVo.setSourceBillNo(wmsAnsBill.getBillNo()); wmsReceiptBillVo.setSourceBillSid(wmsAnsBill.getSid()); wmsReceiptBillVo.setCreateTime(DateUtil.today()); - List list = wmsAnsBillDetailService.selectByBillSid(sourceSid); + List list = wmsAnsBillDetailService.selectByBillSid(sourceSid); list.removeAll(Collections.singleton(null)); if (!list.isEmpty()) { - List lists = Optional.ofNullable(list).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), WmsReceiptBillDetailVo.class)).collect(Collectors.toList()); + List lists = Optional.ofNullable(list).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), StorageReceiptBillDetailVo.class)).collect(Collectors.toList()); wmsReceiptBillVo.setList(lists); } return rb.success().setData(wmsReceiptBillVo); } - public ResultBean getDetailsInit(String sid) { - ResultBean rb = ResultBean.fireFail(); - WmsReceiptBillInitVo wmsReceiptBillInitVo = baseMapper.getDetailsInit(sid); - List pcList = new ArrayList<>(); + public ResultBean getDetailsInit(String sid) { + ResultBean rb = ResultBean.fireFail(); + StorageReceiptBillInitVo wmsReceiptBillInitVo = baseMapper.getDetailsInit(sid); + List pcList = new ArrayList<>(); if (wmsReceiptBillInitVo != null) { - List list = wmsReceiptBillDetailService.getDetailsInit(sid); + List list = wmsReceiptBillDetailService.getDetailsInit(sid); list.removeAll(Collections.singleton(null)); if (!list.isEmpty()) { for (int i = 0; i < list.size(); i++) { - WmsReceiptBillDetailDto2 wmsReceiptBillDetailDto2 = list.get(i); + StorageReceiptBillDetailDto2 wmsReceiptBillDetailDto2 = list.get(i); int a = i + 1; wmsReceiptBillDetailDto2.setXh(String.valueOf(a)); - List pcList2 = wmsReceiptBillDetailBatchService.getDetailsInit(sid, wmsReceiptBillDetailDto2.getDetailsSid()); + List pcList2 = wmsReceiptBillDetailBatchService.getDetailsInit(sid, wmsReceiptBillDetailDto2.getDetailsSid()); pcList2.removeAll(Collections.singleton(null)); if (!pcList2.isEmpty()) { for (int j = 0; j < pcList2.size(); j++) { - WmsReceiptBillDetailBatchDto2 wmsReceiptBillDetailBatchDto2 = pcList2.get(j); + StorageReceiptBillDetailBatchDto2 wmsReceiptBillDetailBatchDto2 = pcList2.get(j); wmsReceiptBillDetailBatchDto2.setXh(String.valueOf(a)); } pcList.addAll(pcList2); @@ -161,14 +161,14 @@ public class WmsReceiptBillService extends MybatisBaseService confirm(WmsReceiptBillDto2 dto) { + public ResultBean confirm(StorageReceiptBillDto2 dto) { ResultBean rb = ResultBean.fireFail(); dto.setBillState("1"); - List list = dto.getList(); + List list = dto.getList(); list.removeAll(Collections.singleton(null)); if (!list.isEmpty()) { for (int i = 0; i < list.size(); i++) { - WmsReceiptBillDetailDto2 wmsReceiptBillDetailDto2 = list.get(i); + StorageReceiptBillDetailDto2 wmsReceiptBillDetailDto2 = list.get(i); wmsReceiptBillDetailDto2.setState(1); } } diff --git a/src/main/java/com/yxt/storage/biz/wmsreceiptbill/WmsReceiptBillVo.java b/src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillVo.java similarity index 86% rename from src/main/java/com/yxt/storage/biz/wmsreceiptbill/WmsReceiptBillVo.java rename to src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillVo.java index 04be3f2..8c2dd9d 100644 --- a/src/main/java/com/yxt/storage/biz/wmsreceiptbill/WmsReceiptBillVo.java +++ b/src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillVo.java @@ -1,6 +1,6 @@ -package com.yxt.storage.biz.wmsreceiptbill; +package com.yxt.storage.biz.storagereceiptbill; -import com.yxt.storage.biz.wmsreceiptbilldetail.WmsReceiptBillDetailVo; +import com.yxt.storage.biz.storagereceiptbilldetail.StorageReceiptBillDetailVo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -14,7 +14,7 @@ import java.util.List; * @date: 2024/4/3 **/ @Data -public class WmsReceiptBillVo { +public class StorageReceiptBillVo { @ApiModelProperty("单据编号") private String billNo; @ApiModelProperty("来源单sid（asn单sid）") @@ -47,5 +47,5 @@ public class WmsReceiptBillVo { @ApiModelProperty("创建组织sid") private String createOrgSid; - private List list = new ArrayList<>(); + private List list = new ArrayList<>(); } diff --git a/src/main/java/com/yxt/storage/biz/wmsreceiptbilldetail/WmsReceiptBillDetail.java b/src/main/java/com/yxt/storage/biz/storagereceiptbilldetail/StorageReceiptBillDetail.java similarity index 93% rename from src/main/java/com/yxt/storage/biz/wmsreceiptbilldetail/WmsReceiptBillDetail.java rename to src/main/java/com/yxt/storage/biz/storagereceiptbilldetail/StorageReceiptBillDetail.java index f94e7d8..6fdfa99 100644 --- a/src/main/java/com/yxt/storage/biz/wmsreceiptbilldetail/WmsReceiptBillDetail.java +++ b/src/main/java/com/yxt/storage/biz/storagereceiptbilldetail/StorageReceiptBillDetail.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.wmsreceiptbilldetail; +package com.yxt.storage.biz.storagereceiptbilldetail; import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModelProperty; @@ -13,7 +13,7 @@ import java.util.Date; * @date: 2024/4/3 **/ @Data -public class WmsReceiptBillDetail extends BaseEntity { +public class StorageReceiptBillDetail extends BaseEntity { @ApiModelProperty("单据sid") private String billSid; @ApiModelProperty("商品基础信息Sid") diff --git a/src/main/java/com/yxt/storage/biz/wmsreceiptbilldetail/WmsReceiptBillDetailDto2.java b/src/main/java/com/yxt/storage/biz/storagereceiptbilldetail/StorageReceiptBillDetailDto2.java similarity index 95% rename from src/main/java/com/yxt/storage/biz/wmsreceiptbilldetail/WmsReceiptBillDetailDto2.java rename to src/main/java/com/yxt/storage/biz/storagereceiptbilldetail/StorageReceiptBillDetailDto2.java index 1577ae8..8ceed3d 100644 --- a/src/main/java/com/yxt/storage/biz/wmsreceiptbilldetail/WmsReceiptBillDetailDto2.java +++ b/src/main/java/com/yxt/storage/biz/storagereceiptbilldetail/StorageReceiptBillDetailDto2.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.wmsreceiptbilldetail; +package com.yxt.storage.biz.storagereceiptbilldetail; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.ApiModelProperty; @@ -10,7 +10,7 @@ import lombok.Data; * @date: 2024/4/15 **/ @Data -public class WmsReceiptBillDetailDto2 { +public class StorageReceiptBillDetailDto2 { @ApiModelProperty("商品Skusid") private String goodsSkuSid; diff --git a/src/main/java/com/yxt/storage/biz/storagereceiptbilldetail/StorageReceiptBillDetailMapper.java b/src/main/java/com/yxt/storage/biz/storagereceiptbilldetail/StorageReceiptBillDetailMapper.java new file mode 100644 index 0000000..57b3f4c --- /dev/null +++ b/src/main/java/com/yxt/storage/biz/storagereceiptbilldetail/StorageReceiptBillDetailMapper.java @@ -0,0 +1,21 @@ +package com.yxt.storage.biz.storagereceiptbilldetail; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/3 + **/ +@Mapper +public interface StorageReceiptBillDetailMapper extends BaseMapper { + int deleteByBillSid(String sid); + + List getDetailsInit(String sid); + + List selectByBillSid(@Param("sid") String sid, @Param("sidList") List sidList); +} diff --git a/src/main/java/com/yxt/storage/biz/wmsreceiptbilldetail/WmsReceiptBillDetailMapper.xml b/src/main/java/com/yxt/storage/biz/storagereceiptbilldetail/StorageReceiptBillDetailMapper.xml similarity index 86% rename from src/main/java/com/yxt/storage/biz/wmsreceiptbilldetail/WmsReceiptBillDetailMapper.xml rename to src/main/java/com/yxt/storage/biz/storagereceiptbilldetail/StorageReceiptBillDetailMapper.xml index 82bddb5..79d48f0 100644 --- a/src/main/java/com/yxt/storage/biz/wmsreceiptbilldetail/WmsReceiptBillDetailMapper.xml +++ b/src/main/java/com/yxt/storage/biz/storagereceiptbilldetail/StorageReceiptBillDetailMapper.xml @@ -1,13 +1,13 @@ - + delete from wms_receipt_bill_detail where billSid = #{sid} - select wrbd.goodsSkuSid, wrbd.goodsSkuTitle, wrbd.goodsSkuCode, @@ -29,7 +29,7 @@ where billSid = #{sid} - select * from wms_receipt_bill_detail where billSid = #{sid} diff --git a/src/main/java/com/yxt/storage/biz/wmsreceiptbilldetail/WmsReceiptBillDetailService.java b/src/main/java/com/yxt/storage/biz/storagereceiptbilldetail/StorageReceiptBillDetailService.java similarity index 53% rename from src/main/java/com/yxt/storage/biz/wmsreceiptbilldetail/WmsReceiptBillDetailService.java rename to src/main/java/com/yxt/storage/biz/storagereceiptbilldetail/StorageReceiptBillDetailService.java index c77429b..d907454 100644 --- a/src/main/java/com/yxt/storage/biz/wmsreceiptbilldetail/WmsReceiptBillDetailService.java +++ b/src/main/java/com/yxt/storage/biz/storagereceiptbilldetail/StorageReceiptBillDetailService.java @@ -1,9 +1,9 @@ -package com.yxt.storage.biz.wmsreceiptbilldetail; +package com.yxt.storage.biz.storagereceiptbilldetail; import cn.hutool.core.bean.BeanUtil; import com.yxt.common.base.service.MybatisBaseService; -import com.yxt.storage.biz.wmsreceiptbilldetailbatch.WmsReceiptBillDetailBatchDto2; -import com.yxt.storage.biz.wmsreceiptbilldetailbatch.WmsReceiptBillDetailBatchService; +import com.yxt.storage.biz.storagereceiptbilldetailbatch.StorageReceiptBillDetailBatchDto2; +import com.yxt.storage.biz.storagereceiptbilldetailbatch.StorageReceiptBillDetailBatchService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -17,22 +17,22 @@ import java.util.stream.Collectors; * @date: 2024/4/3 **/ @Service -public class WmsReceiptBillDetailService extends MybatisBaseService { +public class StorageReceiptBillDetailService extends MybatisBaseService { @Autowired - private WmsReceiptBillDetailBatchService wmsReceiptBillDetailBatchService; + private StorageReceiptBillDetailBatchService wmsReceiptBillDetailBatchService; - public void saveOrUpdateDetailsList2(String sid, List list, List pcList) { + public void saveOrUpdateDetailsList2(String sid, List list, List pcList) { baseMapper.deleteByBillSid(sid); list.forEach(v -> { - WmsReceiptBillDetail wmsReceiptBillDetail = new WmsReceiptBillDetail(); + StorageReceiptBillDetail wmsReceiptBillDetail = new StorageReceiptBillDetail(); BeanUtil.copyProperties(v, wmsReceiptBillDetail, "sid"); wmsReceiptBillDetail.setBillSid(sid); baseMapper.insert(wmsReceiptBillDetail); wmsReceiptBillDetailBatchService.deleteByDetails(sid); pcList.removeAll(Collections.singleton(null)); if (!pcList.isEmpty()) { - List pcList2 = pcList.stream().filter(c -> c.getXh().equals(v.getXh())).collect(Collectors.toList()); + List pcList2 = pcList.stream().filter(c -> c.getXh().equals(v.getXh())).collect(Collectors.toList()); pcList2.removeAll(Collections.singleton(null)); if (!pcList2.isEmpty()) { wmsReceiptBillDetailBatchService.saveBatchs2(sid, wmsReceiptBillDetail.getSid(), pcList2); @@ -43,11 +43,11 @@ public class WmsReceiptBillDetailService extends MybatisBaseService getDetailsInit(String sid) { + public List getDetailsInit(String sid) { return baseMapper.getDetailsInit(sid); } - public List selectByBillSid(String sid, List sidList) { + public List selectByBillSid(String sid, List sidList) { return baseMapper.selectByBillSid(sid, sidList); } } diff --git a/src/main/java/com/yxt/storage/biz/wmsreceiptbilldetail/WmsReceiptBillDetailVo.java b/src/main/java/com/yxt/storage/biz/storagereceiptbilldetail/StorageReceiptBillDetailVo.java similarity index 94% rename from src/main/java/com/yxt/storage/biz/wmsreceiptbilldetail/WmsReceiptBillDetailVo.java rename to src/main/java/com/yxt/storage/biz/storagereceiptbilldetail/StorageReceiptBillDetailVo.java index 460cc18..b22aaf2 100644 --- a/src/main/java/com/yxt/storage/biz/wmsreceiptbilldetail/WmsReceiptBillDetailVo.java +++ b/src/main/java/com/yxt/storage/biz/storagereceiptbilldetail/StorageReceiptBillDetailVo.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.wmsreceiptbilldetail; +package com.yxt.storage.biz.storagereceiptbilldetail; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,7 +9,7 @@ import lombok.Data; * @date: 2024/4/12 **/ @Data -public class WmsReceiptBillDetailVo { +public class StorageReceiptBillDetailVo { @ApiModelProperty("商品Skusid") private String goodsSkuSid; diff --git a/src/main/java/com/yxt/storage/biz/wmsreceiptbilldetailbatch/WmsReceiptBillDetailBatch.java b/src/main/java/com/yxt/storage/biz/storagereceiptbilldetailbatch/StorageReceiptBillDetailBatch.java similarity index 86% rename from src/main/java/com/yxt/storage/biz/wmsreceiptbilldetailbatch/WmsReceiptBillDetailBatch.java rename to src/main/java/com/yxt/storage/biz/storagereceiptbilldetailbatch/StorageReceiptBillDetailBatch.java index dbdc4ef..28a40e1 100644 --- a/src/main/java/com/yxt/storage/biz/wmsreceiptbilldetailbatch/WmsReceiptBillDetailBatch.java +++ b/src/main/java/com/yxt/storage/biz/storagereceiptbilldetailbatch/StorageReceiptBillDetailBatch.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.wmsreceiptbilldetailbatch; +package com.yxt.storage.biz.storagereceiptbilldetailbatch; import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModelProperty; @@ -13,7 +13,7 @@ import java.util.Date; * @date: 2024/4/10 **/ @Data -public class WmsReceiptBillDetailBatch extends BaseEntity { +public class StorageReceiptBillDetailBatch extends BaseEntity { @ApiModelProperty("收货单sid") private String billSid; @ApiModelProperty("收货明细sid") diff --git a/src/main/java/com/yxt/storage/biz/wmsreceiptbilldetailbatch/WmsReceiptBillDetailBatchDto2.java b/src/main/java/com/yxt/storage/biz/storagereceiptbilldetailbatch/StorageReceiptBillDetailBatchDto2.java similarity index 91% rename from src/main/java/com/yxt/storage/biz/wmsreceiptbilldetailbatch/WmsReceiptBillDetailBatchDto2.java rename to src/main/java/com/yxt/storage/biz/storagereceiptbilldetailbatch/StorageReceiptBillDetailBatchDto2.java index a963c6d..d8d4aa3 100644 --- a/src/main/java/com/yxt/storage/biz/wmsreceiptbilldetailbatch/WmsReceiptBillDetailBatchDto2.java +++ b/src/main/java/com/yxt/storage/biz/storagereceiptbilldetailbatch/StorageReceiptBillDetailBatchDto2.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.wmsreceiptbilldetailbatch; +package com.yxt.storage.biz.storagereceiptbilldetailbatch; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,7 +9,7 @@ import lombok.Data; * @date: 2024/4/15 **/ @Data -public class WmsReceiptBillDetailBatchDto2 { +public class StorageReceiptBillDetailBatchDto2 { @ApiModelProperty("批次号（收货日期+有效日期，如240320-241009）") private String batchNumber; diff --git a/src/main/java/com/yxt/storage/biz/storagereceiptbilldetailbatch/StorageReceiptBillDetailBatchMapper.java b/src/main/java/com/yxt/storage/biz/storagereceiptbilldetailbatch/StorageReceiptBillDetailBatchMapper.java new file mode 100644 index 0000000..9c51284 --- /dev/null +++ b/src/main/java/com/yxt/storage/biz/storagereceiptbilldetailbatch/StorageReceiptBillDetailBatchMapper.java @@ -0,0 +1,21 @@ +package com.yxt.storage.biz.storagereceiptbilldetailbatch; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/12 + **/ +@Mapper +public interface StorageReceiptBillDetailBatchMapper extends BaseMapper { + int deleteByDetails(String sid); + + List getDetailsInit(@Param("sid") String sid, @Param("detailsSid") String detailsSid); + + StorageReceiptBillDetailBatch selectByDetails(String sid); +} diff --git a/src/main/java/com/yxt/storage/biz/wmsreceiptbilldetailbatch/WmsReceiptBillDetailBatchMapper.xml b/src/main/java/com/yxt/storage/biz/storagereceiptbilldetailbatch/StorageReceiptBillDetailBatchMapper.xml similarity index 71% rename from src/main/java/com/yxt/storage/biz/wmsreceiptbilldetailbatch/WmsReceiptBillDetailBatchMapper.xml rename to src/main/java/com/yxt/storage/biz/storagereceiptbilldetailbatch/StorageReceiptBillDetailBatchMapper.xml index 3883bb0..73e1056 100644 --- a/src/main/java/com/yxt/storage/biz/wmsreceiptbilldetailbatch/WmsReceiptBillDetailBatchMapper.xml +++ b/src/main/java/com/yxt/storage/biz/storagereceiptbilldetailbatch/StorageReceiptBillDetailBatchMapper.xml @@ -1,6 +1,6 @@ - + delete from wms_receipt_bill_detail_batch @@ -8,7 +8,7 @@ + + - select wsb.sid, wsb.billNo, wsb.createBySid, diff --git a/src/main/java/com/yxt/storage/biz/wmsshelfbill/WmsShelfBillQuery.java b/src/main/java/com/yxt/storage/biz/storageshelfbill/StorageShelfBillQuery.java similarity index 83% rename from src/main/java/com/yxt/storage/biz/wmsshelfbill/WmsShelfBillQuery.java rename to src/main/java/com/yxt/storage/biz/storageshelfbill/StorageShelfBillQuery.java index 1a18fe1..9169646 100644 --- a/src/main/java/com/yxt/storage/biz/wmsshelfbill/WmsShelfBillQuery.java +++ b/src/main/java/com/yxt/storage/biz/storageshelfbill/StorageShelfBillQuery.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.wmsshelfbill; +package com.yxt.storage.biz.storageshelfbill; import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModelProperty; @@ -10,7 +10,7 @@ import lombok.Data; * @date: 2024/4/15 **/ @Data -public class WmsShelfBillQuery implements Query { +public class StorageShelfBillQuery implements Query { @ApiModelProperty("单据编号") private String billNo; diff --git a/src/main/java/com/yxt/storage/biz/wmsshelfbill/WmsShelfBillService.java b/src/main/java/com/yxt/storage/biz/storageshelfbill/StorageShelfBillService.java similarity index 74% rename from src/main/java/com/yxt/storage/biz/wmsshelfbill/WmsShelfBillService.java rename to src/main/java/com/yxt/storage/biz/storageshelfbill/StorageShelfBillService.java index 3ab7248..563f297 100644 --- a/src/main/java/com/yxt/storage/biz/wmsshelfbill/WmsShelfBillService.java +++ b/src/main/java/com/yxt/storage/biz/storageshelfbill/StorageShelfBillService.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.wmsshelfbill; +package com.yxt.storage.biz.storageshelfbill; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; @@ -10,17 +10,17 @@ 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.storage.biz.wmsinventory.WmsInventorySaveDto; -import com.yxt.storage.biz.wmsinventory.WmsInventoryService; -import com.yxt.storage.biz.wmsinventoryrecord.WmsInventoryRecordDto; -import com.yxt.storage.biz.wmsinventoryrecord.WmsInventoryRecordService; -import com.yxt.storage.biz.wmsreceiptbill.WmsReceiptBill; -import com.yxt.storage.biz.wmsreceiptbill.WmsReceiptBillService; -import com.yxt.storage.biz.wmsreceiptbilldetail.WmsReceiptBillDetail; -import com.yxt.storage.biz.wmsreceiptbilldetail.WmsReceiptBillDetailService; -import com.yxt.storage.biz.wmsreceiptbilldetailbatch.WmsReceiptBillDetailBatch; -import com.yxt.storage.biz.wmsreceiptbilldetailbatch.WmsReceiptBillDetailBatchService; -import com.yxt.storage.biz.wmsshelfbilldetail.*; +import com.yxt.storage.biz.storageinventory.StorageInventorySaveDto; +import com.yxt.storage.biz.storageinventory.StorageInventoryService; +import com.yxt.storage.biz.storageinventoryrecord.StorageInventoryRecordDto; +import com.yxt.storage.biz.storageinventoryrecord.StorageInventoryRecordService; +import com.yxt.storage.biz.storagereceiptbill.StorageReceiptBill; +import com.yxt.storage.biz.storagereceiptbill.StorageReceiptBillService; +import com.yxt.storage.biz.storagereceiptbilldetail.StorageReceiptBillDetail; +import com.yxt.storage.biz.storagereceiptbilldetail.StorageReceiptBillDetailService; +import com.yxt.storage.biz.storagereceiptbilldetailbatch.StorageReceiptBillDetailBatch; +import com.yxt.storage.biz.storagereceiptbilldetailbatch.StorageReceiptBillDetailBatchService; +import com.yxt.storage.biz.storageshelfbilldetail.*; import com.yxt.storage.feign.goods.basegoodssku.BaseGoodsSkuDetailsVo; import com.yxt.storage.feign.goods.basegoodssku.BaseGoodsSkuFeign; import com.yxt.storage.utils.Rule; @@ -40,29 +40,29 @@ import java.util.List; * @date: 2024/4/11 **/ @Service -public class WmsShelfBillService extends MybatisBaseService { +public class StorageShelfBillService extends MybatisBaseService { @Autowired - private WmsShelfBillDetailService wmsShelfBillDetailService; + private StorageShelfBillDetailService wmsShelfBillDetailService; @Autowired - private WmsShelfBillDetailMapper wmsShelfBillDetailMapper; + private StorageShelfBillDetailMapper wmsShelfBillDetailMapper; @Autowired - private WmsInventoryService wmsInventoryService; + private StorageInventoryService wmsInventoryService; @Resource private BaseGoodsSkuFeign baseGoodsSkuFeign; @Autowired - private WmsInventoryRecordService wmsInventoryRecordService; + private StorageInventoryRecordService wmsInventoryRecordService; @Autowired - private WmsReceiptBillService wmsReceiptBillService; + private StorageReceiptBillService wmsReceiptBillService; @Autowired - private WmsReceiptBillDetailService wmsReceiptBillDetailService; + private StorageReceiptBillDetailService wmsReceiptBillDetailService; @Autowired - private WmsReceiptBillDetailBatchService wmsReceiptBillDetailBatchService; + private StorageReceiptBillDetailBatchService wmsReceiptBillDetailBatchService; - public PagerVo listPage(PagerQuery pq) { - WmsShelfBillQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); + public PagerVo listPage(PagerQuery pq) { + StorageShelfBillQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); //ToDo:添加查询条件 if (StringUtils.isNotBlank(query.getBillNo())) { qw.like("wsb.billNo", query.getBillNo()); @@ -75,19 +75,19 @@ public class WmsShelfBillService extends MybatisBaseService page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.listPage(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } - public ResultBean saveOrUpdateShelf(WmsShelfBillDto dto) { + public ResultBean saveOrUpdateShelf(StorageShelfBillDto dto) { ResultBean rb = ResultBean.fireFail(); String sid = dto.getSid(); if (StringUtils.isBlank(sid)) { - WmsShelfBill wmsShelfBill = new WmsShelfBill(); + StorageShelfBill wmsShelfBill = new StorageShelfBill(); BeanUtil.copyProperties(dto, wmsShelfBill, "sid"); - List list = dto.getList(); + List list = dto.getList(); list.removeAll(Collections.singleton(null)); sid = wmsShelfBill.getSid(); if (!list.isEmpty()) { @@ -95,12 +95,12 @@ public class WmsShelfBillService extends MybatisBaseService list = dto.getList(); + List list = dto.getList(); list.removeAll(Collections.singleton(null)); sid = wmsShelfBill.getSid(); if (!list.isEmpty()) { @@ -116,13 +116,13 @@ public class WmsShelfBillService extends MybatisBaseService detailList = wmsShelfBillDetailService.selectByBillSid(sid); + StorageShelfBill wmsShelfBill = fetchBySid(sid); + List detailList = wmsShelfBillDetailService.selectByBillSid(sid); detailList.removeAll(Collections.singleton(null)); if (!detailList.isEmpty()) { for (int i = 0; i < detailList.size(); i++) { - WmsShelfBillDetailVos s = detailList.get(i); - WmsInventorySaveDto dto = new WmsInventorySaveDto(); + StorageShelfBillDetailVos s = detailList.get(i); + StorageInventorySaveDto dto = new StorageInventorySaveDto(); dto.setCreateBySid(wmsShelfBill.getCreateBySid()); dto.setBatchNumber(s.getBatchNumber()); dto.setGoodsID(getGoodsId(s.getGoodsSkuSid())); @@ -143,10 +143,10 @@ public class WmsShelfBillService extends MybatisBaseService stringList = wmsShelfBillDetailService.selectReceiptSidList(); stringList.removeAll(Collections.singleton(null)); //获取收货单据 - WmsReceiptBill wmsReceiptBill = wmsReceiptBillService.fetchBySid(sid); + StorageReceiptBill wmsReceiptBill = wmsReceiptBillService.fetchBySid(sid); shelfInitVo.setCreateTime(DateUtil.today());//单据日期 shelfInitVo.setSourceBillNo(wmsReceiptBill.getBillNo());//来源单编号 shelfInitVo.setSourceBillSid(wmsReceiptBill.getSid());//来源单sid shelfInitVo.setBillState(0); List list = new ArrayList<>(); //获取收货单据的明细 - List wmsReceiptBillDetailsList = wmsReceiptBillDetailService.selectByBillSid(sid, stringList); + List wmsReceiptBillDetailsList = wmsReceiptBillDetailService.selectByBillSid(sid, stringList); wmsReceiptBillDetailsList.removeAll(Collections.singleton(null)); if (!wmsReceiptBillDetailsList.isEmpty()) { for (int i = 0; i < wmsReceiptBillDetailsList.size(); i++) { - WmsReceiptBillDetail v = wmsReceiptBillDetailsList.get(i); - WmsReceiptBillDetailBatch wmsReceiptBillDetailBatch = wmsReceiptBillDetailBatchService.selectByDetails(v.getSid()); + StorageReceiptBillDetail v = wmsReceiptBillDetailsList.get(i); + StorageReceiptBillDetailBatch wmsReceiptBillDetailBatch = wmsReceiptBillDetailBatchService.selectByDetails(v.getSid()); ShelfInitListVo shelfInitListVo = new ShelfInitListVo(); BeanUtil.copyProperties(v, shelfInitListVo, "sid"); shelfInitListVo.setBatchNumber(wmsReceiptBillDetailBatch.getBatchNumber()); @@ -251,7 +251,7 @@ public class WmsShelfBillService extends MybatisBaseService confirm(WmsShelfBillDto dto) { + public ResultBean confirm(StorageShelfBillDto dto) { ResultBean rb = ResultBean.fireFail(); dto.setBillState(1); ResultBean resultBean = saveOrUpdateShelf(dto); diff --git a/src/main/java/com/yxt/storage/biz/wmsshelfbill/WmsShelfBillVo.java b/src/main/java/com/yxt/storage/biz/storageshelfbill/StorageShelfBillVo.java similarity index 87% rename from src/main/java/com/yxt/storage/biz/wmsshelfbill/WmsShelfBillVo.java rename to src/main/java/com/yxt/storage/biz/storageshelfbill/StorageShelfBillVo.java index e0121e7..8399ce5 100644 --- a/src/main/java/com/yxt/storage/biz/wmsshelfbill/WmsShelfBillVo.java +++ b/src/main/java/com/yxt/storage/biz/storageshelfbill/StorageShelfBillVo.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.wmsshelfbill; +package com.yxt.storage.biz.storageshelfbill; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,7 +9,7 @@ import lombok.Data; * @date: 2024/4/15 **/ @Data -public class WmsShelfBillVo { +public class StorageShelfBillVo { private String sid; @ApiModelProperty("单据编号") diff --git a/src/main/java/com/yxt/storage/biz/wmsshelfbilldetail/ShelfDetailsListVo.java b/src/main/java/com/yxt/storage/biz/storageshelfbilldetail/ShelfDetailsListVo.java similarity index 96% rename from src/main/java/com/yxt/storage/biz/wmsshelfbilldetail/ShelfDetailsListVo.java rename to src/main/java/com/yxt/storage/biz/storageshelfbilldetail/ShelfDetailsListVo.java index b0cccc2..ddd9c92 100644 --- a/src/main/java/com/yxt/storage/biz/wmsshelfbilldetail/ShelfDetailsListVo.java +++ b/src/main/java/com/yxt/storage/biz/storageshelfbilldetail/ShelfDetailsListVo.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.wmsshelfbilldetail; +package com.yxt.storage.biz.storageshelfbilldetail; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/yxt/storage/biz/wmsshelfbilldetail/ShelfInitListVo.java b/src/main/java/com/yxt/storage/biz/storageshelfbilldetail/ShelfInitListVo.java similarity index 95% rename from src/main/java/com/yxt/storage/biz/wmsshelfbilldetail/ShelfInitListVo.java rename to src/main/java/com/yxt/storage/biz/storageshelfbilldetail/ShelfInitListVo.java index 088f8f0..a87ad59 100644 --- a/src/main/java/com/yxt/storage/biz/wmsshelfbilldetail/ShelfInitListVo.java +++ b/src/main/java/com/yxt/storage/biz/storageshelfbilldetail/ShelfInitListVo.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.wmsshelfbilldetail; +package com.yxt.storage.biz.storageshelfbilldetail; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/src/main/java/com/yxt/storage/biz/wmsshelfbilldetail/WmsShelfBillDetail.java b/src/main/java/com/yxt/storage/biz/storageshelfbilldetail/StorageShelfBillDetail.java similarity index 87% rename from src/main/java/com/yxt/storage/biz/wmsshelfbilldetail/WmsShelfBillDetail.java rename to src/main/java/com/yxt/storage/biz/storageshelfbilldetail/StorageShelfBillDetail.java index 41be309..49834d7 100644 --- a/src/main/java/com/yxt/storage/biz/wmsshelfbilldetail/WmsShelfBillDetail.java +++ b/src/main/java/com/yxt/storage/biz/storageshelfbilldetail/StorageShelfBillDetail.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.wmsshelfbilldetail; +package com.yxt.storage.biz.storageshelfbilldetail; import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModelProperty; @@ -12,7 +12,7 @@ import java.math.BigDecimal; * @date: 2024/4/10 **/ @Data -public class WmsShelfBillDetail extends BaseEntity { +public class StorageShelfBillDetail extends BaseEntity { @ApiModelProperty("单据sid") private String billSid; @ApiModelProperty("收货单明细sid") diff --git a/src/main/java/com/yxt/storage/biz/wmsshelfbilldetail/WmsShelfBillDetailDto.java b/src/main/java/com/yxt/storage/biz/storageshelfbilldetail/StorageShelfBillDetailDto.java similarity index 93% rename from src/main/java/com/yxt/storage/biz/wmsshelfbilldetail/WmsShelfBillDetailDto.java rename to src/main/java/com/yxt/storage/biz/storageshelfbilldetail/StorageShelfBillDetailDto.java index 4d35f22..3ee5528 100644 --- a/src/main/java/com/yxt/storage/biz/wmsshelfbilldetail/WmsShelfBillDetailDto.java +++ b/src/main/java/com/yxt/storage/biz/storageshelfbilldetail/StorageShelfBillDetailDto.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.wmsshelfbilldetail; +package com.yxt.storage.biz.storageshelfbilldetail; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,7 +9,7 @@ import lombok.Data; * @date: 2024/4/15 **/ @Data -public class WmsShelfBillDetailDto { +public class StorageShelfBillDetailDto { @ApiModelProperty("收货单明细sid") private String receiptDetailSid; diff --git a/src/main/java/com/yxt/storage/biz/wmsshelfbilldetail/WmsShelfBillDetailMapper.java b/src/main/java/com/yxt/storage/biz/storageshelfbilldetail/StorageShelfBillDetailMapper.java similarity index 61% rename from src/main/java/com/yxt/storage/biz/wmsshelfbilldetail/WmsShelfBillDetailMapper.java rename to src/main/java/com/yxt/storage/biz/storageshelfbilldetail/StorageShelfBillDetailMapper.java index 864a810..2f6f16b 100644 --- a/src/main/java/com/yxt/storage/biz/wmsshelfbilldetail/WmsShelfBillDetailMapper.java +++ b/src/main/java/com/yxt/storage/biz/storageshelfbilldetail/StorageShelfBillDetailMapper.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.wmsshelfbilldetail; +package com.yxt.storage.biz.storageshelfbilldetail; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -11,12 +11,12 @@ import java.util.List; * @date: 2024/4/17 **/ @Mapper -public interface WmsShelfBillDetailMapper extends BaseMapper { +public interface StorageShelfBillDetailMapper extends BaseMapper { int deleteByMainSid(String sid); List details(String sid); - List selectByBillSid(String sid); + List selectByBillSid(String sid); List selectReceiptSidList(); } diff --git a/src/main/java/com/yxt/storage/biz/wmsshelfbilldetail/WmsShelfBillDetailMapper.xml b/src/main/java/com/yxt/storage/biz/storageshelfbilldetail/StorageShelfBillDetailMapper.xml similarity index 85% rename from src/main/java/com/yxt/storage/biz/wmsshelfbilldetail/WmsShelfBillDetailMapper.xml rename to src/main/java/com/yxt/storage/biz/storageshelfbilldetail/StorageShelfBillDetailMapper.xml index 23a4ed0..f7878a5 100644 --- a/src/main/java/com/yxt/storage/biz/wmsshelfbilldetail/WmsShelfBillDetailMapper.xml +++ b/src/main/java/com/yxt/storage/biz/storageshelfbilldetail/StorageShelfBillDetailMapper.xml @@ -1,13 +1,13 @@ - + delete from wms_shelf_bill_detail where billSid = #{sid} - select wsd.batchNumber, wsd.inventorySid, wsd.warehouseSid, @@ -18,7 +18,7 @@ where billSid = #{sid} - select wrbd.goodSpuSid, wrbd.goodsSpuName, wrbd.goodsSkuSid, diff --git a/src/main/java/com/yxt/storage/biz/wmsshelfbilldetail/WmsShelfBillDetailService.java b/src/main/java/com/yxt/storage/biz/storageshelfbilldetail/StorageShelfBillDetailService.java similarity index 64% rename from src/main/java/com/yxt/storage/biz/wmsshelfbilldetail/WmsShelfBillDetailService.java rename to src/main/java/com/yxt/storage/biz/storageshelfbilldetail/StorageShelfBillDetailService.java index 28d66fa..e507eb8 100644 --- a/src/main/java/com/yxt/storage/biz/wmsshelfbilldetail/WmsShelfBillDetailService.java +++ b/src/main/java/com/yxt/storage/biz/storageshelfbilldetail/StorageShelfBillDetailService.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.wmsshelfbilldetail; +package com.yxt.storage.biz.storageshelfbilldetail; import cn.hutool.core.bean.BeanUtil; import com.yxt.common.base.service.MybatisBaseService; @@ -12,11 +12,11 @@ import java.util.List; * @date: 2024/4/17 **/ @Service -public class WmsShelfBillDetailService extends MybatisBaseService { - public void saveShelfDetails(String sid, List list) { +public class StorageShelfBillDetailService extends MybatisBaseService { + public void saveShelfDetails(String sid, List list) { baseMapper.deleteByMainSid(sid); list.forEach(v -> { - WmsShelfBillDetail wmsShelfBillDetail = new WmsShelfBillDetail(); + StorageShelfBillDetail wmsShelfBillDetail = new StorageShelfBillDetail(); BeanUtil.copyProperties(v, wmsShelfBillDetail, "sid"); wmsShelfBillDetail.setBillSid(sid); baseMapper.insert(wmsShelfBillDetail); @@ -27,7 +27,7 @@ public class WmsShelfBillDetailService extends MybatisBaseService selectByBillSid(String sid) { + public List selectByBillSid(String sid) { return baseMapper.selectByBillSid(sid); } diff --git a/src/main/java/com/yxt/storage/biz/wmsshelfbilldetail/WmsShelfBillDetailVos.java b/src/main/java/com/yxt/storage/biz/storageshelfbilldetail/StorageShelfBillDetailVos.java similarity index 92% rename from src/main/java/com/yxt/storage/biz/wmsshelfbilldetail/WmsShelfBillDetailVos.java rename to src/main/java/com/yxt/storage/biz/storageshelfbilldetail/StorageShelfBillDetailVos.java index b3feca6..614e11e 100644 --- a/src/main/java/com/yxt/storage/biz/wmsshelfbilldetail/WmsShelfBillDetailVos.java +++ b/src/main/java/com/yxt/storage/biz/storageshelfbilldetail/StorageShelfBillDetailVos.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.wmsshelfbilldetail; +package com.yxt.storage.biz.storageshelfbilldetail; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,7 +9,7 @@ import lombok.Data; * @date: 2024/4/19 **/ @Data -public class WmsShelfBillDetailVos { +public class StorageShelfBillDetailVos { private String detailsSid; diff --git a/src/main/java/com/yxt/storage/biz/wmsansbill/WmsAnsBillMapper.java b/src/main/java/com/yxt/storage/biz/wmsansbill/WmsAnsBillMapper.java deleted file mode 100644 index 7b9faa8..0000000 --- a/src/main/java/com/yxt/storage/biz/wmsansbill/WmsAnsBillMapper.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.yxt.storage.biz.wmsansbill; - -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.wms.biz.inventory.wmsansbilldetail.WmsAnsBillDetail; -import com.yxt.wms.biz.inventory.wmsansbilldetail.WmsAnsBillDetailVo; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -/** - * @description: - * @author: dimengzhe - * @date: 2024/4/9 - **/ -@Mapper -public interface WmsAnsBillMapper extends BaseMapper { - IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - - IPage listPages(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - - WmsAnsDetailsVo details(String sid); -} diff --git a/src/main/java/com/yxt/storage/biz/wmsansbilldetail/WmsAnsBillDetailService.java b/src/main/java/com/yxt/storage/biz/wmsansbilldetail/WmsAnsBillDetailService.java deleted file mode 100644 index c5f2f60..0000000 --- a/src/main/java/com/yxt/storage/biz/wmsansbilldetail/WmsAnsBillDetailService.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.yxt.storage.biz.wmsansbilldetail; - -import cn.hutool.core.bean.BeanUtil; -import com.yxt.common.base.service.MybatisBaseService; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @description: - * @author: dimengzhe - * @date: 2024/4/9 - **/ -@Service -public class WmsAnsBillDetailService extends MybatisBaseService { - public void saveOrUpdateDetailsList(String sid, List wmsAnsBillDetailList) { - baseMapper.deleteDetails(sid); - wmsAnsBillDetailList.forEach(v->{ - WmsAnsBillDetail wmsAnsBillDetail = new WmsAnsBillDetail(); - BeanUtil.copyProperties(v,wmsAnsBillDetail,"sid"); - wmsAnsBillDetail.setBillSid(sid); - baseMapper.insert(wmsAnsBillDetail); - }); - } - - public List selectByBillSid(String sid) { - return baseMapper.selectByBillSid(sid); - } -} diff --git a/src/main/java/com/yxt/storage/biz/wmsdistributebill/WmsDistributeBillService.java b/src/main/java/com/yxt/storage/biz/wmsdistributebill/WmsDistributeBillService.java deleted file mode 100644 index 0c5e32f..0000000 --- a/src/main/java/com/yxt/storage/biz/wmsdistributebill/WmsDistributeBillService.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.yxt.storage.biz.wmsdistributebill; - -import com.yxt.common.base.service.MybatisBaseService; -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; -import org.springframework.stereotype.Service; - -/** - * @description: - * @author: dimengzhe - * @date: 2024/4/24 - **/ -@Service -public class WmsDistributeBillService extends MybatisBaseService { - public PagerVo listPage(PagerQuery pagerQuery) { - return null; - } - - public ResultBean getInit(String sid) { - return null; - } - - public ResultBean details(String sid) { - return null; - } - - public ResultBean saveOrUpdateBill(WmsDistributeBillDto dto) { - return null; - } - - public ResultBean confirm(WmsDistributeBillDto dto) { - return null; - } -} diff --git a/src/main/java/com/yxt/storage/biz/wmsinventoryrecord/WmsInventoryRecordMapper.java b/src/main/java/com/yxt/storage/biz/wmsinventoryrecord/WmsInventoryRecordMapper.java deleted file mode 100644 index fc826ff..0000000 --- a/src/main/java/com/yxt/storage/biz/wmsinventoryrecord/WmsInventoryRecordMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.yxt.storage.biz.wmsinventoryrecord; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * @description: - * @author: dimengzhe - * @date: 2024/4/24 - **/ -@Mapper -public interface WmsInventoryRecordMapper extends BaseMapper { - List getWmsInventoryRecordList(String sid); -} diff --git a/src/main/java/com/yxt/storage/biz/wmsreceiptbilldetail/WmsReceiptBillDetailMapper.java b/src/main/java/com/yxt/storage/biz/wmsreceiptbilldetail/WmsReceiptBillDetailMapper.java deleted file mode 100644 index e3ac316..0000000 --- a/src/main/java/com/yxt/storage/biz/wmsreceiptbilldetail/WmsReceiptBillDetailMapper.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.yxt.storage.biz.wmsreceiptbilldetail; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @description: - * @author: dimengzhe - * @date: 2024/4/3 - **/ -@Mapper -public interface WmsReceiptBillDetailMapper extends BaseMapper { - int deleteByBillSid(String sid); - - List getDetailsInit(String sid); - - List selectByBillSid(@Param("sid") String sid, @Param("sidList") List sidList); -} diff --git a/src/main/java/com/yxt/storage/biz/wmsreceiptbilldetailbatch/WmsReceiptBillDetailBatchMapper.java b/src/main/java/com/yxt/storage/biz/wmsreceiptbilldetailbatch/WmsReceiptBillDetailBatchMapper.java deleted file mode 100644 index dfeb0c3..0000000 --- a/src/main/java/com/yxt/storage/biz/wmsreceiptbilldetailbatch/WmsReceiptBillDetailBatchMapper.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.yxt.storage.biz.wmsreceiptbilldetailbatch; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @description: - * @author: dimengzhe - * @date: 2024/4/12 - **/ -@Mapper -public interface WmsReceiptBillDetailBatchMapper extends BaseMapper { - int deleteByDetails(String sid); - - List getDetailsInit(@Param("sid") String sid, @Param("detailsSid") String detailsSid); - - WmsReceiptBillDetailBatch selectByDetails(String sid); -} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index c61da92..24fc81c 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,8 +1,8 @@ spring: application: - name: yxt-wms + name: ss-storage profiles: - active: devv + active: dev messages: # 国际化资源文件路径 basename: i18n/messages diff --git a/target/classes/application-dev.yml b/target/classes/application-dev.yml new file mode 100644 index 0000000..1ff4c2a --- /dev/null +++ b/target/classes/application-dev.yml @@ -0,0 +1,30 @@ +spring: + datasource: + hikari: + max-lifetime: 500000 + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://39.104.100.138:3306/yxt_wms?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true + username: root + password: yxt_mysql_138 + cloud: + nacos: + discovery: + server-addr: 127.0.0.1:8848 + redis: + database: 3 # Redis数据库索引（默认为0） + host: 127.0.0.1 + jedis: + pool: + max-active: -1 #连接池最大连接数（使用负值表示没有限制） + max-idle: 8 #连接池中的最大空闲连接 + max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制） + min-idle: 0 # 连接池中的最小空闲连接 + password: 123456 + port: 6379 + timeout: 0 # 连接超时时间（毫秒） + +image: + upload: + path: D:/works/projects/yxt/yxtgit/lipinka/yxt-yythmall-biz/target/classes/static/upload/ + url: + prefix: http://192.168.2.111:7211/upload/ \ No newline at end of file diff --git a/target/classes/application-pro.yml b/target/classes/application-pro.yml new file mode 100644 index 0000000..e69de29 diff --git a/target/classes/application-test.yml b/target/classes/application-test.yml new file mode 100644 index 0000000..e69de29 diff --git a/target/classes/application.yml b/target/classes/application.yml new file mode 100644 index 0000000..24fc81c --- /dev/null +++ b/target/classes/application.yml @@ -0,0 +1,43 @@ +spring: + application: + name: ss-storage + profiles: + active: dev + messages: + # 国际化资源文件路径 + basename: i18n/messages + servlet: + #上传文件 + multipart: + max-file-size: 50MB + max-request-size: 100MB + devtools: + restart: + # 热部署开关 + enabled: true + +server: + port: 7301 + max-http-header-size: 102400 + undertow: + max-http-post-size: -1 + +#mybatis +mybatis-plus: + # 配置mapper的扫描，找到所有的mapper.xml映射文件 + mapper-locations: classpath*:**Mapper.xml + global-config: + refresh: true + db-config: + #定义生成ID的类型 + id-type: Auto + db-type: mysql + configuration: + map-underscore-to-camel-case: false + cache-enabled: true + call-setters-on-nulls: true + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + + + + diff --git a/src/main/java/com/yxt/storage/biz/wmsansbill/WmsAnsBillMapper.xml b/target/classes/com/yxt/storage/biz/storageansbill/StorageAnsBillMapper.xml similarity index 73% rename from src/main/java/com/yxt/storage/biz/wmsansbill/WmsAnsBillMapper.xml rename to target/classes/com/yxt/storage/biz/storageansbill/StorageAnsBillMapper.xml index 851085a..07f352c 100644 --- a/src/main/java/com/yxt/storage/biz/wmsansbill/WmsAnsBillMapper.xml +++ b/target/classes/com/yxt/storage/biz/storageansbill/StorageAnsBillMapper.xml @@ -1,15 +1,15 @@ - - select wd.goodsSkuSid, wd.goodsSpuName, wd.goodsSkuCode, wd.goodsSkuTitle, wd.goodSpuSid - from wms_ans_bill_detail wd + from storage_ans_bill_detail wd ${ew.sqlSegment} - select wab.sid, wab.billNo, DATE_FORMAT(wab.createTime, '%Y-%m-%d') as createTime, @@ -23,14 +23,14 @@ wab.billState, wab.reviewStatus, wab.refuseReason - from wms_ans_bill wab + from storage_ans_bill wab ${ew.sqlSegment} order by wab.id desc - select wab.billNo, wab.createByName, DATE_FORMAT(wab.createTime, '%Y-%m-%d') as createTime, @@ -42,7 +42,7 @@ DATE_FORMAT(wab.deliveryDate, '%Y-%m-%d') as deliveryDate, wab.billState, wab.reviewStatus - from wms_ans_bill wab + from storage_ans_bill wab where sid = #{sid} \ No newline at end of file diff --git a/target/classes/com/yxt/storage/biz/storageansbilldetail/StorageAnsBillDetailMapper.xml b/target/classes/com/yxt/storage/biz/storageansbilldetail/StorageAnsBillDetailMapper.xml new file mode 100644 index 0000000..57b8972 --- /dev/null +++ b/target/classes/com/yxt/storage/biz/storageansbilldetail/StorageAnsBillDetailMapper.xml @@ -0,0 +1,25 @@ + + + + + delete + from storage_ans_bill_detail + where billSid = #{sid} + + + + \ No newline at end of file diff --git a/target/classes/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillMapper.xml b/target/classes/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillMapper.xml new file mode 100644 index 0000000..28afae0 --- /dev/null +++ b/target/classes/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillMapper.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/target/classes/com/yxt/storage/biz/storageinventory/StorageInventoryMapper.xml b/target/classes/com/yxt/storage/biz/storageinventory/StorageInventoryMapper.xml new file mode 100644 index 0000000..c55663b --- /dev/null +++ b/target/classes/com/yxt/storage/biz/storageinventory/StorageInventoryMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + \ No newline at end of file diff --git a/target/classes/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordMapper.xml b/target/classes/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordMapper.xml new file mode 100644 index 0000000..c7f6fb1 --- /dev/null +++ b/target/classes/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordMapper.xml @@ -0,0 +1,16 @@ + + + + + \ No newline at end of file diff --git a/src/main/java/com/yxt/storage/biz/wmsdistributebill/WmsDistributeBillMapper.xml b/target/classes/com/yxt/storage/biz/storageoutbill/StorageOutBillMapper.xml similarity index 60% rename from src/main/java/com/yxt/storage/biz/wmsdistributebill/WmsDistributeBillMapper.xml rename to target/classes/com/yxt/storage/biz/storageoutbill/StorageOutBillMapper.xml index a58327a..cdf61a6 100644 --- a/src/main/java/com/yxt/storage/biz/wmsdistributebill/WmsDistributeBillMapper.xml +++ b/target/classes/com/yxt/storage/biz/storageoutbill/StorageOutBillMapper.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/target/classes/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillMapper.xml b/target/classes/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillMapper.xml new file mode 100644 index 0000000..19fcf7e --- /dev/null +++ b/target/classes/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillMapper.xml @@ -0,0 +1,42 @@ + + + + + + + \ No newline at end of file diff --git a/target/classes/com/yxt/storage/biz/storagereceiptbilldetail/StorageReceiptBillDetailMapper.xml b/target/classes/com/yxt/storage/biz/storagereceiptbilldetail/StorageReceiptBillDetailMapper.xml new file mode 100644 index 0000000..79d48f0 --- /dev/null +++ b/target/classes/com/yxt/storage/biz/storagereceiptbilldetail/StorageReceiptBillDetailMapper.xml @@ -0,0 +1,42 @@ + + + + + delete + from wms_receipt_bill_detail + where billSid = #{sid} + + + + + + \ No newline at end of file diff --git a/target/classes/com/yxt/storage/biz/storagereceiptbilldetailbatch/StorageReceiptBillDetailBatchMapper.xml b/target/classes/com/yxt/storage/biz/storagereceiptbilldetailbatch/StorageReceiptBillDetailBatchMapper.xml new file mode 100644 index 0000000..73e1056 --- /dev/null +++ b/target/classes/com/yxt/storage/biz/storagereceiptbilldetailbatch/StorageReceiptBillDetailBatchMapper.xml @@ -0,0 +1,27 @@ + + + + + delete + from wms_receipt_bill_detail_batch + where billSid = #{sid} + + + + + + \ No newline at end of file diff --git a/target/classes/com/yxt/storage/biz/storageshelfbill/StorageShelfBillMapper.xml b/target/classes/com/yxt/storage/biz/storageshelfbill/StorageShelfBillMapper.xml new file mode 100644 index 0000000..f6b9ba2 --- /dev/null +++ b/target/classes/com/yxt/storage/biz/storageshelfbill/StorageShelfBillMapper.xml @@ -0,0 +1,39 @@ + + + + + + + + + \ No newline at end of file diff --git a/target/classes/com/yxt/storage/biz/storageshelfbilldetail/StorageShelfBillDetailMapper.xml b/target/classes/com/yxt/storage/biz/storageshelfbilldetail/StorageShelfBillDetailMapper.xml new file mode 100644 index 0000000..f7878a5 --- /dev/null +++ b/target/classes/com/yxt/storage/biz/storageshelfbilldetail/StorageShelfBillDetailMapper.xml @@ -0,0 +1,46 @@ + + + + + delete + from wms_shelf_bill_detail + where billSid = #{sid} + + + + + + + + \ No newline at end of file diff --git a/target/classes/logback-spring.xml b/target/classes/logback-spring.xml new file mode 100644 index 0000000..d01e9e9 --- /dev/null +++ b/target/classes/logback-spring.xml @@ -0,0 +1,54 @@ + + + + + + + + + + %yellow(%date{yyyy-MM-dd HH:mm:ss}) |%highlight(%-5level) |%green(%logger:%line) |%blue(%msg%n) + + + + + + + + + + + + + + + ${log.base}.log + + ${log.base}.%d{yyyyMMdd}.%i.log.zip + + + + 1MB + + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} + -%msg%n + + + + + + + + + + + \ No newline at end of file