From a5999181fbc149b42c7c0a2cef8fecb346d3cd85 Mon Sep 17 00:00:00 2001 From: chenfang Date: Mon, 30 Oct 2023 10:26:32 +0800 Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E7=BC=96=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/wms/enums/ErrorCodeConstants.java | 2 +- .../AccountcalendarController.java | 2 +- .../container/ContainerDetailController.java | 15 ++- .../container/ContainerMainController.java | 15 ++- .../container/vo/ContainerDetailRespVO.java | 8 ++ .../container/vo/ContainerMainRespVO.java | 9 ++ .../countJob/CountJobDetailController.java | 15 ++- .../countJob/CountJobMainController.java | 16 ++- .../countPlan/CountPlanDetailController.java | 15 ++- .../countPlan/CountPlanMainController.java | 16 ++- .../CountRecordDetailController.java | 17 ++- .../CountRecordMainController.java | 15 ++- .../vo/CountRecordDetailRespVO.java | 8 ++ .../CountRequestDetailController.java | 16 ++- .../CountRequestMainController.java | 15 ++- .../CountadjustRecordDetailController.java | 16 ++- .../CountadjustRecordMainController.java | 16 ++- .../CountadjustRequestMainController.java | 16 ++- .../CurrencyexchangeController.java | 24 +++- .../customer/CustomerController.java | 25 +++- .../customerdock/CustomerdockController.java | 17 ++- .../customeritem/CustomeritemController.java | 27 +++- ...CustomerreceiptRecordDetailController.java | 16 ++- .../CustomerreceiptRecordMainController.java | 15 ++- ...ustomerreceiptRequestDetailController.java | 16 ++- .../CustomerreceiptRequestMainController.java | 15 ++- .../CustomerreturnJobDetailController.java | 16 ++- .../CustomerreturnJobMainController.java | 14 ++ .../CustomerreturnRecordDetailController.java | 16 ++- .../CustomerreturnRecordMainController.java | 15 ++- .../vo/CustomerreturnRecordMainRespVO.java | 8 ++ ...CustomerreturnRequestDetailController.java | 16 ++- .../CustomerreturnRequestMainController.java | 16 ++- .../CustomersettleRecordDetailController.java | 17 ++- .../CustomersettleRecordMainController.java | 16 ++- ...CustomersettleRequestDetailController.java | 16 ++- .../CustomersettleRequestMainController.java | 16 ++- .../DeliverJobDetailController.java | 16 ++- .../deliverJob/DeliverJobMainController.java | 16 ++- .../DeliverPlanDetailController.java | 16 ++- .../DeliverPlanMainController.java | 16 ++- .../DeliverRecordDetailController.java | 17 ++- .../DeliverRecordMainController.java | 15 ++- .../DeliverRequestDetailController.java | 16 ++- .../DeliverRequestMainController.java | 15 ++- .../DemandforecastingDetailController.java | 14 ++ .../DemandforecastingMainController.java | 14 ++ .../DismantleRecordDetailbController.java | 112 ---------------- .../vo/DismantleRecordDetailbCreateReqVO.java | 12 -- .../vo/DismantleRecordDetailbRespVO.java | 12 -- .../vo/DismantleRecordDetailbUpdateReqVO.java | 12 -- .../DismantleRequestDetailbCreateReqVO.java | 12 -- .../vo/DismantleRequestDetailbRespVO.java | 12 -- .../DismantleRequestDetailbUpdateReqVO.java | 12 -- .../DismantleRecordDetailbController.java | 124 ++++++++++++++++++ .../ProductdismantleRecordMainController.java | 58 ++++---- .../ProductdismantleRecordDetailbBaseVO.java} | 11 +- ...ductdismantleRecordDetailbCreateReqVO.java | 14 ++ ...ProductdismantleRecordDetailbExcelVO.java} | 12 +- ...uctdismantleRecordDetailbExportReqVO.java} | 11 +- ...oductdismantleRecordDetailbPageReqVO.java} | 12 +- .../ProductdismantleRecordDetailbRespVO.java | 14 ++ ...ductdismantleRecordDetailbUpdateReqVO.java | 14 ++ .../vo/ProductdismantleRecordMainBaseVO.java | 13 +- ...ProductdismantleRecordMainCreateReqVO.java | 6 +- .../vo/ProductdismantleRecordMainExcelVO.java | 14 +- ...ProductdismantleRecordMainExportReqVO.java | 9 +- .../ProductdismantleRecordMainPageReqVO.java | 10 +- .../vo/ProductdismantleRecordMainRespVO.java | 6 +- ...ProductdismantleRecordMainUpdateReqVO.java | 6 +- ...uctdismantleRequestDetailbController.java} | 85 ++++++------ ...ProductdismantleRequestDetailbBaseVO.java} | 13 +- ...uctdismantleRequestDetailbCreateReqVO.java | 14 ++ ...roductdismantleRequestDetailbExcelVO.java} | 15 +-- ...ctdismantleRequestDetailbExportReqVO.java} | 12 +- ...ductdismantleRequestDetailbPageReqVO.java} | 15 ++- .../ProductdismantleRequestDetailbRespVO.java | 14 ++ ...uctdismantleRequestDetailbUpdateReqVO.java | 14 ++ ...roductrepairRequestDetailbController.java} | 56 ++++---- ...=> ProductrepairRequestDetailbBaseVO.java} | 2 +- ...oductrepairRequestDetailbCreateReqVO.java} | 2 +- ...> ProductrepairRequestDetailbExcelVO.java} | 2 +- ...oductrepairRequestDetailbExportReqVO.java} | 2 +- ...ProductrepairRequestDetailbPageReqVO.java} | 2 +- ...=> ProductrepairRequestDetailbRespVO.java} | 2 +- ...oductrepairRequestDetailbUpdateReqVO.java} | 2 +- .../DismantleRecordDetailbConvert.java | 37 ------ .../DismantleRequestDetailbConvert.java | 37 ------ .../ProductdismantleRecordDetailbConvert.java | 36 +++++ .../ProductdismantleRecordMainConvert.java | 17 ++- ...ProductdismantleRequestDetailbConvert.java | 36 +++++ .../ConsumereRequestDetailbConvert.java | 36 ----- .../ProductrepairRequestDetailbConvert.java | 36 +++++ .../ProductdismantleRecordDetailbDO.java} | 12 +- .../ProductdismantleRecordMainDO.java | 14 +- .../ProductdismantleRequestDetailbDO.java} | 14 +- ...ava => ProductrepairRequestDetailbDO.java} | 2 +- .../container/ContainerDetailMapper.java | 7 +- .../mysql/container/ContainerMainMapper.java | 7 +- .../mysql/countJob/CountJobDetailMapper.java | 6 +- .../mysql/countJob/CountJobMainMapper.java | 6 +- .../countPlan/CountPlanDetailMapper.java | 6 +- .../mysql/countPlan/CountPlanMainMapper.java | 6 +- .../countRecord/CountRecordDetailMapper.java | 6 +- .../countRecord/CountRecordMainMapper.java | 6 +- .../CountRequestDetailMapper.java | 6 +- .../countRequest/CountRequestMainMapper.java | 6 +- .../CountadjustRecordDetailMapper.java | 6 +- .../CountadjustRecordMainMapper.java | 7 +- .../CountadjustRequestMainMapper.java | 6 +- .../CurrencyexchangeMapper.java | 6 +- .../dal/mysql/customer/CustomerMapper.java | 6 +- .../customerdock/CustomerdockMapper.java | 6 +- .../customeritem/CustomeritemMapper.java | 6 +- .../CustomerreceiptRecordDetailMapper.java | 6 +- .../CustomerreceiptRecordMainMapper.java | 6 +- .../CustomerreceiptRequestDetailMapper.java | 6 +- .../CustomerreceiptRequestMainMapper.java | 6 +- .../CustomerreturnJobDetailMapper.java | 6 +- .../CustomerreturnJobMainMapper.java | 6 +- .../CustomerreturnRecordDetailMapper.java | 6 +- .../CustomerreturnRecordMainMapper.java | 6 +- .../CustomerreturnRequestDetailMapper.java | 6 +- .../CustomerreturnRequestMainMapper.java | 6 +- .../CustomersettleRecordDetailMapper.java | 6 +- .../CustomersettleRecordMainMapper.java | 6 +- .../CustomersettleRequestDetailMapper.java | 6 +- .../CustomersettleRequestMainMapper.java | 6 +- .../deliverJob/DeliverJobDetailMapper.java | 6 +- .../deliverJob/DeliverJobMainMapper.java | 6 +- .../deliverPlan/DeliverPlanDetailMapper.java | 6 +- .../deliverPlan/DeliverPlanMainMapper.java | 6 +- .../DeliverRecordDetailMapper.java | 6 +- .../DeliverRecordMainMapper.java | 6 + .../DeliverRequestDetailMapper.java | 6 + .../DeliverRequestMainMapper.java | 6 +- .../DemandforecastingDetailMapper.java | 6 +- .../DemandforecastingMainMapper.java | 6 +- .../DismantleRecordDetailbMapper.java | 73 ----------- .../DismantleRequestDetailbMapper.java | 63 --------- .../ProductdismantleRecordDetailbMapper.java | 77 +++++++++++ .../ProductdismantleRecordMainMapper.java | 20 +-- .../ProductdismantleRequestDetailbMapper.java | 63 +++++++++ .../ConsumereRequestDetailbMapper.java | 67 ---------- .../ProductrepairRequestDetailbMapper.java | 67 ++++++++++ .../container/ContainerDetailService.java | 9 ++ .../container/ContainerDetailServiceImpl.java | 6 +- .../container/ContainerMainService.java | 9 ++ .../container/ContainerMainServiceImpl.java | 6 +- .../countJob/CountJobDetailService.java | 8 ++ .../countJob/CountJobDetailServiceImpl.java | 6 +- .../service/countJob/CountJobMainService.java | 9 ++ .../countJob/CountJobMainServiceImpl.java | 6 +- .../countPlan/CountPlanDetailService.java | 8 ++ .../countPlan/CountPlanDetailServiceImpl.java | 6 +- .../countPlan/CountPlanMainService.java | 8 ++ .../countPlan/CountPlanMainServiceImpl.java | 6 +- .../countRecord/CountRecordDetailService.java | 8 ++ .../CountRecordDetailServiceImpl.java | 6 +- .../countRecord/CountRecordMainService.java | 8 ++ .../CountRecordMainServiceImpl.java | 6 +- .../CountRequestDetailService.java | 8 ++ .../CountRequestDetailServiceImpl.java | 6 +- .../countRequest/CountRequestMainService.java | 8 ++ .../CountRequestMainServiceImpl.java | 6 +- .../CountadjustRecordDetailService.java | 8 ++ .../CountadjustRecordDetailServiceImpl.java | 6 +- .../CountadjustRecordMainService.java | 8 ++ .../CountadjustRecordMainServiceImpl.java | 6 +- .../CountadjustRequestMainService.java | 8 ++ .../CountadjustRequestMainServiceImpl.java | 5 + .../CurrencyexchangeService.java | 8 ++ .../CurrencyexchangeServiceImpl.java | 59 ++++++--- .../wms/service/customer/CustomerService.java | 8 ++ .../service/customer/CustomerServiceImpl.java | 62 ++++++--- .../customerdock/CustomerdockService.java | 8 ++ .../customerdock/CustomerdockServiceImpl.java | 57 +++++--- .../customeritem/CustomeritemService.java | 8 ++ .../customeritem/CustomeritemServiceImpl.java | 72 +++++++--- .../CustomerreceiptRecordDetailService.java | 8 ++ ...ustomerreceiptRecordDetailServiceImpl.java | 6 +- .../CustomerreceiptRecordMainService.java | 8 ++ .../CustomerreceiptRecordMainServiceImpl.java | 6 +- .../CustomerreceiptRequestDetailService.java | 8 ++ ...stomerreceiptRequestDetailServiceImpl.java | 6 +- .../CustomerreceiptRequestMainService.java | 8 ++ ...CustomerreceiptRequestMainServiceImpl.java | 6 +- .../CustomerreturnJobDetailService.java | 8 ++ .../CustomerreturnJobDetailServiceImpl.java | 6 +- .../CustomerreturnJobMainService.java | 8 ++ .../CustomerreturnJobMainServiceImpl.java | 6 +- .../CustomerreturnRecordDetailService.java | 8 ++ ...CustomerreturnRecordDetailServiceImpl.java | 6 +- .../CustomerreturnRecordMainService.java | 8 ++ .../CustomerreturnRecordMainServiceImpl.java | 6 +- .../CustomerreturnRequestDetailService.java | 8 ++ ...ustomerreturnRequestDetailServiceImpl.java | 6 +- .../CustomerreturnRequestMainService.java | 8 ++ .../CustomerreturnRequestMainServiceImpl.java | 6 +- .../CustomersettleRecordDetailService.java | 8 ++ ...CustomersettleRecordDetailServiceImpl.java | 6 +- .../CustomersettleRecordMainService.java | 8 ++ .../CustomersettleRecordMainServiceImpl.java | 6 +- .../CustomersettleRequestDetailService.java | 8 ++ ...ustomersettleRequestDetailServiceImpl.java | 6 +- .../CustomersettleRequestMainService.java | 8 ++ .../CustomersettleRequestMainServiceImpl.java | 6 +- .../deliverJob/DeliverJobDetailService.java | 8 ++ .../DeliverJobDetailServiceImpl.java | 6 +- .../deliverJob/DeliverJobMainService.java | 9 ++ .../deliverJob/DeliverJobMainServiceImpl.java | 8 +- .../deliverPlan/DeliverPlanDetailService.java | 8 ++ .../DeliverPlanDetailServiceImpl.java | 6 +- .../deliverPlan/DeliverPlanMainService.java | 8 ++ .../DeliverPlanMainServiceImpl.java | 6 +- .../DeliverRecordDetailService.java | 9 ++ .../DeliverRecordDetailServiceImpl.java | 5 + .../DeliverRecordMainService.java | 10 ++ .../DeliverRecordMainServiceImpl.java | 5 + .../DeliverRequestDetailService.java | 10 ++ .../DeliverRequestDetailServiceImpl.java | 6 + .../DeliverRequestMainService.java | 10 ++ .../DeliverRequestMainServiceImpl.java | 6 + .../DemandforecastingDetailService.java | 10 ++ .../DemandforecastingDetailServiceImpl.java | 6 +- .../DemandforecastingMainService.java | 10 ++ .../DemandforecastingMainServiceImpl.java | 5 + .../DismantleRecordDetailbService.java | 74 ----------- .../DismantleRecordDetailbServiceImpl.java | 86 ------------ .../DismantleRequestDetailbService.java | 74 ----------- .../DismantleRequestDetailbServiceImpl.java | 86 ------------ .../ProductdismantleJobDetailServiceImpl.java | 2 +- .../ProductdismantleRecordDetailbService.java | 85 ++++++++++++ ...ductdismantleRecordDetailbServiceImpl.java | 88 +++++++++++++ .../ProductdismantleRecordMainService.java | 29 ++-- ...ProductdismantleRecordMainServiceImpl.java | 33 +++-- ...ProductdismantleRequestDetailbService.java | 75 +++++++++++ ...uctdismantleRequestDetailbServiceImpl.java | 85 ++++++++++++ .../ConsumereRequestDetailbServiceImpl.java | 89 ------------- ...> ProductrepairRequestDetailbService.java} | 26 ++-- ...roductrepairRequestDetailbServiceImpl.java | 89 +++++++++++++ .../PurchasereceiptRecordMainService.java | 3 +- .../PurchasereceiptRecordMainServiceImpl.java | 5 +- 243 files changed, 2788 insertions(+), 1388 deletions(-) delete mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRecord/DismantleRecordDetailbController.java delete mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRecord/vo/DismantleRecordDetailbCreateReqVO.java delete mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRecord/vo/DismantleRecordDetailbRespVO.java delete mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRecord/vo/DismantleRecordDetailbUpdateReqVO.java delete mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRequest/vo/DismantleRequestDetailbCreateReqVO.java delete mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRequest/vo/DismantleRequestDetailbRespVO.java delete mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRequest/vo/DismantleRequestDetailbUpdateReqVO.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/DismantleRecordDetailbController.java rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/{productdismantleRecordMain => productdismantleRecord}/ProductdismantleRecordMainController.java (77%) rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/{dismantleRecord/vo/DismantleRecordDetailbBaseVO.java => productdismantleRecord/vo/ProductdismantleRecordDetailbBaseVO.java} (92%) create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailbCreateReqVO.java rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/{dismantleRecord/vo/DismantleRecordDetailbExcelVO.java => productdismantleRecord/vo/ProductdismantleRecordDetailbExcelVO.java} (91%) rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/{dismantleRecord/vo/DismantleRecordDetailbExportReqVO.java => productdismantleRecord/vo/ProductdismantleRecordDetailbExportReqVO.java} (91%) rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/{dismantleRecord/vo/DismantleRecordDetailbPageReqVO.java => productdismantleRecord/vo/ProductdismantleRecordDetailbPageReqVO.java} (90%) create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailbRespVO.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailbUpdateReqVO.java rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/{productdismantleRecordMain => productdismantleRecord}/vo/ProductdismantleRecordMainBaseVO.java (90%) rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/{productdismantleRecordMain => productdismantleRecord}/vo/ProductdismantleRecordMainCreateReqVO.java (67%) rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/{productdismantleRecordMain => productdismantleRecord}/vo/ProductdismantleRecordMainExcelVO.java (88%) rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/{productdismantleRecordMain => productdismantleRecord}/vo/ProductdismantleRecordMainExportReqVO.java (94%) rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/{productdismantleRecordMain => productdismantleRecord}/vo/ProductdismantleRecordMainPageReqVO.java (94%) rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/{productdismantleRecordMain => productdismantleRecord}/vo/ProductdismantleRecordMainRespVO.java (67%) rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/{productdismantleRecordMain => productdismantleRecord}/vo/ProductdismantleRecordMainUpdateReqVO.java (67%) rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/{dismantleRequest/DismantleRequestDetailbController.java => productdismantleRequest/ProductdismantleRequestDetailbController.java} (53%) rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/{dismantleRequest/vo/DismantleRequestDetailbBaseVO.java => productdismantleRequest/vo/ProductdismantleRequestDetailbBaseVO.java} (90%) create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailbCreateReqVO.java rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/{dismantleRequest/vo/DismantleRequestDetailbExcelVO.java => productdismantleRequest/vo/ProductdismantleRequestDetailbExcelVO.java} (87%) rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/{dismantleRequest/vo/DismantleRequestDetailbExportReqVO.java => productdismantleRequest/vo/ProductdismantleRequestDetailbExportReqVO.java} (90%) rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/{dismantleRequest/vo/DismantleRequestDetailbPageReqVO.java => productdismantleRequest/vo/ProductdismantleRequestDetailbPageReqVO.java} (89%) create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailbRespVO.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailbUpdateReqVO.java rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/{ConsumereRequestDetailbController.java => ProductrepairRequestDetailbController.java} (57%) rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/{ConsumereRequestDetailbBaseVO.java => ProductrepairRequestDetailbBaseVO.java} (98%) rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/{ConsumereRequestDetailbCreateReqVO.java => ProductrepairRequestDetailbCreateReqVO.java} (78%) rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/{ConsumereRequestDetailbExcelVO.java => ProductrepairRequestDetailbExcelVO.java} (96%) rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/{ConsumereRequestDetailbExportReqVO.java => ProductrepairRequestDetailbExportReqVO.java} (97%) rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/{ConsumereRequestDetailbPageReqVO.java => ProductrepairRequestDetailbPageReqVO.java} (96%) rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/{ConsumereRequestDetailbRespVO.java => ProductrepairRequestDetailbRespVO.java} (78%) rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/{ConsumereRequestDetailbUpdateReqVO.java => ProductrepairRequestDetailbUpdateReqVO.java} (78%) delete mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/dismantleRecord/DismantleRecordDetailbConvert.java delete mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/dismantleRequest/DismantleRequestDetailbConvert.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/productdismantleRecord/ProductdismantleRecordDetailbConvert.java rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/{productdismantleRecordMain => productdismantleRecord}/ProductdismantleRecordMainConvert.java (60%) create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/productdismantleRequest/ProductdismantleRequestDetailbConvert.java delete mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/productrepairRequest/ConsumereRequestDetailbConvert.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/productrepairRequest/ProductrepairRequestDetailbConvert.java rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/{dismantleRecord/DismantleRecordDetailbDO.java => productdismantleRecord/ProductdismantleRecordDetailbDO.java} (87%) rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/{productdismantleRecordMain => productdismantleRecord}/ProductdismantleRecordMainDO.java (91%) rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/{dismantleRequest/DismantleRequestDetailbDO.java => productdismantleRequest/ProductdismantleRequestDetailbDO.java} (83%) rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productrepairRequest/{ConsumereRequestDetailbDO.java => ProductrepairRequestDetailbDO.java} (96%) delete mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/dismantleRecord/DismantleRecordDetailbMapper.java delete mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/dismantleRequest/DismantleRequestDetailbMapper.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleRecord/ProductdismantleRecordDetailbMapper.java rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/{productdismantleRecordMain => productdismantleRecord}/ProductdismantleRecordMainMapper.java (88%) create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleRequest/ProductdismantleRequestDetailbMapper.java delete mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRequest/ConsumereRequestDetailbMapper.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRequest/ProductrepairRequestDetailbMapper.java delete mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dismantleRecord/DismantleRecordDetailbService.java delete mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dismantleRecord/DismantleRecordDetailbServiceImpl.java delete mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dismantleRequest/DismantleRequestDetailbService.java delete mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dismantleRequest/DismantleRequestDetailbServiceImpl.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRecord/ProductdismantleRecordDetailbService.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRecord/ProductdismantleRecordDetailbServiceImpl.java rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/{productdismantleRecordMain => productdismantleRecord}/ProductdismantleRecordMainService.java (63%) rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/{productdismantleRecordMain => productdismantleRecord}/ProductdismantleRecordMainServiceImpl.java (69%) create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestDetailbService.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestDetailbServiceImpl.java delete mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ConsumereRequestDetailbServiceImpl.java rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/{ConsumereRequestDetailbService.java => ProductrepairRequestDetailbService.java} (52%) create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestDetailbServiceImpl.java diff --git a/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java b/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java index 70082a09..ad3ae892 100644 --- a/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java +++ b/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java @@ -435,7 +435,7 @@ public interface ErrorCodeConstants { //采购收货记录子ErrorCode ErrorCode PURCHASERECEIPT_RECORD_DETAIL_NOT_EXISTS = new ErrorCode(1_000_074_001, "采购收货记录子不存在"); ErrorCode PURCHASERECEIPT_RECORD_MAIN_NUMBER_NOT_EXISTS = new ErrorCode(1_000_074_002, "采购收货记录无效,number无效"); - ErrorCode PURCHASERECEIPT_RECORD_DETAIL_PONUMBER_POLINE_ITEMCODE_INVALID = new ErrorCode(1_000_074_003, "采购收货记录明细:订单号，订单行，零件号无效"); + ErrorCode PURCHASERECEIPT_RECORD_DETAIL_PONUMBER_NUMBER_POLINE_ITEMCODE_INVALID = new ErrorCode(1_000_074_003, "采购收货记录明细:订单号，单据号,订单行，零件号无效"); //采购退货申请主ErrorCode ErrorCode PURCHASERETURN_REQUEST_MAIN_NOT_EXISTS = new ErrorCode(1_000_075_000, "采购退货申请主不存在"); //采购退货申请子ErrorCode diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/accountcalendar/AccountcalendarController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/accountcalendar/AccountcalendarController.java index addcdb89..8f262ee3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/accountcalendar/AccountcalendarController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/accountcalendar/AccountcalendarController.java @@ -98,7 +98,7 @@ public class AccountcalendarController { @PostMapping("/senior") @Operation(summary = "高级搜索获得账期日历分页") @PreAuthorize("@ss.hasPermission('wms:accountcalendar:query')") - public CommonResult> getItembasicSenior(@Valid @RequestBody CustomConditions conditions) { + public CommonResult> getAccountcalendarSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = accountcalendarService.getAccountcalendarSenior(conditions); PageResult result = AccountcalendarConvert.INSTANCE.convertPage(pageResult); for(AccountcalendarRespVO vo : result.getList()) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/ContainerDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/ContainerDetailController.java index 34df8b2c..27513a82 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/ContainerDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/ContainerDetailController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.container; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.container.vo.*; @@ -91,7 +92,19 @@ public class ContainerDetailController { PageResult pageResult = containerDetailService.getContainerDetailPage(pageVO); return success(ContainerDetailConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得器具子分页") + @PreAuthorize("@ss.hasPermission('wms:container-detail:query')") + public CommonResult> getContainerDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = containerDetailService.getContainerDetailSenior(conditions); + PageResult result = ContainerDetailConvert.INSTANCE.convertPage(pageResult); + for(ContainerDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出器具子 Excel") @PreAuthorize("@ss.hasPermission('wms:container-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/ContainerMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/ContainerMainController.java index 720dae07..5c75bd71 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/ContainerMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/ContainerMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.container; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.container.vo.*; @@ -91,7 +92,19 @@ public class ContainerMainController { PageResult pageResult = containerMainService.getContainerMainPage(pageVO); return success(ContainerMainConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得器具主分页") + @PreAuthorize("@ss.hasPermission('wms:container-main:query')") + public CommonResult> getContainerMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = containerMainService.getContainerMainSenior(conditions); + PageResult result = ContainerMainConvert.INSTANCE.convertPage(pageResult); + for(ContainerMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出器具主 Excel") @PreAuthorize("@ss.hasPermission('wms:container-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/vo/ContainerDetailRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/vo/ContainerDetailRespVO.java index fc9ef3f7..5dd98ba1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/vo/ContainerDetailRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/vo/ContainerDetailRespVO.java @@ -3,10 +3,18 @@ package com.win.module.wms.controller.container.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import java.time.LocalDateTime; + @Schema(description = "管理后台 - 器具子 Response VO") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) public class ContainerDetailRespVO extends ContainerDetailBaseVO { + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + private LocalDateTime createTime; + + @Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED) + private String creator; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/vo/ContainerMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/vo/ContainerMainRespVO.java index 5ddcb85d..64f4a9df 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/vo/ContainerMainRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/vo/ContainerMainRespVO.java @@ -3,9 +3,18 @@ package com.win.module.wms.controller.container.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import java.time.LocalDateTime; + @Schema(description = "管理后台 - 器具主 Response VO") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) public class ContainerMainRespVO extends ContainerMainBaseVO { + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + private LocalDateTime createTime; + + @Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED) + private String creator; + + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/CountJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/CountJobDetailController.java index 6ca06476..17b67996 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/CountJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/CountJobDetailController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.countJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.countJob.vo.*; @@ -91,7 +92,19 @@ public class CountJobDetailController { PageResult pageResult = countJobDetailService.getCountJobDetailPage(pageVO); return success(CountJobDetailConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得盘点任务子分页") + @PreAuthorize("@ss.hasPermission('wms:count-job-detail:query')") + public CommonResult> getCountJobDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = countJobDetailService.getCountJobDetailSenior(conditions); + PageResult result = CountJobDetailConvert.INSTANCE.convertPage(pageResult); + for(CountJobDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出盘点任务子 Excel") @PreAuthorize("@ss.hasPermission('wms:count-job-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/CountJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/CountJobMainController.java index a5ed19d9..8664b5fa 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/CountJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/CountJobMainController.java @@ -1,9 +1,9 @@ package com.win.module.wms.controller.countJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.countJob.vo.*; -import com.win.module.wms.controller.countadjustRequest.vo.CountadjustRequestMainExcelVO; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -92,7 +92,19 @@ public class CountJobMainController { PageResult pageResult = countJobMainService.getCountJobMainPage(pageVO); return success(CountJobMainConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得盘点任务主分页") + @PreAuthorize("@ss.hasPermission('wms:count-job-main:query')") + public CommonResult> getCountJobMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = countJobMainService.getCountJobMainSenior(conditions); + PageResult result = CountJobMainConvert.INSTANCE.convertPage(pageResult); + for(CountJobMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出盘点任务主 Excel") @PreAuthorize("@ss.hasPermission('wms:count-job-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/CountPlanDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/CountPlanDetailController.java index 959d673b..9178468a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/CountPlanDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/CountPlanDetailController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.countPlan; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.countPlan.vo.*; @@ -91,7 +92,19 @@ public class CountPlanDetailController { PageResult pageResult = countPlanDetailService.getCountPlanDetailPage(pageVO); return success(CountPlanDetailConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得盘点计划子分页") + @PreAuthorize("@ss.hasPermission('wms:count-plan-detail:query')") + public CommonResult> getCountPlanDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = countPlanDetailService.getCountPlanDetailSenior(conditions); + PageResult result = CountPlanDetailConvert.INSTANCE.convertPage(pageResult); + for(CountPlanDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出盘点计划子 Excel") @PreAuthorize("@ss.hasPermission('wms:count-plan-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/CountPlanMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/CountPlanMainController.java index 1f09bc6f..49e2ac65 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/CountPlanMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/CountPlanMainController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.countPlan; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.countJob.vo.CountJobMainExcelVO; import com.win.module.wms.controller.countPlan.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -92,7 +92,19 @@ public class CountPlanMainController { PageResult pageResult = countPlanMainService.getCountPlanMainPage(pageVO); return success(CountPlanMainConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得盘点计划主分页") + @PreAuthorize("@ss.hasPermission('wms:count-plan-main:query')") + public CommonResult> getCountPlanMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = countPlanMainService.getCountPlanMainSenior(conditions); + PageResult result = CountPlanMainConvert.INSTANCE.convertPage(pageResult); + for(CountPlanMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出盘点计划主 Excel") @PreAuthorize("@ss.hasPermission('wms:count-plan-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/CountRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/CountRecordDetailController.java index 704f94b6..f32291b5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/CountRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/CountRecordDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.countRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.countPlan.vo.CountPlanMainExcelVO; import com.win.module.wms.controller.countRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -26,7 +26,6 @@ import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; -import com.win.module.wms.controller.countRecord.vo.*; import com.win.module.wms.dal.dataobject.countRecord.CountRecordDetailDO; import com.win.module.wms.convert.countRecord.CountRecordDetailConvert; import com.win.module.wms.service.countRecord.CountRecordDetailService; @@ -92,7 +91,19 @@ public class CountRecordDetailController { PageResult pageResult = countRecordDetailService.getCountRecordDetailPage(pageVO); return success(CountRecordDetailConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得盘点记录子分页") + @PreAuthorize("@ss.hasPermission('wms:count-record-detail:query')") + public CommonResult> getCountRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = countRecordDetailService.getCountRecordDetailSenior(conditions); + PageResult result = CountRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(CountRecordDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出盘点记录子 Excel") @PreAuthorize("@ss.hasPermission('wms:count-record-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/CountRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/CountRecordMainController.java index 03a91088..f375a887 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/CountRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/CountRecordMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.countRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.countRecord.vo.*; @@ -91,7 +92,19 @@ public class CountRecordMainController { PageResult pageResult = countRecordMainService.getCountRecordMainPage(pageVO); return success(CountRecordMainConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得盘点记录主分页") + @PreAuthorize("@ss.hasPermission('wms:count-record-main:query')") + public CommonResult> getCountRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = countRecordMainService.getCountRecordMainSenior(conditions); + PageResult result = CountRecordMainConvert.INSTANCE.convertPage(pageResult); + for(CountRecordMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出盘点记录主 Excel") @PreAuthorize("@ss.hasPermission('wms:count-record-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordDetailRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordDetailRespVO.java index a86ab63e..538b3dc5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordDetailRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordDetailRespVO.java @@ -3,10 +3,18 @@ package com.win.module.wms.controller.countRecord.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import java.time.LocalDateTime; + @Schema(description = "管理后台 - 盘点记录子 Response VO") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) public class CountRecordDetailRespVO extends CountRecordDetailBaseVO { + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + private LocalDateTime createTime; + + @Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED) + private String creator; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/CountRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/CountRequestDetailController.java index f0d16cba..b2319385 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/CountRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/CountRequestDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.countRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.countRecord.vo.CountRecordMainExcelVO; import com.win.module.wms.controller.countRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -93,7 +93,19 @@ public class CountRequestDetailController { PageResult pageResult = countRequestDetailService.getCountRequestDetailPage(pageVO); return success(CountRequestDetailConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得盘点申请子分页") + @PreAuthorize("@ss.hasPermission('wms:count-request-detail:query')") + public CommonResult> getCountRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = countRequestDetailService.getCountRequestDetailSenior(conditions); + PageResult result = CountRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(CountRequestDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出盘点申请子 Excel") @PreAuthorize("@ss.hasPermission('wms:count-request-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/CountRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/CountRequestMainController.java index 27d7f1c3..d68dce57 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/CountRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/CountRequestMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.countRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.countRequest.vo.*; @@ -92,7 +93,19 @@ public class CountRequestMainController { PageResult pageResult = countRequestMainService.getCountRequestMainPage(pageVO); return success(CountRequestMainConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得盘点申请主分页") + @PreAuthorize("@ss.hasPermission('wms:count-request-main:query')") + public CommonResult> getCountRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = countRequestMainService.getCountRequestMainSenior(conditions); + PageResult result = CountRequestMainConvert.INSTANCE.convertPage(pageResult); + for(CountRequestMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出盘点申请主 Excel") @PreAuthorize("@ss.hasPermission('wms:count-request-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/CountadjustRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/CountadjustRecordDetailController.java index ec13018f..4d9ebf18 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/CountadjustRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/CountadjustRecordDetailController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.countadjustRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.countadjustRecord.vo.*; @@ -25,7 +26,6 @@ import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; -import com.win.module.wms.controller.countadjustRecord.vo.*; import com.win.module.wms.dal.dataobject.countadjustRecord.CountadjustRecordDetailDO; import com.win.module.wms.convert.countadjustRecord.CountadjustRecordDetailConvert; import com.win.module.wms.service.countadjustRecord.CountadjustRecordDetailService; @@ -91,7 +91,19 @@ public class CountadjustRecordDetailController { PageResult pageResult = countadjustRecordDetailService.getCountadjustRecordDetailPage(pageVO); return success(CountadjustRecordDetailConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得盘点调整记录子分页") + @PreAuthorize("@ss.hasPermission('wms:countadjust-record-detail:query')") + public CommonResult> getCountadjustRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = countadjustRecordDetailService.getCountadjustRecordDetailSenior(conditions); + PageResult result = CountadjustRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(CountadjustRecordDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出盘点调整记录子 Excel") @PreAuthorize("@ss.hasPermission('wms:countadjust-record-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/CountadjustRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/CountadjustRecordMainController.java index 9c41c538..e38ede95 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/CountadjustRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/CountadjustRecordMainController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.countadjustRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.container.vo.ContainerMainExcelVO; import com.win.module.wms.controller.countadjustRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -92,7 +92,19 @@ public class CountadjustRecordMainController { PageResult pageResult = countadjustRecordMainService.getCountadjustRecordMainPage(pageVO); return success(CountadjustRecordMainConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得盘点调整记录主分页") + @PreAuthorize("@ss.hasPermission('wms:countadjust-record-main:query')") + public CommonResult> getItembasicSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = countadjustRecordMainService.getCountadjustRecordMainSenior(conditions); + PageResult result = CountadjustRecordMainConvert.INSTANCE.convertPage(pageResult); + for(CountadjustRecordMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出盘点调整记录主 Excel") @PreAuthorize("@ss.hasPermission('wms:countadjust-record-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/CountadjustRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/CountadjustRequestMainController.java index 83a98050..e2bb80f3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/CountadjustRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/CountadjustRequestMainController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.countadjustRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.countadjustRecord.vo.CountadjustRecordMainExcelVO; import com.win.module.wms.controller.countadjustRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -92,7 +92,19 @@ public class CountadjustRequestMainController { PageResult pageResult = countadjustRequestMainService.getCountadjustRequestMainPage(pageVO); return success(CountadjustRequestMainConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得盘点调整申请主分页") + @PreAuthorize("@ss.hasPermission('wms:countadjust-request-main:query')") + public CommonResult> getCountadjustRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = countadjustRequestMainService.getCountadjustRequestMainSenior(conditions); + PageResult result = CountadjustRequestMainConvert.INSTANCE.convertPage(pageResult); + for(CountadjustRequestMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出盘点调整申请主 Excel") @PreAuthorize("@ss.hasPermission('wms:countadjust-request-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/currencyexchange/CurrencyexchangeController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/currencyexchange/CurrencyexchangeController.java index 53de14d7..afab9b7f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/currencyexchange/CurrencyexchangeController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/currencyexchange/CurrencyexchangeController.java @@ -1,13 +1,13 @@ package com.win.module.wms.controller.currencyexchange; import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.countRequest.vo.CountRequestMainExcelVO; import com.win.module.wms.controller.currencyexchange.vo.*; import com.win.module.wms.convert.currencyexchange.CurrencyexchangeConvert; import com.win.module.wms.dal.dataobject.currencyexchange.CurrencyexchangeDO; @@ -94,7 +94,19 @@ public class CurrencyexchangeController { PageResult pageResult = currencyexchangeService.getCurrencyexchangePage(pageVO); return success(CurrencyexchangeConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得货币转换分页") + @PreAuthorize("@ss.hasPermission('wms:currencyexchange:query')") + public CommonResult> getCurrencyexchangeSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = currencyexchangeService.getCurrencyexchangeSenior(conditions); + PageResult result = CurrencyexchangeConvert.INSTANCE.convertPage(pageResult); + for(CurrencyexchangeRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出货币转换 Excel") @PreAuthorize("@ss.hasPermission('wms:currencyexchange:export')") @@ -108,8 +120,12 @@ public class CurrencyexchangeController { AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); - } - ExcelUtils.write(response, "货币转换.xls", "数据", CurrencyexchangeExcelVO.class, datas); + } Map mapDropDown = new HashMap<>(); + String[] currency = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CURRENCY); + mapDropDown.put(0, currency); + String[] isRequired = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(3, isRequired); + ExcelUtils.write(response, "货币转换.xls", "数据", CurrencyexchangeExcelVO.class, datas,mapDropDown); } @GetMapping("/get-import-template") @Operation(summary = "获得导入货币转换模板") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customer/CustomerController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customer/CustomerController.java index fd06cb76..b061b5f6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customer/CustomerController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customer/CustomerController.java @@ -1,13 +1,13 @@ package com.win.module.wms.controller.customer; import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.currencyexchange.vo.CurrencyexchangeExcelVO; import com.win.module.wms.controller.customer.vo.CustomerImportExcelVo; import com.win.module.wms.controller.customer.vo.*; import com.win.module.wms.convert.customer.CustomerConvert; @@ -94,7 +94,19 @@ public class CustomerController { PageResult pageResult = customerService.getCustomerPage(pageVO); return success(CustomerConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得客户分页") + @PreAuthorize("@ss.hasPermission('wms:customer:query')") + public CommonResult> getCustomerSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = customerService.getCustomerSenior(conditions); + PageResult result = CustomerConvert.INSTANCE.convertPage(pageResult); + for(CustomerRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出客户 Excel") @PreAuthorize("@ss.hasPermission('wms:customer:export')") @@ -109,7 +121,14 @@ public class CustomerController { //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); } - ExcelUtils.write(response, "客户.xls", "数据", CustomerExcelVO.class, datas); + Map mapDropDown = new HashMap<>(); + String[] currency = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CURRENCY); + mapDropDown.put(11, currency); + String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CUSTOMER_TYPE); + mapDropDown.put(13, type); + String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(14, available); + ExcelUtils.write(response, "客户.xls", "数据", CustomerExcelVO.class, datas,mapDropDown); } @GetMapping("/get-import-template") @Operation(summary = "获得导入客户模板") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerdock/CustomerdockController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerdock/CustomerdockController.java index 59552b7a..ef89f93f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerdock/CustomerdockController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerdock/CustomerdockController.java @@ -1,14 +1,13 @@ package com.win.module.wms.controller.customerdock; import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.customer.vo.CustomerExcelVO; -import com.win.module.wms.controller.customer.vo.CustomerImportExcelVo; import com.win.module.wms.controller.customerdock.vo.*; import com.win.module.wms.convert.customerdock.CustomerdockConvert; import com.win.module.wms.dal.dataobject.customerdock.CustomerdockDO; @@ -95,7 +94,19 @@ public class CustomerdockController { PageResult pageResult = customerdockService.getCustomerdockPage(pageVO); return success(CustomerdockConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得客户月台分页") + @PreAuthorize("@ss.hasPermission('wms:customerdock:query')") + public CommonResult> getCustomerdockSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = customerdockService.getCustomerdockSenior(conditions); + PageResult result = CustomerdockConvert.INSTANCE.convertPage(pageResult); + for(CustomerdockRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出客户月台 Excel") @PreAuthorize("@ss.hasPermission('wms:customerdock:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/CustomeritemController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/CustomeritemController.java index dbf01db8..eddbaa70 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/CustomeritemController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/CustomeritemController.java @@ -1,13 +1,13 @@ package com.win.module.wms.controller.customeritem; import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.customerdock.vo.CustomerdockExcelVO; import com.win.module.wms.controller.customeritem.vo.*; import com.win.module.wms.convert.customeritem.CustomeritemConvert; import com.win.module.wms.dal.dataobject.customeritem.CustomeritemDO; @@ -94,7 +94,19 @@ public class CustomeritemController { PageResult pageResult = customeritemService.getCustomeritemPage(pageVO); return success(CustomeritemConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得客户物品分页") + @PreAuthorize("@ss.hasPermission('wms:customeritem:query')") + public CommonResult> getCustomeritemSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = customeritemService.getCustomeritemSenior(conditions); + PageResult result = CustomeritemConvert.INSTANCE.convertPage(pageResult); + for(CustomeritemRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出客户物品 Excel") @PreAuthorize("@ss.hasPermission('wms:customeritem:export')") @@ -109,7 +121,16 @@ public class CustomeritemController { //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); } - ExcelUtils.write(response, "客户物品.xls", "数据", CustomeritemExcelVO.class, datas); + Map mapDropDown = new HashMap<>(); + String[] cusotmerUom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM); + mapDropDown.put(3, cusotmerUom); + String[] packUnit = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.PACK_UNIT); + mapDropDown.put(5, packUnit); + String[] altPackUnit = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.PACK_UNIT); + mapDropDown.put(7, altPackUnit); + String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(10, available); + ExcelUtils.write(response, "客户物品.xls", "数据", CustomeritemExcelVO.class, datas,mapDropDown); } @GetMapping("/get-import-template") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/CustomerreceiptRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/CustomerreceiptRecordDetailController.java index b8b56ecf..a117237f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/CustomerreceiptRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/CustomerreceiptRecordDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.customerreceiptRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.customeritem.vo.CustomeritemExcelVO; import com.win.module.wms.controller.customerreceiptRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -92,7 +92,19 @@ public class CustomerreceiptRecordDetailController { PageResult pageResult = customerreceiptRecordDetailService.getCustomerreceiptRecordDetailPage(pageVO); return success(CustomerreceiptRecordDetailConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得账期日历分页") + @PreAuthorize("@ss.hasPermission('wms:customerreceipt-record-detail:query')") + public CommonResult> getCustomerreceiptRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = customerreceiptRecordDetailService.getCustomerreceiptRecordDetailSenior(conditions); + PageResult result = CustomerreceiptRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(CustomerreceiptRecordDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出客户收货记录子 Excel") @PreAuthorize("@ss.hasPermission('wms:customerreceipt-record-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/CustomerreceiptRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/CustomerreceiptRecordMainController.java index ad49c46e..054c7bd2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/CustomerreceiptRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/CustomerreceiptRecordMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.customerreceiptRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.customerreceiptRecord.vo.*; @@ -90,7 +91,19 @@ public class CustomerreceiptRecordMainController { PageResult pageResult = customerreceiptRecordMainService.getCustomerreceiptRecordMainPage(pageVO); return success(CustomerreceiptRecordMainConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得客户收货记录主分页") + @PreAuthorize("@ss.hasPermission('wms:customerreceipt-record-main:query')") + public CommonResult> getCustomerreceiptRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = customerreceiptRecordMainService.getCustomerreceiptRecordMainSenior(conditions); + PageResult result = CustomerreceiptRecordMainConvert.INSTANCE.convertPage(pageResult); + for(CustomerreceiptRecordMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出客户收货记录主 Excel") @PreAuthorize("@ss.hasPermission('wms:customerreceipt-record-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/CustomerreceiptRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/CustomerreceiptRequestDetailController.java index 6563f2a1..24585f1f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/CustomerreceiptRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/CustomerreceiptRequestDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.customerreceiptRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.customerreceiptRecord.vo.CustomerreceiptRecordDetailExcelVO; import com.win.module.wms.controller.customerreceiptRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -92,7 +92,19 @@ public class CustomerreceiptRequestDetailController { PageResult pageResult = customerreceiptRequestDetailService.getCustomerreceiptRequestDetailPage(pageVO); return success(CustomerreceiptRequestDetailConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得客户收货申请子分页") + @PreAuthorize("@ss.hasPermission('wms:customerreceipt-request-detail:query')") + public CommonResult> getCustomerreceiptRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = customerreceiptRequestDetailService.getCustomerreceiptRequestDetailSenior(conditions); + PageResult result = CustomerreceiptRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(CustomerreceiptRequestDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出客户收货申请子 Excel") @PreAuthorize("@ss.hasPermission('wms:customerreceipt-request-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/CustomerreceiptRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/CustomerreceiptRequestMainController.java index a2c7e438..0eaa52cb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/CustomerreceiptRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/CustomerreceiptRequestMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.customerreceiptRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.customerreceiptRequest.vo.*; @@ -91,7 +92,19 @@ public class CustomerreceiptRequestMainController { PageResult pageResult = customerreceiptRequestMainService.getCustomerreceiptRequestMainPage(pageVO); return success(CustomerreceiptRequestMainConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得客户收货申请主分页") + @PreAuthorize("@ss.hasPermission('wms:customerreceipt-request-main:query')") + public CommonResult> getCustomerreceiptRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = customerreceiptRequestMainService.getCustomerreceiptRequestMainSenior(conditions); + PageResult result = CustomerreceiptRequestMainConvert.INSTANCE.convertPage(pageResult); + for(CustomerreceiptRequestMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出客户收货申请主 Excel") @PreAuthorize("@ss.hasPermission('wms:customerreceipt-request-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/CustomerreturnJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/CustomerreturnJobDetailController.java index 7d26bb35..ca92c7e9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/CustomerreturnJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/CustomerreturnJobDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.customerreturnJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.customerreceiptRequest.vo.CustomerreceiptRequestMainExcelVO; import com.win.module.wms.controller.customerreturnJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -92,7 +92,19 @@ public class CustomerreturnJobDetailController { PageResult pageResult = customerreturnJobDetailService.getCustomerreturnJobDetailPage(pageVO); return success(CustomerreturnJobDetailConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得客户退货任务子分页") + @PreAuthorize("@ss.hasPermission('wms:customerreturn-job-detail:query')") + public CommonResult> getCustomerreturnJobDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = customerreturnJobDetailService.getCustomerreturnJobDetailSenior(conditions); + PageResult result = CustomerreturnJobDetailConvert.INSTANCE.convertPage(pageResult); + for(CustomerreturnJobDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出客户退货任务子 Excel") @PreAuthorize("@ss.hasPermission('wms:customerreturn-job-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/CustomerreturnJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/CustomerreturnJobMainController.java index 4539a6b3..7a1bcc3e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/CustomerreturnJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/CustomerreturnJobMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.customerreturnJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.customerreturnJob.vo.*; @@ -92,6 +93,19 @@ public class CustomerreturnJobMainController { return success(CustomerreturnJobMainConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得客户退货任务主分页") + @PreAuthorize("@ss.hasPermission('wms:customerreturn-job-main:query')") + public CommonResult> getCustomerreturnJobMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = customerreturnJobMainService.getCustomerreturnJobMainSenior(conditions); + PageResult result = CustomerreturnJobMainConvert.INSTANCE.convertPage(pageResult); + for(CustomerreturnJobMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出客户退货任务主 Excel") @PreAuthorize("@ss.hasPermission('wms:customerreturn-job-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/CustomerreturnRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/CustomerreturnRecordDetailController.java index c9507cc0..82fff5c5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/CustomerreturnRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/CustomerreturnRecordDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.customerreturnRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainExcelVO; import com.win.module.wms.controller.customerreturnRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -92,7 +92,19 @@ public class CustomerreturnRecordDetailController { PageResult pageResult = customerreturnRecordDetailService.getCustomerreturnRecordDetailPage(pageVO); return success(CustomerreturnRecordDetailConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得客户退货记录子分页") + @PreAuthorize("@ss.hasPermission('wms:customerreturn-record-detail:query')") + public CommonResult> getCustomerreturnRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = customerreturnRecordDetailService.getCustomerreturnRecordDetailSenior(conditions); + PageResult result = CustomerreturnRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(CustomerreturnRecordDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出客户退货记录子 Excel") @PreAuthorize("@ss.hasPermission('wms:customerreturn-record-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/CustomerreturnRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/CustomerreturnRecordMainController.java index be0bdc20..ee2059d8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/CustomerreturnRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/CustomerreturnRecordMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.customerreturnRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.customerreturnRecord.vo.*; @@ -91,7 +92,19 @@ public class CustomerreturnRecordMainController { PageResult pageResult = customerreturnRecordMainService.getCustomerreturnRecordMainPage(pageVO); return success(CustomerreturnRecordMainConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得客户退货记录主分页") + @PreAuthorize("@ss.hasPermission('wms:accountcalendar:query')") + public CommonResult> getCustomerreturnRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = customerreturnRecordMainService.getCustomerreturnRecordMainSenior(conditions); + PageResult result = CustomerreturnRecordMainConvert.INSTANCE.convertPage(pageResult); + for(CustomerreturnRecordMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出客户退货记录主 Excel") @PreAuthorize("@ss.hasPermission('wms:customerreturn-record-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/vo/CustomerreturnRecordMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/vo/CustomerreturnRecordMainRespVO.java index 07f91216..f8db1b9f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/vo/CustomerreturnRecordMainRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/vo/CustomerreturnRecordMainRespVO.java @@ -3,10 +3,18 @@ package com.win.module.wms.controller.customerreturnRecord.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import java.time.LocalDateTime; + @Schema(description = "管理后台 - 客户退货记录主 Response VO") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) public class CustomerreturnRecordMainRespVO extends CustomerreturnRecordMainBaseVO { + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + private LocalDateTime createTime; + + @Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED) + private String creator; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/CustomerreturnRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/CustomerreturnRequestDetailController.java index a613d32f..6cd49d99 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/CustomerreturnRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/CustomerreturnRequestDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.customerreturnRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.customerreturnRecord.vo.CustomerreturnRecordMainExcelVO; import com.win.module.wms.controller.customerreturnRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -92,7 +92,19 @@ public class CustomerreturnRequestDetailController { PageResult pageResult = customerreturnRequestDetailService.getCustomerreturnRequestDetailPage(pageVO); return success(CustomerreturnRequestDetailConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得客户退货申请子分页") + @PreAuthorize("@ss.hasPermission('wms:customerreturn-request-detail:query')") + public CommonResult> getCustomerreturnRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = customerreturnRequestDetailService.getCustomerreturnRequestDetailSenior(conditions); + PageResult result = CustomerreturnRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(CustomerreturnRequestDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出客户退货申请子 Excel") @PreAuthorize("@ss.hasPermission('wms:customerreturn-request-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/CustomerreturnRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/CustomerreturnRequestMainController.java index 55600d09..1fdaad55 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/CustomerreturnRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/CustomerreturnRequestMainController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.customerreturnRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.customerreturnRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -91,7 +91,19 @@ public class CustomerreturnRequestMainController { PageResult pageResult = customerreturnRequestMainService.getCustomerreturnRequestMainPage(pageVO); return success(CustomerreturnRequestMainConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得客户退货申请主分页") + @PreAuthorize("@ss.hasPermission('wms:customerreturn-request-main:query')") + public CommonResult> getCustomerreturnRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = customerreturnRequestMainService.getCustomerreturnRequestMainSenior(conditions); + PageResult result = CustomerreturnRequestMainConvert.INSTANCE.convertPage(pageResult); + for(CustomerreturnRequestMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出客户退货申请主 Excel") @PreAuthorize("@ss.hasPermission('wms:customerreturn-request-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/CustomersettleRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/CustomersettleRecordDetailController.java index 0bf15a5a..0cf578f0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/CustomersettleRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/CustomersettleRecordDetailController.java @@ -1,9 +1,8 @@ package com.win.module.wms.controller.customersettleRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.customerreturnRequest.vo.CustomerreturnRequestMainExcelVO; -import com.win.module.wms.controller.customersettleRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -92,7 +91,19 @@ public class CustomersettleRecordDetailController { PageResult pageResult = customersettleRecordDetailService.getCustomersettleRecordDetailPage(pageVO); return success(CustomersettleRecordDetailConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得客户结算记录子分页") + @PreAuthorize("@ss.hasPermission('wms:customersettle-record-detail:query')") + public CommonResult> getCustomersettleRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = customersettleRecordDetailService.getCustomersettleRecordDetailSenior(conditions); + PageResult result = CustomersettleRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(CustomersettleRecordDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出客户结算记录子 Excel") @PreAuthorize("@ss.hasPermission('wms:customersettle-record-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/CustomersettleRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/CustomersettleRecordMainController.java index 51be8bd2..57eb8db6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/CustomersettleRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/CustomersettleRecordMainController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.customersettleRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.customersettleRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -90,7 +90,19 @@ public class CustomersettleRecordMainController { PageResult pageResult = customersettleRecordMainService.getCustomersettleRecordMainPage(pageVO); return success(CustomersettleRecordMainConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得客户结算记录主分页") + @PreAuthorize("@ss.hasPermission('wms:customersettle-record-main:query')") + public CommonResult> getCustomersettleRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = customersettleRecordMainService.getCustomersettleRecordMainSenior(conditions); + PageResult result = CustomersettleRecordMainConvert.INSTANCE.convertPage(pageResult); + for(CustomersettleRecordMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出客户结算记录主 Excel") @PreAuthorize("@ss.hasPermission('wms:customersettle-record-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/CustomersettleRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/CustomersettleRequestDetailController.java index 1036bb0b..f1c5ebaf 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/CustomersettleRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/CustomersettleRequestDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.customersettleRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.customersettleRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -91,7 +91,19 @@ public class CustomersettleRequestDetailController { PageResult pageResult = customersettleRequestDetailService.getCustomersettleRequestDetailPage(pageVO); return success(CustomersettleRequestDetailConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得客户结算申请子分页") + @PreAuthorize("@ss.hasPermission('wms:customersettle-request-detail:query')") + public CommonResult> getCustomersettleRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = customersettleRequestDetailService.getCustomersettleRequestDetailSenior(conditions); + PageResult result = CustomersettleRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(CustomersettleRequestDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出客户结算申请子 Excel") @PreAuthorize("@ss.hasPermission('wms:customersettle-request-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/CustomersettleRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/CustomersettleRequestMainController.java index 9b3a00c1..6968cca7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/CustomersettleRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/CustomersettleRequestMainController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.customersettleRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.customersettleRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -90,7 +90,19 @@ public class CustomersettleRequestMainController { PageResult pageResult = customersettleRequestMainService.getCustomersettleRequestMainPage(pageVO); return success(CustomersettleRequestMainConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得客户结算申请主分页") + @PreAuthorize("@ss.hasPermission('wms:customersettle-request-main:query')") + public CommonResult> getCustomersettleRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = customersettleRequestMainService.getCustomersettleRequestMainSenior(conditions); + PageResult result = CustomersettleRequestMainConvert.INSTANCE.convertPage(pageResult); + for(CustomersettleRequestMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出客户结算申请主 Excel") @PreAuthorize("@ss.hasPermission('wms:customersettle-request-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/DeliverJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/DeliverJobDetailController.java index 874dbc70..cdb93eb2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/DeliverJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/DeliverJobDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.deliverJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.deliverJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -91,7 +91,19 @@ public class DeliverJobDetailController { PageResult pageResult = deliverJobDetailService.getDeliverJobDetailPage(pageVO); return success(DeliverJobDetailConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得发货任务子分页") + @PreAuthorize("@ss.hasPermission('wms:deliver-job-detail:query')") + public CommonResult> getDeliverJobDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = deliverJobDetailService.getDeliverJobDetailSenior(conditions); + PageResult result = DeliverJobDetailConvert.INSTANCE.convertPage(pageResult); + for(DeliverJobDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出发货任务子 Excel") @PreAuthorize("@ss.hasPermission('wms:deliver-job-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/DeliverJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/DeliverJobMainController.java index 6b00a9dc..1e313738 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/DeliverJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/DeliverJobMainController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.deliverJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.deliverJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -91,7 +91,19 @@ public class DeliverJobMainController { PageResult pageResult = deliverJobMainService.getDeliverJobMainPage(pageVO); return success(DeliverJobMainConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得发货任务主分页") + @PreAuthorize("@ss.hasPermission('wms:deliver-job-main:query')") + public CommonResult> getDeliverJobMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = deliverJobMainService.getDeliverJobMainSenior(conditions); + PageResult result = DeliverJobMainConvert.INSTANCE.convertPage(pageResult); + for(DeliverJobMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出发货任务主 Excel") @PreAuthorize("@ss.hasPermission('wms:deliver-job-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/DeliverPlanDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/DeliverPlanDetailController.java index 68a9820f..1a1a90f4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/DeliverPlanDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/DeliverPlanDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.deliverPlan; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.deliverPlan.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -91,7 +91,19 @@ public class DeliverPlanDetailController { PageResult pageResult = deliverPlanDetailService.getDeliverPlanDetailPage(pageVO); return success(DeliverPlanDetailConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得发货计划子分页") + @PreAuthorize("@ss.hasPermission('wms:deliver-plan-detail:query')") + public CommonResult> getDeliverPlanDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = deliverPlanDetailService.getDeliverPlanDetailSenior(conditions); + PageResult result = DeliverPlanDetailConvert.INSTANCE.convertPage(pageResult); + for(DeliverPlanDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出发货计划子 Excel") @PreAuthorize("@ss.hasPermission('wms:deliver-plan-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/DeliverPlanMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/DeliverPlanMainController.java index 89272de1..7633d827 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/DeliverPlanMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/DeliverPlanMainController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.deliverPlan; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.deliverPlan.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -90,7 +90,19 @@ public class DeliverPlanMainController { PageResult pageResult = deliverPlanMainService.getDeliverPlanMainPage(pageVO); return success(DeliverPlanMainConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得发货计划主分页") + @PreAuthorize("@ss.hasPermission('wms:wms:deliver-plan-main:query')") + public CommonResult> getDeliverPlanMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = deliverPlanMainService.getDeliverPlanMainSenior(conditions); + PageResult result = DeliverPlanMainConvert.INSTANCE.convertPage(pageResult); + for(DeliverPlanMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出发货计划主 Excel") @PreAuthorize("@ss.hasPermission('wms:deliver-plan-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/DeliverRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/DeliverRecordDetailController.java index d2f5124c..c8d40924 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/DeliverRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/DeliverRecordDetailController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.deliverRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.deliverRecord.vo.*; @@ -24,8 +25,6 @@ import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; - -import com.win.module.wms.controller.deliverRecord.vo.*; import com.win.module.wms.dal.dataobject.deliverRecord.DeliverRecordDetailDO; import com.win.module.wms.convert.deliverRecord.DeliverRecordDetailConvert; import com.win.module.wms.service.deliverRecord.DeliverRecordDetailService; @@ -91,6 +90,20 @@ public class DeliverRecordDetailController { return success(DeliverRecordDetailConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得发货记录子分页") + @PreAuthorize("@ss.hasPermission('wms:deliver-record-detail:query')") + public CommonResult> getDeliverRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = deliverRecordDetailService.getDeliverRecordDetailSenior(conditions); + PageResult result = DeliverRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(DeliverRecordDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + @GetMapping("/export-excel") @Operation(summary = "导出发货记录子 Excel") @PreAuthorize("@ss.hasPermission('wms:deliver-record-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/DeliverRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/DeliverRecordMainController.java index a62afd81..07638b8c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/DeliverRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/DeliverRecordMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.deliverRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.deliverRecord.vo.*; @@ -25,7 +26,6 @@ import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; -import com.win.module.wms.controller.deliverRecord.vo.*; import com.win.module.wms.dal.dataobject.deliverRecord.DeliverRecordMainDO; import com.win.module.wms.convert.deliverRecord.DeliverRecordMainConvert; import com.win.module.wms.service.deliverRecord.DeliverRecordMainService; @@ -92,6 +92,19 @@ public class DeliverRecordMainController { return success(DeliverRecordMainConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得发货记录主分页") + @PreAuthorize("@ss.hasPermission('wms:deliver-record-main:query')") + public CommonResult> getDeliverRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = deliverRecordMainService.getDeliverRecordMainSenior(conditions); + PageResult result = DeliverRecordMainConvert.INSTANCE.convertPage(pageResult); + for(DeliverRecordMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出发货记录主 Excel") @PreAuthorize("@ss.hasPermission('wms:deliver-record-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/DeliverRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/DeliverRequestDetailController.java index f41effe7..7bfafe8a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/DeliverRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/DeliverRequestDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.deliverRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.deliverRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -92,6 +92,20 @@ public class DeliverRequestDetailController { return success(DeliverRequestDetailConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得发货申请子分页") + @PreAuthorize("@ss.hasPermission('wms:deliver-request-detail:query')") + public CommonResult> getDeliverRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = deliverRequestDetailService.getDeliverRequestDetailSenior(conditions); + PageResult result = DeliverRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(DeliverRequestDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + @GetMapping("/export-excel") @Operation(summary = "导出发货申请子 Excel") @PreAuthorize("@ss.hasPermission('wms:deliver-request-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/DeliverRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/DeliverRequestMainController.java index dc95aadc..b4d8acce 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/DeliverRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/DeliverRequestMainController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.deliverRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.deliverRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -92,6 +92,19 @@ public class DeliverRequestMainController { return success(DeliverRequestMainConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得发货申请主分页") + @PreAuthorize("@ss.hasPermission('wms:deliver-request-main:query')") + public CommonResult> getDeliverRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = deliverRequestMainService.getDeliverRequestMainSenior(conditions); + PageResult result = DeliverRequestMainConvert.INSTANCE.convertPage(pageResult); + for(DeliverRequestMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出发货申请主 Excel") @PreAuthorize("@ss.hasPermission('wms:deliver-request-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/DemandforecastingDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/DemandforecastingDetailController.java index a824b2f5..03442ab8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/DemandforecastingDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/DemandforecastingDetailController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.demandforecasting; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.demandforecasting.vo.*; @@ -92,6 +93,19 @@ public class DemandforecastingDetailController { return success(DemandforecastingDetailConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得要货预测子分页") + @PreAuthorize("@ss.hasPermission('wms:demandforecasting-detail:query')") + public CommonResult> getDemandforecastingDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = demandforecastingDetailService.getDemandforecastingDetailSenior(conditions); + PageResult result = DemandforecastingDetailConvert.INSTANCE.convertPage(pageResult); + for(DemandforecastingDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出要货预测子 Excel") @PreAuthorize("@ss.hasPermission('wms:demandforecasting-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/DemandforecastingMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/DemandforecastingMainController.java index be8439b6..b3cfbccc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/DemandforecastingMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/DemandforecastingMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.demandforecasting; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.demandforecasting.vo.*; @@ -91,6 +92,19 @@ public class DemandforecastingMainController { return success(DemandforecastingMainConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得要货预测主分页") + @PreAuthorize("@ss.hasPermission('wms:demandforecasting-main:query')") + public CommonResult> getDemandforecastingMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = demandforecastingMainService.getDemandforecastingMainSenior(conditions); + PageResult result = DemandforecastingMainConvert.INSTANCE.convertPage(pageResult); + for(DemandforecastingMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出要货预测主 Excel") @PreAuthorize("@ss.hasPermission('wms:demandforecasting-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRecord/DismantleRecordDetailbController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRecord/DismantleRecordDetailbController.java deleted file mode 100644 index 228e4d62..00000000 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRecord/DismantleRecordDetailbController.java +++ /dev/null @@ -1,112 +0,0 @@ -package com.win.module.wms.controller.dismantleRecord; - -import com.win.module.system.api.user.AdminUserApi; -import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.dismantleRecord.vo.*; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; - -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; -import java.io.IOException; - -import com.win.framework.common.pojo.PageResult; -import com.win.framework.common.pojo.CommonResult; -import static com.win.framework.common.pojo.CommonResult.success; - -import com.win.framework.excel.core.util.ExcelUtils; - -import com.win.framework.operatelog.core.annotations.OperateLog; -import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; - -import com.win.module.wms.controller.dismantleRecord.vo.*; -import com.win.module.wms.dal.dataobject.dismantleRecord.DismantleRecordDetailbDO; -import com.win.module.wms.convert.dismantleRecord.DismantleRecordDetailbConvert; -import com.win.module.wms.service.dismantleRecord.DismantleRecordDetailbService; - -@Tag(name = "管理后台 - 制品拆解记录子") -@RestController -@RequestMapping("/wms/dismantle-record-detailb") -@Validated -public class DismantleRecordDetailbController { - - @Resource - private DismantleRecordDetailbService dismantleRecordDetailbService; - - @Resource - private AdminUserApi userApi; - - @PostMapping("/create") - @Operation(summary = "创建制品拆解记录子") - @PreAuthorize("@ss.hasPermission('wms:dismantle-record-detailb:create')") - public CommonResult createDismantleRecordDetailb(@Valid @RequestBody DismantleRecordDetailbCreateReqVO createReqVO) { - return success(dismantleRecordDetailbService.createDismantleRecordDetailb(createReqVO)); - } - - @PutMapping("/update") - @Operation(summary = "更新制品拆解记录子") - @PreAuthorize("@ss.hasPermission('wms:dismantle-record-detailb:update')") - public CommonResult updateDismantleRecordDetailb(@Valid @RequestBody DismantleRecordDetailbUpdateReqVO updateReqVO) { - dismantleRecordDetailbService.updateDismantleRecordDetailb(updateReqVO); - return success(true); - } - - @DeleteMapping("/delete") - @Operation(summary = "删除制品拆解记录子") - @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('wms:dismantle-record-detailb:delete')") - public CommonResult deleteDismantleRecordDetailb(@RequestParam("id") Long id) { - dismantleRecordDetailbService.deleteDismantleRecordDetailb(id); - return success(true); - } - - @GetMapping("/get") - @Operation(summary = "获得制品拆解记录子") - @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('wms:dismantle-record-detailb:query')") - public CommonResult getDismantleRecordDetailb(@RequestParam("id") Long id) { - DismantleRecordDetailbDO dismantleRecordDetailb = dismantleRecordDetailbService.getDismantleRecordDetailb(id); - return success(DismantleRecordDetailbConvert.INSTANCE.convert(dismantleRecordDetailb)); - } - - @GetMapping("/list") - @Operation(summary = "获得制品拆解记录子列表") - @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") - @PreAuthorize("@ss.hasPermission('wms:dismantle-record-detailb:query')") - public CommonResult> getDismantleRecordDetailbList(@RequestParam("ids") Collection ids) { - List list = dismantleRecordDetailbService.getDismantleRecordDetailbList(ids); - return success(DismantleRecordDetailbConvert.INSTANCE.convertList(list)); - } - - @GetMapping("/page") - @Operation(summary = "获得制品拆解记录子分页") - @PreAuthorize("@ss.hasPermission('wms:dismantle-record-detailb:query')") - public CommonResult> getDismantleRecordDetailbPage(@Valid DismantleRecordDetailbPageReqVO pageVO) { - PageResult pageResult = dismantleRecordDetailbService.getDismantleRecordDetailbPage(pageVO); - return success(DismantleRecordDetailbConvert.INSTANCE.convertPage(pageResult)); - } - - @GetMapping("/export-excel") - @Operation(summary = "导出制品拆解记录子 Excel") - @PreAuthorize("@ss.hasPermission('wms:dismantle-record-detailb:export')") - @OperateLog(type = EXPORT) - public void exportDismantleRecordDetailbExcel(@Valid DismantleRecordDetailbExportReqVO exportReqVO, - HttpServletResponse response) throws IOException { - List list = dismantleRecordDetailbService.getDismantleRecordDetailbList(exportReqVO); - // 导出 Excel - List datas = DismantleRecordDetailbConvert.INSTANCE.convertList02(list); - for(DismantleRecordDetailbExcelVO vo : datas) { - AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 - vo.setCreator(user.getNickname()); - } - ExcelUtils.write(response, "制品拆解记录子.xls", "数据", DismantleRecordDetailbExcelVO.class, datas); - } - -} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRecord/vo/DismantleRecordDetailbCreateReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRecord/vo/DismantleRecordDetailbCreateReqVO.java deleted file mode 100644 index 268a28ec..00000000 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRecord/vo/DismantleRecordDetailbCreateReqVO.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.win.module.wms.controller.dismantleRecord.vo; - -import lombok.*; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema(description = "管理后台 - 制品拆解记录子创建 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class DismantleRecordDetailbCreateReqVO extends DismantleRecordDetailbBaseVO { - -} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRecord/vo/DismantleRecordDetailbRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRecord/vo/DismantleRecordDetailbRespVO.java deleted file mode 100644 index c713c253..00000000 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRecord/vo/DismantleRecordDetailbRespVO.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.win.module.wms.controller.dismantleRecord.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; - -@Schema(description = "管理后台 - 制品拆解记录子 Response VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class DismantleRecordDetailbRespVO extends DismantleRecordDetailbBaseVO { - -} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRecord/vo/DismantleRecordDetailbUpdateReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRecord/vo/DismantleRecordDetailbUpdateReqVO.java deleted file mode 100644 index 8d71ed6e..00000000 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRecord/vo/DismantleRecordDetailbUpdateReqVO.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.win.module.wms.controller.dismantleRecord.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; - -@Schema(description = "管理后台 - 制品拆解记录子更新 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class DismantleRecordDetailbUpdateReqVO extends DismantleRecordDetailbBaseVO { - -} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRequest/vo/DismantleRequestDetailbCreateReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRequest/vo/DismantleRequestDetailbCreateReqVO.java deleted file mode 100644 index ec843b19..00000000 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRequest/vo/DismantleRequestDetailbCreateReqVO.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.win.module.wms.controller.dismantleRequest.vo; - -import lombok.*; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema(description = "管理后台 - 制品拆解申请子创建 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class DismantleRequestDetailbCreateReqVO extends DismantleRequestDetailbBaseVO { - -} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRequest/vo/DismantleRequestDetailbRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRequest/vo/DismantleRequestDetailbRespVO.java deleted file mode 100644 index ea084d00..00000000 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRequest/vo/DismantleRequestDetailbRespVO.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.win.module.wms.controller.dismantleRequest.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; - -@Schema(description = "管理后台 - 制品拆解申请子 Response VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class DismantleRequestDetailbRespVO extends DismantleRequestDetailbBaseVO { - -} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRequest/vo/DismantleRequestDetailbUpdateReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRequest/vo/DismantleRequestDetailbUpdateReqVO.java deleted file mode 100644 index 8c130315..00000000 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRequest/vo/DismantleRequestDetailbUpdateReqVO.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.win.module.wms.controller.dismantleRequest.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; - -@Schema(description = "管理后台 - 制品拆解申请子更新 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class DismantleRequestDetailbUpdateReqVO extends DismantleRequestDetailbBaseVO { - -} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/DismantleRecordDetailbController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/DismantleRecordDetailbController.java new file mode 100644 index 00000000..e68777e2 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/DismantleRecordDetailbController.java @@ -0,0 +1,124 @@ +package com.win.module.wms.controller.productdismantleRecord; + +import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.excel.core.util.ExcelUtils; +import com.win.framework.operatelog.core.annotations.OperateLog; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.productdismantleRecord.vo.*; +import com.win.module.wms.convert.productdismantleRecord.ProductdismantleRecordDetailbConvert; +import com.win.module.wms.dal.dataobject.productdismantleRecord.ProductdismantleRecordDetailbDO; +import com.win.module.wms.service.productdismantleRecord.ProductdismantleRecordDetailbService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.io.IOException; +import java.util.Collection; +import java.util.List; + +import static com.win.framework.common.pojo.CommonResult.success; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; + +@Tag(name = "管理后台 - 制品拆解记录子") +@RestController +@RequestMapping("/wms/dismantle-record-detailb") +@Validated +public class DismantleRecordDetailbController { + + @Resource + private ProductdismantleRecordDetailbService dismantleRecordDetailbService; + + @Resource + private AdminUserApi userApi; + + @PostMapping("/create") + @Operation(summary = "创建制品拆解记录子") + @PreAuthorize("@ss.hasPermission('wms:productdismantle-record-detailb:create')") + public CommonResult createDismantleRecordDetailb(@Valid @RequestBody ProductdismantleRecordDetailbCreateReqVO createReqVO) { + return success(dismantleRecordDetailbService.createDismantleRecordDetailb(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新制品拆解记录子") + @PreAuthorize("@ss.hasPermission('wms:productdismantle-record-detailb:update')") + public CommonResult updateDismantleRecordDetailb(@Valid @RequestBody ProductdismantleRecordDetailbUpdateReqVO updateReqVO) { + dismantleRecordDetailbService.updateDismantleRecordDetailb(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除制品拆解记录子") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('wms:productdismantle-record-detailb:delete')") + public CommonResult deleteDismantleRecordDetailb(@RequestParam("id") Long id) { + dismantleRecordDetailbService.deleteDismantleRecordDetailb(id); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得制品拆解记录子") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('wms:productdismantle-record-detailb:query')") + public CommonResult getDismantleRecordDetailb(@RequestParam("id") Long id) { + ProductdismantleRecordDetailbDO dismantleRecordDetailb = dismantleRecordDetailbService.getDismantleRecordDetailb(id); + return success(ProductdismantleRecordDetailbConvert.INSTANCE.convert(dismantleRecordDetailb)); + } + + @GetMapping("/list") + @Operation(summary = "获得制品拆解记录子列表") + @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") + @PreAuthorize("@ss.hasPermission('wms:productdismantle-record-detailb:query')") + public CommonResult> getDismantleRecordDetailbList(@RequestParam("ids") Collection ids) { + List list = dismantleRecordDetailbService.getDismantleRecordDetailbList(ids); + return success(ProductdismantleRecordDetailbConvert.INSTANCE.convertList(list)); + } + + @GetMapping("/page") + @Operation(summary = "获得制品拆解记录子分页") + @PreAuthorize("@ss.hasPermission('wms:productdismantle-record-detailb:query')") + public CommonResult> getDismantleRecordDetailbPage(@Valid ProductdismantleRecordDetailbPageReqVO pageVO) { + PageResult pageResult = dismantleRecordDetailbService.getDismantleRecordDetailbPage(pageVO); + return success(ProductdismantleRecordDetailbConvert.INSTANCE.convertPage(pageResult)); + } + + @PostMapping("/senior") + @Operation(summary = "高级搜索获得制品拆解记录子分页") + @PreAuthorize("@ss.hasPermission('wms:productdismantle-record-detailb:query')") + public CommonResult> getDismantleRecordDetailbSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = dismantleRecordDetailbService.getDismantleRecordDetailbSenior(conditions); + PageResult result = ProductdismantleRecordDetailbConvert.INSTANCE.convertPage(pageResult); + for(ProductdismantleRecordDetailbRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出制品拆解记录子 Excel") + @PreAuthorize("@ss.hasPermission('wms:productdismantle-record-detailb:export')") + @OperateLog(type = EXPORT) + public void exportDismantleRecordDetailbExcel(@Valid ProductdismantleRecordDetailbExportReqVO exportReqVO, + HttpServletResponse response) throws IOException { + List list = dismantleRecordDetailbService.getDismantleRecordDetailbList(exportReqVO); + // 导出 Excel + List datas = ProductdismantleRecordDetailbConvert.INSTANCE.convertList02(list); + for(ProductdismantleRecordDetailbExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + ExcelUtils.write(response, "制品拆解记录子.xls", "数据", ProductdismantleRecordDetailbExcelVO.class, datas); + } + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecordMain/ProductdismantleRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/ProductdismantleRecordMainController.java similarity index 77% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecordMain/ProductdismantleRecordMainController.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/ProductdismantleRecordMainController.java index 0ea6c569..61b2cc2e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecordMain/ProductdismantleRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/ProductdismantleRecordMainController.java @@ -1,34 +1,32 @@ -package com.win.module.wms.controller.productdismantleRecordMain; +package com.win.module.wms.controller.productdismantleRecord; +import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.excel.core.util.ExcelUtils; +import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.productdismantleRecordMain.vo.*; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.controller.productdismantleRecord.vo.*; +import com.win.module.wms.convert.productdismantleRecord.ProductdismantleRecordMainConvert; +import com.win.module.wms.dal.dataobject.productdismantleRecord.ProductdismantleRecordMainDO; +import com.win.module.wms.service.productdismantleRecord.ProductdismantleRecordMainService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; import java.io.IOException; +import java.util.Collection; +import java.util.List; -import com.win.framework.common.pojo.PageResult; -import com.win.framework.common.pojo.CommonResult; import static com.win.framework.common.pojo.CommonResult.success; - -import com.win.framework.excel.core.util.ExcelUtils; - -import com.win.framework.operatelog.core.annotations.OperateLog; -import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; - -import com.win.module.wms.controller.productdismantleRecordMain.vo.*; -import com.win.module.wms.dal.dataobject.productdismantleRecordMain.ProductdismantleRecordMainDO; -import com.win.module.wms.convert.productdismantleRecordMain.ProductdismantleRecordMainConvert; -import com.win.module.wms.service.productdismantleRecordMain.ProductdismantleRecordMainService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 制品拆解记录主") @RestController @@ -92,6 +90,20 @@ public class ProductdismantleRecordMainController { return success(ProductdismantleRecordMainConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得制品拆解记录主分页") + @PreAuthorize("@ss.hasPermission('wms:productdismantle-record-main:query')") + public CommonResult> getProductdismantleRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productdismantleRecordMainService.getProductdismantleRecordMainSenior(conditions); + PageResult result = ProductdismantleRecordMainConvert.INSTANCE.convertPage(pageResult); + for(ProductdismantleRecordMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + @GetMapping("/export-excel") @Operation(summary = "导出制品拆解记录主 Excel") @PreAuthorize("@ss.hasPermission('wms:productdismantle-record-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRecord/vo/DismantleRecordDetailbBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailbBaseVO.java similarity index 92% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRecord/vo/DismantleRecordDetailbBaseVO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailbBaseVO.java index 33b714ab..544ac5fa 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRecord/vo/DismantleRecordDetailbBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailbBaseVO.java @@ -1,12 +1,11 @@ -package com.win.module.wms.controller.dismantleRecord.vo; +package com.win.module.wms.controller.productdismantleRecord.vo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import javax.validation.constraints.*; +import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; /** @@ -14,7 +13,7 @@ import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 */ @Data -public class DismantleRecordDetailbBaseVO { +public class ProductdismantleRecordDetailbBaseVO { @Schema(description = "id", example = "id") private Long id; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailbCreateReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailbCreateReqVO.java new file mode 100644 index 00000000..7fcf50c9 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailbCreateReqVO.java @@ -0,0 +1,14 @@ +package com.win.module.wms.controller.productdismantleRecord.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +@Schema(description = "管理后台 - 制品拆解记录子创建 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class ProductdismantleRecordDetailbCreateReqVO extends ProductdismantleRecordDetailbBaseVO { + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRecord/vo/DismantleRecordDetailbExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailbExcelVO.java similarity index 91% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRecord/vo/DismantleRecordDetailbExcelVO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailbExcelVO.java index 85e7f8d8..e0eb2a3f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRecord/vo/DismantleRecordDetailbExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailbExcelVO.java @@ -1,13 +1,11 @@ -package com.win.module.wms.controller.dismantleRecord.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; +package com.win.module.wms.controller.productdismantleRecord.vo; import com.alibaba.excel.annotation.ExcelProperty; import com.win.framework.excel.core.annotations.DictFormat; import com.win.framework.excel.core.convert.DictConvert; +import lombok.Data; + +import java.time.LocalDateTime; /** @@ -16,7 +14,7 @@ import com.win.framework.excel.core.convert.DictConvert; * @author 超级管理员 */ @Data -public class DismantleRecordDetailbExcelVO { +public class ProductdismantleRecordDetailbExcelVO { @ExcelProperty("工序代码") private String processCode; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRecord/vo/DismantleRecordDetailbExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailbExportReqVO.java similarity index 91% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRecord/vo/DismantleRecordDetailbExportReqVO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailbExportReqVO.java index 3d8567d0..1d3ae0d2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRecord/vo/DismantleRecordDetailbExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailbExportReqVO.java @@ -1,17 +1,16 @@ -package com.win.module.wms.controller.dismantleRecord.vo; +package com.win.module.wms.controller.productdismantleRecord.vo; -import lombok.*; -import java.util.*; import io.swagger.v3.oas.annotations.media.Schema; -import com.win.framework.common.pojo.PageParam; -import java.time.LocalDateTime; +import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 制品拆解记录子 Excel 导出 Request VO，参数和 DismantleRecordDetailbPageReqVO 是一致的") @Data -public class DismantleRecordDetailbExportReqVO { +public class ProductdismantleRecordDetailbExportReqVO { @Schema(description = "工序代码") private String processCode; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRecord/vo/DismantleRecordDetailbPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailbPageReqVO.java similarity index 90% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRecord/vo/DismantleRecordDetailbPageReqVO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailbPageReqVO.java index d0eea4f9..1243671c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRecord/vo/DismantleRecordDetailbPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailbPageReqVO.java @@ -1,10 +1,12 @@ -package com.win.module.wms.controller.dismantleRecord.vo; +package com.win.module.wms.controller.productdismantleRecord.vo; -import lombok.*; -import java.util.*; -import io.swagger.v3.oas.annotations.media.Schema; import com.win.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import org.springframework.format.annotation.DateTimeFormat; + import java.time.LocalDateTime; import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @@ -13,7 +15,7 @@ import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) -public class DismantleRecordDetailbPageReqVO extends PageParam { +public class ProductdismantleRecordDetailbPageReqVO extends PageParam { @Schema(description = "工序代码") private String processCode; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailbRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailbRespVO.java new file mode 100644 index 00000000..7c648640 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailbRespVO.java @@ -0,0 +1,14 @@ +package com.win.module.wms.controller.productdismantleRecord.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +@Schema(description = "管理后台 - 制品拆解记录子 Response VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class ProductdismantleRecordDetailbRespVO extends ProductdismantleRecordDetailbBaseVO { + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailbUpdateReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailbUpdateReqVO.java new file mode 100644 index 00000000..0472aa76 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailbUpdateReqVO.java @@ -0,0 +1,14 @@ +package com.win.module.wms.controller.productdismantleRecord.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +@Schema(description = "管理后台 - 制品拆解记录子更新 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class ProductdismantleRecordDetailbUpdateReqVO extends ProductdismantleRecordDetailbBaseVO { + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecordMain/vo/ProductdismantleRecordMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordMainBaseVO.java similarity index 90% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecordMain/vo/ProductdismantleRecordMainBaseVO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordMainBaseVO.java index 27608b4f..8f4511de 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecordMain/vo/ProductdismantleRecordMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordMainBaseVO.java @@ -1,16 +1,11 @@ -package com.win.module.wms.controller.productdismantleRecordMain.vo; +package com.win.module.wms.controller.productdismantleRecord.vo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import javax.validation.constraints.*; +import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecordMain/vo/ProductdismantleRecordMainCreateReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordMainCreateReqVO.java similarity index 67% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecordMain/vo/ProductdismantleRecordMainCreateReqVO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordMainCreateReqVO.java index 582bf733..70b526a7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecordMain/vo/ProductdismantleRecordMainCreateReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordMainCreateReqVO.java @@ -1,7 +1,9 @@ -package com.win.module.wms.controller.productdismantleRecordMain.vo; +package com.win.module.wms.controller.productdismantleRecord.vo; -import lombok.*; import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; @Schema(description = "管理后台 - 制品拆解记录主创建 Request VO") @Data diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecordMain/vo/ProductdismantleRecordMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordMainExcelVO.java similarity index 88% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecordMain/vo/ProductdismantleRecordMainExcelVO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordMainExcelVO.java index ab2b3776..5ce371ae 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecordMain/vo/ProductdismantleRecordMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordMainExcelVO.java @@ -1,17 +1,11 @@ -package com.win.module.wms.controller.productdismantleRecordMain.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; +package com.win.module.wms.controller.productdismantleRecord.vo; import com.alibaba.excel.annotation.ExcelProperty; import com.win.framework.excel.core.annotations.DictFormat; import com.win.framework.excel.core.convert.DictConvert; +import lombok.Data; + +import java.time.LocalDateTime; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecordMain/vo/ProductdismantleRecordMainExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordMainExportReqVO.java similarity index 94% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecordMain/vo/ProductdismantleRecordMainExportReqVO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordMainExportReqVO.java index 7cf196e5..e485dc9d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecordMain/vo/ProductdismantleRecordMainExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordMainExportReqVO.java @@ -1,12 +1,11 @@ -package com.win.module.wms.controller.productdismantleRecordMain.vo; +package com.win.module.wms.controller.productdismantleRecord.vo; -import lombok.*; -import java.util.*; import io.swagger.v3.oas.annotations.media.Schema; -import com.win.framework.common.pojo.PageParam; -import java.time.LocalDateTime; +import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 制品拆解记录主 Excel 导出 Request VO，参数和 ProductdismantleRecordMainPageReqVO 是一致的") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecordMain/vo/ProductdismantleRecordMainPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordMainPageReqVO.java similarity index 94% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecordMain/vo/ProductdismantleRecordMainPageReqVO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordMainPageReqVO.java index 3a69fe34..6495c79f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecordMain/vo/ProductdismantleRecordMainPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordMainPageReqVO.java @@ -1,10 +1,12 @@ -package com.win.module.wms.controller.productdismantleRecordMain.vo; +package com.win.module.wms.controller.productdismantleRecord.vo; -import lombok.*; -import java.util.*; -import io.swagger.v3.oas.annotations.media.Schema; import com.win.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import org.springframework.format.annotation.DateTimeFormat; + import java.time.LocalDateTime; import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecordMain/vo/ProductdismantleRecordMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordMainRespVO.java similarity index 67% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecordMain/vo/ProductdismantleRecordMainRespVO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordMainRespVO.java index 27a1f904..326b52ef 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecordMain/vo/ProductdismantleRecordMainRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordMainRespVO.java @@ -1,7 +1,9 @@ -package com.win.module.wms.controller.productdismantleRecordMain.vo; +package com.win.module.wms.controller.productdismantleRecord.vo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; @Schema(description = "管理后台 - 制品拆解记录主 Response VO") @Data diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecordMain/vo/ProductdismantleRecordMainUpdateReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordMainUpdateReqVO.java similarity index 67% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecordMain/vo/ProductdismantleRecordMainUpdateReqVO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordMainUpdateReqVO.java index 0a93ba24..0a19e184 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecordMain/vo/ProductdismantleRecordMainUpdateReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordMainUpdateReqVO.java @@ -1,7 +1,9 @@ -package com.win.module.wms.controller.productdismantleRecordMain.vo; +package com.win.module.wms.controller.productdismantleRecord.vo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; @Schema(description = "管理后台 - 制品拆解记录主更新 Request VO") @Data diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRequest/DismantleRequestDetailbController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/ProductdismantleRequestDetailbController.java similarity index 53% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRequest/DismantleRequestDetailbController.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/ProductdismantleRequestDetailbController.java index 6ec55b89..4bf7cfe0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRequest/DismantleRequestDetailbController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/ProductdismantleRequestDetailbController.java @@ -1,43 +1,40 @@ -package com.win.module.wms.controller.dismantleRequest; +package com.win.module.wms.controller.productdismantleRequest; +import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.excel.core.util.ExcelUtils; +import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.dismantleRequest.vo.*; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.controller.productdismantleRequest.vo.*; +import com.win.module.wms.convert.productdismantleRequest.ProductdismantleRequestDetailbConvert; +import com.win.module.wms.dal.dataobject.productdismantleRequest.ProductdismantleRequestDetailbDO; +import com.win.module.wms.service.productdismantleRequest.ProductdismantleRequestDetailbService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; import java.io.IOException; +import java.util.Collection; +import java.util.List; -import com.win.framework.common.pojo.PageResult; -import com.win.framework.common.pojo.CommonResult; import static com.win.framework.common.pojo.CommonResult.success; - -import com.win.framework.excel.core.util.ExcelUtils; - -import com.win.framework.operatelog.core.annotations.OperateLog; -import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; - -import com.win.module.wms.controller.dismantleRequest.vo.*; -import com.win.module.wms.dal.dataobject.dismantleRequest.DismantleRequestDetailbDO; -import com.win.module.wms.convert.dismantleRequest.DismantleRequestDetailbConvert; -import com.win.module.wms.service.dismantleRequest.DismantleRequestDetailbService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 制品拆解申请子") @RestController @RequestMapping("/wms/dismantle-request-detailb") @Validated -public class DismantleRequestDetailbController { +public class ProductdismantleRequestDetailbController { @Resource - private DismantleRequestDetailbService dismantleRequestDetailbService; + private ProductdismantleRequestDetailbService productdismantleRequestDetailbService; @Resource private AdminUserApi userApi; @@ -45,15 +42,15 @@ public class DismantleRequestDetailbController { @PostMapping("/create") @Operation(summary = "创建制品拆解申请子") @PreAuthorize("@ss.hasPermission('wms:dismantle-request-detailb:create')") - public CommonResult createDismantleRequestDetailb(@Valid @RequestBody DismantleRequestDetailbCreateReqVO createReqVO) { - return success(dismantleRequestDetailbService.createDismantleRequestDetailb(createReqVO)); + public CommonResult createDismantleRequestDetailb(@Valid @RequestBody ProductdismantleRequestDetailbCreateReqVO createReqVO) { + return success(productdismantleRequestDetailbService.createDismantleRequestDetailb(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新制品拆解申请子") @PreAuthorize("@ss.hasPermission('wms:dismantle-request-detailb:update')") - public CommonResult updateDismantleRequestDetailb(@Valid @RequestBody DismantleRequestDetailbUpdateReqVO updateReqVO) { - dismantleRequestDetailbService.updateDismantleRequestDetailb(updateReqVO); + public CommonResult updateDismantleRequestDetailb(@Valid @RequestBody ProductdismantleRequestDetailbUpdateReqVO updateReqVO) { + productdismantleRequestDetailbService.updateDismantleRequestDetailb(updateReqVO); return success(true); } @@ -62,7 +59,7 @@ public class DismantleRequestDetailbController { @Parameter(name = "id", description = "编号", required = true) @PreAuthorize("@ss.hasPermission('wms:dismantle-request-detailb:delete')") public CommonResult deleteDismantleRequestDetailb(@RequestParam("id") Long id) { - dismantleRequestDetailbService.deleteDismantleRequestDetailb(id); + productdismantleRequestDetailbService.deleteDismantleRequestDetailb(id); return success(true); } @@ -70,43 +67,43 @@ public class DismantleRequestDetailbController { @Operation(summary = "获得制品拆解申请子") @Parameter(name = "id", description = "编号", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('wms:dismantle-request-detailb:query')") - public CommonResult getDismantleRequestDetailb(@RequestParam("id") Long id) { - DismantleRequestDetailbDO dismantleRequestDetailb = dismantleRequestDetailbService.getDismantleRequestDetailb(id); - return success(DismantleRequestDetailbConvert.INSTANCE.convert(dismantleRequestDetailb)); + public CommonResult getDismantleRequestDetailb(@RequestParam("id") Long id) { + ProductdismantleRequestDetailbDO dismantleRequestDetailb = productdismantleRequestDetailbService.getDismantleRequestDetailb(id); + return success(ProductdismantleRequestDetailbConvert.INSTANCE.convert(dismantleRequestDetailb)); } @GetMapping("/list") @Operation(summary = "获得制品拆解申请子列表") @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") @PreAuthorize("@ss.hasPermission('wms:dismantle-request-detailb:query')") - public CommonResult> getDismantleRequestDetailbList(@RequestParam("ids") Collection ids) { - List list = dismantleRequestDetailbService.getDismantleRequestDetailbList(ids); - return success(DismantleRequestDetailbConvert.INSTANCE.convertList(list)); + public CommonResult> getDismantleRequestDetailbList(@RequestParam("ids") Collection ids) { + List list = productdismantleRequestDetailbService.getDismantleRequestDetailbList(ids); + return success(ProductdismantleRequestDetailbConvert.INSTANCE.convertList(list)); } @GetMapping("/page") @Operation(summary = "获得制品拆解申请子分页") @PreAuthorize("@ss.hasPermission('wms:dismantle-request-detailb:query')") - public CommonResult> getDismantleRequestDetailbPage(@Valid DismantleRequestDetailbPageReqVO pageVO) { - PageResult pageResult = dismantleRequestDetailbService.getDismantleRequestDetailbPage(pageVO); - return success(DismantleRequestDetailbConvert.INSTANCE.convertPage(pageResult)); + public CommonResult> getDismantleRequestDetailbPage(@Valid ProductdismantleRequestDetailbPageReqVO pageVO) { + PageResult pageResult = productdismantleRequestDetailbService.getDismantleRequestDetailbPage(pageVO); + return success(ProductdismantleRequestDetailbConvert.INSTANCE.convertPage(pageResult)); } @GetMapping("/export-excel") @Operation(summary = "导出制品拆解申请子 Excel") @PreAuthorize("@ss.hasPermission('wms:dismantle-request-detailb:export')") @OperateLog(type = EXPORT) - public void exportDismantleRequestDetailbExcel(@Valid DismantleRequestDetailbExportReqVO exportReqVO, + public void exportDismantleRequestDetailbExcel(@Valid ProductdismantleRequestDetailbExportReqVO exportReqVO, HttpServletResponse response) throws IOException { - List list = dismantleRequestDetailbService.getDismantleRequestDetailbList(exportReqVO); + List list = productdismantleRequestDetailbService.getDismantleRequestDetailbList(exportReqVO); // 导出 Excel - List datas = DismantleRequestDetailbConvert.INSTANCE.convertList02(list); - for(DismantleRequestDetailbExcelVO vo : datas) { + List datas = ProductdismantleRequestDetailbConvert.INSTANCE.convertList02(list); + for(ProductdismantleRequestDetailbExcelVO vo : datas) { AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); } - ExcelUtils.write(response, "制品拆解申请子.xls", "数据", DismantleRequestDetailbExcelVO.class, datas); + ExcelUtils.write(response, "制品拆解申请子.xls", "数据", ProductdismantleRequestDetailbExcelVO.class, datas); } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRequest/vo/DismantleRequestDetailbBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailbBaseVO.java similarity index 90% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRequest/vo/DismantleRequestDetailbBaseVO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailbBaseVO.java index 364f4426..80f8c4fc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRequest/vo/DismantleRequestDetailbBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailbBaseVO.java @@ -1,13 +1,12 @@ -package com.win.module.wms.controller.dismantleRequest.vo; +package com.win.module.wms.controller.productdismantleRequest.vo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotNull; import java.math.BigDecimal; import java.time.LocalDateTime; -import javax.validation.constraints.*; -import org.springframework.format.annotation.DateTimeFormat; import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @@ -16,7 +15,7 @@ import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 */ @Data -public class DismantleRequestDetailbBaseVO { +public class ProductdismantleRequestDetailbBaseVO { @Schema(description = "id", example = "id") private Long id; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailbCreateReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailbCreateReqVO.java new file mode 100644 index 00000000..e921b874 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailbCreateReqVO.java @@ -0,0 +1,14 @@ +package com.win.module.wms.controller.productdismantleRequest.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +@Schema(description = "管理后台 - 制品拆解申请子创建 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class ProductdismantleRequestDetailbCreateReqVO extends ProductdismantleRequestDetailbBaseVO { + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRequest/vo/DismantleRequestDetailbExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailbExcelVO.java similarity index 87% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRequest/vo/DismantleRequestDetailbExcelVO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailbExcelVO.java index f1686bab..d6df4d2b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRequest/vo/DismantleRequestDetailbExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailbExcelVO.java @@ -1,15 +1,12 @@ -package com.win.module.wms.controller.dismantleRequest.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.time.LocalDateTime; +package com.win.module.wms.controller.productdismantleRequest.vo; import com.alibaba.excel.annotation.ExcelProperty; import com.win.framework.excel.core.annotations.DictFormat; import com.win.framework.excel.core.convert.DictConvert; +import lombok.Data; + +import java.math.BigDecimal; +import java.time.LocalDateTime; /** @@ -18,7 +15,7 @@ import com.win.framework.excel.core.convert.DictConvert; * @author 超级管理员 */ @Data -public class DismantleRequestDetailbExcelVO { +public class ProductdismantleRequestDetailbExcelVO { @ExcelProperty("工序代码") private String processCode; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRequest/vo/DismantleRequestDetailbExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailbExportReqVO.java similarity index 90% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRequest/vo/DismantleRequestDetailbExportReqVO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailbExportReqVO.java index ea38e8e0..0211721b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRequest/vo/DismantleRequestDetailbExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailbExportReqVO.java @@ -1,19 +1,17 @@ -package com.win.module.wms.controller.dismantleRequest.vo; +package com.win.module.wms.controller.productdismantleRequest.vo; -import lombok.*; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; -import java.util.*; -import io.swagger.v3.oas.annotations.media.Schema; -import com.win.framework.common.pojo.PageParam; import java.time.LocalDateTime; -import org.springframework.format.annotation.DateTimeFormat; import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 制品拆解申请子 Excel 导出 Request VO，参数和 DismantleRequestDetailbPageReqVO 是一致的") @Data -public class DismantleRequestDetailbExportReqVO { +public class ProductdismantleRequestDetailbExportReqVO { @Schema(description = "工序代码") private String processCode; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRequest/vo/DismantleRequestDetailbPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailbPageReqVO.java similarity index 89% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRequest/vo/DismantleRequestDetailbPageReqVO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailbPageReqVO.java index b44a0ff7..770a2493 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRequest/vo/DismantleRequestDetailbPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailbPageReqVO.java @@ -1,12 +1,13 @@ -package com.win.module.wms.controller.dismantleRequest.vo; +package com.win.module.wms.controller.productdismantleRequest.vo; -import lombok.*; - -import java.math.BigDecimal; -import java.util.*; -import io.swagger.v3.oas.annotations.media.Schema; import com.win.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigDecimal; import java.time.LocalDateTime; import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @@ -15,7 +16,7 @@ import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) -public class DismantleRequestDetailbPageReqVO extends PageParam { +public class ProductdismantleRequestDetailbPageReqVO extends PageParam { @Schema(description = "工序代码") private String processCode; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailbRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailbRespVO.java new file mode 100644 index 00000000..33d99fcd --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailbRespVO.java @@ -0,0 +1,14 @@ +package com.win.module.wms.controller.productdismantleRequest.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +@Schema(description = "管理后台 - 制品拆解申请子 Response VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class ProductdismantleRequestDetailbRespVO extends ProductdismantleRequestDetailbBaseVO { + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailbUpdateReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailbUpdateReqVO.java new file mode 100644 index 00000000..d2606af1 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailbUpdateReqVO.java @@ -0,0 +1,14 @@ +package com.win.module.wms.controller.productdismantleRequest.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +@Schema(description = "管理后台 - 制品拆解申请子更新 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class ProductdismantleRequestDetailbUpdateReqVO extends ProductdismantleRequestDetailbBaseVO { + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ConsumereRequestDetailbController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ProductrepairRequestDetailbController.java similarity index 57% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ConsumereRequestDetailbController.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ProductrepairRequestDetailbController.java index 150a776c..8f79bc0c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ConsumereRequestDetailbController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ProductrepairRequestDetailbController.java @@ -8,9 +8,9 @@ import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productrepairRequest.vo.*; -import com.win.module.wms.convert.productrepairRequest.ConsumereRequestDetailbConvert; -import com.win.module.wms.dal.dataobject.productrepairRequest.ConsumereRequestDetailbDO; -import com.win.module.wms.service.productrepairRequest.ConsumereRequestDetailbService; +import com.win.module.wms.convert.productrepairRequest.ProductrepairRequestDetailbConvert; +import com.win.module.wms.dal.dataobject.productrepairRequest.ProductrepairRequestDetailbDO; +import com.win.module.wms.service.productrepairRequest.ProductrepairRequestDetailbService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -32,10 +32,10 @@ import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @RestController @RequestMapping("/wms/consumere-request-detailb") @Validated -public class ConsumereRequestDetailbController { +public class ProductrepairRequestDetailbController { @Resource - private ConsumereRequestDetailbService consumereRequestDetailbService; + private ProductrepairRequestDetailbService productrepairRequestDetailbService; @Resource private AdminUserApi userApi; @@ -43,15 +43,15 @@ public class ConsumereRequestDetailbController { @PostMapping("/create") @Operation(summary = "创建制品返修申请子") @PreAuthorize("@ss.hasPermission('wms:consumere-request-detailb:create')") - public CommonResult createConsumereRequestDetailb(@Valid @RequestBody ConsumereRequestDetailbCreateReqVO createReqVO) { - return success(consumereRequestDetailbService.createConsumereRequestDetailb(createReqVO)); + public CommonResult createConsumereRequestDetailb(@Valid @RequestBody ProductrepairRequestDetailbCreateReqVO createReqVO) { + return success(productrepairRequestDetailbService.createConsumereRequestDetailb(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新制品返修申请子") @PreAuthorize("@ss.hasPermission('wms:consumere-request-detailb:update')") - public CommonResult updateConsumereRequestDetailb(@Valid @RequestBody ConsumereRequestDetailbUpdateReqVO updateReqVO) { - consumereRequestDetailbService.updateConsumereRequestDetailb(updateReqVO); + public CommonResult updateConsumereRequestDetailb(@Valid @RequestBody ProductrepairRequestDetailbUpdateReqVO updateReqVO) { + productrepairRequestDetailbService.updateConsumereRequestDetailb(updateReqVO); return success(true); } @@ -60,7 +60,7 @@ public class ConsumereRequestDetailbController { @Parameter(name = "id", description = "编号", required = true) @PreAuthorize("@ss.hasPermission('wms:consumere-request-detailb:delete')") public CommonResult deleteConsumereRequestDetailb(@RequestParam("id") String id) { - consumereRequestDetailbService.deleteConsumereRequestDetailb(id); + productrepairRequestDetailbService.deleteConsumereRequestDetailb(id); return success(true); } @@ -68,34 +68,34 @@ public class ConsumereRequestDetailbController { @Operation(summary = "获得制品返修申请子") @Parameter(name = "id", description = "编号", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('wms:consumere-request-detailb:query')") - public CommonResult getConsumereRequestDetailb(@RequestParam("id") String id) { - ConsumereRequestDetailbDO consumereRequestDetailb = consumereRequestDetailbService.getConsumereRequestDetailb(id); - return success(ConsumereRequestDetailbConvert.INSTANCE.convert(consumereRequestDetailb)); + public CommonResult getConsumereRequestDetailb(@RequestParam("id") String id) { + ProductrepairRequestDetailbDO consumereRequestDetailb = productrepairRequestDetailbService.getConsumereRequestDetailb(id); + return success(ProductrepairRequestDetailbConvert.INSTANCE.convert(consumereRequestDetailb)); } @GetMapping("/list") @Operation(summary = "获得制品返修申请子列表") @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") @PreAuthorize("@ss.hasPermission('wms:consumere-request-detailb:query')") - public CommonResult> getConsumereRequestDetailbList(@RequestParam("ids") Collection ids) { - List list = consumereRequestDetailbService.getConsumereRequestDetailbList(ids); - return success(ConsumereRequestDetailbConvert.INSTANCE.convertList(list)); + public CommonResult> getConsumereRequestDetailbList(@RequestParam("ids") Collection ids) { + List list = productrepairRequestDetailbService.getConsumereRequestDetailbList(ids); + return success(ProductrepairRequestDetailbConvert.INSTANCE.convertList(list)); } @GetMapping("/page") @Operation(summary = "获得制品返修申请子分页") @PreAuthorize("@ss.hasPermission('wms:consumere-request-detailb:query')") - public CommonResult> getConsumereRequestDetailbPage(@Valid ConsumereRequestDetailbPageReqVO pageVO) { - PageResult pageResult = consumereRequestDetailbService.getConsumereRequestDetailbPage(pageVO); - return success(ConsumereRequestDetailbConvert.INSTANCE.convertPage(pageResult)); + public CommonResult> getConsumereRequestDetailbPage(@Valid ProductrepairRequestDetailbPageReqVO pageVO) { + PageResult pageResult = productrepairRequestDetailbService.getConsumereRequestDetailbPage(pageVO); + return success(ProductrepairRequestDetailbConvert.INSTANCE.convertPage(pageResult)); } @PostMapping("/senior") @Operation(summary = "高级搜索获得制品返修申请子分页") @PreAuthorize("@ss.hasPermission('wms:consumere:query')") - public CommonResult> getConsumereSenior(@Valid @RequestBody CustomConditions conditions) { - PageResult pageResult = consumereRequestDetailbService.getConsumereRequestDetailbSenior(conditions); - PageResult result = ConsumereRequestDetailbConvert.INSTANCE.convertPage(pageResult); - for(ConsumereRequestDetailbRespVO vo : result.getList()) { + public CommonResult> getConsumereSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productrepairRequestDetailbService.getConsumereRequestDetailbSenior(conditions); + PageResult result = ProductrepairRequestDetailbConvert.INSTANCE.convertPage(pageResult); + for(ProductrepairRequestDetailbRespVO vo : result.getList()) { AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); @@ -106,17 +106,17 @@ public class ConsumereRequestDetailbController { @Operation(summary = "导出制品返修申请子 Excel") @PreAuthorize("@ss.hasPermission('wms:consumere-request-detailb:export')") @OperateLog(type = EXPORT) - public void exportConsumereRequestDetailbExcel(@Valid ConsumereRequestDetailbExportReqVO exportReqVO, + public void exportConsumereRequestDetailbExcel(@Valid ProductrepairRequestDetailbExportReqVO exportReqVO, HttpServletResponse response) throws IOException { - List list = consumereRequestDetailbService.getConsumereRequestDetailbList(exportReqVO); + List list = productrepairRequestDetailbService.getConsumereRequestDetailbList(exportReqVO); // 导出 Excel - List datas = ConsumereRequestDetailbConvert.INSTANCE.convertList02(list); - for(ConsumereRequestDetailbExcelVO vo : datas) { + List datas = ProductrepairRequestDetailbConvert.INSTANCE.convertList02(list); + for(ProductrepairRequestDetailbExcelVO vo : datas) { AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); } - ExcelUtils.write(response, "制品返修申请子.xls", "数据", ConsumereRequestDetailbExcelVO.class, datas); + ExcelUtils.write(response, "制品返修申请子.xls", "数据", ProductrepairRequestDetailbExcelVO.class, datas); } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ConsumereRequestDetailbBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestDetailbBaseVO.java similarity index 98% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ConsumereRequestDetailbBaseVO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestDetailbBaseVO.java index cdb37c83..8e037874 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ConsumereRequestDetailbBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestDetailbBaseVO.java @@ -14,7 +14,7 @@ import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 */ @Data -public class ConsumereRequestDetailbBaseVO { +public class ProductrepairRequestDetailbBaseVO { @Schema(description = "id", example = "id") private Long id; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ConsumereRequestDetailbCreateReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestDetailbCreateReqVO.java similarity index 78% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ConsumereRequestDetailbCreateReqVO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestDetailbCreateReqVO.java index 4c80a673..fa47cb8a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ConsumereRequestDetailbCreateReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestDetailbCreateReqVO.java @@ -9,6 +9,6 @@ import lombok.ToString; @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) -public class ConsumereRequestDetailbCreateReqVO extends ConsumereRequestDetailbBaseVO { +public class ProductrepairRequestDetailbCreateReqVO extends ProductrepairRequestDetailbBaseVO { } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ConsumereRequestDetailbExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestDetailbExcelVO.java similarity index 96% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ConsumereRequestDetailbExcelVO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestDetailbExcelVO.java index 5d24f832..0411e271 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ConsumereRequestDetailbExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestDetailbExcelVO.java @@ -14,7 +14,7 @@ import java.time.LocalDateTime; * @author 超级管理员 */ @Data -public class ConsumereRequestDetailbExcelVO { +public class ProductrepairRequestDetailbExcelVO { @ExcelProperty("库存状态") private String inventoryStatus; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ConsumereRequestDetailbExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestDetailbExportReqVO.java similarity index 97% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ConsumereRequestDetailbExportReqVO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestDetailbExportReqVO.java index 36157124..ebe5ec91 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ConsumereRequestDetailbExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestDetailbExportReqVO.java @@ -10,7 +10,7 @@ import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY @Schema(description = "管理后台 - 制品返修申请子 Excel 导出 Request VO，参数和 ConsumereRequestDetailbPageReqVO 是一致的") @Data -public class ConsumereRequestDetailbExportReqVO { +public class ProductrepairRequestDetailbExportReqVO { @Schema(description = "库存状态") private String inventoryStatus; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ConsumereRequestDetailbPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestDetailbPageReqVO.java similarity index 96% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ConsumereRequestDetailbPageReqVO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestDetailbPageReqVO.java index 8be0799a..aec09297 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ConsumereRequestDetailbPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestDetailbPageReqVO.java @@ -15,7 +15,7 @@ import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) -public class ConsumereRequestDetailbPageReqVO extends PageParam { +public class ProductrepairRequestDetailbPageReqVO extends PageParam { @Schema(description = "库存状态") private String inventoryStatus; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ConsumereRequestDetailbRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestDetailbRespVO.java similarity index 78% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ConsumereRequestDetailbRespVO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestDetailbRespVO.java index db0c4176..4d1afcc3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ConsumereRequestDetailbRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestDetailbRespVO.java @@ -9,6 +9,6 @@ import lombok.ToString; @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) -public class ConsumereRequestDetailbRespVO extends ConsumereRequestDetailbBaseVO { +public class ProductrepairRequestDetailbRespVO extends ProductrepairRequestDetailbBaseVO { } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ConsumereRequestDetailbUpdateReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestDetailbUpdateReqVO.java similarity index 78% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ConsumereRequestDetailbUpdateReqVO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestDetailbUpdateReqVO.java index 8cae999c..62d7b47a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ConsumereRequestDetailbUpdateReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestDetailbUpdateReqVO.java @@ -9,6 +9,6 @@ import lombok.ToString; @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) -public class ConsumereRequestDetailbUpdateReqVO extends ConsumereRequestDetailbBaseVO { +public class ProductrepairRequestDetailbUpdateReqVO extends ProductrepairRequestDetailbBaseVO { } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/dismantleRecord/DismantleRecordDetailbConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/dismantleRecord/DismantleRecordDetailbConvert.java deleted file mode 100644 index 4feadbc5..00000000 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/dismantleRecord/DismantleRecordDetailbConvert.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.win.module.wms.convert.dismantleRecord; - -import java.util.*; - -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.controller.dismantleRecord.vo.DismantleRecordDetailbCreateReqVO; -import com.win.module.wms.controller.dismantleRecord.vo.DismantleRecordDetailbExcelVO; -import com.win.module.wms.controller.dismantleRecord.vo.DismantleRecordDetailbRespVO; -import com.win.module.wms.controller.dismantleRecord.vo.DismantleRecordDetailbUpdateReqVO; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; -import com.win.module.wms.dal.dataobject.dismantleRecord.DismantleRecordDetailbDO; - -/** - * 制品拆解记录子 Convert - * - * @author 超级管理员 - */ -@Mapper -public interface DismantleRecordDetailbConvert { - - DismantleRecordDetailbConvert INSTANCE = Mappers.getMapper(DismantleRecordDetailbConvert.class); - - DismantleRecordDetailbDO convert(DismantleRecordDetailbCreateReqVO bean); - - DismantleRecordDetailbDO convert(DismantleRecordDetailbUpdateReqVO bean); - - DismantleRecordDetailbRespVO convert(DismantleRecordDetailbDO bean); - - List convertList(List list); - - PageResult convertPage(PageResult page); - - List convertList02(List list); - -} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/dismantleRequest/DismantleRequestDetailbConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/dismantleRequest/DismantleRequestDetailbConvert.java deleted file mode 100644 index 357845b5..00000000 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/dismantleRequest/DismantleRequestDetailbConvert.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.win.module.wms.convert.dismantleRequest; - -import java.util.*; - -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.controller.dismantleRequest.vo.DismantleRequestDetailbCreateReqVO; -import com.win.module.wms.controller.dismantleRequest.vo.DismantleRequestDetailbExcelVO; -import com.win.module.wms.controller.dismantleRequest.vo.DismantleRequestDetailbRespVO; -import com.win.module.wms.controller.dismantleRequest.vo.DismantleRequestDetailbUpdateReqVO; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; -import com.win.module.wms.dal.dataobject.dismantleRequest.DismantleRequestDetailbDO; - -/** - * 制品拆解申请子 Convert - * - * @author 超级管理员 - */ -@Mapper -public interface DismantleRequestDetailbConvert { - - DismantleRequestDetailbConvert INSTANCE = Mappers.getMapper(DismantleRequestDetailbConvert.class); - - DismantleRequestDetailbDO convert(DismantleRequestDetailbCreateReqVO bean); - - DismantleRequestDetailbDO convert(DismantleRequestDetailbUpdateReqVO bean); - - DismantleRequestDetailbRespVO convert(DismantleRequestDetailbDO bean); - - List convertList(List list); - - PageResult convertPage(PageResult page); - - List convertList02(List list); - -} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/productdismantleRecord/ProductdismantleRecordDetailbConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/productdismantleRecord/ProductdismantleRecordDetailbConvert.java new file mode 100644 index 00000000..2b532e9e --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/productdismantleRecord/ProductdismantleRecordDetailbConvert.java @@ -0,0 +1,36 @@ +package com.win.module.wms.convert.productdismantleRecord; + +import com.win.framework.common.pojo.PageResult; +import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordDetailbCreateReqVO; +import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordDetailbExcelVO; +import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordDetailbRespVO; +import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordDetailbUpdateReqVO; +import com.win.module.wms.dal.dataobject.productdismantleRecord.ProductdismantleRecordDetailbDO; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +import java.util.List; + +/** + * 制品拆解记录子 Convert + * + * @author 超级管理员 + */ +@Mapper +public interface ProductdismantleRecordDetailbConvert { + + ProductdismantleRecordDetailbConvert INSTANCE = Mappers.getMapper(ProductdismantleRecordDetailbConvert.class); + + ProductdismantleRecordDetailbDO convert(ProductdismantleRecordDetailbCreateReqVO bean); + + ProductdismantleRecordDetailbDO convert(ProductdismantleRecordDetailbUpdateReqVO bean); + + ProductdismantleRecordDetailbRespVO convert(ProductdismantleRecordDetailbDO bean); + + List convertList(List list); + + PageResult convertPage(PageResult page); + + List convertList02(List list); + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/productdismantleRecordMain/ProductdismantleRecordMainConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/productdismantleRecord/ProductdismantleRecordMainConvert.java similarity index 60% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/productdismantleRecordMain/ProductdismantleRecordMainConvert.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/productdismantleRecord/ProductdismantleRecordMainConvert.java index ace99991..4464e47c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/productdismantleRecordMain/ProductdismantleRecordMainConvert.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/productdismantleRecord/ProductdismantleRecordMainConvert.java @@ -1,16 +1,15 @@ -package com.win.module.wms.convert.productdismantleRecordMain; - -import java.util.*; +package com.win.module.wms.convert.productdismantleRecord; import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.controller.productdismantleRecordMain.vo.ProductdismantleRecordMainCreateReqVO; -import com.win.module.wms.controller.productdismantleRecordMain.vo.ProductdismantleRecordMainExcelVO; -import com.win.module.wms.controller.productdismantleRecordMain.vo.ProductdismantleRecordMainRespVO; -import com.win.module.wms.controller.productdismantleRecordMain.vo.ProductdismantleRecordMainUpdateReqVO; +import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordMainCreateReqVO; +import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordMainExcelVO; +import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordMainRespVO; +import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.productdismantleRecord.ProductdismantleRecordMainDO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import com.win.module.wms.dal.dataobject.productdismantleRecordMain.ProductdismantleRecordMainDO; + +import java.util.List; /** * 制品拆解记录主 Convert diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/productdismantleRequest/ProductdismantleRequestDetailbConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/productdismantleRequest/ProductdismantleRequestDetailbConvert.java new file mode 100644 index 00000000..5d4f887c --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/productdismantleRequest/ProductdismantleRequestDetailbConvert.java @@ -0,0 +1,36 @@ +package com.win.module.wms.convert.productdismantleRequest; + +import com.win.framework.common.pojo.PageResult; +import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestDetailbCreateReqVO; +import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestDetailbExcelVO; +import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestDetailbRespVO; +import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestDetailbUpdateReqVO; +import com.win.module.wms.dal.dataobject.productdismantleRequest.ProductdismantleRequestDetailbDO; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +import java.util.List; + +/** + * 制品拆解申请子 Convert + * + * @author 超级管理员 + */ +@Mapper +public interface ProductdismantleRequestDetailbConvert { + + ProductdismantleRequestDetailbConvert INSTANCE = Mappers.getMapper(ProductdismantleRequestDetailbConvert.class); + + ProductdismantleRequestDetailbDO convert(ProductdismantleRequestDetailbCreateReqVO bean); + + ProductdismantleRequestDetailbDO convert(ProductdismantleRequestDetailbUpdateReqVO bean); + + ProductdismantleRequestDetailbRespVO convert(ProductdismantleRequestDetailbDO bean); + + List convertList(List list); + + PageResult convertPage(PageResult page); + + List convertList02(List list); + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/productrepairRequest/ConsumereRequestDetailbConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/productrepairRequest/ConsumereRequestDetailbConvert.java deleted file mode 100644 index eaae5284..00000000 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/productrepairRequest/ConsumereRequestDetailbConvert.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.win.module.wms.convert.productrepairRequest; - -import com.win.framework.common.pojo.PageResult; -import com.win.module.wms.controller.productrepairRequest.vo.ConsumereRequestDetailbCreateReqVO; -import com.win.module.wms.controller.productrepairRequest.vo.ConsumereRequestDetailbExcelVO; -import com.win.module.wms.controller.productrepairRequest.vo.ConsumereRequestDetailbRespVO; -import com.win.module.wms.controller.productrepairRequest.vo.ConsumereRequestDetailbUpdateReqVO; -import com.win.module.wms.dal.dataobject.productrepairRequest.ConsumereRequestDetailbDO; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -import java.util.List; - -/** - * 制品返修申请子 Convert - * - * @author 超级管理员 - */ -@Mapper -public interface ConsumereRequestDetailbConvert { - - ConsumereRequestDetailbConvert INSTANCE = Mappers.getMapper(ConsumereRequestDetailbConvert.class); - - ConsumereRequestDetailbDO convert(ConsumereRequestDetailbCreateReqVO bean); - - ConsumereRequestDetailbDO convert(ConsumereRequestDetailbUpdateReqVO bean); - - ConsumereRequestDetailbRespVO convert(ConsumereRequestDetailbDO bean); - - List convertList(List list); - - PageResult convertPage(PageResult page); - - List convertList02(List list); - -} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/productrepairRequest/ProductrepairRequestDetailbConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/productrepairRequest/ProductrepairRequestDetailbConvert.java new file mode 100644 index 00000000..d2671c36 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/productrepairRequest/ProductrepairRequestDetailbConvert.java @@ -0,0 +1,36 @@ +package com.win.module.wms.convert.productrepairRequest; + +import com.win.framework.common.pojo.PageResult; +import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestDetailbCreateReqVO; +import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestDetailbExcelVO; +import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestDetailbRespVO; +import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestDetailbUpdateReqVO; +import com.win.module.wms.dal.dataobject.productrepairRequest.ProductrepairRequestDetailbDO; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +import java.util.List; + +/** + * 制品返修申请子 Convert + * + * @author 超级管理员 + */ +@Mapper +public interface ProductrepairRequestDetailbConvert { + + ProductrepairRequestDetailbConvert INSTANCE = Mappers.getMapper(ProductrepairRequestDetailbConvert.class); + + ProductrepairRequestDetailbDO convert(ProductrepairRequestDetailbCreateReqVO bean); + + ProductrepairRequestDetailbDO convert(ProductrepairRequestDetailbUpdateReqVO bean); + + ProductrepairRequestDetailbRespVO convert(ProductrepairRequestDetailbDO bean); + + List convertList(List list); + + PageResult convertPage(PageResult page); + + List convertList02(List list); + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/dismantleRecord/DismantleRecordDetailbDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productdismantleRecord/ProductdismantleRecordDetailbDO.java similarity index 87% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/dismantleRecord/DismantleRecordDetailbDO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productdismantleRecord/ProductdismantleRecordDetailbDO.java index 05f17d5a..c57ef30b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/dismantleRecord/DismantleRecordDetailbDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productdismantleRecord/ProductdismantleRecordDetailbDO.java @@ -1,10 +1,10 @@ -package com.win.module.wms.dal.dataobject.dismantleRecord; +package com.win.module.wms.dal.dataobject.productdismantleRecord; -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.sun.xml.bind.v2.TODO; import com.win.framework.mybatis.core.dataobject.BaseDO; +import lombok.*; /** * 制品拆解记录子 DO @@ -18,7 +18,7 @@ import com.win.framework.mybatis.core.dataobject.BaseDO; @Builder @NoArgsConstructor @AllArgsConstructor -public class DismantleRecordDetailbDO extends BaseDO { +public class ProductdismantleRecordDetailbDO extends BaseDO { /** * id diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productdismantleRecordMain/ProductdismantleRecordMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productdismantleRecord/ProductdismantleRecordMainDO.java similarity index 91% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productdismantleRecordMain/ProductdismantleRecordMainDO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productdismantleRecord/ProductdismantleRecordMainDO.java index bc610698..f20da631 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productdismantleRecordMain/ProductdismantleRecordMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productdismantleRecord/ProductdismantleRecordMainDO.java @@ -1,14 +1,12 @@ -package com.win.module.wms.dal.dataobject.productdismantleRecordMain; +package com.win.module.wms.dal.dataobject.productdismantleRecord; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.sun.xml.bind.v2.TODO; +import com.win.framework.mybatis.core.dataobject.BaseDO; import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; + import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.*; -import com.win.framework.mybatis.core.dataobject.BaseDO; /** * 制品拆解记录主 DO diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/dismantleRequest/DismantleRequestDetailbDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productdismantleRequest/ProductdismantleRequestDetailbDO.java similarity index 83% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/dismantleRequest/DismantleRequestDetailbDO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productdismantleRequest/ProductdismantleRequestDetailbDO.java index 1253df03..ee458f07 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/dismantleRequest/DismantleRequestDetailbDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productdismantleRequest/ProductdismantleRequestDetailbDO.java @@ -1,12 +1,12 @@ -package com.win.module.wms.dal.dataobject.dismantleRequest; +package com.win.module.wms.dal.dataobject.productdismantleRequest; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.sun.xml.bind.v2.TODO; +import com.win.framework.mybatis.core.dataobject.BaseDO; import lombok.*; -import java.util.*; -import java.time.LocalDateTime; + import java.math.BigDecimal; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.*; -import com.win.framework.mybatis.core.dataobject.BaseDO; /** * 制品拆解申请子 DO @@ -20,7 +20,7 @@ import com.win.framework.mybatis.core.dataobject.BaseDO; @Builder @NoArgsConstructor @AllArgsConstructor -public class DismantleRequestDetailbDO extends BaseDO { +public class ProductdismantleRequestDetailbDO extends BaseDO { /** * id diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productrepairRequest/ConsumereRequestDetailbDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productrepairRequest/ProductrepairRequestDetailbDO.java similarity index 96% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productrepairRequest/ConsumereRequestDetailbDO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productrepairRequest/ProductrepairRequestDetailbDO.java index 00877807..0c9fe1bd 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productrepairRequest/ConsumereRequestDetailbDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productrepairRequest/ProductrepairRequestDetailbDO.java @@ -19,7 +19,7 @@ import lombok.*; @Builder @NoArgsConstructor @AllArgsConstructor -public class ConsumereRequestDetailbDO extends BaseDO { +public class ProductrepairRequestDetailbDO extends BaseDO { /** * id diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/container/ContainerDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/container/ContainerDetailMapper.java index d6cf83ba..72dbae65 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/container/ContainerDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/container/ContainerDetailMapper.java @@ -2,11 +2,14 @@ package com.win.module.wms.dal.mysql.container; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.container.vo.ContainerDetailExportReqVO; import com.win.module.wms.controller.container.vo.ContainerDetailPageReqVO; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; import com.win.module.wms.dal.dataobject.container.ContainerDetailDO; import org.apache.ibatis.annotations.Mapper; @@ -29,7 +32,9 @@ public interface ContainerDetailMapper extends BaseMapperX { .eqIfPresent(ContainerDetailDO::getQty, reqVO.getQty()) .orderByDesc(ContainerDetailDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(ContainerDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ContainerDetailDO::getContainerContentType, reqVO.getContainerContentType()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/container/ContainerMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/container/ContainerMainMapper.java index d67503df..0aa9d5b8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/container/ContainerMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/container/ContainerMainMapper.java @@ -2,11 +2,14 @@ package com.win.module.wms.dal.mysql.container; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.container.vo.ContainerMainExportReqVO; import com.win.module.wms.controller.container.vo.ContainerMainPageReqVO; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; import com.win.module.wms.dal.dataobject.container.ContainerMainDO; import org.apache.ibatis.annotations.Mapper; @@ -27,7 +30,9 @@ public interface ContainerMainMapper extends BaseMapperX { .eqIfPresent(ContainerMainDO::getOwnerCode, reqVO.getOwnerCode()) .orderByDesc(ContainerMainDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(ContainerMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ContainerMainDO::getNumber, reqVO.getNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countJob/CountJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countJob/CountJobDetailMapper.java index a42fde22..fc49d371 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countJob/CountJobDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countJob/CountJobDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.countJob; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.countJob.vo.CountJobDetailExportReqVO; import com.win.module.wms.controller.countJob.vo.CountJobDetailPageReqVO; import com.win.module.wms.dal.dataobject.countJob.CountJobDetailDO; @@ -39,7 +41,9 @@ public interface CountJobDetailMapper extends BaseMapperX { .eqIfPresent(CountJobDetailDO::getCreator, reqVO.getCreator()) .orderByDesc(CountJobDetailDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(CountJobDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(CountJobDetailDO::getCountDetailNumber, reqVO.getCountDetailNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countJob/CountJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countJob/CountJobMainMapper.java index 1647d06d..c487416f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countJob/CountJobMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countJob/CountJobMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.countJob; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.countJob.vo.CountJobMainExportReqVO; import com.win.module.wms.controller.countJob.vo.CountJobMainPageReqVO; import com.win.module.wms.dal.dataobject.countJob.CountJobMainDO; @@ -59,7 +61,9 @@ public interface CountJobMainMapper extends BaseMapperX { .eqIfPresent(CountJobMainDO::getAllowModifyPackingNumber, reqVO.getAllowModifyPackingNumber()) .orderByDesc(CountJobMainDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(CountJobMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(CountJobMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countPlan/CountPlanDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countPlan/CountPlanDetailMapper.java index 9c422b60..4c0accb5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countPlan/CountPlanDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countPlan/CountPlanDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.countPlan; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.countPlan.vo.CountPlanDetailExportReqVO; import com.win.module.wms.controller.countPlan.vo.CountPlanDetailPageReqVO; import com.win.module.wms.dal.dataobject.countPlan.CountPlanDetailDO; @@ -34,7 +36,9 @@ public interface CountPlanDetailMapper extends BaseMapperX { .eqIfPresent(CountPlanDetailDO::getAvailable, reqVO.getAvailable()) .orderByDesc(CountPlanDetailDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(CountPlanDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(CountPlanDetailDO::getType, reqVO.getType()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countPlan/CountPlanMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countPlan/CountPlanMainMapper.java index ba4d8a0c..ee75d772 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countPlan/CountPlanMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countPlan/CountPlanMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.countPlan; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.countPlan.vo.CountPlanMainExportReqVO; import com.win.module.wms.controller.countPlan.vo.CountPlanMainPageReqVO; import com.win.module.wms.dal.dataobject.countPlan.CountPlanMainDO; @@ -46,7 +48,9 @@ public interface CountPlanMainMapper extends BaseMapperX { .eqIfPresent(CountPlanMainDO::getAvailable, reqVO.getAvailable()) .orderByDesc(CountPlanMainDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(CountPlanMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(CountPlanMainDO::getType, reqVO.getType()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countRecord/CountRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countRecord/CountRecordDetailMapper.java index e9430db6..49b94f71 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countRecord/CountRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countRecord/CountRecordDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.countRecord; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.countRecord.vo.CountRecordDetailExportReqVO; import com.win.module.wms.controller.countRecord.vo.CountRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.countRecord.CountRecordDetailDO; @@ -49,7 +51,9 @@ public interface CountRecordDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(CountRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(CountRecordDetailDO::getCountDetailNumber, reqVO.getCountDetailNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countRecord/CountRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countRecord/CountRecordMainMapper.java index ab4779da..65ae4a0a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countRecord/CountRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countRecord/CountRecordMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.countRecord; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.countRecord.vo.CountRecordMainExportReqVO; import com.win.module.wms.controller.countRecord.vo.CountRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.countRecord.CountRecordMainDO; @@ -42,7 +44,9 @@ public interface CountRecordMainMapper extends BaseMapperX { .eqIfPresent(CountRecordMainDO::getAvailable, reqVO.getAvailable()) .orderByDesc(CountRecordMainDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(CountRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(CountRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countRequest/CountRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countRequest/CountRequestDetailMapper.java index 24417c46..046b7361 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countRequest/CountRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countRequest/CountRequestDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.countRequest; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.countRequest.vo.CountRequestDetailExportReqVO; import com.win.module.wms.controller.countRequest.vo.CountRequestDetailPageReqVO; import com.win.module.wms.dal.dataobject.countRequest.CountRequestDetailDO; @@ -44,7 +46,9 @@ public interface CountRequestDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(CountRequestDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(CountRequestDetailDO::getCountDetailNumber, reqVO.getCountDetailNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countRequest/CountRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countRequest/CountRequestMainMapper.java index f623899e..c3d75d13 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countRequest/CountRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countRequest/CountRequestMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.countRequest; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.countRequest.vo.CountRequestMainExportReqVO; import com.win.module.wms.controller.countRequest.vo.CountRequestMainPageReqVO; import com.win.module.wms.dal.dataobject.countRequest.CountRequestMainDO; @@ -41,7 +43,9 @@ public interface CountRequestMainMapper extends BaseMapperX .eqIfPresent(CountRequestMainDO::getDirectCreateRecord, reqVO.getDirectCreateRecord()) .orderByDesc(CountRequestMainDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(CountRequestMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(CountRequestMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countadjustRecord/CountadjustRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countadjustRecord/CountadjustRecordDetailMapper.java index c444418d..f29a4651 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countadjustRecord/CountadjustRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countadjustRecord/CountadjustRecordDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.countadjustRecord; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.countadjustRecord.vo.CountadjustRecordDetailExportReqVO; import com.win.module.wms.controller.countadjustRecord.vo.CountadjustRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.countadjustRecord.CountadjustRecordDetailDO; @@ -46,7 +48,9 @@ public interface CountadjustRecordDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(CountadjustRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(CountadjustRecordDetailDO::getCountDetailNumber, reqVO.getCountDetailNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countadjustRecord/CountadjustRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countadjustRecord/CountadjustRecordMainMapper.java index 77cd9853..13844368 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countadjustRecord/CountadjustRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countadjustRecord/CountadjustRecordMainMapper.java @@ -2,11 +2,14 @@ package com.win.module.wms.dal.mysql.countadjustRecord; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.countadjustRecord.vo.CountadjustRecordMainExportReqVO; import com.win.module.wms.controller.countadjustRecord.vo.CountadjustRecordMainPageReqVO; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; import com.win.module.wms.dal.dataobject.countadjustRecord.CountadjustRecordMainDO; import org.apache.ibatis.annotations.Mapper; @@ -40,7 +43,9 @@ public interface CountadjustRecordMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(CountadjustRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(CountadjustRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countadjustRequest/CountadjustRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countadjustRequest/CountadjustRequestMainMapper.java index 4991d57f..278eeb02 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countadjustRequest/CountadjustRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countadjustRequest/CountadjustRequestMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.countadjustRequest; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.countadjustRequest.vo.CountadjustRequestMainExportReqVO; import com.win.module.wms.controller.countadjustRequest.vo.CountadjustRequestMainPageReqVO; import com.win.module.wms.dal.dataobject.countadjustRequest.CountadjustRequestMainDO; @@ -40,7 +42,9 @@ public interface CountadjustRequestMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(CountadjustRequestMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(CountadjustRequestMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/currencyexchange/CurrencyexchangeMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/currencyexchange/CurrencyexchangeMapper.java index 41c2f267..60c6514b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/currencyexchange/CurrencyexchangeMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/currencyexchange/CurrencyexchangeMapper.java @@ -1,8 +1,10 @@ package com.win.module.wms.dal.mysql.currencyexchange; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.mapper.BaseMapperX; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.currencyexchange.vo.CurrencyexchangeExportReqVO; import com.win.module.wms.controller.currencyexchange.vo.CurrencyexchangePageReqVO; import com.win.module.wms.dal.dataobject.currencyexchange.CurrencyexchangeDO; @@ -31,7 +33,9 @@ public interface CurrencyexchangeMapper extends BaseMapperX .eqIfPresent(CurrencyexchangeDO::getCreator, reqVO.getCreator()) .orderByDesc(CurrencyexchangeDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(CurrencyexchangeExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(CurrencyexchangeDO::getCurrency, reqVO.getCurrency()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customer/CustomerMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customer/CustomerMapper.java index f955ba4e..982bb331 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customer/CustomerMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customer/CustomerMapper.java @@ -1,8 +1,10 @@ package com.win.module.wms.dal.mysql.customer; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.mapper.BaseMapperX; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.customer.vo.CustomerExportReqVO; import com.win.module.wms.controller.customer.vo.CustomerPageReqVO; import com.win.module.wms.dal.dataobject.customer.CustomerDO; @@ -42,7 +44,9 @@ public interface CustomerMapper extends BaseMapperX { .eqIfPresent(CustomerDO::getCreator, reqVO.getCreator()) .orderByDesc(CustomerDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(CustomerExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(CustomerDO::getCode, reqVO.getCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerdock/CustomerdockMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerdock/CustomerdockMapper.java index 134b0c7b..7fc7d24e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerdock/CustomerdockMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerdock/CustomerdockMapper.java @@ -1,8 +1,10 @@ package com.win.module.wms.dal.mysql.customerdock; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.mapper.BaseMapperX; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.customerdock.vo.CustomerdockExportReqVO; import com.win.module.wms.controller.customerdock.vo.CustomerdockPageReqVO; import com.win.module.wms.dal.dataobject.customerdock.CustomerdockDO; @@ -38,7 +40,9 @@ public interface CustomerdockMapper extends BaseMapperX { .eqIfPresent(CustomerdockDO::getCreator, reqVO.getCreator()) .orderByDesc(CustomerdockDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(CustomerdockExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(CustomerdockDO::getCode, reqVO.getCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customeritem/CustomeritemMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customeritem/CustomeritemMapper.java index e6630a7b..b9a25785 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customeritem/CustomeritemMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customeritem/CustomeritemMapper.java @@ -1,8 +1,10 @@ package com.win.module.wms.dal.mysql.customeritem; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.mapper.BaseMapperX; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.customeritem.vo.CustomeritemExportReqVO; import com.win.module.wms.controller.customeritem.vo.CustomeritemPageReqVO; import com.win.module.wms.dal.dataobject.customeritem.CustomeritemDO; @@ -38,7 +40,9 @@ public interface CustomeritemMapper extends BaseMapperX { .eqIfPresent(CustomeritemDO::getCreator, reqVO.getCreator()) .orderByDesc(CustomeritemDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(CustomeritemExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(CustomeritemDO::getCustomerCode, reqVO.getCustomerCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreceiptRecord/CustomerreceiptRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreceiptRecord/CustomerreceiptRecordDetailMapper.java index 8064e3e1..019281be 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreceiptRecord/CustomerreceiptRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreceiptRecord/CustomerreceiptRecordDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.customerreceiptRecord; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.customerreceiptRecord.vo.CustomerreceiptRecordDetailExportReqVO; import com.win.module.wms.controller.customerreceiptRecord.vo.CustomerreceiptRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.customerreceiptRecord.CustomerreceiptRecordDetailDO; @@ -55,7 +57,9 @@ public interface CustomerreceiptRecordDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(CustomerreceiptRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(CustomerreceiptRecordDetailDO::getSoNumber, reqVO.getSoNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreceiptRecord/CustomerreceiptRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreceiptRecord/CustomerreceiptRecordMainMapper.java index 1af7059b..eeba67e1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreceiptRecord/CustomerreceiptRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreceiptRecord/CustomerreceiptRecordMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.customerreceiptRecord; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.customerreceiptRecord.vo.CustomerreceiptRecordMainExportReqVO; import com.win.module.wms.controller.customerreceiptRecord.vo.CustomerreceiptRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.customerreceiptRecord.CustomerreceiptRecordMainDO; @@ -51,7 +53,9 @@ public interface CustomerreceiptRecordMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(CustomerreceiptRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(CustomerreceiptRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreceiptRequest/CustomerreceiptRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreceiptRequest/CustomerreceiptRequestDetailMapper.java index b2c359b6..51547f13 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreceiptRequest/CustomerreceiptRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreceiptRequest/CustomerreceiptRequestDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.customerreceiptRequest; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.customerreceiptRequest.vo.CustomerreceiptRequestDetailExportReqVO; import com.win.module.wms.controller.customerreceiptRequest.vo.CustomerreceiptRequestDetailPageReqVO; import com.win.module.wms.dal.dataobject.customerreceiptRequest.CustomerreceiptRequestDetailDO; @@ -45,7 +47,9 @@ public interface CustomerreceiptRequestDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(CustomerreceiptRequestDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(CustomerreceiptRequestDetailDO::getSoNumber, reqVO.getSoNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreceiptRequest/CustomerreceiptRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreceiptRequest/CustomerreceiptRequestMainMapper.java index c66a3570..0ed2c76a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreceiptRequest/CustomerreceiptRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreceiptRequest/CustomerreceiptRequestMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.customerreceiptRequest; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.customerreceiptRequest.vo.CustomerreceiptRequestMainExportReqVO; import com.win.module.wms.controller.customerreceiptRequest.vo.CustomerreceiptRequestMainPageReqVO; import com.win.module.wms.dal.dataobject.customerreceiptRequest.CustomerreceiptRequestMainDO; @@ -50,7 +52,9 @@ public interface CustomerreceiptRequestMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(CustomerreceiptRequestMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(CustomerreceiptRequestMainDO::getDeliverRequestNumber, reqVO.getDeliverRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreturnJob/CustomerreturnJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreturnJob/CustomerreturnJobDetailMapper.java index de3c2c38..496a90d5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreturnJob/CustomerreturnJobDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreturnJob/CustomerreturnJobDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.customerreturnJob; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobDetailExportReqVO; import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobDetailPageReqVO; import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobDetailDO; @@ -42,7 +44,9 @@ public interface CustomerreturnJobDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(CustomerreturnJobDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(CustomerreturnJobDetailDO::getSoNumber, reqVO.getSoNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreturnJob/CustomerreturnJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreturnJob/CustomerreturnJobMainMapper.java index 71b9f27f..511e75b0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreturnJob/CustomerreturnJobMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreturnJob/CustomerreturnJobMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.customerreturnJob; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainExportReqVO; import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainPageReqVO; import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; @@ -67,7 +69,9 @@ public interface CustomerreturnJobMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(CustomerreturnJobMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(CustomerreturnJobMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreturnRecord/CustomerreturnRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreturnRecord/CustomerreturnRecordDetailMapper.java index d02296d7..c4f6ba4a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreturnRecord/CustomerreturnRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreturnRecord/CustomerreturnRecordDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.customerreturnRecord; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.customerreturnRecord.vo.CustomerreturnRecordDetailExportReqVO; import com.win.module.wms.controller.customerreturnRecord.vo.CustomerreturnRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.customerreturnRecord.CustomerreturnRecordDetailDO; @@ -55,7 +57,9 @@ public interface CustomerreturnRecordDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(CustomerreturnRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(CustomerreturnRecordDetailDO::getSoNumber, reqVO.getSoNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreturnRecord/CustomerreturnRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreturnRecord/CustomerreturnRecordMainMapper.java index ea7d9d48..488d6101 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreturnRecord/CustomerreturnRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreturnRecord/CustomerreturnRecordMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.customerreturnRecord; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.customerreturnRecord.vo.CustomerreturnRecordMainExportReqVO; import com.win.module.wms.controller.customerreturnRecord.vo.CustomerreturnRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.customerreturnRecord.CustomerreturnRecordMainDO; @@ -53,7 +55,9 @@ public interface CustomerreturnRecordMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(CustomerreturnRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(CustomerreturnRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreturnRequest/CustomerreturnRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreturnRequest/CustomerreturnRequestDetailMapper.java index db6e47a2..1142b905 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreturnRequest/CustomerreturnRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreturnRequest/CustomerreturnRequestDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.customerreturnRequest; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.customerreturnRequest.vo.CustomerreturnRequestDetailExportReqVO; import com.win.module.wms.controller.customerreturnRequest.vo.CustomerreturnRequestDetailPageReqVO; import com.win.module.wms.dal.dataobject.customerreturnRequest.CustomerreturnRequestDetailDO; @@ -44,7 +46,9 @@ public interface CustomerreturnRequestDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(CustomerreturnRequestDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(CustomerreturnRequestDetailDO::getSoNumber, reqVO.getSoNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreturnRequest/CustomerreturnRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreturnRequest/CustomerreturnRequestMainMapper.java index 579dc61e..f5e17b19 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreturnRequest/CustomerreturnRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreturnRequest/CustomerreturnRequestMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.customerreturnRequest; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.customerreturnRequest.vo.CustomerreturnRequestMainExportReqVO; import com.win.module.wms.controller.customerreturnRequest.vo.CustomerreturnRequestMainPageReqVO; import com.win.module.wms.dal.dataobject.customerreturnRequest.CustomerreturnRequestMainDO; @@ -52,7 +54,9 @@ public interface CustomerreturnRequestMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(CustomerreturnRequestMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(CustomerreturnRequestMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customersettleRecord/CustomersettleRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customersettleRecord/CustomersettleRecordDetailMapper.java index 50833f1d..a11f6fca 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customersettleRecord/CustomersettleRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customersettleRecord/CustomersettleRecordDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.customersettleRecord; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.customersettleRecord.vo.CustomersettleRecordDetailExportReqVO; import com.win.module.wms.controller.customersettleRecord.vo.CustomersettleRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.customersettleRecord.CustomersettleRecordDetailDO; @@ -48,7 +50,9 @@ public interface CustomersettleRecordDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(CustomersettleRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(CustomersettleRecordDetailDO::getSoNumber, reqVO.getSoNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customersettleRecord/CustomersettleRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customersettleRecord/CustomersettleRecordMainMapper.java index 92675abb..4593c024 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customersettleRecord/CustomersettleRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customersettleRecord/CustomersettleRecordMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.customersettleRecord; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.customersettleRecord.vo.CustomersettleRecordMainExportReqVO; import com.win.module.wms.controller.customersettleRecord.vo.CustomersettleRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.customersettleRecord.CustomersettleRecordMainDO; @@ -44,7 +46,9 @@ public interface CustomersettleRecordMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(CustomersettleRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(CustomersettleRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customersettleRequest/CustomersettleRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customersettleRequest/CustomersettleRequestDetailMapper.java index 0528c7d4..a9e4a25e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customersettleRequest/CustomersettleRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customersettleRequest/CustomersettleRequestDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.customersettleRequest; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.customersettleRequest.vo.CustomersettleRequestDetailExportReqVO; import com.win.module.wms.controller.customersettleRequest.vo.CustomersettleRequestDetailPageReqVO; import com.win.module.wms.dal.dataobject.customersettleRequest.CustomersettleRequestDetailDO; @@ -42,7 +44,9 @@ public interface CustomersettleRequestDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(CustomersettleRequestDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(CustomersettleRequestDetailDO::getSoNumber, reqVO.getSoNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customersettleRequest/CustomersettleRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customersettleRequest/CustomersettleRequestMainMapper.java index 27a622f0..c7a23588 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customersettleRequest/CustomersettleRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customersettleRequest/CustomersettleRequestMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.customersettleRequest; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.customersettleRequest.vo.CustomersettleRequestMainExportReqVO; import com.win.module.wms.controller.customersettleRequest.vo.CustomersettleRequestMainPageReqVO; import com.win.module.wms.dal.dataobject.customersettleRequest.CustomersettleRequestMainDO; @@ -43,7 +45,9 @@ public interface CustomersettleRequestMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(CustomersettleRequestMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(CustomersettleRequestMainDO::getDeliverRecordNumber, reqVO.getDeliverRecordNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/deliverJob/DeliverJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/deliverJob/DeliverJobDetailMapper.java index 2fc2c5fb..db85e181 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/deliverJob/DeliverJobDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/deliverJob/DeliverJobDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.deliverJob; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.deliverJob.vo.DeliverJobDetailExportReqVO; import com.win.module.wms.controller.deliverJob.vo.DeliverJobDetailPageReqVO; import com.win.module.wms.dal.dataobject.deliverJob.DeliverJobDetailDO; @@ -42,7 +44,9 @@ public interface DeliverJobDetailMapper extends BaseMapperX .eqIfPresent(DeliverJobDetailDO::getCreator, reqVO.getCreator()) .orderByDesc(DeliverJobDetailDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(DeliverJobDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(DeliverJobDetailDO::getSoNumber, reqVO.getSoNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/deliverJob/DeliverJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/deliverJob/DeliverJobMainMapper.java index 3599627b..fe61a881 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/deliverJob/DeliverJobMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/deliverJob/DeliverJobMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.deliverJob; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainExportReqVO; import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainPageReqVO; import com.win.module.wms.dal.dataobject.deliverJob.DeliverJobMainDO; @@ -68,7 +70,9 @@ public interface DeliverJobMainMapper extends BaseMapperX { .eqIfPresent(DeliverJobMainDO::getAllowModifyPackingNumber, reqVO.getAllowModifyPackingNumber()) .orderByDesc(DeliverJobMainDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(DeliverJobMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(DeliverJobMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/deliverPlan/DeliverPlanDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/deliverPlan/DeliverPlanDetailMapper.java index 3a6299bb..2aa84691 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/deliverPlan/DeliverPlanDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/deliverPlan/DeliverPlanDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.deliverPlan; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.deliverPlan.vo.DeliverPlanDetailExportReqVO; import com.win.module.wms.controller.deliverPlan.vo.DeliverPlanDetailPageReqVO; import com.win.module.wms.dal.dataobject.deliverPlan.DeliverPlanDetailDO; @@ -36,7 +38,9 @@ public interface DeliverPlanDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(DeliverPlanDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(DeliverPlanDetailDO::getSoNumber, reqVO.getSoNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/deliverPlan/DeliverPlanMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/deliverPlan/DeliverPlanMainMapper.java index 35e0ad22..bdd20c67 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/deliverPlan/DeliverPlanMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/deliverPlan/DeliverPlanMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.deliverPlan; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.deliverPlan.vo.DeliverPlanMainExportReqVO; import com.win.module.wms.controller.deliverPlan.vo.DeliverPlanMainPageReqVO; import com.win.module.wms.dal.dataobject.deliverPlan.DeliverPlanMainDO; @@ -35,7 +37,9 @@ public interface DeliverPlanMainMapper extends BaseMapperX { .eqIfPresent(DeliverPlanMainDO::getAvailable, reqVO.getAvailable()) .orderByDesc(DeliverPlanMainDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(DeliverPlanMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(DeliverPlanMainDO::getCustomerCode, reqVO.getCustomerCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/deliverRecord/DeliverRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/deliverRecord/DeliverRecordDetailMapper.java index 311f0610..62c6127b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/deliverRecord/DeliverRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/deliverRecord/DeliverRecordDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.deliverRecord; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.deliverRecord.vo.DeliverRecordDetailExportReqVO; import com.win.module.wms.controller.deliverRecord.vo.DeliverRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.deliverRecord.DeliverRecordDetailDO; @@ -53,7 +55,9 @@ public interface DeliverRecordDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(DeliverRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(DeliverRecordDetailDO::getSoNumber, reqVO.getSoNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/deliverRecord/DeliverRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/deliverRecord/DeliverRecordMainMapper.java index 0f26a19c..2c1b4dd6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/deliverRecord/DeliverRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/deliverRecord/DeliverRecordMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.deliverRecord; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.deliverRecord.vo.DeliverRecordMainExportReqVO; import com.win.module.wms.controller.deliverRecord.vo.DeliverRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.deliverRecord.DeliverRecordMainDO; @@ -54,6 +56,10 @@ public interface DeliverRecordMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(DeliverRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(DeliverRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/deliverRequest/DeliverRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/deliverRequest/DeliverRequestDetailMapper.java index 2dc8b76f..8d9c8f31 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/deliverRequest/DeliverRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/deliverRequest/DeliverRequestDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.deliverRequest; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.deliverRequest.vo.DeliverRequestDetailExportReqVO; import com.win.module.wms.controller.deliverRequest.vo.DeliverRequestDetailPageReqVO; import com.win.module.wms.dal.dataobject.deliverRequest.DeliverRequestDetailDO; @@ -45,6 +47,10 @@ public interface DeliverRequestDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(DeliverRequestDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(DeliverRequestDetailDO::getSoNumber, reqVO.getSoNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/deliverRequest/DeliverRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/deliverRequest/DeliverRequestMainMapper.java index 894032f0..f13bad8a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/deliverRequest/DeliverRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/deliverRequest/DeliverRequestMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.deliverRequest; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.deliverRequest.vo.DeliverRequestMainExportReqVO; import com.win.module.wms.controller.deliverRequest.vo.DeliverRequestMainPageReqVO; import com.win.module.wms.dal.dataobject.deliverRequest.DeliverRequestMainDO; @@ -51,7 +53,9 @@ public interface DeliverRequestMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(DeliverRequestMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(DeliverRequestMainDO::getDeliverPlanNumber, reqVO.getDeliverPlanNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/demandforecasting/DemandforecastingDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/demandforecasting/DemandforecastingDetailMapper.java index 8c21a227..9dfd1b43 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/demandforecasting/DemandforecastingDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/demandforecasting/DemandforecastingDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.demandforecasting; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.demandforecasting.vo.DemandforecastingDetailExportReqVO; import com.win.module.wms.controller.demandforecasting.vo.DemandforecastingDetailPageReqVO; import com.win.module.wms.dal.dataobject.demandforecasting.DemandforecastingDetailDO; @@ -34,7 +36,9 @@ public interface DemandforecastingDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(DemandforecastingDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(DemandforecastingDetailDO::getPredictTimeType, reqVO.getPredictTimeType()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/demandforecasting/DemandforecastingMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/demandforecasting/DemandforecastingMainMapper.java index c5ff1eb7..2fe56f45 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/demandforecasting/DemandforecastingMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/demandforecasting/DemandforecastingMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.demandforecasting; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.demandforecasting.vo.DemandforecastingMainExportReqVO; import com.win.module.wms.controller.demandforecasting.vo.DemandforecastingMainPageReqVO; import com.win.module.wms.dal.dataobject.demandforecasting.DemandforecastingMainDO; @@ -36,7 +38,9 @@ public interface DemandforecastingMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(DemandforecastingMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(DemandforecastingMainDO::getSupplierCode, reqVO.getSupplierCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/dismantleRecord/DismantleRecordDetailbMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/dismantleRecord/DismantleRecordDetailbMapper.java deleted file mode 100644 index 42fc1c16..00000000 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/dismantleRecord/DismantleRecordDetailbMapper.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.win.module.wms.dal.mysql.dismantleRecord; - -import java.util.*; - -import com.win.framework.common.pojo.PageResult; -import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.win.framework.mybatis.core.mapper.BaseMapperX; -import com.win.module.wms.controller.dismantleRecord.vo.DismantleRecordDetailbExportReqVO; -import com.win.module.wms.controller.dismantleRecord.vo.DismantleRecordDetailbPageReqVO; -import com.win.module.wms.dal.dataobject.dismantleRecord.DismantleRecordDetailbDO; -import org.apache.ibatis.annotations.Mapper; - -/** - * 制品拆解记录子 Mapper - * - * @author 超级管理员 - */ -@Mapper -public interface DismantleRecordDetailbMapper extends BaseMapperX { - - default PageResult selectPage(DismantleRecordDetailbPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(DismantleRecordDetailbDO::getProcessCode, reqVO.getProcessCode()) - .eqIfPresent(DismantleRecordDetailbDO::getBomVersion, reqVO.getBomVersion()) - .eqIfPresent(DismantleRecordDetailbDO::getBatch, reqVO.getBatch()) - .eqIfPresent(DismantleRecordDetailbDO::getToLocationCode, reqVO.getToLocationCode()) - .eqIfPresent(DismantleRecordDetailbDO::getToLocationGroupCode, reqVO.getToLocationGroupCode()) - .eqIfPresent(DismantleRecordDetailbDO::getToAreaCode, reqVO.getToAreaCode()) - .eqIfPresent(DismantleRecordDetailbDO::getInventoryStatus, reqVO.getInventoryStatus()) - .eqIfPresent(DismantleRecordDetailbDO::getPackingNumber, reqVO.getPackingNumber()) - .eqIfPresent(DismantleRecordDetailbDO::getNumber, reqVO.getNumber()) - .eqIfPresent(DismantleRecordDetailbDO::getItemCode, reqVO.getItemCode()) - .eqIfPresent(DismantleRecordDetailbDO::getRemark, reqVO.getRemark()) - .betweenIfPresent(DismantleRecordDetailbDO::getCreateTime, reqVO.getCreateTime()) - .eqIfPresent(DismantleRecordDetailbDO::getCreator, reqVO.getCreator()) - .likeIfPresent(DismantleRecordDetailbDO::getItemName, reqVO.getItemName()) - .eqIfPresent(DismantleRecordDetailbDO::getItemDesc1, reqVO.getItemDesc1()) - .eqIfPresent(DismantleRecordDetailbDO::getItemDesc2, reqVO.getItemDesc2()) - .eqIfPresent(DismantleRecordDetailbDO::getProjectCode, reqVO.getProjectCode()) - .eqIfPresent(DismantleRecordDetailbDO::getUom, reqVO.getUom()) - .eqIfPresent(DismantleRecordDetailbDO::getCode, reqVO.getCode()) - .eqIfPresent(DismantleRecordDetailbDO::getInterfaceType, reqVO.getInterfaceType()) - .eqIfPresent(DismantleRecordDetailbDO::getJobDetailId, reqVO.getJobDetailId()) - .orderByDesc(DismantleRecordDetailbDO::getId)); - } - - default List selectList(DismantleRecordDetailbExportReqVO reqVO) { - return selectList(new LambdaQueryWrapperX() - .eqIfPresent(DismantleRecordDetailbDO::getProcessCode, reqVO.getProcessCode()) - .eqIfPresent(DismantleRecordDetailbDO::getBomVersion, reqVO.getBomVersion()) - .eqIfPresent(DismantleRecordDetailbDO::getBatch, reqVO.getBatch()) - .eqIfPresent(DismantleRecordDetailbDO::getToLocationCode, reqVO.getToLocationCode()) - .eqIfPresent(DismantleRecordDetailbDO::getToLocationGroupCode, reqVO.getToLocationGroupCode()) - .eqIfPresent(DismantleRecordDetailbDO::getToAreaCode, reqVO.getToAreaCode()) - .eqIfPresent(DismantleRecordDetailbDO::getInventoryStatus, reqVO.getInventoryStatus()) - .eqIfPresent(DismantleRecordDetailbDO::getPackingNumber, reqVO.getPackingNumber()) - .eqIfPresent(DismantleRecordDetailbDO::getNumber, reqVO.getNumber()) - .eqIfPresent(DismantleRecordDetailbDO::getItemCode, reqVO.getItemCode()) - .eqIfPresent(DismantleRecordDetailbDO::getRemark, reqVO.getRemark()) - .betweenIfPresent(DismantleRecordDetailbDO::getCreateTime, reqVO.getCreateTime()) - .eqIfPresent(DismantleRecordDetailbDO::getCreator, reqVO.getCreator()) - .likeIfPresent(DismantleRecordDetailbDO::getItemName, reqVO.getItemName()) - .eqIfPresent(DismantleRecordDetailbDO::getItemDesc1, reqVO.getItemDesc1()) - .eqIfPresent(DismantleRecordDetailbDO::getItemDesc2, reqVO.getItemDesc2()) - .eqIfPresent(DismantleRecordDetailbDO::getProjectCode, reqVO.getProjectCode()) - .eqIfPresent(DismantleRecordDetailbDO::getUom, reqVO.getUom()) - .eqIfPresent(DismantleRecordDetailbDO::getCode, reqVO.getCode()) - .eqIfPresent(DismantleRecordDetailbDO::getInterfaceType, reqVO.getInterfaceType()) - .eqIfPresent(DismantleRecordDetailbDO::getJobDetailId, reqVO.getJobDetailId()) - .orderByDesc(DismantleRecordDetailbDO::getId)); - } - -} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/dismantleRequest/DismantleRequestDetailbMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/dismantleRequest/DismantleRequestDetailbMapper.java deleted file mode 100644 index dd849ac9..00000000 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/dismantleRequest/DismantleRequestDetailbMapper.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.win.module.wms.dal.mysql.dismantleRequest; - -import java.util.*; - -import com.win.framework.common.pojo.PageResult; -import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.win.framework.mybatis.core.mapper.BaseMapperX; -import com.win.module.wms.controller.dismantleRequest.vo.DismantleRequestDetailbExportReqVO; -import com.win.module.wms.controller.dismantleRequest.vo.DismantleRequestDetailbPageReqVO; -import com.win.module.wms.dal.dataobject.dismantleRequest.DismantleRequestDetailbDO; -import org.apache.ibatis.annotations.Mapper; - -/** - * 制品拆解申请子 Mapper - * - * @author 超级管理员 - */ -@Mapper -public interface DismantleRequestDetailbMapper extends BaseMapperX { - - default PageResult selectPage(DismantleRequestDetailbPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(DismantleRequestDetailbDO::getProcessCode, reqVO.getProcessCode()) - .eqIfPresent(DismantleRequestDetailbDO::getBomVersion, reqVO.getBomVersion()) - .eqIfPresent(DismantleRequestDetailbDO::getItemCode, reqVO.getItemCode()) - .eqIfPresent(DismantleRequestDetailbDO::getNumber, reqVO.getNumber()) - .eqIfPresent(DismantleRequestDetailbDO::getRemark, reqVO.getRemark()) - .betweenIfPresent(DismantleRequestDetailbDO::getCreateTime, reqVO.getCreateTime()) - .likeIfPresent(DismantleRequestDetailbDO::getItemName, reqVO.getItemName()) - .eqIfPresent(DismantleRequestDetailbDO::getItemDesc1, reqVO.getItemDesc1()) - .eqIfPresent(DismantleRequestDetailbDO::getItemDesc2, reqVO.getItemDesc2()) - .eqIfPresent(DismantleRequestDetailbDO::getProjectCode, reqVO.getProjectCode()) - .eqIfPresent(DismantleRequestDetailbDO::getQty, reqVO.getQty()) - .eqIfPresent(DismantleRequestDetailbDO::getUom, reqVO.getUom()) - .betweenIfPresent(DismantleRequestDetailbDO::getUpdateTime, reqVO.getUpdateTime()) - .eqIfPresent(DismantleRequestDetailbDO::getUpdater, reqVO.getUpdater()) - .eqIfPresent(DismantleRequestDetailbDO::getCreator, reqVO.getCreator()) - .eqIfPresent(DismantleRequestDetailbDO::getSiteId, reqVO.getSiteId()) - .orderByDesc(DismantleRequestDetailbDO::getId)); - } - - default List selectList(DismantleRequestDetailbExportReqVO reqVO) { - return selectList(new LambdaQueryWrapperX() - .eqIfPresent(DismantleRequestDetailbDO::getProcessCode, reqVO.getProcessCode()) - .eqIfPresent(DismantleRequestDetailbDO::getBomVersion, reqVO.getBomVersion()) - .eqIfPresent(DismantleRequestDetailbDO::getItemCode, reqVO.getItemCode()) - .eqIfPresent(DismantleRequestDetailbDO::getNumber, reqVO.getNumber()) - .eqIfPresent(DismantleRequestDetailbDO::getRemark, reqVO.getRemark()) - .betweenIfPresent(DismantleRequestDetailbDO::getCreateTime, reqVO.getCreateTime()) - .likeIfPresent(DismantleRequestDetailbDO::getItemName, reqVO.getItemName()) - .eqIfPresent(DismantleRequestDetailbDO::getItemDesc1, reqVO.getItemDesc1()) - .eqIfPresent(DismantleRequestDetailbDO::getItemDesc2, reqVO.getItemDesc2()) - .eqIfPresent(DismantleRequestDetailbDO::getProjectCode, reqVO.getProjectCode()) - .eqIfPresent(DismantleRequestDetailbDO::getQty, reqVO.getQty()) - .eqIfPresent(DismantleRequestDetailbDO::getUom, reqVO.getUom()) - .betweenIfPresent(DismantleRequestDetailbDO::getUpdateTime, reqVO.getUpdateTime()) - .eqIfPresent(DismantleRequestDetailbDO::getUpdater, reqVO.getUpdater()) - .eqIfPresent(DismantleRequestDetailbDO::getCreator, reqVO.getCreator()) - .eqIfPresent(DismantleRequestDetailbDO::getSiteId, reqVO.getSiteId()) - .orderByDesc(DismantleRequestDetailbDO::getId)); - } - -} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleRecord/ProductdismantleRecordDetailbMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleRecord/ProductdismantleRecordDetailbMapper.java new file mode 100644 index 00000000..2a13430a --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleRecord/ProductdismantleRecordDetailbMapper.java @@ -0,0 +1,77 @@ +package com.win.module.wms.dal.mysql.productdismantleRecord; + +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; +import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordDetailbExportReqVO; +import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordDetailbPageReqVO; +import com.win.module.wms.dal.dataobject.productdismantleRecord.ProductdismantleRecordDetailbDO; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * 制品拆解记录子 Mapper + * + * @author 超级管理员 + */ +@Mapper +public interface ProductdismantleRecordDetailbMapper extends BaseMapperX { + + default PageResult selectPage(ProductdismantleRecordDetailbPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(ProductdismantleRecordDetailbDO::getProcessCode, reqVO.getProcessCode()) + .eqIfPresent(ProductdismantleRecordDetailbDO::getBomVersion, reqVO.getBomVersion()) + .eqIfPresent(ProductdismantleRecordDetailbDO::getBatch, reqVO.getBatch()) + .eqIfPresent(ProductdismantleRecordDetailbDO::getToLocationCode, reqVO.getToLocationCode()) + .eqIfPresent(ProductdismantleRecordDetailbDO::getToLocationGroupCode, reqVO.getToLocationGroupCode()) + .eqIfPresent(ProductdismantleRecordDetailbDO::getToAreaCode, reqVO.getToAreaCode()) + .eqIfPresent(ProductdismantleRecordDetailbDO::getInventoryStatus, reqVO.getInventoryStatus()) + .eqIfPresent(ProductdismantleRecordDetailbDO::getPackingNumber, reqVO.getPackingNumber()) + .eqIfPresent(ProductdismantleRecordDetailbDO::getNumber, reqVO.getNumber()) + .eqIfPresent(ProductdismantleRecordDetailbDO::getItemCode, reqVO.getItemCode()) + .eqIfPresent(ProductdismantleRecordDetailbDO::getRemark, reqVO.getRemark()) + .betweenIfPresent(ProductdismantleRecordDetailbDO::getCreateTime, reqVO.getCreateTime()) + .eqIfPresent(ProductdismantleRecordDetailbDO::getCreator, reqVO.getCreator()) + .likeIfPresent(ProductdismantleRecordDetailbDO::getItemName, reqVO.getItemName()) + .eqIfPresent(ProductdismantleRecordDetailbDO::getItemDesc1, reqVO.getItemDesc1()) + .eqIfPresent(ProductdismantleRecordDetailbDO::getItemDesc2, reqVO.getItemDesc2()) + .eqIfPresent(ProductdismantleRecordDetailbDO::getProjectCode, reqVO.getProjectCode()) + .eqIfPresent(ProductdismantleRecordDetailbDO::getUom, reqVO.getUom()) + .eqIfPresent(ProductdismantleRecordDetailbDO::getCode, reqVO.getCode()) + .eqIfPresent(ProductdismantleRecordDetailbDO::getInterfaceType, reqVO.getInterfaceType()) + .eqIfPresent(ProductdismantleRecordDetailbDO::getJobDetailId, reqVO.getJobDetailId()) + .orderByDesc(ProductdismantleRecordDetailbDO::getId)); + } + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductdismantleRecordDetailbExportReqVO reqVO) { + return selectList(new LambdaQueryWrapperX() + .eqIfPresent(ProductdismantleRecordDetailbDO::getProcessCode, reqVO.getProcessCode()) + .eqIfPresent(ProductdismantleRecordDetailbDO::getBomVersion, reqVO.getBomVersion()) + .eqIfPresent(ProductdismantleRecordDetailbDO::getBatch, reqVO.getBatch()) + .eqIfPresent(ProductdismantleRecordDetailbDO::getToLocationCode, reqVO.getToLocationCode()) + .eqIfPresent(ProductdismantleRecordDetailbDO::getToLocationGroupCode, reqVO.getToLocationGroupCode()) + .eqIfPresent(ProductdismantleRecordDetailbDO::getToAreaCode, reqVO.getToAreaCode()) + .eqIfPresent(ProductdismantleRecordDetailbDO::getInventoryStatus, reqVO.getInventoryStatus()) + .eqIfPresent(ProductdismantleRecordDetailbDO::getPackingNumber, reqVO.getPackingNumber()) + .eqIfPresent(ProductdismantleRecordDetailbDO::getNumber, reqVO.getNumber()) + .eqIfPresent(ProductdismantleRecordDetailbDO::getItemCode, reqVO.getItemCode()) + .eqIfPresent(ProductdismantleRecordDetailbDO::getRemark, reqVO.getRemark()) + .betweenIfPresent(ProductdismantleRecordDetailbDO::getCreateTime, reqVO.getCreateTime()) + .eqIfPresent(ProductdismantleRecordDetailbDO::getCreator, reqVO.getCreator()) + .likeIfPresent(ProductdismantleRecordDetailbDO::getItemName, reqVO.getItemName()) + .eqIfPresent(ProductdismantleRecordDetailbDO::getItemDesc1, reqVO.getItemDesc1()) + .eqIfPresent(ProductdismantleRecordDetailbDO::getItemDesc2, reqVO.getItemDesc2()) + .eqIfPresent(ProductdismantleRecordDetailbDO::getProjectCode, reqVO.getProjectCode()) + .eqIfPresent(ProductdismantleRecordDetailbDO::getUom, reqVO.getUom()) + .eqIfPresent(ProductdismantleRecordDetailbDO::getCode, reqVO.getCode()) + .eqIfPresent(ProductdismantleRecordDetailbDO::getInterfaceType, reqVO.getInterfaceType()) + .eqIfPresent(ProductdismantleRecordDetailbDO::getJobDetailId, reqVO.getJobDetailId()) + .orderByDesc(ProductdismantleRecordDetailbDO::getId)); + } + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleRecordMain/ProductdismantleRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleRecord/ProductdismantleRecordMainMapper.java similarity index 88% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleRecordMain/ProductdismantleRecordMainMapper.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleRecord/ProductdismantleRecordMainMapper.java index 4696321f..9dfbd0a9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleRecordMain/ProductdismantleRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleRecord/ProductdismantleRecordMainMapper.java @@ -1,15 +1,17 @@ -package com.win.module.wms.dal.mysql.productdismantleRecordMain; - -import java.util.*; +package com.win.module.wms.dal.mysql.productdismantleRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; -import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; -import com.win.module.wms.controller.productdismantleRecordMain.vo.ProductdismantleRecordMainExportReqVO; -import com.win.module.wms.controller.productdismantleRecordMain.vo.ProductdismantleRecordMainPageReqVO; -import com.win.module.wms.dal.dataobject.productdismantleRecordMain.ProductdismantleRecordMainDO; +import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; +import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordMainExportReqVO; +import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordMainPageReqVO; +import com.win.module.wms.dal.dataobject.productdismantleRecord.ProductdismantleRecordMainDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 制品拆解记录主 Mapper * @@ -44,7 +46,9 @@ public interface ProductdismantleRecordMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(ProductdismantleRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductdismantleRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleRequest/ProductdismantleRequestDetailbMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleRequest/ProductdismantleRequestDetailbMapper.java new file mode 100644 index 00000000..d2c55952 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleRequest/ProductdismantleRequestDetailbMapper.java @@ -0,0 +1,63 @@ +package com.win.module.wms.dal.mysql.productdismantleRequest; + +import com.win.framework.common.pojo.PageResult; +import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestDetailbExportReqVO; +import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestDetailbPageReqVO; +import com.win.module.wms.dal.dataobject.productdismantleRequest.ProductdismantleRequestDetailbDO; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * 制品拆解申请子 Mapper + * + * @author 超级管理员 + */ +@Mapper +public interface ProductdismantleRequestDetailbMapper extends BaseMapperX { + + default PageResult selectPage(ProductdismantleRequestDetailbPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(ProductdismantleRequestDetailbDO::getProcessCode, reqVO.getProcessCode()) + .eqIfPresent(ProductdismantleRequestDetailbDO::getBomVersion, reqVO.getBomVersion()) + .eqIfPresent(ProductdismantleRequestDetailbDO::getItemCode, reqVO.getItemCode()) + .eqIfPresent(ProductdismantleRequestDetailbDO::getNumber, reqVO.getNumber()) + .eqIfPresent(ProductdismantleRequestDetailbDO::getRemark, reqVO.getRemark()) + .betweenIfPresent(ProductdismantleRequestDetailbDO::getCreateTime, reqVO.getCreateTime()) + .likeIfPresent(ProductdismantleRequestDetailbDO::getItemName, reqVO.getItemName()) + .eqIfPresent(ProductdismantleRequestDetailbDO::getItemDesc1, reqVO.getItemDesc1()) + .eqIfPresent(ProductdismantleRequestDetailbDO::getItemDesc2, reqVO.getItemDesc2()) + .eqIfPresent(ProductdismantleRequestDetailbDO::getProjectCode, reqVO.getProjectCode()) + .eqIfPresent(ProductdismantleRequestDetailbDO::getQty, reqVO.getQty()) + .eqIfPresent(ProductdismantleRequestDetailbDO::getUom, reqVO.getUom()) + .betweenIfPresent(ProductdismantleRequestDetailbDO::getUpdateTime, reqVO.getUpdateTime()) + .eqIfPresent(ProductdismantleRequestDetailbDO::getUpdater, reqVO.getUpdater()) + .eqIfPresent(ProductdismantleRequestDetailbDO::getCreator, reqVO.getCreator()) + .eqIfPresent(ProductdismantleRequestDetailbDO::getSiteId, reqVO.getSiteId()) + .orderByDesc(ProductdismantleRequestDetailbDO::getId)); + } + + default List selectList(ProductdismantleRequestDetailbExportReqVO reqVO) { + return selectList(new LambdaQueryWrapperX() + .eqIfPresent(ProductdismantleRequestDetailbDO::getProcessCode, reqVO.getProcessCode()) + .eqIfPresent(ProductdismantleRequestDetailbDO::getBomVersion, reqVO.getBomVersion()) + .eqIfPresent(ProductdismantleRequestDetailbDO::getItemCode, reqVO.getItemCode()) + .eqIfPresent(ProductdismantleRequestDetailbDO::getNumber, reqVO.getNumber()) + .eqIfPresent(ProductdismantleRequestDetailbDO::getRemark, reqVO.getRemark()) + .betweenIfPresent(ProductdismantleRequestDetailbDO::getCreateTime, reqVO.getCreateTime()) + .likeIfPresent(ProductdismantleRequestDetailbDO::getItemName, reqVO.getItemName()) + .eqIfPresent(ProductdismantleRequestDetailbDO::getItemDesc1, reqVO.getItemDesc1()) + .eqIfPresent(ProductdismantleRequestDetailbDO::getItemDesc2, reqVO.getItemDesc2()) + .eqIfPresent(ProductdismantleRequestDetailbDO::getProjectCode, reqVO.getProjectCode()) + .eqIfPresent(ProductdismantleRequestDetailbDO::getQty, reqVO.getQty()) + .eqIfPresent(ProductdismantleRequestDetailbDO::getUom, reqVO.getUom()) + .betweenIfPresent(ProductdismantleRequestDetailbDO::getUpdateTime, reqVO.getUpdateTime()) + .eqIfPresent(ProductdismantleRequestDetailbDO::getUpdater, reqVO.getUpdater()) + .eqIfPresent(ProductdismantleRequestDetailbDO::getCreator, reqVO.getCreator()) + .eqIfPresent(ProductdismantleRequestDetailbDO::getSiteId, reqVO.getSiteId()) + .orderByDesc(ProductdismantleRequestDetailbDO::getId)); + } + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRequest/ConsumereRequestDetailbMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRequest/ConsumereRequestDetailbMapper.java deleted file mode 100644 index ef7aa5ff..00000000 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRequest/ConsumereRequestDetailbMapper.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.win.module.wms.dal.mysql.productrepairRequest; - -import com.win.framework.common.pojo.CustomConditions; -import com.win.framework.common.pojo.PageResult; -import com.win.framework.mybatis.core.mapper.BaseMapperX; -import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.win.framework.mybatis.core.util.QueryWrapperUtils; -import com.win.module.wms.controller.productrepairRequest.vo.ConsumereRequestDetailbExportReqVO; -import com.win.module.wms.controller.productrepairRequest.vo.ConsumereRequestDetailbPageReqVO; -import com.win.module.wms.dal.dataobject.productrepairRequest.ConsumereRequestDetailbDO; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * 制品返修申请子 Mapper - * - * @author 超级管理员 - */ -@Mapper -public interface ConsumereRequestDetailbMapper extends BaseMapperX { - - default PageResult selectPage(ConsumereRequestDetailbPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(ConsumereRequestDetailbDO::getInventoryStatus, reqVO.getInventoryStatus()) - .eqIfPresent(ConsumereRequestDetailbDO::getPackingNumber, reqVO.getPackingNumber()) - .eqIfPresent(ConsumereRequestDetailbDO::getBatch, reqVO.getBatch()) - .eqIfPresent(ConsumereRequestDetailbDO::getFromLocationCode, reqVO.getFromLocationCode()) - .eqIfPresent(ConsumereRequestDetailbDO::getNumber, reqVO.getNumber()) - .eqIfPresent(ConsumereRequestDetailbDO::getItemCode, reqVO.getItemCode()) - .eqIfPresent(ConsumereRequestDetailbDO::getRemark, reqVO.getRemark()) - .betweenIfPresent(ConsumereRequestDetailbDO::getCreateTime, reqVO.getCreateTime()) - .eqIfPresent(ConsumereRequestDetailbDO::getCreator, reqVO.getCreator()) - .likeIfPresent(ConsumereRequestDetailbDO::getItemName, reqVO.getItemName()) - .eqIfPresent(ConsumereRequestDetailbDO::getItemDesc1, reqVO.getItemDesc1()) - .eqIfPresent(ConsumereRequestDetailbDO::getItemDesc2, reqVO.getItemDesc2()) - .eqIfPresent(ConsumereRequestDetailbDO::getProjectCode, reqVO.getProjectCode()) - .eqIfPresent(ConsumereRequestDetailbDO::getUom, reqVO.getUom()) - .betweenIfPresent(ConsumereRequestDetailbDO::getUpdateTime, reqVO.getUpdateTime()) - .eqIfPresent(ConsumereRequestDetailbDO::getUpdater, reqVO.getUpdater()) - .orderByDesc(ConsumereRequestDetailbDO::getId)); - } - default PageResult selectSenior(CustomConditions conditions) { - return selectPage(conditions, QueryWrapperUtils.structure(conditions)); - } - default List selectList(ConsumereRequestDetailbExportReqVO reqVO) { - return selectList(new LambdaQueryWrapperX() - .eqIfPresent(ConsumereRequestDetailbDO::getInventoryStatus, reqVO.getInventoryStatus()) - .eqIfPresent(ConsumereRequestDetailbDO::getPackingNumber, reqVO.getPackingNumber()) - .eqIfPresent(ConsumereRequestDetailbDO::getBatch, reqVO.getBatch()) - .eqIfPresent(ConsumereRequestDetailbDO::getFromLocationCode, reqVO.getFromLocationCode()) - .eqIfPresent(ConsumereRequestDetailbDO::getNumber, reqVO.getNumber()) - .eqIfPresent(ConsumereRequestDetailbDO::getItemCode, reqVO.getItemCode()) - .eqIfPresent(ConsumereRequestDetailbDO::getRemark, reqVO.getRemark()) - .betweenIfPresent(ConsumereRequestDetailbDO::getCreateTime, reqVO.getCreateTime()) - .eqIfPresent(ConsumereRequestDetailbDO::getCreator, reqVO.getCreator()) - .likeIfPresent(ConsumereRequestDetailbDO::getItemName, reqVO.getItemName()) - .eqIfPresent(ConsumereRequestDetailbDO::getItemDesc1, reqVO.getItemDesc1()) - .eqIfPresent(ConsumereRequestDetailbDO::getItemDesc2, reqVO.getItemDesc2()) - .eqIfPresent(ConsumereRequestDetailbDO::getProjectCode, reqVO.getProjectCode()) - .eqIfPresent(ConsumereRequestDetailbDO::getUom, reqVO.getUom()) - .betweenIfPresent(ConsumereRequestDetailbDO::getUpdateTime, reqVO.getUpdateTime()) - .eqIfPresent(ConsumereRequestDetailbDO::getUpdater, reqVO.getUpdater()) - .orderByDesc(ConsumereRequestDetailbDO::getId)); - } - -} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRequest/ProductrepairRequestDetailbMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRequest/ProductrepairRequestDetailbMapper.java new file mode 100644 index 00000000..37f87b05 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRequest/ProductrepairRequestDetailbMapper.java @@ -0,0 +1,67 @@ +package com.win.module.wms.dal.mysql.productrepairRequest; + +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; +import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestDetailbExportReqVO; +import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestDetailbPageReqVO; +import com.win.module.wms.dal.dataobject.productrepairRequest.ProductrepairRequestDetailbDO; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * 制品返修申请子 Mapper + * + * @author 超级管理员 + */ +@Mapper +public interface ProductrepairRequestDetailbMapper extends BaseMapperX { + + default PageResult selectPage(ProductrepairRequestDetailbPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(ProductrepairRequestDetailbDO::getInventoryStatus, reqVO.getInventoryStatus()) + .eqIfPresent(ProductrepairRequestDetailbDO::getPackingNumber, reqVO.getPackingNumber()) + .eqIfPresent(ProductrepairRequestDetailbDO::getBatch, reqVO.getBatch()) + .eqIfPresent(ProductrepairRequestDetailbDO::getFromLocationCode, reqVO.getFromLocationCode()) + .eqIfPresent(ProductrepairRequestDetailbDO::getNumber, reqVO.getNumber()) + .eqIfPresent(ProductrepairRequestDetailbDO::getItemCode, reqVO.getItemCode()) + .eqIfPresent(ProductrepairRequestDetailbDO::getRemark, reqVO.getRemark()) + .betweenIfPresent(ProductrepairRequestDetailbDO::getCreateTime, reqVO.getCreateTime()) + .eqIfPresent(ProductrepairRequestDetailbDO::getCreator, reqVO.getCreator()) + .likeIfPresent(ProductrepairRequestDetailbDO::getItemName, reqVO.getItemName()) + .eqIfPresent(ProductrepairRequestDetailbDO::getItemDesc1, reqVO.getItemDesc1()) + .eqIfPresent(ProductrepairRequestDetailbDO::getItemDesc2, reqVO.getItemDesc2()) + .eqIfPresent(ProductrepairRequestDetailbDO::getProjectCode, reqVO.getProjectCode()) + .eqIfPresent(ProductrepairRequestDetailbDO::getUom, reqVO.getUom()) + .betweenIfPresent(ProductrepairRequestDetailbDO::getUpdateTime, reqVO.getUpdateTime()) + .eqIfPresent(ProductrepairRequestDetailbDO::getUpdater, reqVO.getUpdater()) + .orderByDesc(ProductrepairRequestDetailbDO::getId)); + } + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductrepairRequestDetailbExportReqVO reqVO) { + return selectList(new LambdaQueryWrapperX() + .eqIfPresent(ProductrepairRequestDetailbDO::getInventoryStatus, reqVO.getInventoryStatus()) + .eqIfPresent(ProductrepairRequestDetailbDO::getPackingNumber, reqVO.getPackingNumber()) + .eqIfPresent(ProductrepairRequestDetailbDO::getBatch, reqVO.getBatch()) + .eqIfPresent(ProductrepairRequestDetailbDO::getFromLocationCode, reqVO.getFromLocationCode()) + .eqIfPresent(ProductrepairRequestDetailbDO::getNumber, reqVO.getNumber()) + .eqIfPresent(ProductrepairRequestDetailbDO::getItemCode, reqVO.getItemCode()) + .eqIfPresent(ProductrepairRequestDetailbDO::getRemark, reqVO.getRemark()) + .betweenIfPresent(ProductrepairRequestDetailbDO::getCreateTime, reqVO.getCreateTime()) + .eqIfPresent(ProductrepairRequestDetailbDO::getCreator, reqVO.getCreator()) + .likeIfPresent(ProductrepairRequestDetailbDO::getItemName, reqVO.getItemName()) + .eqIfPresent(ProductrepairRequestDetailbDO::getItemDesc1, reqVO.getItemDesc1()) + .eqIfPresent(ProductrepairRequestDetailbDO::getItemDesc2, reqVO.getItemDesc2()) + .eqIfPresent(ProductrepairRequestDetailbDO::getProjectCode, reqVO.getProjectCode()) + .eqIfPresent(ProductrepairRequestDetailbDO::getUom, reqVO.getUom()) + .betweenIfPresent(ProductrepairRequestDetailbDO::getUpdateTime, reqVO.getUpdateTime()) + .eqIfPresent(ProductrepairRequestDetailbDO::getUpdater, reqVO.getUpdater()) + .orderByDesc(ProductrepairRequestDetailbDO::getId)); + } + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/container/ContainerDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/container/ContainerDetailService.java index e0e48fa7..0ea80b03 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/container/ContainerDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/container/ContainerDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.container; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.container.vo.ContainerDetailCreateReqVO; import com.win.module.wms.controller.container.vo.ContainerDetailExportReqVO; import com.win.module.wms.controller.container.vo.ContainerDetailPageReqVO; @@ -62,6 +63,14 @@ public interface ContainerDetailService { * @return 器具子分页 */ PageResult getContainerDetailPage(ContainerDetailPageReqVO pageReqVO); + /** + * 获得用高级搜索器具子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getContainerDetailSenior(CustomConditions conditions); + /** * 获得器具子列表, 用于 Excel 导出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/container/ContainerDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/container/ContainerDetailServiceImpl.java index 099d2225..9ed55e15 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/container/ContainerDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/container/ContainerDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.container; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.container.vo.ContainerDetailCreateReqVO; import com.win.module.wms.controller.container.vo.ContainerDetailExportReqVO; import com.win.module.wms.controller.container.vo.ContainerDetailPageReqVO; @@ -72,7 +73,10 @@ public class ContainerDetailServiceImpl implements ContainerDetailService { public List getContainerDetailList(Collection ids) { return containerDetailMapper.selectBatchIds(ids); } - + @Override + public PageResult getContainerDetailSenior(CustomConditions conditions) { + return containerDetailMapper.selectSenior(conditions); + } @Override public PageResult getContainerDetailPage(ContainerDetailPageReqVO pageReqVO) { return containerDetailMapper.selectPage(pageReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/container/ContainerMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/container/ContainerMainService.java index 1c66ec9d..7716e32a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/container/ContainerMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/container/ContainerMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.container; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.container.vo.ContainerMainCreateReqVO; import com.win.module.wms.controller.container.vo.ContainerMainExportReqVO; import com.win.module.wms.controller.container.vo.ContainerMainPageReqVO; @@ -62,6 +63,14 @@ public interface ContainerMainService { * @return 器具主分页 */ PageResult getContainerMainPage(ContainerMainPageReqVO pageReqVO); + /** + * 获得用高级搜索器具主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getContainerMainSenior(CustomConditions conditions); + /** * 获得器具主列表, 用于 Excel 导出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/container/ContainerMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/container/ContainerMainServiceImpl.java index 44bbae0a..e7796653 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/container/ContainerMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/container/ContainerMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.container; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.container.vo.ContainerMainCreateReqVO; import com.win.module.wms.controller.container.vo.ContainerMainExportReqVO; import com.win.module.wms.controller.container.vo.ContainerMainPageReqVO; @@ -72,7 +73,10 @@ public class ContainerMainServiceImpl implements ContainerMainService { public List getContainerMainList(Collection ids) { return containerMainMapper.selectBatchIds(ids); } - + @Override + public PageResult getContainerMainSenior(CustomConditions conditions) { + return containerMainMapper.selectSenior(conditions); + } @Override public PageResult getContainerMainPage(ContainerMainPageReqVO pageReqVO) { return containerMainMapper.selectPage(pageReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobDetailService.java index 30a498d8..343fc2e2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.countJob; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.countJob.vo.CountJobDetailCreateReqVO; import com.win.module.wms.controller.countJob.vo.CountJobDetailExportReqVO; import com.win.module.wms.controller.countJob.vo.CountJobDetailPageReqVO; @@ -62,6 +63,13 @@ public interface CountJobDetailService { * @return 盘点任务子分页 */ PageResult getCountJobDetailPage(CountJobDetailPageReqVO pageReqVO); + /** + * 获得用高级搜索盘点任务子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getCountJobDetailSenior(CustomConditions conditions); /** * 获得盘点任务子列表, 用于 Excel 导出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobDetailServiceImpl.java index 271d3ad5..1c475428 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.countJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.countJob.vo.CountJobDetailCreateReqVO; import com.win.module.wms.controller.countJob.vo.CountJobDetailExportReqVO; import com.win.module.wms.controller.countJob.vo.CountJobDetailPageReqVO; @@ -77,7 +78,10 @@ public class CountJobDetailServiceImpl implements CountJobDetailService { public PageResult getCountJobDetailPage(CountJobDetailPageReqVO pageReqVO) { return countJobDetailMapper.selectPage(pageReqVO); } - + @Override + public PageResult getCountJobDetailSenior(CustomConditions conditions) { + return countJobDetailMapper.selectSenior(conditions); + } @Override public List getCountJobDetailList(CountJobDetailExportReqVO exportReqVO) { return countJobDetailMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainService.java index 080ef53d..6ccc3031 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.countJob; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.countJob.vo.CountJobMainCreateReqVO; import com.win.module.wms.controller.countJob.vo.CountJobMainExportReqVO; import com.win.module.wms.controller.countJob.vo.CountJobMainPageReqVO; @@ -63,6 +64,14 @@ public interface CountJobMainService { */ PageResult getCountJobMainPage(CountJobMainPageReqVO pageReqVO); + /** + * 获得用高级搜索盘点任务主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getCountJobMainSenior(CustomConditions conditions); + /** * 获得盘点任务主列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainServiceImpl.java index c10b8da1..3a431d3f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainServiceImpl.java @@ -1,6 +1,7 @@ package com.win.module.wms.service.countJob; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.countJob.vo.CountJobMainCreateReqVO; import com.win.module.wms.controller.countJob.vo.CountJobMainExportReqVO; import com.win.module.wms.controller.countJob.vo.CountJobMainPageReqVO; @@ -78,7 +79,10 @@ public class CountJobMainServiceImpl implements CountJobMainService { public PageResult getCountJobMainPage(CountJobMainPageReqVO pageReqVO) { return countJobMainMapper.selectPage(pageReqVO); } - + @Override + public PageResult getCountJobMainSenior(CustomConditions conditions) { + return countJobMainMapper.selectSenior(conditions); + } @Override public List getCountJobMainList(CountJobMainExportReqVO exportReqVO) { return countJobMainMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanDetailService.java index 0935c586..633c9011 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.countPlan; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.countPlan.vo.CountPlanDetailCreateReqVO; import com.win.module.wms.controller.countPlan.vo.CountPlanDetailExportReqVO; import com.win.module.wms.controller.countPlan.vo.CountPlanDetailPageReqVO; @@ -62,6 +63,13 @@ public interface CountPlanDetailService { * @return 盘点计划子分页 */ PageResult getCountPlanDetailPage(CountPlanDetailPageReqVO pageReqVO); + /** + * 获得用高级搜索盘点计划子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getCountPlanDetailSenior(CustomConditions conditions); /** * 获得盘点计划子列表, 用于 Excel 导出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanDetailServiceImpl.java index cde41bf1..d5c694ef 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.countPlan; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.countPlan.vo.CountPlanDetailCreateReqVO; import com.win.module.wms.controller.countPlan.vo.CountPlanDetailExportReqVO; import com.win.module.wms.controller.countPlan.vo.CountPlanDetailPageReqVO; @@ -77,7 +78,10 @@ public class CountPlanDetailServiceImpl implements CountPlanDetailService { public PageResult getCountPlanDetailPage(CountPlanDetailPageReqVO pageReqVO) { return countPlanDetailMapper.selectPage(pageReqVO); } - + @Override + public PageResult getCountPlanDetailSenior(CustomConditions conditions) { + return countPlanDetailMapper.selectSenior(conditions); + } @Override public List getCountPlanDetailList(CountPlanDetailExportReqVO exportReqVO) { return countPlanDetailMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanMainService.java index 4c1def57..cbb4931f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.countPlan; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.countPlan.vo.CountPlanMainCreateReqVO; import com.win.module.wms.controller.countPlan.vo.CountPlanMainExportReqVO; import com.win.module.wms.controller.countPlan.vo.CountPlanMainPageReqVO; @@ -62,6 +63,13 @@ public interface CountPlanMainService { * @return 盘点计划主分页 */ PageResult getCountPlanMainPage(CountPlanMainPageReqVO pageReqVO); + /** + * 获得用高级搜索盘点计划主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getCountPlanMainSenior(CustomConditions conditions); /** * 获得盘点计划主列表, 用于 Excel 导出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanMainServiceImpl.java index 00f06632..ba0b99b3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.countPlan; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.countPlan.vo.CountPlanMainCreateReqVO; import com.win.module.wms.controller.countPlan.vo.CountPlanMainExportReqVO; import com.win.module.wms.controller.countPlan.vo.CountPlanMainPageReqVO; @@ -72,7 +73,10 @@ public class CountPlanMainServiceImpl implements CountPlanMainService { public List getCountPlanMainList(Collection ids) { return countPlanMainMapper.selectBatchIds(ids); } - + @Override + public PageResult getCountPlanMainSenior(CustomConditions conditions) { + return countPlanMainMapper.selectSenior(conditions); + } @Override public PageResult getCountPlanMainPage(CountPlanMainPageReqVO pageReqVO) { return countPlanMainMapper.selectPage(pageReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRecord/CountRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRecord/CountRecordDetailService.java index 03f47e85..00702928 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRecord/CountRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRecord/CountRecordDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.countRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.countRecord.vo.CountRecordDetailCreateReqVO; import com.win.module.wms.controller.countRecord.vo.CountRecordDetailExportReqVO; import com.win.module.wms.controller.countRecord.vo.CountRecordDetailPageReqVO; @@ -62,6 +63,13 @@ public interface CountRecordDetailService { * @return 盘点记录子分页 */ PageResult getCountRecordDetailPage(CountRecordDetailPageReqVO pageReqVO); + /** + * 获得用高级搜索盘点记录子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getCountRecordDetailSenior(CustomConditions conditions); /** * 获得盘点记录子列表, 用于 Excel 导出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRecord/CountRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRecord/CountRecordDetailServiceImpl.java index ce83650f..0c4a62a2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRecord/CountRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRecord/CountRecordDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.countRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.countRecord.vo.CountRecordDetailCreateReqVO; import com.win.module.wms.controller.countRecord.vo.CountRecordDetailExportReqVO; import com.win.module.wms.controller.countRecord.vo.CountRecordDetailPageReqVO; @@ -77,7 +78,10 @@ public class CountRecordDetailServiceImpl implements CountRecordDetailService { public PageResult getCountRecordDetailPage(CountRecordDetailPageReqVO pageReqVO) { return countRecordDetailMapper.selectPage(pageReqVO); } - + @Override + public PageResult getCountRecordDetailSenior(CustomConditions conditions) { + return countRecordDetailMapper.selectSenior(conditions); + } @Override public List getCountRecordDetailList(CountRecordDetailExportReqVO exportReqVO) { return countRecordDetailMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRecord/CountRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRecord/CountRecordMainService.java index 888e5234..f4786615 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRecord/CountRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRecord/CountRecordMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.countRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.countRecord.vo.CountRecordMainCreateReqVO; import com.win.module.wms.controller.countRecord.vo.CountRecordMainExportReqVO; import com.win.module.wms.controller.countRecord.vo.CountRecordMainPageReqVO; @@ -62,6 +63,13 @@ public interface CountRecordMainService { * @return 盘点记录主分页 */ PageResult getCountRecordMainPage(CountRecordMainPageReqVO pageReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getCountRecordMainSenior(CustomConditions conditions); /** * 获得盘点记录主列表, 用于 Excel 导出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRecord/CountRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRecord/CountRecordMainServiceImpl.java index bb534248..6d516064 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRecord/CountRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRecord/CountRecordMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.countRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.countRecord.vo.CountRecordMainCreateReqVO; import com.win.module.wms.controller.countRecord.vo.CountRecordMainExportReqVO; import com.win.module.wms.controller.countRecord.vo.CountRecordMainPageReqVO; @@ -77,7 +78,10 @@ public class CountRecordMainServiceImpl implements CountRecordMainService { public PageResult getCountRecordMainPage(CountRecordMainPageReqVO pageReqVO) { return countRecordMainMapper.selectPage(pageReqVO); } - + @Override + public PageResult getCountRecordMainSenior(CustomConditions conditions) { + return countRecordMainMapper.selectSenior(conditions); + } @Override public List getCountRecordMainList(CountRecordMainExportReqVO exportReqVO) { return countRecordMainMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestDetailService.java index 960c8f4d..8b43051b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.countRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.countRequest.vo.CountRequestDetailCreateReqVO; import com.win.module.wms.controller.countRequest.vo.CountRequestDetailExportReqVO; import com.win.module.wms.controller.countRequest.vo.CountRequestDetailPageReqVO; @@ -62,6 +63,13 @@ public interface CountRequestDetailService { * @return 盘点申请子分页 */ PageResult getCountRequestDetailPage(CountRequestDetailPageReqVO pageReqVO); + /** + * 获得用高级搜索盘点申请子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getCountRequestDetailSenior(CustomConditions conditions); /** * 获得盘点申请子列表, 用于 Excel 导出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestDetailServiceImpl.java index ad5e769a..9a8081f3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.countRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.countRequest.vo.CountRequestDetailCreateReqVO; import com.win.module.wms.controller.countRequest.vo.CountRequestDetailExportReqVO; import com.win.module.wms.controller.countRequest.vo.CountRequestDetailPageReqVO; @@ -72,7 +73,10 @@ public class CountRequestDetailServiceImpl implements CountRequestDetailService public List getCountRequestDetailList(Collection ids) { return countRequestDetailMapper.selectBatchIds(ids); } - + @Override + public PageResult getCountRequestDetailSenior(CustomConditions conditions) { + return countRequestDetailMapper.selectSenior(conditions); + } @Override public PageResult getCountRequestDetailPage(CountRequestDetailPageReqVO pageReqVO) { return countRequestDetailMapper.selectPage(pageReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainService.java index 338eecee..8c9ffbe6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.countRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.countRequest.vo.CountRequestMainCreateReqVO; import com.win.module.wms.controller.countRequest.vo.CountRequestMainExportReqVO; import com.win.module.wms.controller.countRequest.vo.CountRequestMainPageReqVO; @@ -62,6 +63,13 @@ public interface CountRequestMainService { * @return 盘点申请主分页 */ PageResult getCountRequestMainPage(CountRequestMainPageReqVO pageReqVO); + /** + * 获得用高级搜索盘点申请主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getCountRequestMainSenior(CustomConditions conditions); /** * 获得盘点申请主列表, 用于 Excel 导出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java index 77177547..2831c404 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.countRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.countRequest.vo.CountRequestMainCreateReqVO; import com.win.module.wms.controller.countRequest.vo.CountRequestMainExportReqVO; import com.win.module.wms.controller.countRequest.vo.CountRequestMainPageReqVO; @@ -77,7 +78,10 @@ public class CountRequestMainServiceImpl implements CountRequestMainService { public PageResult getCountRequestMainPage(CountRequestMainPageReqVO pageReqVO) { return countRequestMainMapper.selectPage(pageReqVO); } - + @Override + public PageResult getCountRequestMainSenior(CustomConditions conditions) { + return countRequestMainMapper.selectSenior(conditions); + } @Override public List getCountRequestMainList(CountRequestMainExportReqVO exportReqVO) { return countRequestMainMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRecord/CountadjustRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRecord/CountadjustRecordDetailService.java index 552204ce..4c4179ca 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRecord/CountadjustRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRecord/CountadjustRecordDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.countadjustRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.countadjustRecord.vo.CountadjustRecordDetailCreateReqVO; import com.win.module.wms.controller.countadjustRecord.vo.CountadjustRecordDetailExportReqVO; import com.win.module.wms.controller.countadjustRecord.vo.CountadjustRecordDetailPageReqVO; @@ -62,6 +63,13 @@ public interface CountadjustRecordDetailService { * @return 盘点调整记录子分页 */ PageResult getCountadjustRecordDetailPage(CountadjustRecordDetailPageReqVO pageReqVO); + /** + * 获得用高级搜索盘点调整记录子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getCountadjustRecordDetailSenior(CustomConditions conditions); /** * 获得盘点调整记录子列表, 用于 Excel 导出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRecord/CountadjustRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRecord/CountadjustRecordDetailServiceImpl.java index 24fbce2d..082cdf0e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRecord/CountadjustRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRecord/CountadjustRecordDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.countadjustRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.countadjustRecord.vo.CountadjustRecordDetailCreateReqVO; import com.win.module.wms.controller.countadjustRecord.vo.CountadjustRecordDetailExportReqVO; import com.win.module.wms.controller.countadjustRecord.vo.CountadjustRecordDetailPageReqVO; @@ -77,7 +78,10 @@ public class CountadjustRecordDetailServiceImpl implements CountadjustRecordDeta public PageResult getCountadjustRecordDetailPage(CountadjustRecordDetailPageReqVO pageReqVO) { return countadjustRecordDetailMapper.selectPage(pageReqVO); } - + @Override + public PageResult getCountadjustRecordDetailSenior(CustomConditions conditions) { + return countadjustRecordDetailMapper.selectSenior(conditions); + } @Override public List getCountadjustRecordDetailList(CountadjustRecordDetailExportReqVO exportReqVO) { return countadjustRecordDetailMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRecord/CountadjustRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRecord/CountadjustRecordMainService.java index 495eef7c..506906b8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRecord/CountadjustRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRecord/CountadjustRecordMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.countadjustRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.countadjustRecord.vo.CountadjustRecordMainCreateReqVO; import com.win.module.wms.controller.countadjustRecord.vo.CountadjustRecordMainExportReqVO; import com.win.module.wms.controller.countadjustRecord.vo.CountadjustRecordMainPageReqVO; @@ -62,6 +63,13 @@ public interface CountadjustRecordMainService { * @return 盘点调整记录主分页 */ PageResult getCountadjustRecordMainPage(CountadjustRecordMainPageReqVO pageReqVO); + /** + * 获得用高级搜索盘点调整记录主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getCountadjustRecordMainSenior(CustomConditions conditions); /** * 获得盘点调整记录主列表, 用于 Excel 导出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRecord/CountadjustRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRecord/CountadjustRecordMainServiceImpl.java index 5a97f04f..e1bfcaed 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRecord/CountadjustRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRecord/CountadjustRecordMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.countadjustRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.countadjustRecord.vo.CountadjustRecordMainCreateReqVO; import com.win.module.wms.controller.countadjustRecord.vo.CountadjustRecordMainExportReqVO; import com.win.module.wms.controller.countadjustRecord.vo.CountadjustRecordMainPageReqVO; @@ -77,7 +78,10 @@ public class CountadjustRecordMainServiceImpl implements CountadjustRecordMainSe public PageResult getCountadjustRecordMainPage(CountadjustRecordMainPageReqVO pageReqVO) { return countadjustRecordMainMapper.selectPage(pageReqVO); } - + @Override + public PageResult getCountadjustRecordMainSenior(CustomConditions conditions) { + return countadjustRecordMainMapper.selectSenior(conditions); + } @Override public List getCountadjustRecordMainList(CountadjustRecordMainExportReqVO exportReqVO) { return countadjustRecordMainMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestMainService.java index 186f77ce..1562f7fd 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.countadjustRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.countadjustRequest.vo.CountadjustRequestMainCreateReqVO; import com.win.module.wms.controller.countadjustRequest.vo.CountadjustRequestMainExportReqVO; import com.win.module.wms.controller.countadjustRequest.vo.CountadjustRequestMainPageReqVO; @@ -62,6 +63,13 @@ public interface CountadjustRequestMainService { * @return 盘点调整申请主分页 */ PageResult getCountadjustRequestMainPage(CountadjustRequestMainPageReqVO pageReqVO); + /** + * 获得用高级搜索盘点调整申请主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getCountadjustRequestMainSenior(CustomConditions conditions); /** * 获得盘点调整申请主列表, 用于 Excel 导出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestMainServiceImpl.java index 3af76f88..67b29a2d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.countadjustRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.countadjustRequest.vo.CountadjustRequestMainCreateReqVO; import com.win.module.wms.controller.countadjustRequest.vo.CountadjustRequestMainExportReqVO; import com.win.module.wms.controller.countadjustRequest.vo.CountadjustRequestMainPageReqVO; @@ -72,6 +73,10 @@ public class CountadjustRequestMainServiceImpl implements CountadjustRequestMain public List getCountadjustRequestMainList(Collection ids) { return countadjustRequestMainMapper.selectBatchIds(ids); } + @Override + public PageResult getCountadjustRequestMainSenior(CustomConditions conditions) { + return countadjustRequestMainMapper.selectSenior(conditions); + } @Override public PageResult getCountadjustRequestMainPage(CountadjustRequestMainPageReqVO pageReqVO) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/currencyexchange/CurrencyexchangeService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/currencyexchange/CurrencyexchangeService.java index 98e1b024..d4405466 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/currencyexchange/CurrencyexchangeService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/currencyexchange/CurrencyexchangeService.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.currencyexchange; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.currencyexchange.vo.*; import com.win.module.wms.dal.dataobject.currencyexchange.CurrencyexchangeDO; @@ -60,6 +61,13 @@ public interface CurrencyexchangeService { * @return 货币转换分页 */ PageResult getCurrencyexchangePage(CurrencyexchangePageReqVO pageReqVO); + /** + * 获得用高级搜索货币转换分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getCurrencyexchangeSenior(CustomConditions conditions); /** * 获得货币转换列表, 用于 Excel 导出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/currencyexchange/CurrencyexchangeServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/currencyexchange/CurrencyexchangeServiceImpl.java index 71e379b9..5b48f6c2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/currencyexchange/CurrencyexchangeServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/currencyexchange/CurrencyexchangeServiceImpl.java @@ -1,9 +1,11 @@ package com.win.module.wms.service.currencyexchange; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.google.common.annotations.VisibleForTesting; import com.win.framework.common.exception.ServiceException; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.datapermission.core.util.DataPermissionUtils; import com.win.module.wms.controller.currencyexchange.vo.*; @@ -85,7 +87,10 @@ public class CurrencyexchangeServiceImpl implements CurrencyexchangeService { public PageResult getCurrencyexchangePage(CurrencyexchangePageReqVO pageReqVO) { return currencyexchangeMapper.selectPage(pageReqVO); } - + @Override + public PageResult getCurrencyexchangeSenior(CustomConditions conditions) { + return currencyexchangeMapper.selectSenior(conditions); + } @Override public List getCurrencyexchangeList(CurrencyexchangeExportReqVO exportReqVO) { return currencyexchangeMapper.selectList(exportReqVO); @@ -98,24 +103,44 @@ public class CurrencyexchangeServiceImpl implements CurrencyexchangeService { } List errorList = new ArrayList<>(); currencyexchanges.forEach(currencyexchange -> { + String massage = ""; // 校验，判断是否有不符合的原因 - try { - if(mode != null){ - validateCurrencyexchangeForCreateOrUpdate(null,currencyexchange.getCurrency(),currencyexchange.getBasiccurrency(),currencyexchange.getRate(),currencyexchange.getAvailable()); + if(mode != null){ + try { + validateConfigurationSettingExists(null); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateCurrencyExists(currencyexchange.getCurrency()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateBasiccurrencyExists(currencyexchange.getBasiccurrency()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateAvailableExists(currencyexchange.getAvailable()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + }if(StrUtil.isNotEmpty(massage)){ + massage.substring(0,massage.length()-1); + errorList.add(currencyexchange); + } + if(errorList == null){ + // 判断如果不存在，在进行插入 + CurrencyexchangeDO existConfigurationSetting = null; + if (existConfigurationSetting == null&& mode != 3) { + currencyexchangeMapper.insert(CurrencyexchangeConvert.INSTANCE.convert(currencyexchange)); + } + else if (existConfigurationSetting != null && mode != 2) {// 如果存在，判断是否允许更新 + CurrencyexchangeDO currencyexchangeDO = CurrencyexchangeConvert.INSTANCE.convert(currencyexchange); + currencyexchangeDO.setId(existConfigurationSetting.getId()); + currencyexchangeMapper.updateById(currencyexchangeDO); + } } - } catch (ServiceException ex) { - errorList.add(currencyexchange); - return; - } - // 判断如果不存在，在进行插入 - CurrencyexchangeDO existConfigurationSetting = null; - if (existConfigurationSetting == null&& mode != 3) { - currencyexchangeMapper.insert(CurrencyexchangeConvert.INSTANCE.convert(currencyexchange)); - } - else if (existConfigurationSetting != null && mode != 2) {// 如果存在，判断是否允许更新 - CurrencyexchangeDO currencyexchangeDO = CurrencyexchangeConvert.INSTANCE.convert(currencyexchange); - currencyexchangeDO.setId(existConfigurationSetting.getId()); - currencyexchangeMapper.updateById(currencyexchangeDO); } }); //错误不为空并非部分更新，手工回滚 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customer/CustomerService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customer/CustomerService.java index 06541fd6..26d53bf7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customer/CustomerService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customer/CustomerService.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.customer; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.customer.vo.*; import com.win.module.wms.dal.dataobject.customer.CustomerDO; @@ -60,6 +61,13 @@ public interface CustomerService { * @return 客户分页 */ PageResult getCustomerPage(CustomerPageReqVO pageReqVO); + /** + * 获得用高级搜索客户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getCustomerSenior(CustomConditions conditions); /** * 获得客户列表, 用于 Excel 导出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customer/CustomerServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customer/CustomerServiceImpl.java index 9c3356d4..c119c65a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customer/CustomerServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customer/CustomerServiceImpl.java @@ -5,15 +5,13 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.google.common.annotations.VisibleForTesting; import com.win.framework.common.exception.ServiceException; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.datapermission.core.util.DataPermissionUtils; import com.win.module.wms.controller.customer.vo.*; import com.win.module.wms.convert.customer.CustomerConvert; import com.win.module.wms.dal.dataobject.currencyexchange.CurrencyexchangeDO; import com.win.module.wms.dal.dataobject.customer.CustomerDO; -import com.win.module.wms.dal.dataobject.customeritem.CustomeritemDO; -import com.win.module.wms.dal.dataobject.itempackaging.ItempackagingDO; -import com.win.module.wms.dal.dataobject.warehouse.WarehouseDO; import com.win.module.wms.dal.mysql.customer.CustomerMapper; import org.springframework.stereotype.Service; import org.springframework.transaction.interceptor.TransactionAspectSupport; @@ -81,7 +79,10 @@ public class CustomerServiceImpl implements CustomerService { public PageResult getCustomerPage(CustomerPageReqVO pageReqVO) { return customerMapper.selectPage(pageReqVO); } - + @Override + public PageResult getCustomerSenior(CustomConditions conditions) { + return customerMapper.selectSenior(conditions); + } @Override public List getCustomerList(CustomerExportReqVO exportReqVO) { return customerMapper.selectList(exportReqVO); @@ -94,24 +95,45 @@ public class CustomerServiceImpl implements CustomerService { } List errorList = new ArrayList<>(); customers.forEach(customer -> { + String massage = ""; // 校验，判断是否有不符合的原因 - try { - if(mode != null){ - validateCurrencyexchangeForCreateOrUpdate(null,customer.getCode(),customer.getShortName(),customer.getAvailable()); + if(mode != null){ + try { + validateCustomerExists(null); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateCodeExists(null,customer.getCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateShortNameExists(customer.getShortName()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateAvailableExists(customer.getAvailable()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + if(StrUtil.isNotEmpty(massage)){ + massage.substring(0,massage.length()-1); + errorList.add(customer); + } + if(errorList == null){ + // 判断如果不存在，在进行插入 + CurrencyexchangeDO existConfigurationSetting = null; + if (existConfigurationSetting == null&& mode != 3) { + customerMapper.insert(CustomerConvert.INSTANCE.convert(customer)); + } + else if (existConfigurationSetting != null && mode != 2) {// 如果存在，判断是否允许更新 + CustomerDO customerDO = CustomerConvert.INSTANCE.convert(customer); + customerDO.setId(existConfigurationSetting.getId()); + customerMapper.updateById(customerDO); + } } - } catch (ServiceException ex) { - errorList.add(customer); - return; - } - // 判断如果不存在，在进行插入 - CurrencyexchangeDO existConfigurationSetting = null; - if (existConfigurationSetting == null&& mode != 3) { - customerMapper.insert(CustomerConvert.INSTANCE.convert(customer)); - } - else if (existConfigurationSetting != null && mode != 2) {// 如果存在，判断是否允许更新 - CustomerDO customerDO = CustomerConvert.INSTANCE.convert(customer); - customerDO.setId(existConfigurationSetting.getId()); - customerMapper.updateById(customerDO); } }); //错误不为空并非部分更新，手工回滚 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerdock/CustomerdockService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerdock/CustomerdockService.java index 3bb42457..535a98f7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerdock/CustomerdockService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerdock/CustomerdockService.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.customerdock; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.customerdock.vo.*; import com.win.module.wms.dal.dataobject.customerdock.CustomerdockDO; @@ -60,6 +61,13 @@ public interface CustomerdockService { * @return 客户月台分页 */ PageResult getCustomerdockPage(CustomerdockPageReqVO pageReqVO); + /** + * 获得用高级搜索客户月台分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getCustomerdockSenior(CustomConditions conditions); /** * 获得客户月台列表, 用于 Excel 导出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerdock/CustomerdockServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerdock/CustomerdockServiceImpl.java index af75bc11..3bbfbd9b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerdock/CustomerdockServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerdock/CustomerdockServiceImpl.java @@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.google.common.annotations.VisibleForTesting; import com.win.framework.common.exception.ServiceException; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.datapermission.core.util.DataPermissionUtils; import com.win.module.wms.controller.customerdock.vo.*; @@ -85,7 +86,10 @@ public class CustomerdockServiceImpl implements CustomerdockService { public PageResult getCustomerdockPage(CustomerdockPageReqVO pageReqVO) { return customerdockMapper.selectPage(pageReqVO); } - + @Override + public PageResult getCustomerdockSenior(CustomConditions conditions) { + return customerdockMapper.selectSenior(conditions); + } @Override public List getCustomerdockList(CustomerdockExportReqVO exportReqVO) { return customerdockMapper.selectList(exportReqVO); @@ -98,24 +102,47 @@ public class CustomerdockServiceImpl implements CustomerdockService { } List errorList = new ArrayList<>(); customerdocks.forEach(customerdock -> { + String massage = ""; // 校验，判断是否有不符合的原因 - try { - if(mode != null){ - validateCurrencyexchangeForCreateOrUpdate(null,customerdock.getCode(),customerdock.getCustomerCode(),customerdock.getDefaultLocationCode(),customerdock.getAvailable()); + if(mode != null){ + try { + validateCustomerExists(null); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateCodeExists(null,customerdock.getCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } try { + validateCustomerCodeExists(customerdock.getCustomerCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; } - } catch (ServiceException ex) { + try { + validateDefaultLocationCodeExists(customerdock.getDefaultLocationCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } try { + validateAvailableExists(customerdock.getAvailable()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + } if(StrUtil.isNotEmpty(massage)){ + massage.substring(0,massage.length()-1); errorList.add(customerdock); - return; - } - // 判断如果不存在，在进行插入 - CurrencyexchangeDO existConfigurationSetting = null; - if (existConfigurationSetting == null&& mode != 3) { - customerdockMapper.insert(CustomerdockConvert.INSTANCE.convert(customerdock)); } - else if (existConfigurationSetting != null && mode != 2) {// 如果存在，判断是否允许更新 - CustomerdockDO customerdockDO = CustomerdockConvert.INSTANCE.convert(customerdock); - customerdockDO.setId(existConfigurationSetting.getId()); - customerdockMapper.updateById(customerdockDO); + if(errorList == null){ + // 判断如果不存在，在进行插入 + CurrencyexchangeDO existConfigurationSetting = null; + if (existConfigurationSetting == null&& mode != 3) { + customerdockMapper.insert(CustomerdockConvert.INSTANCE.convert(customerdock)); + } + else if (existConfigurationSetting != null && mode != 2) {// 如果存在，判断是否允许更新 + CustomerdockDO customerdockDO = CustomerdockConvert.INSTANCE.convert(customerdock); + customerdockDO.setId(existConfigurationSetting.getId()); + customerdockMapper.updateById(customerdockDO); + } } }); //错误不为空并非部分更新，手工回滚 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customeritem/CustomeritemService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customeritem/CustomeritemService.java index e5dbfd79..c492dd6f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customeritem/CustomeritemService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customeritem/CustomeritemService.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.customeritem; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.customeritem.vo.*; import com.win.module.wms.dal.dataobject.customeritem.CustomeritemDO; @@ -60,6 +61,13 @@ public interface CustomeritemService { * @return 客户物品分页 */ PageResult getCustomeritemPage(CustomeritemPageReqVO pageReqVO); + /** + * 获得用高级搜索客户物品分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getCustomeritemSenior(CustomConditions conditions); /** * 获得客户物品列表, 用于 Excel 导出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customeritem/CustomeritemServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customeritem/CustomeritemServiceImpl.java index 3b84acd5..1bdb7cb5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customeritem/CustomeritemServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customeritem/CustomeritemServiceImpl.java @@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.google.common.annotations.VisibleForTesting; import com.win.framework.common.exception.ServiceException; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.datapermission.core.util.DataPermissionUtils; import com.win.module.wms.controller.customeritem.vo.*; @@ -84,7 +85,10 @@ public class CustomeritemServiceImpl implements CustomeritemService { public PageResult getCustomeritemPage(CustomeritemPageReqVO pageReqVO) { return customeritemMapper.selectPage(pageReqVO); } - + @Override + public PageResult getCustomeritemSenior(CustomConditions conditions) { + return customeritemMapper.selectSenior(conditions); + } @Override public List getCustomeritemList(CustomeritemExportReqVO exportReqVO) { return customeritemMapper.selectList(exportReqVO); @@ -97,24 +101,60 @@ public class CustomeritemServiceImpl implements CustomeritemService { } List errorList = new ArrayList<>(); customeritems.forEach(customeritem -> { + String massage = ""; // 校验，判断是否有不符合的原因 - try { - if(mode != null){ - validateCustomeritemForCreateOrUpdate(null,customeritem.getCustomerCode(),customeritem.getItemCode(),customeritem.getPackUnit(), - customeritem.getPackQty(),customeritem.getPackQtyOfContainer(),customeritem.getAvailable());} - } catch (ServiceException ex) { - errorList.add(customeritem); - return; + if(mode != null){ + try { + validateCustomerExists(null); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateItemCodeExists(null,customeritem.getCustomerItemCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateCustomerCodeExists(customeritem.getCustomerCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validatePackUnitExists(customeritem.getPackUnit()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validatePackQtyExists(customeritem.getPackQty()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validatePackQtyOfContainerExists(customeritem.getPackQtyOfContainer()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateAvailableExists(customeritem.getAvailable()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } } - // 判断如果不存在，在进行插入 - CustomeritemDO existConfigurationSetting = null; - if (existConfigurationSetting == null&& mode != 3) { - customeritemMapper.insert(CustomeritemConvert.INSTANCE.convert(customeritem)); + if(StrUtil.isNotEmpty(massage)){ + massage.substring(0,massage.length()-1); + errorList.add(customeritem); } - else if (existConfigurationSetting != null && mode != 2) {// 如果存在，判断是否允许更新 - CustomeritemDO customeritemDO = CustomeritemConvert.INSTANCE.convert(customeritem); - customeritemDO.setId(existConfigurationSetting.getId()); - customeritemMapper.updateById(customeritemDO); + if(errorList == null){ + // 判断如果不存在，在进行插入 + CustomeritemDO existConfigurationSetting = null; + if (existConfigurationSetting == null&& mode != 3) { + customeritemMapper.insert(CustomeritemConvert.INSTANCE.convert(customeritem)); + } + else if (existConfigurationSetting != null && mode != 2) {// 如果存在，判断是否允许更新 + CustomeritemDO customeritemDO = CustomeritemConvert.INSTANCE.convert(customeritem); + customeritemDO.setId(existConfigurationSetting.getId()); + customeritemMapper.updateById(customeritemDO); + } } }); //错误不为空并非部分更新，手工回滚 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRecord/CustomerreceiptRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRecord/CustomerreceiptRecordDetailService.java index 6c76a50a..068ee5d4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRecord/CustomerreceiptRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRecord/CustomerreceiptRecordDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.customerreceiptRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.customerreceiptRecord.vo.CustomerreceiptRecordDetailCreateReqVO; import com.win.module.wms.controller.customerreceiptRecord.vo.CustomerreceiptRecordDetailExportReqVO; import com.win.module.wms.controller.customerreceiptRecord.vo.CustomerreceiptRecordDetailPageReqVO; @@ -62,6 +63,13 @@ public interface CustomerreceiptRecordDetailService { * @return 客户收货记录子分页 */ PageResult getCustomerreceiptRecordDetailPage(CustomerreceiptRecordDetailPageReqVO pageReqVO); + /** + * 获得用高级搜索客户收货记录子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getCustomerreceiptRecordDetailSenior(CustomConditions conditions); /** * 获得客户收货记录子列表, 用于 Excel 导出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRecord/CustomerreceiptRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRecord/CustomerreceiptRecordDetailServiceImpl.java index f949eb51..efa2ebcc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRecord/CustomerreceiptRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRecord/CustomerreceiptRecordDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.customerreceiptRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.customerreceiptRecord.vo.CustomerreceiptRecordDetailCreateReqVO; import com.win.module.wms.controller.customerreceiptRecord.vo.CustomerreceiptRecordDetailExportReqVO; import com.win.module.wms.controller.customerreceiptRecord.vo.CustomerreceiptRecordDetailPageReqVO; @@ -72,7 +73,10 @@ public class CustomerreceiptRecordDetailServiceImpl implements CustomerreceiptRe public List getCustomerreceiptRecordDetailList(Collection ids) { return customerreceiptRecordDetailMapper.selectBatchIds(ids); } - + @Override + public PageResult getCustomerreceiptRecordDetailSenior(CustomConditions conditions) { + return customerreceiptRecordDetailMapper.selectSenior(conditions); + } @Override public PageResult getCustomerreceiptRecordDetailPage(CustomerreceiptRecordDetailPageReqVO pageReqVO) { return customerreceiptRecordDetailMapper.selectPage(pageReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRecord/CustomerreceiptRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRecord/CustomerreceiptRecordMainService.java index b9fb3d4e..ab4332a4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRecord/CustomerreceiptRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRecord/CustomerreceiptRecordMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.customerreceiptRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.customerreceiptRecord.vo.CustomerreceiptRecordMainCreateReqVO; import com.win.module.wms.controller.customerreceiptRecord.vo.CustomerreceiptRecordMainExportReqVO; import com.win.module.wms.controller.customerreceiptRecord.vo.CustomerreceiptRecordMainPageReqVO; @@ -62,6 +63,13 @@ public interface CustomerreceiptRecordMainService { * @return 客户收货记录主分页 */ PageResult getCustomerreceiptRecordMainPage(CustomerreceiptRecordMainPageReqVO pageReqVO); + /** + * 获得用高级搜索客户收货记录主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getCustomerreceiptRecordMainSenior(CustomConditions conditions); /** * 获得客户收货记录主列表, 用于 Excel 导出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRecord/CustomerreceiptRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRecord/CustomerreceiptRecordMainServiceImpl.java index 21960909..33b52f44 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRecord/CustomerreceiptRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRecord/CustomerreceiptRecordMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.customerreceiptRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.customerreceiptRecord.vo.CustomerreceiptRecordMainCreateReqVO; import com.win.module.wms.controller.customerreceiptRecord.vo.CustomerreceiptRecordMainExportReqVO; import com.win.module.wms.controller.customerreceiptRecord.vo.CustomerreceiptRecordMainPageReqVO; @@ -77,7 +78,10 @@ public class CustomerreceiptRecordMainServiceImpl implements CustomerreceiptReco public PageResult getCustomerreceiptRecordMainPage(CustomerreceiptRecordMainPageReqVO pageReqVO) { return customerreceiptRecordMainMapper.selectPage(pageReqVO); } - + @Override + public PageResult getCustomerreceiptRecordMainSenior(CustomConditions conditions) { + return customerreceiptRecordMainMapper.selectSenior(conditions); + } @Override public List getCustomerreceiptRecordMainList(CustomerreceiptRecordMainExportReqVO exportReqVO) { return customerreceiptRecordMainMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRequest/CustomerreceiptRequestDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRequest/CustomerreceiptRequestDetailService.java index da8c2c62..b49d7ff6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRequest/CustomerreceiptRequestDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRequest/CustomerreceiptRequestDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.customerreceiptRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.customerreceiptRequest.vo.CustomerreceiptRequestDetailCreateReqVO; import com.win.module.wms.controller.customerreceiptRequest.vo.CustomerreceiptRequestDetailExportReqVO; import com.win.module.wms.controller.customerreceiptRequest.vo.CustomerreceiptRequestDetailPageReqVO; @@ -62,6 +63,13 @@ public interface CustomerreceiptRequestDetailService { * @return 客户收货申请子分页 */ PageResult getCustomerreceiptRequestDetailPage(CustomerreceiptRequestDetailPageReqVO pageReqVO); + /** + * 获得用高级搜索客户收货申请子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getCustomerreceiptRequestDetailSenior(CustomConditions conditions); /** * 获得客户收货申请子列表, 用于 Excel 导出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRequest/CustomerreceiptRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRequest/CustomerreceiptRequestDetailServiceImpl.java index 5022110b..5e4fd175 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRequest/CustomerreceiptRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRequest/CustomerreceiptRequestDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.customerreceiptRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.customerreceiptRequest.vo.CustomerreceiptRequestDetailCreateReqVO; import com.win.module.wms.controller.customerreceiptRequest.vo.CustomerreceiptRequestDetailExportReqVO; import com.win.module.wms.controller.customerreceiptRequest.vo.CustomerreceiptRequestDetailPageReqVO; @@ -72,7 +73,10 @@ public class CustomerreceiptRequestDetailServiceImpl implements CustomerreceiptR public List getCustomerreceiptRequestDetailList(Collection ids) { return customerreceiptRequestDetailMapper.selectBatchIds(ids); } - + @Override + public PageResult getCustomerreceiptRequestDetailSenior(CustomConditions conditions) { + return customerreceiptRequestDetailMapper.selectSenior(conditions); + } @Override public PageResult getCustomerreceiptRequestDetailPage(CustomerreceiptRequestDetailPageReqVO pageReqVO) { return customerreceiptRequestDetailMapper.selectPage(pageReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRequest/CustomerreceiptRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRequest/CustomerreceiptRequestMainService.java index d6b545e0..4a81865f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRequest/CustomerreceiptRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRequest/CustomerreceiptRequestMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.customerreceiptRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.customerreceiptRequest.vo.CustomerreceiptRequestMainCreateReqVO; import com.win.module.wms.controller.customerreceiptRequest.vo.CustomerreceiptRequestMainExportReqVO; import com.win.module.wms.controller.customerreceiptRequest.vo.CustomerreceiptRequestMainPageReqVO; @@ -62,6 +63,13 @@ public interface CustomerreceiptRequestMainService { * @return 客户收货申请主分页 */ PageResult getCustomerreceiptRequestMainPage(CustomerreceiptRequestMainPageReqVO pageReqVO); + /** + * 获得用高级搜索客户收货申请主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getCustomerreceiptRequestMainSenior(CustomConditions conditions); /** * 获得客户收货申请主列表, 用于 Excel 导出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRequest/CustomerreceiptRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRequest/CustomerreceiptRequestMainServiceImpl.java index b8dd17e6..825d1714 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRequest/CustomerreceiptRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRequest/CustomerreceiptRequestMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.customerreceiptRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.customerreceiptRequest.vo.CustomerreceiptRequestMainCreateReqVO; import com.win.module.wms.controller.customerreceiptRequest.vo.CustomerreceiptRequestMainExportReqVO; import com.win.module.wms.controller.customerreceiptRequest.vo.CustomerreceiptRequestMainPageReqVO; @@ -72,7 +73,10 @@ public class CustomerreceiptRequestMainServiceImpl implements CustomerreceiptReq public List getCustomerreceiptRequestMainList(Collection ids) { return customerreceiptRequestMainMapper.selectBatchIds(ids); } - + @Override + public PageResult getCustomerreceiptRequestMainSenior(CustomConditions conditions) { + return customerreceiptRequestMainMapper.selectSenior(conditions); + } @Override public PageResult getCustomerreceiptRequestMainPage(CustomerreceiptRequestMainPageReqVO pageReqVO) { return customerreceiptRequestMainMapper.selectPage(pageReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobDetailService.java index 49ce3bb0..fcbbf31d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.customerreturnJob; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobDetailCreateReqVO; import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobDetailExportReqVO; import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobDetailPageReqVO; @@ -62,6 +63,13 @@ public interface CustomerreturnJobDetailService { * @return 客户退货任务子分页 */ PageResult getCustomerreturnJobDetailPage(CustomerreturnJobDetailPageReqVO pageReqVO); + /** + * 获得用高级搜索客户退货任务子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getCustomerreturnJobDetailSenior(CustomConditions conditions); /** * 获得客户退货任务子列表, 用于 Excel 导出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobDetailServiceImpl.java index e8471111..bb725907 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.customerreturnJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobDetailCreateReqVO; import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobDetailExportReqVO; import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobDetailPageReqVO; @@ -77,7 +78,10 @@ public class CustomerreturnJobDetailServiceImpl implements CustomerreturnJobDeta public PageResult getCustomerreturnJobDetailPage(CustomerreturnJobDetailPageReqVO pageReqVO) { return customerreturnJobDetailMapper.selectPage(pageReqVO); } - + @Override + public PageResult getCustomerreturnJobDetailSenior(CustomConditions conditions) { + return customerreturnJobDetailMapper.selectSenior(conditions); + } @Override public List getCustomerreturnJobDetailList(CustomerreturnJobDetailExportReqVO exportReqVO) { return customerreturnJobDetailMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainService.java index 7f25f9bc..7b91699e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.customerreturnJob; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainCreateReqVO; import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainExportReqVO; import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainPageReqVO; @@ -64,6 +65,13 @@ public interface CustomerreturnJobMainService { * @return 客户退货任务主分页 */ PageResult getCustomerreturnJobMainPage(CustomerreturnJobMainPageReqVO pageReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getCustomerreturnJobMainSenior(CustomConditions conditions); /** * 获得客户退货任务主列表, 用于 Excel 导出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainServiceImpl.java index eb4cce47..ca01a90f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainServiceImpl.java @@ -1,6 +1,7 @@ package com.win.module.wms.service.customerreturnJob; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainCreateReqVO; import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainExportReqVO; import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainPageReqVO; @@ -86,7 +87,10 @@ public class CustomerreturnJobMainServiceImpl implements CustomerreturnJobMainSe public PageResult getCustomerreturnJobMainPage(CustomerreturnJobMainPageReqVO pageReqVO) { return customerreturnJobMainMapper.selectPage(pageReqVO); } - + @Override + public PageResult getCustomerreturnJobMainSenior(CustomConditions conditions) { + return customerreturnJobMainMapper.selectSenior(conditions); + } @Override public List getCustomerreturnJobMainList(CustomerreturnJobMainExportReqVO exportReqVO) { return customerreturnJobMainMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRecord/CustomerreturnRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRecord/CustomerreturnRecordDetailService.java index dce0c32d..1aa39844 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRecord/CustomerreturnRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRecord/CustomerreturnRecordDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.customerreturnRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.customerreturnRecord.vo.CustomerreturnRecordDetailCreateReqVO; import com.win.module.wms.controller.customerreturnRecord.vo.CustomerreturnRecordDetailExportReqVO; import com.win.module.wms.controller.customerreturnRecord.vo.CustomerreturnRecordDetailPageReqVO; @@ -62,6 +63,13 @@ public interface CustomerreturnRecordDetailService { * @return 客户退货记录子分页 */ PageResult getCustomerreturnRecordDetailPage(CustomerreturnRecordDetailPageReqVO pageReqVO); + /** + * 获得用高级搜索客户退货记录子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getCustomerreturnRecordDetailSenior(CustomConditions conditions); /** * 获得客户退货记录子列表, 用于 Excel 导出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRecord/CustomerreturnRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRecord/CustomerreturnRecordDetailServiceImpl.java index 8d669839..cef6d01a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRecord/CustomerreturnRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRecord/CustomerreturnRecordDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.customerreturnRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.customerreturnRecord.vo.CustomerreturnRecordDetailCreateReqVO; import com.win.module.wms.controller.customerreturnRecord.vo.CustomerreturnRecordDetailExportReqVO; import com.win.module.wms.controller.customerreturnRecord.vo.CustomerreturnRecordDetailPageReqVO; @@ -72,7 +73,10 @@ public class CustomerreturnRecordDetailServiceImpl implements CustomerreturnReco public List getCustomerreturnRecordDetailList(Collection ids) { return customerreturnRecordDetailMapper.selectBatchIds(ids); } - + @Override + public PageResult getCustomerreturnRecordDetailSenior(CustomConditions conditions) { + return customerreturnRecordDetailMapper.selectSenior(conditions); + } @Override public PageResult getCustomerreturnRecordDetailPage(CustomerreturnRecordDetailPageReqVO pageReqVO) { return customerreturnRecordDetailMapper.selectPage(pageReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRecord/CustomerreturnRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRecord/CustomerreturnRecordMainService.java index b0607a1f..a1d7b629 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRecord/CustomerreturnRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRecord/CustomerreturnRecordMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.customerreturnRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.customerreturnRecord.vo.CustomerreturnRecordMainCreateReqVO; import com.win.module.wms.controller.customerreturnRecord.vo.CustomerreturnRecordMainExportReqVO; import com.win.module.wms.controller.customerreturnRecord.vo.CustomerreturnRecordMainPageReqVO; @@ -62,6 +63,13 @@ public interface CustomerreturnRecordMainService { * @return 客户退货记录主分页 */ PageResult getCustomerreturnRecordMainPage(CustomerreturnRecordMainPageReqVO pageReqVO); + /** + * 获得用高级搜索客户退货记录主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getCustomerreturnRecordMainSenior(CustomConditions conditions); /** * 获得客户退货记录主列表, 用于 Excel 导出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRecord/CustomerreturnRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRecord/CustomerreturnRecordMainServiceImpl.java index bf83d21c..74261a7d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRecord/CustomerreturnRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRecord/CustomerreturnRecordMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.customerreturnRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.customerreturnRecord.vo.CustomerreturnRecordMainCreateReqVO; import com.win.module.wms.controller.customerreturnRecord.vo.CustomerreturnRecordMainExportReqVO; import com.win.module.wms.controller.customerreturnRecord.vo.CustomerreturnRecordMainPageReqVO; @@ -77,7 +78,10 @@ public class CustomerreturnRecordMainServiceImpl implements CustomerreturnRecord public PageResult getCustomerreturnRecordMainPage(CustomerreturnRecordMainPageReqVO pageReqVO) { return customerreturnRecordMainMapper.selectPage(pageReqVO); } - + @Override + public PageResult getCustomerreturnRecordMainSenior(CustomConditions conditions) { + return customerreturnRecordMainMapper.selectSenior(conditions); + } @Override public List getCustomerreturnRecordMainList(CustomerreturnRecordMainExportReqVO exportReqVO) { return customerreturnRecordMainMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestDetailService.java index 462dd65f..8336dd33 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.customerreturnRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.customerreturnRequest.vo.CustomerreturnRequestDetailCreateReqVO; import com.win.module.wms.controller.customerreturnRequest.vo.CustomerreturnRequestDetailExportReqVO; import com.win.module.wms.controller.customerreturnRequest.vo.CustomerreturnRequestDetailPageReqVO; @@ -62,6 +63,13 @@ public interface CustomerreturnRequestDetailService { * @return 客户退货申请子分页 */ PageResult getCustomerreturnRequestDetailPage(CustomerreturnRequestDetailPageReqVO pageReqVO); + /** + * 获得用高级搜索客户退货申请子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getCustomerreturnRequestDetailSenior(CustomConditions conditions); /** * 获得客户退货申请子列表, 用于 Excel 导出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestDetailServiceImpl.java index 47bd4160..54216e20 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.customerreturnRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.customerreturnRequest.vo.CustomerreturnRequestDetailCreateReqVO; import com.win.module.wms.controller.customerreturnRequest.vo.CustomerreturnRequestDetailExportReqVO; import com.win.module.wms.controller.customerreturnRequest.vo.CustomerreturnRequestDetailPageReqVO; @@ -77,7 +78,10 @@ public class CustomerreturnRequestDetailServiceImpl implements CustomerreturnReq public PageResult getCustomerreturnRequestDetailPage(CustomerreturnRequestDetailPageReqVO pageReqVO) { return customerreturnRequestDetailMapper.selectPage(pageReqVO); } - + @Override + public PageResult getCustomerreturnRequestDetailSenior(CustomConditions conditions) { + return customerreturnRequestDetailMapper.selectSenior(conditions); + } @Override public List getCustomerreturnRequestDetailList(CustomerreturnRequestDetailExportReqVO exportReqVO) { return customerreturnRequestDetailMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestMainService.java index 6ef670d4..ea6048a3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.customerreturnRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.customerreturnRequest.vo.CustomerreturnRequestMainCreateReqVO; import com.win.module.wms.controller.customerreturnRequest.vo.CustomerreturnRequestMainExportReqVO; import com.win.module.wms.controller.customerreturnRequest.vo.CustomerreturnRequestMainPageReqVO; @@ -62,6 +63,13 @@ public interface CustomerreturnRequestMainService { * @return 客户退货申请主分页 */ PageResult getCustomerreturnRequestMainPage(CustomerreturnRequestMainPageReqVO pageReqVO); + /** + * 获得用高级搜索客户退货申请主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getCustomerreturnRequestMainSenior(CustomConditions conditions); /** * 获得客户退货申请主列表, 用于 Excel 导出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestMainServiceImpl.java index 3e5308d1..71658fd5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.customerreturnRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.customerreturnRequest.vo.CustomerreturnRequestMainCreateReqVO; import com.win.module.wms.controller.customerreturnRequest.vo.CustomerreturnRequestMainExportReqVO; import com.win.module.wms.controller.customerreturnRequest.vo.CustomerreturnRequestMainPageReqVO; @@ -77,7 +78,10 @@ public class CustomerreturnRequestMainServiceImpl implements CustomerreturnReque public PageResult getCustomerreturnRequestMainPage(CustomerreturnRequestMainPageReqVO pageReqVO) { return customerreturnRequestMainMapper.selectPage(pageReqVO); } - + @Override + public PageResult getCustomerreturnRequestMainSenior(CustomConditions conditions) { + return customerreturnRequestMainMapper.selectSenior(conditions); + } @Override public List getCustomerreturnRequestMainList(CustomerreturnRequestMainExportReqVO exportReqVO) { return customerreturnRequestMainMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customersettleRecord/CustomersettleRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customersettleRecord/CustomersettleRecordDetailService.java index ee95faf1..7d18ecce 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customersettleRecord/CustomersettleRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customersettleRecord/CustomersettleRecordDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.customersettleRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.customersettleRecord.vo.CustomersettleRecordDetailCreateReqVO; import com.win.module.wms.controller.customersettleRecord.vo.CustomersettleRecordDetailExportReqVO; import com.win.module.wms.controller.customersettleRecord.vo.CustomersettleRecordDetailPageReqVO; @@ -62,6 +63,13 @@ public interface CustomersettleRecordDetailService { * @return 客户结算记录子分页 */ PageResult getCustomersettleRecordDetailPage(CustomersettleRecordDetailPageReqVO pageReqVO); + /** + * 获得用高级搜索客户结算记录子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getCustomersettleRecordDetailSenior(CustomConditions conditions); /** * 获得客户结算记录子列表, 用于 Excel 导出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customersettleRecord/CustomersettleRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customersettleRecord/CustomersettleRecordDetailServiceImpl.java index 294107cd..a28702f7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customersettleRecord/CustomersettleRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customersettleRecord/CustomersettleRecordDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.customersettleRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.customersettleRecord.vo.CustomersettleRecordDetailCreateReqVO; import com.win.module.wms.controller.customersettleRecord.vo.CustomersettleRecordDetailExportReqVO; import com.win.module.wms.controller.customersettleRecord.vo.CustomersettleRecordDetailPageReqVO; @@ -77,7 +78,10 @@ public class CustomersettleRecordDetailServiceImpl implements CustomersettleReco public PageResult getCustomersettleRecordDetailPage(CustomersettleRecordDetailPageReqVO pageReqVO) { return customersettleRecordDetailMapper.selectPage(pageReqVO); } - + @Override + public PageResult getCustomersettleRecordDetailSenior(CustomConditions conditions) { + return customersettleRecordDetailMapper.selectSenior(conditions); + } @Override public List getCustomersettleRecordDetailList(CustomersettleRecordDetailExportReqVO exportReqVO) { return customersettleRecordDetailMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customersettleRecord/CustomersettleRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customersettleRecord/CustomersettleRecordMainService.java index 7d8be50d..c9686f1f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customersettleRecord/CustomersettleRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customersettleRecord/CustomersettleRecordMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.customersettleRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.customersettleRecord.vo.CustomersettleRecordMainCreateReqVO; import com.win.module.wms.controller.customersettleRecord.vo.CustomersettleRecordMainExportReqVO; import com.win.module.wms.controller.customersettleRecord.vo.CustomersettleRecordMainPageReqVO; @@ -62,6 +63,13 @@ public interface CustomersettleRecordMainService { * @return 客户结算记录主分页 */ PageResult getCustomersettleRecordMainPage(CustomersettleRecordMainPageReqVO pageReqVO); + /** + * 获得用高级搜索客户结算记录主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getCustomersettleRecordMainSenior(CustomConditions conditions); /** * 获得客户结算记录主列表, 用于 Excel 导出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customersettleRecord/CustomersettleRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customersettleRecord/CustomersettleRecordMainServiceImpl.java index cd7e7f65..3120581e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customersettleRecord/CustomersettleRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customersettleRecord/CustomersettleRecordMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.customersettleRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.customersettleRecord.vo.CustomersettleRecordMainCreateReqVO; import com.win.module.wms.controller.customersettleRecord.vo.CustomersettleRecordMainExportReqVO; import com.win.module.wms.controller.customersettleRecord.vo.CustomersettleRecordMainPageReqVO; @@ -77,7 +78,10 @@ public class CustomersettleRecordMainServiceImpl implements CustomersettleRecord public PageResult getCustomersettleRecordMainPage(CustomersettleRecordMainPageReqVO pageReqVO) { return customersettleRecordMainMapper.selectPage(pageReqVO); } - + @Override + public PageResult getCustomersettleRecordMainSenior(CustomConditions conditions) { + return customersettleRecordMainMapper.selectSenior(conditions); + } @Override public List getCustomersettleRecordMainList(CustomersettleRecordMainExportReqVO exportReqVO) { return customersettleRecordMainMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customersettleRequest/CustomersettleRequestDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customersettleRequest/CustomersettleRequestDetailService.java index 0d225ca0..6a63418a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customersettleRequest/CustomersettleRequestDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customersettleRequest/CustomersettleRequestDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.customersettleRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.customersettleRequest.vo.CustomersettleRequestDetailCreateReqVO; import com.win.module.wms.controller.customersettleRequest.vo.CustomersettleRequestDetailExportReqVO; import com.win.module.wms.controller.customersettleRequest.vo.CustomersettleRequestDetailPageReqVO; @@ -62,6 +63,13 @@ public interface CustomersettleRequestDetailService { * @return 客户结算申请子分页 */ PageResult getCustomersettleRequestDetailPage(CustomersettleRequestDetailPageReqVO pageReqVO); + /** + * 获得用高级搜索客户结算申请子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getCustomersettleRequestDetailSenior(CustomConditions conditions); /** * 获得客户结算申请子列表, 用于 Excel 导出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customersettleRequest/CustomersettleRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customersettleRequest/CustomersettleRequestDetailServiceImpl.java index dc07a459..71b33137 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customersettleRequest/CustomersettleRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customersettleRequest/CustomersettleRequestDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.customersettleRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.customersettleRequest.vo.CustomersettleRequestDetailCreateReqVO; import com.win.module.wms.controller.customersettleRequest.vo.CustomersettleRequestDetailExportReqVO; import com.win.module.wms.controller.customersettleRequest.vo.CustomersettleRequestDetailPageReqVO; @@ -77,7 +78,10 @@ public class CustomersettleRequestDetailServiceImpl implements CustomersettleReq public PageResult getCustomersettleRequestDetailPage(CustomersettleRequestDetailPageReqVO pageReqVO) { return customersettleRequestDetailMapper.selectPage(pageReqVO); } - + @Override + public PageResult getCustomersettleRequestDetailSenior(CustomConditions conditions) { + return customersettleRequestDetailMapper.selectSenior(conditions); + } @Override public List getCustomersettleRequestDetailList(CustomersettleRequestDetailExportReqVO exportReqVO) { return customersettleRequestDetailMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customersettleRequest/CustomersettleRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customersettleRequest/CustomersettleRequestMainService.java index 7ad579cd..dbca4484 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customersettleRequest/CustomersettleRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customersettleRequest/CustomersettleRequestMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.customersettleRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.customersettleRequest.vo.CustomersettleRequestMainCreateReqVO; import com.win.module.wms.controller.customersettleRequest.vo.CustomersettleRequestMainExportReqVO; import com.win.module.wms.controller.customersettleRequest.vo.CustomersettleRequestMainPageReqVO; @@ -62,6 +63,13 @@ public interface CustomersettleRequestMainService { * @return 客户结算申请主分页 */ PageResult getCustomersettleRequestMainPage(CustomersettleRequestMainPageReqVO pageReqVO); + /** + * 获得用高级搜索客户结算申请主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getCustomersettleRequestMainSenior(CustomConditions conditions); /** * 获得客户结算申请主列表, 用于 Excel 导出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customersettleRequest/CustomersettleRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customersettleRequest/CustomersettleRequestMainServiceImpl.java index f4500515..0ccf1ccf 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customersettleRequest/CustomersettleRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customersettleRequest/CustomersettleRequestMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.customersettleRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.customersettleRequest.vo.CustomersettleRequestMainCreateReqVO; import com.win.module.wms.controller.customersettleRequest.vo.CustomersettleRequestMainExportReqVO; import com.win.module.wms.controller.customersettleRequest.vo.CustomersettleRequestMainPageReqVO; @@ -77,7 +78,10 @@ public class CustomersettleRequestMainServiceImpl implements CustomersettleReque public PageResult getCustomersettleRequestMainPage(CustomersettleRequestMainPageReqVO pageReqVO) { return customersettleRequestMainMapper.selectPage(pageReqVO); } - + @Override + public PageResult getCustomersettleRequestMainSenior(CustomConditions conditions) { + return customersettleRequestMainMapper.selectSenior(conditions); + } @Override public List getCustomersettleRequestMainList(CustomersettleRequestMainExportReqVO exportReqVO) { return customersettleRequestMainMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobDetailService.java index 507f9f14..62c1beb8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.deliverJob; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.deliverJob.vo.DeliverJobDetailCreateReqVO; import com.win.module.wms.controller.deliverJob.vo.DeliverJobDetailExportReqVO; import com.win.module.wms.controller.deliverJob.vo.DeliverJobDetailPageReqVO; @@ -62,6 +63,13 @@ public interface DeliverJobDetailService { * @return 发货任务子分页 */ PageResult getDeliverJobDetailPage(DeliverJobDetailPageReqVO pageReqVO); + /** + * 获得用高级搜索发货任务子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getDeliverJobDetailSenior(CustomConditions conditions); /** * 获得发货任务子列表, 用于 Excel 导出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobDetailServiceImpl.java index 4277b491..9661ad3d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.deliverJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.deliverJob.vo.DeliverJobDetailCreateReqVO; import com.win.module.wms.controller.deliverJob.vo.DeliverJobDetailExportReqVO; import com.win.module.wms.controller.deliverJob.vo.DeliverJobDetailPageReqVO; @@ -72,7 +73,10 @@ public class DeliverJobDetailServiceImpl implements DeliverJobDetailService { public List getDeliverJobDetailList(Collection ids) { return deliverJobDetailMapper.selectBatchIds(ids); } - + @Override + public PageResult getDeliverJobDetailSenior(CustomConditions conditions) { + return deliverJobDetailMapper.selectSenior(conditions); + } @Override public PageResult getDeliverJobDetailPage(DeliverJobDetailPageReqVO pageReqVO) { return deliverJobDetailMapper.selectPage(pageReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainService.java index 73754a02..69364498 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.deliverJob; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainCreateReqVO; import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainExportReqVO; import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainPageReqVO; @@ -72,6 +73,14 @@ public interface DeliverJobMainService { * @return 发货任务主列表 */ List getDeliverJobMainList(DeliverJobMainExportReqVO exportReqVO); + /** + * 获得用高级搜索发货任务主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getDeliverJobMainSenior(CustomConditions conditions); + /** * 校验采购订单明细 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainServiceImpl.java index ac1da7b9..8ef700ad 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainServiceImpl.java @@ -1,12 +1,11 @@ package com.win.module.wms.service.deliverJob; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainCreateReqVO; import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainExportReqVO; import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainPageReqVO; import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainUpdateReqVO; -import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; -import com.win.module.wms.dal.dataobject.production.ProductionDetailDO; import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO; import com.win.module.wms.dal.dataobject.sale.SaleDetailDO; import com.win.module.wms.service.purchase.PurchaseMainService; @@ -94,7 +93,10 @@ public class DeliverJobMainServiceImpl implements DeliverJobMainService { public List getDeliverJobMainList(DeliverJobMainExportReqVO exportReqVO) { return deliverJobMainMapper.selectList(exportReqVO); } - + @Override + public PageResult getDeliverJobMainSenior(CustomConditions conditions) { + return deliverJobMainMapper.selectSenior(conditions); + } //校验采购订单明细 @Override public PurchaseDetailDO productionDetailExist(String pnumber, String pitemCode,String psupplierCode,String plineNumber) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverPlan/DeliverPlanDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverPlan/DeliverPlanDetailService.java index 3b204ca0..221307a4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverPlan/DeliverPlanDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverPlan/DeliverPlanDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.deliverPlan; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.deliverPlan.vo.DeliverPlanDetailCreateReqVO; import com.win.module.wms.controller.deliverPlan.vo.DeliverPlanDetailExportReqVO; import com.win.module.wms.controller.deliverPlan.vo.DeliverPlanDetailPageReqVO; @@ -62,6 +63,13 @@ public interface DeliverPlanDetailService { * @return 发货计划子分页 */ PageResult getDeliverPlanDetailPage(DeliverPlanDetailPageReqVO pageReqVO); + /** + * 获得用高级搜索发货计划子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getDeliverPlanDetailSenior(CustomConditions conditions); /** * 获得发货计划子列表, 用于 Excel 导出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverPlan/DeliverPlanDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverPlan/DeliverPlanDetailServiceImpl.java index 929e6946..921be909 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverPlan/DeliverPlanDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverPlan/DeliverPlanDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.deliverPlan; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.deliverPlan.vo.DeliverPlanDetailCreateReqVO; import com.win.module.wms.controller.deliverPlan.vo.DeliverPlanDetailExportReqVO; import com.win.module.wms.controller.deliverPlan.vo.DeliverPlanDetailPageReqVO; @@ -72,7 +73,10 @@ public class DeliverPlanDetailServiceImpl implements DeliverPlanDetailService { public List getDeliverPlanDetailList(Collection ids) { return deliverPlanDetailMapper.selectBatchIds(ids); } - + @Override + public PageResult getDeliverPlanDetailSenior(CustomConditions conditions) { + return deliverPlanDetailMapper.selectSenior(conditions); + } @Override public PageResult getDeliverPlanDetailPage(DeliverPlanDetailPageReqVO pageReqVO) { return deliverPlanDetailMapper.selectPage(pageReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverPlan/DeliverPlanMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverPlan/DeliverPlanMainService.java index 0c3b7009..6a5629e9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverPlan/DeliverPlanMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverPlan/DeliverPlanMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.deliverPlan; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.deliverPlan.vo.DeliverPlanMainCreateReqVO; import com.win.module.wms.controller.deliverPlan.vo.DeliverPlanMainExportReqVO; import com.win.module.wms.controller.deliverPlan.vo.DeliverPlanMainPageReqVO; @@ -62,6 +63,13 @@ public interface DeliverPlanMainService { * @return 发货计划主分页 */ PageResult getDeliverPlanMainPage(DeliverPlanMainPageReqVO pageReqVO); + /** + * 获得用高级搜索发货计划主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getDeliverPlanMainSenior(CustomConditions conditions); /** * 获得发货计划主列表, 用于 Excel 导出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverPlan/DeliverPlanMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverPlan/DeliverPlanMainServiceImpl.java index 40152e51..8e07164d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverPlan/DeliverPlanMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverPlan/DeliverPlanMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.deliverPlan; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.deliverPlan.vo.DeliverPlanMainCreateReqVO; import com.win.module.wms.controller.deliverPlan.vo.DeliverPlanMainExportReqVO; import com.win.module.wms.controller.deliverPlan.vo.DeliverPlanMainPageReqVO; @@ -72,7 +73,10 @@ public class DeliverPlanMainServiceImpl implements DeliverPlanMainService { public List getDeliverPlanMainList(Collection ids) { return deliverPlanMainMapper.selectBatchIds(ids); } - + @Override + public PageResult getDeliverPlanMainSenior(CustomConditions conditions) { + return deliverPlanMainMapper.selectSenior(conditions); + } @Override public PageResult getDeliverPlanMainPage(DeliverPlanMainPageReqVO pageReqVO) { return deliverPlanMainMapper.selectPage(pageReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRecord/DeliverRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRecord/DeliverRecordDetailService.java index 96ab4e6e..6fb9cc0a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRecord/DeliverRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRecord/DeliverRecordDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.deliverRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.deliverRecord.vo.DeliverRecordDetailCreateReqVO; import com.win.module.wms.controller.deliverRecord.vo.DeliverRecordDetailExportReqVO; import com.win.module.wms.controller.deliverRecord.vo.DeliverRecordDetailPageReqVO; @@ -63,6 +64,14 @@ public interface DeliverRecordDetailService { */ PageResult getDeliverRecordDetailPage(DeliverRecordDetailPageReqVO pageReqVO); + /** + * 获得用高级搜索发货记录子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getDeliverRecordDetailSenior(CustomConditions conditions); + /** * 获得发货记录子列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRecord/DeliverRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRecord/DeliverRecordDetailServiceImpl.java index 08d98931..68599956 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRecord/DeliverRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRecord/DeliverRecordDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.deliverRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.deliverRecord.vo.DeliverRecordDetailCreateReqVO; import com.win.module.wms.controller.deliverRecord.vo.DeliverRecordDetailExportReqVO; import com.win.module.wms.controller.deliverRecord.vo.DeliverRecordDetailPageReqVO; @@ -73,6 +74,10 @@ public class DeliverRecordDetailServiceImpl implements DeliverRecordDetailServic return deliverRecordDetailMapper.selectBatchIds(ids); } + @Override + public PageResult getDeliverRecordDetailSenior(CustomConditions conditions) { + return deliverRecordDetailMapper.selectSenior(conditions); + } @Override public PageResult getDeliverRecordDetailPage(DeliverRecordDetailPageReqVO pageReqVO) { return deliverRecordDetailMapper.selectPage(pageReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRecord/DeliverRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRecord/DeliverRecordMainService.java index b1289917..b44dc77b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRecord/DeliverRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRecord/DeliverRecordMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.deliverRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.deliverRecord.vo.DeliverRecordMainCreateReqVO; import com.win.module.wms.controller.deliverRecord.vo.DeliverRecordMainExportReqVO; import com.win.module.wms.controller.deliverRecord.vo.DeliverRecordMainPageReqVO; @@ -63,6 +64,15 @@ public interface DeliverRecordMainService { */ PageResult getDeliverRecordMainPage(DeliverRecordMainPageReqVO pageReqVO); + /** + * 获得用高级搜索发货记录主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getDeliverRecordMainSenior(CustomConditions conditions); + + /** * 获得发货记录主列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRecord/DeliverRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRecord/DeliverRecordMainServiceImpl.java index e82fb7d8..5aa31c35 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRecord/DeliverRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRecord/DeliverRecordMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.deliverRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.deliverRecord.vo.DeliverRecordMainCreateReqVO; import com.win.module.wms.controller.deliverRecord.vo.DeliverRecordMainExportReqVO; import com.win.module.wms.controller.deliverRecord.vo.DeliverRecordMainPageReqVO; @@ -78,6 +79,10 @@ public class DeliverRecordMainServiceImpl implements DeliverRecordMainService { return deliverRecordMainMapper.selectPage(pageReqVO); } + @Override + public PageResult getDeliverRecordMainSenior(CustomConditions conditions) { + return deliverRecordMainMapper.selectSenior(conditions); + } @Override public List getDeliverRecordMainList(DeliverRecordMainExportReqVO exportReqVO) { return deliverRecordMainMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestDetailService.java index 8872a39c..abf6ae49 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.deliverRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.deliverRequest.vo.DeliverRequestDetailCreateReqVO; import com.win.module.wms.controller.deliverRequest.vo.DeliverRequestDetailExportReqVO; import com.win.module.wms.controller.deliverRequest.vo.DeliverRequestDetailPageReqVO; @@ -63,6 +64,15 @@ public interface DeliverRequestDetailService { */ PageResult getDeliverRequestDetailPage(DeliverRequestDetailPageReqVO pageReqVO); + /** + * 获得用高级搜索发货申请子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getDeliverRequestDetailSenior(CustomConditions conditions); + + /** * 获得发货申请子列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestDetailServiceImpl.java index e9869696..b4237788 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.deliverRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.deliverRequest.vo.DeliverRequestDetailCreateReqVO; import com.win.module.wms.controller.deliverRequest.vo.DeliverRequestDetailExportReqVO; import com.win.module.wms.controller.deliverRequest.vo.DeliverRequestDetailPageReqVO; @@ -78,6 +79,11 @@ public class DeliverRequestDetailServiceImpl implements DeliverRequestDetailServ return deliverRequestDetailMapper.selectPage(pageReqVO); } + @Override + public PageResult getDeliverRequestDetailSenior(CustomConditions conditions) { + return deliverRequestDetailMapper.selectSenior(conditions); + } + @Override public List getDeliverRequestDetailList(DeliverRequestDetailExportReqVO exportReqVO) { return deliverRequestDetailMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestMainService.java index 1aebbf05..58905373 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.deliverRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.deliverRequest.vo.DeliverRequestMainCreateReqVO; import com.win.module.wms.controller.deliverRequest.vo.DeliverRequestMainExportReqVO; import com.win.module.wms.controller.deliverRequest.vo.DeliverRequestMainPageReqVO; @@ -63,6 +64,15 @@ public interface DeliverRequestMainService { */ PageResult getDeliverRequestMainPage(DeliverRequestMainPageReqVO pageReqVO); + /** + * 获得用高级搜索发货申请主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getDeliverRequestMainSenior(CustomConditions conditions); + + /** * 获得发货申请主列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestMainServiceImpl.java index 5836ea07..78bc5707 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.deliverRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.deliverRequest.vo.DeliverRequestMainCreateReqVO; import com.win.module.wms.controller.deliverRequest.vo.DeliverRequestMainExportReqVO; import com.win.module.wms.controller.deliverRequest.vo.DeliverRequestMainPageReqVO; @@ -78,6 +79,11 @@ public class DeliverRequestMainServiceImpl implements DeliverRequestMainService return deliverRequestMainMapper.selectPage(pageReqVO); } + @Override + public PageResult getDeliverRequestMainSenior(CustomConditions conditions) { + return deliverRequestMainMapper.selectSenior(conditions); + } + @Override public List getDeliverRequestMainList(DeliverRequestMainExportReqVO exportReqVO) { return deliverRequestMainMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/demandforecasting/DemandforecastingDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/demandforecasting/DemandforecastingDetailService.java index 68c56825..f7a417f8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/demandforecasting/DemandforecastingDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/demandforecasting/DemandforecastingDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.demandforecasting; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.demandforecasting.vo.DemandforecastingDetailCreateReqVO; import com.win.module.wms.controller.demandforecasting.vo.DemandforecastingDetailExportReqVO; import com.win.module.wms.controller.demandforecasting.vo.DemandforecastingDetailPageReqVO; @@ -63,6 +64,15 @@ public interface DemandforecastingDetailService { */ PageResult getDemandforecastingDetailPage(DemandforecastingDetailPageReqVO pageReqVO); + /** + * 获得用高级搜索要货预测子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getDemandforecastingDetailSenior(CustomConditions conditions); + + /** * 获得要货预测子列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/demandforecasting/DemandforecastingDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/demandforecasting/DemandforecastingDetailServiceImpl.java index ba9ebd8d..216d5032 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/demandforecasting/DemandforecastingDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/demandforecasting/DemandforecastingDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.demandforecasting; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.demandforecasting.vo.DemandforecastingDetailCreateReqVO; import com.win.module.wms.controller.demandforecasting.vo.DemandforecastingDetailExportReqVO; import com.win.module.wms.controller.demandforecasting.vo.DemandforecastingDetailPageReqVO; @@ -77,7 +78,10 @@ public class DemandforecastingDetailServiceImpl implements DemandforecastingDeta public PageResult getDemandforecastingDetailPage(DemandforecastingDetailPageReqVO pageReqVO) { return demandforecastingDetailMapper.selectPage(pageReqVO); } - + @Override + public PageResult getDemandforecastingDetailSenior(CustomConditions conditions) { + return demandforecastingDetailMapper.selectSenior(conditions); + } @Override public List getDemandforecastingDetailList(DemandforecastingDetailExportReqVO exportReqVO) { return demandforecastingDetailMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/demandforecasting/DemandforecastingMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/demandforecasting/DemandforecastingMainService.java index fa2043c2..b68807ed 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/demandforecasting/DemandforecastingMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/demandforecasting/DemandforecastingMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.demandforecasting; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.demandforecasting.vo.DemandforecastingMainCreateReqVO; import com.win.module.wms.controller.demandforecasting.vo.DemandforecastingMainExportReqVO; import com.win.module.wms.controller.demandforecasting.vo.DemandforecastingMainPageReqVO; @@ -63,6 +64,15 @@ public interface DemandforecastingMainService { */ PageResult getDemandforecastingMainPage(DemandforecastingMainPageReqVO pageReqVO); + /** + * 获得用高级搜索要货预测主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getDemandforecastingMainSenior(CustomConditions conditions); + + /** * 获得要货预测主列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/demandforecasting/DemandforecastingMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/demandforecasting/DemandforecastingMainServiceImpl.java index d65ed891..4f19c8ec 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/demandforecasting/DemandforecastingMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/demandforecasting/DemandforecastingMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.demandforecasting; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.demandforecasting.vo.DemandforecastingMainCreateReqVO; import com.win.module.wms.controller.demandforecasting.vo.DemandforecastingMainExportReqVO; import com.win.module.wms.controller.demandforecasting.vo.DemandforecastingMainPageReqVO; @@ -78,6 +79,10 @@ public class DemandforecastingMainServiceImpl implements DemandforecastingMainSe return demandforecastingMainMapper.selectPage(pageReqVO); } + @Override + public PageResult getDemandforecastingMainSenior(CustomConditions conditions) { + return demandforecastingMainMapper.selectSenior(conditions); + } @Override public List getDemandforecastingMainList(DemandforecastingMainExportReqVO exportReqVO) { return demandforecastingMainMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dismantleRecord/DismantleRecordDetailbService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dismantleRecord/DismantleRecordDetailbService.java deleted file mode 100644 index 8e0452c9..00000000 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dismantleRecord/DismantleRecordDetailbService.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.win.module.wms.service.dismantleRecord; - -import java.util.*; -import javax.validation.*; - -import com.win.module.wms.controller.dismantleRecord.vo.DismantleRecordDetailbCreateReqVO; -import com.win.module.wms.controller.dismantleRecord.vo.DismantleRecordDetailbExportReqVO; -import com.win.module.wms.controller.dismantleRecord.vo.DismantleRecordDetailbPageReqVO; -import com.win.module.wms.controller.dismantleRecord.vo.DismantleRecordDetailbUpdateReqVO; -import com.win.module.wms.dal.dataobject.dismantleRecord.DismantleRecordDetailbDO; -import com.win.framework.common.pojo.PageResult; - -/** - * 制品拆解记录子 Service 接口 - * - * @author 超级管理员 - */ -public interface DismantleRecordDetailbService { - - /** - * 创建制品拆解记录子 - * - * @param createReqVO 创建信息 - * @return 编号 - */ - Long createDismantleRecordDetailb(@Valid DismantleRecordDetailbCreateReqVO createReqVO); - - /** - * 更新制品拆解记录子 - * - * @param updateReqVO 更新信息 - */ - void updateDismantleRecordDetailb(@Valid DismantleRecordDetailbUpdateReqVO updateReqVO); - - /** - * 删除制品拆解记录子 - * - * @param id 编号 - */ - void deleteDismantleRecordDetailb(Long id); - - /** - * 获得制品拆解记录子 - * - * @param id 编号 - * @return 制品拆解记录子 - */ - DismantleRecordDetailbDO getDismantleRecordDetailb(Long id); - - /** - * 获得制品拆解记录子列表 - * - * @param ids 编号 - * @return 制品拆解记录子列表 - */ - List getDismantleRecordDetailbList(Collection ids); - - /** - * 获得制品拆解记录子分页 - * - * @param pageReqVO 分页查询 - * @return 制品拆解记录子分页 - */ - PageResult getDismantleRecordDetailbPage(DismantleRecordDetailbPageReqVO pageReqVO); - - /** - * 获得制品拆解记录子列表, 用于 Excel 导出 - * - * @param exportReqVO 查询条件 - * @return 制品拆解记录子列表 - */ - List getDismantleRecordDetailbList(DismantleRecordDetailbExportReqVO exportReqVO); - -} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dismantleRecord/DismantleRecordDetailbServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dismantleRecord/DismantleRecordDetailbServiceImpl.java deleted file mode 100644 index ec01397c..00000000 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dismantleRecord/DismantleRecordDetailbServiceImpl.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.win.module.wms.service.dismantleRecord; - -import com.win.module.wms.controller.dismantleRecord.vo.DismantleRecordDetailbCreateReqVO; -import com.win.module.wms.controller.dismantleRecord.vo.DismantleRecordDetailbExportReqVO; -import com.win.module.wms.controller.dismantleRecord.vo.DismantleRecordDetailbPageReqVO; -import com.win.module.wms.controller.dismantleRecord.vo.DismantleRecordDetailbUpdateReqVO; -import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; - -import java.util.*; - -import com.win.module.wms.dal.dataobject.dismantleRecord.DismantleRecordDetailbDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.dismantleRecord.DismantleRecordDetailbConvert; -import com.win.module.wms.dal.mysql.dismantleRecord.DismantleRecordDetailbMapper; - -import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; - -/** - * 制品拆解记录子 Service 实现类 - * - * @author 超级管理员 - */ -@Service -@Validated -public class DismantleRecordDetailbServiceImpl implements DismantleRecordDetailbService { - - @Resource - private DismantleRecordDetailbMapper dismantleRecordDetailbMapper; - - @Override - public Long createDismantleRecordDetailb(DismantleRecordDetailbCreateReqVO createReqVO) { - // 插入 - DismantleRecordDetailbDO dismantleRecordDetailb = DismantleRecordDetailbConvert.INSTANCE.convert(createReqVO); - dismantleRecordDetailbMapper.insert(dismantleRecordDetailb); - // 返回 - return dismantleRecordDetailb.getId(); - } - - @Override - public void updateDismantleRecordDetailb(DismantleRecordDetailbUpdateReqVO updateReqVO) { - // 校验存在 - validateDismantleRecordDetailbExists(updateReqVO.getId()); - // 更新 - DismantleRecordDetailbDO updateObj = DismantleRecordDetailbConvert.INSTANCE.convert(updateReqVO); - dismantleRecordDetailbMapper.updateById(updateObj); - } - - @Override - public void deleteDismantleRecordDetailb(Long id) { - // 校验存在 - validateDismantleRecordDetailbExists(id); - // 删除 - dismantleRecordDetailbMapper.deleteById(id); - } - - private void validateDismantleRecordDetailbExists(Long id) { - if (dismantleRecordDetailbMapper.selectById(id) == null) { - throw exception(DISMANTLE_RECORD_DETAILB_NOT_EXISTS); - } - } - - @Override - public DismantleRecordDetailbDO getDismantleRecordDetailb(Long id) { - return dismantleRecordDetailbMapper.selectById(id); - } - - @Override - public List getDismantleRecordDetailbList(Collection ids) { - return dismantleRecordDetailbMapper.selectBatchIds(ids); - } - - @Override - public PageResult getDismantleRecordDetailbPage(DismantleRecordDetailbPageReqVO pageReqVO) { - return dismantleRecordDetailbMapper.selectPage(pageReqVO); - } - - @Override - public List getDismantleRecordDetailbList(DismantleRecordDetailbExportReqVO exportReqVO) { - return dismantleRecordDetailbMapper.selectList(exportReqVO); - } - -} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dismantleRequest/DismantleRequestDetailbService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dismantleRequest/DismantleRequestDetailbService.java deleted file mode 100644 index ef392bd8..00000000 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dismantleRequest/DismantleRequestDetailbService.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.win.module.wms.service.dismantleRequest; - -import java.util.*; -import javax.validation.*; - -import com.win.module.wms.controller.dismantleRequest.vo.DismantleRequestDetailbCreateReqVO; -import com.win.module.wms.controller.dismantleRequest.vo.DismantleRequestDetailbExportReqVO; -import com.win.module.wms.controller.dismantleRequest.vo.DismantleRequestDetailbPageReqVO; -import com.win.module.wms.controller.dismantleRequest.vo.DismantleRequestDetailbUpdateReqVO; -import com.win.module.wms.dal.dataobject.dismantleRequest.DismantleRequestDetailbDO; -import com.win.framework.common.pojo.PageResult; - -/** - * 制品拆解申请子 Service 接口 - * - * @author 超级管理员 - */ -public interface DismantleRequestDetailbService { - - /** - * 创建制品拆解申请子 - * - * @param createReqVO 创建信息 - * @return 编号 - */ - Long createDismantleRequestDetailb(@Valid DismantleRequestDetailbCreateReqVO createReqVO); - - /** - * 更新制品拆解申请子 - * - * @param updateReqVO 更新信息 - */ - void updateDismantleRequestDetailb(@Valid DismantleRequestDetailbUpdateReqVO updateReqVO); - - /** - * 删除制品拆解申请子 - * - * @param id 编号 - */ - void deleteDismantleRequestDetailb(Long id); - - /** - * 获得制品拆解申请子 - * - * @param id 编号 - * @return 制品拆解申请子 - */ - DismantleRequestDetailbDO getDismantleRequestDetailb(Long id); - - /** - * 获得制品拆解申请子列表 - * - * @param ids 编号 - * @return 制品拆解申请子列表 - */ - List getDismantleRequestDetailbList(Collection ids); - - /** - * 获得制品拆解申请子分页 - * - * @param pageReqVO 分页查询 - * @return 制品拆解申请子分页 - */ - PageResult getDismantleRequestDetailbPage(DismantleRequestDetailbPageReqVO pageReqVO); - - /** - * 获得制品拆解申请子列表, 用于 Excel 导出 - * - * @param exportReqVO 查询条件 - * @return 制品拆解申请子列表 - */ - List getDismantleRequestDetailbList(DismantleRequestDetailbExportReqVO exportReqVO); - -} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dismantleRequest/DismantleRequestDetailbServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dismantleRequest/DismantleRequestDetailbServiceImpl.java deleted file mode 100644 index 0ee6826d..00000000 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dismantleRequest/DismantleRequestDetailbServiceImpl.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.win.module.wms.service.dismantleRequest; - -import com.win.module.wms.controller.dismantleRequest.vo.DismantleRequestDetailbCreateReqVO; -import com.win.module.wms.controller.dismantleRequest.vo.DismantleRequestDetailbExportReqVO; -import com.win.module.wms.controller.dismantleRequest.vo.DismantleRequestDetailbPageReqVO; -import com.win.module.wms.controller.dismantleRequest.vo.DismantleRequestDetailbUpdateReqVO; -import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; - -import java.util.*; - -import com.win.module.wms.dal.dataobject.dismantleRequest.DismantleRequestDetailbDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.dismantleRequest.DismantleRequestDetailbConvert; -import com.win.module.wms.dal.mysql.dismantleRequest.DismantleRequestDetailbMapper; - -import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; - -/** - * 制品拆解申请子 Service 实现类 - * - * @author 超级管理员 - */ -@Service -@Validated -public class DismantleRequestDetailbServiceImpl implements DismantleRequestDetailbService { - - @Resource - private DismantleRequestDetailbMapper dismantleRequestDetailbMapper; - - @Override - public Long createDismantleRequestDetailb(DismantleRequestDetailbCreateReqVO createReqVO) { - // 插入 - DismantleRequestDetailbDO dismantleRequestDetailb = DismantleRequestDetailbConvert.INSTANCE.convert(createReqVO); - dismantleRequestDetailbMapper.insert(dismantleRequestDetailb); - // 返回 - return dismantleRequestDetailb.getId(); - } - - @Override - public void updateDismantleRequestDetailb(DismantleRequestDetailbUpdateReqVO updateReqVO) { - // 校验存在 - validateDismantleRequestDetailbExists(updateReqVO.getId()); - // 更新 - DismantleRequestDetailbDO updateObj = DismantleRequestDetailbConvert.INSTANCE.convert(updateReqVO); - dismantleRequestDetailbMapper.updateById(updateObj); - } - - @Override - public void deleteDismantleRequestDetailb(Long id) { - // 校验存在 - validateDismantleRequestDetailbExists(id); - // 删除 - dismantleRequestDetailbMapper.deleteById(id); - } - - private void validateDismantleRequestDetailbExists(Long id) { - if (dismantleRequestDetailbMapper.selectById(id) == null) { - throw exception(DISMANTLE_REQUEST_DETAILB_NOT_EXISTS); - } - } - - @Override - public DismantleRequestDetailbDO getDismantleRequestDetailb(Long id) { - return dismantleRequestDetailbMapper.selectById(id); - } - - @Override - public List getDismantleRequestDetailbList(Collection ids) { - return dismantleRequestDetailbMapper.selectBatchIds(ids); - } - - @Override - public PageResult getDismantleRequestDetailbPage(DismantleRequestDetailbPageReqVO pageReqVO) { - return dismantleRequestDetailbMapper.selectPage(pageReqVO); - } - - @Override - public List getDismantleRequestDetailbList(DismantleRequestDetailbExportReqVO exportReqVO) { - return dismantleRequestDetailbMapper.selectList(exportReqVO); - } - -} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobDetailServiceImpl.java index 1158b7f3..14e84846 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobDetailServiceImpl.java @@ -4,6 +4,7 @@ import com.win.module.wms.controller.productdismantleJob.vo.ProductdismantleJobD import com.win.module.wms.controller.productdismantleJob.vo.ProductdismantleJobDetailExportReqVO; import com.win.module.wms.controller.productdismantleJob.vo.ProductdismantleJobDetailPageReqVO; import com.win.module.wms.controller.productdismantleJob.vo.ProductdismantleJobDetailUpdateReqVO; +import com.win.module.wms.dal.mysql.productdismantleJob.ProductdismantleJobDetailMapper; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -14,7 +15,6 @@ import com.win.module.wms.dal.dataobject.productdismantleJob.ProductdismantleJob import com.win.framework.common.pojo.PageResult; import com.win.module.wms.convert.productdismantleJob.ProductdismantleJobDetailConvert; -import com.win.module.wms.dal.mysql.productdismantleJob.ProductdismantleJobDetailMapper; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.win.module.wms.enums.ErrorCodeConstants.*; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRecord/ProductdismantleRecordDetailbService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRecord/ProductdismantleRecordDetailbService.java new file mode 100644 index 00000000..11d272e9 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRecord/ProductdismantleRecordDetailbService.java @@ -0,0 +1,85 @@ +package com.win.module.wms.service.productdismantleRecord; + +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordDetailbCreateReqVO; +import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordDetailbExportReqVO; +import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordDetailbPageReqVO; +import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordDetailbUpdateReqVO; +import com.win.module.wms.dal.dataobject.productdismantleRecord.ProductdismantleRecordDetailbDO; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; + +/** + * 制品拆解记录子 Service 接口 + * + * @author 超级管理员 + */ +public interface ProductdismantleRecordDetailbService { + + /** + * 创建制品拆解记录子 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createDismantleRecordDetailb(@Valid ProductdismantleRecordDetailbCreateReqVO createReqVO); + + /** + * 更新制品拆解记录子 + * + * @param updateReqVO 更新信息 + */ + void updateDismantleRecordDetailb(@Valid ProductdismantleRecordDetailbUpdateReqVO updateReqVO); + + /** + * 删除制品拆解记录子 + * + * @param id 编号 + */ + void deleteDismantleRecordDetailb(Long id); + + /** + * 获得制品拆解记录子 + * + * @param id 编号 + * @return 制品拆解记录子 + */ + ProductdismantleRecordDetailbDO getDismantleRecordDetailb(Long id); + + /** + * 获得制品拆解记录子列表 + * + * @param ids 编号 + * @return 制品拆解记录子列表 + */ + List getDismantleRecordDetailbList(Collection ids); + + /** + * 获得制品拆解记录子分页 + * + * @param pageReqVO 分页查询 + * @return 制品拆解记录子分页 + */ + PageResult getDismantleRecordDetailbPage(ProductdismantleRecordDetailbPageReqVO pageReqVO); + + /** + * 获得用高级搜索制品拆解记录子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getDismantleRecordDetailbSenior(CustomConditions conditions); + + + /** + * 获得制品拆解记录子列表, 用于 Excel 导出 + * + * @param exportReqVO 查询条件 + * @return 制品拆解记录子列表 + */ + List getDismantleRecordDetailbList(ProductdismantleRecordDetailbExportReqVO exportReqVO); + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRecord/ProductdismantleRecordDetailbServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRecord/ProductdismantleRecordDetailbServiceImpl.java new file mode 100644 index 00000000..ddd935a7 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRecord/ProductdismantleRecordDetailbServiceImpl.java @@ -0,0 +1,88 @@ +package com.win.module.wms.service.productdismantleRecord; + +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.module.wms.controller.productdismantleRecord.vo.*; +import com.win.module.wms.convert.productdismantleRecord.ProductdismantleRecordDetailbConvert; +import com.win.module.wms.dal.dataobject.productdismantleRecord.ProductdismantleRecordDetailbDO; +import com.win.module.wms.dal.mysql.productdismantleRecord.ProductdismantleRecordDetailbMapper; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; + +import javax.annotation.Resource; +import java.util.Collection; +import java.util.List; + +import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; +import static com.win.module.wms.enums.ErrorCodeConstants.DISMANTLE_RECORD_DETAILB_NOT_EXISTS; + +/** + * 制品拆解记录子 Service 实现类 + * + * @author 超级管理员 + */ +@Service +@Validated +public class ProductdismantleRecordDetailbServiceImpl implements ProductdismantleRecordDetailbService { + + @Resource + private ProductdismantleRecordDetailbMapper productdismantleRecordDetailbMapper; + + @Override + public Long createDismantleRecordDetailb(ProductdismantleRecordDetailbCreateReqVO createReqVO) { + // 插入 + ProductdismantleRecordDetailbDO dismantleRecordDetailb = ProductdismantleRecordDetailbConvert.INSTANCE.convert(createReqVO); + productdismantleRecordDetailbMapper.insert(dismantleRecordDetailb); + // 返回 + return dismantleRecordDetailb.getId(); + } + + @Override + public void updateDismantleRecordDetailb(ProductdismantleRecordDetailbUpdateReqVO updateReqVO) { + // 校验存在 + validateDismantleRecordDetailbExists(updateReqVO.getId()); + // 更新 + ProductdismantleRecordDetailbDO updateObj = ProductdismantleRecordDetailbConvert.INSTANCE.convert(updateReqVO); + productdismantleRecordDetailbMapper.updateById(updateObj); + } + + @Override + public void deleteDismantleRecordDetailb(Long id) { + // 校验存在 + validateDismantleRecordDetailbExists(id); + // 删除 + productdismantleRecordDetailbMapper.deleteById(id); + } + + private void validateDismantleRecordDetailbExists(Long id) { + if (productdismantleRecordDetailbMapper.selectById(id) == null) { + throw exception(DISMANTLE_RECORD_DETAILB_NOT_EXISTS); + } + } + + @Override + public ProductdismantleRecordDetailbDO getDismantleRecordDetailb(Long id) { + return productdismantleRecordDetailbMapper.selectById(id); + } + + @Override + public List getDismantleRecordDetailbList(Collection ids) { + return productdismantleRecordDetailbMapper.selectBatchIds(ids); + } + + @Override + public PageResult getDismantleRecordDetailbPage(ProductdismantleRecordDetailbPageReqVO pageReqVO) { + return productdismantleRecordDetailbMapper.selectPage(pageReqVO); + } + + @Override + public PageResult getDismantleRecordDetailbSenior(CustomConditions conditions) { + return productdismantleRecordDetailbMapper.selectSenior(conditions); + } + + @Override + public List getDismantleRecordDetailbList(ProductdismantleRecordDetailbExportReqVO exportReqVO) { + return productdismantleRecordDetailbMapper.selectList(exportReqVO); + } + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRecordMain/ProductdismantleRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRecord/ProductdismantleRecordMainService.java similarity index 63% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRecordMain/ProductdismantleRecordMainService.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRecord/ProductdismantleRecordMainService.java index 75556e19..9c8fc57a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRecordMain/ProductdismantleRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRecord/ProductdismantleRecordMainService.java @@ -1,14 +1,16 @@ -package com.win.module.wms.service.productdismantleRecordMain; +package com.win.module.wms.service.productdismantleRecord; -import java.util.*; -import javax.validation.*; - -import com.win.module.wms.controller.productdismantleRecordMain.vo.ProductdismantleRecordMainCreateReqVO; -import com.win.module.wms.controller.productdismantleRecordMain.vo.ProductdismantleRecordMainExportReqVO; -import com.win.module.wms.controller.productdismantleRecordMain.vo.ProductdismantleRecordMainPageReqVO; -import com.win.module.wms.controller.productdismantleRecordMain.vo.ProductdismantleRecordMainUpdateReqVO; -import com.win.module.wms.dal.dataobject.productdismantleRecordMain.ProductdismantleRecordMainDO; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; +import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordMainCreateReqVO; +import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordMainExportReqVO; +import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordMainPageReqVO; +import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.productdismantleRecord.ProductdismantleRecordMainDO; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 制品拆解记录主 Service 接口 @@ -63,6 +65,15 @@ public interface ProductdismantleRecordMainService { */ PageResult getProductdismantleRecordMainPage(ProductdismantleRecordMainPageReqVO pageReqVO); + /** + * 获得用高级搜索制品拆解记录主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductdismantleRecordMainSenior(CustomConditions conditions); + + /** * 获得制品拆解记录主列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRecordMain/ProductdismantleRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRecord/ProductdismantleRecordMainServiceImpl.java similarity index 69% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRecordMain/ProductdismantleRecordMainServiceImpl.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRecord/ProductdismantleRecordMainServiceImpl.java index 0c494efd..8ecc5e97 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRecordMain/ProductdismantleRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRecord/ProductdismantleRecordMainServiceImpl.java @@ -1,23 +1,23 @@ -package com.win.module.wms.service.productdismantleRecordMain; +package com.win.module.wms.service.productdismantleRecord; -import com.win.module.wms.controller.productdismantleRecordMain.vo.ProductdismantleRecordMainCreateReqVO; -import com.win.module.wms.controller.productdismantleRecordMain.vo.ProductdismantleRecordMainExportReqVO; -import com.win.module.wms.controller.productdismantleRecordMain.vo.ProductdismantleRecordMainPageReqVO; -import com.win.module.wms.controller.productdismantleRecordMain.vo.ProductdismantleRecordMainUpdateReqVO; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordMainCreateReqVO; +import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordMainExportReqVO; +import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordMainPageReqVO; +import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordMainUpdateReqVO; +import com.win.module.wms.convert.productdismantleRecord.ProductdismantleRecordMainConvert; +import com.win.module.wms.dal.dataobject.productdismantleRecord.ProductdismantleRecordMainDO; +import com.win.module.wms.dal.mysql.productdismantleRecord.ProductdismantleRecordMainMapper; import org.springframework.stereotype.Service; -import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; -import java.util.*; - -import com.win.module.wms.dal.dataobject.productdismantleRecordMain.ProductdismantleRecordMainDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productdismantleRecordMain.ProductdismantleRecordMainConvert; -import com.win.module.wms.dal.mysql.productdismantleRecordMain.ProductdismantleRecordMainMapper; +import javax.annotation.Resource; +import java.util.Collection; +import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import static com.win.module.wms.enums.ErrorCodeConstants.PRODUCTDISMANTLE_RECORD_MAIN_NOT_EXISTS; /** * 制品拆解记录主 Service 实现类 @@ -78,6 +78,11 @@ public class ProductdismantleRecordMainServiceImpl implements ProductdismantleRe return productdismantleRecordMainMapper.selectPage(pageReqVO); } + @Override + public PageResult getProductdismantleRecordMainSenior(CustomConditions conditions) { + return productdismantleRecordMainMapper.selectSenior(conditions); + } + @Override public List getProductdismantleRecordMainList(ProductdismantleRecordMainExportReqVO exportReqVO) { return productdismantleRecordMainMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestDetailbService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestDetailbService.java new file mode 100644 index 00000000..fc8eae55 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestDetailbService.java @@ -0,0 +1,75 @@ +package com.win.module.wms.service.productdismantleRequest; + +import com.win.framework.common.pojo.PageResult; +import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestDetailbCreateReqVO; +import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestDetailbExportReqVO; +import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestDetailbPageReqVO; +import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestDetailbUpdateReqVO; +import com.win.module.wms.dal.dataobject.productdismantleRequest.ProductdismantleRequestDetailbDO; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; + +/** + * 制品拆解申请子 Service 接口 + * + * @author 超级管理员 + */ +public interface ProductdismantleRequestDetailbService { + + /** + * 创建制品拆解申请子 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createDismantleRequestDetailb(@Valid ProductdismantleRequestDetailbCreateReqVO createReqVO); + + /** + * 更新制品拆解申请子 + * + * @param updateReqVO 更新信息 + */ + void updateDismantleRequestDetailb(@Valid ProductdismantleRequestDetailbUpdateReqVO updateReqVO); + + /** + * 删除制品拆解申请子 + * + * @param id 编号 + */ + void deleteDismantleRequestDetailb(Long id); + + /** + * 获得制品拆解申请子 + * + * @param id 编号 + * @return 制品拆解申请子 + */ + ProductdismantleRequestDetailbDO getDismantleRequestDetailb(Long id); + + /** + * 获得制品拆解申请子列表 + * + * @param ids 编号 + * @return 制品拆解申请子列表 + */ + List getDismantleRequestDetailbList(Collection ids); + + /** + * 获得制品拆解申请子分页 + * + * @param pageReqVO 分页查询 + * @return 制品拆解申请子分页 + */ + PageResult getDismantleRequestDetailbPage(ProductdismantleRequestDetailbPageReqVO pageReqVO); + + /** + * 获得制品拆解申请子列表, 用于 Excel 导出 + * + * @param exportReqVO 查询条件 + * @return 制品拆解申请子列表 + */ + List getDismantleRequestDetailbList(ProductdismantleRequestDetailbExportReqVO exportReqVO); + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestDetailbServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestDetailbServiceImpl.java new file mode 100644 index 00000000..d2d130e4 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestDetailbServiceImpl.java @@ -0,0 +1,85 @@ +package com.win.module.wms.service.productdismantleRequest; + +import com.win.framework.common.pojo.PageResult; +import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestDetailbCreateReqVO; +import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestDetailbExportReqVO; +import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestDetailbPageReqVO; +import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestDetailbUpdateReqVO; +import com.win.module.wms.convert.productdismantleRequest.ProductdismantleRequestDetailbConvert; +import com.win.module.wms.dal.dataobject.productdismantleRequest.ProductdismantleRequestDetailbDO; +import com.win.module.wms.dal.mysql.productdismantleRequest.ProductdismantleRequestDetailbMapper; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; + +import javax.annotation.Resource; +import java.util.Collection; +import java.util.List; + +import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; +import static com.win.module.wms.enums.ErrorCodeConstants.DISMANTLE_REQUEST_DETAILB_NOT_EXISTS; + +/** + * 制品拆解申请子 Service 实现类 + * + * @author 超级管理员 + */ +@Service +@Validated +public class ProductdismantleRequestDetailbServiceImpl implements ProductdismantleRequestDetailbService { + + @Resource + private ProductdismantleRequestDetailbMapper productdismantleRequestDetailbMapper; + + @Override + public Long createDismantleRequestDetailb(ProductdismantleRequestDetailbCreateReqVO createReqVO) { + // 插入 + ProductdismantleRequestDetailbDO dismantleRequestDetailb = ProductdismantleRequestDetailbConvert.INSTANCE.convert(createReqVO); + productdismantleRequestDetailbMapper.insert(dismantleRequestDetailb); + // 返回 + return dismantleRequestDetailb.getId(); + } + + @Override + public void updateDismantleRequestDetailb(ProductdismantleRequestDetailbUpdateReqVO updateReqVO) { + // 校验存在 + validateDismantleRequestDetailbExists(updateReqVO.getId()); + // 更新 + ProductdismantleRequestDetailbDO updateObj = ProductdismantleRequestDetailbConvert.INSTANCE.convert(updateReqVO); + productdismantleRequestDetailbMapper.updateById(updateObj); + } + + @Override + public void deleteDismantleRequestDetailb(Long id) { + // 校验存在 + validateDismantleRequestDetailbExists(id); + // 删除 + productdismantleRequestDetailbMapper.deleteById(id); + } + + private void validateDismantleRequestDetailbExists(Long id) { + if (productdismantleRequestDetailbMapper.selectById(id) == null) { + throw exception(DISMANTLE_REQUEST_DETAILB_NOT_EXISTS); + } + } + + @Override + public ProductdismantleRequestDetailbDO getDismantleRequestDetailb(Long id) { + return productdismantleRequestDetailbMapper.selectById(id); + } + + @Override + public List getDismantleRequestDetailbList(Collection ids) { + return productdismantleRequestDetailbMapper.selectBatchIds(ids); + } + + @Override + public PageResult getDismantleRequestDetailbPage(ProductdismantleRequestDetailbPageReqVO pageReqVO) { + return productdismantleRequestDetailbMapper.selectPage(pageReqVO); + } + + @Override + public List getDismantleRequestDetailbList(ProductdismantleRequestDetailbExportReqVO exportReqVO) { + return productdismantleRequestDetailbMapper.selectList(exportReqVO); + } + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ConsumereRequestDetailbServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ConsumereRequestDetailbServiceImpl.java deleted file mode 100644 index 2c21b0f3..00000000 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ConsumereRequestDetailbServiceImpl.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.win.module.wms.service.productrepairRequest; - -import com.win.framework.common.pojo.CustomConditions; -import com.win.framework.common.pojo.PageResult; -import com.win.module.wms.controller.productrepairRequest.vo.ConsumereRequestDetailbCreateReqVO; -import com.win.module.wms.controller.productrepairRequest.vo.ConsumereRequestDetailbExportReqVO; -import com.win.module.wms.controller.productrepairRequest.vo.ConsumereRequestDetailbPageReqVO; -import com.win.module.wms.controller.productrepairRequest.vo.ConsumereRequestDetailbUpdateReqVO; -import com.win.module.wms.convert.productrepairRequest.ConsumereRequestDetailbConvert; -import com.win.module.wms.dal.dataobject.productrepairRequest.ConsumereRequestDetailbDO; -import com.win.module.wms.dal.mysql.productrepairRequest.ConsumereRequestDetailbMapper; -import org.springframework.stereotype.Service; -import org.springframework.validation.annotation.Validated; - -import javax.annotation.Resource; -import java.util.Collection; -import java.util.List; - -import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.CONSUMERE_REQUEST_DETAILB_NOT_EXISTS; - -/** - * 制品返修申请子 Service 实现类 - * - * @author 超级管理员 - */ -@Service -@Validated -public class ConsumereRequestDetailbServiceImpl implements ConsumereRequestDetailbService { - - @Resource - private ConsumereRequestDetailbMapper consumereRequestDetailbMapper; - - @Override - public String createConsumereRequestDetailb(ConsumereRequestDetailbCreateReqVO createReqVO) { - // 插入 - ConsumereRequestDetailbDO consumereRequestDetailb = ConsumereRequestDetailbConvert.INSTANCE.convert(createReqVO); - consumereRequestDetailbMapper.insert(consumereRequestDetailb); - // 返回 - return consumereRequestDetailb.getId(); - } - - @Override - public void updateConsumereRequestDetailb(ConsumereRequestDetailbUpdateReqVO updateReqVO) { - // 校验存在 - validateConsumereRequestDetailbExists(updateReqVO.getId().toString()); - // 更新 - ConsumereRequestDetailbDO updateObj = ConsumereRequestDetailbConvert.INSTANCE.convert(updateReqVO); - consumereRequestDetailbMapper.updateById(updateObj); - } - - @Override - public void deleteConsumereRequestDetailb(String id) { - // 校验存在 - validateConsumereRequestDetailbExists(id); - // 删除 - consumereRequestDetailbMapper.deleteById(id); - } - - private void validateConsumereRequestDetailbExists(String id) { - if (consumereRequestDetailbMapper.selectById(id) == null) { - throw exception(CONSUMERE_REQUEST_DETAILB_NOT_EXISTS); - } - } - - @Override - public ConsumereRequestDetailbDO getConsumereRequestDetailb(String id) { - return consumereRequestDetailbMapper.selectById(id); - } - @Override - public PageResult getConsumereRequestDetailbSenior(CustomConditions conditions) { - return consumereRequestDetailbMapper.selectSenior(conditions); - } - @Override - public List getConsumereRequestDetailbList(Collection ids) { - return consumereRequestDetailbMapper.selectBatchIds(ids); - } - - @Override - public PageResult getConsumereRequestDetailbPage(ConsumereRequestDetailbPageReqVO pageReqVO) { - return consumereRequestDetailbMapper.selectPage(pageReqVO); - } - - @Override - public List getConsumereRequestDetailbList(ConsumereRequestDetailbExportReqVO exportReqVO) { - return consumereRequestDetailbMapper.selectList(exportReqVO); - } - -} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ConsumereRequestDetailbService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestDetailbService.java similarity index 52% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ConsumereRequestDetailbService.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestDetailbService.java index 7e4e120d..4881aac6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ConsumereRequestDetailbService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestDetailbService.java @@ -2,11 +2,11 @@ package com.win.module.wms.service.productrepairRequest; import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; -import com.win.module.wms.controller.productrepairRequest.vo.ConsumereRequestDetailbCreateReqVO; -import com.win.module.wms.controller.productrepairRequest.vo.ConsumereRequestDetailbExportReqVO; -import com.win.module.wms.controller.productrepairRequest.vo.ConsumereRequestDetailbPageReqVO; -import com.win.module.wms.controller.productrepairRequest.vo.ConsumereRequestDetailbUpdateReqVO; -import com.win.module.wms.dal.dataobject.productrepairRequest.ConsumereRequestDetailbDO; +import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestDetailbCreateReqVO; +import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestDetailbExportReqVO; +import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestDetailbPageReqVO; +import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestDetailbUpdateReqVO; +import com.win.module.wms.dal.dataobject.productrepairRequest.ProductrepairRequestDetailbDO; import javax.validation.Valid; import java.util.Collection; @@ -17,7 +17,7 @@ import java.util.List; * * @author 超级管理员 */ -public interface ConsumereRequestDetailbService { +public interface ProductrepairRequestDetailbService { /** * 创建制品返修申请子 @@ -25,14 +25,14 @@ public interface ConsumereRequestDetailbService { * @param createReqVO 创建信息 * @return 编号 */ - String createConsumereRequestDetailb(@Valid ConsumereRequestDetailbCreateReqVO createReqVO); + String createConsumereRequestDetailb(@Valid ProductrepairRequestDetailbCreateReqVO createReqVO); /** * 更新制品返修申请子 * * @param updateReqVO 更新信息 */ - void updateConsumereRequestDetailb(@Valid ConsumereRequestDetailbUpdateReqVO updateReqVO); + void updateConsumereRequestDetailb(@Valid ProductrepairRequestDetailbUpdateReqVO updateReqVO); /** * 删除制品返修申请子 @@ -47,7 +47,7 @@ public interface ConsumereRequestDetailbService { * @param id 编号 * @return 制品返修申请子 */ - ConsumereRequestDetailbDO getConsumereRequestDetailb(String id); + ProductrepairRequestDetailbDO getConsumereRequestDetailb(String id); /** * 获得制品返修申请子列表 @@ -55,7 +55,7 @@ public interface ConsumereRequestDetailbService { * @param ids 编号 * @return 制品返修申请子列表 */ - List getConsumereRequestDetailbList(Collection ids); + List getConsumereRequestDetailbList(Collection ids); /** * 获得用高级搜索制品返修申请子分页列表 @@ -63,7 +63,7 @@ public interface ConsumereRequestDetailbService { * @param conditions 分页、排序和自定义条件 * @return 分页列表 */ - PageResult getConsumereRequestDetailbSenior(CustomConditions conditions); + PageResult getConsumereRequestDetailbSenior(CustomConditions conditions); /** * 获得制品返修申请子分页 @@ -71,7 +71,7 @@ public interface ConsumereRequestDetailbService { * @param pageReqVO 分页查询 * @return 制品返修申请子分页 */ - PageResult getConsumereRequestDetailbPage(ConsumereRequestDetailbPageReqVO pageReqVO); + PageResult getConsumereRequestDetailbPage(ProductrepairRequestDetailbPageReqVO pageReqVO); /** * 获得制品返修申请子列表, 用于 Excel 导出 @@ -79,6 +79,6 @@ public interface ConsumereRequestDetailbService { * @param exportReqVO 查询条件 * @return 制品返修申请子列表 */ - List getConsumereRequestDetailbList(ConsumereRequestDetailbExportReqVO exportReqVO); + List getConsumereRequestDetailbList(ProductrepairRequestDetailbExportReqVO exportReqVO); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestDetailbServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestDetailbServiceImpl.java new file mode 100644 index 00000000..c5f25b0c --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestDetailbServiceImpl.java @@ -0,0 +1,89 @@ +package com.win.module.wms.service.productrepairRequest; + +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestDetailbCreateReqVO; +import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestDetailbExportReqVO; +import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestDetailbPageReqVO; +import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestDetailbUpdateReqVO; +import com.win.module.wms.convert.productrepairRequest.ProductrepairRequestDetailbConvert; +import com.win.module.wms.dal.dataobject.productrepairRequest.ProductrepairRequestDetailbDO; +import com.win.module.wms.dal.mysql.productrepairRequest.ProductrepairRequestDetailbMapper; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; + +import javax.annotation.Resource; +import java.util.Collection; +import java.util.List; + +import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; +import static com.win.module.wms.enums.ErrorCodeConstants.CONSUMERE_REQUEST_DETAILB_NOT_EXISTS; + +/** + * 制品返修申请子 Service 实现类 + * + * @author 超级管理员 + */ +@Service +@Validated +public class ProductrepairRequestDetailbServiceImpl implements ProductrepairRequestDetailbService { + + @Resource + private ProductrepairRequestDetailbMapper productrepairRequestDetailbMapper; + + @Override + public String createConsumereRequestDetailb(ProductrepairRequestDetailbCreateReqVO createReqVO) { + // 插入 + ProductrepairRequestDetailbDO consumereRequestDetailb = ProductrepairRequestDetailbConvert.INSTANCE.convert(createReqVO); + productrepairRequestDetailbMapper.insert(consumereRequestDetailb); + // 返回 + return consumereRequestDetailb.getId(); + } + + @Override + public void updateConsumereRequestDetailb(ProductrepairRequestDetailbUpdateReqVO updateReqVO) { + // 校验存在 + validateConsumereRequestDetailbExists(updateReqVO.getId().toString()); + // 更新 + ProductrepairRequestDetailbDO updateObj = ProductrepairRequestDetailbConvert.INSTANCE.convert(updateReqVO); + productrepairRequestDetailbMapper.updateById(updateObj); + } + + @Override + public void deleteConsumereRequestDetailb(String id) { + // 校验存在 + validateConsumereRequestDetailbExists(id); + // 删除 + productrepairRequestDetailbMapper.deleteById(id); + } + + private void validateConsumereRequestDetailbExists(String id) { + if (productrepairRequestDetailbMapper.selectById(id) == null) { + throw exception(CONSUMERE_REQUEST_DETAILB_NOT_EXISTS); + } + } + + @Override + public ProductrepairRequestDetailbDO getConsumereRequestDetailb(String id) { + return productrepairRequestDetailbMapper.selectById(id); + } + @Override + public PageResult getConsumereRequestDetailbSenior(CustomConditions conditions) { + return productrepairRequestDetailbMapper.selectSenior(conditions); + } + @Override + public List getConsumereRequestDetailbList(Collection ids) { + return productrepairRequestDetailbMapper.selectBatchIds(ids); + } + + @Override + public PageResult getConsumereRequestDetailbPage(ProductrepairRequestDetailbPageReqVO pageReqVO) { + return productrepairRequestDetailbMapper.selectPage(pageReqVO); + } + + @Override + public List getConsumereRequestDetailbList(ProductrepairRequestDetailbExportReqVO exportReqVO) { + return productrepairRequestDetailbMapper.selectList(exportReqVO); + } + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordMainService.java index ab1c8ffd..7e56e8d5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordMainService.java @@ -76,9 +76,10 @@ public interface PurchasereceiptRecordMainService { * 查询采购收货记录是否存在 * Record-----VPur * @param ppoNumber 订单号 + * @param pNumber 订单号 * @param ppoLine 订单行 * @param pitemCode 零件号 * @return */ - public PurchasereceiptRecordDetailDO selectPurchasereceiptExist(String ppoNumber, String ppoLine, String pitemCode); + public PurchasereceiptRecordDetailDO selectPurchasereceiptExist(String ppoNumber, String pNumber,String ppoLine, String pitemCode); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordMainServiceImpl.java index 22abf9f1..61476dfa 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordMainServiceImpl.java @@ -89,20 +89,21 @@ public class PurchasereceiptRecordMainServiceImpl implements PurchasereceiptReco return purchasereceiptRecordMainMapper.selectList(exportReqVO); } @Override - public PurchasereceiptRecordDetailDO selectPurchasereceiptExist(String ppoNumber,String ppoLine,String pitemCode){ + public PurchasereceiptRecordDetailDO selectPurchasereceiptExist(String ppoNumber,String pNumber,String ppoLine,String pitemCode){ QueryWrapper queryWrapperMain = new QueryWrapper(); queryWrapperMain.eq("asn_number",ppoNumber); PurchasereceiptRecordMainDO purchasereceiptRecordMainDO = purchasereceiptRecordMainMapper.selectOne(queryWrapperMain); if(purchasereceiptRecordMainDO != null && "TRUE".equals(purchasereceiptRecordMainDO.getAvailable())){ QueryWrapper queryWrapperDetail = new QueryWrapper(); queryWrapperDetail.eq("po_number",ppoNumber); + queryWrapperDetail.eq("number",pNumber); queryWrapperDetail.eq("po_line",ppoLine); queryWrapperDetail.eq("item_code",pitemCode); PurchasereceiptRecordDetailDO purchasereceiptRecordDetailDO = purchasereceiptRecordDetailMapper.selectOne(queryWrapperDetail); if(purchasereceiptRecordDetailDO != null){ return purchasereceiptRecordDetailDO; }else { - throw exception(PURCHASERECEIPT_RECORD_DETAIL_PONUMBER_POLINE_ITEMCODE_INVALID); + throw exception(PURCHASERECEIPT_RECORD_DETAIL_PONUMBER_NUMBER_POLINE_ITEMCODE_INVALID); } }else { throw exception(PURCHASERECEIPT_RECORD_MAIN_NUMBER_NOT_EXISTS);